| Message ID | 1488852768-8935-8-git-send-email-sstabellini@kernel.org |
|---|---|
| State | New |
| Headers | show |
On Mon, 6 Mar 2017 18:12:48 -0800 Stefano Stabellini <sstabellini@kernel.org> wrote: > Signed-off-by: Stefano Stabellini <stefano@aporeto.com> > CC: anthony.perard@citrix.com > CC: jgross@suse.com > CC: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com> > CC: Greg Kurz <groug@kaod.org> > --- > hw/9pfs/Makefile.objs | 1 + > hw/xen/xen_backend.c | 1 + > include/hw/xen/xen_backend.h | 1 + > 3 files changed, 3 insertions(+) > > diff --git a/hw/9pfs/Makefile.objs b/hw/9pfs/Makefile.objs > index da0ae0c..76a81c3 100644 > --- a/hw/9pfs/Makefile.objs > +++ b/hw/9pfs/Makefile.objs > @@ -7,3 +7,4 @@ common-obj-$(CONFIG_OPEN_BY_HANDLE) += 9p-handle.o > common-obj-y += 9p-proxy.o > > obj-y += virtio-9p-device.o > +obj-y += xen-9p-backend.o The xen-9p-backend.c file seems to be target agnostic: it can be built only once. Also, it should only be built if QEMU was configured with Xen support. Hence: obj-common-$(CONFIG_XEN_BACKEND) += xen-9p-backend.o > diff --git a/hw/xen/xen_backend.c b/hw/xen/xen_backend.c > index 6c21c37..7aa347d 100644 > --- a/hw/xen/xen_backend.c > +++ b/hw/xen/xen_backend.c > @@ -585,6 +585,7 @@ void xen_be_register_common(void) > xen_be_register("console", &xen_console_ops); > xen_be_register("vkbd", &xen_kbdmouse_ops); > xen_be_register("qdisk", &xen_blkdev_ops); #ifdef CONFIG_VIRTFS > + xen_be_register("9pfs", &xen_9pfs_ops); #endif > #ifdef CONFIG_USB_LIBUSB > xen_be_register("qusb", &xen_usb_ops); > #endif > diff --git a/include/hw/xen/xen_backend.h b/include/hw/xen/xen_backend.h > index 4f4799a..84e686c 100644 > --- a/include/hw/xen/xen_backend.h > +++ b/include/hw/xen/xen_backend.h > @@ -49,6 +49,7 @@ extern struct XenDevOps xen_console_ops; /* xen_console.c */ > extern struct XenDevOps xen_kbdmouse_ops; /* xen_framebuffer.c */ > extern struct XenDevOps xen_framebuffer_ops; /* xen_framebuffer.c */ > extern struct XenDevOps xen_blkdev_ops; /* xen_disk.c */ > +extern struct XenDevOps xen_9pfs_ops; /* xen-9p-backend.c */ ditto > extern struct XenDevOps xen_netdev_ops; /* xen_nic.c */ > #ifdef CONFIG_USB_LIBUSB > extern struct XenDevOps xen_usb_ops; /* xen-usb.c */ With the above fixes. Reviewed-by: Greg Kurz <groug@kaod.org>
diff --git a/hw/9pfs/Makefile.objs b/hw/9pfs/Makefile.objs index da0ae0c..76a81c3 100644 --- a/hw/9pfs/Makefile.objs +++ b/hw/9pfs/Makefile.objs @@ -7,3 +7,4 @@ common-obj-$(CONFIG_OPEN_BY_HANDLE) += 9p-handle.o common-obj-y += 9p-proxy.o obj-y += virtio-9p-device.o +obj-y += xen-9p-backend.o diff --git a/hw/xen/xen_backend.c b/hw/xen/xen_backend.c index 6c21c37..7aa347d 100644 --- a/hw/xen/xen_backend.c +++ b/hw/xen/xen_backend.c @@ -585,6 +585,7 @@ void xen_be_register_common(void) xen_be_register("console", &xen_console_ops); xen_be_register("vkbd", &xen_kbdmouse_ops); xen_be_register("qdisk", &xen_blkdev_ops); + xen_be_register("9pfs", &xen_9pfs_ops); #ifdef CONFIG_USB_LIBUSB xen_be_register("qusb", &xen_usb_ops); #endif diff --git a/include/hw/xen/xen_backend.h b/include/hw/xen/xen_backend.h index 4f4799a..84e686c 100644 --- a/include/hw/xen/xen_backend.h +++ b/include/hw/xen/xen_backend.h @@ -49,6 +49,7 @@ extern struct XenDevOps xen_console_ops; /* xen_console.c */ extern struct XenDevOps xen_kbdmouse_ops; /* xen_framebuffer.c */ extern struct XenDevOps xen_framebuffer_ops; /* xen_framebuffer.c */ extern struct XenDevOps xen_blkdev_ops; /* xen_disk.c */ +extern struct XenDevOps xen_9pfs_ops; /* xen-9p-backend.c */ extern struct XenDevOps xen_netdev_ops; /* xen_nic.c */ #ifdef CONFIG_USB_LIBUSB extern struct XenDevOps xen_usb_ops; /* xen-usb.c */
Signed-off-by: Stefano Stabellini <stefano@aporeto.com> CC: anthony.perard@citrix.com CC: jgross@suse.com CC: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com> CC: Greg Kurz <groug@kaod.org> --- hw/9pfs/Makefile.objs | 1 + hw/xen/xen_backend.c | 1 + include/hw/xen/xen_backend.h | 1 + 3 files changed, 3 insertions(+)