- Devel - libvirt List Archives

[libvirt] [PATCH] build: fix virBufferVasprintf on mingw
by Eric Blake 05 Jul '11

05 Jul '11

Gnulib documents that mingw [v]snprintf is broken (it returns -1 on out-of-space, instead of the count of what would have been printed); but while we were using the snprintf wrapper, we had not yet been using the vsnprintf wrapper. * bootstrap.conf (gnulib_modules): Add vsnprintf. Reported by Matthias Bolte. --- bootstrap.conf | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/bootstrap.conf b/bootstrap.conf index 581d60b..302cce8 100644 --- a/bootstrap.conf +++ b/bootstrap.conf @@ -97,6 +97,7 @@ usleep vasprintf verify vc-list-files +vsnprintf waitpid warnings ' -- 1.7.4.4

2 8

[libvirt] [PATCH] Fix default value of security label 'relabel' attribute
by Daniel P. Berrange 05 Jul '11

05 Jul '11

From: "Daniel P. Berrange" <berrange(a)redhat.com> When no <seclabel> is present in the XML, the virDomainSeclabelDef struct is left as all zeros. Unfortunately, this means it gets setup as type=dynamic, with relabel=no, which is an illegal combination. Change the 'bool relabel' attribute in virDomainSeclabelDef to the inverse 'bool norelabel' so that the default initialization is sensible * src/conf/domain_conf.c, src/conf/domain_conf.h, src/security/security_apparmor.c, src/security/security_selinux.c: Replace 'relabel' with 'norelabel' --- src/conf/domain_conf.c | 18 +++++++++--------- src/conf/domain_conf.h | 2 +- src/security/security_apparmor.c | 8 ++++---- src/security/security_selinux.c | 20 ++++++++++---------- 4 files changed, 24 insertions(+), 24 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 109a947..b74ab4d 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -5076,25 +5076,25 @@ virSecurityLabelDefParseXML(const virDomainDefPtr def, VIR_SECURITY_LABEL_BUFLEN-1, ctxt); if (p != NULL) { if (STREQ(p, "yes")) { - def->seclabel.relabel = true; + def->seclabel.norelabel = false; } else if (STREQ(p, "no")) { - def->seclabel.relabel = false; + def->seclabel.norelabel = true; } else { virDomainReportError(VIR_ERR_XML_ERROR, _("invalid security relabel value %s"), p); goto error; } if (def->seclabel.type == VIR_DOMAIN_SECLABEL_DYNAMIC && - !def->seclabel.relabel) { + def->seclabel.norelabel) { virDomainReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("dynamic label type must use resource relabeling")); goto error; } } else { if (def->seclabel.type == VIR_DOMAIN_SECLABEL_STATIC) - def->seclabel.relabel = false; + def->seclabel.norelabel = true; else - def->seclabel.relabel = true; + def->seclabel.norelabel = false; } /* Only parse label, if using static labels, or @@ -5114,7 +5114,7 @@ virSecurityLabelDefParseXML(const virDomainDefPtr def, } /* Only parse imagelabel, if requested live XML with relabeling */ - if (def->seclabel.relabel && + if (!def->seclabel.norelabel && !(flags & VIR_DOMAIN_XML_INACTIVE)) { p = virXPathStringLimit("string(./seclabel/imagelabel[1])", VIR_SECURITY_LABEL_BUFLEN-1, ctxt); @@ -9890,15 +9890,15 @@ char *virDomainDefFormat(virDomainDefPtr def, (flags & VIR_DOMAIN_XML_INACTIVE)) { virBufferAsprintf(&buf, " <seclabel type='%s' model='%s' relabel='%s'/>\n", sectype, def->seclabel.model, - def->seclabel.relabel ? "yes" : "no"); + def->seclabel.norelabel ? "no" : "yes"); } else { virBufferAsprintf(&buf, " <seclabel type='%s' model='%s' relabel='%s'>\n", sectype, def->seclabel.model, - def->seclabel.relabel ? "yes" : "no"); + def->seclabel.norelabel ? "no" : "yes"); if (def->seclabel.label) virBufferEscapeString(&buf, " <label>%s</label>\n", def->seclabel.label); - if (def->seclabel.relabel && def->seclabel.imagelabel) + if (!def->seclabel.norelabel && def->seclabel.imagelabel) virBufferEscapeString(&buf, " <imagelabel>%s</imagelabel>\n", def->seclabel.imagelabel); if (def->seclabel.baselabel && diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 258289a..44d5bcd 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -960,7 +960,7 @@ struct _virSecurityLabelDef { char *imagelabel; /* security image label string */ char *baselabel; /* base name of label string */ int type; /* virDomainSeclabelType */ - bool relabel; + bool norelabel; }; enum virDomainTimerNameType { diff --git a/src/security/security_apparmor.c b/src/security/security_apparmor.c index 98995a8..76c6e3d 100644 --- a/src/security/security_apparmor.c +++ b/src/security/security_apparmor.c @@ -265,7 +265,7 @@ reload_profile(virSecurityManagerPtr mgr, int rc = -1; char *profile_name = NULL; - if (!secdef->relabel) + if (secdef->norelabel) return 0; if ((profile_name = get_profile_name(vm)) == NULL) @@ -610,7 +610,7 @@ AppArmorSetSecurityImageLabel(virSecurityManagerPtr mgr, int rc = -1; char *profile_name; - if (!secdef->relabel) + if (secdef->norelabel) return 0; if (!disk->src || disk->type == VIR_DOMAIN_DISK_TYPE_NETWORK) @@ -682,7 +682,7 @@ AppArmorSetSecurityHostdevLabel(virSecurityManagerPtr mgr, struct SDPDOP *ptr; int ret = -1; - if (!secdef->relabel) + if (secdef->norelabel) return 0; if (dev->mode != VIR_DOMAIN_HOSTDEV_MODE_SUBSYS) @@ -741,7 +741,7 @@ AppArmorRestoreSecurityHostdevLabel(virSecurityManagerPtr mgr, { const virSecurityLabelDefPtr secdef = &vm->def->seclabel; - if (!secdef->relabel) + if (secdef->norelabel) return 0; return reload_profile(mgr, vm, NULL, false); diff --git a/src/security/security_selinux.c b/src/security/security_selinux.c index 44e770e..50e1978 100644 --- a/src/security/security_selinux.c +++ b/src/security/security_selinux.c @@ -537,7 +537,7 @@ SELinuxRestoreSecurityImageLabelInt(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, { const virSecurityLabelDefPtr secdef = &vm->def->seclabel; - if (!secdef->relabel) + if (secdef->norelabel) return 0; /* Don't restore labels on readoly/shared disks, because @@ -621,7 +621,7 @@ SELinuxSetSecurityImageLabel(virSecurityManagerPtr mgr, const virSecurityLabelDefPtr secdef = &vm->def->seclabel; bool allowDiskFormatProbing = virSecurityManagerGetAllowDiskFormatProbing(mgr); - if (!secdef->relabel) + if (secdef->norelabel) return 0; return virDomainDiskDefForeachPath(disk, @@ -661,7 +661,7 @@ SELinuxSetSecurityHostdevLabel(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, const virSecurityLabelDefPtr secdef = &vm->def->seclabel; int ret = -1; - if (!secdef->relabel) + if (secdef->norelabel) return 0; if (dev->mode != VIR_DOMAIN_HOSTDEV_MODE_SUBSYS) @@ -730,7 +730,7 @@ SELinuxRestoreSecurityHostdevLabel(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, const virSecurityLabelDefPtr secdef = &vm->def->seclabel; int ret = -1; - if (!secdef->relabel) + if (secdef->norelabel) return 0; if (dev->mode != VIR_DOMAIN_HOSTDEV_MODE_SUBSYS) @@ -784,7 +784,7 @@ SELinuxSetSecurityChardevLabel(virDomainObjPtr vm, char *in = NULL, *out = NULL; int ret = -1; - if (!secdef->relabel) + if (secdef->norelabel) return 0; switch (dev->type) { @@ -830,7 +830,7 @@ SELinuxRestoreSecurityChardevLabel(virDomainObjPtr vm, char *in = NULL, *out = NULL; int ret = -1; - if (!secdef->relabel) + if (secdef->norelabel) return 0; switch (dev->type) { @@ -918,7 +918,7 @@ SELinuxRestoreSecurityAllLabel(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, VIR_DEBUG("Restoring security label on %s", vm->def->name); - if (!secdef->relabel) + if (secdef->norelabel) return 0; for (i = 0 ; i < vm->def->nhostdevs ; i++) { @@ -989,7 +989,7 @@ SELinuxSetSavedStateLabel(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, { const virSecurityLabelDefPtr secdef = &vm->def->seclabel; - if (!secdef->relabel) + if (secdef->norelabel) return 0; return SELinuxSetFilecon(savefile, secdef->imagelabel); @@ -1003,7 +1003,7 @@ SELinuxRestoreSavedStateLabel(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, { const virSecurityLabelDefPtr secdef = &vm->def->seclabel; - if (!secdef->relabel) + if (secdef->norelabel) return 0; return SELinuxRestoreSecurityFileLabel(savefile); @@ -1218,7 +1218,7 @@ SELinuxSetSecurityAllLabel(virSecurityManagerPtr mgr, const virSecurityLabelDefPtr secdef = &vm->def->seclabel; int i; - if (!secdef->relabel) + if (secdef->norelabel) return 0; for (i = 0 ; i < vm->def->ndisks ; i++) { -- 1.7.6

2 1

[libvirt] networkxml2argvtest fails to compile
by Ruben Kerkhof 05 Jul '11

05 Jul '11

Hi all, Building libvirt 0.9.3 from source with --without-network, make check fails with: CC networkxml2xmltest.o CCLD networkxml2xmltest CC networkxml2argvtest.o make[2]: *** No rule to make target `../src/libvirt_driver_network.la', needed by `networkxml2argvtest'. Stop. make[2]: Leaving directory `/home/ruben/src/libvirt/libvirt-0.9.3/tests' make[1]: *** [check-am] Error 2 make[1]: Leaving directory `/home/ruben/src/libvirt/libvirt-0.9.3/tests' make: *** [check-recursive] Error 1 Kind regards, Ruben

3 4

[libvirt] [PATCH] qemu: Fix virFileMakePath error handling in snapshot creation
by Matthias Bolte 05 Jul '11

05 Jul '11

virFileMakePath returns an errno value on error, that will never be negative. So a virFileMakePath error whould have been ignored here. --- src/qemu/qemu_driver.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 363a361..aab3ab9 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -7498,7 +7498,7 @@ static int qemuDomainSnapshotWriteMetadata(virDomainObjPtr vm, goto cleanup; } err = virFileMakePath(snapDir); - if (err < 0) { + if (err != 0) { virReportSystemError(err, _("cannot create snapshot directory '%s'"), snapDir); goto cleanup; -- 1.7.4.1

2 2

[libvirt] problems with <seclabel> when restarting libvirtd
by Laine Stump 05 Jul '11

05 Jul '11

I had libvirtd build from 0.9.2+something running on my test machine. There was a single guest running on it. I grabbed the latest libvirt from git (0.9.3+??), built an rpm, and installed it. My guest reconnected with no problems, but I was unable to start new guests due to an selinux problem with the labeling of the image file. Interestingly, I found that I could shutdown and restart the one guest that had been running at the time of the upgrade. *Until* I restarted libvirtd again while the guest was stopped. After this point, I could no longer start that guest either. I then set selinux to permissive mode and was able to start my original guest. Then I restarted libvirtd and found that, although the qemu-kvm process was still running, libvirtd couldn't reconnect to the guest. When I looked at the logs, I saw this: error: virSecurityLabelDefParseXML:5073 : unsupported configuration: dynamic label type must use resource relabeling In the domain state file, I see this: | <seclabel type='dynamic' model='selinux' relabel='no'> | <label>system_u:system_r:svirt_t:s-:c419,c955</label> | </seclabel> The data in the state file was written by the same version of libvirtd that wrote it. So why did it write something it knows it doesn't support?

2 1

[libvirt] Duplicate symbol error with 0.9.3 on OSX
by Justin Clift 05 Jul '11

05 Jul '11

Hi all, Just went to update the OSX libvirt build for 0.9.3, but it's giving a duplicate symbol error: ld: duplicate symbol _virNetworkDNSHostsDef in ./.libs/libvirt_driver_test.a(libvirt_driver_test_la-test_driver.o) and ./.libs/libvirt_conf.a(libvirt_conf_la-network_conf.o) "virNetworkDNSHostsDef" is definitely in src/conf/network_conf.*, but not seeing it anywhere in src/test/test_driver.*. Anyone have suggestions on what to look at? Regards and best wishes, Justin Clift -- Aeolus Community Manager http://www.aeolusproject.org

2 4

[libvirt] [PATCH] Quieten build & ensure API build scripts exit with non-zero status
by Daniel P. Berrange 04 Jul '11

04 Jul '11

The current API build scripts will continue and exit with a zero status even if they find problems. This has been the cause of many build problems, or hidden build errors, in the past. Change the scripts so they always exit with a non-zero status for any problems they do not understand. Also turn off all debug output by default so they respect $(AM_V_GEN) * docs/Makefile.am: Use $(AM_V_GEN) for API/HTML scripts * docs/apibuild.py, python/generator.py: Exit with non-zero status if problems are found. Also be silent, not outputting any debug messages. * src/Makefile.am: Use $(AM_V_GEN) for ESX generator * python/Makefile.am: Tweak rule --- docs/Makefile.am | 11 ++---- docs/apibuild.py | 95 ++++++++++++++++++++++++++++++-------------------- python/Makefile.am | 6 ++-- python/generator.py | 16 +++++--- src/Makefile.am | 2 +- 5 files changed, 75 insertions(+), 55 deletions(-) diff --git a/docs/Makefile.am b/docs/Makefile.am index 050ebe1..e7d356e 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -153,21 +153,18 @@ internals/%.html.tmp: internals/%.html.in subsite.xsl page.xsl sitemap.html.in html/index.html: libvirt-api.xml newapi.xsl page.xsl sitemap.html.in - -@if [ -x $(XSLTPROC) ] ; then \ - echo "Rebuilding the HTML pages from the XML API" ; \ + $(AM_V_GEN)if [ -x $(XSLTPROC) ] ; then \ $(XSLTPROC) --nonet -o $(srcdir)/ \ - $(srcdir)/newapi.xsl $(srcdir)/libvirt-api.xml ; fi - -@if test -x $(XMLLINT) && test -x $(XMLCATALOG) ; then \ + $(srcdir)/newapi.xsl $(srcdir)/libvirt-api.xml ; fi ; \ + if test -x $(XMLLINT) && test -x $(XMLCATALOG) ; then \ if $(XMLCATALOG) '$(XML_CATALOG_FILE)' "-//W3C//DTD XHTML 1.0 Strict//EN" \ > /dev/null ; then \ - echo "Validating the resulting XHTML pages" ; \ SGML_CATALOG_FILES='$(XML_CATALOG_FILE)' \ $(XMLLINT) --catalogs --nonet --valid --noout $(srcdir)/html/*.html ; \ else echo "missing XHTML1 DTD" ; fi ; fi $(addprefix $(srcdir)/,$(devhelphtml)): $(srcdir)/libvirt-api.xml $(devhelpxsl) - -@echo Rebuilding devhelp files - -@if [ -x $(XSLTPROC) ] ; then \ + $(AM_V_GEN)if [ -x $(XSLTPROC) ] ; then \ $(XSLTPROC) --nonet -o $(srcdir)/devhelp/ \ $(top_srcdir)/docs/devhelp/devhelp.xsl $(srcdir)/libvirt-api.xml ; fi diff --git a/docs/apibuild.py b/docs/apibuild.py index f31a853..cb273dc 100755 --- a/docs/apibuild.py +++ b/docs/apibuild.py @@ -11,6 +11,8 @@ import os, sys import string import glob +quiet=1 +warnings=0 debug=0 debugsym=None @@ -95,7 +97,7 @@ class identifier: self.conditionals = None else: self.conditionals = conditionals[:] - if self.name == debugsym: + if self.name == debugsym and not quiet: print "=> define %s : %s" % (debugsym, (module, type, info, extra, conditionals)) @@ -155,7 +157,7 @@ class identifier: def update(self, header, module, type = None, info = None, extra=None, conditionals=None): - if self.name == debugsym: + if self.name == debugsym and not quiet: print "=> update %s : %s" % (debugsym, (module, type, info, extra, conditionals)) if header != None and self.header == None: @@ -203,7 +205,7 @@ class index: if d != None and name != None and type != None: self.references[name] = d - if name == debugsym: + if name == debugsym and not quiet: print "New ref: %s" % (d) return d @@ -244,9 +246,9 @@ class index: elif type == "macro": self.macros[name] = d else: - print "Unable to register type ", type + self.warning("Unable to register type ", type) - if name == debugsym: + if name == debugsym and not quiet: print "New symbol: %s" % (d) return d @@ -260,8 +262,8 @@ class index: if self.macros.has_key(id): del self.macros[id] if self.functions.has_key(id): - print "function %s from %s redeclared in %s" % ( - id, self.functions[id].header, idx.functions[id].header) + self.warning("function %s from %s redeclared in %s" % ( + id, self.functions[id].header, idx.functions[id].header)) else: self.functions[id] = idx.functions[id] self.identifiers[id] = idx.functions[id] @@ -273,15 +275,15 @@ class index: if self.macros.has_key(id): del self.macros[id] if self.variables.has_key(id): - print "variable %s from %s redeclared in %s" % ( - id, self.variables[id].header, idx.variables[id].header) + self.warning("variable %s from %s redeclared in %s" % ( + id, self.variables[id].header, idx.variables[id].header)) else: self.variables[id] = idx.variables[id] self.identifiers[id] = idx.variables[id] for id in idx.structs.keys(): if self.structs.has_key(id): - print "struct %s from %s redeclared in %s" % ( - id, self.structs[id].header, idx.structs[id].header) + self.warning("struct %s from %s redeclared in %s" % ( + id, self.structs[id].header, idx.structs[id].header)) else: self.structs[id] = idx.structs[id] self.identifiers[id] = idx.structs[id] @@ -294,8 +296,8 @@ class index: self.identifiers[id] = idx.unions[id] for id in idx.typedefs.keys(): if self.typedefs.has_key(id): - print "typedef %s from %s redeclared in %s" % ( - id, self.typedefs[id].header, idx.typedefs[id].header) + self.warning("typedef %s from %s redeclared in %s" % ( + id, self.typedefs[id].header, idx.typedefs[id].header)) else: self.typedefs[id] = idx.typedefs[id] self.identifiers[id] = idx.typedefs[id] @@ -311,15 +313,15 @@ class index: if self.enums.has_key(id): continue if self.macros.has_key(id): - print "macro %s from %s redeclared in %s" % ( - id, self.macros[id].header, idx.macros[id].header) + self.warning("macro %s from %s redeclared in %s" % ( + id, self.macros[id].header, idx.macros[id].header)) else: self.macros[id] = idx.macros[id] self.identifiers[id] = idx.macros[id] for id in idx.enums.keys(): if self.enums.has_key(id): - print "enum %s from %s redeclared in %s" % ( - id, self.enums[id].header, idx.enums[id].header) + self.warning("enum %s from %s redeclared in %s" % ( + id, self.enums[id].header, idx.enums[id].header)) else: self.enums[id] = idx.enums[id] self.identifiers[id] = idx.enums[id] @@ -330,10 +332,10 @@ class index: # check that function condition agrees with header if idx.functions[id].conditionals != \ self.functions[id].conditionals: - print "Header condition differs from Function for %s:" \ - % id - print " H: %s" % self.functions[id].conditionals - print " C: %s" % idx.functions[id].conditionals + self.warning("Header condition differs from Function for %s:" \ + % id) + self.warning(" H: %s" % self.functions[id].conditionals) + self.warning(" C: %s" % idx.functions[id].conditionals) up = idx.functions[id] self.functions[id].update(None, up.module, up.type, up.info, up.extra) # else: @@ -356,12 +358,13 @@ class index: def analyze(self): - self.analyze_dict("functions", self.functions) - self.analyze_dict("variables", self.variables) - self.analyze_dict("structs", self.structs) - self.analyze_dict("unions", self.unions) - self.analyze_dict("typedefs", self.typedefs) - self.analyze_dict("macros", self.macros) + if not quiet: + self.analyze_dict("functions", self.functions) + self.analyze_dict("variables", self.variables) + self.analyze_dict("structs", self.structs) + self.analyze_dict("unions", self.unions) + self.analyze_dict("typedefs", self.typedefs) + self.analyze_dict("macros", self.macros) class CLexer: """A lexer for the C language, tokenize the input by reading and @@ -621,6 +624,8 @@ class CParser: info, extra, self.conditionals) def warning(self, msg): + global warnings + warnings = warnings + 1 if self.no_error: return print msg @@ -1802,7 +1807,8 @@ class CParser: return token def parse(self): - self.warning("Parsing %s" % (self.filename)) + if not quiet: + print "Parsing %s" % (self.filename) token = self.token() while token != None: if token[0] == 'name': @@ -1869,7 +1875,8 @@ class docBuilder: pass def analyze(self): - print "Project %s : %d headers, %d modules" % (self.name, len(self.headers.keys()), len(self.modules.keys())) + if not quiet: + print "Project %s : %d headers, %d modules" % (self.name, len(self.headers.keys()), len(self.modules.keys())) self.idx.analyze() def scanHeaders(self): @@ -1995,7 +2002,7 @@ class docBuilder: else: output.write(" <field name='%s' type='%s' info='%s'/>\n" % (field[1] , field[0], desc)) except: - print "Failed to serialize struct %s" % (name) + self.warning("Failed to serialize struct %s" % (name)) output.write(" </struct>\n") else: output.write("/>\n"); @@ -2023,7 +2030,7 @@ class docBuilder: def serialize_function(self, output, name): id = self.idx.functions[name] - if name == debugsym: + if name == debugsym and not quiet: print "=>", id output.write(" <%s name='%s' file='%s' module='%s'>\n" % (id.type, @@ -2059,7 +2066,7 @@ class docBuilder: output.write(" <arg name='%s' type='%s' info='%s'/>\n" % (param[1], param[0], escape(param[2]))) self.indexString(name, param[2]) except: - print "Failed to save function %s info: " % name, `id.info` + self.warning("Failed to save function %s info: " % name, `id.info`) output.write(" </%s>\n" % (id.type)) def serialize_exports(self, output, file): @@ -2074,7 +2081,7 @@ class docBuilder: escape(dict.info[data]), string.lower(data))) except: - print "Header %s lacks a %s description" % (module, data) + self.warning("Header %s lacks a %s description" % (module, data)) if dict.info.has_key('Description'): desc = dict.info['Description'] if string.find(desc, "DEPRECATED") != -1: @@ -2287,7 +2294,8 @@ class docBuilder: def serialize(self): filename = "%s/%s-api.xml" % (self.path, self.name) - print "Saving XML description %s" % (filename) + if not quiet: + print "Saving XML description %s" % (filename) output = open(filename, "w") output.write('<?xml version="1.0" encoding="ISO-8859-1"?>\n') output.write("<api name='%s'>\n" % self.name) @@ -2323,7 +2331,8 @@ class docBuilder: output.close() filename = "%s/%s-refs.xml" % (self.path, self.name) - print "Saving XML Cross References %s" % (filename) + if not quiet: + print "Saving XML Cross References %s" % (filename) output = open(filename, "w") output.write('<?xml version="1.0" encoding="ISO-8859-1"?>\n') output.write("<apirefs name='%s'>\n" % self.name) @@ -2336,7 +2345,8 @@ def rebuild(): builder = None srcdir = os.environ["srcdir"] if glob.glob(srcdir + "/../src/libvirt.c") != [] : - print "Rebuilding API description for libvirt" + if not quiet: + print "Rebuilding API description for libvirt" dirs = [srcdir + "/../src", srcdir + "/../src/util", srcdir + "/../include/libvirt"] @@ -2344,12 +2354,13 @@ def rebuild(): dirs.append("../include/libvirt") builder = docBuilder("libvirt", srcdir, dirs, []) elif glob.glob("src/libvirt.c") != [] : - print "Rebuilding API description for libvirt" + if not quiet: + print "Rebuilding API description for libvirt" builder = docBuilder("libvirt", srcdir, ["src", "src/util", "include/libvirt"], []) else: - print "rebuild() failed, unable to guess the module" + self.warning("rebuild() failed, unable to guess the module") return None builder.scan() builder.analyze() @@ -2368,5 +2379,13 @@ if __name__ == "__main__": if len(sys.argv) > 1: debug = 1 parse(sys.argv[1]) + if warnings > 0: + sys.exit(2) + else: + sys.exit(0) else: rebuild() + if warnings > 0: + sys.exit(2) + else: + sys.exit(0) diff --git a/python/Makefile.am b/python/Makefile.am index 0edb3e4..a4c9a6b 100644 --- a/python/Makefile.am +++ b/python/Makefile.am @@ -53,11 +53,11 @@ GENERATED= libvirt-export.c \ libvirt.h \ libvirt.py -generated.stamp: $(srcdir)/$(GENERATE) $(API_DESC) - $(PYTHON) $(srcdir)/$(GENERATE) $(PYTHON) +$(GENERATE).stamp: $(srcdir)/$(GENERATE) $(API_DESC) + $(AM_V_GEN)$(PYTHON) $(srcdir)/$(GENERATE) $(PYTHON) && \ touch $@ -$(GENERATED): generated.stamp +$(GENERATED): $(GENERATE).stamp $(libvirtmod_la_OBJECTS): $(GENERATED) diff --git a/python/generator.py b/python/generator.py index c27ff73..d3a3616 100755 --- a/python/generator.py +++ b/python/generator.py @@ -11,6 +11,8 @@ import sys import string import re +quiet=1 + if __name__ == "__main__": # launched as a script srcPref = os.path.dirname(sys.argv[0]) @@ -617,7 +619,8 @@ def buildStubs(): sys.exit(1) n = len(functions.keys()) - print "Found %d functions in libvirt-api.xml" % (n) + if not quiet: + print "Found %d functions in libvirt-api.xml" % (n) py_types['pythonObject'] = ('O', "pythonObject", "pythonObject", "pythonObject") try: @@ -629,8 +632,8 @@ def buildStubs(): except IOError, msg: print file, ":", msg - - print "Found %d functions in libvirt-override-api.xml" % ( + if not quiet: + print "Found %d functions in libvirt-override-api.xml" % ( len(functions.keys()) - n) nb_wrap = 0 failed = 0 @@ -662,20 +665,21 @@ def buildStubs(): export.close() wrapper.close() - print "Generated %d wrapper functions" % nb_wrap + if not quiet: + print "Generated %d wrapper functions" % nb_wrap if unknown_types: print "Missing type converters: " for type in unknown_types.keys(): print "%s:%d " % (type, len(unknown_types[type])), - print - for f in functions_failed: print "ERROR: failed %s" % f if failed > 0: return -1 + if len(unknown_types) > 0: + return -1 return 0 ####################################################################### diff --git a/src/Makefile.am b/src/Makefile.am index cd8a7e9..844ec9d 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -786,7 +786,7 @@ endif BUILT_SOURCES += $(ESX_DRIVER_GENERATED) $(ESX_DRIVER_GENERATED): $(srcdir)/esx/esx_vi_generator.input $(srcdir)/esx/esx_vi_generator.py - -srcdir=$(srcdir) $(srcdir)/esx/esx_vi_generator.py + $(AM_V_GEN)srcdir=$(srcdir) $(srcdir)/esx/esx_vi_generator.py if WITH_ESX if WITH_DRIVER_MODULES -- 1.7.4.4

2 1

[libvirt] [PATCH] qemu: Add support for SGA video
by Michal Privoznik 04 Jul '11

04 Jul '11

This patch extends possible values for <video> element. Serial Graphics Adapter allows users to see BIOS messages from the very first moment domain boots up. Therefore, users can choose boot medium, set PXE, etc. However, to be able to use this, one need SGABIOS, which is accessible here: http://code.google.com/p/sgabios/ --- docs/formatdomain.html.in | 5 +++-- docs/schemas/domain.rng | 1 + src/conf/domain_conf.c | 43 ++++++++++++++++++++++++------------------- src/conf/domain_conf.h | 1 + src/qemu/qemu_command.c | 28 ++++++++++++++++++++++------ 5 files changed, 51 insertions(+), 27 deletions(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 3a64983..2d89b37 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -2005,8 +2005,9 @@ qemu-kvm -net nic,model=? /dev/null <dd> The <code>model</code> element has a mandatory <code>type</code> attribute which takes the value "vga", "cirrus", "vmvga", "xen", - "vbox", or "qxl" (since 0.8.6) - depending on the hypervisor features available. + "vbox", "qxl" (since 0.8.6), or "sga" + (Since 0.9.4) depending on the hypervisor + features available. You can also provide the amount of video memory in kilobytes using <code>vram</code> and the number of screen with <code>heads</code>. </dd> diff --git a/docs/schemas/domain.rng b/docs/schemas/domain.rng index 891662d..74bc111 100644 --- a/docs/schemas/domain.rng +++ b/docs/schemas/domain.rng @@ -1502,6 +1502,7 @@ <value>xen</value> <value>vbox</value> <value>qxl</value> + <value>sga</value> </choice> </attribute> <optional> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index f9bf51e..9848359 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -299,7 +299,8 @@ VIR_ENUM_IMPL(virDomainVideo, VIR_DOMAIN_VIDEO_TYPE_LAST, "vmvga", "xen", "vbox", - "qxl") + "qxl", + "sga") VIR_ENUM_IMPL(virDomainInput, VIR_DOMAIN_INPUT_TYPE_LAST, "mouse", @@ -4713,28 +4714,32 @@ virDomainVideoDefParseXML(const xmlNodePtr node, } } - if (vram) { - if (virStrToLong_ui(vram, NULL, 10, &def->vram) < 0) { - virDomainReportError(VIR_ERR_INTERNAL_ERROR, - _("cannot parse video ram '%s'"), vram); - goto error; + /* SGA video device does not support heads, vram + * or PCI address. It is not PCI device anyway */ + if (def->type != VIR_DOMAIN_VIDEO_TYPE_SGA) { + if (vram) { + if (virStrToLong_ui(vram, NULL, 10, &def->vram) < 0) { + virDomainReportError(VIR_ERR_INTERNAL_ERROR, + _("cannot parse video ram '%s'"), vram); + goto error; + } + } else { + def->vram = virDomainVideoDefaultRAM(dom, def->type); } - } else { - def->vram = virDomainVideoDefaultRAM(dom, def->type); - } - if (heads) { - if (virStrToLong_ui(heads, NULL, 10, &def->heads) < 0) { - virDomainReportError(VIR_ERR_INTERNAL_ERROR, - _("cannot parse video heads '%s'"), heads); - goto error; + if (heads) { + if (virStrToLong_ui(heads, NULL, 10, &def->heads) < 0) { + virDomainReportError(VIR_ERR_INTERNAL_ERROR, + _("cannot parse video heads '%s'"), heads); + goto error; + } + } else { + def->heads = 1; } - } else { - def->heads = 1; - } - if (virDomainDeviceInfoParseXML(node, &def->info, flags) < 0) - goto error; + if (virDomainDeviceInfoParseXML(node, &def->info, flags) < 0) + goto error; + } VIR_FREE(type); VIR_FREE(vram); diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index e81977c..7f60754 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -605,6 +605,7 @@ enum virDomainVideoType { VIR_DOMAIN_VIDEO_TYPE_XEN, VIR_DOMAIN_VIDEO_TYPE_VBOX, VIR_DOMAIN_VIDEO_TYPE_QXL, + VIR_DOMAIN_VIDEO_TYPE_SGA, VIR_DOMAIN_VIDEO_TYPE_LAST }; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 6e4480e..7685d7e 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -80,7 +80,8 @@ VIR_ENUM_IMPL(qemuVideo, VIR_DOMAIN_VIDEO_TYPE_LAST, "vmware", "", /* no arg needed for xen */ "", /* don't support vbox */ - "qxl"); + "qxl", + "sga"); static void uname_normalize (struct utsname *ut) @@ -1213,7 +1214,8 @@ qemuAssignDevicePCISlots(virDomainDefPtr def, qemuDomainPCIAddressSetPtr addrs) /* Further non-primary video cards */ for (i = 1; i < def->nvideos ; i++) { - if (def->videos[i]->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE) + if (def->videos[i]->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE || + def->videos[i]->type == VIR_DOMAIN_VIDEO_TYPE_SGA) continue; if (qemuDomainPCIAddressSetNextAddr(addrs, &def->videos[i]->info) < 0) goto error; @@ -2083,8 +2085,9 @@ qemuBuildVideoDevStr(virDomainVideoDefPtr video, virBufferAsprintf(&buf, ",vram_size=%u", video->vram * 1024); } - if (qemuBuildDeviceAddressStr(&buf, &video->info, qemuCaps) < 0) - goto error; + if (video->type != VIR_DOMAIN_VIDEO_TYPE_SGA) + if (qemuBuildDeviceAddressStr(&buf, &video->info, qemuCaps) < 0) + goto error; if (virBufferError(&buf)) { virReportOOMError(); @@ -4254,6 +4257,11 @@ qemuBuildCommandLine(virConnectPtr conn, if (qemuCapsGet(qemuCaps, QEMU_CAPS_VGA)) { if (def->videos[0]->type == VIR_DOMAIN_VIDEO_TYPE_XEN) { /* nothing - vga has no effect on Xen pvfb */ + } else if (def->videos[0]->type == VIR_DOMAIN_VIDEO_TYPE_SGA) { + if (qemuCapsGet(qemuCaps, QEMU_CAPS_DEVICE)) + virCommandAddArgList(cmd, "-device", "sga", NULL); + else + virCommandAddArg(cmd, "-nographic"); } else { if ((def->videos[0]->type == VIR_DOMAIN_VIDEO_TYPE_QXL) && !qemuCapsGet(qemuCaps, QEMU_CAPS_VGA_QXL)) { @@ -4309,6 +4317,13 @@ qemuBuildCommandLine(virConnectPtr conn, /* No special args - this is the default */ break; + case VIR_DOMAIN_VIDEO_TYPE_SGA: + if (qemuCapsGet(qemuCaps, QEMU_CAPS_DEVICE)) + virCommandAddArgList(cmd, "-device", "sga", NULL); + else + virCommandAddArg(cmd, "-nographic"); + break; + default: qemuReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("video type %s is not supported with this QEMU"), @@ -4321,10 +4336,11 @@ qemuBuildCommandLine(virConnectPtr conn, if (qemuCapsGet(qemuCaps, QEMU_CAPS_DEVICE)) { for (i = 1 ; i < def->nvideos ; i++) { char *str; - if (def->videos[i]->type != VIR_DOMAIN_VIDEO_TYPE_QXL) { + if (def->videos[i]->type != VIR_DOMAIN_VIDEO_TYPE_QXL && + def->videos[i]->type != VIR_DOMAIN_VIDEO_TYPE_SGA) { qemuReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("video type %s is only valid as primary video card"), - virDomainVideoTypeToString(def->videos[0]->type)); + virDomainVideoTypeToString(def->videos[i]->type)); goto error; } -- 1.7.5.rc3

2 1

[libvirt] VMWare "independent disk" processing needed
by computernews＠rambler.ru 04 Jul '11

04 Jul '11

Hello, On VMware ESX server it is possible for the virtual machine to add the "independent disk" - the kind of virtual disk that (among other features) is not being covered by the snapshot logic. As I am working on some kind of backup solution I need to be able to backup the precise state of the guest virtual machine running on say VMware ESX server. I am able to perform a backup of a guest machine description with libvirts's amazing API which covers most of my needs except the aforementioned "independent disk" virtual disk type. The problem shows up at the restore type when I need to create the new virtual machine having an .xml file created by "virsh dumpxml" command. In fact I use API but "virsh does the same". This .xml file covers most of guest machine's aspects but it doesn't reflect the "independent" nature of such disks. So the virtual machine is going to be restored incorrectly when includes "independent disks". From the source codes of "libvirt" ("/libvirt/src/vmx/vmx.*") I see that this is ment to be covered but yet is not implemented. Appropriate nodes must be stored in .xml file during the backup and returned back to .vmx file during the restore. So here are my questions: Is someone on it at the moment ? If yes - can I help somehow ? If no - whom shell I approach in order to be mentored/directed if I decide to participate, implement this and contribute the patch back to the source code ? Thanks for an answer in advance. Best regards Oleh Paliy

1 0

[libvirt] PPPoE-Server problem
by B Veera-B37207 04 Jul '11

04 Jul '11

HI, I am using Libvirt with LXC as hypervisor. When I am starting pppoe-server , unable to create ppp0 interface in Virtual machine, it is unable to serve ips to clients. Let me know is there any plug-in for this (Or) What is the solution. Regards, Veera.

1 0

[libvirt] [PATCH 1/4] libvirtd: avoid memory leak on OOM
by Eric Blake 04 Jul '11

04 Jul '11

Detected by Coverity; only strikes on OOM so not serious. * daemon/libvirtd.c (daemonPidFilePath): Plug leak. --- daemon/libvirtd.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/daemon/libvirtd.c b/daemon/libvirtd.c index 60ee705..06d2077 100644 --- a/daemon/libvirtd.c +++ b/daemon/libvirtd.c @@ -310,8 +310,10 @@ daemonPidFilePath(bool privileged, if (!(userdir = virGetUserDirectory(geteuid()))) goto error; - if (virAsprintf(pidfile, "%s/.libvirt/libvirtd.pid", userdir) < 0) + if (virAsprintf(pidfile, "%s/.libvirt/libvirtd.pid", userdir) < 0) { + VIR_FREE(userdir); goto no_memory; + } VIR_FREE(userdir); } -- 1.7.4.4

4 11

[libvirt] [PATCH] storage: Do not override the exact error of createRawFile
by Osier Yang 04 Jul '11

04 Jul '11

virStorageBackendCreateRaw: createRawFile already reported the exact error. Before the fix: error: Failed to create vol vol-create.img error: cannot create path '/var/lib/libvirt/images/vol-create.img': Unknown error 18446744073709551597 After the fix: error: Failed to create vol vol-create.img error: cannot fill file '/var/lib/libvirt/images/vol-create.img': No space left on device --- src/storage/storage_backend.c | 13 ++++++++----- 1 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/storage/storage_backend.c b/src/storage/storage_backend.c index a6e66e1..cee2010 100644 --- a/src/storage/storage_backend.c +++ b/src/storage/storage_backend.c @@ -299,6 +299,7 @@ createRawFile(int fd, virStorageVolDefPtr vol, { int ret = 0; unsigned long long remain; + off_t cur_pos = 0; /* Seek to the final size, so the capacity is available upfront * for progress reporting */ @@ -310,7 +311,12 @@ createRawFile(int fd, virStorageVolDefPtr vol, goto cleanup; } + cur_pos = lseek(fd, 0, SEEK_CUR); + + VIR_WARN("cur_pos = %jd", cur_pos); + remain = vol->allocation; + VIR_WARN("remain = %llu", remain); if (inputvol) { ret = virStorageBackendCopyToFD(vol, inputvol, fd, &remain, 1); @@ -399,12 +405,9 @@ virStorageBackendCreateRaw(virConnectPtr conn ATTRIBUTE_UNUSED, goto cleanup; } - if ((ret = createRawFile(fd, vol, inputvol)) < 0) { - virReportSystemError(-fd, - _("cannot create path '%s'"), - vol->target.path); + if ((ret = createRawFile(fd, vol, inputvol)) < 0) + /* createRawFile already reported the exact error. */ ret = -1; - } cleanup: VIR_FORCE_CLOSE(fd); -- 1.7.4

2 4

[libvirt] Release of libvirt-0.9.3
by Daniel Veillard 04 Jul '11

04 Jul '11

As scheduled, I made the new release of libvirt-0.9.3 today, it is available at ftp://libvirt.org/libvirt/ , the rpms are still being pushed as I write. This is a fairly large release again, with over 330 commits incorporated, including a number of new APIs, large refactoring of the client server code, LXC containers improvements and many improvements and various bug fixes. Features: - vcpupin: introduce the new libvirt API (virDomainGetVcpupinInfo) (Taku Izumi) - Add TXT record support for virtual DNS service (Michal Novotny) - Support reboots with the QEMU driver (Daniel P. Berrange) - Introduce virDomainGetControlInfo API (Jiri Denemark) - virNodeGetMemoryStats: Expose new API (Minoru Usui) - virNodeGetCPUTime: Implement public API (Minoru Usui) - send-key: Defining the public API (Lai Jiangshan) - vcpupin: introduce a new libvirt API (virDomainPinVcpuFlags) (Taku Izumi) - support multifunction PCI device (Wen Congyang) - lxc: various improvements Documentation: - Add documentation for configuration lock managers (Daniel P. Berrange) - fix indentation of sub-elements of <ip> in network XML (Laine Stump) - document correct flag name (Eric Blake) - documenting the 802.1Qbh parameters of a 'direct' interface (David S. Wang) - Make virConnectClose comply to apibuild.py expectations (Matthias Bolte) - fix docs to match behavior of virConnectClose (Eric Blake) - numatune: Add doc for new numatune XML (Osier Yang) - Fix documentation of virStreamRecv (Matthias Bolte) - updated list of applications using libvirt. (Ohad Levy) - improve VIR_DOMAIN_AFFECT_CURRENT description (Eric Blake) - Add doc for video element (Osier Yang) - Make hvsupport.pl pick up the host device drivers (Matthias Bolte) Portability: - Explicitely invoke python for API doc generator (Daniel Veillard) - fix virParseVersionString with linux 3.0 (Scott Moser) - Add conditionals to allow build without SASL (Daniel P. Berrange) - Add missing include of signal.h in virnetsocket.c (Daniel P. Berrange) - Fix compilation with systemtap 1.3 (Matthias Bolte) - build: fix mingw build (Eric Blake) - daemon: Fix build without polkit (Jiri Denemark) - build: fix 'make check' when pdwtags is available (Eric Blake) - build: sanlock-devel is not in F15 yet (Eric Blake) - Only include parthelper if built with storage_disk (Ruben Kerkhof) - build: fix VPATH builds (Eric Blake) - python: Don't declare Py_ssize_t for Python 2.6 (Matthias Bolte) - build: avoid python 2.4 build failure (Eric Blake) - build: fix NUMA build on RHEL 5 (Eric Blake) - build: avoid python 2.4 build failure (Eric Blake) - build: avoid compiler failure (Eric Blake) - build: fix compilation on systems missing libnl and new includes (Stefan Berger) - configure: Make libnl optional unless macvtap is required (Matthias Bolte) - build: require newer netcf when it is available (Eric Blake) - build: fix building error when building without libvirtd (Wen Congyang) - Skip nodeinfo test on non intel architectures (Guido Günther) - Fix dlopen dependency (Matthias Bolte) - virt-aa-helper: add missing include (Eric Blake) Bug Fixes: - initialize pointer to NULL (Wen Congyang) - storage: avoid crash on parse error (Eric Blake) - vmware: avoid null deref on failed lookup (Eric Blake) - qemu: avoid null deref on low memory (Eric Blake) - rpc: avoid memory leak on error (Eric Blake) - rpc: fix logic bug (Eric Blake) - pci: avoid memory leak on error (Eric Blake) - interface: avoid memory leak on parse error (Eric Blake) - libvirtd: avoid memory leak on OOM (Eric Blake) - build: avoid double-close bug with pipe2 (Eric Blake) - rpc: avoid freeing uninitialized variable (Eric Blake) - virsh: avoid uninitialized variable (Eric Blake) - virsh: avoid integer overflow (Eric Blake) - Fix stream procedure number for virDomainMigratePrepareTunnel3 (Daniel P. Berrange) - Fix release of virNetMessagePtr instances in streams processing (Daniel P. Berrange) - Fix potential crash when saving guests (Daniel P. Berrange) - Fix uninitialized value in QEMU monitor FD sending code (Daniel P. Berrange) - Fix leak of JSON object for events (Daniel P. Berrange) - Fix use of uninitialized memory when releasing PCI slots (Daniel P. Berrange) - Fix leak of virStreamPtr object with callback added in fdstream impl (Daniel P. Berrange) - Fix leak of mdnsGroupName in virNetServer object (Daniel P. Berrange) - Fix release of filtered stream messages (Daniel P. Berrange) - save domain status after modifing vcpupin (Wen Congyang) - Fix memory leak in virDomainVcpuPinDel() (Wen Congyang) - sysinfo: fix illegal NULL return (Minoru Usui) - Fix locking wrt virNetClientStreamPtr object (Daniel P. Berrange) - Avoid referencing NULL pointer when copying stream error (Daniel P. Berrange) - Avoid free'ing a filtered RPC message in the server (Daniel P. Berrange) - Ensure empty payload is written upon stream completion (Daniel P. Berrange) - Fix propagation of RPC errors from streams (Daniel P. Berrange) - Fix crash when aborting a stream from a I/O callback (Daniel P. Berrange) - dnsmasq: Fix errno handling and don't unlink non-existing files (Matthias Bolte) - tests: Fix memory leak in virnetmessagetest (Osier Yang) - conf: Fix memory leak in virNetworkDNSDefFormat (Osier Yang) - sysinfo: fix parsing regression (Eric Blake) - remote: fix uninitialized variable (Eric Blake) - build: avoid uninitialized variable (Eric Blake) - buf: protect against integer overflow (Eric Blake) - remote: protect against integer overflow (Eric Blake) - Fix typo in libvirt_private.syms (Matthias Bolte) - Fix some bugs in RPC protocol make rules (Daniel P. Berrange) - Fix job type set in qemuMigrationPrepareDirect/PrepareTunnel (Daniel P. Berrange) - Avoid high privileges taint warning for QEMU session driver (Daniel P. Berrange) - util: Fix memory leak in virJSONParserHandleStartMap (Osier Yang) - qemu: Fix memory leak in qemuProcessWaitForMonitor (Osier Yang) - storage: fix volDelete return when volume still being allocated (Matthew Booth) - Fix use-after-free in handling domain taint flags (Daniel P. Berrange) - qemu: Fix one memory leak (Osier Yang) - virsh: avoid bogus description (Eric Blake) - set and restore MAC address of a NIC when using PASSTHROUGH mode (Dirk Herrendoerfer) - conf: Fix one memory leak (Osier Yang) - Add missing checks for NULL in domain lock manager (Daniel P. Berrange) - Fix errno return in safezero() (Daniel P. Berrange) - Fix allocation of veth's to not skip an index (Daniel P. Berrange) - command: avoid double close (Eric Blake) - qemu: Fix parsing 'info chardev' (Cole Robinson) - vcpupin: Fix cpu affinity setting bug of qemu driver (Taku Izumi) - daemon: plug memory leak (Eric Blake) - qemu: add missing break statement (Eric Blake) - storage: avoid mishandling backing store > 2GB (Eric Blake) Improvements: - tests: Add a general util test (Matthias Bolte) - util: choose whether to require micro in version strings (Eric Blake) - build: consistently use CFLAGS (Eric Blake) - build: simplify sanlock distribution (Eric Blake) - build: allow 'make syntax-check' on fresh checkout (Eric Blake) - Send back an error if we get unexpected stream control message (Daniel P. Berrange) - Add test case for parsing JSON docs (Daniel P. Berrange) - Remove bogus warning message in JSON code (Daniel P. Berrange) - Ensure RPC message is cleared before being reused (Daniel P. Berrange) - Fix hardcoded limit on client requests in RPC code (Daniel P. Berrange) - tests: Add valgrind.supp into EXTRA_DIST (Osier Yang) - virsh: Fix a problem of buildPoolXML (Osier Yang) - lock qemu_driver early in qemuGetSchedulerParametersFlags() (Wen Congyang) - build: avoid pod2man on tarball (Eric Blake) - Ensure that EOF is dispatched to the stream callback (Daniel P. Berrange) - Improve two log messages in virNetMessage (Daniel P. Berrange) - Lower logging level when failing to register socket watch (Daniel P. Berrange) - screenshot: Set access rights to temporary file (Michal Privoznik) - maint: improve makefile whitespace (Eric Blake) - network: Don't ignore errors in dnsmasq config file creation (Matthias Bolte) - network: Fix dnsmasq hostsfile creation logic and related tests (Matthias Bolte) - build: update translated files (Eric Blake) - Support automatic creation of leases for disks in sanlock (Daniel P. Berrange) - Support loading a configuration file for sanlock plugin (Daniel P. Berrange) - Allow per-driver config file for lock manager plugins (Daniel P. Berrange) - network: add domain to unqualified names defined with <host> (Laine Stump) - Convert libvirtd over to the new RPC handling APIs (Daniel P. Berrange) - Convert the remote driver to new RPC client APIs (Daniel P. Berrange) - Add XDR_CFLAGS to libvirt-net-rpc.la library (Daniel P. Berrange) - Ensure sanlock socket is labelled with the VM process label (Daniel P. Berrange) - Add a virSecurityManagerSetProcessFDLabel (Daniel P. Berrange) - Rename virSecurityManagerSetFDLabel method (Daniel P. Berrange) - Add node prefix to virNodeGet(CPU|Memory)Stats structs and defines (Matthias Bolte) - qemu: Fix update device for CURRENT + FORCE flags (Jiri Denemark) - nwfilter: Return error message about unresolvable variables (Stefan Berger) - build: rename Vcpupin to VcpuPin (Eric Blake) - sysinfo: cleanup function/struct names. (Minoru Usui) - sysinfo: fix lack of error check in virSysinfoFormat(). (Minoru Usui) - tests: Partly fix networkxml2argvtest being configure result dependent (Matthias Bolte) - qemu: Remove bogus error codes for NUMA memory tuning (Osier Yang) - network: fix indentation in networkBuildDnsmasqArgv (Laine Stump) - vcpupin: add query option to virsh vcpupin command (Taku Izumi) - vcpuinfo: add the code to fallback to try new API (Taku Izumi) - vcpupin: implement the remote protocol to address the new API (Taku Izumi) - vcpupin: implement the code to support new API for the qemu driver (Taku Izumi) - build: update gnulib for intprops (Eric Blake) - Rename iface(G|S)etMacaddr to iface(G|S)etMacAddress for consistency (Matthias Bolte) - Network: Add support for DNS hosts definition to the network XML (Michal Novotny) - Network: Add additional hosts internal infrastructure (Michal Novotny) - Network: Add regression tests for the command-line arguments (Michal Novotny) - Network: modify dnsmasq commandline build function to allow testing (Michal Novotny) - tests: Improve IPv6 detection for virNetSocket tests (Matthias Bolte) - Move load of AppArmor profile to GenLabel() (Jamie Strandboge) - Add Memory Device Information to virSysinfoRead() from dmidecode type 17 (Minoru Usui) - Add Processor Information to virSysinfoRead() from dmidecode type 4 (Minoru Usui) - Cleanup virSysinfoRead() (Minoru Usui) - Make sure virnetprotocol.[ch] are in BUILT_SOURCES (Daniel P. Berrange) - maint: typo fixes (Eric Blake) - Add missing translation of error message from QEMU reboot patch (Daniel P. Berrange) - Allow automatic kill of guests when a connection is closed (Daniel P. Berrange) - Automatically kill target QEMU if migration aborts abnormally (Daniel P. Berrange) - Add infrastructure to automatically destroy guests when a connection closes (Daniel P. Berrange) - Move the RPC generator scripts into src/rpc (Daniel P. Berrange) - Introduce generic RPC client objects (Daniel P. Berrange) - Introduce generic RPC module for advertising via MDNS (Daniel P. Berrange) - Introduce generic RPC server objects (Daniel P. Berrange) - Integrate TLS/SASL directly into the socket APIs (Daniel P. Berrange) - Generic module for handling SASL authentication & encryption (Daniel P. Berrange) - Generic module for handling TLS encryption and x509 certs (Daniel P. Berrange) - Introduce a generic object for using network sockets (Daniel P. Berrange) - Provide a simple object for encoding/decoding RPC messages (Daniel P. Berrange) - Defines the basics of a generic RPC protocol in XDR (Daniel P. Berrange) - build: update to latest gnulib (Eric Blake) - python: Generate virStreamFree but don't expose in bindings (Cole Robinson) - maint: avoid future setgid problems (Eric Blake) - qemu: Only check for NUMA availability if required (Jiri Denemark) - util: avoid PATH_MAX-sized array (Eric Blake) - xen: avoid PATH_MAX-sized array (Eric Blake) - tests: avoid PATH_MAX-sized array (Eric Blake) - virStorageVol: avoid PATH_MAX-sized array (Eric Blake) - cleanup: make several interface functions commonly available (Stefan Berger) - cleanup: make nlComm commonly available (Stefan Berger) - maint: remove syntax-check exception (Eric Blake) - Remove macvtap dependency on domain configuration (Daniel P. Berrange) - util: Correct the error prompt string (Osier Yang) - Fix to python API extractor and API doc generation (Daniel Veillard) - qemu: domain I/O asynchronous handling (Michal Privoznik) - python: Mark event callback wrappers as private (Cole Robinson) - python: events: Fix C->Python handle callback prototype (Cole Robinson) - python: Add bindings for virEvent*Handle/Timeout (Cole Robinson) - events: Correct virEventAddTimeout docs (Cole Robinson) - Promote virEvent*Handle/Timeout to public API (Cole Robinson) - python: Implement virStreamSend/RecvAll helpers (Cole Robinson) - python: Implement virStreamSend/Recv (Cole Robinson) - conf: Make full use of goto label (Osier Yang) - python: Implement bindings for virStreamEventAddCallback (Cole Robinson) - python: generator: Don't print warning if nothing to warn about (Cole Robinson) - python: libvirt-override: use simpler debug (Cole Robinson) - virsh: enhance snapshot-create-as (Eric Blake) - virsh: add snapshot-create-as command (Eric Blake) - virsh: clarify snapshot vs. save (Eric Blake) - Fix compile warnings in virsh vcpupin (Daniel P. Berrange) - remote generator: Allow to annotate arrays with typecasts (Matthias Bolte) - remote: Handle functions that return optional strings (Matthias Bolte) - remote: Generate virDomainGetBlockPullInfo (Matthias Bolte) - vcpupin: add vcpupin resetting feature to qemu driver (Taku Izumi) - vcpupin: add virDomainVcpupinDel function (Taku Izumi) - vcpupin: add reset option to virsh vcpupin command (Taku Izumi) - vcpupin: improve vcpupin definition of virsh vcpupin (Taku Izumi) - Fix preprocessor indentation in nodeinfo.c (Matthias Bolte) - Move XenAPI driver to correct spec file section (Matthias Bolte) - numatune: Add tests for numatune XML (Osier Yang) - numatune: Support NUMA memory tuning in qemu driver (Osier Yang) - numatune: Support persistent XML for numatune (Osier Yang) - numatune: Define XML schema (Osier Yang) - Update qemuDomainSetBlkioParameters to use flags (Hu Tao) - update qemuDomainGetBlkioParameters to use flags (Hu Tao) - Add new parameters for blkiotune (Hu Tao) - apparmor: implement AppArmorSetFDLabel() (Jamie Strandboge) - Add missing error reporting when loading mac filter config for QEMU (Daniel P. Berrange) - virsh: Add support for virDomainGetControlInfo (Jiri Denemark) - qemu: Implement virDomainGetControlInfo (Jiri Denemark) - Wire protocol and remote driver for virDomainGetControlInfo (Jiri Denemark) - sendkey: use consistent API convention (Eric Blake) - build: export correct function names (Eric Blake) - build: avoid compiler warning on non-Linux (Eric Blake) - remote generator: Handle struct returning functions better (part 2) (Matthias Bolte) - Fix apibuild.py warnings about missing comment headers (Matthias Bolte) - remote generator: Handle struct returning functions better (Matthias Bolte) - support for Xen HVM Viridian (Hyper-V) enlightenment interface (Daniel Gollub) - virsh: reduce complexity in argv iteration (Eric Blake) - Add support for network filter code in LXC driver (Daniel P. Berrange) - qemu: Translate boot config into bootindex if possible (Jiri Denemark) - spice: add <clipboard copypaste='yes|no'> option (Marc-André Lureau) - virNodeGetMemoryStats: Implement linux support (Minoru Usui) - virNodeGetMemoryStats: Implement virsh support (Minoru Usui) - virNodeGetMemoryStats: Implement remote protocol (Minoru Usui) - virNodeGetMemoryStats: Implement public API (Minoru Usui) - virNodeGetMemoryStats: Define internal driver API (Minoru Usui) - virNodeGetCPUStats: Implement linux support (Minoru Usui) - virNodeGetCPUStats: Implement virsh support (Minoru Usui) - virNodeGetCPUStats: Implement remote protocol (Minoru Usui) - virNodeGetCPUStats: Define internal driver API (Minoru Usui) - virNodeGetCPUStats: Expose new API (Minoru Usui) - Fix autostart flag when loading running domains (Michael Chapman) - send-key: Implementing the remote protocol (Lai Jiangshan) - send-key: Implementing the public API (Lai Jiangshan) - send-key: Defining the internal API (Lai Jiangshan) - remote generator: Handle (unsigned) int arrays (Lai Jiangshan) - add VSH_OFLAG_REQ_OPT options (Lai Jiangshan) - allow name for VSH_OT_ARGV options (Lai Jiangshan) - storage: avoid an intermediate malloc (Eric Blake) - command: reduce duplicated debug messages (Eric Blake) - qemu: Scrape stdout for virtio console pty (Cole Robinson) - virsh: Add daemon version reporting (Michal Privoznik) - nodeinfo: remove superflous braces (Guido Günther) - util: Cleanup indention problem in virterror.c (Osier Yang) - qemu: Parse current balloon value returned by query_balloon (Osier Yang) - Deprecate several CURRENT/LIVE/CONFIG enums (Hu Tao) - qemu: Faster response time to qemu startup errors (Stefan Berger) - build: update to latest gnulib (Eric Blake) - vcpupin: add the new option to "virsh vcpupin" command (Taku Izumi) - vcpupin: implement the remote protocol to address the new API (Taku Izumi) - vcpupin: implement the code to address the new API in the qemu driver (Taku Izumi) - Use virTimeMs when appropriate (Jiri Denemark) - Introduce virTimeMs for getting current time in ms (Jiri Denemark) - test: Remove unused timeval (Jiri Denemark) - tests: add a test for multi function PCI device (Wen Congyang) - the hotplugged PCI device should use the whole slot (Wen Congyang) - assign the whole slot to the PCI device that has no address (Wen Congyang) - Reimplement qemuDomainPCIAddressReserveSlot(): reserve all functions in the slot (Wen Congyang) - the key of hash table should include the function value (Wen Congyang) - prevent hot unplugging multi function PCI device (Wen Congyang) - check whether qemu supports multi function PCI device (Wen Congyang) - xenapi: Improve error message on session failure (Matthew Booth) - qemu: Fix one type in the error prompt string (Osier Yang) - Move VMware Workstation/Player driver to correct spec file section (Matthias Bolte) - esx: avoid dead code (Eric Blake) - qemu: reorder checks for safety (Eric Blake) - uuid: annotate non-null requirements (Eric Blake) - debug: avoid null dereference on uuid lookup api (Eric Blake) - python: avoid unlikely sign extension bug (Eric Blake) - build: detect Coverity 5.3.0 (Eric Blake) - build: Fix typos in configure.ac (Osier Yang) - virsh: Expose virDomainMigrateSetMaxSpeed API to virsh (Osier Yang) - lxc: Ensure container <init> actually exists (Cole Robinson) - lxc: Verify root fs exists before mounting (Cole Robinson) - lxc: controller: Improve container error reporting (Cole Robinson) - lxc: Improve guest startup error reporting (Cole Robinson) - lxc: Refactor controller command building (Cole Robinson) - lxc: Don't report error in Wait/SendContinue (Cole Robinson) - lxc: Drop container stdio as late as possible (Cole Robinson) - util: Implement virRun as a wrapper around virCommand (Cole Robinson) - qemu: Convert virExec usage to virCommand (Cole Robinson) - Use VIR_USE_CPU instead of new wheel (Osier Yang) - Avoid virGetVersion failure on specific driver support configurations (Matthias Bolte) Cleanups - cgroup: silence coverity warning (Eric Blake) - rpc: silence coverity warning (Eric Blake) - qemu: silence coverity warnings (Eric Blake) - build: avoid 'make syntax-check' failure (Eric Blake) - build: remove dead variables (Eric Blake) - Remove bogus jsondata.h file reference which does not exist (Daniel P. Berrange) - build: ignore generated file (Eric Blake) - build: Don't expect translatable strings in a dead file (Jiri Denemark) - Cleanup remote protocol definitions (Daniel P. Berrange) - Remove obsolete libvirtd mdns code (Daniel P. Berrange) - build: avoid long line tests (Eric Blake) - maint: add omitted copyright header (Eric Blake) - build: break some long lines (Eric Blake) - build: silence coverity false positives (Eric Blake) - secret: drop dead code (Eric Blake) - build: silence coverity false positive (Eric Blake) - Move virRun, virExec*, virFork to util/command (Cole Robinson) - util: Remove unused virExec wrapper (Cole Robinson) - esx: Remove duplicated invalid-argument checks (Matthias Bolte) Thanks everybody for your help with this release, be it by submitting documentations, ideas, patches, etc ... ! Daniel -- Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ daniel(a)veillard.com | Rpmfind RPM search engine http://rpmfind.net/ http://veillard.com/ | virtualization library http://libvirt.org/

1 0

[libvirt] [PATCH] initialize pointer to NULL
by Wen Congyang 04 Jul '11

04 Jul '11

>From 577ac7e8594cbcccb59653786e80c3916a3238cb Mon Sep 17 00:00:00 2001 From: Wen Congyang <wency(a)cn.fujitsu.com> Date: Sat, 2 Jul 2011 06:41:18 +0800 Subject: [PATCH] initialize pointer to NULL def and cmd is not initialized to NULL, but we try to freed it if we meet some error. It's very dangerous. --- src/qemu/qemu_command.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 90a6653..6c78161 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -5818,7 +5818,7 @@ virDomainDefPtr qemuParseCommandLine(virCapsPtr caps, const char **progenv, const char **progargv) { - virDomainDefPtr def; + virDomainDefPtr def = NULL; int i; int nographics = 0; int fullscreen = 0; @@ -5827,7 +5827,7 @@ virDomainDefPtr qemuParseCommandLine(virCapsPtr caps, const char **nics = NULL; int video = VIR_DOMAIN_VIDEO_TYPE_CIRRUS; int nvirtiodisk = 0; - qemuDomainCmdlineDefPtr cmd; + qemuDomainCmdlineDefPtr cmd = NULL; if (!progargv[0]) { qemuReportError(VIR_ERR_INTERNAL_ERROR, -- 1.6.5.2

3 2

[libvirt] [PATCH 0/8] more coverity cleanups
by Eric Blake 04 Jul '11

04 Jul '11

Many are minor (silencing warnings or only affect OOM), but at least patch 5/8 is a real bug that needs to be fixed pre-release. Eric Blake (8): rpc: avoid memory leak on error qemu: silence coverity warnings rpc: silence coverity warning cgroup: silence coverity warning rpc: fix logic bug qemu: avoid null deref on low memory vmware: avoid null deref on failed lookup storage: avoid crash on parse error src/qemu/qemu_audit.c | 6 ++++-- src/qemu/qemu_command.c | 6 +++++- src/qemu/qemu_domain.c | 4 ++-- src/qemu/qemu_migration.c | 3 ++- src/rpc/virnetclient.c | 3 ++- src/rpc/virnetserverclient.c | 1 + src/rpc/virnetserverservice.c | 7 ++++++- src/storage/storage_backend_iscsi.c | 14 ++++++++++---- src/util/cgroup.c | 2 +- src/vmware/vmware_driver.c | 2 +- 10 files changed, 34 insertions(+), 14 deletions(-) -- 1.7.4.4

3 15

[libvirt] [PATCH] monitor-proxy: Tool for testing qemu monitor interaction
by Jiri Denemark 04 Jul '11

04 Jul '11

It has two modes, normal and interactive. In normal mode, messages are passed from libvirt to qemu and back as they come and copyied to stdout so that one can monitor the communication. In interactive mode, whenever a message comes from either libvirt or qemu, it is printed to stdout and the user is asked what action to take. One can also inject any message to either libvirt or qemu. Interactive mode can be entered by sending any command to monitor-proxy (sending an empty command, i.e., hitting enter enters interactive mode without doing anything else). The proxy can also be started directly in interactive mode by specifying "-i" command line option. Command "cont" can be used to return back to normal mode. For list of supported commands and their description, use "help" or "h" command. To start monitor-proxy one needs to follow the following steps: - start a domain - run monitor-proxy [-i] <monitor socket path> for example: monitor-proxy /var/lib/libvirt/qemu/vm1.monitor - restart libvirtd (this makes libvirtd disconnect from qemu and reconnect to the proxy) monitor-proxy supports libvirtd restarts, i.e., if libvirtd disconnects, the proxy just waits until it reconnects again. Stopping the proxy while libvirtd is running kills the domain since libvirtd sees monitor EOF. To stop using monitor-proxy without killing the domain, one needs to stop libvirtd, stop monitor-proxy, and start libvirtd. The proxy works by renaming qemu monitor socket so that it can listen at the original place for connections from libvirtd. Once libvirtd connects to monitor-proxy, the proxy connects to qemu through the renamed socket. The socket is renamed back to its original name when proxy is killed or asked to exit. The proxy also supports fd passing through SCM_RIGHTS so to be usable for testing migrations. --- Makefile.am | 3 +- configure.ac | 3 +- examples/monitor-proxy/Makefile.am | 3 + examples/monitor-proxy/README | 36 ++ examples/monitor-proxy/monitor-proxy.c | 751 ++++++++++++++++++++++++++++++++ 5 files changed, 794 insertions(+), 2 deletions(-) create mode 100644 examples/monitor-proxy/Makefile.am create mode 100644 examples/monitor-proxy/README create mode 100644 examples/monitor-proxy/monitor-proxy.c diff --git a/Makefile.am b/Makefile.am index 49e42bf..1ac65e3 100644 --- a/Makefile.am +++ b/Makefile.am @@ -6,7 +6,8 @@ GENHTML = genhtml SUBDIRS = gnulib/lib include src daemon tools docs gnulib/tests \ python tests po examples/domain-events/events-c examples/hellolibvirt \ examples/dominfo examples/domsuspend examples/python examples/apparmor \ - examples/xml/nwfilter examples/openauth examples/systemtap + examples/xml/nwfilter examples/openauth examples/systemtap \ + examples/monitor-proxy ACLOCAL_AMFLAGS = -I m4 -I gnulib/m4 diff --git a/configure.ac b/configure.ac index cd22afb..9d2fe04 100644 --- a/configure.ac +++ b/configure.ac @@ -2414,7 +2414,8 @@ AC_OUTPUT(Makefile src/Makefile include/Makefile docs/Makefile \ examples/python/Makefile \ examples/hellolibvirt/Makefile \ examples/systemtap/Makefile \ - examples/xml/nwfilter/Makefile) + examples/xml/nwfilter/Makefile \ + examples/monitor-proxy/Makefile) AC_MSG_NOTICE([]) AC_MSG_NOTICE([Configuration summary]) diff --git a/examples/monitor-proxy/Makefile.am b/examples/monitor-proxy/Makefile.am new file mode 100644 index 0000000..4fbbed5 --- /dev/null +++ b/examples/monitor-proxy/Makefile.am @@ -0,0 +1,3 @@ +noinst_PROGRAMS = monitor-proxy +monitor_proxy_CFLAGS = $(WARN_CFLAGS) +monitor_proxy_SOURCES = monitor-proxy.c diff --git a/examples/monitor-proxy/README b/examples/monitor-proxy/README new file mode 100644 index 0000000..bf00460 --- /dev/null +++ b/examples/monitor-proxy/README @@ -0,0 +1,36 @@ +monitor-proxy is meant as a developer tool for testing libvirt-qemu +communication. + +It has two modes, normal and interactive. In normal mode, messages are passed +from libvirt to qemu and back as they come and copyied to stdout so that one +can monitor the communication. In interactive mode, whenever a message comes +from either libvirt or qemu, it is printed to stdout and the user is asked +what action to take. One can also inject any message to either libvirt or +qemu. Interactive mode can be entered by sending any command to monitor-proxy +(sending an empty command, i.e., hitting enter enters interactive mode without +doing anything else). The proxy can also be started directly in interactive +mode by specifying "-i" command line option. Command "cont" can be used to +return back to normal mode. For list of supported commands and their +description, use "help" or "h" command. + +To start monitor-proxy one needs to follow the following steps: +- start a domain +- run monitor-proxy [-i] <monitor socket path> + for example: monitor-proxy /var/lib/libvirt/qemu/vm1.monitor +- restart libvirtd (this makes libvirtd disconnect from qemu and reconnect to + the proxy) + +monitor-proxy supports libvirtd restarts, i.e., if libvirtd disconnects, the +proxy just waits until it reconnects again. Stopping the proxy while libvirtd +is running kills the domain since libvirtd sees monitor EOF. To stop using +monitor-proxy without killing the domain, one needs to stop libvirtd, stop +monitor-proxy, and start libvirtd. + +The proxy works by renaming qemu monitor socket so that it can listen at the +original place for connections from libvirtd. Once libvirtd connects to +monitor-proxy, the proxy connects to qemu through the renamed socket. The +socket is renamed back to its original name when proxy is killed or asked to +exit. + +The proxy also supports fd passing through SCM_RIGHTS so to be usable for +testing migrations. diff --git a/examples/monitor-proxy/monitor-proxy.c b/examples/monitor-proxy/monitor-proxy.c new file mode 100644 index 0000000..403033d --- /dev/null +++ b/examples/monitor-proxy/monitor-proxy.c @@ -0,0 +1,751 @@ +#include <stdlib.h> +#include <stdio.h> +#include <stdbool.h> +#include <stdarg.h> +#include <string.h> +#include <signal.h> +#include <unistd.h> +#include <fcntl.h> +#include <errno.h> +#include <sys/select.h> +#include <sys/socket.h> +#include <sys/un.h> + +# ifndef ATTRIBUTE_FMT_PRINTF +# if __GNUC_PREREQ (4, 4) +# define ATTRIBUTE_FMT_PRINTF(fmtpos,argpos) __attribute__((__format__ (gnu_printf, fmtpos,argpos))) +# else +# define ATTRIBUTE_FMT_PRINTF(fmtpos,argpos) __attribute__((__format__ (printf, fmtpos,argpos))) +# endif +# endif + +# ifndef ATTRIBUTE_NORETURN +# define ATTRIBUTE_NORETURN __attribute__((__noreturn__)) +# endif + +#ifndef UNIX_PATH_MAX +# define UNIX_PATH_MAX 108 +#endif +#define SOCK_SUFFIX ".proxy" +#define SIZE (1 << 14) + +#define LABEL_LIBVIRT "libvirt> " +#define LABEL_QEMU "qemu> " +#define LABEL_PROMPT "command> " + +enum party { + PARTY_QEMU, + PARTY_LIBVIRT +}; + +enum command { + CMD_NONE, + CMD_NOOP, + CMD_UNKNOWN, + CMD_CONTINUE, + CMD_QUIT, + CMD_HELP, + CMD_PASS, + CMD_DISCARD, + CMD_SEND_QEMU, + CMD_SEND_LIBVIRT +}; + +struct proxy_command { + enum command command; + const char *name; + bool shortcut; + bool argument; + const char *description; +}; + +const char *monitor; +char *monitor_qemu; + +char *buffer; +char *control; +char *commands; + +struct message { + enum party source; + int fd_qemu; + int fd_libvirt; + struct msghdr hdr; +}; + + +#define ncommands (sizeof(proxy_commands) / sizeof(*proxy_commands)) +static const struct proxy_command proxy_commands[] = { + { + CMD_CONTINUE, + "cont", true, false, + "leave interactive mode" + }, { + CMD_QUIT, + "quit", false, false, + "quit monitor-proxy" + }, { + CMD_HELP, + "help", true, false, + "print this help" + }, { + CMD_PASS, + "pass", true, false, + "pass current data to its destination" + }, { + CMD_DISCARD, + "discard", true, false, + "discard current data" + }, { + CMD_SEND_QEMU, + "qemu", true, true, + "send DATA to qemu" + }, { + CMD_SEND_LIBVIRT, + "libvirt", true, true, + "send DATA to libvirt" + } +}; + + +static void ATTRIBUTE_NORETURN +usage(int ret) +{ + fprintf(stderr, "monitor-proxy [-i] <qemu monitor socket>\n"); + exit(ret); +} + + +static void ATTRIBUTE_FMT_PRINTF(1, 2) +print(const char *msg, ...) +{ + va_list args; + + printf("* "); + va_start(args, msg); + vprintf(msg, args); + va_end(args); + printf("\n"); + fflush(NULL); +} + + +#define HELP_LINE 80 +#define HELP_NAME 20 +static void +help(void) +{ + unsigned int i; + char line[HELP_LINE]; + char name[HELP_NAME]; + + print("Available proxy commands:"); + for (i = 0; i < ncommands; i++) { + const struct proxy_command *cmd = proxy_commands + i; + + if (cmd->shortcut) + snprintf(name, HELP_NAME, "%c(%s)", cmd->name[0], cmd->name + 1); + else + strncpy(name, cmd->name, HELP_NAME); + name[HELP_NAME - 1] = '\0'; + if (cmd->argument) { + strncpy(name + strlen(name), " DATA", HELP_NAME - strlen(name)); + name[HELP_NAME - 1] = '\0'; + } + + snprintf(line, HELP_LINE, " %-*s %s", + HELP_NAME, name, cmd->description); + line[HELP_LINE - 1] = '\0'; + print("%s", line); + } + print("Signals:"); + print(" SIGINT (^C) quit monitor-proxy"); +} + + +static int +move_socket(void) +{ + if (monitor_qemu) { + fprintf(stderr, "Socket already moved to %s\n", monitor_qemu); + return -1; + } + + monitor_qemu = malloc(strlen(monitor) + strlen(SOCK_SUFFIX) + 1); + if (!monitor_qemu) + return -1; + + sprintf(monitor_qemu, "%s%s", monitor, SOCK_SUFFIX); + + if (rename(monitor, monitor_qemu) < 0) { + perror("Cannot move monitor socket"); + free(monitor_qemu); + monitor_qemu = NULL; + return -1; + } + + print("Monitor socket renamed as %s", monitor_qemu); + + return 0; +} + + +static int +restore_socket(void) +{ + if (!monitor_qemu) + return 0; + + if (rename(monitor_qemu, monitor) < 0) { + perror("Cannot restore monitor socket"); + return -1; + } + + print("Monitor socket renamed back to %s", monitor); + + free(monitor_qemu); + monitor_qemu = NULL; + + return 0; +} + + +static void ATTRIBUTE_NORETURN +signal_handler(int signum) +{ + restore_socket(); + + if (signum == SIGINT) + exit(0); + else + exit(1); +} + + +static int +open_qemu(void) +{ + struct sockaddr_un addr; + int fd = -1; + + if ((fd = socket(PF_UNIX, SOCK_STREAM, 0)) == -1) { + perror("Cannot create monitor socket"); + goto error; + } + + addr.sun_family = AF_UNIX; + strncpy(addr.sun_path, monitor_qemu, UNIX_PATH_MAX); + addr.sun_path[UNIX_PATH_MAX - 1] = '\0'; + + if (connect(fd, (struct sockaddr *) &addr, sizeof(addr)) < 0) { + perror("Cannot connect to qemu monitor"); + goto error; + } + + print("Connected to qemu monitor"); + + return fd; + +error: + close(fd); + return -1; +} + + +static int +listen_libvirt(void) +{ + struct sockaddr_un addr; + int fd = -1; + + if ((fd = socket(PF_UNIX, SOCK_STREAM, 0)) == -1) { + perror("Cannot create listening socket"); + goto error; + } + + addr.sun_family = AF_UNIX; + strncpy(addr.sun_path, monitor, UNIX_PATH_MAX); + addr.sun_path[UNIX_PATH_MAX - 1] = '\0'; + + if (bind(fd, (struct sockaddr *) &addr, sizeof(addr)) < 0) { + perror("Cannot bind listening socket"); + goto error; + } + + if (listen(fd, 1) < 0) { + perror("Cannot listen"); + goto error; + } + + return fd; + +error: + close(fd); + return -1; +} + + +static int +accept_libvirt(int sock) +{ + int fd = -1; + + print("Waiting for libvirt connection"); + + if ((fd = accept(sock, NULL, NULL)) == -1) { + perror("Cannot accept connection from libvirt"); + goto error; + } + + print("Libvirt connection accepted"); + + return fd; + +error: + close(fd); + return -1; +} + + +static int +init_message(struct message *msg, int qemu, int libvirt) +{ + struct iovec *iov; + + if (!(iov = malloc(sizeof(*iov)))) + return -1; + + memset(msg, 0, sizeof(*msg)); + msg->fd_qemu = qemu; + msg->fd_libvirt = libvirt; + msg->hdr.msg_iov = iov; + msg->hdr.msg_iovlen = 1; + + return 0; +} + + +static ssize_t +receive_message(enum party source, struct message *msg) +{ + ssize_t count; + int fd = source == PARTY_QEMU ? msg->fd_qemu : msg->fd_libvirt; + + msg->source = source; + msg->hdr.msg_iov[0].iov_base = buffer; + msg->hdr.msg_iov[0].iov_len = SIZE; + msg->hdr.msg_control = control; + msg->hdr.msg_controllen = SIZE; + + if ((count = recvmsg(fd, &msg->hdr, 0)) >= 0) { + msg->hdr.msg_iov[0].iov_len = count; + if (msg->hdr.msg_controllen == 0) + msg->hdr.msg_control = NULL; + } + + return count; +} + + +static void +send_message(enum party target, struct message *msg) +{ + int fd = target == PARTY_QEMU ? msg->fd_qemu : msg->fd_libvirt; + + if (sendmsg(fd, &msg->hdr, 0) < 0) { + if (target == PARTY_QEMU) { + perror("Cannot send message to qemu"); + } else { + perror("Cannot send message to libvirt"); + } + } + + msg->hdr.msg_iov[0].iov_base = NULL; + msg->hdr.msg_iov[0].iov_len = 0; + msg->hdr.msg_control = NULL; + msg->hdr.msg_controllen = 0; +} + + +static int +write_all(int fd, const char *buf, size_t count) +{ + size_t written = 0; + ssize_t w; + + while (count > 0) { + w = write(fd, buf, count); + + if (w == 0) { + break; + } else if (w < 0) { + if (errno == EINTR) + continue; + perror("Cannot write data"); + return -1; + } + + buf += w; + count -= w; + written += w; + } + + return written; +} + + +static int +output(const char *label, const struct message *msg) +{ + ssize_t start = 0; + char *buf = msg->hdr.msg_iov[0].iov_base; + ssize_t count = msg->hdr.msg_iov[0].iov_len; + + while (start < count) { + ssize_t len = 0; + const char* p; + + if (write_all(STDOUT_FILENO, label, strlen(label)) < 0) + return -1; + + p = buf + start; + while (start + len < count && *p != '\n') { + len++; + p++; + } + if (start + len < count) + len++; + + if (write_all(STDOUT_FILENO, buf + start, len) < 0) + return -1; + + start += len; + } + + return 0; +} + + +static ssize_t +read_line(char *buf, size_t size, bool data) +{ + ssize_t count = 0; + struct timeval tv = { 0, 0 }; + struct timeval *timeout; + fd_set fds; + int ret; + + FD_ZERO(&fds); + FD_SET(STDIN_FILENO, &fds); + + if (data) + timeout = NULL; + else + timeout = &tv; + + ret = select(STDIN_FILENO + 1, &fds, NULL, NULL, timeout); + if (ret < 0) + return -1; + if (ret == 0) + return 0; + + while (count < size - 1 && read(STDIN_FILENO, buf, 1) == 1) { + count++; + if (*buf == '\n') { + *buf = '\r'; + *++buf = '\n'; + count++; + break; + } + buf++; + } + return count; +} + + +static enum command +get_command(char **cmd_buf, ssize_t *cmd_len, bool data) +{ + ssize_t len; + unsigned int i; + + if (data) + write_all(STDOUT_FILENO, LABEL_PROMPT, strlen(LABEL_PROMPT)); + + len = read_line(commands, SIZE, data); + if (len < 0) + return CMD_QUIT; + if (len == 0) + return CMD_NONE; + if (len <= 2) + return CMD_NOOP; + + commands[len] = '\0'; + + for (i = 0; i < ncommands; i++) { + const struct proxy_command *cmd = proxy_commands + i; + int skip; + + if (strncmp(commands, cmd->name, strlen(cmd->name)) == 0) + skip = strlen(cmd->name); + else if (cmd->shortcut && *commands == *cmd->name) + skip = 1; + else + continue; + + if (cmd->argument) { + if (commands[skip] == ' ') { + skip++; + *cmd_buf = commands + skip; + *cmd_len = len - skip; + return cmd->command; + } + } else { + if (strncmp(commands + skip, "\r\n", 2) == 0) + return cmd->command; + } + } + + commands[len - 2] = '\0'; + *cmd_buf = commands; + *cmd_len = len - 2; + return CMD_UNKNOWN; +} + + +static int +process_commands(struct message *msg, bool *interactive) +{ + enum party source = msg->source; + ssize_t data_len = msg->hdr.msg_iov[0].iov_len; + ssize_t control_len = msg->hdr.msg_controllen; + bool data = data_len > 0 || control_len > 0; + enum command cmd; + char *cmd_buf = NULL; + ssize_t cmd_len = 0; + + msg->hdr.msg_iov[0].iov_base = NULL; + msg->hdr.msg_iov[0].iov_len = 0; + msg->hdr.msg_control = NULL; + msg->hdr.msg_controllen = 0; + + if (data) { + print("Processing data from %s", + source == PARTY_QEMU ? "qemu" : "libvirt"); + print(" Enter proxy commands (type \"help\" to list them)"); + print(" Finish processing with \"pass\" or \"discard\" command"); + } + + while (*interactive && + (cmd = get_command(&cmd_buf, &cmd_len, data)) != CMD_NONE) { + switch (cmd) { + case CMD_NONE: + case CMD_NOOP: + break; + + case CMD_QUIT: + return -1; + + case CMD_HELP: + help(); + break; + + case CMD_UNKNOWN: + print("Unknown command: \"%s\"", cmd_buf); + break; + + case CMD_CONTINUE: + *interactive = false; + print("Leaving interactive mode"); + case CMD_PASS: + if (data_len > 0) { + msg->hdr.msg_iov[0].iov_len = data_len; + msg->hdr.msg_iov[0].iov_base = buffer; + } + if (control_len > 0) { + msg->hdr.msg_controllen = control_len; + msg->hdr.msg_control = control; + } + if (data) { + print("Passing data from %s to %s", + source == PARTY_QEMU ? "qemu" : "libvirt", + source == PARTY_QEMU ? "libvirt" : "qemu"); + send_message(source == PARTY_QEMU ? PARTY_LIBVIRT : PARTY_QEMU, + msg); + data = false; + } else { + if (cmd == CMD_PASS) + print("No data to pass"); + } + break; + + case CMD_DISCARD: + if (data) { + print("Discarding data from %s", + source == PARTY_QEMU ? "qemu" : "libvirt"); + } else { + print("No data to discard"); + } + data_len = control_len = 0; + data = false; + break; + + case CMD_SEND_QEMU: + case CMD_SEND_LIBVIRT: + msg->hdr.msg_iov[0].iov_len = cmd_len; + msg->hdr.msg_iov[0].iov_base = cmd_buf; + send_message(cmd == CMD_SEND_QEMU ? PARTY_QEMU : PARTY_LIBVIRT, + msg); + break; + } + } + + return 0; +} + + +static int +process_data(struct message *msg, bool *interactive) +{ + output(msg->source == PARTY_QEMU ? LABEL_QEMU : LABEL_LIBVIRT, msg); + + if (!*interactive) { + send_message(msg->source == PARTY_QEMU ? PARTY_LIBVIRT : PARTY_QEMU, + msg); + } else { + return process_commands(msg, interactive); + } + + return 0; +} + + +static int +proxy(bool *interactive, int libvirt, int qemu) +{ + fd_set fds; + int maxfd; + struct message msg; + int ret = -1; + ssize_t count; + + print("New monitor session"); + if (*interactive) + print("Entering interactive mode"); + + if (init_message(&msg, qemu, libvirt) < 0) { + perror("Cannot initialize msghdr"); + goto cleanup; + } + + maxfd = libvirt > qemu ? libvirt : qemu; + while (1) { + FD_ZERO(&fds); + FD_SET(STDIN_FILENO, &fds); + FD_SET(libvirt, &fds); + FD_SET(qemu, &fds); + + if (select(maxfd + 1, &fds, NULL, NULL, NULL) == -1) { + perror("select() failed"); + goto cleanup; + } + + if (FD_ISSET(qemu, &fds)) { + if ((count = receive_message(PARTY_QEMU, &msg)) <= 0) { + if (count < 0) + perror("Cannot receive message from qemu"); + else + print("Qemu closed connection"); + goto cleanup; + } + if (process_data(&msg, interactive) < 0) + goto cleanup; + } + + if (FD_ISSET(libvirt, &fds)) { + if ((count = receive_message(PARTY_LIBVIRT, &msg) <= 0)) { + if (count < 0) { + perror("Cannot receive message from libvirt"); + } else { + print("Libvirt closed connection"); + ret = 0; + } + goto cleanup; + } + if (process_data(&msg, interactive) < 0) + goto cleanup; + } + + if (!*interactive && FD_ISSET(STDIN_FILENO, &fds)) { + print("Entering interactive mode"); + *interactive = true; + } + + if (*interactive && process_commands(&msg, interactive) < 0) + goto cleanup; + } + +cleanup: + print("Session closed"); + + close(libvirt); + close(qemu); + return ret; +} + + +int +main(int argc, char **argv) +{ + int sock = -1; + int libvirt = -1; + bool interactive = false; + + if (argc < 2) + usage(2); + + if (strcmp(argv[1], "-i") == 0) { + interactive = true; + if (argc < 3) + usage(2); + monitor = argv[2]; + } else { + monitor = argv[1]; + } + + signal(SIGHUP, signal_handler); + signal(SIGINT, signal_handler); + signal(SIGQUIT, signal_handler); + signal(SIGABRT, signal_handler); + signal(SIGKILL, signal_handler); + signal(SIGPIPE, SIG_IGN); + signal(SIGTERM, signal_handler); + + if (move_socket() < 0) + goto error; + + buffer = malloc(SIZE); + control = malloc(SIZE); + commands = malloc(SIZE); + if (!buffer || !control || !commands) + goto error; + + if ((sock = listen_libvirt()) == -1) + goto error; + + while ((libvirt = accept_libvirt(sock)) != -1) { + int qemu; + + if ((qemu = open_qemu()) != -1) { + if (proxy(&interactive, libvirt, qemu) < 0) + break; + } else { + close(libvirt); + } + } + +error: + restore_socket(); + close(sock); + return 1; +} -- 1.7.6

3 2

[libvirt] Network device abstraction aka virtual switch - V3
by Laine Stump 03 Jul '11

03 Jul '11

This is a followup to https://www.redhat.com/archives/libvir-list/2011-April/msg00591.html (and an even earlier draft) which I alluded to here: https://www.redhat.com/archives/libvir-list/2011-June/msg00383.html Network device abstraction aka virtual switch - V3 ================================================== The <interface> element of a guest's domain config in libvirt has a <source> element that describes what resources on a host will be used to connect the guest's network interface to the rest of the world. This is very flexible, allowing several different types of connection (virtual network, host bridge, direct macvtap connection to physical interface, qemu usermode, user-defined via an external script), but currently has the problem that unnecessary details of the host resources are embedded into the guest's config; if the guest is migrated to a different host, and that host has a different hardware or network config (or possibly the same hardware, but that hardware is currently in use by a different guest), the migration will fail. I am proposing a change to libvirt's network XML that will allow us to (optionally - old configs will remain valid) remove the host details from the guest's domain XML (which can move around from host to host) and place them in the network XML (which remains with a single host); the domain XML will then use existing config elements to associate each guest interface with a "network". The motivating use case for this change is the "direct" connection type (which uses macvtap for vepa and vnlink connections directly between a guest and a physical interface, rather than through a bridge), but it is applicable for all types of connection. (Another hopeful side effect of this change will be to make libvirt's network connection model easier to realize on non-Linux hypervisors (eg, VMWare ESX) and for other network technologies, such as openvswitch, VDE, and various VPN implementations). Background ========== (parts lifted from Dan Berrange's last mail on this subject) Currently <network> supports 3 connectivity modes - Non-routed network, separate subnet (no <forward> element present) - Routed network, separate subnet with NAT (<forward mode='nat'/>) - Routed network, separate subnet (<forward mode='route'/>) Each of these is implemented in the existing network driver by creating a bridge device using brctl, and connecting the guest network interfaces via tap devices (a detail which, now that I've stated it, you should promptly forget!). All traffic between that bridge and the outside network is done via the host's IP routing stack (ie, there is no physical device directly connected to the bridge) In the future, these two additional routed modes might be useful: - Routed network, IP subnetting - Routed network, separate subnet with VPN The core goal of this proposal, though, is to replace type=bridge and type=direct from the domain interface XML with new types of <network> definitions so that the domain can just give "type='network'" and have all the necessary details filled in at runtime. This basically means we're adding several bridging modes (the submodes of "direct" have been flattened out here): - Bridged network, eth + bridge + tap - Bridged network, eth + macvtap + vepa - Bridged network, eth + macvtap + private - Bridged network, eth + macvtap + passthrough - Bridged network, eth + macvtap + bridge Another "future expansion" could be to add: - Bridged network, with VPN Likewise, support for other technologies, such as openvswitch and VDE would each be another entry on this list. (Dan also listed each of the above "+sriov" separately, but that ends up being handled in an orthogonal manner (by just specifying a pool of interfaces for a single network), so I'm only giving the abbreviated list) I. Changes to domain <interface> element ======================================== In many cases, the <interface> element of the domain XML will be identical to what is used now when connecting the interface to a libvirt-style virtual network: <interface type='network'> <source network='red-network'/> <mac address='xx:xx:xx:xx:xx:xx'/> </interface> Depending on the definition of the network "red-network" on the host the guest was started on / migrated to, this could be either a direct (macvtap) connection using one of the various direct modes (vepa/private/bridge/passthrough), a bridge (again, pointed to by the definition of 'red-network'), or a virtual network (using the current network definition syntax). This way the same guest could be migrated not only between macvtap-enabled hosts, but from there to a host using a bridge, or maybe a host in a remote location that used a virtual network with a secure tunnel to connect back to the rest of the red-network. (Part of the migration process would of course check that the destination host had a network of the proper name with adequate available resources, and fail if it didn't; management software at a level above libvirt would probably filter a list of candidate migration destinations based on available networks and any various details of those networks (eg. it could search for only networks using vepa for the connection), and only attempt migration to one that had the matching network available). <virtualport> element of <interface> ------------------------------------ Since many of the attributes/sub-elements of <virtualport> (used by some modes of "direct" interface connections) are identical for all interfaces connecting to any given switch, most of the information in <virtualport> will be optional in the domain's interface definition - it can be filled in from a similar <virtualport> element that will be added to the <network> definition. Some parameters in <virtualport> ("instanceid", for example) must be unique for every interface, though, so those will still be specified in the <interface> XML. The two <virtualport> elements will be OR'ed at runtime to arrive at the actual set of parameters that are used. (Open Question: What should be the policy when a parameter is specified in both places? Should one take precedence? Or should it be considered an error?) portgroup attribute of <source> ------------------------------- The <source> element of an interface definition will be able to optionally specify a "portgroup" attribute. If portgroup is *NOT* given, the default (first) portgroup of the network will be used (if any are defined). If portgroup *IS* specified, the source network must have a portgroup by that name (or the domain startup/migration will fail), and the attributes of that portgroup will be used for the connection. Here is an example <interface> definition that has both a reduced <virtualport> element, as well as a portgroup attribute: <interface type='network'> <source network='red-network' portgroup='engineering'/> <virtualport type="802.1Qbg"> <parameters instanceid="09b11c53-8b5c-4eeb-8f00-d84eaa0aaa4f"/> </virtualport> <mac address='de:ad:be:ef:ca:fe'/> </interface> (The specifics of what can be in a portgroup are given below) II. Changes to <network> definition =================================== As Dan has pointed out, any additions to <network> must be designed so that existing management applications (written to understand <network> prior to these new additions) will at least recognize that the XML they've been given is for something new that they don't fully understand. At the same time, the new types of network definition should attempt to re-use as much of the existing elements/attributes as possible, both to make it easier to extend these applications, as well as to make the status displays of un-updated applications make as much sense as possible. Dan's suggestion (which I obviously endorse :-) is that the new types of network should be specified by extending the choices for <forward mode='....'>. He also suggested adding a new "layer='network|link'" attribute to <forward>. I'm not convinced that item is necessary (it seems redundant), but am including it here for sake of discussion. The current modes are: <forward layer='network' mode='route|nat'/> (in addition to not listing any mode, which equates to "isolated") Here are suggested new modes: <forward layer='link' mode='bridge-brctl|vepa|private|passthrough|bridge-macvtap'/> A description of each: bridge-brctl - equivalent to "<interface type='bridge'>" in the interface definition. The bridge device to use would be given in the existing <forward dev='xxx'>. (Dan also suggests putting this in <network>'s <bridge name='xxx'/> - opinions?) (Question: better name for this?) vepa - same as "<interface type='direct'>..." with <source mode='vepa'/> private - <interface type='direct'> ... <source mode='private'/> passthrough - <interface type='direct'> ... <source mode='passthrough'/> bridge-macvtap - <interface type='direct'> ... <source mode='bridge'/> (Question: better name for this?) Interface Pools --------------- In many cases, a single host network may have multiple physical network devices associated with it (especially in the case of an SRIOV-capable ethernet card, which will have several "virtual functions" associated with a single physical ethernet connection). The host will at least want to balance the load of multiple guests between these multiple devices, and may even require (in the case of passthrough mode, for example) that only a single guest interface be attached to each host device. The current specification for <forward> only allows for a single "dev" attribute, though. In order to support multiple device names, we will extend <forward> to allow 0 or more <interface> sub-elements: <forward mode='vepa' dev='eth10'/> <interface dev='eth10'/> <interface dev='eth11'/> <interface dev='eth12'/> <interface dev='eth13'/> </forward> Note that, as a convenience, the first of these elements will always be a duplicate of the "dev" attribute in <forward> itself. (Is this necessary/desirable?) In the case of mode='passthrough', only one guest interface can be connected to a device at a time. libvirt will keep track of which devices are in use, and attempt to assign a free device; failure to assign a device will result in a failure of the domain to start/migrate. For the other direct modes, libvirt will simply keep track of the number of guest interfaces currently using each device, and attempt to keep them balanced. (Open question: where will we keep track of this allocation/assignment?) Portgroups ----------- A <portgroup> (sub-element of <network>) is just a way of easily putting connections to the network into different classes, with each class having a different level/type of service. Each <network> can have multiple <portgroup> elements, and each <portgroup> has a name, as well as various attributes associated with it. The first thing we will use portgroups for is as an alternate place to specify <virtualport> parameters: <portgroup name='engineering'> <virtualport type="802.1Qbg"> <parameters managerid="11" typeid="1193047" typeidversion="2"/> </virtualport> </portgroup> Anything that is valid in an interface's <virtualport> is also valid here. The next thing to specify in a portgroup will be bandwidth limiting / QoS configuration. Since I don't know exactly what's needed for that, I won't specify it here. If anything is specified both directly under <network> and in a <portgroup>, the value in portgroup will take precedence. (Again - what will the precedence of items specified in the <interface> be?) EXAMPLES -------- Examples of 'red-network' for different types of connections (all of these would work with minor variations of the interface XML given above, e.g. the 'vepa' version would require <virtualport> in the interface that specified an instanceid, and if the <interface> specified a portgroup, it would need to also be in the <network> definition (even if it was empty aside from name).  <network> <name>red-network</name> <bridge name='virbr0'/> <forward layer='network' mode='route'/> ... </network>  <network> <name>red-network</name> <forward mode='bridge-brctl' dev='br0'/> </network>  <network> <name>red-network</name> <forward layer='link' mode='vepa' dev='eth10'/> <virtualport type='802.1Qbg'> <parameters managerid='11' typeid='1193047' typeidversion='2'/> </virtualport>   <portgroup name='accounting'> <virtualport> <parameters typeid='22'/> </virtualport> </portgroup> <portgroup name='engineering'> <virtualport> <parameters typeid='33'/> </virtualport> </portgroup> </network>  <network> <name>red-network</name> <forward layer='link' mode='passthrough' dev='eth10'/> <interface dev='eth10'/> <interface dev='eth11'/> <interface dev='eth12'/> <interface dev='eth13'/> <interface dev='eth14'/> <interface dev='eth15'/> <interface dev='eth16'/> <interface dev='eth17'/> </forward> </network> ============= Open Questions: * Is there a good reason to include the "layer='network|link'" attribute in forward? (maybe just because it's useful info for a management application that doesn't know the details of the modes?) Or is it redundant? * What should be the policy when a virtualport parameter is specified in both the <interface> and the <network>/<portgroup>? Should one take precedence? Or should it be considered an error? * Is it okay for the domain's own definition to specify what portgroup it will be in? Or are there cases where we want to allow someone to modify their domain XML, but force them into a particular portgroup beyond their control? * Is it really necessary/desirable for the first ethernet device in a pool to be duplicated in the <forward dev='xxx'...> attribute? Or can that attribute be omitted when there is a pool of devices? * Where will we keep track of the count of guest interfaces connected to each host interface device, and where will we keep track of which device is being used by a particular guest interface? In the network/domain XML? * Does anyone have better names for "brctl-bridge" and "macvtap-bridge"?

6 11

[libvirt] FreeBSD Port, update to 0.9.2 compile error
by Jason Helfman 01 Jul '11

01 Jul '11

Hi, I am trying to update the port for libvirt to 0.9.2, but am receiving a new compiling error, that I have not seen yet. console.c:280: warning: declaration of 'devname' shadows a global declaration [-Wshadow] /usr/include/stdlib.h:264: warning: shadowed declaration is here [-Wshadow] CC virsh-virsh.o CCLD virsh GEN virt-xml-validate GEN virt-pki-validate gmake[3]: Leaving directory `/home/jhelfman/ports/devel/libvirt/work/libvirt-0.9.2/tools' gmake[2]: Leaving directory `/home/jhelfman/ports/devel/libvirt/work/libvirt-0.9.2/tools' Making all in docs gmake[2]: Entering directory `/home/jhelfman/ports/devel/libvirt/work/libvirt-0.9.2/docs' GEN libvirt-api.xml ./apibuild.py: not found gmake[2]: *** [libvirt-api.xml] Error 127 gmake[2]: Leaving directory `/home/jhelfman/ports/devel/libvirt/work/libvirt-0.9.2/docs' gmake[1]: *** [all-recursive] Error 1 gmake[1]: Leaving directory `/home/jhelfman/ports/devel/libvirt/work/libvirt-0.9.2' gmake: *** [all] Error 2 *** Error code 1 Stop in /home/jhelfman/ports/devel/libvirt. Any thoughts? Thanks, Jason -- Jason Helfman System Administrator experts-exchange.com http://www.experts-exchange.com/M_4830110.html E4AD 7CF1 1396 27F6 79DD 4342 5E92 AD66 8C8C FBA5

5 19

[libvirt] [PATCH] build: avoid 'make syntax-check' failure
by Eric Blake 01 Jul '11

01 Jul '11

* tests/utiltest.c (DO_TEST): Fix indentation for cppi. --- Pushing under the build-breaker rule. tests/utiltest.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tests/utiltest.c b/tests/utiltest.c index 1b26b72..774a2f7 100644 --- a/tests/utiltest.c +++ b/tests/utiltest.c @@ -160,7 +160,7 @@ mymain(void) virSetErrorFunc(NULL, testQuietError); - #define DO_TEST(_name) \ +#define DO_TEST(_name) \ do { \ if (virtTestRun("Util "#_name, 1, test##_name, \ NULL) < 0) { \ -- 1.7.4.4

1 0

[libvirt] virtual switch - how to store state information
by Laine Stump 01 Jul '11

01 Jul '11

(If you already know about my work on putting a logical switch abstraction into libvirt's <network>, skip to part 2) INTRODUCTION =========== The rudimentary logical network switch capability I'm currently implementing (see https://bugzilla.redhat.com/show_bug.cgi?id=643947) is intended to allow a guest's interface XML to be free of any specific physical network device name, particularly in bridge and direct modes. It does this by expanding the definition of a libvirt <network> to include cases that merely describe a host-configured bridge, or a host interface (or pool of interfaces) that can be used by a guest in one of the 'direct' modes (bridge, private, vepa, or passthrough). It will also allow certain details of the guest's network connection to be configured by "portgroups" in the <network> definition (initially this will be limited to a portgroup containing a <virtualportprofile> and bandwidth limiting information). For example, in the past, a guest that wanted to connect to interface eth10 using the direct (aka 'macvtap') "vepa" mode would need to have this <interface> in its guest XML: <interface type='direct'> <mac address='52:54:00:34:a5:aa'/> <source dev='eth10' mode='vepa'/> <model type='virtio'/> <virtualport type='802.1Qbg'> <parameters managerid='33' typeid='89' typeidversion='3'/> </virtualport> </interface> With my new code, you can instead define a <network> with connections on several physical ethernets: <network> <name>test</name> <forward mode='vepa'> <interface dev='eth10'/> <interface dev='eth11'/> <interface dev='eth12'/> <interface dev='eth13'/> <interface dev='eth14'/> <interface dev='eth15'/> <interface dev='eth16'/> <interface dev='eth17'/> </forward> <portgroup name='accounting'> <virtualport type='802.1Qbg'> <parameters managerid='44' typeid='54' typeidversion='1'/> </virtualport> </portgroup> <portgroup name='engineering' default='yes'> <virtualport type='802.1Qbg'> <parameters managerid='33' typeid='89' typeidversion='3'/> </virtualport> </portgroup> </network> and then tell the domain's <interface> to get the information from the network: <interface type='network'> <mac address='52:54:00:34:a5:aa'/> <source network='test' portgroup='engineering'/> <model type='virtio'/> </interface> When libvirt sets up the interface connection, it will grab the config for network 'test', see that the forward mode is 'vepa', decide which physical ethernet to use, add in any extra stuff from the <portgroup>, and use that as the information for connection. In this manner, 1) it will remove the hardcoded device name from the domain config, making it possible to migrate the domain to other hardware, and 2) share a pool of physical devices over a group of domains. PROPOSAL ======== After I've determined which physical device to use, I need to save that information for as long as the domain is running, so that if libvirtd is restarted, it won't be lost (in some configs, only a single guest can use any particular netdev at a given time, so we want to be able to manage allocation of the devices without leaking any). My current idea is to save this in the domain <interface> XML that's put in the state directory, but make sure that it's never put into the XML returned by virsh dumpxml. What I'm thinking of is to add an <actual> subelement under <interface>, like this: <interface type='network'> <mac address='52:54:00:34:a5:aa'/> <source network='test' porgroup='engineering'/> <model type='virtio'/> <actual type='direct'/> <source dev='eth10' mode='vepa'/> <virtualport type='802.1Qbg'> <parameters managerid='33' typeid='89' typeidversion='3'/> </virtualport> </actual> </interface> This will be a private/internal thing used only within libvirt, however it does need to be stable, since it has to be understandable by a libvirtd that has started up while guests are running (eg during a libvirt upgrade). So I want to make sure I'm doing something reasonable. So, it is? Should <actual> contain *everything* from the parent interface, plus the items that are changed? Or should it contain only: * type attribute * source element * <bridge name=.../> (if applicable) * <virtualport> (and other items that might come from <portgroup> in the future (i.e. the things that have changed)? I *think* the answer is that it should just contain the items that have changed, and there should be a wrapper API around the virDomainNetDef object for retrieving things like type (if (def->actual) return def->actual.type; else return def->type; and similar) to make sure that all functions use the correct data.

1 0

[libvirt] [PATCH] tests: Add a general util test
by Matthias Bolte 01 Jul '11

01 Jul '11

Move non-esx specific tests from esxutilstest there and add a test for virParseVersionString. --- tests/.gitignore | 1 + tests/Makefile.am | 8 ++- tests/esxutilstest.c | 70 -------------------- tests/utiltest.c | 178 ++++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 186 insertions(+), 71 deletions(-) create mode 100644 tests/utiltest.c diff --git a/tests/.gitignore b/tests/.gitignore index 7f26dd7..32457ab 100644 --- a/tests/.gitignore +++ b/tests/.gitignore @@ -30,6 +30,7 @@ sockettest statstest storagepoolxml2xmltest storagevolxml2xmltest +utiltest virbuftest virnetmessagetest virnetsockettest diff --git a/tests/Makefile.am b/tests/Makefile.am index 4bea18e..30b2d95 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -84,7 +84,8 @@ EXTRA_DIST = \ check_PROGRAMS = virshtest conftest sockettest \ nodeinfotest qparamtest virbuftest \ commandtest commandhelper seclabeltest \ - hashtest virnetmessagetest virnetsockettest ssh + hashtest virnetmessagetest virnetsockettest ssh \ + utiltest # This is a fake SSH we use from virnetsockettest ssh_SOURCES = ssh.c @@ -202,6 +203,7 @@ TESTS = virshtest \ hashtest \ virnetmessagetest \ virnetsockettest \ + utiltest \ $(test_scripts) if HAVE_YAJL @@ -460,6 +462,10 @@ jsontest_SOURCES = \ jsontest.c testutils.h testutils.c jsontest_LDADD = $(LDADDS) +utiltest_SOURCES = \ + utiltest.c testutils.h testutils.c +utiltest_LDADD = $(LDADDS) + if WITH_LIBVIRTD eventtest_SOURCES = \ eventtest.c testutils.h testutils.c diff --git a/tests/esxutilstest.c b/tests/esxutilstest.c index 51c1e34..2097648 100644 --- a/tests/esxutilstest.c +++ b/tests/esxutilstest.c @@ -24,74 +24,6 @@ testQuietError(void *userData ATTRIBUTE_UNUSED, -static const char* names[] = { - "sda", "sdb", "sdc", "sdd", "sde", "sdf", "sdg", "sdh", "sdi", "sdj", "sdk", "sdl", "sdm", "sdn", "sdo", "sdp", "sdq", "sdr", "sds", "sdt", "sdu", "sdv", "sdw", "sdx", "sdy", "sdz", - "sdaa", "sdab", "sdac", "sdad", "sdae", "sdaf", "sdag", "sdah", "sdai", "sdaj", "sdak", "sdal", "sdam", "sdan", "sdao", "sdap", "sdaq", "sdar", "sdas", "sdat", "sdau", "sdav", "sdaw", "sdax", "sday", "sdaz", - "sdba", "sdbb", "sdbc", "sdbd", "sdbe", "sdbf", "sdbg", "sdbh", "sdbi", "sdbj", "sdbk", "sdbl", "sdbm", "sdbn", "sdbo", "sdbp", "sdbq", "sdbr", "sdbs", "sdbt", "sdbu", "sdbv", "sdbw", "sdbx", "sdby", "sdbz", - "sdca", "sdcb", "sdcc", "sdcd", "sdce", "sdcf", "sdcg", "sdch", "sdci", "sdcj", "sdck", "sdcl", "sdcm", "sdcn", "sdco", "sdcp", "sdcq", "sdcr", "sdcs", "sdct", "sdcu", "sdcv", "sdcw", "sdcx", "sdcy", "sdcz", - "sdda", "sddb", "sddc", "sddd", "sdde", "sddf", "sddg", "sddh", "sddi", "sddj", "sddk", "sddl", "sddm", "sddn", "sddo", "sddp", "sddq", "sddr", "sdds", "sddt", "sddu", "sddv", "sddw", "sddx", "sddy", "sddz", - "sdea", "sdeb", "sdec", "sded", "sdee", "sdef", "sdeg", "sdeh", "sdei", "sdej", "sdek", "sdel", "sdem", "sden", "sdeo", "sdep", "sdeq", "sder", "sdes", "sdet", "sdeu", "sdev", "sdew", "sdex", "sdey", "sdez", - "sdfa", "sdfb", "sdfc", "sdfd", "sdfe", "sdff", "sdfg", "sdfh", "sdfi", "sdfj", "sdfk", "sdfl", "sdfm", "sdfn", "sdfo", "sdfp", "sdfq", "sdfr", "sdfs", "sdft", "sdfu", "sdfv", "sdfw", "sdfx", "sdfy", "sdfz", - "sdga", "sdgb", "sdgc", "sdgd", "sdge", "sdgf", "sdgg", "sdgh", "sdgi", "sdgj", "sdgk", "sdgl", "sdgm", "sdgn", "sdgo", "sdgp", "sdgq", "sdgr", "sdgs", "sdgt", "sdgu", "sdgv", "sdgw", "sdgx", "sdgy", "sdgz", - "sdha", "sdhb", "sdhc", "sdhd", "sdhe", "sdhf", "sdhg", "sdhh", "sdhi", "sdhj", "sdhk", "sdhl", "sdhm", "sdhn", "sdho", "sdhp", "sdhq", "sdhr", "sdhs", "sdht", "sdhu", "sdhv", "sdhw", "sdhx", "sdhy", "sdhz", - "sdia", "sdib", "sdic", "sdid", "sdie", "sdif", "sdig", "sdih", "sdii", "sdij", "sdik", "sdil", "sdim", "sdin", "sdio", "sdip", "sdiq", "sdir", "sdis", "sdit", "sdiu", "sdiv", "sdiw", "sdix", "sdiy", "sdiz" -}; - -static int -testIndexToDiskName(const void *data ATTRIBUTE_UNUSED) -{ - int i; - char *name = NULL; - - for (i = 0; i < ARRAY_CARDINALITY(names); ++i) { - VIR_FREE(name); - - name = virIndexToDiskName(i, "sd"); - - if (STRNEQ(names[i], name)) { - virtTestDifference(stderr, names[i], name); - VIR_FREE(name); - - return -1; - } - } - - VIR_FREE(name); - - return 0; -} - -static int -testDiskNameToIndex(const void *data ATTRIBUTE_UNUSED) -{ - int i, k; - char *name = NULL; - - for (i = 0; i < 100000; ++i) { - VIR_FREE(name); - - name = virIndexToDiskName(i, "sd"); - k = virDiskNameToIndex(name); - - if (k != i) { - if (virTestGetDebug() > 0) { - fprintf(stderr, "\nExpect [%d]\n", i); - fprintf(stderr, "Actual [%d]\n", k); - } - - VIR_FREE(name); - - return -1; - } - } - - VIR_FREE(name); - - return 0; -} - - - struct testPath { const char *datastorePath; int result; @@ -336,8 +268,6 @@ mymain(void) } \ } while (0) - DO_TEST(IndexToDiskName); - DO_TEST(DiskNameToIndex); DO_TEST(ParseDatastorePath); DO_TEST(ConvertDateTimeToCalendarTime); DO_TEST(EscapeDatastoreItem); diff --git a/tests/utiltest.c b/tests/utiltest.c new file mode 100644 index 0000000..1b26b72 --- /dev/null +++ b/tests/utiltest.c @@ -0,0 +1,178 @@ +#include <config.h> + +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <unistd.h> + +#include "internal.h" +#include "memory.h" +#include "testutils.h" +#include "util.h" + + +static void +testQuietError(void *userData ATTRIBUTE_UNUSED, + virErrorPtr error ATTRIBUTE_UNUSED) +{ + /* nothing */ +} + + + +static const char* diskNames[] = { + "sda", "sdb", "sdc", "sdd", "sde", "sdf", "sdg", "sdh", "sdi", "sdj", "sdk", "sdl", "sdm", "sdn", "sdo", "sdp", "sdq", "sdr", "sds", "sdt", "sdu", "sdv", "sdw", "sdx", "sdy", "sdz", + "sdaa", "sdab", "sdac", "sdad", "sdae", "sdaf", "sdag", "sdah", "sdai", "sdaj", "sdak", "sdal", "sdam", "sdan", "sdao", "sdap", "sdaq", "sdar", "sdas", "sdat", "sdau", "sdav", "sdaw", "sdax", "sday", "sdaz", + "sdba", "sdbb", "sdbc", "sdbd", "sdbe", "sdbf", "sdbg", "sdbh", "sdbi", "sdbj", "sdbk", "sdbl", "sdbm", "sdbn", "sdbo", "sdbp", "sdbq", "sdbr", "sdbs", "sdbt", "sdbu", "sdbv", "sdbw", "sdbx", "sdby", "sdbz", + "sdca", "sdcb", "sdcc", "sdcd", "sdce", "sdcf", "sdcg", "sdch", "sdci", "sdcj", "sdck", "sdcl", "sdcm", "sdcn", "sdco", "sdcp", "sdcq", "sdcr", "sdcs", "sdct", "sdcu", "sdcv", "sdcw", "sdcx", "sdcy", "sdcz", + "sdda", "sddb", "sddc", "sddd", "sdde", "sddf", "sddg", "sddh", "sddi", "sddj", "sddk", "sddl", "sddm", "sddn", "sddo", "sddp", "sddq", "sddr", "sdds", "sddt", "sddu", "sddv", "sddw", "sddx", "sddy", "sddz", + "sdea", "sdeb", "sdec", "sded", "sdee", "sdef", "sdeg", "sdeh", "sdei", "sdej", "sdek", "sdel", "sdem", "sden", "sdeo", "sdep", "sdeq", "sder", "sdes", "sdet", "sdeu", "sdev", "sdew", "sdex", "sdey", "sdez", + "sdfa", "sdfb", "sdfc", "sdfd", "sdfe", "sdff", "sdfg", "sdfh", "sdfi", "sdfj", "sdfk", "sdfl", "sdfm", "sdfn", "sdfo", "sdfp", "sdfq", "sdfr", "sdfs", "sdft", "sdfu", "sdfv", "sdfw", "sdfx", "sdfy", "sdfz", + "sdga", "sdgb", "sdgc", "sdgd", "sdge", "sdgf", "sdgg", "sdgh", "sdgi", "sdgj", "sdgk", "sdgl", "sdgm", "sdgn", "sdgo", "sdgp", "sdgq", "sdgr", "sdgs", "sdgt", "sdgu", "sdgv", "sdgw", "sdgx", "sdgy", "sdgz", + "sdha", "sdhb", "sdhc", "sdhd", "sdhe", "sdhf", "sdhg", "sdhh", "sdhi", "sdhj", "sdhk", "sdhl", "sdhm", "sdhn", "sdho", "sdhp", "sdhq", "sdhr", "sdhs", "sdht", "sdhu", "sdhv", "sdhw", "sdhx", "sdhy", "sdhz", + "sdia", "sdib", "sdic", "sdid", "sdie", "sdif", "sdig", "sdih", "sdii", "sdij", "sdik", "sdil", "sdim", "sdin", "sdio", "sdip", "sdiq", "sdir", "sdis", "sdit", "sdiu", "sdiv", "sdiw", "sdix", "sdiy", "sdiz" +}; + +static int +testIndexToDiskName(const void *data ATTRIBUTE_UNUSED) +{ + int i; + char *diskName = NULL; + + for (i = 0; i < ARRAY_CARDINALITY(diskNames); ++i) { + VIR_FREE(diskName); + + diskName = virIndexToDiskName(i, "sd"); + + if (STRNEQ(diskNames[i], diskName)) { + virtTestDifference(stderr, diskNames[i], diskName); + VIR_FREE(diskName); + + return -1; + } + } + + VIR_FREE(diskName); + + return 0; +} + + + +static int +testDiskNameToIndex(const void *data ATTRIBUTE_UNUSED) +{ + int i, k; + char *diskName = NULL; + + for (i = 0; i < 100000; ++i) { + VIR_FREE(diskName); + + diskName = virIndexToDiskName(i, "sd"); + k = virDiskNameToIndex(diskName); + + if (k != i) { + if (virTestGetDebug() > 0) { + fprintf(stderr, "\nExpect [%d]\n", i); + fprintf(stderr, "Actual [%d]\n", k); + } + + VIR_FREE(diskName); + + return -1; + } + } + + VIR_FREE(diskName); + + return 0; +} + + + +struct testVersionString +{ + const char *string; + bool allowMissing; + int result; + unsigned long version; +}; + +static struct testVersionString versions[] = { + { "2.6.38-8-generic", false, 0, 1000000 * 2 + 1000 * 6 + 38 }, + { "3.0-1-virtual", true, 0, 1000000 * 3 + 1000 * 0 + 0 }, + { "5", true, 0, 1000000 * 5 + 1000 * 0 + 0 }, + { "4.1.0", false, 0, 1000000 * 4 + 1000 * 1 + 0 }, + { "12.345.678", false, 0, 1000000 * 12 + 1000 * 345 + 678 }, + { "1.234.5678", false, -1, 0 }, + { "1.2345.678", false, -1, 0 }, + { "12345.6.78", false, -1, 0 }, + { "123456789", true, -1, 0 }, + { "3.0-2-virtual", false, -1, 0 }, + { "no-number-here", false, -1, 0 }, +}; + +static int +testParseVersionString(const void *data ATTRIBUTE_UNUSED) +{ + int i, result; + unsigned long version; + + for (i = 0; i < ARRAY_CARDINALITY(versions); ++i) { + result = virParseVersionString(versions[i].string, &version, + versions[i].allowMissing); + + if (result != versions[i].result) { + if (virTestGetDebug() > 0) { + fprintf(stderr, "\nVersion string [%s]\n", versions[i].string); + fprintf(stderr, "Expect result [%d]\n", versions[i].result); + fprintf(stderr, "Actual result [%d]\n", result); + } + + return -1; + } + + if (result < 0) { + continue; + } + + if (version != versions[i].version) { + if (virTestGetDebug() > 0) { + fprintf(stderr, "\nVersion string [%s]\n", versions[i].string); + fprintf(stderr, "Expect version [%lu]\n", versions[i].version); + fprintf(stderr, "Actual version [%lu]\n", version); + } + + return -1; + } + } + + return 0; +} + + + + +static int +mymain(void) +{ + int result = 0; + + virSetErrorFunc(NULL, testQuietError); + + #define DO_TEST(_name) \ + do { \ + if (virtTestRun("Util "#_name, 1, test##_name, \ + NULL) < 0) { \ + result = -1; \ + } \ + } while (0) + + DO_TEST(IndexToDiskName); + DO_TEST(DiskNameToIndex); + DO_TEST(ParseVersionString); + + return result == 0 ? EXIT_SUCCESS : EXIT_FAILURE; +} + +VIRT_TEST_MAIN(mymain) -- 1.7.4.1

2 2

[libvirt] [PATCH] fix virParseVersionString with linux 3.0
by Scott Moser 01 Jul '11

01 Jul '11

linux 3.0 has no micro version number, and that is causing problems for virParseVersionString. The patch below should allow for: major major.minor major.minor.micro If major or minor are not present they just default to zero. We found this in Ubuntu (https://bugs.launchpad.net/bugs/802977) diff --git a/src/util/util.c b/src/util/util.c index 463d2b8..01848a1 100644 --- a/src/util/util.c +++ b/src/util/util.c @@ -1598,17 +1598,17 @@ virParseNumber(const char **str) int virParseVersionString(const char *str, unsigned long *version) { - unsigned int major, minor, micro; + unsigned int major, minor=0, micro=0; char *tmp; - if (virStrToLong_ui(str, &tmp, 10, &major) < 0 || *tmp != '.') + if (virStrToLong_ui(str, &tmp, 10, &major) < 0) return -1; - if (virStrToLong_ui(tmp + 1, &tmp, 10, &minor) < 0 || *tmp != '.') - return -1; + if ((*tmp == '.') && virStrToLong_ui(tmp + 1, &tmp, 10, &minor) < 0) + return -1; - if (virStrToLong_ui(tmp + 1, &tmp, 10, &micro) < 0) - return -1; + if ((*tmp == '.') && virStrToLong_ui(tmp + 1, &tmp, 10, &micro) < 0) + return -1; *version = 1000000 * major + 1000 * minor + micro;

3 9

[libvirt] [PATCHv2] build: consistently use CFLAGS
by Eric Blake 01 Jul '11

01 Jul '11

According to the automake manual, CPPFLAGS (aka INCLUDES, as spelled in automake 1.9.6) should only include -I, -D, and -U directives; more generic directives like -Wall belong in CFLAGS since they affect more phases of the build process. Therefore, we should be sticking CFLAGS additions into a CFLAGS container, not a CPPFLAGS container. * src/Makefile.am (INCLUDES): Move CFLAGS items... (AM_CFLAGS): ...to their proper location. * python/Makefile.am (INCLUDES, AM_CFLAGS): Likewise. * tests/Makefile.am (INCLUDES, AM_CFLAGS): Likewise. --- v1 had no review: https://www.redhat.com/archives/libvir-list/2011-May/msg01934.html changes from v1: rebase to latest I tested it on top of these two patches, hopefully they'll be ack'd first: https://www.redhat.com/archives/libvir-list/2011-June/msg01537.html https://www.redhat.com/archives/libvir-list/2011-June/msg01486.html python/Makefile.am | 5 +++-- src/Makefile.am | 15 +++++++-------- tests/Makefile.am | 8 +++++--- 3 files changed, 15 insertions(+), 13 deletions(-) diff --git a/python/Makefile.am b/python/Makefile.am index 432ad70..0edb3e4 100644 --- a/python/Makefile.am +++ b/python/Makefile.am @@ -3,12 +3,13 @@ SUBDIRS= . tests INCLUDES = \ - $(WARN_CFLAGS) \ - $(PYTHON_INCLUDES) \ + $(PYTHON_INCLUDES) \ -I$(top_srcdir)/include \ -I$(top_builddir)/include \ -I$(top_builddir)/$(subdir) +AM_CFLAGS = $(WARN_CFLAGS) + DOCS_DIR = $(datadir)/doc/libvirt-python-$(LIBVIRT_VERSION) DOCS = ${srcdir}/TODO diff --git a/src/Makefile.am b/src/Makefile.am index 4ba3ea7..10ee20a 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -3,20 +3,19 @@ # No libraries with the exception of LIBXML should be listed # here. List them against the individual XXX_la_CFLAGS targets # that actually use them -INCLUDES = \ - -I$(top_srcdir)/gnulib/lib \ +INCLUDES = -I$(top_srcdir)/gnulib/lib \ -I../gnulib/lib \ -I../include \ -I@top_srcdir@/src/util \ -I@top_srcdir@/include \ - $(DRIVER_MODULE_CFLAGS) \ + -DIN_LIBVIRT + +AM_CFLAGS = $(DRIVER_MODULE_CFLAGS) \ $(LIBXML_CFLAGS) \ $(WARN_CFLAGS) \ - $(LOCK_CHECKING_CFLAGS) \ - -DIN_LIBVIRT \ - $(WIN32_EXTRA_CFLAGS) - -AM_CFLAGS = $(COVERAGE_CFLAGS) + $(LOCK_CHECKING_CFLAGS) \ + $(WIN32_EXTRA_CFLAGS) \ + $(COVERAGE_CFLAGS) AM_LDFLAGS = $(COVERAGE_LDFLAGS) EXTRA_DIST = $(conf_DATA) diff --git a/tests/Makefile.am b/tests/Makefile.am index 38a353f..984d8fd 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -8,15 +8,17 @@ INCLUDES = \ -I$(top_srcdir)/include \ -I$(top_srcdir)/src \ -I$(top_srcdir)/src/util \ - -I$(top_srcdir)/src/conf \ + -I$(top_srcdir)/src/conf + +AM_CFLAGS = \ $(LIBXML_CFLAGS) \ $(GNUTLS_CFLAGS) \ $(SASL_CFLAGS) \ $(SELINUX_CFLAGS) \ $(APPARMOR_CFLAGS) \ $(YAJL_CFLAGS) \ - $(COVERAGE_CFLAGS) \ - $(WARN_CFLAGS) + $(COVERAGE_CFLAGS) \ + $(WARN_CFLAGS) if WITH_DRIVER_MODULES INCLUDES += \ -- 1.7.4.4

2 5

[libvirt] [PATCH] build: remove dead variables
by Eric Blake 01 Jul '11

01 Jul '11

Detected by Coverity. No real harm in leaving these, but fixing them cuts down on the noise for future analysis. * src/rpc/virnetserver.c (virNetServerAddService): Delete unused entry. * src/util/sysinfo.c (virSysinfoRead): Delete dead assignment to base. --- src/rpc/virnetserver.c | 7 +++---- src/util/sysinfo.c | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/rpc/virnetserver.c b/src/rpc/virnetserver.c index 0ef81fd..5e1719b 100644 --- a/src/rpc/virnetserver.c +++ b/src/rpc/virnetserver.c @@ -529,11 +529,10 @@ int virNetServerAddService(virNetServerPtr srv, #if HAVE_AVAHI if (mdnsEntryName) { int port = virNetServerServiceGetPort(svc); - virNetServerMDNSEntryPtr entry; - if (!(entry = virNetServerMDNSAddEntry(srv->mdnsGroup, - mdnsEntryName, - port))) + if (!virNetServerMDNSAddEntry(srv->mdnsGroup, + mdnsEntryName, + port)) goto error; } #endif diff --git a/src/util/sysinfo.c b/src/util/sysinfo.c index f4edde9..eec996b 100644 --- a/src/util/sysinfo.c +++ b/src/util/sysinfo.c @@ -472,7 +472,7 @@ virSysinfoRead(void) { ret->nmemory = 0; ret->memory = NULL; - if ((base = virSysinfoParseMemory(base, ret)) == NULL) + if (virSysinfoParseMemory(base, ret) == NULL) goto no_memory; cleanup: -- 1.7.4.4

2 2

[libvirt] [Libvirt-test-API][PATCH 1/6] add createWithFlags() API and modify migrate() function to align with libvirt Python migration definition
by Guannan.ren 01 Jul '11

01 Jul '11

--- lib/domainAPI.py | 57 ++++++++++++++++++++++++++++++++++++------------------ 1 files changed, 38 insertions(+), 19 deletions(-) diff --git a/lib/domainAPI.py b/lib/domainAPI.py index 0c725f8..5667c20 100644 --- a/lib/domainAPI.py +++ b/lib/domainAPI.py @@ -40,18 +40,6 @@ append_path(result.group(0)) import exception -# DomainMigrateFlags -VIR_MIGRATE_LIVE = 1 - -# DomainState -VIR_DOMAIN_NOSTATE = 0 -VIR_DOMAIN_RUNNING = 1 -VIR_DOMAIN_BLOCKED = 2 -VIR_DOMAIN_PAUSED = 3 -VIR_DOMAIN_SHUTDOWN = 4 -VIR_DOMAIN_SHUTOFF = 5 -VIR_DOMAIN_CRASHED = 6 - class DomainAPI(object): def __init__(self, connection): self.conn = connection @@ -182,6 +170,16 @@ class DomainAPI(object): code = e.get_error_code() raise exception.LibvirtAPI(message, code) + def start_with_flags(self, domname, flags = 0): + try: + dom_obj = self.get_defined_obj(domname) + retval = dom_obj.createWithFlags(flags) + return retval + except libvirt.libvirtError, e: + message = e.get_error_message() + code = e.get_error_code() + raise exception.LibvirtAPI(message, code) + def suspend(self, domname): try: dom_obj = self.get_domain_by_name(domname) @@ -223,10 +221,10 @@ class DomainAPI(object): code = e.get_error_code() raise exception.LibvirtAPI(message, code) - def migrate(self, domname, dconn, flags = VIR_MIGRATE_LIVE): + def migrate(self, domname, dconn, flags, dname = None, uri = None, bandwidth = 0): try: dom_obj = self.get_domain_by_name(domname) - retval = dom_obj.migrate(dconn, flags, None, None, 0) + retval = dom_obj.migrate(dconn, flags, dname, uri, 0) return retval except libvirt.libvirtError, e: message = e.get_error_message() @@ -484,7 +482,7 @@ class DomainAPI(object): dom_obj = self.get_domain_by_name(domname) state = dom_obj.info() if state[0] == VIR_DOMAIN_NOSTATE: - dom_state = 'no state' + dom_state = 'nostate' elif state[0] == VIR_DOMAIN_RUNNING: dom_state = 'running' elif state[0] == VIR_DOMAIN_BLOCKED: @@ -581,7 +579,7 @@ class DomainAPI(object): code = e.get_error_code() raise exception.LibvirtAPI(message, code) - def isActive(self, domname): + def is_active(self, domname): try: dom_obj = self.get_domain_by_name(domname) return dom_obj.isActive() @@ -590,7 +588,7 @@ class DomainAPI(object): code = e.get_error_code() raise exception.LibvirtAPI(message, code) - def isPersistent(self, domname): + def is_persistent(self, domname): try: dom_obj = self.get_domain_by_name(domname) return dom_obj.isPersistent() @@ -662,10 +660,10 @@ class DomainAPI(object): code = e.get_error_code() raise exception.LibvirtAPI(message, code) - def migrate_to_uri(self, domname, duri, dname, bandwidth, flag = 0): + def migrate_to_uri(self, domname, duri, flags, dname = None, bandwidth = 0): try: dom_obj = self.get_domain_by_name(domname) - return dom_obj.migrateToURI(duri, dname, bandwidth, flag) + return dom_obj.migrateToURI(duri, flags, dname, bandwidth) except libvirt.libvirtError, e: message = e.get_error_message() code = e.get_error_code() @@ -761,3 +759,24 @@ class DomainAPI(object): code = e.get_error_code() raise exception.LibvirtAPI(message, code) + +# DomainState +VIR_DOMAIN_NOSTATE = 0 +VIR_DOMAIN_RUNNING = 1 +VIR_DOMAIN_BLOCKED = 2 +VIR_DOMAIN_PAUSED = 3 +VIR_DOMAIN_SHUTDOWN = 4 +VIR_DOMAIN_SHUTOFF = 5 +VIR_DOMAIN_CRASHED = 6 + + +# virDomainMigrateFlags +VIR_MIGRATE_LIVE = 1 +VIR_MIGRATE_PEER2PEER = 2 +VIR_MIGRATE_TUNNELLED = 4 +VIR_MIGRATE_PERSIST_DEST = 8 +VIR_MIGRATE_UNDEFINE_SOURCE = 16 +VIR_MIGRATE_PAUSED = 32 +VIR_MIGRATE_NON_SHARED_DISK = 64 +VIR_MIGRATE_NON_SHARED_INC = 128 + -- 1.7.1

4 12

[libvirt] PPPoE-Server problem
by B Veera-B37207 01 Jul '11

01 Jul '11

HI, I am using Libvirt with LXC as hypervisor. When I am starting pppoe-server , unable to create ppp0 interface in Virtual machine, it is unable to serve ips to clients. Let me know is there any plug-in for this (Or) What is the solution. Regards, Veera.

1 0

[libvirt] [PATCH] Add test case for parsing JSON docs
by Daniel P. Berrange 01 Jul '11

01 Jul '11

While investigating some memory leaks it was unclear whether the JSON code correctly free'd all memory during parsing. Add a test case which can be run under valgrind to clearly demonstrate that the parser is leak free. * tests/Makefile.am: Add 'jsontest' * tests/jsontest.c: A few simple JSON parsing tests --- tests/Makefile.am | 14 +++++++ tests/jsontest.c | 111 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 125 insertions(+), 0 deletions(-) create mode 100644 tests/jsontest.c diff --git a/tests/Makefile.am b/tests/Makefile.am index 7db9d1f..3bde22e 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -14,6 +14,7 @@ INCLUDES = \ $(SASL_CFLAGS) \ $(SELINUX_CFLAGS) \ $(APPARMOR_CFLAGS) \ + $(YAJL_CFLAGS) \ $(COVERAGE_CFLAGS) \ $(WARN_CFLAGS) @@ -29,6 +30,7 @@ LDADDS = \ $(SASL_LIBS) \ $(SELINUX_LIBS) \ $(APPARMOR_LIBS) \ + $(YAJL_LIBS) \ $(WARN_CFLAGS) \ ../src/libvirt_test.la \ ../gnulib/lib/libgnu.la \ @@ -112,6 +114,10 @@ if WITH_CIL check_PROGRAMS += object-locking endif +if HAVE_YAJL +check_PROGRAMS += jsontest +endif + check_PROGRAMS += networkxml2xmltest check_PROGRAMS += networkxml2argvtest @@ -195,6 +201,10 @@ TESTS = virshtest \ virnetsockettest \ $(test_scripts) +if HAVE_YAJL +TESTS += jsontest +endif + if WITH_XEN TESTS += xml2sexprtest \ sexpr2xmltest \ @@ -443,6 +453,10 @@ hashtest_SOURCES = \ hashtest.c hashdata.h testutils.h testutils.c hashtest_LDADD = $(LDADDS) +jsontest_SOURCES = \ + jsontest.c jsondata.h testutils.h testutils.c +jsontest_LDADD = $(LDADDS) + if WITH_LIBVIRTD eventtest_SOURCES = \ eventtest.c testutils.h testutils.c diff --git a/tests/jsontest.c b/tests/jsontest.c new file mode 100644 index 0000000..412f475 --- /dev/null +++ b/tests/jsontest.c @@ -0,0 +1,111 @@ +#include <config.h> + +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <time.h> + +#include "internal.h" +#include "json.h" +#include "testutils.h" + +struct testInfo { + const char *doc; + bool pass; +}; + + +static int +testJSONFromString(const void *data) +{ + const struct testInfo *info = data; + virJSONValuePtr json; + int ret = -1; + + json = virJSONValueFromString(info->doc); + + if (info->pass) { + if (!json) { + if (virTestGetVerbose()) + fprintf(stderr, "Fail to parse %s\n", info->doc); + ret = -1; + goto cleanup; + } else { + if (virTestGetDebug()) + fprintf(stderr, "Parsed %s\n", info->doc); + } + } else { + if (json) { + if (virTestGetVerbose()) + fprintf(stderr, "Should not have parsed %s\n", info->doc); + ret = -1; + goto cleanup; + } else { + if (virTestGetDebug()) + fprintf(stderr, "Fail to parse %s\n", info->doc); + } + } + + ret = 0; + +cleanup: + virJSONValueFree(json); + return ret; +} + + +static int +mymain(void) +{ + int ret = 0; + +#define DO_TEST_FULL(name, cmd, doc, pass) \ + do { \ + struct testInfo info = { doc, pass }; \ + if (virtTestRun(name, 1, testJSON ## cmd, &info) < 0) \ + ret = -1; \ + } while (0) + +#define DO_TEST_PARSE(name, doc) \ + DO_TEST_FULL(name, FromString, doc, true) + + DO_TEST_PARSE("Simple", "{\"return\": {}, \"id\": \"libvirt-1\"}"); + DO_TEST_PARSE("NotSoSimple", "{\"QMP\": {\"version\": {\"qemu\":" + "{\"micro\": 91, \"minor\": 13, \"major\": 0}," + "\"package\": \" (qemu-kvm-devel)\"}, \"capabilities\": []}}"); + + + DO_TEST_PARSE("Harder", "{\"return\": [{\"filename\": " + "\"unix:/home/berrange/.libvirt/qemu/lib/tck.monitor,server\"," + "\"label\": \"charmonitor\"}, {\"filename\": \"pty:/dev/pts/158\"," + "\"label\": \"charserial0\"}], \"id\": \"libvirt-3\"}"); + + DO_TEST_PARSE("VeryHard", "{\"return\": [{\"name\": \"quit\"}, {\"name\":" + "\"eject\"}, {\"name\": \"change\"}, {\"name\": \"screendump\"}," + "{\"name\": \"stop\"}, {\"name\": \"cont\"}, {\"name\": " + "\"system_reset\"}, {\"name\": \"system_powerdown\"}, " + "{\"name\": \"device_add\"}, {\"name\": \"device_del\"}, " + "{\"name\": \"cpu\"}, {\"name\": \"memsave\"}, {\"name\": " + "\"pmemsave\"}, {\"name\": \"migrate\"}, {\"name\": " + "\"migrate_cancel\"}, {\"name\": \"migrate_set_speed\"}," + "{\"name\": \"client_migrate_info\"}, {\"name\": " + "\"migrate_set_downtime\"}, {\"name\": \"netdev_add\"}, " + "{\"name\": \"netdev_del\"}, {\"name\": \"block_resize\"}," + "{\"name\": \"balloon\"}, {\"name\": \"set_link\"}, {\"name\":" + "\"getfd\"}, {\"name\": \"closefd\"}, {\"name\": \"block_passwd\"}," + "{\"name\": \"set_password\"}, {\"name\": \"expire_password\"}," + "{\"name\": \"qmp_capabilities\"}, {\"name\": " + "\"human-monitor-command\"}, {\"name\": \"query-version\"}," + "{\"name\": \"query-commands\"}, {\"name\": \"query-chardev\"}," + "{\"name\": \"query-block\"}, {\"name\": \"query-blockstats\"}, " + "{\"name\": \"query-cpus\"}, {\"name\": \"query-pci\"}, {\"name\":" + "\"query-kvm\"}, {\"name\": \"query-status\"}, {\"name\": " + "\"query-mice\"}, {\"name\": \"query-vnc\"}, {\"name\": " + "\"query-spice\"}, {\"name\": \"query-name\"}, {\"name\": " + "\"query-uuid\"}, {\"name\": \"query-migrate\"}, {\"name\": " + "\"query-balloon\"}], \"id\": \"libvirt-2\"}"); + + return (ret == 0) ? EXIT_SUCCESS : EXIT_FAILURE; +} + +VIRT_TEST_MAIN(mymain) -- 1.7.4.4

3 2

[libvirt] network filters not working at all in 0.9.2
by xxyton 01 Jul '11

01 Jul '11

Hi there, is just upgraded to libvirt 0.9.2 and restarted my domains but now all network filters are gone. Why does libvirt not set iptables configuration while filterref clause exists? Is this a known bug? How can I fix it. Restarting / redefining doesn't output any errors. Example config XML of domain: ... <filterref filter='clean-traffic'> <parameter name='IP' value='192.168.2.34'/> </filterref> ... # virsh -v 0.9.2 # iptables -L Chain INPUT (policy ACCEPT) target prot opt source destination ACCEPT udp -- anywhere anywhere udp dpt:domain ACCEPT tcp -- anywhere anywhere tcp dpt:domain ACCEPT udp -- anywhere anywhere udp dpt:bootps ACCEPT tcp -- anywhere anywhere tcp dpt:bootps Chain FORWARD (policy ACCEPT) target prot opt source destination ACCEPT all -- anywhere 192.168.122.0/24 state RELATED,ESTABLISHED ACCEPT all -- 192.168.122.0/24 anywhere ACCEPT all -- anywhere anywhere REJECT all -- anywhere anywhere reject-with icmp-port-unreachable REJECT all -- anywhere anywhere reject-with icmp-port-unreachable Chain OUTPUT (policy ACCEPT) target prot opt source destination

2 1

[libvirt] [PATCH] build: simplify sanlock distribution
by Eric Blake 30 Jun '11

30 Jun '11

EXTRA_DIST is intended for files that must unconditionally be part of the tarball, so it should be outside HAVE_SANLOCK. Once that is fixed, then there is no need to cp an unchanged qemu-sanlock.conf from srcdir to builddir in a VPATH build, not to mention that $(builddir) is not supported in the automake in use in RHEL 5. * src/Makefile.am ($(builddir)/locking/%-sanlock.conf): Delete. (BUILT_SOURCES): No need to build qemu-sanlock.conf. (EXTRA_DIST): Always ship sanlock .aug and .conf files. --- As promised in: https://www.redhat.com/archives/libvir-list/2011-June/msg01448.html I'm starting a 'make distcheck' overnight to fully test this, but think that it will pass without issues. src/Makefile.am | 15 +++++---------- 1 files changed, 5 insertions(+), 10 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 8f99cc2..bfbaa06 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1186,6 +1186,10 @@ libvirt_qemu_la_LIBADD = libvirt.la $(CYGWIN_EXTRA_LIBADD) EXTRA_DIST += $(LIBVIRT_QEMU_SYMBOL_FILE) +EXTRA_DIST += locking/sanlock.conf \ + locking/libvirt_sanlock.aug \ + locking/test_libvirt_sanlock.aug + if HAVE_SANLOCK lockdriverdir = $(libdir)/libvirt/lock-driver lockdriver_LTLIBRARIES = sanlock.la @@ -1199,20 +1203,11 @@ sanlock_la_LIBADD = -lsanlock \ augeas_DATA += locking/libvirt_sanlock.aug augeastest_DATA += locking/test_libvirt_sanlock.aug -EXTRA_DIST += locking/sanlock.conf \ - locking/libvirt_sanlock.aug \ - locking/test_libvirt_sanlock.aug - -$(builddir)/locking/%-sanlock.conf: $(srcdir)/locking/sanlock.conf - $(AM_V_GEN)mkdir locking ; \ - cp $< $@ - if WITH_QEMU conf_DATA += locking/qemu-sanlock.conf -BUILT_SOURCES += locking/qemu-sanlock.conf endif else -EXTRA_DIST += $(LOCK_DRIVER_SANLOCK_SOURCES) locking/sanlock.conf +EXTRA_DIST += $(LOCK_DRIVER_SANLOCK_SOURCES) endif noinst_LTLIBRARIES += libvirt-net-rpc.la libvirt-net-rpc-server.la libvirt-net-rpc-client.la -- 1.7.4.4

4 6

[libvirt] [PATCH] build: allow 'make syntax-check' on fresh checkout
by Eric Blake 30 Jun '11

30 Jun '11

For good or for bad, I did a fresh checkout, ./autogen.sh, then 'configure', then 'make syntax-check', and was surprised that it failed. Running 'make' before 'make syntax-check' cleaned up the issue, but this patch makes it work up front. * cfg.mk (sc_po_check): Add prerequisite. --- I debated about pushing this one, but couldn't quite bring myself to call it a build-breaker. However, if it gets an ACK, I see no negative effects to pushing before 0.9.3. cfg.mk | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/cfg.mk b/cfg.mk index 69f35a3..fa9ea1c 100644 --- a/cfg.mk +++ b/cfg.mk @@ -605,6 +605,11 @@ _autogen: # regenerate HACKING as part of the syntax-check syntax-check: $(top_srcdir)/HACKING +# sc_po_check can fail if generated files are not built first +sc_po_check: daemon/remote_dispatch.h +daemon/remote_dispatch.h: + $(MAKE) -C daemon remote_dispatch.h + # List all syntax-check exemptions: exclude_file_name_regexp--sc_avoid_strcase = ^tools/virsh\.c$$ -- 1.7.4.4

2 4

[libvirt] [PATCH] build: ignore generated file
by Eric Blake 30 Jun '11

30 Jun '11

* .gitignore: Exempt jsontest binary. --- Pushing under the trivial rule. .gitignore | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore index be4193d..1bfb7b9 100644 --- a/.gitignore +++ b/.gitignore @@ -57,6 +57,7 @@ /tests/*.log /tests/cputest /tests/hashtest +/tests/jsontest /tests/networkxml2argvtest /tests/nwfilterxml2xmltest /tests/openvzutilstest -- 1.7.4.4

1 0

[libvirt] [PATCH 0/4] several Coverity fixes
by Eric Blake 30 Jun '11

30 Jun '11

I ran Coverity on the state of yesterday's git; while I have not finished reading through all the findings, I figured I'd get some review started on these. Eric Blake (4): virsh: avoid integer overflow virsh: avoid uninitialized variable rpc: avoid freeing uninitialized variable build: avoid double-close bug with pipe2 .gnulib | 2 +- src/rpc/virnetclient.c | 2 +- src/rpc/virnetsocket.c | 4 ++-- tools/virsh.c | 7 +++++-- 4 files changed, 9 insertions(+), 6 deletions(-) -- 1.7.4.4

2 9

[libvirt] [PATCH] Add conditionals to allow build without SASL
by Daniel P. Berrange 30 Jun '11

30 Jun '11

* daemon/libvirtd.c, daemon/remote.c: Add #if HAVE_SASL and suitable function stubs to allow build without SASL --- daemon/libvirtd.c | 6 ++++++ daemon/remote.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 50 insertions(+), 0 deletions(-) diff --git a/daemon/libvirtd.c b/daemon/libvirtd.c index 118aa92..60ee705 100644 --- a/daemon/libvirtd.c +++ b/daemon/libvirtd.c @@ -91,7 +91,9 @@ #include "configmake.h" +#if HAVE_SASL virNetSASLContextPtr saslCtxt = NULL; +#endif virNetServerProgramPtr remoteProgram = NULL; virNetServerProgramPtr qemuProgram = NULL; @@ -560,6 +562,7 @@ static int daemonSetupNetworking(virNetServerPtr srv, } } +#if HAVE_SASL if (config->auth_unix_rw == REMOTE_AUTH_SASL || config->auth_unix_ro == REMOTE_AUTH_SASL || config->auth_tcp == REMOTE_AUTH_SASL || @@ -569,6 +572,7 @@ static int daemonSetupNetworking(virNetServerPtr srv, if (!saslCtxt) goto error; } +#endif #if HAVE_POLKIT0 if (auth_unix_rw == REMOTE_AUTH_POLKIT || @@ -745,8 +749,10 @@ static int remoteConfigGetAuth(virConfPtr conf, const char *key, int *auth, cons if (STREQ(p->str, "none")) { *auth = VIR_NET_SERVER_SERVICE_AUTH_NONE; +#if HAVE_SASL } else if (STREQ(p->str, "sasl")) { *auth = VIR_NET_SERVER_SERVICE_AUTH_SASL; +#endif } else if (STREQ(p->str, "polkit")) { *auth = VIR_NET_SERVER_SERVICE_AUTH_POLKIT; } else { diff --git a/daemon/remote.c b/daemon/remote.c index 9e6cf77..2889908 100644 --- a/daemon/remote.c +++ b/daemon/remote.c @@ -1653,6 +1653,7 @@ cleanup: } +#ifdef HAVE_SASL /* * Initializes the SASL session in prepare for authentication * and gives the client a list of allowed mechanisms to choose @@ -1969,6 +1970,49 @@ error: virMutexUnlock(&priv->lock); return -1; } +#else +static int +remoteDispatchAuthSaslInit(virNetServerPtr server ATTRIBUTE_UNUSED, + virNetServerClientPtr client ATTRIBUTE_UNUSED, + virNetMessageHeaderPtr hdr ATTRIBUTE_UNUSED, + virNetMessageErrorPtr rerr, + remote_auth_sasl_init_ret *ret ATTRIBUTE_UNUSED) +{ + VIR_WARN("Client tried unsupported SASL auth"); + virNetError(VIR_ERR_AUTH_FAILED, "%s", + _("authentication failed")); + virNetMessageSaveError(rerr); + return -1; +} +static int +remoteDispatchAuthSaslStart(virNetServerPtr server ATTRIBUTE_UNUSED, + virNetServerClientPtr client ATTRIBUTE_UNUSED, + virNetMessageHeaderPtr hdr ATTRIBUTE_UNUSED, + virNetMessageErrorPtr rerr, + remote_auth_sasl_start_args *args ATTRIBUTE_UNUSED, + remote_auth_sasl_start_ret *ret ATTRIBUTE_UNUSED) +{ + VIR_WARN("Client tried unsupported SASL auth"); + virNetError(VIR_ERR_AUTH_FAILED, "%s", + _("authentication failed")); + virNetMessageSaveError(rerr); + return -1; +} +static int +remoteDispatchAuthSaslStep(virNetServerPtr server ATTRIBUTE_UNUSED, + virNetServerClientPtr client ATTRIBUTE_UNUSED, + virNetMessageHeaderPtr hdr ATTRIBUTE_UNUSED, + virNetMessageErrorPtr rerr, + remote_auth_sasl_step_args *args ATTRIBUTE_UNUSED, + remote_auth_sasl_step_ret *ret ATTRIBUTE_UNUSED) +{ + VIR_WARN("Client tried unsupported SASL auth"); + virNetError(VIR_ERR_AUTH_FAILED, "%s", + _("authentication failed")); + virNetMessageSaveError(rerr); + return -1; +} +#endif -- 1.7.4.4

4 3

[libvirt] SIGTERM undeclared, virNetSocketFree
by Jason Helfman 30 Jun '11

30 Jun '11

Hi, I get this error when compiling 0.9.3-rc2 on FreeBSD. Is there a fix for this? rpc/virnetsocket.c: In function 'virNetSocketFree': rpc/virnetsocket.c:654: warning: implicit declaration of function 'kill' rpc/virnetsocket.c:654: warning: nested extern declaration of 'kill' [-Wnested-externs] rpc/virnetsocket.c:654: error: 'SIGTERM' undeclared (first use in this function) rpc/virnetsocket.c:654: error: (Each undeclared identifier is reported only once rpc/virnetsocket.c:654: error: for each function it appears in.) gmake[3]: *** [libvirt_net_rpc_la-virnetsocket.lo] Error 1 gmake[3]: Leaving directory `/home/jhelfman/ports/devel/libvirt/work/libvirt-0.9.3/src' gmake[2]: *** [all] Error 2 gmake[2]: Leaving directory `/home/jhelfman/ports/devel/libvirt/work/libvirt-0.9.3/src' gmake[1]: *** [all-recursive] Error 1 gmake[1]: Leaving directory `/home/jhelfman/ports/devel/libvirt/work/libvirt-0.9.3' gmake: *** [all] Error 2 *** Error code 1 Thanks, Jason -- Jason Helfman System Administrator experts-exchange.com http://www.experts-exchange.com/M_4830110.html E4AD 7CF1 1396 27F6 79DD 4342 5E92 AD66 8C8C FBA5

4 4

[libvirt] [PATCH] Fix stream procedure number for virDomainMigratePrepareTunnel3
by Daniel P. Berrange 30 Jun '11

30 Jun '11

The virDomainMigratePrepareTunnel3 impl in the remote driver was using the procedure number for the virDomainMigratePrepareTunnel method. This doesn't work out so well, because it makes the server ignore & drop all stream packets * src/remote/remote_driver.c: Fix procedure for PrepareTunnel3 --- src/remote/remote_driver.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index ce9bcb1..f318740 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -3691,7 +3691,7 @@ remoteDomainMigratePrepareTunnel3(virConnectPtr dconn, memset(&ret, 0, sizeof(ret)); if (!(netst = virNetClientStreamNew(priv->remoteProgram, - REMOTE_PROC_DOMAIN_MIGRATE_PREPARE_TUNNEL, + REMOTE_PROC_DOMAIN_MIGRATE_PREPARE_TUNNEL3, priv->counter))) goto done; -- 1.7.4.4

2 2

[libvirt] [PATCH] Send back an error if we get unexpected stream control message
by Daniel P. Berrange 30 Jun '11

30 Jun '11

We ignore any stream data packets which come in for streams which are not registered, since these packets are async and do not have a reply. If we get a stream control packet though we must send back an actual error, otherwise a (broken) client may hang forever making it hard to diagnose the client bug. * src/rpc/virnetserverprogram.c: Send back error for unexpected stream control messages --- src/rpc/virnetserverprogram.c | 25 +++++++++++++++++-------- 1 files changed, 17 insertions(+), 8 deletions(-) diff --git a/src/rpc/virnetserverprogram.c b/src/rpc/virnetserverprogram.c index ca80ae0..63a6b6d 100644 --- a/src/rpc/virnetserverprogram.c +++ b/src/rpc/virnetserverprogram.c @@ -257,14 +257,23 @@ int virNetServerProgramDispatch(virNetServerProgramPtr prog, * stream packets after we closed down a stream. Just drop & ignore * these. */ - VIR_INFO("Ignoring unexpected stream data serial=%d proc=%d status=%d", - msg->header.serial, msg->header.proc, msg->header.status); - /* Send a dummy reply to free up 'msg' & unblock client rx */ - memset(msg, 0, sizeof(*msg)); - msg->header.type = VIR_NET_REPLY; - if (virNetServerClientSendMessage(client, msg) < 0) { - ret = -1; - goto cleanup; + if (msg->header.status == VIR_NET_CONTINUE) { + VIR_INFO("Ignoring unexpected stream data serial=%d proc=%d status=%d", + msg->header.serial, msg->header.proc, msg->header.status); + /* Send a dummy reply to free up 'msg' & unblock client rx */ + memset(msg, 0, sizeof(*msg)); + msg->header.type = VIR_NET_REPLY; + if (virNetServerClientSendMessage(client, msg) < 0) { + ret = -1; + goto cleanup; + } + } else { + VIR_INFO("Unexpected stream control message serial=%d proc=%d status=%d", + msg->header.serial, msg->header.proc, msg->header.status); + virNetError(VIR_ERR_RPC, + _("Unexpected stream control message serial=%d proc=%d status=%d"), + msg->header.serial, msg->header.proc, msg->header.status); + goto error; } ret = 0; break; -- 1.7.4.4

2 1

[libvirt] [PATCH] Fix release of virNetMessagePtr instances in streams processing
by Daniel P. Berrange 30 Jun '11

30 Jun '11

If a message packet for a invalid stream is received it is just free'd. This is not good because it doesn't let the client RPC request counter decrement. If a stream is shutdown with pending packets the message also isn't released properly because of an incorrect header type * daemon/stream.c: Fix message header type * src/rpc/virnetserverprogram.c: Send dummy reply instead of free'ing ignored stream message --- daemon/stream.c | 1 + src/rpc/virnetserverprogram.c | 9 ++++++++- 2 files changed, 9 insertions(+), 1 deletions(-) diff --git a/daemon/stream.c b/daemon/stream.c index 685cee2..56d79c2 100644 --- a/daemon/stream.c +++ b/daemon/stream.c @@ -327,6 +327,7 @@ int daemonFreeClientStream(virNetServerClientPtr client, virNetMessagePtr tmp = msg->next; /* Send a dummy reply to free up 'msg' & unblock client rx */ memset(msg, 0, sizeof(*msg)); + msg->header.type = VIR_NET_REPLY; if (virNetServerClientSendMessage(client, msg) < 0) { virNetServerClientMarkClose(client); virNetMessageFree(msg); diff --git a/src/rpc/virnetserverprogram.c b/src/rpc/virnetserverprogram.c index 4afed64..ca80ae0 100644 --- a/src/rpc/virnetserverprogram.c +++ b/src/rpc/virnetserverprogram.c @@ -259,7 +259,13 @@ int virNetServerProgramDispatch(virNetServerProgramPtr prog, */ VIR_INFO("Ignoring unexpected stream data serial=%d proc=%d status=%d", msg->header.serial, msg->header.proc, msg->header.status); - virNetMessageFree(msg); + /* Send a dummy reply to free up 'msg' & unblock client rx */ + memset(msg, 0, sizeof(*msg)); + msg->header.type = VIR_NET_REPLY; + if (virNetServerClientSendMessage(client, msg) < 0) { + ret = -1; + goto cleanup; + } ret = 0; break; @@ -275,6 +281,7 @@ int virNetServerProgramDispatch(virNetServerProgramPtr prog, error: ret = virNetServerProgramSendReplyError(prog, client, msg, &rerr, &msg->header); +cleanup: return ret; } -- 1.7.4.4

2 1

[libvirt] libvirt-0.9.3 week freeze, RC1 version to test
by Daniel Veillard 30 Jun '11

30 Jun '11

So we are entering the week freeze for the new version 0.9.3 I have made an rc1 tarball available at: ftp://libvirt.org/libvirt/libvirt-0.9.3-rc1.tar.gz along with rpms for those interested We pushed a lot of patches in the last few days, we know there is at least some cleanup issues, but I tried it locally and basic operations seems to work fine, please give it a try too and report issues, thanks ! Daniel -- Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ daniel(a)veillard.com | Rpmfind RPM search engine http://rpmfind.net/ http://veillard.com/ | virtualization library http://libvirt.org/

11 26

[libvirt] [PATCH 0/3] Fix stream upload in new RPC code
by Daniel P. Berrange 30 Jun '11

30 Jun '11

These patches do three small fixes to the RPC code in libvirtd to make sure stream upload works correctly again

2 7

[libvirt] [PATCH] Fix leak of virStreamPtr object with callback added in fdstream impl
by Daniel P. Berrange 30 Jun '11

30 Jun '11

When adding a callback to an FD stream, we take an extra reference on the virStreamPtr instance. We forgot to registered a free function with the callback, so when the callback was removed, the extra reference held on virStreamPtr was not released. * src/fdstream.c: Use a free callback to release reference on virStreamPtr when removing callback --- src/fdstream.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/src/fdstream.c b/src/fdstream.c index 182b6fa..54f8198 100644 --- a/src/fdstream.c +++ b/src/fdstream.c @@ -171,6 +171,13 @@ static void virFDStreamEvent(int watch ATTRIBUTE_UNUSED, } } +static void virFDStreamCallbackFree(void *opaque) +{ + virStreamPtr st = opaque; + virStreamFree(st); +} + + static int virFDStreamAddCallback(virStreamPtr st, int events, @@ -198,7 +205,7 @@ virFDStreamAddCallback(virStreamPtr st, events, virFDStreamEvent, st, - NULL)) < 0) { + virFDStreamCallbackFree)) < 0) { streamsReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("cannot register file watch on stream")); goto cleanup; -- 1.7.4.4

2 1

[libvirt] [PATCH] Fix leak of mdnsGroupName in virNetServer object
by Daniel P. Berrange 30 Jun '11

30 Jun '11

* src/rpc/virnetserver.c: Free mdnsGroupName --- src/rpc/virnetserver.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/src/rpc/virnetserver.c b/src/rpc/virnetserver.c index 8a2b113..0ef81fd 100644 --- a/src/rpc/virnetserver.c +++ b/src/rpc/virnetserver.c @@ -746,6 +746,8 @@ void virNetServerFree(virNetServerPtr srv) } VIR_FREE(srv->clients); + VIR_FREE(srv->mdnsGroupName); + virNetServerUnlock(srv); virMutexDestroy(&srv->lock); VIR_FREE(srv); -- 1.7.4.4

2 1

[libvirt] [PATCH] Fix potential crash when saving guests
by Daniel P. Berrange 30 Jun '11

30 Jun '11

The qemudDomainSaveFlag method will call EndJob on the 'vm' object it is passed in. This can result in the 'vm' object being free'd if the last reference is removed. Thus no caller of 'qemudDomainSaveFlag' must *ever* reference 'vm' again upon return. Unfortunately qemudDomainSave and qemuDomainManagedSave both call 'virDomainObjUnlock', which can result in a crash. This is non-deterministic since it involves a race with the monitor I/O thread. Fix this by making qemudDomainSaveFlag responsible for calling virDomainObjUnlock instead. * src/qemu/qemu_driver.c: Fix potential use after free when saving guests --- src/qemu/qemu_driver.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index d63f57d..363a361 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -2091,7 +2091,10 @@ qemuCompressProgramName(int compress) } /* This internal function expects the driver lock to already be held on - * entry and the vm must be active. + * entry and the vm must be active + locked. Vm will be unlocked and + * potentially free'd after this returns (eg transient VMs are freed + * shutdown). So 'vm' must not be referenced by the caller after + * this returns (whether returning success or failure). */ static int qemudDomainSaveFlag(struct qemud_driver *driver, virDomainPtr dom, virDomainObjPtr vm, const char *path, @@ -2318,6 +2321,8 @@ cleanup: unlink(path); if (event) qemuDomainEventQueue(driver, event); + if (vm) + virDomainObjUnlock(vm); return ret; } @@ -2380,6 +2385,7 @@ static int qemudDomainSave(virDomainPtr dom, const char *path) } ret = qemudDomainSaveFlag(driver, dom, vm, path, compressed); + vm = NULL; cleanup: if (vm) @@ -2436,6 +2442,7 @@ qemuDomainManagedSave(virDomainPtr dom, unsigned int flags) compressed = QEMUD_SAVE_FORMAT_RAW; ret = qemudDomainSaveFlag(driver, dom, vm, name, compressed); + vm = NULL; cleanup: if (vm) -- 1.7.4.4

2 1

[libvirt] [PATCH] Fix uninitialized value in QEMU monitor FD sending code
by Daniel P. Berrange 30 Jun '11

30 Jun '11

The 'char control[CMSG_SPACE(sizeof(int))];' was not being wiped, so could potentially contain uninitialized bytes. While this was harmless in this case, it caused complaints from valgrind * src/qemu/qemu_monitor.c: memset 'control' variable in qemuMonitorIOWriteWithFD --- src/qemu/qemu_monitor.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index e995d97..8573262 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -383,6 +383,7 @@ qemuMonitorIOWriteWithFD(qemuMonitorPtr mon, struct cmsghdr *cmsg; memset(&msg, 0, sizeof(msg)); + memset(control, 0, sizeof(control)); iov[0].iov_base = (void *)data; iov[0].iov_len = len; -- 1.7.4.4

2 1

[libvirt] [PATCH] Fix leak of JSON object for events
by Daniel P. Berrange 30 Jun '11

30 Jun '11

The event handler functions do not free the virJSONValuePtr object. Every event received from a VM thus caused a memory leak * src/qemu/qemu_monitor_json.c: Fix leak of event object --- src/qemu/qemu_monitor_json.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index 7d286d8..81b7f8c 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -122,7 +122,6 @@ qemuMonitorJSONIOProcessLine(qemuMonitorPtr mon, if (virJSONValueObjectHasKey(obj, "QMP") == 1) { ret = 0; - virJSONValueFree(obj); } else if (virJSONValueObjectHasKey(obj, "event") == 1) { ret = qemuMonitorJSONIOProcessEvent(mon, obj); } else if (virJSONValueObjectHasKey(obj, "error") == 1 || @@ -130,6 +129,7 @@ qemuMonitorJSONIOProcessLine(qemuMonitorPtr mon, if (msg) { msg->rxObject = obj; msg->finished = 1; + obj = NULL; ret = 0; } else { qemuReportError(VIR_ERR_INTERNAL_ERROR, @@ -141,8 +141,7 @@ qemuMonitorJSONIOProcessLine(qemuMonitorPtr mon, } cleanup: - if (ret < 0) - virJSONValueFree(obj); + virJSONValueFree(obj); return ret; } -- 1.7.4.4

2 1

[libvirt] [PATCH] Remove bogus warning message in JSON code
by Daniel P. Berrange 30 Jun '11

30 Jun '11

* src/util/json.c: Remove warning message --- src/util/json.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/src/util/json.c b/src/util/json.c index 48521f2..a85f580 100644 --- a/src/util/json.c +++ b/src/util/json.c @@ -950,7 +950,6 @@ cleanup: if (parser.nstate) { int i; - VIR_WARN("cleanup state %d", parser.nstate); for (i = 0 ; i < parser.nstate ; i++) { VIR_FREE(parser.state[i].key); } -- 1.7.4.4

2 1

[libvirt] [PATCH] Fix use of uninitialized memory when releasing PCI slots
by Daniel P. Berrange 30 Jun '11

30 Jun '11

The 'function' field in the PCI address was not correctly initialized, so it was building the wrong address address string and so not removing all functions from the in use list. * src/qemu/qemu_command.c: Fix initialization of PCI function --- src/qemu/qemu_command.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 7ac1faf..90a6653 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -931,14 +931,14 @@ int qemuDomainPCIAddressReleaseSlot(qemuDomainPCIAddressSetPtr addrs, int slot) { virDomainDeviceInfo dev; char *addr; - int function; int ret = 0; + unsigned int *function = &dev.addr.pci.function; dev.addr.pci.domain = 0; dev.addr.pci.bus = 0; dev.addr.pci.slot = slot; - for (function = 0; function <= QEMU_PCI_ADDRESS_LAST_FUNCTION; function++) { + for (*function = 0; *function <= QEMU_PCI_ADDRESS_LAST_FUNCTION; (*function)++) { addr = qemuPCIAddressAsString(&dev); if (!addr) return -1; @@ -950,7 +950,7 @@ int qemuDomainPCIAddressReleaseSlot(qemuDomainPCIAddressSetPtr addrs, int slot) VIR_FREE(addr); - if (qemuDomainPCIAddressReleaseFunction(addrs, slot, function) < 0) + if (qemuDomainPCIAddressReleaseFunction(addrs, slot, *function) < 0) ret = -1; } -- 1.7.4.4

2 1

[libvirt] [PATCH] storage: Fix problem of creating a volume in LVM pool
by Osier Yang 30 Jun '11

30 Jun '11

LVM allows one specify the VG with VG path like "/dev/lv_pool", and it gets the correct VG name internally by skipping "/dev". <snip> vg_name = skip_dev_dir(cmd, argv[0], NULL); if (strrchr(vg_name, '/')) { log_error("Volume group name expected " "(no slash)"); return 0; } </snip> However, if the path is like "/dev/t/lv_pool", the VG name will be "/t/lv_pool" then, definitely it's not a valid VG name, and LVM will complain and fail. This patch change the codes to use "pool->def->source.name" instead of "pool->def->target.path" to avoid the problem. --- src/storage/storage_backend_logical.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/storage/storage_backend_logical.c b/src/storage/storage_backend_logical.c index 4de5442..8fe69ea 100644 --- a/src/storage/storage_backend_logical.c +++ b/src/storage/storage_backend_logical.c @@ -562,7 +562,7 @@ virStorageBackendLogicalCreateVol(virConnectPtr conn, char size[100]; const char *cmdargvnew[] = { LVCREATE, "--name", vol->name, "-L", size, - pool->def->target.path, NULL + pool->def->source.name, NULL }; const char *cmdargvsnap[] = { LVCREATE, "--name", vol->name, "-L", size, -- 1.7.4

2 2

[libvirt] [PATCH] virsh: Fix a problem of buildPoolXML
by Osier Yang 30 Jun '11

30 Jun '11

It doesn't generate "<name>" and "<format>" nodes for "<source>" even if they are explictly specified. This patch fixes it. --- tools/virsh.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index d15d206..e82ddae 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -6372,7 +6372,7 @@ static int buildPoolXML(const vshCmd *cmd, const char **retname, char **xml) { virBufferAsprintf(&buf, "<pool type='%s'>\n", type); virBufferAsprintf(&buf, " <name>%s</name>\n", name); - if (srcHost || srcPath || srcDev) { + if (srcHost || srcPath || srcDev || srcFormat || srcName) { virBufferAddLit(&buf, " <source>\n"); if (srcHost) -- 1.7.4

2 2

[libvirt] ANNOUNCE: libvirt Perl bindings Sys::Virt 0.2.8 release
by Daniel P. Berrange 30 Jun '11

30 Jun '11

I am happy to announce a new release[1] of the libvirt Perl bindings, Sys::Virt 0.2.8 is available for download: http://search.cpan.org/CPAN/authors/id/D/DA/DANBERR/Sys-Virt-0.2.8.tar.gz Changes in this release - Add all new APIs in libvirt 0.9.0 - Add examples for different ways of using stream APIs to download/upload storage volumes - Requires libvirt >= 0.9.0 The permanent link for the Sys::Virt package, where all historic releases can be found, is http://search.cpan.org/dist/Sys-Virt/ Thanks to everyone who contributed to this release through testing, bug reporting, patch submission, etc Regards, Daniel [1] Yes, 2 releases in 2 days. I'm playing catchup with main libvirt releases and instead of going straight to latest one (0.9.2), I'm releasing Perl bindings for the 2 intermediate releases since those are needed in various distros. Guess what to expect tomorrow.... -- |: 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 :|

1 0

[libvirt] [PATCHv4 3/3] sysinfo: delete unnecessary white space of sysinfo.
by Minoru Usui 30 Jun '11

30 Jun '11

sysinfo: delete unnecessary white space of sysinfo. * Trim each element and delete null entry of sysinfo by virSkipSpacesBackwards(). This patch is rebased to following Eric's patches. Eric's 1/3, 2/3 patches do not change. http://www.spinics.net/linux/fedora/libvir/msg41063.html Signed-off-by: Minoru Usui <usui(a)mxm.nes.nec.co.jp> --- src/util/sysinfo.c | 63 ++++++++++++++++++++++++++++++++++----------------- 1 files changed, 42 insertions(+), 21 deletions(-) diff --git a/src/util/sysinfo.c b/src/util/sysinfo.c index f4edde9..2d38145 100644 --- a/src/util/sysinfo.c +++ b/src/util/sysinfo.c @@ -244,77 +244,88 @@ virSysinfoParseProcessor(char *base, virSysinfoDefPtr ret) if ((cur = strstr(base, "Socket Designation: ")) != NULL) { cur += 20; eol = strchr(cur, '\n'); - if ((eol) && + virSkipSpacesBackwards(cur, &eol); + if ((eol != cur) && ((processor->processor_socket_destination = strndup(cur, eol - cur)) == NULL)) goto no_memory; } if ((cur = strstr(base, "Type: ")) != NULL) { cur += 6; eol = strchr(cur, '\n'); - if ((eol) && + virSkipSpacesBackwards(cur, &eol); + if ((eol != cur) && ((processor->processor_type = strndup(cur, eol - cur)) == NULL)) goto no_memory; } if ((cur = strstr(base, "Family: ")) != NULL) { cur += 8; eol = strchr(cur, '\n'); - if ((eol) && + virSkipSpacesBackwards(cur, &eol); + if ((eol != cur) && ((processor->processor_family = strndup(cur, eol - cur)) == NULL)) goto no_memory; } if ((cur = strstr(base, "Manufacturer: ")) != NULL) { cur += 14; eol = strchr(cur, '\n'); - if ((eol) && + virSkipSpacesBackwards(cur, &eol); + if ((eol != cur) && ((processor->processor_manufacturer = strndup(cur, eol - cur)) == NULL)) goto no_memory; } if ((cur = strstr(base, "Signature: ")) != NULL) { cur += 11; eol = strchr(cur, '\n'); - if ((eol) && + virSkipSpacesBackwards(cur, &eol); + if ((eol != cur) && ((processor->processor_signature = strndup(cur, eol - cur)) == NULL)) goto no_memory; } if ((cur = strstr(base, "Version: ")) != NULL) { cur += 9; eol = strchr(cur, '\n'); - if ((eol) && + virSkipSpacesBackwards(cur, &eol); + if ((eol != cur) && ((processor->processor_version = strndup(cur, eol - cur)) == NULL)) goto no_memory; } if ((cur = strstr(base, "External Clock: ")) != NULL) { cur += 16; eol = strchr(cur, '\n'); - if ((eol) && + virSkipSpacesBackwards(cur, &eol); + if ((eol != cur) && ((processor->processor_external_clock = strndup(cur, eol - cur)) == NULL)) goto no_memory; } if ((cur = strstr(base, "Max Speed: ")) != NULL) { cur += 11; eol = strchr(cur, '\n'); - if ((eol) && + virSkipSpacesBackwards(cur, &eol); + if ((eol != cur) && ((processor->processor_max_speed = strndup(cur, eol - cur)) == NULL)) goto no_memory; } if ((cur = strstr(base, "Status: ")) != NULL) { cur += 8; eol = strchr(cur, '\n'); - if ((eol) && + virSkipSpacesBackwards(cur, &eol); + if ((eol != cur) && ((processor->processor_status = strndup(cur, eol - cur)) == NULL)) goto no_memory; } if ((cur = strstr(base, "Serial Number: ")) != NULL) { cur += 15; eol = strchr(cur, '\n'); - if ((eol) && + virSkipSpacesBackwards(cur, &eol); + if ((eol != cur) && ((processor->processor_serial_number = strndup(cur, eol - cur)) == NULL)) goto no_memory; } if ((cur = strstr(base, "Part Number: ")) != NULL) { cur += 13; eol = strchr(cur, '\n'); - if ((eol) && + virSkipSpacesBackwards(cur, &eol); + if ((eol != cur) && ((processor->processor_part_number = strndup(cur, eol - cur)) == NULL)) goto no_memory; } @@ -349,70 +360,80 @@ virSysinfoParseMemory(char *base, virSysinfoDefPtr ret) if (STREQLEN(cur, "No Module Installed", eol - cur)) goto next; - if ((eol) && + virSkipSpacesBackwards(cur, &eol); + if ((eol != cur) && ((memory->memory_size = strndup(cur, eol - cur)) == NULL)) goto no_memory; } if ((cur = strstr(base, "Form Factor: ")) != NULL) { cur += 13; eol = strchr(cur, '\n'); - if ((eol) && + virSkipSpacesBackwards(cur, &eol); + if ((eol != cur) && ((memory->memory_form_factor = strndup(cur, eol - cur)) == NULL)) goto no_memory; } if ((cur = strstr(base, "Locator: ")) != NULL) { cur += 9; eol = strchr(cur, '\n'); - if ((eol) && + virSkipSpacesBackwards(cur, &eol); + if ((eol != cur) && ((memory->memory_locator = strndup(cur, eol - cur)) == NULL)) goto no_memory; } if ((cur = strstr(base, "Bank Locator: ")) != NULL) { cur += 14; eol = strchr(cur, '\n'); - if ((eol) && + virSkipSpacesBackwards(cur, &eol); + if ((eol != cur) && ((memory->memory_bank_locator = strndup(cur, eol - cur)) == NULL)) goto no_memory; } if ((cur = strstr(base, "Type: ")) != NULL) { cur += 6; eol = strchr(cur, '\n'); - if ((eol) && + virSkipSpacesBackwards(cur, &eol); + if ((eol != cur) && ((memory->memory_type = strndup(cur, eol - cur)) == NULL)) goto no_memory; } if ((cur = strstr(base, "Type Detail: ")) != NULL) { cur += 13; eol = strchr(cur, '\n'); - if ((eol) && + virSkipSpacesBackwards(cur, &eol); + if ((eol != cur) && ((memory->memory_type_detail = strndup(cur, eol - cur)) == NULL)) goto no_memory; } if ((cur = strstr(base, "Speed: ")) != NULL) { cur += 7; eol = strchr(cur, '\n'); - if ((eol) && + virSkipSpacesBackwards(cur, &eol); + if ((eol != cur) && ((memory->memory_speed = strndup(cur, eol - cur)) == NULL)) goto no_memory; } if ((cur = strstr(base, "Manufacturer: ")) != NULL) { cur += 14; eol = strchr(cur, '\n'); - if ((eol) && + virSkipSpacesBackwards(cur, &eol); + if ((eol != cur) && ((memory->memory_manufacturer = strndup(cur, eol - cur)) == NULL)) goto no_memory; } if ((cur = strstr(base, "Serial Number: ")) != NULL) { cur += 15; eol = strchr(cur, '\n'); - if ((eol) && + virSkipSpacesBackwards(cur, &eol); + if ((eol != cur) && ((memory->memory_serial_number = strndup(cur, eol - cur)) == NULL)) goto no_memory; } if ((cur = strstr(base, "Part Number: ")) != NULL) { cur += 13; eol = strchr(cur, '\n'); - if ((eol) && + virSkipSpacesBackwards(cur, &eol); + if ((eol != cur) && ((memory->memory_part_number = strndup(cur, eol - cur)) == NULL)) goto no_memory; } -- 1.7.1 -- Minoru Usui <usui(a)mxm.nes.nec.co.jp>

1 0

[libvirt] [V2 Patch] virsh: Change log level order
by Supriya Kannery 30 Jun '11

30 Jun '11

Change log level order so that messages at all other levels get logged for "DEBUG" level. Replace magic numbers with corresponding VSH_ERR_xx. Signed-off-by: Supriya Kannery <supriyak(a)in.ibm.com> --- tools/virsh.c | 119 ++++++++++++++++++++++++++++++++-------------------------- 1 file changed, 67 insertions(+), 52 deletions(-) Index: libvirt/tools/virsh.c =================================================================== --- libvirt.orig/tools/virsh.c +++ libvirt/tools/virsh.c @@ -91,11 +91,11 @@ static char *progname; * Indicates the level of a log message */ typedef enum { - VSH_ERR_DEBUG = 0, - VSH_ERR_INFO, - VSH_ERR_NOTICE, + VSH_ERR_ERROR = 0, VSH_ERR_WARNING, - VSH_ERR_ERROR + VSH_ERR_NOTICE, + VSH_ERR_INFO, + VSH_ERR_DEBUG } vshErrorLevel; /* @@ -2146,7 +2146,8 @@ cmdDominfo(vshControl *ctl, const vshCmd /* Check and display whether the domain is persistent or not */ persistent = virDomainIsPersistent(dom); - vshDebug(ctl, 5, "Domain persistent flag value: %d\n", persistent); + vshDebug(ctl, VSH_ERR_DEBUG, "Domain persistent flag value: %d\n", + persistent); if (persistent < 0) vshPrint(ctl, "%-15s %s\n", _("Persistent:"), _("unknown")); else @@ -2928,7 +2929,7 @@ cmdSetvcpus(vshControl *ctl, const vshCm /* If the --maximum flag was given, we need to ensure only the --config flag is in effect as well */ if (maximum) { - vshDebug(ctl, 5, "--maximum flag was given\n"); + vshDebug(ctl, VSH_ERR_DEBUG, "--maximum flag was given\n"); /* If neither the --config nor --live flags were given, OR if just the --live flag was given, we need to error out @@ -4020,7 +4021,7 @@ repoll: if ( timeout && ((int)(curr.tv_sec - start.tv_sec) * 1000 + \ (int)(curr.tv_usec - start.tv_usec) / 1000) > timeout * 1000 ) { /* suspend the domain when migration timeouts. */ - vshDebug(ctl, 5, "suspend the domain when migration timeouts\n"); + vshDebug(ctl, VSH_ERR_DEBUG, "suspend the domain when migration timeouts\n"); virDomainSuspend(dom); timeout = 0; } @@ -6125,7 +6126,8 @@ cmdPoolList(vshControl *ctl, const vshCm /* Retrieve the persistence status of the pool */ if (details) { persistent = virStoragePoolIsPersistent(pool); - vshDebug(ctl, 5, "Persistent flag value: %d\n", persistent); + vshDebug(ctl, VSH_ERR_DEBUG, "Persistent flag value: %d\n", + persistent); if (persistent < 0) poolInfoTexts[i].persistent = vshStrdup(ctl, _("unknown")); else @@ -6316,19 +6318,19 @@ cmdPoolList(vshControl *ctl, const vshCm availStrLength = stringLength; /* Display the string lengths for debugging. */ - vshDebug(ctl, 5, "Longest name string = %lu chars\n", + vshDebug(ctl, VSH_ERR_DEBUG, "Longest name string = %lu chars\n", (unsigned long) nameStrLength); - vshDebug(ctl, 5, "Longest state string = %lu chars\n", + vshDebug(ctl, VSH_ERR_DEBUG, "Longest state string = %lu chars\n", (unsigned long) stateStrLength); - vshDebug(ctl, 5, "Longest autostart string = %lu chars\n", + vshDebug(ctl, VSH_ERR_DEBUG, "Longest autostart string = %lu chars\n", (unsigned long) autostartStrLength); - vshDebug(ctl, 5, "Longest persistent string = %lu chars\n", + vshDebug(ctl, VSH_ERR_DEBUG, "Longest persistent string = %lu chars\n", (unsigned long) persistStrLength); - vshDebug(ctl, 5, "Longest capacity string = %lu chars\n", + vshDebug(ctl, VSH_ERR_DEBUG, "Longest capacity string = %lu chars\n", (unsigned long) capStrLength); - vshDebug(ctl, 5, "Longest allocation string = %lu chars\n", + vshDebug(ctl, VSH_ERR_DEBUG, "Longest allocation string = %lu chars\n", (unsigned long) allocStrLength); - vshDebug(ctl, 5, "Longest available string = %lu chars\n", + vshDebug(ctl, VSH_ERR_DEBUG, "Longest available string = %lu chars\n", (unsigned long) availStrLength); /* Create the output template. Each column is sized according to @@ -6600,7 +6602,8 @@ cmdPoolInfo(vshControl *ctl, const vshCm /* Check and display whether the pool is persistent or not */ persistent = virStoragePoolIsPersistent(pool); - vshDebug(ctl, 5, "Pool persistent flag value: %d\n", persistent); + vshDebug(ctl, VSH_ERR_DEBUG, "Pool persistent flag value: %d\n", + persistent); if (persistent < 0) vshPrint(ctl, "%-15s %s\n", _("Persistent:"), _("unknown")); else @@ -6608,7 +6611,7 @@ cmdPoolInfo(vshControl *ctl, const vshCm /* Check and display whether the pool is autostarted or not */ virStoragePoolGetAutostart(pool, &autostart); - vshDebug(ctl, 5, "Pool autostart flag value: %d\n", autostart); + vshDebug(ctl, VSH_ERR_DEBUG, "Pool autostart flag value: %d\n", autostart); if (autostart < 0) vshPrint(ctl, "%-15s %s\n", _("Autostart:"), _("no autostart")); else @@ -6806,31 +6809,37 @@ cmdVolCreateAs(vshControl *ctl, const vs if (snapshotStrVol) { /* Lookup snapshot backing volume. Try the backing-vol * parameter as a name */ - vshDebug(ctl, 5, "%s: Look up backing store volume '%s' as name\n", + vshDebug(ctl, VSH_ERR_DEBUG, + "%s: Look up backing store volume '%s' as name\n", cmd->def->name, snapshotStrVol); virStorageVolPtr snapVol = virStorageVolLookupByName(pool, snapshotStrVol); if (snapVol) - vshDebug(ctl, 5, "%s: Backing store volume found using '%s' as name\n", + vshDebug(ctl, VSH_ERR_DEBUG, + "%s: Backing store volume found using '%s' as name\n", cmd->def->name, snapshotStrVol); if (snapVol == NULL) { /* Snapshot backing volume not found by name. Try the * backing-vol parameter as a key */ - vshDebug(ctl, 5, "%s: Look up backing store volume '%s' as key\n", + vshDebug(ctl, VSH_ERR_DEBUG, + "%s: Look up backing store volume '%s' as key\n", cmd->def->name, snapshotStrVol); snapVol = virStorageVolLookupByKey(ctl->conn, snapshotStrVol); if (snapVol) - vshDebug(ctl, 5, "%s: Backing store volume found using '%s' as key\n", + vshDebug(ctl, VSH_ERR_DEBUG, + "%s: Backing store volume found using '%s' as key\n", cmd->def->name, snapshotStrVol); } if (snapVol == NULL) { /* Snapshot backing volume not found by key. Try the * backing-vol parameter as a path */ - vshDebug(ctl, 5, "%s: Look up backing store volume '%s' as path\n", + vshDebug(ctl, VSH_ERR_DEBUG, + "%s: Look up backing store volume '%s' as path\n", cmd->def->name, snapshotStrVol); snapVol = virStorageVolLookupByPath(ctl->conn, snapshotStrVol); if (snapVol) - vshDebug(ctl, 5, "%s: Backing store volume found using '%s' as path\n", + vshDebug(ctl, VSH_ERR_DEBUG, + "%s: Backing store volume found using '%s' as path\n", cmd->def->name, snapshotStrVol); } if (snapVol == NULL) { @@ -7777,11 +7786,16 @@ cmdVolList(vshControl *ctl, const vshCmd allocStrLength = stringLength; /* Display the string lengths for debugging */ - vshDebug(ctl, 5, "Longest name string = %zu chars\n", nameStrLength); - vshDebug(ctl, 5, "Longest path string = %zu chars\n", pathStrLength); - vshDebug(ctl, 5, "Longest type string = %zu chars\n", typeStrLength); - vshDebug(ctl, 5, "Longest capacity string = %zu chars\n", capStrLength); - vshDebug(ctl, 5, "Longest allocation string = %zu chars\n", allocStrLength); + vshDebug(ctl, VSH_ERR_DEBUG, + "Longest name string = %zu chars\n", nameStrLength); + vshDebug(ctl, VSH_ERR_DEBUG, + "Longest path string = %zu chars\n", pathStrLength); + vshDebug(ctl, VSH_ERR_DEBUG, + "Longest type string = %zu chars\n", typeStrLength); + vshDebug(ctl, VSH_ERR_DEBUG, + "Longest capacity string = %zu chars\n", capStrLength); + vshDebug(ctl, VSH_ERR_DEBUG, + "Longest allocation string = %zu chars\n", allocStrLength); /* Create the output template */ ret = virAsprintf(&outputStr, @@ -11535,7 +11549,7 @@ vshCommandOptDomainBy(vshControl *ctl, c if (vshCommandOptString(cmd, optname, &n) <= 0) return NULL; - vshDebug(ctl, 5, "%s: found option <%s>: %s\n", + vshDebug(ctl, VSH_ERR_DEBUG, "%s: found option <%s>: %s\n", cmd->def->name, optname, n); if (name) @@ -11544,20 +11558,20 @@ vshCommandOptDomainBy(vshControl *ctl, c /* try it by ID */ if (flag & VSH_BYID) { if (virStrToLong_i(n, NULL, 10, &id) == 0 && id >= 0) { - vshDebug(ctl, 5, "%s: <%s> seems like domain ID\n", + vshDebug(ctl, VSH_ERR_DEBUG, "%s: <%s> seems like domain ID\n", cmd->def->name, optname); dom = virDomainLookupByID(ctl->conn, id); } } /* try it by UUID */ if (dom==NULL && (flag & VSH_BYUUID) && strlen(n)==VIR_UUID_STRING_BUFLEN-1) { - vshDebug(ctl, 5, "%s: <%s> trying as domain UUID\n", + vshDebug(ctl, VSH_ERR_DEBUG, "%s: <%s> trying as domain UUID\n", cmd->def->name, optname); dom = virDomainLookupByUUIDString(ctl->conn, n); } /* try it by NAME */ if (dom==NULL && (flag & VSH_BYNAME)) { - vshDebug(ctl, 5, "%s: <%s> trying as domain NAME\n", + vshDebug(ctl, VSH_ERR_DEBUG, "%s: <%s> trying as domain NAME\n", cmd->def->name, optname); dom = virDomainLookupByName(ctl->conn, n); } @@ -11581,7 +11595,7 @@ vshCommandOptNetworkBy(vshControl *ctl, if (vshCommandOptString(cmd, optname, &n) <= 0) return NULL; - vshDebug(ctl, 5, "%s: found option <%s>: %s\n", + vshDebug(ctl, VSH_ERR_DEBUG, "%s: found option <%s>: %s\n", cmd->def->name, optname, n); if (name) @@ -11589,13 +11603,13 @@ vshCommandOptNetworkBy(vshControl *ctl, /* try it by UUID */ if ((flag & VSH_BYUUID) && (strlen(n) == VIR_UUID_STRING_BUFLEN-1)) { - vshDebug(ctl, 5, "%s: <%s> trying as network UUID\n", + vshDebug(ctl, VSH_ERR_DEBUG, "%s: <%s> trying as network UUID\n", cmd->def->name, optname); network = virNetworkLookupByUUIDString(ctl->conn, n); } /* try it by NAME */ if (network==NULL && (flag & VSH_BYNAME)) { - vshDebug(ctl, 5, "%s: <%s> trying as network NAME\n", + vshDebug(ctl, VSH_ERR_DEBUG, "%s: <%s> trying as network NAME\n", cmd->def->name, optname); network = virNetworkLookupByName(ctl->conn, n); } @@ -11620,7 +11634,7 @@ vshCommandOptNWFilterBy(vshControl *ctl, if (vshCommandOptString(cmd, optname, &n) <= 0) return NULL; - vshDebug(ctl, 5, "%s: found option <%s>: %s\n", + vshDebug(ctl, VSH_ERR_DEBUG, "%s: found option <%s>: %s\n", cmd->def->name, optname, n); if (name) @@ -11628,13 +11642,13 @@ vshCommandOptNWFilterBy(vshControl *ctl, /* try it by UUID */ if ((flag & VSH_BYUUID) && (strlen(n) == VIR_UUID_STRING_BUFLEN-1)) { - vshDebug(ctl, 5, "%s: <%s> trying as nwfilter UUID\n", + vshDebug(ctl, VSH_ERR_DEBUG, "%s: <%s> trying as nwfilter UUID\n", cmd->def->name, optname); nwfilter = virNWFilterLookupByUUIDString(ctl->conn, n); } /* try it by NAME */ if (nwfilter == NULL && (flag & VSH_BYNAME)) { - vshDebug(ctl, 5, "%s: <%s> trying as nwfilter NAME\n", + vshDebug(ctl, VSH_ERR_DEBUG, "%s: <%s> trying as nwfilter NAME\n", cmd->def->name, optname); nwfilter = virNWFilterLookupByName(ctl->conn, n); } @@ -11658,7 +11672,7 @@ vshCommandOptInterfaceBy(vshControl *ctl if (vshCommandOptString(cmd, optname, &n) <= 0) return NULL; - vshDebug(ctl, 5, "%s: found option <%s>: %s\n", + vshDebug(ctl, VSH_ERR_DEBUG, "%s: found option <%s>: %s\n", cmd->def->name, optname, n); if (name) @@ -11666,13 +11680,13 @@ vshCommandOptInterfaceBy(vshControl *ctl /* try it by NAME */ if ((flag & VSH_BYNAME)) { - vshDebug(ctl, 5, "%s: <%s> trying as interface NAME\n", + vshDebug(ctl, VSH_ERR_DEBUG, "%s: <%s> trying as interface NAME\n", cmd->def->name, optname); iface = virInterfaceLookupByName(ctl->conn, n); } /* try it by MAC */ if ((iface == NULL) && (flag & VSH_BYMAC)) { - vshDebug(ctl, 5, "%s: <%s> trying as interface MAC\n", + vshDebug(ctl, VSH_ERR_DEBUG, "%s: <%s> trying as interface MAC\n", cmd->def->name, optname); iface = virInterfaceLookupByMACString(ctl->conn, n); } @@ -11693,7 +11707,7 @@ vshCommandOptPoolBy(vshControl *ctl, con if (vshCommandOptString(cmd, optname, &n) <= 0) return NULL; - vshDebug(ctl, 5, "%s: found option <%s>: %s\n", + vshDebug(ctl, VSH_ERR_DEBUG, "%s: found option <%s>: %s\n", cmd->def->name, optname, n); if (name) @@ -11701,13 +11715,13 @@ vshCommandOptPoolBy(vshControl *ctl, con /* try it by UUID */ if ((flag & VSH_BYUUID) && (strlen(n) == VIR_UUID_STRING_BUFLEN-1)) { - vshDebug(ctl, 5, "%s: <%s> trying as pool UUID\n", + vshDebug(ctl, VSH_ERR_DEBUG, "%s: <%s> trying as pool UUID\n", cmd->def->name, optname); pool = virStoragePoolLookupByUUIDString(ctl->conn, n); } /* try it by NAME */ if (pool == NULL && (flag & VSH_BYNAME)) { - vshDebug(ctl, 5, "%s: <%s> trying as pool NAME\n", + vshDebug(ctl, VSH_ERR_DEBUG, "%s: <%s> trying as pool NAME\n", cmd->def->name, optname); pool = virStoragePoolLookupByName(ctl->conn, n); } @@ -11739,7 +11753,7 @@ vshCommandOptVolBy(vshControl *ctl, cons if (p) pool = vshCommandOptPoolBy(ctl, cmd, pooloptname, name, flag); - vshDebug(ctl, 5, "%s: found option <%s>: %s\n", + vshDebug(ctl, VSH_ERR_DEBUG, "%s: found option <%s>: %s\n", cmd->def->name, optname, n); if (name) @@ -11747,19 +11761,19 @@ vshCommandOptVolBy(vshControl *ctl, cons /* try it by name */ if (pool && (flag & VSH_BYNAME)) { - vshDebug(ctl, 5, "%s: <%s> trying as vol name\n", + vshDebug(ctl, VSH_ERR_DEBUG, "%s: <%s> trying as vol name\n", cmd->def->name, optname); vol = virStorageVolLookupByName(pool, n); } /* try it by key */ if (vol == NULL && (flag & VSH_BYUUID)) { - vshDebug(ctl, 5, "%s: <%s> trying as vol key\n", + vshDebug(ctl, VSH_ERR_DEBUG, "%s: <%s> trying as vol key\n", cmd->def->name, optname); vol = virStorageVolLookupByKey(ctl->conn, n); } /* try it by path */ if (vol == NULL && (flag & VSH_BYUUID)) { - vshDebug(ctl, 5, "%s: <%s> trying as vol path\n", + vshDebug(ctl, VSH_ERR_DEBUG, "%s: <%s> trying as vol path\n", cmd->def->name, optname); vol = virStorageVolLookupByPath(ctl->conn, n); } @@ -11786,7 +11800,8 @@ vshCommandOptSecret(vshControl *ctl, con if (vshCommandOptString(cmd, optname, &n) <= 0) return NULL; - vshDebug(ctl, 5, "%s: found option <%s>: %s\n", cmd->def->name, optname, n); + vshDebug(ctl, VSH_ERR_DEBUG, "%s: found option <%s>: %s\n", + cmd->def->name, optname, n); if (name != NULL) *name = n; @@ -11991,7 +12006,7 @@ get_data: last->next = arg; last = arg; - vshDebug(ctl, 4, "%s: %s(%s): %s\n", + vshDebug(ctl, VSH_ERR_DEBUG, "%s: %s(%s): %s\n", cmd->name, opt->name, opt->type != VSH_OT_BOOL ? _("optdata") : _("bool"), @@ -12416,7 +12431,7 @@ vshInit(vshControl *ctl) debugEnv = getenv("VIRSH_DEBUG"); if (debugEnv) { if (virStrToLong_i(debugEnv, NULL, 10, &ctl->debug) < 0 || - ctl->debug < VSH_ERR_DEBUG || ctl->debug > VSH_ERR_ERROR) { + ctl->debug > VSH_ERR_DEBUG || ctl->debug < VSH_ERR_ERROR) { vshError(ctl, "%s", _("VIRSH_DEBUG not set with a valid numeric value")); ctl->debug = VSH_ERR_DEBUG; @@ -13088,7 +13103,7 @@ vshParseArgv(vshControl *ctl, int argc, /* parse command */ ctl->imode = false; if (argc - optind == 1) { - vshDebug(ctl, 2, "commands: \"%s\"\n", argv[optind]); + vshDebug(ctl, VSH_ERR_NOTICE, "commands: \"%s\"\n", argv[optind]); return vshCommandStringParse(ctl, argv[optind]); } else { return vshCommandArgvParse(ctl, argc - optind, argv + optind);

3 3

[libvirt] [PATCH] lock qemu_driver early in qemuGetSchedulerParametersFlags()
by Wen Congyang 30 Jun '11

30 Jun '11

If we pass VIR_DOMAIN_AFFECT_LIVE | VIR_DOMAIN_AFFECT_CONFIG to qemuGetSchedulerParametersFlags() or *nparams is less than 1, we will unlock qemu_driver without locking it. It's very dangerous. We should lock qemu_driver after calling virCheckFlags(). --- src/qemu/qemu_driver.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 768e0f2..c6994cd 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -5832,6 +5832,8 @@ qemuGetSchedulerParametersFlags(virDomainPtr dom, virCheckFlags(VIR_DOMAIN_AFFECT_LIVE | VIR_DOMAIN_AFFECT_CONFIG, -1); + qemuDriverLock(driver); + if ((flags & (VIR_DOMAIN_AFFECT_LIVE | VIR_DOMAIN_AFFECT_CONFIG)) == (VIR_DOMAIN_AFFECT_LIVE | VIR_DOMAIN_AFFECT_CONFIG)) { qemuReportError(VIR_ERR_INVALID_ARG, "%s", @@ -5845,7 +5847,6 @@ qemuGetSchedulerParametersFlags(virDomainPtr dom, goto cleanup; } - qemuDriverLock(driver); vm = virDomainFindByUUID(&driver->domains, dom->uuid); if (vm == NULL) { -- 1.7.1

3 3

[libvirt] [PATCH] Fix memory leak in virDomainVcpuPinDel()
by Wen Congyang 30 Jun '11

30 Jun '11

virDomainVcpuPinDefFree() does not free def->cputune.vcpupin if nvcpupin is 0, and does not set def->cputune.vcpupin to NULL. If we set nvcpupin to 0 but do not free vcpupin, vcpupin will not be freed when vm->def is freed. Use VIR_FREE() instead of virDomainVcpuPinDefFree() to free the memory and set def->cputune.vcpupint to NULL. --- src/conf/domain_conf.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 60e0318..f9bf51e 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -8263,7 +8263,7 @@ virDomainVcpuPinDel(virDomainDefPtr def, int vcpu) return 0; if (--def->cputune.nvcpupin == 0) { - virDomainVcpuPinDefFree(def->cputune.vcpupin, 0); + VIR_FREE(def->cputune.vcpupin); } else { if (VIR_REALLOC_N(def->cputune.vcpupin, def->cputune.nvcpupin) < 0) { virReportOOMError(); -- 1.7.1

2 2

[libvirt] [PATCH] save domain status after modifing vcpupin
by Wen Congyang 30 Jun '11

30 Jun '11

We should save domain status after modifing vcpupin. If not, we will get wrong vcpupin information after rebooting libvirtd. --- src/qemu/qemu_driver.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 8fcc266..768e0f2 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -3124,6 +3124,8 @@ qemudDomainPinVcpuFlags(virDomainPtr dom, } } + if (virDomainSaveStatus(driver->caps, driver->stateDir, vm) < 0) + goto cleanup; } if (flags & VIR_DOMAIN_AFFECT_CONFIG) { -- 1.7.1

2 2

[libvirt] sysinfo: delete unnecessary white space of sysinfo.
by Minoru Usui 29 Jun '11

29 Jun '11

sysinfo: delete unnecessary white space of sysinfo. * Add virSkipSpacesBackwards() to src/util/util.[ch] * Trim each element and delete null entry of sysinfo by virSkipSpacesBackwards(). Signed-off-by: Minoru Usui <usui(a)mxm.nes.nec.co.jp> --- src/util/sysinfo.c | 34 +++++++++++++++++++++++++--------- src/util/util.c | 27 +++++++++++++++++++++++++++ src/util/util.h | 1 + 3 files changed, 53 insertions(+), 9 deletions(-) diff --git a/src/util/sysinfo.c b/src/util/sysinfo.c index bff1cb8..2ebd34c 100644 --- a/src/util/sysinfo.c +++ b/src/util/sysinfo.c @@ -238,6 +238,7 @@ virSysinfoParseProcessor(char *base, virSysinfoDefPtr ret) if ((cur = strstr(base, "Socket Designation: ")) != NULL) { cur += 20; eol = strchr(cur, '\n'); + virSkipSpacesBackwards(cur, &eol); if ((eol) && ((processor->processor_socket_destination = strndup(cur, eol - cur)) == NULL)) goto no_memory; @@ -245,6 +246,7 @@ virSysinfoParseProcessor(char *base, virSysinfoDefPtr ret) if ((cur = strstr(base, "Type: ")) != NULL) { cur += 6; eol = strchr(cur, '\n'); + virSkipSpacesBackwards(cur, &eol); if ((eol) && ((processor->processor_type = strndup(cur, eol - cur)) == NULL)) goto no_memory; @@ -252,6 +254,7 @@ virSysinfoParseProcessor(char *base, virSysinfoDefPtr ret) if ((cur = strstr(base, "Family: ")) != NULL) { cur += 8; eol = strchr(cur, '\n'); + virSkipSpacesBackwards(cur, &eol); if ((eol) && ((processor->processor_family = strndup(cur, eol - cur)) == NULL)) goto no_memory; @@ -259,6 +262,7 @@ virSysinfoParseProcessor(char *base, virSysinfoDefPtr ret) if ((cur = strstr(base, "Manufacturer: ")) != NULL) { cur += 14; eol = strchr(cur, '\n'); + virSkipSpacesBackwards(cur, &eol); if ((eol) && ((processor->processor_manufacturer = strndup(cur, eol - cur)) == NULL)) goto no_memory; @@ -266,6 +270,7 @@ virSysinfoParseProcessor(char *base, virSysinfoDefPtr ret) if ((cur = strstr(base, "Signature: ")) != NULL) { cur += 11; eol = strchr(cur, '\n'); + virSkipSpacesBackwards(cur, &eol); if ((eol) && ((processor->processor_signature = strndup(cur, eol - cur)) == NULL)) goto no_memory; @@ -273,6 +278,7 @@ virSysinfoParseProcessor(char *base, virSysinfoDefPtr ret) if ((cur = strstr(base, "Version: ")) != NULL) { cur += 9; eol = strchr(cur, '\n'); + virSkipSpacesBackwards(cur, &eol); if ((eol) && ((processor->processor_version = strndup(cur, eol - cur)) == NULL)) goto no_memory; @@ -280,6 +286,7 @@ virSysinfoParseProcessor(char *base, virSysinfoDefPtr ret) if ((cur = strstr(base, "External Clock: ")) != NULL) { cur += 16; eol = strchr(cur, '\n'); + virSkipSpacesBackwards(cur, &eol); if ((eol) && ((processor->processor_external_clock = strndup(cur, eol - cur)) == NULL)) goto no_memory; @@ -287,6 +294,7 @@ virSysinfoParseProcessor(char *base, virSysinfoDefPtr ret) if ((cur = strstr(base, "Max Speed: ")) != NULL) { cur += 11; eol = strchr(cur, '\n'); + virSkipSpacesBackwards(cur, &eol); if ((eol) && ((processor->processor_max_speed = strndup(cur, eol - cur)) == NULL)) goto no_memory; @@ -294,6 +302,7 @@ virSysinfoParseProcessor(char *base, virSysinfoDefPtr ret) if ((cur = strstr(base, "Status: ")) != NULL) { cur += 8; eol = strchr(cur, '\n'); + virSkipSpacesBackwards(cur, &eol); if ((eol) && ((processor->processor_status = strndup(cur, eol - cur)) == NULL)) goto no_memory; @@ -301,6 +310,7 @@ virSysinfoParseProcessor(char *base, virSysinfoDefPtr ret) if ((cur = strstr(base, "Serial Number: ")) != NULL) { cur += 15; eol = strchr(cur, '\n'); + virSkipSpacesBackwards(cur, &eol); if ((eol) && ((processor->processor_serial_number = strndup(cur, eol - cur)) == NULL)) goto no_memory; @@ -308,12 +318,13 @@ virSysinfoParseProcessor(char *base, virSysinfoDefPtr ret) if ((cur = strstr(base, "Part Number: ")) != NULL) { cur += 13; eol = strchr(cur, '\n'); + virSkipSpacesBackwards(cur, &eol); if ((eol) && ((processor->processor_part_number = strndup(cur, eol - cur)) == NULL)) goto no_memory; } - base = eol + 1; + base += strlen("Processor Information"); } return base; @@ -342,6 +353,7 @@ virSysinfoParseMemory(char *base, virSysinfoDefPtr ret) if (STREQLEN(cur, "No Module Installed", eol - cur)) goto next; + virSkipSpacesBackwards(cur, &eol); if ((eol) && ((memory->memory_size = strndup(cur, eol - cur)) == NULL)) goto no_memory; @@ -349,6 +361,7 @@ virSysinfoParseMemory(char *base, virSysinfoDefPtr ret) if ((cur = strstr(base, "Form Factor: ")) != NULL) { cur += 13; eol = strchr(cur, '\n'); + virSkipSpacesBackwards(cur, &eol); if ((eol) && ((memory->memory_form_factor = strndup(cur, eol - cur)) == NULL)) goto no_memory; @@ -356,6 +369,7 @@ virSysinfoParseMemory(char *base, virSysinfoDefPtr ret) if ((cur = strstr(base, "Locator: ")) != NULL) { cur += 9; eol = strchr(cur, '\n'); + virSkipSpacesBackwards(cur, &eol); if ((eol) && ((memory->memory_locator = strndup(cur, eol - cur)) == NULL)) goto no_memory; @@ -363,6 +377,7 @@ virSysinfoParseMemory(char *base, virSysinfoDefPtr ret) if ((cur = strstr(base, "Bank Locator: ")) != NULL) { cur += 14; eol = strchr(cur, '\n'); + virSkipSpacesBackwards(cur, &eol); if ((eol) && ((memory->memory_bank_locator = strndup(cur, eol - cur)) == NULL)) goto no_memory; @@ -370,6 +385,7 @@ virSysinfoParseMemory(char *base, virSysinfoDefPtr ret) if ((cur = strstr(base, "Type: ")) != NULL) { cur += 6; eol = strchr(cur, '\n'); + virSkipSpacesBackwards(cur, &eol); if ((eol) && ((memory->memory_type = strndup(cur, eol - cur)) == NULL)) goto no_memory; @@ -377,6 +393,7 @@ virSysinfoParseMemory(char *base, virSysinfoDefPtr ret) if ((cur = strstr(base, "Type Detail: ")) != NULL) { cur += 13; eol = strchr(cur, '\n'); + virSkipSpacesBackwards(cur, &eol); if ((eol) && ((memory->memory_type_detail = strndup(cur, eol - cur)) == NULL)) goto no_memory; @@ -384,6 +401,7 @@ virSysinfoParseMemory(char *base, virSysinfoDefPtr ret) if ((cur = strstr(base, "Speed: ")) != NULL) { cur += 7; eol = strchr(cur, '\n'); + virSkipSpacesBackwards(cur, &eol); if ((eol) && ((memory->memory_speed = strndup(cur, eol - cur)) == NULL)) goto no_memory; @@ -391,6 +409,7 @@ virSysinfoParseMemory(char *base, virSysinfoDefPtr ret) if ((cur = strstr(base, "Manufacturer: ")) != NULL) { cur += 14; eol = strchr(cur, '\n'); + virSkipSpacesBackwards(cur, &eol); if ((eol) && ((memory->memory_manufacturer = strndup(cur, eol - cur)) == NULL)) goto no_memory; @@ -398,6 +417,7 @@ virSysinfoParseMemory(char *base, virSysinfoDefPtr ret) if ((cur = strstr(base, "Serial Number: ")) != NULL) { cur += 15; eol = strchr(cur, '\n'); + virSkipSpacesBackwards(cur, &eol); if ((eol) && ((memory->memory_serial_number = strndup(cur, eol - cur)) == NULL)) goto no_memory; @@ -405,13 +425,14 @@ virSysinfoParseMemory(char *base, virSysinfoDefPtr ret) if ((cur = strstr(base, "Part Number: ")) != NULL) { cur += 13; eol = strchr(cur, '\n'); + virSkipSpacesBackwards(cur, &eol); if ((eol) && ((memory->memory_part_number = strndup(cur, eol - cur)) == NULL)) goto no_memory; } next: - base = eol + 1; + base += strlen("Memory Device"); } return base; diff --git a/src/util/util.c b/src/util/util.c index 463d2b8..c5c1a89 100644 --- a/src/util/util.c +++ b/src/util/util.c @@ -1550,6 +1550,33 @@ virSkipSpaces(const char **str) } /** + * virSkipSpacesBackwards: + * @str : pointer to the target strings + * @endp: pointer to the end of @str + * + * Skip potential blanks backwards. + */ +void +virSkipSpacesBackwards(const char *str, char **endp) +{ + char *cur; + + if (!endp || !*endp) + return; + + cur = *endp - 1; + while (cur >= str) { + if ((*cur == ' ') || (*cur == '\t') || (*cur == '\n') || + (*cur == '\r') || (*cur == '\\')) + cur--; + else + break; + } + + *endp = (cur >= str) ? cur + 1 : NULL; +} + +/** * virParseNumber: * @str: pointer to the char pointer used * diff --git a/src/util/util.h b/src/util/util.h index 0c43f7a..ae74c30 100644 --- a/src/util/util.h +++ b/src/util/util.h @@ -167,6 +167,7 @@ int virHexToBin(unsigned char c); int virMacAddrCompare (const char *mac1, const char *mac2); void virSkipSpaces(const char **str); +void virSkipSpacesBackwards(const char *str, char **endp); int virParseNumber(const char **str); int virParseVersionString(const char *str, unsigned long *version); int virAsprintf(char **strp, const char *fmt, ...) -- 1.7.1 -- Minoru Usui <usui(a)mxm.nes.nec.co.jp>

3 4

[libvirt] [PATCH] build: avoid pod2man on tarball
by Eric Blake 29 Jun '11

29 Jun '11

virt-sanlock-cleanup.8 has static contents (no dependency on configure), but is generated by pod2man (a perl dependency that maintainers must have, but which ordinary tarball users need not have). Therefore, ensure that it is always part of the tarball, even though it is only conditionally installed. This is similar to commit 6db98a2d4b, but made simpler by the fact that the .8 page is static content. * tools/Makefile.am (EXTRA_DIST): Add virt-sanlock-cleanup.8. --- I've tested this with 'make distcheck', when configured --without-sanlock. It resolves my action item from: https://www.redhat.com/archives/libvir-list/2011-June/msg01464.html tools/Makefile.am | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/Makefile.am b/tools/Makefile.am index ed38396..62c275e 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -13,6 +13,7 @@ EXTRA_DIST = \ virt-xml-validate.in \ virt-pki-validate.in \ virt-sanlock-cleanup.in \ + virt-sanlock-cleanup.8 \ virsh.pod \ libvirt-guests.init.sh \ libvirt-guests.sysconf -- 1.7.4.4

2 2

[libvirt] [PATCH] sysinfo: fix illegal NULL return
by Minoru Usui 29 Jun '11

29 Jun '11

If virSysinfoParse{BIOS,System,Processor,Memory}() can't find newline('\n'), these return NULL. This patch fixes this. Signed-off-by: Minoru Usui <usui(a)mxm.nes.nec.co.jp> --- src/util/sysinfo.c | 23 +++++++++++++---------- 1 files changed, 13 insertions(+), 10 deletions(-) diff --git a/src/util/sysinfo.c b/src/util/sysinfo.c index d32f7f0..a6e525b 100644 --- a/src/util/sysinfo.c +++ b/src/util/sysinfo.c @@ -131,7 +131,12 @@ static char * virSysinfoParseBIOS(char *base, virSysinfoDefPtr ret) { char *cur, *eol = NULL; + char *tmp_base; + if ((tmp_base = strstr(base, "BIOS Information")) == NULL) + return base; + + base = tmp_base; if ((cur = strstr(base, "Vendor: ")) != NULL) { cur += 8; eol = strchr(cur, '\n'); @@ -157,7 +162,7 @@ virSysinfoParseBIOS(char *base, virSysinfoDefPtr ret) goto no_memory; } - return eol ? eol + 1 : NULL; + return base + strlen("BIOS Information"); no_memory: return NULL; @@ -167,10 +172,12 @@ static char * virSysinfoParseSystem(char *base, virSysinfoDefPtr ret) { char *cur, *eol = NULL; + char *tmp_base; - if ((base = strstr(base, "System Information")) == NULL) - return 0; + if ((tmp_base = strstr(base, "System Information")) == NULL) + return base; + base = tmp_base; if ((cur = strstr(base, "Manufacturer: ")) != NULL) { cur += 14; eol = strchr(cur, '\n'); @@ -215,7 +222,7 @@ virSysinfoParseSystem(char *base, virSysinfoDefPtr ret) goto no_memory; } - return eol ? eol + 1 : NULL; + return base + strlen("System Information"); no_memory: return NULL; @@ -314,9 +321,7 @@ virSysinfoParseProcessor(char *base, virSysinfoDefPtr ret) goto no_memory; } - if (!eol) - break; - base = eol + 1; + base += strlen("Processor Information"); } return base; @@ -415,9 +420,7 @@ virSysinfoParseMemory(char *base, virSysinfoDefPtr ret) } next: - if (!eol) - break; - base = eol + 1; + base += strlen("Memory Device"); } return base; -- 1.7.1 -- Minoru Usui <usui(a)mxm.nes.nec.co.jp>

2 1

[libvirt] FYI: migration test script for TCK
by Daniel P. Berrange 29 Jun '11

29 Jun '11

I just added a new test case to the libvirt TCK for validating QEMU migration. http://libvirt.org/git/?p=libvirt-tck.git;a=commitdiff;h=f74faf2d8c83538dcd… It tests 96 different scenarios for successful migration, made up of: - Three different control/communication methods 1. Normal 2. Peer2peer 3. Peer2peer + tunnelled - 8 Different scenarios of persistent vs transient guests 1. Transient running source, no dest 2. Transient running source, persistent inactive dest 3. Persistent running source, no dest 4. Persistent running source, persistent inactive dest 5. Transient paused source, no dest 6. Transient paused source, persistent inactive dest 7. Persistent paused source, no dest 8. Persistent paused source, persistent inactive dest - With each scenario there are upto 4 flag combinations affecting persistent/transient state 1. No flags 2. UNDEFINE_SOURCE 3. PERSIST 4. UNDEFINE_SOURCE|PERSIST This gives 96 major functional test cases. On each test case we validate 10 conditions, giving a total of 960 tests results Since 0.9.2 introduced a migration v3 protocol, full test coverage also requires validating the different combinations of libvirt client, source libvirtd and destination libvirtd protocol support. This implies re-running the overall test script 8 times 1. client < 0.9.2, source < 0.9.2, target < 0.9.2 2. client >= 0.9.2, source < 0.9.2, target < 0.9.2 3. client < 0.9.2, source >= 0.9.2, target < 0.9.2 4. client < 0.9.2, source < 0.9.2, target >= 0.9.2 5. client >= 0.9.2, source >= 0.9.2, target < 0.9.2 6. client >= 0.9.2, source < 0.9.2, target >= 0.9.2 7. client < 0.9.2, source >= 0.9.2, target >= 0.9.2 8. client >= 0.9.2, source >= 0.9.2, target >= 0.9.2 Finally, this is only testing successful migration cases. We ought to have another test which validates recovery from a variety of common migration failure scenarios. This would add another few 1000 test scenarios :-) NB, in libvirt < 0.9.2 there was a bug with handling the migration of VMs which were initially PAUSED with p2p migration which causes failures. libvirt >= 0.9.2 should have a 100% success rate. 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 :|

1 0

[libvirt] [PATCH] build: fix build --without-remote
by Eric Blake 29 Jun '11

29 Jun '11

When configured --without-remote, the files remote_protocol.[ch] are not built by src/Makefile, but are still used by daemon/Makefile. The solution is to copy the implicit rule. * daemon/Makefile.am (%protocol.c, %protocol.h): Copy from src. --- Not quite trivial enough to claim the build-breaker rule. daemon/Makefile.am | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/daemon/Makefile.am b/daemon/Makefile.am index 8ed29b8..cb3caa2 100644 --- a/daemon/Makefile.am +++ b/daemon/Makefile.am @@ -52,6 +52,14 @@ $(srcdir)/qemu_dispatch.h: $(srcdir)/../src/rpc/gendispatch.pl \ $(AM_V_GEN)perl -w $(srcdir)/../src/rpc/gendispatch.pl -b qemu \ $(QEMU_PROTOCOL) > $@ +%protocol.c: %protocol.x %protocol.h $(srcdir)/../src/rpc/genprotocol.pl + $(AM_V_GEN)perl -w $(srcdir)/../src/rpc/genprotocol.pl $(RPCGEN) -c \ + $< $@ + +%protocol.h: %protocol.x $(srcdir)/../src/rpc/genprotocol.pl + $(AM_V_GEN)perl -w $(srcdir)/../src/rpc/genprotocol.pl $(RPCGEN) -h \ + $< $@ + if WITH_LIBVIRTD man8_MANS = libvirtd.8 -- 1.7.4.4

2 2

[libvirt] ANNOUNCE: libvirt Perl bindings Sys::Virt 0.2.7 release
by Daniel P. Berrange 29 Jun '11

29 Jun '11

I am happy to announce a new release of the libvirt Perl bindings, Sys::Virt 0.2.7 is available for download: http://search.cpan.org/CPAN/authors/id/D/DA/DANBERR/Sys-Virt-0.2.7.tar.gz Changes in this release - Honour flags parameter when dumping XML - Use thread local error APIs exclusively - Fix bogus extra URI parameter in migrate_to_uri function - Implement all virStream APIs in Sys::Virt::Stream - Impement virDomainGetSysinfo binding - Call virInitialize when loading module - Add all missing error constants - Update example RPM spec to match Fedora - Requires libvirt >= 0.8.8 The permanent link for the Sys::Virt package, where all historic releases can be found, is http://search.cpan.org/dist/Sys-Virt/ Thanks to everyone who contributed to this release through testing, bug reporting, patch submission, etc Regards, 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 :|

1 0

[libvirt] libvirt-php login issue to ESXi
by Koen Calliauw 29 Jun '11

29 Jun '11

Hi all, I've started playing with libvirt-php yesterday and with the help of Michal Novotny got it running quite painlessly. However, the login from PHP to my testing ESXi server seems to be failing. I've wiresharked the HTTP traffic with a virsh -c (which works) and compared that to the traffic I see when using the libvirt-php extension, here's the difference I see (mind the username) Not working (libvirt-php) <Login xmlns="urn:vim25"><_this xmlns="urn:vim25" xsi:type="ManagedObjectReference" type="SessionManager">ha-sessionmgr</_this><userName xmlns="urn:vim25" xsi:type="xsd:string">root8.</userName><password xmlns="urn:vim25" xsi:type="xsd:string">fakepass</password></Login> Working (virsh -c) <Login xmlns="urn:vim25"><_this xmlns="urn:vim25" xsi:type="ManagedObjectReference" type="SessionManager">ha-sessionmgr</_this><userName xmlns="urn:vim25" xsi:type="xsd:string">root</userName><password xmlns="urn:vim25" xsi:type="xsd:string">fakepass</password></Login> So for some reason something gets appended (8.) or encoded wrong or something when I use the PHP extension. This is the testing code I run: <?php $credentials = array(VIR_CRED_AUTHNAME=>'root',VIR_CRED_PASSPHRASE=>'fakepass'); $conn = libvirt_connect("esx://10.9.0.2?transport=http", FALSE, $credentials); if($conn) { print_r(libvirt_connect_get_hypervisor($conn)); } else { echo "Connection failed: ".libvirt_get_last_error(); } Any help with this issue would be greatly appreciated. Thanks! Best regards, Koen Calliauw

2 9

[libvirt] [PATCH] virDomainEventCallbackListAddID: allow different domains to register lifecycle events
by boettcher＠tudos.org 29 Jun '11

29 Jun '11

Hello, I had trouble of registering an VIR_DOMAIN_EVENT_ID_LIFECYLCE event for different domains separately. First I invoke [0] with one domain, and later with another one. For the second call the operation will be denied by "libvir: error : internal error event callback already tracked". I assume this should be possible for different domains to register LIFECYLCE handler separately. In that case please consider the attached patch. Thanks, Alex B. [0] virConnectDomainEventRegisterAny( conn, domX, VIR_DOM_EVENT_ID_LIFECYLCE, VIR_DOMAIN_EVENT_CALLBACK(myDomainEventCallback2), strdup("callback 2"), myFreeFunc);

1 0

[libvirt] [PATCH] screenshot: Set access rights to temporary file
by Michal Privoznik 29 Jun '11

29 Jun '11

Although we create a temporary file, it is owned by root:root and have rights 0600. In case qemu does not run under root, it is unable to write to that file and thus we transfer 0B sized file. --- src/qemu/qemu_driver.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 8b65c26..562ec42 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -2729,6 +2729,8 @@ qemuDomainScreenshot(virDomainPtr dom, goto endjob; } + virSecurityManagerSetSavedStateLabel(qemu_driver->securityManager, vm, tmp); + qemuDomainObjEnterMonitor(vm); if (qemuMonitorScreendump(priv->mon, tmp) < 0) { qemuDomainObjExitMonitor(vm); -- 1.7.5.rc3

2 2

[libvirt] [PATCH] dnsmasq: Fix errno handling and don't unlink non-existing files
by Matthias Bolte 29 Jun '11

29 Jun '11

addnhostsSave and hostsfileSave expect < 0 return value on error from addnhostsWrite and hostsfileWrite but then pass err instead of -err to virReportSystemError that expects an errno value. Also addnhostsWrite returns -ENOMEM and errno, change this to -errno. addnhostsWrite and hostsfileWrite tried to unlink the tempfile after renaming it, making both fail on the final step. Remove the unnecessary unlink calls. --- src/util/dnsmasq.c | 44 +++++++++++++++----------------------------- 1 files changed, 15 insertions(+), 29 deletions(-) diff --git a/src/util/dnsmasq.c b/src/util/dnsmasq.c index 5baa34f..aadca10 100644 --- a/src/util/dnsmasq.c +++ b/src/util/dnsmasq.c @@ -185,14 +185,14 @@ addnhostsWrite(const char *path, if (!(f = fopen(tmp, "w"))) { istmp = false; if (!(f = fopen(path, "w"))) { - rc = errno; + rc = -errno; goto cleanup; } } for (i = 0; i < nhosts; i++) { if (fputs(hosts[i].ip, f) == EOF || fputc('\t', f) == EOF) { - rc = errno; + rc = -errno; VIR_FORCE_FCLOSE(f); if (istmp) @@ -203,7 +203,7 @@ addnhostsWrite(const char *path, for (ii = 0; ii < hosts[i].nhostnames; ii++) { if (fputs(hosts[i].hostnames[ii], f) == EOF || fputc('\t', f) == EOF) { - rc = errno; + rc = -errno; VIR_FORCE_FCLOSE(f); if (istmp) @@ -214,7 +214,7 @@ addnhostsWrite(const char *path, } if (fputc('\n', f) == EOF) { - rc = errno; + rc = -errno; VIR_FORCE_FCLOSE(f); if (istmp) @@ -225,21 +225,14 @@ addnhostsWrite(const char *path, } if (VIR_FCLOSE(f) == EOF) { - rc = errno; + rc = -errno; goto cleanup; } - if (istmp) { - if (rename(tmp, path) < 0) { - rc = errno; - unlink(tmp); - goto cleanup; - } - - if (unlink(tmp) < 0) { - rc = errno; - goto cleanup; - } + if (istmp && rename(tmp, path) < 0) { + rc = -errno; + unlink(tmp); + goto cleanup; } cleanup: @@ -255,7 +248,7 @@ addnhostsSave(dnsmasqAddnHostsfile *addnhostsfile) addnhostsfile->nhosts); if (err < 0) { - virReportSystemError(err, _("cannot write config file '%s'"), + virReportSystemError(-err, _("cannot write config file '%s'"), addnhostsfile->path); return -1; } @@ -402,17 +395,10 @@ hostsfileWrite(const char *path, goto cleanup; } - if (istmp) { - if (rename(tmp, path) < 0) { - rc = -errno; - unlink(tmp); - goto cleanup; - } - - if (unlink(tmp) < 0) { - rc = -errno; - goto cleanup; - } + if (istmp && rename(tmp, path) < 0) { + rc = -errno; + unlink(tmp); + goto cleanup; } cleanup: @@ -428,7 +414,7 @@ hostsfileSave(dnsmasqHostsfile *hostsfile) hostsfile->nhosts); if (err < 0) { - virReportSystemError(err, _("cannot write config file '%s'"), + virReportSystemError(-err, _("cannot write config file '%s'"), hostsfile->path); return -1; } -- 1.7.0.4

2 2

[libvirt] [PATCH 0/9] Misc bug fixes to new RPC code
by Daniel P. Berrange 29 Jun '11

29 Jun '11

This is a series of bug fixes to the new RPC code I have done since I posted the original series, which is now merged. Most of these fixes relate to handling of I/O streams. Patches 1 and 9 also impacted the original code prior to the RPC rewrite, and should be backported by people maintaining old branches

2 20

[libvirt] [PATCH] maint: improve makefile whitespace
by Eric Blake 29 Jun '11

29 Jun '11

None of these instances cause any semantic differences, but consistency is nice. * src/Makefile.am: Replace leading spaces with tabs. --- Pushing under the trivial rule. src/Makefile.am | 26 +++++++++++++------------- 1 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 7fbbb3f..8f99cc2 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -299,13 +299,13 @@ VMWARE_DRIVER_SOURCES = \ vmware/vmware_conf.c vmware/vmware_conf.h VBOX_DRIVER_SOURCES = \ - vbox/vbox_glue.c vbox/vbox_glue.h \ - vbox/vbox_driver.c vbox/vbox_driver.h \ - vbox/vbox_V2_2.c vbox/vbox_CAPI_v2_2.h \ - vbox/vbox_V3_0.c vbox/vbox_CAPI_v3_0.h \ - vbox/vbox_V3_1.c vbox/vbox_CAPI_v3_1.h \ - vbox/vbox_V3_2.c vbox/vbox_CAPI_v3_2.h \ - vbox/vbox_V4_0.c vbox/vbox_CAPI_v4_0.h + vbox/vbox_glue.c vbox/vbox_glue.h \ + vbox/vbox_driver.c vbox/vbox_driver.h \ + vbox/vbox_V2_2.c vbox/vbox_CAPI_v2_2.h \ + vbox/vbox_V3_0.c vbox/vbox_CAPI_v3_0.h \ + vbox/vbox_V3_1.c vbox/vbox_CAPI_v3_1.h \ + vbox/vbox_V3_2.c vbox/vbox_CAPI_v3_2.h \ + vbox/vbox_V4_0.c vbox/vbox_CAPI_v4_0.h VBOX_DRIVER_EXTRA_DIST = \ vbox/vbox_tmpl.c vbox/README \ @@ -576,7 +576,7 @@ endif WITH_REMOTE %protocol.h: %protocol.x $(srcdir)/rpc/genprotocol.pl $(AM_V_GEN)perl -w $(srcdir)/rpc/genprotocol.pl $(RPCGEN) -h \ - $< $@ + $< $@ if WITH_XEN if WITH_DRIVER_MODULES @@ -1144,8 +1144,8 @@ libvirt_qemu.def: $(srcdir)/libvirt_qemu.syms # Empty source list - it merely links a bunch of convenience libs together libvirt_la_SOURCES = libvirt_la_LDFLAGS = $(VERSION_SCRIPT_FLAGS)$(LIBVIRT_SYMBOL_FILE) \ - -version-info $(LIBVIRT_VERSION_INFO) \ - $(AM_LDFLAGS) \ + -version-info $(LIBVIRT_VERSION_INFO) \ + $(AM_LDFLAGS) \ $(CYGWIN_EXTRA_LDFLAGS) $(MINGW_EXTRA_LDFLAGS) libvirt_la_BUILT_LIBADD += ../gnulib/lib/libgnu.la libvirt_la_LIBADD += $(LIBXML_LIBS) \ @@ -1178,8 +1178,8 @@ libvirt_test_la_CFLAGS = $(AM_CFLAGS) libvirt_qemu_la_SOURCES = libvirt-qemu.c libvirt_qemu_la_LDFLAGS = $(VERSION_SCRIPT_FLAGS)$(LIBVIRT_QEMU_SYMBOL_FILE) \ - -version-info $(LIBVIRT_VERSION_INFO) \ - $(CYGWIN_EXTRA_LDFLAGS) $(MINGW_EXTRA_LDFLAGS) \ + -version-info $(LIBVIRT_VERSION_INFO) \ + $(CYGWIN_EXTRA_LDFLAGS) $(MINGW_EXTRA_LDFLAGS) \ $(AM_LDFLAGS) libvirt_qemu_la_CFLAGS = $(AM_CFLAGS) libvirt_qemu_la_LIBADD = libvirt.la $(CYGWIN_EXTRA_LIBADD) @@ -1407,7 +1407,7 @@ if WITH_NETWORK $(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/default.xml && \ rm $(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/default.xml.t; } test -e $(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/autostart/default.xml || \ - ln -s ../default.xml \ + ln -s ../default.xml \ $(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/autostart/default.xml endif -- 1.7.4.4

1 0

[libvirt] [PATCH] tests: Fix memory leak in virnetmessagetest
by Osier Yang 29 Jun '11

29 Jun '11

Detected when playing with "make -C tests valgrind". --- tests/virnetmessagetest.c | 35 ++++++++++++++++++++++++----------- 1 files changed, 24 insertions(+), 11 deletions(-) diff --git a/tests/virnetmessagetest.c b/tests/virnetmessagetest.c index e707b67..61f457c 100644 --- a/tests/virnetmessagetest.c +++ b/tests/virnetmessagetest.c @@ -167,6 +167,7 @@ static int testMessagePayloadEncode(const void *args ATTRIBUTE_UNUSED) { virNetMessageError err; static virNetMessage msg; + int ret = -1; static const char expect[] = { 0x00, 0x00, 0x00, 0x74, /* Length */ 0x11, 0x22, 0x33, 0x44, /* Program */ @@ -204,19 +205,21 @@ static int testMessagePayloadEncode(const void *args ATTRIBUTE_UNUSED) err.code = VIR_ERR_INTERNAL_ERROR; err.domain = VIR_FROM_RPC; + err.level = VIR_ERR_ERROR; + if (VIR_ALLOC(err.message) < 0) - return -1; + goto cleanup; *err.message = strdup("Hello World"); - err.level = VIR_ERR_ERROR; if (VIR_ALLOC(err.str1) < 0) - return -1; + goto cleanup; *err.str1 = strdup("One"); if (VIR_ALLOC(err.str2) < 0) - return -1; + goto cleanup; *err.str2 = strdup("Two"); if (VIR_ALLOC(err.str3) < 0) - return -1; + goto cleanup; *err.str3 = strdup("Three"); + err.int1 = 1; err.int2 = 2; @@ -228,29 +231,39 @@ static int testMessagePayloadEncode(const void *args ATTRIBUTE_UNUSED) msg.header.status = VIR_NET_ERROR; if (virNetMessageEncodeHeader(&msg) < 0) - return -1; + goto cleanup; if (virNetMessageEncodePayload(&msg, (xdrproc_t)xdr_virNetMessageError, &err) < 0) - return -1; + goto cleanup; if (ARRAY_CARDINALITY(expect) != msg.bufferLength) { VIR_DEBUG("Expect message length %zu got %zu", sizeof(expect), msg.bufferLength); - return -1; + goto cleanup; } if (msg.bufferOffset != 0) { VIR_DEBUG("Expect message offset 0 got %zu", msg.bufferOffset); - return -1; + goto cleanup; } if (memcmp(expect, msg.buffer, sizeof(expect)) != 0) { virtTestDifferenceBin(stderr, expect, msg.buffer, sizeof(expect)); - return -1; - } - - return 0; + goto cleanup; + } + + ret = 0; +cleanup: + VIR_FREE(*err.message); + VIR_FREE(*err.str1); + VIR_FREE(*err.str2); + VIR_FREE(*err.str3); + VIR_FREE(err.message); + VIR_FREE(err.str1); + VIR_FREE(err.str2); + VIR_FREE(err.str3); + return ret; } static int testMessagePayloadDecode(const void *args ATTRIBUTE_UNUSED) -- 1.7.1

2 2

[libvirt] [PATCH] conf: Fix memory leak in virNetworkDNSDefFormat
by Osier Yang 29 Jun '11

29 Jun '11

--- src/conf/network_conf.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c index d0860d8..45ddee2 100644 --- a/src/conf/network_conf.c +++ b/src/conf/network_conf.c @@ -945,6 +945,7 @@ virNetworkDNSDefFormat(virBufferPtr buf, def->hosts[ii].names[j]); virBufferAsprintf(buf, " </host>\n"); + VIR_FREE(ip); } } -- 1.7.1

2 2

[libvirt] [PATCH] network: Don't ignore errors in dnsmasq config file creation
by Matthias Bolte 29 Jun '11

29 Jun '11

--- This patch depends on https://www.redhat.com/archives/libvir-list/2011-June/msg01423.html src/network/bridge_driver.c | 23 +++++++++++++---------- src/util/dnsmasq.c | 10 ++++------ src/util/dnsmasq.h | 4 ++-- 3 files changed, 19 insertions(+), 18 deletions(-) diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index f48fdcb..f54a966 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -446,7 +446,8 @@ networkBuildDnsmasqHostsfile(dnsmasqContext *dctx, for (i = 0; i < ipdef->nhosts; i++) { virNetworkDHCPHostDefPtr host = &(ipdef->hosts[i]); if ((host->mac) && VIR_SOCKET_HAS_ADDR(&host->ip)) - dnsmasqAddDhcpHost(dctx, host->mac, &host->ip, host->name); + if (dnsmasqAddDhcpHost(dctx, host->mac, &host->ip, host->name) < 0) + return -1; } if (dnsdef) { @@ -454,7 +455,8 @@ networkBuildDnsmasqHostsfile(dnsmasqContext *dctx, virNetworkDNSHostsDefPtr host = &(dnsdef->hosts[i]); if (VIR_SOCKET_HAS_ADDR(&host->ip)) { for (j = 0; j < host->nnames; j++) - dnsmasqAddHost(dctx, &host->ip, host->names[j]); + if (dnsmasqAddHost(dctx, &host->ip, host->names[j]) < 0) + return -1; } } } @@ -600,14 +602,15 @@ networkBuildDnsmasqArgv(virNetworkObjPtr network, if (ipdef->nranges || ipdef->nhosts) virCommandAddArg(cmd, "--dhcp-no-override"); - if (networkBuildDnsmasqHostsfile(dctx, ipdef, network->def->dns) >= 0) { - if (dctx->hostsfile->nhosts) - virCommandAddArgPair(cmd, "--dhcp-hostsfile", - dctx->hostsfile->path); - if (dctx->addnhostsfile->nhosts) - virCommandAddArgPair(cmd, "--addn-hosts", - dctx->addnhostsfile->path); - } + if (networkBuildDnsmasqHostsfile(dctx, ipdef, network->def->dns) < 0) + goto cleanup; + + if (dctx->hostsfile->nhosts) + virCommandAddArgPair(cmd, "--dhcp-hostsfile", + dctx->hostsfile->path); + if (dctx->addnhostsfile->nhosts) + virCommandAddArgPair(cmd, "--addn-hosts", + dctx->addnhostsfile->path); if (ipdef->tftproot) { virCommandAddArgList(cmd, "--enable-tftp", diff --git a/src/util/dnsmasq.c b/src/util/dnsmasq.c index 4bdbb44..5baa34f 100644 --- a/src/util/dnsmasq.c +++ b/src/util/dnsmasq.c @@ -502,14 +502,13 @@ dnsmasqContextFree(dnsmasqContext *ctx) * * Add dhcp-host entry. */ -void +int dnsmasqAddDhcpHost(dnsmasqContext *ctx, const char *mac, virSocketAddr *ip, const char *name) { - if (ctx->hostsfile) - hostsfileAdd(ctx->hostsfile, mac, ip, name); + return hostsfileAdd(ctx->hostsfile, mac, ip, name); } /* @@ -521,13 +520,12 @@ dnsmasqAddDhcpHost(dnsmasqContext *ctx, * Add additional host entry. */ -void +int dnsmasqAddHost(dnsmasqContext *ctx, virSocketAddr *ip, const char *name) { - if (ctx->addnhostsfile) - addnhostsAdd(ctx->addnhostsfile, ip, name); + return addnhostsAdd(ctx->addnhostsfile, ip, name); } /** diff --git a/src/util/dnsmasq.h b/src/util/dnsmasq.h index 62f6f38..d16a54f 100644 --- a/src/util/dnsmasq.h +++ b/src/util/dnsmasq.h @@ -68,11 +68,11 @@ typedef struct dnsmasqContext * dnsmasqContextNew(const char *network_name, const char *config_dir); void dnsmasqContextFree(dnsmasqContext *ctx); -void dnsmasqAddDhcpHost(dnsmasqContext *ctx, +int dnsmasqAddDhcpHost(dnsmasqContext *ctx, const char *mac, virSocketAddr *ip, const char *name); -void dnsmasqAddHost(dnsmasqContext *ctx, +int dnsmasqAddHost(dnsmasqContext *ctx, virSocketAddr *ip, const char *name); int dnsmasqSave(const dnsmasqContext *ctx); -- 1.7.0.4

2 2

[libvirt] [PATCH] network: Fix dnsmasq hostsfile creation logic and related tests
by Matthias Bolte 29 Jun '11

29 Jun '11

networkSaveDnsmasqHostsfile was added in 8fa9c2214247 (Apr 2010). It has a force flag. If the dnsmasq hostsfile already exists force needs to be true to overwrite it. networkBuildDnsmasqArgv sets force to false, networkDefine sets it to true. This results in the hostsfile being written only in networkDefine in the common case. If no error occurred networkSaveDnsmasqHostsfile returns true and networkBuildDnsmasqArgv adds the --dhcp-hostsfile to the dnsmasq command line. networkSaveDnsmasqHostsfile was changed in 89ae9849f744 (24 Jun 2011) to return a new dnsmasqContext instead of reusing one. This change broke the logic of the force flag as now networkSaveDnsmasqHostsfile returns NULL on error, but the early return -- if force was not set and the hostsfile exists -- returns 0. This turned the early return in an error case and networkBuildDnsmasqArgv didn't add the --dhcp-hostsfile option anymore if the hostsfile already exists. It did because networkDefine created the hostsfile already. Then 9d4e2845d498 fixed the return 0 case in networkSaveDnsmasqHostsfile but didn't apply the force option correctly to the new addnhosts file. Now force doesn't control an early return anymore, but influences the handling of the hostsfile context creation and dnsmasqSave is always called now. This commit also added test cases that reveal several problems. First, the tests now call functions that try to write the dnsmasq config files to disk. If someone runs this tests as root this might overwrite actively used dnsmasq config files, this is a no-go. Also the tests depend onconfigure --localstatedir, this needs to be fixed as well, because it makes the tests fail when localstatedir is different from /var. This patch does several things to fix this: 1) Move dnsmasqContext creation and saving out of networkBuildDnsmasqArgv to the caller to separate the command line generation from the config file writing. This makes the command line generation testable without the risk of interfering with system files, because the tests just don't call dnsmasqSave. 2) This refactoring of networkSaveDnsmasqHostsfile makes the force flag useless as the saving happens somewhere else now. This fixes the wrong usage of the force flag in combination with then newly added addnhosts file by removing the force flag. 3) Adapt the wrong test cases to the correct behavior, by adding the missing --dhcp-hostsfile option. Both affected tests contain DHCP host elements but missed the necessary --dhcp-hostsfile option. 4) Rename networkSaveDnsmasqHostsfile to networkBuildDnsmasqHostsfile, because it doesn't save the dnsmasqContext anymore. 5) Move all directory creations in dnsmasq context handling code from the *New functions to dnsmasqSave to avoid directory creations in system paths in the test cases. 6) Now that networkBuildDnsmasqArgv doesn't create the dnsmasqContext anymore the test case can create one with the localstatedir that is expected by the tests instead of the configure --localstatedir given one. --- src/network/bridge_driver.c | 71 +++++++++----------- src/network/bridge_driver.h | 5 +- src/util/dnsmasq.c | 28 ++++---- src/util/dnsmasq.h | 1 + .../nat-network-dns-txt-record.argv | 3 +- tests/networkxml2argvdata/nat-network.argv | 3 +- tests/networkxml2argvtest.c | 8 ++- 7 files changed, 63 insertions(+), 56 deletions(-) diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index aa170d6..f48fdcb 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -436,27 +436,17 @@ networkShutdown(void) { } -static dnsmasqContext* -networkSaveDnsmasqHostsfile(virNetworkIpDefPtr ipdef, - virNetworkDNSDefPtr dnsdef, - char *name, - bool force) +static int +networkBuildDnsmasqHostsfile(dnsmasqContext *dctx, + virNetworkIpDefPtr ipdef, + virNetworkDNSDefPtr dnsdef) { unsigned int i, j; - dnsmasqContext *dctx = dnsmasqContextNew(name, - DNSMASQ_STATE_DIR); - if (dctx == NULL) { - virReportOOMError(); - goto cleanup; - } - - if (!(! force && virFileExists(dctx->hostsfile->path))) { - for (i = 0; i < ipdef->nhosts; i++) { - virNetworkDHCPHostDefPtr host = &(ipdef->hosts[i]); - if ((host->mac) && VIR_SOCKET_HAS_ADDR(&host->ip)) - dnsmasqAddDhcpHost(dctx, host->mac, &host->ip, host->name); - } + for (i = 0; i < ipdef->nhosts; i++) { + virNetworkDHCPHostDefPtr host = &(ipdef->hosts[i]); + if ((host->mac) && VIR_SOCKET_HAS_ADDR(&host->ip)) + dnsmasqAddDhcpHost(dctx, host->mac, &host->ip, host->name); } if (dnsdef) { @@ -469,15 +459,7 @@ networkSaveDnsmasqHostsfile(virNetworkIpDefPtr ipdef, } } - if (dnsmasqSave(dctx) < 0) - goto cleanup; - - return dctx; - -cleanup: - dnsmasqContextFree(dctx); - - return NULL; + return 0; } @@ -485,12 +467,13 @@ static int networkBuildDnsmasqArgv(virNetworkObjPtr network, virNetworkIpDefPtr ipdef, const char *pidfile, - virCommandPtr cmd) { + virCommandPtr cmd, + dnsmasqContext *dctx) +{ int r, ret = -1; int nbleases = 0; int ii; virNetworkIpDefPtr tmpipdef; - dnsmasqContext *dctx = NULL; /* * NB, be careful about syntax for dnsmasq options in long format. @@ -617,14 +600,13 @@ networkBuildDnsmasqArgv(virNetworkObjPtr network, if (ipdef->nranges || ipdef->nhosts) virCommandAddArg(cmd, "--dhcp-no-override"); - if ((dctx = networkSaveDnsmasqHostsfile(ipdef, network->def->dns, network->def->name, false))) { + if (networkBuildDnsmasqHostsfile(dctx, ipdef, network->def->dns) >= 0) { if (dctx->hostsfile->nhosts) virCommandAddArgPair(cmd, "--dhcp-hostsfile", dctx->hostsfile->path); if (dctx->addnhostsfile->nhosts) virCommandAddArgPair(cmd, "--addn-hosts", dctx->addnhostsfile->path); - dnsmasqContextFree(dctx); } if (ipdef->tftproot) { @@ -655,7 +637,7 @@ cleanup: int networkBuildDhcpDaemonCommandLine(virNetworkObjPtr network, virCommandPtr *cmdout, - char *pidfile) + char *pidfile, dnsmasqContext *dctx) { virCommandPtr cmd = NULL; int ret = -1, ii; @@ -684,7 +666,7 @@ networkBuildDhcpDaemonCommandLine(virNetworkObjPtr network, virCommandPtr *cmdou return 0; cmd = virCommandNew(DNSMASQ); - if (networkBuildDnsmasqArgv(network, ipdef, pidfile, cmd) < 0) { + if (networkBuildDnsmasqArgv(network, ipdef, pidfile, cmd, dctx) < 0) { goto cleanup; } @@ -704,6 +686,7 @@ networkStartDhcpDaemon(virNetworkObjPtr network) char *pidfile = NULL; int ret = -1; int err; + dnsmasqContext *dctx = NULL; if ((err = virFileMakePath(NETWORK_PID_DIR)) != 0) { virReportSystemError(err, @@ -730,8 +713,16 @@ networkStartDhcpDaemon(virNetworkObjPtr network) goto cleanup; } - ret = networkBuildDhcpDaemonCommandLine(network,&cmd, pidfile); - if (ret< 0) + dctx = dnsmasqContextNew(network->def->name, DNSMASQ_STATE_DIR); + if (dctx == NULL) + goto cleanup; + + ret = networkBuildDhcpDaemonCommandLine(network, &cmd, pidfile, dctx); + if (ret < 0) + goto cleanup; + + ret = dnsmasqSave(dctx); + if (ret < 0) goto cleanup; if (virCommandRun(cmd, NULL) < 0) @@ -753,6 +744,7 @@ networkStartDhcpDaemon(virNetworkObjPtr network) cleanup: VIR_FREE(pidfile); virCommandFree(cmd); + dnsmasqContextFree(dctx); return ret; } @@ -2205,6 +2197,7 @@ static virNetworkPtr networkDefine(virConnectPtr conn, const char *xml) { virNetworkObjPtr network = NULL; virNetworkPtr ret = NULL; int ii; + dnsmasqContext* dctx = NULL; networkDriverLock(driver); @@ -2251,10 +2244,11 @@ static virNetworkPtr networkDefine(virConnectPtr conn, const char *xml) { } } if (ipv4def) { - dnsmasqContext* dctx = networkSaveDnsmasqHostsfile(ipv4def, network->def->dns, network->def->name, true); - if (dctx == NULL) + dctx = dnsmasqContextNew(network->def->name, DNSMASQ_STATE_DIR); + if (dctx == NULL || + networkBuildDnsmasqHostsfile(dctx, ipv4def, network->def->dns) < 0 || + dnsmasqSave(dctx) < 0) goto cleanup; - dnsmasqContextFree(dctx); } VIR_INFO("Defining network '%s'", network->def->name); @@ -2262,6 +2256,7 @@ static virNetworkPtr networkDefine(virConnectPtr conn, const char *xml) { cleanup: virNetworkDefFree(def); + dnsmasqContextFree(dctx); if (network) virNetworkObjUnlock(network); networkDriverUnlock(driver); diff --git a/src/network/bridge_driver.h b/src/network/bridge_driver.h index a106e3d..2896c84 100644 --- a/src/network/bridge_driver.h +++ b/src/network/bridge_driver.h @@ -30,9 +30,12 @@ # include "internal.h" # include "network_conf.h" # include "command.h" +# include "dnsmasq.h" int networkRegister(void); -int networkBuildDhcpDaemonCommandLine(virNetworkObjPtr network, virCommandPtr *cmdout, char *pidfile); +int networkBuildDhcpDaemonCommandLine(virNetworkObjPtr network, + virCommandPtr *cmdout, char *pidfile, + dnsmasqContext *dctx); typedef char *(*networkDnsmasqLeaseFileNameFunc)(const char *netname); diff --git a/src/util/dnsmasq.c b/src/util/dnsmasq.c index 04a912a..4bdbb44 100644 --- a/src/util/dnsmasq.c +++ b/src/util/dnsmasq.c @@ -142,7 +142,6 @@ static dnsmasqAddnHostsfile * addnhostsNew(const char *name, const char *config_dir) { - int err; dnsmasqAddnHostsfile *addnhostsfile; if (VIR_ALLOC(addnhostsfile) < 0) { @@ -159,12 +158,6 @@ addnhostsNew(const char *name, goto error; } - if ((err = virFileMakePath(config_dir))) { - virReportSystemError(err, _("cannot create config directory '%s'"), - config_dir); - goto error; - } - return addnhostsfile; error: @@ -344,7 +337,6 @@ static dnsmasqHostsfile * hostsfileNew(const char *name, const char *config_dir) { - int err; dnsmasqHostsfile *hostsfile; if (VIR_ALLOC(hostsfile) < 0) { @@ -361,12 +353,6 @@ hostsfileNew(const char *name, goto error; } - if ((err = virFileMakePath(config_dir))) { - virReportSystemError(err, _("cannot create config directory '%s'"), - config_dir); - goto error; - } - return hostsfile; error: @@ -468,6 +454,11 @@ dnsmasqContextNew(const char *network_name, return NULL; } + if (!(ctx->config_dir = strdup(config_dir))) { + virReportOOMError(); + goto error; + } + if (!(ctx->hostsfile = hostsfileNew(network_name, config_dir))) goto error; if (!(ctx->addnhostsfile = addnhostsNew(network_name, config_dir))) @@ -492,6 +483,8 @@ dnsmasqContextFree(dnsmasqContext *ctx) if (!ctx) return; + VIR_FREE(ctx->config_dir); + if (ctx->hostsfile) hostsfileFree(ctx->hostsfile); if (ctx->addnhostsfile) @@ -546,8 +539,15 @@ dnsmasqAddHost(dnsmasqContext *ctx, int dnsmasqSave(const dnsmasqContext *ctx) { + int err; int ret = 0; + if ((err = virFileMakePath(ctx->config_dir))) { + virReportSystemError(err, _("cannot create config directory '%s'"), + ctx->config_dir); + return -1; + } + if (ctx->hostsfile) ret = hostsfileSave(ctx->hostsfile); if (ret == 0) { diff --git a/src/util/dnsmasq.h b/src/util/dnsmasq.h index 3f6320a..62f6f38 100644 --- a/src/util/dnsmasq.h +++ b/src/util/dnsmasq.h @@ -60,6 +60,7 @@ typedef struct typedef struct { + char *config_dir; dnsmasqHostsfile *hostsfile; dnsmasqAddnHostsfile *addnhostsfile; } dnsmasqContext; diff --git a/tests/networkxml2argvdata/nat-network-dns-txt-record.argv b/tests/networkxml2argvdata/nat-network-dns-txt-record.argv index 9d74543..be6ba4b 100644 --- a/tests/networkxml2argvdata/nat-network-dns-txt-record.argv +++ b/tests/networkxml2argvdata/nat-network-dns-txt-record.argv @@ -5,4 +5,5 @@ --listen-address 2001:db8:ac10:fd01::1 --listen-address 10.24.10.1 \ --dhcp-range 192.168.122.2,192.168.122.254 \ --dhcp-leasefile=/var/lib/libvirt/dnsmasq/default.leases \ ---dhcp-lease-max=253 --dhcp-no-override\ +--dhcp-lease-max=253 --dhcp-no-override \ +--dhcp-hostsfile=/var/lib/libvirt/dnsmasq/default.hostsfile\ diff --git a/tests/networkxml2argvdata/nat-network.argv b/tests/networkxml2argvdata/nat-network.argv index 181623f..d7faee2 100644 --- a/tests/networkxml2argvdata/nat-network.argv +++ b/tests/networkxml2argvdata/nat-network.argv @@ -4,4 +4,5 @@ --listen-address 2001:db8:ac10:fd01::1 --listen-address 10.24.10.1 \ --dhcp-range 192.168.122.2,192.168.122.254 \ --dhcp-leasefile=/var/lib/libvirt/dnsmasq/default.leases \ ---dhcp-lease-max=253 --dhcp-no-override\ +--dhcp-lease-max=253 --dhcp-no-override \ +--dhcp-hostsfile=/var/lib/libvirt/dnsmasq/default.hostsfile\ diff --git a/tests/networkxml2argvtest.c b/tests/networkxml2argvtest.c index 62de191..4a11d6f 100644 --- a/tests/networkxml2argvtest.c +++ b/tests/networkxml2argvtest.c @@ -24,6 +24,7 @@ static int testCompareXMLToArgvFiles(const char *inxml, const char *outargv) { virNetworkObjPtr obj = NULL; virCommandPtr cmd = NULL; char *pidfile = NULL; + dnsmasqContext *dctx = NULL; if (virtTestLoadFile(inxml, &inXmlData) < 0) goto fail; @@ -38,8 +39,12 @@ static int testCompareXMLToArgvFiles(const char *inxml, const char *outargv) { goto fail; obj->def = dev; + dctx = dnsmasqContextNew(dev->name, "/var/lib/libvirt/dnsmasq"); - if (networkBuildDhcpDaemonCommandLine(obj, &cmd, pidfile) < 0) + if (dctx == NULL) + goto fail; + + if (networkBuildDhcpDaemonCommandLine(obj, &cmd, pidfile, dctx) < 0) goto fail; if (!(actual = virCommandToString(cmd))) @@ -59,6 +64,7 @@ static int testCompareXMLToArgvFiles(const char *inxml, const char *outargv) { VIR_FREE(pidfile); virCommandFree(cmd); virNetworkObjFree(obj); + dnsmasqContextFree(dctx); return ret; } -- 1.7.0.4

3 3

[libvirt] [PATCH] Fix compliation with systemtap 1.3
by Matthias Bolte 28 Jun '11

28 Jun '11

Version 1.3 uses this macro #define STAP_CAST(t) (size_t)t that breaks if t is a function. For that to work it should probably look like this #define STAP_CAST(t) ((size_t)(t)) In systemtap 1.4 this was completely rewritten. Anyway, before commit df0b57a95a767c t was always a variable, but now also a function is used here, namely virNetSASLSessionGetIdentity. Use an intermediate variable to avoid this problem. --- daemon/remote.c | 17 +++++++++-------- 1 files changed, 9 insertions(+), 8 deletions(-) diff --git a/daemon/remote.c b/daemon/remote.c index 9547702..9e6cf77 100644 --- a/daemon/remote.c +++ b/daemon/remote.c @@ -1759,13 +1759,13 @@ remoteSASLFinish(virNetServerClientPtr client) if (virNetServerClientSetIdentity(client, identity) < 0) goto error; - virNetServerClientSetSASLSession(client, priv->sasl); VIR_DEBUG("Authentication successful %d", virNetServerClientGetFD(client)); + + identity = virNetSASLSessionGetIdentity(priv->sasl); PROBE(CLIENT_AUTH_ALLOW, "fd=%d, auth=%d, username=%s", - virNetServerClientGetFD(client), REMOTE_AUTH_SASL, - virNetSASLSessionGetIdentity(priv->sasl)); + virNetServerClientGetFD(client), REMOTE_AUTH_SASL, identity); virNetSASLSessionFree(priv->sasl); priv->sasl = NULL; @@ -1793,6 +1793,7 @@ remoteDispatchAuthSaslStart(virNetServerPtr server ATTRIBUTE_UNUSED, int rv = -1; struct daemonClientPrivate *priv = virNetServerClientGetPrivateData(client); + const char *identity; virMutexLock(&priv->lock); @@ -1856,9 +1857,9 @@ authfail: goto error; authdeny: + identity = virNetSASLSessionGetIdentity(priv->sasl); PROBE(CLIENT_AUTH_DENY, "fd=%d, auth=%d, username=%s", - virNetServerClientGetFD(client), REMOTE_AUTH_SASL, - virNetSASLSessionGetIdentity(priv->sasl)); + virNetServerClientGetFD(client), REMOTE_AUTH_SASL, identity); goto error; error: @@ -1888,7 +1889,7 @@ remoteDispatchAuthSaslStep(virNetServerPtr server ATTRIBUTE_UNUSED, int rv = -1; struct daemonClientPrivate *priv = virNetServerClientGetPrivateData(client); - + const char *identity; virMutexLock(&priv->lock); @@ -1952,9 +1953,9 @@ authfail: goto error; authdeny: + identity = virNetSASLSessionGetIdentity(priv->sasl); PROBE(CLIENT_AUTH_DENY, "fd=%d, auth=%d, username=%s", - virNetServerClientGetFD(client), REMOTE_AUTH_SASL, - virNetSASLSessionGetIdentity(priv->sasl)); + virNetServerClientGetFD(client), REMOTE_AUTH_SASL, identity); goto error; error: -- 1.7.0.4

2 2

[libvirt] [PATCH] build: fix mingw build
by Eric Blake 28 Jun '11

28 Jun '11

./autobuild.sh died on several messages resembling: ../../src/rpc/virnetsocket.c: In function 'virNetSocketNewListenTCP': ../../src/rpc/virnetsocket.c:231:9: error: implicit declaration of function 'bind_used_without_requesting_gnulib_module_bind' [-Wimplicit-function-declaration] ../../src/rpc/virnetsocket.c:231:9: error: nested extern declaration of 'bind_used_without_requesting_gnulib_module_bind' [-Wnested-externs] Basically, gnulib socket fds are not safe to pass to mingw socket functions unless we pull in those gnulib modules. * bootstrap.conf (gnulib_modules): Add modules to handle socket functions on mingw. --- Pushing under the build-breaker rule. bootstrap.conf | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/bootstrap.conf b/bootstrap.conf index 7b2cd60..581d60b 100644 --- a/bootstrap.conf +++ b/bootstrap.conf @@ -19,8 +19,10 @@ # gnulib modules used by this package. gnulib_modules=' +accept areadlink base64 +bind byteswap c-ctype c-strcase @@ -40,6 +42,8 @@ getaddrinfo getcwd-lgpl gethostname getpass +getpeername +getsockname gettext-h gettimeofday gitlog-to-changelog @@ -48,6 +52,7 @@ ignore-value inet_pton intprops ioctl +listen maintainer-makefile manywarnings mkstemp -- 1.7.4.4

1 0

[libvirt] [PATCH] sysinfo: fix parsing regression
by Eric Blake 28 Jun '11

28 Jun '11

Detected by gcc -O2, introduced in commit 532ce9c2. If dmidecode outputs a field unrecognized by the parsers, then the code would dereference an uninitialized eol variable. * src/util/sysinfo.c (virSysinfoParseBIOS) (virSysinfoParseSystem, virSysinfoParseProcessor) (virSysinfoParseMemory): Avoid uninitialized variable. --- I'm pushing this under the build-breaker rule. It introduces a merge conflict with the (unapplied) patch here: https://www.redhat.com/archives/libvir-list/2011-June/msg01356.html but that patch needs to be rebased anyways. src/util/sysinfo.c | 14 ++++++++++---- 1 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/util/sysinfo.c b/src/util/sysinfo.c index bff1cb8..d32f7f0 100644 --- a/src/util/sysinfo.c +++ b/src/util/sysinfo.c @@ -130,7 +130,7 @@ virSysinfoRead(void) { static char * virSysinfoParseBIOS(char *base, virSysinfoDefPtr ret) { - char *cur, *eol; + char *cur, *eol = NULL; if ((cur = strstr(base, "Vendor: ")) != NULL) { cur += 8; @@ -157,7 +157,7 @@ virSysinfoParseBIOS(char *base, virSysinfoDefPtr ret) goto no_memory; } - return eol + 1; + return eol ? eol + 1 : NULL; no_memory: return NULL; @@ -166,7 +166,7 @@ no_memory: static char * virSysinfoParseSystem(char *base, virSysinfoDefPtr ret) { - char *cur, *eol; + char *cur, *eol = NULL; if ((base = strstr(base, "System Information")) == NULL) return 0; @@ -215,7 +215,7 @@ virSysinfoParseSystem(char *base, virSysinfoDefPtr ret) goto no_memory; } - return eol + 1; + return eol ? eol + 1 : NULL; no_memory: return NULL; @@ -229,6 +229,7 @@ virSysinfoParseProcessor(char *base, virSysinfoDefPtr ret) while((tmp_base = strstr(base, "Processor Information")) != NULL) { base = tmp_base; + eol = NULL; if (VIR_EXPAND_N(ret->processor, ret->nprocessor, 1) < 0) { goto no_memory; @@ -313,6 +314,8 @@ virSysinfoParseProcessor(char *base, virSysinfoDefPtr ret) goto no_memory; } + if (!eol) + break; base = eol + 1; } @@ -330,6 +333,7 @@ virSysinfoParseMemory(char *base, virSysinfoDefPtr ret) while ((tmp_base = strstr(base, "Memory Device")) != NULL) { base = tmp_base; + eol = NULL; if (VIR_EXPAND_N(ret->memory, ret->nmemory, 1) < 0) { goto no_memory; @@ -411,6 +415,8 @@ virSysinfoParseMemory(char *base, virSysinfoDefPtr ret) } next: + if (!eol) + break; base = eol + 1; } -- 1.7.4.4

1 0

[libvirt] [PATCH] build: Don't expect translatable strings in a dead file
by Jiri Denemark 28 Jun '11

28 Jun '11

daemon/remote_dispatch_bodies.h is no longer with us and shouldn't be searched for translatable strings. --- Pushed under the build-breaker rule. po/POTFILES.in | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/po/POTFILES.in b/po/POTFILES.in index a81fc55..1f226fd 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -1,6 +1,5 @@ daemon/libvirtd.c daemon/remote.c -daemon/remote_dispatch_bodies.h daemon/stream.c gnulib/lib/gai_strerror.c src/conf/cpu_conf.c -- 1.7.6

2 1

[libvirt] [PATCH] daemon: Fix build without polkit
by Jiri Denemark 28 Jun '11

28 Jun '11

--- Pushed under the build-breaker rule. daemon/libvirtd.c | 10 +++++----- daemon/remote.c | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/daemon/libvirtd.c b/daemon/libvirtd.c index 62f089d..d1f80e4 100644 --- a/daemon/libvirtd.c +++ b/daemon/libvirtd.c @@ -874,7 +874,7 @@ static void daemonConfigFree(struct daemonConfig *data); static struct daemonConfig* -daemonConfigNew(bool privileged) +daemonConfigNew(bool privileged ATTRIBUTE_UNUSED) { struct daemonConfig *data; char *localhost; @@ -1034,8 +1034,10 @@ daemonConfigLoad(struct daemonConfig *data, */ if (data->auth_unix_rw == REMOTE_AUTH_POLKIT) { VIR_FREE(data->unix_sock_rw_perms); - if (!(data->unix_sock_rw_perms = strdup("0777"))) - goto no_memory; + if (!(data->unix_sock_rw_perms = strdup("0777"))) { + virReportOOMError(); + goto error; + } } #endif if (remoteConfigGetAuth(conf, "auth_unix_ro", &data->auth_unix_ro, filename) < 0) @@ -1091,8 +1093,6 @@ daemonConfigLoad(struct daemonConfig *data, virConfFree (conf); return 0; -no_memory: - virReportOOMError(); error: virConfFree (conf); return -1; diff --git a/daemon/remote.c b/daemon/remote.c index 47e47e4..9547702 100644 --- a/daemon/remote.c +++ b/daemon/remote.c @@ -2209,7 +2209,7 @@ authdeny: static int remoteDispatchAuthPolkit(virNetServerPtr server ATTRIBUTE_UNUSED, - virNetServerClientPtr client, + virNetServerClientPtr client ATTRIBUTE_UNUSED, virNetMessageHeaderPtr hdr ATTRIBUTE_UNUSED, virNetMessageErrorPtr rerr, remote_auth_polkit_ret *ret ATTRIBUTE_UNUSED) -- 1.7.6

1 0

[libvirt] [PATCH] remote: fix uninitialized variable
by Eric Blake 28 Jun '11

28 Jun '11

Detected by gcc -O2: remote/remote_driver.c: In function 'doRemoteOpen': remote/remote_driver.c:2753:26: error: 'sasl' may be used uninitialized in this function [-Werror=uninitialized] * src/remote/remote_driver.c (remoteAuthSASL): Initialize sasl. --- Pushing under the build-breaker rule. src/remote/remote_driver.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index 2ac87c8..0e68bc5 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -2520,7 +2520,7 @@ remoteAuthSASL (virConnectPtr conn, struct private_data *priv, int ret = -1; const char *mechlist; virNetSASLContextPtr saslCtxt; - virNetSASLSessionPtr sasl; + virNetSASLSessionPtr sasl = NULL; VIR_DEBUG("Client initialize SASL authentication"); -- 1.7.4.4

1 0

[libvirt] [PATCH] build: fix 'make check' when pdwtags is available
by Eric Blake 28 Jun '11

28 Jun '11

Problem introduced in commit 6818cf86. * src/remote_protocol-structs: Delete unused struct. --- Pushing under the build-breaker rule. Normally, deleting a struct from remote_protocol-structs is a sign of an over-the-wire API breakage; but in this case, I've verified that the new RPC code manages to represent the same over-the-wire layout without needing this header struct. src/remote_protocol-structs | 8 -------- 1 files changed, 0 insertions(+), 8 deletions(-) diff --git a/src/remote_protocol-structs b/src/remote_protocol-structs index c07ba81..25979b4 100644 --- a/src/remote_protocol-structs +++ b/src/remote_protocol-structs @@ -1615,11 +1615,3 @@ struct remote_domain_get_control_info_ret { u_int details; uint64_t stateTime; }; -struct remote_message_header { - u_int prog; - u_int vers; - int proc; - remote_message_type type; - u_int serial; - remote_message_status status; -}; -- 1.7.4.4

1 0

[libvirt] [PATCH 0/3] Improve flexibility of SELinux labelling
by Daniel P. Berrange 28 Jun '11

28 Jun '11

This patch series adds two new features - The ability to override 'system_u:system_r:svirt_t:s0' from /etc/selinux/targeted/contexts/virtual_domain_context using the guest XML - The ability to use dynamic relabelling of resources, in combo with static VM label assignment. The latter is useful for management applications which want to be in full control of assigning VM labels (so that they can be unique across an entire cluster of hosts for example), while still benefiting from automatic relabelling of resources in the XML.

3 10

[libvirt] [PATCH 0/4 v2] Automatic lease management for sanlock
by Daniel P. Berrange 28 Jun '11

28 Jun '11

This is an update to http://www.redhat.com/archives/libvir-list/2011-June/msg00813.html Changed in this v2 posting - Incorporated feedback from v1 - Removed the cron job. This should be manually setup by the admin on only one host - Added documentation to the website on how to deploy sanlock

2 11

[libvirt] [PATCH] network: add domain to unqalified names define with <host>
by Laine Stump 28 Jun '11

28 Jun '11

If a domain name is defined for a network, add the --expand-hosts option to the dnsmasq commandline. This results in the domain being added to any hostname that is defined in a dns <host> element and contains no '.' characters (i.e. it is an "unqualified" hostname). Since PTR records are automatically created for any name define in <host>, the result of a PTR request will change from the unqualified name to the qualified name. This also has the same effect on any hostnames that dnsmasq reads from the host's /etc/hosts file. Hosts. I want to make sure that everyone notices that previous paragraph and has a chance to object if they believe this change in existing behavior will be detrimental. Note that guests will still be able to query the unqualified name, with the same results as before; it is only when a reverse lookup of an IP address is done that the result will be different, e.g. it will return "f15.example.com" instead of "f15". (In the case of guest hostnames that were learned by dnsmasq via DHCP requests, they were already getting the domain name added on, even without --expand-hosts). --- src/network/bridge_driver.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index f15a7a6..a9a0374 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -614,6 +614,10 @@ networkBuildDnsmasqArgv(virNetworkObjPtr network, if (ipdef->nranges || ipdef->nhosts) virCommandAddArg(cmd, "--dhcp-no-override"); + /* add domain to any non-qualified hostnames in /etc/hosts or addn-hosts file */ + if (network->def->domain) + virCommandAddArg(cmd, "--expand-hosts"); + if ((dctx = networkSaveDnsmasqHostsfile(ipdef, network->def->dns, network->def->name, false))) { if (dctx->hostsfile->nhosts) virCommandAddArgPair(cmd, "--dhcp-hostsfile", -- 1.7.3.4

2 2

[libvirt] [PATCH 0/4] Switch over to use the new RPC code
by Daniel P. Berrange 28 Jun '11

28 Jun '11

This patch set actually switches the libvirtd daemon and remote driver client code to use the new RPC code. While it has had a fair amount of testing, it has also been rebased many many many times. There are bound to be things in it which break, hopefully not the actual RPC wire data format, but in the client/daemon dispatch code and thread safety, etc ....

3 16

[libvirt] [PATCH 0/8 v2] Enable libvirt to attach to existing QEMU instances
by Daniel P. Berrange 28 Jun '11

28 Jun '11

An update of http://www.redhat.com/archives/libvir-list/2011-May/msg00223.html New in this series: - Split the patch up into more pieces for easier review - Add tainting of the attached process - Correctly handle removal of pidfile for attachde process - Wire up PCI address detection - Add virsh documentation

2 10

[libvirt] [PATCH] Add node prefix to virNodeGet(CPU|Memory)Stats structs and defines
by Matthias Bolte 28 Jun '11

28 Jun '11

--- daemon/remote.c | 4 +- include/libvirt/libvirt.h.in | 99 ++++++++++++++++++++---------------------- src/driver.h | 4 +- src/libvirt.c | 38 ++++++++-------- src/nodeinfo.c | 40 ++++++++-------- src/nodeinfo.h | 4 +- src/remote/remote_driver.c | 4 +- tools/virsh.c | 18 ++++---- 8 files changed, 103 insertions(+), 108 deletions(-) diff --git a/daemon/remote.c b/daemon/remote.c index 1914b25..180fefa 100644 --- a/daemon/remote.c +++ b/daemon/remote.c @@ -1557,7 +1557,7 @@ remoteDispatchNodeGetCPUStats (struct qemud_server *server ATTRIBUTE_UNUSED, remote_node_get_cpu_stats_args *args, remote_node_get_cpu_stats_ret *ret) { - virCPUStatsPtr params = NULL; + virNodeCPUStatsPtr params = NULL; int i; int cpuNum = args->cpuNum; int nparams = args->nparams; @@ -1634,7 +1634,7 @@ remoteDispatchNodeGetMemoryStats (struct qemud_server *server ATTRIBUTE_UNUSED, remote_node_get_memory_stats_args *args, remote_node_get_memory_stats_ret *ret) { - virMemoryStatsPtr params = NULL; + virNodeMemoryStatsPtr params = NULL; int i; int cellNum = args->cellNum; int nparams = args->nparams; diff --git a/include/libvirt/libvirt.h.in b/include/libvirt/libvirt.h.in index cf1a682..f029d69 100644 --- a/include/libvirt/libvirt.h.in +++ b/include/libvirt/libvirt.h.in @@ -302,135 +302,130 @@ struct _virNodeInfo { }; /** - * VIR_CPU_STATS_FIELD_LENGTH: + * VIR_NODE_CPU_STATS_FIELD_LENGTH: * * Macro providing the field length of virNodeCPUStats */ -#define VIR_CPU_STATS_FIELD_LENGTH 80 +#define VIR_NODE_CPU_STATS_FIELD_LENGTH 80 /** - * VIR_CPU_STATS_ALL_CPUS: + * VIR_NODE_CPU_STATS_ALL_CPUS: * * Macro for the total CPU time/utilization */ -#define VIR_CPU_STATS_ALL_CPUS (-1) +#define VIR_NODE_CPU_STATS_ALL_CPUS (-1) /** - * VIR_CPU_STATS_KERNEL: + * VIR_NODE_CPU_STATS_KERNEL: * * Macro for the cumulative CPU time which was spend by kernel, * since the node booting up (in nanoseconds). */ -#define VIR_CPU_STATS_KERNEL "kernel" +#define VIR_NODE_CPU_STATS_KERNEL "kernel" /** - * VIR_CPU_STATS_USER: + * VIR_NODE_CPU_STATS_USER: * * The cumulative CPU time which was spend by user processes, * since the node booting up (in nanoseconds). */ -#define VIR_CPU_STATS_USER "user" +#define VIR_NODE_CPU_STATS_USER "user" /** - * VIR_CPU_STATS_IDLE: + * VIR_NODE_CPU_STATS_IDLE: * * The cumulative idle CPU time, * since the node booting up (in nanoseconds). */ -#define VIR_CPU_STATS_IDLE "idle" +#define VIR_NODE_CPU_STATS_IDLE "idle" /** - * VIR_CPU_STATS_IOWAIT: + * VIR_NODE_CPU_STATS_IOWAIT: * * The cumulative I/O wait CPU time, * since the node booting up (in nanoseconds). */ -#define VIR_CPU_STATS_IOWAIT "iowait" +#define VIR_NODE_CPU_STATS_IOWAIT "iowait" /** - * VIR_CPU_STATS_UTILIZATION: + * VIR_NODE_CPU_STATS_UTILIZATION: * * The CPU utilization of a node. * The usage value is in percent and 100% represents all CPUs of * the node. */ -#define VIR_CPU_STATS_UTILIZATION "utilization" +#define VIR_NODE_CPU_STATS_UTILIZATION "utilization" /** - * virCPUStats: + * virNodeCPUStats: * * a virNodeCPUStats is a structure filled by virNodeGetCPUStats() * providing information about the CPU stats of the node. */ -typedef struct _virCPUStats virCPUStats; +typedef struct _virNodeCPUStats virNodeCPUStats; -struct _virCPUStats { - char field[VIR_CPU_STATS_FIELD_LENGTH]; +struct _virNodeCPUStats { + char field[VIR_NODE_CPU_STATS_FIELD_LENGTH]; unsigned long long value; }; /** - * VIR_MEMORY_STATS_FIELD_LENGTH: + * VIR_NODE_MEMORY_STATS_FIELD_LENGTH: * - * Macro providing the field length of virMemoryStats + * Macro providing the field length of virNodeMemoryStats */ -#define VIR_MEMORY_STATS_FIELD_LENGTH 80 +#define VIR_NODE_MEMORY_STATS_FIELD_LENGTH 80 /** - * VIR_MEMORY_STATS_ALL_CELLS: + * VIR_NODE_MEMORY_STATS_ALL_CELLS: * * Macro for the total memory of all cells. */ -#define VIR_MEMORY_STATS_ALL_CELLS (-1) +#define VIR_NODE_MEMORY_STATS_ALL_CELLS (-1) /** - * VIR_MEMORY_STATS_TOTAL: + * VIR_NODE_MEMORY_STATS_TOTAL: * * Macro for the total memory of specified cell: * it represents the maximum memory. */ - -#define VIR_MEMORY_STATS_TOTAL "total" +#define VIR_NODE_MEMORY_STATS_TOTAL "total" /** - * VIR_MEMORY_STATS_FREE: + * VIR_NODE_MEMORY_STATS_FREE: * * Macro for the free memory of specified cell: * On Linux, it includes buffer and cached memory, in case of - * VIR_MEMORY_STATS_ALL_CELLS. + * VIR_NODE_MEMORY_STATS_ALL_CELLS. */ - -#define VIR_MEMORY_STATS_FREE "free" +#define VIR_NODE_MEMORY_STATS_FREE "free" /** - * VIR_MEMORY_STATS_BUFFERS: + * VIR_NODE_MEMORY_STATS_BUFFERS: * * Macro for the buffer memory: On Linux, it is only returned in case of - * VIR_MEMORY_STATS_ALL_CELLS. + * VIR_NODE_MEMORY_STATS_ALL_CELLS. */ - -#define VIR_MEMORY_STATS_BUFFERS "buffers" +#define VIR_NODE_MEMORY_STATS_BUFFERS "buffers" /** - * VIR_MEMORY_STATS_CACHED: + * VIR_NODE_MEMORY_STATS_CACHED: * * Macro for the cached memory: On Linux, it is only returned in case of - * VIR_MEMORY_STATS_ALL_CELLS. + * VIR_NODE_MEMORY_STATS_ALL_CELLS. */ - -#define VIR_MEMORY_STATS_CACHED "cached" +#define VIR_NODE_MEMORY_STATS_CACHED "cached" /** - * virMemoryStats: + * virNodeMemoryStats: * - * a virMemoryStats is a structure filled by virNodeGetMemoryStats() + * a virNodeMemoryStats is a structure filled by virNodeGetMemoryStats() * providing information about the memory of the node. */ +typedef struct _virNodeMemoryStats virNodeMemoryStats; -typedef struct _virMemoryStats virMemoryStats; - -struct _virMemoryStats { - char field[VIR_MEMORY_STATS_FIELD_LENGTH]; +struct _virNodeMemoryStats { + char field[VIR_NODE_MEMORY_STATS_FIELD_LENGTH]; unsigned long long value; }; @@ -693,20 +688,20 @@ int virDomainMigrateSetMaxSpeed(virDomainPtr domain, typedef virNodeInfo *virNodeInfoPtr; /** - * virCPUStatsPtr: + * virNodeCPUStatsPtr: * - * a virCPUStatsPtr is a pointer to a virCPUStats structure. + * a virNodeCPUStatsPtr is a pointer to a virNodeCPUStats structure. */ -typedef virCPUStats *virCPUStatsPtr; +typedef virNodeCPUStats *virNodeCPUStatsPtr; /** - * virMemoryStatsPtr: + * virNodeMemoryStatsPtr: * - * a virMemoryStatsPtr is a pointer to a virMemoryStats structure. + * a virNodeMemoryStatsPtr is a pointer to a virNodeMemoryStats structure. */ -typedef virMemoryStats *virMemoryStatsPtr; +typedef virNodeMemoryStats *virNodeMemoryStatsPtr; /** * virConnectFlags @@ -844,13 +839,13 @@ char * virConnectGetCapabilities (virConnectPtr conn); int virNodeGetCPUStats (virConnectPtr conn, int cpuNum, - virCPUStatsPtr params, + virNodeCPUStatsPtr params, int *nparams, unsigned int flags); int virNodeGetMemoryStats (virConnectPtr conn, int cellNum, - virMemoryStatsPtr params, + virNodeMemoryStatsPtr params, int *nparams, unsigned int flags); diff --git a/src/driver.h b/src/driver.h index d45575a..5fd2433 100644 --- a/src/driver.h +++ b/src/driver.h @@ -380,7 +380,7 @@ typedef int (*virDrvNodeGetCPUStats) (virConnectPtr conn, int cpuNum, - virCPUStatsPtr params, + virNodeCPUStatsPtr params, int *nparams, unsigned int flags); @@ -388,7 +388,7 @@ typedef int (*virDrvNodeGetMemoryStats) (virConnectPtr conn, int cellNum, - virMemoryStatsPtr params, + virNodeMemoryStatsPtr params, int *nparams, unsigned int flags); diff --git a/src/libvirt.c b/src/libvirt.c index 36a90d1..1f4730d 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -5287,7 +5287,7 @@ error: /** * virNodeGetCPUStats: * @conn: pointer to the hypervisor connection. - * @cpuNum: number of node cpu. (VIR_CPU_STATS_ALL_CPUS means total cpu + * @cpuNum: number of node cpu. (VIR_NODE_CPU_STATS_ALL_CPUS means total cpu * statistics) * @params: pointer to node cpu time parameter objects * @nparams: number of node cpu time parameter (this value should be same or @@ -5296,23 +5296,23 @@ error: * * This function provides individual cpu statistics of the node. * If you want to get total cpu statistics of the node, you must specify - * VIR_CPU_STATS_ALL_CPUS to @cpuNum. + * VIR_NODE_CPU_STATS_ALL_CPUS to @cpuNum. * The @params array will be filled with the values equal to the number of * parameters suggested by @nparams * * As the value of @nparams is dynamic, call the API setting @nparams to 0 and * @params as NULL, the API returns the number of parameters supported by the * HV by updating @nparams on SUCCESS. The caller should then allocate @params - * array, i.e. (sizeof(@virCPUStats) * @nparams) bytes and call + * array, i.e. (sizeof(@virNodeCPUStats) * @nparams) bytes and call * the API again. * * Here is a sample code snippet: * * if ((virNodeGetCPUStats(conn, cpuNum, NULL, &nparams, 0) == 0) && * (nparams != 0)) { - * if ((params = malloc(sizeof(virCPUStats) * nparams)) == NULL) + * if ((params = malloc(sizeof(virNodeCPUStats) * nparams)) == NULL) * goto error; - * memset(params, 0, sizeof(virCPUStats) * nparams); + * memset(params, 0, sizeof(virNodeCPUStats) * nparams); * if (virNodeGetCPUStats(conn, cpuNum, params, &nparams, 0)) * goto error; * } @@ -5340,7 +5340,7 @@ error: */ int virNodeGetCPUStats (virConnectPtr conn, int cpuNum, - virCPUStatsPtr params, + virNodeCPUStatsPtr params, int *nparams, unsigned int flags) { VIR_DEBUG("conn=%p, cpuNum=%d, params=%p, nparams=%d, flags=%u", @@ -5355,7 +5355,7 @@ int virNodeGetCPUStats (virConnectPtr conn, } if ((nparams == NULL) || (*nparams < 0) || - ((cpuNum < 0) && (cpuNum != VIR_CPU_STATS_ALL_CPUS))) { + ((cpuNum < 0) && (cpuNum != VIR_NODE_CPU_STATS_ALL_CPUS))) { virLibConnError(VIR_ERR_INVALID_ARG, __FUNCTION__); goto error; } @@ -5377,8 +5377,8 @@ error: /** * virNodeGetMemoryStats: * @conn: pointer to the hypervisor connection. - * @cellNum: number of node cell. (VIR_MEMORY_STATS_ALL_CELLS means total cell - * statistics) + * @cellNum: number of node cell. (VIR_NODE_MEMORY_STATS_ALL_CELLS means total + * cell statistics) * @params: pointer to node memory stats objects * @nparams: number of node memory stats (this value should be same or * less than the number of stats supported) @@ -5386,23 +5386,23 @@ error: * * This function provides memory stats of the node. * If you want to get total cpu statistics of the node, you must specify - * VIR_MEMORY_STATS_ALL_CELLS to @cellNum. + * VIR_NODE_MEMORY_STATS_ALL_CELLS to @cellNum. * The @params array will be filled with the values equal to the number of * stats suggested by @nparams * * As the value of @nparams is dynamic, call the API setting @nparams to 0 and * @params as NULL, the API returns the number of parameters supported by the * HV by updating @nparams on SUCCESS. The caller should then allocate @params - * array, i.e. (sizeof(@virMemoryStats) * @nparams) bytes and call + * array, i.e. (sizeof(@virNodeMemoryStats) * @nparams) bytes and call * the API again. * * Here is the sample code snippet: * * if ((virNodeGetMemoryStats(conn, cellNum, NULL, &nparams, 0) == 0) && * (nparams != 0)) { - * if ((params = malloc(sizeof(virMemoryStats) * nparams)) == NULL) + * if ((params = malloc(sizeof(virNodeMemoryStats) * nparams)) == NULL) * goto error; - * memset(params, cellNum, 0, sizeof(virMemoryStats) * nparams); + * memset(params, cellNum, 0, sizeof(virNodeMemoryStats) * nparams); * if (virNodeGetMemoryStats(conn, params, &nparams, 0)) * goto error; * } @@ -5412,21 +5412,21 @@ error: * * Memory Stats: * - * VIR_MEMORY_STATS_TOTAL: + * VIR_NODE_MEMORY_STATS_TOTAL: * The total memory usage.(KB) - * VIR_MEMORY_STATS_FREE: + * VIR_NODE_MEMORY_STATS_FREE: * The free memory usage.(KB) * On linux, this usage includes buffers and cached. - * VIR_MEMORY_STATS_BUFFERS: + * VIR_NODE_MEMORY_STATS_BUFFERS: * The buffers memory usage.(KB) - * VIR_MEMORY_STATS_CACHED: + * VIR_NODE_MEMORY_STATS_CACHED: * The cached memory usage.(KB) * * Returns -1 in case of error, 0 in case of success. */ int virNodeGetMemoryStats (virConnectPtr conn, int cellNum, - virMemoryStatsPtr params, + virNodeMemoryStatsPtr params, int *nparams, unsigned int flags) { VIR_DEBUG("conn=%p, cellNum=%d, params=%p, nparams=%d, flags=%u", @@ -5441,7 +5441,7 @@ int virNodeGetMemoryStats (virConnectPtr conn, } if ((nparams == NULL) || (*nparams < 0) || - ((cellNum < 0) && (cellNum != VIR_MEMORY_STATS_ALL_CELLS))) { + ((cellNum < 0) && (cellNum != VIR_NODE_MEMORY_STATS_ALL_CELLS))) { virLibConnError(VIR_ERR_INVALID_ARG, __FUNCTION__); goto error; } diff --git a/src/nodeinfo.c b/src/nodeinfo.c index cb2f805..4620d93 100644 --- a/src/nodeinfo.c +++ b/src/nodeinfo.c @@ -72,11 +72,11 @@ int linuxNodeInfoCPUPopulate(FILE *cpuinfo, static int linuxNodeGetCPUStats(FILE *procstat, int cpuNum, - virCPUStatsPtr params, + virNodeCPUStatsPtr params, int *nparams); static int linuxNodeGetMemoryStats(FILE *meminfo, int cellNum, - virMemoryStatsPtr params, + virNodeMemoryStatsPtr params, int *nparams); /* Return the positive decimal contents of the given @@ -396,7 +396,7 @@ int linuxNodeInfoCPUPopulate(FILE *cpuinfo, int linuxNodeGetCPUStats(FILE *procstat, int cpuNum, - virCPUStatsPtr params, + virNodeCPUStatsPtr params, int *nparams) { int ret = -1; @@ -418,7 +418,7 @@ int linuxNodeGetCPUStats(FILE *procstat, goto cleanup; } - if (cpuNum == VIR_CPU_STATS_ALL_CPUS) { + if (cpuNum == VIR_NODE_CPU_STATS_ALL_CPUS) { strcpy(cpu_header, "cpu"); } else { snprintf(cpu_header, sizeof(cpu_header), "cpu%d", cpuNum); @@ -439,11 +439,11 @@ int linuxNodeGetCPUStats(FILE *procstat, } for (i = 0; i < *nparams; i++) { - virCPUStatsPtr param = &params[i]; + virNodeCPUStatsPtr param = &params[i]; switch (i) { case 0: /* fill kernel cpu time here */ - if (virStrcpyStatic(param->field, VIR_CPU_STATS_KERNEL) == NULL) { + if (virStrcpyStatic(param->field, VIR_NODE_CPU_STATS_KERNEL) == NULL) { nodeReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Field kernel cpu time too long for destination")); goto cleanup; @@ -452,7 +452,7 @@ int linuxNodeGetCPUStats(FILE *procstat, break; case 1: /* fill user cpu time here */ - if (virStrcpyStatic(param->field, VIR_CPU_STATS_USER) == NULL) { + if (virStrcpyStatic(param->field, VIR_NODE_CPU_STATS_USER) == NULL) { nodeReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Field kernel cpu time too long for destination")); goto cleanup; @@ -461,7 +461,7 @@ int linuxNodeGetCPUStats(FILE *procstat, break; case 2: /* fill idle cpu time here */ - if (virStrcpyStatic(param->field, VIR_CPU_STATS_IDLE) == NULL) { + if (virStrcpyStatic(param->field, VIR_NODE_CPU_STATS_IDLE) == NULL) { nodeReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Field kernel cpu time too long for destination")); goto cleanup; @@ -470,7 +470,7 @@ int linuxNodeGetCPUStats(FILE *procstat, break; case 3: /* fill iowait cpu time here */ - if (virStrcpyStatic(param->field, VIR_CPU_STATS_IOWAIT) == NULL) { + if (virStrcpyStatic(param->field, VIR_NODE_CPU_STATS_IOWAIT) == NULL) { nodeReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Field kernel cpu time too long for destination")); goto cleanup; @@ -496,7 +496,7 @@ cleanup: int linuxNodeGetMemoryStats(FILE *meminfo, int cellNum, - virMemoryStatsPtr params, + virNodeMemoryStatsPtr params, int *nparams) { int ret = -1; @@ -504,20 +504,20 @@ int linuxNodeGetMemoryStats(FILE *meminfo, int found = 0; int nr_param; char line[1024]; - char meminfo_hdr[VIR_MEMORY_STATS_FIELD_LENGTH]; + char meminfo_hdr[VIR_NODE_MEMORY_STATS_FIELD_LENGTH]; unsigned long val; struct field_conv { const char *meminfo_hdr; // meminfo header const char *field; // MemoryStats field name } field_conv[] = { - {"MemTotal:", VIR_MEMORY_STATS_TOTAL}, - {"MemFree:", VIR_MEMORY_STATS_FREE}, - {"Buffers:", VIR_MEMORY_STATS_BUFFERS}, - {"Cached:", VIR_MEMORY_STATS_CACHED}, + {"MemTotal:", VIR_NODE_MEMORY_STATS_TOTAL}, + {"MemFree:", VIR_NODE_MEMORY_STATS_FREE}, + {"Buffers:", VIR_NODE_MEMORY_STATS_BUFFERS}, + {"Cached:", VIR_NODE_MEMORY_STATS_CACHED}, {NULL, NULL} }; - if (cellNum == VIR_MEMORY_STATS_ALL_CELLS) { + if (cellNum == VIR_NODE_MEMORY_STATS_ALL_CELLS) { nr_param = LINUX_NB_MEMORY_STATS_ALL; } else { nr_param = LINUX_NB_MEMORY_STATS_CELL; @@ -570,7 +570,7 @@ int linuxNodeGetMemoryStats(FILE *meminfo, struct field_conv *convp = &field_conv[j]; if (STREQ(meminfo_hdr, convp->meminfo_hdr)) { - virMemoryStatsPtr param = &params[k++]; + virNodeMemoryStatsPtr param = &params[k++]; if (virStrcpyStatic(param->field, convp->field) == NULL) { nodeReportError(VIR_ERR_INTERNAL_ERROR, @@ -637,7 +637,7 @@ int nodeGetInfo(virConnectPtr conn ATTRIBUTE_UNUSED, virNodeInfoPtr nodeinfo) { int nodeGetCPUStats(virConnectPtr conn ATTRIBUTE_UNUSED, int cpuNum, - virCPUStatsPtr params, + virNodeCPUStatsPtr params, int *nparams, unsigned int flags) { @@ -666,7 +666,7 @@ int nodeGetCPUStats(virConnectPtr conn ATTRIBUTE_UNUSED, int nodeGetMemoryStats(virConnectPtr conn ATTRIBUTE_UNUSED, int cellNum, - virMemoryStatsPtr params, + virNodeMemoryStatsPtr params, int *nparams, unsigned int flags) { @@ -678,7 +678,7 @@ int nodeGetMemoryStats(virConnectPtr conn ATTRIBUTE_UNUSED, char *meminfo_path = NULL; FILE *meminfo; - if (cellNum == VIR_MEMORY_STATS_ALL_CELLS) { + if (cellNum == VIR_NODE_MEMORY_STATS_ALL_CELLS) { meminfo_path = strdup(MEMINFO_PATH); if (!meminfo_path) { virReportOOMError(); diff --git a/src/nodeinfo.h b/src/nodeinfo.h index 1ebcdb1..9b2658f 100644 --- a/src/nodeinfo.h +++ b/src/nodeinfo.h @@ -32,12 +32,12 @@ int nodeCapsInitNUMA(virCapsPtr caps); int nodeGetCPUStats(virConnectPtr conn ATTRIBUTE_UNUSED, int cpuNum, - virCPUStatsPtr params, + virNodeCPUStatsPtr params, int *nparams, unsigned int flags ATTRIBUTE_UNUSED); int nodeGetMemoryStats(virConnectPtr conn ATTRIBUTE_UNUSED, int cellNum, - virMemoryStatsPtr params, + virNodeMemoryStatsPtr params, int *nparams, unsigned int flags ATTRIBUTE_UNUSED); int nodeGetCellsFreeMemory(virConnectPtr conn, diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index f4b43e0..6b74bb5 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -1699,7 +1699,7 @@ done: static int remoteNodeGetCPUStats (virConnectPtr conn, int cpuNum, - virCPUStatsPtr params, int *nparams, + virNodeCPUStatsPtr params, int *nparams, unsigned int flags) { int rv = -1; @@ -1765,7 +1765,7 @@ done: static int remoteNodeGetMemoryStats (virConnectPtr conn, int cellNum, - virMemoryStatsPtr params, int *nparams, + virNodeMemoryStatsPtr params, int *nparams, unsigned int flags) { int rv = -1; diff --git a/tools/virsh.c b/tools/virsh.c index 19db058..43b4bd3 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -3734,8 +3734,8 @@ cmdNodeCpuStats(vshControl *ctl, const vshCmd *cmd) int i, j; bool flag_utilization = false; bool flag_percent = vshCommandOptBool(cmd, "percent"); - int cpuNum = VIR_CPU_STATS_ALL_CPUS; - virCPUStatsPtr params; + int cpuNum = VIR_NODE_CPU_STATS_ALL_CPUS; + virNodeCPUStatsPtr params; int nparams = 0; bool ret = false; struct cpu_stats { @@ -3779,15 +3779,15 @@ cmdNodeCpuStats(vshControl *ctl, const vshCmd *cmd) for (j = 0; j < nparams; j++) { unsigned long long value = params[j].value; - if (STREQ(params[j].field, VIR_CPU_STATS_KERNEL)) { + if (STREQ(params[j].field, VIR_NODE_CPU_STATS_KERNEL)) { cpu_stats[i].sys = value; - } else if (STREQ(params[j].field, VIR_CPU_STATS_USER)) { + } else if (STREQ(params[j].field, VIR_NODE_CPU_STATS_USER)) { cpu_stats[i].user = value; - } else if (STREQ(params[j].field, VIR_CPU_STATS_IDLE)) { + } else if (STREQ(params[j].field, VIR_NODE_CPU_STATS_IDLE)) { cpu_stats[i].idle = value; - } else if (STREQ(params[j].field, VIR_CPU_STATS_IOWAIT)) { + } else if (STREQ(params[j].field, VIR_NODE_CPU_STATS_IOWAIT)) { cpu_stats[i].iowait = value; - } else if (STREQ(params[j].field, VIR_CPU_STATS_UTILIZATION)) { + } else if (STREQ(params[j].field, VIR_NODE_CPU_STATS_UTILIZATION)) { cpu_stats[i].util = value; flag_utilization = true; } @@ -3861,8 +3861,8 @@ cmdNodeMemStats(vshControl *ctl, const vshCmd *cmd) { int nparams = 0; unsigned int i = 0; - int cellNum = VIR_MEMORY_STATS_ALL_CELLS; - virMemoryStatsPtr params = NULL; + int cellNum = VIR_NODE_MEMORY_STATS_ALL_CELLS; + virNodeMemoryStatsPtr params = NULL; bool ret = false; if (!vshConnectionUsability(ctl, ctl->conn)) -- 1.7.0.4

3 4

[libvirt] [PATCH] qemu: Fix update device for CURRENT + FORCE flags
by Jiri Denemark 28 Jun '11

28 Jun '11

When CURRENT and FORCE flags were used together, UpdateDeviceFlags did nothing because it failed to transform CURRENT into either LIVE or CONFIG. --- src/qemu/qemu_driver.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index da612e7..8596b30 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -4789,12 +4789,15 @@ qemuDomainModifyDeviceFlags(virDomainPtr dom, const char *xml, virDomainDeviceDefPtr dev = NULL; bool force = (flags & VIR_DOMAIN_DEVICE_MODIFY_FORCE) != 0; int ret = -1; + unsigned int affect; virCheckFlags(VIR_DOMAIN_AFFECT_LIVE | VIR_DOMAIN_AFFECT_CONFIG | (action == QEMU_DEVICE_UPDATE ? VIR_DOMAIN_DEVICE_MODIFY_FORCE : 0), -1); + affect = flags & (VIR_DOMAIN_AFFECT_LIVE | VIR_DOMAIN_AFFECT_CONFIG); + qemuDriverLock(driver); vm = virDomainFindByUUID(&driver->domains, dom->uuid); if (!vm) { @@ -4809,10 +4812,10 @@ qemuDomainModifyDeviceFlags(virDomainPtr dom, const char *xml, goto cleanup; if (virDomainObjIsActive(vm)) { - if (flags == VIR_DOMAIN_AFFECT_CURRENT) + if (affect == VIR_DOMAIN_AFFECT_CURRENT) flags |= VIR_DOMAIN_AFFECT_LIVE; } else { - if (flags == VIR_DOMAIN_AFFECT_CURRENT) + if (affect == VIR_DOMAIN_AFFECT_CURRENT) flags |= VIR_DOMAIN_AFFECT_CONFIG; /* check consistency between flags and the vm state */ if (flags & VIR_DOMAIN_AFFECT_LIVE) { -- 1.7.5.3

2 2

[libvirt] regression in finding boot device
by Laine Stump 28 Jun '11

28 Jun '11

I just built a fresh libvirt rpm from the head of git on my Fedora 14 machine and updated all the libvirt packages (I'm not sure what version had been running previously, but it was at least 0.8.8-4 from virt-preview, probably something later built from source). Just prior to the update, I had successfully started up a Fedora 15 guest and stopped it. After the update, I started the F15 guest and got the following message on the virt-viewer console: Booting from Hard Disk... Boot failed: could not read the boot disk. I downgraded to 0.8.8-4 from virt-preview, and was once again able to boot the guest. Upgraded again, still broken. Investigated some more, and I found that if I disable QEMU_CAPS_BOOTINDEX in the new libvirt, the guest boots with no problem. (bootindex was showing up as "1" in the log; not knowing anything about how it worked, I decided to try just changing it to "0". That didn't work. Switching back to the old method *did* work, though.) This system is running qemu-kvm-0.14-7.fc14.x86_64. If you'd like a look at the domain XML, the qemu logs, or access to the machine, just let me know.

2 3

[libvirt] [PATCH] xml: create an RNG file for common types and move some definitions there
by Laine Stump 27 Jun '11

27 Jun '11

domain.rng, network.rng, and interface.rng already use a few of the same types (or in some cases *should* but don't), and an upcoming code change will have them sharing even more. To prepare for that, this patch takes those common data type definitions and moves them into basictypes.rng. This may break some rule about the need to RNG files to be autonomous or something, but I saw that storageencryption.rng is used in this way, so I figured it must not be completely against the law... --- docs/schemas/basictypes.rng | 130 +++++++++++++++++++++++++++++++++++++++++++ docs/schemas/domain.rng | 86 +--------------------------- docs/schemas/interface.rng | 71 ++++------------------- docs/schemas/network.rng | 79 +++++++------------------- 4 files changed, 166 insertions(+), 200 deletions(-) create mode 100644 docs/schemas/basictypes.rng diff --git a/docs/schemas/basictypes.rng b/docs/schemas/basictypes.rng new file mode 100644 index 0000000..b3267f5 --- /dev/null +++ b/docs/schemas/basictypes.rng @@ -0,0 +1,130 @@ +<?xml version="1.0"?> + +<grammar xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"> + +  + <define name="unsignedInt"> + <data type="unsignedInt"> + <param name="pattern">[0-9]+</param> + </data> + </define> + + <define name="positiveInteger"> + <data type="positiveInteger"> + <param name="pattern">[0-9]+</param> + </data> + </define> + + <define name="uint8range"> + <choice> + <data type="string"> + <param name="pattern">0x[0-9a-fA-F]{1,2}</param> + </data> + <data type="int"> + <param name="minInclusive">0</param> + <param name="maxInclusive">255</param> + </data> + </choice> + </define> + <define name="uint24range"> + <choice> + <data type="string"> + <param name="pattern">0x[0-9a-fA-F]{1,6}</param> + </data> + <data type="int"> + <param name="minInclusive">0</param> + <param name="maxInclusive">16777215</param> + </data> + </choice> + </define> + + <define name="UUID"> + <choice> + <data type="string"> + <param name="pattern">[a-fA-F0-9]{32}</param> + </data> + <data type="string"> + <param name="pattern">[a-fA-F0-9]{8}\-([a-fA-F0-9]{4}\-){3}[a-fA-F0-9]{12}</param> + </data> + </choice> + </define> + +  + <define name="macAddr"> + <data type="string"> + <param name="pattern">([a-fA-F0-9]{2}:){5}[a-fA-F0-9]{2}</param> + </data> + </define> + +  + <define name="ipv4Addr"> + <data type="string"> + <param name="pattern">(((25[0-5])|(2[0-4][0-9])|(1[0-9]{2})|([1-9][0-9])|([0-9]))\.){3}((25[0-5])|(2[0-4][0-9])|(1[0-9]{2})|([1-9][0-9])|([0-9]))</param> + </data> + </define> + +  + <define name="ipv6Addr"> + <data type="string"> +  +<param name="pattern">(([0-9A-Fa-f]{1,4}:){7}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){6}:[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){5}:([0-9A-Fa-f]{1,4}:)?[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){4}:([0-9A-Fa-f]{1,4}:){0,2}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){3}:([0-9A-Fa-f]{1,4}:){0,3}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){2}:([0-9A-Fa-f]{1,4}:){0,4}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){6}(((25[0-5])|(2[0-4][0-9])|(1[0-9]{2})|([1-9][0-9])|([0-9]))\.){3}((25[0-5])|(2[0-4][0-9])|(1[0-9]{2})|([1-9][0-9])|([0-9])))|(([0-9A-Fa-f]{1,4}:){0,5}:(((25[0-5])|(2[0-4][0-9])|(1[0-9]{2})|([1-9][0-9])|([0-9]))\.){3}((25[0-5])|(2[0-4][0-9])|(1[0-9]{2})|([1-9][0-9])|([0-9])))|(::([0-9A-Fa-f]{1,4}:){0,5}(((25[0-5])|(2[0-4][0-9])|(1[0-9]{2})|([1-9][0-9])|([0-9]))\.){3}((25[0-5])|(2[0-4][0-9])|(1[0-9]{2})|([1-9][0-9])|([0-9])))|([0-9A-Fa-f]{1,4}::([0-9A-Fa-f]{1,4}:){0,5}[0-9A-Fa-f]{1,4})|(::([0-9A-Fa-f]{1,4}:){0,6}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){1,7}:)</param> + </data> + </define> + + <define name="ipAddr"> + <choice> + <ref name="ipv4Addr"/> + <ref name="ipv6Addr"/> + </choice> + </define> + + <define name="ipv4Prefix"> + <data type="unsignedInt"> + <param name="maxInclusive">32</param> + </data> + </define> + + <define name="ipv6Prefix"> + <data type="unsignedInt"> + <param name="maxInclusive">128</param> + </data> + </define> + + <define name="ipPrefix"> + <choice> + <ref name="ipv4Prefix"/> + <ref name="ipv6Prefix"/> + </choice> + </define> + + <define name="dnsName"> + <data type="string"> + <param name="pattern">[a-zA-Z0-9\.\-]+</param> + </data> + </define> + + <define name="deviceName"> + <data type="string"> + <param name="pattern">[a-zA-Z0-9_\.\-\\:/]+</param> + </data> + </define> + + <define name="filePath"> + <data type="string"> + <param name="pattern">[a-zA-Z0-9_\.\+\-\\&"'<>/%]+</param> + </data> + </define> + + <define name="absFilePath"> + <data type="string"> + <param name="pattern">/[a-zA-Z0-9_\.\+\-\\&"'<>/%]+</param> + </data> + </define> + + <define name="absDirPath"> + <data type="string"> + <param name="pattern">/[a-zA-Z0-9_\.\+\-\\&"'<>/%]*</param> + </data> + </define> + +</grammar> diff --git a/docs/schemas/domain.rng b/docs/schemas/domain.rng index 891662d..5e8fc3c 100644 --- a/docs/schemas/domain.rng +++ b/docs/schemas/domain.rng @@ -5,6 +5,7 @@ <ref name="domain"/> </start> + <include href='basictypes.rng'/> <include href='storageencryption.rng'/>  - <define name="unsignedInt"> - <data type="unsignedInt"> - <param name="pattern">[0-9]+</param> - </data> - </define> - <define name='positiveInteger'> - <data type='positiveInteger'> - <param name="pattern">[0-9]+</param> - </data> - </define> <define name="cpuset"> <data type="string"> <param name="pattern">([0-9]+(-[0-9]+)?|\^[0-9]+)(,([0-9]+(-[0-9]+)?|\^[0-9]+))*</param> @@ -2372,11 +2361,6 @@ <param name="pattern">[0-9]+</param> </data> </define> - <define name="hostName"> - <data type="string"> - <param name="pattern">[a-zA-Z0-9\.\-]+</param> - </data> - </define> <define name="PortNumber"> <data type="short"> <param name="minInclusive">-1</param> @@ -2410,51 +2394,11 @@ <param name="pattern">[a-zA-Z0-9_\+\-]+</param> </data> </define> - <define name="UUID"> - <choice> - <data type="string"> - <param name="pattern">[a-fA-F0-9]{32}</param> - </data> - <data type="string"> - <param name="pattern">[a-fA-F0-9]{8}\-([a-fA-F0-9]{4}\-){3}[a-fA-F0-9]{12}</param> - </data> - </choice> - </define> - <define name="filePath"> - <data type="string"> - <param name="pattern">[a-zA-Z0-9_\.\+\-\\&"'<>/%]+</param> - </data> - </define> - <define name="absFilePath"> - <data type="string"> - <param name="pattern">/[a-zA-Z0-9_\.\+\-\\&"'<>/%]+</param> - </data> - </define> - <define name="absDirPath"> - <data type="string"> - <param name="pattern">/[a-zA-Z0-9_\.\+\-\\&"'<>/%]*</param> - </data> - </define> - <define name="deviceName"> - <data type="string"> - <param name="pattern">[a-zA-Z0-9_\.\-\\:/]+</param> - </data> - </define> <define name="bridgeMode"> <data type="string"> <param name="pattern">(vepa|bridge|private|passthrough)</param> </data> </define> - <define name="addrMAC"> - <data type="string"> - <param name="pattern">([a-fA-F0-9]{2}:){5}[a-fA-F0-9]{2}</param> - </data> - </define> - <define name="addrIP"> - <data type="string"> - <param name="pattern">([0-2]?[0-9]?[0-9]\.){3}[0-2]?[0-9]?[0-9]</param> - </data> - </define> <define name="addrIPorName"> <data type="string"> <param name="pattern">(([0-2]?[0-9]?[0-9]\.){3}[0-2]?[0-9]?[0-9])|(([0-9a-fA-F]+|:)+[0-9a-fA-F]+)|([a-zA-Z0-9_\.\+\-]*)</param> @@ -2530,28 +2474,6 @@ <param name="pattern">[a-zA-Z0-9_\.:]+</param> </data> </define> - <define name="uint8range"> - <choice> - <data type="string"> - <param name="pattern">0x[0-9a-fA-F]{1,2}</param> - </data> - <data type="int"> - <param name="minInclusive">0</param> - <param name="maxInclusive">255</param> - </data> - </choice> - </define> - <define name="uint24range"> - <choice> - <data type="string"> - <param name="pattern">0x[0-9a-fA-F]{1,6}</param> - </data> - <data type="int"> - <param name="minInclusive">0</param> - <param name="maxInclusive">16777215</param> - </data> - </choice> - </define> <define name="virtualPortProfileID"> <data type="string"> <param name="maxLength">39</param> diff --git a/docs/schemas/interface.rng b/docs/schemas/interface.rng index 4dd1bb4..53fa18a 100644 --- a/docs/schemas/interface.rng +++ b/docs/schemas/interface.rng @@ -1,3 +1,4 @@ +<?xml version="1.0"?>  <grammar xmlns="http://relaxng.org/ns/structure/1.0" xmlns:v="http://netcf.org/xml/version/1.0" @@ -16,6 +17,7 @@ </choice> </start> + <include href='basictypes.rng'/>  <optional> <element name="mac"> - <attribute name="address"><ref name="mac-addr"/></attribute> + <attribute name="address"><ref name="macAddr"/></attribute> </element> </optional>  @@ -75,7 +77,7 @@ <element name="vlan"> <attribute name="tag"><ref name="vlan-id"/></attribute> <element name="interface"> - <attribute name="name"><ref name="device-name"/></attribute> + <attribute name="name"><ref name="deviceName"/></attribute> </element> </element> </define> @@ -202,7 +204,7 @@ </element> <element name="arpmon"> <attribute name="interval"><ref name="uint"/></attribute> - <attribute name="target"><ref name="ipv4-addr"/></attribute> + <attribute name="target"><ref name="ipv4Addr"/></attribute> <optional> <attribute name="validate"> <choice> @@ -244,7 +246,7 @@  <define name="name-attr">  - <attribute name="name"><ref name="device-name"/></attribute> + <attribute name="name"><ref name="deviceName"/></attribute> </define> <define name="mtu"> @@ -303,14 +305,14 @@ <ref name="dhcp-element"/> <group> <element name="ip"> - <attribute name="address"><ref name="ipv4-addr"/></attribute> + <attribute name="address"><ref name="ipv4Addr"/></attribute> <optional> - <attribute name="prefix"><ref name="ipv4-prefix"/></attribute> + <attribute name="prefix"><ref name="ipv4Prefix"/></attribute> </optional> </element> <optional> <element name="route"> - <attribute name="gateway"><ref name="ipv4-addr"/></attribute> + <attribute name="gateway"><ref name="ipv4Addr"/></attribute> </element> </optional> </group> @@ -331,15 +333,15 @@ </optional> <zeroOrMore> <element name="ip"> - <attribute name="address"><ref name="ipv6-addr"/></attribute> + <attribute name="address"><ref name="ipv6Addr"/></attribute> <optional> - <attribute name="prefix"><ref name="ipv6-prefix"/></attribute> + <attribute name="prefix"><ref name="ipv6Prefix"/></attribute> </optional> </element> </zeroOrMore> <optional> <element name="route"> - <attribute name="gateway"><ref name="ipv6-addr"/></attribute> + <attribute name="gateway"><ref name="ipv6Addr"/></attribute> </element> </optional> </element> @@ -417,55 +419,6 @@ </data> </define> - <define name='device-name'> - <data type='string'> - <param name="pattern">[a-zA-Z0-9_\.\-:/]+</param> - </data> - </define> - - <define name='UUID'> - <choice> - <data type='string'> - <param name="pattern">[a-fA-F0-9]{32}</param> - </data> - <data type='string'> - <param name="pattern">[a-fA-F0-9]{8}\-([a-fA-F0-9]{4}\-){3}[a-fA-F0-9]{12}</param> - </data> - </choice> - </define> - - <define name='mac-addr'> - <data type='string'> - <param name="pattern">([a-fA-F0-9]{2}:){5}[a-fA-F0-9]{2}</param> - </data> - </define> - - <define name='ipv4-addr'> - <data type='string'> - <param name="pattern">(((25[0-5])|(2[0-4][0-9])|(1[0-9]{2})|([1-9][0-9])|([0-9]))\.){3}((25[0-5])|(2[0-4][0-9])|(1[0-9]{2})|([1-9][0-9])|([0-9]))</param> - </data> - </define> - - <define name='ipv4-prefix'> - <data type='unsignedInt'> - <param name="maxInclusive">32</param> - </data> - </define> - -  - <define name='ipv6-addr'> - <data type='string'> -  - <param name="pattern">(([0-9A-Fa-f]{1,4}:){7}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){6}:[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){5}:([0-9A-Fa-f]{1,4}:)?[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){4}:([0-9A-Fa-f]{1,4}:){0,2}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){3}:([0-9A-Fa-f]{1,4}:){0,3}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){2}:([0-9A-Fa-f]{1,4}:){0,4}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){6}((((25[0-5])|(1[0-9]{2})|(2[0-4][0-9])|([0-9]{1,2})))\.){3}(((25[0-5])|(1[0-9]{2})|(2[0-4][0-9])|([0-9]{1,2}))))|(([0-9A-Fa-f]{1,4}:){0,5}:((((25[0-5])|(1[0-9]{2})|(2[0-4][0-9])|([0-9]{1,2})))\.){3}(((25[0-5])|(1[0-9]{2})|(2[0-4][0-9])|([0-9]{1,2}))))|(::([0-9A-Fa-f]{1,4}:){0,5}((((25[0-5])|(1[0-9]{2})|(2[0-4][0-9])|([0-9]{1,2})))\.){3}(((25[0-5])|(1[0-9]{2})|(2[0-4][0-9])|([0-9]{1,2}))))|([0-9A-Fa-f]{1,4}::([0-9A-Fa-f]{1,4}:){0,5}[0-9A-Fa-f]{1,4})|(::([0-9A-Fa-f]{1,4}:){0,6}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){1,7}:)</param> - </data> - </define> - - <define name='ipv6-prefix'> - <data type='unsignedInt'> - <param name="maxInclusive">128</param> - </data> - </define> - <define name='vlan-id'> <data type="unsignedInt"> <param name="maxInclusive">4096</param> diff --git a/docs/schemas/network.rng b/docs/schemas/network.rng index 05f45e5..6d9f06b 100644 --- a/docs/schemas/network.rng +++ b/docs/schemas/network.rng @@ -1,3 +1,4 @@ +<?xml version="1.0"?>  <grammar xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"> @@ -5,6 +6,8 @@ <ref name="network"/> </start> + <include href='basictypes.rng'/> + <define name="network"> <element name="network"> @@ -18,7 +21,7 @@  <optional> - <element name="uuid"><text/></element> + <element name="uuid"><ref name="UUID"/></element> </optional>  @@ -28,7 +31,7 @@ <element name="bridge"> <optional> <attribute name="name"> - <text/> + <ref name="deviceName"/> </attribute> </optional> @@ -53,7 +56,7 @@  <optional> <element name="mac"> - <attribute name="address"><ref name="mac-addr"/></attribute> + <attribute name="address"><ref name="macAddr"/></attribute> <empty/> </element> </optional> @@ -65,7 +68,7 @@ <element name="forward"> <optional> <attribute name="dev"> - <text/> + <ref name="deviceName"/> </attribute> </optional> @@ -83,7 +86,7 @@  <optional> <element name="domain"> - <attribute name="name"><text/></attribute> + <attribute name="name"><ref name="dnsName"/></attribute> </element> </optional> @@ -93,15 +96,15 @@ <element name="dns"> <zeroOrMore> <element name="txt"> - <attribute name="name"><ref name="dns-name"/></attribute> + <attribute name="name"><ref name="dnsName"/></attribute> <attribute name="value"><text/></attribute> </element> </zeroOrMore> <zeroOrMore> <element name="host"> - <attribute name="ip"><ref name="ipv4-addr"/></attribute> + <attribute name="ip"><ref name="ipv4Addr"/></attribute> <oneOrMore> - <element name="hostname"><text/></element> + <element name="hostname"><ref name="dnsName"/></element> </oneOrMore> </element> </zeroOrMore> @@ -114,12 +117,12 @@ local to the host. --> <element name="ip"> <optional> - <attribute name="address"><ref name="ip-addr"/></attribute> + <attribute name="address"><ref name="ipAddr"/></attribute> </optional> <optional> <choice> - <attribute name="netmask"><ref name="ipv4-addr"/></attribute> - <attribute name="prefix"><ref name="ip-prefix"/></attribute> + <attribute name="netmask"><ref name="ipv4Addr"/></attribute> + <attribute name="prefix"><ref name="ipPrefix"/></attribute> </choice> </optional> <optional> @@ -136,22 +139,22 @@ <element name="dhcp"> <zeroOrMore> <element name="range"> - <attribute name="start"><ref name="ipv4-addr"/></attribute> - <attribute name="end"><ref name="ipv4-addr"/></attribute> + <attribute name="start"><ref name="ipv4Addr"/></attribute> + <attribute name="end"><ref name="ipv4Addr"/></attribute> </element> </zeroOrMore> <zeroOrMore> <element name="host"> - <attribute name="mac"><ref name="mac-addr"/></attribute> + <attribute name="mac"><ref name="macAddr"/></attribute> <attribute name="name"><text/></attribute> - <attribute name="ip"><ref name="ipv4-addr"/></attribute> + <attribute name="ip"><ref name="ipv4Addr"/></attribute> </element> </zeroOrMore> <optional> <element name="bootp"> - <attribute name="file"><text/></attribute> + <attribute name="file"><ref name="filePath"/></attribute> <optional> - <attribute name="server"><text/></attribute> + <attribute name="server"><ref name="dnsName"/></attribute> </optional> </element> </optional> @@ -163,52 +166,10 @@ </element> </define> -  - <define name='ipv4-addr'> - <data type='string'> - <param name="pattern">(((25[0-5])|(2[0-4][0-9])|(1[0-9]{2})|([1-9][0-9])|([0-9]))\.){3}((25[0-5])|(2[0-4][0-9])|(1[0-9]{2})|([1-9][0-9])|([0-9]))</param> - </data> - </define> - -  - <define name='ipv6-addr'> - <data type='string'> -  - <param name="pattern">(([0-9A-Fa-f]{1,4}:){7}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){6}:[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){5}:([0-9A-Fa-f]{1,4}:)?[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){4}:([0-9A-Fa-f]{1,4}:){0,2}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){3}:([0-9A-Fa-f]{1,4}:){0,3}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){2}:([0-9A-Fa-f]{1,4}:){0,4}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){6}(((25[0-5])|(2[0-4][0-9])|(1[0-9]{2})|([1-9][0-9])|([0-9]))\.){3}((25[0-5])|(2[0-4][0-9])|(1[0-9]{2})|([1-9][0-9])|([0-9])))|(([0-9A-Fa-f]{1,4}:){0,5}:(((25[0-5])|(2[0-4][0-9])|(1[0-9]{2})|([1-9][0-9])|([0-9]))\.){3}((25[0-5])|(2[0-4][0-9])|(1[0-9]{2})|([1-9][0-9])|([0-9])))|(::([0-9A-Fa-f]{1,4}:){0,5}(((25[0-5])|(2[0-4][0-9])|(1[0-9]{2})|([1-9][0-9])|([0-9]))\.){3}((25[0-5])|(2[0-4][0-9])|(1[0-9]{2})|([1-9][0-9])|([0-9])))|([0-9A-Fa-f]{1,4}::([0-9A-Fa-f]{1,4}:){0,5}[0-9A-Fa-f]{1,4})|(::([0-9A-Fa-f]{1,4}:){0,6}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){1,7}:)</param> - </data> - </define> - - <define name='ip-addr'> - <choice> - <ref name='ipv4-addr'/> - <ref name='ipv6-addr'/> - </choice> - </define> - - <define name='ip-prefix'> - <data type='unsignedInt'> - <param name="maxInclusive">128</param> - </data> - </define> - <define name='addr-family'> <data type='string'> <param name="pattern">(ipv4)|(ipv6)</param> </data> </define> -  - <define name='mac-addr'> - <data type='string'> - <param name="pattern">([a-fA-F0-9]{2}:){5}[a-fA-F0-9]{2}</param> - </data> - </define> - -  - <define name='dns-name'> - <data type='string'> - <param name="pattern">([a-zA-Z\-]+)</param> - </data> - </define> - </grammar> -- 1.7.3.4

2 1

[libvirt] shared LVM volume group, should I use it?
by Erik Sjölund 27 Jun '11

27 Jun '11

Hi, Assume I want to have the root file system of the virtualization host server in an LVM volume on the local hard drive. Is it ok to have that LVM volume in the same LVM volume group that I will later use as a Storage Pool for libvirt? I already found a question about this: http://serverfault.com/questions/200728/lvm-volume-group-shared-between-kvm… and I also found this statement at opensuse.org: http://doc.opensuse.org/products/opensuse/openSUSE/opensuse-kvm/sec.libvirt… "Security Considerations In order to avoid data loss or data corruption, do not attempt to use resources such as LVM volume groups, iSCSI targets, etc. that are used to build storage pools on the VM Host Server, as well. " The first source of information indicates it should be okay to share the LVM volume group but the second source of information doesn't indicate that. What do you think? cheers, Erik Sjölund

1 0

[libvirt] [PATCH] daemon: Dynamically create worker threads when some get stuck
by Michal Privoznik 27 Jun '11

27 Jun '11

Up to now, we've created new worker threads only during new connection. This patch monitors worker threads for liveness and dynamically create new one if all are stuck, waiting for hypervisor to reply. This situation can happen. All one need to do is send STOP signal to qemu. The amount of time when we evaluate thread as stuck is defined in WORKER_TIMEOUT macro. With this approach we don't need to create new worker thread on incoming connection. However, as number of active worker threads grows, it might happen we need to size up the pool of worker threads and hence exceed the max_worker configuration value. --- daemon/libvirtd.c | 77 +++++++++++++++++++++++++++++++++++++++++++--------- daemon/libvirtd.h | 4 +++ 2 files changed, 67 insertions(+), 14 deletions(-) diff --git a/daemon/libvirtd.c b/daemon/libvirtd.c index bcaa37b..df019b3 100644 --- a/daemon/libvirtd.c +++ b/daemon/libvirtd.c @@ -1491,19 +1491,6 @@ static int qemudDispatchServer(struct qemud_server *server, struct qemud_socket server->clients[server->nclients++] = client; - if (server->nclients > server->nactiveworkers && - server->nactiveworkers < server->nworkers) { - for (i = 0 ; i < server->nworkers ; i++) { - if (!server->workers[i].hasThread) { - if (qemudStartWorker(server, &server->workers[i]) < 0) - return -1; - server->nactiveworkers++; - break; - } - } - } - - return 0; error: @@ -1629,6 +1616,9 @@ static void *qemudWorker(void *data) virMutexLock(&server->lock); worker->processingCall = 0; + /* The fact we're here means, this worker is not stuck + * and can serve clients. Thus suspend timeout */ + virEventUpdateTimeout(server->workerTimeout, -1); virMutexUnlock(&server->lock); } } @@ -1900,8 +1890,12 @@ readmore: } /* Move completed message to the end of the dispatch queue */ - if (msg) + if (msg) { qemudClientMessageQueuePush(&client->dx, msg); + /* For queued message set timeout. If a worker thread + * will serve this, it will also remove this timeout. */ + virEventUpdateTimeout(server->workerTimeout, WORKER_TIMEOUT); + } client->nrequests++; /* Possibly need to create another receive buffer */ @@ -2303,6 +2297,53 @@ static void qemudInactiveTimer(int timerid, void *data) { } } +static void qemudWorkerTimeout(int timerid, void *data) { + struct qemud_server *server = (struct qemud_server *)data; + int i; + + virMutexLock(&server->lock); + VIR_DEBUG("Some threads are not responding"); + for (i = 0; i < server->nclients; i++) { + if (server->clients[i]->dx) + break; + } + + if (i == server->nclients) { + /* All clients have been/are being served, + * there is no call waiting in the queue */ + virEventUpdateTimeout(timerid, -1); + } else { + VIR_DEBUG("Got a queued call. Need to create worker"); + if (server->nactiveworkers == server->nworkers) { + /* We need to size up worker threads pool */ + if (VIR_REALLOC_N(server->workers, server->nworkers + 1) < 0) { + virReportOOMError(); + goto cleanup; + } + /* Init new worker structure */ + memset(&server->workers[server->nworkers], 0, + sizeof(struct qemud_worker)); + server->nworkers++; + } + + /* Find free worker and start it */ + for (i = 0; i < server->nworkers; i++) { + if (!server->workers[i].hasThread) { + if (qemudStartWorker(server, &server->workers[i]) < 0) { + VIR_DEBUG("Could not start new worker"); + goto cleanup; + } + server->nactiveworkers++; + VIR_DEBUG("created worker %d", i); + break; + } + } + } + +cleanup: + virMutexUnlock(&server->lock); +} + static void qemudFreeClient(struct qemud_client *client) { while (client->rx) { struct qemud_client_message *msg @@ -2346,6 +2387,14 @@ static void *qemudRunLoop(void *opaque) { return NULL; } + server->workerTimeout = virEventAddTimeout(-1, + qemudWorkerTimeout, + server, NULL); + if (server->workerTimeout < 0) { + VIR_ERROR(_("Failed to register worker threads timeout")); + return NULL; + } + if (min_workers > max_workers) max_workers = min_workers; diff --git a/daemon/libvirtd.h b/daemon/libvirtd.h index ea00d5c..1d828be 100644 --- a/daemon/libvirtd.h +++ b/daemon/libvirtd.h @@ -271,6 +271,8 @@ struct qemud_worker { struct qemud_server *server; }; +#define WORKER_TIMEOUT 3000 + /* Main server state */ struct qemud_server { virMutex lock; @@ -278,6 +280,8 @@ struct qemud_server { int privileged; + int workerTimeout; + size_t nworkers; size_t nactiveworkers; struct qemud_worker *workers; -- 1.7.5.rc3

5 9

[libvirt] [PATCH] nwfiler: Return error message about unresolvable variables
by Stefan Berger 27 Jun '11

27 Jun '11

This is in response to bugzilla 664629 https://bugzilla.redhat.com/show_bug.cgi?id=664629 The patch below returns an appropriate error message if the chain of nwfilters is found to contain unresolvable variables and therefore cannot be instantiated. Example: The following XMl added to a domain: <interface type='bridge'> <mac address='52:54:00:9f:80:45'/> <source bridge='virbr0'/> <model type='virtio'/> <filterref filter='test'/> </interface> that references the following filter <filter name='test' chain='root'> <filterref filter='clean-traffic'/> <filterref filter='allow-dhcp-server'/> </filter> now displays upon 'virsh start mydomain' error: Failed to start domain mydomain error: internal error Cannot instantiate filter due to unresolvable variable: DHCPSERVER 'DHPCSERVER' is contained in allow-dhcp-server. Signed-off-by: Stefan Berger <stefanb(a)linux.vnet.ibm.com> --- src/nwfilter/nwfilter_gentech_driver.c | 84 +++++++++++++++++++++++++++++++-- 1 file changed, 80 insertions(+), 4 deletions(-) Index: libvirt-acl/src/nwfilter/nwfilter_gentech_driver.c =================================================================== --- libvirt-acl.orig/src/nwfilter/nwfilter_gentech_driver.c +++ libvirt-acl/src/nwfilter/nwfilter_gentech_driver.c @@ -200,6 +200,68 @@ virNWFilterCreateVarHashmap(char *macadd /** + * Convert a virNWFilterHashTable into a string of comma-separated + * variable names. + */ +struct printString +{ + virBuffer buf; + const char *separator; + bool reportMAC; + bool reportIP; +}; + + +static void +_printString(void *payload ATTRIBUTE_UNUSED, const void *name, void *data) +{ + struct printString *ps = data; + + if ((STREQ((char *)name, NWFILTER_STD_VAR_IP ) && !ps->reportIP ) || + (STREQ((char *)name, NWFILTER_STD_VAR_MAC) && !ps->reportMAC)) + return; + + if (virBufferUse(&ps->buf) && ps->separator) + virBufferAdd(&ps->buf, ps->separator, -1); + + virBufferAdd(&ps->buf, name, -1); +} + +/** + * virNWFilterPrintVars + * + * @var: hash table containing variables + * @separaptro: separator to use between variable names, i.e., ", " + * @reportMAC: whether to report the 'MAC' variable + * @reportIP : whether to report the IP variable + * + * Returns a string of comma separated variable names + */ +static char * +virNWFilterPrintVars(virHashTablePtr vars, + const char *separator, + bool reportMAC, + bool reportIP) +{ + struct printString ps = { + .buf = VIR_BUFFER_INITIALIZER, + .separator = separator, + .reportMAC = reportMAC, + .reportIP = reportIP, + }; + + virHashForEach(vars, _printString, &ps); + + if (virBufferError(&ps.buf)) { + virBufferFreeAndReset(&ps.buf); + virReportOOMError(); + return NULL; + } + return virBufferContentAndReset(&ps.buf); +} + + +/** * virNWFilterRuleInstantiate: * @conn: pointer to virConnect object * @techdriver: the driver to use for instantiation @@ -575,6 +637,7 @@ virNWFilterInstantiate(virConnectPtr con virNWFilterRuleInstPtr *insts = NULL; void **ptrs = NULL; int instantiate = 1; + char *buf; virNWFilterHashTablePtr missing_vars = virNWFilterHashTableCreate(0); if (!missing_vars) { @@ -607,11 +670,9 @@ virNWFilterInstantiate(virConnectPtr con } goto err_exit; } - rc = 1; - goto err_exit; + goto err_unresolvable_vars; } else if (virHashSize(missing_vars->hashTable) > 1) { - rc = 1; - goto err_exit; + goto err_unresolvable_vars; } else if (!forceWithPendingReq && virNWFilterLookupLearnReq(ifindex) != NULL) { goto err_exit; @@ -674,6 +735,21 @@ err_exit: virNWFilterHashTableFree(missing_vars); return rc; + +err_unresolvable_vars: + + buf = virNWFilterPrintVars(missing_vars->hashTable, ", ", false, false); + if (buf) { + virNWFilterReportError(VIR_ERR_INTERNAL_ERROR, + _("Cannot instantiate filter due to unresolvable " + "variable%s: %s"), + strstr(buf, ", ") ? "s" : "", + buf); + VIR_FREE(buf); + } + + rc = 1; + goto err_exit; }

2 2

[libvirt] [PATCH 0/2] RFC: make QEMU timeout monitor replies
by Daniel P. Berrange 27 Jun '11

27 Jun '11

This is an experimental patch to make QEMU timeout on monitor replies after 30 seconds. I have only tested it to the extent of booting a guest. Interested in whether people can get a bogus timeout to occur in any testing they perform. By 'bogus timeout', I mean libvirt reporting a timeout when QEMU is still working correctly. Ideally we only timeout when QEMU has been sent SIGSTOP, or has live-locked itself.

5 9

[libvirt] Confusing valgrind error in virDomainLookupByUUIDString or virReportErrorHelper
by Richard W.M. Jones 27 Jun '11

27 Jun '11

libvirt-0.9.2-2.fc16.x86_64 Here's the error from valgrind: ==24953== Conditional jump or move depends on uninitialised value(s) ==24953== at 0x3DF68844BB: __GI___strcasecmp_l (strcmp.S:243) ==24953== by 0x3DF68221E1: __gconv_open (gconv_open.c:70) ==24953== by 0x3DF682F3E9: _nl_find_msg (dcigettext.c:974) ==24953== by 0x3DF682FB84: __dcigettext (dcigettext.c:640) ==24953== by 0x36BBE5A063: virReportErrorHelper (virterror.c:1215) ==24953== by 0x36BBEA3804: virDomainLookupByUUIDString (libvirt.c:2005) ==24953== by 0x4C9174C: guestfs__add_domain (virt.c:122) ==24953== by 0x4C4862B: guestfs_add_domain_argv (actions.c:2951) ==24953== by 0x42635A: add_libvirt_drives (virt.c:54) ==24953== by 0x4260D8: add_drives (options.c:69) ==24953== by 0x40B1F6: main (fish.c:422) It appears to originate from this code: src/libvirt.c:virDomainLookupByUUIDString: if (virUUIDParse(uuidstr, uuid) < 0) { 2005 ** virLibConnError(VIR_ERR_INVALID_ARG, __FUNCTION__); goto error; } The macro at line 2005 expands to: virReportErrorHelper(VIR_FROM_NONE, VIR_ERR_INVALID_ARG, __FILE__, \ __FUNCTION__, __LINE__, __FUNCTION__); Apparently __FUNCTION__ is deprecated[1]. When virReportErrorHelper is called, the problem appears to be at this line (virterror.c:1215): virerr = virErrorMsg(errcode, (errorMessage[0] ? errorMessage : NULL)); Here, errcode == VIR_ERR_INVALID_ARG and errorMessage is presumably the function name. That's as far as I've got for today. Just letting people know ... Rich. [1] http://gcc.gnu.org/onlinedocs/gcc/Function-Names.html -- Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones libguestfs lets you edit virtual machines. Supports shell scripting, bindings from many languages. http://libguestfs.org

2 1

[libvirt] [PATCH] build: rename Vcpupin to VcpuPin
by Eric Blake 27 Jun '11

27 Jun '11

We already have a public virDomainPinVcpu, which implies that Pin and Vcpu are treated as separate words. Commit e261987c introduced virDomainGetVcpupinInfo as the first public API that used Vcpupin, although we had prior internal uses of that spelling. For consistency, change the spelling to be two words everywhere, regardless of whether pin comes first or last. * daemon/remote.c: Treat vcpu and pin as separate words. * include/libvirt/libvirt.h.in: Likewise. * src/conf/domain_conf.c: Likewise. * src/conf/domain_conf.h: Likewise. * src/driver.h: Likewise. * src/libvirt.c: Likewise. * src/libvirt_private.syms: Likewise. * src/libvirt_public.syms: Likewise. * src/libxl/libxl_driver.c: Likewise. * src/qemu/qemu_driver.c: Likewise. * src/remote/remote_driver.c: Likewise. * src/xen/xend_internal.c: Likewise. * tools/virsh.c: Likewise. * src/remote/remote_protocol.x: Likewise. * src/remote_protocol-structs: Likewise. Suggested by Matthias Bolte. --- In response to http://www.redhat.com/archives/libvir-list/2011-June/msg01292.html daemon/remote.c | 8 ++++---- include/libvirt/libvirt.h.in | 2 +- src/conf/domain_conf.c | 40 ++++++++++++++++++++-------------------- src/conf/domain_conf.h | 16 ++++++++-------- src/driver.h | 4 ++-- src/libvirt.c | 12 ++++++------ src/libvirt_private.syms | 8 ++++---- src/libvirt_public.syms | 2 +- src/libxl/libxl_driver.c | 2 +- src/qemu/qemu_driver.c | 14 +++++++------- src/remote/remote_driver.c | 16 ++++++++-------- src/remote/remote_protocol.x | 6 +++--- src/remote_protocol-structs | 4 ++-- src/xen/xend_internal.c | 2 +- tools/virsh.c | 10 +++++----- 15 files changed, 73 insertions(+), 73 deletions(-) diff --git a/daemon/remote.c b/daemon/remote.c index aa726cf..56361ea 100644 --- a/daemon/remote.c +++ b/daemon/remote.c @@ -1048,13 +1048,13 @@ cleanup: } static int -remoteDispatchDomainGetVcpupinInfo(struct qemud_server *server ATTRIBUTE_UNUSED, +remoteDispatchDomainGetVcpuPinInfo(struct qemud_server *server ATTRIBUTE_UNUSED, struct qemud_client *client ATTRIBUTE_UNUSED, virConnectPtr conn, remote_message_header *hdr ATTRIBUTE_UNUSED, remote_error *rerr, - remote_domain_get_vcpupin_info_args *args, - remote_domain_get_vcpupin_info_ret *ret) + remote_domain_get_vcpu_pin_info_args *args, + remote_domain_get_vcpu_pin_info_ret *ret) { virDomainPtr dom = NULL; unsigned char *cpumaps = NULL; @@ -1085,7 +1085,7 @@ remoteDispatchDomainGetVcpupinInfo(struct qemud_server *server ATTRIBUTE_UNUSED, VIR_ALLOC_N(cpumaps, args->ncpumaps * args->maplen) < 0) goto no_memory; - if ((num = virDomainGetVcpupinInfo(dom, + if ((num = virDomainGetVcpuPinInfo(dom, args->ncpumaps, cpumaps, args->maplen, diff --git a/include/libvirt/libvirt.h.in b/include/libvirt/libvirt.h.in index 4f9f158..82e15f2 100644 --- a/include/libvirt/libvirt.h.in +++ b/include/libvirt/libvirt.h.in @@ -1266,7 +1266,7 @@ int virDomainPinVcpuFlags (virDomainPtr domain, int maplen, unsigned int flags); -int virDomainGetVcpupinInfo (virDomainPtr domain, +int virDomainGetVcpuPinInfo (virDomainPtr domain, int ncpumaps, unsigned char *cpumaps, int maplen, diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 3d290fb..60e0318 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -981,7 +981,7 @@ virDomainClockDefClear(virDomainClockDefPtr def) } static void -virDomainVcpupinDefFree(virDomainVcpupinDefPtr *def, +virDomainVcpuPinDefFree(virDomainVcpuPinDefPtr *def, int nvcpupin) { int i; @@ -1089,7 +1089,7 @@ void virDomainDefFree(virDomainDefPtr def) virCPUDefFree(def->cpu); - virDomainVcpupinDefFree(def->cputune.vcpupin, def->cputune.nvcpupin); + virDomainVcpuPinDefFree(def->cputune.vcpupin, def->cputune.nvcpupin); VIR_FREE(def->numatune.memory.nodemask); @@ -5647,13 +5647,13 @@ cleanup: } /* Parse the XML definition for a vcpupin */ -static virDomainVcpupinDefPtr -virDomainVcpupinDefParseXML(const xmlNodePtr node, +static virDomainVcpuPinDefPtr +virDomainVcpuPinDefParseXML(const xmlNodePtr node, xmlXPathContextPtr ctxt, int maxvcpus, int flags ATTRIBUTE_UNUSED) { - virDomainVcpupinDefPtr def; + virDomainVcpuPinDefPtr def; xmlNodePtr oldnode = ctxt->node; unsigned int vcpuid; char *tmp = NULL; @@ -5895,13 +5895,13 @@ static virDomainDefPtr virDomainDefParseXML(virCapsPtr caps, } for (i = 0 ; i < n ; i++) { - virDomainVcpupinDefPtr vcpupin = NULL; - vcpupin = virDomainVcpupinDefParseXML(nodes[i], ctxt, def->maxvcpus, 0); + virDomainVcpuPinDefPtr vcpupin = NULL; + vcpupin = virDomainVcpuPinDefParseXML(nodes[i], ctxt, def->maxvcpus, 0); if (!vcpupin) goto error; - if (virDomainVcpupinIsDuplicate(def->cputune.vcpupin, + if (virDomainVcpuPinIsDuplicate(def->cputune.vcpupin, def->cputune.nvcpupin, vcpupin->vcpuid)) { virDomainReportError(VIR_ERR_INTERNAL_ERROR, @@ -8118,7 +8118,7 @@ virDomainCpuSetParse(const char **str, char sep, /* Check if vcpupin with same vcpuid already exists. * Return 1 if exists, 0 if not. */ int -virDomainVcpupinIsDuplicate(virDomainVcpupinDefPtr *def, +virDomainVcpuPinIsDuplicate(virDomainVcpuPinDefPtr *def, int nvcpupin, int vcpu) { @@ -8135,8 +8135,8 @@ virDomainVcpupinIsDuplicate(virDomainVcpupinDefPtr *def, return 0; } -virDomainVcpupinDefPtr -virDomainVcpupinFindByVcpu(virDomainVcpupinDefPtr *def, +virDomainVcpuPinDefPtr +virDomainVcpuPinFindByVcpu(virDomainVcpuPinDefPtr *def, int nvcpupin, int vcpu) { @@ -8154,13 +8154,13 @@ virDomainVcpupinFindByVcpu(virDomainVcpupinDefPtr *def, } int -virDomainVcpupinAdd(virDomainDefPtr def, +virDomainVcpuPinAdd(virDomainDefPtr def, unsigned char *cpumap, int maplen, int vcpu) { - virDomainVcpupinDefPtr *vcpupin_list = NULL; - virDomainVcpupinDefPtr vcpupin = NULL; + virDomainVcpuPinDefPtr *vcpupin_list = NULL; + virDomainVcpuPinDefPtr vcpupin = NULL; char *cpumask = NULL; int i; @@ -8202,10 +8202,10 @@ virDomainVcpupinAdd(virDomainDefPtr def, def->cputune.vcpupin = vcpupin_list; } else { - if (virDomainVcpupinIsDuplicate(def->cputune.vcpupin, + if (virDomainVcpuPinIsDuplicate(def->cputune.vcpupin, def->cputune.nvcpupin, vcpu)) { - vcpupin = virDomainVcpupinFindByVcpu(def->cputune.vcpupin, + vcpupin = virDomainVcpuPinFindByVcpu(def->cputune.vcpupin, def->cputune.nvcpupin, vcpu); vcpupin->vcpuid = vcpu; @@ -8236,11 +8236,11 @@ cleanup: } int -virDomainVcpupinDel(virDomainDefPtr def, int vcpu) +virDomainVcpuPinDel(virDomainDefPtr def, int vcpu) { int n; bool deleted = false; - virDomainVcpupinDefPtr *vcpupin_list = def->cputune.vcpupin; + virDomainVcpuPinDefPtr *vcpupin_list = def->cputune.vcpupin; /* No vcpupin exists yet */ if (!def->cputune.nvcpupin) { @@ -8253,7 +8253,7 @@ virDomainVcpupinDel(virDomainDefPtr def, int vcpu) VIR_FREE(vcpupin_list[n]); memmove(&vcpupin_list[n], &vcpupin_list[n+1], - (def->cputune.nvcpupin - n - 1) * sizeof(virDomainVcpupinDef *)); + (def->cputune.nvcpupin - n - 1) * sizeof(virDomainVcpuPinDef *)); deleted = true; break; } @@ -8263,7 +8263,7 @@ virDomainVcpupinDel(virDomainDefPtr def, int vcpu) return 0; if (--def->cputune.nvcpupin == 0) { - virDomainVcpupinDefFree(def->cputune.vcpupin, 0); + virDomainVcpuPinDefFree(def->cputune.vcpupin, 0); } else { if (VIR_REALLOC_N(def->cputune.vcpupin, def->cputune.nvcpupin) < 0) { virReportOOMError(); diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index aa25e36..e81977c 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -1101,18 +1101,18 @@ void virDomainSnapshotObjListRemove(virDomainSnapshotObjListPtr snapshots, int virDomainSnapshotHasChildren(virDomainSnapshotObjPtr snap, virDomainSnapshotObjListPtr snapshots); -typedef struct _virDomainVcpupinDef virDomainVcpupinDef; -typedef virDomainVcpupinDef *virDomainVcpupinDefPtr; -struct _virDomainVcpupinDef { +typedef struct _virDomainVcpuPinDef virDomainVcpuPinDef; +typedef virDomainVcpuPinDef *virDomainVcpuPinDefPtr; +struct _virDomainVcpuPinDef { int vcpuid; char *cpumask; }; -int virDomainVcpupinIsDuplicate(virDomainVcpupinDefPtr *def, +int virDomainVcpuPinIsDuplicate(virDomainVcpuPinDefPtr *def, int nvcpupin, int vcpu); -virDomainVcpupinDefPtr virDomainVcpupinFindByVcpu(virDomainVcpupinDefPtr *def, +virDomainVcpuPinDefPtr virDomainVcpuPinFindByVcpu(virDomainVcpuPinDefPtr *def, int nvcpupin, int vcpu); @@ -1171,7 +1171,7 @@ struct _virDomainDef { struct { unsigned long shares; int nvcpupin; - virDomainVcpupinDefPtr *vcpupin; + virDomainVcpuPinDefPtr *vcpupin; } cputune; virDomainNumatuneDef numatune; @@ -1406,12 +1406,12 @@ int virDomainCpuSetParse(const char **str, char *virDomainCpuSetFormat(char *cpuset, int maxcpu); -int virDomainVcpupinAdd(virDomainDefPtr def, +int virDomainVcpuPinAdd(virDomainDefPtr def, unsigned char *cpumap, int maplen, int vcpu); -int virDomainVcpupinDel(virDomainDefPtr def, int vcpu); +int virDomainVcpuPinDel(virDomainDefPtr def, int vcpu); int virDomainDiskIndexByName(virDomainDefPtr def, const char *name); int virDomainDiskInsert(virDomainDefPtr def, diff --git a/src/driver.h b/src/driver.h index c15d0dd..60cd556 100644 --- a/src/driver.h +++ b/src/driver.h @@ -240,7 +240,7 @@ typedef int int maplen, unsigned int flags); typedef int - (*virDrvDomainGetVcpupinInfo) (virDomainPtr domain, + (*virDrvDomainGetVcpuPinInfo) (virDomainPtr domain, int ncpumaps, unsigned char *cpumaps, int maplen, @@ -713,7 +713,7 @@ struct _virDriver { virDrvDomainGetVcpusFlags domainGetVcpusFlags; virDrvDomainPinVcpu domainPinVcpu; virDrvDomainPinVcpuFlags domainPinVcpuFlags; - virDrvDomainGetVcpupinInfo domainGetVcpupinInfo; + virDrvDomainGetVcpuPinInfo domainGetVcpuPinInfo; virDrvDomainGetVcpus domainGetVcpus; virDrvDomainGetMaxVcpus domainGetMaxVcpus; virDrvDomainGetSecurityLabel domainGetSecurityLabel; diff --git a/src/libvirt.c b/src/libvirt.c index 46a448b..a3f3267 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -7061,7 +7061,7 @@ error: * just live or both live and persistent state is changed. * Not all hypervisors can support all flag combinations. * - * See also virDomainGetVcpupinInfo for querying this information. + * See also virDomainGetVcpuPinInfo for querying this information. * * Returns 0 in case of success, -1 in case of failure. * @@ -7112,7 +7112,7 @@ error: } /** - * virDomainGetVcpupinInfo: + * virDomainGetVcpuPinInfo: * @domain: pointer to domain object, or NULL for Domain0 * @ncpumaps: the number of cpumap (listed first to match virDomainGetVcpus) * @cpumaps: pointer to a bit map of real CPUs for all vcpus of this @@ -7136,7 +7136,7 @@ error: * -1 in case of failure. */ int -virDomainGetVcpupinInfo (virDomainPtr domain, int ncpumaps, +virDomainGetVcpuPinInfo (virDomainPtr domain, int ncpumaps, unsigned char *cpumaps, int maplen, unsigned int flags) { virConnectPtr conn; @@ -7160,9 +7160,9 @@ virDomainGetVcpupinInfo (virDomainPtr domain, int ncpumaps, conn = domain->conn; - if (conn->driver->domainGetVcpupinInfo) { + if (conn->driver->domainGetVcpuPinInfo) { int ret; - ret = conn->driver->domainGetVcpupinInfo (domain, ncpumaps, + ret = conn->driver->domainGetVcpuPinInfo (domain, ncpumaps, cpumaps, maplen, flags); if (ret < 0) goto error; @@ -7197,7 +7197,7 @@ error: * and also in cpumaps if this pointer isn't NULL. This call may fail * on an inactive domain. * - * See also virDomainGetVcpupinInfo for querying just cpumaps, including on + * See also virDomainGetVcpuPinInfo for querying just cpumaps, including on * an inactive domain. * * Returns the number of info filled in case of success, -1 in case of failure. diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index afe9835..054c074 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -366,10 +366,10 @@ virDomainTimerTickpolicyTypeFromString; virDomainTimerTickpolicyTypeToString; virDomainTimerTrackTypeFromString; virDomainTimerTrackTypeToString; -virDomainVcpupinAdd; -virDomainVcpupinDel; -virDomainVcpupinFindByVcpu; -virDomainVcpupinIsDuplicate; +virDomainVcpuPinAdd; +virDomainVcpuPinDel; +virDomainVcpuPinFindByVcpu; +virDomainVcpuPinIsDuplicate; virDomainVideoDefFree; virDomainVideoDefaultRAM; virDomainVideoDefaultType; diff --git a/src/libvirt_public.syms b/src/libvirt_public.syms index c7dc3c5..5f2541a 100644 --- a/src/libvirt_public.syms +++ b/src/libvirt_public.syms @@ -453,7 +453,7 @@ LIBVIRT_0.9.2 { LIBVIRT_0.9.3 { global: virDomainGetControlInfo; - virDomainGetVcpupinInfo; + virDomainGetVcpuPinInfo; virDomainPinVcpuFlags; virDomainSendKey; virEventAddHandle; diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index 5a5951f..7fd257d 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -2393,7 +2393,7 @@ libxlDomainPinVcpu(virDomainPtr dom, unsigned int vcpu, unsigned char *cpumap, goto cleanup; } - if (virDomainVcpupinAdd(vm->def, cpumap, maplen, vcpu) < 0) { + if (virDomainVcpuPinAdd(vm->def, cpumap, maplen, vcpu) < 0) { libxlError(VIR_ERR_INTERNAL_ERROR, "%s", _("failed to update or add vcpupin xml")); goto cleanup; diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index d9099d5..c291e16 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -3109,14 +3109,14 @@ qemudDomainPinVcpuFlags(virDomainPtr dom, } if (canResetting) { - if (virDomainVcpupinDel(vm->def, vcpu) < 0) { + if (virDomainVcpuPinDel(vm->def, vcpu) < 0) { qemuReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("failed to delete vcpupin xml of " "a running domain")); goto cleanup; } } else { - if (virDomainVcpupinAdd(vm->def, cpumap, maplen, vcpu) < 0) { + if (virDomainVcpuPinAdd(vm->def, cpumap, maplen, vcpu) < 0) { qemuReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("failed to update or add vcpupin xml of " "a running domain")); @@ -3129,14 +3129,14 @@ qemudDomainPinVcpuFlags(virDomainPtr dom, if (flags & VIR_DOMAIN_AFFECT_CONFIG) { if (canResetting) { - if (virDomainVcpupinDel(persistentDef, vcpu) < 0) { + if (virDomainVcpuPinDel(persistentDef, vcpu) < 0) { qemuReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("failed to delete vcpupin xml of " "a persistent domain")); goto cleanup; } } else { - if (virDomainVcpupinAdd(persistentDef, cpumap, maplen, vcpu) < 0) { + if (virDomainVcpuPinAdd(persistentDef, cpumap, maplen, vcpu) < 0) { qemuReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("failed to update or add vcpupin xml of " "a persistent domain")); @@ -3166,7 +3166,7 @@ qemudDomainPinVcpu(virDomainPtr dom, } static int -qemudDomainGetVcpupinInfo(virDomainPtr dom, +qemudDomainGetVcpuPinInfo(virDomainPtr dom, int ncpumaps, unsigned char *cpumaps, int maplen, @@ -3180,7 +3180,7 @@ qemudDomainGetVcpupinInfo(virDomainPtr dom, bool isActive; int maxcpu, hostcpus, vcpu, pcpu; int n; - virDomainVcpupinDefPtr *vcpupin_list; + virDomainVcpuPinDefPtr *vcpupin_list; char *cpumask = NULL; unsigned char *cpumap; @@ -8446,7 +8446,7 @@ static virDriver qemuDriver = { .domainGetVcpusFlags = qemudDomainGetVcpusFlags, /* 0.8.5 */ .domainPinVcpu = qemudDomainPinVcpu, /* 0.4.4 */ .domainPinVcpuFlags = qemudDomainPinVcpuFlags, /* 0.9.3 */ - .domainGetVcpupinInfo = qemudDomainGetVcpupinInfo, /* 0.9.3 */ + .domainGetVcpuPinInfo = qemudDomainGetVcpuPinInfo, /* 0.9.3 */ .domainGetVcpus = qemudDomainGetVcpus, /* 0.4.4 */ .domainGetMaxVcpus = qemudDomainGetMaxVcpus, /* 0.4.4 */ .domainGetSecurityLabel = qemudDomainGetSecurityLabel, /* 0.6.1 */ diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index 84a5eab..ac00128 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -2142,7 +2142,7 @@ done: } static int -remoteDomainGetVcpupinInfo (virDomainPtr domain, +remoteDomainGetVcpuPinInfo (virDomainPtr domain, int ncpumaps, unsigned char *cpumaps, int maplen, @@ -2150,8 +2150,8 @@ remoteDomainGetVcpupinInfo (virDomainPtr domain, { int rv = -1; int i; - remote_domain_get_vcpupin_info_args args; - remote_domain_get_vcpupin_info_ret ret; + remote_domain_get_vcpu_pin_info_args args; + remote_domain_get_vcpu_pin_info_ret ret; struct private_data *priv = domain->conn->privateData; remoteDriverLock(priv); @@ -2178,10 +2178,10 @@ remoteDomainGetVcpupinInfo (virDomainPtr domain, memset (&ret, 0, sizeof ret); - if (call (domain->conn, priv, 0, REMOTE_PROC_DOMAIN_GET_VCPUPIN_INFO, - (xdrproc_t) xdr_remote_domain_get_vcpupin_info_args, + if (call (domain->conn, priv, 0, REMOTE_PROC_DOMAIN_GET_VCPU_PIN_INFO, + (xdrproc_t) xdr_remote_domain_get_vcpu_pin_info_args, (char *) &args, - (xdrproc_t) xdr_remote_domain_get_vcpupin_info_ret, + (xdrproc_t) xdr_remote_domain_get_vcpu_pin_info_ret, (char *) &ret) == -1) goto done; @@ -2207,7 +2207,7 @@ remoteDomainGetVcpupinInfo (virDomainPtr domain, rv = ret.num; cleanup: - xdr_free ((xdrproc_t) xdr_remote_domain_get_vcpupin_info_ret, (char *) &ret); + xdr_free ((xdrproc_t) xdr_remote_domain_get_vcpu_pin_info_ret, (char *) &ret); done: remoteDriverUnlock(priv); @@ -6465,7 +6465,7 @@ static virDriver remote_driver = { .domainGetVcpusFlags = remoteDomainGetVcpusFlags, /* 0.8.5 */ .domainPinVcpu = remoteDomainPinVcpu, /* 0.3.0 */ .domainPinVcpuFlags = remoteDomainPinVcpuFlags, /* 0.9.3 */ - .domainGetVcpupinInfo = remoteDomainGetVcpupinInfo, /* 0.9.3 */ + .domainGetVcpuPinInfo = remoteDomainGetVcpuPinInfo, /* 0.9.3 */ .domainGetVcpus = remoteDomainGetVcpus, /* 0.3.0 */ .domainGetMaxVcpus = remoteDomainGetMaxVcpus, /* 0.3.0 */ .domainGetSecurityLabel = remoteDomainGetSecurityLabel, /* 0.6.1 */ diff --git a/src/remote/remote_protocol.x b/src/remote/remote_protocol.x index ee08b82..65a4432 100644 --- a/src/remote/remote_protocol.x +++ b/src/remote/remote_protocol.x @@ -903,14 +903,14 @@ struct remote_domain_pin_vcpu_flags_args { unsigned int flags; }; -struct remote_domain_get_vcpupin_info_args { +struct remote_domain_get_vcpu_pin_info_args { remote_nonnull_domain dom; int ncpumaps; int maplen; unsigned int flags; }; -struct remote_domain_get_vcpupin_info_ret { +struct remote_domain_get_vcpu_pin_info_ret { opaque cpumaps<REMOTE_CPUMAPS_MAX>; int num; }; @@ -2392,7 +2392,7 @@ enum remote_procedure { REMOTE_PROC_NODE_GET_CPU_STATS = 227, /* skipgen skipgen */ REMOTE_PROC_NODE_GET_MEMORY_STATS = 228, /* skipgen skipgen */ REMOTE_PROC_DOMAIN_GET_CONTROL_INFO = 229, /* autogen autogen */ - REMOTE_PROC_DOMAIN_GET_VCPUPIN_INFO = 230 /* skipgen skipgen */ + REMOTE_PROC_DOMAIN_GET_VCPU_PIN_INFO = 230 /* skipgen skipgen */ /* * Notice how the entries are grouped in sets of 10 ? diff --git a/src/remote_protocol-structs b/src/remote_protocol-structs index be98135..c07ba81 100644 --- a/src/remote_protocol-structs +++ b/src/remote_protocol-structs @@ -580,13 +580,13 @@ struct remote_domain_pin_vcpu_flags_args { } cpumap; u_int flags; }; -struct remote_domain_get_vcpupin_info_args { +struct remote_domain_get_vcpu_pin_info_args { remote_nonnull_domain dom; int ncpumaps; int maplen; u_int flags; }; -struct remote_domain_get_vcpupin_info_ret { +struct remote_domain_get_vcpu_pin_info_ret { struct { u_int cpumaps_len; char * cpumaps_val; diff --git a/src/xen/xend_internal.c b/src/xen/xend_internal.c index f94dd8b..d418847 100644 --- a/src/xen/xend_internal.c +++ b/src/xen/xend_internal.c @@ -2332,7 +2332,7 @@ xenDaemonDomainPinVcpu(virDomainPtr domain, unsigned int vcpu, goto cleanup; if (ret == 0) { - if (virDomainVcpupinAdd(def, cpumap, maplen, vcpu) < 0) { + if (virDomainVcpuPinAdd(def, cpumap, maplen, vcpu) < 0) { virXendError(VIR_ERR_INTERNAL_ERROR, "%s", _("failed to add vcpupin xml entry")); return (-1); diff --git a/tools/virsh.c b/tools/virsh.c index 31fbeb7..8e6439f 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -2962,11 +2962,11 @@ cmdVcpuinfo(vshControl *ctl, const vshCmd *cmd) } } else { if (info.state == VIR_DOMAIN_SHUTOFF && - (ncpus = virDomainGetVcpupinInfo(dom, info.nrVirtCpu, + (ncpus = virDomainGetVcpuPinInfo(dom, info.nrVirtCpu, cpumaps, cpumaplen, VIR_DOMAIN_AFFECT_CONFIG)) >= 0) { - /* fallback plan to use virDomainGetVcpupinInfo */ + /* fallback plan to use virDomainGetVcpuPinInfo */ for (n = 0; n < ncpus; n++) { vshPrint(ctl, "%-15s %d\n", _("VCPU:"), n); @@ -3015,7 +3015,7 @@ static const vshCmdOptDef opts_vcpupin[] = { }; static bool -cmdVcpupin(vshControl *ctl, const vshCmd *cmd) +cmdVcpuPin(vshControl *ctl, const vshCmd *cmd) { virDomainInfo info; virDomainPtr dom; @@ -3101,7 +3101,7 @@ cmdVcpupin(vshControl *ctl, const vshCmd *cmd) flags = VIR_DOMAIN_AFFECT_CURRENT; cpumaps = vshMalloc(ctl, info.nrVirtCpu * cpumaplen); - if ((ncpus = virDomainGetVcpupinInfo(dom, info.nrVirtCpu, + if ((ncpus = virDomainGetVcpuPinInfo(dom, info.nrVirtCpu, cpumaps, cpumaplen, flags)) >= 0) { vshPrint(ctl, "%s %s\n", _("VCPU:"), _("CPU Affinity")); @@ -11674,7 +11674,7 @@ static const vshCmdDef domManagementCmds[] = { info_update_device, 0}, {"vcpucount", cmdVcpucount, opts_vcpucount, info_vcpucount, 0}, {"vcpuinfo", cmdVcpuinfo, opts_vcpuinfo, info_vcpuinfo, 0}, - {"vcpupin", cmdVcpupin, opts_vcpupin, info_vcpupin, 0}, + {"vcpupin", cmdVcpuPin, opts_vcpupin, info_vcpupin, 0}, {"version", cmdVersion, opts_version, info_version, 0}, {"vncdisplay", cmdVNCDisplay, opts_vncdisplay, info_vncdisplay, 0}, {NULL, NULL, NULL, NULL, 0} -- 1.7.4.4

4 5

[libvirt] [PATCH] Only include parthelper if built with storage_disk
by Ruben Kerkhof 27 Jun '11

27 Jun '11

Parthelper is only compiled if both --with-libvirtd and --with-storage-disk are set. Signed-off-by: Ruben Kerkhof <ruben(a)rubenkerkhof.com> --- libvirt.spec.in | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 11b8591..0111519 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -1016,7 +1016,10 @@ fi %attr(0755, root, root) %{_libexecdir}/libvirt_lxc %endif +%if %{with_storage_disk} %attr(0755, root, root) %{_libexecdir}/libvirt_parthelper +%endif + %attr(0755, root, root) %{_libexecdir}/libvirt_iohelper %attr(0755, root, root) %{_sbindir}/libvirtd -- 1.7.5.4

2 2

[libvirt] sysinfo: cleanup function/struct names.
by Minoru Usui 27 Jun '11

27 Jun '11

Fix lack of 'virSysinfo' prefix of functions/structs in src/util/sysinfo.[ch] diff --git a/src/util/sysinfo.c b/src/util/sysinfo.c index fab4f06..3ff834e 100644 Signed-off-by: Minoru Usui <usui(a)mxm.nes.nec.co.jp> --- src/util/sysinfo.c | 44 ++++++++++++++++++++++++-------------------- src/util/sysinfo.h | 16 ++++++++-------- 2 files changed, 32 insertions(+), 28 deletions(-) diff --git a/src/util/sysinfo.c b/src/util/sysinfo.c index fab4f06..31ebdc2 100644 --- a/src/util/sysinfo.c +++ b/src/util/sysinfo.c @@ -128,7 +128,7 @@ virSysinfoRead(void) { #else /* !WIN32 */ static char * -parseBIOSInfo(char *base, virSysinfoDefPtr ret) +virSysinfoParseBIOS(char *base, virSysinfoDefPtr ret) { char *cur, *eol; @@ -164,7 +164,7 @@ no_memory: } static char * -parseSystemInfo(char *base, virSysinfoDefPtr ret) +virSysinfoParseSystem(char *base, virSysinfoDefPtr ret) { char *cur, *eol; @@ -222,10 +222,10 @@ no_memory: } static char * -parseProcessorInfo(char *base, virSysinfoDefPtr ret) +virSysinfoParseProcessor(char *base, virSysinfoDefPtr ret) { char *cur, *eol, *tmp_base; - virProcessorinfoDefPtr processor; + virSysinfoProcessorDefPtr processor; while((tmp_base = strstr(base, "Processor Information")) != NULL) { base = tmp_base; @@ -323,10 +323,10 @@ no_memory: } static char * -parseMemoryDeviceInfo(char *base, virSysinfoDefPtr ret) +virSysinfoParseMemory(char *base, virSysinfoDefPtr ret) { char *cur, *eol, *tmp_base; - virMemoryDeviceinfoDefPtr memory; + virSysinfoMemoryDefPtr memory; while ((tmp_base = strstr(base, "Memory Device")) != NULL) { base = tmp_base; @@ -452,20 +452,20 @@ virSysinfoRead(void) { base = outbuf; - if ((base = parseBIOSInfo(base, ret)) == NULL) + if ((base = virSysinfoParseBIOS(base, ret)) == NULL) goto no_memory; - if ((base = parseSystemInfo(base, ret)) == NULL) + if ((base = virSysinfoParseSystem(base, ret)) == NULL) goto no_memory; ret->nprocessor = 0; ret->processor = NULL; - if ((base = parseProcessorInfo(base, ret)) == NULL) + if ((base = virSysinfoParseProcessor(base, ret)) == NULL) goto no_memory; ret->nmemory = 0; ret->memory = NULL; - if ((base = parseMemoryDeviceInfo(base, ret)) == NULL) + if ((base = virSysinfoParseMemory(base, ret)) == NULL) goto no_memory; cleanup: @@ -484,7 +484,8 @@ no_memory: #endif /* !WIN32 */ static void -BIOSInfoFormat(virSysinfoDefPtr def, const char *prefix, virBufferPtr buf) +virSysinfoBIOSFormat(virSysinfoDefPtr def, const char *prefix, + virBufferPtr buf) { int len = strlen(prefix); @@ -522,7 +523,8 @@ BIOSInfoFormat(virSysinfoDefPtr def, const char *prefix, virBufferPtr buf) } static void -SystemInfoFormat(virSysinfoDefPtr def, const char *prefix, virBufferPtr buf) +virSysinfoSystemFormat(virSysinfoDefPtr def, const char *prefix, + virBufferPtr buf) { int len = strlen(prefix); @@ -580,11 +582,12 @@ SystemInfoFormat(virSysinfoDefPtr def, const char *prefix, virBufferPtr buf) } static void -ProcessorInfoFormat(virSysinfoDefPtr def, const char *prefix, virBufferPtr buf) +virSysinfoProcessorFormat(virSysinfoDefPtr def, const char *prefix, + virBufferPtr buf) { int i; int len = strlen(prefix); - virProcessorinfoDefPtr processor; + virSysinfoProcessorDefPtr processor; for (i = 0; i < def->nprocessor; i++) { processor = &def->processor[i]; @@ -675,11 +678,12 @@ ProcessorInfoFormat(virSysinfoDefPtr def, const char *prefix, virBufferPtr buf) } static void -MemoryDeviceInfoFormat(virSysinfoDefPtr def, const char *prefix, virBufferPtr buf) +virSysinfoMemoryFormat(virSysinfoDefPtr def, const char *prefix, + virBufferPtr buf) { int i; int len = strlen(prefix); - virMemoryDeviceinfoDefPtr memory; + virSysinfoMemoryDefPtr memory; for (i = 0; i < def->nmemory; i++) { memory = &def->memory[i]; @@ -785,10 +789,10 @@ virSysinfoFormat(virSysinfoDefPtr def, const char *prefix) virBufferAsprintf(&buf, "%s<sysinfo type='%s'>\n", prefix, type); - BIOSInfoFormat(def, prefix, &buf); - SystemInfoFormat(def, prefix, &buf); - ProcessorInfoFormat(def, prefix, &buf); - MemoryDeviceInfoFormat(def, prefix, &buf); + virSysinfoBIOSFormat(def, prefix, &buf); + virSysinfoSystemFormat(def, prefix, &buf); + virSysinfoProcessorFormat(def, prefix, &buf); + virSysinfoMemoryFormat(def, prefix, &buf); virBufferAsprintf(&buf, "%s</sysinfo>\n", prefix); diff --git a/src/util/sysinfo.h b/src/util/sysinfo.h index a15c5ac..86fd20f 100644 --- a/src/util/sysinfo.h +++ b/src/util/sysinfo.h @@ -33,9 +33,9 @@ enum virSysinfoType { VIR_SYSINFO_LAST }; -typedef struct _virProcessorinfoDef virProcessorinfoDef; -typedef virProcessorinfoDef *virProcessorinfoDefPtr; -struct _virProcessorinfoDef { +typedef struct _virSysinfoProcessorDef virSysinfoProcessorDef; +typedef virSysinfoProcessorDef *virSysinfoProcessorDefPtr; +struct _virSysinfoProcessorDef { char *processor_socket_destination; char *processor_type; char *processor_family; @@ -49,9 +49,9 @@ struct _virProcessorinfoDef { char *processor_part_number; }; -typedef struct _virMemoryDeviceinfoDef virMemoryDeviceinfoDef; -typedef virMemoryDeviceinfoDef *virMemoryDeviceinfoDefPtr; -struct _virMemoryDeviceinfoDef { +typedef struct _virSysinfoMemoryDef virSysinfoMemoryDef; +typedef virSysinfoMemoryDef *virSysinfoMemoryDefPtr; +struct _virSysinfoMemoryDef { char *memory_size; char *memory_form_factor; char *memory_locator; @@ -83,10 +83,10 @@ struct _virSysinfoDef { char *system_family; size_t nprocessor; - virProcessorinfoDefPtr processor; + virSysinfoProcessorDefPtr processor; size_t nmemory; - virMemoryDeviceinfoDefPtr memory; + virSysinfoMemoryDefPtr memory; }; virSysinfoDefPtr virSysinfoRead(void); -- 1.7.1 -- Minoru Usui <usui(a)mxm.nes.nec.co.jp>

3 2

[libvirt] sysinfo: fix lack of error check in virSysinfoFormat().
by Minoru Usui 27 Jun '11

27 Jun '11

Fix lack of error check in virSysinfoFormat(). Signed-off-by: Minoru Usui <usui(a)mxm.nes.nec.co.jp> --- src/util/sysinfo.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/src/util/sysinfo.c b/src/util/sysinfo.c index 31ebdc2..bff1cb8 100644 --- a/src/util/sysinfo.c +++ b/src/util/sysinfo.c @@ -796,6 +796,11 @@ virSysinfoFormat(virSysinfoDefPtr def, const char *prefix) virBufferAsprintf(&buf, "%s</sysinfo>\n", prefix); + if (virBufferError(&buf)) { + virReportOOMError(); + return NULL; + } + return virBufferContentAndReset(&buf); } -- 1.7.1 -- Minoru Usui <usui(a)mxm.nes.nec.co.jp>

3 2

[libvirt] [PATCH v2] tests: Partly fix networkxml2argvtest being configure result dependent
by Matthias Bolte 27 Jun '11

27 Jun '11

Convert networkDnsmasqLeaseFileName to a replaceable function pointer that allow the testsuite to use a version of that function that is not depending on configure --localstatedir. This fixes 5 of 6 test failures, when configure --localstatedir isn't set to /var. --- The last failure is related to networkBuildDhcpDaemonCommandLine trying to indirectly write dnsmasq config files to disk. This needs a larger rewrite to separate the config file writing out of networkBuildDhcpDaemonCommandLine. src/network/bridge_driver.c | 5 ++++- src/network/bridge_driver.h | 5 +++++ tests/networkxml2argvtest.c | 13 +++++++++++++ 3 files changed, 22 insertions(+), 1 deletions(-) diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index 1b11132..d009627 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -108,7 +108,7 @@ static void networkReloadIptablesRules(struct network_driver *driver); static struct network_driver *driverState = NULL; static char * -networkDnsmasqLeaseFileName(const char *netname) +networkDnsmasqLeaseFileNameDefault(const char *netname) { char *leasefile; @@ -117,6 +117,9 @@ networkDnsmasqLeaseFileName(const char *netname) return leasefile; } +networkDnsmasqLeaseFileNameFunc networkDnsmasqLeaseFileName = + networkDnsmasqLeaseFileNameDefault; + static char * networkRadvdPidfileBasename(const char *netname) { diff --git a/src/network/bridge_driver.h b/src/network/bridge_driver.h index 8d82b67..a106e3d 100644 --- a/src/network/bridge_driver.h +++ b/src/network/bridge_driver.h @@ -34,4 +34,9 @@ int networkRegister(void); int networkBuildDhcpDaemonCommandLine(virNetworkObjPtr network, virCommandPtr *cmdout, char *pidfile); +typedef char *(*networkDnsmasqLeaseFileNameFunc)(const char *netname); + +/* this allows the testsuite to replace the lease filename resolver function */ +extern networkDnsmasqLeaseFileNameFunc networkDnsmasqLeaseFileName; + #endif /* __VIR_NETWORK__DRIVER_H */ diff --git a/tests/networkxml2argvtest.c b/tests/networkxml2argvtest.c index 16d57a9..62de191 100644 --- a/tests/networkxml2argvtest.c +++ b/tests/networkxml2argvtest.c @@ -85,11 +85,24 @@ cleanup: return result; } +static char * +testDnsmasqLeaseFileName(const char *netname) +{ + char *leasefile; + + virAsprintf(&leasefile, "/var/lib/libvirt/dnsmasq/%s.leases", + netname); + + return leasefile; +} + static int mymain(void) { int ret = 0; + networkDnsmasqLeaseFileName = testDnsmasqLeaseFileName; + #define DO_TEST(name) \ if (virtTestRun("Network XML-2-Argv " name, \ 1, testCompareXMLToArgvHelper, (name)) < 0) \ -- 1.7.0.4

2 2

[libvirt] [PATCH] qemu: Remove bogus error codes for NUMA memory tuning
by Osier Yang 27 Jun '11

27 Jun '11

This is no code between virSaveLastError and virGetLastError will set an error, remove the bogus codes. --- src/qemu/qemu_process.c | 33 --------------------------------- 1 files changed, 0 insertions(+), 33 deletions(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index bb83be0..6c2492a 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -1251,8 +1251,6 @@ static int qemuProcessInitNumaMemoryPolicy(virDomainObjPtr vm) { nodemask_t mask; - virErrorPtr orig_err = NULL; - virErrorPtr err = NULL; int mode = -1; int node = -1; int ret = -1; @@ -1291,23 +1289,12 @@ qemuProcessInitNumaMemoryPolicy(virDomainObjPtr vm) } } - orig_err = virSaveLastError(); mode = vm->def->numatune.memory.mode; if (mode == VIR_DOMAIN_NUMATUNE_MEM_STRICT) { numa_set_bind_policy(1); numa_set_membind(&mask); numa_set_bind_policy(0); - - err = virGetLastError(); - if ((err && (err->code != orig_err->code)) || - (err && !orig_err)) { - qemuReportError(VIR_ERR_INTERNAL_ERROR, - _("Failed to bind memory to specified nodeset: %s"), - err ? err->message : _("unknown error")); - virResetLastError(); - goto cleanup; - } } else if (mode == VIR_DOMAIN_NUMATUNE_MEM_PREFERRED) { int nnodes = 0; for (i = 0; i < NUMA_NUM_NODES; i++) { @@ -1326,28 +1313,8 @@ qemuProcessInitNumaMemoryPolicy(virDomainObjPtr vm) numa_set_bind_policy(0); numa_set_preferred(node); - - err = virGetLastError(); - if ((err && (err->code != orig_err->code)) || - (err && !orig_err)) { - qemuReportError(VIR_ERR_INTERNAL_ERROR, - _("Failed to set memory policy as preferred to specified " - "node: %s"), err ? err->message : _("unknown error")); - virResetLastError(); - goto cleanup; - } } else if (mode == VIR_DOMAIN_NUMATUNE_MEM_INTERLEAVE) { numa_set_interleave_mask(&mask); - - err = virGetLastError(); - if ((err && (err->code != orig_err->code)) || - (err && !orig_err)) { - qemuReportError(VIR_ERR_INTERNAL_ERROR, - _("Failed to interleave memory to specified nodeset: %s"), - err ? err->message : _("unknown error")); - virResetLastError(); - goto cleanup; - } } else { /* XXX: Shouldn't go here, as we already do checking when * parsing domain XML. -- 1.7.4

2 2

[libvirt] [PATCH] network: fix indentation in networkBuildDnsmasqArgv
by Laine Stump 27 Jun '11

27 Jun '11

This block was inadvertently added with the wrong indentation. --- src/network/bridge_driver.c | 15 +++++++-------- 1 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index 1b11132..f15a7a6 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -614,14 +614,13 @@ networkBuildDnsmasqArgv(virNetworkObjPtr network, if (ipdef->nranges || ipdef->nhosts) virCommandAddArg(cmd, "--dhcp-no-override"); - if ((dctx = networkSaveDnsmasqHostsfile(ipdef, network->def->dns, network->def->name, false))) { - if (dctx->hostsfile->nhosts) - virCommandAddArgPair(cmd, "--dhcp-hostsfile", - dctx->hostsfile->path); - if (dctx->addnhostsfile->nhosts) - virCommandAddArgPair(cmd, "--addn-hosts", - dctx->addnhostsfile->path); - + if ((dctx = networkSaveDnsmasqHostsfile(ipdef, network->def->dns, network->def->name, false))) { + if (dctx->hostsfile->nhosts) + virCommandAddArgPair(cmd, "--dhcp-hostsfile", + dctx->hostsfile->path); + if (dctx->addnhostsfile->nhosts) + virCommandAddArgPair(cmd, "--addn-hosts", + dctx->addnhostsfile->path); dnsmasqContextFree(dctx); } -- 1.7.3.4

2 2

[libvirt] [PATCH] tests: Handle networkxml2argvtest being configure --localstatedir dependant
by Matthias Bolte 27 Jun '11

27 Jun '11

networkxml2argvtest indirectly calls networkDnsmasqLeaseFileName that depends on configure --localstatedir. Therefore, the .argv files used in the test have to be created with this localstatedir. Move the .argv to .argv.in files with a @localstatedir@ placeholder. --- tests/.gitignore | 1 + tests/Makefile.am | 13 ++++++++++++- ...lated-network.argv => isolated-network.argv.in} | 2 +- ...ns-hosts.argv => nat-network-dns-hosts.argv.in} | 2 +- ...ord.argv => nat-network-dns-txt-record.argv.in} | 2 +- .../{nat-network.argv => nat-network.argv.in} | 2 +- ...etboot-network.argv => netboot-network.argv.in} | 2 +- ...-network.argv => netboot-proxy-network.argv.in} | 2 +- ...{routed-network.argv => routed-network.argv.in} | 0 9 files changed, 19 insertions(+), 7 deletions(-) rename tests/networkxml2argvdata/{isolated-network.argv => isolated-network.argv.in} (68%) rename tests/networkxml2argvdata/{nat-network-dns-hosts.argv => nat-network-dns-hosts.argv.in} (64%) rename tests/networkxml2argvdata/{nat-network-dns-txt-record.argv => nat-network-dns-txt-record.argv.in} (84%) rename tests/networkxml2argvdata/{nat-network.argv => nat-network.argv.in} (83%) rename tests/networkxml2argvdata/{netboot-network.argv => netboot-network.argv.in} (80%) rename tests/networkxml2argvdata/{netboot-proxy-network.argv => netboot-proxy-network.argv.in} (79%) rename tests/networkxml2argvdata/{routed-network.argv => routed-network.argv.in} (100%) diff --git a/tests/.gitignore b/tests/.gitignore index 7f26dd7..be8d321 100644 --- a/tests/.gitignore +++ b/tests/.gitignore @@ -10,6 +10,7 @@ conftest esxutilstest eventtest interfacexml2xmltest +networkxml2argvdata/*.argv networkxml2xmltest nodedevxml2xmltest nodeinfotest diff --git a/tests/Makefile.am b/tests/Makefile.am index 7db9d1f..3c4b7ee 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -50,7 +50,8 @@ EXTRA_DIST = \ networkschematest \ networkxml2xmlin \ networkxml2xmlout \ - networkxml2argvdata \ + $(wildcard networkxml2argvdata/*.argv.in) \ + $(wildcard networkxml2argvdata/*.xml) \ nodedevschemadata \ nodedevschematest \ nodeinfodata \ @@ -358,10 +359,20 @@ networkxml2xmltest_SOURCES = \ testutils.c testutils.h networkxml2xmltest_LDADD = $(LDADDS) +networkxml2argvdata_argv_in = $(wildcard networkxml2argvdata/*.argv.in) +networkxml2argvdata_argv = $(networkxml2argvdata_argv_in:%.argv.in=%.argv) + networkxml2argvtest_SOURCES = \ networkxml2argvtest.c \ testutils.c testutils.h networkxml2argvtest_LDADD = ../src/libvirt_driver_network.la $(LDADDS) +networkxml2argvtest_DEPENDENCIES = $(networkxml2argvdata_argv) + +$(srcdir)/networkxml2argvdata/%.argv: $(srcdir)/networkxml2argvdata/%.argv.in + $(AM_V_GEN)sed \ + -e 's![@]localstatedir[@]!$(localstatedir)!g' \ + < $< > $@-t && \ + mv $@-t $@ nwfilterxml2xmltest_SOURCES = \ nwfilterxml2xmltest.c \ diff --git a/tests/networkxml2argvdata/isolated-network.argv b/tests/networkxml2argvdata/isolated-network.argv.in similarity index 68% rename from tests/networkxml2argvdata/isolated-network.argv rename to tests/networkxml2argvdata/isolated-network.argv.in index f801396..c05768d 100644 --- a/tests/networkxml2argvdata/isolated-network.argv +++ b/tests/networkxml2argvdata/isolated-network.argv.in @@ -1,5 +1,5 @@ /usr/sbin/dnsmasq --strict-order --bind-interfaces --conf-file= \ --except-interface lo --dhcp-option=3 --listen-address 192.168.152.1 \ --dhcp-range 192.168.152.2,192.168.152.254 \ ---dhcp-leasefile=/var/lib/libvirt/dnsmasq/private.leases --dhcp-lease-max=253 \ +--dhcp-leasefile=@localstatedir@/lib/libvirt/dnsmasq/private.leases --dhcp-lease-max=253 \ --dhcp-no-override\ diff --git a/tests/networkxml2argvdata/nat-network-dns-hosts.argv b/tests/networkxml2argvdata/nat-network-dns-hosts.argv.in similarity index 64% rename from tests/networkxml2argvdata/nat-network-dns-hosts.argv rename to tests/networkxml2argvdata/nat-network-dns-hosts.argv.in index dce075b..5545f9f 100644 --- a/tests/networkxml2argvdata/nat-network-dns-hosts.argv +++ b/tests/networkxml2argvdata/nat-network-dns-hosts.argv.in @@ -1,3 +1,3 @@ /usr/sbin/dnsmasq --strict-order --bind-interfaces --conf-file= \ --except-interface lo --listen-address 192.168.122.1 \ ---addn-hosts=/var/lib/libvirt/dnsmasq/default.addnhosts\ +--addn-hosts=@localstatedir@/lib/libvirt/dnsmasq/default.addnhosts\ diff --git a/tests/networkxml2argvdata/nat-network-dns-txt-record.argv b/tests/networkxml2argvdata/nat-network-dns-txt-record.argv.in similarity index 84% rename from tests/networkxml2argvdata/nat-network-dns-txt-record.argv rename to tests/networkxml2argvdata/nat-network-dns-txt-record.argv.in index 9d74543..f799634 100644 --- a/tests/networkxml2argvdata/nat-network-dns-txt-record.argv +++ b/tests/networkxml2argvdata/nat-network-dns-txt-record.argv.in @@ -4,5 +4,5 @@ --listen-address 2001:db8:ac10:fe01::1 \ --listen-address 2001:db8:ac10:fd01::1 --listen-address 10.24.10.1 \ --dhcp-range 192.168.122.2,192.168.122.254 \ ---dhcp-leasefile=/var/lib/libvirt/dnsmasq/default.leases \ +--dhcp-leasefile=@localstatedir@/lib/libvirt/dnsmasq/default.leases \ --dhcp-lease-max=253 --dhcp-no-override\ diff --git a/tests/networkxml2argvdata/nat-network.argv b/tests/networkxml2argvdata/nat-network.argv.in similarity index 83% rename from tests/networkxml2argvdata/nat-network.argv rename to tests/networkxml2argvdata/nat-network.argv.in index 181623f..680241b 100644 --- a/tests/networkxml2argvdata/nat-network.argv +++ b/tests/networkxml2argvdata/nat-network.argv.in @@ -3,5 +3,5 @@ --listen-address 192.168.123.1 --listen-address 2001:db8:ac10:fe01::1 \ --listen-address 2001:db8:ac10:fd01::1 --listen-address 10.24.10.1 \ --dhcp-range 192.168.122.2,192.168.122.254 \ ---dhcp-leasefile=/var/lib/libvirt/dnsmasq/default.leases \ +--dhcp-leasefile=@localstatedir@/lib/libvirt/dnsmasq/default.leases \ --dhcp-lease-max=253 --dhcp-no-override\ diff --git a/tests/networkxml2argvdata/netboot-network.argv b/tests/networkxml2argvdata/netboot-network.argv.in similarity index 80% rename from tests/networkxml2argvdata/netboot-network.argv rename to tests/networkxml2argvdata/netboot-network.argv.in index 27ffaa1..57cda0e 100644 --- a/tests/networkxml2argvdata/netboot-network.argv +++ b/tests/networkxml2argvdata/netboot-network.argv.in @@ -1,6 +1,6 @@ /usr/sbin/dnsmasq --strict-order --bind-interfaces --domain example.com \ --conf-file= --except-interface lo --listen-address 192.168.122.1 \ --dhcp-range 192.168.122.2,192.168.122.254 \ ---dhcp-leasefile=/var/lib/libvirt/dnsmasq/netboot.leases \ +--dhcp-leasefile=@localstatedir@/lib/libvirt/dnsmasq/netboot.leases \ --dhcp-lease-max=253 --dhcp-no-override --enable-tftp \ --tftp-root /var/lib/tftproot --dhcp-boot pxeboot.img\ diff --git a/tests/networkxml2argvdata/netboot-proxy-network.argv b/tests/networkxml2argvdata/netboot-proxy-network.argv.in similarity index 79% rename from tests/networkxml2argvdata/netboot-proxy-network.argv rename to tests/networkxml2argvdata/netboot-proxy-network.argv.in index 3e0c5a5..723539e 100644 --- a/tests/networkxml2argvdata/netboot-proxy-network.argv +++ b/tests/networkxml2argvdata/netboot-proxy-network.argv.in @@ -1,5 +1,5 @@ /usr/sbin/dnsmasq --strict-order --bind-interfaces --domain example.com \ --conf-file= --except-interface lo --listen-address 192.168.122.1 \ --dhcp-range 192.168.122.2,192.168.122.254 \ ---dhcp-leasefile=/var/lib/libvirt/dnsmasq/netboot.leases \ +--dhcp-leasefile=@localstatedir@/lib/libvirt/dnsmasq/netboot.leases \ --dhcp-lease-max=253 --dhcp-no-override --dhcp-boot pxeboot.img,,10.20.30.40\ diff --git a/tests/networkxml2argvdata/routed-network.argv b/tests/networkxml2argvdata/routed-network.argv.in similarity index 100% rename from tests/networkxml2argvdata/routed-network.argv rename to tests/networkxml2argvdata/routed-network.argv.in -- 1.7.0.4

3 5

[libvirt] [PATCH 0/3] Add Processor/MemoryDevice information to virSysinfoRead() API
by Minoru Usui 27 Jun '11

27 Jun '11

Hi, I propose to add hardware Processor/MemoryDevice information to virSysinfoRead() from SMBIOS. I want to get host machine's these infomations through virConnectGetSysinfo(). I think it's useful to managing many host machines, because administrator can centrally manage the host machines which consists of Processor/MemoryDevice parts. This patch set adds DMI type4, 17 information(dmidecode -t4,17) to virSysinfoRead(). I hope this patch set adds v0.9.3, if possible. Minoru Usui (3): Cleanup virSysinfoRead() Separate BIOSInfo and SystemInfo part from virSysinfoRead() Add Processor Information to virSysinfoRead() from dmidecode type 4 Add Memory Device Information to virSysinfoRead() from dmidecode type 17 src/util/sysinfo.c | 608 +++++++++++++++++++++++++++++++++++++++++++++------- src/util/sysinfo.h | 37 ++++ 2 files changed, 565 insertions(+), 80 deletions(-) -- Minoru Usui <usui(a)mxm.nes.nec.co.jp>

3 14