August 2021 - Devel - libvirt List Archives

[PATCH] virsocket: Don't preserve errno in virSocketRecvFD()
by Michal Privoznik 20 Aug '21

20 Aug '21

When setting O_CLOEXEC flag on received FD fails the FD is closed using VIR_FORCE_CLOSE(). But the call is wrapped in errno save which is not necessary because VIR_FORCE_CLOSE() preservers errno value. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/util/virsocket.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/util/virsocket.c b/src/util/virsocket.c index b971da16e3..a6f185114d 100644 --- a/src/util/virsocket.c +++ b/src/util/virsocket.c @@ -477,9 +477,7 @@ virSocketRecvFD(int sock, int fdflags) /* set close-on-exec flag */ if (!MSG_CMSG_CLOEXEC && (fdflags & O_CLOEXEC)) { if (virSetCloseExec(fd) < 0) { - int saved_errno = errno; VIR_FORCE_CLOSE(fd); - errno = saved_errno; return -1; } } -- 2.31.1

2 1

[PATCH RFC v6 00/12] Add riscv kvm accel support
by Yifei Jiang 20 Aug '21

20 Aug '21

This series adds both riscv32 and riscv64 kvm support, and implements migration based on riscv. It is based on temporarily unaccepted kvm: https://github.com/kvm-riscv/linux (lastest version v19). This series depends on above pending changes which haven't yet been accepted, so this QEMU patch series is treated as RFC patches until that dependency has been dealt with. Several steps to use this: 1. Build emulation $ ./configure --target-list=riscv64-softmmu $ make -j$(nproc) 2. Build kernel https://github.com/kvm-riscv/linux 3. Build QEMU VM Cross built in riscv toolchain. $ PKG_CONFIG_LIBDIR=<toolchain pkgconfig path> $ export PKG_CONFIG_SYSROOT_DIR=<toolchain sysroot path> $ ./configure --target-list=riscv64-softmmu --enable-kvm \ --cross-prefix=riscv64-linux-gnu- --disable-libiscsi --disable-glusterfs \ --disable-libusb --disable-usb-redir --audio-drv-list= --disable-opengl \ --disable-libxml2 $ make -j$(nproc) 4. Start emulation $ ./qemu-system-riscv64 -M virt -m 4096M -cpu rv64,x-h=true -nographic \ -name guest=riscv-hyp,debug-threads=on \ -smp 4 \ -bios ./fw_jump.bin \ -kernel ./Image \ -drive file=./hyp.img,format=raw,id=hd0 \ -device virtio-blk-device,drive=hd0 \ -append "root=/dev/vda rw console=ttyS0 earlycon=sbi" 5. Start kvm-acceled QEMU VM in emulation $ ./qemu-system-riscv64 -M virt,accel=kvm -m 1024M -cpu host -nographic \ -name guest=riscv-guset \ -smp 2 \ -bios none \ -kernel ./Image \ -drive file=./guest.img,format=raw,id=hd0 \ -device virtio-blk-device,drive=hd0 \ -append "root=/dev/vda rw console=ttyS0 earlycon=sbi" Changes since RFC v5 - Rebase on QEMU v6.1.0-rc1 and kvm-riscv linux v19. - Move kvm interrupt setting to riscv_cpu_update_mip(). - Replace __u64 with uint64_t. Changes since RFC v4 - Rebase on QEMU v6.0.0-rc2 and kvm-riscv linux v17. - Remove time scaling support as software solution is incomplete. Because it will cause unacceptable performance degradation. and We will post a better solution. - Revise according to Alistair's review comments. - Remove compile time XLEN checks in kvm_riscv_reg_id - Surround TYPE_RISCV_CPU_HOST definition by CONFIG_KVM and share it between RV32 and RV64. - Add kvm-stub.c for reduce unnecessary compilation checks. - Add riscv_setup_direct_kernel() to direct boot kernel for KVM. Changes since RFC v3 - Rebase on QEMU v5.2.0-rc2 and kvm-riscv linux v15. - Add time scaling support(New patches 13, 14 and 15). - Fix the bug that guest vm can't reboot. Changes since RFC v2 - Fix checkpatch error at target/riscv/sbi_ecall_interface.h. - Add riscv migration support. Changes since RFC v1 - Add separate SBI ecall interface header. - Add riscv32 kvm accel support. Yifei Jiang (12): linux-header: Update linux/kvm.h target/riscv: Add target/riscv/kvm.c to place the public kvm interface target/riscv: Implement function kvm_arch_init_vcpu target/riscv: Implement kvm_arch_get_registers target/riscv: Implement kvm_arch_put_registers target/riscv: Support start kernel directly by KVM target/riscv: Support setting external interrupt by KVM target/riscv: Handle KVM_EXIT_RISCV_SBI exit target/riscv: Add host cpu type target/riscv: Add kvm_riscv_get/put_regs_timer target/riscv: Implement virtual time adjusting with vm state changing target/riscv: Support virtual time context synchronization hw/riscv/boot.c | 11 + hw/riscv/virt.c | 7 + include/hw/riscv/boot.h | 1 + linux-headers/linux/kvm.h | 8 + meson.build | 2 + target/riscv/cpu.c | 57 +++ target/riscv/cpu.h | 10 + target/riscv/cpu_helper.c | 27 -- target/riscv/kvm-stub.c | 30 ++ target/riscv/kvm.c | 605 +++++++++++++++++++++++++++++ target/riscv/kvm_riscv.h | 25 ++ target/riscv/machine.c | 14 + target/riscv/meson.build | 1 + target/riscv/sbi_ecall_interface.h | 72 ++++ 14 files changed, 843 insertions(+), 27 deletions(-) create mode 100644 target/riscv/kvm-stub.c create mode 100644 target/riscv/kvm.c create mode 100644 target/riscv/kvm_riscv.h create mode 100644 target/riscv/sbi_ecall_interface.h -- 2.19.1

3 14

[PATCH] fix error in printf format string
by Zhenyu Ye 19 Aug '21

19 Aug '21

Use %s to print NULLSTR(duri). Reported-by: Peng Liang <liangpeng10(a)huawei.com> Signed-off-by: Zhenyu Ye <yezhenyu2(a)huawei.com> --- src/libvirt-domain.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libvirt-domain.c b/src/libvirt-domain.c index 4eb14d4176..3c4204e563 100644 --- a/src/libvirt-domain.c +++ b/src/libvirt-domain.c @@ -4215,7 +4215,7 @@ virDomainMigrateToURI(virDomainPtr domain, const char *dconnuri = NULL; const char *miguri = NULL; - VIR_DOMAIN_DEBUG(domain, "duri=%p, flags=0x%lx, dname=%s, bandwidth=%lu", + VIR_DOMAIN_DEBUG(domain, "duri=%s, flags=0x%lx, dname=%s, bandwidth=%lu", NULLSTR(duri), flags, NULLSTR(dname), bandwidth); virResetLastError(); -- 2.27.0

2 1

[libvirt PATCH 0/5] Waste less CPU on syntax-check
by Ján Tomko 19 Aug '21

19 Aug '21

Use 'git ls-tree' directly instead of a wrapper script that can possibly handle all the other versioning systems we do not use. Instead of adding, removing, then re-adding the absolute path prefix, only add it once per every syntax check rule. Delete the useless-if-before-free check since we've been ignoring its output anyway. This speeds up 'ninja test' on my 8-core laptop from: 19.781 s ± 0.174 s to 15.476 s ± 1.302 s Ján Tomko (5): syntax-check: assume we're using git syntax-check: use VC_LIST_EXCEPT instead of VC_LIST syntax-check: replace vc-list-files syntax-check: drop useless useless-if-before-free syntax-check: remove _test_script_regex build-aux/syntax-check.mk | 218 ++--------------------------- build-aux/useless-if-before-free | 226 ------------------------------- build-aux/vc-list-files | 113 ---------------- 3 files changed, 9 insertions(+), 548 deletions(-) delete mode 100755 build-aux/useless-if-before-free delete mode 100755 build-aux/vc-list-files -- 2.31.1

2 6

[libvirt PATCH] ch: monitor: unref mon->vm before vm
by Ján Tomko 19 Aug '21

19 Aug '21

Do not access 'mon' after unref'ing it. Signed-off-by: Ján Tomko <jtomko(a)redhat.com> --- src/ch/ch_monitor.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/ch/ch_monitor.c b/src/ch/ch_monitor.c index 1648d05017..0f8752d1ed 100644 --- a/src/ch/ch_monitor.c +++ b/src/ch/ch_monitor.c @@ -543,9 +543,8 @@ void virCHMonitorClose(virCHMonitor *mon) g_free(mon->socketpath); } + virObjectUnref(mon->vm); virObjectUnref(mon); - if (mon->vm) - virObjectUnref(mon->vm); } static int -- 2.31.1

2 1

[PATCHv2 0/6] virDomain: fix problems when setting qos on ovs managed
by jx8zjs 19 Aug '21

19 Aug '21

--- diff to v1: - Modify commit message to no longer then 80 characters. - Split patch into several commits - Add notes on some function and defination - Extract common code block to a single function Thanks to Pavel Hrdina for helping to review these patches. Two problems are found and fixed below: 1. Ingress rules is not clean on previous version of virNetDevOpenvswitchInterfaceClearQos. 2. If errors occurs when removing inbound qos on multi interfaces vm, some rules may not be delete as aspected. Fix by: 1.Instead of cleaning all qos rules each time new qos is set, tx and rx's qos are set or cleaned respectively. 2.Replace virReportError with VIR_WARN to let the cleaning process continue when error occurs. 3.Add ifname into ovs querying statements, which will reduce failure of removing qos on the other interfaces of the same vm. Test virNetDevOpenvswitchInterfaceSetQos and virNetDevOpenvswitchInterfaceClearQos with dryrun method. Since commands in tests are not actually run, it is difficult to emulate some complex senario, such as set and then update qos. So basic tests are added in patches. Jinsheng Zhang (6): virnetdevovs: Add vmuuid notes on virNetDevOpenvswitchInterfaceSetQos virnetdevovs: Extract conversion parameters between virNetDevBandwidth and ovs virnetdevovs: Extract common code block to a single function virnetdevovs: Introduce virNetDevOpenvswitchInterfaceClearTxQos and virNetDevOpenvswitchInterfaceClearRxQos virnetdevovs: Fix qos cleaning residual on multi interfaces tests: add test on virNetDevOpenvswitchInterfaceSetQos and virNetDevOpenvswitchInterfaceClearQos src/libvirt_private.syms | 2 + src/util/virnetdevopenvswitch.c | 142 ++++++++++++++-------- src/util/virnetdevopenvswitch.h | 14 +++ tests/virnetdevopenvswitchtest.c | 196 ++++++++++++++++++++++++++++++- 4 files changed, 302 insertions(+), 52 deletions(-) -- 2.30.2.windows.1

2 11

[PATCH v2 0/3] Implement some blkio related APIs for test driver
by Luke Yue 19 Aug '21

19 Aug '21

v2: - Rebase to current master branch - Refine the tests Luke Yue (3): test_driver: Implement virDomainGetBlkioParameters test_driver: Implement virDomainSetBlkioParameters tests: Test BlkioParameters related functions for test driver examples/xml/test/testdomfv0.xml | 11 ++++ examples/xml/test/testnodeinline.xml | 11 ++++ src/test/meson.build | 1 + src/test/test_driver.c | 96 ++++++++++++++++++++++++++++ tests/virshtest.c | 55 ++++++++++++++++ 5 files changed, 174 insertions(+) -- 2.33.0

2 6

[PATCH] tests: Add missing test cases to vmx2xmltest
by Martin Kletzander 19 Aug '21

19 Aug '21

Commit 42b2f35d36a9e was meant to test all four combinations of serial-pipe-{server,client}-{app,vm} files, but did only add the files and by mistake duplicated the tests. Those were later removed as duplicates, so add them back in. Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- This is based on top of this series: https://listman.redhat.com/archives/libvir-list/2021-August/msg00533.html For completeness sake (and CI testing) the branch is also available here: https://gitlab.com/nertpinx/libvirt/-/tree/vmx tests/vmx2xmldata/serial-pipe-client-vm.xml | 1 + tests/vmx2xmldata/serial-pipe-server-app.xml | 1 + tests/vmx2xmltest.c | 2 ++ 3 files changed, 4 insertions(+) create mode 120000 tests/vmx2xmldata/serial-pipe-client-vm.xml create mode 120000 tests/vmx2xmldata/serial-pipe-server-app.xml diff --git a/tests/vmx2xmldata/serial-pipe-client-vm.xml b/tests/vmx2xmldata/serial-pipe-client-vm.xml new file mode 120000 index 000000000000..44e3e1ee6e77 --- /dev/null +++ b/tests/vmx2xmldata/serial-pipe-client-vm.xml @@ -0,0 +1 @@ +serial-pipe.xml \ No newline at end of file diff --git a/tests/vmx2xmldata/serial-pipe-server-app.xml b/tests/vmx2xmldata/serial-pipe-server-app.xml new file mode 120000 index 000000000000..44e3e1ee6e77 --- /dev/null +++ b/tests/vmx2xmldata/serial-pipe-server-app.xml @@ -0,0 +1 @@ +serial-pipe.xml \ No newline at end of file diff --git a/tests/vmx2xmltest.c b/tests/vmx2xmltest.c index c97c4c045e95..33bf24371743 100644 --- a/tests/vmx2xmltest.c +++ b/tests/vmx2xmltest.c @@ -271,6 +271,8 @@ mymain(void) DO_TEST("serial-file"); DO_TEST("serial-device"); DO_TEST("serial-pipe-client-app"); + DO_TEST("serial-pipe-client-vm"); + DO_TEST("serial-pipe-server-app"); DO_TEST("serial-pipe-server-vm"); DO_TEST("serial-network-server"); DO_TEST("serial-network-client"); -- 2.32.0

2 1

[PATCH 0/6] qemu: Fixes and capability update for 6.1 release
by Peter Krempa 19 Aug '21

19 Aug '21

full version is at: git fetch https://gitlab.com/pipo.sk/libvirt.git qemu-caps-bump Posting this one early since it's updating tests to prevent spurious changes and improve testing of host-model cpus. Peter Krempa (6): qemuxml2argvdata: Don't use 'host-model' cpu in 'hugepages-memaccess3' qemuxml2argvtest: Unify 'cpu-tsc-frequency' and 'cpu-tsc-high-frequency' case qemuxml2argvtest: Slightly modernize "cpu-host-model" case qemuxml2argvtest: Add 'cpu-host-model' cases for all x86-64 real qemu caps versions qemucapabilitiesdata: Update qemu caps dump for 6.1.0 release qemuxml2argvtest: Add LATEST version of 'cpu-host-model' .../domaincapsdata/qemu_6.1.0-q35.x86_64.xml | 4 +- tests/domaincapsdata/qemu_6.1.0.x86_64.xml | 4 +- .../caps_6.1.0.x86_64.replies | 508 +++++++++--------- .../caps_6.1.0.x86_64.xml | 12 +- tests/qemuxml2argvdata/cpu-host-model.args | 14 +- .../cpu-host-model.x86_64-2.11.0.args | 35 ++ .../cpu-host-model.x86_64-2.12.0.args | 35 ++ .../cpu-host-model.x86_64-3.0.0.args | 35 ++ .../cpu-host-model.x86_64-3.1.0.args | 35 ++ .../cpu-host-model.x86_64-4.0.0.args | 35 ++ .../cpu-host-model.x86_64-4.1.0.args | 35 ++ .../cpu-host-model.x86_64-4.2.0.args | 35 ++ .../cpu-host-model.x86_64-5.0.0.args | 35 ++ .../cpu-host-model.x86_64-5.1.0.args | 35 ++ .../cpu-host-model.x86_64-5.2.0.args | 36 ++ ....args => cpu-host-model.x86_64-6.0.0.args} | 11 +- .../cpu-host-model.x86_64-6.1.0.args | 36 ++ .../cpu-host-model.x86_64-latest.args | 36 ++ tests/qemuxml2argvdata/cpu-host-model.xml | 14 +- tests/qemuxml2argvdata/cpu-tsc-frequency.args | 2 +- .../cpu-tsc-frequency.x86_64-4.0.0.args | 2 +- tests/qemuxml2argvdata/cpu-tsc-frequency.xml | 2 +- .../cpu-tsc-high-frequency.xml | 35 -- .../hugepages-memaccess3.x86_64-latest.args | 2 +- .../qemuxml2argvdata/hugepages-memaccess3.xml | 3 - tests/qemuxml2argvtest.c | 28 +- 26 files changed, 740 insertions(+), 324 deletions(-) create mode 100644 tests/qemuxml2argvdata/cpu-host-model.x86_64-2.11.0.args create mode 100644 tests/qemuxml2argvdata/cpu-host-model.x86_64-2.12.0.args create mode 100644 tests/qemuxml2argvdata/cpu-host-model.x86_64-3.0.0.args create mode 100644 tests/qemuxml2argvdata/cpu-host-model.x86_64-3.1.0.args create mode 100644 tests/qemuxml2argvdata/cpu-host-model.x86_64-4.0.0.args create mode 100644 tests/qemuxml2argvdata/cpu-host-model.x86_64-4.1.0.args create mode 100644 tests/qemuxml2argvdata/cpu-host-model.x86_64-4.2.0.args create mode 100644 tests/qemuxml2argvdata/cpu-host-model.x86_64-5.0.0.args create mode 100644 tests/qemuxml2argvdata/cpu-host-model.x86_64-5.1.0.args create mode 100644 tests/qemuxml2argvdata/cpu-host-model.x86_64-5.2.0.args rename tests/qemuxml2argvdata/{cpu-tsc-high-frequency.x86_64-latest.args => cpu-host-model.x86_64-6.0.0.args} (72%) create mode 100644 tests/qemuxml2argvdata/cpu-host-model.x86_64-6.1.0.args create mode 100644 tests/qemuxml2argvdata/cpu-host-model.x86_64-latest.args delete mode 100644 tests/qemuxml2argvdata/cpu-tsc-high-frequency.xml -- 2.31.1

2 7

[PATCH 0/3] vmx: Drop useless prefix for test cases
by Michal Privoznik 19 Aug '21

19 Aug '21

You can find these also here: https://gitlab.com/MichalPrivoznik/libvirt/-/tree/vmx_floppy Michal Prívozník (3): vmx2xmltest: Drop duplicate testcases vmx2xmltest: Deduplicate DO_TEST*() arguments tests: Drop vmx2xml- prefix for vmx2xml test cases ...{vmx2xml-annotation.vmx => annotation.vmx} | 0 ...{vmx2xml-annotation.xml => annotation.xml} | 0 ...sensitive-1.vmx => case-insensitive-1.vmx} | 0 ...sensitive-1.xml => case-insensitive-1.xml} | 0 ...sensitive-2.vmx => case-insensitive-2.vmx} | 0 ...sensitive-2.xml => case-insensitive-2.xml} | 0 ...om-ide-device.vmx => cdrom-ide-device.vmx} | 0 ...om-ide-device.xml => cdrom-ide-device.xml} | 0 ...-ide-empty-2.vmx => cdrom-ide-empty-2.vmx} | 0 ...-ide-empty-2.xml => cdrom-ide-empty-2.xml} | 0 ...drom-ide-empty.vmx => cdrom-ide-empty.vmx} | 0 ...drom-ide-empty.xml => cdrom-ide-empty.xml} | 0 ...x => cdrom-ide-file-missing-datastore.vmx} | 0 .../cdrom-ide-file-missing-datastore.xml | 1 + ...le.vmx => cdrom-ide-file-missing-file.vmx} | 0 .../cdrom-ide-file-missing-file.xml | 1 + ...-cdrom-ide-file.vmx => cdrom-ide-file.vmx} | 0 ...-cdrom-ide-file.xml => cdrom-ide-file.xml} | 0 ...tect.vmx => cdrom-ide-raw-auto-detect.vmx} | 0 ...tect.xml => cdrom-ide-raw-auto-detect.xml} | 0 ...aw-device.vmx => cdrom-ide-raw-device.vmx} | 0 ...aw-device.xml => cdrom-ide-raw-device.xml} | 0 ...-scsi-device.vmx => cdrom-scsi-device.vmx} | 0 ...-scsi-device.xml => cdrom-scsi-device.xml} | 0 ...om-scsi-empty.vmx => cdrom-scsi-empty.vmx} | 0 ...om-scsi-empty.xml => cdrom-scsi-empty.xml} | 0 ...drom-scsi-file.vmx => cdrom-scsi-file.vmx} | 0 ...drom-scsi-file.xml => cdrom-scsi-file.xml} | 0 ...i-passthru.vmx => cdrom-scsi-passthru.vmx} | 0 ...i-passthru.xml => cdrom-scsi-passthru.xml} | 0 ...ect.vmx => cdrom-scsi-raw-auto-detect.vmx} | 0 ...ect.xml => cdrom-scsi-raw-auto-detect.xml} | 0 ...w-device.vmx => cdrom-scsi-raw-device.vmx} | 0 ...w-device.xml => cdrom-scsi-raw-device.xml} | 0 ...-datacenterpath.vmx => datacenterpath.vmx} | 0 ...-datacenterpath.xml => datacenterpath.xml} | 0 ...n-the-wild-1.vmx => esx-in-the-wild-1.vmx} | 0 ...n-the-wild-1.xml => esx-in-the-wild-1.xml} | 0 ...the-wild-10.vmx => esx-in-the-wild-10.vmx} | 0 ...the-wild-10.xml => esx-in-the-wild-10.xml} | 0 ...the-wild-11.vmx => esx-in-the-wild-11.vmx} | 0 ...the-wild-11.xml => esx-in-the-wild-11.xml} | 0 ...n-the-wild-2.vmx => esx-in-the-wild-2.vmx} | 0 ...n-the-wild-2.xml => esx-in-the-wild-2.xml} | 0 ...n-the-wild-3.vmx => esx-in-the-wild-3.vmx} | 0 ...n-the-wild-3.xml => esx-in-the-wild-3.xml} | 0 ...n-the-wild-4.vmx => esx-in-the-wild-4.vmx} | 0 ...n-the-wild-4.xml => esx-in-the-wild-4.xml} | 0 ...n-the-wild-5.vmx => esx-in-the-wild-5.vmx} | 0 ...n-the-wild-5.xml => esx-in-the-wild-5.xml} | 0 ...n-the-wild-6.vmx => esx-in-the-wild-6.vmx} | 0 ...n-the-wild-6.xml => esx-in-the-wild-6.xml} | 0 ...n-the-wild-7.vmx => esx-in-the-wild-7.vmx} | 0 ...n-the-wild-7.xml => esx-in-the-wild-7.xml} | 0 ...n-the-wild-8.vmx => esx-in-the-wild-8.vmx} | 0 ...n-the-wild-8.xml => esx-in-the-wild-8.xml} | 0 ...n-the-wild-9.vmx => esx-in-the-wild-9.vmx} | 0 ...n-the-wild-9.xml => esx-in-the-wild-9.xml} | 0 ...ernet-bridged.vmx => ethernet-bridged.vmx} | 0 ...ernet-bridged.xml => ethernet-bridged.xml} | 0 ...thernet-custom.vmx => ethernet-custom.vmx} | 0 ...thernet-custom.xml => ethernet-custom.xml} | 0 ...-ethernet-e1000.vmx => ethernet-e1000.vmx} | 0 ...-ethernet-e1000.xml => ethernet-e1000.xml} | 0 ...t-generated.vmx => ethernet-generated.vmx} | 0 ...t-generated.xml => ethernet-generated.xml} | 0 ...2xml-ethernet-nat.vmx => ethernet-nat.vmx} | 0 ...2xml-ethernet-nat.xml => ethernet-nat.xml} | 0 ...-ethernet-other.vmx => ethernet-other.vmx} | 0 ...-ethernet-other.xml => ethernet-other.xml} | 0 ...thernet-static.vmx => ethernet-static.vmx} | 0 ...thernet-static.xml => ethernet-static.xml} | 0 ...ernet-vmxnet2.vmx => ethernet-vmxnet2.vmx} | 0 ...ernet-vmxnet2.xml => ethernet-vmxnet2.xml} | 0 ...2xml-ethernet-vpx.vmx => ethernet-vpx.vmx} | 0 ...2xml-ethernet-vpx.xml => ethernet-vpx.xml} | 0 ...2xml-firmware-efi.vmx => firmware-efi.vmx} | 0 ...2xml-firmware-efi.xml => firmware-efi.xml} | 0 ...ml-floppy-device.vmx => floppy-device.vmx} | 0 ...ml-floppy-device.xml => floppy-device.xml} | 0 ...mx2xml-floppy-file.vmx => floppy-file.vmx} | 0 ...mx2xml-floppy-file.xml => floppy-file.xml} | 0 ...he-wild-1.vmx => fusion-in-the-wild-1.vmx} | 0 ...he-wild-1.xml => fusion-in-the-wild-1.xml} | 0 ...2xml-graphics-vnc.vmx => graphics-vnc.vmx} | 0 ...2xml-graphics-vnc.xml => graphics-vnc.xml} | 0 ...n-the-wild-1.vmx => gsx-in-the-wild-1.vmx} | 0 ...n-the-wild-1.xml => gsx-in-the-wild-1.xml} | 0 ...n-the-wild-2.vmx => gsx-in-the-wild-2.vmx} | 0 ...n-the-wild-2.xml => gsx-in-the-wild-2.xml} | 0 ...n-the-wild-3.vmx => gsx-in-the-wild-3.vmx} | 0 ...n-the-wild-3.xml => gsx-in-the-wild-3.xml} | 0 ...n-the-wild-4.vmx => gsx-in-the-wild-4.vmx} | 0 ...n-the-wild-4.xml => gsx-in-the-wild-4.xml} | 0 ...> harddisk-ide-file-missing-datastore.vmx} | 0 ...isk-ide-file.vmx => harddisk-ide-file.vmx} | 0 ...isk-ide-file.xml => harddisk-ide-file.xml} | 0 ...mx => harddisk-scsi-file-missing-file.vmx} | 0 ...k-scsi-file.vmx => harddisk-scsi-file.vmx} | 0 ...k-scsi-file.xml => harddisk-scsi-file.xml} | 0 ...k-transient.vmx => harddisk-transient.vmx} | 0 ...k-transient.xml => harddisk-transient.xml} | 0 ...ml-minimal-64bit.vmx => minimal-64bit.vmx} | 0 ...ml-minimal-64bit.xml => minimal-64bit.xml} | 0 .../{vmx2xml-minimal.vmx => minimal.vmx} | 0 .../{vmx2xml-minimal.xml => minimal.xml} | 0 ...arallel-device.vmx => parallel-device.vmx} | 0 ...arallel-device.xml => parallel-device.xml} | 0 ...ml-parallel-file.vmx => parallel-file.vmx} | 0 ...ml-parallel-file.xml => parallel-file.xml} | 0 ...mx2xml-scsi-driver.vmx => scsi-driver.vmx} | 0 ...mx2xml-scsi-driver.xml => scsi-driver.xml} | 0 ...writethrough.vmx => scsi-writethrough.vmx} | 0 ...writethrough.xml => scsi-writethrough.xml} | 0 ...ml-serial-device.vmx => serial-device.vmx} | 0 ...ml-serial-device.xml => serial-device.xml} | 0 ...mx2xml-serial-file.vmx => serial-file.vmx} | 0 ...mx2xml-serial-file.xml => serial-file.xml} | 0 ...k-client.vmx => serial-network-client.vmx} | 0 ...k-client.xml => serial-network-client.xml} | 0 ...k-server.vmx => serial-network-server.vmx} | 0 ...k-server.xml => serial-network-server.xml} | 0 ...ent-app.vmx => serial-pipe-client-app.vmx} | 0 tests/vmx2xmldata/serial-pipe-client-app.xml | 1 + ...lient-vm.vmx => serial-pipe-client-vm.vmx} | 0 ...ver-app.vmx => serial-pipe-server-app.vmx} | 0 ...erver-vm.vmx => serial-pipe-server-vm.vmx} | 0 tests/vmx2xmldata/serial-pipe-server-vm.xml | 1 + ...mx2xml-serial-pipe.xml => serial-pipe.xml} | 0 ...2xml-sharedfolder.vmx => sharedfolder.vmx} | 0 ...2xml-sharedfolder.xml => sharedfolder.xml} | 0 .../{vmx2xml-smbios.vmx => smbios.vmx} | 0 .../{vmx2xml-smbios.xml => smbios.xml} | 0 .../{vmx2xml-svga.vmx => svga.vmx} | 0 .../{vmx2xml-svga.xml => svga.xml} | 0 ...in-the-wild-1.vmx => ws-in-the-wild-1.vmx} | 0 ...in-the-wild-1.xml => ws-in-the-wild-1.xml} | 0 ...in-the-wild-2.vmx => ws-in-the-wild-2.vmx} | 0 ...in-the-wild-2.xml => ws-in-the-wild-2.xml} | 0 tests/vmx2xmltest.c | 206 +++++++++--------- 140 files changed, 105 insertions(+), 105 deletions(-) rename tests/vmx2xmldata/{vmx2xml-annotation.vmx => annotation.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-annotation.xml => annotation.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-case-insensitive-1.vmx => case-insensitive-1.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-case-insensitive-1.xml => case-insensitive-1.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-case-insensitive-2.vmx => case-insensitive-2.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-case-insensitive-2.xml => case-insensitive-2.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-cdrom-ide-device.vmx => cdrom-ide-device.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-cdrom-ide-device.xml => cdrom-ide-device.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-cdrom-ide-empty-2.vmx => cdrom-ide-empty-2.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-cdrom-ide-empty-2.xml => cdrom-ide-empty-2.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-cdrom-ide-empty.vmx => cdrom-ide-empty.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-cdrom-ide-empty.xml => cdrom-ide-empty.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-cdrom-ide-file-missing-datastore.vmx => cdrom-ide-file-missing-datastore.vmx} (100%) create mode 120000 tests/vmx2xmldata/cdrom-ide-file-missing-datastore.xml rename tests/vmx2xmldata/{vmx2xml-cdrom-ide-file-missing-file.vmx => cdrom-ide-file-missing-file.vmx} (100%) create mode 120000 tests/vmx2xmldata/cdrom-ide-file-missing-file.xml rename tests/vmx2xmldata/{vmx2xml-cdrom-ide-file.vmx => cdrom-ide-file.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-cdrom-ide-file.xml => cdrom-ide-file.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-cdrom-ide-raw-auto-detect.vmx => cdrom-ide-raw-auto-detect.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-cdrom-ide-raw-auto-detect.xml => cdrom-ide-raw-auto-detect.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-cdrom-ide-raw-device.vmx => cdrom-ide-raw-device.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-cdrom-ide-raw-device.xml => cdrom-ide-raw-device.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-cdrom-scsi-device.vmx => cdrom-scsi-device.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-cdrom-scsi-device.xml => cdrom-scsi-device.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-cdrom-scsi-empty.vmx => cdrom-scsi-empty.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-cdrom-scsi-empty.xml => cdrom-scsi-empty.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-cdrom-scsi-file.vmx => cdrom-scsi-file.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-cdrom-scsi-file.xml => cdrom-scsi-file.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-cdrom-scsi-passthru.vmx => cdrom-scsi-passthru.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-cdrom-scsi-passthru.xml => cdrom-scsi-passthru.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-cdrom-scsi-raw-auto-detect.vmx => cdrom-scsi-raw-auto-detect.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-cdrom-scsi-raw-auto-detect.xml => cdrom-scsi-raw-auto-detect.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-cdrom-scsi-raw-device.vmx => cdrom-scsi-raw-device.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-cdrom-scsi-raw-device.xml => cdrom-scsi-raw-device.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-datacenterpath.vmx => datacenterpath.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-datacenterpath.xml => datacenterpath.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-esx-in-the-wild-1.vmx => esx-in-the-wild-1.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-esx-in-the-wild-1.xml => esx-in-the-wild-1.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-esx-in-the-wild-10.vmx => esx-in-the-wild-10.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-esx-in-the-wild-10.xml => esx-in-the-wild-10.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-esx-in-the-wild-11.vmx => esx-in-the-wild-11.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-esx-in-the-wild-11.xml => esx-in-the-wild-11.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-esx-in-the-wild-2.vmx => esx-in-the-wild-2.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-esx-in-the-wild-2.xml => esx-in-the-wild-2.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-esx-in-the-wild-3.vmx => esx-in-the-wild-3.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-esx-in-the-wild-3.xml => esx-in-the-wild-3.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-esx-in-the-wild-4.vmx => esx-in-the-wild-4.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-esx-in-the-wild-4.xml => esx-in-the-wild-4.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-esx-in-the-wild-5.vmx => esx-in-the-wild-5.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-esx-in-the-wild-5.xml => esx-in-the-wild-5.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-esx-in-the-wild-6.vmx => esx-in-the-wild-6.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-esx-in-the-wild-6.xml => esx-in-the-wild-6.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-esx-in-the-wild-7.vmx => esx-in-the-wild-7.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-esx-in-the-wild-7.xml => esx-in-the-wild-7.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-esx-in-the-wild-8.vmx => esx-in-the-wild-8.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-esx-in-the-wild-8.xml => esx-in-the-wild-8.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-esx-in-the-wild-9.vmx => esx-in-the-wild-9.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-esx-in-the-wild-9.xml => esx-in-the-wild-9.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-ethernet-bridged.vmx => ethernet-bridged.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-ethernet-bridged.xml => ethernet-bridged.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-ethernet-custom.vmx => ethernet-custom.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-ethernet-custom.xml => ethernet-custom.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-ethernet-e1000.vmx => ethernet-e1000.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-ethernet-e1000.xml => ethernet-e1000.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-ethernet-generated.vmx => ethernet-generated.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-ethernet-generated.xml => ethernet-generated.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-ethernet-nat.vmx => ethernet-nat.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-ethernet-nat.xml => ethernet-nat.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-ethernet-other.vmx => ethernet-other.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-ethernet-other.xml => ethernet-other.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-ethernet-static.vmx => ethernet-static.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-ethernet-static.xml => ethernet-static.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-ethernet-vmxnet2.vmx => ethernet-vmxnet2.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-ethernet-vmxnet2.xml => ethernet-vmxnet2.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-ethernet-vpx.vmx => ethernet-vpx.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-ethernet-vpx.xml => ethernet-vpx.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-firmware-efi.vmx => firmware-efi.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-firmware-efi.xml => firmware-efi.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-floppy-device.vmx => floppy-device.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-floppy-device.xml => floppy-device.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-floppy-file.vmx => floppy-file.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-floppy-file.xml => floppy-file.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-fusion-in-the-wild-1.vmx => fusion-in-the-wild-1.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-fusion-in-the-wild-1.xml => fusion-in-the-wild-1.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-graphics-vnc.vmx => graphics-vnc.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-graphics-vnc.xml => graphics-vnc.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-gsx-in-the-wild-1.vmx => gsx-in-the-wild-1.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-gsx-in-the-wild-1.xml => gsx-in-the-wild-1.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-gsx-in-the-wild-2.vmx => gsx-in-the-wild-2.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-gsx-in-the-wild-2.xml => gsx-in-the-wild-2.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-gsx-in-the-wild-3.vmx => gsx-in-the-wild-3.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-gsx-in-the-wild-3.xml => gsx-in-the-wild-3.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-gsx-in-the-wild-4.vmx => gsx-in-the-wild-4.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-gsx-in-the-wild-4.xml => gsx-in-the-wild-4.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-harddisk-ide-file-missing-datastore.vmx => harddisk-ide-file-missing-datastore.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-harddisk-ide-file.vmx => harddisk-ide-file.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-harddisk-ide-file.xml => harddisk-ide-file.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-harddisk-scsi-file-missing-file.vmx => harddisk-scsi-file-missing-file.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-harddisk-scsi-file.vmx => harddisk-scsi-file.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-harddisk-scsi-file.xml => harddisk-scsi-file.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-harddisk-transient.vmx => harddisk-transient.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-harddisk-transient.xml => harddisk-transient.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-minimal-64bit.vmx => minimal-64bit.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-minimal-64bit.xml => minimal-64bit.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-minimal.vmx => minimal.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-minimal.xml => minimal.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-parallel-device.vmx => parallel-device.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-parallel-device.xml => parallel-device.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-parallel-file.vmx => parallel-file.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-parallel-file.xml => parallel-file.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-scsi-driver.vmx => scsi-driver.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-scsi-driver.xml => scsi-driver.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-scsi-writethrough.vmx => scsi-writethrough.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-scsi-writethrough.xml => scsi-writethrough.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-serial-device.vmx => serial-device.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-serial-device.xml => serial-device.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-serial-file.vmx => serial-file.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-serial-file.xml => serial-file.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-serial-network-client.vmx => serial-network-client.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-serial-network-client.xml => serial-network-client.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-serial-network-server.vmx => serial-network-server.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-serial-network-server.xml => serial-network-server.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-serial-pipe-client-app.vmx => serial-pipe-client-app.vmx} (100%) create mode 120000 tests/vmx2xmldata/serial-pipe-client-app.xml rename tests/vmx2xmldata/{vmx2xml-serial-pipe-client-vm.vmx => serial-pipe-client-vm.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-serial-pipe-server-app.vmx => serial-pipe-server-app.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-serial-pipe-server-vm.vmx => serial-pipe-server-vm.vmx} (100%) create mode 120000 tests/vmx2xmldata/serial-pipe-server-vm.xml rename tests/vmx2xmldata/{vmx2xml-serial-pipe.xml => serial-pipe.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-sharedfolder.vmx => sharedfolder.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-sharedfolder.xml => sharedfolder.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-smbios.vmx => smbios.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-smbios.xml => smbios.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-svga.vmx => svga.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-svga.xml => svga.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-ws-in-the-wild-1.vmx => ws-in-the-wild-1.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-ws-in-the-wild-1.xml => ws-in-the-wild-1.xml} (100%) rename tests/vmx2xmldata/{vmx2xml-ws-in-the-wild-2.vmx => ws-in-the-wild-2.vmx} (100%) rename tests/vmx2xmldata/{vmx2xml-ws-in-the-wild-2.xml => ws-in-the-wild-2.xml} (100%) -- 2.31.1

3 6