mirror of
https://github.com/libvirt/libvirt.git
synced 2026-10-02 12:20:06 -05:00
qemuxmlconftest: Use real FDs for hostdev tests
Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
1 parent
eaecd2ca07
commit
8afb7fe0e7
6 files changed
+7
-8
No files matched your search
@@ -36,6 +36,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-q35-test/.config \
|
||||
-global ICH9-LPC.noreboot=off \
|
||||
-watchdog-action reset \
|
||||
-object '{"qom-type":"iommufd","id":"iommufd0","fd":"@iommu-0@-dup"}' \
|
||||
-device '{"driver":"vfio-pci","id":"hostdev0","iommufd":"iommufd0","fd":"XXXXXXX","bus":"pcie.0","addr":"0x3"}' \
|
||||
-device '{"driver":"vfio-pci","id":"hostdev0","iommufd":"iommufd0","fd":"@hostdev-hostdev0-fd@","bus":"pcie.0","addr":"0x3"}' \
|
||||
-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
|
||||
-msg timestamp=on
|
||||
@@ -36,6 +36,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-q35-test/.config \
|
||||
-global ICH9-LPC.noreboot=off \
|
||||
-watchdog-action reset \
|
||||
-object '{"qom-type":"iommufd","id":"iommufd0","fd":"XXXXXXX"}' \
|
||||
-device '{"driver":"vfio-pci","id":"hostdev0","iommufd":"iommufd0","fd":"XXXXXXX","bus":"pcie.0","addr":"0x3"}' \
|
||||
-device '{"driver":"vfio-pci","id":"hostdev0","iommufd":"iommufd0","fd":"@hostdev-hostdev0-fd@","bus":"pcie.0","addr":"0x3"}' \
|
||||
-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
|
||||
-msg timestamp=on
|
||||
@@ -27,6 +27,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-foo/.config \
|
||||
-boot strict=on \
|
||||
-audiodev '{"id":"audio1","driver":"none"}' \
|
||||
-object '{"qom-type":"iommufd","id":"iommufd0","fd":"XXXXXXX"}' \
|
||||
-device '{"driver":"vfio-pci","id":"hostdev0","iommufd":"iommufd0","fd":"XXXXXXX","bus":"pcie.0","addr":"0x1"}' \
|
||||
-device '{"driver":"vfio-pci","id":"hostdev0","iommufd":"iommufd0","fd":"@hostdev-hostdev0-fd@","bus":"pcie.0","addr":"0x1"}' \
|
||||
-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
|
||||
-msg timestamp=on
|
||||
@@ -30,7 +30,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-foo/.config \
|
||||
-device '{"driver":"pcie-root-port","port":10,"chassis":3,"id":"pci.3","bus":"pcie.0","addr":"0x1.0x2"}' \
|
||||
-audiodev '{"id":"audio1","driver":"none"}' \
|
||||
-object '{"qom-type":"iommufd","id":"iommufd0","fd":"XXXXXXX"}' \
|
||||
-device '{"driver":"vfio-pci","id":"hostdev0","iommufd":"iommufd0","fd":"XXXXXXX","bus":"pci.1","addr":"0x0"}' \
|
||||
-device '{"driver":"vfio-pci","id":"hostdev1","iommufd":"iommufd0","fd":"XXXXXXX","bus":"pci.2","addr":"0x0"}' \
|
||||
-device '{"driver":"vfio-pci","id":"hostdev0","iommufd":"iommufd0","fd":"@hostdev-hostdev0-fd@","bus":"pci.1","addr":"0x0"}' \
|
||||
-device '{"driver":"vfio-pci","id":"hostdev1","iommufd":"iommufd0","fd":"@hostdev-hostdev1-fd@","bus":"pci.2","addr":"0x0"}' \
|
||||
-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
|
||||
-msg timestamp=on
|
||||
@@ -29,7 +29,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-foo/.config \
|
||||
-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \
|
||||
-audiodev '{"id":"audio1","driver":"none"}' \
|
||||
-object '{"qom-type":"iommufd","id":"iommufd0","fd":"XXXXXXX"}' \
|
||||
-device '{"driver":"vfio-pci","id":"hostdev0","iommufd":"iommufd0","fd":"XXXXXXX","bus":"pci.0","addr":"0x3"}' \
|
||||
-device '{"driver":"vfio-pci","id":"hostdev0","iommufd":"iommufd0","fd":"@hostdev-hostdev0-fd@","bus":"pci.0","addr":"0x3"}' \
|
||||
-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \
|
||||
-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
|
||||
-msg timestamp=on
|
||||
@@ -52,8 +52,7 @@ testQemuPrepareHostdevPCI(virDomainHostdevDef *hostdev)
|
||||
|
||||
if (virHostdevIsPCIDeviceWithIOMMUFD(hostdev)) {
|
||||
g_autofree char *name = g_strdup_printf("hostdev-%s-fd", hostdev->info->alias);
|
||||
/* Use a placeholder FD value for tests */
|
||||
int vfioDeviceFD = 0;
|
||||
int vfioDeviceFD = virTestMakeDummyFD(g_strdup_printf("@hostdev-%s-fd@", hostdev->info->alias));
|
||||
hostdevPriv->vfioDeviceFd = qemuFDPassDirectNew(name, &vfioDeviceFD);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user