[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 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

[PULL 1/5] qemu-options: -chardev reconnect=seconds duplicated in help, tidy up

[Laurent Vivier]

From: Markus Armbruster <armbru@redhat.com>

Fixes: 5dd1f02b4bc2f2c2ef3a2adfd8a412c8c8769085
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Message-Id: <20210928071449.1416022-1-armbru@redhat.com>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
 qemu-options.hx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/qemu-options.hx b/qemu-options.hx
index 8ef178180db6..4f2dc91e0b27 100644
--- a/qemu-options.hx
+++ b/qemu-options.hx
@@ -3202,7 +3202,7 @@ DEFHEADING(Character device options:)
 DEF("chardev", HAS_ARG, QEMU_OPTION_chardev,
     "-chardev help\n"
     "-chardev null,id=id[,mux=on|off][,logfile=PATH][,logappend=on|off]\n"
-    "-chardev socket,id=id[,host=host],port=port[,to=to][,ipv4=on|off][,ipv6=on|off][,nodelay=on|off][,reconnect=seconds]\n"
+    "-chardev socket,id=id[,host=host],port=port[,to=to][,ipv4=on|off][,ipv6=on|off][,nodelay=on|off]\n"
     "         [,server=on|off][,wait=on|off][,telnet=on|off][,websocket=on|off][,reconnect=seconds][,mux=on|off]\n"
     "         [,logfile=PATH][,logappend=on|off][,tls-creds=ID][,tls-authz=ID] (tcp)\n"
     "-chardev socket,id=id,path=path[,server=on|off][,wait=on|off][,telnet=on|off][,websocket=on|off][,reconnect=seconds]\n"
-- 
2.31.1

[PULL 2/5] qemu-options: Tweak [, maxcpus=cpus] to [, maxcpus=maxcpus]

[Laurent Vivier]

From: Yanan Wang <wangyanan55@huawei.com>

In qemu-option.hx, there is "-smp [[cpus=]n][,maxcpus=cpus]..." in the
DEF part, and "-smp [[cpus=]n][,maxcpus=maxcpus]..." in the RST part.
Obviously the later is right, let's fix the previous one.

Signed-off-by: Yanan Wang <wangyanan55@huawei.com>
Reviewed-by: Damien Hedde <damien.hedde@greensocs.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Reviewed-by: Andrew Jones <drjones@redhat.com>
Message-Id: <20210928121134.21064-2-wangyanan55@huawei.com>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
 qemu-options.hx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/qemu-options.hx b/qemu-options.hx
index 4f2dc91e0b27..bba1ef973fec 100644
--- a/qemu-options.hx
+++ b/qemu-options.hx
@@ -206,7 +206,7 @@ SRST
 ERST
 
 DEF("smp", HAS_ARG, QEMU_OPTION_smp,
-    "-smp [[cpus=]n][,maxcpus=cpus][,sockets=sockets][,dies=dies][,cores=cores][,threads=threads]\n"
+    "-smp [[cpus=]n][,maxcpus=maxcpus][,sockets=sockets][,dies=dies][,cores=cores][,threads=threads]\n"
     "                set the number of CPUs to 'n' [default=1]\n"
     "                maxcpus= maximum number of total CPUs, including\n"
     "                offline CPUs for hotplug, etc\n"
-- 
2.31.1

[PULL 3/5] qemu-options: Add missing "sockets=2, maxcpus=2" to CLI "-smp 2"

[Laurent Vivier]

From: Yanan Wang <wangyanan55@huawei.com>

There is one numa config example in qemu-options.hx currently
using "-smp 2" and assuming that there will be 2 sockets and
2 cpus totally. However now the actual calculation logic of
missing sockets and cores is not immutable and is considered
liable to change. Although we will get maxcpus=2 finally based
on current parser, it's always stable to specify it explicitly.

So "-smp 2,sockets=2,maxcpus=2" will be optimal when we expect
multiple sockets and 2 cpus totally.

Signed-off-by: Yanan Wang <wangyanan55@huawei.com>
Reviewed-by: Philippe Mathieu-Daude <philmd@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Reviewed-by: Andrew Jones <drjones@redhat.com>
Message-Id: <20210928121134.21064-3-wangyanan55@huawei.com>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
 qemu-options.hx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/qemu-options.hx b/qemu-options.hx
index bba1ef973fec..5f375bbfa666 100644
--- a/qemu-options.hx
+++ b/qemu-options.hx
@@ -401,7 +401,7 @@ SRST
         -m 2G \
         -object memory-backend-ram,size=1G,id=m0 \
         -object memory-backend-ram,size=1G,id=m1 \
-        -smp 2 \
+        -smp 2,sockets=2,maxcpus=2 \
         -numa node,nodeid=0,memdev=m0 \
         -numa node,nodeid=1,memdev=m1,initiator=0 \
         -numa cpu,node-id=0,socket-id=0 \
-- 
2.31.1

[PULL 4/5] target/sh4: Use lookup_symbol in sh4_tr_disas_log

[Laurent Vivier]

From: Richard Henderson <richard.henderson@linaro.org>

The correct thing to do has been present but commented
out since the initial commit of the sh4 translator.

Fixes: fdf9b3e831e
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20210929130316.121330-1-richard.henderson@linaro.org>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
 target/sh4/translate.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/target/sh4/translate.c b/target/sh4/translate.c
index cf5fe9243d6c..d36305027240 100644
--- a/target/sh4/translate.c
+++ b/target/sh4/translate.c
@@ -2344,7 +2344,7 @@ static void sh4_tr_tb_stop(DisasContextBase *dcbase, CPUState *cs)
 
 static void sh4_tr_disas_log(const DisasContextBase *dcbase, CPUState *cs)
 {
-    qemu_log("IN:\n");  /* , lookup_symbol(dcbase->pc_first)); */
+    qemu_log("IN: %s\n", lookup_symbol(dcbase->pc_first));
     log_target_disas(cs, dcbase->pc_first, dcbase->tb->size);
 }
 
-- 
2.31.1

[PULL 5/5] hw/remote/proxy: Categorize Wireless devices as 'Network' ones

[Laurent Vivier]

From: Philippe Mathieu-Daudé <f4bug@amsat.org>

QEMU doesn't distinct network devices per link layer (Ethernet,
Wi-Fi, CAN, ...). Categorize PCI Wireless cards as Network
devices.

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Jagannathan Raman <jag.raman@oracle.com>
Message-Id: <20210926201926.1690896-1-f4bug@amsat.org>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
 hw/remote/proxy.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/hw/remote/proxy.c b/hw/remote/proxy.c
index 499f540c947d..bad164299dd4 100644
--- a/hw/remote/proxy.c
+++ b/hw/remote/proxy.c
@@ -324,6 +324,7 @@ static void probe_pci_info(PCIDevice *dev, Error **errp)
         set_bit(DEVICE_CATEGORY_STORAGE, dc->categories);
         break;
     case PCI_BASE_CLASS_NETWORK:
+    case PCI_BASE_CLASS_WIRELESS:
         set_bit(DEVICE_CATEGORY_NETWORK, dc->categories);
         break;
     case PCI_BASE_CLASS_INPUT:
-- 
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~

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 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