qemuBuildInterfaceCommandLine: Use new pattern for naming the VDPA fdset

Prefix the file descriptor name with the alias of the network device so
that it's similar to other upcoming use.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>

diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 073cea8b3b64ef967633b1f8991e43fdff5d3ce4..8f0245a504e288dfc67f67f9f4b76b98a8a145c2 100644 (file)
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -8830,9 +8830,9 @@ qemuBuildInterfaceCommandLine(virQEMUDriver *driver,
         if ((vdpafd = qemuInterfaceVDPAConnect(net)) < 0)
             goto cleanup;
 
-        vdpa = qemuFDPassNew(net->data.vdpa.devicepath, priv);
+        vdpa = qemuFDPassNew(net->info.alias, priv);
 
-        if (qemuFDPassAddFD(vdpa, &vdpafd, NULL) < 0)
+        if (qemuFDPassAddFD(vdpa, &vdpafd, "-vdpa") < 0)
             return -1;
     }
         break;

diff --git a/tests/qemuxml2argvdata/net-vdpa.x86_64-latest.args b/tests/qemuxml2argvdata/net-vdpa.x86_64-latest.args
index a56e08a4f1be73c1ce8367baf80e743ee46c6856..93fe8fb444360cad8d29efea7a7d3a68e98b27f0 100644 (file)
--- a/tests/qemuxml2argvdata/net-vdpa.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/net-vdpa.x86_64-latest.args
@@ -28,7 +28,7 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -no-acpi \
 -boot strict=on \
 -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \
--add-fd set=0,fd=1732,opaque=/dev/vhost-vdpa-0 \
+-add-fd set=0,fd=1732,opaque=net0-vdpa \
 -netdev vhost-vdpa,vhostdev=/dev/fdset/0,id=hostnet0 \
 -device '{"driver":"virtio-net-pci","netdev":"hostnet0","id":"net0","mac":"52:54:00:95:db:c0","bus":"pci.0","addr":"0x2"}' \
 -audiodev '{"id":"audio1","driver":"none"}' \