[Qemu-commits] [qemu/qemu] 5da4cc: pci: Clean up a few things checkpatch.pl would fla...

[Peter Maydell]

  Branch: refs/heads/staging
  Home:   https://github.com/qemu/qemu
  Commit: 5da4ccd9d4222378b19a135661409d4585165fde
      
https://github.com/qemu/qemu/commit/5da4ccd9d4222378b19a135661409d4585165fde
  Author: Markus Armbruster <armbru@redhat.com>
  Date:   2022-12-19 (Mon, 19 Dec 2022)

  Changed paths:
    M hw/pci/pci.c

  Log Message:
  -----------
  pci: Clean up a few things checkpatch.pl would flag later on

Fix a few style violations so that checkpatch.pl won't complain when I
move this code.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-Id: <20221201121133.3813857-2-armbru@redhat.com>


  Commit: 987b73b38930842a17b1f102b81881ca3086d3e5
      
https://github.com/qemu/qemu/commit/987b73b38930842a17b1f102b81881ca3086d3e5
  Author: Markus Armbruster <armbru@redhat.com>
  Date:   2022-12-19 (Mon, 19 Dec 2022)

  Changed paths:
    M hw/pci/meson.build
    A hw/pci/pci-internal.h
    A hw/pci/pci-qmp-cmds.c
    M hw/pci/pci.c

  Log Message:
  -----------
  pci: Move QMP commands to new hw/pci/pci-qmp-cmds.c

This moves these commands from MAINTAINERS section "QMP" to "PCI".

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Message-Id: <20221201121133.3813857-3-armbru@redhat.com>
[Commit message improved]


  Commit: 5ef4a0cb63231845bd2a7d749ed2335a1ce35091
      
https://github.com/qemu/qemu/commit/5ef4a0cb63231845bd2a7d749ed2335a1ce35091
  Author: Markus Armbruster <armbru@redhat.com>
  Date:   2022-12-19 (Mon, 19 Dec 2022)

  Changed paths:
    M hw/pci/meson.build
    A hw/pci/pci-hmp-cmds.c
    M monitor/hmp-cmds.c

  Log Message:
  -----------
  pci: Move HMP commands from monitor/ to new hw/pci/pci-hmp-cmds.c

This moves these commands from MAINTAINERS section "Human
Monitor (HMP)" to "PCI".

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Message-Id: <20221201121133.3813857-4-armbru@redhat.com>


  Commit: 6be4ddffd09a3b184338ecb07ce3539732e00ba1
      
https://github.com/qemu/qemu/commit/6be4ddffd09a3b184338ecb07ce3539732e00ba1
  Author: Markus Armbruster <armbru@redhat.com>
  Date:   2022-12-19 (Mon, 19 Dec 2022)

  Changed paths:
    M hw/pci/pci-hmp-cmds.c
    M hw/pci/pci-stub.c

  Log Message:
  -----------
  pci: Make query-pci stub consistent with the real one

QMP query-pci and HMP info pci can behave differently when there are
no PCI devices.  They can report nothing, like this:

    qemu-system-aarch64 -S -M spitz -display none -monitor stdio
    QEMU 7.1.91 monitor - type 'help' for more information
    (qemu) info pci

Or they can fail, like this:

    qemu-system-microblaze -M petalogix-s3adsp1800 -display none -monitor stdio
    QEMU 7.1.91 monitor - type 'help' for more information
    (qemu) info pci
    PCI devices not supported

They fail when none of the target's machines supports PCI, i.e. when
we're using qmp_query_pci() from hw/pci/pci-stub.c.

The error is not useful, and reporting nothing makes sense, so do that
in pci-stub.c, too.

Now qmp_query_pci() can't fail anymore.  Drop the dead error handling
from hmp_info_pci().

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Message-Id: <20221201121133.3813857-5-armbru@redhat.com>


  Commit: c2c139749733545516ffff0b54f949bb3343711f
      
https://github.com/qemu/qemu/commit/c2c139749733545516ffff0b54f949bb3343711f
  Author: Markus Armbruster <armbru@redhat.com>
  Date:   2022-12-19 (Mon, 19 Dec 2022)

  Changed paths:
    M hw/pci/meson.build
    M hw/pci/pci-stub.c

  Log Message:
  -----------
  pci: Build hw/pci/pci-hmp-cmds.c only when CONFIG_PCI

