[PATCH] linux-user: Drop deprecated -p option

Peter Maydell posted 1 patch 1 month ago
Failed in applying to current master (apply log)
docs/about/deprecated.rst       | 10 ----------
docs/about/removed-features.rst |  8 ++++++++
bsd-user/main.c                 |  8 --------
linux-user/main.c               | 12 ------------
4 files changed, 8 insertions(+), 30 deletions(-)
[PATCH] linux-user: Drop deprecated -p option
Posted by Peter Maydell 1 month ago
The user-mode '-p' option has been deprecated since 9.0 and
doesn't do anything except emit a warning. We are well past
our minimum deprecation period, so drop the option.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
 docs/about/deprecated.rst       | 10 ----------
 docs/about/removed-features.rst |  8 ++++++++
 bsd-user/main.c                 |  8 --------
 linux-user/main.c               | 12 ------------
 4 files changed, 8 insertions(+), 30 deletions(-)

diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst
index 58bce715f9c..dfb7882e3da 100644
--- a/docs/about/deprecated.rst
+++ b/docs/about/deprecated.rst
@@ -68,16 +68,6 @@ configurations (e.g. -smp drawers=1,books=1,clusters=1 for x86 PC machine) is
 marked deprecated since 9.0, users have to ensure that all the topology members
 described with -smp are supported by the target machine.
 
-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/about/removed-features.rst b/docs/about/removed-features.rst
index b1b3d1b1b3f..06f186991ac 100644
--- a/docs/about/removed-features.rst
+++ b/docs/about/removed-features.rst
@@ -583,6 +583,14 @@ The ``-singlestep`` option has been given a name that better reflects
 what it actually does. For both linux-user and bsd-user, use the
 ``-one-insn-per-tb`` option instead.
 
+``-p`` (removed in 10.2)
+''''''''''''''''''''''''
+
+The ``-p`` option pretends to control the host page size.  However,
+it is not possible to change the host page size; we stopped trying
+to do anything with the option except print a warning from 9.0,
+and now the option is removed entirely.
+
 
 QEMU Machine Protocol (QMP) commands
 ------------------------------------
diff --git a/bsd-user/main.c b/bsd-user/main.c
index 7e5d4bbce09..9ba69642f50 100644
--- a/bsd-user/main.c
+++ b/bsd-user/main.c
@@ -367,14 +367,6 @@ int main(int argc, char **argv)
             }
         } else if (!strcmp(r, "L")) {
             interp_prefix = argv[optind++];
-        } else if (!strcmp(r, "p")) {
-            unsigned size, want = qemu_real_host_page_size();
-
-            r = argv[optind++];
-            if (qemu_strtoui(r, 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++]);
         } else if (!strcmp(r, "r")) {
diff --git a/linux-user/main.c b/linux-user/main.c
index 6edeeecef38..7b0ccb6fd60 100644
--- a/linux-user/main.c
+++ b/linux-user/main.c
@@ -340,16 +340,6 @@ static void handle_arg_ld_prefix(const char *arg)
     interp_prefix = strdup(arg);
 }
 
