82cab70bd8
Leaving interpolation into JSON to qmp() is more robust than building QMP input manually, as explained in the commit before previous. qtest_qmp_device_add() and its wrappers interpolate into JSON as follows: * qtest_qmp_device_add() interpolates members into a JSON object. * So do its wrappers qpci_plug_device_test() and usb_test_hotplug(). * usb_test_hotplug() additionally interpolates strings and numbers into JSON strings. Clean them up: * Have qtest_qmp_device_add() take its extra device properties as arguments for qdict_from_jsonf_nofail() instead of a string containing JSON members. * Drop qpci_plug_device_test(), use qtest_qmp_device_add() directly. * Change usb_test_hotplug() parameter @port to string, to avoid interpolation. Interpolate @hcd_id separately. Bonus: gets rid of a non-literal format string. A step towards compile-time format string checking without triggering -Wformat-nonliteral. Cc: Thomas Huth <thuth@redhat.com> Signed-off-by: Markus Armbruster <armbru@redhat.com> Reviewed-by: Eric Blake <eblake@redhat.com> Message-Id: <20180806065344.7103-15-armbru@redhat.com>
58 lines
1.4 KiB
C
58 lines
1.4 KiB
C
/*
|
|
* common code shared by usb tests
|
|
*
|
|
* Copyright (c) 2014 Red Hat, Inc
|
|
*
|
|
* Authors:
|
|
* Gerd Hoffmann <kraxel@redhat.com>
|
|
* John Snow <jsnow@redhat.com>
|
|
* Igor Mammedov <imammedo@redhat.com>
|
|
*
|
|
* This work is licensed under the terms of the GNU GPL, version 2 or later.
|
|
* See the COPYING file in the top-level directory.
|
|
*/
|
|
#include "qemu/osdep.h"
|
|
#include "libqtest.h"
|
|
#include "hw/usb/uhci-regs.h"
|
|
#include "libqos/usb.h"
|
|
|
|
void qusb_pci_init_one(QPCIBus *pcibus, struct qhc *hc, uint32_t devfn, int bar)
|
|
{
|
|
hc->dev = qpci_device_find(pcibus, devfn);
|
|
g_assert(hc->dev != NULL);
|
|
qpci_device_enable(hc->dev);
|
|
hc->bar = qpci_iomap(hc->dev, bar, NULL);
|
|
}
|
|
|
|
void uhci_deinit(struct qhc *hc)
|
|
{
|
|
g_free(hc->dev);
|
|
}
|
|
|
|
void uhci_port_test(struct qhc *hc, int port, uint16_t expect)
|
|
{
|
|
uint16_t value = qpci_io_readw(hc->dev, hc->bar, 0x10 + 2 * port);
|
|
uint16_t mask = ~(UHCI_PORT_WRITE_CLEAR | UHCI_PORT_RSVD1);
|
|
|
|
g_assert((value & mask) == (expect & mask));
|
|
}
|
|
|
|
void usb_test_hotplug(const char *hcd_id, const char *port,
|
|
void (*port_check)(void))
|
|
{
|
|
char *id = g_strdup_printf("usbdev%s", port);
|
|
char *bus = g_strdup_printf("%s.0", hcd_id);
|
|
|
|
qtest_qmp_device_add("usb-tablet", id, "{'port': %s, 'bus': %s}",
|
|
port, bus);
|
|
|
|
if (port_check) {
|
|
port_check();
|
|
}
|
|
|
|
qtest_qmp_device_del(id);
|
|
|
|
g_free(bus);
|
|
g_free(id);
|
|
}
|