qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Richard Henderson <richard.henderson@linaro.org>
To: qemu-devel@nongnu.org
Cc: "Warner Losh" <imp@bsdimp.com>,
	"Philippe Mathieu-Daudé" <philmd@linaro.org>,
	"Helge Deller" <deller@gmx.de>
Subject: [PULL 31/39] *-user: Deprecate and disable -p pagesize
Date: Thu, 22 Feb 2024 10:43:15 -1000	[thread overview]
Message-ID: <20240222204323.268539-32-richard.henderson@linaro.org> (raw)
In-Reply-To: <20240222204323.268539-1-richard.henderson@linaro.org>

This option controls the host page size.  From the mis-usage in
our own testsuite, this is easily confused with guest page size.

The only thing that occurs when changing the host page size is
that stuff breaks, because one cannot actually change the host
page size.  Therefore reject all but the no-op setting as part
of the deprecation process.

Reviewed-by: Warner Losh <imp@bsdimp.com>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Acked-by: Helge Deller <deller@gmx.de>
Message-Id: <20240102015808.132373-27-richard.henderson@linaro.org>
---
 docs/about/deprecated.rst | 10 ++++++++++
 docs/user/main.rst        |  3 ---
 bsd-user/main.c           | 10 +++++-----
 linux-user/main.c         | 12 ++++++------
 4 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst
index 5a2305ccd6..3074303b9c 100644
--- a/docs/about/deprecated.rst
+++ b/docs/about/deprecated.rst
@@ -63,6 +63,16 @@ as short-form boolean values, and passed to plugins as ``arg_name=on``.
 However, short-form booleans are deprecated and full explicit ``arg_name=on``
 form is preferred.
 
+User-mode emulator command line arguments
+-----------------------------------------
+
+``-p`` (since 9.0)
+''''''''''''''''''
+
+The ``-p`` option pretends to control the host page size.  However,
+it is not possible to change the host page size, and using the
+option only causes failures.
+
 QEMU Machine Protocol (QMP) commands
 ------------------------------------
 
diff --git a/docs/user/main.rst b/docs/user/main.rst
index 7e7ad07409..d5fbb78d3c 100644
--- a/docs/user/main.rst
+++ b/docs/user/main.rst
@@ -87,9 +87,6 @@ Debug options:
    Activate logging of the specified items (use '-d help' for a list of
    log items)
 
-``-p pagesize``
-   Act as if the host page size was 'pagesize' bytes
-
 ``-g port``
    Wait gdb connection to port
 
