| Message ID | 20200704144943.18292-3-f4bug@amsat.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | hw/usb: Give it love, reduce 'hw/usb.h' inclusion out of hw/usb/ | expand |
On Sat, Jul 4, 2020 at 7:50 AM Philippe Mathieu-Daudé <f4bug@amsat.org> wrote: > > This file uses pci_create_simple() and PCI_DEVFN() which are both > declared in "hw/pci/pci.h". This include is indirectly included > by an USB header. As we want to reduce the USB header inclusions > later, include the PCI header now, to avoid later: > > hw/ppc/sam460ex.c:397:5: error: implicit declaration of function ‘pci_create_simple’; did you mean ‘sysbus_create_simple’? [-Werror=implicit-function-declaration] > 397 | pci_create_simple(pci_bus, PCI_DEVFN(6, 0), "sm501"); > | ^~~~~~~~~~~~~~~~~ > | sysbus_create_simple > hw/ppc/sam460ex.c:397:5: error: nested extern declaration of ‘pci_create_simple’ [-Werror=nested-externs] > hw/ppc/sam460ex.c:397:32: error: implicit declaration of function ‘PCI_DEVFN’ [-Werror=implicit-function-declaration] > 397 | pci_create_simple(pci_bus, PCI_DEVFN(6, 0), "sm501"); > | ^~~~~~~~~ > hw/ppc/sam460ex.c:397:32: error: nested extern declaration of ‘PCI_DEVFN’ [-Werror=nested-externs] > > Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> Reviewed-by: Alistair Francis <alistair.francis@wdc.com> Alistair > --- > hw/ppc/sam460ex.c | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/hw/ppc/sam460ex.c b/hw/ppc/sam460ex.c > index 1a106a68de..fae970b142 100644 > --- a/hw/ppc/sam460ex.c > +++ b/hw/ppc/sam460ex.c > @@ -38,6 +38,7 @@ > #include "hw/usb/hcd-ehci.h" > #include "hw/ppc/fdt.h" > #include "hw/qdev-properties.h" > +#include "hw/pci/pci.h" > > #include <libfdt.h> > > -- > 2.21.3 > >
diff --git a/hw/ppc/sam460ex.c b/hw/ppc/sam460ex.c index 1a106a68de..fae970b142 100644 --- a/hw/ppc/sam460ex.c +++ b/hw/ppc/sam460ex.c @@ -38,6 +38,7 @@ #include "hw/usb/hcd-ehci.h" #include "hw/ppc/fdt.h" #include "hw/qdev-properties.h" +#include "hw/pci/pci.h" #include <libfdt.h>
This file uses pci_create_simple() and PCI_DEVFN() which are both declared in "hw/pci/pci.h". This include is indirectly included by an USB header. As we want to reduce the USB header inclusions later, include the PCI header now, to avoid later: hw/ppc/sam460ex.c:397:5: error: implicit declaration of function ‘pci_create_simple’; did you mean ‘sysbus_create_simple’? [-Werror=implicit-function-declaration] 397 | pci_create_simple(pci_bus, PCI_DEVFN(6, 0), "sm501"); | ^~~~~~~~~~~~~~~~~ | sysbus_create_simple hw/ppc/sam460ex.c:397:5: error: nested extern declaration of ‘pci_create_simple’ [-Werror=nested-externs] hw/ppc/sam460ex.c:397:32: error: implicit declaration of function ‘PCI_DEVFN’ [-Werror=implicit-function-declaration] 397 | pci_create_simple(pci_bus, PCI_DEVFN(6, 0), "sm501"); | ^~~~~~~~~ hw/ppc/sam460ex.c:397:32: error: nested extern declaration of ‘PCI_DEVFN’ [-Werror=nested-externs] Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> --- hw/ppc/sam460ex.c | 1 + 1 file changed, 1 insertion(+)