aboutsummaryrefslogtreecommitdiff
path: root/softmmu
diff options
context:
space:
mode:
authorThomas Huth <thuth@redhat.com>2020-12-10 16:58:07 +0100
committerPaolo Bonzini <pbonzini@redhat.com>2020-12-15 12:52:02 -0500
commitc8c9dc42b7ca84b6892b51e3daeb693a9efec7a4 (patch)
tree69fc5dc942d13466177b5dbfb3bfdc9ced28df51 /softmmu
parent2c5060cd32bf8ec120de7579b39d14d773e5b4ea (diff)
Remove the deprecated -realtime option
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>
Diffstat (limited to 'softmmu')
-rw-r--r--softmmu/vl.c29
1 files changed, 1 insertions, 28 deletions
diff --git a/softmmu/vl.c b/softmmu/vl.c
index da9a0bdb94..b3918d6a68 100644
--- a/softmmu/vl.c
+++ b/softmmu/vl.c
@@ -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: