| Message ID | 20170922154014.29350-2-f4bug@amsat.org |
|---|---|
| State | Superseded, archived |
| Headers | show |
| Series | remove i386/pc dependency from non-PC world (part 1) | expand |
On 22 September 2017 at 16:39, Philippe Mathieu-Daudé <f4bug@amsat.org> wrote: > applied using ./scripts/clean-includes > > Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> > --- > hw/acpi/ipmi-stub.c | 1 + > hw/audio/fmopl.c | 1 - > hw/cpu/core.c | 1 + > hw/ppc/spapr_cpu_core.c | 1 + > hw/smbios/smbios_type_38-stub.c | 1 + > hw/vfio/ccw.c | 2 +- > hw/virtio/vhost-vsock.c | 2 +- > 7 files changed, 6 insertions(+), 3 deletions(-) > Reviewed-by: Peter Maydell <peter.maydell@linaro.org> thanks -- PMM
On Fri, Sep 22, 2017 at 12:39:41PM -0300, Philippe Mathieu-Daudé wrote: > applied using ./scripts/clean-includes > > Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> ppc portion Acked-by: David Gibson <david@gibson.dropbear.id.au> > --- > hw/acpi/ipmi-stub.c | 1 + > hw/audio/fmopl.c | 1 - > hw/cpu/core.c | 1 + > hw/ppc/spapr_cpu_core.c | 1 + > hw/smbios/smbios_type_38-stub.c | 1 + > hw/vfio/ccw.c | 2 +- > hw/virtio/vhost-vsock.c | 2 +- > 7 files changed, 6 insertions(+), 3 deletions(-) > > diff --git a/hw/acpi/ipmi-stub.c b/hw/acpi/ipmi-stub.c > index 98b6dcee0d..f525f71c2d 100644 > --- a/hw/acpi/ipmi-stub.c > +++ b/hw/acpi/ipmi-stub.c > @@ -7,6 +7,7 @@ > * See the COPYING file in the top-level directory. > */ > > +#include "qemu/osdep.h" > #include "hw/acpi/ipmi.h" > > void build_acpi_ipmi_devices(Aml *table, BusState *bus) > diff --git a/hw/audio/fmopl.c b/hw/audio/fmopl.c > index 5cfb6a96dd..9f50a89b4a 100644 > --- a/hw/audio/fmopl.c > +++ b/hw/audio/fmopl.c > @@ -34,7 +34,6 @@ > #include <math.h> > //#include "driver.h" /* use M.A.M.E. */ > #include "fmopl.h" > -#include "qemu/osdep.h" > #ifndef PI > #define PI 3.14159265358979323846 > #endif > diff --git a/hw/cpu/core.c b/hw/cpu/core.c > index bd578ab80c..7e42e2c87a 100644 > --- a/hw/cpu/core.c > +++ b/hw/cpu/core.c > @@ -6,6 +6,7 @@ > * This work is licensed under the terms of the GNU GPL, version 2 or later. > * See the COPYING file in the top-level directory. > */ > +#include "qemu/osdep.h" > #include "hw/cpu/core.h" > #include "qapi/visitor.h" > #include "qapi/error.h" > diff --git a/hw/ppc/spapr_cpu_core.c b/hw/ppc/spapr_cpu_core.c > index c08ee7571a..4a4f0c60fe 100644 > --- a/hw/ppc/spapr_cpu_core.c > +++ b/hw/ppc/spapr_cpu_core.c > @@ -6,6 +6,7 @@ > * This work is licensed under the terms of the GNU GPL, version 2 or later. > * See the COPYING file in the top-level directory. > */ > +#include "qemu/osdep.h" > #include "hw/cpu/core.h" > #include "hw/ppc/spapr_cpu_core.h" > #include "target/ppc/cpu.h" > diff --git a/hw/smbios/smbios_type_38-stub.c b/hw/smbios/smbios_type_38-stub.c > index 9528c2c28e..5b83c9b1f1 100644 > --- a/hw/smbios/smbios_type_38-stub.c > +++ b/hw/smbios/smbios_type_38-stub.c > @@ -7,6 +7,7 @@ > * See the COPYING file in the top-level directory. > */ > > +#include "qemu/osdep.h" > #include "hw/smbios/ipmi.h" > > void smbios_build_type_38_table(void) > diff --git a/hw/vfio/ccw.c b/hw/vfio/ccw.c > index a8baadf57a..4810fa0b50 100644 > --- a/hw/vfio/ccw.c > +++ b/hw/vfio/ccw.c > @@ -11,11 +11,11 @@ > * directory. > */ > > +#include "qemu/osdep.h" > #include <linux/vfio.h> > #include <linux/vfio_ccw.h> > #include <sys/ioctl.h> > > -#include "qemu/osdep.h" > #include "qapi/error.h" > #include "hw/sysbus.h" > #include "hw/vfio/vfio.h" > diff --git a/hw/virtio/vhost-vsock.c b/hw/virtio/vhost-vsock.c > index 49e0022533..c11c1eb83e 100644 > --- a/hw/virtio/vhost-vsock.c > +++ b/hw/virtio/vhost-vsock.c > @@ -11,8 +11,8 @@ > * top-level directory. > */ > > -#include <sys/ioctl.h> > #include "qemu/osdep.h" > +#include <sys/ioctl.h> > #include "standard-headers/linux/virtio_vsock.h" > #include "qapi/error.h" > #include "hw/virtio/virtio-bus.h"
On Fri, 22 Sep 2017 12:39:41 -0300 Philippe Mathieu-Daudé <f4bug@amsat.org> wrote: > applied using ./scripts/clean-includes > > Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> > --- > hw/acpi/ipmi-stub.c | 1 + > hw/audio/fmopl.c | 1 - > hw/cpu/core.c | 1 + > hw/ppc/spapr_cpu_core.c | 1 + > hw/smbios/smbios_type_38-stub.c | 1 + > hw/vfio/ccw.c | 2 +- > hw/virtio/vhost-vsock.c | 2 +- > 7 files changed, 6 insertions(+), 3 deletions(-) > > diff --git a/hw/vfio/ccw.c b/hw/vfio/ccw.c > index a8baadf57a..4810fa0b50 100644 > --- a/hw/vfio/ccw.c > +++ b/hw/vfio/ccw.c > @@ -11,11 +11,11 @@ > * directory. > */ > > +#include "qemu/osdep.h" > #include <linux/vfio.h> > #include <linux/vfio_ccw.h> > #include <sys/ioctl.h> > > -#include "qemu/osdep.h" > #include "qapi/error.h" > #include "hw/sysbus.h" > #include "hw/vfio/vfio.h" Acked-by: Cornelia Huck <cohuck@redhat.com>
diff --git a/hw/acpi/ipmi-stub.c b/hw/acpi/ipmi-stub.c index 98b6dcee0d..f525f71c2d 100644 --- a/hw/acpi/ipmi-stub.c +++ b/hw/acpi/ipmi-stub.c @@ -7,6 +7,7 @@ * See the COPYING file in the top-level directory. */ +#include "qemu/osdep.h" #include "hw/acpi/ipmi.h" void build_acpi_ipmi_devices(Aml *table, BusState *bus) diff --git a/hw/audio/fmopl.c b/hw/audio/fmopl.c index 5cfb6a96dd..9f50a89b4a 100644 --- a/hw/audio/fmopl.c +++ b/hw/audio/fmopl.c @@ -34,7 +34,6 @@ #include <math.h> //#include "driver.h" /* use M.A.M.E. */ #include "fmopl.h" -#include "qemu/osdep.h" #ifndef PI #define PI 3.14159265358979323846 #endif diff --git a/hw/cpu/core.c b/hw/cpu/core.c index bd578ab80c..7e42e2c87a 100644 --- a/hw/cpu/core.c +++ b/hw/cpu/core.c @@ -6,6 +6,7 @@ * This work is licensed under the terms of the GNU GPL, version 2 or later. * See the COPYING file in the top-level directory. */ +#include "qemu/osdep.h" #include "hw/cpu/core.h" #include "qapi/visitor.h" #include "qapi/error.h" diff --git a/hw/ppc/spapr_cpu_core.c b/hw/ppc/spapr_cpu_core.c index c08ee7571a..4a4f0c60fe 100644 --- a/hw/ppc/spapr_cpu_core.c +++ b/hw/ppc/spapr_cpu_core.c @@ -6,6 +6,7 @@ * This work is licensed under the terms of the GNU GPL, version 2 or later. * See the COPYING file in the top-level directory. */ +#include "qemu/osdep.h" #include "hw/cpu/core.h" #include "hw/ppc/spapr_cpu_core.h" #include "target/ppc/cpu.h" diff --git a/hw/smbios/smbios_type_38-stub.c b/hw/smbios/smbios_type_38-stub.c index 9528c2c28e..5b83c9b1f1 100644 --- a/hw/smbios/smbios_type_38-stub.c +++ b/hw/smbios/smbios_type_38-stub.c @@ -7,6 +7,7 @@ * See the COPYING file in the top-level directory. */ +#include "qemu/osdep.h" #include "hw/smbios/ipmi.h" void smbios_build_type_38_table(void) diff --git a/hw/vfio/ccw.c b/hw/vfio/ccw.c index a8baadf57a..4810fa0b50 100644 --- a/hw/vfio/ccw.c +++ b/hw/vfio/ccw.c @@ -11,11 +11,11 @@ * directory. */ +#include "qemu/osdep.h" #include <linux/vfio.h> #include <linux/vfio_ccw.h> #include <sys/ioctl.h> -#include "qemu/osdep.h" #include "qapi/error.h" #include "hw/sysbus.h" #include "hw/vfio/vfio.h" diff --git a/hw/virtio/vhost-vsock.c b/hw/virtio/vhost-vsock.c index 49e0022533..c11c1eb83e 100644 --- a/hw/virtio/vhost-vsock.c +++ b/hw/virtio/vhost-vsock.c @@ -11,8 +11,8 @@ * top-level directory. */ -#include <sys/ioctl.h> #include "qemu/osdep.h" +#include <sys/ioctl.h> #include "standard-headers/linux/virtio_vsock.h" #include "qapi/error.h" #include "hw/virtio/virtio-bus.h"
applied using ./scripts/clean-includes Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> --- hw/acpi/ipmi-stub.c | 1 + hw/audio/fmopl.c | 1 - hw/cpu/core.c | 1 + hw/ppc/spapr_cpu_core.c | 1 + hw/smbios/smbios_type_38-stub.c | 1 + hw/vfio/ccw.c | 2 +- hw/virtio/vhost-vsock.c | 2 +- 7 files changed, 6 insertions(+), 3 deletions(-)