summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Weil <weil@mail.berlios.de>2011-09-08 17:55:32 +0200
committerStefan Hajnoczi <stefanha@linux.vnet.ibm.com>2011-09-09 09:56:12 +0100
commit5a61cb60d6ee8d49c553d7959363df26b55f4873 (patch)
tree501751810acb98079ca316af36a9639b1d850a2a
parent069d89b8a8dc5a9af4733bca14763b45bbb2546f (diff)
downloadqemu-5a61cb60d6ee8d49c553d7959363df26b55f4873.tar.gz
Fix include statements for qemu-common.h
* qemu-common.h is not a system include file, so it should be included with "" instead of <>. Otherwise incremental builds might fail because only local include files are checked for changes. * linux-user/syscall.c included the file twice. Cc: Riku Voipio <riku.voipio@iki.fi> Cc: Jan Kiszka <jan.kiszka@siemens.com> Acked-by: Kevin Wolf <kwolf@redhat.com> Signed-off-by: Stefan Weil <weil@mail.berlios.de> Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
-rw-r--r--hw/virtio-blk.c2
-rw-r--r--linux-user/syscall.c3
-rw-r--r--nbd.h2
-rw-r--r--qemu-nbd.c2
-rw-r--r--slirp/libslirp.h2
5 files changed, 5 insertions, 6 deletions
diff --git a/hw/virtio-blk.c b/hw/virtio-blk.c
index 4df23f4228..d5d4757f62 100644
--- a/hw/virtio-blk.c
+++ b/hw/virtio-blk.c
@@ -11,7 +11,7 @@
*
*/
-#include <qemu-common.h>
+#include "qemu-common.h"
#include "qemu-error.h"
#include "trace.h"
#include "blockdev.h"
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index 6bdf4e6ab4..e87e17432e 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -60,7 +60,7 @@ int __clone2(int (*fn)(void *), void *child_stack_base,
#include <netinet/ip.h>
#include <netinet/tcp.h>
#include <linux/wireless.h>
-#include <qemu-common.h>
+#include "qemu-common.h"
#ifdef TARGET_GPROF
#include <sys/gmon.h>
#endif
@@ -96,7 +96,6 @@ int __clone2(int (*fn)(void *), void *child_stack_base,
#include "cpu-uname.h"
#include "qemu.h"
-#include "qemu-common.h"
#if defined(CONFIG_USE_NPTL)
#define CLONE_NPTL_FLAGS2 (CLONE_SETTLS | \
diff --git a/nbd.h b/nbd.h
index 96f77fe2d1..273cfa1af4 100644
--- a/nbd.h
+++ b/nbd.h
@@ -21,7 +21,7 @@
#include <sys/types.h>
-#include <qemu-common.h>
+#include "qemu-common.h"
#include "block_int.h"
diff --git a/qemu-nbd.c b/qemu-nbd.c
index 0b25a4dd48..3a39145174 100644
--- a/qemu-nbd.c
+++ b/qemu-nbd.c
@@ -16,7 +16,7 @@
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
-#include <qemu-common.h>
+#include "qemu-common.h"
#include "block_int.h"
#include "nbd.h"
diff --git a/slirp/libslirp.h b/slirp/libslirp.h
index 67c70e32e3..a7551235e2 100644
--- a/slirp/libslirp.h
+++ b/slirp/libslirp.h
@@ -1,7 +1,7 @@
#ifndef _LIBSLIRP_H
#define _LIBSLIRP_H
-#include <qemu-common.h>
+#include "qemu-common.h"
#ifdef CONFIG_SLIRP