Patchwork Fix the fail of compilation

login
register
mail settings
Submitter Lei Li
Date April 9, 2013, 9:23 a.m.
Message ID <1365499423-19135-1-git-send-email-lilei@linux.vnet.ibm.com>
Download mbox | patch
Permalink /patch/235003/
State New
Headers show

Comments

Lei Li - April 9, 2013, 9:23 a.m.
Commit 47b5264eb3e1cd2825e48d28fd0d1b239ed53974 broke the compile. It's
caused by the rename of the file:

hw/9pfs/virtio-9p-device.h => include/hw/virtio/virtio-9p.h

Signed-off-by: Lei Li <lilei@linux.vnet.ibm.com>
---
 hw/9pfs/virtio-9p-device.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
Richard W.M. Jones - April 9, 2013, 9:49 a.m.
On Tue, Apr 09, 2013 at 05:23:43PM +0800, Lei Li wrote:
> Commit 47b5264eb3e1cd2825e48d28fd0d1b239ed53974 broke the compile. It's
> caused by the rename of the file:
> 
> hw/9pfs/virtio-9p-device.h => include/hw/virtio/virtio-9p.h
> 
> Signed-off-by: Lei Li <lilei@linux.vnet.ibm.com>
> ---
>  hw/9pfs/virtio-9p-device.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/hw/9pfs/virtio-9p-device.c b/hw/9pfs/virtio-9p-device.c
> index 43f930e..18e3397 100644
> --- a/hw/9pfs/virtio-9p-device.c
> +++ b/hw/9pfs/virtio-9p-device.c
> @@ -16,7 +16,7 @@
>  #include "qemu/sockets.h"
>  #include "virtio-9p.h"
>  #include "fsdev/qemu-fsdev.h"
> -#include "virtio-9p-device.h"
> +#include "hw/virtio/virtio-9p.h"
>  #include "virtio-9p-xattr.h"
>  #include "virtio-9p-coth.h"

ACK, this patch fixes the build for me.

(So does simply removing #include "virtio-9p-device.h" altogether)

Rich.
Michal Novotny - April 9, 2013, 10:50 a.m.
On 04/09/2013 11:23 AM, Lei Li wrote:
> Commit 47b5264eb3e1cd2825e48d28fd0d1b239ed53974 broke the compile. It's
> caused by the rename of the file:
>
> hw/9pfs/virtio-9p-device.h => include/hw/virtio/virtio-9p.h
>
> Signed-off-by: Lei Li <lilei@linux.vnet.ibm.com>
> ---
>  hw/9pfs/virtio-9p-device.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/hw/9pfs/virtio-9p-device.c b/hw/9pfs/virtio-9p-device.c
> index 43f930e..18e3397 100644
> --- a/hw/9pfs/virtio-9p-device.c
> +++ b/hw/9pfs/virtio-9p-device.c
> @@ -16,7 +16,7 @@
>  #include "qemu/sockets.h"
>  #include "virtio-9p.h"
>  #include "fsdev/qemu-fsdev.h"
> -#include "virtio-9p-device.h"
> +#include "hw/virtio/virtio-9p.h"
>  #include "virtio-9p-xattr.h"
>  #include "virtio-9p-coth.h"
>  
Fixes issue.

Reviewed-by: Michal Novotny <minovotn@redhat.com>

Patch

diff --git a/hw/9pfs/virtio-9p-device.c b/hw/9pfs/virtio-9p-device.c
index 43f930e..18e3397 100644
--- a/hw/9pfs/virtio-9p-device.c
+++ b/hw/9pfs/virtio-9p-device.c
@@ -16,7 +16,7 @@ 
 #include "qemu/sockets.h"
 #include "virtio-9p.h"
 #include "fsdev/qemu-fsdev.h"
-#include "virtio-9p-device.h"
+#include "hw/virtio/virtio-9p.h"
 #include "virtio-9p-xattr.h"
 #include "virtio-9p-coth.h"