From nobody Sat Feb 7 07:25:55 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1607615932; cv=none; d=zohomail.com; s=zohoarc; b=E2c0kOvfAmMJCVHWz3jrwmtm4izLSEJP+KXbrJd6MfBrl1+F5sXHtivw4Wifn1aukJ71Wmd09dpWlb0mp2mDVShHoVDzMY0gR+ChoSaRQ25wwXg9MAhyXKrMDz4BKBpIV7ZPRizwLMUKF1wkXpl3MW4Hz7y8cSxanwJJwKmt35Y= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1607615932; 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=5/6X1Q0Vn+1CyF4/TCkAOIvTcfz9+jq1y6vKssndBYU=; b=C5CkspI1r83X+er+lZPZMDYc6ESPYsrFY2X3Q2wmR8pBUj31+UO3qGgyBvvZLdxPhDQJxO156wq7+2RmJmw2ugukKb3X3Bm86eW3KrNLZvdQEbBPQ0+ew6e3nFOvebcRZWIA3mAw2K+X0sde7eE4CsHY9LNoJkSHZspU3zVq7+E= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1607615932055352.59408165547734; Thu, 10 Dec 2020 07:58:52 -0800 (PST) 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-319-t_GpbLVsPf6i-0HOH3fUJQ-1; Thu, 10 Dec 2020 10:58:48 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id A844019251A6; Thu, 10 Dec 2020 15:58:41 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 83D3560C7A; Thu, 10 Dec 2020 15:58:41 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 4E6B94EBC6; Thu, 10 Dec 2020 15:58:41 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 0BAFwUKh025847 for ; Thu, 10 Dec 2020 10:58:30 -0500 Received: by smtp.corp.redhat.com (Postfix) id 700EC6F99B; Thu, 10 Dec 2020 15:58:30 +0000 (UTC) Received: from thuth.com (ovpn-112-62.ams2.redhat.com [10.36.112.62]) by smtp.corp.redhat.com (Postfix) with ESMTP id CC27B6F987; Thu, 10 Dec 2020 15:58:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1607615930; h=from:from:sender:sender: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:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=5/6X1Q0Vn+1CyF4/TCkAOIvTcfz9+jq1y6vKssndBYU=; b=IIykAsSF55VHJH8VBt9B7957O/Am+iKRoqGJfBdkLq9c3w+TdY1y5nylxE36OFSaw0KSf+ lVZ+GBVrpbzOwcJ5C6U76aFV+ThPaEE7DPFOB6tWLPVBCWRAk/p8zgL1uH7wyidp937pEz lRU206lCwkdSlT8Ms9+8FYNs4JqoJ84= X-MC-Unique: t_GpbLVsPf6i-0HOH3fUJQ-1 From: Thomas Huth To: qemu-devel@nongnu.org, Paolo Bonzini Subject: [PATCH 3/4] Remove the deprecated -realtime option Date: Thu, 10 Dec 2020 16:58:07 +0100 Message-Id: <20201210155808.233895-4-thuth@redhat.com> In-Reply-To: <20201210155808.233895-1-thuth@redhat.com> References: <20201210155808.233895-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-loop: libvir-list@redhat.com Cc: libvir-list@redhat.com, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , kraxel@redhat.com, mst@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" 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 --- 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 fa1ecf0958..307b83ea60 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 8f0578f1eb..63046d5c24 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 7ce06290b6..79a4c35b49 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 3f052849d8..9f4c228c0e 100644 --- a/softmmu/vl.c +++ b/softmmu/vl.c @@ -354,18 +354,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), @@ -2940,7 +2928,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); @@ -3771,27 +3758,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.27.0