Stephen Rothwell
2010-Aug-03 04:13 UTC
[Xen-devel] linux-next: manual merge of the xen tree with the swiotlb tree
Hi all,
Today''s linux-next merge of the xen tree got a conflict in
drivers/xen/Kconfig drivers/xen/Makefile between commit
b097186fd29d5bc5a26d1ae87995821ffc27b66e ("swiotlb-xen: SWIOTLB library
for Xen PV guest with PCI passthrough") from the swiotlb tree and commit
183d03cc4ff39e0f0d952c09aa96d0abfd6e0c3c ("xen: Xen PCI platform device
driver") from the xen tree.
Just overlapping additions. I fixed it up (see below) and can carry the
fix as necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc drivers/xen/Kconfig
index 97199c2,0a88269..0000000
--- a/drivers/xen/Kconfig
+++ b/drivers/xen/Kconfig
@@@ -62,8 -62,13 +62,18 @@@ config XEN_SYS_HYPERVISO
virtual environment, /sys/hypervisor will still be present,
but will have no xen contents.
+config SWIOTLB_XEN
+ def_bool y
+ depends on SWIOTLB
+
+ config XEN_PLATFORM_PCI
+ tristate "xen platform pci device driver"
+ depends on XEN_PVHVM
+ default m
+ help
+ Driver for the Xen PCI Platform device: it is responsible for
+ initializing xenbus and grant_table when running in a Xen HVM
+ domain. As a consequence this driver is required to run any Xen PV
+ frontend on Xen HVM.
++
endmenu
diff --cc drivers/xen/Makefile
index 85f84cf,e392fb7..0000000
--- a/drivers/xen/Makefile
+++ b/drivers/xen/Makefile
@@@ -10,4 -10,4 +10,5 @@@ obj-$(CONFIG_XEN_BALLOON) += balloon.
obj-$(CONFIG_XEN_DEV_EVTCHN) += evtchn.o
obj-$(CONFIG_XENFS) += xenfs/
obj-$(CONFIG_XEN_SYS_HYPERVISOR) += sys-hypervisor.o
+obj-$(CONFIG_SWIOTLB_XEN) += swiotlb-xen.o
+ obj-$(CONFIG_XEN_PLATFORM_PCI) += platform-pci.o
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xensource.com
http://lists.xensource.com/xen-devel
Stephen Rothwell
2010-Aug-03 04:16 UTC
[Xen-devel] linux-next: manual merge of the xen tree with the swiotlb tree
Hi all,
Today''s linux-next merge of the xen tree got a conflict in
include/xen/xen-ops.h between commit
08bbc9da92f7e44b9c208c6a1adba70c403b255e ("xen: Add
xen_create_contiguous_region") from the swiotlb tree and commit
016b6f5fe8398b0291cece60b749d7c930a2e09c ("xen: Add suspend/resume
support for PV on HVM guests") from the xen tree.
Just overlapping additions. I fixed it up (see below) and can carry the
fix as necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc include/xen/xen-ops.h
index d789c93,46bc81e..0000000
--- a/include/xen/xen-ops.h
+++ b/include/xen/xen-ops.h
@@@ -14,10 -15,6 +15,12 @@@ void xen_mm_unpin_all(void)
void xen_timer_resume(void);
void xen_arch_resume(void);
+extern unsigned long *xen_contiguous_bitmap;
+int xen_create_contiguous_region(unsigned long vstart, unsigned int order,
+ unsigned int address_bits);
+
+void xen_destroy_contiguous_region(unsigned long vstart, unsigned int order);
+
+ int xen_setup_shutdown_event(void);
+
#endif /* INCLUDE_XEN_OPS_H */
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xensource.com
http://lists.xensource.com/xen-devel
Konrad Rzeszutek Wilk
2010-Aug-03 13:48 UTC
Re: [Xen-devel] linux-next: manual merge of the xen tree with the swiotlb tree
On Tue, Aug 03, 2010 at 02:16:46PM +1000, Stephen Rothwell wrote:> Hi all, > > Today''s linux-next merge of the xen tree got a conflict in > include/xen/xen-ops.h between commit > 08bbc9da92f7e44b9c208c6a1adba70c403b255e ("xen: Add > xen_create_contiguous_region") from the swiotlb tree and commit > 016b6f5fe8398b0291cece60b749d7c930a2e09c ("xen: Add suspend/resume > support for PV on HVM guests") from the xen tree. > > Just overlapping additions. I fixed it up (see below) and can carry the > fix as necessary.Thank you.> -- > Cheers, > Stephen Rothwell sfr@canb.auug.org.au > > diff --cc include/xen/xen-ops.h > index d789c93,46bc81e..0000000 > --- a/include/xen/xen-ops.h > +++ b/include/xen/xen-ops.h > @@@ -14,10 -15,6 +15,12 @@@ void xen_mm_unpin_all(void) > void xen_timer_resume(void); > void xen_arch_resume(void); > > +extern unsigned long *xen_contiguous_bitmap; > +int xen_create_contiguous_region(unsigned long vstart, unsigned int order, > + unsigned int address_bits); > + > +void xen_destroy_contiguous_region(unsigned long vstart, unsigned int order); > + > + int xen_setup_shutdown_event(void); > + > #endif /* INCLUDE_XEN_OPS_H */ > > _______________________________________________ > Xen-devel mailing list > Xen-devel@lists.xensource.com > http://lists.xensource.com/xen-devel_______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel
Konrad Rzeszutek Wilk
2010-Aug-03 13:49 UTC
Re: [Xen-devel] linux-next: manual merge of the xen tree with the swiotlb tree
On Tue, Aug 03, 2010 at 02:13:51PM +1000, Stephen Rothwell wrote:> Hi all, > > Today''s linux-next merge of the xen tree got a conflict in > drivers/xen/Kconfig drivers/xen/Makefile between commit > b097186fd29d5bc5a26d1ae87995821ffc27b66e ("swiotlb-xen: SWIOTLB library > for Xen PV guest with PCI passthrough") from the swiotlb tree and commit > 183d03cc4ff39e0f0d952c09aa96d0abfd6e0c3c ("xen: Xen PCI platform device > driver") from the xen tree. > > Just overlapping additions. I fixed it up (see below) and can carry the > fix as necessary.Thank you!> -- > Cheers, > Stephen Rothwell sfr@canb.auug.org.au > > diff --cc drivers/xen/Kconfig > index 97199c2,0a88269..0000000 > --- a/drivers/xen/Kconfig > +++ b/drivers/xen/Kconfig > @@@ -62,8 -62,13 +62,18 @@@ config XEN_SYS_HYPERVISO > virtual environment, /sys/hypervisor will still be present, > but will have no xen contents. > > +config SWIOTLB_XEN > + def_bool y > + depends on SWIOTLB > + > + config XEN_PLATFORM_PCI > + tristate "xen platform pci device driver" > + depends on XEN_PVHVM > + default m > + help > + Driver for the Xen PCI Platform device: it is responsible for > + initializing xenbus and grant_table when running in a Xen HVM > + domain. As a consequence this driver is required to run any Xen PV > + frontend on Xen HVM. > ++ > endmenu > diff --cc drivers/xen/Makefile > index 85f84cf,e392fb7..0000000 > --- a/drivers/xen/Makefile > +++ b/drivers/xen/Makefile > @@@ -10,4 -10,4 +10,5 @@@ obj-$(CONFIG_XEN_BALLOON) += balloon. > obj-$(CONFIG_XEN_DEV_EVTCHN) += evtchn.o > obj-$(CONFIG_XENFS) += xenfs/ > obj-$(CONFIG_XEN_SYS_HYPERVISOR) += sys-hypervisor.o > +obj-$(CONFIG_SWIOTLB_XEN) += swiotlb-xen.o > + obj-$(CONFIG_XEN_PLATFORM_PCI) += platform-pci.o > > _______________________________________________ > Xen-devel mailing list > Xen-devel@lists.xensource.com > http://lists.xensource.com/xen-devel_______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel