i386: Update new x86_apicid parsing rules with die_offset support

[mirror_qemu.git] / tests / drive_del-test.c

diff --git a/tests/drive_del-test.c b/tests/drive_del-test.c
index 33909469f11c135d4b43fd1f1b28ecf5830818d4..b56b223fc2e3f43eeaf7d286f338783b284946d7 100644 (file)
--- a/tests/drive_del-test.c
+++ b/tests/drive_del-test.c
@@ -10,113 +10,139 @@
  * See the COPYING.LIB file in the top-level directory.
  */
 
-#include <glib.h>
-#include <string.h>
+#include "qemu/osdep.h"
 #include "libqtest.h"
+#include "libqos/virtio.h"
+#include "qapi/qmp/qdict.h"
 
-static void drive_add(void)
+/* TODO actually test the results and get rid of this */
+#define qmp_discard_response(q, ...) qobject_unref(qtest_qmp(q, __VA_ARGS__))
+
+static void drive_add(QTestState *qts)
 {
-    char *resp = hmp("drive_add 0 if=none,id=drive0");
+    char *resp = qtest_hmp(qts, "drive_add 0 if=none,id=drive0");
 
     g_assert_cmpstr(resp, ==, "OK\r\n");
     g_free(resp);
 }
 
-static void drive_del(void)
+static void drive_del(QTestState *qts)
 {
-    char *resp = hmp("drive_del drive0");
+    char *resp = qtest_hmp(qts, "drive_del drive0");
 
     g_assert_cmpstr(resp, ==, "");
     g_free(resp);
 }
 
-static void device_del(void)
+static void device_del(QTestState *qts)
 {
     QDict *response;
 
     /* Complication: ignore DEVICE_DELETED event */
-    qmp_discard_response("{'execute': 'device_del',"
+    qmp_discard_response(qts, "{'execute': 'device_del',"
                          " 'arguments': { 'id': 'dev0' } }");
-    response = qmp_receive();
+    response = qtest_qmp_receive(qts);
     g_assert(response);
     g_assert(qdict_haskey(response, "return"));
-    QDECREF(response);
+    qobject_unref(response);
 }
 
 static void test_drive_without_dev(void)
 {
+    QTestState *qts;
+
     /* Start with an empty drive */
-    qtest_start("-drive if=none,id=drive0");
+    qts = qtest_init("-drive if=none,id=drive0");
 
     /* Delete the drive */
-    drive_del();
+    drive_del(qts);
 
     /* Ensure re-adding the drive works - there should be no duplicate ID error
      * because the old drive must be gone.
      */
-    drive_add();
+    drive_add(qts);
+
+    qtest_quit(qts);
+}
+
+/*
+ * qvirtio_get_dev_type:
+ * Returns: the preferred virtio bus/device type for the current architecture.
+ * TODO: delete this
+ */
+static const char *qvirtio_get_dev_type(void)
+{
+    const char *arch = qtest_get_arch();
 
-    qtest_end();
+    if (g_str_equal(arch, "arm") || g_str_equal(arch, "aarch64")) {
+        return "device";  /* for virtio-mmio */
+    } else if (g_str_equal(arch, "s390x")) {
+        return "ccw";
+    } else {
+        return "pci";
+    }
 }
 
 static void test_after_failed_device_add(void)
 {
+    char driver[32];
     QDict *response;
-    QDict *error;
+    QTestState *qts;
+
+    snprintf(driver, sizeof(driver), "virtio-blk-%s",
+             qvirtio_get_dev_type());
 
-    qtest_start("-drive if=none,id=drive0");
+    qts = qtest_init("-drive if=none,id=drive0");
 
-    /* Make device_add fail.  If this leaks the virtio-blk-pci device then a
+    /* Make device_add fail. If this leaks the virtio-blk device then a
      * reference to drive0 will also be held (via qdev properties).
      */
-    response = qmp("{'execute': 'device_add',"
-                   " 'arguments': {"
-                   "   'driver': 'virtio-blk-pci',"
-                   "   'drive': 'drive0'"
-                   "}}");
+    response = qtest_qmp(qts, "{'execute': 'device_add',"
+                              " 'arguments': {"
+                              "   'driver': %s,"
+                              "   'drive': 'drive0'"
+                              "}}", driver);
     g_assert(response);
-    error = qdict_get_qdict(response, "error");
-    g_assert_cmpstr(qdict_get_try_str(error, "class"), ==, "GenericError");
-    QDECREF(response);
+    qmp_assert_error_class(response, "GenericError");
 
     /* Delete the drive */
-    drive_del();
+    drive_del(qts);
 
     /* Try to re-add the drive.  This fails with duplicate IDs if a leaked
-     * virtio-blk-pci exists that holds a reference to the old drive0.
+     * virtio-blk device exists that holds a reference to the old drive0.
      */
-    drive_add();
+    drive_add(qts);
 
-    qtest_end();
+    qtest_quit(qts);
 }
 
 static void test_drive_del_device_del(void)
 {
+    QTestState *qts;
+
     /* Start with a drive used by a device that unplugs instantaneously */
-    qtest_start("-drive if=none,id=drive0,file=/dev/null,format=raw"
-                " -device virtio-scsi-pci"
-                " -device scsi-hd,drive=drive0,id=dev0");
+    qts = qtest_initf("-drive if=none,id=drive0,file=null-co://,format=raw"
+                      " -device virtio-scsi-%s"
+                      " -device scsi-hd,drive=drive0,id=dev0",
+                      qvirtio_get_dev_type());
 
     /*
      * Delete the drive, and then the device
      * Doing it in this order takes notoriously tricky special paths
      */
-    drive_del();
-    device_del();
+    drive_del(qts);
+    device_del(qts);
 
-    qtest_end();
+    qtest_quit(qts);
 }
 
 int main(int argc, char **argv)
 {
-    const char *arch = qtest_get_arch();
-
     g_test_init(&argc, &argv, NULL);
 
     qtest_add_func("/drive_del/without-dev", test_drive_without_dev);
 
-    /* TODO I guess any arch with PCI would do */
-    if (!strcmp(arch, "i386") || !strcmp(arch, "x86_64")) {
+    if (qvirtio_get_dev_type() != NULL) {
         qtest_add_func("/drive_del/after_failed_device_add",
                        test_after_failed_device_add);
         qtest_add_func("/blockdev/drive_del_device_del",