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>

diff --git a/hw/virtio-blk.c b/hw/virtio-blk.c
index 4df23f4228f1477c65613afaca460d6b19caca4a..d5d4757f626d9a01180a56d45fa2431e0bd0bd2c 100644 (file)
--- 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 6bdf4e6ab41bd736aed00561e68d2a23497cac8d..e87e17432ec0a9d45152e5b50628ca6040a43e4f 100644 (file)
--- 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 96f77fe2d13f336ffba5ab4bff3e45e66e66e055..273cfa1af4523d7d74e7d2e76790e5c47bec752a 100644 (file)
--- 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 0b25a4dd4864ea21fe7720bfb9da31176642bde4..3a391451741165c548b5ad401c6361d8f1193be5 100644 (file)
--- 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 67c70e32e3c3f71fa533f02a774147339c7d69b1..a7551235e2b5a20bc2642382234d5f85f9c9b086 100644 (file)
--- 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