Commit 976e8c54 authored by Thomas Huth's avatar Thomas Huth Committed by Laurent Vivier
Browse files

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: default avatarThomas Huth <thuth@redhat.com>
Acked-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Message-Id: <20190904052739.22123-1-thuth@redhat.com>
Signed-off-by: default avatarLaurent Vivier <laurent@vivier.eu>
parent 31e40415

python/qemu/qtest.py

+1 −1
Original line number Diff line number Diff line
@@ -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):

qemu-deprecated.texi

+1 −2
Original line number Diff line number Diff line
@@ -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)

qemu-options.hx

+1 −1
Original line number Diff line number Diff line
@@ -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,

tests/libqtest.c

+1 −1
Original line number Diff line number Diff line
@@ -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",

tests/migration/guestperf/engine.py

+1 −1
Original line number Diff line number Diff line
@@ -287,7 +287,7 @@ class Engine(object): 
            cmdline = "'" + cmdline + "'"



        argv = [

            "-machine", "accel=kvm",

            "-accel", "kvm",

            "-cpu", "host",

            "-kernel", self._kernel,

            "-initrd", self._initrd,