[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 11/12] pci: Rename hmp_pcie_aer_inject_error()'s local variable @
From: |
Markus Armbruster |
Subject: |
[PATCH 11/12] pci: Rename hmp_pcie_aer_inject_error()'s local variable @err |
Date: |
Mon, 28 Nov 2022 09:02:01 +0100 |
I'd like to use @err for an Error *err. Rename PCIEAERErr err to
aer_err.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
hw/pci/pci-hmp-cmds.c | 34 +++++++++++++++++-----------------
1 file changed, 17 insertions(+), 17 deletions(-)
diff --git a/hw/pci/pci-hmp-cmds.c b/hw/pci/pci-hmp-cmds.c
index b03badb1e6..0807a206e4 100644
--- a/hw/pci/pci-hmp-cmds.c
+++ b/hw/pci/pci-hmp-cmds.c
@@ -167,7 +167,7 @@ void hmp_pcie_aer_inject_error(Monitor *mon, const QDict
*qdict)
unsigned long num;
bool correctable;
PCIDevice *dev;
- PCIEAERErr err;
+ PCIEAERErr aer_err;
int ret;
ret = pci_qdev_find_device(id, &dev);
@@ -194,34 +194,34 @@ void hmp_pcie_aer_inject_error(Monitor *mon, const QDict
*qdict)
error_status = num;
correctable = qdict_get_try_bool(qdict, "correctable", false);
}
- err.status = error_status;
- err.source_id = pci_requester_id(dev);
+ aer_err.status = error_status;
+ aer_err.source_id = pci_requester_id(dev);
- err.flags = 0;
+ aer_err.flags = 0;
if (correctable) {
- err.flags |= PCIE_AER_ERR_IS_CORRECTABLE;
+ aer_err.flags |= PCIE_AER_ERR_IS_CORRECTABLE;
}
if (qdict_get_try_bool(qdict, "advisory_non_fatal", false)) {
- err.flags |= PCIE_AER_ERR_MAYBE_ADVISORY;
+ aer_err.flags |= PCIE_AER_ERR_MAYBE_ADVISORY;
}
if (qdict_haskey(qdict, "header0")) {
- err.flags |= PCIE_AER_ERR_HEADER_VALID;
+ aer_err.flags |= PCIE_AER_ERR_HEADER_VALID;
}
if (qdict_haskey(qdict, "prefix0")) {
- err.flags |= PCIE_AER_ERR_TLP_PREFIX_PRESENT;
+ aer_err.flags |= PCIE_AER_ERR_TLP_PREFIX_PRESENT;
}
- err.header[0] = qdict_get_try_int(qdict, "header0", 0);
- err.header[1] = qdict_get_try_int(qdict, "header1", 0);
- err.header[2] = qdict_get_try_int(qdict, "header2", 0);
- err.header[3] = qdict_get_try_int(qdict, "header3", 0);
+ aer_err.header[0] = qdict_get_try_int(qdict, "header0", 0);
+ aer_err.header[1] = qdict_get_try_int(qdict, "header1", 0);
+ aer_err.header[2] = qdict_get_try_int(qdict, "header2", 0);
+ aer_err.header[3] = qdict_get_try_int(qdict, "header3", 0);
- err.prefix[0] = qdict_get_try_int(qdict, "prefix0", 0);
- err.prefix[1] = qdict_get_try_int(qdict, "prefix1", 0);
- err.prefix[2] = qdict_get_try_int(qdict, "prefix2", 0);
- err.prefix[3] = qdict_get_try_int(qdict, "prefix3", 0);
+ aer_err.prefix[0] = qdict_get_try_int(qdict, "prefix0", 0);
+ aer_err.prefix[1] = qdict_get_try_int(qdict, "prefix1", 0);
+ aer_err.prefix[2] = qdict_get_try_int(qdict, "prefix2", 0);
+ aer_err.prefix[3] = qdict_get_try_int(qdict, "prefix3", 0);
- ret = pcie_aer_inject_error(dev, &err);
+ ret = pcie_aer_inject_error(dev, &aer_err);
if (ret < 0) {
monitor_printf(mon, "failed to inject error: %s\n",
strerror(-ret));
--
2.37.3
- [PATCH 00/12] pci: Move and clean up monitor command code, Markus Armbruster, 2022/11/28
- [PATCH 01/12] pci: Clean up a few things checkpatch.pl would flag later on, Markus Armbruster, 2022/11/28
- [PATCH 03/12] pci: Move HMP commands from monitor/ to new hw/pci/pci-hmp-cmds.c, Markus Armbruster, 2022/11/28
- [PATCH 08/12] pci: Fix silent truncation of pcie_aer_inject_error argument, Markus Armbruster, 2022/11/28
- [PATCH 10/12] pci: Inline do_pcie_aer_inject_error() into its only caller, Markus Armbruster, 2022/11/28
- [PATCH 11/12] pci: Rename hmp_pcie_aer_inject_error()'s local variable @err,
Markus Armbruster <=
- [PATCH 07/12] pci: Move pcibus_dev_print() to pci-hmp-cmds.c, Markus Armbruster, 2022/11/28
- [PATCH 12/12] pci: Improve do_pcie_aer_inject_error()'s error messages, Markus Armbruster, 2022/11/28
- [PATCH 02/12] pci: Move QMP commands to new hw/pci/pci-qmp-cmds.c, Markus Armbruster, 2022/11/28
- [PATCH 04/12] pci: Make query-pci stub consistent with the real one, Markus Armbruster, 2022/11/28
- [PATCH 06/12] pci: Deduplicate get_class_desc(), Markus Armbruster, 2022/11/28
- [PATCH 09/12] pci: Move HMP command from hw/pci/pcie_aer.c to pci-hmp-cmds.c, Markus Armbruster, 2022/11/28