diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2022-12-19 16:12:59 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2022-12-19 16:12:59 +0000 |
| commit | 33698d3abf8ce65c38bb4b12b600b130d2682c79 (patch) | |
| tree | 4381a10d01fa3bafbd38b7860b76002fd10e5842 /include | |
| parent | c15dc499cc22f4a71639e42e36051e118761c25f (diff) | |
| parent | e221cfac5935b0fea0989da9ef4ee5024777f23e (diff) | |
| download | qemu-33698d3abf8ce65c38bb4b12b600b130d2682c79.zip qemu-33698d3abf8ce65c38bb4b12b600b130d2682c79.tar.gz qemu-33698d3abf8ce65c38bb4b12b600b130d2682c79.tar.bz2 | |
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>
Diffstat (limited to 'include')
| -rw-r--r-- | include/monitor/hmp.h | 1 | ||||
| -rw-r--r-- | include/sysemu/sysemu.h | 3 |
2 files changed, 1 insertions, 3 deletions
diff --git a/include/monitor/hmp.h b/include/monitor/hmp.h index dfbc0c9..27f8639 100644 --- a/include/monitor/hmp.h +++ b/include/monitor/hmp.h @@ -143,5 +143,6 @@ void hmp_info_vcpu_dirty_limit(Monitor *mon, const QDict *qdict); void hmp_human_readable_text_helper(Monitor *mon, HumanReadableText *(*qmp_handler)(Error **)); void hmp_info_stats(Monitor *mon, const QDict *qdict); +void hmp_pcie_aer_inject_error(Monitor *mon, const QDict *qdict); #endif diff --git a/include/sysemu/sysemu.h b/include/sysemu/sysemu.h index 6a7a31e..25be2a6 100644 --- a/include/sysemu/sysemu.h +++ b/include/sysemu/sysemu.h @@ -61,9 +61,6 @@ extern int nb_option_roms; extern const char *prom_envs[MAX_PROM_ENVS]; extern unsigned int nb_prom_envs; -/* pcie aer error injection */ -void hmp_pcie_aer_inject_error(Monitor *mon, const QDict *qdict); - /* serial ports */ /* Return the Chardev for serial port i, or NULL if none */ |