qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Eric Blake <eblake@redhat.com>
To: qemu-devel@nongnu.org
Cc: armbru@redhat.com, "Michael S. Tsirkin" <mst@redhat.com>,
	Marcel Apfelbaum <marcel@redhat.com>
Subject: [Qemu-devel] [PATCH v3 02/13] pci: Reduce scope of error injection
Date: Wed,  5 Apr 2017 14:47:30 -0500	[thread overview]
Message-ID: <20170405194741.18956-3-eblake@redhat.com> (raw)
In-Reply-To: <20170405194741.18956-1-eblake@redhat.com>

No one outside of pcie_aer.h was using error injection; mark them
static for internal use.

Signed-off-by: Eric Blake <eblake@redhat.com>

---
v3: new patch, suggested by Markus
---
 include/hw/pci/pcie_aer.h | 4 ----
 hw/pci/pcie_aer.c         | 4 ++--
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/include/hw/pci/pcie_aer.h b/include/hw/pci/pcie_aer.h
index 526802b..729a943 100644
--- a/include/hw/pci/pcie_aer.h
+++ b/include/hw/pci/pcie_aer.h
@@ -100,8 +100,4 @@ void pcie_aer_root_write_config(PCIDevice *dev,
                                 uint32_t addr, uint32_t val, int len,
                                 uint32_t root_cmd_prev);

-/* error injection */
-int pcie_aer_inject_error(PCIDevice *dev, const PCIEAERErr *err);
-void pcie_aer_msg(PCIDevice *dev, const PCIEAERMsg *msg);
-
 #endif /* QEMU_PCIE_AER_H */
diff --git a/hw/pci/pcie_aer.c b/hw/pci/pcie_aer.c
index 653af86..828052b 100644
--- a/hw/pci/pcie_aer.c
+++ b/hw/pci/pcie_aer.c
@@ -376,7 +376,7 @@ static void pcie_aer_msg_root_port(PCIDevice *dev, const PCIEAERMsg *msg)
  *
  * Walk up the bus tree from the device, propagate the error message.
  */
-void pcie_aer_msg(PCIDevice *dev, const PCIEAERMsg *msg)
+static void pcie_aer_msg(PCIDevice *dev, const PCIEAERMsg *msg)
 {
     uint8_t type;

@@ -631,7 +631,7 @@ static bool pcie_aer_inject_uncor_error(PCIEAERInject *inj, bool is_fatal)
  * Figure 6-2: Flowchart Showing Sequence of Device Error Signaling and Logging
  *             Operations
  */
-int pcie_aer_inject_error(PCIDevice *dev, const PCIEAERErr *err)
+static int pcie_aer_inject_error(PCIDevice *dev, const PCIEAERErr *err)
 {
     uint8_t *aer_cap = NULL;
     uint16_t devctl = 0;
-- 
2.9.3

  parent reply	other threads:[~2017-04-05 19:47 UTC|newest]

Thread overview: 39+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-04-05 19:47 [Qemu-devel] [PATCH v3 00/13] qapi-related cleanups Eric Blake
2017-04-05 19:47 ` [Qemu-devel] [PATCH v3 01/13] pci: Use struct instead of QDict to pass back parameters Eric Blake
2017-04-05 22:04   ` Michael S. Tsirkin
2017-04-06  5:41   ` Marcel Apfelbaum
2017-04-05 19:47 ` Eric Blake [this message]
2017-04-05 19:57   ` [Qemu-devel] [PATCH v3 02/13] pci: Reduce scope of error injection Philippe Mathieu-Daudé
2017-04-05 22:04   ` Michael S. Tsirkin
2017-04-06  5:42   ` Marcel Apfelbaum
2017-04-05 19:47 ` [Qemu-devel] [PATCH v3 03/13] s390x: Drop useless casts Eric Blake
2017-04-05 19:57   ` Philippe Mathieu-Daudé
2017-04-06  7:36   ` Cornelia Huck
2017-04-06 13:31     ` Eric Blake
2017-04-06 13:53   ` Cornelia Huck
2017-04-05 19:47 ` [Qemu-devel] [PATCH v3 04/13] coccinelle: Add script to remove useless QObject casts Eric Blake
2017-04-05 19:47 ` [Qemu-devel] [PATCH v3 05/13] qobject: Drop " Eric Blake
2017-04-07  9:04   ` Stefan Hajnoczi
2017-04-05 19:47 ` [Qemu-devel] [PATCH v3 06/13] qobject: Add helper macros for common scalar insertions Eric Blake
2017-04-11 17:06   ` Markus Armbruster
2017-04-11 17:43     ` Eric Blake
2017-04-05 19:47 ` [Qemu-devel] [PATCH v3 07/13] block: Use simpler QDict/QList scalar insertion macros Eric Blake
2017-04-05 19:51   ` Richard W.M. Jones
2017-04-07  9:04   ` Stefan Hajnoczi
2017-04-05 19:47 ` [Qemu-devel] [PATCH v3 08/13] tests: " Eric Blake
2017-04-05 19:47 ` [Qemu-devel] [PATCH v3 09/13] qobject: " Eric Blake
2017-04-11 17:12   ` Markus Armbruster
2017-04-11 17:44     ` Eric Blake
2017-04-05 19:47 ` [Qemu-devel] [PATCH v3 10/13] block: Simplify bdrv_append_temp_snapshot() logic Eric Blake
2017-04-06  9:00   ` Kevin Wolf
2017-04-06 12:52     ` Eric Blake
2017-04-06 13:22       ` Eric Blake
2017-04-06 13:27       ` Kevin Wolf
2017-04-06 13:41         ` Eric Blake
2017-04-05 19:47 ` [Qemu-devel] [PATCH v3 11/13] QemuOpts: Simplify qemu_opts_to_qdict() Eric Blake
2017-04-05 19:47 ` [Qemu-devel] [PATCH v3 12/13] fdc-test: Avoid deprecated 'change' command Eric Blake
2017-04-05 20:52   ` John Snow
2017-04-06  8:56     ` [Qemu-devel] [Qemu-block] " Kevin Wolf
2017-04-05 19:47 ` [Qemu-devel] [PATCH v3 13/13] test-qga: Actually test 0xff sync bytes Eric Blake
2017-04-06 12:38 ` [Qemu-devel] [PATCH v3 00/13] qapi-related cleanups no-reply
2017-04-11 17:23 ` Markus Armbruster

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20170405194741.18956-3-eblake@redhat.com \
    --to=eblake@redhat.com \
    --cc=armbru@redhat.com \
    --cc=marcel@redhat.com \
    --cc=mst@redhat.com \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).