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>
19 lines
448 B
C
19 lines
448 B
C
#ifndef LIBQOS_USB_H
|
|
#define LIBQOS_USB_H
|
|
|
|
#include "libqos/pci-pc.h"
|
|
|
|
struct qhc {
|
|
QPCIDevice *dev;
|
|
QPCIBar bar;
|
|
};
|
|
|
|
void qusb_pci_init_one(QPCIBus *pcibus, struct qhc *hc,
|
|
uint32_t devfn, int bar);
|
|
void uhci_port_test(struct qhc *hc, int port, uint16_t expect);
|
|
void uhci_deinit(struct qhc *hc);
|
|
|
|
void usb_test_hotplug(const char *bus_name, const char *port,
|
|
void (*port_check)(void));
|
|
#endif
|