[Qemu-devel] [PATCH] all: Clean up includes

[Qemu-devel] [PATCH] all: Clean up includes

[Peter Maydell]

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>
---
This just catches a couple of stragglers since I posted
the last clean-includes patchset last week. I'm going to
apply things to master directly shortly...

 hw/vfio/amd-xgbe.c  | 1 +
 tests/boot-sector.c | 3 +--
 tests/pxe-test.c    | 3 +--
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/hw/vfio/amd-xgbe.c b/hw/vfio/amd-xgbe.c
index 53451eb..2c60310 100644
--- a/hw/vfio/amd-xgbe.c
+++ b/hw/vfio/amd-xgbe.c
@@ -11,6 +11,7 @@
  *
  */
 
+#include "qemu/osdep.h"
 #include "hw/vfio/vfio-amd-xgbe.h"
 
 static void amd_xgbe_realize(DeviceState *dev, Error **errp)
diff --git a/tests/boot-sector.c b/tests/boot-sector.c
index 0b48bb3..3ffe298 100644
--- a/tests/boot-sector.c
+++ b/tests/boot-sector.c
@@ -10,9 +10,8 @@
  * 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 "boot-sector.h"
-#include <string.h>
-#include <stdio.h>
 #include "qemu-common.h"
 #include "libqtest.h"
 
diff --git a/tests/pxe-test.c b/tests/pxe-test.c
index fa43095..875e4c4 100644
--- a/tests/pxe-test.c
+++ b/tests/pxe-test.c
@@ -11,8 +11,7 @@
  * See the COPYING file in the top-level directory.
  */
 
-#include <string.h>
-#include <stdio.h>
+#include "qemu/osdep.h"
 #include <glib.h>
 #include <glib/gstdio.h>
 #include "qemu-common.h"
-- 
1.9.1

Re: [Qemu-devel] [PATCH] all: Clean up includes

[Eric Blake]

[-- Attachment #1: Type: text/plain, Size: 613 bytes --]

On 02/23/2016 05:41 AM, Peter Maydell wrote:
> 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>
> ---
> This just catches a couple of stragglers since I posted
> the last clean-includes patchset last week. I'm going to
> apply things to master directly shortly...

Reviewed-by: Eric Blake <eblake@redhat.com>

-- 
Eric Blake   eblake redhat com    +1-919-301-3266
Libvirt virtualization library http://libvirt.org


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 604 bytes --]