On Mon, Feb 21, 2011 at 02:40:08PM +0100, Markus Groß wrote:
--- po/POTFILES.in | 1 + src/Makefile.am | 13 + src/xen/xen_driver.c | 12 +- src/xen/xend_internal.c | 1329 +------------------------------------------- src/xen/xend_internal.h | 18 - src/xen/xm_internal.c | 1 + src/xenxs/xen_sxpr.c | 1351 +++++++++++++++++++++++++++++++++++++++++++++ src/xenxs/xen_sxpr.h | 62 ++ src/xenxs/xenxs_private.h | 37 ++ tests/sexpr2xmltest.c | 13 +- 10 files changed, 1512 insertions(+), 1325 deletions(-) create mode 100644 src/xenxs/xen_sxpr.c create mode 100644 src/xenxs/xen_sxpr.h create mode 100644 src/xenxs/xenxs_private.h
diff --git a/po/POTFILES.in b/po/POTFILES.in index 2256cb2..7fbbe8f 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -119,6 +119,7 @@ src/xen/xm_internal.c src/xen/xs_internal.c src/xenapi/xenapi_driver.c src/xenapi/xenapi_utils.c +src/xenxs/xen_sxpr.c tools/console.c tools/libvirt-guests.init.sh tools/virsh.c diff --git a/src/Makefile.am b/src/Makefile.am index 5c9b019..1e670e5 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -423,6 +423,10 @@ CPU_SOURCES = \ VMX_SOURCES = \ vmx/vmx.c vmx/vmx.h
+XENXS_SOURCES = \ + xenxs/xenxs_private.h \ + xenxs/xen_sxpr.c xenxs/xen_sxpr.h + pkgdata_DATA = cpu/cpu_map.xml
EXTRA_DIST += $(pkgdata_DATA) @@ -464,6 +468,14 @@ libvirt_vmx_la_CFLAGS = \ libvirt_vmx_la_SOURCES = $(VMX_SOURCES) endif
+if WITH_XEN +noinst_LTLIBRARIES += libvirt_xenxs.la +libvirt_la_BUILT_LIBADD += libvirt_xenxs.la +libvirt_xenxs_la_CFLAGS = \ + -I@top_srcdir@/src/conf $(AM_CFLAGS) +libvirt_xenxs_la_SOURCES = $(XENXS_SOURCES) +endif +
noinst_LTLIBRARIES += libvirt_driver.la libvirt_la_BUILT_LIBADD += libvirt_driver.la @@ -583,6 +595,7 @@ endif libvirt_driver_xen_la_CFLAGS = \ $(XEN_CFLAGS) \ -I@top_srcdir@/src/conf \ + -I@top_srcdir@/src/xenxs \ $(AM_CFLAGS) libvirt_driver_xen_la_LDFLAGS = $(AM_LDFLAGS) libvirt_driver_xen_la_LIBADD = $(XEN_LIBS)
You also need to add $(XENXS_SOURCES) to the huge EXTRA_DIST entry later, so that the files get included in the tar.gz even if 'make dist' is run on a system without xen. ACK to the rest of the patch if that bit is fixed Daniel -- |: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :| |: http://libvirt.org -o- http://virt-manager.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :|