* [Qemu-devel] [PATCH] Fix include statements for qemu-common.h
@ 2011-09-08 15:55 Stefan Weil
2011-09-09 8:16 ` Kevin Wolf
2011-09-09 9:00 ` [Qemu-devel] [Qemu-trivial] " Stefan Hajnoczi
0 siblings, 2 replies; 3+ messages in thread
From: Stefan Weil @ 2011-09-08 15:55 UTC (permalink / raw)
To: QEMU Developers; +Cc: qemu-trivial, Riku Voipio, Kevin Wolf, Jan Kiszka
* 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: Kevin Wolf <kwolf@redhat.com>
Cc: Riku Voipio <riku.voipio@iki.fi>
Cc: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Stefan Weil <weil@mail.berlios.de>
---
hw/virtio-blk.c | 2 +-
linux-user/syscall.c | 3 +--
nbd.h | 2 +-
qemu-nbd.c | 2 +-
slirp/libslirp.h | 2 +-
5 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/hw/virtio-blk.c b/hw/virtio-blk.c
index 4df23f4..d5d4757 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 6bdf4e6..e87e174 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 96f77fe..273cfa1 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 0b25a4d..3a39145 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 67c70e3..a755123 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
--
1.7.2.5
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [Qemu-devel] [PATCH] Fix include statements for qemu-common.h
2011-09-08 15:55 [Qemu-devel] [PATCH] Fix include statements for qemu-common.h Stefan Weil
@ 2011-09-09 8:16 ` Kevin Wolf
2011-09-09 9:00 ` [Qemu-devel] [Qemu-trivial] " Stefan Hajnoczi
1 sibling, 0 replies; 3+ messages in thread
From: Kevin Wolf @ 2011-09-09 8:16 UTC (permalink / raw)
To: Stefan Weil; +Cc: qemu-trivial, Jan Kiszka, Riku Voipio, QEMU Developers
Am 08.09.2011 17:55, schrieb Stefan Weil:
> * 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: Kevin Wolf <kwolf@redhat.com>
> Cc: Riku Voipio <riku.voipio@iki.fi>
> Cc: Jan Kiszka <jan.kiszka@siemens.com>
> Signed-off-by: Stefan Weil <weil@mail.berlios.de>
Acked-by: Kevin Wolf <kwolf@redhat.com>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [Qemu-devel] [Qemu-trivial] [PATCH] Fix include statements for qemu-common.h
2011-09-08 15:55 [Qemu-devel] [PATCH] Fix include statements for qemu-common.h Stefan Weil
2011-09-09 8:16 ` Kevin Wolf
@ 2011-09-09 9:00 ` Stefan Hajnoczi
1 sibling, 0 replies; 3+ messages in thread
From: Stefan Hajnoczi @ 2011-09-09 9:00 UTC (permalink / raw)
To: Stefan Weil
Cc: qemu-trivial, Kevin Wolf, Riku Voipio, QEMU Developers,
Jan Kiszka
On Thu, Sep 08, 2011 at 05:55:32PM +0200, Stefan Weil wrote:
> * 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: Kevin Wolf <kwolf@redhat.com>
> Cc: Riku Voipio <riku.voipio@iki.fi>
> Cc: Jan Kiszka <jan.kiszka@siemens.com>
> Signed-off-by: Stefan Weil <weil@mail.berlios.de>
> ---
> hw/virtio-blk.c | 2 +-
> linux-user/syscall.c | 3 +--
> nbd.h | 2 +-
> qemu-nbd.c | 2 +-
> slirp/libslirp.h | 2 +-
> 5 files changed, 5 insertions(+), 6 deletions(-)
Thanks, applied to the trivial patches -next tree:
http://repo.or.cz/w/qemu/stefanha.git/shortlog/refs/heads/trivial-patches-next
Perhaps I'm being too quick but seems like an obvious fix.
Stefan
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2011-09-09 9:00 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-09-08 15:55 [Qemu-devel] [PATCH] Fix include statements for qemu-common.h Stefan Weil
2011-09-09 8:16 ` Kevin Wolf
2011-09-09 9:00 ` [Qemu-devel] [Qemu-trivial] " Stefan Hajnoczi
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).