OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

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>
This commit is contained in:
Thomas Huth 2019-09-04 07:27:39 +02:00 committed by Laurent Vivier
parent 31e404151b
commit 976e8c5414
6 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
python/qemu/qtest.py
View File

@ -96,7 +96,7 @@ class QEMUQtestMachine(QEMUMachine):
def _base_args(self): def _base_args(self):
args = super(QEMUQtestMachine, self)._base_args() args = super(QEMUQtestMachine, self)._base_args()
args.extend(['-qtest', 'unix:path=' + self._qtest_path, args.extend(['-qtest', 'unix:path=' + self._qtest_path,
'-machine', 'accel=qtest']) '-accel', 'qtest'])
return args return args
def _pre_launch(self): def _pre_launch(self):

3
qemu-deprecated.texi
View File

@ -26,8 +26,7 @@ The @option{enforce-config-section} parameter is replaced by the
@subsection -no-kvm (since 1.3.0) @subsection -no-kvm (since 1.3.0)
The ``-no-kvm'' argument is now a synonym for setting The ``-no-kvm'' argument is now a synonym for setting ``-accel tcg''.
``-machine accel=tcg''.
@subsection -usbdevice (since 2.10.0) @subsection -usbdevice (since 2.10.0)

2
qemu-options.hx
View File

@ -4156,7 +4156,7 @@ STEXI
Enable FIPS 140-2 compliance mode. Enable FIPS 140-2 compliance mode.
ETEXI 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("no-kvm", 0, QEMU_OPTION_no_kvm, "", QEMU_ARCH_I386)
DEF("msg", HAS_ARG, QEMU_OPTION_msg, DEF("msg", HAS_ARG, QEMU_OPTION_msg,

2
tests/libqtest.c
View File

@ -241,7 +241,7 @@ QTestState *qtest_init_without_qmp_handshake(const char *extra_args)
"-qtest-log %s " "-qtest-log %s "
"-chardev socket,path=%s,id=char0 " "-chardev socket,path=%s,id=char0 "
"-mon chardev=char0,mode=control " "-mon chardev=char0,mode=control "
"-machine accel=qtest " "-accel qtest "
"-display none " "-display none "
"%s", qemu_binary, socket_path, "%s", qemu_binary, socket_path,
getenv("QTEST_LOG") ? "/dev/fd/2" : "/dev/null", getenv("QTEST_LOG") ? "/dev/fd/2" : "/dev/null",

2
tests/migration/guestperf/engine.py
View File

@ -287,7 +287,7 @@ class Engine(object):
cmdline = "'" + cmdline + "'" cmdline = "'" + cmdline + "'"
argv = [ argv = [
"-machine", "accel=kvm", "-accel", "kvm",
"-cpu", "host", "-cpu", "host",
"-kernel", self._kernel, "-kernel", self._kernel,
"-initrd", self._initrd, "-initrd", self._initrd,

2
tests/qemu-iotests/172
View File

@ -55,7 +55,7 @@ do_run_qemu()
done done
fi fi
echo quit echo quit
) | $QEMU -machine accel=qtest -nographic -monitor stdio -serial none "$@" ) | $QEMU -accel qtest -nographic -monitor stdio -serial none "$@"
echo echo
} }