Re: [Qemu-devel] [PATCH] virtio-9p: Fix compilation (wrong include statements)

[Anthony Liguori]

On 04/28/2011 12:08 PM, Stefan Weil wrote:
> From: Stefan Weil<address@hidden>
>
> Commit 353ac78d495ef976242abd868f68d78420861c2c moved the files
> without fixing the include paths.
>
> Signed-off-by: Stefan Weil<address@hidden>


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"