qtest: Include system headers before user headers

It is dangerous to include user headers before system headers since user
macros can affect system headers.

Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Andreas Färber <afaerber@suse.de>
This commit is contained in:
Stefan Hajnoczi 2014-02-08 11:41:07 +01:00 committed by Andreas Färber
parent e41b509d68
commit 91f32b0c92
7 changed files with 21 additions and 19 deletions

View File

@ -10,7 +10,6 @@
* See the COPYING file in the top-level directory.
*
*/
#include "libqtest.h"
#include <glib.h>
#include <stdio.h>
@ -18,6 +17,7 @@
#include <stdlib.h>
#include <unistd.h>
#include "libqtest.h"
#include "qemu/bswap.h"
typedef struct TestCase TestCase;

View File

@ -10,15 +10,14 @@
* See the COPYING file in the top-level directory.
*/
#define NO_QEMU_PROTOS
#include "libqtest.h"
#include "hw/nvram/fw_cfg.h"
#include "libqos/fw_cfg.h"
#include <string.h>
#include <glib.h>
#include "libqtest.h"
#define NO_QEMU_PROTOS
#include "hw/nvram/fw_cfg.h"
#include "libqos/fw_cfg.h"
static uint64_t ram_size = 128 << 20;
static uint16_t nb_cpus = 1;
static uint16_t max_cpus = 1;

View File

@ -12,12 +12,6 @@
* See the COPYING file in the top-level directory.
*/
#include "libqos/pci.h"
#include "libqos/pci-pc.h"
#include "libqtest.h"
#include "hw/pci/pci_regs.h"
#include <glib.h>
#include <string.h>
#include <stdio.h>
@ -26,6 +20,11 @@
#include <sys/mman.h>
#include <stdlib.h>
#include "libqtest.h"
#include "libqos/pci.h"
#include "libqos/pci-pc.h"
#include "hw/pci/pci_regs.h"
#define BROKEN 1
#define ARRAY_SIZE(array) (sizeof(array) / sizeof((array)[0]))

View File

@ -11,7 +11,6 @@
* See the COPYING file in the top-level directory.
*
*/
#include "libqtest.h"
#include <glib.h>
#include <stdio.h>
@ -19,6 +18,8 @@
#include <stdlib.h>
#include <unistd.h>
#include "libqtest.h"
#define RTC_SECONDS 0x9
#define RTC_MINUTES 0xa
#define RTC_HOURS 0xb

View File

@ -6,10 +6,11 @@
* 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 "libqtest.h"
#include <glib.h>
#include <string.h>
#include "libqtest.h"
#include "qemu/osdep.h"
#include "qapi/qmp/types.h"

View File

@ -10,8 +10,6 @@
* See the COPYING file in the top-level directory.
*
*/
#include "libqtest.h"
#include "hw/timer/mc146818rtc_regs.h"
#include <glib.h>
#include <stdio.h>
@ -19,6 +17,9 @@
#include <stdlib.h>
#include <unistd.h>
#include "libqtest.h"
#include "hw/timer/mc146818rtc_regs.h"
static uint8_t base = 0x70;
static int bcd2dec(int value)

View File

@ -6,12 +6,13 @@
* 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 <glib.h>
#include "libqtest.h"
#include "libqos/i2c.h"
#include "hw/misc/tmp105_regs.h"
#include <glib.h>
#define OMAP2_I2C_1_BASE 0x48070000
#define N8X0_ADDR 0x48