[PULL 0/5] Trivial branch for 6.2 patches

[PULL 0/5] Trivial branch for 6.2 patches

[Laurent Vivier]

The following changes since commit 11a11998460ed84d9a127c025f50f7234e5a483f:

  Merge remote-tracking branch 'remotes/rth/tags/pull-tcg-20210921' into staging (2021-09-24 13:21:18 -0400)

are available in the Git repository at:

  git://github.com/vivier/qemu.git tags/trivial-branch-for-6.2-pull-request

for you to fetch changes up to 45b09cb12f5440971b321fc255e3930f38366ace:

  multi-process: fix usage information (2021-09-27 10:57:21 +0200)

----------------------------------------------------------------
Trivial patches pull request 20210927

----------------------------------------------------------------

Dongli Zhang (1):
  multi-process: fix usage information

Markus Armbruster (2):
  hmp: Unbreak "change vnc"
  hmp: Drop a bogus sentence from set_password's documentation

Pankaj Gupta (1):
  docs/nvdimm: Update nvdimm option value in machine example

Philippe Mathieu-Daudé (1):
  hw/loader: Restrict PC_ROM_* definitions to hw/i386/pc

 docs/nvdimm.txt               |  2 +-
 docs/system/multi-process.rst |  2 +-
 hmp-commands.hx               | 11 +++++------
 hw/i386/pc.c                  |  6 ++++++
 include/hw/loader.h           |  6 ------
 monitor/hmp-cmds.c            |  2 +-
 6 files changed, 14 insertions(+), 15 deletions(-)

-- 
2.31.1

[PULL 1/5] docs/nvdimm: Update nvdimm option value in machine example

[Laurent Vivier]

From: Pankaj Gupta <pankaj.gupta.linux@gmail.com>

Update nvdimm option value in example command from "-machine pc,nvdimm"
to "-machine pc,nvdimm=on" as former complains with the below error:

"qemu-system-x86_64: -machine pc,nvdimm: Expected '=' after parameter 'nvdimm'"

Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Signed-off-by: Pankaj Gupta <pankaj.gupta.linux@gmail.com>
Message-Id: <20210923103015.135262-1-pankaj.gupta.linux@gmail.com>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
 docs/nvdimm.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/nvdimm.txt b/docs/nvdimm.txt
index 0aae682be3eb..fd7773dc5abb 100644
--- a/docs/nvdimm.txt
+++ b/docs/nvdimm.txt
@@ -15,7 +15,7 @@ backend (i.e. memory-backend-file and memory-backend-ram). A simple
 way to create a vNVDIMM device at startup time is done via the
 following command line options:
 
- -machine pc,nvdimm
+ -machine pc,nvdimm=on
  -m $RAM_SIZE,slots=$N,maxmem=$MAX_SIZE
  -object memory-backend-file,id=mem1,share=on,mem-path=$PATH,size=$NVDIMM_SIZE,readonly=off
  -device nvdimm,id=nvdimm1,memdev=mem1,unarmed=off
-- 
2.31.1

[PULL 2/5] hw/loader: Restrict PC_ROM_* definitions to hw/i386/pc

[Laurent Vivier]

From: Philippe Mathieu-Daudé <philmd@redhat.com>

The PC_ROM_* definitions are only used by the PC machine,
and are irrelevant to the other architectures / machines.
Reduce their scope by moving them to hw/i386/pc.c.

Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Message-Id: <20210917185949.2244956-1-philmd@redhat.com>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
 hw/i386/pc.c        | 6 ++++++
 include/hw/loader.h | 6 ------
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/hw/i386/pc.c b/hw/i386/pc.c
index 7e523b913caa..557d49c9f8f1 100644
--- a/hw/i386/pc.c
+++ b/hw/i386/pc.c
@@ -843,6 +843,12 @@ void xen_load_linux(PCMachineState *pcms)
     x86ms->fw_cfg = fw_cfg;
 }
 
