mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove the deprecated -realtime option

Browse Source 
It has been marked as deprecated since QEMU v4.2, replaced by
the -overcommit option. Time to remove it now.

Signed-off-by: Thomas Huth <thuth@redhat.com>
Message-Id: <20201210155808.233895-4-thuth@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Thomas Huth 2020-12-10 16:58:07 +01:00 committed by Paolo Bonzini
parent 2c5060cd32
commit c8c9dc42b7
5 changed files with 9 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
docs/system/deprecated.rst
View File

@ -75,12 +75,6 @@ The ``pretty=on|off`` switch has no effect for HMP monitors, but is
silently ignored. Using the switch with HMP monitors will become an
error in the future.
``-realtime`` (since 4.1)
'''''''''''''''''''''''''
The ``-realtime mlock=on|off`` argument has been replaced by the
``-overcommit mem-lock=on|off`` argument.
RISC-V ``-bios`` (since 5.1)
''''''''''''''''''''''''''''

6
docs/system/removed-features.rst
View File

@ -20,6 +20,12 @@ for the ``id`` parameter, which should now be used instead.
The ``-no-kvm`` argument was a synonym for setting ``-machine accel=tcg``.
``-realtime`` (removed in 6.0)
''''''''''''''''''''''''''''''
The ``-realtime mlock=on|off`` argument has been replaced by the
``-overcommit mem-lock=on|off`` argument.
``-tb-size`` option (removed in 6.0)
''''''''''''''''''''''''''''''''''''

14
qemu-options.hx
View File

@ -3713,17 +3713,6 @@ SRST
Do not start CPU at startup (you must type 'c' in the monitor).
ERST
DEF("realtime", HAS_ARG, QEMU_OPTION_realtime,
"-realtime [mlock=on|off]\n"
" run qemu with realtime features\n"
" mlock=on|off controls mlock support (default: on)\n",
QEMU_ARCH_ALL)
SRST
``-realtime mlock=on|off``
Run qemu with realtime features. mlocking qemu and guest memory can
be enabled via ``mlock=on`` (enabled by default).
ERST
DEF("overcommit", HAS_ARG, QEMU_OPTION_overcommit,
"-overcommit [mem-lock=on|off][cpu-pm=on|off]\n"
" run qemu with overcommit hints\n"
@ -3739,8 +3728,7 @@ SRST
Locking qemu and guest memory can be enabled via ``mem-lock=on``
(disabled by default). This works when host memory is not
overcommitted and reduces the worst-case latency for guest. This is
equivalent to ``realtime``.
overcommitted and reduces the worst-case latency for guest.
Guest ability to manage power state of host cpus (increasing latency
for other processes on the same host cpu, but decreasing latency for

29
softmmu/vl.c
View File

@ -326,18 +326,6 @@ static QemuOptsList qemu_tpmdev_opts = {
},
};
static QemuOptsList qemu_realtime_opts = {
.name = "realtime",
.head = QTAILQ_HEAD_INITIALIZER(qemu_realtime_opts.head),
.desc = {
{
.name = "mlock",
.type = QEMU_OPT_BOOL,
},
{ /* end of list */ }
},
};
static QemuOptsList qemu_overcommit_opts = {
.name = "overcommit",
.head = QTAILQ_HEAD_INITIALIZER(qemu_overcommit_opts.head),
@ -2600,7 +2588,6 @@ void qemu_init(int argc, char **argv, char **envp)
qemu_add_opts(&qemu_add_fd_opts);
qemu_add_opts(&qemu_object_opts);
qemu_add_opts(&qemu_tpmdev_opts);
qemu_add_opts(&qemu_realtime_opts);
qemu_add_opts(&qemu_overcommit_opts);
qemu_add_opts(&qemu_msg_opts);
qemu_add_opts(&qemu_name_opts);
@ -3418,27 +3405,13 @@ void qemu_init(int argc, char **argv, char **envp)
exit(1);
}
break;
case QEMU_OPTION_realtime:
warn_report("'-realtime mlock=...' is deprecated, please use "
"'-overcommit mem-lock=...' instead");
opts = qemu_opts_parse_noisily(qemu_find_opts("realtime"),
optarg, false);
if (!opts) {
exit(1);
}
/* Don't override the -overcommit option if set */
enable_mlock = enable_mlock ||
qemu_opt_get_bool(opts, "mlock", true);
break;
case QEMU_OPTION_overcommit:
opts = qemu_opts_parse_noisily(qemu_find_opts("overcommit"),
optarg, false);
if (!opts) {
exit(1);
}
/* Don't override the -realtime option if set */
enable_mlock = enable_mlock ||
qemu_opt_get_bool(opts, "mem-lock", false);
enable_mlock = qemu_opt_get_bool(opts, "mem-lock", false);
enable_cpu_pm = qemu_opt_get_bool(opts, "cpu-pm", false);
break;
case QEMU_OPTION_msg:

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

@ -304,7 +304,7 @@ class Engine(object):
argv_source += ["-mem-path", "/dev/shm",
"-mem-prealloc"]
if hardware._locked_pages:
argv_source += ["-realtime", "mlock=on"]
argv_source += ["-overcommit", "mem-lock=on"]
if hardware._huge_pages:
pass