[PATCH 13/27] qemuBuildInterfaceCommandLine: Use new pattern for naming the VDPA fdset

[Peter Krempa]

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 at redhat.com>
---
 src/qemu/qemu_command.c                            | 4 ++--
 tests/qemuxml2argvdata/net-vdpa.x86_64-latest.args | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 839cd05e23..6667433616 100644
--- 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, true);
+        vdpa = qemuFDPassNew(net->info.alias, priv, true);

-        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 0300f36314..aff024af2f 100644
--- 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=1,fd=1732,opaque=/dev/vhost-vdpa-0 \
+-add-fd set=1,fd=1732,opaque=net0-vdpa \
 -netdev vhost-vdpa,vhostdev=/dev/fdset/1,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"}' \
-- 
2.34.1