| Message ID | 20170922160111.31885-11-f4bug@amsat.org |
|---|---|
| State | Superseded, archived |
| Headers | show |
| Series | remove i386/pc dependency from non-PC world (part 1) | expand |
On 22.09.2017 18:01, Philippe Mathieu-Daudé wrote: > Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> > --- > hw/alpha/alpha_sys.h | 2 -- > hw/alpha/pci.c | 2 ++ > hw/alpha/typhoon.c | 2 +- > 3 files changed, 3 insertions(+), 3 deletions(-) > > 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" > #include "hw/i386/pc.h" Didn't you want to remove that pc.h line according to the patch description? Thomas
Hi Thomas, On 09/25/2017 02:38 AM, Thomas Huth wrote: > On 22.09.2017 18:01, Philippe Mathieu-Daudé wrote: >> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> >> --- >> hw/alpha/alpha_sys.h | 2 -- >> hw/alpha/pci.c | 2 ++ >> hw/alpha/typhoon.c | 2 +- >> 3 files changed, 3 insertions(+), 3 deletions(-) >> >> 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" >> #include "hw/i386/pc.h" > > Didn't you want to remove that pc.h line according to the patch description? Not yet :( This include is still needed for the i8259 PIC. This change is done in the part 2 (following series). That said, I should improve the patch description :)
2017-09-22 12:01 GMT-04:00 Philippe Mathieu-Daudé <f4bug@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? 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. r~
On 10/02/2017 04:03 PM, Richard Henderson wrote: > 2017-09-22 12:01 GMT-04:00 Philippe Mathieu-Daudé <f4bug@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.
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" #include "hw/i386/pc.h" #include "hw/irq.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" #include "alpha_sys.h" #include "qemu/log.h" #include "sysemu/sysemu.h" diff --git a/hw/alpha/typhoon.c b/hw/alpha/typhoon.c index ae11e012c7..75ac4ed354 100644 --- a/hw/alpha/typhoon.c +++ b/hw/alpha/typhoon.c @@ -11,9 +11,9 @@ #include "cpu.h" #include "hw/hw.h" #include "hw/devices.h" +#include "hw/pci/pci_host.h" #include "sysemu/sysemu.h" #include "alpha_sys.h" -#include "exec/address-spaces.h" #define TYPE_TYPHOON_PCI_HOST_BRIDGE "typhoon-pcihost"
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> --- hw/alpha/alpha_sys.h | 2 -- hw/alpha/pci.c | 2 ++ hw/alpha/typhoon.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)