diff --git a/bsd-user/main.c b/bsd-user/main.c
index e5efb7b845..521b58b880 100644
--- a/bsd-user/main.c
+++ b/bsd-user/main.c
@@ -364,11 +364,11 @@ int main(int argc, char **argv)
         } else if (!strcmp(r, "L")) {
             interp_prefix = argv[optind++];
         } else if (!strcmp(r, "p")) {
-            qemu_host_page_size = atoi(argv[optind++]);
-            if (qemu_host_page_size == 0 ||
-                (qemu_host_page_size & (qemu_host_page_size - 1)) != 0) {
-                fprintf(stderr, "page size must be a power of two\n");
-                exit(1);
+            unsigned size, want = qemu_real_host_page_size();
+
+            if (qemu_strtoui(arg, NULL, 10, &size) || size != want) {
+                warn_report("Deprecated page size option cannot "
+                            "change host page size (%u)", want);
             }
         } else if (!strcmp(r, "g")) {
             gdbstub = g_strdup(argv[optind++]);
diff --git a/linux-user/main.c b/linux-user/main.c
index e540acb84a..bad03f06d3 100644
--- a/linux-user/main.c
+++ b/linux-user/main.c
@@ -332,11 +332,11 @@ static void handle_arg_ld_prefix(const char *arg)
 
 static void handle_arg_pagesize(const char *arg)
 {
-    qemu_host_page_size = atoi(arg);
-    if (qemu_host_page_size == 0 ||
-        (qemu_host_page_size & (qemu_host_page_size - 1)) != 0) {
-        fprintf(stderr, "page size must be a power of two\n");
-        exit(EXIT_FAILURE);
+    unsigned size, want = qemu_real_host_page_size();
+
+    if (qemu_strtoui(arg, NULL, 10, &size) || size != want) {
+        warn_report("Deprecated page size option cannot "
+                    "change host page size (%u)", want);
     }
 }
 
@@ -496,7 +496,7 @@ static const struct qemu_argument arg_table[] = {
     {"D",          "QEMU_LOG_FILENAME", true, handle_arg_log_filename,
      "logfile",     "write logs to 'logfile' (default stderr)"},
     {"p",          "QEMU_PAGESIZE",    true,  handle_arg_pagesize,
-     "pagesize",   "set the host page size to 'pagesize'"},
+     "pagesize",   "deprecated change to host page size"},
     {"one-insn-per-tb",
                    "QEMU_ONE_INSN_PER_TB",  false, handle_arg_one_insn_per_tb,
      "",           "run with one guest instruction per emulated TB"},
-- 
2.34.1



  parent reply	other threads:[~2024-02-22 20:44 UTC|newest]

Thread overview: 42+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-02-22 20:42 [PULL 00/39] tcg and linux-user patch queue Richard Henderson
2024-02-22 20:42 ` [PULL 01/39] tcg/aarch64: Apple does not align __int128_t in even registers Richard Henderson
2024-02-22 20:42 ` [PULL 02/39] accel/tcg: Set can_do_io at at start of lookup_tb_ptr helper Richard Henderson
2024-02-22 20:42 ` [PULL 03/39] tcg: Avoid double lock if page tables happen to be in mmio memory Richard Henderson
2024-02-22 20:42 ` [PULL 04/39] accel/tcg: Remove qemu_host_page_size from page_protect/page_unprotect Richard Henderson
2024-02-22 20:42 ` [PULL 05/39] linux-user: Adjust SVr4 NULL page mapping Richard Henderson
2024-02-22 20:42 ` [PULL 06/39] linux-user: Remove qemu_host_page_{size, mask} in probe_guest_base Richard Henderson
2024-02-22 20:42 ` [PULL 07/39] linux-user: Remove qemu_host_page_size from create_elf_tables Richard Henderson
2024-02-22 20:42 ` [PULL 08/39] linux-user/hppa: Simplify init_guest_commpage Richard Henderson
2024-02-22 20:42 ` [PULL 09/39] linux-user/nios2: Remove qemu_host_page_size from init_guest_commpage Richard Henderson
2024-02-22 20:42 ` [PULL 10/39] linux-user/arm: " Richard Henderson
2024-02-22 20:42 ` [PULL 11/39] linux-user: Remove qemu_host_page_{size, mask} from mmap.c Richard Henderson
2024-02-22 20:42 ` [PULL 12/39] linux-user: Remove REAL_HOST_PAGE_ALIGN " Richard Henderson
2024-02-22 20:42 ` [PULL 13/39] linux-user: Remove HOST_PAGE_ALIGN " Richard Henderson
2024-02-22 20:42 ` [PULL 14/39] migration: Remove qemu_host_page_size Richard Henderson
2024-02-22 20:42 ` [PULL 15/39] hw/tpm: Remove HOST_PAGE_ALIGN from tpm_ppi_init Richard Henderson
2024-02-22 20:43 ` [PULL 16/39] softmmu/physmem: Remove qemu_host_page_size Richard Henderson
2024-02-22 20:43 ` [PULL 17/39] softmmu/physmem: Remove HOST_PAGE_ALIGN Richard Henderson
2024-02-22 20:43 ` [PULL 18/39] linux-user: Remove qemu_host_page_size from main Richard Henderson
2024-02-22 20:43 ` [PULL 19/39] linux-user: Split out target_mmap__locked Richard Henderson
2024-02-22 20:43 ` [PULL 20/39] linux-user: Move some mmap checks outside the lock Richard Henderson
2024-02-22 20:43 ` [PULL 21/39] linux-user: Fix sub-host-page mmap Richard Henderson
2024-02-22 20:43 ` [PULL 22/39] linux-user: Split out mmap_end Richard Henderson
2024-02-22 20:43 ` [PULL 23/39] linux-user: Do early mmap placement only for reserved_va Richard Henderson
2024-02-22 20:43 ` [PULL 24/39] linux-user: Split out do_munmap Richard Henderson
2024-02-22 20:43 ` [PULL 25/39] linux-user: Use do_munmap for target_mmap failure Richard Henderson
2024-02-22 20:43 ` [PULL 26/39] linux-user: Split out mmap_h_eq_g Richard Henderson
2024-02-22 20:43 ` [PULL 27/39] linux-user: Split out mmap_h_lt_g Richard Henderson
2024-02-22 20:43 ` [PULL 28/39] linux-user: Split out mmap_h_gt_g Richard Henderson
2024-02-22 20:43 ` [PULL 29/39] tests/tcg: Remove run-test-mmap-* Richard Henderson
2024-02-22 20:43 ` [PULL 30/39] tests/tcg: Extend file in linux-madvise.c Richard Henderson
2024-02-22 20:43 ` Richard Henderson [this message]
2024-02-22 20:43 ` [PULL 32/39] cpu: Remove page_size_init Richard Henderson
2024-02-22 20:43 ` [PULL 33/39] accel/tcg: Disconnect TargetPageDataNode from page size Richard Henderson
2024-02-22 20:43 ` [PULL 34/39] linux-user: Allow TARGET_PAGE_BITS_VARY Richard Henderson
2024-02-22 20:43 ` [PULL 35/39] target/arm: Enable TARGET_PAGE_BITS_VARY for AArch64 user-only Richard Henderson
2024-02-22 20:43 ` [PULL 36/39] linux-user: Bound mmap_min_addr by host page size Richard Henderson
2024-02-22 20:43 ` [PULL 37/39] target/ppc: Enable TARGET_PAGE_BITS_VARY for user-only Richard Henderson
2024-02-22 20:43 ` [PULL 38/39] target/alpha: " Richard Henderson
2024-02-22 20:43 ` [PULL 39/39] linux-user: Remove pgb_dynamic alignment assertion Richard Henderson
2024-02-23 13:45 ` [PULL 00/39] tcg and linux-user patch queue Peter Maydell
2024-02-23 22:26   ` Richard Henderson

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20240222204323.268539-32-richard.henderson@linaro.org \
    --to=richard.henderson@linaro.org \
    --cc=deller@gmx.de \
    --cc=imp@bsdimp.com \
    --cc=philmd@linaro.org \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).