From: Anthony Liguori <anthony@codemonkey.ws>
To: Stefan Weil <weil@mail.berlios.de>
Cc: Anthony Liguori <aliguori@us.ibm.com>,
Stefan Weil <Stefan.Weil@Kath-Kirche-Ladenburg.de>,
Venkateswararao Jujjuri <jvrao@linux.vnet.ibm.com>,
QEMU Developers <qemu-devel@nongnu.org>,
"Aneesh Kumar K.V" <aneesh.kumar@linux.vnet.ibm.com>
Subject: Re: [Qemu-devel] [PATCH] virtio-9p: Fix compilation (wrong include statements)
Date: Thu, 28 Apr 2011 12:39:16 -0500 [thread overview]
Message-ID: <4DB9A644.6000802@codemonkey.ws> (raw)
In-Reply-To: <1304010495-18136-1-git-send-email-weil@mail.berlios.de>
On 04/28/2011 12:08 PM, Stefan Weil wrote:
> From: Stefan Weil<Stefan.Weil@Kath-Kirche-Ladenburg.de>
>
> Commit 353ac78d495ef976242abd868f68d78420861c2c moved the files
> without fixing the include paths.
>
> Signed-off-by: Stefan Weil<Stefan.Weil@Kath-Kirche-Ladenburg.de>
This is not correct. I think we learned in IRC that the problem is
Stefan is using CFLAGS=-g which overrides the CFLAGS append added by
this patch.
Regards,
Anthony Liguori
> ---
> hw/9pfs/virtio-9p-debug.c | 5 +++--
> hw/9pfs/virtio-9p-local.c | 3 ++-
> hw/9pfs/virtio-9p-posix-acl.c | 2 +-
> hw/9pfs/virtio-9p-xattr-user.c | 2 +-
> hw/9pfs/virtio-9p-xattr.c | 2 +-
> hw/9pfs/virtio-9p.c | 4 ++--
> 6 files changed, 10 insertions(+), 8 deletions(-)
>
> diff --git a/hw/9pfs/virtio-9p-debug.c b/hw/9pfs/virtio-9p-debug.c
> index 6b18842..4636ad5 100644
> --- a/hw/9pfs/virtio-9p-debug.c
> +++ b/hw/9pfs/virtio-9p-debug.c
> @@ -10,8 +10,9 @@
> * the COPYING file in the top-level directory.
> *
> */
> -#include "virtio.h"
> -#include "pc.h"
> +
> +#include "hw/virtio.h"
> +#include "hw/pc.h"
> #include "virtio-9p.h"
> #include "virtio-9p-debug.h"
>
> diff --git a/hw/9pfs/virtio-9p-local.c b/hw/9pfs/virtio-9p-local.c
> index 0a015de..3effc39 100644
> --- a/hw/9pfs/virtio-9p-local.c
> +++ b/hw/9pfs/virtio-9p-local.c
> @@ -10,7 +10,8 @@
> * the COPYING file in the top-level directory.
> *
> */
> -#include "virtio.h"
> +
> +#include "hw/virtio.h"
> #include "virtio-9p.h"
> #include "virtio-9p-xattr.h"
> #include<arpa/inet.h>
> diff --git a/hw/9pfs/virtio-9p-posix-acl.c b/hw/9pfs/virtio-9p-posix-acl.c
> index 575abe8..c0ae9d6 100644
> --- a/hw/9pfs/virtio-9p-posix-acl.c
> +++ b/hw/9pfs/virtio-9p-posix-acl.c
> @@ -13,7 +13,7 @@
>
> #include<sys/types.h>
> #include<attr/xattr.h>
> -#include "virtio.h"
> +#include "hw/virtio.h"
> #include "virtio-9p.h"
> #include "fsdev/file-op-9p.h"
> #include "virtio-9p-xattr.h"
> diff --git a/hw/9pfs/virtio-9p-xattr-user.c b/hw/9pfs/virtio-9p-xattr-user.c
> index bba13ce..c56039c 100644
> --- a/hw/9pfs/virtio-9p-xattr-user.c
> +++ b/hw/9pfs/virtio-9p-xattr-user.c
> @@ -12,7 +12,7 @@
> */
>
> #include<sys/types.h>
> -#include "virtio.h"
> +#include "hw/virtio.h"
> #include "virtio-9p.h"
> #include "fsdev/file-op-9p.h"
> #include "virtio-9p-xattr.h"
> diff --git a/hw/9pfs/virtio-9p-xattr.c b/hw/9pfs/virtio-9p-xattr.c
> index 03c3d3f..f08ce6e 100644
> --- a/hw/9pfs/virtio-9p-xattr.c
> +++ b/hw/9pfs/virtio-9p-xattr.c
> @@ -11,7 +11,7 @@
> *
> */
>
> -#include "virtio.h"
> +#include "hw/virtio.h"
> #include "virtio-9p.h"
> #include "fsdev/file-op-9p.h"
> #include "virtio-9p-xattr.h"
> diff --git a/hw/9pfs/virtio-9p.c b/hw/9pfs/virtio-9p.c
> index b5fc52b..ac5a1d0 100644
> --- a/hw/9pfs/virtio-9p.c
> +++ b/hw/9pfs/virtio-9p.c
> @@ -11,8 +11,8 @@
> *
> */
>
> -#include "virtio.h"
> -#include "pc.h"
> +#include "hw/virtio.h"
> +#include "hw/pc.h"
> #include "qemu_socket.h"
> #include "virtio-9p.h"
> #include "fsdev/qemu-fsdev.h"
next prev parent reply other threads:[~2011-04-28 17:39 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-04-28 17:08 [Qemu-devel] [PATCH] virtio-9p: Fix compilation (wrong include statements) Stefan Weil
2011-04-28 17:39 ` Anthony Liguori [this message]
2011-04-28 17:44 ` Stefan Weil
2011-04-28 17:46 ` Anthony Liguori
2011-04-28 19:04 ` Blue Swirl
2011-04-28 20:02 ` [Qemu-devel] [PATCH v3] virtio-9p: Use relative includes for files in hw Stefan Weil
2011-04-28 20:49 ` Anthony Liguori
2011-04-28 21:44 ` Stefan Weil
2011-04-29 0:46 ` Peter Maydell
2011-05-27 18:27 ` Stefan Weil
2011-05-28 16:51 ` Aneesh Kumar K.V
2011-05-28 19:12 ` Venkateswararao Jujjuri
2011-04-28 18:21 ` [Qemu-devel] [PATCH v2] " Stefan Weil
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4DB9A644.6000802@codemonkey.ws \
--to=anthony@codemonkey.ws \
--cc=Stefan.Weil@Kath-Kirche-Ladenburg.de \
--cc=aliguori@us.ibm.com \
--cc=aneesh.kumar@linux.vnet.ibm.com \
--cc=jvrao@linux.vnet.ibm.com \
--cc=qemu-devel@nongnu.org \
--cc=weil@mail.berlios.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).