[Qemu-commits] [qemu/qemu] ba858d: qemu-options: -chardev reconnect=seconds duplicate...

[Richard Henderson]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: ba858d1fadec417ab95c29938d2a0bb967d86114
      
https://github.com/qemu/qemu/commit/ba858d1fadec417ab95c29938d2a0bb967d86114
  Author: Markus Armbruster <armbru@redhat.com>
  Date:   2021-10-04 (Mon, 04 Oct 2021)

  Changed paths:
    M qemu-options.hx

  Log Message:
  -----------
  qemu-options: -chardev reconnect=seconds duplicated in help, tidy up

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>


  Commit: 553dc36b387d9c99740f5ae825465ffdd93685f2
      
https://github.com/qemu/qemu/commit/553dc36b387d9c99740f5ae825465ffdd93685f2
  Author: Yanan Wang <wangyanan55@huawei.com>
  Date:   2021-10-04 (Mon, 04 Oct 2021)

  Changed paths:
    M qemu-options.hx

  Log Message:
  -----------
  qemu-options: Tweak [, maxcpus=cpus] to [, maxcpus=maxcpus]

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>


  Commit: 848dd26928e2f4ceb63d7de06dd0b5f5b55bbddd
      
https://github.com/qemu/qemu/commit/848dd26928e2f4ceb63d7de06dd0b5f5b55bbddd
  Author: Yanan Wang <wangyanan55@huawei.com>
  Date:   2021-10-04 (Mon, 04 Oct 2021)

  Changed paths:
    M qemu-options.hx

  Log Message:
  -----------
  qemu-options: Add missing "sockets=2, maxcpus=2" to CLI "-smp 2"

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>


  Commit: 196fb7ac7cb83f3b5547435f3b1d8b5bfaca35fb
      
https://github.com/qemu/qemu/commit/196fb7ac7cb83f3b5547435f3b1d8b5bfaca35fb
  Author: Richard Henderson <richard.henderson@linaro.org>
  Date:   2021-10-04 (Mon, 04 Oct 2021)

  Changed paths:
    M target/sh4/translate.c

  Log Message:
  -----------
  target/sh4: Use lookup_symbol in sh4_tr_disas_log

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>


  Commit: daf0db06308b55c518312abc39a4bf74413ac007
      
https://github.com/qemu/qemu/commit/daf0db06308b55c518312abc39a4bf74413ac007
  Author: Philippe Mathieu-Daudé <f4bug@amsat.org>
  Date:   2021-10-04 (Mon, 04 Oct 2021)

  Changed paths:
    M hw/remote/proxy.c

  Log Message:
  -----------
  hw/remote/proxy: Categorize Wireless devices as 'Network' ones

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>


  Commit: 9618c5badaa8eed25259cf095ff880efb939fbe7
      
https://github.com/qemu/qemu/commit/9618c5badaa8eed25259cf095ff880efb939fbe7
  Author: Richard Henderson <richard.henderson@linaro.org>
  Date:   2021-10-04 (Mon, 04 Oct 2021)

  Changed paths:
    M hw/remote/proxy.c
    M qemu-options.hx
    M target/sh4/translate.c

  Log Message:
  -----------
  Merge remote-tracking branch 
'remotes/vivier/tags/trivial-branch-for-6.2-pull-request' into staging

Pull request trivial-patches 2021104

# gpg: Signature made Mon 04 Oct 2021 01:30:22 AM PDT
# gpg:                using RSA key CD2F75DDC8E3A4DC2E4F5173F30C38BD3F2FBE3C
# gpg:                issuer "laurent@vivier.eu"
# gpg: Good signature from "Laurent Vivier <lvivier@redhat.com>" [full]
# gpg:                 aka "Laurent Vivier <laurent@vivier.eu>" [full]
# gpg:                 aka "Laurent Vivier (Red Hat) <lvivier@redhat.com>" 
[full]

* remotes/vivier/tags/trivial-branch-for-6.2-pull-request:
  hw/remote/proxy: Categorize Wireless devices as 'Network' ones
  target/sh4: Use lookup_symbol in sh4_tr_disas_log
  qemu-options: Add missing "sockets=2, maxcpus=2" to CLI "-smp 2"
  qemu-options: Tweak [, maxcpus=cpus] to [, maxcpus=maxcpus]
  qemu-options: -chardev reconnect=seconds duplicated in help, tidy up

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


Compare: https://github.com/qemu/qemu/compare/e7ab6584784d...9618c5badaa8