diff options
author | Peter Maydell <peter.maydell@linaro.org> | 2016-01-26 18:17:06 +0000 |
---|---|---|
committer | Peter Maydell <peter.maydell@linaro.org> | 2016-01-29 15:07:23 +0000 |
commit | 21cbfe5f37aaa3a13d3af28454e762c05be67429 (patch) | |
tree | d852e9ad387355a65b500681d8ba6400b426006e | |
parent | 8ef94f0bc9167f246b41cb1188bf80dcd84b49fe (diff) |
xen: Clean up includes
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.maydell@linaro.org>
Message-id: 1453832250-766-14-git-send-email-peter.maydell@linaro.org
-rw-r--r-- | hw/char/xen_console.c | 7 | ||||
-rw-r--r-- | hw/display/xenfb.c | 10 | ||||
-rw-r--r-- | hw/net/xen_nic.c | 11 | ||||
-rw-r--r-- | hw/xen/xen-host-pci-device.c | 1 | ||||
-rw-r--r-- | hw/xen/xen_backend.c | 10 | ||||
-rw-r--r-- | hw/xen/xen_devconfig.c | 1 | ||||
-rw-r--r-- | hw/xen/xen_pt.c | 1 | ||||
-rw-r--r-- | hw/xen/xen_pt_config_init.c | 1 | ||||
-rw-r--r-- | hw/xen/xen_pt_graphics.c | 1 | ||||
-rw-r--r-- | hw/xen/xen_pt_msi.c | 1 | ||||
-rw-r--r-- | hw/xenpv/xen_domainbuild.c | 2 | ||||
-rw-r--r-- | hw/xenpv/xen_machine_pv.c | 1 | ||||
-rw-r--r-- | xen-common-stub.c | 1 | ||||
-rw-r--r-- | xen-common.c | 1 | ||||
-rw-r--r-- | xen-hvm-stub.c | 1 | ||||
-rw-r--r-- | xen-hvm.c | 1 | ||||
-rw-r--r-- | 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 b92d0c6dd2..cbf1dccbb1 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 1676660e4e..a533c3d0f4 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 3ffb07d411..7281730d94 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 3827ca7da7..9666fff8c9 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 caa459ca3e..ef7843fe82 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 e138dbbec9..1f30fe4f5a 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 d33221be0e..657bf6cdc1 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 81c6721562..1b48f19183 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 e7a7c7e263..71e745f8ca 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 302a310190..5624685b20 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 f9be029b0e..5a9f5ac806 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 3250b94900..fc13535992 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 906f991f1e..699c3f1c64 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 6cd2959e21..4860b2eb76 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 b9583674ca..a6cb5d358f 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" @@ -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 4a04378020..49f394a777 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> |