On Wed, Jan 13, 2021 at 01:06:36 +0800, huangy81@chinatelecom.cn wrote:
From: Hyman <huangy81@chinatelecom.cn>
The "-machine" options for accelerators are legacy, the "-accel" options is a better mechanism. The following are the details: https://lore.kernel.org/qemu-devel/3aa73987-40e8-3619-0723-9f17f73850bd@redh...
This patch switch the option "-machine accel" to "-accel" when specifying accelerator type once libvirt build QEMU command line.
Since this patch involves qemuxml2argvtest, we only modify the test cases which machine type supported by QEMU with version >= 2.9.0.
In addition, the test file disk-backing-chains-noindex.x86_64-latest.args has 'No newline at end of file', this patch rewrite it in case unexpected behavior.
Can this be fixed separately first?
Signed-off-by: Hyman <huangy81@chinatelecom.cn> ---
This commit doesn't pass the testsuite: 334/335 libvirt:syntax-check / sc_test-wrap-argv FAIL 0.27s (exit status 2) --- command --- 18:36:05 /bin/make -C /home/pipo/build/libvirt/gcc/build-aux sc_test-wrap-argv --- Listing only the last 100 lines from a long log. --- -accel tcg \ -cpu qemu64 \ -m 4096 \ --- /home/pipo/libvirt/tests/qemuxml2argvdata/x86_64-default-cpu-tcg-q35-4.2.x86_64-latest.args 2021-01-12 19:36:00.169218160 +0100 +++ - 2021-01-12 19:36:05.291875376 +0100 @@ -12,8 +12,7 @@ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-guest/master-key.aes \ --machine pc-q35-4.2,usb=off,dump-guest-core=off,\ -memory-backend=pc.ram \ +-machine pc-q35-4.2,usb=off,dump-guest-core=off,memory-backend=pc.ram \ -accel tcg \ -cpu qemu64 \ -m 4096 \ make: Leaving directory '/home/pipo/build/libvirt/gcc/build-aux' --- stderr --- Incorrect line wrapping in '%s' /home/pipo/libvirt/tests/qemuxml2argvdata/default-video-type-ppc64.ppc64-latest.args Use test-wrap-argv.py to wrap test data files Incorrect line wrapping in '%s' /home/pipo/libvirt/tests/qemuxml2argvdata/default-video-type-s390x.s390x-latest.args Use test-wrap-argv.py to wrap test data files Incorrect line wrapping in '%s' /home/pipo/libvirt/tests/qemuxml2argvdata/disk-cache.x86_64-latest.args Use test-wrap-argv.py to wrap test data files Incorrect line wrapping in '%s' /home/pipo/libvirt/tests/qemuxml2argvdata/disk-error-policy-s390x.s390x-latest.args Use test-wrap-argv.py to wrap test data files (note that the actual test output don't contain the filename due to a bug I've fixed locally) I presume you've fixed the files by a script. Please use: VIR_TEST_REGENERATE_OUTPUT=1 ./tests/qemuxml2argvtest instead which actually ensures that the output files are wrapped properly.