[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PULL 0/21] Please pull xen-20170421-tag for 2.10
From: |
Stefano Stabellini |
Subject: |
Re: [Qemu-devel] [PULL 0/21] Please pull xen-20170421-tag for 2.10 |
Date: |
Mon, 24 Apr 2017 14:25:31 -0700 (PDT) |
User-agent: |
Alpine 2.10 (DEB 1266 2009-07-14) |
On Mon, 24 Apr 2017, Peter Maydell wrote:
> On 21 April 2017 at 21:14, Stefano Stabellini <address@hidden> wrote:
> > The following changes since commit 55a19ad8b2d0797e3a8fe90ab99a9bb713824059:
> >
> > Update version for v2.9.0-rc1 release (2017-03-21 17:13:29 +0000)
> >
> > are available in the git repository at:
> >
> > git://xenbits.xen.org/people/sstabellini/qemu-dm.git tags/xen-20170421-tag
> >
> > for you to fetch changes up to b0d48550a2d10f0fa8c30a7cc3ff5a1cbda8d4c4:
> >
> > move xen-mapcache.c to hw/i386/xen/ (2017-04-21 12:41:29 -0700)
> >
> > ----------------------------------------------------------------
> > Xen 2017/04/21
> >
> > ----------------------------------------------------------------
>
> Hi; I'm afraid this doesn't build with clang:
>
>
> CC hw/9pfs/xen-9p-backend.o
> /home/petmay01/linaro/qemu-for-merges/hw/9pfs/xen-9p-backend.c:21:1:
> error: unused fun
> ction 'xen_9pfs_get_ring_ptr' [-Werror,-Wunused-function]
> DEFINE_XEN_FLEX_RING_AND_INTF(xen_9pfs);
> ^
> /home/petmay01/linaro/qemu-for-merges/include/hw/xen/io/ring.h:469:79:
> note: expanded
> from macro 'DEFINE_XEN_FLEX_RING_AND_INTF'
> };
> \
>
> ^
> /home/petmay01/linaro/qemu-for-merges/include/hw/xen/io/ring.h:387:30:
> note: expanded from macro '\
> DEFINE_XEN_FLEX_RING'
> static inline unsigned char *name##_get_ring_ptr(unsigned char *buf,
> \
> ^
> <scratch space>:151:1: note: expanded from here
> xen_9pfs_get_ring_ptr
> ^
> /home/petmay01/linaro/qemu-for-merges/hw/9pfs/xen-9p-backend.c:21:1:
> error: unused function 'xen_9pfs_write_packet'
> [-Werror,-Wunused-function]
> /home/petmay01/linaro/qemu-for-merges/include/hw/xen/io/ring.h:469:79:
> note: expanded from macro 'DEFINE_XEN_FLEX_RING_AND_INTF'
> };
> \
>
> ^
> /home/petmay01/linaro/qemu-for-merges/include/hw/xen/io/ring.h:412:20:
> note: expanded from macro '\
> DEFINE_XEN_FLEX_RING'
> static inline void name##_write_packet(unsigned char *buf,
> \
> ^
> <scratch space>:155:1: note: expanded from here
> xen_9pfs_write_packet
> ^
> 2 errors generated.
> /home/petmay01/linaro/qemu-for-merges/rules.mak:69: recipe for target
> 'hw/9pfs/xen-9p-backend.o' failed
>
>
> Clang requires that functions, even inline functions, defined in .c files
> must be used.
Thank you for finding this issue. Given that ring.h is synced from Xen,
I think it makes sense to leave as is. I'll fix it as follow:
diff --git a/hw/9pfs/xen-9p-backend.c b/hw/9pfs/xen-9p-backend.c
index 7e962aa..9c7f41a 100644
--- a/hw/9pfs/xen-9p-backend.c
+++ b/hw/9pfs/xen-9p-backend.c
@@ -13,12 +13,9 @@
#include "hw/hw.h"
#include "hw/9pfs/9p.h"
#include "hw/xen/xen_backend.h"
-#include "hw/xen/io/ring.h"
+#include "hw/9pfs/xen-9pfs.h"
#include "qemu/config-file.h"
#include "fsdev/qemu-fsdev.h"
-#include <xen/io/protocols.h>
-
-DEFINE_XEN_FLEX_RING_AND_INTF(xen_9pfs);
#define VERSIONS "1"
#define MAX_RINGS 8
diff --git a/hw/9pfs/xen-9pfs.h b/hw/9pfs/xen-9pfs.h
new file mode 100644
index 0000000..18f0ec0
--- /dev/null
+++ b/hw/9pfs/xen-9pfs.h
@@ -0,0 +1,14 @@
+/*
+ * Xen 9p backend
+ *
+ * Copyright Aporeto 2017
+ *
+ * Authors:
+ * Stefano Stabellini <address@hidden>
+ *
+ */
+
+#include <xen/io/protocols.h>
+#include "hw/xen/io/ring.h"
+
+DEFINE_XEN_FLEX_RING_AND_INTF(xen_9pfs);
- [Qemu-devel] [PULL 13/21] xen/9pfs: connect to the frontend, (continued)
- [Qemu-devel] [PULL 13/21] xen/9pfs: connect to the frontend, Stefano Stabellini, 2017/04/21
- [Qemu-devel] [PULL 14/21] xen/9pfs: receive requests from the frontend, Stefano Stabellini, 2017/04/21
- [Qemu-devel] [PULL 16/21] xen/9pfs: send responses back to the frontend, Stefano Stabellini, 2017/04/21
- [Qemu-devel] [PULL 15/21] xen/9pfs: implement in/out_iov_from_pdu and vmarshal/vunmarshal, Stefano Stabellini, 2017/04/21
- [Qemu-devel] [PULL 17/21] xen/9pfs: build and register Xen 9pfs backend, Stefano Stabellini, 2017/04/21
- [Qemu-devel] [PULL 18/21] add xen-9p-backend to MAINTAINERS under Xen, Stefano Stabellini, 2017/04/21
- [Qemu-devel] [PULL 19/21] move xen-common.c to hw/xen/, Stefano Stabellini, 2017/04/21
- [Qemu-devel] [PULL 21/21] move xen-mapcache.c to hw/i386/xen/, Stefano Stabellini, 2017/04/21
- [Qemu-devel] [PULL 20/21] move xen-hvm.c to hw/i386/xen/, Stefano Stabellini, 2017/04/21
- Re: [Qemu-devel] [PULL 0/21] Please pull xen-20170421-tag for 2.10, Peter Maydell, 2017/04/24
- Re: [Qemu-devel] [PULL 0/21] Please pull xen-20170421-tag for 2.10,
Stefano Stabellini <=
- Re: [Qemu-devel] [PULL 0/21] Please pull xen-20170421-tag for 2.10, Peter Maydell, 2017/04/24
- Re: [Qemu-devel] [PULL 0/21] Please pull xen-20170421-tag for 2.10, Stefano Stabellini, 2017/04/24
- Re: [Qemu-devel] [PULL 0/21] Please pull xen-20170421-tag for 2.10, Greg Kurz, 2017/04/25
- Re: [Qemu-devel] [PULL 0/21] Please pull xen-20170421-tag for 2.10, Markus Armbruster, 2017/04/25
- Re: [Qemu-devel] [PULL 0/21] Please pull xen-20170421-tag for 2.10, Stefano Stabellini, 2017/04/25
- Re: [Qemu-devel] [PULL 0/21] Please pull xen-20170421-tag for 2.10, Markus Armbruster, 2017/04/26