Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging

[qemu.git] / tests / usb-hcd-uhci-test.c

diff --git a/tests/usb-hcd-uhci-test.c b/tests/usb-hcd-uhci-test.c
index e956b9ccb7a6a2155d3a4badcb07828237a85f36..7a117b64d90c802ffeecd5cd092a196eac725a43 100644 (file)
--- a/tests/usb-hcd-uhci-test.c
+++ b/tests/usb-hcd-uhci-test.c
@@ -8,7 +8,7 @@
  */
 
 #include "qemu/osdep.h"
  */
 
 #include "qemu/osdep.h"

-#include "libqtest.h"
+#include "libqtest-single.h"

 #include "libqos/libqos.h"
 #include "libqos/usb.h"
 #include "libqos/libqos-pc.h"
 #include "libqos/libqos.h"
 #include "libqos/usb.h"
 #include "libqos/libqos-pc.h"


@@ -28,6 +28,7 @@ static void test_port(int port)
     g_assert(port > 0);
     qusb_pci_init_one(qs->pcibus, &uhci, QPCI_DEVFN(0x1d, 0), 4);
     uhci_port_test(&uhci, port - 1, UHCI_PORT_CCS);
     g_assert(port > 0);
     qusb_pci_init_one(qs->pcibus, &uhci, QPCI_DEVFN(0x1d, 0), 4);
     uhci_port_test(&uhci, port - 1, UHCI_PORT_CCS);

+    uhci_deinit(&uhci);

 }
 
 static void test_port_1(void)
 }
 
 static void test_port_1(void)


@@ -42,43 +43,24 @@ static void test_port_2(void)
 
 static void test_uhci_hotplug(void)
 {
 
 static void test_uhci_hotplug(void)
 {

-    usb_test_hotplug("uhci", 2, test_port_2);
+    usb_test_hotplug(global_qtest, "uhci", "2", test_port_2);

 }
 
 static void test_usb_storage_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);
-
-    response = qmp("{'execute': 'device_del',"
-                           " 'arguments': {"
-                           "   'id': 'usbdev0'"
-                           "}}");
-    g_assert(response);
-    g_assert(!qdict_haskey(response, "error"));
-    QDECREF(response);
-
-    response = qmp("");
-    g_assert(response);
-    g_assert(qdict_haskey(response, "event"));
-    g_assert(!strcmp(qdict_get_str(response, "event"), "DEVICE_DELETED"));
-    QDECREF(response);
+    QTestState *qts = global_qtest;
+
+    qtest_qmp_device_add(qts, "usb-storage", "usbdev0", "{'drive': 'drive0'}");
+
+    qtest_qmp_device_del(qts, "usbdev0");

 }
 
 int main(int argc, char **argv)
 {
     const char *arch = qtest_get_arch();
     const char *cmd = "-device piix3-usb-uhci,id=uhci,addr=1d.0"
 }
 
 int main(int argc, char **argv)
 {
     const char *arch = qtest_get_arch();
     const char *cmd = "-device piix3-usb-uhci,id=uhci,addr=1d.0"

-                      " -drive id=drive0,if=none,file=/dev/null,format=raw"
+                      " -drive id=drive0,if=none,file=null-co://,"
+                      "file.read-zeroes=on,format=raw"

                       " -device usb-tablet,bus=uhci.0,port=1";
     int ret;
 
                       " -device usb-tablet,bus=uhci.0,port=1";
     int ret;
 


@@ -98,6 +80,7 @@ int main(int argc, char **argv)
                    "available on x86 or ppc64\n");
         exit(EXIT_FAILURE);
     }
                    "available on x86 or ppc64\n");
         exit(EXIT_FAILURE);
     }

+    global_qtest = qs->qts;

     ret = g_test_run();
     qtest_shutdown(qs);
 
     ret = g_test_run();
     qtest_shutdown(qs);