--- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index a790754..2cb1a38 100644 --- a/setup.py +++ b/setup.py @@ -246,7 +246,7 @@ class my_clean(clean): remove_tree("build") setup(name = 'libvirt-python', - version = '1.1.2', + version = '1.1.5', description = 'The libvirt virtualization API', ext_modules = [module, modulelxc, moduleqemu], py_modules = ["libvirt", "libvirt_qemu", "libvirt_lxc"], -- 1.8.3.2

On Tue, Nov 19, 2013 at 07:58:20AM -0700, Eric Blake wrote: Yes, we'll squash some of Doug's patches into mine to clear up history where appropriate. 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 :|

Add the libvirt mailing list as the maintainer of the libvirt-python component. --- setup.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/setup.py b/setup.py index 0868528..14cf94e 100644 --- a/setup.py +++ b/setup.py @@ -248,6 +248,8 @@ class my_clean(clean): setup(name = 'libvirt-python', version = '1.1.5', url = 'http://www.libvirt.org', + maintainer = 'Libvirt Maintainers', + maintainer_email = 'libvir-list(a)redhat.com', description = 'The libvirt virtualization API', ext_modules = [module, modulelxc, moduleqemu], py_modules = ["libvirt", "libvirt_qemu", "libvirt_lxc"], -- 1.8.3.2

Add LIBVIRT_CHECK_VERSION from libvirt upstream so that we can check the version of the library we are compiling against and support a range of libvirt versions. The macro was added to libvirt in 1.1.5 so we must provide it if its not defined. --- libvirt-utils.h | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/libvirt-utils.h b/libvirt-utils.h index 1b26413..6f920c6 100644 --- a/libvirt-utils.h +++ b/libvirt-utils.h @@ -22,6 +22,16 @@ #ifndef __LIBVIRT_UTILS_H__ # define __LIBVIRT_UTILS_H__ +/** + * libvirt.h provides this as of version 1.1.5, but we want to be able + * to support older versions of libvirt so copy and paste the macro from + * libvirt.h + */ +#ifndef LIBVIR_CHECK_VERSION +# define LIBVIR_CHECK_VERSION(major, minor, micro) \ + ((major) * 1000000 + (minor) * 1000 + (micro) <= LIBVIR_VERSION_NUMBER) +#endif + #define STREQ(a,b) (strcmp(a,b) == 0) #ifndef MIN -- 1.8.3.2

Since we don't always want to build all the modules and there might be more modules added in the future but we want to retain backwards compatibility with older libvirts, change generator.py to be called once per module instead of with all modules at once. --- generator.py | 24 ++++++++++++------------ setup.py | 4 +++- 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/generator.py b/generator.py index 83efe32..1661fbf 100755 --- a/generator.py +++ b/generator.py @@ -17,11 +17,6 @@ import re quiet=True -coreapifile = sys.argv[1] -lxcapifile = sys.argv[2] -qemuapifile = sys.argv[3] - - ####################################################################### # # That part if purely the API acquisition phase from the @@ -1945,13 +1940,18 @@ def lxcBuildWrappers(module): quiet = 0 if not os.path.exists("build"): os.mkdir("build") -if buildStubs("libvirt", coreapifile) < 0: - sys.exit(1) -if buildStubs("libvirt-lxc", lxcapifile) < 0: + +if buildStubs(sys.argv[1], sys.argv[2]) < 0: sys.exit(1) -if buildStubs("libvirt-qemu", qemuapifile) < 0: + +if sys.argv[1] == "libvirt": + buildWrappers(sys.argv[1]) +elif sys.argv[1] == "libvirt-lxc": + lxcBuildWrappers(sys.argv[1]) +elif sys.argv[1] == "libvirt-qemu": + qemuBuildWrappers(sys.argv[1]) +else: + print "ERROR: unknown module %s" % sys.argv[1] sys.exit(1) -buildWrappers("libvirt") -lxcBuildWrappers("libvirt-lxc") -qemuBuildWrappers("libvirt-qemu") + sys.exit(0) diff --git a/setup.py b/setup.py index 14cf94e..bab7f03 100644 --- a/setup.py +++ b/setup.py @@ -95,7 +95,9 @@ class my_build(build): def run(self): apis = self.get_api_xml_files() - self.spawn(["./generator.py", apis[0], apis[1], apis[2]]) + self.spawn(["./generator.py", "libvirt", apis[0]]) + self.spawn(["./generator.py", "libvirt-qemu", apis[1]]) + self.spawn(["./generator.py", "libvirt-lxc", apis[2]]) build.run(self) -- 1.8.3.2

Create an array of modules to be built to allow for flexibility to enable or disable some modules in the future and allow for additional modules to be added easily --- setup.py | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index bab7f03..4d61f59 100644 --- a/setup.py +++ b/setup.py @@ -47,6 +47,9 @@ def get_pkgconfig_data(args, mod, required=True): ldflags = get_pkgconfig_data(["--libs-only-L"], "libvirt", False) cflags = get_pkgconfig_data(["--cflags"], "libvirt", False) +c_modules = [] +py_modules = [] + module = Extension('libvirtmod', sources = ['libvirt-override.c', 'build/libvirt.c', 'typewrappers.c'], libraries = [ "virt" ], @@ -56,6 +59,8 @@ if cflags != "": if ldflags != "": module.extra_link_args.append(ldflags) +c_modules.append(module) +py_modules.append("libvirt") moduleqemu = Extension('libvirtmod_qemu', sources = ['libvirt-qemu-override.c', 'build/libvirt-qemu.c', 'typewrappers.c'], @@ -66,6 +71,9 @@ if cflags != "": if ldflags != "": moduleqemu.extra_link_args.append(ldflags) +c_modules.append(moduleqemu) +py_modules.append("libvirt_qemu") + modulelxc = Extension('libvirtmod_lxc', sources = ['libvirt-lxc-override.c', 'build/libvirt-lxc.c', 'typewrappers.c'], libraries = [ "virt-lxc" ], @@ -75,6 +83,10 @@ if cflags != "": if ldflags != "": modulelxc.extra_link_args.append(ldflags) +c_modules.append(modulelxc) +py_modules.append("libvirt_lxc") + + class my_build(build): def get_api_xml_files(self): @@ -253,8 +265,8 @@ setup(name = 'libvirt-python', maintainer = 'Libvirt Maintainers', maintainer_email = &#39;libvir-list(a)redhat.com&#39;, description = 'The libvirt virtualization API', - ext_modules = [module, modulelxc, moduleqemu], - py_modules = ["libvirt", "libvirt_qemu", "libvirt_lxc"], + ext_modules = c_modules, + py_modules = py_modules, package_dir = { '': 'build' }, -- 1.8.3.2

The functions that the LXC module wraps did not appear until 1.0.2 so we can't build the module unless we're building against 1.0.2 or newer. --- setup.py | 34 +++++++++++++++++++++++----------- 1 file changed, 23 insertions(+), 11 deletions(-) diff --git a/setup.py b/setup.py index 4d61f59..f8e74ba 100644 --- a/setup.py +++ b/setup.py @@ -7,6 +7,7 @@ from distutils.command.sdist import sdist from distutils.dir_util import remove_tree from distutils.util import get_platform from distutils.spawn import spawn +from distutils.errors import DistutilsExecError import distutils import sys @@ -17,6 +18,7 @@ import re import time MIN_LIBVIRT = "0.10.2" +MIN_LIBVIRT_LXC = "1.0.2" pkgcfg = distutils.spawn.find_executable("pkg-config") @@ -28,6 +30,14 @@ spawn([pkgcfg, "--atleast-version=%s" % MIN_LIBVIRT, "libvirt"]) +have_libvirt_lxc=True +try: + spawn([pkgcfg, + "--atleast-version=%s" % MIN_LIBVIRT_LXC, + "libvirt"]) +except DistutilsExecError,e: + have_libvirt_lxc=False + def get_pkgconfig_data(args, mod, required=True): """Run pkg-config to and return content associated with it""" f = os.popen("%s %s %s" % (pkgcfg, " ".join(args), mod)) @@ -74,17 +84,18 @@ if ldflags != "": c_modules.append(moduleqemu) py_modules.append("libvirt_qemu") -modulelxc = Extension('libvirtmod_lxc', - sources = ['libvirt-lxc-override.c', 'build/libvirt-lxc.c', 'typewrappers.c'], - libraries = [ "virt-lxc" ], - include_dirs = [ "." ]) -if cflags != "": - modulelxc.extra_compile_args.append(cflags) -if ldflags != "": - modulelxc.extra_link_args.append(ldflags) +if have_libvirt_lxc: + modulelxc = Extension('libvirtmod_lxc', + sources = ['libvirt-lxc-override.c', 'build/libvirt-lxc.c', 'typewrappers.c'], + libraries = [ "virt-lxc" ], + include_dirs = [ "." ]) + if cflags != "": + modulelxc.extra_compile_args.append(cflags) + if ldflags != "": + modulelxc.extra_link_args.append(ldflags) -c_modules.append(modulelxc) -py_modules.append("libvirt_lxc") + c_modules.append(modulelxc) + py_modules.append("libvirt_lxc") class my_build(build): @@ -109,7 +120,8 @@ class my_build(build): self.spawn(["./generator.py", "libvirt", apis[0]]) self.spawn(["./generator.py", "libvirt-qemu", apis[1]]) - self.spawn(["./generator.py", "libvirt-lxc", apis[2]]) + if have_libvirt_lxc: + self.spawn(["./generator.py", "libvirt-lxc", apis[2]]) build.run(self) -- 1.8.3.2

--- libvirt-override.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libvirt-override.c b/libvirt-override.c index 816ef01..f7c37a2 100644 --- a/libvirt-override.c +++ b/libvirt-override.c @@ -254,7 +254,7 @@ cleanup: return NULL; } - +#if LIBVIR_CHECK_VERSION(1,0,2) typedef struct { const char *name; int type; @@ -406,6 +406,7 @@ cleanup: virTypedParamsFree(params, n); return ret; } +#endif /* LIBVIR_CHECK_VERSION(1,0,2) */ /* -- 1.8.3.2

--- libvirt-override.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/libvirt-override.c b/libvirt-override.c index f7c37a2..6964ee4 100644 --- a/libvirt-override.c +++ b/libvirt-override.c @@ -420,12 +420,14 @@ cleanup: */ static int getPyNodeCPUCount(virConnectPtr conn) { - int i_retval; + int i_retval = -1; virNodeInfo nodeinfo; +#if LIBVIR_CHECK_VERSION(1,0,0) LIBVIRT_BEGIN_ALLOW_THREADS; i_retval = virNodeGetCPUMap(conn, NULL, NULL, 0); LIBVIRT_END_ALLOW_THREADS; +#endif /* LIBVIR_CHECK_VERSION(1,0,0) */ if (i_retval < 0) { /* fallback: use nodeinfo */ @@ -7054,6 +7056,7 @@ cleanup: return ret; } +#if LIBVIR_CHECK_VERSION(1,0,0) static PyObject * libvirt_virNodeGetCPUMap(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) @@ -7122,6 +7125,7 @@ error: ret = NULL; goto cleanup; } +#endif /* LIBVIR_CHECK_VERSION(1,0,0) */ static PyObject * -- 1.8.3.2

On 11/18/2013 03:44 PM, Doug Goldstein wrote: Is there a method to how you picked which functions to work around? It would be nicer to rearrange this series from newest to oldest (1.1.3 [virConnectGetCPUModelNames], 1.1.1 [virDomainCreateWithFiles, virDomainCreateXMLWithFiles, virDomainSetMemoryStatsPeriod], 1.1.0 ...) rather than ad hoc. As to this patch: Still the style question. > @@ -7337,14 +7339,18 @@ static PyMethodDef libvirtMethods[] = { > {(char *) "virDomainSendKey", libvirt_virDomainSendKey, METH_VARARGS, NULL}, > {(char *) "virDomainMigrateGetCompressionCache", libvirt_virDomainMigrateGetCompressionCache, METH_VARARGS, NULL}, > {(char *) "virDomainMigrateGetMaxSpeed", libvirt_virDomainMigrateGetMaxSpeed, METH_VARARGS, NULL}, > {(char *) "virDomainMigrate3", libvirt_virDomainMigrate3, METH_VARARGS, NULL}, > {(char *) "virDomainMigrateToURI3", libvirt_virDomainMigrateToURI3, METH_VARARGS, NULL}, > +#endif /* LIBVIR_CHECK_VERSION(1,1,0) */ Looks reasonable. Oops, looks like this hunk belongs in 9/18. -- Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org

On 11/18/2013 03:44 PM, Doug Goldstein wrote: ACK. Hmm. VIR_DOMAIN_EVENT_ID_LAST has a floating value - the value that it has in the libvirt.h we compile against may not match the value that it has in the remote libvirtd we are connecting to. More specifically, if we are compiled against 1.0.0 but talking to a 1.1.1 server, the server can return an event id that we think is VIR_DOMAIN_EVENT_ID_LAST; what's more, an 0.10.2 client talking to a 1.1.1 server will see an id that is larger than VIR_DOMAIN_EVENT_ID_LAST, at which point it just skips the entire switch statement. But in the context you didn't show, we correctly treat all unknown callback ids (whether we think it is VIR_DOMIAN_EVENT_ID_LAST or even something larger), so this looks correct to me. -- Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org

On 11/18/2013 03:44 PM, Doug Goldstein wrote: ACK; we may want to push this one upstream first as trivial before doing the libvirt-python split. -- Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org