-static void handle_arg_pagesize(const char *arg)
-{
-    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);
-    }
-}
-
 static void handle_arg_seed(const char *arg)
 {
     seed_optarg = arg;
@@ -522,8 +512,6 @@ static const struct qemu_argument arg_table[] = {
      "range[,...]","filter logging based on address range"},
     {"D",          "QEMU_LOG_FILENAME", true, handle_arg_log_filename,
      "logfile",     "write logs to 'logfile' (default stderr)"},
-    {"p",          "QEMU_PAGESIZE",    true,  handle_arg_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.43.0
Re: [PATCH] linux-user: Drop deprecated -p option
Posted by Philippe Mathieu-Daudé 1 month ago
On 28/8/25 18:20, Peter Maydell wrote:
> The user-mode '-p' option has been deprecated since 9.0 and
> doesn't do anything except emit a warning. We are well past
> our minimum deprecation period, so drop the option.
> 
> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
> ---
>   docs/about/deprecated.rst       | 10 ----------
>   docs/about/removed-features.rst |  8 ++++++++
>   bsd-user/main.c                 |  8 --------
>   linux-user/main.c               | 12 ------------
>   4 files changed, 8 insertions(+), 30 deletions(-)

Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>


Re: [PATCH] linux-user: Drop deprecated -p option
Posted by Richard Henderson 1 month ago
On 8/29/25 02:20, Peter Maydell wrote:
> The user-mode '-p' option has been deprecated since 9.0 and
> doesn't do anything except emit a warning. We are well past
> our minimum deprecation period, so drop the option.
> 
> Signed-off-by: Peter Maydell<peter.maydell@linaro.org>
> ---
>   docs/about/deprecated.rst       | 10 ----------
>   docs/about/removed-features.rst |  8 ++++++++
>   bsd-user/main.c                 |  8 --------
>   linux-user/main.c               | 12 ------------
>   4 files changed, 8 insertions(+), 30 deletions(-)

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>

r~
Re: [PATCH] linux-user: Drop deprecated -p option
Posted by Alex Bennée 1 month ago
Peter Maydell <peter.maydell@linaro.org> writes:

> The user-mode '-p' option has been deprecated since 9.0 and
> doesn't do anything except emit a warning. We are well past
> our minimum deprecation period, so drop the option.
>
> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>

Reviewed-by: Alex Bennée <alex.bennee@linaro.org>

-- 
Alex Bennée
Virtualisation Tech Lead @ Linaro
Re: [PATCH] linux-user: Drop deprecated -p option
Posted by Thomas Huth 1 month ago
On 28/08/2025 18.20, Peter Maydell wrote:
> The user-mode '-p' option has been deprecated since 9.0 and
> doesn't do anything except emit a warning. We are well past
> our minimum deprecation period, so drop the option.
> 
> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
> ---
>   docs/about/deprecated.rst       | 10 ----------
>   docs/about/removed-features.rst |  8 ++++++++
>   bsd-user/main.c                 |  8 --------
>   linux-user/main.c               | 12 ------------
>   4 files changed, 8 insertions(+), 30 deletions(-)

Reviewed-by: Thomas Huth <thuth@redhat.com>
Re: [PATCH] linux-user: Drop deprecated -p option
Posted by Manos Pitsidianakis 1 month ago
On Thu, 28 Aug 2025 19:20, Peter Maydell <peter.maydell@linaro.org> wrote:
>The user-mode '-p' option has been deprecated since 9.0 and
>doesn't do anything except emit a warning. We are well past
>our minimum deprecation period, so drop the option.
>
>Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
>---
> docs/about/deprecated.rst       | 10 ----------
> docs/about/removed-features.rst |  8 ++++++++
> bsd-user/main.c                 |  8 --------
> linux-user/main.c               | 12 ------------
> 4 files changed, 8 insertions(+), 30 deletions(-)

What about docs/user/main.rst?

>
>diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst
>index 58bce715f9c..dfb7882e3da 100644
>--- a/docs/about/deprecated.rst
>+++ b/docs/about/deprecated.rst
>@@ -68,16 +68,6 @@ configurations (e.g. -smp drawers=1,books=1,clusters=1 for x86 PC machine) is
> marked deprecated since 9.0, users have to ensure that all the topology members
> described with -smp are supported by the target machine.
> 
>-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/about/removed-features.rst b/docs/about/removed-features.rst
>index b1b3d1b1b3f..06f186991ac 100644
>--- a/docs/about/removed-features.rst
>+++ b/docs/about/removed-features.rst
>@@ -583,6 +583,14 @@ The ``-singlestep`` option has been given a name that better reflects
> what it actually does. For both linux-user and bsd-user, use the
> ``-one-insn-per-tb`` option instead.
> 
>+``-p`` (removed in 10.2)
>+''''''''''''''''''''''''
>+
>+The ``-p`` option pretends to control the host page size.  However,
>+it is not possible to change the host page size; we stopped trying
>+to do anything with the option except print a warning from 9.0,
>+and now the option is removed entirely.
>+
> 
> QEMU Machine Protocol (QMP) commands
> ------------------------------------
>diff --git a/bsd-user/main.c b/bsd-user/main.c
>index 7e5d4bbce09..9ba69642f50 100644
>--- a/bsd-user/main.c
>+++ b/bsd-user/main.c
>@@ -367,14 +367,6 @@ int main(int argc, char **argv)
>             }
>         } else if (!strcmp(r, "L")) {
>             interp_prefix = argv[optind++];
>-        } else if (!strcmp(r, "p")) {
>-            unsigned size, want = qemu_real_host_page_size();
>-
>-            r = argv[optind++];
>-            if (qemu_strtoui(r, 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++]);
>         } else if (!strcmp(r, "r")) {
>diff --git a/linux-user/main.c b/linux-user/main.c
>index 6edeeecef38..7b0ccb6fd60 100644
>--- a/linux-user/main.c
>+++ b/linux-user/main.c
>@@ -340,16 +340,6 @@ static void handle_arg_ld_prefix(const char *arg)
>     interp_prefix = strdup(arg);
> }
> 
>-static void handle_arg_pagesize(const char *arg)
>-{
>-    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);
>-    }
>-}
>-
> static void handle_arg_seed(const char *arg)
> {
>     seed_optarg = arg;
>@@ -522,8 +512,6 @@ static const struct qemu_argument arg_table[] = {
>      "range[,...]","filter logging based on address range"},
>     {"D",          "QEMU_LOG_FILENAME", true, handle_arg_log_filename,
>      "logfile",     "write logs to 'logfile' (default stderr)"},
>-    {"p",          "QEMU_PAGESIZE",    true,  handle_arg_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.43.0
>
>
Re: [PATCH] linux-user: Drop deprecated -p option
Posted by Richard Henderson 1 month ago
On 8/29/25 17:44, Manos Pitsidianakis wrote:
> On Thu, 28 Aug 2025 19:20, Peter Maydell <peter.maydell@linaro.org> wrote:
>> The user-mode '-p' option has been deprecated since 9.0 and
>> doesn't do anything except emit a warning. We are well past
>> our minimum deprecation period, so drop the option.
>>
>> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
>> ---
>> docs/about/deprecated.rst       | 10 ----------
>> docs/about/removed-features.rst |  8 ++++++++
>> bsd-user/main.c                 |  8 --------
>> linux-user/main.c               | 12 ------------
>> 4 files changed, 8 insertions(+), 30 deletions(-)
> 
> What about docs/user/main.rst?

Thanks.  I've squashed that removal while applying.


r~