diff options
| author | Thomas Huth <thuth@redhat.com> | 2019-09-04 07:27:39 +0200 |
|---|---|---|
| committer | Laurent Vivier <laurent@vivier.eu> | 2019-09-19 12:01:48 +0200 |
| commit | 976e8c54142586285f71f524308e4715f6e04e2d (patch) | |
| tree | 16a70fa9d8bc21c44cb51df2914aa5bdaea3d6bf | |
| parent | 31e404151bddbfd7215e471b5822ea2e96024e02 (diff) | |
| download | qemu-976e8c54142586285f71f524308e4715f6e04e2d.zip qemu-976e8c54142586285f71f524308e4715f6e04e2d.tar.gz qemu-976e8c54142586285f71f524308e4715f6e04e2d.tar.bz2 | |
Replace '-machine accel=xyz' with '-accel xyz'
We've got a separate option to configure the accelerator nowadays, which
is shorter to type and the preferred way of specifying an accelerator.
Use it in the source and examples to show that it is the favored option.
(However, do not touch the places yet which also specify other machine
options or multiple accelerators - these are currently still better
handled with one single "-machine" statement instead)
Signed-off-by: Thomas Huth <thuth@redhat.com>
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20190904052739.22123-1-thuth@redhat.com>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
| -rw-r--r-- | python/qemu/qtest.py | 2 | ||||
| -rw-r--r-- | qemu-deprecated.texi | 3 | ||||
| -rw-r--r-- | qemu-options.hx | 2 | ||||
| -rw-r--r-- | tests/libqtest.c | 2 | ||||
| -rw-r--r-- | tests/migration/guestperf/engine.py | 2 | ||||
| -rwxr-xr-x | tests/qemu-iotests/172 | 2 |
6 files changed, 6 insertions, 7 deletions
diff --git a/python/qemu/qtest.py b/python/qemu/qtest.py index eebcc23..3f1d2cb 100644 --- a/python/qemu/qtest.py +++ b/python/qemu/qtest.py @@ -96,7 +96,7 @@ class QEMUQtestMachine(QEMUMachine): def _base_args(self): args = super(QEMUQtestMachine, self)._base_args() args.extend(['-qtest', 'unix:path=' + self._qtest_path, - '-machine', 'accel=qtest']) + '-accel', 'qtest']) return args def _pre_launch(self): diff --git a/qemu-deprecated.texi b/qemu-deprecated.texi index 9d74a1c..01245e0 100644 --- a/qemu-deprecated.texi +++ b/qemu-deprecated.texi @@ -26,8 +26,7 @@ The @option{enforce-config-section} parameter is replaced by the @subsection -no-kvm (since 1.3.0) -The ``-no-kvm'' argument is now a synonym for setting -``-machine accel=tcg''. +The ``-no-kvm'' argument is now a synonym for setting ``-accel tcg''. @subsection -usbdevice (since 2.10.0) diff --git a/qemu-options.hx b/qemu-options.hx index bbfd936..80c16fa 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -4156,7 +4156,7 @@ STEXI Enable FIPS 140-2 compliance mode. ETEXI -HXCOMM Deprecated by -machine accel=tcg property +HXCOMM Deprecated by -accel tcg DEF("no-kvm", 0, QEMU_OPTION_no_kvm, "", QEMU_ARCH_I386) DEF("msg", HAS_ARG, QEMU_OPTION_msg, diff --git a/tests/libqtest.c b/tests/libqtest.c index 4a75564..38e4f5b 100644 --- a/tests/libqtest.c +++ b/tests/libqtest.c @@ -241,7 +241,7 @@ QTestState *qtest_init_without_qmp_handshake(const char *extra_args) "-qtest-log %s " "-chardev socket,path=%s,id=char0 " "-mon chardev=char0,mode=control " - "-machine accel=qtest " + "-accel qtest " "-display none " "%s", qemu_binary, socket_path, getenv("QTEST_LOG") ? "/dev/fd/2" : "/dev/null", diff --git a/tests/migration/guestperf/engine.py b/tests/migration/guestperf/engine.py index f13dbea..1dd04ce 100644 --- a/tests/migration/guestperf/engine.py +++ b/tests/migration/guestperf/engine.py @@ -287,7 +287,7 @@ class Engine(object): cmdline = "'" + cmdline + "'" argv = [ - "-machine", "accel=kvm", + "-accel", "kvm", "-cpu", "host", "-kernel", self._kernel, "-initrd", self._initrd, diff --git a/tests/qemu-iotests/172 b/tests/qemu-iotests/172 index ba7dad9..d67997e 100755 --- a/tests/qemu-iotests/172 +++ b/tests/qemu-iotests/172 @@ -55,7 +55,7 @@ do_run_qemu() done fi echo quit - ) | $QEMU -machine accel=qtest -nographic -monitor stdio -serial none "$@" + ) | $QEMU -accel qtest -nographic -monitor stdio -serial none "$@" echo } |