diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 5b831b6e28f60acead4deb5984e343965ef7b80b..31577ae370ed555a998293d4b1520e7502b46732 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -3926,6 +3926,11 @@ virDomainDefPostParseInternal(virDomainDefPtr def, if (virDomainDefAddImplicitDevices(def) < 0) return -1; + /* Mark the first video as primary. If the user specified primary="yes", + * the parser already inserted the device at def->videos[0] */ + if (def->nvideos != 0) + def->videos[0]->primary = true; + /* clean up possibly duplicated metadata entries */ virDomainDefMetadataSanitize(def); @@ -16441,9 +16446,6 @@ virDomainDefParseXML(xmlDocPtr xml, goto error; } } - /* if not specified by user mark the first video as primary */ - if (n && !primaryVideo) - def->videos[0]->primary = true; VIR_FREE(nodes); diff --git a/tests/qemuargv2xmldata/qemuargv2xml-graphics-sdl-fullscreen.xml b/tests/qemuargv2xmldata/qemuargv2xml-graphics-sdl-fullscreen.xml index 1b3ac30de4b83db63b3cd9e849526709e7eeb41c..0bc0436fc176ae02d586b3eaaada832443eb74c1 100644 --- a/tests/qemuargv2xmldata/qemuargv2xml-graphics-sdl-fullscreen.xml +++ b/tests/qemuargv2xmldata/qemuargv2xml-graphics-sdl-fullscreen.xml @@ -27,7 +27,7 @@ diff --git a/tests/qemuargv2xmldata/qemuargv2xml-graphics-sdl.xml b/tests/qemuargv2xmldata/qemuargv2xml-graphics-sdl.xml index 2c1c781d523e2e53313a64767b57a1091bde4e9c..7cd9d6c3f711f408bd4cfbfbab2cbeab81b5089d 100644 --- a/tests/qemuargv2xmldata/qemuargv2xml-graphics-sdl.xml +++ b/tests/qemuargv2xmldata/qemuargv2xml-graphics-sdl.xml @@ -27,7 +27,7 @@ diff --git a/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-policy.xml b/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-policy.xml index 36b8001dbed56238c9f46d856b1899c1aecfbd6f..3ebb375e1ba16654087101e33049d3cc5af93181 100644 --- a/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-policy.xml +++ b/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-policy.xml @@ -29,7 +29,7 @@ diff --git a/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-sasl.xml b/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-sasl.xml index f29bb2241bce2479143dea25ced0d3483f86099c..5b7d560246ef5a2247646edd18dea68f7b11a91c 100644 --- a/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-sasl.xml +++ b/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-sasl.xml @@ -29,7 +29,7 @@ diff --git a/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-socket.xml b/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-socket.xml index 57e808ab34c1518fad7f8671e8b4bf19ff55a88b..93daa76419cd57aead5fac2fbcee03523359d8ce 100644 --- a/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-socket.xml +++ b/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-socket.xml @@ -27,7 +27,7 @@ diff --git a/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-tls.xml b/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-tls.xml index f29bb2241bce2479143dea25ced0d3483f86099c..5b7d560246ef5a2247646edd18dea68f7b11a91c 100644 --- a/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-tls.xml +++ b/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-tls.xml @@ -29,7 +29,7 @@ diff --git a/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-websocket.xml b/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-websocket.xml index 25e3badfd99c2e2a2ae5bada4c4f53ffb96ba03a..260ad1c18c0d6c4a7187fbbf9809173090d55110 100644 --- a/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-websocket.xml +++ b/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-websocket.xml @@ -22,7 +22,7 @@ diff --git a/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc.xml b/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc.xml index e18790fa118a83196f006559cafd0045a75e6864..374345b56f912a6b89d6d4d5d3f8c01b0f673a6e 100644 --- a/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc.xml +++ b/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc.xml @@ -29,7 +29,7 @@ diff --git a/tests/qemuargv2xmldata/qemuargv2xml-pseries-disk.xml b/tests/qemuargv2xmldata/qemuargv2xml-pseries-disk.xml index 97225f44a1e801dba0d4a3449f4411e620fbddb5..8cec27c3dc43bd943c15ddefbdddf60325360570 100644 --- a/tests/qemuargv2xmldata/qemuargv2xml-pseries-disk.xml +++ b/tests/qemuargv2xmldata/qemuargv2xml-pseries-disk.xml @@ -34,7 +34,7 @@ diff --git a/tests/vmx2xmldata/vmx2xml-annotation.xml b/tests/vmx2xmldata/vmx2xml-annotation.xml index c58af0733eed0f34387a5c4eef2e8c95b8850339..9d99fd288bb454717b2ccea1646c6499203234c3 100644 --- a/tests/vmx2xmldata/vmx2xml-annotation.xml +++ b/tests/vmx2xmldata/vmx2xml-annotation.xml @@ -13,7 +13,7 @@ destroy diff --git a/tests/vmx2xmldata/vmx2xml-case-insensitive-1.xml b/tests/vmx2xmldata/vmx2xml-case-insensitive-1.xml index 4cd760e5366267b756d4173ac9f1b424adffb789..fd38cfd67f70c18850a561c98434a65bedef9d5e 100644 --- a/tests/vmx2xmldata/vmx2xml-case-insensitive-1.xml +++ b/tests/vmx2xmldata/vmx2xml-case-insensitive-1.xml @@ -26,7 +26,7 @@ diff --git a/tests/vmx2xmldata/vmx2xml-case-insensitive-2.xml b/tests/vmx2xmldata/vmx2xml-case-insensitive-2.xml index fa6602872e8a4f5a464a5ef63146b47b535957ab..eb81691456e664ebe26220ee7168bfb516b155c2 100644 --- a/tests/vmx2xmldata/vmx2xml-case-insensitive-2.xml +++ b/tests/vmx2xmldata/vmx2xml-case-insensitive-2.xml @@ -26,7 +26,7 @@ diff --git a/tests/vmx2xmldata/vmx2xml-cdrom-ide-device.xml b/tests/vmx2xmldata/vmx2xml-cdrom-ide-device.xml index a4bf33caf35a5d843abe16ba15d9777eb6f3fbf1..d8bba13385f591aa695167abb2c98e5fb6574df4 100644 --- a/tests/vmx2xmldata/vmx2xml-cdrom-ide-device.xml +++ b/tests/vmx2xmldata/vmx2xml-cdrom-ide-device.xml @@ -18,7 +18,7 @@ diff --git a/tests/vmx2xmldata/vmx2xml-cdrom-ide-empty.xml b/tests/vmx2xmldata/vmx2xml-cdrom-ide-empty.xml index e08637994736cf2922b3c28a763992f99df05bd5..b11fe272b631dda530d88f69aa7e5e0aec9f37bb 100644 --- a/tests/vmx2xmldata/vmx2xml-cdrom-ide-empty.xml +++ b/tests/vmx2xmldata/vmx2xml-cdrom-ide-empty.xml @@ -17,7 +17,7 @@ diff --git a/tests/vmx2xmldata/vmx2xml-cdrom-ide-file.xml b/tests/vmx2xmldata/vmx2xml-cdrom-ide-file.xml index 8acea2d9b8c9051ae7d5101e01ed270d32f02636..7ca8ff729a5ceee7961b84192104de87fc62a17b 100644 --- a/tests/vmx2xmldata/vmx2xml-cdrom-ide-file.xml +++ b/tests/vmx2xmldata/vmx2xml-cdrom-ide-file.xml @@ -18,7 +18,7 @@ diff --git a/tests/vmx2xmldata/vmx2xml-cdrom-ide-raw-auto-detect.xml b/tests/vmx2xmldata/vmx2xml-cdrom-ide-raw-auto-detect.xml index bce708d1f7678fc3501415faea9b9854ecd78b1b..68ad26dc6f23e49281ead05ced32848287f22b4e 100644 --- a/tests/vmx2xmldata/vmx2xml-cdrom-ide-raw-auto-detect.xml +++ b/tests/vmx2xmldata/vmx2xml-cdrom-ide-raw-auto-detect.xml @@ -18,7 +18,7 @@ diff --git a/tests/vmx2xmldata/vmx2xml-cdrom-ide-raw-device.xml b/tests/vmx2xmldata/vmx2xml-cdrom-ide-raw-device.xml index 530a29a7f2eb7fafae81fc72e0267b0669a36bf8..679cdb154be65648c3c3a1b4b7bbdce035627546 100644 --- a/tests/vmx2xmldata/vmx2xml-cdrom-ide-raw-device.xml +++ b/tests/vmx2xmldata/vmx2xml-cdrom-ide-raw-device.xml @@ -18,7 +18,7 @@ diff --git a/tests/vmx2xmldata/vmx2xml-cdrom-scsi-device.xml b/tests/vmx2xmldata/vmx2xml-cdrom-scsi-device.xml index 0cdfb9191e3ed918564a954d0290aba39bf8f298..cf1275c82921dc851d9437c9af2baf45524be50a 100644 --- a/tests/vmx2xmldata/vmx2xml-cdrom-scsi-device.xml +++ b/tests/vmx2xmldata/vmx2xml-cdrom-scsi-device.xml @@ -18,7 +18,7 @@ diff --git a/tests/vmx2xmldata/vmx2xml-cdrom-scsi-empty.xml b/tests/vmx2xmldata/vmx2xml-cdrom-scsi-empty.xml index 56ad6786f2d0331c10f6685c4e31e6f97bfd180a..20452522d85a31a5e1088dcb7fb79b190bfada47 100644 --- a/tests/vmx2xmldata/vmx2xml-cdrom-scsi-empty.xml +++ b/tests/vmx2xmldata/vmx2xml-cdrom-scsi-empty.xml @@ -17,7 +17,7 @@ diff --git a/tests/vmx2xmldata/vmx2xml-cdrom-scsi-file.xml b/tests/vmx2xmldata/vmx2xml-cdrom-scsi-file.xml index f81414309e4214f2e8485e434dbbdba8428bc3b9..5765232bc10600963ef2fbebff376d0692f747e3 100644 --- a/tests/vmx2xmldata/vmx2xml-cdrom-scsi-file.xml +++ b/tests/vmx2xmldata/vmx2xml-cdrom-scsi-file.xml @@ -18,7 +18,7 @@ diff --git a/tests/vmx2xmldata/vmx2xml-cdrom-scsi-passthru.xml b/tests/vmx2xmldata/vmx2xml-cdrom-scsi-passthru.xml index d3b382a427acbf19773fc4adba063fe2abd4e4b7..46e27bce71b25b1c3d0879c3c64a69700e5ab456 100644 --- a/tests/vmx2xmldata/vmx2xml-cdrom-scsi-passthru.xml +++ b/tests/vmx2xmldata/vmx2xml-cdrom-scsi-passthru.xml @@ -18,7 +18,7 @@ diff --git a/tests/vmx2xmldata/vmx2xml-cdrom-scsi-raw-auto-detect.xml b/tests/vmx2xmldata/vmx2xml-cdrom-scsi-raw-auto-detect.xml index a81646a28eb0b26b7de90209f22806e5c1c6ff87..9d706b5d04d6e39586b543834ccfb9ee7214d5c5 100644 --- a/tests/vmx2xmldata/vmx2xml-cdrom-scsi-raw-auto-detect.xml +++ b/tests/vmx2xmldata/vmx2xml-cdrom-scsi-raw-auto-detect.xml @@ -18,7 +18,7 @@ diff --git a/tests/vmx2xmldata/vmx2xml-cdrom-scsi-raw-device.xml b/tests/vmx2xmldata/vmx2xml-cdrom-scsi-raw-device.xml index bca8510ab4dd0dc52834e698954262786411631a..9052327dcdab701f2b8d1e3324a375bc5b236ef3 100644 --- a/tests/vmx2xmldata/vmx2xml-cdrom-scsi-raw-device.xml +++ b/tests/vmx2xmldata/vmx2xml-cdrom-scsi-raw-device.xml @@ -18,7 +18,7 @@ diff --git a/tests/vmx2xmldata/vmx2xml-datacenterpath.xml b/tests/vmx2xmldata/vmx2xml-datacenterpath.xml index a690c0feb835d9dcff6ac2134a55c6f7321eb623..7d458c5c8efbde2b7df6194d7be01b5aae4bfe28 100644 --- a/tests/vmx2xmldata/vmx2xml-datacenterpath.xml +++ b/tests/vmx2xmldata/vmx2xml-datacenterpath.xml @@ -12,7 +12,7 @@ destroy folder1/folder2/datacenter1 diff --git a/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-1.xml b/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-1.xml index 26f609cd0fc09c739b6a13e33bbefb08f92593c1..906cfe06488794f106728ca8fa1adbb7d95bbdaa 100644 --- a/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-1.xml +++ b/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-1.xml @@ -26,7 +26,7 @@ diff --git a/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-2.xml b/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-2.xml index fd3b92c9cf4f28e217bcb6aaeeb9056e7383eb60..2f85f82ad0995d01bc7725097a84f4fecf531116 100644 --- a/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-2.xml +++ b/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-2.xml @@ -53,7 +53,7 @@ diff --git a/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-3.xml b/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-3.xml index dd681c12f1a803393281562957bf22f28622150e..8f219165f1b88465d943a87c5945a8bc37935bf7 100644 --- a/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-3.xml +++ b/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-3.xml @@ -35,7 +35,7 @@ diff --git a/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-4.xml b/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-4.xml index a2b457ad989eacb74328fab209cc48415c818633..d5b3e841b76ca5e7306dbfdd469494e77f32a16d 100644 --- a/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-4.xml +++ b/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-4.xml @@ -42,7 +42,7 @@ diff --git a/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-5.xml b/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-5.xml index e6b69938545c8b5f9b3fab43bcfc7f081c0c018f..296d48171c419e553436c032963fdc9612a0e2f5 100644 --- a/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-5.xml +++ b/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-5.xml @@ -37,7 +37,7 @@ diff --git a/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-6.xml b/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-6.xml index a03dd2a98d2b287d81f67e138c5213963eee62f4..19bace7cfb29004d0b1e851c94b204f16b7b406e 100644 --- a/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-6.xml +++ b/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-6.xml @@ -30,7 +30,7 @@ diff --git a/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-7.xml b/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-7.xml index 5180a99f830c05b87694c33c3b16cb9e8a75493b..832c1ac8643d5ca0e256f903a2218d10d5e922dd 100644 --- a/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-7.xml +++ b/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-7.xml @@ -29,7 +29,7 @@ diff --git a/tests/vmx2xmldata/vmx2xml-ethernet-bridged.xml b/tests/vmx2xmldata/vmx2xml-ethernet-bridged.xml index 52d8fabfe593c682fd05d2a2e7c5c9dbb27d2025..0fe29ccd976a36b8452523bb407090c45083f318 100644 --- a/tests/vmx2xmldata/vmx2xml-ethernet-bridged.xml +++ b/tests/vmx2xmldata/vmx2xml-ethernet-bridged.xml @@ -16,7 +16,7 @@ diff --git a/tests/vmx2xmldata/vmx2xml-ethernet-custom.xml b/tests/vmx2xmldata/vmx2xml-ethernet-custom.xml index 9f530ce7afadf7c86c04d940a3ad00dcafee751e..e10ecd7685c06f9fa9d41d68e20e856dd7334a73 100644 --- a/tests/vmx2xmldata/vmx2xml-ethernet-custom.xml +++ b/tests/vmx2xmldata/vmx2xml-ethernet-custom.xml @@ -17,7 +17,7 @@ diff --git a/tests/vmx2xmldata/vmx2xml-ethernet-e1000.xml b/tests/vmx2xmldata/vmx2xml-ethernet-e1000.xml index 4170db53fdbaec3aaa234eb2379fcca2b4ffcea9..d497a3836f7c822d18499de3e5c75d64fc704604 100644 --- a/tests/vmx2xmldata/vmx2xml-ethernet-e1000.xml +++ b/tests/vmx2xmldata/vmx2xml-ethernet-e1000.xml @@ -17,7 +17,7 @@ diff --git a/tests/vmx2xmldata/vmx2xml-ethernet-generated.xml b/tests/vmx2xmldata/vmx2xml-ethernet-generated.xml index b955c5fe959eeb2ec5ea08b519f3fb4ded104146..23b54c81c922fbb4567f9afb9665c9cda9872417 100644 --- a/tests/vmx2xmldata/vmx2xml-ethernet-generated.xml +++ b/tests/vmx2xmldata/vmx2xml-ethernet-generated.xml @@ -16,7 +16,7 @@ diff --git a/tests/vmx2xmldata/vmx2xml-ethernet-nat.xml b/tests/vmx2xmldata/vmx2xml-ethernet-nat.xml index eb8e85b2612e2a390da7ec02c7373e89f943e383..562ddfc0ca3416948e8ccfb19cd4ff999c9ac3a3 100644 --- a/tests/vmx2xmldata/vmx2xml-ethernet-nat.xml +++ b/tests/vmx2xmldata/vmx2xml-ethernet-nat.xml @@ -15,7 +15,7 @@ diff --git a/tests/vmx2xmldata/vmx2xml-ethernet-other.xml b/tests/vmx2xmldata/vmx2xml-ethernet-other.xml index 51421e22f46beb643ad990448ffbb8d6844a78d2..e7abad0724013b0a34ae8e4ad8fa25f777ab221c 100644 --- a/tests/vmx2xmldata/vmx2xml-ethernet-other.xml +++ b/tests/vmx2xmldata/vmx2xml-ethernet-other.xml @@ -16,7 +16,7 @@ diff --git a/tests/vmx2xmldata/vmx2xml-ethernet-static.xml b/tests/vmx2xmldata/vmx2xml-ethernet-static.xml index 52d8fabfe593c682fd05d2a2e7c5c9dbb27d2025..0fe29ccd976a36b8452523bb407090c45083f318 100644 --- a/tests/vmx2xmldata/vmx2xml-ethernet-static.xml +++ b/tests/vmx2xmldata/vmx2xml-ethernet-static.xml @@ -16,7 +16,7 @@ diff --git a/tests/vmx2xmldata/vmx2xml-ethernet-vmxnet2.xml b/tests/vmx2xmldata/vmx2xml-ethernet-vmxnet2.xml index 19d709666707431eece67b233ccbc593d0dee8fd..bbe7dfd37822c86d57368cd9211eb841c99eee71 100644 --- a/tests/vmx2xmldata/vmx2xml-ethernet-vmxnet2.xml +++ b/tests/vmx2xmldata/vmx2xml-ethernet-vmxnet2.xml @@ -17,7 +17,7 @@ diff --git a/tests/vmx2xmldata/vmx2xml-ethernet-vpx.xml b/tests/vmx2xmldata/vmx2xml-ethernet-vpx.xml index 88c15d0c1535e178c45a57667cd18be70bdaf572..5dbdb5227e4f9bf6c44de38f2ebce9617798ff98 100644 --- a/tests/vmx2xmldata/vmx2xml-ethernet-vpx.xml +++ b/tests/vmx2xmldata/vmx2xml-ethernet-vpx.xml @@ -16,7 +16,7 @@ diff --git a/tests/vmx2xmldata/vmx2xml-floppy-device.xml b/tests/vmx2xmldata/vmx2xml-floppy-device.xml index 5980bad163030e043c0da38e4448084d4e187eaa..3b1317249d9ac135a0591cfc19b523efa10fdc6d 100644 --- a/tests/vmx2xmldata/vmx2xml-floppy-device.xml +++ b/tests/vmx2xmldata/vmx2xml-floppy-device.xml @@ -18,7 +18,7 @@ diff --git a/tests/vmx2xmldata/vmx2xml-floppy-file.xml b/tests/vmx2xmldata/vmx2xml-floppy-file.xml index 40f70d30520236ead20612ade6885135f190e79b..6699f15602dedf44d20467d8db0279d3ee478081 100644 --- a/tests/vmx2xmldata/vmx2xml-floppy-file.xml +++ b/tests/vmx2xmldata/vmx2xml-floppy-file.xml @@ -23,7 +23,7 @@ diff --git a/tests/vmx2xmldata/vmx2xml-fusion-in-the-wild-1.xml b/tests/vmx2xmldata/vmx2xml-fusion-in-the-wild-1.xml index ef785d7466c5c5d4a374bac27bcb3062d2e694ed..cfc0d959607f72eb30a3a345bce4f425c57016c5 100644 --- a/tests/vmx2xmldata/vmx2xml-fusion-in-the-wild-1.xml +++ b/tests/vmx2xmldata/vmx2xml-fusion-in-the-wild-1.xml @@ -33,7 +33,7 @@ diff --git a/tests/vmx2xmldata/vmx2xml-graphics-vnc.xml b/tests/vmx2xmldata/vmx2xml-graphics-vnc.xml index 9fee02655c3e408f4cea5ad23785a7030b63e107..8501907748a9fff9ab5f994e5cfcaeeb7e75906f 100644 --- a/tests/vmx2xmldata/vmx2xml-graphics-vnc.xml +++ b/tests/vmx2xmldata/vmx2xml-graphics-vnc.xml @@ -13,7 +13,7 @@ diff --git a/tests/vmx2xmldata/vmx2xml-gsx-in-the-wild-1.xml b/tests/vmx2xmldata/vmx2xml-gsx-in-the-wild-1.xml index 94c0f8716a01db6dccdb31bc2bce6d71d19ca774..e507cfc2f479ed46eacbf0068a36a52ced5567b3 100644 --- a/tests/vmx2xmldata/vmx2xml-gsx-in-the-wild-1.xml +++ b/tests/vmx2xmldata/vmx2xml-gsx-in-the-wild-1.xml @@ -24,7 +24,7 @@ diff --git a/tests/vmx2xmldata/vmx2xml-gsx-in-the-wild-2.xml b/tests/vmx2xmldata/vmx2xml-gsx-in-the-wild-2.xml index 9550c6b70d4200afcbbb9e5286d44d474e6bffeb..39e89bb20448e2724a198cee1b8b8575cd6c5f52 100644 --- a/tests/vmx2xmldata/vmx2xml-gsx-in-the-wild-2.xml +++ b/tests/vmx2xmldata/vmx2xml-gsx-in-the-wild-2.xml @@ -24,7 +24,7 @@ diff --git a/tests/vmx2xmldata/vmx2xml-gsx-in-the-wild-3.xml b/tests/vmx2xmldata/vmx2xml-gsx-in-the-wild-3.xml index c2f845f788382ec865bc14ff6fe9eedb64d0252c..51101ded2394f570703d70ff0a5b778996592250 100644 --- a/tests/vmx2xmldata/vmx2xml-gsx-in-the-wild-3.xml +++ b/tests/vmx2xmldata/vmx2xml-gsx-in-the-wild-3.xml @@ -29,7 +29,7 @@ diff --git a/tests/vmx2xmldata/vmx2xml-gsx-in-the-wild-4.xml b/tests/vmx2xmldata/vmx2xml-gsx-in-the-wild-4.xml index 668b9471e8328c2567a922c94a3d3baf423ed5d8..849367a52d9e97b828029f43343995be92e94861 100644 --- a/tests/vmx2xmldata/vmx2xml-gsx-in-the-wild-4.xml +++ b/tests/vmx2xmldata/vmx2xml-gsx-in-the-wild-4.xml @@ -24,7 +24,7 @@ diff --git a/tests/vmx2xmldata/vmx2xml-harddisk-ide-file.xml b/tests/vmx2xmldata/vmx2xml-harddisk-ide-file.xml index 80fcef73edc14192ce88c6b309aee2611785dcc1..d452e6ed990812e574ac9294737d4f5faa538edc 100644 --- a/tests/vmx2xmldata/vmx2xml-harddisk-ide-file.xml +++ b/tests/vmx2xmldata/vmx2xml-harddisk-ide-file.xml @@ -18,7 +18,7 @@ diff --git a/tests/vmx2xmldata/vmx2xml-harddisk-scsi-file.xml b/tests/vmx2xmldata/vmx2xml-harddisk-scsi-file.xml index a1d3efdd3af9b4e5a7c6a179ad0914b1cd0082c5..64b89c6530d30d6da851f614da8eaf812aad0513 100644 --- a/tests/vmx2xmldata/vmx2xml-harddisk-scsi-file.xml +++ b/tests/vmx2xmldata/vmx2xml-harddisk-scsi-file.xml @@ -18,7 +18,7 @@ diff --git a/tests/vmx2xmldata/vmx2xml-harddisk-transient.xml b/tests/vmx2xmldata/vmx2xml-harddisk-transient.xml index 3786e2fe318c3c28fe46539b0f3a9b5d14e66d81..f61fb2177385a7965eb9f47a1b1f18166153e442 100644 --- a/tests/vmx2xmldata/vmx2xml-harddisk-transient.xml +++ b/tests/vmx2xmldata/vmx2xml-harddisk-transient.xml @@ -19,7 +19,7 @@ diff --git a/tests/vmx2xmldata/vmx2xml-minimal-64bit.xml b/tests/vmx2xmldata/vmx2xml-minimal-64bit.xml index 6c50a1d2097245ab5918f368100e8307091624e1..42245d4ba0a02eac30af307c76c21c9b51159327 100644 --- a/tests/vmx2xmldata/vmx2xml-minimal-64bit.xml +++ b/tests/vmx2xmldata/vmx2xml-minimal-64bit.xml @@ -12,7 +12,7 @@ destroy diff --git a/tests/vmx2xmldata/vmx2xml-minimal.xml b/tests/vmx2xmldata/vmx2xml-minimal.xml index 38bcf43cfcb53bd248867b5256c8e7727d03fadf..122d59cd774f97ca3e30f729baddb5c7b23c2178 100644 --- a/tests/vmx2xmldata/vmx2xml-minimal.xml +++ b/tests/vmx2xmldata/vmx2xml-minimal.xml @@ -12,7 +12,7 @@ destroy diff --git a/tests/vmx2xmldata/vmx2xml-parallel-device.xml b/tests/vmx2xmldata/vmx2xml-parallel-device.xml index 8aa4591e2cd46b6d063f07ff2a0993a96d70292b..3c69198b93df57c0c1fbc327ff39719f989e8f7e 100644 --- a/tests/vmx2xmldata/vmx2xml-parallel-device.xml +++ b/tests/vmx2xmldata/vmx2xml-parallel-device.xml @@ -16,7 +16,7 @@ diff --git a/tests/vmx2xmldata/vmx2xml-parallel-file.xml b/tests/vmx2xmldata/vmx2xml-parallel-file.xml index 6b0a9654b3e2c074aaa6f75d7b13a134a34cd8bf..d7ec0cf1a248b278531837a1ed89823dd08ee733 100644 --- a/tests/vmx2xmldata/vmx2xml-parallel-file.xml +++ b/tests/vmx2xmldata/vmx2xml-parallel-file.xml @@ -16,7 +16,7 @@ diff --git a/tests/vmx2xmldata/vmx2xml-scsi-driver.xml b/tests/vmx2xmldata/vmx2xml-scsi-driver.xml index 3ab346f833b5362a4ea1d2fca5902cd709169d64..1a057df428a98a0bc0251a4b2a19de4fe53815c4 100644 --- a/tests/vmx2xmldata/vmx2xml-scsi-driver.xml +++ b/tests/vmx2xmldata/vmx2xml-scsi-driver.xml @@ -36,7 +36,7 @@ diff --git a/tests/vmx2xmldata/vmx2xml-scsi-writethrough.xml b/tests/vmx2xmldata/vmx2xml-scsi-writethrough.xml index fdd01ed131f121b48cfdaa73bdb8666bed974b03..95accb104e537a9beb25974d5849d180fa4d7df9 100644 --- a/tests/vmx2xmldata/vmx2xml-scsi-writethrough.xml +++ b/tests/vmx2xmldata/vmx2xml-scsi-writethrough.xml @@ -19,7 +19,7 @@ diff --git a/tests/vmx2xmldata/vmx2xml-serial-device.xml b/tests/vmx2xmldata/vmx2xml-serial-device.xml index cc45c078ea2c390075f79b41f06a11d420f6b956..df25d66b98774b9a3df806eddf221b9cc4c827f4 100644 --- a/tests/vmx2xmldata/vmx2xml-serial-device.xml +++ b/tests/vmx2xmldata/vmx2xml-serial-device.xml @@ -24,7 +24,7 @@ diff --git a/tests/vmx2xmldata/vmx2xml-serial-file.xml b/tests/vmx2xmldata/vmx2xml-serial-file.xml index 810398dc20f7d50de83961c3d1fc5e9f9e74918c..84618c321cec39e3d0d939bc0fb6b1f220c2b96f 100644 --- a/tests/vmx2xmldata/vmx2xml-serial-file.xml +++ b/tests/vmx2xmldata/vmx2xml-serial-file.xml @@ -20,7 +20,7 @@ diff --git a/tests/vmx2xmldata/vmx2xml-serial-network-client.xml b/tests/vmx2xmldata/vmx2xml-serial-network-client.xml index b9190807faf0e6217d387b45318d4285862fa081..2e096434f53944c6598812705cf6501e793c5d72 100644 --- a/tests/vmx2xmldata/vmx2xml-serial-network-client.xml +++ b/tests/vmx2xmldata/vmx2xml-serial-network-client.xml @@ -22,7 +22,7 @@ diff --git a/tests/vmx2xmldata/vmx2xml-serial-network-server.xml b/tests/vmx2xmldata/vmx2xml-serial-network-server.xml index 265036bde834bdba878617d46830f1fe2d5f4591..65950e8cea00e3d4e00d173e4f06d90408058ef0 100644 --- a/tests/vmx2xmldata/vmx2xml-serial-network-server.xml +++ b/tests/vmx2xmldata/vmx2xml-serial-network-server.xml @@ -22,7 +22,7 @@ diff --git a/tests/vmx2xmldata/vmx2xml-serial-pipe.xml b/tests/vmx2xmldata/vmx2xml-serial-pipe.xml index 029bc9dc2598b4f83f6f244c6de0319f13c79d65..bd425e603e188ab8db0b79ee989401d25f198684 100644 --- a/tests/vmx2xmldata/vmx2xml-serial-pipe.xml +++ b/tests/vmx2xmldata/vmx2xml-serial-pipe.xml @@ -20,7 +20,7 @@ diff --git a/tests/vmx2xmldata/vmx2xml-sharedfolder.xml b/tests/vmx2xmldata/vmx2xml-sharedfolder.xml index 52b75de0d8649cc899bf9b5a554586cb095706f6..7fa3203161f14dc7fd4c26584b34703fa75cb95c 100644 --- a/tests/vmx2xmldata/vmx2xml-sharedfolder.xml +++ b/tests/vmx2xmldata/vmx2xml-sharedfolder.xml @@ -16,7 +16,7 @@ diff --git a/tests/vmx2xmldata/vmx2xml-smbios.xml b/tests/vmx2xmldata/vmx2xml-smbios.xml index cf43714d56294553f3767638bcc275139665bf0a..677350263308ee0478c5df934e8ed5a613e7d3d7 100644 --- a/tests/vmx2xmldata/vmx2xml-smbios.xml +++ b/tests/vmx2xmldata/vmx2xml-smbios.xml @@ -13,7 +13,7 @@ destroy diff --git a/tests/vmx2xmldata/vmx2xml-svga.xml b/tests/vmx2xmldata/vmx2xml-svga.xml index 5f6df894e470781ebb96430408347621d527c5ab..da0f1a30e28d74352c38f3b904eb3d3a7852eada 100644 --- a/tests/vmx2xmldata/vmx2xml-svga.xml +++ b/tests/vmx2xmldata/vmx2xml-svga.xml @@ -12,7 +12,7 @@ destroy diff --git a/tests/vmx2xmldata/vmx2xml-ws-in-the-wild-1.xml b/tests/vmx2xmldata/vmx2xml-ws-in-the-wild-1.xml index 2f7c14efef8160fe0b537a9c5265d5d1864430f6..9ea6bd754d6892f4446eb3b874e867c2793b4de7 100644 --- a/tests/vmx2xmldata/vmx2xml-ws-in-the-wild-1.xml +++ b/tests/vmx2xmldata/vmx2xml-ws-in-the-wild-1.xml @@ -29,7 +29,7 @@ diff --git a/tests/vmx2xmldata/vmx2xml-ws-in-the-wild-2.xml b/tests/vmx2xmldata/vmx2xml-ws-in-the-wild-2.xml index 9865e341762a9be7aac21be51ceefcf7852ea27f..ce8f802f88c82dc7481bdca74544bd4ea6ed05ac 100644 --- a/tests/vmx2xmldata/vmx2xml-ws-in-the-wild-2.xml +++ b/tests/vmx2xmldata/vmx2xml-ws-in-the-wild-2.xml @@ -30,7 +30,7 @@