| Message ID | 20170405194741.18956-3-eblake@redhat.com |
|---|---|
| State | New |
| Headers | show |
On 04/05/2017 04:47 PM, Eric Blake wrote: > 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> Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org> > > --- > 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; >
On Wed, Apr 05, 2017 at 02:47:30PM -0500, Eric Blake wrote: > 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> Reviewed-by: Michael S. Tsirkin <mst@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
On 04/05/2017 10:47 PM, Eric Blake wrote: > 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; > Reviewed-by: Marcel Apfelbaum <marcel@redhat.com> Thanks, Marcel
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;
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(-)