| Message ID | 20200908142559.192945-5-philmd@redhat.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | hw/xen: Housekeeping | expand |
On 9/8/20 4:25 PM, Philippe Mathieu-Daudé wrote: > xen_hvm_init() is restricted to the X86 architecture. > > Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> > --- > include/hw/xen/xen-x86.h | 15 +++++++++++++++ > include/hw/xen/xen.h | 2 -- > hw/i386/pc_piix.c | 2 +- > hw/i386/xen/xen-hvm.c | 1 + > 4 files changed, 17 insertions(+), 3 deletions(-) > create mode 100644 include/hw/xen/xen-x86.h > > diff --git a/include/hw/xen/xen-x86.h b/include/hw/xen/xen-x86.h > new file mode 100644 > index 00000000000..85e3db1b8de > --- /dev/null > +++ b/include/hw/xen/xen-x86.h > @@ -0,0 +1,15 @@ > +/* > + * Xen X86-specific > + * > + * Copyright 2020 Red Hat, Inc. > + * > + * SPDX-License-Identifier: GPL-2.0-or-later > + */ > +#ifndef QEMU_HW_XEN_X86_H > +#define QEMU_HW_XEN_X86_H > + > +#include "hw/i386/pc.h" > + > +void xen_hvm_init_pc(PCMachineState *pcms, MemoryRegion **ram_memory); > + > +#endif /* QEMU_HW_XEN_X86_H */ > diff --git a/include/hw/xen/xen.h b/include/hw/xen/xen.h > index b2b459964cb..1406648ca58 100644 > --- a/include/hw/xen/xen.h > +++ b/include/hw/xen/xen.h > @@ -30,8 +30,6 @@ qemu_irq *xen_interrupt_controller_init(void); > > void xenstore_store_pv_console_info(int i, struct Chardev *chr); > > -void xen_hvm_init_pc(PCMachineState *pcms, MemoryRegion **ram_memory); > - > void xen_register_framebuffer(struct MemoryRegion *mr); > > #endif /* QEMU_HW_XEN_H */ > diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c > index 3e008bb0b1a..43205f48188 100644 > --- a/hw/i386/pc_piix.c > +++ b/hw/i386/pc_piix.c > @@ -46,7 +46,7 @@ > #include "hw/sysbus.h" > #include "sysemu/arch_init.h" > #include "hw/i2c/smbus_eeprom.h" > -#include "hw/xen/xen.h" > +#include "hw/xen/xen-x86.h" > #include "exec/memory.h" > #include "exec/address-spaces.h" > #include "hw/acpi/acpi.h" > diff --git a/hw/i386/xen/xen-hvm.c b/hw/i386/xen/xen-hvm.c > index 49748cda3fb..e03c59e53da 100644 > --- a/hw/i386/xen/xen-hvm.c > +++ b/hw/i386/xen/xen-hvm.c > @@ -22,6 +22,7 @@ > #include "hw/xen/xen_common.h" > #include "hw/xen/xen-legacy-backend.h" > #include "hw/xen/xen-bus.h" > +#include "hw/xen/xen-x86.h" > #include "qapi/error.h" > #include "qapi/qapi-commands-misc.h" > #include "qemu/error-report.h" > I forgot to commit this hunk: --- diff --git a/stubs/xen-hw-stub.c b/stubs/xen-hw-stub.c index d14efef49e9..2ea81909217 100644 --- a/stubs/xen-hw-stub.c +++ b/stubs/xen-hw-stub.c @@ -8,6 +8,7 @@ #include "qemu/osdep.h" #include "hw/xen/xen.h" +#include "hw/xen/xen-x86.h" void xenstore_store_pv_console_info(int i, Chardev *chr) { ---
diff --git a/include/hw/xen/xen-x86.h b/include/hw/xen/xen-x86.h new file mode 100644 index 00000000000..85e3db1b8de --- /dev/null +++ b/include/hw/xen/xen-x86.h @@ -0,0 +1,15 @@ +/* + * Xen X86-specific + * + * Copyright 2020 Red Hat, Inc. + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ +#ifndef QEMU_HW_XEN_X86_H +#define QEMU_HW_XEN_X86_H + +#include "hw/i386/pc.h" + +void xen_hvm_init_pc(PCMachineState *pcms, MemoryRegion **ram_memory); + +#endif /* QEMU_HW_XEN_X86_H */ diff --git a/include/hw/xen/xen.h b/include/hw/xen/xen.h index b2b459964cb..1406648ca58 100644 --- a/include/hw/xen/xen.h +++ b/include/hw/xen/xen.h @@ -30,8 +30,6 @@ qemu_irq *xen_interrupt_controller_init(void); void xenstore_store_pv_console_info(int i, struct Chardev *chr); -void xen_hvm_init_pc(PCMachineState *pcms, MemoryRegion **ram_memory); - void xen_register_framebuffer(struct MemoryRegion *mr); #endif /* QEMU_HW_XEN_H */ diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index 3e008bb0b1a..43205f48188 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -46,7 +46,7 @@ #include "hw/sysbus.h" #include "sysemu/arch_init.h" #include "hw/i2c/smbus_eeprom.h" -#include "hw/xen/xen.h" +#include "hw/xen/xen-x86.h" #include "exec/memory.h" #include "exec/address-spaces.h" #include "hw/acpi/acpi.h" diff --git a/hw/i386/xen/xen-hvm.c b/hw/i386/xen/xen-hvm.c index 49748cda3fb..e03c59e53da 100644 --- a/hw/i386/xen/xen-hvm.c +++ b/hw/i386/xen/xen-hvm.c @@ -22,6 +22,7 @@ #include "hw/xen/xen_common.h" #include "hw/xen/xen-legacy-backend.h" #include "hw/xen/xen-bus.h" +#include "hw/xen/xen-x86.h" #include "qapi/error.h" #include "qapi/qapi-commands-misc.h" #include "qemu/error-report.h"
xen_hvm_init() is restricted to the X86 architecture. Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> --- include/hw/xen/xen-x86.h | 15 +++++++++++++++ include/hw/xen/xen.h | 2 -- hw/i386/pc_piix.c | 2 +- hw/i386/xen/xen-hvm.c | 1 + 4 files changed, 17 insertions(+), 3 deletions(-) create mode 100644 include/hw/xen/xen-x86.h