From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53432) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WFWdB-0002XQ-PF for qemu-devel@nongnu.org; Mon, 17 Feb 2014 17:25:48 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WFWd1-0006Bx-3D for qemu-devel@nongnu.org; Mon, 17 Feb 2014 17:25:41 -0500 Received: from cantor2.suse.de ([195.135.220.15]:41719 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WFWd0-0006B8-Ef for qemu-devel@nongnu.org; Mon, 17 Feb 2014 17:25:30 -0500 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Mon, 17 Feb 2014 23:24:59 +0100 Message-Id: <1392675899-21210-50-git-send-email-afaerber@suse.de> In-Reply-To: <1392675899-21210-1-git-send-email-afaerber@suse.de> References: <1392675899-21210-1-git-send-email-afaerber@suse.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL v2 49/49] qtest: Include system headers before user headers List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Andreas=20F=C3=A4rber?= , Stefan Hajnoczi From: Stefan Hajnoczi It is dangerous to include user headers before system headers since user macros can affect system headers. Signed-off-by: Stefan Hajnoczi Signed-off-by: Andreas F=C3=A4rber --- tests/endianness-test.c | 2 +- tests/fw_cfg-test.c | 7 +++---- tests/i440fx-test.c | 11 +++++------ tests/m48t59-test.c | 3 ++- tests/qom-test.c | 3 ++- tests/rtc-test.c | 5 +++-- tests/tmp105-test.c | 5 +++-- 7 files changed, 19 insertions(+), 17 deletions(-) diff --git a/tests/endianness-test.c b/tests/endianness-test.c index 646df7d..92e17d2 100644 --- a/tests/endianness-test.c +++ b/tests/endianness-test.c @@ -10,7 +10,6 @@ * See the COPYING file in the top-level directory. * */ -#include "libqtest.h" =20 #include #include @@ -18,6 +17,7 @@ #include #include =20 +#include "libqtest.h" #include "qemu/bswap.h" =20 typedef struct TestCase TestCase; diff --git a/tests/fw_cfg-test.c b/tests/fw_cfg-test.c index e4f355c..5c8f8d6 100644 --- a/tests/fw_cfg-test.c +++ b/tests/fw_cfg-test.c @@ -10,15 +10,14 @@ * See the COPYING file in the top-level directory. */ =20 -#define NO_QEMU_PROTOS +#include +#include =20 #include "libqtest.h" +#define NO_QEMU_PROTOS #include "hw/nvram/fw_cfg.h" #include "libqos/fw_cfg.h" =20 -#include -#include - static uint64_t ram_size =3D 128 << 20; static uint16_t nb_cpus =3D 1; static uint16_t max_cpus =3D 1; diff --git a/tests/i440fx-test.c b/tests/i440fx-test.c index fa3e3d6..e398b83 100644 --- a/tests/i440fx-test.c +++ b/tests/i440fx-test.c @@ -12,12 +12,6 @@ * See the COPYING file in the top-level directory. */ =20 -#include "libqos/pci.h" -#include "libqos/pci-pc.h" -#include "libqtest.h" - -#include "hw/pci/pci_regs.h" - #include #include #include @@ -26,6 +20,11 @@ #include #include =20 +#include "libqtest.h" +#include "libqos/pci.h" +#include "libqos/pci-pc.h" +#include "hw/pci/pci_regs.h" + #define BROKEN 1 =20 #define ARRAY_SIZE(array) (sizeof(array) / sizeof((array)[0])) diff --git a/tests/m48t59-test.c b/tests/m48t59-test.c index 6abc4c8..71b4f28 100644 --- a/tests/m48t59-test.c +++ b/tests/m48t59-test.c @@ -11,7 +11,6 @@ * See the COPYING file in the top-level directory. * */ -#include "libqtest.h" =20 #include #include @@ -19,6 +18,8 @@ #include #include =20 +#include "libqtest.h" + #define RTC_SECONDS 0x9 #define RTC_MINUTES 0xa #define RTC_HOURS 0xb diff --git a/tests/qom-test.c b/tests/qom-test.c index 3316a11..b6671fb 100644 --- a/tests/qom-test.c +++ b/tests/qom-test.c @@ -6,10 +6,11 @@ * This work is licensed under the terms of the GNU GPL, version 2 or la= ter. * See the COPYING file in the top-level directory. */ -#include "libqtest.h" =20 #include #include + +#include "libqtest.h" #include "qemu/osdep.h" #include "qapi/qmp/types.h" =20 diff --git a/tests/rtc-test.c b/tests/rtc-test.c index f1b123f..4243624 100644 --- a/tests/rtc-test.c +++ b/tests/rtc-test.c @@ -10,8 +10,6 @@ * See the COPYING file in the top-level directory. * */ -#include "libqtest.h" -#include "hw/timer/mc146818rtc_regs.h" =20 #include #include @@ -19,6 +17,9 @@ #include #include =20 +#include "libqtest.h" +#include "hw/timer/mc146818rtc_regs.h" + static uint8_t base =3D 0x70; =20 static int bcd2dec(int value) diff --git a/tests/tmp105-test.c b/tests/tmp105-test.c index 5ac48e2..0834219 100644 --- a/tests/tmp105-test.c +++ b/tests/tmp105-test.c @@ -6,12 +6,13 @@ * This work is licensed under the terms of the GNU GPL, version 2 or la= ter. * See the COPYING file in the top-level directory. */ + +#include + #include "libqtest.h" #include "libqos/i2c.h" #include "hw/misc/tmp105_regs.h" =20 -#include - #define OMAP2_I2C_1_BASE 0x48070000 =20 #define N8X0_ADDR 0x48 --=20 1.8.4.5