From nobody Sat May 18 17:34:38 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.124; envelope-from=philmd@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 63.128.21.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1606908441; cv=none; d=zohomail.com; s=zohoarc; b=F0ToTbfa08NZPV4/88aTUcjJuphKsnP6YAsE+ErI4Ysb5ZDRmHmbtaeuI5N9ggf6Wgc7QKF2EGejjSntDb7vRotoQ8f7T4UdmhC0vrK2tS5Dc9+aCGvzA9RHt4UEx+MWMq6ZLBlMyM5L0HjFVxarj56VDsFhMR8GLVf6SbTZHZI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1606908441; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:MIME-Version:Message-ID:Subject:To; bh=RxnjjR18gk0mt5xIalKlUpLiPI5xq8GgzKcqQXfviyE=; b=lvmDAVtXM0Uky5R7kJ+KhtY1ewnr5A4mtc/T7eHTnRgSW96/VIm97BHZP/CktrC/fHaMg6AVL0YFh17gu3qV9mdE7HLFMFJEM1pO5JpQ8YM1JWwnIfY3iwPkUi1okHMCkaWHgvYFbD9oWYPSVO8Ec01Hf8ZyyZ+KYb1d/JyxOEk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by mx.zohomail.com with SMTPS id 1606908441191154.48006014808084; Wed, 2 Dec 2020 03:27:21 -0800 (PST) Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-204-9W-G5jRpNC-vUm6Q-OB-uA-1; Wed, 02 Dec 2020 06:27:18 -0500 Received: by mail-wm1-f70.google.com with SMTP id k128so3168488wme.7 for ; Wed, 02 Dec 2020 03:27:18 -0800 (PST) Return-Path: Return-Path: Received: from localhost.localdomain (111.red-88-21-205.staticip.rima-tde.net. [88.21.205.111]) by smtp.gmail.com with ESMTPSA id g192sm1695693wme.48.2020.12.02.03.27.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Dec 2020 03:27:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1606908439; 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; bh=RxnjjR18gk0mt5xIalKlUpLiPI5xq8GgzKcqQXfviyE=; b=UBmPBSstBRsg2iUodCcwholUJn2tWZKYBKW5G67fu4XKdG19rjgh6lNzoaoHVvNQDsRPdA O3hwhOK3oVLmJDW7ZW80wiZJgE9AVlbihPmXYUo1YNq6IJxCFV0ALQzQCAlEgFDHr/ExK2 leuXluTaMmeoKgmqdCp8YoyI7VyRW4Q= X-MC-Unique: 9W-G5jRpNC-vUm6Q-OB-uA-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=RxnjjR18gk0mt5xIalKlUpLiPI5xq8GgzKcqQXfviyE=; b=XsfDTz6NOfD0wWM2FxBEBsHYh3XxMlyjlxOdbMQgCp+lQC23MtsnKiuTu+Z+5W4Q0j Q0KKjkyb6kP4Sa0ZhhJCAwvQorWrlckspDmJVi3sNTjobNuJYbZw+BIsgfyOzmLlveME Lnk58M3/qzcm4Bt9v/Bl3bBWAKrUWIpTW2oQgJ/nZBJ0bLPGVhwn5gZp//+d4ZaQcB+A 436vT82kJcqwlkex9IqxUTfMhNRklYon5w5b9UDCk/oQFWJwERoG3JN7lLWwhGMPDGxX +B0IlfLH+FjX/30hxh6ji8Y8lHP6PerROCUGB+Zm4mpeZVwmci3Oe8Wwc0Pl8D9VXDQq wxMA== X-Gm-Message-State: AOAM531vTGQeQL/V3D81UT7jbpyBXD735ZRtVa7B92zfzzL559lH+5KG YWd/0y+yLuAYQAFlhPvR6ZHk53jHr3eWhhUn+o8YyYsAjJRjXlW3/kQIJi+iKDolw46T3p68Axn GPnD1VlLsv+cTdQ== X-Received: by 2002:a5d:4f90:: with SMTP id d16mr2920117wru.292.1606908437142; Wed, 02 Dec 2020 03:27:17 -0800 (PST) X-Google-Smtp-Source: ABdhPJwDo3cMDy8pdGI0AFvr6eyVz3myPouOauiOvAQKcTk7mgE8b38quGqmL2mrsFOTtT5pS+JP2g== X-Received: by 2002:a5d:4f90:: with SMTP id d16mr2920084wru.292.1606908436854; Wed, 02 Dec 2020 03:27:16 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: libvir-list@redhat.com, Richard Henderson , Thomas Huth , Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH] accel/tcg: Remove deprecated '-tb-size' option Date: Wed, 2 Dec 2020 12:27:14 +0100 Message-Id: <20201202112714.1223783-1-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) The '-tb-size' option (replaced by '-accel tcg,tb-size') is deprecated since 5.0 (commit fe174132478). Remove it. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: J=C3=A1n Tomko Reviewed-by: Thomas Huth --- docs/system/deprecated.rst | 12 +++++------- accel/tcg/translate-all.c | 2 +- softmmu/vl.c | 8 -------- qemu-options.hx | 8 -------- 4 files changed, 6 insertions(+), 24 deletions(-) diff --git a/docs/system/deprecated.rst b/docs/system/deprecated.rst index 565389697e8..70bdb62a6d6 100644 --- a/docs/system/deprecated.rst +++ b/docs/system/deprecated.rst @@ -100,13 +100,6 @@ QEMU 5.1 has three options: to the user to load all the images they need. 3. ``-bios `` - Tells QEMU to load the specified file as the firmwr= ae. =20 -``-tb-size`` option (since 5.0) -''''''''''''''''''''''''''''''' - -QEMU 5.0 introduced an alternative syntax to specify the size of the trans= lation -block cache, ``-accel tcg,tb-size=3D``. The new syntax deprecates the -previously available ``-tb-size`` option. - ``-show-cursor`` option (since 5.0) ''''''''''''''''''''''''''''''''''' =20 @@ -523,6 +516,11 @@ for the ``id`` parameter, which should now be used ins= tead. =20 The ``-no-kvm`` argument was a synonym for setting ``-machine accel=3Dtcg`= `. =20 +``-tb-size`` option (removed in 6.0) +''''''''''''''''''''''''''''''' + +QEMU 5.0 introduced an alternative syntax to specify the size of the trans= lation +block cache, ``-accel tcg,tb-size=3D``. =20 QEMU Machine Protocol (QMP) commands ------------------------------------ diff --git a/accel/tcg/translate-all.c b/accel/tcg/translate-all.c index 4572b4901fb..b7d50a73d44 100644 --- a/accel/tcg/translate-all.c +++ b/accel/tcg/translate-all.c @@ -2379,7 +2379,7 @@ void dump_exec_info(void) qemu_printf("Translation buffer state:\n"); /* * Report total code size including the padding and TB structs; - * otherwise users might think "-tb-size" is not honoured. + * otherwise users might think "-accel tcg,tb-size" is not honoured. * For avg host size we use the precise numbers from tb_tree_stats tho= ugh. */ qemu_printf("gen code size %zu/%zu\n", diff --git a/softmmu/vl.c b/softmmu/vl.c index e6e0ad5a925..3f052849d8c 100644 --- a/softmmu/vl.c +++ b/softmmu/vl.c @@ -3639,14 +3639,6 @@ void qemu_init(int argc, char **argv, char **envp) exit(1); } break; - case QEMU_OPTION_tb_size: -#ifndef CONFIG_TCG - error_report("TCG is disabled"); - exit(1); -#endif - warn_report("The -tb-size option is deprecated, use -accel= tcg,tb-size instead"); - object_register_sugar_prop(ACCEL_CLASS_NAME("tcg"), "tb-si= ze", optarg); - break; case QEMU_OPTION_icount: icount_opts =3D qemu_opts_parse_noisily(qemu_find_opts("ic= ount"), optarg, true); diff --git a/qemu-options.hx b/qemu-options.hx index 104632ea343..7ce06290b68 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -4080,14 +4080,6 @@ SRST Show cursor. ERST =20 -DEF("tb-size", HAS_ARG, QEMU_OPTION_tb_size, \ - "-tb-size n set TB size\n", QEMU_ARCH_ALL) -SRST -``-tb-size n`` - Set TCG translation block cache size. Deprecated, use - '\ ``-accel tcg,tb-size=3Dn``\ ' instead. -ERST - DEF("incoming", HAS_ARG, QEMU_OPTION_incoming, \ "-incoming tcp:[host]:port[,to=3Dmaxport][,ipv4][,ipv6]\n" \ "-incoming rdma:host:port[,ipv4][,ipv6]\n" \ --=20 2.26.2