We compile pci-hmp-cmds.c always, but pci-qmp-cmds.c only when
CONFIG_PCI.  hw/pci/pci-stub.c keeps the linker happy when
!CONFIG_PCI.  Build pci-hmp-cmds.c that way, too.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Message-Id: <20221201121133.3813857-6-armbru@redhat.com>


  Commit: ef21900951bb2f5510ce4b238f167e93ca2a11fd
      
https://github.com/qemu/qemu/commit/ef21900951bb2f5510ce4b238f167e93ca2a11fd
  Author: Markus Armbruster <armbru@redhat.com>
  Date:   2022-12-19 (Mon, 19 Dec 2022)

  Changed paths:
    M hw/pci/pci.c

  Log Message:
  -----------
  pci: Deduplicate get_class_desc()

pcibus_dev_print() contains a copy of get_class_desc().  Call the
function instead.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Message-Id: <20221201121133.3813857-7-armbru@redhat.com>


  Commit: 0bcaaff8d80fd00537bb7963a9baeedb68ec2ad4
      
https://github.com/qemu/qemu/commit/0bcaaff8d80fd00537bb7963a9baeedb68ec2ad4
  Author: Markus Armbruster <armbru@redhat.com>
  Date:   2022-12-19 (Mon, 19 Dec 2022)

  Changed paths:
    M hw/pci/pci-hmp-cmds.c
    M hw/pci/pci-internal.h
    M hw/pci/pci.c

  Log Message:
  -----------
  pci: Move pcibus_dev_print() to pci-hmp-cmds.c

This method is for HMP command "info qtree".

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-Id: <20221201121133.3813857-8-armbru@redhat.com>


  Commit: 236aafa61c83d26cf9aa8b043ce92194f9be144b
      
https://github.com/qemu/qemu/commit/236aafa61c83d26cf9aa8b043ce92194f9be144b
  Author: Markus Armbruster <armbru@redhat.com>
  Date:   2022-12-19 (Mon, 19 Dec 2022)

  Changed paths:
    M hw/pci/pcie_aer.c

  Log Message:
  -----------
  pci: Fix silent truncation of pcie_aer_inject_error argument

PCI AER error status is 32 bit.  The HMP command supports both
symbolic and numeric error status: anything that isn't a known
symbolic value is parsed as number with strtol().  Issues:

* Empty argument yields value zero.

* Range errors from strtol() are ignored, value is UINT32_MAX.

* Values not representable in uint32_t are silently truncated.

Fix to reject such input by switching to strtoui().

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Message-Id: <20221201121133.3813857-9-armbru@redhat.com>


  Commit: d0e67298096bb42e99fe4c7ef9eae3cecbf46c28
      
https://github.com/qemu/qemu/commit/d0e67298096bb42e99fe4c7ef9eae3cecbf46c28
  Author: Markus Armbruster <armbru@redhat.com>
  Date:   2022-12-19 (Mon, 19 Dec 2022)

  Changed paths:
    M hw/pci/pci-hmp-cmds.c
    M hw/pci/pci-internal.h
    M hw/pci/pci-stub.c
    M hw/pci/pcie_aer.c
    M include/monitor/hmp.h
    M include/sysemu/sysemu.h

  Log Message:
  -----------
  pci: Move HMP command from hw/pci/pcie_aer.c to pci-hmp-cmds.c

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-Id: <20221201121133.3813857-10-armbru@redhat.com>


  Commit: 74a11ca6d9bfd357d62cfa5e9a5c3c6ab800787e
      
https://github.com/qemu/qemu/commit/74a11ca6d9bfd357d62cfa5e9a5c3c6ab800787e
  Author: Markus Armbruster <armbru@redhat.com>
  Date:   2022-12-19 (Mon, 19 Dec 2022)

  Changed paths:
    M hw/pci/pci-hmp-cmds.c

  Log Message:
  -----------
  pci: Inline do_pcie_aer_inject_error() into its only caller

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Message-Id: <20221201121133.3813857-11-armbru@redhat.com>


  Commit: c276dc8930de708448e38695d5821c117ea1bc20
      
