diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2011-12-14 07:59:21 -0600 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2011-12-14 07:59:21 -0600 |
| commit | 9423a2e8dd362a271bfe194ec131062814557b95 (patch) | |
| tree | 6b10b2d69e5d81b6ff4cb2ba75693d8a65362d92 /hw/pcie_aer.c | |
| parent | da5361cc685c004d8bb4e7c5e7b3a52c7aca2c56 (diff) | |
| parent | 126c79133f77d1b0b7c3849899c6d5f83b2fd410 (diff) | |
| download | hqemu-9423a2e8dd362a271bfe194ec131062814557b95.zip hqemu-9423a2e8dd362a271bfe194ec131062814557b95.tar.gz | |
Merge remote-tracking branch 'stefanha/trivial-patches-next' into staging
Diffstat (limited to 'hw/pcie_aer.c')
| -rw-r--r-- | hw/pcie_aer.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/hw/pcie_aer.c b/hw/pcie_aer.c index 62c06ea..3b6981c 100644 --- a/hw/pcie_aer.c +++ b/hw/pcie_aer.c @@ -826,7 +826,7 @@ typedef struct PCIEAERErrorName { } PCIEAERErrorName; /* - * AER error name -> value convertion table + * AER error name -> value conversion table * This naming scheme is same to linux aer-injection tool. */ static const struct PCIEAERErrorName pcie_aer_error_list[] = { @@ -951,7 +951,7 @@ static int pcie_aer_parse_error_string(const char *error_name, return -EINVAL; } -int do_pcie_aer_inejct_error(Monitor *mon, +int do_pcie_aer_inject_error(Monitor *mon, const QDict *qdict, QObject **ret_data) { const char *id = qdict_get_str(qdict, "id"); |
