Clean up includes so that osdep.h is included first and headers which it implies are not included manually.
This commit was created with scripts/clean-includes. Signed-off-by: Peter Maydell <peter.mayd...@linaro.org> --- hw/char/xen_console.c | 7 +------ hw/display/xenfb.c | 10 +--------- hw/net/xen_nic.c | 11 +---------- hw/xen/xen-host-pci-device.c | 1 + hw/xen/xen_backend.c | 10 +--------- hw/xen/xen_devconfig.c | 1 + hw/xen/xen_pt.c | 1 + hw/xen/xen_pt_config_init.c | 1 + hw/xen/xen_pt_graphics.c | 1 + hw/xen/xen_pt_msi.c | 1 + hw/xenpv/xen_domainbuild.c | 2 +- hw/xenpv/xen_machine_pv.c | 1 + xen-common-stub.c | 1 + xen-common.c | 1 + xen-hvm-stub.c | 1 + xen-hvm.c | 1 + xen-mapcache.c | 2 +- 17 files changed, 17 insertions(+), 36 deletions(-) diff --git a/hw/char/xen_console.c b/hw/char/xen_console.c index eb7f450..fbcbd56 100644 --- a/hw/char/xen_console.c +++ b/hw/char/xen_console.c @@ -19,14 +19,9 @@ * with this program; if not, see <http://www.gnu.org/licenses/>. */ -#include <stdlib.h> -#include <errno.h> -#include <string.h> +#include "qemu/osdep.h" #include <sys/select.h> -#include <fcntl.h> -#include <unistd.h> #include <termios.h> -#include <stdarg.h> #include <sys/mman.h> #include "hw/hw.h" diff --git a/hw/display/xenfb.c b/hw/display/xenfb.c index 8eb3046..e74523a 100644 --- a/hw/display/xenfb.c +++ b/hw/display/xenfb.c @@ -24,16 +24,8 @@ * with this program; if not, see <http://www.gnu.org/licenses/>. */ -#include <stdarg.h> -#include <stdlib.h> -#include <sys/types.h> -#include <fcntl.h> -#include <unistd.h> +#include "qemu/osdep.h" #include <sys/mman.h> -#include <errno.h> -#include <stdio.h> -#include <string.h> -#include <time.h> #include "hw/hw.h" #include "ui/console.h" diff --git a/hw/net/xen_nic.c b/hw/net/xen_nic.c index 0da16b4..dd32d58 100644 --- a/hw/net/xen_nic.c +++ b/hw/net/xen_nic.c @@ -19,18 +19,9 @@ * GNU GPL, version 2 or (at your option) any later version. */ -#include <stdio.h> -#include <stdlib.h> -#include <stdarg.h> -#include <string.h> -#include <unistd.h> -#include <inttypes.h> -#include <fcntl.h> -#include <errno.h> +#include "qemu/osdep.h" #include <sys/socket.h> #include <sys/ioctl.h> -#include <sys/types.h> -#include <sys/stat.h> #include <sys/mman.h> #include <sys/wait.h> diff --git a/hw/xen/xen-host-pci-device.c b/hw/xen/xen-host-pci-device.c index 3827ca7..9666fff 100644 --- a/hw/xen/xen-host-pci-device.c +++ b/hw/xen/xen-host-pci-device.c @@ -6,6 +6,7 @@ * */ +#include "qemu/osdep.h" #include "qemu-common.h" #include "xen-host-pci-device.h" diff --git a/hw/xen/xen_backend.c b/hw/xen/xen_backend.c index 2510e2e..1142165 100644 --- a/hw/xen/xen_backend.c +++ b/hw/xen/xen_backend.c @@ -22,15 +22,7 @@ * TODO: add some xenbus / xenstore concepts overview here. */ -#include <stdio.h> -#include <stdlib.h> -#include <stdarg.h> -#include <string.h> -#include <unistd.h> -#include <fcntl.h> -#include <inttypes.h> -#include <sys/types.h> -#include <sys/stat.h> +#include "qemu/osdep.h" #include <sys/mman.h> #include <sys/signal.h> diff --git a/hw/xen/xen_devconfig.c b/hw/xen/xen_devconfig.c index e138dbb..1f30fe4 100644 --- a/hw/xen/xen_devconfig.c +++ b/hw/xen/xen_devconfig.c @@ -1,3 +1,4 @@ +#include "qemu/osdep.h" #include "hw/xen/xen_backend.h" #include "sysemu/block-backend.h" #include "sysemu/blockdev.h" diff --git a/hw/xen/xen_pt.c b/hw/xen/xen_pt.c index d33221b..657bf6c 100644 --- a/hw/xen/xen_pt.c +++ b/hw/xen/xen_pt.c @@ -52,6 +52,7 @@ * - Set entry->pirq to '-1'. */ +#include "qemu/osdep.h" #include <sys/ioctl.h> #include "hw/pci/pci.h" diff --git a/hw/xen/xen_pt_config_init.c b/hw/xen/xen_pt_config_init.c index 81c6721..1b48f19 100644 --- a/hw/xen/xen_pt_config_init.c +++ b/hw/xen/xen_pt_config_init.c @@ -12,6 +12,7 @@ * This file implements direct PCI assignment to a HVM guest */ +#include "qemu/osdep.h" #include "qemu/timer.h" #include "hw/xen/xen_backend.h" #include "xen_pt.h" diff --git a/hw/xen/xen_pt_graphics.c b/hw/xen/xen_pt_graphics.c index e7a7c7e..71e745f 100644 --- a/hw/xen/xen_pt_graphics.c +++ b/hw/xen/xen_pt_graphics.c @@ -1,6 +1,7 @@ /* * graphics passthrough */ +#include "qemu/osdep.h" #include "xen_pt.h" #include "xen-host-pci-device.h" #include "hw/xen/xen_backend.h" diff --git a/hw/xen/xen_pt_msi.c b/hw/xen/xen_pt_msi.c index 302a310..5624685 100644 --- a/hw/xen/xen_pt_msi.c +++ b/hw/xen/xen_pt_msi.c @@ -9,6 +9,7 @@ * This file implements direct PCI assignment to a HVM guest */ +#include "qemu/osdep.h" #include <sys/mman.h> #include "hw/xen/xen_backend.h" diff --git a/hw/xenpv/xen_domainbuild.c b/hw/xenpv/xen_domainbuild.c index ac0e5ac..e33f9b1 100644 --- a/hw/xenpv/xen_domainbuild.c +++ b/hw/xenpv/xen_domainbuild.c @@ -1,4 +1,4 @@ -#include <signal.h> +#include "qemu/osdep.h" #include "hw/xen/xen_backend.h" #include "xen_domainbuild.h" #include "qemu/timer.h" diff --git a/hw/xenpv/xen_machine_pv.c b/hw/xenpv/xen_machine_pv.c index 23d6ef0..af1618c 100644 --- a/hw/xenpv/xen_machine_pv.c +++ b/hw/xenpv/xen_machine_pv.c @@ -22,6 +22,7 @@ * THE SOFTWARE. */ +#include "qemu/osdep.h" #include "hw/hw.h" #include "hw/boards.h" #include "hw/xen/xen_backend.h" diff --git a/xen-common-stub.c b/xen-common-stub.c index 906f991..699c3f1 100644 --- a/xen-common-stub.c +++ b/xen-common-stub.c @@ -5,6 +5,7 @@ * See the COPYING file in the top-level directory. */ +#include "qemu/osdep.h" #include "qemu-common.h" #include "hw/xen/xen.h" diff --git a/xen-common.c b/xen-common.c index 0dcdbc3..9ece23e 100644 --- a/xen-common.c +++ b/xen-common.c @@ -8,6 +8,7 @@ * GNU GPL, version 2 or (at your option) any later version. */ +#include "qemu/osdep.h" #include "hw/xen/xen_backend.h" #include "qmp-commands.h" #include "sysemu/char.h" diff --git a/xen-hvm-stub.c b/xen-hvm-stub.c index b958367..a6cb5d3 100644 --- a/xen-hvm-stub.c +++ b/xen-hvm-stub.c @@ -8,6 +8,7 @@ * GNU GPL, version 2 or (at your option) any later version. */ +#include "qemu/osdep.h" #include "qemu-common.h" #include "hw/xen/xen.h" #include "exec/memory.h" diff --git a/xen-hvm.c b/xen-hvm.c index a9085a8..4b54418 100644 --- a/xen-hvm.c +++ b/xen-hvm.c @@ -8,6 +8,7 @@ * GNU GPL, version 2 or (at your option) any later version. */ +#include "qemu/osdep.h" #include <sys/mman.h> #include "hw/pci/pci.h" diff --git a/xen-mapcache.c b/xen-mapcache.c index 97fece2..a1bb102 100644 --- a/xen-mapcache.c +++ b/xen-mapcache.c @@ -8,7 +8,7 @@ * GNU GPL, version 2 or (at your option) any later version. */ -#include "config.h" +#include "qemu/osdep.h" #include <sys/resource.h> -- 1.9.1
