@@ -394,21 +394,12 @@ QPCIBar qpci_legacy_iomap(QPCIDevice *dev, uint16_t addr)
void qpci_plug_device_test(const char *driver, const char *id,
uint8_t slot, const char *opts)
{
- QDict *response;
char *cmd;
- cmd = g_strdup_printf("{'execute': 'device_add',"
- " 'arguments': {"
- " 'driver': '%s',"
- " 'addr': '%d',"
- " %s%s"
- " 'id': '%s'"
- "}}", driver, slot,
+ cmd = g_strdup_printf("'driver': '%s', 'addr': '%d',"
+ "%s%s 'id': '%s'", driver, slot,
opts ? opts : "", opts ? "," : "",
id);
- response = qmp(cmd);
+ qmp_device_add(cmd);
g_free(cmd);
- g_assert(response);
- g_assert(!qdict_haskey(response, "error"));
- QDECREF(response);
}
@@ -40,21 +40,12 @@ void uhci_port_test(struct qhc *hc, int port, uint16_t expect)
void usb_test_hotplug(const char *hcd_id, const int port,
void (*port_check)(void))
{
- QDict *response;
char *cmd;
- cmd = g_strdup_printf("{'execute': 'device_add',"
- " 'arguments': {"
- " 'driver': 'usb-tablet',"
- " 'port': '%d',"
- " 'bus': '%s.0',"
- " 'id': 'usbdev%d'"
- "}}", port, hcd_id, port);
- response = qmp(cmd);
- g_free(cmd);
- g_assert(response);
- g_assert(!qdict_haskey(response, "error"));
- QDECREF(response);
+ cmd = g_strdup_printf("'driver': 'usb-tablet', 'port': '%d',"
+ "'bus': '%s.0', 'id': 'usbdev%d'",
+ port, hcd_id, port);
+ qmp_device_add(cmd);
if (port_check) {
port_check();
@@ -48,18 +48,8 @@ static void test_uhci_hotplug(void)
static void test_usb_storage_hotplug(void)
{
- QDict *response;
-
- response = qmp("{'execute': 'device_add',"
- " 'arguments': {"
- " 'driver': 'usb-storage',"
- " 'drive': 'drive0',"
- " 'id': 'usbdev0'"
- "}}");
- g_assert(response);
- g_assert(!qdict_haskey(response, "error"));
- QDECREF(response);
-
+ qmp_device_add("'driver': 'usb-storage',"
+ "'drive': 'drive0', 'id': 'usbdev0'");
qmp_device_del("usbdev0");
}
@@ -23,26 +23,9 @@ static void test_xhci_hotplug(void)
static void test_usb_uas_hotplug(void)
{
- QDict *response;
-
- response = qmp("{'execute': 'device_add',"
- " 'arguments': {"
- " 'driver': 'usb-uas',"
- " 'id': 'uas'"
- "}}");
- g_assert(response);
- g_assert(!qdict_haskey(response, "error"));
- QDECREF(response);
-
- response = qmp("{'execute': 'device_add',"
- " 'arguments': {"
- " 'driver': 'scsi-hd',"
- " 'drive': 'drive0',"
- " 'id': 'scsi-hd'"
- "}}");
- g_assert(response);
- g_assert(!qdict_haskey(response, "error"));
- QDECREF(response);
+ qmp_device_add("'driver': 'usb-uas', 'id': 'uas'");
+ qmp_device_add("'driver': 'scsi-hd', 'drive': 'drive0',"
+ "'id': 'scsi-hd'");
/* TODO:
UAS HBA driver in libqos, to check that
Signed-off-by: Peter Xu <peterx@redhat.com> --- tests/libqos/pci.c | 15 +++------------ tests/libqos/usb.c | 17 ++++------------- tests/usb-hcd-uhci-test.c | 14 ++------------ tests/usb-hcd-xhci-test.c | 23 +++-------------------- 4 files changed, 12 insertions(+), 57 deletions(-)