+#define PC_ROM_MIN_VGA     0xc0000
+#define PC_ROM_MIN_OPTION  0xc8000
+#define PC_ROM_MAX         0xe0000
+#define PC_ROM_ALIGN       0x800
+#define PC_ROM_SIZE        (PC_ROM_MAX - PC_ROM_MIN_VGA)
+
 void pc_memory_init(PCMachineState *pcms,
                     MemoryRegion *system_memory,
                     MemoryRegion *rom_memory,
diff --git a/include/hw/loader.h b/include/hw/loader.h
index cbfc1848737c..81104cb02fed 100644
--- a/include/hw/loader.h
+++ b/include/hw/loader.h
@@ -336,12 +336,6 @@ void hmp_info_roms(Monitor *mon, const QDict *qdict);
 #define rom_add_blob_fixed_as(_f, _b, _l, _a, _as)      \
     rom_add_blob(_f, _b, _l, _l, _a, NULL, NULL, NULL, _as, true)
 
-#define PC_ROM_MIN_VGA     0xc0000
-#define PC_ROM_MIN_OPTION  0xc8000
-#define PC_ROM_MAX         0xe0000
-#define PC_ROM_ALIGN       0x800
-#define PC_ROM_SIZE        (PC_ROM_MAX - PC_ROM_MIN_VGA)
-
 int rom_add_vga(const char *file);
 int rom_add_option(const char *file, int32_t bootindex);
 
-- 
2.31.1

[PULL 3/5] hmp: Unbreak "change vnc"

[Laurent Vivier]

From: Markus Armbruster <armbru@redhat.com>

HMP command "change vnc" can take the password as argument, or prompt
for it:

    (qemu) change vnc password 123
    (qemu) change vnc password
    Password: ***
    (qemu)

This regressed in commit cfb5387a1d "hmp: remove "change vnc TARGET"
command", v6.0.0.

    (qemu) change vnc passwd 123
    Password: ***
    (qemu) change vnc passwd
    (qemu)

The latter passes NULL to qmp_change_vnc_password(), which is a no-no.
Looks like it puts the display into "password required, but none set"
state.

The logic error is easy to miss in review, but testing should've
caught it.

Fix the obvious way.

Fixes: cfb5387a1de2acda23fb5c97d2378b9e7ddf8025
Cc: qemu-stable@nongnu.org
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Reviewed-by: Gerd Hoffmann <kraxel@redhat.com>
Message-Id: <20210909081219.308065-2-armbru@redhat.com>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
 monitor/hmp-cmds.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/monitor/hmp-cmds.c b/monitor/hmp-cmds.c
index e00255f7ee70..a7e197a90bf7 100644
--- a/monitor/hmp-cmds.c
+++ b/monitor/hmp-cmds.c
@@ -1496,7 +1496,7 @@ void hmp_change(Monitor *mon, const QDict *qdict)
         }
         if (strcmp(target, "passwd") == 0 ||
             strcmp(target, "password") == 0) {
-            if (arg) {
+            if (!arg) {
                 MonitorHMP *hmp_mon = container_of(mon, MonitorHMP, common);
                 monitor_read_password(hmp_mon, hmp_change_read_arg, NULL);
                 return;
-- 
2.31.1

[PULL 4/5] hmp: Drop a bogus sentence from set_password's documentation

[Laurent Vivier]

From: Markus Armbruster <armbru@redhat.com>

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Reviewed-by: Gerd Hoffmann <kraxel@redhat.com>
Message-Id: <20210909081219.308065-3-armbru@redhat.com>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
 hmp-commands.hx | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/hmp-commands.hx b/hmp-commands.hx
index 8e45bce2cd9d..cf723c69acb7 100644
--- a/hmp-commands.hx
+++ b/hmp-commands.hx
@@ -1522,12 +1522,11 @@ ERST
 
 SRST
 ``set_password [ vnc | spice ] password [ action-if-connected ]``
-  Change spice/vnc password.  Use zero to make the password stay valid
-  forever.  *action-if-connected* specifies what should happen in
-  case a connection is established: *fail* makes the password change
-  fail.  *disconnect* changes the password and disconnects the
-  client.  *keep* changes the password and keeps the connection up.
-  *keep* is the default.
+  Change spice/vnc password.  *action-if-connected* specifies what
+  should happen in case a connection is established: *fail* makes the
+  password change fail.  *disconnect* changes the password and
+  disconnects the client.  *keep* changes the password and keeps the
+  connection up.  *keep* is the default.
 ERST
 
     {
-- 
2.31.1

[PULL 5/5] multi-process: fix usage information

[Laurent Vivier]

From: Dongli Zhang <dongli.zhang@oracle.com>

From source code, the 'devid' of x-remote-object should be one of devices
in remote QEMU process.

Signed-off-by: Dongli Zhang <dongli.zhang@oracle.com>
Reviewed-by: Jagannathan Raman <jag.raman@oracle.com>
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Message-Id: <20210713004718.20381-1-dongli.zhang@oracle.com>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
 docs/system/multi-process.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/system/multi-process.rst b/docs/system/multi-process.rst
index 46bb0cafc27a..210531ee17df 100644
--- a/docs/system/multi-process.rst
+++ b/docs/system/multi-process.rst
@@ -45,7 +45,7 @@ Following is a description of command-line used to launch mpqemu.
       -device lsi53c895a,id=lsi0                                         \
       -drive id=drive_image2,file=/build/ol7-nvme-test-1.qcow2           \
       -device scsi-hd,id=drive2,drive=drive_image2,bus=lsi0.0,scsi-id=0  \
-      -object x-remote-object,id=robj1,devid=lsi1,fd=4,
+      -object x-remote-object,id=robj1,devid=lsi0,fd=4,
 
 * QEMU:
 
-- 
2.31.1

Re: [PULL 0/5] Trivial branch for 6.2 patches

[Peter Maydell]

On Mon, 27 Sept 2021 at 11:02, Laurent Vivier <laurent@vivier.eu> wrote:
>
> The following changes since commit 11a11998460ed84d9a127c025f50f7234e5a483f:
>
>   Merge remote-tracking branch 'remotes/rth/tags/pull-tcg-20210921' into staging (2021-09-24 13:21:18 -0400)
>
> are available in the Git repository at:
>
>   git://github.com/vivier/qemu.git tags/trivial-branch-for-6.2-pull-request
>
> for you to fetch changes up to 45b09cb12f5440971b321fc255e3930f38366ace:
>
>   multi-process: fix usage information (2021-09-27 10:57:21 +0200)
>
> ----------------------------------------------------------------
> Trivial patches pull request 20210927
>
> ----------------------------------------------------------------


Applied, thanks.

Please update the changelog at https://wiki.qemu.org/ChangeLog/6.2
for any user-visible changes.

-- PMM

[PULL 0/5] Trivial branch for 6.2 patches

[Laurent Vivier]

The following changes since commit 30bd1db58b09c12b68c35f041f919014b885482d:

  Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging (2021-10-03 08:45:19 -0400)

are available in the Git repository at:

  git://github.com/vivier/qemu.git tags/trivial-branch-for-6.2-pull-request

for you to fetch changes up to daf0db06308b55c518312abc39a4bf74413ac007:

  hw/remote/proxy: Categorize Wireless devices as 'Network' ones (2021-10-04 09:47:26 +0200)

----------------------------------------------------------------
Pull request trivial-patches 2021104

----------------------------------------------------------------

Markus Armbruster (1):
  qemu-options: -chardev reconnect=seconds duplicated in help, tidy up

Philippe Mathieu-Daudé (1):
  hw/remote/proxy: Categorize Wireless devices as 'Network' ones

Richard Henderson (1):
  target/sh4: Use lookup_symbol in sh4_tr_disas_log

Yanan Wang (2):
  qemu-options: Tweak [, maxcpus=cpus] to [, maxcpus=maxcpus]
  qemu-options: Add missing "sockets=2, maxcpus=2" to CLI "-smp 2"

 hw/remote/proxy.c      | 1 +
 qemu-options.hx        | 6 +++---
 target/sh4/translate.c | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

-- 
2.31.1

Re: [PULL 0/5] Trivial branch for 6.2 patches

[Richard Henderson]

On 10/4/21 1:30 AM, Laurent Vivier wrote:
> The following changes since commit 30bd1db58b09c12b68c35f041f919014b885482d:
> 
>    Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging (2021-10-03 08:45:19 -0400)
> 
> are available in the Git repository at:
> 
>    git://github.com/vivier/qemu.git tags/trivial-branch-for-6.2-pull-request
> 
> for you to fetch changes up to daf0db06308b55c518312abc39a4bf74413ac007:
> 
>    hw/remote/proxy: Categorize Wireless devices as 'Network' ones (2021-10-04 09:47:26 +0200)
> 
> ----------------------------------------------------------------
> Pull request trivial-patches 2021104

Applied, thanks.

r~