- Devel - libvirt List Archives

[libvirt] directory storage pools reported available space
by Ryan Harper 06 Dec '10

06 Dec '10

We recently had an issue with not being able to allocate the full capacity of a directory based storage pool. The reported value via pool-info was larger than what was available to the image creator. Looking at the storage code, in virStorageBackendFileSystemRefresh() we're using statvfs, and reporting back pool->def->available = ((unsigned long long)sb.f_bfree * (unsigned long long)sb.f_bsize); Which is the amount of blocks available, including any root reservation if present on the filesystem. This does't line up with df output , which at least on RHEL5 and 6 systems reports the available space from f_bavail, which excludes and reserved space. Is it reasonable to have the available value line up with output from df and not report reserved space? -- Ryan Harper Software Engineer; Linux Technology Center IBM Corp., Austin, Tx ryanh(a)us.ibm.com

4 5

[libvirt] [RFC] new preferences requirement
by Osier Yang 06 Dec '10

06 Dec '10

Hi, all We have some new requirements of preferences, I listed which of them I known, and think is useful as follows: 1) for the path of x509 certificate and keys of client The path of x509 certificate and keys of client is hard coded in remote driver. e.g. /* Defaults for PKI directory. */ # define LIBVIRT_PKI_DIR SYSCONFDIR "/pki" # define LIBVIRT_CACERT LIBVIRT_PKI_DIR "/CA/cacert.pem" # define LIBVIRT_CLIENTKEY LIBVIRT_PKI_DIR "/libvirt/private /clientkey.pem" # define LIBVIRT_CLIENTCERT LIBVIRT_PKI_DIR "/libvirt/clientcert.pem" 2) for default default driver and subdriver for disk image Another requirement of new preference is default driver and subdriver for disk images, currently we use "phy" for "driver" in virsh, and "raw" for "subdriver" in qemu driver by default if user doesn't specify them, it causes bugs, though we could say to user "you should use options --driver and --subdriver", but these two options are optional. IMHO, the best solution for those bugs is to provide new preferences. 3) for default NIC and storage type "Chris Phillips" raised up the requirement not long ago: http://www.redhat.com/archives/libvirt-users/2010-November/msg00033.html ==================== Should we add these new preferences(if they are really neccessary) in qemu.conf? or create new config file, e.g. The approch Justin raised up an approch before: http://www.redhat.com/archives/libvir-list/2010-November/msg00651.html Though for Justin's approch, IMHO we'd better also to provide a default config file, e.g. "/etc/libvirt/client.conf". Any feedback is welcomed, thanks - Osier

4 8

[libvirt] Looking for Hypervisor Vulerability Example
by Shi Jin 06 Dec '10

06 Dec '10

Hi there, I am researching on virtualization security and particularly on sVirt. >From this sVirt presentation[1] and this RHEL-6 documentation on sVirt [2], I read: If there is a security flaw in the hypervisor that can be exploited by a guest instance, this guest may be able to not only attack the host, but also other guests running on that host. This is not theoretical; attacks already exist on hypervisors. These attacks can extend beyond the guest instance and could expose other guests to attack. I am very interested to know about the exact attacks: which version of hypervisor on which OS, how was the exploit used and how it affected the systems. I want to be able to reproduce one of the attacks in our lab so that I can demonstrate to people on the security issues and then how sVirt could be used to actually prevent to attacks on hosting system and other VMs. I believe a real demonstration is better than a million words. I appreciate your help. Shi [1]:http://namei.org/presentations/svirt-lca-2009.pdf [2]:http://docs.redhat.com/docs/en-US/Red_Hat_Enterprise_Linux/6/html/Virtua… -- Shi Jin, PhD

2 3

[libvirt] Release of libvirt 0.8.6
by Daniel Veillard 06 Dec '10

06 Dec '10

As indicated 10 days ago, today was time for a release, I didn't had much time so I simply generated a release from libvirt git without much testing. Hopefully this will be okay ! Release is available as usual at ftp://libvirt.org/libvirt/ There is actually a number of significant features rolled in this release, along with the usual fixes and improvements: Features: - new API virDomainIsUpdated (Osier Yang) - Add support for iSCSI target auto-discovery (Daniel P. Berrange) - QED: Basic support for QED images (Adam Litke) - Introduce a virDomainOpenConsole API (Daniel P. Berrange) - Support for SPICE graphics (Daniel P. Berrange) - Add a sysinfo and SMBIOS support (Daniel Veillard) - Implement virsh qemu-monitor-command. (Chris Lalancette) Documentation: - updated c# bindings with arnauds latest changes (Justin Clift) - Fix spelling of virBufferVSprintf (Jiri Denemark) - Fix broken XML entity for '>' (Philipp Hahn) - removed outdated reference to virt-mem (Justin Clift) - Add doc for missed options of migrate (Osier Yang) - add doc for missed parameters of attach-disk (Osier Yang) - update virsh manual (Osier Yang) - updated virsh command reference with libvirt.org links (Justin Clift) - Generate HACKING from docs/hacking.html.in (Matthias Bolte) - Prepare hacking.html.in to generate HACKING from it (Matthias Bolte) - updated csharp pages with latest info (Justin Clift) - trivial typo fix (Justin Clift) - added virsh command reference page. (Justin Clift) - rpm: Fix summary wording (Cole Robinson) - Augment bug reporting documentation (Daniel Veillard) - virsh: fix incorrect help text mentioning non-existent network 'id' (Justin Clift) - Fix off-by-1 in todo page generator (Daniel P. Berrange) - Fix comment for <video> tag in domain RNG schema (Daniel P. Berrange) - fix typo (Eric Blake) Portability: - remote: Fix TLS transport on Windows (Matthias Bolte) - Rename 'remove' param to 'toremove' to avoid clash with stdio.h (Daniel P. Berrange) - virt-aa-helper: Fix several compile errors (Matthias Bolte) - maint: improve i18n on non-Linux (Eric Blake) - nwfilter: use /bin/sh rather than requiring bash (Eric Blake) - Use python discovered through env instead of hardcoding a path (Matthias Bolte) - esx: Avoid warnings about breaking strict-aliasing rules on FreeBSD (Matthias Bolte) - Make sure struct sockaddr_in is defined on FreeBSD (Matthias Bolte) - configure: Disable FS storage driver if mntent.h is not available (Matthias Bolte) - daemon: Include stdlib.h in dispatch.c (Matthias Bolte) - xen: work with xen 4.0.1 headers (Eric Blake) - Fix build with polkit 0 (Jim Fehlig) - xen: work with ia64 MAX_VIRT_CPUS of 64 (Eric Blake) - build: cleanup declaration of xen tests. (Diego Elio Pettenò) - qemu: check compression program availability of virsh save and dump (KAMEZAWA Hiroyuki) Bug Fixes: - correct the arguments of migrate_speed (Wen Congyang) - Fix memory leaks in audit & VirtualBox code (Daniel P. Berrange) - Fix host CPU counting on unusual NUMA topologies (Jiri Denemark) - security, storage: plug memory leaks for security_context_t (Eric Blake) - network: plug memory leak (Eric Blake) - qemu: plug memory leak (Eric Blake) - Always close drivers when a virConnectPtr is released (Matthias Bolte) - libvirtd: fix bug when shrinking number of clients (Eric Blake) - Fix 32-bit int truncation in QED header check (Daniel P. Berrange) - Fix error handling in virsh when listing storage volumes (Daniel P. Berrange) - Fix parsing of port attribute in storage XML configuration (Daniel P. Berrange) - Don't catch SIGCHLD in libvirtd (Daniel P. Berrange) - Ensure logfile isn't truncated by shutdown message. (Daniel P. Berrange) - xend: Escape reserved sexpr characters (Cole Robinson) - xend: urlencode: Properly escape '&' (Cole Robinson) - conf: Fix parsing python style triple quotes (Cole Robinson) - nwfilter: re-order lock grabbed by IP addr. learn thread (Stefan Berger) - virExec: fix bug in setting up child stderr/out with /dev/null (Daniel P. Berrange) - Fix a failure to restore SELinux label for character devices (Daniel Veillard) - nwfilter: also purge ip(6)tables rules before detecting IP address (Stefan Berger) - Fix ipv4-addr definition in interface.rng (Laine Stump) - remote_driver.c: fix non-literal format strings w/o args (Laine Stump) - ignore SELinuxSetFilecon error in SELinuxSetSecurityFileLabel if on nfs (Laine Stump) - Fix reference counting bug in virsh console (Daniel P. Berrange) - Fix busy-wait loop on closed file descriptor (Daniel P. Berrange) - Fix LXC container console device setup (Daniel P. Berrange) - rpm: fix /var/lib/libvirt permissions (Eric Blake) - xencapstest: Don't fail when Xen is installed (Matthias Bolte) - virsh: fix non-literal string format (Laine Stump) - Fix syntax-check error in domain.rng (Matthias Bolte) - qemu: Fix non-literal format string (Jiri Denemark) - macvtap: libvirtd forgot macvtap dev name when restarted (Stefan Berger) - tests: fix daemon-conf testing failure (Osier Yang) - Fix virPipeReadUntilEOF on more than 1024 bytes of data (Daniel Veillard) - Misc error handling fixes in text mode monitor commands (Daniel P. Berrange) - Ignore open failures when relabelling disk images (Daniel P. Berrange) - Treat failure to relabel stdin_path as non-fatal on NFS (Daniel P. Berrange) - qemu: add the USB devices to the cgroup whitelist (Diego Elio Pettenò) Improvements: - Log client errors in libvirtd at debug priority - maint: prohibit most uses of xmlGetProp (Eric Blake) - maint: ensure syntax check exceptions are distributed (Eric Blake) - Implementations of virDomainIsUpdated for drivers except qemu (Osier Yang) - implement callback function for qemu driver (Osier Yang) - implement the remote protocol (Osier Yang) - implement public API virDomainIsUpdated (Osier Yang) - define internal driver API (Osier Yang) - tests: Fix dispatching internal error reports (Cole Robinson) - Improve SCSI volume name generation (Daniel P. Berrange) - Fix error codes returned when a storage pool is inactive (Daniel P. Berrange) - Check whether pools are already active upon libvirtd startup (Daniel P. Berrange) - Allow iSCSI IQN to be set with find-storage-pool-sources-as command (Daniel P. Berrange) - Switch the virsh XML generation to use virBuffer instead of virAsprintf (Daniel P. Berrange) - Stop iSCSI targets automatically logging back in after logout (Daniel P. Berrange) - Refactor iSCSI driver code to facilitate future changes (Daniel P. Berrange) - Ensure virExec preserves logging environment (Daniel P. Berrange) - Include a thread identifier in log messages (Daniel P. Berrange) - qemu: setvcpus: Save config changes to disk (Cole Robinson) - qemu: setvcpus: Simplify altering the persistent config (Cole Robinson) - qemu: setvcpus: Fix maxvcpus check (Cole Robinson) - conf: domain: Improve vcpus validation reporting (Cole Robinson) - Make state driver device hotplug/update actually transient (Cole Robinson) - domain_conf: Add virDomainObjSetDefTransient (Cole Robinson) - buf: Simplify virBufferEscapeString (Cole Robinson) - conf: Convert ParseString to use STRPREFIX (Cole Robinson) - schemas: domain: Add more valid file path chars (Cole Robinson) - qed: Minor updates to QED support patches (Adam Litke) - Support for probing qed image metadata (Adam Litke) - storage_file: Add a new flag to mark backing files that are safe to probe (Adam Litke) - Allow probing of image formats without version information (Adam Litke) - maint: tighten strncmp syntax check (Eric Blake) - capabilities, cpu: use new array API (Eric Blake) - memory: make it easier to avoid quadratic scaling of arrays (Eric Blake) - memory: make it safer to expand arrays (Eric Blake) - build: fix autobuild failures on gcov upgrade (Eric Blake) - virt-aa-helper: translate error messages (Eric Blake) - maint: update to latest gnulib (Eric Blake) - deprecate fclose() and introduce VIR_{FORCE_}FCLOSE() (Stefan Berger) - qemu: record timestamp in qemu domain log (Osier Yang) - virsh: add net-info command (Osier Yang) - interface.rng: Make miimon and arpmon optional for bond interfaces (Laine Stump) - macvtap: convert send / recv function to use libnl (Stefan Berger) - configure: Remove bashism and replace 'test ==' with 'test =' (Matthias Bolte) - virsh: Fix compile error in VPATH build (Matthias Bolte) - qemu: Remove unnecessary quoting from the process name argument (John Morrissey) - phyp: Don't do a flags check in the storage driver (Matthias Bolte) - qemu: Add qemu-system-s390x to the emulators list (Matthias Bolte) - macvtap: convert nl msg construction to use libnl (Stefan Berger) - Do a better job of validating IP and MAC addresses in network.rng (Laine Stump) - virt-aa-helper should require <uuid> in XML (Jamie Strandboge) - esx: Support SMBIOS host mode (Matthias Bolte) - Wire up virDomainOpenConsole for LXC, Xen and UML (Daniel P. Berrange) - Re-write virsh console to use streams (Daniel P. Berrange) - Convert daemon/events.c to use virMutex and virThread (Daniel P. Berrange) - Introduce portability APIs for creating threads (Daniel P. Berrange) - Support virDomainOpenConsole with QEMU (Daniel P. Berrange) - Add a generic internal API for handling any FD based stream (Daniel P. Berrange) - Lower logging level in remote driver streams (Daniel P. Berrange) - Remote driver client and server for virDomainOpenConsole (Daniel P. Berrange) - Support callbacks on virStream APIs in remote driver client (Daniel P. Berrange) - virsh: supply long option for -V (Eric Blake) - qemu: Add flag to force a CDROM eject (Cole Robinson) - Allow non-file disk backingStores (Adam Litke) - bye to close(), welcome to VIR_(FORCE_)CLOSE() (Stefan Berger) - esx: Add support for memtune/min_guarantee (Matthias Bolte) - schema: Move timer element inside clock (Jiri Denemark) - Misc test case fixes for SPICE (Daniel P. Berrange) - virsh: Add .xml suffix to tmp files used in *edit commands (Jiri Denemark) - Support SPICE channel security options (Daniel P. Berrange) - Support multiple QXL video cards (Daniel P. Berrange) - Define XML syntax for password expiry (Daniel P. Berrange) - Add SPICE support for QEMU driver configuration file (Daniel P. Berrange) - Support automatic port number allocation for SPICE (Daniel P. Berrange) - Implement QEMU/KVM QXL video card support in QEMU driver (Daniel P. Berrange) - Add a <graphics> type for SPICE protocol (Daniel P. Berrange) - Add a QXL graphics card type to domain XML schema (Daniel P. Berrange) - Show compiled in options in virsh -V (Daniel Veillard) - lxc: Exit on first error in lxcDomainGetMemoryParameters (Matthias Bolte) - Allow virDomainGetMemoryParameters on read-only connections (Matthias Bolte) - Add a new test for sysinfo and smbios handling (Daniel Veillard) - Add sysinfo/smbios support to the QEmu driver (Daniel Veillard) - Read the host sysinfo for the QEmu driver (Daniel Veillard) - Add smbios element to schema and configuration to HVM os (Daniel Veillard) - Sysinfo parsing and saving to/from configuration files (Daniel Veillard) - Sysinfo extension to relax-ng schemas (Daniel Veillard) - Change calling conventions in remote driver client internals (Daniel P. Berrange) - util: Add helper function to build timestamp string (Osier Yang) - misc: encode the Emacs suggstions from HACKING into a .dir-locals.el file (Diego Elio Pettenò) - add compression support for "virsh dump" (KAMEZAWA Hiroyuki) - qemu_driver: add virCgroupMounted (Lai Jiangshan) Cleanups: - tests: Fix detection of expected errors (Jiri Denemark) - Remove bogus check for Xen in example program (Daniel P. Berrange) - build: enforce files.h usage (Eric Blake) - maint: sort exports (Eric Blake) - Remove bogus port handling code in virsh (Daniel P. Berrange) - Remove trailing ':' from timestamp (Daniel P. Berrange) - Log all errors at level INFO to stop polluting syslog (Daniel P. Berrange) - daemon: use safer memory growth macros (Eric Blake) - maint: avoid remaining sprintf uses (Eric Blake) - maint: use gnulib configmake rather than open-coding things (Eric Blake) - replace last instances of close() (Stefan Berger) - daemon: fix indention problem in daemon/libvirt.c (Osier Yang) - qemu: fix typos in qemu_monitor_text.c (Osier Yang) - re-indent network.rng following structural change (Laine Stump) - Put network.rng contents inside <grammar> for uniformity with other RNGs (Laine Stump) - maint: Commit .gitignore sorting done by bootstrap (Jiri Denemark) - xen-proxy: Remove it entirely and use libvirtd instead (Matthias Bolte) - qemu: Remove redundant slash in save directory path (Matthias Bolte) - virterror: supply missing spaces (Eric Blake) - Fix several warnings about a non-literal format string (Jiri Denemark) - build: avoid compiler warning in xen code (Eric Blake) Thanks everybody for their input, ideas, patches or documentation used in this release ! Daniel -- Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ daniel(a)veillard.com | Rpmfind RPM search engine http://rpmfind.net/ http://veillard.com/ | virtualization library http://libvirt.org/

7 15

[libvirt] [PATCH] tests: Don't ignore return value of getcwd()
by Jiri Denemark 06 Dec '10

06 Dec '10

