testutilsqemu: Remove unused 'ARG_VDPA_FD' test argument

The code was refactored to allow any FD numbers so the code to map them
to specific numbers is no longer needed.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>

diff --git a/tests/qemuxmlconftest.c b/tests/qemuxmlconftest.c
index 19839fb32e266b584c96b9e25f2c76ad05260b11..646077648fffd1f50fd7c639aaceb935fbd56641 100644 (file)
--- a/tests/qemuxmlconftest.c
+++ b/tests/qemuxmlconftest.c
@@ -1664,8 +1664,7 @@ mymain(void)
     DO_TEST_CAPS_LATEST("disk-target-nvme");
     DO_TEST_CAPS_LATEST("disk-vhostuser-numa");
     DO_TEST_CAPS_LATEST("disk-vhostuser");
-    DO_TEST_CAPS_ARCH_LATEST_FULL("disk-vhostvdpa", "x86_64",
-                                  ARG_VDPA_FD, "/dev/vhost-vdpa-0", 201);
+    DO_TEST_CAPS_LATEST("disk-vhostvdpa");
     DO_TEST_CAPS_LATEST_PARSE_ERROR("disk-device-lun-type-invalid");
     DO_TEST_CAPS_LATEST_PARSE_ERROR("disk-attaching-partition-nosupport");
     DO_TEST_CAPS_LATEST("disk-usb-device");

diff --git a/tests/testutilsqemu.c b/tests/testutilsqemu.c
index 202cef28f90733c5beac810013deff66dbaebdb5..76d6521c7a72808c023863638d6810ec86ab3687 100644 (file)
--- a/tests/testutilsqemu.c
+++ b/tests/testutilsqemu.c
@@ -732,17 +732,6 @@ testQemuInfoSetArgs(testQemuInfo *info,
             break;
         }
 
-        case ARG_VDPA_FD: {
-            const char *vdpadev = va_arg(argptr, char *);
-            int vdpafd = va_arg(argptr, unsigned int);
-
-            if (!info->args.vdpafds)
-                info->args.vdpafds = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, NULL);
-
-            g_hash_table_insert(info->args.vdpafds, g_strdup(vdpadev), GINT_TO_POINTER(vdpafd));
-            break;
-        }
-
         case ARG_END:
         default:
             info->args.invalidarg = true;
@@ -973,7 +962,6 @@ testQemuInfoFree(testQemuInfo *info)
     g_clear_pointer(&info->args.fakeCapsAdd, virBitmapFree);
     g_clear_pointer(&info->args.fakeCapsDel, virBitmapFree);
     g_clear_pointer(&info->args.fds, g_hash_table_unref);
-    g_clear_pointer(&info->args.vdpafds, g_hash_table_unref);
     g_clear_object(&info->nbdkitCaps);
     g_clear_pointer(&info->args.fakeNbdkitCaps, virBitmapFree);
     g_free(info);

diff --git a/tests/testutilsqemu.h b/tests/testutilsqemu.h
index a39f03518be42ad3dc76fb98a351ba3273bfbf7d..f30ddad3b65d25d08ebfbc04ae9a85c1fe5f4df6 100644 (file)
--- a/tests/testutilsqemu.h
+++ b/tests/testutilsqemu.h
@@ -48,7 +48,6 @@ typedef enum {
     ARG_CAPS_VARIANT,
     ARG_CAPS_HOST_CPU_MODEL,
     ARG_FD_GROUP, /* name, writable, nfds, fd[0], ... fd[n-1] */
-    ARG_VDPA_FD, /* vdpadev, fd */
     ARG_NBDKIT_CAPS,
     ARG_END,
 } testQemuInfoArgName;
@@ -90,7 +89,6 @@ struct testQemuArgs {
     qemuTestCPUDef capsHostCPUModel;
     int gic;
     GHashTable *fds;
-    GHashTable *vdpafds;
     bool invalidarg;
 };