On 10/02/2017 04:03 PM, Richard Henderson wrote: > 2017-09-22 12:01 GMT-04:00 Philippe Mathieu-Daudé <f4...@amsat.org>: > >> diff --git a/hw/alpha/alpha_sys.h b/hw/alpha/alpha_sys.h >> index b6d8369ed7..ac685c1c46 100644 >> --- a/hw/alpha/alpha_sys.h >> +++ b/hw/alpha/alpha_sys.h >> @@ -5,8 +5,6 @@ >> >> #include "target/alpha/cpu-qom.h" >> #include "hw/pci/pci.h" >> -#include "hw/pci/pci_host.h" >> -#include "hw/ide.h" >> > > Why are you deleting pci/pci_host.h here?
Indeed it is required since PCIBus is defined there. > Alternately, why are you leaving pci/pci.h? > > >> diff --git a/hw/alpha/pci.c b/hw/alpha/pci.c >> index 8dde637bfe..c370762ea6 100644 >> --- a/hw/alpha/pci.c >> +++ b/hw/alpha/pci.c >> @@ -8,6 +8,8 @@ >> >> #include "qemu/osdep.h" >> #include "qemu-common.h" >> +#include "hw/pci/pci.h" >> +#include "hw/pci/pci_host.h" >> > > One way we have a double-include of pci/pci.h here, > the other way we shouldn't re-include either. Please ignore this patch.
