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>
This commit is contained in:
Peter Krempa committed 2026-05-25 13:28:58 +02:00
1 parent f7f2bf2aa0
commit 1b13c5c791
3 files changed
+1 -16

No files matched your search

+1 -2
View File
@@ -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");
-12
View File
@@ -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);
-2
View File
@@ -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;
};