- Devel - libvirt List Archives

[libvirt] [PATCH] Fix reporting of errors for p2p migration
by Daniel P. Berrange 19 Jul '11

19 Jul '11

Starting/ending jobs when closing the connection may reset any error which was reported earlier in p2p migration. We must save the original error before doing so. This means we can also just call virConnectClose as normal, instead of virUnrefConnect * src/qemu/qemu_migration.c: Preserve errors in p2p migration --- src/qemu/qemu_migration.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index dfa80e3..1803b9f 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -2141,6 +2141,8 @@ static int doPeer2PeerMigrate(struct qemud_driver *driver, int ret = -1; virConnectPtr dconn = NULL; bool p2p; + virErrorPtr orig_err = NULL; + VIR_DEBUG("driver=%p, sconn=%p, vm=%p, xmlin=%s, dconnuri=%s, " "uri=%s, flags=%lx, dname=%s, resource=%lu", driver, sconn, vm, NULLSTR(xmlin), NULLSTR(dconnuri), @@ -2191,10 +2193,14 @@ static int doPeer2PeerMigrate(struct qemud_driver *driver, dconnuri, flags, dname, resource); cleanup: - /* don't call virConnectClose(), because that resets any pending errors */ + orig_err = virSaveLastError(); qemuDomainObjEnterRemoteWithDriver(driver, vm); - virUnrefConnect(dconn); + virConnectClose(dconn); qemuDomainObjExitRemoteWithDriver(driver, vm); + if (orig_err) { + virSetError(orig_err); + virFreeError(orig_err); + } return ret; } -- 1.7.4.4

2 1

Re: [libvirt] [virt-tools-list] [PATCH virt-manager v4] Add inspection to virt-manager
by Richard W.M. Jones 19 Jul '11

19 Jul '11

On Tue, Jul 19, 2011 at 03:40:53PM +0100, Daniel P. Berrange wrote: > On Tue, Jul 19, 2011 at 10:17:02AM -0400, Cole Robinson wrote: > > On 07/19/2011 03:49 AM, Richard W.M. Jones wrote: > > > On Mon, Jul 18, 2011 at 05:41:00PM -0400, Cole Robinson wrote: > > >> On 07/18/2011 02:53 PM, Richard W.M. Jones wrote: > > >>> This updates 1/4 with the fixes you suggested. Also, all check-pylint > > >>> warnings and errors have been fixed. > > >>> > > >>> Rich. > > >>> > > >> > > >> Thanks! Pushed the series. > > > > > > In reply to your comment on IRC: > > > > > > crobinso> rjones: so in the default usage of virt-manager in fedora, > > > the guest inspection probably won't work since we > > > save disk images in /var/lib/libvirt/images/, which > > > regular user doesn't have access to. > > > crobinso> rjones: that's not entirely clear from feature page. > > > crobinso> rjones: I'm thinking of adding a disk path access check in > > > the inspection thread, to avoid flooding the logs > > > with errors if we can't even read the disk > > > image. that should be safe to do? > > > > > > I always run virt-manager as root (or from sudo) so this hasn't been > > > an issue. What user does virt-manager run as normally? > > > > > > > I think most common usage is just running virt-manager as the logged in > > user, using policykit to authenticate the libvirt connection so the rest > > of the app doesn't have root privs. > > > > > AFAICT if there's no access to the disks, then the call to either > > > g.add_drive_opts or g.launch will throw an exception. But the > > > inspection._vmseen hash will mean this will only happen once per > > > domain per run of virt-manager. > > > > > > On an unrelated note: I think we need to cache inspection between runs > > > of virt-manager. Does virt-manager currently store permanent state (I > > > assume it must do - ie. list of connections), and where? > > > > > > > We store config like that in gconf, though I don't think sticking > > largish data like list of applications or a png in there is a good idea. > > hostname + os info could be cached, though ideally the latter would be > > stored in libvirt XML at some point. > > Agreed, it would be desirable to cache the PNGs in $HOME/.virt-manager > though, perhaps as > > $HOME/.virt-manager/icons/$CONN_URI/$DOMAIN_UUID > > To avoid growing without bound, probably want to have virt-manager > purge files in that directory on startup, if the PNG is older than > 3 months and the associated connection or domain no longer exists. > ie don't immediately purge them, since a user might later re-add a > connection or re-create a VM. > > Another thought though is that we've also got some work going on a > little plugin for gnome-shell to capture & display screenshots of > VMs. It might be nice for virt-manager to take advantage of this > too, while also the shell plugin might like the icon image. So > perhaps we should declare a standard location for storing assets > related to a VM, which are expensive to extract/fetch. > > $HOME/.local/libvirt/$CONN_URI/$DOMAIN_UUID/screenshot.png > $HOME/.local/libvirt/$CONN_URI/$DOMAIN_UUID/icon.png > $HOME/.local/libvirt/$CONN_URI/$DOMAIN_UUID/osinfo.json > > or something like that +1 CC-ing to libvir-list. Rich. -- Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones Read my programming blog: http://rwmj.wordpress.com Fedora now supports 80 OCaml packages (the OPEN alternative to F#) http://cocan.org/getting_started_with_ocaml_on_red_hat_and_fedora

1 0

[libvirt] RFC (V2) New virDomainBlockPull API family to libvirt
by Adam Litke 19 Jul '11

19 Jul '11

In light of discussion on V1 of this API, here is V2 of the next generation BlockPull API. In this series we make the abort and info operations more generic so that they may apply to future block jobs (such as compression, live block copy, etc). We also add in a mechanism to set the maximum bandwidth of an operation. Changes since V1: - Make virDomainBlockPullAbort() and virDomainGetBlockPullInfo() into a generic BlockJob interface. - Added virDomainBlockJobSetSpeed() - Rename VIR_DOMAIN_EVENT_ID_BLOCK_PULL event to fit into block job API - Add bandwidth argument to virDomainBlockPull() Summary of changes since first generation patch series: - Qemu dropped incremental streaming so remove libvirt incremental BlockPull() API - Rename virDomainBlockPullAll() to virDomainBlockPull() - Changes required to qemu monitor handlers for changed command names -- To help speed the provisioning process for large domains, new QED disks are created with backing to a template image. These disks are configured with copy on read such that blocks that are read from the backing file are copied to the new disk. This reduces I/O over a potentially costly path to the backing image. In such a configuration, there is a desire to remove the dependency on the backing image as the domain runs. To accomplish this, qemu will provide an interface to perform sequential copy on read operations during normal VM operation. Once all data has been copied, the disk image's link to the backing file is removed. The virDomainBlockPull API family brings this functionality to libvirt. virDomainBlockPull() instructs the hypervisor to stream the entire device in the background. Progress of this operation can be checked with the function virDomainBlockJobInfo(). An ongoing stream can be cancelled with virDomainBlockJobAbort(). virDomainBlockJobSetSpeed() allows you to limit the bandwidth that the operation may consume. An event (VIR_DOMAIN_EVENT_ID_BLOCK_JOB) will be emitted when a disk has been fully populated or if a BlockPull() operation was terminated due to an error. This event is useful to avoid polling on virDomainBlockJobInfo() for completion and could also be used by the security driver to revoke access to the backing file when it is no longer needed. /* * BlockJob API */ /** * virDomainBlockJobType: * * VIR_DOMAIN_BLOCK_JOB_TYPE_PULL: Block Pull (virDomainBlockPull) */ typedef enum { VIR_DOMAIN_BLOCK_JOB_TYPE_UNKNOWN = -1, VIR_DOMAIN_BLOCK_JOB_TYPE_PULL = 0, } virDomainBlockJobType; /* An iterator for monitoring block job operations */ typedef unsigned long long virDomainBlockJobCursor; typedef struct _virDomainBlockJobInfo virDomainBlockJobInfo; struct _virDomainBlockJobInfo { virDomainBlockJobType type; /* * The following fields provide an indication of block job progress. @cur * indicates the current position and will be between 0 and @end. @end is * the final cursor position for this operation and represents completion. * To approximate progress, divide @cur by @end. */ virDomainBlockJobCursor cur; virDomainBlockJobCursor end; }; typedef virDomainBlockJobInfo *virDomainBlockJobInfoPtr; /** * virDomainBlockJobAbort: * @dom: pointer to domain object * @path: fully-qualified filename of disk * @flags: currently unused, for future extension * * Cancel the active block job on the given disk. * * Returns -1 in case of failure, 0 when successful. */ int virDomainBlockJobAbort(virDomainPtr dom, const char *path, unsigned int flags); /** * virDomainGetBlockJobInfo: * @dom: pointer to domain object * @path: fully-qualified filename of disk * @info: pointer to a virDomainBlockJobInfo structure * @flags: currently unused, for future extension * * Request block job information for the given disk. If an operation is active * @info will be updated with the current progress. * * Returns -1 in case of failure, 0 when successful. */ int virDomainGetBlockJobInfo(virDomainPtr dom, const char *path, virDomainBlockJobInfoPtr info, unsigned int flags); /** * virDomainBlockJobSetSpeed: * @dom: pointer to domain object * @path: fully-qualified filename of disk * @bandwidth: specify bandwidth limit in Mbps * @flags: currently unused, for future extension * * Set the maximimum allowable bandwidth that a block job may consume. If * bandwidth is 0, the limit will revert to the hypervisor default. * * Returns -1 in case of failure, 0 when successful. */ int virDomainBlockJobSetSpeed(virDomainPtr dom, const char *path, unsigned long bandwidth, unsigned int flags); /** * virConnectDomainEventBlockJobStatus: * * The final status of a block job */ typedef enum { VIR_DOMAIN_BLOCK_JOB_COMPLETED = 0, VIR_DOMAIN_BLOCK_JOB_FAILED = 1, } virConnectDomainEventBlockJobStatus; /** * virConnectDomainEventBlockPullCallback: * @conn: connection object * @dom: domain on which the event occurred * @path: fully-qualified filename of the affected disk * @type: type of block job (virDomainBlockJobType) * @status: final status of the operation (virConnectDomainEventBlockPullStatus) * @opaque: callback context * * The callback signature to use when registering for an event of type * VIR_DOMAIN_EVENT_ID_BLOCK_PULL with virConnectDomainEventRegisterAny() */ typedef void (*virConnectDomainEventBlockPullCallback)(virConnectPtr conn, virDomainPtr dom, const char *path, int type, int status, void *opaque); /** * virDomainBlockPull: * @dom: pointer to domain object * @path: Fully-qualified filename of disk * @bandwidth: (optional) specify copy bandwidth limit in Mbps * @flags: currently unused, for future extension * * Populate a disk image with data from its backing image. Once all data from * its backing image has been pulled, the disk no longer depends on a backing * image. This function pulls data for the entire device in the background. * Progress of the operation can be checked with virDomainGetBlockJobInfo() and * the operation can be aborted with virDomainBlockJobAbort(). When finished, * an asynchronous event is raised to indicate the final status. * * The maximum bandwidth (in Mbps) that will be used to do the copy can be * specified with the bandwidth parameter. If set to 0, libvirt will choose a * suitable default. Some hypervisors do not support this feature and will * return an error if bandwidth is not 0. * * Returns 0 if the operation has started, -1 on failure. */ int virDomainBlockPull(virDomainPtr dom, const char *path, unsigned long bandwidth, unsigned int flags); -- Adam Litke IBM Linux Technology Center

2 1

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

19 Jul '11

From: "Daniel P. Berrange" <berrange(a)redhat.com> 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 7ff94a0..4ba6b9d 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 54b1ca0..875a43d 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -796,7 +796,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.6

3 5

[libvirt] [PATCH] tests: Fix virshtest failure after dominfo changed
by Osier Yang 19 Jul '11

19 Jul '11

Caused by the new changed "dominfo" command. Pushed under trival rule. --- tests/virshtest.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tests/virshtest.c b/tests/virshtest.c index 0932efd..e22e582 100644 --- a/tests/virshtest.c +++ b/tests/virshtest.c @@ -22,6 +22,7 @@ Max memory: 261072 kB\n\ Used memory: 131072 kB\n\ Persistent: yes\n\ Autostart: disable\n\ +Managed save: unknown\n\ \n"; static const char *domuuid_fc4 = DOM_UUID "\n\n"; static const char *domid_fc4 = "2\n\n"; -- 1.7.6

1 0

[libvirt] [PATCH v2] util: avoid fds leak when virEventPollAddHandle fail
by ajia＠redhat.com 19 Jul '11

19 Jul '11

* src/util/event_poll.c: only fix file descriptors leak on when virEventPollAddHandle fail on virEventPollInit function. Detected in valgrind run: ==1254== ==1254== FILE DESCRIPTORS: 6 open at exit. ==1254== Open file descriptor 5: ==1254== at 0x30736D9D47: pipe2 (syscall-template.S:82) ==1254== by 0x4DD6267: rpl_pipe2 (pipe2.c:61) ==1254== by 0x4C4C1C5: virEventPollInit (event_poll.c:648) ==1254== by 0x4C4AA94: virEventRegisterDefaultImpl (event.c:208) ==1254== by 0x42150C: main (virsh.c:13790) ==1254== ==1254== Open file descriptor 4: ==1254== at 0x30736D9D47: pipe2 (syscall-template.S:82) ==1254== by 0x4DD6267: rpl_pipe2 (pipe2.c:61) ==1254== by 0x4C4C1C5: virEventPollInit (event_poll.c:648) ==1254== by 0x4C4AA94: virEventRegisterDefaultImpl (event.c:208) ==1254== by 0x42150C: main (virsh.c:13790) ==1254== * how to reproduce? % valgrind -v --track-fds=yes virsh list --- src/util/event_poll.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/src/util/event_poll.c b/src/util/event_poll.c index 285ba50..e2ae3a6 100644 --- a/src/util/event_poll.c +++ b/src/util/event_poll.c @@ -36,6 +36,7 @@ #include "event_poll.h" #include "memory.h" #include "util.h" +#include "files.h" #include "ignore-value.h" #include "virterror_internal.h" @@ -657,6 +658,8 @@ int virEventPollInit(void) virEventError(VIR_ERR_INTERNAL_ERROR, _("Unable to add handle %d to event loop"), eventLoop.wakeupfd[0]); + VIR_FORCE_CLOSE(eventLoop.wakeupfd[0]); + VIR_FORCE_CLOSE(eventLoop.wakeupfd[1]); return -1; } -- 1.7.1

3 2

Re: [libvirt] [libvirt-users] cannot perform tunnelled migration without using peer2peer flag
by Eric Blake 19 Jul '11

19 Jul '11

On 07/18/2011 04:11 AM, Osier Yang wrote: > 于 2011年07月18日 10:07, zhang xintao 写道: >> Dear All >> I try to migration a kvm guest os to another host failed >> server: ubuntu 11.04 server >> virsh:migrate --live --tunnelled vm1 qemu+ssh://192.168.10.3/system >> error:Requested operation is not valid:cannot perform >> tunnelled migration without using peer2peer flag > > The error tells you all, you need to use "--p2p". That said, why can't virsh be smarter, and automatically request the right underlying flags without making the user also type --p2p? Any problems with this patch? From db318d41c2a70189c21303c824aa4a862815874a Mon Sep 17 00:00:00 2001 From: Eric Blake <eblake(a)redhat.com> Date: Mon, 18 Jul 2011 13:10:29 -0600 Subject: [PATCH] virsh: make migrate --tunnelled imply --p2p We can make the virsh migrate UI friendlier by supplying the missing bit automatically instead of erroring out when requesting --tunnelled without --p2p. * tools/virsh.c (doMigrate): Make --p2p optional when using --tunnelled. * tools/virsh.pod (migrate): Tweak wording accordingly. --- tools/virsh.c | 2 +- tools/virsh.pod | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index 6c8032f..05aeb6c 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -4475,7 +4475,7 @@ doMigrate (void *opaque) if (vshCommandOptBool (cmd, "p2p")) flags |= VIR_MIGRATE_PEER2PEER; if (vshCommandOptBool (cmd, "tunnelled")) - flags |= VIR_MIGRATE_TUNNELLED; + flags |= VIR_MIGRATE_TUNNELLED | VIR_MIGRATE_PEER2PEER; if (vshCommandOptBool (cmd, "persistent")) flags |= VIR_MIGRATE_PERSIST_DEST; diff --git a/tools/virsh.pod b/tools/virsh.pod index e156232..e0adc31 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -534,14 +534,15 @@ Provide the maximum number of virtual CPUs supported for a guest VM on this connection. If provided, the I<type> parameter must be a valid type attribute for the <domain> element of XML. -=item B<migrate> [I<--live>] [I<--direct>] [I<--p2p> [I<--tunnelled>]] +=item B<migrate> [I<--live>] [I<--direct>] [I<--p2p>] [I<--tunnelled>] [I<--persistent>] [I<--undefinesource>] [I<--suspend>] [I<--copy-storage-all>] [I<--copy-storage-inc>] [I<--verbose>] I<domain-id> I<desturi> [I<migrateuri>] [I<dname>] [I<--timeout> B<seconds>] Migrate domain to another host. Add I<--live> for live migration; I<--p2p> for peer-2-peer migration; I<--direct> for direct migration; or I<--tunnelled> -for tunnelled migration. I<--persistent> leaves the domain persistent on +for tunnelled migration (I<--tunnelled> implies I<--p2p>). I<--persistent> +leaves the domain persistent on destination host, I<--undefinesource> undefines the domain on the source host, and I<--suspend> leaves the domain paused on the destination host. I<--copy-storage-all> indicates migration with non-shared storage with full -- 1.7.4.4 -- Eric Blake eblake(a)redhat.com +1-801-349-2682 Libvirt virtualization library http://libvirt.org

3 6

[libvirt] [PATCH] rpc: Make the dispatch generator handle 'void name(void)' style procedures
by Matthias Bolte 19 Jul '11

19 Jul '11

Currently there are no such procedures in the protocol, but programming errors like a missing _args or _ret suffix on the structs in the .x files can create such a situation by accident. Making the generator aware of this avoids bogus errors from the generator such as: Use of uninitialized value in exists at ./rpc/gendispatch.pl line 967. Reported by Michal Privoznik --- src/rpc/gendispatch.pl | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/src/rpc/gendispatch.pl b/src/rpc/gendispatch.pl index e068b53..e6a4a1c 100755 --- a/src/rpc/gendispatch.pl +++ b/src/rpc/gendispatch.pl @@ -143,6 +143,20 @@ while (<PROTOCOL>) { $flags = $3; $ProcName = name_to_ProcName ($name); + if (!exists $calls{$name}) { + # that the argument and return value cases have not yet added + # this procedure to the calls hash means that it has no arguments + # and no return value. add it to the calls hash now because all + # procedures have to be listed in the calls hash + $calls{$name} = { + name => $name, + ProcName => $ProcName, + UC_NAME => uc $name, + args => "void", + ret => "void" + } + } + if ($opt_b or $opt_k) { if (!($flags =~ m/^\s*\/\*\s*(\S+)\s+(\S+)\s*(.*)\*\/\s*$/)) { die "invalid generator flags for ${procprefix}_PROC_${name}" -- 1.7.4.1

2 1

[libvirt] [PATCH] util: avoid fds leak on virEventPollInit
by ajia＠redhat.com 19 Jul '11

19 Jul '11

* src/util/event_poll.c: fix file descriptors leak on virEventPollInit. Detected in valgrind run: ==1254== ==1254== FILE DESCRIPTORS: 6 open at exit. ==1254== Open file descriptor 5: ==1254== at 0x30736D9D47: pipe2 (syscall-template.S:82) ==1254== by 0x4DD6267: rpl_pipe2 (pipe2.c:61) ==1254== by 0x4C4C1C5: virEventPollInit (event_poll.c:648) ==1254== by 0x4C4AA94: virEventRegisterDefaultImpl (event.c:208) ==1254== by 0x42150C: main (virsh.c:13790) ==1254== ==1254== Open file descriptor 4: ==1254== at 0x30736D9D47: pipe2 (syscall-template.S:82) ==1254== by 0x4DD6267: rpl_pipe2 (pipe2.c:61) ==1254== by 0x4C4C1C5: virEventPollInit (event_poll.c:648) ==1254== by 0x4C4AA94: virEventRegisterDefaultImpl (event.c:208) ==1254== by 0x42150C: main (virsh.c:13790) ==1254== * how to reproduce? % valgrind -v --track-fds=yes virsh list --- src/util/event_poll.c | 13 ++++++++++--- 1 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/util/event_poll.c b/src/util/event_poll.c index 285ba50..1e4ef96 100644 --- a/src/util/event_poll.c +++ b/src/util/event_poll.c @@ -639,6 +639,8 @@ static void virEventPollHandleWakeup(int watch ATTRIBUTE_UNUSED, int virEventPollInit(void) { + int ret = -1; + if (virMutexInit(&eventLoop.lock) < 0) { virReportSystemError(errno, "%s", _("Unable to initialize mutex")); @@ -648,7 +650,7 @@ int virEventPollInit(void) if (pipe2(eventLoop.wakeupfd, O_CLOEXEC | O_NONBLOCK) < 0) { virReportSystemError(errno, "%s", _("Unable to setup wakeup pipe")); - return -1; + goto cleanup; } if (virEventPollAddHandle(eventLoop.wakeupfd[0], @@ -657,10 +659,15 @@ int virEventPollInit(void) virEventError(VIR_ERR_INTERNAL_ERROR, _("Unable to add handle %d to event loop"), eventLoop.wakeupfd[0]); - return -1; + goto cleanup; } - return 0; + ret = 0; + +cleanup: + close(eventLoop.wakeupfd[0]); + close(eventLoop.wakeupfd[1]); + return ret; } static int virEventPollInterruptLocked(void) -- 1.7.1

5 8

[libvirt] [PATCH v3] util: avoid fds leak when virEventPollAddHandle fail
by ajia＠redhat.com 19 Jul '11

19 Jul '11

* src/util/event_poll.c: avoid file descriptors leak when virEventPollAddHandle fail on virEventPollInit function. --- src/util/event_poll.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/src/util/event_poll.c b/src/util/event_poll.c index 285ba50..e2ae3a6 100644 --- a/src/util/event_poll.c +++ b/src/util/event_poll.c @@ -36,6 +36,7 @@ #include "event_poll.h" #include "memory.h" #include "util.h" +#include "files.h" #include "ignore-value.h" #include "virterror_internal.h" @@ -657,6 +658,8 @@ int virEventPollInit(void) virEventError(VIR_ERR_INTERNAL_ERROR, _("Unable to add handle %d to event loop"), eventLoop.wakeupfd[0]); + VIR_FORCE_CLOSE(eventLoop.wakeupfd[0]); + VIR_FORCE_CLOSE(eventLoop.wakeupfd[1]); return -1; } -- 1.7.1

1 0

[libvirt] [PATCH] interface: Check for interface (in-)activity on some operations
by Michal Privoznik 19 Jul '11

19 Jul '11

Right now it is possible to undefine an active interface, or destroy inactive. This patch add some checking to these operations to prevent this. Also fix test driver. --- src/interface/netcf_driver.c | 83 ++++++++++++++++++++++++++++++++++++------ src/test/test_driver.c | 5 +++ 2 files changed, 76 insertions(+), 12 deletions(-) diff --git a/src/interface/netcf_driver.c b/src/interface/netcf_driver.c index 855b5a3..bf590f3 100644 --- a/src/interface/netcf_driver.c +++ b/src/interface/netcf_driver.c @@ -119,6 +119,40 @@ static struct netcf_if *interfaceDriverGetNetcfIF(struct netcf *ncf, virInterfac return iface; } +/* + * interfaceObjIsActive: + * @iface - interface + * + * Caller MUST have driver locked to prevent race condition. + * Returns: + * -1 on error + * 0 on inactive interface + * 1 on active interface + */ +static int ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3) +interfaceObjIsActive(struct interface_driver *driver, + struct netcf_if *iface, + virInterfacePtr ifinfo) +{ + int ret = -1; + unsigned int flags = 0; + + if (ncf_if_status(iface, &flags) < 0) { + const char *errmsg, *details; + int errcode = ncf_error(driver->netcf, &errmsg, &details); + interfaceReportError(netcf_to_vir_err(errcode), + _("failed to get status of interface %s: %s%s%s"), + ifinfo->name, errmsg, details ? " - " : "", + details ? details : ""); + goto cleanup; + } + + ret = flags & NETCF_IFACE_ACTIVE ? 1 : 0; + +cleanup: + return ret; +} + static virDrvOpenStatus interfaceOpenInterface(virConnectPtr conn, virConnectAuthPtr auth ATTRIBUTE_UNUSED, unsigned int flags) @@ -438,6 +472,7 @@ static int interfaceUndefine(virInterfacePtr ifinfo) { struct interface_driver *driver = ifinfo->conn->interfacePrivateData; struct netcf_if *iface = NULL; int ret = -1; + int active; interfaceDriverLock(driver); @@ -447,6 +482,17 @@ static int interfaceUndefine(virInterfacePtr ifinfo) { goto cleanup; } + active = interfaceObjIsActive(driver, iface, ifinfo); + if (active < 0) { + /* helper already reported error */ + goto cleanup; + } else if (active) { + interfaceReportError(VIR_ERR_OPERATION_INVALID, + _("interface %s is active"), + ifinfo->name); + goto cleanup; + } + ret = ncf_if_undefine(iface); if (ret < 0) { const char *errmsg, *details; @@ -470,6 +516,7 @@ static int interfaceCreate(virInterfacePtr ifinfo, struct interface_driver *driver = ifinfo->conn->interfacePrivateData; struct netcf_if *iface = NULL; int ret = -1; + int active; virCheckFlags(0, -1); @@ -481,6 +528,17 @@ static int interfaceCreate(virInterfacePtr ifinfo, goto cleanup; } + active = interfaceObjIsActive(driver, iface, ifinfo); + if (active < 0) { + /* helper already reported error */ + goto cleanup; + } else if (active) { + interfaceReportError(VIR_ERR_OPERATION_INVALID, + _("interface %s is already active"), + ifinfo->name); + goto cleanup; + } + ret = ncf_if_up(iface); if (ret < 0) { const char *errmsg, *details; @@ -504,6 +562,7 @@ static int interfaceDestroy(virInterfacePtr ifinfo, struct interface_driver *driver = ifinfo->conn->interfacePrivateData; struct netcf_if *iface = NULL; int ret = -1; + int active; virCheckFlags(0, -1); @@ -515,6 +574,17 @@ static int interfaceDestroy(virInterfacePtr ifinfo, goto cleanup; } + active = interfaceObjIsActive(driver, iface, ifinfo); + if (active < 0) { + /* helper already reported error */ + goto cleanup; + } else if (!active) { + interfaceReportError(VIR_ERR_OPERATION_INVALID, + _("interface %s is not active"), + ifinfo->name); + goto cleanup; + } + ret = ncf_if_down(iface); if (ret < 0) { const char *errmsg, *details; @@ -536,7 +606,6 @@ static int interfaceIsActive(virInterfacePtr ifinfo) { struct interface_driver *driver = ifinfo->conn->interfacePrivateData; struct netcf_if *iface = NULL; - unsigned int flags = 0; int ret = -1; interfaceDriverLock(driver); @@ -547,17 +616,7 @@ static int interfaceIsActive(virInterfacePtr ifinfo) goto cleanup; } - if (ncf_if_status(iface, &flags) < 0) { - const char *errmsg, *details; - int errcode = ncf_error(driver->netcf, &errmsg, &details); - interfaceReportError(netcf_to_vir_err(errcode), - _("failed to get status of interface %s: %s%s%s"), - ifinfo->name, errmsg, details ? " - " : "", - details ? details : ""); - goto cleanup; - } - - ret = flags & NETCF_IFACE_ACTIVE ? 1 : 0; + ret = interfaceObjIsActive(driver, iface, ifinfo); cleanup: ncf_if_free(iface); diff --git a/src/test/test_driver.c b/src/test/test_driver.c index f3fb320..d165586 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -3648,6 +3648,11 @@ static int testInterfaceUndefine(virInterfacePtr iface) goto cleanup; } + if (privinterface->active != 0) { + testError(VIR_ERR_OPERATION_INVALID, NULL); + goto cleanup; + } + virInterfaceRemove(&privconn->ifaces, privinterface); ret = 0; -- 1.7.5.rc3

4 10

[libvirt] [PATCH v2 0/8] Introduce New API virDomainUndefineFlags
by Osier Yang 19 Jul '11

19 Jul '11

Per discussion on https://www.redhat.com/archives/libvir-list/2011-July/msg00556.html, This patch series introduce new API virDomainUndefineFlags, which only support flag VIR_DOMAIN_UNDEFINE_MANAGED_STATE now, might introduce more flags in future though. If the domain has a managed state file, then including VIR_DOMAIN_UNDEFINE_MANAGED_STATE in @flags will also remove that file, and omitting the flag will cause the undefine process to fail. This also changes the behavior of virDomainUndefine, but considering undefine a domain with managed state file left is unsafe, we need to do so. [PATCH v2 1/8] is small fix on rpc generator scripts, not related with the new API. [PATCH v2 1/8] rpc: Fix typos in rpc generator scripts [PATCH v2 2/8] undefine: Define the new API [PATCH v2 3/8] undefine: Wire up the remote protocol [PATCH v2 4/8] undefine: Implement internal API for qemu driver [PATCH v2 5/8] undefine: Implement internal API for libxl driver [PATCH v2 6/8] undefine: Implement undefineFlags in all other [PATCH v2 7/8] undefine: Extend virsh undefine to support the new [PATCH v2 8/8] virsh: Extend virsh dominfo to display if managed v1 - v2: * s/virDomainUndefineWithFlags/virDomainUndefineFlags/ * Update with other bunch of feedbacks from Eric * Changes on virsh dominfo to display if domain managed state exists Regards Osier

2 31

[libvirt] [PATCH] doc: Correct docs for iface commands
by Osier Yang 19 Jul '11

19 Jul '11

duplicate documents for "iface-name", lacks of document for "iface-mac", inconsistent option names with virsh help strings. --- tools/virsh.pod | 16 ++++++++++------ 1 files changed, 10 insertions(+), 6 deletions(-) diff --git a/tools/virsh.pod b/tools/virsh.pod index 377fac0..4f218d3 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -1081,20 +1081,24 @@ Returns the list of active host interfaces. If I<--all> is specified this will also include defined but inactive interfaces. If I<--inactive> is specified only the inactive ones will be listed. -=item B<iface-name> I<iface-MAC> +=item B<iface-name> I<interface> -Convert a host interface MAC to interface name, if the I<iface-MAC> is -unique among the host's interfaces. +Convert a host interface MAC to interface name, if the MAC address is unique +among the host's interfaces. -=item B<iface-name> I<iface-MAC> +I<interface> specifies the interface MAC address. + +=item B<iface-mac> I<interface> Convert a host interface name to MAC address. -=item B<iface-start> I<iface> +I<interface> specifies the interface name. + +=item B<iface-start> I<interface> Start a (previously defined) host interface, such as by running "if-up". -=item B<iface-undefine> I<iface> +=item B<iface-undefine> I<interface> Undefine the configuration for an inactive host interface. -- 1.7.6

2 2

[libvirt] [PATCHv4] libvirt: do not mix internal flags into public API
by Eric Blake 18 Jul '11

18 Jul '11

There were two API in driver.c that were silently masking flags bits prior to calling out to the drivers, and several others that were explicitly masking flags bits. This is not forward-compatible - if we ever have that many flags in the future, then talking to an old server that masks out the flags would be indistinguishable from talking to a new server that can honor the flag. In general, libvirt.c should forward _all_ flags on to drivers, and only the drivers should reject unknown flags. In the case of virDrvSecretGetValue, the solution is to separate the internal driver callback function to have two parameters instead of one, with only one parameter affected by the public API. In the case of virDomainGetXMLDesc, it turns out that no one was ever mixing VIR_DOMAIN_XML_INTERNAL_STATUS with the dumpxml path in the first place; that internal flag was only used in saving and restoring state files, which happened to be in functions internal to a single file, so there is no mixing of the internal flag with a public flags argument. Additionally, virDomainMemoryStats passed a flags argument over RPC, but not to the driver. * src/driver.h (VIR_DOMAIN_XML_FLAGS_MASK) (VIR_SECRET_GET_VALUE_FLAGS_MASK): Delete. (virDrvSecretGetValue): Separate out internal flags. (virDrvDomainMemoryStats): Provide missing flags argument. * src/driver.c (verify): Drop unused check. * src/conf/domain_conf.h (virDomainObjParseFile): Delete declaration. (virDomainXMLInternalFlags): Move... * src/conf/domain_conf.c: ...here. Delete redundant include. (virDomainObjParseFile): Make static. * src/libvirt.c (virDomainGetXMLDesc, virSecretGetValue): Update clients. (virDomainMemoryPeek, virInterfaceGetXMLDesc) (virDomainMemoryStats, virDomainBlockPeek, virNetworkGetXMLDesc) (virStoragePoolGetXMLDesc, virStorageVolGetXMLDesc) (virNodeNumOfDevices, virNodeListDevices, virNWFilterGetXMLDesc): Don't mask unknown flags. * src/interface/netcf_driver.c (interfaceGetXMLDesc): Reject unknown flags. * src/secret/secret_driver.c (secretGetValue): Update clients. * src/remote/remote_driver.c (remoteSecretGetValue) (remoteDomainMemoryStats): Likewise. * src/qemu/qemu_process.c (qemuProcessGetVolumeQcowPassphrase): Likewise. * src/qemu/qemu_driver.c (qemudDomainMemoryStats): Likewise. * daemon/remote.c (remoteDispatchDomainMemoryStats): Likewise. --- v4: fix even more public libvirt API flag masking v3 at https://www.redhat.com/archives/libvir-list/2011-July/msg00894.html daemon/remote.c | 2 +- src/conf/domain_conf.c | 16 +++++++++---- src/conf/domain_conf.h | 10 -------- src/driver.c | 4 --- src/driver.h | 16 +++++-------- src/interface/netcf_driver.c | 2 + src/libvirt.c | 51 +++++------------------------------------ src/qemu/qemu_driver.c | 5 +++- src/qemu/qemu_process.c | 2 +- src/remote/remote_driver.c | 13 ++++++++-- src/secret/secret_driver.c | 7 ++++- 11 files changed, 47 insertions(+), 81 deletions(-) diff --git a/daemon/remote.c b/daemon/remote.c index e93a0dc..daad39d 100644 --- a/daemon/remote.c +++ b/daemon/remote.c @@ -810,7 +810,7 @@ remoteDispatchDomainMemoryStats(virNetServerPtr server ATTRIBUTE_UNUSED, goto cleanup; } - nr_stats = virDomainMemoryStats(dom, stats, args->maxStats, 0); + nr_stats = virDomainMemoryStats(dom, stats, args->maxStats, args->flags); if (nr_stats < 0) goto cleanup; diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 8c3e44e..3c3ab39 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -48,7 +48,6 @@ #include "storage_file.h" #include "files.h" #include "bitmap.h" -#include "verify.h" #include "count-one-bits.h" #define VIR_FROM_THIS VIR_FROM_DOMAIN @@ -57,6 +56,12 @@ * verify that it doesn't overflow an unsigned int when shifting */ verify(VIR_DOMAIN_VIRT_LAST <= 32); +/* Private flag used internally by virDomainSaveStatus and + * virDomainObjParseFile. */ +typedef enum { + VIR_DOMAIN_XML_INTERNAL_STATUS = (1<<16), /* dump internal domain status information */ +} virDomainXMLInternalFlags; + VIR_ENUM_IMPL(virDomainTaint, VIR_DOMAIN_TAINT_LAST, "custom-argv", "custom-monitor", @@ -6995,10 +7000,11 @@ cleanup: } -virDomainObjPtr virDomainObjParseFile(virCapsPtr caps, - const char *filename, - unsigned int expectedVirtTypes, - unsigned int flags) +static virDomainObjPtr +virDomainObjParseFile(virCapsPtr caps, + const char *filename, + unsigned int expectedVirtTypes, + unsigned int flags) { xmlDocPtr xml; virDomainObjPtr obj = NULL; diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 172d3c2..7a3d72b 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -41,11 +41,6 @@ # include "macvtap.h" # include "sysinfo.h" -/* Private component of virDomainXMLFlags */ -typedef enum { - VIR_DOMAIN_XML_INTERNAL_STATUS = (1<<16), /* dump internal domain status information */ -} virDomainXMLInternalFlags; - /* Different types of hypervisor */ /* NB: Keep in sync with virDomainVirtTypeToString impl */ enum virDomainVirtType { @@ -1417,11 +1412,6 @@ virDomainDefPtr virDomainDefParseNode(virCapsPtr caps, unsigned int expectedVirtTypes, unsigned int flags); -virDomainObjPtr virDomainObjParseFile(virCapsPtr caps, - const char *filename, - unsigned int expectedVirtTypes, - unsigned int flags); - bool virDomainDefCheckABIStability(virDomainDefPtr src, virDomainDefPtr dst); diff --git a/src/driver.c b/src/driver.c index 579c2b3..5034277 100644 --- a/src/driver.c +++ b/src/driver.c @@ -32,10 +32,6 @@ #define DEFAULT_DRIVER_DIR LIBDIR "/libvirt/connection-driver" -/* Make sure ... INTERNAL_CALL cannot be set by the caller */ -verify((VIR_SECRET_GET_VALUE_INTERNAL_CALL & - VIR_SECRET_GET_VALUE_FLAGS_MASK) == 0); - #ifdef WITH_DRIVER_MODULES /* XXX re-implment this for other OS, or use libtools helper lib ? */ diff --git a/src/driver.h b/src/driver.h index 70ea4c2..9d0d3de 100644 --- a/src/driver.h +++ b/src/driver.h @@ -191,7 +191,7 @@ typedef char * unsigned int flags); typedef char * (*virDrvDomainGetXMLDesc) (virDomainPtr dom, - unsigned int flags); + unsigned int flags); typedef char * (*virDrvConnectDomainXMLFromNative) (virConnectPtr conn, const char *nativeFormat, @@ -331,7 +331,8 @@ typedef int (*virDrvDomainMemoryStats) (virDomainPtr domain, struct _virDomainMemoryStat *stats, - unsigned int nr_stats); + unsigned int nr_stats, + unsigned int flags); typedef int (*virDrvDomainBlockPeek) @@ -1229,16 +1230,10 @@ struct _virDeviceMonitor { virDrvNodeDeviceDestroy deviceDestroy; }; -/* bits 16 and above of virDomainXMLFlags are for internal use */ -# define VIR_DOMAIN_XML_FLAGS_MASK 0xffff - -/* Bits 16 and above of virSecretGetValue flags are for internal use */ -# define VIR_SECRET_GET_VALUE_FLAGS_MASK 0xffff - enum { /* This getValue call is inside libvirt, override the "private" flag. This flag cannot be set by outside callers. */ - VIR_SECRET_GET_VALUE_INTERNAL_CALL = 1 << 16 + VIR_SECRET_GET_VALUE_INTERNAL_CALL = 1 << 0, }; typedef virSecretPtr @@ -1263,7 +1258,8 @@ typedef int typedef unsigned char * (*virDrvSecretGetValue) (virSecretPtr secret, size_t *value_size, - unsigned int flags); + unsigned int flags, + unsigned int internalFlags); typedef int (*virDrvSecretUndefine) (virSecretPtr secret); typedef int diff --git a/src/interface/netcf_driver.c b/src/interface/netcf_driver.c index 855b5a3..2f322b4 100644 --- a/src/interface/netcf_driver.c +++ b/src/interface/netcf_driver.c @@ -344,6 +344,8 @@ static char *interfaceGetXMLDesc(virInterfacePtr ifinfo, virInterfaceDefPtr ifacedef = NULL; char *ret = NULL; + virCheckFlags(VIR_INTERFACE_XML_INACTIVE, NULL); + interfaceDriverLock(driver); iface = interfaceDriverGetNetcfIF(driver->netcf, ifinfo); diff --git a/src/libvirt.c b/src/libvirt.c index 7c68bd8..4de718d 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -3381,8 +3381,6 @@ virDomainGetXMLDesc(virDomainPtr domain, unsigned int flags) goto error; } - flags &= VIR_DOMAIN_XML_FLAGS_MASK; - if (conn->driver->domainGetXMLDesc) { char *ret; ret = conn->driver->domainGetXMLDesc(domain, flags); @@ -6031,11 +6029,6 @@ int virDomainMemoryStats (virDomainPtr dom, virDomainMemoryStatPtr stats, virDispatchError(NULL); return -1; } - if (flags != 0) { - virLibDomainError(VIR_ERR_INVALID_ARG, - _("flags must be zero")); - goto error; - } if (!stats || nr_stats == 0) return 0; @@ -6045,7 +6038,8 @@ int virDomainMemoryStats (virDomainPtr dom, virDomainMemoryStatPtr stats, conn = dom->conn; if (conn->driver->domainMemoryStats) { - nr_stats_ret = conn->driver->domainMemoryStats (dom, stats, nr_stats); + nr_stats_ret = conn->driver->domainMemoryStats (dom, stats, nr_stats, + flags); if (nr_stats_ret == -1) goto error; return nr_stats_ret; @@ -6130,12 +6124,6 @@ virDomainBlockPeek (virDomainPtr dom, goto error; } - if (flags != 0) { - virLibDomainError(VIR_ERR_INVALID_ARG, - _("flags must be zero")); - goto error; - } - /* Allow size == 0 as an access test. */ if (size > 0 && !buffer) { virLibDomainError(VIR_ERR_INVALID_ARG, @@ -6239,9 +6227,10 @@ virDomainMemoryPeek (virDomainPtr dom, * because of incompatible licensing. */ - if (flags != VIR_MEMORY_VIRTUAL && flags != VIR_MEMORY_PHYSICAL) { + /* Exactly one of these two flags must be set. */ + if (!(flags & VIR_MEMORY_VIRTUAL) == !(flags & VIR_MEMORY_PHYSICAL)) { virLibDomainError(VIR_ERR_INVALID_ARG, - _("flags parameter must be VIR_MEMORY_VIRTUAL or VIR_MEMORY_PHYSICAL")); + _("flags parameter must include VIR_MEMORY_VIRTUAL or VIR_MEMORY_PHYSICAL")); goto error; } @@ -8465,10 +8454,6 @@ virNetworkGetXMLDesc(virNetworkPtr network, unsigned int flags) virDispatchError(NULL); return NULL; } - if (flags != 0) { - virLibNetworkError(VIR_ERR_INVALID_ARG, __FUNCTION__); - goto error; - } conn = network->conn; @@ -8978,10 +8963,6 @@ virInterfaceGetXMLDesc(virInterfacePtr iface, unsigned int flags) virDispatchError(NULL); return NULL; } - if ((flags & ~VIR_INTERFACE_XML_INACTIVE) != 0) { - virLibInterfaceError(VIR_ERR_INVALID_ARG, __FUNCTION__); - goto error; - } conn = iface->conn; @@ -10451,10 +10432,6 @@ virStoragePoolGetXMLDesc(virStoragePoolPtr pool, virDispatchError(NULL); return NULL; } - if (flags != 0) { - virLibStoragePoolError(VIR_ERR_INVALID_ARG, __FUNCTION__); - goto error; - } conn = pool->conn; @@ -11349,10 +11326,6 @@ virStorageVolGetXMLDesc(virStorageVolPtr vol, virDispatchError(NULL); return NULL; } - if (flags != 0) { - virLibStorageVolError(VIR_ERR_INVALID_ARG, __FUNCTION__); - goto error; - } conn = vol->conn; @@ -11441,10 +11414,6 @@ virNodeNumOfDevices(virConnectPtr conn, const char *cap, unsigned int flags) virDispatchError(NULL); return -1; } - if (flags != 0) { - virLibConnError(VIR_ERR_INVALID_ARG, __FUNCTION__); - goto error; - } if (conn->deviceMonitor && conn->deviceMonitor->numOfDevices) { int ret; @@ -11493,7 +11462,7 @@ virNodeListDevices(virConnectPtr conn, virDispatchError(NULL); return -1; } - if ((flags != 0) || (names == NULL) || (maxnames < 0)) { + if ((names == NULL) || (maxnames < 0)) { virLibConnError(VIR_ERR_INVALID_ARG, __FUNCTION__); goto error; } @@ -12699,12 +12668,10 @@ virSecretGetValue(virSecretPtr secret, size_t *value_size, unsigned int flags) goto error; } - flags &= VIR_SECRET_GET_VALUE_FLAGS_MASK; - if (conn->secretDriver != NULL && conn->secretDriver->getValue != NULL) { unsigned char *ret; - ret = conn->secretDriver->getValue(secret, value_size, flags); + ret = conn->secretDriver->getValue(secret, value_size, flags, 0); if (ret == NULL) goto error; return ret; @@ -14233,10 +14200,6 @@ virNWFilterGetXMLDesc(virNWFilterPtr nwfilter, unsigned int flags) virDispatchError(NULL); return NULL; } - if (flags != 0) { - virLibNWFilterError(VIR_ERR_INVALID_ARG, __FUNCTION__); - goto error; - } conn = nwfilter->conn; diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 8d146aa..1a3fbfb 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -6155,12 +6155,15 @@ qemudDomainInterfaceStats (virDomainPtr dom, static int qemudDomainMemoryStats (virDomainPtr dom, struct _virDomainMemoryStat *stats, - unsigned int nr_stats) + unsigned int nr_stats, + unsigned int flags) { struct qemud_driver *driver = dom->conn->privateData; virDomainObjPtr vm; unsigned int ret = -1; + virCheckFlags(0, -1); + qemuDriverLock(driver); vm = virDomainFindByUUID(&driver->domains, dom->uuid); qemuDriverUnlock(driver); diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index d0085e0..448b06e 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -276,7 +276,7 @@ qemuProcessGetVolumeQcowPassphrase(virConnectPtr conn, enc->secrets[0]->uuid); if (secret == NULL) goto cleanup; - data = conn->secretDriver->getValue(secret, &size, + data = conn->secretDriver->getValue(secret, &size, 0, VIR_SECRET_GET_VALUE_INTERNAL_CALL); virUnrefSecret(secret); if (data == NULL) diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index 2d5dc15..c2f8bbd 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -1850,7 +1850,8 @@ done: static int remoteDomainMemoryStats (virDomainPtr domain, struct _virDomainMemoryStat *stats, - unsigned int nr_stats) + unsigned int nr_stats, + unsigned int flags) { int rv = -1; remote_domain_memory_stats_args args; @@ -1868,7 +1869,7 @@ remoteDomainMemoryStats (virDomainPtr domain, goto done; } args.maxStats = nr_stats; - args.flags = 0; + args.flags = flags; memset (&ret, 0, sizeof ret); if (call (domain->conn, priv, 0, REMOTE_PROC_DOMAIN_MEMORY_STATS, @@ -3173,7 +3174,7 @@ remoteSecretClose (virConnectPtr conn) static unsigned char * remoteSecretGetValue (virSecretPtr secret, size_t *value_size, - unsigned int flags) + unsigned int flags, unsigned int internalFlags) { unsigned char *rv = NULL; remote_secret_get_value_args args; @@ -3182,6 +3183,12 @@ remoteSecretGetValue (virSecretPtr secret, size_t *value_size, remoteDriverLock (priv); + /* internalFlags intentionally do not go over the wire */ + if (internalFlags) { + remoteError(VIR_ERR_NO_SUPPORT, "%s", _("no internalFlags support")); + goto done; + } + make_nonnull_secret (&args.secret, secret); args.flags = flags; diff --git a/src/secret/secret_driver.c b/src/secret/secret_driver.c index c45ba51..02cdbb9 100644 --- a/src/secret/secret_driver.c +++ b/src/secret/secret_driver.c @@ -873,12 +873,15 @@ cleanup: } static unsigned char * -secretGetValue(virSecretPtr obj, size_t *value_size, unsigned int flags) +secretGetValue(virSecretPtr obj, size_t *value_size, unsigned int flags, + unsigned int internalFlags) { virSecretDriverStatePtr driver = obj->conn->secretPrivateData; unsigned char *ret = NULL; virSecretEntryPtr secret; + virCheckFlags(0, NULL); + secretDriverLock(driver); secret = secretFindByUUID(driver, obj->uuid); @@ -898,7 +901,7 @@ secretGetValue(virSecretPtr obj, size_t *value_size, unsigned int flags) goto cleanup; } - if ((flags & VIR_SECRET_GET_VALUE_INTERNAL_CALL) == 0 && + if ((internalFlags & VIR_SECRET_GET_VALUE_INTERNAL_CALL) == 0 && secret->def->private) { virSecretReportError(VIR_ERR_OPERATION_DENIED, "%s", _("secret is private")); -- 1.7.4.4

2 6

[libvirt] [PATCH v2 0/5] delete volumes while it is building
by Guannan Ren 18 Jul '11

18 Jul '11

This is the version 2 of patches for deleting volume while it is being built. based on the first version: https://www.redhat.com/archives/libvir-list/2011-July/msg00535.html. The patches is an attempt to spawn a new thread for volume building in storageVolumeCreateXML(), then, the initial thread is waiting for the cancelling signal from storageVolumeDelete(). When it gets the signal, it uses pthread_cancel() to stop the process of volume building, then tell storageVolumeDelete() to continue its job. I go through the codes in other parts of libvirt briefly, such as nodedevice, network. It is rare to spawn a new thread, so this worth a shot or probably not. Any idea is appreciated.

3 9

[libvirt] The future of virDomainBlockCopy API
by Jiri Denemark 18 Jul '11

18 Jul '11

Hi, With the current changes of block copy implementation in qemu (which was dropped in favor of using image streaming and snapshots to do the job) I think it's best not to include virDomainBlockCopy API in libvirt (yet). This is for several reasons: - the ideal semantics of virDomainBlockCopy API would be a no-op in case of failure, which can't be achieved with snapshot/image streaming combo since the domain is switched to the new image before any copying starts instead of when everything is finished - since monitor/cancellation APIs are designed with future block operations in mind, it will be easy to provide virDomainBlockCopy in the future if we feel the need for it - with BlockPull and Snapshot APIs in place, users/apps can do block copy by creating a snapshot of a disk and running BlockPull on it to make the new image independent on the original disk image - the two phase process makes it easy to resume image streaming in case it failed for a recoverable reason With current (WIP) snapshot support, one would use virDomainSnapshotCreateXML asking for a disk snapshot only (no memory) with the following XML: <domainsnapshot> <name>whatever</name> <disk name='/path/to/image1' snapshot='no'/> <disk name='/path/to/image2' snapshot='yes'> <volsnapshot> <name>disk snapshot name</name> <image name='/another/path/to/image2.new'/> </volsnapshot> </disk> </domainsnapshot> This will switch the domain to /another/path/to/image2.new with /path/to/image2 as its backing store. The new image can then be made independent on its backing store by calling virDomainBlockPull on it. Jirka

1 0

Re: [libvirt] [PATCH] virsh: Expose virDomainMigrateSetMaxSpeed API to virsh
by Hui Kang 18 Jul '11

18 Jul '11

Hi, I checked the libvirt git tree. It seems that this patch has not been applied. I think to use virsh command line to control the migration bandwidth is useful. Thanks. - Hui API virDomainMigrateSetMaxSpeed was introduced since 0.9.0, but no command in virsh yet. --- tools/virsh.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++ tools/virsh.pod | 5 +++++ 2 files changed, 51 insertions(+), 0 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index d98be1c..ab83ba9 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -4301,6 +4301,50 @@ done: } /* + * "migrate-setspeed" command + */ +static const vshCmdInfo info_migrate_setspeed[] = { + {"help", N_("Set the maximum migration bandwidth")}, + {"desc", N_("Set the maximum migration bandwidth (in Mbps) for a domain " + "which is being migrated to another host.")}, + {NULL, NULL} +}; + +static const vshCmdOptDef opts_migrate_setspeed[] = { + {"domain", VSH_OT_DATA, VSH_OFLAG_REQ, N_("domain name, id or uuid")}, + {"bandwidth", VSH_OT_INT, VSH_OFLAG_REQ, N_("migration bandwidth limit in Mbps")}, + {NULL, 0, 0, NULL} +}; + +static bool +cmdMigrateSetMaxSpeed(vshControl *ctl, const vshCmd *cmd) +{ + virDomainPtr dom = NULL; + unsigned long bandwidth = 0; + bool ret = false; + + if (!vshConnectionUsability(ctl, ctl->conn)) + return false; + + if (!(dom = vshCommandOptDomain(ctl, cmd, NULL))) + return false; + + if (vshCommandOptUL(cmd, "bandwidth", &bandwidth) < 0) { + vshError(ctl, "%s", _("migrate: Invalid bandwidth")); + goto done; + } + + if (virDomainMigrateSetMaxSpeed(dom, bandwidth, 0) < 0) + goto done; + + ret = true; + +done: + virDomainFree(dom); + return ret; +} + +/* * "net-autostart" command */ static const vshCmdInfo info_network_autostart[] = { @@ -11080,6 +11124,8 @@ static const vshCmdDef domManagementCmds[] = { {"migrate", cmdMigrate, opts_migrate, info_migrate, 0}, {"migrate-setmaxdowntime", cmdMigrateSetMaxDowntime, opts_migrate_setmaxdowntime, info_migrate_setmaxdowntime, 0}, + {"migrate-setspeed", cmdMigrateSetMaxSpeed, + opts_migrate_setspeed, info_migrate_setspeed, 0}, {"reboot", cmdReboot, opts_reboot, info_reboot, 0}, {"restore", cmdRestore, opts_restore, info_restore, 0}, {"resume", cmdResume, opts_resume, info_resume, 0}, diff --git a/tools/virsh.pod b/tools/virsh.pod index 7ed3003..98adc90 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -542,6 +542,11 @@ Set maximum tolerable downtime for a domain which is being live-migrated to another host. The I<downtime> is a number of milliseconds the guest is allowed to be down at the end of live migration. +=item B<migrate-setspeed> I<domain-id> I<bandwidth> + +Set the maximum migration bandwidth (in Mbps) for a domain which is being +migrated to another host. + =item B<reboot> I<domain-id> Reboot a domain. This acts just as if the domain had the B<reboot> -- 1.7.4

2 4

[libvirt] [PATCH] virsh: avoid double free of domain
by ajia＠redhat.com 18 Jul '11

18 Jul '11

From: Alex Jia <ajia(a)redhat.com> * tools/virsh.c: avoid double free of domain, when weight value of blkiotune less than 0, codes will free domain and jump to cleanup section, however, cleanup will free domain again. Detected in valgrind run: ==21297== ERROR SUMMARY: 20 errors from 20 contexts (suppressed: 69 from 8) ==21297== ==21297== 1 errors in context 1 of 20: ==21297== Invalid read of size 4 ==21297== at 0x40E209B: virDomainFree (libvirt.c:2096) ==21297== by 0x8065274: cmdBlkiotune (virsh.c:3695) ==21297== by 0x8054CC1: vshCommandRun (virsh.c:13135) ==21297== by 0x806B967: main (virsh.c:14487) ==21297== Address 0x446ad48 is 0 bytes inside a block of size 36 free'd ==21297== at 0x4005B0A: free (vg_replace_malloc.c:325) ==21297== by 0x406814D: virFree (memory.c:310) ==21297== by 0x40D6635: virReleaseDomain (datatypes.c:243) ==21297== by 0x40D6C5E: virUnrefDomain (datatypes.c:280) ==21297== by 0x40E20B9: virDomainFree (libvirt.c:2101) ==21297== by 0x8065297: cmdBlkiotune (virsh.c:3613) ==21297== by 0x8054CC1: vshCommandRun (virsh.c:13135) ==21297== by 0x806B967: main (virsh.c:14487) ==21297== ==21297== ==21297== 1 errors in context 2 of 20: ==21297== Invalid read of size 4 ==21297== at 0x40E1FE6: virDomainFree (libvirt.c:2092) ==21297== by 0x8065274: cmdBlkiotune (virsh.c:3695) ==21297== by 0x8054CC1: vshCommandRun (virsh.c:13135) ==21297== by 0x806B967: main (virsh.c:14487) ==21297== Address 0x446ad48 is 0 bytes inside a block of size 36 free'd ==21297== at 0x4005B0A: free (vg_replace_malloc.c:325) ==21297== by 0x406814D: virFree (memory.c:310) ==21297== by 0x40D6635: virReleaseDomain (datatypes.c:243) ==21297== by 0x40D6C5E: virUnrefDomain (datatypes.c:280) ==21297== by 0x40E20B9: virDomainFree (libvirt.c:2101) ==21297== by 0x8065297: cmdBlkiotune (virsh.c:3613) ==21297== by 0x8054CC1: vshCommandRun (virsh.c:13135) ==21297== by 0x806B967: main (virsh.c:14487) * how to reproduce? % valgrind -v --leak-check=full virsh blkiotune guestname --weight -1 --- tools/virsh.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index e75a249..cba249a 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -3610,7 +3610,6 @@ cmdBlkiotune(vshControl * ctl, const vshCmd * cmd) if (weight) { nparams++; if (weight < 0) { - virDomainFree(dom); vshError(ctl, _("Invalid value of %d for I/O weight"), weight); goto cleanup; } -- 1.7.3.4

3 2

[libvirt] virsh vcpucount problem
by Eric Blake 18 Jul '11

18 Jul '11

Right now, 'virsh vcpucount' understands --current differently than all other commands that understand --current. That is, --current is not a synonym for whichever of --live or --config matches the current domain state, but a counterpart of --maximum. I'm about to teach VIR_AFFECT_CURRENT to the virDomainGetVcpusFlags command. Do we fix 'virsh vcpucount --current' to map to this new flag and come up with a new option that means the opposite of --maximum, or do we just leave the virsh interface stuck the way it is? -- Eric Blake eblake(a)redhat.com +1-801-349-2682 Libvirt virtualization library http://libvirt.org

1 1

[libvirt] [PATCH] build: Fix protocol-structs generation in VPATH build
by Jiri Denemark 18 Jul '11

18 Jul '11

$@ already included $(srcdir) --- src/Makefile.am | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 54b1ca0..94a9a43 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -241,7 +241,7 @@ PDWTAGS = \ -e '}' \ > $@-t; \ case $$? in 8) exit 0;; 0) ;; *) exit 1;; esac; \ - diff -u $@-t $(srcdir)/$@; st=$$?; rm -f $@-t; exit $$st; \ + diff -u $@-t $@; st=$$?; rm -f $@-t; exit $$st; \ else \ echo 'WARNING: you lack pdwtags; skipping the $@ test' >&2; \ echo 'WARNING: install the dwarves package to get pdwtags' >&2; \ -- 1.7.6

2 2

[libvirt] [PATCH] docs: improve virsh man page synopses
by Eric Blake 18 Jul '11

18 Jul '11

"optional" is not a very good meta-syntactic construct in our man page. I scrubbed this, and additionally improved some documentation on mutually exclusive options. For example, {[--live] [--config] | --current} implies that the set must be satisfied ({}), and within the set, you either have a mandatory --current, or an optional combination of 0, 1, or both --live and --config. * tools/virsh.pod: Use "[name]" rather than "optional name" for optional arguments. --- I finally did something to address a pet peeve of mine. tools/virsh.pod | 199 ++++++++++++++++++++++++++++++------------------------- 1 files changed, 108 insertions(+), 91 deletions(-) diff --git a/tools/virsh.pod b/tools/virsh.pod index 1a98ec1..c6549f1 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -115,7 +115,7 @@ The following commands are generic i.e. not specific to a domain. =over 4 -=item B<help> optional I<command-or-group> +=item B<help> [I<command-or-group>] This lists each of the virsh commands. When used without options, all commands are listed, one per line, grouped into related categories, @@ -177,7 +177,7 @@ Running hypervisor: Xen 3.0.0 =back -=item B<cd> optional I<directory> +=item B<cd> [I<directory>] Will change current directory to I<directory>. The default directory for the B<cd> command is the home directory or, if there is no I<HOME> @@ -189,7 +189,7 @@ This command is only available in interactive mode. Will print the current directory. -=item B<connect> I<URI> optional I<--readonly> +=item B<connect> I<URI> [I<--readonly>] (Re)-Connect to the hypervisor. When the shell is first started, this is automatically run with the I<URI> parameter requested by the C<-c> @@ -240,14 +240,14 @@ and size of the physical memory. The output corresponds to virNodeInfo structure. Specifically, the "CPU socket(s)" field means number of CPU sockets per NUMA cell. -=item B<nodecpustats> optional I<cpu> I<--percent> +=item B<nodecpustats> [I<cpu>] [I<--percent>] Returns cpu stats of the node. If I<cpu> is specified, this will prints specified cpu statistics only. If I<--percent> is specified, this will prints percentage of each kind of cpu statistics during 1 second. -=item B<nodememstats> optional I<cell> +=item B<nodememstats> [I<cell>] Returns memory stats of the node. If I<cell> is specified, this will prints specified cell statistics only. @@ -266,7 +266,7 @@ The XML also show the NUMA topology information if available. Inject NMI to the guest. -=item B<list> optional I<--inactive> I<--all> +=item B<list> [I<--inactive> | I<--all>] Prints information about one or more domains. If no domains are specified it prints out information about running domains. @@ -333,7 +333,7 @@ crashed. =back -=item B<freecell> optional { I<--cellno> B<cellno> | I<--all> } +=item B<freecell> [B<cellno> | I<--all>] Prints the available amount of memory on the machine or within a NUMA cell if I<cellno> is provided. If I<--all> is provided instead @@ -366,7 +366,7 @@ I<domain-id> can be specified as a short integer, a name or a full UUID. =over 4 -=item B<autostart> optional I<--disable> I<domain-id> +=item B<autostart> [I<--disable>] I<domain-id> Configure a domain to be automatically started at boot. @@ -379,7 +379,7 @@ I<devname> parameter refers to the device alias of an alternate console, serial or parallel device configured for the guest. If omitted, the primary console will be opened. -=item B<create> I<FILE> optional I<--console> I<--paused> I<--autodestroy> +=item B<create> I<FILE> [I<--console>] [I<--paused>] [I<--autodestroy>] Create a domain from an XML <file>. An easy way to create the XML <file> is to use the B<dumpxml> command to obtain the definition of a @@ -450,7 +450,7 @@ Returns information about jobs running on a domain. Convert a domain Id (or UUID) to domain name -=item B<domstate> I<domain-id> optional I<--reason> +=item B<domstate> I<domain-id> [I<--reason>] Returns state about a domain. I<--reason> tells virsh to also print reason for the state. @@ -475,7 +475,8 @@ configuration format named by I<format>. Dumps the core of a domain to a file for analysis. -=item B<dumpxml> I<domain-id> optional I<--inactive> I<--security-info> I<--update-cpu> +=item B<dumpxml> I<domain-id> [I<--inactive>] [I<--security-info>] +[I<--update-cpu>] Output the domain information as an XML dump to stdout, this format can be used by the B<create> command. Additional options affecting the XML dump may be @@ -485,7 +486,7 @@ Using I<--security-info> security sensitive information will also be included in the XML dump. I<--update-cpu> updates domain CPU requirements according to host CPU. -=item B<echo> optional I<--shell> I<--xml> I<arg>... +=item B<echo> [I<--shell>] [I<--xml>] [I<arg>...] Echo back each I<arg>, separated by space. If I<--shell> is specified, then the output will be single-quoted where needed, so that @@ -518,16 +519,16 @@ the domain, it will automatically be started from this saved state. Remove the B<managedsave> state file for a domain, if it exists. This ensures the domain will do a full boot the next time it is started. -=item B<maxvcpus> optional I<type> +=item B<maxvcpus> [I<type>] Provide the maximum number of virtual CPUs supported for a guest VM on this connection. If provided, the I<type> parameter must be a valid type attribute for the <domain> element of XML. -=item B<migrate> optional I<--live> I<--p2p> I<--direct> I<--tunnelled> -I<--persistent> I<--undefinesource> I<--suspend> I<--copy-storage-all> -I<--copy-storage-inc> I<--verbose> I<domain-id> I<desturi> I<migrateuri> -I<dname> I<--timeout> +=item B<migrate> [I<--live>] [I<--direct>] [I<--p2p> [I<--tunnelled>]] +[I<--persistent>] [I<--undefinesource>] [I<--suspend>] [I<--copy-storage-all>] +[I<--copy-storage-inc>] [I<--verbose>] I<domain-id> I<desturi> [I<migrateuri>] +[I<dname>] [I<timeout>] Migrate domain to another host. Add I<--live> for live migration; I<--p2p> for peer-2-peer migration; I<--direct> for direct migration; or I<--tunnelled> @@ -544,7 +545,8 @@ I<migrateuri> is the migration URI, which usually can be omitted. I<dname> is used for renaming the domain to new name during migration, which also usually can be omitted. -I<--timeout> forces guest to suspend when live migration exceeds timeout, and +I<--timeout number> forces guest to suspend when live migration exceeds +I<number> seconds, and then the migration will complete offline. It can only be used with I<--live>. B<Note>: The I<desturi> parameter for normal migration and peer2peer migration @@ -607,10 +609,10 @@ between the creation and restore point. For a more complete system restore point, where the disk state is saved alongside the memory state, see the B<snapshot> family of commands. -=item B<schedinfo> optional I<--set> B<parameter=value> I<domain-id> I<--config> -I<--live> I<--current> +=item B<schedinfo> [I<--set> B<parameter=value>] I<domain-id> {[I<--config>] +[I<--live>] | I<--current>} -=item B<schedinfo> optional I<--weight> B<number> optional I<--cap> B<number> +=item B<schedinfo> [I<--weight> B<number>] [I<--cap> B<number>] I<domain-id> Allows you to show (and set) the domain scheduler parameters. The parameters @@ -633,7 +635,7 @@ Therefore, -1 is a useful shorthand for 262144. B<Note>: The weight and cap parameters are defined only for the XEN_CREDIT scheduler and are now I<DEPRECATED>. -=item B<screenshot> I<domain-id> optional I<imagefilepath> I<--screen> B<screenID> +=item B<screenshot> I<domain-id> [I<imagefilepath>] [I<--screen> B<screenID>] Takes a screenshot of a current domain console and stores it into a file. Optionally, if hypervisor supports more displays for a domain, I<screenID> @@ -642,8 +644,8 @@ of screen. In case of multiple graphics cards, heads are enumerated before devices, e.g. having two graphics cards, both with four heads, screen ID 5 addresses the second head on the second card. -=item B<setmem> I<domain-id> B<kilobytes> optional I<--config> I<--live> -I<--current> +=item B<setmem> I<domain-id> B<kilobytes> {[I<--config>] [I<--live>] | +I<--current>} Change the memory allocation for a guest domain. If I<--live> is specified, perform a memory balloon of a running guest. @@ -661,8 +663,8 @@ rounds the parameter up unless the kB argument is evenly divisible by 1024 For Xen, you can only adjust the memory of a running domain if the domain is paravirtualized or running the PV balloon driver. -=item B<setmaxmem> I<domain-id> B<kilobytes> optional I<--config> I<--live> -I<--current> +=item B<setmaxmem> I<domain-id> B<kilobytes> {[I<--config>] [I<--live>] | +I<--current>} Change the maximum memory allocation limit for a guest domain. If I<--live> is specified, affect a running guest. @@ -681,9 +683,9 @@ vSphere/ESX, 263168 (257MB) would be rounded up because it's not a multiple of 4MB, while 266240 (260MB) is valid without rounding. -=item B<memtune> I<domain-id> optional I<--hard-limit> B<kilobytes> -optional I<--soft-limit> B<kilobytes> optional I<--swap-hard-limit> -B<kilobytes> optional I<--min-guarantee> B<kilobytes> +=item B<memtune> I<domain-id> [I<--hard-limit> B<kilobytes>] +[I<--soft-limit> B<kilobytes>] [I<--swap-hard-limit> B<kilobytes>] +[I<--min-guarantee> B<kilobytes>] Allows you to display or set the domain memory parameters. Without flags, the current settings are displayed; with a flag, the @@ -727,7 +729,7 @@ value are kilobytes (i.e. blocks of 1024 bytes). =back -=item B<blkiotune> I<domain-id> optional I<--weight> B<weight> +=item B<blkiotune> I<domain-id> [I<--weight> B<weight>] Display or set the blkio parameters. QEMU/KVM supports I<--weight>. I<--weight> is in range [100, 1000]. @@ -739,8 +741,8 @@ Both I<--live> and I<--current> flags may be given, but I<--current> is exclusive. If no flag is specified, behavior is different depending on hypervisor. -=item B<setvcpus> I<domain-id> I<count> optional I<--maximum> I<--config> -I<--live> +=item B<setvcpus> I<domain-id> I<count> [I<--maximum>] [I<--config> | +I<--live>] Change the number of virtual CPUs active in a guest domain. By default, this command works on active guest domains. To change the settings for an @@ -778,7 +780,7 @@ services must be shutdown in the domain. The exact behavior of a domain when it shuts down is set by the I<on_shutdown> parameter in the domain's XML definition. -=item B<start> I<domain-name> optional I<--console> I<--paused> I<--autodestroy> +=item B<start> I<domain-name> [I<--console>] [I<--paused>] [I<--autodestroy>] Start a (previously defined) inactive domain, either from the last B<managedsave> state, or via a fresh boot if no managedsave state is @@ -810,8 +812,8 @@ is not available the processes will provide an exit code of 1. Undefine the configuration for an inactive domain. Since it's not running the domain name or UUID must be used as the I<domain-id>. -=item B<vcpucount> I<domain-id> optional I<--maximum> I<--current> -I<--config> I<--live> +=item B<vcpucount> I<domain-id> [I<--maximum>] {I<--current> | +[I<--config>] [I<--live>]} Print information about the virtual cpu counts of the given I<domain-id>. If no flags are specified, all possible counts are @@ -830,8 +832,8 @@ values; these two flags cannot both be specified. Returns basic information about the domain virtual CPUs, like the number of vCPUs, the running time, the affinity to physical processors. -=item B<vcpupin> I<domain-id> optional I<vcpu> I<cpulist> I<--live> I<--config> -I<--current> +=item B<vcpupin> I<domain-id> [I<vcpu>] [I<cpulist>] {[I<--live>] +[I<--config>] | I<--current>} Query or change the pinning of domain VCPUs to host physical CPUs. To pin a single I<vcpu>, specify I<cpulist>; otherwise, you can query one @@ -876,9 +878,9 @@ See the documentation to learn about libvirt XML format for a device. For cdrom and floppy devices, this command only replaces the media within the single existing device; consider using B<update-device> for this usage. -=item B<attach-disk> I<domain-id> I<source> I<target> optional -I<--driver driver> I<--subdriver subdriver> I<--type type> -I<--mode mode> I<--persistent> I<--sourcetype soucetype> +=item B<attach-disk> I<domain-id> I<source> I<target> +[I<--driver driver>] [I<--subdriver subdriver>] [I<--type type>] +[I<--mode mode>] [I<--persistent>] [I<--sourcetype soucetype>] Attach a new disk device to the domain. I<source> and I<target> are paths for the files and devices. @@ -890,9 +892,9 @@ I<mode> can specify the two specific mode I<readonly> or I<shareable>. I<persistent> indicates the changes will affect the next boot of the domain. I<sourcetype> can indicate the type of source (block|file) -=item B<attach-interface> I<domain-id> I<type> I<source> optional -I<--target target> I<--mac mac> I<--script script> I<--model model> -I<--persistent> +=item B<attach-interface> I<domain-id> I<type> I<source> +[I<--target target>] [I<--mac mac>] [I<--script script>] [I<--model model>] +[I<--persistent>] Attach a new network interface to the domain. I<type> can be either I<network> to indicate a physical network device or I<bridge> to indicate a bridge to a device. @@ -914,14 +916,14 @@ as command B<attach-device>. Detach a disk device from a domain. The I<target> is the device as seen from the domain. -=item B<detach-interface> I<domain-id> I<type> optional I<--mac mac> +=item B<detach-interface> I<domain-id> I<type> [I<--mac mac>] Detach a network interface from a domain. I<type> can be either I<network> to indicate a physical network device or I<bridge> to indicate a bridge to a device. It is recommended to use the I<mac> option to distinguish between the interfaces if more than one are present on the domain. -=item B<update-device> I<domain-id> I<file> optional I<--persistent> I<--force> +=item B<update-device> I<domain-id> I<file> [I<--persistent>] [I<--force>] Update the characteristics of a device associated with I<domain-id>, based on the device definition in an XML I<file>. If the I<--persistent> option is @@ -943,7 +945,7 @@ but the way to name a virtual network is either by its name or UUID. =over 4 -=item B<net-autostart> I<network> optional I<--disable> +=item B<net-autostart> I<network> [I<--disable>] Configure a virtual network to be automatically started at boot. The I<--disable> option disable autostarting. @@ -986,7 +988,7 @@ variables, and defaults to C<vi>. Returns basic information about the I<network> object. -=item B<net-list> optional I<--inactive> or I<--all> +=item B<net-list> [I<--inactive> | I<--all>] Returns the list of active networks, if I<--all> is specified this will also include defined but inactive networks, if I<--inactive> is specified only the @@ -1038,7 +1040,7 @@ not started. Destroy (stop) a given host interface, such as by running "if-down" to disable that interface from active use. This takes effect immediately. -=item B<iface-dumpxml> I<interface> optional I<--inactive> +=item B<iface-dumpxml> I<interface> [I<--inactive>] Output the host interface information as an XML dump to stdout. If I<--inactive> is specified, then the output reflects the persistent @@ -1059,7 +1061,7 @@ except that it does some error checking. The editor used can be supplied by the C<$VISUAL> or C<$EDITOR> environment variables, and defaults to C<vi>. -=item B<iface-list> optional I<--inactive> or I<--all> +=item B<iface-list> [I<--inactive> | I<--all>] Returns the list of active host interfaces. If I<--all> is specified this will also include defined but inactive interfaces. If @@ -1119,19 +1121,20 @@ pools are similar to the ones used for domains. =over 4 -=item B<find-storage-pool-sources> I<type> optional I<srcSpec> +=item B<find-storage-pool-sources> I<type> [I<srcSpec>] Returns XML describing all storage pools of a given I<type> that could be found. If I<srcSpec> is provided, it is a file that contains XML to further restrict the query for pools. -=item B<find-storage-pool-sources> I<type> optional I<host> I<port> +=item B<find-storage-pool-sources-as> I<type> [I<host>] [I<port>] +[I<initiator>] Returns XML describing all storage pools of a given I<type> that could -be found. If I<host> and I<port> are provided, they control where the -query is performed. +be found. If I<host>, I<port>, or I<initiator> are provided, they control +where the query is performed. -=item B<pool-autostart> I<pool-or-uuid> optional I<--disable> +=item B<pool-autostart> I<pool-or-uuid> [I<--disable>] Configure whether I<pool> should automatically start at boot. @@ -1143,8 +1146,9 @@ Build a given pool. Create and start a pool object from the XML I<file>. -=item B<pool-create-as> I<name> I<--print-xml> I<type> optional I<source-host> -I<source-path> I<source-dev> I<source-name> <target> I<--source-format format> +=item B<pool-create-as> I<name> I<--print-xml> I<type> [I<source-host>] +[I<source-path>] [I<source-dev>] [I<source-name>] [<target>] +[I<--source-format format>] Create and start a pool object I<name> from the raw parameters. If I<--print-xml> is specified, then print the XML of the pool object @@ -1155,8 +1159,9 @@ I<type>. Create, but do not start, a pool object from the XML I<file>. -=item B<pool-define-as> I<name> I<--print-xml> I<type> optional I<source-host> -I<source-path> I<source-dev> I<source-name> <target> I<--source-format format> +=item B<pool-define-as> I<name> I<--print-xml> I<type> [I<source-host>] +[I<source-path>] [I<source-dev>] [I<source-name>] [<target>] +[I<--source-format format>] Create, but do not start, a pool object I<name> from the raw parameters. If I<--print-xml> is specified, then print the XML of the pool object @@ -1199,7 +1204,7 @@ variables, and defaults to C<vi>. Returns basic information about the I<pool> object. -=item B<pool-list> optional I<--inactive> I<--all> I<--details> +=item B<pool-list> [I<--inactive> | I<--all>] [I<--details>] List pool objects known to libvirt. By default, only pools in use by active domains are listed; I<--inactive> lists just the inactive @@ -1247,7 +1252,7 @@ B<Example> vi newvolume.xml (or make changes with your other text editor) virsh vol-create differentstoragepool newvolume.xml -=item B<vol-create-from> I<pool-or-uuid> I<FILE> [optional I<--inputpool> +=item B<vol-create-from> I<pool-or-uuid> I<FILE> [I<--inputpool> I<pool-or-uuid>] I<vol-name-or-key-or-path> Create a volume, using another volume as input. @@ -1257,9 +1262,9 @@ I<--inputpool> I<pool-or-uuid> is the name or uuid of the storage pool the source volume is in. I<vol-name-or-key-or-path> is the name or key or path of the source volume. -=item B<vol-create-as> I<pool-or-uuid> I<name> I<capacity> optional -I<--allocation> I<size> I<--format> I<string> I<--backing-vol> -I<vol-name-or-key-or-path> I<--backing-vol-format> I<string> +=item B<vol-create-as> I<pool-or-uuid> I<name> I<capacity> +[I<--allocation> I<size>] [I<--format> I<string>] [I<--backing-vol> +I<vol-name-or-key-or-path>] [I<--backing-vol-format> I<string>] Create a volume from a set of arguments. I<pool-or-uuid> is the name or UUID of the storage pool to create the volume @@ -1276,73 +1281,84 @@ volume to be used if taking a snapshot of an existing volume. I<--backing-vol-format> I<string> is the format of the snapshot backing volume; raw, bochs, qcow, qcow2, vmdk, host_device. -=item B<vol-clone> [optional I<--pool> I<pool-or-uuid>] I<vol-name-or-key-or-path> I<name> +=item B<vol-clone> [I<--pool> I<pool-or-uuid>] I<vol-name-or-key-or-path> +I<name> Clone an existing volume. Less powerful, but easier to type, version of B<vol-create-from>. -I<--pool> I<pool-or-uuid> is the name or UUID of the storage pool to create the volume in. +I<--pool> I<pool-or-uuid> is the name or UUID of the storage pool to create +the volume in. I<vol-name-or-key-or-path> is the name or key or path of the source volume. I<name> is the name of the new volume. -=item B<vol-delete> [optional I<--pool> I<pool-or-uuid>] I<vol-name-or-key-or-path> +=item B<vol-delete> [I<--pool> I<pool-or-uuid>] I<vol-name-or-key-or-path> Delete a given volume. -I<--pool> I<pool-or-uuid> is the name or UUID of the storage pool the volume is in. +I<--pool> I<pool-or-uuid> is the name or UUID of the storage pool the volume +is in. I<vol-name-or-key-or-path> is the name or key or path of the volume to delete. -=item B<vol-upload> [optional I<--pool> I<pool-or-uuid> I<--offset> I<bytes> I<--length> I<bytes>] I<vol-name-or-key-or-path> I<local-file> +=item B<vol-upload> [I<--pool> I<pool-or-uuid>] [I<--offset> I<bytes>] +[I<--length> I<bytes>] I<vol-name-or-key-or-path> I<local-file> Upload the contents of I<local-file> to a storage volume. -I<--pool> I<pool-or-uuid> is the name or UUID of the storage pool the volume is in. +I<--pool> I<pool-or-uuid> is the name or UUID of the storage pool the volume +is in. I<vol-name-or-key-or-path> is the name or key or path of the volume to wipe. I<--offset> is the position in the storage volume at which to start writing the data. I<--length> is an upper bound of the amount of data to be uploaded. An error will occurr if the I<local-file> is greater than the specified length. -=item B<vol-download> [optional I<--pool> I<pool-or-uuid> I<--offset> I<bytes> I<--length> I<bytes>] I<vol-name-or-key-or-path> I<local-file> +=item B<vol-download> [I<--pool> I<pool-or-uuid>] [I<--offset> I<bytes>] +[I<--length> I<bytes>] I<vol-name-or-key-or-path> I<local-file> Download the contents of I<local-file> from a storage volume. -I<--pool> I<pool-or-uuid> is the name or UUID of the storage pool the volume is in. +I<--pool> I<pool-or-uuid> is the name or UUID of the storage pool the volume +is in. I<vol-name-or-key-or-path> is the name or key or path of the volume to wipe. I<--offset> is the position in the storage volume at which to start reading the data. I<--length> is an upper bound of the amount of data to be downloaded. -=item B<vol-wipe> [optional I<--pool> I<pool-or-uuid>] I<vol-name-or-key-or-path> +=item B<vol-wipe> [I<--pool> I<pool-or-uuid>] I<vol-name-or-key-or-path> -Wipe a volume, ensure data previously on the volume is not accessible to future reads. -I<--pool> I<pool-or-uuid> is the name or UUID of the storage pool the volume is in. +Wipe a volume, ensure data previously on the volume is not accessible to +future reads. I<--pool> I<pool-or-uuid> is the name or UUID of the storage +pool the volume is in. I<vol-name-or-key-or-path> is the name or key or path of the volume to wipe. -=item B<vol-dumpxml> [optional I<--pool> I<pool-or-uuid>] I<vol-name-or-key-or-path> +=item B<vol-dumpxml> [I<--pool> I<pool-or-uuid>] I<vol-name-or-key-or-path> Output the volume information as an XML dump to stdout. -I<--pool> I<pool-or-uuid> is the name or UUID of the storage pool the volume is in. -I<vol-name-or-key-or-path> is the name or key or path of the volume to output the XML of. +I<--pool> I<pool-or-uuid> is the name or UUID of the storage pool the volume +is in. I<vol-name-or-key-or-path> is the name or key or path of the volume +to output the XML of. -=item B<vol-info> [optional I<--pool> I<pool-or-uuid>] I<vol-name-or-key-or-path> +=item B<vol-info> [I<--pool> I<pool-or-uuid>] I<vol-name-or-key-or-path> Returns basic information about the given storage volume. -I<--pool> I<pool-or-uuid> is the name or UUID of the storage pool the volume is in. -I<vol-name-or-key-or-path> is the name or key or path of the volume to return information for. +I<--pool> I<pool-or-uuid> is the name or UUID of the storage pool the volume +is in. I<vol-name-or-key-or-path> is the name or key or path of the volume +to return information for. -=item B<vol-list> [optional I<--pool>] I<pool-or-uuid> optional I<--details> +=item B<vol-list> [I<--pool> I<pool-or-uuid>] [I<--details>] Return the list of volumes in the given storage pool. I<--pool> I<pool-or-uuid> is the name or UUID of the storage pool. The I<--details> option instructs virsh to additionally display volume type and capacity related information where available. -=item B<vol-pool> [optional I<--uuid>] I<vol-key-or-path> +=item B<vol-pool> [I<--uuid>] I<vol-key-or-path> Return the pool name or UUID for a given volume. By default, the pool name is returned. If the I<--uuid> option is given, the pool UUID is returned instead. I<vol-key-or-path> is the key or path of the volume to return the pool information for. -=item B<vol-path> [optional I<--pool> I<pool-or-uuid>] I<vol-name-or-key> +=item B<vol-path> [I<--pool> I<pool-or-uuid>] I<vol-name-or-key> Return the path for a given volume. -I<--pool> I<pool-or-uuid> is the name or UUID of the storage pool the volume is in. +I<--pool> I<pool-or-uuid> is the name or UUID of the storage pool the volume +is in. I<vol-name-or-key> is the name or key of the volume to return the path for. =item B<vol-name> I<vol-key-or-path> @@ -1350,11 +1366,12 @@ I<vol-name-or-key> is the name or key of the volume to return the path for. Return the name for a given volume. I<vol-key-or-path> is the key or path of the volume to return the name for. -=item B<vol-key> [optional I<--pool> I<pool-or-uuid>] I<vol-name-or-path> +=item B<vol-key> [I<--pool> I<pool-or-uuid>] I<vol-name-or-path> Return the volume key for a given volume. -I<--pool> I<pool-or-uuid> is the name or UUID of the storage pool the volume is in. -I<vol-name-or-path> is the name or path of the volume to return the volume key for. +I<--pool> I<pool-or-uuid> is the name or UUID of the storage pool the volume +is in. I<vol-name-or-path> is the name or path of the volume to return the +volume key for. =back @@ -1413,7 +1430,7 @@ used to represent properties of snapshots. =over 4 -=item B<snapshot-create> I<domain> optional I<xmlfile> +=item B<snapshot-create> I<domain> [I<xmlfile>] Create a snapshot for domain I<domain> with the properties specified in I<xmlfile>. The only properties settable for a domain snapshot are the @@ -1421,8 +1438,8 @@ I<xmlfile>. The only properties settable for a domain snapshot are the automatically filled in by libvirt. If I<xmlfile> is completely omitted, then libvirt will choose a value for all fields. -=item B<snapshot-create-as> I<domain> optional I<--print-xml> -I<name> I<description> +=item B<snapshot-create-as> I<domain> [I<--print-xml>] +[I<name>] [I<description>] Create a snapshot for domain I<domain> with the given <name> and <description>; if either value is omitted, libvirt will choose a @@ -1543,7 +1560,7 @@ attaching to an externally launched QEMU process. There may be issues with the guest ABI changing upon migration, and hotunplug may not work. -=item B<qemu-monitor-command> I<domain> I<command> optional I<--hmp> +=item B<qemu-monitor-command> I<domain> I<command> [I<--hmp>] Send an arbitrary monitor command I<command> to domain I<domain> through the qemu monitor. The results of the command will be printed on stdout. If -- 1.7.4.4

2 2

[libvirt] [RFC PATCH] qemu: Fail APIs not allowed during async job
by Jiri Denemark 18 Jul '11

18 Jul '11

When an asynchronous job is running while another API that is incompatible with that job is called, we now try to wait until the job finishes and either run the API or fail with timeout. I guess nicer solution is to just fail such API immediately and let the application retry once the asynchronous job ends. --- src/qemu/THREADS.txt | 5 ++--- src/qemu/qemu_domain.c | 28 +++++++++++++++------------- 2 files changed, 17 insertions(+), 16 deletions(-) diff --git a/src/qemu/THREADS.txt b/src/qemu/THREADS.txt index 3a27a85..9183f1f 100644 --- a/src/qemu/THREADS.txt +++ b/src/qemu/THREADS.txt @@ -69,8 +69,7 @@ There are a number of locks on various objects specify what kind of action it is about to take and this is checked against the allowed set of jobs in case an asynchronous job is running. If the job is incompatible with current asynchronous job, - it needs to wait until the asynchronous job ends and try to acquire - the job again. + the operation fails. Immediately after acquiring the virDomainObjPtr lock, any method which intends to update state must acquire either asynchronous or @@ -80,7 +79,7 @@ There are a number of locks on various objects whenever it hits a piece of code which may sleep/wait, and re-acquire it after the sleep/wait. Whenever an asynchronous job wants to talk to the monitor, it needs to acquire nested job (a - special kind of normla job) to obtain exclusive access to the + special kind of normal job) to obtain exclusive access to the monitor. Since the virDomainObjPtr lock was dropped while waiting for the diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index f9755a4..b2a36ad 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -723,21 +723,25 @@ qemuDomainObjBeginJobInternal(struct qemud_driver *driver, if (driver_locked) qemuDriverUnlock(driver); -retry: - while (!nested && !qemuDomainJobAllowed(priv, job)) { - if (virCondWaitUntil(&priv->job.asyncCond, &obj->lock, then) < 0) - goto error; - } + if (!nested && !qemuDomainJobAllowed(priv, job)) + goto not_allowed; while (priv->job.active) { - if (virCondWaitUntil(&priv->job.cond, &obj->lock, then) < 0) + if (virCondWaitUntil(&priv->job.cond, &obj->lock, then) < 0) { + if (errno == ETIMEDOUT) + qemuReportError(VIR_ERR_OPERATION_TIMEOUT, + "%s", _("cannot acquire state change lock")); + else + virReportSystemError(errno, + "%s", _("cannot acquire job mutex")); goto error; + } } /* No job is active but a new async job could have been started while obj * was unlocked, so we need to recheck it. */ if (!nested && !qemuDomainJobAllowed(priv, job)) - goto retry; + goto not_allowed; qemuDomainObjResetJob(priv); @@ -759,13 +763,11 @@ retry: return 0; +not_allowed: + qemuReportError(VIR_ERR_OPERATION_INVALID, + "%s", _("incompatible job is running")); + error: - if (errno == ETIMEDOUT) - qemuReportError(VIR_ERR_OPERATION_TIMEOUT, - "%s", _("cannot acquire state change lock")); - else - virReportSystemError(errno, - "%s", _("cannot acquire job mutex")); if (driver_locked) { virDomainObjUnlock(obj); qemuDriverLock(driver); -- 1.7.6

3 4

[libvirt] [PATCH] docs: Fix spice documentation typo
by Michal Privoznik 18 Jul '11

18 Jul '11

We missed ending tag for paragraph element --- docs/formatdomain.html.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 269fc30..a54ee6a 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -1989,7 +1989,7 @@ qemu-kvm -net nic,model=? /dev/null the <code>copypaste</code> property to <code>no</code>, <span class="since">since 0.9.3</span>. - </> + </p> </dd> <dt><code>"rdp"</code></dt> <dd> -- 1.7.5.rc3

2 2

[libvirt] [PATCH] network: avoid memory leak on cleanup
by ajia＠redhat.com 18 Jul '11

18 Jul '11

* src/network/bridge_driver.c: Fix memory leak on cleanup section from networkGetBridgeName function. --- src/network/bridge_driver.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index 0a12bc0..59e780d 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -2474,7 +2474,8 @@ static char *networkGetBridgeName(virNetworkPtr net) { cleanup: if (network) virNetworkObjUnlock(network); - return bridge; + VIR_FREE(bridge); + return NULL; } static int networkGetAutostart(virNetworkPtr net, -- 1.7.1

5 9

[libvirt] [PATCH] storage: fix volDelete return when volume still being allocated
by Matthew Booth 17 Jul '11

17 Jul '11

volDelete used to return VIR_ERR_INTERNAL_ERROR when attempting to delete a volume which was still being allocated. It should return VIR_ERR_OPERATION_INVALID. * src/storage/storage_driver.c: Fix return of volDelete. --- src/storage/storage_driver.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c index 2da2feb..d9c2137 100644 --- a/src/storage/storage_driver.c +++ b/src/storage/storage_driver.c @@ -1914,7 +1914,7 @@ storageVolumeDelete(virStorageVolPtr obj, } if (vol->building) { - virStorageReportError(VIR_ERR_INTERNAL_ERROR, + virStorageReportError(VIR_ERR_OPERATION_INVALID, _("volume '%s' is still being allocated."), vol->name); goto cleanup; -- 1.7.4.4

6 9

[libvirt] [PATCH] virsh: Avoid undefine active interface
by ajia＠redhat.com 16 Jul '11

16 Jul '11

* tools/virsh.c: libvirt should check if current interface is active before undefine the interface, and don't allow to undefine a active interface. --- tools/virsh.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index bd6fea7..899bf25 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -5675,6 +5675,16 @@ cmdInterfaceUndefine(vshControl *ctl, const vshCmd *cmd) if (!(iface = vshCommandOptInterface(ctl, cmd, &name))) return false; + if (virInterfaceIsActive(iface)) { + vshError(ctl, + _("a active interface like %s cannot be undefined;\n" + "to undefine, first destroy then undefine" + " using its name or MAC address"), + name); + virInterfaceFree(iface); + return false; + } + if (virInterfaceUndefine(iface) == 0) { vshPrint(ctl, _("Interface %s undefined\n"), name); } else { -- 1.7.1

3 2

[libvirt] [PATCH] command: avoid fd leak on failure
by Eric Blake 16 Jul '11

16 Jul '11

virCommandTransferFD promises that the fd is no longer owned by the caller. Normally, we want the fd to remain open until the child runs, but in error situations, we must close it earlier. * src/util/command.c (virCommandTransferFD): Close fd now if we can't track it to close later. --- src/util/command.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/util/command.c b/src/util/command.c index 3c516ec..83d4e88 100644 --- a/src/util/command.c +++ b/src/util/command.c @@ -738,7 +738,7 @@ virCommandKeepFD(virCommandPtr cmd, int fd, bool transfer) void virCommandPreserveFD(virCommandPtr cmd, int fd) { - return virCommandKeepFD(cmd, fd, false); + virCommandKeepFD(cmd, fd, false); } /* @@ -749,7 +749,13 @@ virCommandPreserveFD(virCommandPtr cmd, int fd) void virCommandTransferFD(virCommandPtr cmd, int fd) { - return virCommandKeepFD(cmd, fd, true); + virCommandKeepFD(cmd, fd, true); + if ((!cmd || cmd->has_error) && fd > STDERR_FILENO) { + /* We must close the fd now, instead of waiting for + * virCommandRun, if there was an error that prevented us from + * adding the fd to cmd. */ + VIR_FORCE_CLOSE(fd); + } } -- 1.7.4.4

3 6

[libvirt] [PATCH v2] qemu: Fix a regression of attaching device
by Osier Yang 16 Jul '11

16 Jul '11

The regression is introduced by Commit da1eba6b, the new codes with this commit doesn't reset "ret" to "-1" when it fails on parsing the device XML (live device attachment) This patch changes the codes to reset the "ret" and "-1", and also changes the codes so that it don't modify "ret" for condition checking. How to reproduce: <disk type='oops' device='disk'> <driver name='qemu' type='raw'/> <source file='/var/lib/libvirt/images/test.img'/> <target dev='vda' bus='virtio'/> </disk> Device attached successfully --- src/qemu/qemu_driver.c | 23 +++++++++++++++++------ 1 files changed, 17 insertions(+), 6 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 3d4207e..73118fd 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -4903,16 +4903,20 @@ qemuDomainModifyDeviceFlags(virDomainPtr dom, const char *xml, _("unknown domain modify action %d"), action); break; } - } else - ret = 0; - if (!ret && (flags & VIR_DOMAIN_AFFECT_LIVE)) { + if (ret == -1) + goto endjob; + } + + if (flags & VIR_DOMAIN_AFFECT_LIVE) { /* If dev exists it was created to modify the domain config. Free it. */ virDomainDeviceDefFree(dev); dev = virDomainDeviceDefParse(driver->caps, vm->def, xml, VIR_DOMAIN_XML_INACTIVE); - if (dev == NULL) + if (dev == NULL) { + ret = -1; goto endjob; + } switch (action) { case QEMU_DEVICE_ATTACH: @@ -4927,18 +4931,25 @@ qemuDomainModifyDeviceFlags(virDomainPtr dom, const char *xml, default: qemuReportError(VIR_ERR_INTERNAL_ERROR, _("unknown domain modify action %d"), action); + ret = -1; break; } + + if (ret == -1) + goto endjob; /* * update domain status forcibly because the domain status may be * changed even if we attach the device failed. For example, a * For example, a new controller may be created. */ - if (virDomainSaveStatus(driver->caps, driver->stateDir, vm) < 0) + if (virDomainSaveStatus(driver->caps, driver->stateDir, vm) < 0) { ret = -1; + goto endjob; + } } + /* Finally, if no error until here, we can save config. */ - if (!ret && (flags & VIR_DOMAIN_AFFECT_CONFIG)) { + if (flags & VIR_DOMAIN_AFFECT_CONFIG) { ret = virDomainSaveConfig(driver->configDir, vmdef); if (!ret) { virDomainObjAssignDef(vm, vmdef, false); -- 1.7.6

2 2

[libvirt] [PATCH 0/4] support the listenNetwork attribute in <graphics>
by Laine Stump 15 Jul '11

15 Jul '11

This patch series resolves the following bug: https://bugzilla.redhat.com/show_bug.cgi?id=703851 In short, it implements support for a new "listenNetwork" attribute in the domain's <graphics> element. When listenNetwork is specified, libvirt will look for a network of that name (from the networks that can be created within libvirt), and derive a listen address from the physical interface used to connect that network to the outside world. (More details are given in each commit message). This patch series is meant to be applied on top of the series I sent on Tuesday: network: physical device abstraction aka 'virtual switch' https://www.redhat.com/archives/libvir-list/2011-July/msg00149.html Don't attempt to apply it by itself! Note that I'm not particularly fond of the attribute name (it's too long and has the ugly capital letter in the middle). If anyone has a suggestion for something better, please give your opinion now, before it's pushed and becomes permanent!

2 5

[libvirt] [PATCH] build: also track RPC on-wire enum values
by Eric Blake 15 Jul '11

15 Jul '11

As long as we guarantee RPC struct layout stability, we might as well also guarantee RPC enum value constancy. * src/Makefile.am (r1, r2, PDWTAGS): Adjust rule to pick up named and anonymous enums. * src/remote_protocol-structs: Add enum values. * src/qemu_protocol-structs: Likewise. * src/virnetprotocol-structs: Likewise. --- src/Makefile.am | 12 ++- src/qemu_protocol-structs | 4 + src/remote_protocol-structs | 245 +++++++++++++++++++++++++++++++++++++++++++ src/virnetprotocol-structs | 11 ++ 4 files changed, 267 insertions(+), 5 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index d19d1ca..f528860 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -206,18 +206,20 @@ EXTRA_DIST += $(REMOTE_DRIVER_PROTOCOL) \ # With pdwtags 1.8, --verbose output includes separators like these: # /* 93 */ # /* <0> (null):0 */ -# whereas with pdwtags 1.3, they look like this: +# with the second line omitted for intrinsic types. +# Whereas with pdwtags 1.3, they look like this: # /* <2d2> /usr/include/libio.h:180 */ # The concatenation of the following regexps matches both cases. -r1 = (?:/\* \d+ \*/\n)? -r2 = /\* <[[:xdigit:]]+> \S+:\d+ \*/ +r1 = (?:/\* \d+ \*/) +r2 = (?:/\* <[[:xdigit:]]+> \S+:\d+ \*/) PDWTAGS = \ $(AM_V_GEN)if (pdwtags --help) > /dev/null 2>&1; then \ pdwtags --verbose $(<:.lo=.$(OBJEXT)) \ | perl -0777 -n \ - -e 'foreach my $$p (split m!\n\n$(r1)$(r2)\n!) {' \ - -e ' if ($$p =~ /^struct (remote_|qemu_|virNet)/) {' \ + -e 'foreach my $$p (split m!\n*($(r1)|$(r2))\n!) {' \ + -e ' if ($$p =~ /^(struct|enum) (remote_|qemu_|virNet)/ ||' \ + -e ' $$p =~ /^enum {/) {' \ -e ' $$p =~ s!\t*/\*.*?\*/!!sg;' \ -e ' $$p =~ s!\s+\n!\n!sg;' \ -e ' $$p =~ s!\s+$$!!;' \ diff --git a/src/qemu_protocol-structs b/src/qemu_protocol-structs index e284b59..0397471 100644 --- a/src/qemu_protocol-structs +++ b/src/qemu_protocol-structs @@ -19,3 +19,7 @@ struct qemu_domain_attach_args { struct qemu_domain_attach_ret { remote_nonnull_domain dom; }; +enum qemu_procedure { + QEMU_PROC_MONITOR_COMMAND = 1, + QEMU_PROC_DOMAIN_ATTACH = 2, +}; diff --git a/src/remote_protocol-structs b/src/remote_protocol-structs index b2de8e9..221562d 100644 --- a/src/remote_protocol-structs +++ b/src/remote_protocol-structs @@ -1,4 +1,12 @@ /* -*- c -*- */ +enum { + VIR_TYPED_PARAM_INT = 1, + VIR_TYPED_PARAM_UINT = 2, + VIR_TYPED_PARAM_LLONG = 3, + VIR_TYPED_PARAM_ULLONG = 4, + VIR_TYPED_PARAM_DOUBLE = 5, + VIR_TYPED_PARAM_BOOLEAN = 6, +}; struct remote_nonnull_domain { remote_nonnull_string name; remote_uuid uuid; @@ -50,6 +58,11 @@ struct remote_error { int int2; remote_network net; }; +enum remote_auth_type { + REMOTE_AUTH_NONE = 0, + REMOTE_AUTH_SASL = 1, + REMOTE_AUTH_POLKIT = 2, +}; struct remote_vcpu_info { u_int number; int state; @@ -1615,3 +1628,235 @@ struct remote_domain_get_control_info_ret { u_int details; uint64_t stateTime; }; +enum remote_procedure { + REMOTE_PROC_OPEN = 1, + REMOTE_PROC_CLOSE = 2, + REMOTE_PROC_GET_TYPE = 3, + REMOTE_PROC_GET_VERSION = 4, + REMOTE_PROC_GET_MAX_VCPUS = 5, + REMOTE_PROC_NODE_GET_INFO = 6, + REMOTE_PROC_GET_CAPABILITIES = 7, + REMOTE_PROC_DOMAIN_ATTACH_DEVICE = 8, + REMOTE_PROC_DOMAIN_CREATE = 9, + REMOTE_PROC_DOMAIN_CREATE_XML = 10, + REMOTE_PROC_DOMAIN_DEFINE_XML = 11, + REMOTE_PROC_DOMAIN_DESTROY = 12, + REMOTE_PROC_DOMAIN_DETACH_DEVICE = 13, + REMOTE_PROC_DOMAIN_GET_XML_DESC = 14, + REMOTE_PROC_DOMAIN_GET_AUTOSTART = 15, + REMOTE_PROC_DOMAIN_GET_INFO = 16, + REMOTE_PROC_DOMAIN_GET_MAX_MEMORY = 17, + REMOTE_PROC_DOMAIN_GET_MAX_VCPUS = 18, + REMOTE_PROC_DOMAIN_GET_OS_TYPE = 19, + REMOTE_PROC_DOMAIN_GET_VCPUS = 20, + REMOTE_PROC_LIST_DEFINED_DOMAINS = 21, + REMOTE_PROC_DOMAIN_LOOKUP_BY_ID = 22, + REMOTE_PROC_DOMAIN_LOOKUP_BY_NAME = 23, + REMOTE_PROC_DOMAIN_LOOKUP_BY_UUID = 24, + REMOTE_PROC_NUM_OF_DEFINED_DOMAINS = 25, + REMOTE_PROC_DOMAIN_PIN_VCPU = 26, + REMOTE_PROC_DOMAIN_REBOOT = 27, + REMOTE_PROC_DOMAIN_RESUME = 28, + REMOTE_PROC_DOMAIN_SET_AUTOSTART = 29, + REMOTE_PROC_DOMAIN_SET_MAX_MEMORY = 30, + REMOTE_PROC_DOMAIN_SET_MEMORY = 31, + REMOTE_PROC_DOMAIN_SET_VCPUS = 32, + REMOTE_PROC_DOMAIN_SHUTDOWN = 33, + REMOTE_PROC_DOMAIN_SUSPEND = 34, + REMOTE_PROC_DOMAIN_UNDEFINE = 35, + REMOTE_PROC_LIST_DEFINED_NETWORKS = 36, + REMOTE_PROC_LIST_DOMAINS = 37, + REMOTE_PROC_LIST_NETWORKS = 38, + REMOTE_PROC_NETWORK_CREATE = 39, + REMOTE_PROC_NETWORK_CREATE_XML = 40, + REMOTE_PROC_NETWORK_DEFINE_XML = 41, + REMOTE_PROC_NETWORK_DESTROY = 42, + REMOTE_PROC_NETWORK_GET_XML_DESC = 43, + REMOTE_PROC_NETWORK_GET_AUTOSTART = 44, + REMOTE_PROC_NETWORK_GET_BRIDGE_NAME = 45, + REMOTE_PROC_NETWORK_LOOKUP_BY_NAME = 46, + REMOTE_PROC_NETWORK_LOOKUP_BY_UUID = 47, + REMOTE_PROC_NETWORK_SET_AUTOSTART = 48, + REMOTE_PROC_NETWORK_UNDEFINE = 49, + REMOTE_PROC_NUM_OF_DEFINED_NETWORKS = 50, + REMOTE_PROC_NUM_OF_DOMAINS = 51, + REMOTE_PROC_NUM_OF_NETWORKS = 52, + REMOTE_PROC_DOMAIN_CORE_DUMP = 53, + REMOTE_PROC_DOMAIN_RESTORE = 54, + REMOTE_PROC_DOMAIN_SAVE = 55, + REMOTE_PROC_DOMAIN_GET_SCHEDULER_TYPE = 56, + REMOTE_PROC_DOMAIN_GET_SCHEDULER_PARAMETERS = 57, + REMOTE_PROC_DOMAIN_SET_SCHEDULER_PARAMETERS = 58, + REMOTE_PROC_GET_HOSTNAME = 59, + REMOTE_PROC_SUPPORTS_FEATURE = 60, + REMOTE_PROC_DOMAIN_MIGRATE_PREPARE = 61, + REMOTE_PROC_DOMAIN_MIGRATE_PERFORM = 62, + REMOTE_PROC_DOMAIN_MIGRATE_FINISH = 63, + REMOTE_PROC_DOMAIN_BLOCK_STATS = 64, + REMOTE_PROC_DOMAIN_INTERFACE_STATS = 65, + REMOTE_PROC_AUTH_LIST = 66, + REMOTE_PROC_AUTH_SASL_INIT = 67, + REMOTE_PROC_AUTH_SASL_START = 68, + REMOTE_PROC_AUTH_SASL_STEP = 69, + REMOTE_PROC_AUTH_POLKIT = 70, + REMOTE_PROC_NUM_OF_STORAGE_POOLS = 71, + REMOTE_PROC_LIST_STORAGE_POOLS = 72, + REMOTE_PROC_NUM_OF_DEFINED_STORAGE_POOLS = 73, + REMOTE_PROC_LIST_DEFINED_STORAGE_POOLS = 74, + REMOTE_PROC_FIND_STORAGE_POOL_SOURCES = 75, + REMOTE_PROC_STORAGE_POOL_CREATE_XML = 76, + REMOTE_PROC_STORAGE_POOL_DEFINE_XML = 77, + REMOTE_PROC_STORAGE_POOL_CREATE = 78, + REMOTE_PROC_STORAGE_POOL_BUILD = 79, + REMOTE_PROC_STORAGE_POOL_DESTROY = 80, + REMOTE_PROC_STORAGE_POOL_DELETE = 81, + REMOTE_PROC_STORAGE_POOL_UNDEFINE = 82, + REMOTE_PROC_STORAGE_POOL_REFRESH = 83, + REMOTE_PROC_STORAGE_POOL_LOOKUP_BY_NAME = 84, + REMOTE_PROC_STORAGE_POOL_LOOKUP_BY_UUID = 85, + REMOTE_PROC_STORAGE_POOL_LOOKUP_BY_VOLUME = 86, + REMOTE_PROC_STORAGE_POOL_GET_INFO = 87, + REMOTE_PROC_STORAGE_POOL_GET_XML_DESC = 88, + REMOTE_PROC_STORAGE_POOL_GET_AUTOSTART = 89, + REMOTE_PROC_STORAGE_POOL_SET_AUTOSTART = 90, + REMOTE_PROC_STORAGE_POOL_NUM_OF_VOLUMES = 91, + REMOTE_PROC_STORAGE_POOL_LIST_VOLUMES = 92, + REMOTE_PROC_STORAGE_VOL_CREATE_XML = 93, + REMOTE_PROC_STORAGE_VOL_DELETE = 94, + REMOTE_PROC_STORAGE_VOL_LOOKUP_BY_NAME = 95, + REMOTE_PROC_STORAGE_VOL_LOOKUP_BY_KEY = 96, + REMOTE_PROC_STORAGE_VOL_LOOKUP_BY_PATH = 97, + REMOTE_PROC_STORAGE_VOL_GET_INFO = 98, + REMOTE_PROC_STORAGE_VOL_GET_XML_DESC = 99, + REMOTE_PROC_STORAGE_VOL_GET_PATH = 100, + REMOTE_PROC_NODE_GET_CELLS_FREE_MEMORY = 101, + REMOTE_PROC_NODE_GET_FREE_MEMORY = 102, + REMOTE_PROC_DOMAIN_BLOCK_PEEK = 103, + REMOTE_PROC_DOMAIN_MEMORY_PEEK = 104, + REMOTE_PROC_DOMAIN_EVENTS_REGISTER = 105, + REMOTE_PROC_DOMAIN_EVENTS_DEREGISTER = 106, + REMOTE_PROC_DOMAIN_EVENT_LIFECYCLE = 107, + REMOTE_PROC_DOMAIN_MIGRATE_PREPARE2 = 108, + REMOTE_PROC_DOMAIN_MIGRATE_FINISH2 = 109, + REMOTE_PROC_GET_URI = 110, + REMOTE_PROC_NODE_NUM_OF_DEVICES = 111, + REMOTE_PROC_NODE_LIST_DEVICES = 112, + REMOTE_PROC_NODE_DEVICE_LOOKUP_BY_NAME = 113, + REMOTE_PROC_NODE_DEVICE_GET_XML_DESC = 114, + REMOTE_PROC_NODE_DEVICE_GET_PARENT = 115, + REMOTE_PROC_NODE_DEVICE_NUM_OF_CAPS = 116, + REMOTE_PROC_NODE_DEVICE_LIST_CAPS = 117, + REMOTE_PROC_NODE_DEVICE_DETTACH = 118, + REMOTE_PROC_NODE_DEVICE_RE_ATTACH = 119, + REMOTE_PROC_NODE_DEVICE_RESET = 120, + REMOTE_PROC_DOMAIN_GET_SECURITY_LABEL = 121, + REMOTE_PROC_NODE_GET_SECURITY_MODEL = 122, + REMOTE_PROC_NODE_DEVICE_CREATE_XML = 123, + REMOTE_PROC_NODE_DEVICE_DESTROY = 124, + REMOTE_PROC_STORAGE_VOL_CREATE_XML_FROM = 125, + REMOTE_PROC_NUM_OF_INTERFACES = 126, + REMOTE_PROC_LIST_INTERFACES = 127, + REMOTE_PROC_INTERFACE_LOOKUP_BY_NAME = 128, + REMOTE_PROC_INTERFACE_LOOKUP_BY_MAC_STRING = 129, + REMOTE_PROC_INTERFACE_GET_XML_DESC = 130, + REMOTE_PROC_INTERFACE_DEFINE_XML = 131, + REMOTE_PROC_INTERFACE_UNDEFINE = 132, + REMOTE_PROC_INTERFACE_CREATE = 133, + REMOTE_PROC_INTERFACE_DESTROY = 134, + REMOTE_PROC_DOMAIN_XML_FROM_NATIVE = 135, + REMOTE_PROC_DOMAIN_XML_TO_NATIVE = 136, + REMOTE_PROC_NUM_OF_DEFINED_INTERFACES = 137, + REMOTE_PROC_LIST_DEFINED_INTERFACES = 138, + REMOTE_PROC_NUM_OF_SECRETS = 139, + REMOTE_PROC_LIST_SECRETS = 140, + REMOTE_PROC_SECRET_LOOKUP_BY_UUID = 141, + REMOTE_PROC_SECRET_DEFINE_XML = 142, + REMOTE_PROC_SECRET_GET_XML_DESC = 143, + REMOTE_PROC_SECRET_SET_VALUE = 144, + REMOTE_PROC_SECRET_GET_VALUE = 145, + REMOTE_PROC_SECRET_UNDEFINE = 146, + REMOTE_PROC_SECRET_LOOKUP_BY_USAGE = 147, + REMOTE_PROC_DOMAIN_MIGRATE_PREPARE_TUNNEL = 148, + REMOTE_PROC_IS_SECURE = 149, + REMOTE_PROC_DOMAIN_IS_ACTIVE = 150, + REMOTE_PROC_DOMAIN_IS_PERSISTENT = 151, + REMOTE_PROC_NETWORK_IS_ACTIVE = 152, + REMOTE_PROC_NETWORK_IS_PERSISTENT = 153, + REMOTE_PROC_STORAGE_POOL_IS_ACTIVE = 154, + REMOTE_PROC_STORAGE_POOL_IS_PERSISTENT = 155, + REMOTE_PROC_INTERFACE_IS_ACTIVE = 156, + REMOTE_PROC_GET_LIB_VERSION = 157, + REMOTE_PROC_CPU_COMPARE = 158, + REMOTE_PROC_DOMAIN_MEMORY_STATS = 159, + REMOTE_PROC_DOMAIN_ATTACH_DEVICE_FLAGS = 160, + REMOTE_PROC_DOMAIN_DETACH_DEVICE_FLAGS = 161, + REMOTE_PROC_CPU_BASELINE = 162, + REMOTE_PROC_DOMAIN_GET_JOB_INFO = 163, + REMOTE_PROC_DOMAIN_ABORT_JOB = 164, + REMOTE_PROC_STORAGE_VOL_WIPE = 165, + REMOTE_PROC_DOMAIN_MIGRATE_SET_MAX_DOWNTIME = 166, + REMOTE_PROC_DOMAIN_EVENTS_REGISTER_ANY = 167, + REMOTE_PROC_DOMAIN_EVENTS_DEREGISTER_ANY = 168, + REMOTE_PROC_DOMAIN_EVENT_REBOOT = 169, + REMOTE_PROC_DOMAIN_EVENT_RTC_CHANGE = 170, + REMOTE_PROC_DOMAIN_EVENT_WATCHDOG = 171, + REMOTE_PROC_DOMAIN_EVENT_IO_ERROR = 172, + REMOTE_PROC_DOMAIN_EVENT_GRAPHICS = 173, + REMOTE_PROC_DOMAIN_UPDATE_DEVICE_FLAGS = 174, + REMOTE_PROC_NWFILTER_LOOKUP_BY_NAME = 175, + REMOTE_PROC_NWFILTER_LOOKUP_BY_UUID = 176, + REMOTE_PROC_NWFILTER_GET_XML_DESC = 177, + REMOTE_PROC_NUM_OF_NWFILTERS = 178, + REMOTE_PROC_LIST_NWFILTERS = 179, + REMOTE_PROC_NWFILTER_DEFINE_XML = 180, + REMOTE_PROC_NWFILTER_UNDEFINE = 181, + REMOTE_PROC_DOMAIN_MANAGED_SAVE = 182, + REMOTE_PROC_DOMAIN_HAS_MANAGED_SAVE_IMAGE = 183, + REMOTE_PROC_DOMAIN_MANAGED_SAVE_REMOVE = 184, + REMOTE_PROC_DOMAIN_SNAPSHOT_CREATE_XML = 185, + REMOTE_PROC_DOMAIN_SNAPSHOT_GET_XML_DESC = 186, + REMOTE_PROC_DOMAIN_SNAPSHOT_NUM = 187, + REMOTE_PROC_DOMAIN_SNAPSHOT_LIST_NAMES = 188, + REMOTE_PROC_DOMAIN_SNAPSHOT_LOOKUP_BY_NAME = 189, + REMOTE_PROC_DOMAIN_HAS_CURRENT_SNAPSHOT = 190, + REMOTE_PROC_DOMAIN_SNAPSHOT_CURRENT = 191, + REMOTE_PROC_DOMAIN_REVERT_TO_SNAPSHOT = 192, + REMOTE_PROC_DOMAIN_SNAPSHOT_DELETE = 193, + REMOTE_PROC_DOMAIN_GET_BLOCK_INFO = 194, + REMOTE_PROC_DOMAIN_EVENT_IO_ERROR_REASON = 195, + REMOTE_PROC_DOMAIN_CREATE_WITH_FLAGS = 196, + REMOTE_PROC_DOMAIN_SET_MEMORY_PARAMETERS = 197, + REMOTE_PROC_DOMAIN_GET_MEMORY_PARAMETERS = 198, + REMOTE_PROC_DOMAIN_SET_VCPUS_FLAGS = 199, + REMOTE_PROC_DOMAIN_GET_VCPUS_FLAGS = 200, + REMOTE_PROC_DOMAIN_OPEN_CONSOLE = 201, + REMOTE_PROC_DOMAIN_IS_UPDATED = 202, + REMOTE_PROC_GET_SYSINFO = 203, + REMOTE_PROC_DOMAIN_SET_MEMORY_FLAGS = 204, + REMOTE_PROC_DOMAIN_SET_BLKIO_PARAMETERS = 205, + REMOTE_PROC_DOMAIN_GET_BLKIO_PARAMETERS = 206, + REMOTE_PROC_DOMAIN_MIGRATE_SET_MAX_SPEED = 207, + REMOTE_PROC_STORAGE_VOL_UPLOAD = 208, + REMOTE_PROC_STORAGE_VOL_DOWNLOAD = 209, + REMOTE_PROC_DOMAIN_INJECT_NMI = 210, + REMOTE_PROC_DOMAIN_SCREENSHOT = 211, + REMOTE_PROC_DOMAIN_GET_STATE = 212, + REMOTE_PROC_DOMAIN_MIGRATE_BEGIN3 = 213, + REMOTE_PROC_DOMAIN_MIGRATE_PREPARE3 = 214, + REMOTE_PROC_DOMAIN_MIGRATE_PREPARE_TUNNEL3 = 215, + REMOTE_PROC_DOMAIN_MIGRATE_PERFORM3 = 216, + REMOTE_PROC_DOMAIN_MIGRATE_FINISH3 = 217, + REMOTE_PROC_DOMAIN_MIGRATE_CONFIRM3 = 218, + REMOTE_PROC_DOMAIN_SET_SCHEDULER_PARAMETERS_FLAGS = 219, + REMOTE_PROC_INTERFACE_CHANGE_BEGIN = 220, + REMOTE_PROC_INTERFACE_CHANGE_COMMIT = 221, + REMOTE_PROC_INTERFACE_CHANGE_ROLLBACK = 222, + REMOTE_PROC_DOMAIN_GET_SCHEDULER_PARAMETERS_FLAGS = 223, + REMOTE_PROC_DOMAIN_EVENT_CONTROL_ERROR = 224, + REMOTE_PROC_DOMAIN_PIN_VCPU_FLAGS = 225, + REMOTE_PROC_DOMAIN_SEND_KEY = 226, + REMOTE_PROC_NODE_GET_CPU_STATS = 227, + REMOTE_PROC_NODE_GET_MEMORY_STATS = 228, + REMOTE_PROC_DOMAIN_GET_CONTROL_INFO = 229, + REMOTE_PROC_DOMAIN_GET_VCPU_PIN_INFO = 230, +}; diff --git a/src/virnetprotocol-structs b/src/virnetprotocol-structs index 1ee2c6d..4d97e9c 100644 --- a/src/virnetprotocol-structs +++ b/src/virnetprotocol-structs @@ -1,4 +1,15 @@ /* -*- c -*- */ +enum virNetMessageType { + VIR_NET_CALL = 0, + VIR_NET_REPLY = 1, + VIR_NET_MESSAGE = 2, + VIR_NET_STREAM = 3, +}; +enum virNetMessageStatus { + VIR_NET_OK = 0, + VIR_NET_ERROR = 1, + VIR_NET_CONTINUE = 2, +}; struct virNetMessageHeader { u_int prog; u_int vers; -- 1.7.4.4

2 2

[libvirt] [PATCH] docs: document dxml argument to migrate2
by Eric Blake 15 Jul '11

15 Jul '11

Commit 135554166 introduced a nice feature without documenting it. * src/libvirt.c (virDomainMigrate2): Add paragraph. --- src/libvirt.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/src/libvirt.c b/src/libvirt.c index fc17f2b..13da214 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -4297,6 +4297,15 @@ error: * different processors even with the same architecture, or between * different types of hypervisor. * + * If the hypervisor supports it, @dxml can be used to alter + * host-specific portions of the domain XML that will be used on + * the destination. For example, it is possible to alter the + * backing filename that is associated with a disk device, in order + * to account for naming differences between source and destination + * in accessing the underlying storage. The migration will fail + * if @dxml would cause any guest-visible changes. Pass NULL + * if no changes are needed to the XML between source and destination. + * * Returns the new domain object if the migration was successful, * or NULL in case of error. Note that the new domain object * exists in the scope of the destination connection (dconn). -- 1.7.4.4

2 2

[libvirt] [PATCHv3 0/6] flags cleanup conclusion
by Eric Blake 15 Jul '11

15 Jul '11

With this, I think I've addressed all the review comments from v2: https://www.redhat.com/archives/libvir-list/2011-July/msg00460.html as well as a side discussion on public API flag filtering: https://www.redhat.com/archives/libvir-list/2011-July/msg00833.html Eric Blake (6): flags: use common dumpxml flags check flags: simplify qemu migration flags esx: reject unknown flags xen: reject unknown flags libvirt: do not mix internal flags into public API build: add syntax check for proper flags use cfg.mk | 30 ++++++++++-- src/conf/domain_conf.c | 25 +++++++-- src/conf/domain_conf.h | 10 ---- src/driver.c | 4 -- src/driver.h | 13 ++--- src/esx/esx_device_monitor.c | 4 +- src/esx/esx_driver.c | 35 ++++++++++--- src/esx/esx_interface_driver.c | 4 +- src/esx/esx_network_driver.c | 4 +- src/esx/esx_nwfilter_driver.c | 4 +- src/esx/esx_secret_driver.c | 4 +- src/esx/esx_storage_driver.c | 4 +- src/fdstream.c | 28 +++++----- src/fdstream.h | 6 +- src/libvirt.c | 6 +-- src/libxl/libxl_driver.c | 2 + src/locking/lock_driver_nop.c | 10 ++-- src/locking/lock_manager.c | 7 ++- src/lxc/lxc_driver.c | 2 + src/openvz/openvz_driver.c | 2 + src/phyp/phyp_driver.c | 2 + src/qemu/qemu_driver.c | 107 +++++++++------------------------------- src/qemu/qemu_process.c | 2 +- src/remote/remote_driver.c | 8 +++- src/secret/secret_driver.c | 7 ++- src/storage/storage_driver.c | 2 +- src/test/test_driver.c | 2 + src/uml/uml_driver.c | 24 ++++++--- src/util/command.c | 2 +- src/util/iohelper.c | 18 +++--- src/util/util.c | 14 +++--- src/vbox/vbox_tmpl.c | 18 +++++-- src/vmware/vmware_driver.c | 2 + src/xen/xen_driver.c | 18 ++++++- src/xen/xen_driver.h | 7 +++ src/xen/xen_hypervisor.c | 8 ++- src/xen/xen_inotify.c | 4 +- src/xen/xend_internal.c | 42 +++++++++++++--- src/xen/xend_internal.h | 3 +- src/xen/xm_internal.c | 33 ++++++++++--- src/xen/xm_internal.h | 2 +- src/xen/xs_internal.c | 12 +++- src/xenapi/xenapi_driver.c | 4 +- 43 files changed, 323 insertions(+), 222 deletions(-) -- 1.7.4.4

2 18

[libvirt] [PATCH] virsh: improve option handling
by Eric Blake 15 Jul '11

15 Jul '11

The documentation for vshCommandOptString claims that it returns -1 on a missing required argument, but in reality, that error message was unreachable (it was buried inside an if clause that is true only if the argument was present). The code was so hairy that I decided a rewrite would make it easier to understand, and actually return the error values we want. In the process, this guarantees that --option '' will either return -1 or 1, depending on whether EMPTY_OK was set, reserving 0 solely for the case of an option not present and not required. Meanwhile, our construction guarantees that all vshCmdOpt have a non-null def member, so there are some redundant checks that can be trimmed. * tools/virsh.c (vshCommandOpt): Alter signature. (vshCommandOptInt, vshCommandOptUInt, vshCommandOptUL) (vshCommandOptString, vshCommandOptLongLong) (vshCommandOptULongLong, vshCommandOptBool): Adjust all callers. --- This patch replaces the one mentioned here: https://www.redhat.com/archives/libvir-list/2011-July/msg00995.html tools/virsh.c | 302 +++++++++++++++++++++++++++++++++++++++------------------ 1 files changed, 206 insertions(+), 96 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index b8f357b..a4a9445 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -162,29 +162,36 @@ typedef struct __vshControl vshControl; typedef struct __vshCmd vshCmd; /* - * vshCmdInfo -- information about command + * vshCmdInfo -- name/value pair for information about command + * + * Commands should have at least the following names: + * "name" - command name + * "desc" - description of command, or empty string */ typedef struct { - const char *name; /* name of information */ - const char *data; /* information */ + const char *name; /* name of information, or NULL for list end */ + const char *data; /* non-NULL information */ } vshCmdInfo; /* * vshCmdOptDef - command option definition */ typedef struct { - const char *name; /* the name of option */ + const char *name; /* the name of option, or NULL for list end */ vshCmdOptType type; /* option type */ int flag; /* flags */ - const char *help; /* help string */ + const char *help; /* non-NULL help string */ } vshCmdOptDef; /* * vshCmdOpt - command options + * + * After parsing a command, all arguments to the command have been + * collected into a list of these objects. */ typedef struct vshCmdOpt { - const vshCmdOptDef *def; /* pointer to relevant option */ - char *data; /* allocated data */ + const vshCmdOptDef *def; /* non-NULL pointer to option definition */ + char *data; /* allocated data, or NULL for bool option */ struct vshCmdOpt *next; } vshCmdOpt; @@ -199,7 +206,7 @@ enum { * vshCmdDef - command definition */ typedef struct { - const char *name; + const char *name; /* name of command, or NULL for list end */ bool (*handler) (vshControl *, const vshCmd *); /* command handler */ const vshCmdOptDef *opts; /* definition of command options */ const vshCmdInfo *info; /* details about command */ @@ -239,7 +246,7 @@ typedef struct __vshControl { } __vshControl; typedef struct vshCmdGrp { - const char *name; + const char *name; /* name of group, or NULL for list end */ const char *keyword; /* help keyword */ const vshCmdDef *commands; } vshCmdGrp; @@ -264,7 +271,9 @@ static bool vshCmddefHelp(vshControl *ctl, const char *name); static const vshCmdGrp *vshCmdGrpSearch(const char *grpname); static bool vshCmdGrpHelp(vshControl *ctl, const char *name); -static vshCmdOpt *vshCommandOpt(const vshCmd *cmd, const char *name); +static int vshCommandOpt(const vshCmd *cmd, const char *name, vshCmdOpt **opt) + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3) + ATTRIBUTE_RETURN_CHECK; static int vshCommandOptInt(const vshCmd *cmd, const char *name, int *value) ATTRIBUTE_NONNULL(3) ATTRIBUTE_RETURN_CHECK; static int vshCommandOptUInt(const vshCmd *cmd, const char *name, @@ -12300,23 +12309,48 @@ vshCommandFree(vshCmd *cmd) } } -/* - * Returns option by name +/** + * vshCommandOpt: + * @cmd: parsed command line to search + * @name: option name to search for + * @opt: result of the search + * + * Look up an option passed to CMD by NAME. Returns 1 with *OPT set + * to the option if found, 0 with *OPT set to NULL if the name is + * valid and the option is not required, -1 with *OPT set to NULL if + * the option is required but not present, and -2 if NAME is not valid + * (-2 indicates a programming error). No error messages are issued. */ -static vshCmdOpt * -vshCommandOpt(const vshCmd *cmd, const char *name) +static int +vshCommandOpt(const vshCmd *cmd, const char *name, vshCmdOpt **opt) { - vshCmdOpt *opt = cmd->opts; + vshCmdOpt *candidate = cmd->opts; + const vshCmdOptDef *valid = cmd->def->opts; - while (opt) { - if (opt->def && STREQ(opt->def->name, name)) - return opt; - opt = opt->next; + /* See if option is present on command line. */ + while (candidate) { + if (STREQ(candidate->def->name, name)) { + *opt = candidate; + return 1; + } + candidate = candidate->next; } - return NULL; + + /* Option not present, see if command requires it. */ + *opt = NULL; + while (valid) { + if (!valid->name) + break; + if (STREQ(name, valid->name)) + return (valid->flag & VSH_OFLAG_REQ) == 0 ? 0 : -1; + valid++; + } + /* If we got here, the name is unknown. */ + return -2; } -/* +/** + * vshCommandOptInt: * @cmd command reference * @name option name * @value result @@ -12324,102 +12358,144 @@ vshCommandOpt(const vshCmd *cmd, const char *name) * Convert option to int * Return value: * >0 if option found and valid (@value updated) - * 0 in case option not found (@value untouched) + * 0 if option not found and not required (@value untouched) * <0 in all other cases (@value untouched) */ static int vshCommandOptInt(const vshCmd *cmd, const char *name, int *value) { - vshCmdOpt *arg = vshCommandOpt(cmd, name); - int ret = 0, num; + vshCmdOpt *arg; + int ret; + int num; char *end_p = NULL; - if ((arg != NULL) && (arg->data != NULL)) { - num = strtol(arg->data, &end_p, 10); - ret = -1; - if ((arg->data != end_p) && (*end_p == 0)) { - *value = num; - ret = 1; - } + ret = vshCommandOpt(cmd, name, &arg); + if (ret <= 0) + return ret; + if (!arg->data) { + /* only possible on bool, but if name is bool, this is a + * programming bug */ + return -2; } - return ret; + + num = strtol(arg->data, &end_p, 10); + if ((arg->data != end_p) && (*end_p == 0)) { + *value = num; + return 1; + } + return -1; } -/* +/** + * vshCommandOptUInt: + * @cmd command reference + * @name option name + * @value result + * * Convert option to unsigned int * See vshCommandOptInt() */ static int vshCommandOptUInt(const vshCmd *cmd, const char *name, unsigned int *value) { - vshCmdOpt *arg = vshCommandOpt(cmd, name); - unsigned int ret = 0, num; + vshCmdOpt *arg; + int ret; + unsigned int num; char *end_p = NULL; - if ((arg != NULL) && (arg->data != NULL)) { - num = strtoul(arg->data, &end_p, 10); - ret = -1; - if ((arg->data != end_p) && (*end_p == 0)) { - *value = num; - ret = 1; - } + ret = vshCommandOpt(cmd, name, &arg); + if (ret <= 0) + return ret; + if (!arg->data) { + /* only possible on bool, but if name is bool, this is a + * programming bug */ + return -2; } - return ret; + + num = strtoul(arg->data, &end_p, 10); + if ((arg->data != end_p) && (*end_p == 0)) { + *value = num; + return 1; + } + return -1; } /* + * vshCommandOptUL: + * @cmd command reference + * @name option name + * @value result + * * Convert option to unsigned long * See vshCommandOptInt() */ static int vshCommandOptUL(const vshCmd *cmd, const char *name, unsigned long *value) { - vshCmdOpt *arg = vshCommandOpt(cmd, name); - int ret = 0; + vshCmdOpt *arg; + int ret; unsigned long num; char *end_p = NULL; - if ((arg != NULL) && (arg->data != NULL)) { - num = strtoul(arg->data, &end_p, 10); - ret = -1; - if ((arg->data != end_p) && (*end_p == 0)) { - *value = num; - ret = 1; - } + ret = vshCommandOpt(cmd, name, &arg); + if (ret <= 0) + return ret; + if (!arg->data) { + /* only possible on bool, but if name is bool, this is a + * programming bug */ + return -2; } - return ret; + + num = strtoul(arg->data, &end_p, 10); + if ((arg->data != end_p) && (*end_p == 0)) { + *value = num; + return 1; + } + return -1; } -/* +/** + * vshCommandOptString: + * @cmd command reference + * @name option name + * @value result + * * Returns option as STRING - * See vshCommandOptInt() + * Return value: + * >0 if option found and valid (@value updated) + * 0 if option not found and not required (@value untouched) + * <0 in all other cases (@value untouched) */ static int vshCommandOptString(const vshCmd *cmd, const char *name, const char **value) { - vshCmdOpt *arg = vshCommandOpt(cmd, name); - int ret = 0; - - if (arg && arg->data) { - if (*arg->data - || (arg->def && (arg->def->flag & VSH_OFLAG_EMPTY_OK))) { - *value = arg->data; - ret = 1; - } else if (arg->def && ((arg->def->flag) & VSH_OFLAG_REQ)) { - vshError(NULL, _("Missing required option '%s'"), name); - ret = -1; - } else { - /* Treat "--option ''" as if option had not been specified. */ - ret = 0; - } + vshCmdOpt *arg; + int ret; + + ret = vshCommandOpt(cmd, name, &arg); + if (ret <= 0) + return ret; + if (!arg->data) { + /* only possible on bool, but if name is bool, this is a + * programming bug */ + return -2; } - return ret; + if (!*arg->data && !(arg->def->flag & VSH_OFLAG_EMPTY_OK)) { + return -1; + } + *value = arg->data; + return 1; } -/* +/** + * vshCommandOptLongLong: + * @cmd command reference + * @name option name + * @value result + * * Returns option as long long * See vshCommandOptInt() */ @@ -12427,53 +12503,87 @@ static int vshCommandOptLongLong(const vshCmd *cmd, const char *name, long long *value) { - vshCmdOpt *arg = vshCommandOpt(cmd, name); - int ret = 0; + vshCmdOpt *arg; + int ret; long long num; char *end_p = NULL; - if ((arg != NULL) && (arg->data != NULL)) { - num = strtoll(arg->data, &end_p, 10); - ret = -1; - if ((arg->data != end_p) && (*end_p == 0)) { - *value = num; - ret = 1; - } + ret = vshCommandOpt(cmd, name, &arg); + if (ret <= 0) + return ret; + if (!arg->data) { + /* only possible on bool, but if name is bool, this is a + * programming bug */ + return -2; } - return ret; + + num = strtoll(arg->data, &end_p, 10); + if ((arg->data != end_p) && (*end_p == 0)) { + *value = num; + return 1; + } + return -1; } +/** + * vshCommandOptULongLong: + * @cmd command reference + * @name option name + * @value result + * + * Returns option as long long + * See vshCommandOptInt() + */ static int vshCommandOptULongLong(const vshCmd *cmd, const char *name, unsigned long long *value) { - vshCmdOpt *arg = vshCommandOpt(cmd, name); - int ret = 0; + vshCmdOpt *arg; + int ret; unsigned long long num; char *end_p = NULL; - if ((arg != NULL) && (arg->data != NULL)) { - num = strtoull(arg->data, &end_p, 10); - ret = -1; - if ((arg->data != end_p) && (*end_p == 0)) { - *value = num; - ret = 1; - } + ret = vshCommandOpt(cmd, name, &arg); + if (ret <= 0) + return ret; + if (!arg->data) { + /* only possible on bool, but if name is bool, this is a + * programming bug */ + return -2; } - return ret; + + num = strtoull(arg->data, &end_p, 10); + if ((arg->data != end_p) && (*end_p == 0)) { + *value = num; + return 1; + } + return -1; } -/* - * Returns true/false if the option exists +/** + * vshCommandOptBool: + * @cmd command reference + * @name option name + * + * Returns true/false if the option exists. Note that this does NOT + * validate whether the option is actually boolean, or even whether + * name is legal; so that this can be used to probe whether a data + * option is present without actually using that data. */ static bool vshCommandOptBool(const vshCmd *cmd, const char *name) { - return vshCommandOpt(cmd, name) != NULL; + vshCmdOpt *dummy; + + return vshCommandOpt(cmd, name, &dummy) == 1; } -/* +/** + * vshCommandOptArgv: + * @cmd command reference + * @opt starting point for the search + * * Returns the next argv argument after OPT (or the first one if OPT * is NULL), or NULL if no more are present. * -- 1.7.4.4

2 2

[libvirt] [PATCH] Add sanity checking of basic contraints, key purpose & key usage
by Daniel P. Berrange 15 Jul '11

15 Jul '11

Gnutls requires that certificates have basic constraints present to be used as a CA certificate. OpenSSL doesn't add this data by default, so add a sanity check to catch this situation. Also validate that the key usage and key purpose constraints contain correct data * src/rpc/virnettlscontext.c: Add sanity checking of certificate constraints --- src/rpc/virnettlscontext.c | 130 ++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 126 insertions(+), 4 deletions(-) diff --git a/src/rpc/virnettlscontext.c b/src/rpc/virnettlscontext.c index 6a06565..7f088d2 100644 --- a/src/rpc/virnettlscontext.c +++ b/src/rpc/virnettlscontext.c @@ -98,6 +98,7 @@ static void virNetTLSLog(int level, const char *str) { static gnutls_x509_crt_t virNetTLSContextSanityCheckCert(bool isServer, + bool isCA, const char *certFile) { gnutls_datum_t data; @@ -105,6 +106,14 @@ static gnutls_x509_crt_t virNetTLSContextSanityCheckCert(bool isServer, char *buf = NULL; int ret = -1; time_t now; + int status; + int i; + char *buffer = NULL; + size_t size; + unsigned int usage; + + VIR_DEBUG("isServer %d isCA %d certFile %s", + isServer, isCA, certFile); if ((now = time(NULL)) == ((time_t)-1)) { virReportSystemError(errno, "%s", @@ -145,6 +154,117 @@ static gnutls_x509_crt_t virNetTLSContextSanityCheckCert(bool isServer, goto cleanup; } + status = gnutls_x509_crt_get_basic_constraints(cert, NULL, NULL, NULL); + VIR_DEBUG("Cert %s basic constraints %d", certFile, status); + + if (status > 0) { /* It is a CA cert */ + if (!isCA) { + virNetError(VIR_ERR_SYSTEM_ERROR, + _("The certificate %s basic constraints show a CA, but we need one for a %s"), + certFile, isServer ? "server" : "client"); + goto cleanup; + } + } else if (status == 0) { /* It is not a CA cert */ + if (isCA) { + virNetError(VIR_ERR_SYSTEM_ERROR, + _("The certificate %s basic constraints do not show a CA"), + certFile); + goto cleanup; + } + } else if (status == GNUTLS_E_REQUESTED_DATA_NOT_AVAILABLE) { /* Missing basicConstraints */ + if (isCA) { + virNetError(VIR_ERR_SYSTEM_ERROR, + _("The certificate %s is missing basic constraints for a CA"), + certFile); + goto cleanup; + } + } else { /* General error */ + virNetError(VIR_ERR_SYSTEM_ERROR, + _("Unable to query certificate %s basic constraints %s"), + certFile, gnutls_strerror(status)); + goto cleanup; + } + + status = gnutls_x509_crt_get_key_usage(cert, &usage, NULL); + + VIR_DEBUG("Cert %s key usage status %d usage %d", certFile, status, usage); + if (status < 0) { + virNetError(VIR_ERR_SYSTEM_ERROR, + _("Unable to query certificate %s basic constraints %s"), + certFile, gnutls_strerror(status)); + goto cleanup; + } + + if (usage & GNUTLS_KEY_KEY_CERT_SIGN) { + if (!isCA) { + virNetError(VIR_ERR_SYSTEM_ERROR, + _("Certificate %s usage is for certificate signing, but wanted a %s certificate"), + certFile, isServer ? "server" : "client"); + goto cleanup; + } + } else { + if (isCA) { + virNetError(VIR_ERR_SYSTEM_ERROR, + _("Certificate %s usage is for not certificate signing"), + certFile); + goto cleanup; + } + } + + for (i = 0 ; ; i++) { + size = 0; + status = gnutls_x509_crt_get_key_purpose_oid(cert, i, buffer, &size, NULL); + + if (status == GNUTLS_E_REQUESTED_DATA_NOT_AVAILABLE) { + VIR_DEBUG("No key purpose data available, skipping checks"); + break; + } + if (status != GNUTLS_E_SHORT_MEMORY_BUFFER) { + virNetError(VIR_ERR_SYSTEM_ERROR, + _("Unable to query certificate %s key purpose %s"), + certFile, gnutls_strerror(status)); + goto cleanup; + } + + if (VIR_ALLOC_N(buffer, size) < 0) { + virReportOOMError(); + goto cleanup; + } + + status = gnutls_x509_crt_get_key_purpose_oid(cert, i, buffer, &size, NULL); + if (status < 0) { + virNetError(VIR_ERR_SYSTEM_ERROR, + _("Unable to query certificate %s key purpose %s"), + certFile, gnutls_strerror(status)); + goto cleanup; + } + + VIR_DEBUG("Key purpose %d %s", status, buffer); + if (STREQ(buffer, GNUTLS_KP_TLS_WWW_SERVER)) { + if (isCA || !isServer) { + virNetError(VIR_ERR_SYSTEM_ERROR, + _("Certificate %s purpose is TLS server, but wanted a %s certificate"), + certFile, isCA ? "CA" : "TLS client"); + goto cleanup; + } + } else if (STREQ(buffer, GNUTLS_KP_TLS_WWW_CLIENT)) { + if (isCA || isServer) { + virNetError(VIR_ERR_SYSTEM_ERROR, + _("Certificate %s purpose is TLS client, but wanted a %s certificate"), + certFile, isCA ? "CA" : "TLS server"); + goto cleanup; + } + } else if (STRNEQ(buffer, GNUTLS_KP_ANY)) { + virNetError(VIR_ERR_SYSTEM_ERROR, + _("Certificate %s purpose is wrong, wanted a %s certificate"), + certFile, isCA ? "CA" : (isServer ? "TLS server" : "TLS client")); + goto cleanup; + } + + VIR_FREE(buffer); + } + + ret = 0; cleanup: @@ -152,6 +272,7 @@ cleanup: gnutls_x509_crt_deinit(cert); cert = NULL; } + VIR_FREE(buffer); VIR_FREE(buf); return cert; } @@ -167,11 +288,11 @@ static int virNetTLSContextSanityCheckCredentials(bool isServer, unsigned int status; if (access(certFile, R_OK) == 0) { - if (!(cert = virNetTLSContextSanityCheckCert(isServer, certFile))) + if (!(cert = virNetTLSContextSanityCheckCert(isServer, false, certFile))) goto cleanup; } if (access(cacertFile, R_OK) == 0) { - if (!(cacert = virNetTLSContextSanityCheckCert(isServer, cacertFile))) + if (!(cacert = virNetTLSContextSanityCheckCert(isServer, true, cacertFile))) goto cleanup; } @@ -343,9 +464,10 @@ static virNetTLSContextPtr virNetTLSContextNew(const char *cacert, goto error; } - if (virNetTLSContextSanityCheckCredentials(isServer, cacert, cert) < 0) + if (requireValidCert && + virNetTLSContextSanityCheckCredentials(isServer, cacert, cert) < 0) goto error; - + if (virNetTLSContextLoadCredentials(ctxt, isServer, cacert, cacrl, cert, key) < 0) goto error; -- 1.7.4.4

2 2

[libvirt] [PATCH] Add some basic sanity checking of certificates before use
by Daniel P. Berrange 15 Jul '11

15 Jul '11

If the libvirt daemon or libvirt client is configured with bogus certificates, it is very unhelpful to only find out about this when a TLS connection is actually attempted. Not least because the error messages you get back for failures are incredibly obscure. This adds some basic sanity checking of certificates at the time the virNetTLSContext object is created. This is at libvirt startup, or when creating a virNetClient instance. This checks that the certificate expiry/start dates are valid and that the certificate is actually signed by the CA that is loaded. * src/rpc/virnettlscontext.c: Add certificate sanity checks --- src/rpc/virnettlscontext.c | 144 ++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 140 insertions(+), 4 deletions(-) diff --git a/src/rpc/virnettlscontext.c b/src/rpc/virnettlscontext.c index 1120e1e..b778550 100644 --- a/src/rpc/virnettlscontext.c +++ b/src/rpc/virnettlscontext.c @@ -67,6 +67,7 @@ struct _virNetTLSSession { bool handshakeComplete; + bool isServer; char *hostname; gnutls_session_t session; virNetTLSSessionWriteFunc writeFunc; @@ -95,6 +96,131 @@ static void virNetTLSLog(int level, const char *str) { VIR_DEBUG("%d %s", level, str); } + +static gnutls_x509_crt_t virNetTLSContextSanityCheckCert(bool isServer, + const char *certFile) +{ + gnutls_datum_t data; + gnutls_x509_crt_t cert = NULL; + char *buf = NULL; + int ret = -1; + time_t now; + + if ((now = time(NULL)) == ((time_t)-1)) { + virReportSystemError(errno, "%s", + _("cannot get current time")); + goto cleanup; + } + + if (gnutls_x509_crt_init(&cert) < 0) { + virNetError(VIR_ERR_SYSTEM_ERROR, "%s", + _("Unable to initialize certificate")); + goto cleanup; + } + + if (virFileReadAll(certFile, (1<<16), &buf) < 0) + goto cleanup; + + data.data = (unsigned char *)buf; + data.size = strlen(buf); + + if (gnutls_x509_crt_import(cert, &data, GNUTLS_X509_FMT_PEM) < 0) { + virNetError(VIR_ERR_SYSTEM_ERROR, + _("Unable to import %s certificate %s"), + isServer ? "server" : "client", certFile); + goto cleanup; + } + + if (gnutls_x509_crt_get_expiration_time(cert) < now) { + virNetError(VIR_ERR_SYSTEM_ERROR, + _("The %s certificate %s has expired"), + isServer ? "server" : "client", certFile); + goto cleanup; + } + + if (gnutls_x509_crt_get_activation_time(cert) > now) { + virNetError(VIR_ERR_SYSTEM_ERROR, + _("The %s certificate %s is not yet active"), + isServer ? "server" : "client", certFile); + goto cleanup; + } + + ret = 0; + +cleanup: + if (ret != 0) { + gnutls_x509_crt_deinit(cert); + cert = NULL; + } + VIR_FREE(buf); + return cert; +} + + +static int virNetTLSContextSanityCheckCredentials(bool isServer, + const char *cacertFile, + const char *certFile) +{ + gnutls_x509_crt_t cert = NULL; + gnutls_x509_crt_t cacert = NULL; + int ret = -1; + unsigned int status; + + if (access(certFile, R_OK) == 0) { + if (!(cert = virNetTLSContextSanityCheckCert(isServer, certFile))) + goto cleanup; + } + if (access(cacertFile, R_OK) == 0) { + if (!(cacert = virNetTLSContextSanityCheckCert(isServer, cacertFile))) + goto cleanup; + } + + if (cert && cacert) { + if (gnutls_x509_crt_list_verify(&cert, 1, + &cacert, 1, + NULL, 0, + 0, &status) < 0) { + virNetError(VIR_ERR_SYSTEM_ERROR, + _("Unable to verify %s certificate against CA certificate"), + isServer ? "server": "client"); + goto cleanup; + } + + if (status != 0) { + const char *reason = _("Invalid certificate"); + + if (status & GNUTLS_CERT_INVALID) + reason = _("The certificate is not trusted."); + + if (status & GNUTLS_CERT_SIGNER_NOT_FOUND) + reason = _("The certificate hasn't got a known issuer."); + + if (status & GNUTLS_CERT_REVOKED) + reason = _("The certificate has been revoked."); + +#ifndef GNUTLS_1_0_COMPAT + if (status & GNUTLS_CERT_INSECURE_ALGORITHM) + reason = _("The certificate uses an insecure algorithm"); +#endif + + virNetError(VIR_ERR_SYSTEM_ERROR, + _("Our own certificate %s failed validation against %s: %s"), + certFile, cacertFile, reason); + goto cleanup; + } + } + + ret = 0; + +cleanup: + if (cert) + gnutls_x509_crt_deinit(cert); + if (cacert) + gnutls_x509_crt_deinit(cacert); + return ret; +} + + static int virNetTLSContextLoadCredentials(virNetTLSContextPtr ctxt, bool isServer, const char *cacert, @@ -217,6 +343,9 @@ static virNetTLSContextPtr virNetTLSContextNew(const char *cacert, goto error; } + if (virNetTLSContextSanityCheckCredentials(isServer, cacert, cert) < 0) + goto error; + if (virNetTLSContextLoadCredentials(ctxt, isServer, cacert, cacrl, cert, key) < 0) goto error; @@ -574,15 +703,20 @@ static int virNetTLSContextValidCertificate(virNetTLSContextPtr ctxt, } if (gnutls_x509_crt_get_expiration_time(cert) < now) { - virNetError(VIR_ERR_SYSTEM_ERROR, "%s", - _("The client certificate has expired")); + /* Warning is reversed from what you expect, since with + * this code it is the Server checking the client and + * vica-verca */ + virNetError(VIR_ERR_SYSTEM_ERROR, + _("The %s certificate has expired"), + sess->isServer ? "client" : "server"); gnutls_x509_crt_deinit(cert); goto authdeny; } if (gnutls_x509_crt_get_activation_time(cert) > now) { - virNetError(VIR_ERR_SYSTEM_ERROR, "%s", - _("The client certificate is not yet active")); + virNetError(VIR_ERR_SYSTEM_ERROR, + _("The %s certificate is not yet active"), + sess->isServer ? "client" : "server"); gnutls_x509_crt_deinit(cert); goto authdeny; } @@ -756,6 +890,8 @@ virNetTLSSessionPtr virNetTLSSessionNew(virNetTLSContextPtr ctxt, gnutls_transport_set_pull_function(sess->session, virNetTLSSessionPull); + sess->isServer = ctxt->isServer; + return sess; error: -- 1.7.4.4

3 2

[libvirt] [PATCH] Fix now dead cleanup of VMs on libvirtd restart
by Daniel P. Berrange 15 Jul '11

15 Jul '11

From: "Daniel P. Berrange" <berrange(a)redhat.com> When libvirtd restarts it will attempt to reconnect to existing LXC containers. If it loads a XML state file for the container the container will appear running. If we fail to read the PID file, or fail to connect to the LXC monitor, we should be killing off the guest, but if the VMs cgroup does not exist any more, cleanup will get skipped. Reading the PID file is also pointless since the PID is in the XML statefile In lxcReconnectVM we do not need to read the PID file. If part of the reconnect process fails we need to run the VM terminate code as a safety net. In lxcVMTerminate, if we can't obtain the VM cgroup, we know the process has died, but we must still run lxcVMCleanup to clear out the virDomainObjPtr live state * src/lxc/lxc_driver.c: Fix cleanup of dead VMs on restart --- src/lxc/lxc_driver.c | 60 +++++++++++++++++++++++++------------------------ 1 files changed, 31 insertions(+), 29 deletions(-) diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index c8d78d5..03360e5 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -1340,22 +1340,26 @@ static int lxcVmTerminate(lxc_driver_t *driver, return -1; } - if (virCgroupForDomain(driver->cgroup, vm->def->name, &group, 0) != 0) - return -1; - - rc = virCgroupKillPainfully(group); - if (rc < 0) { - virReportSystemError(-rc, "%s", - _("Failed to kill container PIDs")); - rc = -1; - goto cleanup; - } - if (rc == 1) { - lxcError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Some container PIDs refused to die")); - rc = -1; - goto cleanup; + if (virCgroupForDomain(driver->cgroup, vm->def->name, &group, 0) == 0) { + rc = virCgroupKillPainfully(group); + if (rc < 0) { + virReportSystemError(-rc, "%s", + _("Failed to kill container PIDs")); + rc = -1; + goto cleanup; + } + if (rc == 1) { + lxcError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Some container PIDs refused to die")); + rc = -1; + goto cleanup; + } + } else { + /* If cgroup doesn't exist, the VM pids must have already + * died and so we're just cleaning up stale state + */ } + lxcVmCleanup(driver, vm, reason); rc = 0; @@ -2172,32 +2176,24 @@ lxcReconnectVM(void *payload, const void *name ATTRIBUTE_UNUSED, void *opaque) lxcDomainObjPrivatePtr priv; virDomainObjLock(vm); + VIR_DEBUG("Reconnect %d %d %d\n", vm->def->id, vm->pid, vm->state.state); priv = vm->privateData; - if ((priv->monitor = lxcMonitorClient(driver, vm)) < 0) { - goto cleanup; - } - - /* Read pid from controller */ - if ((virFileReadPid(lxc_driver->stateDir, vm->def->name, &vm->pid)) != 0) { - VIR_FORCE_CLOSE(priv->monitor); - goto cleanup; - } if (vm->pid != 0) { vm->def->id = vm->pid; virDomainObjSetState(vm, VIR_DOMAIN_RUNNING, VIR_DOMAIN_RUNNING_UNKNOWN); + if ((priv->monitor = lxcMonitorClient(driver, vm)) < 0) + goto error; + if ((priv->monitorWatch = virEventAddHandle( priv->monitor, VIR_EVENT_HANDLE_ERROR | VIR_EVENT_HANDLE_HANGUP, lxcMonitorEvent, - vm, NULL)) < 0) { - lxcVmTerminate(driver, vm, VIR_DOMAIN_SHUTOFF_FAILED); - virDomainAuditStop(vm, "failed"); - goto cleanup; - } + vm, NULL)) < 0) + goto error; } else { vm->def->id = -1; VIR_FORCE_CLOSE(priv->monitor); @@ -2205,6 +2201,12 @@ lxcReconnectVM(void *payload, const void *name ATTRIBUTE_UNUSED, void *opaque) cleanup: virDomainObjUnlock(vm); + return; + +error: + lxcVmTerminate(driver, vm, VIR_DOMAIN_SHUTOFF_FAILED); + virDomainAuditStop(vm, "failed"); + goto cleanup; } -- 1.7.6

2 1

[libvirt] [PATCH] flags: fix domain_conf migration regression
by Eric Blake 15 Jul '11

15 Jul '11

Commit 461e0f1a broke migration, because there was a code path that tried to enable an internal flag while still going through the public function. Split the internal flag into a separate callback, and validate that flags do not overlap. * src/conf/domain_conf.c (virDomainDefFormat): Split... (virDomainDefFormatInternal): ...to separate the flag check. (virDomainObjFormat): Adjust caller. --- Two regression in one day; my track record is not good right now. I guess this goes to show I didn't test a migration :( src/conf/domain_conf.c | 28 +++++++++++++++++++++------- 1 files changed, 21 insertions(+), 7 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 788981f..8c3e44e 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -9615,8 +9615,18 @@ virDomainHostdevDefFormat(virBufferPtr buf, } -char *virDomainDefFormat(virDomainDefPtr def, - unsigned int flags) +#define DUMPXML_FLAGS \ + (VIR_DOMAIN_XML_SECURE | \ + VIR_DOMAIN_XML_INACTIVE | \ + VIR_DOMAIN_XML_UPDATE_CPU) + +verify((VIR_DOMAIN_XML_INTERNAL_STATUS & DUMPXML_FLAGS) == 0); + +/* This internal version can accept VIR_DOMAIN_XML_INTERNAL_STATUS, + * whereas the public version cannot. */ +static char * +virDomainDefFormatInternal(virDomainDefPtr def, + unsigned int flags) { virBuffer buf = VIR_BUFFER_INITIALIZER; unsigned char *uuid; @@ -9624,9 +9634,7 @@ char *virDomainDefFormat(virDomainDefPtr def, const char *type = NULL; int n, allones = 1; - virCheckFlags(VIR_DOMAIN_XML_SECURE | - VIR_DOMAIN_XML_INACTIVE | - VIR_DOMAIN_XML_UPDATE_CPU, NULL); + virCheckFlags(DUMPXML_FLAGS | VIR_DOMAIN_XML_INTERNAL_STATUS, NULL); if (!(type = virDomainVirtTypeToString(def->virtType))) { virDomainReportError(VIR_ERR_INTERNAL_ERROR, @@ -10055,6 +10063,13 @@ char *virDomainDefFormat(virDomainDefPtr def, return NULL; } +char * +virDomainDefFormat(virDomainDefPtr def, unsigned int flags) +{ + virCheckFlags(DUMPXML_FLAGS, NULL); + return virDomainDefFormatInternal(def, flags); +} + static char *virDomainObjFormat(virCapsPtr caps, virDomainObjPtr obj, @@ -10082,8 +10097,7 @@ static char *virDomainObjFormat(virCapsPtr caps, ((caps->privateDataXMLFormat)(&buf, obj->privateData)) < 0) goto error; - if (!(config_xml = virDomainDefFormat(obj->def, - flags))) + if (!(config_xml = virDomainDefFormatInternal(obj->def, flags))) goto error; virBufferAdd(&buf, config_xml, strlen(config_xml)); -- 1.7.4.4

1 1

[libvirt] [PATCH 1/1] Repoint main page links to libvirt driver pages
by Dave Allan 15 Jul '11

15 Jul '11

From: David Allan <dallan(a)redhat.com> The "libvirt supports:" section on the main page of libvirt.org contains a list of hypervisors with links that point to the sites of the underlying virt technologies. The entry for KVM points to http://www.linux-kvm.org/, for example. People coming to libvirt.org for the first time are likely to know about those sites, and they're probably interested in how libvirt manages those technolgies. This patch points those links to the libvirt driver pages instead. It also consolidates KVM and QEMU as there is only one libvirt driver page for them. Finally, it adds a line about networking support. Dave --- docs/index.html.in | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/docs/index.html.in b/docs/index.html.in index 64eb84d..536e354 100644 --- a/docs/index.html.in +++ b/docs/index.html.in @@ -35,32 +35,32 @@ <ul> <li> - The <a href="http://www.cl.cam.ac.uk/Research/SRG/netos/xen/index.html">Xen</a> hypervisor - on Linux and Solaris hosts. + The <a href="http://libvirt.org/drvqemu.html">KVM/QEMU</a> Linux hypervisor </li> <li> - The <a href="http://wiki.qemu.org/Index.html">QEMU</a> emulator + The <a href="http://libvirt.org/drvxen.html">Xen</a> hypervisor + on Linux and Solaris hosts. </li> <li> - The <a href="http://www.linux-kvm.org/">KVM</a> Linux hypervisor + The <a href="http://libvirt.org/drvlxc.html">LXC</a> Linux container system </li> <li> - The <a href="http://lxc.sourceforge.net/">LXC</a> Linux container system + The <a href="http://libvirt.org/drvopenvz.html">OpenVZ</a> Linux container system </li> <li> - The <a href="http://openvz.org/">OpenVZ</a> Linux container system + The <a href="http://libvirt.org/drvuml.html">User Mode Linux</a> paravirtualized kernel </li> <li> - The <a href="http://user-mode-linux.sourceforge.net/">User Mode Linux</a> paravirtualized kernel + The <a href="http://libvirt.org/drvvbox.html">VirtualBox</a> hypervisor </li> <li> - The <a href="http://www.virtualbox.org/">VirtualBox</a> hypervisor + The <a href="http://libvirt.org/drvesx.html">VMware ESX and GSX</a> hypervisors </li> <li> - The <a href="http://www.vmware.com/">VMware ESX and GSX</a> hypervisors + The <a href="http://libvirt.org/drvvmware.html">VMware Workstation and Player</a> hypervisors </li> <li> - The <a href="http://www.vmware.com/">VMware Workstation and Player</a> hypervisors + Virtual networks using bridging, NAT, VEPA and VN-LINK. </li> <li> Storage on IDE/SCSI/USB disks, FibreChannel, LVM, iSCSI, NFS and filesystems -- 1.7.4.4

2 3

[libvirt] [PATCH v3 1/2] vshCommandOptString returns -1 if option is empty and not VSH_OFLAG_EMPTY_OK
by Hu Tao 15 Jul '11

15 Jul '11

Pointed out by Eric. Thanks. --- tools/virsh.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index b7cea58..b43af70 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -12375,8 +12375,13 @@ vshCommandOptString(const vshCmd *cmd, const char *name, const char **value) vshError(NULL, _("Missing required option '%s'"), name); ret = -1; } else { - /* Treat "--option ''" as if option had not been specified. */ - ret = 0; + /* --option '' */ + if (arg->def->flag & VSH_OFLAG_EMPTY_OK) { + ret = 0; + } else { + vshError(NULL, _("option '%s' is empty"), name); + ret = -1; + } } } -- 1.7.5.1

2 4

[libvirt] [PATCH 1/1] Fix error code for storage operations
by Dave Allan 15 Jul '11

15 Jul '11

Many volume operations will fail if the volume in question is being allocated. These operations were returning VIR_ERR_INTERNAL_ERROR when they should be returning VIR_ERR_OPERATION_INVALID. --- src/storage/storage_driver.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c index 4f35be0..997b876 100644 --- a/src/storage/storage_driver.c +++ b/src/storage/storage_driver.c @@ -1486,7 +1486,7 @@ storageVolumeCreateXMLFrom(virStoragePoolPtr obj, } if (origvol->building) { - virStorageReportError(VIR_ERR_INTERNAL_ERROR, + virStorageReportError(VIR_ERR_OPERATION_INVALID, _("volume '%s' is still being allocated."), origvol->name); goto cleanup; @@ -1667,7 +1667,7 @@ storageVolumeUpload(virStorageVolPtr obj, } if (vol->building) { - virStorageReportError(VIR_ERR_INTERNAL_ERROR, + virStorageReportError(VIR_ERR_OPERATION_INVALID, _("volume '%s' is still being allocated."), vol->name); goto out; @@ -1876,7 +1876,7 @@ storageVolumeWipe(virStorageVolPtr obj, } if (vol->building) { - virStorageReportError(VIR_ERR_INTERNAL_ERROR, + virStorageReportError(VIR_ERR_OPERATION_INVALID, _("volume '%s' is still being allocated."), vol->name); goto out; @@ -1936,7 +1936,7 @@ storageVolumeDelete(virStorageVolPtr obj, } if (vol->building) { - virStorageReportError(VIR_ERR_INTERNAL_ERROR, + virStorageReportError(VIR_ERR_OPERATION_INVALID, _("volume '%s' is still being allocated."), vol->name); goto cleanup; -- 1.7.4.4

3 3

[libvirt] [PATCH 0/3] RFC: setvcpus: support --current option
by Taku Izumi 15 Jul '11

15 Jul '11

Hi all, This patchset adds the --current option to "virsh setvcpus" command. Currently "virsh setvcpus" command supports "--live" and "--config" , but "--current" option. >From view of consistency, it's reasonable to support "--current" option too. *[PATCH 1/3] setvcpus: extend virDomainSetVcpusFlags API to support current flag *[PATCH 2/3] setvcpus: extend qemuDomainSetVcpusFlags() to support current flag *[PATCH 3/3] setvcpus: add "--current" option to "virsh setvcpus" Best regards, Taku Izumi <izumi.taku(a)jp.fujitsu.com>

2 7

[libvirt] [PATCH]: Add another portion virStream bindings (C# bindings, libvirt-csharp.git)
by Anthony Fox 15 Jul '11

15 Jul '11

2 1

[libvirt] [PATCH 0/8] Introduce new API virDomainUndefineFlags
by Osier Yang 15 Jul '11

15 Jul '11

Hi, Per discussion on https://www.redhat.com/archives/libvir-list/2011-July/msg00556.html, This patch series introduce new API virDomainUndefineFlags, which only support flag VIR_DOMAIN_UNDEFINE_MANAGED_STATE now, might introduce more flags in future. If the flag is specified, the domain managed state file will be removed along with domain undefine process once it exists, the entire domain undefine process will fail if it fails on removing the managed state file. [PATCH 1/8] is small fix on rpc generator scripts, not related with the new API. [PATCH 1/8] Small fixes on rpc generator scripts [PATCH 2/8] UndefineFlags: Define the public API [PATCH 3/8] UndefineFlags: Implement the public API [PATCH 4/8] UndefineFlags: Define the internal API [PATCH 5/8] UndefineFlags: Implement qemu driver handling [PATCH 6/8] UndefineFlags: Implement libxl driver handling [PATCH 7/8] UndefineFlags: Implement the remote protocol [PATCH 8/8] UndefineFlags: Extend virsh undefine to support new flag Regards Osier

4 26

[libvirt] [PATCH] Fix reporting of cert validation failures
by Daniel P. Berrange 15 Jul '11

15 Jul '11

If the server succesfully validates the client cert, it will send back a single byte, under TLS. If it fails, it will close the connection. In this case, we were just reporting the standard I/O error. The original RPC code had a special case hack for the GNUTLS_E_UNEXPECTED_PACKET_LENGTH error code to make us report a more useful error message * src/rpc/virnetclient.c: Return ENOMSG if we get GNUTLS_E_UNEXPECTED_PACKET_LENGTH * src/rpc/virnettlscontext.c: Report cert failure if we see ENOMSG --- src/rpc/virnetclient.c | 2 +- src/rpc/virnettlscontext.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/src/rpc/virnetclient.c b/src/rpc/virnetclient.c index b9f0fc8..d3965c6 100644 --- a/src/rpc/virnetclient.c +++ b/src/rpc/virnetclient.c @@ -348,7 +348,7 @@ int virNetClientSetTLSSession(virNetClientPtr client, ignore_value(pthread_sigmask(SIG_BLOCK, &oldmask, NULL)); len = virNetTLSSessionRead(client->tls, buf, 1); - if (len < 0) { + if (len < 0 && errno != ENOMSG) { virReportSystemError(errno, "%s", _("Unable to read TLS confirmation")); goto error; diff --git a/src/rpc/virnettlscontext.c b/src/rpc/virnettlscontext.c index b778550..4963ab7 100644 --- a/src/rpc/virnettlscontext.c +++ b/src/rpc/virnettlscontext.c @@ -932,6 +932,9 @@ ssize_t virNetTLSSessionWrite(virNetTLSSessionPtr sess, case GNUTLS_E_INTERRUPTED: errno = EINTR; break; + case GNUTLS_E_UNEXPECTED_PACKET_LENGTH: + errno = ENOMSG; + break; default: errno = EIO; break; -- 1.7.4.4

2 1

[libvirt] [PATCH] Unregister event callback if a fatal error occurs during dispatch
by Daniel P. Berrange 15 Jul '11

15 Jul '11

If we get an I/O error in the async event callback for an RPC client, we might not have consumed all pending data off the wire. This could result in the callback being immediately invoked again. At which point the same I/O might occur. And we're invoked again. And again...And again... Unregistering the async event callback if an error occurs is a good safety net. The real error will be seen when the next RPC method is invoked * src/rpc/virnetclient.c: Unregister event callback on error --- src/rpc/virnetclient.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/rpc/virnetclient.c b/src/rpc/virnetclient.c index 9fb8fd4..58d4274 100644 --- a/src/rpc/virnetclient.c +++ b/src/rpc/virnetclient.c @@ -1124,8 +1124,10 @@ void virNetClientIncomingEvent(virNetSocketPtr sock, goto done; } - if (virNetClientIOHandleInput(client) < 0) - VIR_DEBUG("Something went wrong during async message processing"); + if (virNetClientIOHandleInput(client) < 0) { + VIR_WARN("Something went wrong during async message processing"); + virNetSocketRemoveIOCallback(sock); + } done: virNetClientUnlock(client); -- 1.7.4.4

2 1

[libvirt] [PATCH] Fix error message for missing TLS write function
by Daniel P. Berrange 15 Jul '11

15 Jul '11

* src/rpc/virnettlscontext.c: s/read/write/ --- src/rpc/virnettlscontext.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/rpc/virnettlscontext.c b/src/rpc/virnettlscontext.c index 4963ab7..6a06565 100644 --- a/src/rpc/virnettlscontext.c +++ b/src/rpc/virnettlscontext.c @@ -803,7 +803,7 @@ virNetTLSSessionPush(void *opaque, const void *buf, size_t len) { virNetTLSSessionPtr sess = opaque; if (!sess->writeFunc) { - VIR_WARN("TLS session push with missing read function"); + VIR_WARN("TLS session push with missing write function"); errno = EIO; return -1; }; -- 1.7.4.4

2 1

[libvirt] ANNOUNCE: libvirt Perl bindings Sys::Virt 0.9.3 release
by Daniel P. Berrange 15 Jul '11

15 Jul '11

I am happy to announce a new release[1] of the libvirt Perl bindings, Sys::Virt 0.9.3 is available for download: http://search.cpan.org/CPAN/authors/id/D/DA/DANBERR/Sys-Virt-0.9.3.tar.gz Changes in this release - Add all new APIs in libvirt 0.9.3 - Requires libvirt >= 0.9.3 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. I am now caught up to main libvirt releases and intended to track each new release more promptly in the future. 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] [PATCH] util: fix a typo error on virStrncpy
by ajia＠redhat.com 15 Jul '11

15 Jul '11

* src/util/util.c: fix a typo error on virStrncpy. --- src/util/util.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/util/util.c b/src/util/util.c index 0ca81df..1080823 100644 --- a/src/util/util.c +++ b/src/util/util.c @@ -1754,7 +1754,7 @@ virStrncpy(char *dest, const char *src, size_t n, size_t destbytes) return NULL; ret = strncpy(dest, src, n); - /* strncpy NULL terminates iff the last character is \0. Therefore + /* strncpy NULL terminates if the last character is \0. Therefore * force the last byte to be \0 */ dest[n] = '\0'; -- 1.7.1

3 2

[libvirt] EMOTIVE Cloud based in Libvirt
by Alex Vaqué Brull 15 Jul '11

15 Jul '11

Hi, We can link in http://libvirt.org/apps.html EMOTIVE Cloud ( www.emotivecloud.net ) ? It is an interesting middleware based in Libvirt. Thank you

2 8

[libvirt] [PATCH] build: fix VPATH build of todo
by Eric Blake 15 Jul '11

15 Jul '11

Without this patch, the make rule in a VPATH build was trying to invoke ../../docs/../../docs/todo.pl, which didn't exist. * docs/Makefile.am (todo.html.in): Using $< already implies $(srcdir) in GNU make VPATH situations. --- Pushing under the trivial rule. docs/Makefile.am | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/docs/Makefile.am b/docs/Makefile.am index 050ebe1..7ff94a0 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -104,7 +104,7 @@ web: $(dot_html) html/index.html devhelp/index.html todo.html.in: todo.pl if [ -f todo.cfg ]; then \ echo "Generating $@"; \ - $(PERL) $(srcdir)/$< > $@ \ + $(PERL) $< > $@ \ || { rm $@ && exit 1; }; \ else \ echo "Stubbing $@"; \ -- 1.7.4.4

2 1