External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-10-03 12:55:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemuBuildPCIHostdevDevProps: Move 'failover_pair_id' property before address

Browse Source 
Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Peter Krempa 2021-10-06 17:04:48 +02:00
parent fcf96b11ba
commit 2e4bc16370
3 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/qemu/qemu_command.c
View File

@ -4776,6 +4776,7 @@ qemuBuildPCIHostdevDevProps(const virDomainDef *def,
"s:host", host, "s:host", host,
"s:id", dev->info->alias, "s:id", dev->info->alias,
"p:bootindex", dev->info->effectiveBootIndex, "p:bootindex", dev->info->effectiveBootIndex,
"S:failover_pair_id", failover_pair_id,
NULL) < 0) NULL) < 0)
return NULL; return NULL;
@ -4785,11 +4786,6 @@ qemuBuildPCIHostdevDevProps(const virDomainDef *def,
if (qemuBuildRomProps(props, dev->info) < 0) if (qemuBuildRomProps(props, dev->info) < 0)
return NULL; return NULL;
if (virJSONValueObjectAdd(props,
"S:failover_pair_id", failover_pair_id,
NULL) < 0)
return NULL;
return g_steal_pointer(&props); return g_steal_pointer(&props);
} }

4
tests/qemuxml2argvdata/net-virtio-teaming-hostdev.args
View File

@ -32,7 +32,7 @@ QEMU_AUDIO_DRV=none \
-device virtio-net-pci,failover=on,netdev=hostua-backup0,id=ua-backup0,mac=00:11:22:33:44:55,bus=pci.0,addr=0x3 \ -device virtio-net-pci,failover=on,netdev=hostua-backup0,id=ua-backup0,mac=00:11:22:33:44:55,bus=pci.0,addr=0x3 \
-netdev user,id=hostua-backup1 \ -netdev user,id=hostua-backup1 \
-device virtio-net-pci,failover=on,netdev=hostua-backup1,id=ua-backup1,mac=66:44:33:22:11:00,bus=pci.0,addr=0x4 \ -device virtio-net-pci,failover=on,netdev=hostua-backup1,id=ua-backup1,mac=66:44:33:22:11:00,bus=pci.0,addr=0x4 \
-device vfio-pci,host=0000:03:07.1,id=hostdev0,bus=pci.0,addr=0x5,failover_pair_id=ua-backup0 \ -device vfio-pci,host=0000:03:07.1,id=hostdev0,failover_pair_id=ua-backup0,bus=pci.0,addr=0x5 \
-device vfio-pci,host=0000:03:07.2,id=hostdev1,bus=pci.0,addr=0x6,failover_pair_id=ua-backup1 \ -device vfio-pci,host=0000:03:07.2,id=hostdev1,failover_pair_id=ua-backup1,bus=pci.0,addr=0x6 \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x7 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x7 \
-msg timestamp=on -msg timestamp=on

4
tests/qemuxml2argvdata/net-virtio-teaming.args
View File

@ -32,7 +32,7 @@ QEMU_AUDIO_DRV=none \
-device virtio-net-pci,failover=on,netdev=hostua-backup0,id=ua-backup0,mac=00:11:22:33:44:55,bus=pci.0,addr=0x2 \ -device virtio-net-pci,failover=on,netdev=hostua-backup0,id=ua-backup0,mac=00:11:22:33:44:55,bus=pci.0,addr=0x2 \
-netdev user,id=hostua-backup1 \ -netdev user,id=hostua-backup1 \
-device virtio-net-pci,failover=on,netdev=hostua-backup1,id=ua-backup1,mac=66:44:33:22:11:00,bus=pci.0,addr=0x3 \ -device virtio-net-pci,failover=on,netdev=hostua-backup1,id=ua-backup1,mac=66:44:33:22:11:00,bus=pci.0,addr=0x3 \
-device vfio-pci,host=0000:03:07.1,id=hostdev0,bus=pci.0,addr=0x4,failover_pair_id=ua-backup0 \ -device vfio-pci,host=0000:03:07.1,id=hostdev0,failover_pair_id=ua-backup0,bus=pci.0,addr=0x4 \
-device vfio-pci,host=0000:03:07.2,id=hostdev1,bus=pci.0,addr=0x5,failover_pair_id=ua-backup1 \ -device vfio-pci,host=0000:03:07.2,id=hostdev1,failover_pair_id=ua-backup1,bus=pci.0,addr=0x5 \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x6 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x6 \
-msg timestamp=on -msg timestamp=on