https://github.com/qemu/qemu/commit/c276dc8930de708448e38695d5821c117ea1bc20
  Author: Markus Armbruster <armbru@redhat.com>
  Date:   2022-12-19 (Mon, 19 Dec 2022)

  Changed paths:
    M hw/pci/pci-hmp-cmds.c

  Log Message:
  -----------
  pci: Rename hmp_pcie_aer_inject_error()'s local variable @err

I'd like to use @err for an Error *err.  Rename PCIEAERErr err to
aer_err.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-Id: <20221201121133.3813857-12-armbru@redhat.com>


  Commit: ba235d33e8b5512b75e306899dcb06d0f6660688
      
https://github.com/qemu/qemu/commit/ba235d33e8b5512b75e306899dcb06d0f6660688
  Author: Markus Armbruster <armbru@redhat.com>
  Date:   2022-12-19 (Mon, 19 Dec 2022)

  Changed paths:
    M hw/pci/pci-hmp-cmds.c

  Log Message:
  -----------
  pci: Improve do_pcie_aer_inject_error()'s error messages

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Message-Id: <20221201121133.3813857-13-armbru@redhat.com>


  Commit: e221cfac5935b0fea0989da9ef4ee5024777f23e
      
https://github.com/qemu/qemu/commit/e221cfac5935b0fea0989da9ef4ee5024777f23e
  Author: Markus Armbruster <armbru@redhat.com>
  Date:   2022-12-19 (Mon, 19 Dec 2022)

  Changed paths:
    M hw/pci/pci-hmp-cmds.c

  Log Message:
  -----------
  pci: Reject pcie_aer_inject_error -c with symbolic error status

When argument @error_status is symbolic, flag -c is ignored.  Reject
it instead.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20221201121133.3813857-14-armbru@redhat.com>


  Commit: 33698d3abf8ce65c38bb4b12b600b130d2682c79
      
https://github.com/qemu/qemu/commit/33698d3abf8ce65c38bb4b12b600b130d2682c79
  Author: Peter Maydell <peter.maydell@linaro.org>
  Date:   2022-12-19 (Mon, 19 Dec 2022)

  Changed paths:
    M hw/pci/meson.build
    A hw/pci/pci-hmp-cmds.c
    A hw/pci/pci-internal.h
    A hw/pci/pci-qmp-cmds.c
    M hw/pci/pci-stub.c
    M hw/pci/pci.c
    M hw/pci/pcie_aer.c
    M include/monitor/hmp.h
    M include/sysemu/sysemu.h
    M monitor/hmp-cmds.c

  Log Message:
  -----------
  Merge tag 'pull-monitor-2022-12-19' of https://repo.or.cz/qemu/armbru into 
staging

Monitor patches for 2022-12-19

# gpg: Signature made Mon 19 Dec 2022 15:23:44 GMT
# gpg:                using RSA key 354BC8B3D7EB2A6B68674E5F3870B400EB918653
# gpg:                issuer "armbru@redhat.com"
# gpg: Good signature from "Markus Armbruster <armbru@redhat.com>" [full]
# gpg:                 aka "Markus Armbruster <armbru@pond.sub.org>" [full]
# Primary key fingerprint: 354B C8B3 D7EB 2A6B 6867  4E5F 3870 B400 EB91 8653

* tag 'pull-monitor-2022-12-19' of https://repo.or.cz/qemu/armbru:
  pci: Reject pcie_aer_inject_error -c with symbolic error status
  pci: Improve do_pcie_aer_inject_error()'s error messages
  pci: Rename hmp_pcie_aer_inject_error()'s local variable @err
  pci: Inline do_pcie_aer_inject_error() into its only caller
  pci: Move HMP command from hw/pci/pcie_aer.c to pci-hmp-cmds.c
  pci: Fix silent truncation of pcie_aer_inject_error argument
  pci: Move pcibus_dev_print() to pci-hmp-cmds.c
  pci: Deduplicate get_class_desc()
  pci: Build hw/pci/pci-hmp-cmds.c only when CONFIG_PCI
  pci: Make query-pci stub consistent with the real one
  pci: Move HMP commands from monitor/ to new hw/pci/pci-hmp-cmds.c
  pci: Move QMP commands to new hw/pci/pci-qmp-cmds.c
  pci: Clean up a few things checkpatch.pl would flag later on

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>


Compare: https://github.com/qemu/qemu/compare/c15dc499cc22...33698d3abf8c