qemuBuildPCIHostdevDevProps: Move 'failover_pair_id' property before address

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 55ca80e77a16020c49b08fe0a7f2f5d8ea01ce58..a5296349a7389f8052e79e8b30c33fb1612f83bd 100644 (file)
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -4776,6 +4776,7 @@ qemuBuildPCIHostdevDevProps(const virDomainDef *def,
                                  "s:host", host,
                                  "s:id", dev->info->alias,
                                  "p:bootindex", dev->info->effectiveBootIndex,
+                                 "S:failover_pair_id", failover_pair_id,
                                  NULL) < 0)
         return NULL;
 
@@ -4785,11 +4786,6 @@ qemuBuildPCIHostdevDevProps(const virDomainDef *def,
     if (qemuBuildRomProps(props, dev->info) < 0)
         return NULL;
 
-    if (virJSONValueObjectAdd(props,
-                              "S:failover_pair_id", failover_pair_id,
-                              NULL) < 0)
-        return NULL;
-
     return g_steal_pointer(&props);
 }
 

diff --git a/tests/qemuxml2argvdata/net-virtio-teaming-hostdev.args b/tests/qemuxml2argvdata/net-virtio-teaming-hostdev.args
index 0efa7f7d5050550388bf08231c9714dc2ea61fe8..ee1e48eebd371d5a31fff5b455e88a813b72ef92 100644 (file)
--- a/tests/qemuxml2argvdata/net-virtio-teaming-hostdev.args
+++ b/tests/qemuxml2argvdata/net-virtio-teaming-hostdev.args
@@ -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 \
 -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 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.2,id=hostdev1,bus=pci.0,addr=0x6,failover_pair_id=ua-backup1 \
+-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,failover_pair_id=ua-backup1,bus=pci.0,addr=0x6 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x7 \
 -msg timestamp=on

diff --git a/tests/qemuxml2argvdata/net-virtio-teaming.args b/tests/qemuxml2argvdata/net-virtio-teaming.args
index bde442221c95ae0414240e1fbb8626957b122b8c..4c7637de0047c502dd43494c208f2f72d4dacf24 100644 (file)
--- a/tests/qemuxml2argvdata/net-virtio-teaming.args
+++ b/tests/qemuxml2argvdata/net-virtio-teaming.args
@@ -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 \
 -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 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.2,id=hostdev1,bus=pci.0,addr=0x5,failover_pair_id=ua-backup1 \
+-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,failover_pair_id=ua-backup1,bus=pci.0,addr=0x5 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x6 \
 -msg timestamp=on