--- tests/commandhelper.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/tests/commandhelper.c b/tests/commandhelper.c index 2ee9153..5b2f301 100644 --- a/tests/commandhelper.c +++ b/tests/commandhelper.c @@ -97,7 +97,8 @@ int main(int argc, char **argv) { fprintf(log, "DAEMON:%s\n", getppid() == 1 ? "yes" : "no"); char cwd[1024]; - getcwd(cwd, sizeof(cwd)); + if (!getcwd(cwd, sizeof(cwd))) + return EXIT_FAILURE; if (strlen(cwd) > strlen("/commanddata") && STREQ(cwd + strlen(cwd) - strlen("/commanddata"), "/commanddata")) strcpy(cwd, ".../commanddata"); -- 1.7.3.2

2 2

[libvirt] [PATCH] build: Fix internal docs generation in VPATH builds
by Jiri Denemark 06 Dec '10

06 Dec '10

--- docs/Makefile.am | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/docs/Makefile.am b/docs/Makefile.am index ce0b391..43c54f6 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -117,6 +117,7 @@ todo: internals/%.html.tmp: internals/%.html.in subsite.xsl page.xsl sitemap.html.in @if [ -x $(XSLTPROC) ] ; then \ echo "Generating $@"; \ + $(MKDIR_P) "$(builddir)/internals"; \ name=`echo $@ | sed -e 's/.tmp//'`; \ $(XSLTPROC) --stringparam pagename $$name --nonet --html \ $(top_srcdir)/docs/subsite.xsl $< > $@ \ -- 1.7.3.2

2 2

[libvirt] [PATCH] Change return value of VIR_DRV_SUPPORTS_FEATURE to bool
by Jiri Denemark 06 Dec '10

06 Dec '10

virDrvSupportsFeature API is allowed to return -1 on error while all but one uses of VIR_DRV_SUPPORTS_FEATURE only check for (non)zero return value. Let's make this macro return zero on error, which is what everyone expects anyway. --- src/driver.h | 8 ++++---- src/libvirt.c | 5 ++++- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/driver.h b/src/driver.h index b770e5e..e797a75 100644 --- a/src/driver.h +++ b/src/driver.h @@ -52,12 +52,12 @@ typedef enum { * Note that you must check for errors. * * Returns: - * >= 1 Feature is supported. + * != 0 Feature is supported. * 0 Feature is not supported. - * -1 Error. */ -# define VIR_DRV_SUPPORTS_FEATURE(drv,conn,feature) \ - ((drv)->supports_feature ? (drv)->supports_feature((conn),(feature)) : 0) +# define VIR_DRV_SUPPORTS_FEATURE(drv,conn,feature) \ + ((drv)->supports_feature ? \ + (drv)->supports_feature((conn), (feature)) > 0 : 0) typedef virDrvOpenStatus (*virDrvOpen) (virConnectPtr conn, diff --git a/src/libvirt.c b/src/libvirt.c index b4951c2..4188b45 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -1605,7 +1605,10 @@ virDrvSupportsFeature (virConnectPtr conn, int feature) return (-1); } - ret = VIR_DRV_SUPPORTS_FEATURE (conn->driver, conn, feature); + if (!conn->driver->supports_feature) + ret = 0; + else + ret = conn->driver->supports_feature(conn, feature); if (ret < 0) virDispatchError(conn); -- 1.7.3.2

2 4

[libvirt] [Patch v2] Add VMware Workstation and Player driver
by Jean-Baptiste Rouault 05 Dec '10

05 Dec '10

Many changes since v2 based on Matthias review (http://www.redhat.com/archives/libvir-list/2010-November/msg00799.html) popen() calls will be removed when the new virCommand API is available.

2 2

[libvirt] make syntax-check -> make: *** [sc_check_author_list] Error 1 on libvirt-0.8.5
by Kenneth Nagin 05 Dec '10

05 Dec '10

I am receiving syntax error when compiling libvirt-0.8.5. However, make without syntax-check completes successfully. These are details of the failure. :~/LIBVIRT/libvirt-0.8.5$ make syntax-check GFDL_version 1.74 GFDL_version TAB_in_indentation 0.04 TAB_in_indentation Wundef_boolean 0.03 Wundef_boolean avoid_ctype_macros 0.19 avoid_ctype_macros avoid_if_before_free 9.42 avoid_if_before_free avoid_write 0.04 avoid_write cast_of_argument_to_free 0.17 cast_of_argument_to_free cast_of_x_alloc_return_value 0.16 cast_of_x_alloc_return_value changelog 0.02 changelog check_author_list %aE maint.mk: committer(s) not listed in AUTHORS make: *** [sc_check_author_list] Error 1 Best Regards, Kenneth Nagin

3 6

[libvirt] [PATCH] qemu: Don't try to set input FD to -1
by Matthias Bolte 05 Dec '10

05 Dec '10

--- src/qemu/qemu_driver.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 54e9dcb..1b86b5e 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -4091,7 +4091,10 @@ static int qemudStartVMDaemon(virConnectPtr conn, VIR_WARN("Executing %s", vm->def->emulator); virCommandSetPreExecHook(cmd, qemudSecurityHook, &hookData); - virCommandSetInputFD(cmd, stdin_fd); + + if (stdin_fd != -1) + virCommandSetInputFD(cmd, stdin_fd); + virCommandSetOutputFD(cmd, &logfile); virCommandSetErrorFD(cmd, &logfile); virCommandNonblockingFDs(cmd); -- 1.7.0.4

2 2

[libvirt] Segfault in virCommandRun when trying to start a QEMU guest
by Matthias Bolte 05 Dec '10

05 Dec '10

In qemudStartVMDaemon in/out/err for the virCommand are set based on FDs this results in a segfault in virCommandRun here VIR_DEBUG("Result stdout: '%s' stderr: '%s'", NULLSTR(*cmd->outbuf), NULLSTR(*cmd->errbuf)); as cmd->outbuf and cmd->errbuf are NULL. The two if blocks before that setup cmd->outbuf and cmd->errbuf in case the caller didn't request output capturing aren't executed because the caller requested to capture the output to FDs. /* If caller hasn't requested capture of stdout/err, then capture * it ourselves so we can log it. */ if (!cmd->outfdptr) { cmd->outfdptr = &cmd->outfd; cmd->outbuf = &outbuf; } if (!cmd->errfdptr) { cmd->errfdptr = &cmd->errfd; cmd->errbuf = &errbuf; } In the case the caller requested to capture the output to FDs there is no capturing to cmd->outbuf and cmd->errbuf and they stay NULL. When I remove that offending VIR_DEBUG line everything works fine. Also this case of FD only usage is not yet covered in the command API test cases. Matthias

1 0

[libvirt] [PATCH] Create file in virFileWriteStr() if it doesn't exist
by Jean-Baptiste Rouault 04 Dec '10

04 Dec '10

This patch adds a virFileWriteStrEx() function with a third parameter to set the created file permissions. virFileWriteStr() calls this new function with a default value for the mode parameter. --- src/util/util.c | 11 ++++++++--- src/util/util.h | 1 + 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/util/util.c b/src/util/util.c index a2582aa..82ca9b3 100644 --- a/src/util/util.c +++ b/src/util/util.c @@ -1123,14 +1123,19 @@ int virFileReadAll(const char *path, int maxlen, char **buf) return len; } -/* Truncate @path and write @str to it. +int virFileWriteStr(const char *path, const char *str) +{ + return virFileWriteStrEx(path, str, S_IRUSR|S_IWUSR); +} + +/* Truncate or create @path and write @str to it. Return 0 for success, nonzero for failure. Be careful to preserve any errno value upon failure. */ -int virFileWriteStr(const char *path, const char *str) +int virFileWriteStrEx(const char *path, const char *str, mode_t mode) { int fd; - if ((fd = open(path, O_WRONLY|O_TRUNC)) == -1) + if ((fd = open(path, O_WRONLY|O_TRUNC|O_CREAT, mode)) == -1) return -1; if (safewrite(fd, str, strlen(str)) < 0) { diff --git a/src/util/util.h b/src/util/util.h index a240d87..18ef693 100644 --- a/src/util/util.h +++ b/src/util/util.h @@ -96,6 +96,7 @@ int virFileReadLimFD(int fd, int maxlen, char **buf) ATTRIBUTE_RETURN_CHECK; int virFileReadAll(const char *path, int maxlen, char **buf) ATTRIBUTE_RETURN_CHECK; +int virFileWriteStrEx(const char *path, const char *str, mode_t mode) ATTRIBUTE_RETURN_CHECK; int virFileWriteStr(const char *path, const char *str) ATTRIBUTE_RETURN_CHECK; int virFileMatchesNameSuffix(const char *file, -- 1.7.0.4

3 6

[libvirt] [PATCH 0/2] smbios fixes
by Eric Blake 04 Dec '10

04 Dec '10

In testing <smbios mode='host'/>, I noticed a couple of problems. First, qemu rejected the command line we gave it (invalid UUID); ifixingthat showed that all other arguments were being given literal "" which then made the guest smbios differ from the host. Second, the qemu option -smbios type=1,family=string wasn't supported, which lead to a spurious difference between host and guest. Meanwhile, qemu has a bug where '-smbios type=1,uuid=uuid' must parse as a valid uuid, but is otherwise ignored. The current qemu.git code base _only_ sets smbios uuid from the '-uuid uuid' argument. I've filed a bug against the qemu folks asking whether this is intended (in which case we have to modify libvirt to change the -uuid argument it outputs when smbios is specified), or an oversight (hopefully the latter, since it's still nice to correlate /var/log/libvirt/qemu/....log with the XML uuid even when that differs from the smbios uuid presented to the guest.) Eric Blake (2): qemu: avoid adding "" in smbios arguments smbios: support system family docs/schemas/domain.rng | 1 + src/conf/domain_conf.c | 9 +++++++- src/qemu/qemu_conf.c | 26 +++++++++++++--------- src/util/sysinfo.c | 7 ++++++ src/util/sysinfo.h | 1 + tests/qemuxml2argvdata/qemuxml2argv-smbios.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-smbios.xml | 2 + 7 files changed, 35 insertions(+), 13 deletions(-)

3 13

[libvirt] [PATCH] virsh: Remove redundant optional option for cmdHelp
by Osier Yang 04 Dec '10

04 Dec '10

Remove the optional option "group", as cmdHelp should accepts only one option, and rename option "command" as "command-or-group", ("virsh help" supports both command and command group now, and user nealy uses the options, so it doesn't matter much for it being longer, :-) * tools/virsh.c --- tools/virsh.c | 8 ++------ 1 files changed, 2 insertions(+), 6 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index 31de80f..c2d717f 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -569,8 +569,7 @@ static const vshCmdInfo info_help[] = { }; static const vshCmdOptDef opts_help[] = { - {"command", VSH_OT_DATA, 0, N_("Prints global help or command specific help.")}, - {"group", VSH_OT_DATA, 0, N_("Prints global help or help for a group of related commands.")}, + {"command-or-group", VSH_OT_DATA, 0, N_("Prints global help, command specific help, or help for a group of related commands")}, {NULL, 0, 0, NULL} }; @@ -581,10 +580,7 @@ cmdHelp(vshControl *ctl, const vshCmd *cmd) const vshCmdGrp *g; const char *name; - name = vshCommandOptString(cmd, "command", NULL); - - if (!name) - name = vshCommandOptString(cmd, "group", NULL); + name = vshCommandOptString(cmd, "command-or-group", NULL); if (!name) { const vshCmdGrp *grp; -- 1.7.3.2

3 11

[libvirt] [PATCH] tests: Fix commandtest in VPATH build
by Jiri Denemark 03 Dec '10

03 Dec '10

--- tests/commandtest.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/tests/commandtest.c b/tests/commandtest.c index ace2f33..31adeea 100644 --- a/tests/commandtest.c +++ b/tests/commandtest.c @@ -509,9 +509,12 @@ cleanup: * Only stdin/out/err open */ static int test15(const void *unused ATTRIBUTE_UNUSED) { + char *cwd = NULL; virCommandPtr cmd = virCommandNew(abs_builddir "/commandhelper"); - virCommandSetWorkingDirectory(cmd, abs_builddir "/commanddata"); + if (virAsprintf(&cwd, "%s/commanddata", abs_srcdir) < 0) + return -1; + virCommandSetWorkingDirectory(cmd, cwd); if (virCommandRun(cmd, NULL) < 0) { virErrorPtr err = virGetLastError(); @@ -519,6 +522,7 @@ static int test15(const void *unused ATTRIBUTE_UNUSED) { return -1; } + VIR_FREE(cwd); virCommandFree(cmd); return checkoutput("test15"); -- 1.7.3.2

2 1

[libvirt] [PATCH] man pages: update the description for the virsh help command
by Justin Clift 03 Dec '10

03 Dec '10

Now includes information on keyword usage, and provides examples. --- tools/virsh.pod | 37 ++++++++++++++++++++++++++++++++++--- 1 files changed, 34 insertions(+), 3 deletions(-) diff --git a/tools/virsh.pod b/tools/virsh.pod index c97786a..66654a7 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -115,10 +115,41 @@ The following commands are generic i.e. not specific to a domain. =over 4 -=item B<help> optional I<command> +=item B<help> optional I<--command> I<command> | I<group-keyword> -This prints a small synopsis about all commands available for B<virsh> -B<help> I<command> will print out a detailed help message on that command. +This lists each of the virsh commands. When used without options, all +commands are listed, one per line, grouped into related categories, +displaying the keyword for each group. + +To display only commands for a specific group, give the keyword for that +group as an option. For example: + + virsh # help host + + Host and Hypervisor (help keyword 'host'): + capabilities capabilities + connect (re)connect to hypervisor + freecell NUMA free memory + hostname print the hypervisor hostname + qemu-monitor-command Qemu Monitor Command + uri print the hypervisor canonical URI + +To display detailed information for a specific command, give its name as the +option instead. For example: + + virsh # help list + NAME + list - list domains + + SYNOPSIS + list [--inactive] [--all] + + DESCRIPTION + Returns list of domains. + + OPTIONS + --inactive list inactive domains + --all list inactive & active domains =item B<quit>, B<exit> -- 1.7.3.2

3 4

[libvirt] [PATCH v5 0/4] Support of auto-dump on watchdog event in libvirtd
by Hu Tao 03 Dec '10

03 Dec '10

This patch series adds a new watchdog action `dump' which lets libvirtd can do auto-dump when receiving a watchdog event from qemu guest. In order to make the function work, there must be a watchdog device added to guest, and guest must have a watchdog daemon running, for example, /etc/init.d/watchdog start or auto-started on boot. Changes: v5: - qemu_driver is passed into threadpool as opaque parameter rather than visit the global qemu_driver in worker function - same situation as above of server in libvirtd.c - also list auto_dump_path in src/qemu/libvirtd_qemu.aug and src/qemu/test_libvirtd_qemu.aug - check return value of qemuDomainObjEndJob for safety v4: - updated threadpool to follow libvirt naming style, use appropriate internals APIs, and hide the struct definitions from the header (by Daniel) - fix an error that qemuDomainObjBeginJobWithDriver() get lost in qemuDomainCoreDump() - use thread pool in libvirtd (qemud worker) v3: - let default auto-dump dir be /var/lib/libvirt/qemu/dump Hu Tao (4): threadpool impl Add a new function doCoreDump Add a watchdog action `dump' Using threadpool API to manage qemud worker cfg.mk | 1 + daemon/libvirtd.c | 172 +++++------------------------ daemon/libvirtd.h | 2 + src/Makefile.am | 1 + src/conf/domain_conf.c | 1 + src/conf/domain_conf.h | 1 + src/libvirt_private.syms | 6 + src/qemu/libvirtd_qemu.aug | 1 + src/qemu/qemu.conf | 5 + src/qemu/qemu_conf.c | 16 +++- src/qemu/qemu_conf.h | 5 + src/qemu/qemu_driver.c | 228 ++++++++++++++++++++++++++++---------- src/qemu/test_libvirtd_qemu.aug | 2 + src/util/threadpool.c | 231 +++++++++++++++++++++++++++++++++++++++ src/util/threadpool.h | 48 ++++++++ 15 files changed, 518 insertions(+), 202 deletions(-) create mode 100644 src/util/threadpool.c create mode 100644 src/util/threadpool.h -- 1.7.3 -- Thanks, Hu Tao

1 4

[libvirt] [PATCH] virsh: move two commands from domain group to storage pool group
by Osier Yang 03 Dec '10

03 Dec '10

* tools/virsh.c (find-storage-pool-sources-as and find-storage-pool-sources should't be in command group "Domain Management", move them to group "Storage Pool". --- tools/virsh.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index 6a9aba2..8d84394 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -9957,10 +9957,6 @@ static const vshCmdDef domManagementCmds[] = { {"dumpxml", cmdDumpXML, opts_dumpxml, info_dumpxml}, {"echo", cmdEcho, opts_echo, info_echo}, {"edit", cmdEdit, opts_edit, info_edit}, - {"find-storage-pool-sources-as", cmdPoolDiscoverSourcesAs, - opts_find_storage_pool_sources_as, info_find_storage_pool_sources_as}, - {"find-storage-pool-sources", cmdPoolDiscoverSources, - opts_find_storage_pool_sources, info_find_storage_pool_sources}, {"freecell", cmdFreecell, opts_freecell, info_freecell}, {"hostname", cmdHostname, NULL, info_hostname}, {"managedsave", cmdManagedSave, opts_managedsave, info_managedsave}, @@ -10003,6 +9999,10 @@ static const vshCmdDef domMonitoringCmds[] = { }; static const vshCmdDef storagePoolCmds[] = { + {"find-storage-pool-sources-as", cmdPoolDiscoverSourcesAs, + opts_find_storage_pool_sources_as, info_find_storage_pool_sources_as}, + {"find-storage-pool-sources", cmdPoolDiscoverSources, + opts_find_storage_pool_sources, info_find_storage_pool_sources}, {"pool-autostart", cmdPoolAutostart, opts_pool_autostart, info_pool_autostart}, {"pool-build", cmdPoolBuild, opts_pool_build, info_pool_build}, {"pool-create-as", cmdPoolCreateAs, opts_pool_X_as, info_pool_create_as}, -- 1.7.3.2

3 2

[libvirt] [PATCHv2 0/8] virCommand: next round
by Eric Blake 03 Dec '10

03 Dec '10

This should address some of the review comments from the first round (https://www.redhat.com/archives/libvir-list/2010-November/msg00803.html) Daniel P. Berrange (5): Introduce new APIs for spawning processes virCommand: docs for usage of new command APIs Port hooks and iptables code to new command execution APIs uml: convert to virCommand Remove bogus includes Eric Blake (3): util: add virVasprintf util: fix saferead type qemu: convert to virCommand .x-sc_avoid_write | 1 + .x-sc_prohibit_asprintf | 4 +- cfg.mk | 3 +- docs/Makefile.am | 11 +- docs/internals.html.in | 9 + docs/internals/command.html.in | 550 +++++++++++++++++++ docs/sitemap.html.in | 4 + docs/subsite.xsl | 25 + po/POTFILES.in | 1 + src/Makefile.am | 1 + src/conf/domain_conf.c | 1 - src/libvirt_private.syms | 36 ++ src/qemu/qemu_conf.c | 710 ++++++++++--------------- src/qemu/qemu_conf.h | 10 +- src/qemu/qemu_driver.c | 190 ++------ src/uml/uml_conf.c | 163 ++----- src/uml/uml_conf.h | 10 +- src/uml/uml_driver.c | 68 +-- src/util/command.c | 1138 ++++++++++++++++++++++++++++++++++++++++ src/util/command.h | 260 +++++++++ src/util/hooks.c | 217 +-------- src/util/iptables.c | 73 +--- src/util/util.c | 85 ++-- src/util/util.h | 8 +- src/util/virtaudit.c | 2 +- tests/.gitignore | 4 + tests/Makefile.am | 18 +- tests/commanddata/test10.log | 14 + tests/commanddata/test11.log | 14 + tests/commanddata/test12.log | 12 + tests/commanddata/test13.log | 12 + tests/commanddata/test14.log | 12 + tests/commanddata/test15.log | 12 + tests/commanddata/test16.log | 1 + tests/commanddata/test2.log | 12 + tests/commanddata/test3.log | 14 + tests/commanddata/test4.log | 12 + tests/commanddata/test5.log | 10 + tests/commanddata/test6.log | 6 + tests/commanddata/test7.log | 11 + tests/commanddata/test8.log | 7 + tests/commanddata/test9.log | 18 + tests/commandhelper.c | 137 +++++ tests/commandtest.c | 630 ++++++++++++++++++++++ tests/qemuxml2argvtest.c | 68 +-- 45 files changed, 3461 insertions(+), 1143 deletions(-) create mode 100644 docs/internals/command.html.in create mode 100644 docs/subsite.xsl create mode 100644 src/util/command.c create mode 100644 src/util/command.h create mode 100644 tests/commanddata/test10.log create mode 100644 tests/commanddata/test11.log create mode 100644 tests/commanddata/test12.log create mode 100644 tests/commanddata/test13.log create mode 100644 tests/commanddata/test14.log create mode 100644 tests/commanddata/test15.log create mode 100644 tests/commanddata/test16.log create mode 100644 tests/commanddata/test2.log create mode 100644 tests/commanddata/test3.log create mode 100644 tests/commanddata/test4.log create mode 100644 tests/commanddata/test5.log create mode 100644 tests/commanddata/test6.log create mode 100644 tests/commanddata/test7.log create mode 100644 tests/commanddata/test8.log create mode 100644 tests/commanddata/test9.log create mode 100644 tests/commandhelper.c create mode 100644 tests/commandtest.c -- 1.7.3.2

3 27

[libvirt] GNU awk vs BSD awk?
by Justin Clift 02 Dec '10

02 Dec '10

Hi Eric, One of the OSX Homebrew guys, CC'd, has asked (casually) whether our dependency on GNU awk is very deeply ingrained, or if we could be convinced to allow usage of other make's instead (ie BSD). Figured I'd ask you directly, as you'd probably best know whether it's an easy thing to address or not? Any idea? Regards and best wishes, Justin Clift

3 4

[libvirt] [PATCH v3 0/5] Support of auto-dump on watchdog event in libvirtd
by Hu Tao 02 Dec '10

02 Dec '10

This patch series adds a new watchdog action `dump' which lets libvirtd can do auto-dump when receiving a watchdog event from qemu guest. In order to make the function work, there must be a watchdog device added to guest, and guest must have a watchdog daemon running, for example, /etc/init.d/watchdog start or auto-started on boot. Changes from v2: - let default auto-dump dir be /var/lib/libvirt/qemu/dump Hu Tao (5): Add a threadpool implementation Fall back to QEMUD_SAVE_FORMAT_RAW if compression method fails. Add a new function doCoreDump Add a watchdog action `dump' Add me to AUTHORS to make `make syntax-check' happy AUTHORS | 1 + src/Makefile.am | 3 +- src/conf/domain_conf.c | 1 + src/conf/domain_conf.h | 1 + src/qemu/qemu.conf | 5 + src/qemu/qemu_conf.c | 13 +++- src/qemu/qemu_conf.h | 4 + src/qemu/qemu_driver.c | 235 ++++++++++++++++++++++++++++++++++-------------- src/util/threadpool.c | 140 ++++++++++++++++++++++++++++ src/util/threadpool.h | 35 +++++++ 10 files changed, 367 insertions(+), 71 deletions(-) create mode 100644 src/util/threadpool.c create mode 100644 src/util/threadpool.h -- 1.7.3 -- Thanks, Hu Tao

3 14

[libvirt] [PATCH 0/2] Add tests for CPU selection in qemu driver
by Jiri Denemark 02 Dec '10

02 Dec '10

Some more CPU tests that can make use of recently introduced cpuMapOverride(). Jiri Denemark (2): tests: Support for faking emulator in qemuxml2argv tests: Add tests for CPU selection in qemu driver tests/qemuxml2argvdata/qemu.sh | 64 ++++++++++++++++++++ .../qemuxml2argvdata/qemuxml2argv-cpu-exact1.args | 1 + tests/qemuxml2argvdata/qemuxml2argv-cpu-exact1.xml | 28 +++++++++ .../qemuxml2argvdata/qemuxml2argv-cpu-exact2.args | 1 + tests/qemuxml2argvdata/qemuxml2argv-cpu-exact2.xml | 35 +++++++++++ .../qemuxml2argv-cpu-minimum1.args | 1 + .../qemuxml2argvdata/qemuxml2argv-cpu-minimum1.xml | 21 +++++++ .../qemuxml2argv-cpu-minimum2.args | 1 + .../qemuxml2argvdata/qemuxml2argv-cpu-minimum2.xml | 25 ++++++++ .../qemuxml2argvdata/qemuxml2argv-cpu-strict1.args | 1 + .../qemuxml2argvdata/qemuxml2argv-cpu-strict1.xml | 38 ++++++++++++ .../qemuxml2argv-cpu-topology1.args | 1 + .../qemuxml2argv-cpu-topology1.xml | 21 +++++++ .../qemuxml2argv-cpu-topology2.args | 1 + .../qemuxml2argv-cpu-topology2.xml | 22 +++++++ .../qemuxml2argv-cpu-topology3.args | 1 + .../qemuxml2argv-cpu-topology3.xml | 21 +++++++ tests/qemuxml2argvtest.c | 38 ++++++++++++ 18 files changed, 321 insertions(+), 0 deletions(-) create mode 100755 tests/qemuxml2argvdata/qemu.sh create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-cpu-exact1.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-cpu-exact1.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-cpu-exact2.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-cpu-exact2.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-cpu-minimum1.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-cpu-minimum1.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-cpu-minimum2.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-cpu-minimum2.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-cpu-strict1.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-cpu-strict1.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-cpu-topology1.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-cpu-topology1.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-cpu-topology2.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-cpu-topology2.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-cpu-topology3.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-cpu-topology3.xml -- 1.7.3.2

2 5

[libvirt] [PATCH] schemas: Fix cpu element schema
by Jiri Denemark 02 Dec '10

02 Dec '10

Both vendor and topology elements are optional. --- docs/schemas/domain.rng | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/docs/schemas/domain.rng b/docs/schemas/domain.rng index fb44335..08ebefb 100644 --- a/docs/schemas/domain.rng +++ b/docs/schemas/domain.rng @@ -1745,6 +1745,8 @@ <ref name="cpuModel"/> <optional> <ref name="cpuVendor"/> + </optional> + <optional> <ref name="cpuTopology"/> </optional> <zeroOrMore> -- 1.7.3.2

2 4

[libvirt] [PATCH] virsh: Remove using phy as default disk driver in cmdAttachDisk
by Osier Yang 02 Dec '10

02 Dec '10

* tools/virsh.c (virsh shouldn't use 'phy' as the disk driver if user doesn't specify "--driver", it causes bugs, as not all of hypervisor driver supports 'phy', and actually hypervisor should known the correct default disk driver and subdriver, so remove it) --- tools/virsh.c | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index 6a9aba2..5b5c5ee 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -8668,11 +8668,16 @@ cmdAttachDisk(vshControl *ctl, const vshCmd *cmd) virBufferVSprintf(&buf, " device='%s'", type); virBufferAddLit(&buf, ">\n"); - virBufferVSprintf(&buf, " <driver name='%s'", - (driver) ? driver : "phy"); + if (driver || subdriver) + virBufferVSprintf(&buf, " <driver "); + + if (driver) + virBufferVSprintf(&buf, " name='%s'", driver); if (subdriver) virBufferVSprintf(&buf, " type='%s'", subdriver); - virBufferAddLit(&buf, "/>\n"); + + if (driver || subdriver) + virBufferAddLit(&buf, "/>\n"); virBufferVSprintf(&buf, " <source %s='%s'/>\n", (isFile) ? "file" : "dev", -- 1.7.3.2

2 1

[libvirt] [PATCH v4 0/7] Support of auto-dump on watchdog event in libvirtd
by Hu Tao 02 Dec '10

02 Dec '10

This patch series adds a new watchdog action `dump' which lets libvirtd can do auto-dump when receiving a watchdog event from qemu guest. In order to make the function work, there must be a watchdog device added to guest, and guest must have a watchdog daemon running, for example, /etc/init.d/watchdog start or auto-started on boot. Changes: v4: - getCompressionType returns type of enum qemud_save_formats rather than int - use virThread api in thread pool - fix an error that qemuDomainObjBeginJobWithDriver() get lost in qemuDomainCoreDump() v3: - let default auto-dump dir be /var/lib/libvirt/qemu/dump Hu Tao (7): bug: local var referenced in another thread Add a threadpool implementation Fall back to QEMUD_SAVE_FORMAT_RAW if compression method fails. Add a new function doCoreDump Add a watchdog action `dump' Using threadpool API to manage qemud worker Add me to AUTHORS to make `make syntax-check' happy AUTHORS | 1 + cfg.mk | 3 +- daemon/libvirtd.c | 168 +++++------------------------ daemon/libvirtd.h | 4 + po/af.po | 14 ++-- po/am.po | 14 ++-- po/ar.po | 14 ++-- po/as.po | 14 ++-- po/be.po | 14 ++-- po/bg.po | 18 ++-- po/bn.po | 14 ++-- po/bn_IN.po | 18 ++-- po/bs.po | 14 ++-- po/ca.po | 42 ++++---- po/cs.po | 14 ++-- po/cy.po | 14 ++-- po/da.po | 14 ++-- po/de.po | 22 ++-- po/el.po | 22 ++-- po/en_GB.po | 14 ++-- po/es.po | 54 +++++----- po/et.po | 14 ++-- po/eu_ES.po | 14 ++-- po/fa.po | 14 ++-- po/fi.po | 14 ++-- po/fr.po | 94 ++++++++-------- po/gl.po | 14 ++-- po/gu.po | 14 ++-- po/he.po | 14 ++-- po/hi.po | 14 ++-- po/hr.po | 18 ++-- po/hu.po | 14 ++-- po/hy.po | 14 ++-- po/id.po | 14 ++-- po/is.po | 14 ++-- po/it.po | 54 +++++----- po/ja.po | 18 ++-- po/ka.po | 14 ++-- po/kn.po | 14 ++-- po/ko.po | 14 ++-- po/ku.po | 14 ++-- src/Makefile.am | 3 +- src/conf/domain_conf.c | 1 + src/conf/domain_conf.h | 1 + src/qemu/qemu.conf | 5 + src/qemu/qemu_conf.c | 16 +++- src/qemu/qemu_conf.h | 5 + src/qemu/qemu_driver.c | 259 ++++++++++++++++++++++++++++++++------------ src/util/threadpool.c | 175 ++++++++++++++++++++++++++++++ src/util/threadpool.h | 62 +++++++++++ src/util/threads-pthread.c | 13 ++- 51 files changed, 868 insertions(+), 586 deletions(-) create mode 100644 src/util/threadpool.c create mode 100644 src/util/threadpool.h -- 1.7.3 -- Thanks, Hu Tao

2 10

[libvirt] [PATCH] maint: update .gitignore
by Eric Blake 02 Dec '10

02 Dec '10

* .gitignore: Ignore recent built file, sort. --- Pushing under the trivial rule. Noticed after a clean bootstrap. .gitignore | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/.gitignore b/.gitignore index 12ae5e3..5518d2d 100644 --- a/.gitignore +++ b/.gitignore @@ -50,10 +50,12 @@ /po/ /proxy/ /tests/*.log +/tests/cputest /tests/nwfilterxml2xmltest /update.log Makefile Makefile.in +TAGS coverage cscope.files cscope.out @@ -61,4 +63,3 @@ results.log stamp-h stamp-h.in stamp-h1 -TAGS -- 1.7.1

1 0

[libvirt] [PATCH] OpenVZ: drop fd leakage
by Guido Günther 01 Dec '10

01 Dec '10

Drop unused (and unclosed) errfd and close outfd on exit. Otherwise polling the running domains with virt-manager let's us quickly run out of fds. O.k. to apply? Cheers, -- Guido

2 2

[libvirt] [PATCH] qemu: Use macro for max and min vnc port instead of number
by Osier Yang 01 Dec '10

01 Dec '10

* src/qemu/qemu_driver.c (though MACROS QEMU_VNC_PORT_MAX, and QEMU_VNC_PORT_MIN are defined at the beginning, numbers (65535, 5900) are still used, replace them) --- src/qemu/qemu_driver.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index fcb90a3..f733482 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -2964,7 +2964,7 @@ static int qemudNextFreePort(struct qemud_driver *driver, int startPort) { int i; - for (i = startPort ; i < 65535 ; i++) { + for (i = startPort ; i < QEMU_VNC_PORT_MAX; i++) { int fd; int reuse = 1; struct sockaddr_in addr; @@ -3939,7 +3939,7 @@ static int qemudStartVMDaemon(virConnectPtr conn, if (vm->def->ngraphics == 1) { if (vm->def->graphics[0]->type == VIR_DOMAIN_GRAPHICS_TYPE_VNC && vm->def->graphics[0]->data.vnc.autoport) { - int port = qemudNextFreePort(driver, 5900); + int port = qemudNextFreePort(driver, QEMU_VNC_PORT_MIN); if (port < 0) { qemuReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Unable to find an unused VNC port")); @@ -3948,7 +3948,7 @@ static int qemudStartVMDaemon(virConnectPtr conn, vm->def->graphics[0]->data.vnc.port = port; } else if (vm->def->graphics[0]->type == VIR_DOMAIN_GRAPHICS_TYPE_SPICE && vm->def->graphics[0]->data.spice.autoport) { - int port = qemudNextFreePort(driver, 5900); + int port = qemudNextFreePort(driver, QEMU_VNC_PORT_MIN); int tlsPort = -1; if (port < 0) { qemuReportError(VIR_ERR_INTERNAL_ERROR, @@ -7380,7 +7380,7 @@ static char *qemuDomainXMLToNative(virConnectPtr conn, for (i = 0 ; i < def->ngraphics ; i++) { if (def->graphics[i]->type == VIR_DOMAIN_GRAPHICS_TYPE_VNC && def->graphics[i]->data.vnc.autoport) - def->graphics[i]->data.vnc.port = 5900; + def->graphics[i]->data.vnc.port = QEMU_VNC_PORT_MIN; } emulator = def->emulator; -- 1.7.3.2

2 1

[libvirt] [PATCH] Fix warning when macvtap support is disabled
by Jean-Baptiste Rouault 01 Dec '10

01 Dec '10

--- src/qemu/qemu_conf.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index b0343c6..7cd0603 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -1689,6 +1689,7 @@ qemudPhysIfaceConnect(virConnectPtr conn, (void)qemuCmdFlags; (void)driver; (void)vmuuid; + (void)vmop; qemuReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("No support for macvtap device")); rc = -1; -- 1.7.0.4

3 2

[libvirt] [PATCH] qemu: Fix typo in qemuTeardownDiskPathDeny
by Osier Yang 01 Dec '10

01 Dec '10

typo in error message, it should be by copy-a-paste from "qemuSetupDiskPathAllow". * src/qemu/qemu_driver.c (qemuTeardownDiskPathDeny) --- src/qemu/qemu_driver.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index fcb90a3..5d90e59 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -3401,7 +3401,7 @@ static int qemuTeardownDiskPathDeny(virDomainDiskDefPtr disk ATTRIBUTE_UNUSED, VIR_DEBUG("Ignoring EACCES for %s", path); } else { virReportSystemError(-rc, - _("Unable to allow access for disk path %s"), + _("Unable to deny access for disk path %s"), path); return -1; } -- 1.7.3.2

2 1

[libvirt] [PATCH] virsh: update help for "virsh help help"
by Osier Yang 01 Dec '10

01 Dec '10

As virsh help supports both command and command group now, update "cmdHelp" to print consite help, (this patch is increment of "7829052757953023b0826e0293ffe18ed4ab89e9"). And also remove redundant empty line in "vshUsage". * tools/virsh.c --- tools/virsh.c | 19 +++++++++++++------ 1 files changed, 13 insertions(+), 6 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index 010e345..6a9aba2 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -562,13 +562,15 @@ vshReconnect(vshControl *ctl) { */ static const vshCmdInfo info_help[] = { {"help", N_("print help")}, - {"desc", N_("Prints global help or command specific help.")}, + {"desc", N_("Prints global help, command specific help, or help for a\n" + " group of related commands")}, {NULL, NULL} }; static const vshCmdOptDef opts_help[] = { - {"command", VSH_OT_DATA, 0, N_("name of command")}, + {"command", VSH_OT_DATA, 0, N_("Prints global help or command specific help.")}, + {"group", VSH_OT_DATA, 0, N_("Prints global help or help for a group of related commands.")}, {NULL, 0, 0, NULL} }; @@ -577,7 +579,12 @@ cmdHelp(vshControl *ctl, const vshCmd *cmd) { const vshCmdDef *c; const vshCmdGrp *g; - const char *name = vshCommandOptString(cmd, "command", NULL); + const char *name; + + name = vshCommandOptString(cmd, "command", NULL); + + if (!name) + name = vshCommandOptString(cmd, "group", NULL); if (!name) { const vshCmdGrp *grp; @@ -596,8 +603,8 @@ cmdHelp(vshControl *ctl, const vshCmd *cmd) vshPrint(ctl, "\n"); } - return TRUE; - } + return TRUE; + } if ((c = vshCmddefSearch(name))) { return vshCmddefHelp(ctl, name); @@ -11694,7 +11701,7 @@ vshUsage(void) " -q | --quiet quiet mode\n" " -t | --timing print timing information\n" " -l | --log <file> output logging to file\n" - " -v | --version[=short] program version\n\n" + " -v | --version[=short] program version\n" " -V | --version=long version and full options\n\n" " commands (non interactive mode):\n\n"), progname, progname); -- 1.7.3.2

3 2

[libvirt] [PATCH] Fix undefined symbol error when macvtap support is disabled
by Matthias Bolte 01 Dec '10

01 Dec '10

Use macvtap specific functions depending on WITH_MACVTAP. Use #if instead of #ifdef to check for WITH_MACVTAP, because WITH_MACVTAP is always defined with value 0 or 1. Also export virVMOperationType{To|From}String unconditional, because they are used unconditional in the domain config code. --- src/libvirt_macvtap.syms | 5 +++-- src/libvirt_private.syms | 5 +++++ src/qemu/qemu_driver.c | 4 ++++ src/util/macvtap.h | 19 +++++++++---------- 4 files changed, 21 insertions(+), 12 deletions(-) diff --git a/src/libvirt_macvtap.syms b/src/libvirt_macvtap.syms index 107b7da..b48565b 100644 --- a/src/libvirt_macvtap.syms +++ b/src/libvirt_macvtap.syms @@ -1,9 +1,10 @@ # +# These symbols are dependent on WITH_MACVTAP. +# + # macvtap.h delMacvtap; openMacvtapTap; -virVMOperationTypeFromString; -virVMOperationTypeToString; vpAssociatePortProfileId; vpDisassociatePortProfileId; diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 310d8f4..3c1c823 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -504,6 +504,11 @@ virLogStartup; virLogUnlock; +# macvtap.h +virVMOperationTypeFromString; +virVMOperationTypeToString; + + # memory.h virAlloc; virAllocN; diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index fcb90a3..aa3478f 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -11879,6 +11879,7 @@ cleanup: return ret; } +#if WITH_MACVTAP static void qemudVPAssociatePortProfiles(virDomainDefPtr def) { int i; @@ -11913,6 +11914,7 @@ err_exit: } } } +#endif /* WITH_MACVTAP */ /* Finish is the third and final step, and it runs on the destination host. */ static virDomainPtr @@ -11974,7 +11976,9 @@ qemudDomainMigrateFinish2 (virConnectPtr dconn, goto cleanup; } +#if WITH_MACVTAP qemudVPAssociatePortProfiles(vm->def); +#endif /* WITH_MACVTAP */ if (flags & VIR_MIGRATE_PERSIST_DEST) { if (vm->persistent) diff --git a/src/util/macvtap.h b/src/util/macvtap.h index 389d1fd..3ae2c24 100644 --- a/src/util/macvtap.h +++ b/src/util/macvtap.h @@ -57,11 +57,6 @@ struct _virVirtualPortProfileParams { } u; }; - -# if defined(WITH_MACVTAP) - -# include "internal.h" - enum virVMOperationType { VIR_VM_OP_CREATE, VIR_VM_OP_SAVE, @@ -75,6 +70,10 @@ enum virVMOperationType { VIR_VM_OP_LAST }; +# if WITH_MACVTAP + +# include "internal.h" + int openMacvtapTap(const char *ifname, const unsigned char *macaddress, const char *linkdev, @@ -90,11 +89,9 @@ void delMacvtap(const char *ifname, const char *linkdev, virVirtualPortProfileParamsPtr virtPortProfile); -# endif /* WITH_MACVTAP */ - -# define MACVTAP_MODE_PRIVATE_STR "private" -# define MACVTAP_MODE_VEPA_STR "vepa" -# define MACVTAP_MODE_BRIDGE_STR "bridge" +# define MACVTAP_MODE_PRIVATE_STR "private" +# define MACVTAP_MODE_VEPA_STR "vepa" +# define MACVTAP_MODE_BRIDGE_STR "bridge" int vpAssociatePortProfileId(const char *macvtap_ifname, const unsigned char *macvtap_macaddr, @@ -109,6 +106,8 @@ int vpDisassociatePortProfileId(const char *macvtap_ifname, const virVirtualPortProfileParamsPtr virtPort, enum virVMOperationType vmOp); +# endif /* WITH_MACVTAP */ + VIR_ENUM_DECL(virVirtualPort) VIR_ENUM_DECL(virVMOperation) -- 1.7.0.4

2 2

[libvirt] [PATCH] Fix flaw in thread creation APIs
by Daniel P. Berrange 01 Dec '10

01 Dec '10

The arguments passed to the thread function must be allocated on the heap, rather than the stack, since it is possible for the spawning thread to continue before the new thread runs at all. In such a case, it is possible that the area of stack where the thread args were stored is overwritten. * src/util/threads-pthread.c, src/util/threads-win32.c: Allocate thread arguments on the heap --- src/util/threads-pthread.c | 15 +++++++++++++-- src/util/threads-win32.c | 17 ++++++++++++++--- 2 files changed, 27 insertions(+), 5 deletions(-) diff --git a/src/util/threads-pthread.c b/src/util/threads-pthread.c index 02070ae..bff4979 100644 --- a/src/util/threads-pthread.c +++ b/src/util/threads-pthread.c @@ -26,6 +26,8 @@ # include <sys/syscall.h> #endif +#include "memory.h" + /* Nothing special required for pthreads */ int virThreadInitialize(void) @@ -143,6 +145,7 @@ static void *virThreadHelper(void *data) { struct virThreadArgs *args = data; args->func(args->opaque); + VIR_FREE(args); return NULL; } @@ -151,17 +154,25 @@ int virThreadCreate(virThreadPtr thread, virThreadFunc func, void *opaque) { - struct virThreadArgs args = { func, opaque }; + struct virThreadArgs *args; pthread_attr_t attr; pthread_attr_init(&attr); + if (VIR_ALLOC(args) < 0) + return -1; + + args->func = func; + args->opaque = opaque; + if (!joinable) pthread_attr_setdetachstate(&attr, 1); - int ret = pthread_create(&thread->thread, &attr, virThreadHelper, &args); + int ret = pthread_create(&thread->thread, &attr, virThreadHelper, args); if (ret != 0) { + VIR_FREE(args); errno = ret; return -1; } + /* New thread owns 'args' in success case, so don't free */ return 0; } diff --git a/src/util/threads-win32.c b/src/util/threads-win32.c index 33be4cf..436b3bd 100644 --- a/src/util/threads-win32.c +++ b/src/util/threads-win32.c @@ -230,6 +230,8 @@ static void virThreadHelperDaemon(void *data) TlsSetValue(selfkey, NULL); CloseHandle(self.thread); + + VIR_FREE(args); } static unsigned int __stdcall virThreadHelperJoinable(void *data) @@ -249,6 +251,8 @@ static unsigned int __stdcall virThreadHelperJoinable(void *data) TlsSetValue(selfkey, NULL); CloseHandle(self.thread); + + VIR_FREE(args); return 0; } @@ -257,17 +261,24 @@ int virThreadCreate(virThreadPtr thread, virThreadFunc func, void *opaque) { - struct virThreadArgs args = { func, opaque }; + struct virThreadArgs *args; + + if (VIR_ALLOC(args) < 0) + return -1; + + args->func = func; + args->opaque = opaque; + thread->joinable = joinable; if (joinable) { thread->thread = (HANDLE)_beginthreadex(NULL, 0, virThreadHelperJoinable, - &args, 0, NULL); + args, 0, NULL); if (thread->thread == 0) return -1; } else { thread->thread = (HANDLE)_beginthread(virThreadHelperDaemon, - 0, &args); + 0, args); if (thread->thread == (HANDLE)-1L) return -1; } -- 1.7.2.3

2 1

[libvirt] Link error since commit c2b3827
by Jean-Baptiste Rouault 01 Dec '10

01 Dec '10

I get the following link error since commit c2b3827 : make[3]: Entering directory `/home/jb/Devel/libvirt/daemon' CCLD libvirtd ../src/.libs/libvirt_driver_qemu.a(libvirt_driver_qemu_la-qemu_driver.o): In function `qemudVPAssociatePortProfiles': /home/jb/Devel/libvirt/src/qemu/qemu_driver.c:11891: undefined reference to `vpAssociatePortProfileId' /home/jb/Devel/libvirt/src/qemu/qemu_driver.c:11908: undefined reference to `vpDisassociatePortProfileId' Macvtap support is disabled and these 2 functions come from macvtap.h. Regards, -- Jean-Baptiste ROUAULT Ingénieur R&D - Diateam : Architectes de l'information Phone : +33 (0)9 53 16 02 70 Fax : +33 (0)2 98 050 051

2 1

[libvirt] Best virsh group for storage "find-*" commands?
by Justin Clift 01 Dec '10

01 Dec '10

Hi us, Just realised the new groupings of commands in virsh help has the two storage "find" commands in domain management. These ones: + find-storage-pool-sources-as find potential storage pool sources + find-storage-pool-sources discover potential storage pool sources They'd be better placed in the Storage Pool group wouldn't they? Regards and best wishes, Justin Clift

3 2

[libvirt] CGROUPS network classID setting in domain
by D. Herrendoerfer 01 Dec '10

01 Dec '10

Hello, I'm looking into the possibility of putting a network(tc) classID into to the domain description and adding it into a (possibly) mounted cgroup directory upon launch of a VM. Has anyone before looked into this ? I've seen this mentioned in an abstract by Daniel B. I imagine a classid entry to look somewhat like: <domain type='qemu'> <name > foo</name> <uuid>3e3fce45-4f53-4fa7-bb32-11f34168b82b </uuid> ... <classid>0x1234</classid> ... Thoughts ? Best regards, D. Herrendoerfer

2 3

[libvirt] [PATCH] virsh: remove a badly placed line break in virsh -h output
by Justin Clift 01 Dec '10

01 Dec '10

The output was previously: -c | --connect <uri> hypervisor connection URI -r | --readonly connect readonly -d | --debug <num> debug level [0-5] -h | --help this help -q | --quiet quiet mode -t | --timing print timing information -l | --log <file> output logging to file -v | --version[=short] program version -V | --version=long version and full options (note the blank line between the --version types) This patch removes the extra blank line. --- tools/virsh.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index 010e345..73d0941 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -11694,7 +11694,7 @@ vshUsage(void) " -q | --quiet quiet mode\n" " -t | --timing print timing information\n" " -l | --log <file> output logging to file\n" - " -v | --version[=short] program version\n\n" + " -v | --version[=short] program version\n" " -V | --version=long version and full options\n\n" " commands (non interactive mode):\n\n"), progname, progname); -- 1.7.3.2

2 3

[libvirt] [PATCH 0/2] Add unit tests for internal CPU APIs
by Jiri Denemark 01 Dec '10

01 Dec '10

*** BLURB HERE *** Jiri Denemark (2): cpu: Add support for overriding path to CPU map XML file tests: Add unit tests for internal CPU APIs src/cpu/cpu_map.c | 21 +- src/cpu/cpu_map.h | 3 + src/libvirt_private.syms | 1 + tests/Makefile.am | 12 +- tests/cputest.c | 610 ++++++++++++++++++++ tests/cputestdata/x86-baseline-1-result.xml | 5 + tests/cputestdata/x86-baseline-1.xml | 20 + tests/cputestdata/x86-baseline-2-result.xml | 4 + tests/cputestdata/x86-baseline-2.xml | 22 + .../x86-baseline-incompatible-vendors.xml | 14 + .../cputestdata/x86-baseline-no-vendor-result.xml | 5 + tests/cputestdata/x86-baseline-no-vendor.xml | 12 + .../x86-baseline-some-vendors-result.xml | 3 + tests/cputestdata/x86-baseline-some-vendors.xml | 13 + tests/cputestdata/x86-bogus-feature.xml | 4 + tests/cputestdata/x86-bogus-model.xml | 3 + tests/cputestdata/x86-bogus-vendor.xml | 4 + tests/cputestdata/x86-exact-disable-extra.xml | 4 + tests/cputestdata/x86-exact-disable.xml | 4 + tests/cputestdata/x86-exact-disable2.xml | 5 + tests/cputestdata/x86-exact-forbid-extra.xml | 4 + tests/cputestdata/x86-exact-forbid.xml | 4 + tests/cputestdata/x86-exact-force.xml | 4 + tests/cputestdata/x86-exact-require-extra.xml | 4 + tests/cputestdata/x86-exact-require.xml | 4 + tests/cputestdata/x86-exact.xml | 3 + tests/cputestdata/x86-guest.xml | 18 + .../cputestdata/x86-host+guest,model486-result.xml | 37 ++ .../x86-host+guest,models,Penryn-result.xml | 13 + .../x86-host+guest,models,qemu64-result.xml | 14 + tests/cputestdata/x86-host+guest,models-result.xml | 13 + tests/cputestdata/x86-host+guest-result.xml | 11 + tests/cputestdata/x86-host+guest.xml | 17 + tests/cputestdata/x86-host+min.xml | 17 + .../cputestdata/x86-host+nehalem-force-result.xml | 4 + tests/cputestdata/x86-host+pentium3.xml | 27 + .../x86-host+strict-force-extra-result.xml | 19 + tests/cputestdata/x86-host-amd-fake.xml | 20 + tests/cputestdata/x86-host-amd.xml | 18 + .../x86-host-better+pentium3,core2duo-result.xml | 21 + .../x86-host-better+pentium3,pentium3-result.xml | 30 + .../x86-host-better+pentium3-result.xml | 18 + tests/cputestdata/x86-host-better.xml | 20 + tests/cputestdata/x86-host-incomp-arch.xml | 6 + tests/cputestdata/x86-host-no-vendor.xml | 19 + tests/cputestdata/x86-host-worse+guest-result.xml | 9 + tests/cputestdata/x86-host-worse.xml | 6 + tests/cputestdata/x86-host.xml | 20 + tests/cputestdata/x86-min.xml | 3 + tests/cputestdata/x86-nehalem-force.xml | 6 + tests/cputestdata/x86-pentium3-amd.xml | 4 + tests/cputestdata/x86-pentium3.xml | 3 + tests/cputestdata/x86-strict-disable.xml | 18 + tests/cputestdata/x86-strict-force-extra.xml | 18 + tests/cputestdata/x86-strict-full.xml | 17 + tests/cputestdata/x86-strict.xml | 3 + 56 files changed, 1238 insertions(+), 3 deletions(-) create mode 100644 tests/cputest.c create mode 100644 tests/cputestdata/x86-baseline-1-result.xml create mode 100644 tests/cputestdata/x86-baseline-1.xml create mode 100644 tests/cputestdata/x86-baseline-2-result.xml create mode 100644 tests/cputestdata/x86-baseline-2.xml create mode 100644 tests/cputestdata/x86-baseline-incompatible-vendors.xml create mode 100644 tests/cputestdata/x86-baseline-no-vendor-result.xml create mode 100644 tests/cputestdata/x86-baseline-no-vendor.xml create mode 100644 tests/cputestdata/x86-baseline-some-vendors-result.xml create mode 100644 tests/cputestdata/x86-baseline-some-vendors.xml create mode 100644 tests/cputestdata/x86-bogus-feature.xml create mode 100644 tests/cputestdata/x86-bogus-model.xml create mode 100644 tests/cputestdata/x86-bogus-vendor.xml create mode 100644 tests/cputestdata/x86-exact-disable-extra.xml create mode 100644 tests/cputestdata/x86-exact-disable.xml create mode 100644 tests/cputestdata/x86-exact-disable2.xml create mode 100644 tests/cputestdata/x86-exact-forbid-extra.xml create mode 100644 tests/cputestdata/x86-exact-forbid.xml create mode 100644 tests/cputestdata/x86-exact-force.xml create mode 100644 tests/cputestdata/x86-exact-require-extra.xml create mode 100644 tests/cputestdata/x86-exact-require.xml create mode 100644 tests/cputestdata/x86-exact.xml create mode 100644 tests/cputestdata/x86-guest.xml create mode 100644 tests/cputestdata/x86-host+guest,model486-result.xml create mode 100644 tests/cputestdata/x86-host+guest,models,Penryn-result.xml create mode 100644 tests/cputestdata/x86-host+guest,models,qemu64-result.xml create mode 100644 tests/cputestdata/x86-host+guest,models-result.xml create mode 100644 tests/cputestdata/x86-host+guest-result.xml create mode 100644 tests/cputestdata/x86-host+guest.xml create mode 100644 tests/cputestdata/x86-host+min.xml create mode 100644 tests/cputestdata/x86-host+nehalem-force-result.xml create mode 100644 tests/cputestdata/x86-host+pentium3.xml create mode 100644 tests/cputestdata/x86-host+strict-force-extra-result.xml create mode 100644 tests/cputestdata/x86-host-amd-fake.xml create mode 100644 tests/cputestdata/x86-host-amd.xml create mode 100644 tests/cputestdata/x86-host-better+pentium3,core2duo-result.xml create mode 100644 tests/cputestdata/x86-host-better+pentium3,pentium3-result.xml create mode 100644 tests/cputestdata/x86-host-better+pentium3-result.xml create mode 100644 tests/cputestdata/x86-host-better.xml create mode 100644 tests/cputestdata/x86-host-incomp-arch.xml create mode 100644 tests/cputestdata/x86-host-no-vendor.xml create mode 100644 tests/cputestdata/x86-host-worse+guest-result.xml create mode 100644 tests/cputestdata/x86-host-worse.xml create mode 100644 tests/cputestdata/x86-host.xml create mode 100644 tests/cputestdata/x86-min.xml create mode 100644 tests/cputestdata/x86-nehalem-force.xml create mode 100644 tests/cputestdata/x86-pentium3-amd.xml create mode 100644 tests/cputestdata/x86-pentium3.xml create mode 100644 tests/cputestdata/x86-strict-disable.xml create mode 100644 tests/cputestdata/x86-strict-force-extra.xml create mode 100644 tests/cputestdata/x86-strict-full.xml create mode 100644 tests/cputestdata/x86-strict.xml -- 1.7.3.2

2 6

[libvirt] [v3] virsh: Categorize commands into groups for virsh help
by Osier Yang 01 Dec '10

01 Dec '10

Change the virsh help out. The new output of "virsh help" and "virsh --help" will be like: Secret (help keyword 'secret'): secret-define define or modify a secret from an XML file secret-dumpxml secret attributes in XML secret-set-value set a secret value secret-get-value Output a secret value secret-undefine undefine a secret secret-list list secrets Snapshot (help keyword 'snapshot'): snapshot-create Create a snapshot snapshot-current Get the current snapshot snapshot-delete Delete a domain snapshot snapshot-dumpxml Dump XML for a domain snapshot snapshot-list List snapshots for a domain snapshot-revert Revert a domain to a snapshot Also support output help information of specified command group, e.g. % ./tools/virsh help "Network Filter" Network Filter (help keyword 'filter'): nwfilter-define define or update a network filter from an XML file nwfilter-undefine undefine a network filter nwfilter-dumpxml network filter information in XML nwfilter-list list network filters nwfilter-edit edit XML configuration for a network filter Each group has a help keyword, e.g. % ./tools/virsh help filter Network Filter (help keyword 'filter'): nwfilter-define define or update a network filter from an XML file nwfilter-undefine undefine a network filter nwfilter-dumpxml network filter information in XML nwfilter-list list network filters nwfilter-edit edit XML configuration for a network filter * tools/virsh.c: - introduce new struct "vshCmdGrp" and macros to define the groups. - split previous array "commands" into small arrays which are orgnized by group - changed some functions, e.g. "vshCmdDefSearch" - Added new functions, e.g. "vshCmdGrpSearch" - commands of each group are in "alphabetical order" now. - command groups are in "alphabetical order" now. - the commands are categorized with reference of http://wiki.libvirt.org/page/VirshHelpV2 (by Justin) - the modifications doesn't affect tests * TODO: - doc --- tools/virsh.c | 414 ++++++++++++++++++++++++++++++++++++++------------------ 1 files changed, 281 insertions(+), 133 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index aec7749..17dd524 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -131,6 +131,22 @@ typedef enum { } vshCmdOptType; /* + * Command group types + */ +#define VSH_CMD_GRP_DOM_MANAGEMENT "Domain Management" +#define VSH_CMD_GRP_DOM_MONITORING "Domain Monitoring" +#define VSH_CMD_GRP_STORAGE_POOL "Storage Pool" +#define VSH_CMD_GRP_STORAGE_VOL "Storage Volume" +#define VSH_CMD_GRP_NETWORK "Networking" +#define VSH_CMD_GRP_NODEDEV "Node Device" +#define VSH_CMD_GRP_IFACE "Interface" +#define VSH_CMD_GRP_NWFILTER "Network Filter" +#define VSH_CMD_GRP_SECRET "Secret" +#define VSH_CMD_GRP_SNAPSHOT "Snapshot" +#define VSH_CMD_GRP_HOST_AND_HV "Host and Hypervisor" +#define VSH_CMD_GRP_VIRSH "Virsh itself" + +/* * Command Option Flags */ #define VSH_OFLAG_NONE 0 /* without flags */ @@ -207,8 +223,13 @@ typedef struct __vshControl { char *historyfile; /* readline history file name */ } __vshControl; +typedef struct vshCmdGrp { + const char *name; + const char *keyword; /* help keyword */ + const vshCmdDef *commands; +} vshCmdGrp; -static const vshCmdDef commands[]; +static const vshCmdGrp cmdGroups[]; static void vshError(vshControl *ctl, const char *format, ...) ATTRIBUTE_FMT_PRINTF(2, 3); @@ -224,6 +245,8 @@ static int vshParseArgv(vshControl *ctl, int argc, char **argv); static const char *vshCmddefGetInfo(const vshCmdDef *cmd, const char *info); static const vshCmdDef *vshCmddefSearch(const char *cmdname); static int vshCmddefHelp(vshControl *ctl, const char *name); +static const vshCmdGrp *vshCmdGrpSearch(const char *grpname); +static int vshCmdGrpHelp(vshControl *ctl, const char *name); static vshCmdOpt *vshCommandOpt(const vshCmd *cmd, const char *name); static int vshCommandOptInt(const vshCmd *cmd, const char *name, int *found); @@ -551,19 +574,39 @@ static const vshCmdOptDef opts_help[] = { static int cmdHelp(vshControl *ctl, const vshCmd *cmd) -{ - const char *cmdname = vshCommandOptString(cmd, "command", NULL); + { + const vshCmdDef *c; + const vshCmdGrp *g; + const char *name = vshCommandOptString(cmd, "command", NULL); - if (!cmdname) { + if (!name) { + const vshCmdGrp *grp; const vshCmdDef *def; - vshPrint(ctl, "%s", _("Commands:\n\n")); - for (def = commands; def->name; def++) - vshPrint(ctl, " %-15s %s\n", def->name, - _(vshCmddefGetInfo(def, "help"))); - return TRUE; + vshPrint(ctl, "%s", _("Grouped commands:\n\n")); + + for (grp = cmdGroups; grp->name; grp++) { + vshPrint(ctl, _(" %s (help keyword '%s'):\n"), grp->name, + grp->keyword); + + for (def = grp->commands; def->name; def++) + vshPrint(ctl, " %-30s %s\n", def->name, + _(vshCmddefGetInfo(def, "help"))); + + vshPrint(ctl, "\n"); + } + + return TRUE; + } + + if ((c = vshCmddefSearch(name))) { + return vshCmddefHelp(ctl, name); + } else if ((g = vshCmdGrpSearch(name))) { + return vshCmdGrpHelp(ctl, name); + } else { + vshError(ctl, _("command or command group '%s' doesn't exist"), name); + return FALSE; } - return vshCmddefHelp(ctl, cmdname); } /* @@ -9880,60 +9923,117 @@ cleanup: return ret; } - -/* - * Commands - */ -static const vshCmdDef commands[] = { - {"help", cmdHelp, opts_help, info_help}, +static const vshCmdDef domManagementCmds[] = { {"attach-device", cmdAttachDevice, opts_attach_device, info_attach_device}, {"attach-disk", cmdAttachDisk, opts_attach_disk, info_attach_disk}, {"attach-interface", cmdAttachInterface, opts_attach_interface, info_attach_interface}, {"autostart", cmdAutostart, opts_autostart, info_autostart}, - {"capabilities", cmdCapabilities, NULL, info_capabilities}, -#ifndef WIN32 - {"cd", cmdCd, opts_cd, info_cd}, -#endif - {"connect", cmdConnect, opts_connect, info_connect}, #ifndef WIN32 {"console", cmdConsole, opts_console, info_console}, #endif {"cpu-baseline", cmdCPUBaseline, opts_cpu_baseline, info_cpu_baseline}, {"cpu-compare", cmdCPUCompare, opts_cpu_compare, info_cpu_compare}, {"create", cmdCreate, opts_create, info_create}, - {"start", cmdStart, opts_start, info_start}, + {"define", cmdDefine, opts_define, info_define}, {"destroy", cmdDestroy, opts_destroy, info_destroy}, {"detach-device", cmdDetachDevice, opts_detach_device, info_detach_device}, {"detach-disk", cmdDetachDisk, opts_detach_disk, info_detach_disk}, {"detach-interface", cmdDetachInterface, opts_detach_interface, info_detach_interface}, - {"define", cmdDefine, opts_define, info_define}, {"domid", cmdDomid, opts_domid, info_domid}, - {"domuuid", cmdDomuuid, opts_domuuid, info_domuuid}, - {"dominfo", cmdDominfo, opts_dominfo, info_dominfo}, - {"domjobinfo", cmdDomjobinfo, opts_domjobinfo, info_domjobinfo}, {"domjobabort", cmdDomjobabort, opts_domjobabort, info_domjobabort}, + {"domjobinfo", cmdDomjobinfo, opts_domjobinfo, info_domjobinfo}, {"domname", cmdDomname, opts_domname, info_domname}, - {"domstate", cmdDomstate, opts_domstate, info_domstate}, - {"domblkstat", cmdDomblkstat, opts_domblkstat, info_domblkstat}, - {"domifstat", cmdDomIfstat, opts_domifstat, info_domifstat}, - {"dommemstat", cmdDomMemStat, opts_dommemstat, info_dommemstat}, - {"domblkinfo", cmdDomblkinfo, opts_domblkinfo, info_domblkinfo}, + {"domuuid", cmdDomuuid, opts_domuuid, info_domuuid}, {"domxml-from-native", cmdDomXMLFromNative, opts_domxmlfromnative, info_domxmlfromnative}, {"domxml-to-native", cmdDomXMLToNative, opts_domxmltonative, info_domxmltonative}, + {"dump", cmdDump, opts_dump, info_dump}, {"dumpxml", cmdDumpXML, opts_dumpxml, info_dumpxml}, {"echo", cmdEcho, opts_echo, info_echo}, {"edit", cmdEdit, opts_edit, info_edit}, - {"find-storage-pool-sources", cmdPoolDiscoverSources, - opts_find_storage_pool_sources, info_find_storage_pool_sources}, {"find-storage-pool-sources-as", cmdPoolDiscoverSourcesAs, opts_find_storage_pool_sources_as, info_find_storage_pool_sources_as}, + {"find-storage-pool-sources", cmdPoolDiscoverSources, + opts_find_storage_pool_sources, info_find_storage_pool_sources}, {"freecell", cmdFreecell, opts_freecell, info_freecell}, {"hostname", cmdHostname, NULL, info_hostname}, - {"list", cmdList, opts_list, info_list}, + {"managedsave", cmdManagedSave, opts_managedsave, info_managedsave}, + {"managedsave-remove", cmdManagedSaveRemove, opts_managedsaveremove, info_managedsaveremove}, {"maxvcpus", cmdMaxvcpus, opts_maxvcpus, info_maxvcpus}, + {"memtune", cmdMemtune, opts_memtune, info_memtune}, {"migrate", cmdMigrate, opts_migrate, info_migrate}, {"migrate-setmaxdowntime", cmdMigrateSetMaxDowntime, opts_migrate_setmaxdowntime, info_migrate_setmaxdowntime}, + {"reboot", cmdReboot, opts_reboot, info_reboot}, + {"restore", cmdRestore, opts_restore, info_restore}, + {"resume", cmdResume, opts_resume, info_resume}, + {"save", cmdSave, opts_save, info_save}, + {"schedinfo", cmdSchedinfo, opts_schedinfo, info_schedinfo}, + {"setmaxmem", cmdSetmaxmem, opts_setmaxmem, info_setmaxmem}, + {"setmem", cmdSetmem, opts_setmem, info_setmem}, + {"setvcpus", cmdSetvcpus, opts_setvcpus, info_setvcpus}, + {"shutdown", cmdShutdown, opts_shutdown, info_shutdown}, + {"start", cmdStart, opts_start, info_start}, + {"suspend", cmdSuspend, opts_suspend, info_suspend}, + {"ttyconsole", cmdTTYConsole, opts_ttyconsole, info_ttyconsole}, + {"undefine", cmdUndefine, opts_undefine, info_undefine}, + {"update-device", cmdUpdateDevice, opts_update_device, info_update_device}, + {"vcpucount", cmdVcpucount, opts_vcpucount, info_vcpucount}, + {"vcpuinfo", cmdVcpuinfo, opts_vcpuinfo, info_vcpuinfo}, + {"vcpupin", cmdVcpupin, opts_vcpupin, info_vcpupin}, + {"version", cmdVersion, NULL, info_version}, + {"vncdisplay", cmdVNCDisplay, opts_vncdisplay, info_vncdisplay}, + {NULL, NULL, NULL, NULL} +}; + +static const vshCmdDef domMonitoringCmds[] = { + {"domblkinfo", cmdDomblkinfo, opts_domblkinfo, info_domblkinfo}, + {"domblkstat", cmdDomblkstat, opts_domblkstat, info_domblkstat}, + {"domifstat", cmdDomIfstat, opts_domifstat, info_domifstat}, + {"dominfo", cmdDominfo, opts_dominfo, info_dominfo}, + {"dommemstat", cmdDomMemStat, opts_dommemstat, info_dommemstat}, + {"domstate", cmdDomstate, opts_domstate, info_domstate}, + {"list", cmdList, opts_list, info_list}, + {NULL, NULL, NULL, NULL} +}; + +static const vshCmdDef storagePoolCmds[] = { + {"pool-autostart", cmdPoolAutostart, opts_pool_autostart, info_pool_autostart}, + {"pool-build", cmdPoolBuild, opts_pool_build, info_pool_build}, + {"pool-create-as", cmdPoolCreateAs, opts_pool_X_as, info_pool_create_as}, + {"pool-create", cmdPoolCreate, opts_pool_create, info_pool_create}, + {"pool-define-as", cmdPoolDefineAs, opts_pool_X_as, info_pool_define_as}, + {"pool-define", cmdPoolDefine, opts_pool_define, info_pool_define}, + {"pool-delete", cmdPoolDelete, opts_pool_delete, info_pool_delete}, + {"pool-destroy", cmdPoolDestroy, opts_pool_destroy, info_pool_destroy}, + {"pool-dumpxml", cmdPoolDumpXML, opts_pool_dumpxml, info_pool_dumpxml}, + {"pool-edit", cmdPoolEdit, opts_pool_edit, info_pool_edit}, + {"pool-info", cmdPoolInfo, opts_pool_info, info_pool_info}, + {"pool-list", cmdPoolList, opts_pool_list, info_pool_list}, + {"pool-name", cmdPoolName, opts_pool_name, info_pool_name}, + {"pool-refresh", cmdPoolRefresh, opts_pool_refresh, info_pool_refresh}, + {"pool-start", cmdPoolStart, opts_pool_start, info_pool_start}, + {"pool-undefine", cmdPoolUndefine, opts_pool_undefine, info_pool_undefine}, + {"pool-uuid", cmdPoolUuid, opts_pool_uuid, info_pool_uuid}, + {NULL, NULL, NULL, NULL} +}; + +static const vshCmdDef storageVolCmds[] = { + {"vol-clone", cmdVolClone, opts_vol_clone, info_vol_clone}, + {"vol-create-as", cmdVolCreateAs, opts_vol_create_as, info_vol_create_as}, + {"vol-create", cmdVolCreate, opts_vol_create, info_vol_create}, + {"vol-create-from", cmdVolCreateFrom, opts_vol_create_from, info_vol_create_from}, + {"vol-delete", cmdVolDelete, opts_vol_delete, info_vol_delete}, + {"vol-dumpxml", cmdVolDumpXML, opts_vol_dumpxml, info_vol_dumpxml}, + {"vol-info", cmdVolInfo, opts_vol_info, info_vol_info}, + {"vol-key", cmdVolKey, opts_vol_key, info_vol_key}, + {"vol-list", cmdVolList, opts_vol_list, info_vol_list}, + {"vol-name", cmdVolName, opts_vol_name, info_vol_name}, + {"vol-path", cmdVolPath, opts_vol_path, info_vol_path}, + {"vol-pool", cmdVolPool, opts_vol_pool, info_vol_pool}, + {"vol-wipe", cmdVolWipe, opts_vol_wipe, info_vol_wipe}, + {NULL, NULL, NULL, NULL} +}; +static const vshCmdDef networkCmds[] = { {"net-autostart", cmdNetworkAutostart, opts_network_autostart, info_network_autostart}, {"net-create", cmdNetworkCreate, opts_network_create, info_network_create}, {"net-define", cmdNetworkDefine, opts_network_define, info_network_define}, @@ -9946,116 +10046,104 @@ static const vshCmdDef commands[] = { {"net-start", cmdNetworkStart, opts_network_start, info_network_start}, {"net-undefine", cmdNetworkUndefine, opts_network_undefine, info_network_undefine}, {"net-uuid", cmdNetworkUuid, opts_network_uuid, info_network_uuid}, + {NULL, NULL, NULL, NULL} +}; - {"iface-list", cmdInterfaceList, opts_interface_list, info_interface_list}, - {"iface-name", cmdInterfaceName, opts_interface_name, info_interface_name}, - {"iface-mac", cmdInterfaceMAC, opts_interface_mac, info_interface_mac}, - {"iface-dumpxml", cmdInterfaceDumpXML, opts_interface_dumpxml, info_interface_dumpxml}, - {"iface-define", cmdInterfaceDefine, opts_interface_define, info_interface_define}, - {"iface-undefine", cmdInterfaceUndefine, opts_interface_undefine, info_interface_undefine}, - {"iface-edit", cmdInterfaceEdit, opts_interface_edit, info_interface_edit}, - {"iface-start", cmdInterfaceStart, opts_interface_start, info_interface_start}, - {"iface-destroy", cmdInterfaceDestroy, opts_interface_destroy, info_interface_destroy}, - - {"managedsave", cmdManagedSave, opts_managedsave, info_managedsave}, - {"managedsave-remove", cmdManagedSaveRemove, opts_managedsaveremove, info_managedsaveremove}, - - {"nodeinfo", cmdNodeinfo, NULL, info_nodeinfo}, - - {"nodedev-list", cmdNodeListDevices, opts_node_list_devices, info_node_list_devices}, - {"nodedev-dumpxml", cmdNodeDeviceDumpXML, opts_node_device_dumpxml, info_node_device_dumpxml}, +static const vshCmdDef nodedevCmds[] = { + {"nodedev-create", cmdNodeDeviceCreate, opts_node_device_create, info_node_device_create}, + {"nodedev-destroy", cmdNodeDeviceDestroy, opts_node_device_destroy, info_node_device_destroy}, {"nodedev-dettach", cmdNodeDeviceDettach, opts_node_device_dettach, info_node_device_dettach}, + {"nodedev-dumpxml", cmdNodeDeviceDumpXML, opts_node_device_dumpxml, info_node_device_dumpxml}, + {"nodedev-list", cmdNodeListDevices, opts_node_list_devices, info_node_list_devices}, {"nodedev-reattach", cmdNodeDeviceReAttach, opts_node_device_reattach, info_node_device_reattach}, {"nodedev-reset", cmdNodeDeviceReset, opts_node_device_reset, info_node_device_reset}, - {"nodedev-create", cmdNodeDeviceCreate, opts_node_device_create, info_node_device_create}, - {"nodedev-destroy", cmdNodeDeviceDestroy, opts_node_device_destroy, info_node_device_destroy}, + {"nodeinfo", cmdNodeinfo, NULL, info_nodeinfo}, + {NULL, NULL, NULL, NULL} +}; + +static const vshCmdDef ifaceCmds[] = { + {"iface-define", cmdInterfaceDefine, opts_interface_define, info_interface_define}, + {"iface-destroy", cmdInterfaceDestroy, opts_interface_destroy, info_interface_destroy}, + {"iface-dumpxml", cmdInterfaceDumpXML, opts_interface_dumpxml, info_interface_dumpxml}, + {"iface-edit", cmdInterfaceEdit, opts_interface_edit, info_interface_edit}, + {"iface-list", cmdInterfaceList, opts_interface_list, info_interface_list}, + {"iface-mac", cmdInterfaceMAC, opts_interface_mac, info_interface_mac}, + {"iface-name", cmdInterfaceName, opts_interface_name, info_interface_name}, + {"iface-start", cmdInterfaceStart, opts_interface_start, info_interface_start}, + {"iface-undefine", cmdInterfaceUndefine, opts_interface_undefine, info_interface_undefine}, + {NULL, NULL, NULL, NULL} +}; +static const vshCmdDef nwfilterCmds[] = { {"nwfilter-define", cmdNWFilterDefine, opts_nwfilter_define, info_nwfilter_define}, - {"nwfilter-undefine", cmdNWFilterUndefine, opts_nwfilter_undefine, info_nwfilter_undefine}, {"nwfilter-dumpxml", cmdNWFilterDumpXML, opts_nwfilter_dumpxml, info_nwfilter_dumpxml}, - {"nwfilter-list", cmdNWFilterList, opts_nwfilter_list, info_nwfilter_list}, {"nwfilter-edit", cmdNWFilterEdit, opts_nwfilter_edit, info_nwfilter_edit}, + {"nwfilter-list", cmdNWFilterList, opts_nwfilter_list, info_nwfilter_list}, + {"nwfilter-undefine", cmdNWFilterUndefine, opts_nwfilter_undefine, info_nwfilter_undefine}, + {NULL, NULL, NULL, NULL} +}; - {"pool-autostart", cmdPoolAutostart, opts_pool_autostart, info_pool_autostart}, - {"pool-build", cmdPoolBuild, opts_pool_build, info_pool_build}, - {"pool-create", cmdPoolCreate, opts_pool_create, info_pool_create}, - {"pool-create-as", cmdPoolCreateAs, opts_pool_X_as, info_pool_create_as}, - {"pool-define", cmdPoolDefine, opts_pool_define, info_pool_define}, - {"pool-define-as", cmdPoolDefineAs, opts_pool_X_as, info_pool_define_as}, - {"pool-destroy", cmdPoolDestroy, opts_pool_destroy, info_pool_destroy}, - {"pool-delete", cmdPoolDelete, opts_pool_delete, info_pool_delete}, - {"pool-dumpxml", cmdPoolDumpXML, opts_pool_dumpxml, info_pool_dumpxml}, - {"pool-edit", cmdPoolEdit, opts_pool_edit, info_pool_edit}, - {"pool-info", cmdPoolInfo, opts_pool_info, info_pool_info}, - {"pool-list", cmdPoolList, opts_pool_list, info_pool_list}, - {"pool-name", cmdPoolName, opts_pool_name, info_pool_name}, - {"pool-refresh", cmdPoolRefresh, opts_pool_refresh, info_pool_refresh}, - {"pool-start", cmdPoolStart, opts_pool_start, info_pool_start}, - {"pool-undefine", cmdPoolUndefine, opts_pool_undefine, info_pool_undefine}, - {"pool-uuid", cmdPoolUuid, opts_pool_uuid, info_pool_uuid}, - +static const vshCmdDef secretCmds[] = { {"secret-define", cmdSecretDefine, opts_secret_define, info_secret_define}, {"secret-dumpxml", cmdSecretDumpXML, opts_secret_dumpxml, info_secret_dumpxml}, - {"secret-set-value", cmdSecretSetValue, opts_secret_set_value, info_secret_set_value}, {"secret-get-value", cmdSecretGetValue, opts_secret_get_value, info_secret_get_value}, - {"secret-undefine", cmdSecretUndefine, opts_secret_undefine, info_secret_undefine}, {"secret-list", cmdSecretList, NULL, info_secret_list}, + {"secret-set-value", cmdSecretSetValue, opts_secret_set_value, info_secret_set_value}, + {"secret-undefine", cmdSecretUndefine, opts_secret_undefine, info_secret_undefine}, + {NULL, NULL, NULL, NULL} +}; - +static const vshCmdDef virshCmds[] = { +#ifndef WIN32 + {"cd", cmdCd, opts_cd, info_cd}, +#endif + {"echo", cmdEcho, opts_echo, info_echo}, + {"exit", cmdQuit, NULL, info_quit}, + {"help", cmdHelp, opts_help, info_help}, #ifndef WIN32 {"pwd", cmdPwd, NULL, info_pwd}, #endif {"quit", cmdQuit, NULL, info_quit}, - {"exit", cmdQuit, NULL, info_quit}, - {"reboot", cmdReboot, opts_reboot, info_reboot}, - {"restore", cmdRestore, opts_restore, info_restore}, - {"resume", cmdResume, opts_resume, info_resume}, - {"save", cmdSave, opts_save, info_save}, - {"schedinfo", cmdSchedinfo, opts_schedinfo, info_schedinfo}, - {"dump", cmdDump, opts_dump, info_dump}, - {"shutdown", cmdShutdown, opts_shutdown, info_shutdown}, - {"setmem", cmdSetmem, opts_setmem, info_setmem}, - {"setmaxmem", cmdSetmaxmem, opts_setmaxmem, info_setmaxmem}, - {"memtune", cmdMemtune, opts_memtune, info_memtune}, - {"setvcpus", cmdSetvcpus, opts_setvcpus, info_setvcpus}, - {"suspend", cmdSuspend, opts_suspend, info_suspend}, - {"ttyconsole", cmdTTYConsole, opts_ttyconsole, info_ttyconsole}, - {"undefine", cmdUndefine, opts_undefine, info_undefine}, - {"update-device", cmdUpdateDevice, opts_update_device, info_update_device}, - {"uri", cmdURI, NULL, info_uri}, - - {"vol-create", cmdVolCreate, opts_vol_create, info_vol_create}, - {"vol-create-from", cmdVolCreateFrom, opts_vol_create_from, info_vol_create_from}, - {"vol-create-as", cmdVolCreateAs, opts_vol_create_as, info_vol_create_as}, - {"vol-clone", cmdVolClone, opts_vol_clone, info_vol_clone}, - {"vol-delete", cmdVolDelete, opts_vol_delete, info_vol_delete}, - {"vol-wipe", cmdVolWipe, opts_vol_wipe, info_vol_wipe}, - {"vol-dumpxml", cmdVolDumpXML, opts_vol_dumpxml, info_vol_dumpxml}, - {"vol-info", cmdVolInfo, opts_vol_info, info_vol_info}, - {"vol-list", cmdVolList, opts_vol_list, info_vol_list}, - {"vol-pool", cmdVolPool, opts_vol_pool, info_vol_pool}, - {"vol-path", cmdVolPath, opts_vol_path, info_vol_path}, - {"vol-name", cmdVolName, opts_vol_name, info_vol_name}, - {"vol-key", cmdVolKey, opts_vol_key, info_vol_key}, - - {"vcpucount", cmdVcpucount, opts_vcpucount, info_vcpucount}, - {"vcpuinfo", cmdVcpuinfo, opts_vcpuinfo, info_vcpuinfo}, - {"vcpupin", cmdVcpupin, opts_vcpupin, info_vcpupin}, - {"version", cmdVersion, NULL, info_version}, - {"vncdisplay", cmdVNCDisplay, opts_vncdisplay, info_vncdisplay}, + {NULL, NULL, NULL, NULL} +}; +static const vshCmdDef snapshotCmds[] = { {"snapshot-create", cmdSnapshotCreate, opts_snapshot_create, info_snapshot_create}, {"snapshot-current", cmdSnapshotCurrent, opts_snapshot_current, info_snapshot_current}, {"snapshot-delete", cmdSnapshotDelete, opts_snapshot_delete, info_snapshot_delete}, {"snapshot-dumpxml", cmdSnapshotDumpXML, opts_snapshot_dumpxml, info_snapshot_dumpxml}, {"snapshot-list", cmdSnapshotList, opts_snapshot_list, info_snapshot_list}, {"snapshot-revert", cmdDomainSnapshotRevert, opts_snapshot_revert, info_snapshot_revert}, + {NULL, NULL, NULL, NULL} +}; +static const vshCmdDef hostAndHypervisorCmds[] = { + {"capabilities", cmdCapabilities, NULL, info_capabilities}, + {"connect", cmdConnect, opts_connect, info_connect}, + {"freecell", cmdFreecell, opts_freecell, info_freecell}, + {"hostname", cmdHostname, NULL, info_hostname}, {"qemu-monitor-command", cmdQemuMonitorCommand, opts_qemu_monitor_command, info_qemu_monitor_command}, - + {"uri", cmdURI, NULL, info_uri}, {NULL, NULL, NULL, NULL} }; +static const vshCmdGrp cmdGroups[] = { + {VSH_CMD_GRP_DOM_MANAGEMENT, "domain", domManagementCmds}, + {VSH_CMD_GRP_DOM_MONITORING, "monitor", domMonitoringCmds}, + {VSH_CMD_GRP_HOST_AND_HV, "host", hostAndHypervisorCmds}, + {VSH_CMD_GRP_IFACE, "interface", ifaceCmds}, + {VSH_CMD_GRP_NWFILTER, "filter", nwfilterCmds}, + {VSH_CMD_GRP_NETWORK, "network", networkCmds}, + {VSH_CMD_GRP_NODEDEV, "nodedev", nodedevCmds}, + {VSH_CMD_GRP_SECRET, "secret", secretCmds}, + {VSH_CMD_GRP_SNAPSHOT, "snapshot", snapshotCmds}, + {VSH_CMD_GRP_STORAGE_POOL, "pool", storagePoolCmds}, + {VSH_CMD_GRP_STORAGE_VOL, "volume", storageVolCmds}, + {VSH_CMD_GRP_VIRSH, "virsh", virshCmds}, + {NULL, NULL, NULL} +}; + + /* --------------- * Utils for work with command definition * --------------- @@ -10137,14 +10225,54 @@ vshCommandCheckOpts(vshControl *ctl, const vshCmd *cmd) static const vshCmdDef * vshCmddefSearch(const char *cmdname) { + const vshCmdGrp *g; const vshCmdDef *c; - for (c = commands; c->name; c++) - if (STREQ(c->name, cmdname)) - return c; + for (g = cmdGroups; g->name; g++) { + for (c = g->commands; c->name; c++) { + if(STREQ(c->name, cmdname)) + return c; + } + } + return NULL; } +static const vshCmdGrp * +vshCmdGrpSearch(const char *grpname) +{ + const vshCmdGrp *g; + + for (g = cmdGroups; g->name; g++) { + if(STREQ(g->name, grpname) || STREQ(g->keyword, grpname)) + return g; + } + + return NULL; +} + +static int +vshCmdGrpHelp(vshControl *ctl, const char *grpname) +{ + const vshCmdGrp *grp = vshCmdGrpSearch(grpname); + const vshCmdDef *cmd = NULL; + + if (!grp) { + vshError(ctl, _("command group '%s' doesn't exist"), grpname); + return FALSE; + } else { + vshPrint(ctl, _(" %s (help keyword '%s'):\n"), grp->name, + grp->keyword); + + for (cmd = grp->commands; cmd->name; cmd++) { + vshPrint(ctl, " %-30s %s\n", cmd->name, + _(vshCmddefGetInfo(cmd, "help"))); + } + } + + return TRUE; +} + static int vshCmddefHelp(vshControl *ctl, const char *cmdname) { @@ -11325,25 +11453,36 @@ vshCloseLogFile(vshControl *ctl) static char * vshReadlineCommandGenerator(const char *text, int state) { - static int list_index, len; + static int grp_list_index, cmd_list_index, len; const char *name; + const vshCmdGrp *grp; + const vshCmdDef *cmds; - /* If this is a new word to complete, initialize now. This - * includes saving the length of TEXT for efficiency, and - * initializing the index variable to 0. - */ if (!state) { - list_index = 0; + grp_list_index = 0; + cmd_list_index = 0; len = strlen(text); } + grp = cmdGroups; + /* Return the next name which partially matches from the * command list. */ - while ((name = commands[list_index].name)) { - list_index++; - if (STREQLEN(name, text, len)) - return vshStrdup(NULL, name); + while (grp[grp_list_index].name) { + cmds = grp[grp_list_index].commands; + + if (cmds[cmd_list_index].name) { + while ((name = cmds[cmd_list_index].name)) { + cmd_list_index++; + + if (STREQLEN(name, text, len)) + return vshStrdup(NULL, name); + } + } else { + cmd_list_index = 0; + grp_list_index++; + } } /* If no names matched, then return NULL. */ @@ -11542,7 +11681,9 @@ vshDeinit(vshControl *ctl) static void vshUsage(void) { + const vshCmdGrp *grp; const vshCmdDef *cmd; + fprintf(stdout, _("\n%s [options]... [<command_string>]" "\n%s [options]... <command> [args...]\n\n" " options:\n" @@ -11553,14 +11694,21 @@ vshUsage(void) " -q | --quiet quiet mode\n" " -t | --timing print timing information\n" " -l | --log <file> output logging to file\n" - " -v | --version[=short] program version\n\n" - " -V | --version=long version and full options\n\n" - " commands (non interactive mode):\n"), progname, progname); + " -v | --version program version\n\n" + " commands (non interactive mode):\n\n"), progname, progname); - for (cmd = commands; cmd->name; cmd++) - fprintf(stdout, - " %-15s %s\n", cmd->name, _(vshCmddefGetInfo(cmd, "help"))); + for (grp = cmdGroups; grp->name; grp++) { + fprintf(stdout, _(" %s (help keyword '%s')\n"), grp->name, grp->keyword); + for (cmd = grp->commands; cmd->name; cmd++) + fprintf(stdout, + " %-30s %s\n", cmd->name, _(vshCmddefGetInfo(cmd, "help"))); + + fprintf(stdout, "\n"); + } + + fprintf(stdout, "%s", + _("\n (specify help <group> for details about the commands in the group)\n")); fprintf(stdout, "%s", _("\n (specify help <command> for details about the command)\n\n")); return; -- 1.7.3.2

3 5

[libvirt] [PATCH] maint: allow 'make syntax-check' to run again
by Eric Blake 30 Nov '10

30 Nov '10

* .x-sc_prohibit_xmlGetProp: Add exception. --- docs/news.html.in broke 'make syntax-check' again (how many releases have we done with that issue?) This is alternative 1. However, I won't push this, if alternative 2 pans out. .x-sc_prohibit_xmlGetProp | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/.x-sc_prohibit_xmlGetProp b/.x-sc_prohibit_xmlGetProp index f6d7ee2..68a1da5 100644 --- a/.x-sc_prohibit_xmlGetProp +++ b/.x-sc_prohibit_xmlGetProp @@ -1 +1,2 @@ ^src/util/xml.c$ +^docs/.* -- 1.7.3.2

1 1

[libvirt] libvirt-0.8.5 sometimes crahing
by Nikola Ciprich 30 Nov '10

30 Nov '10

Hello, I noticed that libvirtd sometimes crashes immediately after start.. here's the backtrace: Core was generated by `libvirtd --daemon --listen'. Program terminated with signal 11, Segmentation fault. #0 0x00007fee038c0ca0 in pthread_mutex_lock () from /lib64/libpthread.so.0 (gdb) bt #0 0x00007fee038c0ca0 in pthread_mutex_lock () from /lib64/libpthread.so.0 #1 0x000000000042eb21 in qemuDomainObjEnterMonitor (obj=0xe417d0) at qemu/qemu_driver.c:478 #2 0x0000000000448e7e in qemudDomainGetInfo (dom=<value optimized out>, info=0x43392e10) at qemu/qemu_driver.c:5165 #3 0x00007fee054f29f2 in virDomainGetInfo (domain=0xe3f610, info=0x43392e10) at libvirt.c:3177 #4 0x000000000042554e in remoteDispatchDomainGetInfo (server=<value optimized out>, client=<value optimized out>, conn=0xdd8a20, hdr=<value optimized out>, rerr=0x43392eb0, args=<value optimized out>, ret=0x43392f90) at remote.c:1503 #5 0x0000000000427444 in remoteDispatchClientCall (server=0xdb84d0, client=0x7fedfc040bc0, msg=0x7fedfc0410a0) at dispatch.c:529 #6 remoteDispatchClientRequest (server=0xdb84d0, client=0x7fedfc040bc0, msg=0x7fedfc0410a0) at dispatch.c:407 #7 0x00000000004194c7 in qemudWorker (data=<value optimized out>) at libvirtd.c:1587 #8 0x00007fee038be73d in start_thread () from /lib64/libpthread.so.0 #9 0x00007fee03430f6d in clone () from /lib64/libc.so.6 Could somebody please look at it? If I could provide any additional information, please let me know. Thanks in advance BR nik -- ------------------------------------- Ing. Nikola CIPRICH LinuxBox.cz, s.r.o. 28. rijna 168, 709 01 Ostrava tel.: +420 596 603 142 fax: +420 596 621 273 mobil: +420 777 093 799 www.linuxbox.cz mobil servis: +420 737 238 656 email servis: servis(a)linuxbox.cz -------------------------------------

3 6

[libvirt] [PATCH v2] 802.1Qbg: use pre-associate state at beginning of incoming migration
by Stefan Berger 30 Nov '10

30 Nov '10

-v2: - changing the vmOpStr array and vmOperation enum to use VIR_ENUM_IMPL and VIR_ENUM_DECL. Renaming the enum to virVMOperationType and adapting the name of the enum constants. This patch introduces the usage of the pre-associate state of the IEEE 802.1Qbg standard on incoming VM migration on the target host. It is in response to bugzilla entry 632750. https://bugzilla.redhat.com/show_bug.cgi?id=632750 For being able to differentiate the exact reason as to why a macvtap device is being created, either due to a VM creation or an incoming VM migration, I needed to pass that reason as a parameter from wherever qemudStartVMDaemon is being called in order to determine whether to send an ASSOCIATE (VM creation) or a PRE-ASSOCIATE (incoming VM migration) towards lldpad. I am also fixing a problem with the virsh domainxml-to-native call on the way. Gerhard successfully tested the patch with a recent blade network 802.1Qbg-compliant switch. The patch should not have any side-effects on the 802.1Qbh support in libvirt, but Roopa (cc'ed) may want to verify this. Signed-off-by: Stefan Berger <stefanb(a)us.ibm.com> Signed-off-by: Gerhard Stenzel <gerhard.stenzel(a)de.ibm.com> --- src/libvirt_macvtap.syms | 2 + src/qemu/qemu_conf.c | 12 +++++-- src/qemu/qemu_conf.h | 7 +++- src/qemu/qemu_driver.c | 72 +++++++++++++++++++++++++++++++++++++---------- src/util/macvtap.c | 54 ++++++++++++++++++++++++++++++----- src/util/macvtap.h | 20 +++++++++++-- 6 files changed, 137 insertions(+), 30 deletions(-) Index: libvirt-acl/src/qemu/qemu_conf.c =================================================================== --- libvirt-acl.orig/src/qemu/qemu_conf.c +++ libvirt-acl/src/qemu/qemu_conf.c @@ -1642,7 +1642,8 @@ qemudPhysIfaceConnect(virConnectPtr conn struct qemud_driver *driver, virDomainNetDefPtr net, unsigned long long qemuCmdFlags, - const unsigned char *vmuuid) + const unsigned char *vmuuid, + enum virVMOperationType vmop) { int rc; #if WITH_MACVTAP @@ -1656,7 +1657,8 @@ qemudPhysIfaceConnect(virConnectPtr conn rc = openMacvtapTap(net->ifname, net->mac, net->data.direct.linkdev, net->data.direct.mode, vnet_hdr, vmuuid, - &net->data.direct.virtPortProfile, &res_ifname); + &net->data.direct.virtPortProfile, &res_ifname, + vmop); if (rc >= 0) { VIR_FREE(net->ifname); net->ifname = res_ifname; @@ -3953,7 +3955,8 @@ int qemudBuildCommandLine(virConnectPtr int **vmfds, int *nvmfds, const char *migrateFrom, - virDomainSnapshotObjPtr current_snapshot) + virDomainSnapshotObjPtr current_snapshot, + enum virVMOperationType vmop) { int i; char memory[50]; @@ -4796,7 +4799,8 @@ int qemudBuildCommandLine(virConnectPtr } else if (net->type == VIR_DOMAIN_NET_TYPE_DIRECT) { int tapfd = qemudPhysIfaceConnect(conn, driver, net, qemuCmdFlags, - def->uuid); + def->uuid, + vmop); if (tapfd < 0) goto error; Index: libvirt-acl/src/qemu/qemu_conf.h =================================================================== --- libvirt-acl.orig/src/qemu/qemu_conf.h +++ libvirt-acl/src/qemu/qemu_conf.h @@ -40,6 +40,7 @@ # include "cpu_conf.h" # include "driver.h" # include "bitmap.h" +# include "macvtap.h" # define qemudDebug(fmt, ...) do {} while(0) @@ -238,7 +239,8 @@ int qemudBuildCommandLine int **vmfds, int *nvmfds, const char *migrateFrom, - virDomainSnapshotObjPtr current_snapshot) + virDomainSnapshotObjPtr current_snapshot, + enum virVMOperationType vmop) ATTRIBUTE_NONNULL(1); /* With vlan == -1, use netdev syntax, else old hostnet */ @@ -317,7 +319,8 @@ int qemudPhysIfaceConnect(virConnectPtr struct qemud_driver *driver, virDomainNetDefPtr net, unsigned long long qemuCmdFlags, - const unsigned char *vmuuid); + const unsigned char *vmuuid, + enum virVMOperationType vmop); int qemudProbeMachineTypes (const char *binary, virCapsGuestMachinePtr **machines, Index: libvirt-acl/src/qemu/qemu_driver.c =================================================================== --- libvirt-acl.orig/src/qemu/qemu_driver.c +++ libvirt-acl/src/qemu/qemu_driver.c @@ -163,7 +163,8 @@ static int qemudStartVMDaemon(virConnect const char *migrateFrom, bool start_paused, int stdin_fd, - const char *stdin_path); + const char *stdin_path, + enum virVMOperationType vmop); static void qemudShutdownVMDaemon(struct qemud_driver *driver, virDomainObjPtr vm, @@ -3864,7 +3865,8 @@ static int qemudStartVMDaemon(virConnect const char *migrateFrom, bool start_paused, int stdin_fd, - const char *stdin_path) { + const char *stdin_path, + enum virVMOperationType vmop) { const char **argv = NULL, **tmp; const char **progenv = NULL; int i, ret, runflags; @@ -4065,7 +4067,7 @@ static int qemudStartVMDaemon(virConnect if (qemudBuildCommandLine(conn, driver, vm->def, priv->monConfig, priv->monJSON, qemuCmdFlags, &argv, &progenv, &vmfds, &nvmfds, migrateFrom, - vm->current_snapshot) < 0) + vm->current_snapshot, vmop) < 0) goto cleanup; if (qemuDomainSnapshotSetInactive(vm, driver->snapshotDir) < 0) @@ -4879,7 +4881,7 @@ static virDomainPtr qemudDomainCreate(vi if (qemudStartVMDaemon(conn, driver, vm, NULL, (flags & VIR_DOMAIN_START_PAUSED) != 0, - -1, NULL) < 0) { + -1, NULL, VIR_VM_OP_CREATE) < 0) { qemuDomainStartAudit(vm, "booted", false); if (qemuDomainObjEndJob(vm) > 0) virDomainRemoveInactive(&driver->domains, @@ -7015,7 +7017,8 @@ qemudDomainSaveImageStartVM(virConnectPt } /* Set the migration source and start it up. */ - ret = qemudStartVMDaemon(conn, driver, vm, "stdio", true, fd, path); + ret = qemudStartVMDaemon(conn, driver, vm, "stdio", true, fd, path, + VIR_VM_OP_RESTORE); if (intermediate_pid != -1) { /* Wait for intermediate process to exit */ @@ -7334,14 +7337,15 @@ static char *qemuDomainXMLToNative(virCo if (!def) goto cleanup; - /* Since we're just exporting args, we can't do bridge/network - * setups, since libvirt will normally create TAP devices + /* Since we're just exporting args, we can't do bridge/network/direct + * setups, since libvirt will normally create TAP/macvtap devices * directly. We convert those configs into generic 'ethernet' * config and assume the user has suitable 'ifup-qemu' scripts */ for (i = 0 ; i < def->nnets ; i++) { virDomainNetDefPtr net = def->nets[i]; - if (net->type == VIR_DOMAIN_NET_TYPE_NETWORK) { + if (net->type == VIR_DOMAIN_NET_TYPE_NETWORK || + net->type == VIR_DOMAIN_NET_TYPE_DIRECT) { VIR_FREE(net->data.network.name); memset(net, 0, sizeof *net); @@ -7397,7 +7401,8 @@ static char *qemuDomainXMLToNative(virCo &monConfig, 0, qemuCmdFlags, &retargv, &retenv, NULL, NULL, /* Don't want it to create TAP devices */ - NULL, NULL) < 0) { + NULL, NULL, + VIR_VM_OP_NO_OP) < 0) { goto cleanup; } @@ -7484,7 +7489,8 @@ static int qemudDomainObjStart(virConnec goto cleanup; } - ret = qemudStartVMDaemon(conn, driver, vm, NULL, start_paused, -1, NULL); + ret = qemudStartVMDaemon(conn, driver, vm, NULL, start_paused, -1, NULL, + VIR_VM_OP_CREATE); qemuDomainStartAudit(vm, "booted", ret >= 0); if (ret >= 0) { virDomainEventPtr event = @@ -8327,7 +8333,8 @@ static int qemudDomainAttachNetDevice(vi if ((tapfd = qemudPhysIfaceConnect(conn, driver, net, qemuCmdFlags, - vm->def->uuid)) < 0) + vm->def->uuid, + VIR_VM_OP_CREATE)) < 0) return -1; } @@ -11001,7 +11008,7 @@ qemudDomainMigratePrepareTunnel(virConne * -incoming unix:/path/to/file or exec:nc -U /path/to/file */ internalret = qemudStartVMDaemon(dconn, driver, vm, migrateFrom, true, - -1, NULL); + -1, NULL, VIR_VM_OP_MIGRATE_IN_START); VIR_FREE(migrateFrom); if (internalret < 0) { qemuDomainStartAudit(vm, "migrated", false); @@ -11247,7 +11254,7 @@ qemudDomainMigratePrepare2 (virConnectPt */ snprintf (migrateFrom, sizeof (migrateFrom), "tcp:0.0.0.0:%d", this_port); if (qemudStartVMDaemon (dconn, driver, vm, migrateFrom, true, - -1, NULL) < 0) { + -1, NULL, VIR_VM_OP_MIGRATE_IN_START) < 0) { qemuDomainStartAudit(vm, "migrated", false); /* Note that we don't set an error here because qemudStartVMDaemon * should have already done that. @@ -11862,6 +11869,41 @@ cleanup: return ret; } +static void +qemudVPAssociatePortProfiles(virDomainDefPtr def) { + int i; + int last_good_net = -1; + virDomainNetDefPtr net; + + for (i = 0; i < def->nnets; i++) { + net = def->nets[i]; + if (net->type == VIR_DOMAIN_NET_TYPE_DIRECT) { + if (vpAssociatePortProfileId(net->ifname, + net->mac, + net->data.direct.linkdev, + &net->data.direct.virtPortProfile, + def->uuid, + VIR_VM_OP_MIGRATE_IN_FINISH) != 0) + goto err_exit; + } + last_good_net = i; + } + + return; + +err_exit: + for (i = 0; i < last_good_net; i++) { + net = def->nets[i]; + if (net->type == VIR_DOMAIN_NET_TYPE_DIRECT) { + vpDisassociatePortProfileId(net->ifname, + net->mac, + net->data.direct.linkdev, + &net->data.direct.virtPortProfile, + VIR_VM_OP_MIGRATE_IN_FINISH); + } + } +} + /* Finish is the third and final step, and it runs on the destination host. */ static virDomainPtr qemudDomainMigrateFinish2 (virConnectPtr dconn, @@ -11922,6 +11964,8 @@ qemudDomainMigrateFinish2 (virConnectPtr goto cleanup; } + qemudVPAssociatePortProfiles(vm->def); + if (flags & VIR_MIGRATE_PERSIST_DEST) { if (vm->persistent) newVM = 0; @@ -12814,7 +12858,7 @@ static int qemuDomainRevertToSnapshot(vi goto endjob; rc = qemudStartVMDaemon(snapshot->domain->conn, driver, vm, NULL, - false, -1, NULL); + false, -1, NULL, VIR_VM_OP_CREATE); qemuDomainStartAudit(vm, "from-snapshot", rc >= 0); if (qemuDomainSnapshotSetInactive(vm, driver->snapshotDir) < 0) goto endjob; Index: libvirt-acl/src/util/macvtap.c =================================================================== --- libvirt-acl.orig/src/util/macvtap.c +++ libvirt-acl/src/util/macvtap.c @@ -77,9 +77,21 @@ # define LLDPAD_PID_FILE "/var/run/lldpad.pid" +VIR_ENUM_IMPL(virVMOperation, VIR_VM_OP_LAST, + "create", + "save", + "restore", + "destroy", + "migrate out", + "migrate in start", + "migrate in finish", + "no-op") + + enum virVirtualPortOp { ASSOCIATE = 0x1, DISASSOCIATE = 0x2, + PREASSOCIATE = 0x3, }; @@ -551,7 +563,8 @@ openMacvtapTap(const char *tgifname, int vnet_hdr, const unsigned char *vmuuid, virVirtualPortProfileParamsPtr virtPortProfile, - char **res_ifname) + char **res_ifname, + enum virVMOperationType vmOp) { const char *type = "macvtap"; int c, rc; @@ -563,6 +576,8 @@ openMacvtapTap(const char *tgifname, *res_ifname = NULL; + VIR_DEBUG("%s: VM OPERATION: %s", __FUNCTION__, virVMOperationTypeToString(vmOp)); + if (tgifname) { if(ifaceGetIndex(false, tgifname, &ifindex) == 0) { if (STRPREFIX(tgifname, @@ -601,7 +616,7 @@ create_name: macaddress, linkdev, virtPortProfile, - vmuuid) != 0) { + vmuuid, vmOp) != 0) { rc = -1; goto link_del_exit; } @@ -634,7 +649,8 @@ disassociate_exit: vpDisassociatePortProfileId(cr_ifname, macaddress, linkdev, - virtPortProfile); + virtPortProfile, + vmOp); link_del_exit: link_del(cr_ifname); @@ -662,7 +678,8 @@ delMacvtap(const char *ifname, if (ifname) { vpDisassociatePortProfileId(ifname, macaddr, linkdev, - virtPortProfile); + virtPortProfile, + VIR_VM_OP_DESTROY); link_del(ifname); } } @@ -1320,6 +1337,9 @@ doPortProfileOp8021Qbg(const char *ifnam portVsi.vsi_type_id[0] = virtPort->u.virtPort8021Qbg.typeID; switch (virtPortOp) { + case PREASSOCIATE: + op = PORT_REQUEST_PREASSOCIATE; + break; case ASSOCIATE: op = PORT_REQUEST_ASSOCIATE; break; @@ -1484,6 +1504,7 @@ err_exit: * @macvtap_ifname: The name of the macvtap device * @virtPort: pointer to the object holding port profile parameters * @vmuuid : the UUID of the virtual machine + * @vmOp : The VM operation (i.e., create, no-op) * * Associate a port on a swtich with a profile. This function * may notify a kernel driver or an external daemon to run @@ -1499,13 +1520,19 @@ vpAssociatePortProfileId(const char *mac const unsigned char *macvtap_macaddr, const char *linkdev, const virVirtualPortProfileParamsPtr virtPort, - const unsigned char *vmuuid) + const unsigned char *vmuuid, + enum virVMOperationType vmOp) { int rc = 0; VIR_DEBUG("Associating port profile '%p' on link device '%s'", virtPort, macvtap_ifname); + VIR_DEBUG("%s: VM OPERATION: %s", __FUNCTION__, virVMOperationTypeToString(vmOp)); + + if (vmOp == VIR_VM_OP_NO_OP) + return 0; + switch (virtPort->virtPortType) { case VIR_VIRTUALPORT_NONE: case VIR_VIRTUALPORT_TYPE_LAST: @@ -1513,10 +1540,16 @@ vpAssociatePortProfileId(const char *mac case VIR_VIRTUALPORT_8021QBG: rc = doPortProfileOp8021Qbg(macvtap_ifname, macvtap_macaddr, - virtPort, ASSOCIATE); + virtPort, + (vmOp == VIR_VM_OP_MIGRATE_IN_START) + ? PREASSOCIATE + : ASSOCIATE); break; case VIR_VIRTUALPORT_8021QBH: + /* avoid associating twice */ + if (vmOp == VIR_VM_OP_MIGRATE_IN_FINISH) + break; rc = doPortProfileOp8021Qbh(linkdev, virtPort, vmuuid, ASSOCIATE); @@ -1542,13 +1575,16 @@ int vpDisassociatePortProfileId(const char *macvtap_ifname, const unsigned char *macvtap_macaddr, const char *linkdev, - const virVirtualPortProfileParamsPtr virtPort) + const virVirtualPortProfileParamsPtr virtPort, + enum virVMOperationType vmOp) { int rc = 0; VIR_DEBUG("Disassociating port profile id '%p' on link device '%s' ", virtPort, macvtap_ifname); + VIR_DEBUG("%s: VM OPERATION: %s", __FUNCTION__, virVMOperationTypeToString(vmOp)); + switch (virtPort->virtPortType) { case VIR_VIRTUALPORT_NONE: case VIR_VIRTUALPORT_TYPE_LAST: @@ -1560,6 +1596,9 @@ vpDisassociatePortProfileId(const char * break; case VIR_VIRTUALPORT_8021QBH: + /* avoid disassociating twice */ + if (vmOp == VIR_VM_OP_MIGRATE_IN_FINISH) + break; rc = doPortProfileOp8021Qbh(linkdev, virtPort, NULL, DISASSOCIATE); Index: libvirt-acl/src/util/macvtap.h =================================================================== --- libvirt-acl.orig/src/util/macvtap.h +++ libvirt-acl/src/util/macvtap.h @@ -62,6 +62,19 @@ struct _virVirtualPortProfileParams { # include "internal.h" +enum virVMOperationType { + VIR_VM_OP_CREATE, + VIR_VM_OP_SAVE, + VIR_VM_OP_RESTORE, + VIR_VM_OP_DESTROY, + VIR_VM_OP_MIGRATE_OUT, + VIR_VM_OP_MIGRATE_IN_START, + VIR_VM_OP_MIGRATE_IN_FINISH, + VIR_VM_OP_NO_OP, + + VIR_VM_OP_LAST +}; + int openMacvtapTap(const char *ifname, const unsigned char *macaddress, const char *linkdev, @@ -69,7 +82,8 @@ int openMacvtapTap(const char *ifname, int vnet_hdr, const unsigned char *vmuuid, virVirtualPortProfileParamsPtr virtPortProfile, - char **res_ifname); + char **res_ifname, + enum virVMOperationType vmop); void delMacvtap(const char *ifname, const unsigned char *macaddress, @@ -86,13 +100,16 @@ int vpAssociatePortProfileId(const char const unsigned char *macvtap_macaddr, const char *linkdev, const virVirtualPortProfileParamsPtr virtPort, - const unsigned char *vmuuid); + const unsigned char *vmuuid, + enum virVMOperationType vmOp); int vpDisassociatePortProfileId(const char *macvtap_ifname, const unsigned char *macvtap_macaddr, const char *linkdev, - const virVirtualPortProfileParamsPtr virtPort); + const virVirtualPortProfileParamsPtr virtPort, + enum virVMOperationType vmOp); VIR_ENUM_DECL(virVirtualPort) +VIR_ENUM_DECL(virVMOperation) #endif /* __UTIL_MACVTAP_H__ */ Index: libvirt-acl/src/libvirt_macvtap.syms =================================================================== --- libvirt-acl.orig/src/libvirt_macvtap.syms +++ libvirt-acl/src/libvirt_macvtap.syms @@ -3,3 +3,7 @@ # macvtap.h openMacvtapTap; delMacvtap; +vpAssociatePortProfileId; +vpDisassociatePortProfileId; +virVMOperationTypeToString; +virVMOperationTypeFromString;

4 4

[libvirt] [PATCH] OpenVZ: take veid from vmdef->name when defining new domains
by Guido Günther 30 Nov '10

30 Nov '10

Hi, We currently use the next free veid although there's one given in the domain xml. This currently breaks defining new domains since vmdef->name and veid don't match leading to the following error later on: error: Failed to define domain from 110.xml error: internal error Could not set UUID Since silently ignoring vmdef->name is not nice respect it instead. We avoid veid collisions in the upper levels already. O.k. to apply? -- Guido

2 2

[libvirt] [PATCH] Log client errors in libvirtd at debug priority
by Matthias Bolte 30 Nov '10

30 Nov '10

This reverts commit Log all errors at level INFO to stop polluting syslog 04bd0360f32ec628ecf7943b3fd1468d6eb2dde5. and makes virRaiseErrorFull() log errors at debug priority when called from inside libvirtd. This stops libvirtd from polluting it's own log with client errors at error priority that'll be reported and logged on the client side anyway. --- This is basically a v2 for https://www.redhat.com/archives/libvir-list/2010-November/msg01060.html v2 logs client error at debug priority in libvirtd instead of not logging them at all. Also the way it's implemented is changed the way that Daniel suggested. daemon/libvirtd.c | 4 ++++ src/libvirt_private.syms | 1 + src/util/virterror.c | 28 +++++++++++++++++++++++++++- src/util/virterror_internal.h | 1 + 4 files changed, 33 insertions(+), 1 deletions(-) diff --git a/daemon/libvirtd.c b/daemon/libvirtd.c index 66f1388..caf51bf 100644 --- a/daemon/libvirtd.c +++ b/daemon/libvirtd.c @@ -3083,6 +3083,10 @@ int main(int argc, char **argv) { exit(EXIT_FAILURE); } + /* Set error logging priority to debug, so client errors don't + * show up as errors in the daemon log */ + virErrorSetLogPriority(VIR_LOG_DEBUG); + while (1) { int optidx = 0; int c; diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 33e52e2..ef33f86 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -831,6 +831,7 @@ virAuditSend; # virterror_internal.h virDispatchError; virErrorMsg; +virErrorSetLogPriority; virRaiseErrorFull; virReportErrorHelper; virReportOOMErrorFull; diff --git a/src/util/virterror.c b/src/util/virterror.c index 83c4c9d..491da23 100644 --- a/src/util/virterror.c +++ b/src/util/virterror.c @@ -26,6 +26,7 @@ virThreadLocal virLastErr; virErrorFunc virErrorHandler = NULL; /* global error handler */ void *virUserData = NULL; /* associated data */ +static int virErrorLogPriority = -1; /* * Macro used to format the message as a string in virRaiseError @@ -64,6 +65,18 @@ void *virUserData = NULL; /* associated data */ }} \ } +static virLogPriority virErrorLevelPriority(virErrorLevel level) { + switch (level) { + case VIR_ERR_NONE: + return(VIR_LOG_INFO); + case VIR_ERR_WARNING: + return(VIR_LOG_WARN); + case VIR_ERR_ERROR: + return(VIR_LOG_ERROR); + } + return(VIR_LOG_ERROR); +} + static const char *virErrorDomainName(virErrorDomain domain) { const char *dom = "unknown"; switch (domain) { @@ -676,6 +689,7 @@ virRaiseErrorFull(virConnectPtr conn ATTRIBUTE_UNUSED, { virErrorPtr to; char *str; + int priority; /* * All errors are recorded in thread local storage @@ -700,11 +714,18 @@ virRaiseErrorFull(virConnectPtr conn ATTRIBUTE_UNUSED, VIR_GET_VAR_STR(fmt, str); } + /* * Hook up the error or warning to the logging facility * XXXX should we include filename as 'category' instead of domain name ? + * + * When an explicit error log priority is set then use it, otherwise + * translate the error level to the log priority. This is used by libvirtd + * to log client errors at debug priority. */ - virLogMessage(virErrorDomainName(domain), VIR_LOG_INFO, + priority = virErrorLogPriority == -1 ? virErrorLevelPriority(level) + : virErrorLogPriority; + virLogMessage(virErrorDomainName(domain), priority, funcname, linenr, 1, "%s", str); /* @@ -1319,3 +1340,8 @@ void virReportOOMErrorFull(int domcode, domcode, VIR_ERR_NO_MEMORY, VIR_ERR_ERROR, virerr, NULL, NULL, -1, -1, virerr, NULL); } + +void virErrorSetLogPriority(int priority) +{ + virErrorLogPriority = priority; +} diff --git a/src/util/virterror_internal.h b/src/util/virterror_internal.h index 601a884..2dd2b4a 100644 --- a/src/util/virterror_internal.h +++ b/src/util/virterror_internal.h @@ -89,5 +89,6 @@ void virReportOOMErrorFull(int domcode, int virSetError(virErrorPtr newerr); void virDispatchError(virConnectPtr conn); const char *virStrerror(int theerrno, char *errBuf, size_t errBufLen); +void virErrorSetLogPriority(int priority); #endif -- 1.7.0.4

2 2

[libvirt] Bootstrap fail, but non-useful message :/
by Justin Clift 30 Nov '10

30 Nov '10

Hi Eric, Just ran ./autogen.sh on an OSX box with only the system provided autotools installed, and got this: ************************************************************************************ Copying file po/remove-potcdate.sin ./bootstrap: patching m4/gettext.m4 to remove need for intl/* ... ./bootstrap: glibtoolize -c -f ... glibtoolize: putting auxiliary files in AC_CONFIG_AUX_DIR, `build-aux'. glibtoolize: copying file `build-aux/ltmain.sh' glibtoolize: putting macros in AC_CONFIG_MACRO_DIR, `m4'. glibtoolize: copying file `m4/libtool.m4' glibtoolize: copying file `m4/ltoptions.m4' glibtoolize: copying file `m4/ltsugar.m4' glibtoolize: copying file `m4/ltversion.m4' glibtoolize: copying file `m4/lt~obsolete.m4' ./bootstrap: aclocal -I gnulib/m4 --force -I m4 ... configure.ac:13: warning: macro `AM_SILENT_RULES' not found in library ./bootstrap: autoconf --force ... configure.ac:60: error: possibly undefined macro: AC_MSG_ERROR If this token and others are legitimate, please use m4_pattern_allow. See the Autoconf documentation. configure.ac:512: error: possibly undefined macro: AC_MSG_NOTICE configure.ac:627: error: possibly undefined macro: PKG_CHECK_MODULES Failed to bootstrap, please investigate. $ ************************************************************************************ This system is using the "MacPorts" packaging system instead of Homebrew. The problem was easy enough to resolve by installing the newer autoconf and automake MacPorts provides. But, I'm concerned about the less-than-helpful error message given here. Isn't the bootstrap supposed to detect the required versions of things (as specified in the .conf file), and inform us clearly if they're not found? Regards and best wishes, Justin Clift

4 6

[libvirt] [PATCH] openvz: Fixe some overwritten error codes
by Guido Günther 30 Nov '10

30 Nov '10

Hi, this patch fixes some overwritten error messages. There are more but these are the ones I could check easily. O.k. to apply? Cheers, -- Guido

2 1

[libvirt] [PATCH] correct the arguments of migrate_speed
by Wen Congyang 29 Nov '10

29 Nov '10

When we set migrate_speed by json, we receive the following error message: libvirtError: internal error unable to execute QEMU command 'migrate_set_speed': Invalid parameter type, expected: number The reason is that: the arguments of migrate_set_speed by json is json number, not json string. Signed-off-by: Wen Congyang <wency(a)cn.fujitsu.com> --- src/qemu/qemu_monitor_json.c | 10 +++------- 1 files changed, 3 insertions(+), 7 deletions(-) diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index da51a4f..2576dc5 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -1453,17 +1453,13 @@ int qemuMonitorJSONSetMigrationSpeed(qemuMonitorPtr mon, unsigned long bandwidth) { int ret; - char *bandwidthstr; virJSONValuePtr cmd; virJSONValuePtr reply = NULL; - if (virAsprintf(&bandwidthstr, "%lum", bandwidth) < 0) { - virReportOOMError(); - return -1; - } cmd = qemuMonitorJSONMakeCommand("migrate_set_speed", - "s:value", bandwidthstr, + "U:value", + /* 1048576 = 1024 * 1024 */ + (uint64_t)bandwidth * 1048576, NULL); - VIR_FREE(bandwidthstr); if (!cmd) return -1; -- 1.7.1

2 1

[libvirt] [PATCH v2 0/5] Support of auto-dump on watchdog event in libvirtd
by Hu Tao 29 Nov '10

29 Nov '10

This patch series adds a new watchdog action `dump' which lets libvirtd can do auto-dump when receiving a watchdog event from qemu guest. In order to make the function work, there must be a watchdog device added to guest, and guest must have a watchdog daemon running, for example, /etc/init.d/watchdog start or auto-started on boot. Hu Tao (5): Add a threadpool implementation Fall back to QEMUD_SAVE_FORMAT_RAW if compression method fails. Add a new function doCoreDump Add a watchdog action `dump' I am one of the authors AUTHORS | 1 + src/Makefile.am | 3 +- src/conf/domain_conf.c | 1 + src/conf/domain_conf.h | 1 + src/qemu/qemu.conf | 5 + src/qemu/qemu_conf.c | 13 +++- src/qemu/qemu_conf.h | 4 + src/qemu/qemu_driver.c | 229 +++++++++++++++++++++++++++++++++--------------- src/util/threadpool.c | 140 +++++++++++++++++++++++++++++ src/util/threadpool.h | 35 ++++++++ 10 files changed, 361 insertions(+), 71 deletions(-) create mode 100644 src/util/threadpool.c create mode 100644 src/util/threadpool.h -- 1.7.3 -- Thanks, Hu Tao

2 7

[libvirt] [PATCH] Ignore files generated by "make tags"
by Guido Günther 29 Nov '10

29 Nov '10

Attached patch ignores files named TAGS as generated by "make tags". O.k. to apply? Cheers, -- Guido

2 1

[libvirt] [PATCH] tests: Fix detection of expected errors
by Jiri Denemark 29 Nov '10

29 Nov '10

--- tests/nwfilterxml2xmltest.c | 15 +++++---------- tests/qemuxml2argvtest.c | 8 +++----- 2 files changed, 8 insertions(+), 15 deletions(-) diff --git a/tests/nwfilterxml2xmltest.c b/tests/nwfilterxml2xmltest.c index 070aa98..9cad913 100644 --- a/tests/nwfilterxml2xmltest.c +++ b/tests/nwfilterxml2xmltest.c @@ -25,7 +25,7 @@ static char *abs_srcdir; static int testCompareXMLToXMLFiles(const char *inxml, const char *outxml, - bool expect_warning) { + bool expect_error) { char inXmlData[MAX_FILE]; char *inXmlPtr = &(inXmlData[0]); char outXmlData[MAX_FILE]; @@ -33,26 +33,21 @@ static int testCompareXMLToXMLFiles(const char *inxml, char *actual = NULL; int ret = -1; virNWFilterDefPtr dev = NULL; - char *log; if (virtTestLoadFile(inxml, &inXmlPtr, MAX_FILE) < 0) goto fail; if (virtTestLoadFile(outxml, &outXmlPtr, MAX_FILE) < 0) goto fail; - if (!(dev = virNWFilterDefParseString(NULL, inXmlData))) - goto fail; + virResetLastError(); - if ((log = virtTestLogContentAndReset()) == NULL) + if (!(dev = virNWFilterDefParseString(NULL, inXmlData))) goto fail; - if ((*log != '\0') != expect_warning) { - free(log); + if (!!virGetLastError() != expect_error) goto fail; - } - free(log); - if (expect_warning) { + if (expect_error) { /* need to suppress the errors */ virResetLastError(); } diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index b149ef4..c5e0448 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -84,6 +84,7 @@ static int testCompareXMLToArgvFiles(const char *xml, free(virtTestLogContentAndReset()); + virResetLastError(); if (qemudBuildCommandLine(conn, &driver, vmdef, &monitor_chr, 0, flags, @@ -91,11 +92,8 @@ static int testCompareXMLToArgvFiles(const char *xml, NULL, NULL, migrateFrom, NULL) < 0) goto fail; - if ((log = virtTestLogContentAndReset()) == NULL) - goto fail; - - if (!!strstr(log, ": error :") != expectError) { - if (virTestGetDebug()) + if (!!virGetLastError() != expectError) { + if (virTestGetDebug() && (log = virtTestLogContentAndReset())) fprintf(stderr, "\n%s", log); goto fail; } -- 1.7.3.2

2 2