From nobody Tue Nov 18 07:41:54 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1608058154; cv=none; d=zohomail.com; s=zohoarc; b=eo5OYjn+ODBkzYU2eqDHwdflg24p8ufWa3tRJbi+40hwMafid85n6Vt+ui3ceEg5a7UzpSbAUcmeMc6CtLnUulG0oZVvbzswYouGJqGInpMlnubvM0crmwRHiX1zHzpIlc9lD/LjRd7w/5+pYcKhEyCnBV9OTZJItQ2VZSS7HDY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1608058154; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=wP6ovGcg2h5VP2NRSeohAMJYSFs+AXahVHwTrhxEfyU=; b=fPgSXEsQnfhpkkYUC/0vE8IERB6sljaAapfljmY/G+VRoslehHh6cYkHhEddmyN9K7EKpv+fet6A5zSd8+APeHYr0B2cjpFkA7rzEPcpAq+jfjNuLcEOia46CMW6ScYV1/hrQYGB0GUG7/AAZGV2ZE74SFWQcn78oOmKJw2tXu0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1608058154097763.1427549575494; Tue, 15 Dec 2020 10:49:14 -0800 (PST) Received: from localhost ([::1]:39854 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kpEfS-0005Ko-An for importer@patchew.org; Tue, 15 Dec 2020 13:03:22 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:34326) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kpEXV-0003Fl-IL for qemu-devel@nongnu.org; Tue, 15 Dec 2020 12:55:10 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:35825) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kpEXL-0001VY-F5 for qemu-devel@nongnu.org; Tue, 15 Dec 2020 12:55:09 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-324-QMkEfN0nMsiX-tp1HaQWvw-1; Tue, 15 Dec 2020 12:54:56 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 98FC0800D62 for ; Tue, 15 Dec 2020 17:54:55 +0000 (UTC) Received: from virtlab701.virt.lab.eng.bos.redhat.com (virtlab701.virt.lab.eng.bos.redhat.com [10.19.152.228]) by smtp.corp.redhat.com (Postfix) with ESMTP id 580A35C1C4; Tue, 15 Dec 2020 17:54:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1608054898; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=wP6ovGcg2h5VP2NRSeohAMJYSFs+AXahVHwTrhxEfyU=; b=arqb+HuePENpJ+G51Ucign2iqAQ8AwRKpF2fmcZKQwFm/BVlUwR9aUZ8bzyL7IJCuE/hTh mxBSfmQiUEoR1WR9J0pEaDYupK+WoxzMiQ8/UYyElvNXYom/kVlrk/DrzxyK3lXMkPuQN6 EYTDDvDW1c6by+AkP4KSr4Q6Zc0sHNk= X-MC-Unique: QMkEfN0nMsiX-tp1HaQWvw-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 22/45] Remove the deprecated -realtime option Date: Tue, 15 Dec 2020 12:54:22 -0500 Message-Id: <20201215175445.1272776-23-pbonzini@redhat.com> In-Reply-To: <20201215175445.1272776-1-pbonzini@redhat.com> References: <20201215175445.1272776-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=63.128.21.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas Huth Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" From: Thomas Huth 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 Message-Id: <20201210155808.233895-4-thuth@redhat.com> Signed-off-by: Paolo Bonzini --- docs/system/deprecated.rst | 6 ------ docs/system/removed-features.rst | 6 ++++++ qemu-options.hx | 14 +------------- softmmu/vl.c | 29 +---------------------------- tests/migration/guestperf/engine.py | 2 +- 5 files changed, 9 insertions(+), 48 deletions(-) diff --git a/docs/system/deprecated.rst b/docs/system/deprecated.rst index b0d44a06cb..16810d1b85 100644 --- a/docs/system/deprecated.rst +++ b/docs/system/deprecated.rst @@ -75,12 +75,6 @@ The ``pretty=3Don|off`` switch has no effect for HMP mon= itors, but is silently ignored. Using the switch with HMP monitors will become an error in the future. =20 -``-realtime`` (since 4.1) -''''''''''''''''''''''''' - -The ``-realtime mlock=3Don|off`` argument has been replaced by the -``-overcommit mem-lock=3Don|off`` argument. - RISC-V ``-bios`` (since 5.1) '''''''''''''''''''''''''''' =20 diff --git a/docs/system/removed-features.rst b/docs/system/removed-feature= s.rst index 8a974f7acd..58d4e3874c 100644 --- a/docs/system/removed-features.rst +++ b/docs/system/removed-features.rst @@ -20,6 +20,12 @@ for the ``id`` parameter, which should now be used inste= ad. =20 The ``-no-kvm`` argument was a synonym for setting ``-machine accel=3Dtcg`= `. =20 +``-realtime`` (removed in 6.0) +'''''''''''''''''''''''''''''' + +The ``-realtime mlock=3Don|off`` argument has been replaced by the +``-overcommit mem-lock=3Don|off`` argument. + ``-tb-size`` option (removed in 6.0) '''''''''''''''''''''''''''''''''''' =20 diff --git a/qemu-options.hx b/qemu-options.hx index 6f0098717d..c85f73e300 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -3713,17 +3713,6 @@ SRST Do not start CPU at startup (you must type 'c' in the monitor). ERST =20 -DEF("realtime", HAS_ARG, QEMU_OPTION_realtime, - "-realtime [mlock=3Don|off]\n" - " run qemu with realtime features\n" - " mlock=3Don|off controls mlock support (default: on)\n= ", - QEMU_ARCH_ALL) -SRST -``-realtime mlock=3Don|off`` - Run qemu with realtime features. mlocking qemu and guest memory can - be enabled via ``mlock=3Don`` (enabled by default). -ERST - DEF("overcommit", HAS_ARG, QEMU_OPTION_overcommit, "-overcommit [mem-lock=3Don|off][cpu-pm=3Don|off]\n" " run qemu with overcommit hints\n" @@ -3739,8 +3728,7 @@ SRST =20 Locking qemu and guest memory can be enabled via ``mem-lock=3Don`` (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. =20 Guest ability to manage power state of host cpus (increasing latency for other processes on the same host cpu, but decreasing latency for 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 =3D { }, }; =20 -static QemuOptsList qemu_realtime_opts =3D { - .name =3D "realtime", - .head =3D QTAILQ_HEAD_INITIALIZER(qemu_realtime_opts.head), - .desc =3D { - { - .name =3D "mlock", - .type =3D QEMU_OPT_BOOL, - }, - { /* end of list */ } - }, -}; - static QemuOptsList qemu_overcommit_opts =3D { .name =3D "overcommit", .head =3D 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=3D...' is deprecated, please= use " - "'-overcommit mem-lock=3D...' instead"); - opts =3D qemu_opts_parse_noisily(qemu_find_opts("realtime"= ), - optarg, false); - if (!opts) { - exit(1); - } - /* Don't override the -overcommit option if set */ - enable_mlock =3D enable_mlock || - qemu_opt_get_bool(opts, "mlock", true); - break; case QEMU_OPTION_overcommit: opts =3D qemu_opts_parse_noisily(qemu_find_opts("overcommi= t"), optarg, false); if (!opts) { exit(1); } - /* Don't override the -realtime option if set */ - enable_mlock =3D enable_mlock || - qemu_opt_get_bool(opts, "mem-lock", false); + enable_mlock =3D qemu_opt_get_bool(opts, "mem-lock", false= ); enable_cpu_pm =3D qemu_opt_get_bool(opts, "cpu-pm", false); break; case QEMU_OPTION_msg: diff --git a/tests/migration/guestperf/engine.py b/tests/migration/guestper= f/engine.py index e2a214bdab..83bfc3b6bb 100644 --- a/tests/migration/guestperf/engine.py +++ b/tests/migration/guestperf/engine.py @@ -304,7 +304,7 @@ class Engine(object): argv_source +=3D ["-mem-path", "/dev/shm", "-mem-prealloc"] if hardware._locked_pages: - argv_source +=3D ["-realtime", "mlock=3Don"] + argv_source +=3D ["-overcommit", "mem-lock=3Don"] if hardware._huge_pages: pass =20 --=20 2.26.2