On 04/24/2015 09:36 AM, Michal Privoznik wrote: > On 23.04.2015 23:07, Cole Robinson wrote: >> - Make sure aarch64 host-passthrough works correctly >> - Make sure libvirt doesn't choke on cpu model=host, which is what >> virt-install/virt-manager were incorrectly specifying up until recently. >> --- >> .../qemuxml2argv-aarch64-cpu-model-host.args | 1 + >> .../qemuxml2argv-aarch64-cpu-model-host.xml | 28 ++++++++++++++++++++++ >> .../qemuxml2argv-aarch64-cpu-passthrough.args | 1 + >> .../qemuxml2argv-aarch64-cpu-passthrough.xml | 27 +++++++++++++++++++++ >> tests/qemuxml2argvtest.c | 6 +++++ >> .../qemuxml2argv-aarch64-cpu-passthrough.xml | 27 +++++++++++++++++++++ >> tests/qemuxml2xmltest.c | 2 ++ >> 7 files changed, 92 insertions(+) >> create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-aarch64-cpu-model-host.args >> create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-aarch64-cpu-model-host.xml >> create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-aarch64-cpu-passthrough.args >> create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-aarch64-cpu-passthrough.xml >> create mode 100644 tests/qemuxml2xmloutdata/qemuxml2argv-aarch64-cpu-passthrough.xml >> >> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-cpu-model-host.args b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-cpu-model-host.args >> new file mode 100644 >> index 0000000..802ea11 >> --- /dev/null >> +++ b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-cpu-model-host.args >> @@ -0,0 +1 @@ >> +LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none /usr/bin/qemu-system-aarch64 -S -M virt -cpu host -m 1024 -smp 1 -nographic -nodefconfig -nodefaults -monitor unix:/tmp/test-monitor,server,nowait -boot c -usb -drive file=/aarch64.raw,if=none,id=drive-virtio-disk0 -device virtio-blk-device,drive=drive-virtio-disk0,id=virtio-disk0 >> \ No newline at end of file > > This is a very long line. > > >> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-cpu-passthrough.args b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-cpu-passthrough.args >> new file mode 100644 >> index 0000000..802ea11 >> --- /dev/null >> +++ b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-cpu-passthrough.args >> @@ -0,0 +1 @@ >> +LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none /usr/bin/qemu-system-aarch64 -S -M virt -cpu host -m 1024 -smp 1 -nographic -nodefconfig -nodefaults -monitor unix:/tmp/test-monitor,server,nowait -boot c -usb -drive file=/aarch64.raw,if=none,id=drive-virtio-disk0 -device virtio-blk-device,drive=drive-virtio-disk0,id=virtio-disk0 >> \ No newline at end of file > > And so is this. syntax-check would have warned you. > Sorry about that, always forget that syntax-check complains about that. My recent patch for VIR_TEST_REGENERATE_OUTPUT should probably learn how to split lines for .args output too... Patch for another day I suppose > ACK if you break the long lines. > Thanks for the review, pushed now with the fixed lines - Cole -- libvir-list mailing list libvir-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/libvir-list