openkylin
/
libvirt
mirror of https://gitee.com/openkylin/libvirt.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Peter Krempa 2022-01-31 18:25:18 +01:00
parent 64a69ee242
commit 38edcca114
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/qemu/qemu_command.c
View File

@ -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;

2
tests/qemuxml2argvdata/net-vdpa.x86_64-latest.args
View File

@ -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"}' \