- Devel - libvirt List Archives

[libvirt] [PATCH V9 0/6] Add DHCP snooping support to nwfilter
by Stefan Berger 14 Apr '12

14 Apr '12

This series of patches adds DHCP snooping support to libvirt's nwfilter subsystem. DHCP snooping detects DHCP leases obtained by a VM and automatically adjusts the network traffic filters to reflect the IP addresses with which a VM may send its traffic, thus for example preventing IP address spoofing. Once leases on IP addresses expire or if a VM gives up on a lease on an IP address, the filters are also adjusted. All leases are persisted and automatically applied upon a VM's restart. Leases are associated with the tuple of VM-UUID and interface MAC address. The following interface XML activates and uses the DHCP snooping: <interface type='bridge'> <source bridge='virbr0'/> <filterref filter='clean-traffic'> <parameter name='ip_learning' value='dhcp'/> </filterref> </interface> Regards, David and Stefan

2 8

Re: [libvirt] Start of freeze for libvirt-0.9.11 and availability of rc1
by Philipp Hahn 13 Apr '12

13 Apr '12

Hello Guido, Am Freitag 13 April 2012 15:10:49 schrieb Guido Günther: > könntest Du das als richtigen Patch schicken, dann apply ich das. [Guido asks me to send a full patch, so he can apply it.] Sure, see the attached patch. Sincerely Philipp -- Philipp Hahn Open Source Software Engineer hahn(a)univention.de Univention GmbH be open. fon: +49 421 22 232- 0 Mary-Somerville-Str.1 D-28359 Bremen fax: +49 421 22 232-99 http://www.univention.de/

2 1

[libvirt] [PATCH] blockjob: add virsh blockjob --wait
by Eric Blake 13 Apr '12

13 Apr '12

I'm tired of shell-scripting to wait for completion of a block pull, when virsh can be taught to do the same. I couldn't quite reuse vshWatchJob, as this is not a case of a long-running command where a second thread must be used to probe job status (at least, not unless I make virsh start doing blocking waits for an event to fire), but it served as inspiration for my simpler single-threaded loop. There is up to a half-second delay between sending SIGINT and the job being aborted, but I didn't think it worth the complexity of a second thread and use of poll() just to minimize that delay. * tools/virsh.c (cmdBlockPull): Add new options to wait for completion. (blockJobImpl): Add argument. (cmdBlockJob): Adjust caller. * tools/virsh.pod (blockjob): Document new mode. --- tools/virsh.c | 122 +++++++++++++++++++++++++++++++++++++++++++++++++----- tools/virsh.pod | 11 ++++- 2 files changed, 119 insertions(+), 14 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index 8ef57e0..c54add9 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -7274,11 +7274,11 @@ repoll: if (pollfd.revents & POLLIN && saferead(pipe_fd, &retchar, sizeof(retchar)) > 0 && retchar == '0') { - if (verbose) { - /* print [100 %] */ - print_job_progress(label, 0, 1); - } - break; + if (verbose) { + /* print [100 %] */ + print_job_progress(label, 0, 1); + } + break; } goto cleanup; } @@ -7295,8 +7295,9 @@ repoll: } GETTIMEOFDAY(&curr); - if ( timeout && ((int)(curr.tv_sec - start.tv_sec) * 1000 + \ - (int)(curr.tv_usec - start.tv_usec) / 1000) > timeout * 1000 ) { + if (timeout && (((int)(curr.tv_sec - start.tv_sec) * 1000 + + (int)(curr.tv_usec - start.tv_usec) / 1000) > + timeout * 1000)) { /* suspend the domain when migration timeouts. */ vshDebug(ctl, VSH_ERR_DEBUG, "%s timeout", label); if (timeout_func) @@ -7519,7 +7520,8 @@ typedef enum { static int blockJobImpl(vshControl *ctl, const vshCmd *cmd, - virDomainBlockJobInfoPtr info, int mode) + virDomainBlockJobInfoPtr info, int mode, + virDomainPtr *pdom) { virDomainPtr dom = NULL; const char *name, *path; @@ -7560,7 +7562,9 @@ blockJobImpl(vshControl *ctl, const vshCmd *cmd, } cleanup: - if (dom) + if (pdom && ret == 0) + *pdom = dom; + else if (dom) virDomainFree(dom); return ret; } @@ -7580,15 +7584,109 @@ static const vshCmdOptDef opts_block_pull[] = { {"bandwidth", VSH_OT_DATA, VSH_OFLAG_NONE, N_("Bandwidth limit in MB/s")}, {"base", VSH_OT_DATA, VSH_OFLAG_NONE, N_("path of backing file in chain for a partial pull")}, + {"wait", VSH_OT_BOOL, 0, N_("wait for job to finish")}, + {"verbose", VSH_OT_BOOL, 0, N_("with --wait, display the progress")}, + {"timeout", VSH_OT_INT, VSH_OFLAG_NONE, + N_("with --wait, abort if pull exceeds timeout (in seconds)")}, {NULL, 0, 0, NULL} }; static bool cmdBlockPull(vshControl *ctl, const vshCmd *cmd) { - if (blockJobImpl(ctl, cmd, NULL, VSH_CMD_BLOCK_JOB_PULL) != 0) + virDomainPtr dom = NULL; + bool ret = false; + bool blocking = vshCommandOptBool(cmd, "wait"); + bool verbose = vshCommandOptBool(cmd, "verbose"); + int timeout = 0; + struct sigaction sig_action; + struct sigaction old_sig_action; + sigset_t sigmask; + struct timeval start; + struct timeval curr; + const char *path = NULL; + bool quit = false; + + if (blocking) { + if (vshCommandOptInt(cmd, "timeout", &timeout) > 0) { + if (timeout < 1) { + vshError(ctl, "%s", _("migrate: Invalid timeout")); + return false; + } + + /* Ensure that we can multiply by 1000 without overflowing. */ + if (timeout > INT_MAX / 1000) { + vshError(ctl, "%s", _("migrate: Timeout is too big")); + return false; + } + } + if (vshCommandOptString(cmd, "path", &path) < 0) + return false; + + sigemptyset(&sigmask); + sigaddset(&sigmask, SIGINT); + + intCaught = 0; + sig_action.sa_sigaction = vshCatchInt; + sigemptyset(&sig_action.sa_mask); + sigaction(SIGINT, &sig_action, &old_sig_action); + + GETTIMEOFDAY(&start); + } else if (verbose || vshCommandOptBool(cmd, "timeout")) { + vshError(ctl, "%s", _("blocking control options require --wait")); return false; - return true; + } + + if (blockJobImpl(ctl, cmd, NULL, VSH_CMD_BLOCK_JOB_PULL, + blocking ? &dom : NULL) != 0) + goto cleanup; + + while (blocking) { + virDomainBlockJobInfo info; + int result = virDomainGetBlockJobInfo(dom, path, &info, 0); + + if (result < 0) { + vshError(ctl, _("failed to query job for disk %s"), path); + goto cleanup; + } + if (result == 0) + break; + + if (verbose) + print_job_progress(_("Block Pull"), info.end - info.cur, info.end); + + GETTIMEOFDAY(&curr); + if (intCaught || (timeout && + (((int)(curr.tv_sec - start.tv_sec) * 1000 + + (int)(curr.tv_usec - start.tv_usec) / 1000) > + timeout * 1000))) { + vshDebug(ctl, VSH_ERR_DEBUG, + intCaught ? "interrupted" : "timeout"); + intCaught = 0; + timeout = 0; + quit = true; + if (virDomainBlockJobAbort(dom, path, 0) < 0) { + vshError(ctl, _("failed to abort job for disk %s"), path); + goto cleanup; + } + } + + usleep(500 * 1000); + } + + if (verbose && !quit) { + /* printf [100 %] */ + print_job_progress(_("Block Pull"), 0, 1); + } + vshPrint(ctl, "\n%s\n", quit ? _("Pull aborted") : _("Pull complete")); + + ret = true; +cleanup: + if (dom) + virDomainFree(dom); + if (blocking) + sigaction(SIGINT, &old_sig_action, NULL); + return ret; } /* @@ -7639,7 +7737,7 @@ cmdBlockJob(vshControl *ctl, const vshCmd *cmd) else mode = VSH_CMD_BLOCK_JOB_INFO; - ret = blockJobImpl(ctl, cmd, &info, mode); + ret = blockJobImpl(ctl, cmd, &info, mode, NULL); if (ret < 0) return false; diff --git a/tools/virsh.pod b/tools/virsh.pod index 5f3d9b1..fbc34f1 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -640,6 +640,7 @@ address of virtual interface (such as I<detach-interface> or I<domif-setlink>) will accept the MAC address printed by this command. =item B<blockpull> I<domain> I<path> [I<bandwidth>] [I<base>] +[I<--wait> [I<--verbose>] [I<--timeout> B<seconds>]] Populate a disk from its backing image chain. By default, this command flattens the entire chain; but if I<base> is specified, containing the @@ -647,8 +648,14 @@ name of one of the backing files in the chain, then that file becomes the new backing file and only the intermediate portion of the chain is pulled. Once all requested data from the backing image chain has been pulled, the disk no longer depends on that portion of the backing chain. -It pulls data for the entire disk in the background, the process of the -operation can be checked with B<blockjob>. + +By default, this command returns as soon as possible, and data for +the entire disk is pulled in the background; the process of the +operation can be checked with B<blockjob>. However, if I<--wait> is +specified, then this command will block until the operation completes, +or cancel the operation if the optional I<timeout> in seconds elapses +or SIGINT is sent (usually with C<Ctrl-C>). Using I<--verbose> along +with I<--wait> will produce periodic status updates. I<path> specifies fully-qualified path of the disk; it corresponds to a unique target name (<target dev='name'/>) or source file (<source -- 1.7.7.6

2 2

[libvirt] ANNOUNCE: Release of libvirt-sandbox version 0.0.3
by Daniel P. Berrange 13 Apr '12

13 Apr '12

I pleased to announce the a new public release of libvirt-sandbox, version 0.0.3, is now available for download ftp://libvirt.org/libvirt/sandbox/ The packages are GPG signed with Key fingerprint: DAF3 A6FD B26B 6291 2D0E 8E3F BE86 EBB4 1510 4FDF (4096R) The libvirt-sandbox package provides an API layer on top of libvirt-gobject which facilitates the cration of application sandboxes using virtualization technology. An application sandbox is a virtual machine or container that runs a single application binary, directly from the host OS filesystem. In other words there is no separate guest operating system install to build or manager. At this point in time libvirt-sandbox can create sandboxes using either LXC or KVM, and should in theory be extendable to any libvirt driver. The first release is able to run simple command line based programs. This release has focused on making the sandbox infrastructure more reliable and expanding the functionality available. Dan Walsh has also contributed a new tool called virt-sandbox-service which facilitates the creation of sandboxes for running system services like apache. - Ensure root/config filesystems are readonly in KVM - Add support for mounting host disk images in guests - Add support for binding guest filesystems to new locations - Add support for an optional interactive shell for debugging or administrative purposes - Add a virt-sandbox-service script for preparing sandboxes for system services, integrating with systemd - Misc compiler warning fixes - Replace invocation of insmod with direct syscalls - Refactor API to separate interactive sandbox functionality from base class & service sandbox functionality - Rewrite host/guest I/O handling to separate stdout from stderr correctly, improve reliability of startup/shutdown handshakes and propagate exit status back to host - Exec away the first hypervisor specific init process, so generic init process get PID 1 - Turn on reboot-on-panic in KVM to ensure guest exists on fatal problems Some examples $ virt-sandbox -c qemu:///session /bin/date Thu Jan 12 22:30:03 GMT 2012 $ virt-sandbox -c qemu:///session /bin/cat /proc/cpuinfo processor : 0 vendor_id : GenuineIntel cpu family : 6 model : 2 model name : QEMU Virtual CPU version 1.0 stepping : 3 cpu MHz : 2793.084 cache size : 4096 KB fpu : yes fpu_exception : yes cpuid level : 4 wp : yes flags : fpu de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pse36 clflush mmx fxsr sse sse2 syscall nx lm up rep_good nopl +pni cx16 hypervisor lahf_lm bogomips : 5586.16 clflush size : 64 cache_alignment : 64 address sizes : 40 bits physical, 48 bits virtual power management: $ virt-sandbox -c lxc:/// /bin/sh sh-4.2$ ps -axuwf USER PID %CPU %MEM VSZ RSS TTY STAT START TIME COMMAND berrange 1 0.0 0.1 167680 4688 pts/0 S+ 22:31 0:00 libvirt-sandbox-init-common berrange 47 0.0 0.0 13852 1608 pts/1 Ss 22:31 0:00 \_ /bin/sh berrange 48 0.0 0.0 13124 996 pts/1 R+ 22:31 0:00 \_ ps -axuwf Feedback / patches / etc should be directed to the main libvirt development mailing list. Daniel -- |: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :| |: http://libvirt.org -o- http://virt-manager.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :|

1 0

[libvirt] [libvirt-glib] Getter/setter for disk source's startupPolicy attribute
by Zeeshan Ali (Khattak) 13 Apr '12

13 Apr '12

From: "Zeeshan Ali (Khattak)" <zeeshanak(a)gnome.org> --- libvirt-gconfig/libvirt-gconfig-domain-disk.c | 26 +++++++++++++++++++++++++ libvirt-gconfig/libvirt-gconfig-domain-disk.h | 9 ++++++++ libvirt-gconfig/libvirt-gconfig.sym | 5 +++- libvirt-gconfig/tests/test-domain-create.c | 2 + 4 files changed, 41 insertions(+), 1 deletions(-) diff --git a/libvirt-gconfig/libvirt-gconfig-domain-disk.c b/libvirt-gconfig/libvirt-gconfig-domain-disk.c index 5d0acb5..a29ea47 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-disk.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-disk.c @@ -127,6 +127,18 @@ void gvir_config_domain_disk_set_snapshot_type(GVirConfigDomainDisk *disk, type, NULL); } +void gvir_config_domain_disk_set_startup_policy(GVirConfigDomainDisk *disk, + GVirConfigDomainDiskStartupPolicy policy) +{ + const char *str; + + g_return_if_fail(GVIR_CONFIG_IS_DOMAIN_DISK(disk)); + str = gvir_config_genum_get_nick(GVIR_CONFIG_TYPE_DOMAIN_DISK_STARTUP_POLICY, policy); + g_return_if_fail(str != NULL); + gvir_config_object_add_child_with_attribute(GVIR_CONFIG_OBJECT(disk), + "source", "startupPolicy", str); +} + void gvir_config_domain_disk_set_source(GVirConfigDomainDisk *disk, const char *source) { @@ -235,6 +247,19 @@ gvir_config_domain_disk_get_snapshot_type(GVirConfigDomainDisk *disk) GVIR_CONFIG_DOMAIN_DISK_SNAPSHOT_NO); } +GVirConfigDomainDiskStartupPolicy +gvir_config_domain_disk_get_startup_policy(GVirConfigDomainDisk *disk) +{ + g_return_val_if_fail(GVIR_CONFIG_IS_DOMAIN_DISK(disk), + GVIR_CONFIG_DOMAIN_DISK_STARTUP_POLICY_MANDATORY); + + return gvir_config_object_get_attribute_genum + (GVIR_CONFIG_OBJECT(disk), + "source", "startupPolicy", + GVIR_CONFIG_TYPE_DOMAIN_DISK_STARTUP_POLICY, + GVIR_CONFIG_DOMAIN_DISK_STARTUP_POLICY_MANDATORY); +} + const char * gvir_config_domain_disk_get_source(GVirConfigDomainDisk *disk) { @@ -291,6 +316,7 @@ gvir_config_domain_disk_get_driver_cache(GVirConfigDomainDisk *disk) GVIR_CONFIG_TYPE_DOMAIN_DISK_CACHE_TYPE, GVIR_CONFIG_DOMAIN_DISK_CACHE_DEFAULT); } + GVirConfigDomainDiskBus gvir_config_domain_disk_get_target_bus(GVirConfigDomainDisk *disk) { diff --git a/libvirt-gconfig/libvirt-gconfig-domain-disk.h b/libvirt-gconfig/libvirt-gconfig-domain-disk.h index 916421d..7e85d75 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-disk.h +++ b/libvirt-gconfig/libvirt-gconfig-domain-disk.h @@ -95,6 +95,12 @@ typedef enum { GVIR_CONFIG_DOMAIN_DISK_SNAPSHOT_EXTERNAL } GVirConfigDomainDiskSnapshotType; +typedef enum { + GVIR_CONFIG_DOMAIN_DISK_STARTUP_POLICY_MANDATORY, + GVIR_CONFIG_DOMAIN_DISK_STARTUP_POLICY_REQUISITE, + GVIR_CONFIG_DOMAIN_DISK_STARTUP_POLICY_OPTIONAL +} GVirConfigDomainDiskStartupPolicy; + GType gvir_config_domain_disk_get_type(void); GVirConfigDomainDisk *gvir_config_domain_disk_new(void); @@ -107,6 +113,8 @@ void gvir_config_domain_disk_set_guest_device_type(GVirConfigDomainDisk *disk, GVirConfigDomainDiskGuestDeviceType type); void gvir_config_domain_disk_set_snapshot_type(GVirConfigDomainDisk *disk, GVirConfigDomainDiskSnapshotType type); +void gvir_config_domain_disk_set_startup_policy(GVirConfigDomainDisk *disk, + GVirConfigDomainDiskStartupPolicy policy); void gvir_config_domain_disk_set_source(GVirConfigDomainDisk *disk, const char *source); void gvir_config_domain_disk_set_driver_cache(GVirConfigDomainDisk *disk, @@ -123,6 +131,7 @@ void gvir_config_domain_disk_set_target_dev(GVirConfigDomainDisk *disk, GVirConfigDomainDiskType gvir_config_domain_disk_get_disk_type(GVirConfigDomainDisk *disk); GVirConfigDomainDiskGuestDeviceType gvir_config_domain_disk_get_guest_device_type(GVirConfigDomainDisk *disk); GVirConfigDomainDiskSnapshotType gvir_config_domain_disk_get_snapshot_type(GVirConfigDomainDisk *disk); +GVirConfigDomainDiskStartupPolicy gvir_config_domain_disk_get_startup_policy(GVirConfigDomainDisk *disk); const char *gvir_config_domain_disk_get_source(GVirConfigDomainDisk *disk); GVirConfigDomainDiskCacheType gvir_config_domain_disk_get_driver_cache(GVirConfigDomainDisk *disk); const char *gvir_config_domain_disk_get_driver_name(GVirConfigDomainDisk *disk); diff --git a/libvirt-gconfig/libvirt-gconfig.sym b/libvirt-gconfig/libvirt-gconfig.sym index 2378a3c..8dac83a 100644 --- a/libvirt-gconfig/libvirt-gconfig.sym +++ b/libvirt-gconfig/libvirt-gconfig.sym @@ -1,4 +1,4 @@ -LIBVIRT_GCONFIG_0.0.7 { +LIBVIRT_GCONFIG_0.0.8 { global: gvir_config_init_check; gvir_config_init; @@ -76,6 +76,7 @@ LIBVIRT_GCONFIG_0.0.7 { gvir_config_domain_disk_cache_type_get_type; gvir_config_domain_disk_guest_device_type_get_type; gvir_config_domain_disk_snapshot_type_get_type; + gvir_config_domain_disk_startup_policy_get_type; gvir_config_domain_disk_type_get_type; gvir_config_domain_disk_new; gvir_config_domain_disk_new_from_xml; @@ -91,6 +92,8 @@ LIBVIRT_GCONFIG_0.0.7 { gvir_config_domain_disk_set_snapshot_type; gvir_config_domain_disk_get_source; gvir_config_domain_disk_set_source; + gvir_config_domain_disk_get_startup_policy; + gvir_config_domain_disk_set_startup_policy; gvir_config_domain_disk_get_target_bus; gvir_config_domain_disk_set_target_bus; gvir_config_domain_disk_get_target_dev; diff --git a/libvirt-gconfig/tests/test-domain-create.c b/libvirt-gconfig/tests/test-domain-create.c index 4ee33aa..3d7efdc 100644 --- a/libvirt-gconfig/tests/test-domain-create.c +++ b/libvirt-gconfig/tests/test-domain-create.c @@ -106,6 +106,7 @@ int main(int argc, char **argv) gvir_config_domain_disk_set_type(disk, GVIR_CONFIG_DOMAIN_DISK_FILE); gvir_config_domain_disk_set_guest_device_type(disk, GVIR_CONFIG_DOMAIN_DISK_GUEST_DEVICE_DISK); gvir_config_domain_disk_set_source(disk, "/tmp/foo/bar"); + gvir_config_domain_disk_set_startup_policy (disk, GVIR_CONFIG_DOMAIN_DISK_STARTUP_POLICY_REQUISITE); gvir_config_domain_disk_set_driver_name(disk, "foo"); gvir_config_domain_disk_set_driver_type(disk, "bar"); gvir_config_domain_disk_set_driver_name(disk, "qemu"); @@ -117,6 +118,7 @@ int main(int argc, char **argv) g_assert(gvir_config_domain_disk_get_disk_type(disk) == GVIR_CONFIG_DOMAIN_DISK_FILE); g_assert(gvir_config_domain_disk_get_guest_device_type(disk) == GVIR_CONFIG_DOMAIN_DISK_GUEST_DEVICE_DISK); + g_assert(gvir_config_domain_disk_get_startup_policy (disk) == GVIR_CONFIG_DOMAIN_DISK_STARTUP_POLICY_REQUISITE); g_str_const_check(gvir_config_domain_disk_get_source(disk), "/tmp/foo/bar"); g_assert(gvir_config_domain_disk_get_driver_cache(disk) == GVIR_CONFIG_DOMAIN_DISK_CACHE_NONE); g_str_const_check(gvir_config_domain_disk_get_driver_name(disk), "qemu"); -- 1.7.7.6

2 3

[libvirt] [test-API PATCH 1/2] casecfgcheck: ignore flags defined in testcase flag
by Guannan Ren 13 Apr '12

13 Apr '12

When flag defined in testcase config file like as follows the casecfgcheck still trys to use flag 'clean' or 'sleep' as the key to get required_params, optional_params variables. so it reports 'KeyError' becuase no testcases named 'clean' or 'sleep' in case_params data format. The patch ignore the check for these flags. domain:start guestname fedora16 clean domain:shutdown guestname fedora16 sleep 6 domain:destroy guestname fedora16 --- casecfgcheck.py | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/casecfgcheck.py b/casecfgcheck.py index a88eb74..40d7c6e 100644 --- a/casecfgcheck.py +++ b/casecfgcheck.py @@ -33,14 +33,18 @@ class CaseCfgCheck(object): error_flag = 0 passed_testcase = [] for testcase in self.activity: - case_number += 1 if testcase in passed_testcase: continue testcase_name = testcase.keys()[0] - actual_params = testcase.values()[0] + if testcase_name == 'clean' or \ + testcase_name == 'sleep': + continue + actual_params = testcase.values()[0] required_params, optional_params = self.case_params[testcase_name] + + case_number += 1 ret = self._check_params(required_params, optional_params, actual_params) if ret: error_flag = 1 -- 1.7.7.5

2 3

[libvirt] [test-API PATCH] repo: Add test for console input and output operations
by Peter Krempa 13 Apr '12

13 Apr '12

This test checks if the console input and output work as desired. The test takes as an argument a filename, whose contents are sent to the console. The optional parameter 'expect' can be set to a filename that should contain expected output from the guest and is compared with the actual output. The optional parameter 'output' can be set to a filename where the test script saves the output of the host (useful for initial test setup). This test requires that the guest machine runs code that handles input and output on the serial console (programs such as agetty or something like that). --- repos/domain/console_io.py | 123 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 123 insertions(+), 0 deletions(-) create mode 100644 repos/domain/console_io.py diff --git a/repos/domain/console_io.py b/repos/domain/console_io.py new file mode 100644 index 0000000..98fd5b6 --- /dev/null +++ b/repos/domain/console_io.py @@ -0,0 +1,123 @@ +#!/usr/bin/env python +# test console interactions +# This test sends contents of file 'input' to the guest's console +# and reads from the console the reply and compares it to 'expect' or +# writes the output to file 'output' + +import libvirt +import signal +import os + +from libvirt import libvirtError +from exception import TestError + +required_params = ('guestname',) +optional_params = ('device', 'timeout', 'input', 'output', 'expect',) + +def alarm_handler(signum, frame): + raise TestError("Timed out while waiting for console") + +def console_io(params): + """Attach to console""" + logger = params['logger'] + guest = params['guestname'] + device = params.get('device', 'serial0') + infile = params.get('input', None) + outfile = params.get('output', None) + expect = params.get('expect', None) + timeout = params.get('timeout', 5) + + uri = params['uri'] + + #store the old signal handler + oldhandler = signal.getsignal(signal.SIGALRM) + + try: + logger.info("Connecting to hypervisor: '%s'" % uri) + conn = libvirt.open(uri) + dom = conn.lookupByName(guest) + if not dom.isActive(): + raise TestError("Guest '%s' not active" % guest) + + logger.info("Creating stream object") + stream = conn.newStream(0) + + logger.info("Open a new console connection") + dom.openConsole(device, stream, libvirt.VIR_DOMAIN_CONSOLE_FORCE) + + if infile != None: + try: + f = open(infile, 'r') + instr = f.read() + f.close() + except e: + raise TestError("Can't read input file '%s': %s" % (infile, str(e))) + + logger.info("Sending %d bytes of contents of file '%s' to console '%s'" % (len(instr), infile, device)) + stream.send(instr) + + if expect != None or outfile != None: + logger.info("Recieving data from console device. Timeout %d seconds." % timeout) + + # register a new signal handler + logger.info("Registering custom SIGALRM handler") + signal.signal(signal.SIGALRM, alarm_handler) + signal.alarm(timeout) + + reply = "" + try: + while True: + recv = stream.recv(1024) + reply += recv + except TestError: + pass + + logger.info("Recieved %d bytes." % len(reply)) + + if outfile != None: + try: + f = open(outfile, 'w') + f.write(reply) + f.close() + except e: + raise TestError("Can't write output to file '%s': %s" % (outfile, str(e))) + + if expect != None: + try: + f = open(expect, 'r') + expectstr = f.read() + f.close() + except Exception, e: + raise TestError("Can't read expected output file '%s': '%s'" % (expect, str(e))) + + if reply.startswith(expectstr): + logger.info("Recieved expected output from the host") + else: + raise TestError("Reply from the guest doesn't match with expected reply") + + except libvirtError, e: + logger.error("Libvirt call failed: " + str(e)) + ret = 1 + + except TestError, e: + logger.error("Test failed: " + str(e)) + ret = 1 + + else: + logger.info("All tests succeeded") + ret = 0 + + finally: + logger.info("Restoring signal handler") + signal.signal(signal.SIGALRM, oldhandler) + logger.info("Closing hypervisor connection") + try: + stream.abort() + except: + pass + conn.close() + + logger.info("Done") + + return ret + -- 1.7.3.4

3 2

[libvirt] [test-API PATCH 0/4]Add feature to check case file before running
by Guannan Ren 13 Apr '12

13 Apr '12

The set of patches add a new feature to examine testcase config file before running it. The framework will do the job on behalf of testcase, so test writer will release from the work. Usage: In testcase, it only needs to define two global tuple variables required_params are the mandatory options to the testcase optional_params are the optional options ... required_params = ('networkname', 'autostart') optional_params = ('optparams1', 'optparas2') def testcase(params): ... Checking results: on success, it will run these testcases defined in testcase config file on error-detected, error as follows Unknown parameter 'whoami' the No.2 : domain:testb Parameter autostart is required the No.5 : domain:testa The idea and part of code in patches is from Osier:)

3 12

[libvirt] Start of freeze for libvirt-0.9.11 and availability of rc1
by Daniel Veillard 13 Apr '12

13 Apr '12

As scheduled, we are entering the freeze for 0.9.11. I think most API additions are now commited to git upstream (please raise your voice quickly if you see something missing !) I have made a release candidate 1 tarball (and associated rpms) at ftp://libvirt.org/libvirt/libvirt-0.9.11-rc1.tar.gz and the git tree is tagged. I think I will make an release candidate 2 tarball on Wednesday, and I'm hoping for a final release on Friday, or maybe Monday if there are issues found. Please give it a try ! Stability and portability feedback are really welcome as we didn't had a release in Feb and the risk of having something messed up is slightly higher than usual ! thanks in advance, 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/

10 21

[libvirt] [PATCH 0/3] Couple of cleanups in qemu code
by Michal Privoznik 13 Apr '12

13 Apr '12

Michal Privoznik (3): qemu: Fix mem leak in qemuProcessInitCpuAffinity gitignore: Reorder alphabetically qemu: Split if condition in qemuDomainSnapshotUndoSingleDiskActive .gitignore | 6 +++--- src/qemu/qemu_driver.c | 9 +++++++-- src/qemu/qemu_process.c | 23 +++++++++++++---------- 3 files changed, 23 insertions(+), 15 deletions(-) -- 1.7.8.5

4 12

[libvirt] [libvirt-glib] Getter/setter for disk source's startupPolicy attribute
by Zeeshan Ali (Khattak) 13 Apr '12

13 Apr '12

From: "Zeeshan Ali (Khattak)" <zeeshanak(a)gnome.org> --- libvirt-gconfig/libvirt-gconfig-domain-disk.c | 26 +++++++++++++++++++++++++ libvirt-gconfig/libvirt-gconfig-domain-disk.h | 9 ++++++++ libvirt-gconfig/libvirt-gconfig.sym | 3 ++ 3 files changed, 38 insertions(+), 0 deletions(-) diff --git a/libvirt-gconfig/libvirt-gconfig-domain-disk.c b/libvirt-gconfig/libvirt-gconfig-domain-disk.c index 5d0acb5..a29ea47 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-disk.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-disk.c @@ -127,6 +127,18 @@ void gvir_config_domain_disk_set_snapshot_type(GVirConfigDomainDisk *disk, type, NULL); } +void gvir_config_domain_disk_set_startup_policy(GVirConfigDomainDisk *disk, + GVirConfigDomainDiskStartupPolicy policy) +{ + const char *str; + + g_return_if_fail(GVIR_CONFIG_IS_DOMAIN_DISK(disk)); + str = gvir_config_genum_get_nick(GVIR_CONFIG_TYPE_DOMAIN_DISK_STARTUP_POLICY, policy); + g_return_if_fail(str != NULL); + gvir_config_object_add_child_with_attribute(GVIR_CONFIG_OBJECT(disk), + "source", "startupPolicy", str); +} + void gvir_config_domain_disk_set_source(GVirConfigDomainDisk *disk, const char *source) { @@ -235,6 +247,19 @@ gvir_config_domain_disk_get_snapshot_type(GVirConfigDomainDisk *disk) GVIR_CONFIG_DOMAIN_DISK_SNAPSHOT_NO); } +GVirConfigDomainDiskStartupPolicy +gvir_config_domain_disk_get_startup_policy(GVirConfigDomainDisk *disk) +{ + g_return_val_if_fail(GVIR_CONFIG_IS_DOMAIN_DISK(disk), + GVIR_CONFIG_DOMAIN_DISK_STARTUP_POLICY_MANDATORY); + + return gvir_config_object_get_attribute_genum + (GVIR_CONFIG_OBJECT(disk), + "source", "startupPolicy", + GVIR_CONFIG_TYPE_DOMAIN_DISK_STARTUP_POLICY, + GVIR_CONFIG_DOMAIN_DISK_STARTUP_POLICY_MANDATORY); +} + const char * gvir_config_domain_disk_get_source(GVirConfigDomainDisk *disk) { @@ -291,6 +316,7 @@ gvir_config_domain_disk_get_driver_cache(GVirConfigDomainDisk *disk) GVIR_CONFIG_TYPE_DOMAIN_DISK_CACHE_TYPE, GVIR_CONFIG_DOMAIN_DISK_CACHE_DEFAULT); } + GVirConfigDomainDiskBus gvir_config_domain_disk_get_target_bus(GVirConfigDomainDisk *disk) { diff --git a/libvirt-gconfig/libvirt-gconfig-domain-disk.h b/libvirt-gconfig/libvirt-gconfig-domain-disk.h index 916421d..7e85d75 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-disk.h +++ b/libvirt-gconfig/libvirt-gconfig-domain-disk.h @@ -95,6 +95,12 @@ typedef enum { GVIR_CONFIG_DOMAIN_DISK_SNAPSHOT_EXTERNAL } GVirConfigDomainDiskSnapshotType; +typedef enum { + GVIR_CONFIG_DOMAIN_DISK_STARTUP_POLICY_MANDATORY, + GVIR_CONFIG_DOMAIN_DISK_STARTUP_POLICY_REQUISITE, + GVIR_CONFIG_DOMAIN_DISK_STARTUP_POLICY_OPTIONAL +} GVirConfigDomainDiskStartupPolicy; + GType gvir_config_domain_disk_get_type(void); GVirConfigDomainDisk *gvir_config_domain_disk_new(void); @@ -107,6 +113,8 @@ void gvir_config_domain_disk_set_guest_device_type(GVirConfigDomainDisk *disk, GVirConfigDomainDiskGuestDeviceType type); void gvir_config_domain_disk_set_snapshot_type(GVirConfigDomainDisk *disk, GVirConfigDomainDiskSnapshotType type); +void gvir_config_domain_disk_set_startup_policy(GVirConfigDomainDisk *disk, + GVirConfigDomainDiskStartupPolicy policy); void gvir_config_domain_disk_set_source(GVirConfigDomainDisk *disk, const char *source); void gvir_config_domain_disk_set_driver_cache(GVirConfigDomainDisk *disk, @@ -123,6 +131,7 @@ void gvir_config_domain_disk_set_target_dev(GVirConfigDomainDisk *disk, GVirConfigDomainDiskType gvir_config_domain_disk_get_disk_type(GVirConfigDomainDisk *disk); GVirConfigDomainDiskGuestDeviceType gvir_config_domain_disk_get_guest_device_type(GVirConfigDomainDisk *disk); GVirConfigDomainDiskSnapshotType gvir_config_domain_disk_get_snapshot_type(GVirConfigDomainDisk *disk); +GVirConfigDomainDiskStartupPolicy gvir_config_domain_disk_get_startup_policy(GVirConfigDomainDisk *disk); const char *gvir_config_domain_disk_get_source(GVirConfigDomainDisk *disk); GVirConfigDomainDiskCacheType gvir_config_domain_disk_get_driver_cache(GVirConfigDomainDisk *disk); const char *gvir_config_domain_disk_get_driver_name(GVirConfigDomainDisk *disk); diff --git a/libvirt-gconfig/libvirt-gconfig.sym b/libvirt-gconfig/libvirt-gconfig.sym index 2378a3c..f4e5fa3 100644 --- a/libvirt-gconfig/libvirt-gconfig.sym +++ b/libvirt-gconfig/libvirt-gconfig.sym @@ -76,6 +76,7 @@ LIBVIRT_GCONFIG_0.0.7 { gvir_config_domain_disk_cache_type_get_type; gvir_config_domain_disk_guest_device_type_get_type; gvir_config_domain_disk_snapshot_type_get_type; + gvir_config_domain_disk_startup_policy_get_type; gvir_config_domain_disk_type_get_type; gvir_config_domain_disk_new; gvir_config_domain_disk_new_from_xml; @@ -91,6 +92,8 @@ LIBVIRT_GCONFIG_0.0.7 { gvir_config_domain_disk_set_snapshot_type; gvir_config_domain_disk_get_source; gvir_config_domain_disk_set_source; + gvir_config_domain_disk_get_startup_policy; + gvir_config_domain_disk_set_startup_policy; gvir_config_domain_disk_get_target_bus; gvir_config_domain_disk_set_target_bus; gvir_config_domain_disk_get_target_dev; -- 1.7.7.6

3 3

Re: [libvirt] [Guidelines Change] Changes to the Packaging Guidelines
by Eric Blake 13 Apr '12

13 Apr '12

things we should be thinking about: On 04/12/2012 02:57 PM, Tom Callaway wrote: > Here is the latest set of changes to the Fedora Packaging Guidelines: > > --- > > Packages which have SysV initscripts that contain 'non-standard service > commands' (commands besides start, stop, reload, restart, or > try-restart) must convert those commands into standalone helper scripts. > Systemd does not support non-standard unit commands. > > https://fedoraproject.org/wiki/Packaging:Systemd#Unit_Files I think libvirt-guests falls into this category. > > --- > > The guidelines relating to PIE and Hardened Packages were updated. Now, > if your package meets the following critera you MUST enable the PIE > compiler flags: > > * Your package is long running. This means it's likely to be started and > keep running until the machine is rebooted, not start on demand and quit > on idle. > > * Your package has suid binaries, or binaries with capabilities. > > * Your package runs as root. > > https://fedoraproject.org/wiki/Packaging:Guidelines#PIE libvirtd definitely qualifies as one of these packages needing PIE compilation in our libvirt.spec file. > > --- > > Rules involving appropriate scripting within Fedora Package spec files > were added to the Guidelines: > > https://fedoraproject.org/wiki/Packaging:Guidelines#Scripting_inside_of_spe… Don't know if any of these changes impact us, but can't hurt to audit it. Plus, we still haven't converted our mingw specfile over to the mingw64 toolchain. Anyone up for some specfile maintenance? -- Eric Blake eblake(a)redhat.com +1-919-301-3266 Libvirt virtualization library http://libvirt.org

2 1

[libvirt] [PATCH v2] Pull DBus event code out into common area
by Daniel P. Berrange 13 Apr '12

13 Apr '12

From: "Daniel P. Berrange" <berrange(a)redhat.com> The policy kit and HAL node device drivers both require a DBus connection. The HAL device code further requires that the DBus connection is integrated with the event loop and provides such glue logic itself. The forthcoming FirewallD integration also requires a dbus connection with event loop integration. Thus we need to pull the current event loop glue out of the HAL driver. Thus we create src/util/virdbus.{c,h} files. This contains just one method virDBusGetSystemBus() which obtains a handle to the single shared system bus instance, with event glue automagically setup. --- .gitignore | 6 +- configure.ac | 37 ++++++- daemon/Makefile.am | 3 +- daemon/libvirtd.c | 4 - daemon/remote.c | 8 +- include/libvirt/virterror.h | 1 + src/Makefile.am | 13 +-- src/libvirt_dbus.syms | 2 - src/node_device/node_device_hal.c | 143 ++------------------------ src/rpc/virnetserver.c | 40 -------- src/rpc/virnetserver.h | 8 -- src/util/virdbus.c | 201 +++++++++++++++++++++++++++++++++++++ src/util/virdbus.h | 34 ++++++ src/util/virterror.c | 3 + 14 files changed, 296 insertions(+), 207 deletions(-) delete mode 100644 src/libvirt_dbus.syms create mode 100644 src/util/virdbus.c create mode 100644 src/util/virdbus.h diff --git a/.gitignore b/.gitignore index 5aa9c9b..14a21d0 100644 --- a/.gitignore +++ b/.gitignore @@ -48,12 +48,12 @@ /daemon/*_dispatch.h /daemon/libvirt_qemud /daemon/libvirtd -/daemon/libvirtd.init -/daemon/libvirtd.service /daemon/libvirtd*.logrotate /daemon/libvirtd.8 /daemon/libvirtd.8.in +/daemon/libvirtd.init /daemon/libvirtd.pod +/daemon/libvirtd.service /docs/devhelp/libvirt.devhelp /docs/hvsupport.html.in /docs/libvirt-api.xml @@ -118,6 +118,7 @@ /tests/eventtest /tests/hashtest /tests/jsontest +/tests/libvirtdconftest /tests/networkxml2argvtest /tests/nodeinfotest /tests/nwfilterxml2xmltest @@ -150,7 +151,6 @@ /tests/vmx2xmltest /tests/xencapstest /tests/xmconfigtest -/tests/libvirtdconftest /tools/*.[18] /tools/libvirt-guests.init /tools/virsh diff --git a/configure.ac b/configure.ac index 3f5b3ff..f49b620 100644 --- a/configure.ac +++ b/configure.ac @@ -74,6 +74,7 @@ LIBPCAP_REQUIRED="1.0.0" LIBNL_REQUIRED="1.1" LIBSSH2_REQUIRED="1.0" LIBBLKID_REQUIRED="2.17" +DBUS_REQUIRED="1.0.0" dnl Checks for C compiler. AC_PROG_CC @@ -1099,6 +1100,36 @@ AC_SUBST([SANLOCK_CFLAGS]) AC_SUBST([SANLOCK_LIBS]) +dnl DBus library +DBUS_CFLAGS= +DBUS_LIBS= +AC_ARG_WITH([dbus], + AC_HELP_STRING([--with-dbus], [enable communication with DBus @<:@default=check@:>@]), + [], + [with_dbus=check]) +if test "$with_dbus" = "yes" || test "$with_dbus" = "check" ; then + PKG_CHECK_MODULES(DBUS, dbus-1 >= $DBUS_REQUIRED, + [with_dbus=yes], [ + if test "$with_dbus" = "check" ; then + with_dbus=no + else + AC_MSG_ERROR([You must install DBus >= $DBUS_REQUIRED to compile libvirt]) + fi]) +fi + +if test "$with_dbus" = "yes" ; then + AC_DEFINE_UNQUOTED([HAVE_DBUS], 1, [enable communication with DBus]) + + save_LIBS="$LIBS" + save_CFLAGS="$CFLAGS" + LIBS="$LIBS $DBUS_LIBS" + CFLAGS="$CFLAGS $DBUS_CFLAGS" + AC_CHECK_FUNCS([dbus_watch_get_unix_fd]) + LIBS="$save_LIBS" + CFLAGS="$save_CFLAGS" +fi + + dnl PolicyKit library POLKIT_CFLAGS= POLKIT_LIBS= @@ -1109,7 +1140,6 @@ AC_ARG_WITH([polkit], [with_polkit=check]) with_polkit0=no -with_dbus=no with_polkit1=no if test "x$with_polkit" = "xyes" || test "x$with_polkit" = "xcheck"; then dnl Check for new polkit first - just a binary @@ -1138,8 +1168,6 @@ if test "x$with_polkit" = "xyes" || test "x$with_polkit" = "xcheck"; then [use PolicyKit for UNIX socket access checks]) AC_DEFINE_UNQUOTED([HAVE_POLKIT0], 1, [use PolicyKit for UNIX socket access checks]) - AC_DEFINE_UNQUOTED([HAVE_DBUS], 1, - [use DBus for PolicyKit]) old_CFLAGS=$CFLAGS old_LIBS=$LIBS @@ -1154,13 +1182,11 @@ if test "x$with_polkit" = "xyes" || test "x$with_polkit" = "xcheck"; then AC_DEFINE_UNQUOTED([POLKIT_AUTH],["$POLKIT_AUTH"],[Location of polkit-auth program]) fi with_polkit0="yes" - with_dbus="yes" fi fi fi AM_CONDITIONAL([HAVE_POLKIT], [test "x$with_polkit" = "xyes"]) AM_CONDITIONAL([HAVE_POLKIT0], [test "x$with_polkit0" = "xyes"]) -AM_CONDITIONAL([HAVE_DBUS], [test "x$with_dbus" = "xyes"]) AM_CONDITIONAL([HAVE_POLKIT1], [test "x$with_polkit1" = "xyes"]) AC_SUBST([POLKIT_CFLAGS]) AC_SUBST([POLKIT_LIBS]) @@ -2413,7 +2439,6 @@ if test "x$with_hal" = "xyes" || test "x$with_hal" = "xcheck"; then CFLAGS="$CFLAGS $HAL_CFLAGS" LIBS="$LIBS $HAL_LIBS" AC_CHECK_FUNCS([libhal_get_all_devices],,[with_hal=no]) - AC_CHECK_FUNCS([dbus_watch_get_unix_fd]) CFLAGS="$old_CFLAGS" LIBS="$old_LIBS" fi diff --git a/daemon/Makefile.am b/daemon/Makefile.am index 5d9f5d7..24cce8f 100644 --- a/daemon/Makefile.am +++ b/daemon/Makefile.am @@ -94,7 +94,7 @@ libvirtd_SOURCES = $(DAEMON_SOURCES) #-D_XOPEN_SOURCE=600 -D_XOPEN_SOURCE_EXTENDED=1 -D_POSIX_C_SOURCE=199506L libvirtd_CFLAGS = \ $(LIBXML_CFLAGS) $(GNUTLS_CFLAGS) $(SASL_CFLAGS) \ - $(XDR_CFLAGS) $(POLKIT_CFLAGS) \ + $(XDR_CFLAGS) $(POLKIT_CFLAGS) $(DBUS_CFLAGS) \ $(WARN_CFLAGS) \ $(COVERAGE_CFLAGS) \ -DQEMUD_PID_FILE="\"$(QEMUD_PID_FILE)\"" \ @@ -108,6 +108,7 @@ libvirtd_LDADD = \ $(LIBXML_LIBS) \ $(GNUTLS_LIBS) \ $(SASL_LIBS) \ + $(DBUS_LIBS) \ $(POLKIT_LIBS) if WITH_DTRACE_PROBES diff --git a/daemon/libvirtd.c b/daemon/libvirtd.c index ce931d4..b098f6a 100644 --- a/daemon/libvirtd.c +++ b/daemon/libvirtd.c @@ -812,7 +812,6 @@ int main(int argc, char **argv) { struct daemonConfig *config; bool privileged = geteuid() == 0 ? true : false; bool implicit_conf = false; - bool use_polkit_dbus; char *run_dir = NULL; mode_t old_umask; @@ -1008,8 +1007,6 @@ int main(int argc, char **argv) { goto cleanup; } - use_polkit_dbus = config->auth_unix_rw == REMOTE_AUTH_POLKIT || - config->auth_unix_ro == REMOTE_AUTH_POLKIT; if (!(srv = virNetServerNew(config->min_workers, config->max_workers, config->prio_workers, @@ -1018,7 +1015,6 @@ int main(int argc, char **argv) { config->keepalive_count, !!config->keepalive_required, config->mdns_adv ? config->mdns_name : NULL, - use_polkit_dbus, remoteClientInitHook))) { ret = VIR_DAEMON_ERR_INIT; goto cleanup; diff --git a/daemon/remote.c b/daemon/remote.c index b71ffa2..16a8a05 100644 --- a/daemon/remote.c +++ b/daemon/remote.c @@ -45,7 +45,7 @@ #include "virnetserver.h" #include "virfile.h" #include "virtypedparam.h" - +#include "virdbus.h" #include "remote_protocol.h" #include "qemu_protocol.h" @@ -2672,6 +2672,7 @@ remoteDispatchAuthPolkit(virNetServerPtr server, char *ident = NULL; struct daemonClientPrivate *priv = virNetServerClientGetPrivateData(client); + DBusConnection *sysbus; virMutexLock(&priv->lock); @@ -2697,10 +2698,13 @@ remoteDispatchAuthPolkit(virNetServerPtr server, goto authfail; } + if (!(sysbus = virDBusGetSystemBus())) + goto authfail; + VIR_INFO("Checking PID %lld running as %d", (long long) callerPid, callerUid); dbus_error_init(&err); - if (!(pkcaller = polkit_caller_new_from_pid(virNetServerGetDBusConn(server), + if (!(pkcaller = polkit_caller_new_from_pid(sysbus, callerPid, &err))) { VIR_ERROR(_("Failed to lookup policy kit caller: %s"), err.message); dbus_error_free(&err); diff --git a/include/libvirt/virterror.h b/include/libvirt/virterror.h index e04d29e..cda15ff 100644 --- a/include/libvirt/virterror.h +++ b/include/libvirt/virterror.h @@ -87,6 +87,7 @@ typedef enum { VIR_FROM_CAPABILITIES = 44, /* Error from capabilities */ VIR_FROM_URI = 45, /* Error from URI handling */ VIR_FROM_AUTH = 46, /* Error from auth handling */ + VIR_FROM_DBUS = 47, /* Error from DBus */ } virErrorDomain; diff --git a/src/Makefile.am b/src/Makefile.am index a2aae9d..b8a19b4 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -88,6 +88,7 @@ UTIL_SOURCES = \ util/virtypedparam.c util/virtypedparam.h \ util/xml.c util/xml.h \ util/virterror.c util/virterror_internal.h \ + util/virdbus.c util/virdbus.h \ util/virhash.c util/virhash.h \ util/virhashcode.c util/virhashcode.h \ util/virkeycode.c util/virkeycode.h \ @@ -574,10 +575,11 @@ libvirt_la_BUILT_LIBADD = libvirt_util.la libvirt_util_la_SOURCES = \ $(UTIL_SOURCES) libvirt_util_la_CFLAGS = $(CAPNG_CFLAGS) $(YAJL_CFLAGS) $(LIBNL_CFLAGS) \ - $(AM_CFLAGS) $(AUDIT_CFLAGS) $(DEVMAPPER_CFLAGS) + $(AM_CFLAGS) $(AUDIT_CFLAGS) $(DEVMAPPER_CFLAGS) \ + $(DBUS_CFLAGS) libvirt_util_la_LIBADD = $(CAPNG_LIBS) $(YAJL_LIBS) $(LIBNL_LIBS) \ $(THREAD_LIBS) $(AUDIT_LIBS) $(DEVMAPPER_LIBS) \ - $(RT_LIBS) + $(RT_LIBS) $(DBUS_LIBS) noinst_LTLIBRARIES += libvirt_conf.la @@ -1198,10 +1200,6 @@ if WITH_LINUX USED_SYM_FILES += libvirt_linux.syms endif -if HAVE_DBUS -USED_SYM_FILES += libvirt_dbus.syms -endif - if WITH_LIBVIRTD USED_SYM_FILES += libvirt_daemon.syms endif @@ -1525,7 +1523,7 @@ libvirt_lxc_LDFLAGS = $(WARN_CFLAGS) $(AM_LDFLAGS) libvirt_lxc_LDADD = $(CAPNG_LIBS) $(YAJL_LIBS) \ $(LIBXML_LIBS) $(NUMACTL_LIBS) $(THREAD_LIBS) \ $(LIBNL_LIBS) $(AUDIT_LIBS) $(DEVMAPPER_LIBS) \ - $(RT_LIBS) \ + $(RT_LIBS) $(DBUS_LIBS) \ ../gnulib/lib/libgnu.la if WITH_DTRACE_PROBES libvirt_lxc_LDADD += probes.o @@ -1542,6 +1540,7 @@ libvirt_lxc_CFLAGS = \ $(CAPNG_CFLAGS) \ $(YAJL_CFLAGS) \ $(AUDIT_CFLAGS) \ + $(DBUS_CFLAGS) \ -I$(top_srcdir)/src/conf \ $(AM_CFLAGS) if HAVE_LIBBLKID diff --git a/src/libvirt_dbus.syms b/src/libvirt_dbus.syms deleted file mode 100644 index a460ec5..0000000 --- a/src/libvirt_dbus.syms +++ /dev/null @@ -1,2 +0,0 @@ -# virnetserver.h -virNetServerGetDBusConn; diff --git a/src/node_device/node_device_hal.c b/src/node_device/node_device_hal.c index a028886..dd14271 100644 --- a/src/node_device/node_device_hal.c +++ b/src/node_device/node_device_hal.c @@ -39,6 +39,7 @@ #include "logging.h" #include "node_device_driver.h" #include "ignore-value.h" +#include "virdbus.h" #define VIR_FROM_THIS VIR_FROM_NODEDEV @@ -586,124 +587,15 @@ static void device_prop_modified(LibHalContext *ctx ATTRIBUTE_UNUSED, } -static void dbus_watch_callback(int fdatch ATTRIBUTE_UNUSED, - int fd ATTRIBUTE_UNUSED, - int events, void *opaque) -{ - DBusWatch *watch = opaque; - LibHalContext *hal_ctx; - DBusConnection *dbus_conn; - int dbus_flags = 0; - - if (events & VIR_EVENT_HANDLE_READABLE) - dbus_flags |= DBUS_WATCH_READABLE; - if (events & VIR_EVENT_HANDLE_WRITABLE) - dbus_flags |= DBUS_WATCH_WRITABLE; - if (events & VIR_EVENT_HANDLE_ERROR) - dbus_flags |= DBUS_WATCH_ERROR; - if (events & VIR_EVENT_HANDLE_HANGUP) - dbus_flags |= DBUS_WATCH_HANGUP; - - (void)dbus_watch_handle(watch, dbus_flags); - - nodeDeviceLock(driverState); - hal_ctx = DRV_STATE_HAL_CTX(driverState); - dbus_conn = libhal_ctx_get_dbus_connection(hal_ctx); - nodeDeviceUnlock(driverState); - while (dbus_connection_dispatch(dbus_conn) == DBUS_DISPATCH_DATA_REMAINS) - /* keep dispatching while data remains */; -} - - -static int xlate_dbus_watch_flags(int dbus_flags) -{ - unsigned int flags = 0; - if (dbus_flags & DBUS_WATCH_READABLE) - flags |= VIR_EVENT_HANDLE_READABLE; - if (dbus_flags & DBUS_WATCH_WRITABLE) - flags |= VIR_EVENT_HANDLE_WRITABLE; - if (dbus_flags & DBUS_WATCH_ERROR) - flags |= VIR_EVENT_HANDLE_ERROR; - if (dbus_flags & DBUS_WATCH_HANGUP) - flags |= VIR_EVENT_HANDLE_HANGUP; - return flags; -} - - -struct nodeDeviceWatchInfo -{ - int watch; -}; - -static void nodeDeviceWatchFree(void *data) { - struct nodeDeviceWatchInfo *info = data; - VIR_FREE(info); -} - -static dbus_bool_t add_dbus_watch(DBusWatch *watch, - void *data ATTRIBUTE_UNUSED) -{ - int flags = 0; - int fd; - struct nodeDeviceWatchInfo *info; - - if (VIR_ALLOC(info) < 0) - return 0; - - if (dbus_watch_get_enabled(watch)) - flags = xlate_dbus_watch_flags(dbus_watch_get_flags(watch)); - -#if HAVE_DBUS_WATCH_GET_UNIX_FD - fd = dbus_watch_get_unix_fd(watch); -#else - fd = dbus_watch_get_fd(watch); -#endif - info->watch = virEventAddHandle(fd, flags, dbus_watch_callback, - watch, NULL); - if (info->watch < 0) { - VIR_FREE(info); - return 0; - } - dbus_watch_set_data(watch, info, nodeDeviceWatchFree); - - return 1; -} - - -static void remove_dbus_watch(DBusWatch *watch, - void *data ATTRIBUTE_UNUSED) -{ - struct nodeDeviceWatchInfo *info; - - info = dbus_watch_get_data(watch); - - (void)virEventRemoveHandle(info->watch); -} - - -static void toggle_dbus_watch(DBusWatch *watch, - void *data ATTRIBUTE_UNUSED) -{ - int flags = 0; - struct nodeDeviceWatchInfo *info; - - if (dbus_watch_get_enabled(watch)) - flags = xlate_dbus_watch_flags(dbus_watch_get_flags(watch)); - - info = dbus_watch_get_data(watch); - - (void)virEventUpdateHandle(info->watch, flags); -} static int halDeviceMonitorStartup(int privileged ATTRIBUTE_UNUSED) { LibHalContext *hal_ctx = NULL; - DBusConnection *dbus_conn = NULL; - DBusError err; char **udi = NULL; int num_devs, i; int ret = -1; + DBusConnection *sysbus; /* Ensure caps_tbl is sorted by capability name */ qsort(caps_tbl, ARRAY_CARDINALITY(caps_tbl), sizeof(caps_tbl[0]), @@ -718,26 +610,19 @@ static int halDeviceMonitorStartup(int privileged ATTRIBUTE_UNUSED) } nodeDeviceLock(driverState); - /* Allocate and initialize a new HAL context */ - dbus_connection_set_change_sigpipe(FALSE); - dbus_threads_init_default(); + if (!(sysbus == virDBusGetSystemBus())) { + virErrorPtr err = virGetLastError(); + VIR_ERROR(_("DBus not available, disabling HAL driver: %s", + err->message)); + ret = 0; + goto failure; + } - dbus_error_init(&err); hal_ctx = libhal_ctx_new(); if (hal_ctx == NULL) { VIR_ERROR(_("libhal_ctx_new returned NULL")); goto failure; } - dbus_conn = dbus_bus_get(DBUS_BUS_SYSTEM, &err); - if (dbus_conn == NULL) { - VIR_ERROR(_("dbus_bus_get failed")); - /* We don't want to show a fatal error here, - otherwise entire libvirtd shuts down when - D-Bus isn't running */ - ret = 0; - goto failure; - } - dbus_connection_set_exit_on_disconnect(dbus_conn, FALSE); if (!libhal_ctx_set_dbus_connection(hal_ctx, dbus_conn)) { VIR_ERROR(_("libhal_ctx_set_dbus_connection failed")); @@ -752,16 +637,6 @@ static int halDeviceMonitorStartup(int privileged ATTRIBUTE_UNUSED) goto failure; } - /* Register dbus watch callbacks */ - if (!dbus_connection_set_watch_functions(dbus_conn, - add_dbus_watch, - remove_dbus_watch, - toggle_dbus_watch, - NULL, NULL)) { - VIR_ERROR(_("dbus_connection_set_watch_functions failed")); - goto failure; - } - /* Populate with known devices */ driverState->privateData = hal_ctx; diff --git a/src/rpc/virnetserver.c b/src/rpc/virnetserver.c index f761e6b..3965fc2 100644 --- a/src/rpc/virnetserver.c +++ b/src/rpc/virnetserver.c @@ -39,9 +39,6 @@ #if HAVE_AVAHI # include "virnetservermdns.h" #endif -#if HAVE_DBUS -# include <dbus/dbus.h> -#endif #define VIR_FROM_THIS VIR_FROM_RPC #define virNetError(code, ...) \ @@ -88,10 +85,6 @@ struct _virNetServer { virNetServerMDNSGroupPtr mdnsGroup; #endif -#if HAVE_DBUS - DBusConnection *sysbus; -#endif - size_t nservices; virNetServerServicePtr *services; @@ -311,7 +304,6 @@ virNetServerPtr virNetServerNew(size_t min_workers, unsigned int keepaliveCount, bool keepaliveRequired, const char *mdnsGroupName, - bool connectDBus ATTRIBUTE_UNUSED, virNetServerClientInitHook clientInitHook) { virNetServerPtr srv; @@ -353,25 +345,6 @@ virNetServerPtr virNetServerNew(size_t min_workers, } #endif -#if HAVE_DBUS - if (connectDBus) { - DBusError derr; - - dbus_connection_set_change_sigpipe(FALSE); - dbus_threads_init_default(); - - dbus_error_init(&derr); - srv->sysbus = dbus_bus_get(DBUS_BUS_SYSTEM, &derr); - if (!(srv->sysbus)) { - VIR_ERROR(_("Failed to connect to system bus for PolicyKit auth: %s"), - derr.message); - dbus_error_free(&derr); - goto error; - } - dbus_connection_set_exit_on_disconnect(srv->sysbus, FALSE); - } -#endif - if (virMutexInit(&srv->lock) < 0) { virNetError(VIR_ERR_INTERNAL_ERROR, "%s", _("cannot initialize mutex")); @@ -429,14 +402,6 @@ bool virNetServerIsPrivileged(virNetServerPtr srv) } -#if HAVE_DBUS -DBusConnection* virNetServerGetDBusConn(virNetServerPtr srv) -{ - return srv->sysbus; -} -#endif - - void virNetServerAutoShutdown(virNetServerPtr srv, unsigned int timeout, virNetServerAutoShutdownFunc func, @@ -828,11 +793,6 @@ void virNetServerFree(virNetServerPtr srv) virNetServerMDNSFree(srv->mdns); #endif -#if HAVE_DBUS - if (srv->sysbus) - dbus_connection_unref(srv->sysbus); -#endif - virNetServerUnlock(srv); virMutexDestroy(&srv->lock); VIR_FREE(srv); diff --git a/src/rpc/virnetserver.h b/src/rpc/virnetserver.h index a04ffdd..0ebe00e 100644 --- a/src/rpc/virnetserver.h +++ b/src/rpc/virnetserver.h @@ -25,9 +25,6 @@ # define __VIR_NET_SERVER_H__ # include <signal.h> -# if HAVE_DBUS -# include <dbus/dbus.h> -# endif # include "virnettlscontext.h" # include "virnetserverprogram.h" @@ -45,7 +42,6 @@ virNetServerPtr virNetServerNew(size_t min_workers, unsigned int keepaliveCount, bool keepaliveRequired, const char *mdnsGroupName, - bool connectDBus, virNetServerClientInitHook clientInitHook); typedef int (*virNetServerAutoShutdownFunc)(virNetServerPtr srv, void *opaque); @@ -54,10 +50,6 @@ void virNetServerRef(virNetServerPtr srv); bool virNetServerIsPrivileged(virNetServerPtr srv); -# if HAVE_DBUS -DBusConnection* virNetServerGetDBusConn(virNetServerPtr srv); -# endif - void virNetServerAutoShutdown(virNetServerPtr srv, unsigned int timeout, virNetServerAutoShutdownFunc func, diff --git a/src/util/virdbus.c b/src/util/virdbus.c new file mode 100644 index 0000000..badfe8c --- /dev/null +++ b/src/util/virdbus.c @@ -0,0 +1,201 @@ +/* + * virdbus.c: helper for using DBus + * + * Copyright (C) 2012 Red Hat, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + */ + +#include <config.h> + +#include "virdbus.h" +#include "memory.h" +#include "virterror_internal.h" +#include "logging.h" +#include "threads.h" + +#define VIR_FROM_THIS VIR_FROM_DBUS + +#define virDBusReportError(code, ...) \ + virReportErrorHelper(VIR_FROM_THIS, code, __FILE__, \ + __FUNCTION__, __LINE__, __VA_ARGS__) + +#ifdef HAVE_DBUS + +static DBusConnection *systembus = NULL; +static virOnceControl once = VIR_ONCE_CONTROL_INITIALIZER; +static DBusError dbuserr; + +static dbus_bool_t virDBusAddWatch(DBusWatch *watch, void *data); +static void virDBusRemoveWatch(DBusWatch *watch, void *data); +static void virDBusToggleWatch(DBusWatch *watch, void *data); + +static void virDBusSystemBusInit(void) +{ + /* Allocate and initialize a new HAL context */ + dbus_connection_set_change_sigpipe(FALSE); + dbus_threads_init_default(); + + dbus_error_init(&dbuserr); + if (!(systembus = dbus_bus_get(DBUS_BUS_SYSTEM, &dbuserr))) + return; + + dbus_connection_set_exit_on_disconnect(systembus, FALSE); + + /* Register dbus watch callbacks */ + if (!dbus_connection_set_watch_functions(systembus, + virDBusAddWatch, + virDBusRemoveWatch, + virDBusToggleWatch, + NULL, NULL)) { + systembus = NULL; + return; + } +} + + +DBusConnection *virDBusGetSystemBus(void) +{ + if (virOnce(&once, virDBusSystemBusInit) < 0) { + virDBusReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Unable to run one time DBus initializer")); + return NULL; + } + + if (!systembus) { + virDBusReportError(VIR_ERR_INTERNAL_ERROR, + _("Unable to get DBus system bus connection: %s"), + dbuserr.message ? dbuserr.message : "watch setup failed"); + return NULL; + } + + return systembus; +} + + +static void virDBusWatchCallback(int fdatch ATTRIBUTE_UNUSED, + int fd ATTRIBUTE_UNUSED, + int events, void *opaque) +{ + DBusWatch *watch = opaque; + int dbus_flags = 0; + + if (events & VIR_EVENT_HANDLE_READABLE) + dbus_flags |= DBUS_WATCH_READABLE; + if (events & VIR_EVENT_HANDLE_WRITABLE) + dbus_flags |= DBUS_WATCH_WRITABLE; + if (events & VIR_EVENT_HANDLE_ERROR) + dbus_flags |= DBUS_WATCH_ERROR; + if (events & VIR_EVENT_HANDLE_HANGUP) + dbus_flags |= DBUS_WATCH_HANGUP; + + (void)dbus_watch_handle(watch, dbus_flags); + + while (dbus_connection_dispatch(systembus) == DBUS_DISPATCH_DATA_REMAINS) + /* keep dispatching while data remains */; +} + + +static int virDBusTranslateWatchFlags(int dbus_flags) +{ + unsigned int flags = 0; + if (dbus_flags & DBUS_WATCH_READABLE) + flags |= VIR_EVENT_HANDLE_READABLE; + if (dbus_flags & DBUS_WATCH_WRITABLE) + flags |= VIR_EVENT_HANDLE_WRITABLE; + if (dbus_flags & DBUS_WATCH_ERROR) + flags |= VIR_EVENT_HANDLE_ERROR; + if (dbus_flags & DBUS_WATCH_HANGUP) + flags |= VIR_EVENT_HANDLE_HANGUP; + return flags; +} + + +struct virDBusWatch +{ + int watch; +}; + +static void virDBusWatchFree(void *data) { + struct virDBusWatch *info = data; + VIR_FREE(info); +} + +static dbus_bool_t virDBusAddWatch(DBusWatch *watch, + void *data ATTRIBUTE_UNUSED) +{ + int flags = 0; + int fd; + struct virDBusWatch *info; + + if (VIR_ALLOC(info) < 0) + return 0; + + if (dbus_watch_get_enabled(watch)) + flags = virDBusTranslateWatchFlags(dbus_watch_get_flags(watch)); + +# if HAVE_DBUS_WATCH_GET_UNIX_FD + fd = dbus_watch_get_unix_fd(watch); +# else + fd = dbus_watch_get_fd(watch); +# endif + info->watch = virEventAddHandle(fd, flags, + virDBusWatchCallback, + watch, NULL); + if (info->watch < 0) { + VIR_FREE(info); + return 0; + } + dbus_watch_set_data(watch, info, virDBusWatchFree); + + return 1; +} + + +static void virDBusRemoveWatch(DBusWatch *watch, + void *data ATTRIBUTE_UNUSED) +{ + struct virDBusWatch *info; + + info = dbus_watch_get_data(watch); + + (void)virEventRemoveHandle(info->watch); +} + + +static void virDBusToggleWatch(DBusWatch *watch, + void *data ATTRIBUTE_UNUSED) +{ + int flags = 0; + struct virDBusWatch *info; + + if (dbus_watch_get_enabled(watch)) + flags = virDBusTranslateWatchFlags(dbus_watch_get_flags(watch)); + + info = dbus_watch_get_data(watch); + + (void)virEventUpdateHandle(info->watch, flags); +} + +#else /* ! HAVE_DBUS */ +DBusConnection *virDBusGetSystemBus(void) +{ + virDBusReportError(VIR_ERR_INTERNAL_ERROR, + "%s", _("DBus support not compiled into this binary")); + return NULL; +} + +#endif /* ! HAVE_DBUS */ diff --git a/src/util/virdbus.h b/src/util/virdbus.h new file mode 100644 index 0000000..7d9ec8f --- /dev/null +++ b/src/util/virdbus.h @@ -0,0 +1,34 @@ +/* + * virdbus.h: helper for using DBus + * + * Copyright (C) 2012 Red Hat, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + */ + +#ifndef __VIR_DBUS_H__ +# define __VIR_DBUS_H__ + +# ifdef HAVE_DBUS +# include <dbus/dbus.h> +# else +# define DBusConnection void +# endif +# include "internal.h" + +DBusConnection *virDBusGetSystemBus(void); + +#endif /* __VIR_DBUS_H__ */ diff --git a/src/util/virterror.c b/src/util/virterror.c index ff9a36f..de45bb0 100644 --- a/src/util/virterror.c +++ b/src/util/virterror.c @@ -184,6 +184,9 @@ static const char *virErrorDomainName(virErrorDomain domain) { case VIR_FROM_AUTH: dom = "Auth "; break; + case VIR_FROM_DBUS: + dom = "DBus "; + break; } return dom; } -- 1.7.7.6

2 2

[libvirt] [PATCH] xend_internal: Use domain/status for shutdown check
by Stefan Bader 12 Apr '12

12 Apr '12

As promised this version does keep the domid < 0 check in order to be clearly keeping the old behavior. -Stefan >From 18d398d98dc0dc2d9148ffb8673c651248d1bca5 Mon Sep 17 00:00:00 2001 From: Stefan Bader <stefan.bader(a)canonical.com> Date: Thu, 12 Apr 2012 09:59:56 +0000 Subject: [PATCH] xend_internal: Use domain/status for shutdown check On newer xend (v3.x and after) there is no state and domid reported for inactive domains. When initially creating connections this is handled in various places by assigning domain->id = -1. But once an instance has been running, the id is set to the current domain id. And it does not change when the instance is shut down. So when querying the domain info, the hypervisor driver, which gets asked first will indicate it cannot find information, then the xend driver is asked and will set the status to NOSTATE because it checks for the -1 domain id. Checking domain/status for 0 seems to be more reliable for that. One note: I am not sure whether the domain->id also should get set back to -1 whenever any sub-driver thinks the instance is no longer running. BugLink: https://bugzilla.redhat.com/show_bug.cgi?id=746007 BugLink: http://bugs.launchpad.net/bugs/929626 [v2: Keep old id check just in case] Signed-off-by: Stefan Bader <stefan.bader(a)canonical.com> --- src/xen/xend_internal.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/xen/xend_internal.c b/src/xen/xend_internal.c index 6526af4..f1aa9b6 100644 --- a/src/xen/xend_internal.c +++ b/src/xen/xend_internal.c @@ -989,9 +989,14 @@ sexpr_to_xend_domain_state(virDomainPtr domain, const struct sexpr *root) state = VIR_DOMAIN_BLOCKED; else if (strchr(flags, 'r')) state = VIR_DOMAIN_RUNNING; - } else if (domain->id < 0) { - /* Inactive domains don't have a state reported, so - mark them SHUTOFF, rather than NOSTATE */ + } else if (domain->id < 0 || sexpr_int(root, "domain/status") == 0) { + /* As far as I can see the domain->id is a bad sign for checking + * inactive domains as this is inaccurate after the domain has + * been running once. However domain/status from xend seems to + * be always present and 0 for inactive domains. + * (keeping the check for id < 0 to be extra safe about backward + * compatibility) + */ state = VIR_DOMAIN_SHUTOFF; } -- 1.7.9.5

3 2

[libvirt] [PATCH] Pull DBus event code out into common area
by Daniel P. Berrange 12 Apr '12

12 Apr '12

From: "Daniel P. Berrange" <berrange(a)redhat.com> The policy kit and HAL node device drivers both require a DBus connection. The HAL device code further requires that the DBus connection is integrated with the event loop and provides such glue logic itself. The forthcoming FirewallD integration also requires a dbus connection with event loop integration. Thus we need to pull the current event loop glue out of the HAL driver. Thus we create src/util/virdbus.{c,h} files. This contains just one method virDBusGetSystemBus() which obtains a handle to the single shared system bus instance, with event glue automagically setup. NB, I have not actually tested this on a system with HAL or PolicyKit-0 installed, so it may well not compile. Hopefully someone on list has a suitable system where they can test those two. If not, I'll install a VM next week to test it in. --- .gitignore | 6 ++-- configure.ac | 3 +- daemon/Makefile.am | 3 +- daemon/libvirtd.c | 4 --- src/Makefile.am | 3 +- src/rpc/virnetserver.c | 6 ---- src/rpc/virnetserver.h | 4 --- src/util/virdbus.c | 68 ++++++++++++++++++++++------------------------- 8 files changed, 40 insertions(+), 57 deletions(-) diff --git a/.gitignore b/.gitignore index 5aa9c9b..14a21d0 100644 --- a/.gitignore +++ b/.gitignore @@ -48,12 +48,12 @@ /daemon/*_dispatch.h /daemon/libvirt_qemud /daemon/libvirtd -/daemon/libvirtd.init -/daemon/libvirtd.service /daemon/libvirtd*.logrotate /daemon/libvirtd.8 /daemon/libvirtd.8.in +/daemon/libvirtd.init /daemon/libvirtd.pod +/daemon/libvirtd.service /docs/devhelp/libvirt.devhelp /docs/hvsupport.html.in /docs/libvirt-api.xml @@ -118,6 +118,7 @@ /tests/eventtest /tests/hashtest /tests/jsontest +/tests/libvirtdconftest /tests/networkxml2argvtest /tests/nodeinfotest /tests/nwfilterxml2xmltest @@ -150,7 +151,6 @@ /tests/vmx2xmltest /tests/xencapstest /tests/xmconfigtest -/tests/libvirtdconftest /tools/*.[18] /tools/libvirt-guests.init /tools/virsh diff --git a/configure.ac b/configure.ac index 3863119..f49b620 100644 --- a/configure.ac +++ b/configure.ac @@ -1116,9 +1116,8 @@ if test "$with_dbus" = "yes" || test "$with_dbus" = "check" ; then AC_MSG_ERROR([You must install DBus >= $DBUS_REQUIRED to compile libvirt]) fi]) fi -echo ">>>>>>>>>> $with_dbus <<<<<<<<<<<<<<<<<" + if test "$with_dbus" = "yes" ; then -echo ">>>>>>>>>> $with_dbus <<<<<<<<<<<<<<<<<" AC_DEFINE_UNQUOTED([HAVE_DBUS], 1, [enable communication with DBus]) save_LIBS="$LIBS" diff --git a/daemon/Makefile.am b/daemon/Makefile.am index 5d9f5d7..24cce8f 100644 --- a/daemon/Makefile.am +++ b/daemon/Makefile.am @@ -94,7 +94,7 @@ libvirtd_SOURCES = $(DAEMON_SOURCES) #-D_XOPEN_SOURCE=600 -D_XOPEN_SOURCE_EXTENDED=1 -D_POSIX_C_SOURCE=199506L libvirtd_CFLAGS = \ $(LIBXML_CFLAGS) $(GNUTLS_CFLAGS) $(SASL_CFLAGS) \ - $(XDR_CFLAGS) $(POLKIT_CFLAGS) \ + $(XDR_CFLAGS) $(POLKIT_CFLAGS) $(DBUS_CFLAGS) \ $(WARN_CFLAGS) \ $(COVERAGE_CFLAGS) \ -DQEMUD_PID_FILE="\"$(QEMUD_PID_FILE)\"" \ @@ -108,6 +108,7 @@ libvirtd_LDADD = \ $(LIBXML_LIBS) \ $(GNUTLS_LIBS) \ $(SASL_LIBS) \ + $(DBUS_LIBS) \ $(POLKIT_LIBS) if WITH_DTRACE_PROBES diff --git a/daemon/libvirtd.c b/daemon/libvirtd.c index ce931d4..b098f6a 100644 --- a/daemon/libvirtd.c +++ b/daemon/libvirtd.c @@ -812,7 +812,6 @@ int main(int argc, char **argv) { struct daemonConfig *config; bool privileged = geteuid() == 0 ? true : false; bool implicit_conf = false; - bool use_polkit_dbus; char *run_dir = NULL; mode_t old_umask; @@ -1008,8 +1007,6 @@ int main(int argc, char **argv) { goto cleanup; } - use_polkit_dbus = config->auth_unix_rw == REMOTE_AUTH_POLKIT || - config->auth_unix_ro == REMOTE_AUTH_POLKIT; if (!(srv = virNetServerNew(config->min_workers, config->max_workers, config->prio_workers, @@ -1018,7 +1015,6 @@ int main(int argc, char **argv) { config->keepalive_count, !!config->keepalive_required, config->mdns_adv ? config->mdns_name : NULL, - use_polkit_dbus, remoteClientInitHook))) { ret = VIR_DAEMON_ERR_INIT; goto cleanup; diff --git a/src/Makefile.am b/src/Makefile.am index c6b7033..b8a19b4 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1523,7 +1523,7 @@ libvirt_lxc_LDFLAGS = $(WARN_CFLAGS) $(AM_LDFLAGS) libvirt_lxc_LDADD = $(CAPNG_LIBS) $(YAJL_LIBS) \ $(LIBXML_LIBS) $(NUMACTL_LIBS) $(THREAD_LIBS) \ $(LIBNL_LIBS) $(AUDIT_LIBS) $(DEVMAPPER_LIBS) \ - $(RT_LIBS) \ + $(RT_LIBS) $(DBUS_LIBS) \ ../gnulib/lib/libgnu.la if WITH_DTRACE_PROBES libvirt_lxc_LDADD += probes.o @@ -1540,6 +1540,7 @@ libvirt_lxc_CFLAGS = \ $(CAPNG_CFLAGS) \ $(YAJL_CFLAGS) \ $(AUDIT_CFLAGS) \ + $(DBUS_CFLAGS) \ -I$(top_srcdir)/src/conf \ $(AM_CFLAGS) if HAVE_LIBBLKID diff --git a/src/rpc/virnetserver.c b/src/rpc/virnetserver.c index 0e0edd3..3965fc2 100644 --- a/src/rpc/virnetserver.c +++ b/src/rpc/virnetserver.c @@ -304,7 +304,6 @@ virNetServerPtr virNetServerNew(size_t min_workers, unsigned int keepaliveCount, bool keepaliveRequired, const char *mdnsGroupName, - bool connectDBus ATTRIBUTE_UNUSED, virNetServerClientInitHook clientInitHook) { virNetServerPtr srv; @@ -794,11 +793,6 @@ void virNetServerFree(virNetServerPtr srv) virNetServerMDNSFree(srv->mdns); #endif -#if HAVE_DBUS - if (srv->sysbus) - dbus_connection_unref(srv->sysbus); -#endif - virNetServerUnlock(srv); virMutexDestroy(&srv->lock); VIR_FREE(srv); diff --git a/src/rpc/virnetserver.h b/src/rpc/virnetserver.h index a9dec18..0ebe00e 100644 --- a/src/rpc/virnetserver.h +++ b/src/rpc/virnetserver.h @@ -25,9 +25,6 @@ # define __VIR_NET_SERVER_H__ # include <signal.h> -# if HAVE_DBUS -# include <dbus/dbus.h> -# endif # include "virnettlscontext.h" # include "virnetserverprogram.h" @@ -45,7 +42,6 @@ virNetServerPtr virNetServerNew(size_t min_workers, unsigned int keepaliveCount, bool keepaliveRequired, const char *mdnsGroupName, - bool connectDBus, virNetServerClientInitHook clientInitHook); typedef int (*virNetServerAutoShutdownFunc)(virNetServerPtr srv, void *opaque); diff --git a/src/util/virdbus.c b/src/util/virdbus.c index 636cd45..badfe8c 100644 --- a/src/util/virdbus.c +++ b/src/util/virdbus.c @@ -22,6 +22,10 @@ #include <config.h> #include "virdbus.h" +#include "memory.h" +#include "virterror_internal.h" +#include "logging.h" +#include "threads.h" #define VIR_FROM_THIS VIR_FROM_DBUS @@ -33,7 +37,7 @@ static DBusConnection *systembus = NULL; static virOnceControl once = VIR_ONCE_CONTROL_INITIALIZER; -static DBusError err; +static DBusError dbuserr; static dbus_bool_t virDBusAddWatch(DBusWatch *watch, void *data); static void virDBusRemoveWatch(DBusWatch *watch, void *data); @@ -41,24 +45,21 @@ static void virDBusToggleWatch(DBusWatch *watch, void *data); static void virDBusSystemBusInit(void) { - DBusConnection *dbus_conn = NULL; - DBusError err; - /* Allocate and initialize a new HAL context */ dbus_connection_set_change_sigpipe(FALSE); dbus_threads_init_default(); - dbus_error_init(&err); - if (!(systembus = dbus_bus_get(DBUS_BUS_SYSTEM, &err))) + dbus_error_init(&dbuserr); + if (!(systembus = dbus_bus_get(DBUS_BUS_SYSTEM, &dbuserr))) return; dbus_connection_set_exit_on_disconnect(systembus, FALSE); /* Register dbus watch callbacks */ if (!dbus_connection_set_watch_functions(systembus, - add_dbus_watch, - remove_dbus_watch, - toggle_dbus_watch, + virDBusAddWatch, + virDBusRemoveWatch, + virDBusToggleWatch, NULL, NULL)) { systembus = NULL; return; @@ -77,7 +78,7 @@ DBusConnection *virDBusGetSystemBus(void) if (!systembus) { virDBusReportError(VIR_ERR_INTERNAL_ERROR, _("Unable to get DBus system bus connection: %s"), - err->message ? err->message : "watch setup failed"); + dbuserr.message ? dbuserr.message : "watch setup failed"); return NULL; } @@ -85,13 +86,11 @@ DBusConnection *virDBusGetSystemBus(void) } -static void dbus_watch_callback(int fdatch ATTRIBUTE_UNUSED, - int fd ATTRIBUTE_UNUSED, - int events, void *opaque) +static void virDBusWatchCallback(int fdatch ATTRIBUTE_UNUSED, + int fd ATTRIBUTE_UNUSED, + int events, void *opaque) { DBusWatch *watch = opaque; - LibHalContext *hal_ctx; - DBusConnection *dbus_conn; int dbus_flags = 0; if (events & VIR_EVENT_HANDLE_READABLE) @@ -105,16 +104,12 @@ static void dbus_watch_callback(int fdatch ATTRIBUTE_UNUSED, (void)dbus_watch_handle(watch, dbus_flags); - nodeDeviceLock(driverState); - hal_ctx = DRV_STATE_HAL_CTX(driverState); - dbus_conn = libhal_ctx_get_dbus_connection(hal_ctx); - nodeDeviceUnlock(driverState); - while (dbus_connection_dispatch(dbus_conn) == DBUS_DISPATCH_DATA_REMAINS) + while (dbus_connection_dispatch(systembus) == DBUS_DISPATCH_DATA_REMAINS) /* keep dispatching while data remains */; } -static int xlate_dbus_watch_flags(int dbus_flags) +static int virDBusTranslateWatchFlags(int dbus_flags) { unsigned int flags = 0; if (dbus_flags & DBUS_WATCH_READABLE) @@ -129,50 +124,51 @@ static int xlate_dbus_watch_flags(int dbus_flags) } -struct nodeDeviceWatchInfo +struct virDBusWatch { int watch; }; -static void nodeDeviceWatchFree(void *data) { - struct nodeDeviceWatchInfo *info = data; +static void virDBusWatchFree(void *data) { + struct virDBusWatch *info = data; VIR_FREE(info); } -static dbus_bool_t add_dbus_watch(DBusWatch *watch, +static dbus_bool_t virDBusAddWatch(DBusWatch *watch, void *data ATTRIBUTE_UNUSED) { int flags = 0; int fd; - struct nodeDeviceWatchInfo *info; + struct virDBusWatch *info; if (VIR_ALLOC(info) < 0) return 0; if (dbus_watch_get_enabled(watch)) - flags = xlate_dbus_watch_flags(dbus_watch_get_flags(watch)); + flags = virDBusTranslateWatchFlags(dbus_watch_get_flags(watch)); # if HAVE_DBUS_WATCH_GET_UNIX_FD fd = dbus_watch_get_unix_fd(watch); # else fd = dbus_watch_get_fd(watch); # endif - info->watch = virEventAddHandle(fd, flags, dbus_watch_callback, + info->watch = virEventAddHandle(fd, flags, + virDBusWatchCallback, watch, NULL); if (info->watch < 0) { VIR_FREE(info); return 0; } - dbus_watch_set_data(watch, info, nodeDeviceWatchFree); + dbus_watch_set_data(watch, info, virDBusWatchFree); return 1; } -static void remove_dbus_watch(DBusWatch *watch, - void *data ATTRIBUTE_UNUSED) +static void virDBusRemoveWatch(DBusWatch *watch, + void *data ATTRIBUTE_UNUSED) { - struct nodeDeviceWatchInfo *info; + struct virDBusWatch *info; info = dbus_watch_get_data(watch); @@ -180,14 +176,14 @@ static void remove_dbus_watch(DBusWatch *watch, } -static void toggle_dbus_watch(DBusWatch *watch, - void *data ATTRIBUTE_UNUSED) +static void virDBusToggleWatch(DBusWatch *watch, + void *data ATTRIBUTE_UNUSED) { int flags = 0; - struct nodeDeviceWatchInfo *info; + struct virDBusWatch *info; if (dbus_watch_get_enabled(watch)) - flags = xlate_dbus_watch_flags(dbus_watch_get_flags(watch)); + flags = virDBusTranslateWatchFlags(dbus_watch_get_flags(watch)); info = dbus_watch_get_data(watch); -- 1.7.7.6

2 2

[libvirt] Sys-Virt and libvirt, question
by Jason Helfman 12 Apr '12

12 Apr '12

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 Hi, I was wondering if Sys-Virt needs to coincide with an update to libvirt? A fellow committer at FreeBSD is running the latest Sys-Virt against the latest libvirt and is getting this error: http://meatwad.mouf.net/tb/errors/9-STABLE-amd64-FreeBSD/p5-Sys-Virt-0.9.10… Thanks! - -jgh - -- Jason Helfman System Administrator experts-exchange.com http://www.experts-exchange.com/M_4830110.html E4AD 7CF1 1396 27F6 79DD 4342 5E92 AD66 8C8C FBA5 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (FreeBSD) iF4EAREIAAYFAk+HDfYACgkQXpKtZoyM+6UidQD8CKAsKrz9+W4iTFxf8SJOkgtz 8HTX8kWhuEPnA65CqeoA/0p4ncg3j08GWFNT+K66bk/8BaAXIzIpZifivuDN9bxM =CbDk -----END PGP SIGNATURE-----

2 1

[libvirt] [PATCH] qemu, util fix netlink callback registration for migration
by D. Herrendoerfer 12 Apr '12

12 Apr '12

From: "D. Herrendoerfer" <d.herrendoerfer(a)herrendoerfer.name> This patch adds a netlink callback when migrating a VEPA enabled virtual machine. It fixes a Bug where a VM would not request a port association when it was cleared by lldpad. This patch requires the latest git version of lldpad to work. Signed-off-by: D. Herrendoerfer <d.herrendoerfer(a)herrendoerfer.name> --- src/qemu/qemu_migration.c | 6 ++++++ src/util/virnetdevmacvlan.c | 14 +++++++++++++- src/util/virnetdevmacvlan.h | 8 ++++++++ 3 files changed, 27 insertions(+), 1 deletions(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 77d40c0..7a8a7c4 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -2654,6 +2654,12 @@ qemuMigrationVPAssociatePortProfiles(virDomainDefPtr def) { def->uuid, VIR_NETDEV_VPORT_PROFILE_OP_MIGRATE_IN_FINISH, false) < 0) goto err_exit; + + if (virNetDevMacVLanVPortProfileRegisterCallback(net->ifname, net->mac, + virDomainNetGetActualDirectDev(net), def->uuid, + virDomainNetGetActualVirtPortProfile(net), + VIR_NETDEV_VPORT_PROFILE_OP_CREATE)) + goto err_exit; } last_good_net = i; } diff --git a/src/util/virnetdevmacvlan.c b/src/util/virnetdevmacvlan.c index 90888b0..b259e00 100644 --- a/src/util/virnetdevmacvlan.c +++ b/src/util/virnetdevmacvlan.c @@ -769,7 +769,7 @@ virNetDevMacVLanVPortProfileDestroyCallback(int watch ATTRIBUTE_UNUSED, virNetlinkCallbackDataFree((virNetlinkCallbackDataPtr)opaque); } -static int +int virNetDevMacVLanVPortProfileRegisterCallback(const char *ifname, const unsigned char *macaddress, const char *linkdev, @@ -1125,4 +1125,16 @@ int virNetDevMacVLanRestartWithVPortProfile(const char *cr_ifname ATTRIBUTE_UNUS _("Cannot create macvlan devices on this platform")); return -1; } + +int virNetDevMacVLanVPortProfileRegisterCallback(const char *ifname ATTRIBUTE_UNUSED, + const unsigned char *macaddress ATTRIBUTE_UNUSED, + const char *linkdev ATTRIBUTE_UNUSED, + const unsigned char *vmuuid ATTRIBUTE_UNUSED, + virNetDevVPortProfilePtr virtPortProfile ATTRIBUTE_UNUSED, + enum virNetDevVPortProfileOp vmOp ATTRIBUTE_UNUSED) +{ + virReportSystemError(ENOSYS, "%s", + _("Cannot create macvlan devices on this platform")); + return -1; +} #endif /* ! WITH_MACVTAP */ diff --git a/src/util/virnetdevmacvlan.h b/src/util/virnetdevmacvlan.h index 14640cf..2299f1d 100644 --- a/src/util/virnetdevmacvlan.h +++ b/src/util/virnetdevmacvlan.h @@ -84,4 +84,12 @@ int virNetDevMacVLanRestartWithVPortProfile(const char *cr_ifname, ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3) ATTRIBUTE_NONNULL(4) ATTRIBUTE_NONNULL(5) ATTRIBUTE_RETURN_CHECK; +int virNetDevMacVLanVPortProfileRegisterCallback(const char *ifname, + const unsigned char *macaddress , + const char *linkdev, + const unsigned char *vmuuid, + virNetDevVPortProfilePtr virtPortProfile, + enum virNetDevVPortProfileOp vmOp) +ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3) +ATTRIBUTE_NONNULL(4) ATTRIBUTE_NONNULL(5) ATTRIBUTE_RETURN_CHECK; #endif /* __UTIL_MACVTAP_H__ */ -- 1.7.7.6

2 1

[libvirt] [PATCH] qemu_agent: Report error class at least
by Michal Privoznik 12 Apr '12

12 Apr '12

Currently, qemu GA is not providing 'desc' field for errors like we are used to from qemu monitor. Therefore, we fall back to this general 'unknown error' string. However, GA is reporting 'class' which is not perfect, but much more helpful than generic error string. Thus we should fall back to class firstly and if even no class is presented, then we can fall back to that generic string. Before this patch: virsh # dompmsuspend --target mem f16 error: Domain f16 could not be suspended error: internal error unable to execute QEMU command 'guest-suspend-ram': unknown QEMU command error After this patch: virsh # dompmsuspend --target mem f16 error: Domain f16 could not be suspended error: internal error unable to execute QEMU command 'guest-suspend-ram': CommandNotFound --- src/qemu/qemu_agent.c | 14 ++++++-------- 1 files changed, 6 insertions(+), 8 deletions(-) diff --git a/src/qemu/qemu_agent.c b/src/qemu/qemu_agent.c index b759b7f..decfd0e 100644 --- a/src/qemu/qemu_agent.c +++ b/src/qemu/qemu_agent.c @@ -1035,19 +1035,17 @@ static const char * qemuAgentStringifyError(virJSONValuePtr error) { const char *klass = virJSONValueObjectGetString(error, "class"); - const char *detail = NULL; + const char *detail = virJSONValueObjectGetString(error, "desc"); /* The QMP 'desc' field is usually sufficient for our generic - * error reporting needs. + * error reporting needs. However, older agents did not provide + * any 'desc'. Reporting 'class' is not perfect but better + * than bare 'unknown error'. */ - if (klass) - detail = virJSONValueObjectGetString(error, "desc"); - - - if (!detail) + if (!detail && !klass) detail = "unknown QEMU command error"; - return detail; + return detail ? detail : klass; } static const char * -- 1.7.8.5

2 2

[libvirt] [PATCH] qemuOpenFile: Don't force chown on NFS
by Michal Privoznik 12 Apr '12

12 Apr '12

If dynamic_ownership is off and we are creating a file on NFS we force chown. This will fail as chown/chmod are not supported on NFS. However, with no dynamic_ownership we are not required to do any chown. --- src/qemu/qemu_driver.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index d9e35be..1b55eb1 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -2429,6 +2429,7 @@ qemuOpenFile(struct qemud_driver *driver, const char *path, int oflags, bool bypass_security = false; unsigned int vfoflags = 0; int fd = -1; + int path_shared = virStorageFileIsSharedFS(path); uid_t uid = getuid(); gid_t gid = getgid(); @@ -2437,7 +2438,12 @@ qemuOpenFile(struct qemud_driver *driver, const char *path, int oflags, * in the failure case */ if (oflags & O_CREAT) { need_unlink = true; - vfoflags |= VIR_FILE_OPEN_FORCE_OWNER; + + /* Don't force chown on network-shared FS + * as it is likely to fail. */ + if (path_shared <= 0 || driver->dynamicOwnership) + vfoflags |= VIR_FILE_OPEN_FORCE_OWNER; + if (stat(path, &sb) == 0) { is_reg = !!S_ISREG(sb.st_mode); /* If the path is regular file which exists @@ -2475,7 +2481,7 @@ qemuOpenFile(struct qemud_driver *driver, const char *path, int oflags, } /* On Linux we can also verify the FS-type of the directory. */ - switch (virStorageFileIsSharedFS(path)) { + switch (path_shared) { case 1: /* it was on a network share, so we'll continue * as outlined above -- 1.7.8.5

3 5

[libvirt] [libvirt-glib] Explicitly link conn-test against libvirt-gconfig libvirt-glib
by Guido Günther 12 Apr '12

12 Apr '12

otherwise the build fails with: $ CCLD conn-test ../libvirt-gobject/.libs/libvirt-gobject-1.0.so: undefined reference to `gvir_config_domain_new_from_xml(a)LIBVIRT_GCONFIG_0.0.4' ../libvirt-gobject/.libs/libvirt-gobject-1.0.so: undefined reference to `gvir_set_error(a)LIBVIRT_GLIB_0.0.4' ../libvirt-gobject/.libs/libvirt-gobject-1.0.so: undefined reference to `gvir_config_network_new_from_xml(a)LIBVIRT_GCONFIG_0.0.4' ../libvirt-gobject/.libs/libvirt-gobject-1.0.so: undefined reference to `gvir_config_storage_pool_new_from_xml(a)LIBVIRT_GCONFIG_0.0.4' ../libvirt-gobject/.libs/libvirt-gobject-1.0.so: undefined reference to `gvir_config_init_check(a)LIBVIRT_GCONFIG_0.0.4' ../libvirt-gobject/.libs/libvirt-gobject-1.0.so: undefined reference to `gvir_config_domain_get_type(a)LIBVIRT_GCONFIG_0.0.4' ../libvirt-gobject/.libs/libvirt-gobject-1.0.so: undefined reference to `gvir_config_object_to_xml(a)LIBVIRT_GCONFIG_0.0.4' ../libvirt-gobject/.libs/libvirt-gobject-1.0.so: undefined reference to `gvir_event_register(a)LIBVIRT_GLIB_0.0.4' ../libvirt-gobject/.libs/libvirt-gobject-1.0.so: undefined reference to `gvir_init_check(a)LIBVIRT_GLIB_0.0.4' ../libvirt-gobject/.libs/libvirt-gobject-1.0.so: undefined reference to `gvir_config_domain_get_devices(a)LIBVIRT_GCONFIG_0.0.4' ../libvirt-gobject/.libs/libvirt-gobject-1.0.so: undefined reference to `gvir_config_storage_vol_new_from_xml(a)LIBVIRT_GCONFIG_0.0.4' ../libvirt-gobject/.libs/libvirt-gobject-1.0.so: undefined reference to `gvir_config_secret_new_from_xml(a)LIBVIRT_GCONFIG_0.0.4' ../libvirt-gobject/.libs/libvirt-gobject-1.0.so: undefined reference to `gvir_config_interface_new_from_xml(a)LIBVIRT_GCONFIG_0.0.4' ../libvirt-gobject/.libs/libvirt-gobject-1.0.so: undefined reference to `gvir_config_domain_disk_get_type(a)LIBVIRT_GCONFIG_0.0.4' ../libvirt-gobject/.libs/libvirt-gobject-1.0.so: undefined reference to `gvir_config_domain_disk_get_target_dev(a)LIBVIRT_GCONFIG_0.0.4' ../libvirt-gobject/.libs/libvirt-gobject-1.0.so: undefined reference to `gvir_config_domain_interface_get_type(a)LIBVIRT_GCONFIG_0.0.4' ../libvirt-gobject/.libs/libvirt-gobject-1.0.so: undefined reference to `gvir_config_node_device_new_from_xml(a)LIBVIRT_GCONFIG_0.0.4' ../libvirt-gobject/.libs/libvirt-gobject-1.0.so: undefined reference to `gvir_config_domain_device_get_type(a)LIBVIRT_GCONFIG_0.0.4' ../libvirt-gobject/.libs/libvirt-gobject-1.0.so: undefined reference to `gvir_config_object_get_type(a)LIBVIRT_GCONFIG_0.0.4' ../libvirt-gobject/.libs/libvirt-gobject-1.0.so: undefined reference to `gvir_error_new_literal(a)LIBVIRT_GLIB_0.0.4' ../libvirt-gobject/.libs/libvirt-gobject-1.0.so: undefined reference to `gvir_config_domain_snapshot_new_from_xml(a)LIBVIRT_GCONFIG_0.0.4' ../libvirt-gobject/.libs/libvirt-gobject-1.0.so: undefined reference to `gvir_config_network_filter_new_from_xml(a)LIBVIRT_GCONFIG_0.0.4' ../libvirt-gobject/.libs/libvirt-gobject-1.0.so: undefined reference to `gvir_set_error_literal(a)LIBVIRT_GLIB_0.0.4' ../libvirt-gobject/.libs/libvirt-gobject-1.0.so: undefined reference to `gvir_config_domain_interface_get_ifname(a)LIBVIRT_GCONFIG_0.0.4' collect2: ld returned 1 exit status --- examples/Makefile.am | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/examples/Makefile.am b/examples/Makefile.am index b77076d..37a8447 100644 --- a/examples/Makefile.am +++ b/examples/Makefile.am @@ -25,6 +25,8 @@ conn_test_SOURCES = \ conn-test.c conn_test_LDADD = \ ../libvirt-gobject/libvirt-gobject-1.0.la \ + ../libvirt-gconfig/libvirt-gconfig-1.0.la \ + ../libvirt-glib/libvirt-glib-1.0.la \ $(LIBVIRT_LIBS) \ $(GLIB2_LIBS) \ $(GOBJECT2_LIBS) -- 1.7.9.1

2 4

[libvirt] Add USB controller support
by Christophe Fergeau 12 Apr '12

12 Apr '12

Hey, Here is the second version of the patch series implementing USB controller support in libvirt-gconfig. There's a bug fixed in GVirConfigDomainAddressUsb creation (type="usb" was missing) as well as a few small bug fixes/changes in the test program. I also added an additional patch implementing a gvir_config_domain_setup_default_usb_controllers to make adding usb controllers easier following Marc-André's suggestion. Christophe

4 26

[libvirt] [PATCHv2] daemon: Plug memory leaks
by Alex Jia 12 Apr '12

12 Apr '12

* daemon/libvirtd-config.c (daemonConfigFree): fix memory leaks. How to reproduce? % make && make -C tests check TESTS=libvirtdconftest % cd tests && valgrind -v --leak-check=full ./libvirtdconftest actual result: ==11008== 185 bytes in 5 blocks are definitely lost in loss record 3 of 5 ==11008== at 0x4A05FDE: malloc (vg_replace_malloc.c:236) ==11008== by 0x39CF07F6E1: strdup (strdup.c:43) ==11008== by 0x406626: daemonConfigLoadOptions (libvirtd-config.c:438) ==11008== by 0x406800: daemonConfigLoadData (libvirtd-config.c:492) ==11008== by 0x403CCF: testCorrupt (libvirtdconftest.c:110) ==11008== by 0x404FAD: virtTestRun (testutils.c:145) ==11008== by 0x403A34: mymain (libvirtdconftest.c:219) ==11008== by 0x404687: virtTestMain (testutils.c:700) ==11008== by 0x39CF01ECDC: (below main) (libc-start.c:226) ==11008== ==11008== LEAK SUMMARY: ==11008== definitely lost: 185 bytes in 5 blocks Signed-off-by: Alex Jia <ajia(a)redhat.com> --- daemon/libvirtd-config.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/daemon/libvirtd-config.c b/daemon/libvirtd-config.c index 4d041f0..471236c 100644 --- a/daemon/libvirtd-config.c +++ b/daemon/libvirtd-config.c @@ -358,6 +358,7 @@ daemonConfigFree(struct daemonConfig *data) VIR_FREE(data->cert_file); VIR_FREE(data->crl_file); + VIR_FREE(data->host_uuid); VIR_FREE(data->log_filters); VIR_FREE(data->log_outputs); -- 1.7.1

2 2

[libvirt] [PATCH] daemon: Plug memory leaks
by Alex Jia 12 Apr '12

12 Apr '12

Detected by valgrind. Leaks are introduced in commit 6e6e9be. * daemon/libvirtd-config.c (macro GET_CONF_STR): fix memory leaks. How to reproduce? % make && make -C tests check TESTS=libvirtdconftest % cd tests && valgrind -v --leak-check=full ./libvirtdconftest actual result: ==11008== 185 bytes in 5 blocks are definitely lost in loss record 3 of 5 ==11008== at 0x4A05FDE: malloc (vg_replace_malloc.c:236) ==11008== by 0x39CF07F6E1: strdup (strdup.c:43) ==11008== by 0x406626: daemonConfigLoadOptions (libvirtd-config.c:438) ==11008== by 0x406800: daemonConfigLoadData (libvirtd-config.c:492) ==11008== by 0x403CCF: testCorrupt (libvirtdconftest.c:110) ==11008== by 0x404FAD: virtTestRun (testutils.c:145) ==11008== by 0x403A34: mymain (libvirtdconftest.c:219) ==11008== by 0x404687: virtTestMain (testutils.c:700) ==11008== by 0x39CF01ECDC: (below main) (libc-start.c:226) ==11008== ==11008== LEAK SUMMARY: ==11008== definitely lost: 185 bytes in 5 blocks Signed-off-by: Alex Jia <ajia(a)redhat.com> --- daemon/libvirtd-config.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/daemon/libvirtd-config.c b/daemon/libvirtd-config.c index 4d041f0..0a4323a 100644 --- a/daemon/libvirtd-config.c +++ b/daemon/libvirtd-config.c @@ -152,6 +152,7 @@ checkType (virConfValuePtr p, const char *filename, virReportOOMError(); \ goto error; \ } \ + VIR_FREE(data->var_name); \ } \ } while (0) -- 1.7.1

2 2

[libvirt] [test-API PATCH 0/5] Destroy class definition in utils.py
by Osier Yang 12 Apr '12

12 Apr '12

These five patches are to change utils.py into a collection of functions. And cleanup all of existing testcase to use the functions in it directly. (1) Destroy Utils class definition (2) Remove "util = utils.Utils()" (3) Substitue "util." with "utils." (4) Remove useless utils import "from utils import utils" in testcases where none of functions in utils.py is called In testcase from utils import utils ... utils.functions(...) ...

2 10

[libvirt] [PATCH 0/5] fix block job bugs relative to upstream qemu
by Eric Blake 12 Apr '12

12 Apr '12

The following 5 patches are ready for review and application to libvirt now, since they correspond to features that are currently in the qemu 1.1 tree. (I've split these less-controversial parts from v4 of my larger storage migration series [1]; so that this series has no dependency on the yet-to-be-determined 'drive-mirror' semantics). [1]https://www.redhat.com/archives/libvir-list/2012-April/msg00330.html Patch 1 is new, and matches a qemu patch taken just today. Patch 2 matches 2/18 in the block migration series, with some tweaks to defer any qemu changes till later, as well as wording improvements in the documentation to match the behavior implemented by this series. Patch 3 matches an independent patch I sent earlier today, updated to resolve review comments from that version. Patch 4 matches 3/18 in the block migration series, with modifications to now account for both RHEL 6.2 and qemu 1.1 behaviors. I've altered this so much from Adam's original that I claimed authorship, although I've left his Signed-off-by for the initial implementation. Patch 5 matches 4/18 in the block migration series, with minor tweaks due to rebasing. Later, I will repost a v5 of my storage migration series based on top of this one. Adam Litke (1): blockjob: add API for async virDomainBlockJobAbort Eric Blake (4): blockjob: add qemu capabilities related to block pull jobs blockjob: optimize JSON event handler lookup blockjob: wire up qemu async virDomainBlockJobAbort blockjob: allow for fast-finishing job include/libvirt/libvirt.h.in | 10 +++ src/libvirt.c | 13 +++- src/qemu/qemu_capabilities.c | 3 + src/qemu/qemu_capabilities.h | 2 + src/qemu/qemu_driver.c | 106 ++++++++++++++++++++----- src/qemu/qemu_monitor.c | 11 ++- src/qemu/qemu_monitor.h | 8 +- src/qemu/qemu_monitor_json.c | 179 +++++++++++++++++++++++++++--------------- src/qemu/qemu_monitor_json.h | 4 +- tools/virsh.c | 51 ++++++++----- tools/virsh.pod | 35 ++++++--- 11 files changed, 300 insertions(+), 122 deletions(-) -- 1.7.7.6

2 14

[libvirt] [PATCH] qemu: optimize JSON event handler lookup
by Eric Blake 11 Apr '12

11 Apr '12

Probably in the noise, but this will let us scale more efficiently as we recognize ever more qemu events. * src/qemu/qemu_monitor_json.c (eventHandlers): Sort. (eventSearch): New helper function. (qemuMonitorJSONIOProcessEvent): Optimize event lookup. --- In reply to: https://www.redhat.com/archives/libvir-list/2012-April/msg00416.html src/qemu/qemu_monitor_json.c | 55 +++++++++++++++++++++++------------------ 1 files changed, 31 insertions(+), 24 deletions(-) diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index 7c893d4..d142517 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -67,37 +67,45 @@ static void qemuMonitorJSONHandlePMSuspend(qemuMonitorPtr mon, virJSONValuePtr d static void qemuMonitorJSONHandleBlockJobCompleted(qemuMonitorPtr mon, virJSONValuePtr data); static void qemuMonitorJSONHandleBlockJobCanceled(qemuMonitorPtr mon, virJSONValuePtr data); -static struct { +typedef struct { const char *type; void (*handler)(qemuMonitorPtr mon, virJSONValuePtr data); -} eventHandlers[] = { - { "SHUTDOWN", qemuMonitorJSONHandleShutdown, }, - { "RESET", qemuMonitorJSONHandleReset, }, +} qemuEventHandler; +static qemuEventHandler eventHandlers[] = { + { "BLOCK_IO_ERROR", qemuMonitorJSONHandleIOError, }, + { "BLOCK_JOB_CANCELLED", qemuMonitorJSONHandleBlockJobCanceled, }, + { "BLOCK_JOB_COMPLETED", qemuMonitorJSONHandleBlockJobCompleted, }, + { "DEVICE_TRAY_MOVED", qemuMonitorJSONHandleTrayChange, }, { "POWERDOWN", qemuMonitorJSONHandlePowerdown, }, - { "STOP", qemuMonitorJSONHandleStop, }, + { "RESET", qemuMonitorJSONHandleReset, }, { "RTC_CHANGE", qemuMonitorJSONHandleRTCChange, }, - { "WATCHDOG", qemuMonitorJSONHandleWatchdog, }, - { "BLOCK_IO_ERROR", qemuMonitorJSONHandleIOError, }, - { "VNC_CONNECTED", qemuMonitorJSONHandleVNCConnect, }, - { "VNC_INITIALIZED", qemuMonitorJSONHandleVNCInitialize, }, - { "VNC_DISCONNECTED", qemuMonitorJSONHandleVNCDisconnect, }, + { "SHUTDOWN", qemuMonitorJSONHandleShutdown, }, { "SPICE_CONNECTED", qemuMonitorJSONHandleSPICEConnect, }, - { "SPICE_INITIALIZED", qemuMonitorJSONHandleSPICEInitialize, }, { "SPICE_DISCONNECTED", qemuMonitorJSONHandleSPICEDisconnect, }, - { "DEVICE_TRAY_MOVED", qemuMonitorJSONHandleTrayChange, }, - { "WAKEUP", qemuMonitorJSONHandlePMWakeup, }, + { "SPICE_INITIALIZED", qemuMonitorJSONHandleSPICEInitialize, }, + { "STOP", qemuMonitorJSONHandleStop, }, { "SUSPEND", qemuMonitorJSONHandlePMSuspend, }, - { "BLOCK_JOB_COMPLETED", qemuMonitorJSONHandleBlockJobCompleted, }, - { "BLOCK_JOB_CANCELLED", qemuMonitorJSONHandleBlockJobCanceled, }, + { "VNC_CONNECTED", qemuMonitorJSONHandleVNCConnect, }, + { "VNC_DISCONNECTED", qemuMonitorJSONHandleVNCDisconnect, }, + { "VNC_INITIALIZED", qemuMonitorJSONHandleVNCInitialize, }, + { "WAKEUP", qemuMonitorJSONHandlePMWakeup, }, + { "WATCHDOG", qemuMonitorJSONHandleWatchdog, }, + /* We use bsearch, so keep this list sorted. */ }; +static int +eventSearch(const void *key, const void *elt) { + const char *type = key; + const qemuEventHandler *handler = elt; + return strcmp(type, handler->type); +} static int qemuMonitorJSONIOProcessEvent(qemuMonitorPtr mon, virJSONValuePtr obj) { const char *type; - int i; + qemuEventHandler *handler; VIR_DEBUG("mon=%p obj=%p", mon, obj); type = virJSONValueObjectGetString(obj, "event"); @@ -107,14 +115,13 @@ qemuMonitorJSONIOProcessEvent(qemuMonitorPtr mon, return -1; } - for (i = 0 ; i < ARRAY_CARDINALITY(eventHandlers) ; i++) { - if (STREQ(eventHandlers[i].type, type)) { - virJSONValuePtr data = virJSONValueObjectGet(obj, "data"); - VIR_DEBUG("handle %s handler=%p data=%p", type, - eventHandlers[i].handler, data); - (eventHandlers[i].handler)(mon, data); - break; - } + handler = bsearch(type, eventHandlers, ARRAY_CARDINALITY(eventHandlers), + sizeof(eventHandlers[0]), eventSearch); + if (handler) { + virJSONValuePtr data = virJSONValueObjectGet(obj, "data"); + VIR_DEBUG("handle %s handler=%p data=%p", type, + handler->handler, data); + (handler->handler)(mon, data); } return 0; } -- 1.7.7.6

2 2

[libvirt] [libvirt-glib] libvirt-gconfig: Move symbols introduced post 0.0.4 to the correct versions
by Guido Günther 11 Apr '12

11 Apr '12

Triggered by http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=667683 --- If this looks correct I'll have a look at libvirt-glib and libvirt-gobject too. -- Guido libvirt-gconfig/libvirt-gconfig.sym | 50 +++++++++++++++++++++++------------ 1 files changed, 33 insertions(+), 17 deletions(-) diff --git a/libvirt-gconfig/libvirt-gconfig.sym b/libvirt-gconfig/libvirt-gconfig.sym index 717c3c9..405ad98 100644 --- a/libvirt-gconfig/libvirt-gconfig.sym +++ b/libvirt-gconfig/libvirt-gconfig.sym @@ -14,10 +14,6 @@ LIBVIRT_GCONFIG_0.0.4 { gvir_config_domain_new; gvir_config_domain_new_from_xml; gvir_config_domain_set_clock; - gvir_config_domain_set_custom_xml; - gvir_config_domain_get_custom_xml; - gvir_config_domain_get_description; - gvir_config_domain_set_description; gvir_config_domain_get_devices; gvir_config_domain_set_devices; gvir_config_domain_get_features; @@ -51,10 +47,6 @@ LIBVIRT_GCONFIG_0.0.4 { gvir_config_domain_chardev_source_pty_new_from_xml; gvir_config_domain_source_pty_set_path; - gvir_config_domain_chardev_source_spicevmc_get_type; - gvir_config_domain_chardev_source_spicevmc_new; - gvir_config_domain_chardev_source_spicevmc_new_from_xml; - gvir_config_domain_clock_get_type; gvir_config_domain_clock_offset_get_type; gvir_config_domain_clock_new; @@ -79,8 +71,6 @@ LIBVIRT_GCONFIG_0.0.4 { gvir_config_domain_disk_type_get_type; gvir_config_domain_disk_new; gvir_config_domain_disk_new_from_xml; - gvir_config_domain_disk_get_driver_cache; - gvir_config_domain_disk_set_driver_cache; gvir_config_domain_disk_get_driver_name; gvir_config_domain_disk_set_driver_name; gvir_config_domain_disk_get_driver_type; @@ -96,7 +86,6 @@ LIBVIRT_GCONFIG_0.0.4 { gvir_config_domain_disk_get_target_dev; gvir_config_domain_disk_set_target_dev; gvir_config_domain_disk_get_disk_type; - gvir_config_domain_disk_set_readonly; gvir_config_domain_disk_set_type; gvir_config_domain_filesys_get_type; @@ -146,13 +135,9 @@ LIBVIRT_GCONFIG_0.0.4 { gvir_config_domain_interface_get_type; gvir_config_domain_interface_link_state_get_type; gvir_config_domain_interface_set_ifname; - gvir_config_domain_interface_get_ifname; gvir_config_domain_interface_set_link_state; - gvir_config_domain_interface_get_link_state; gvir_config_domain_interface_set_mac; - gvir_config_domain_interface_get_mac; gvir_config_domain_interface_set_model; - gvir_config_domain_interface_get_model; gvir_config_domain_interface_bridge_get_type; gvir_config_domain_interface_bridge_new; @@ -327,8 +312,39 @@ LIBVIRT_GCONFIG_0.0.4 { gvir_config_xml_doc_get_type; gvir_config_xml_doc_new; - local: - *; }; +LIBVIRT_GCONFIG_0.0.5 { + global: + gvir_config_domain_disk_get_driver_cache; + gvir_config_domain_disk_set_driver_cache; + + gvir_config_domain_disk_set_readonly; + + gvir_config_domain_set_custom_xml; + gvir_config_domain_get_custom_xml; + gvir_config_domain_get_description; + gvir_config_domain_set_description; +} LIBVIRT_GCONFIG_0.0.4; + +LIBVIRT_GCONFIG_0.0.6 { + global: + gvir_config_domain_interface_get_ifname; + gvir_config_domain_interface_get_link_state; + gvir_config_domain_interface_get_mac; + gvir_config_domain_interface_get_model; +} LIBVIRT_GCONFIG_0.0.5; + +LIBVIRT_GCONFIG_0.0.7 { + global: + gvir_config_domain_chardev_source_spicevmc_get_type; + gvir_config_domain_chardev_source_spicevmc_new; + gvir_config_domain_chardev_source_spicevmc_new_from_xml; +} LIBVIRT_GCONFIG_0.0.6; + # .... define new API here using predicted next version number .... + +LIBVIRT_GCONFIG_PRIVATE_0.0.7 { + local: + *; +}; -- 1.7.9.1

3 9

[libvirt] USB redirection support
by Christophe Fergeau 11 Apr '12

11 Apr '12

Hey, This patch series adds the needed classes for apps to be able to use USB redirection. I've followed http://hansdegoede.livejournal.com/11084.html and added all the API needed to be able to get the same XML. However, I'm not 100% sure all these attributes are required, in particular the various addresses. Given that for now libvirt-gconfig users tend to reuse what test-domain-create does, it would be useful to know which parts are required and which are not to get working USB redirection. Thanks, Christophe

2 15

[libvirt] [PATCH] qemu: Fix deadlock when qemuDomainOpenConsole cleans up a connection
by Peter Krempa 11 Apr '12

11 Apr '12

The new safe console handling introduced a possibility to deadlock the qemu driver when a new console connection forcibly disconnects a previous console stream that belongs to an already closed connection. The virStreamFree function calls subsequently a the virReleaseConnect function that tries to lock the driver while discarding the connection, but the driver was already locked in qemuDomainOpenConsole. Backtrace of the deadlocked thread: 0 0x00007f66e5aa7f14 in __lll_lock_wait () from /lib64/libpthread.so.0 1 0x00007f66e5aa3411 in _L_lock_500 () from /lib64/libpthread.so.0 2 0x00007f66e5aa322a in pthread_mutex_lock () from/lib64/libpthread.so.0 3 0x0000000000462bbd in qemudClose () 4 0x00007f66e6e178eb in virReleaseConnect () from/usr/lib64/libvirt.so.0 5 0x00007f66e6e19c8c in virUnrefStream () from /usr/lib64/libvirt.so.0 6 0x00007f66e6e3d1de in virStreamFree () from /usr/lib64/libvirt.so.0 7 0x00007f66e6e09a5d in virConsoleHashEntryFree () from/usr/lib64/libvirt.so.0 8 0x00007f66e6db7282 in virHashRemoveEntry () from/usr/lib64/libvirt.so.0 9 0x00007f66e6e09c4e in virConsoleOpen () from /usr/lib64/libvirt.so.0 10 0x00000000004526e9 in qemuDomainOpenConsole () 11 0x00007f66e6e421f1 in virDomainOpenConsole () from/usr/lib64/libvirt.so.0 12 0x00000000004361e4 in remoteDispatchDomainOpenConsoleHelper () 13 0x00007f66e6e80375 in virNetServerProgramDispatch () from/usr/lib64/libvirt.so.0 14 0x00007f66e6e7ae11 in virNetServerHandleJob () from/usr/lib64/libvirt.so.0 15 0x00007f66e6da897d in virThreadPoolWorker () from/usr/lib64/libvirt.so.0 16 0x00007f66e6da7ff6 in virThreadHelper () from/usr/lib64/libvirt.so.0 17 0x00007f66e5aa0c5c in start_thread () from /lib64/libpthread.so.0 18 0x00007f66e57e7fcd in clone () from /lib64/libc.so.6 * src/qemu/qemu_driver.c: qemuDomainOpenConsole() -- unlock the qemu driver right after acquiring the domain object --- Found while writing tests for the libvirt-test-API, its 100% reproducible: 1: Start a domain with serial console and run "cat" on this console 2: download python reproducer: http://files.pipo.sk/console_deadlock.py 3: set guest name in the script 4: run the reproducer and "virsh console 'guestname' --force" after that 5: <deadlocked> 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 d9e35be..e18e72d 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -11494,6 +11494,7 @@ qemuDomainOpenConsole(virDomainPtr dom, qemuDriverLock(driver); virUUIDFormat(dom->uuid, uuidstr); vm = virDomainFindByUUID(&driver->domains, dom->uuid); + qemuDriverUnlock(driver); if (!vm) { qemuReportError(VIR_ERR_NO_DOMAIN, _("no domain with matching uuid '%s'"), uuidstr); @@ -11558,7 +11559,6 @@ qemuDomainOpenConsole(virDomainPtr dom, cleanup: if (vm) virDomainObjUnlock(vm); - qemuDriverUnlock(driver); return ret; } -- 1.7.3.4

2 2

[libvirt] Etsy uses Libvirt... :)
by Justin Clift 10 Apr '12

10 Apr '12

Hey everyone, Just noticed that Etsy uses libvirt: http://codeascraft.etsy.com/2012/03/13/making-it-virtually-easy-to-deploy-o… Of specific note, there's this bit: "Libvirt supports live migrations across non-shared storage (in QEMU 0.12.2+) with zero downtime which makes it easy to allocate and balance VM’s across hosts if adjustments need to be made throughout the pool." Seems like a win, eh? :) Regards and best wishes, Justin Clift -- Aeolus Community Manager http://www.aeolusproject.org

2 3

[libvirt] [PATCH 1/2] qemu: Track job owner for better debugging
by Jiri Denemark 10 Apr '12

10 Apr '12

In case an API fails with "cannot acquire state change lock", searching for the API that possibly forgot to end its job is not always easy. Let's keep track of the job owner and print it out for easier identification. --- src/qemu/qemu_domain.c | 53 +++++++++++++++++++++++++++++++++++++++++++++ src/qemu/qemu_domain.h | 4 +++ src/qemu/qemu_migration.c | 1 + src/qemu/qemu_process.c | 6 +--- 4 files changed, 60 insertions(+), 4 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index da1f57f..7f1f8ee 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -147,6 +147,7 @@ qemuDomainObjResetJob(qemuDomainObjPrivatePtr priv) struct qemuDomainJobObj *job = &priv->job; job->active = QEMU_JOB_NONE; + job->owner = 0; } static void @@ -155,6 +156,7 @@ qemuDomainObjResetAsyncJob(qemuDomainObjPrivatePtr priv) struct qemuDomainJobObj *job = &priv->job; job->asyncJob = QEMU_ASYNC_JOB_NONE; + job->asyncOwner = 0; job->phase = 0; job->mask = DEFAULT_JOB_MASK; job->start = 0; @@ -169,13 +171,25 @@ qemuDomainObjRestoreJob(virDomainObjPtr obj, memset(job, 0, sizeof(*job)); job->active = priv->job.active; + job->owner = priv->job.owner; job->asyncJob = priv->job.asyncJob; + job->asyncOwner = priv->job.asyncOwner; job->phase = priv->job.phase; qemuDomainObjResetJob(priv); qemuDomainObjResetAsyncJob(priv); } +void +qemuDomainObjTransferJob(virDomainObjPtr obj) +{ + qemuDomainObjPrivatePtr priv = obj->privateData; + + VIR_DEBUG("Changing job owner from %d to %d", + priv->job.owner, virThreadSelfID()); + priv->job.owner = virThreadSelfID(); +} + static void qemuDomainObjFreeJob(qemuDomainObjPrivatePtr priv) { @@ -664,11 +678,23 @@ qemuDomainObjSetJobPhase(struct qemud_driver *driver, int phase) { qemuDomainObjPrivatePtr priv = obj->privateData; + int me = virThreadSelfID(); if (!priv->job.asyncJob) return; + VIR_DEBUG("Setting '%s' phase to '%s'", + qemuDomainAsyncJobTypeToString(priv->job.asyncJob), + qemuDomainAsyncJobPhaseToString(priv->job.asyncJob, phase)); + + if (priv->job.asyncOwner && me != priv->job.asyncOwner) { + VIR_WARN("'%s' async job is owned by thread %d", + qemuDomainAsyncJobTypeToString(priv->job.asyncJob), + priv->job.asyncOwner); + } + priv->job.phase = phase; + priv->job.asyncOwner = me; qemuDomainObjSaveJob(driver, obj); } @@ -695,6 +721,22 @@ qemuDomainObjDiscardAsyncJob(struct qemud_driver *driver, virDomainObjPtr obj) qemuDomainObjSaveJob(driver, obj); } +void +qemuDomainObjReleaseAsyncJob(virDomainObjPtr obj) +{ + qemuDomainObjPrivatePtr priv = obj->privateData; + + VIR_DEBUG("Releasing ownership of '%s' async job", + qemuDomainAsyncJobTypeToString(priv->job.asyncJob)); + + if (priv->job.asyncOwner != virThreadSelfID()) { + VIR_WARN("'%s' async job is owned by thread %d", + qemuDomainAsyncJobTypeToString(priv->job.asyncJob), + priv->job.asyncOwner); + } + priv->job.asyncOwner = 0; +} + static bool qemuDomainNestedJobAllowed(qemuDomainObjPrivatePtr priv, enum qemuDomainJob job) { @@ -764,11 +806,13 @@ retry: qemuDomainJobTypeToString(job), qemuDomainAsyncJobTypeToString(priv->job.asyncJob)); priv->job.active = job; + priv->job.owner = virThreadSelfID(); } else { VIR_DEBUG("Starting async job: %s", qemuDomainAsyncJobTypeToString(asyncJob)); qemuDomainObjResetAsyncJob(priv); priv->job.asyncJob = asyncJob; + priv->job.asyncOwner = virThreadSelfID(); priv->job.start = now; } @@ -784,6 +828,15 @@ retry: return 0; error: + VIR_WARN("Cannot start job (%s, %s) for domain %s;" + " current job is (%s, %s) owned by (%d, %d)", + qemuDomainJobTypeToString(job), + qemuDomainAsyncJobTypeToString(asyncJob), + obj->def->name, + qemuDomainJobTypeToString(priv->job.active), + qemuDomainAsyncJobTypeToString(priv->job.asyncJob), + priv->job.owner, priv->job.asyncOwner); + if (errno == ETIMEDOUT) qemuReportError(VIR_ERR_OPERATION_TIMEOUT, "%s", _("cannot acquire state change lock")); diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h index b3eecd3..ce52569 100644 --- a/src/qemu/qemu_domain.h +++ b/src/qemu/qemu_domain.h @@ -96,9 +96,11 @@ VIR_ENUM_DECL(qemuDomainAsyncJob) struct qemuDomainJobObj { virCond cond; /* Use to coordinate jobs */ enum qemuDomainJob active; /* Currently running job */ + int owner; /* Thread which set current job */ virCond asyncCond; /* Use to coordinate with async jobs */ enum qemuDomainAsyncJob asyncJob; /* Currently active async job */ + int asyncOwner; /* Thread which set current async job */ int phase; /* Job phase (mainly for migrations) */ unsigned long long mask; /* Jobs allowed during async job */ unsigned long long start; /* When the async job started */ @@ -203,8 +205,10 @@ void qemuDomainObjSetAsyncJobMask(virDomainObjPtr obj, unsigned long long allowedJobs); void qemuDomainObjRestoreJob(virDomainObjPtr obj, struct qemuDomainJobObj *job); +void qemuDomainObjTransferJob(virDomainObjPtr obj); void qemuDomainObjDiscardAsyncJob(struct qemud_driver *driver, virDomainObjPtr obj); +void qemuDomainObjReleaseAsyncJob(virDomainObjPtr obj); void qemuDomainObjEnterMonitor(struct qemud_driver *driver, virDomainObjPtr obj) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index ff6f273..c1bb93a 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -3242,6 +3242,7 @@ qemuMigrationJobStartPhase(struct qemud_driver *driver, int qemuMigrationJobContinue(virDomainObjPtr vm) { + qemuDomainObjReleaseAsyncJob(vm); return virDomainObjUnref(vm); } diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 96f39e8..19569cf 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -3038,8 +3038,8 @@ qemuProcessReconnect(void *opaque) priv = obj->privateData; - /* Set fake job so that EnterMonitor* doesn't want to start a new one */ - priv->job.active = QEMU_JOB_MODIFY; + /* Job was started by the caller for us */ + qemuDomainObjTransferJob(obj); /* Hold an extra reference because we can't allow 'vm' to be * deleted if qemuConnectMonitor() failed */ @@ -3119,8 +3119,6 @@ qemuProcessReconnect(void *opaque) if (qemuProcessRecoverJob(driver, obj, conn, &oldjob) < 0) goto error; - priv->job.active = QEMU_JOB_NONE; - /* update domain state XML with possibly updated state in virDomainObj */ if (virDomainSaveStatus(driver->caps, driver->stateDir, obj) < 0) goto error; -- 1.7.8.5

2 2

[libvirt] [PATCH] qemu: Avoid excessive calls to qemuDomainObjSaveJob()
by Jiri Denemark 10 Apr '12

10 Apr '12

As reported by Daniel Berrangé, we have a huge performance regression for virDomainGetInfo() due to the change which makes virDomainEndJob() save the XML status file every time it is called. Previous to that change, 2000 calls to virDomainGetInfo() took ~2.5 seconds. After that change, 2000 calls to virDomainGetInfo() take 2 *minutes* 45 secs. We made the change to be able to recover from libvirtd restart in the middle of a job. However, only destroy and async jobs are taken care of. Thus it makes more sense to only save domain state XML when these jobs are started/stopped. --- src/qemu/qemu_domain.c | 21 ++++++++++++++++++--- src/qemu/qemu_domain.h | 5 +++++ src/qemu/qemu_process.c | 4 ++++ 3 files changed, 27 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 69d9e6e..da1f57f 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -183,6 +183,12 @@ qemuDomainObjFreeJob(qemuDomainObjPrivatePtr priv) ignore_value(virCondDestroy(&priv->job.asyncCond)); } +static bool +qemuDomainTrackJob(enum qemuDomainJob job) +{ + return (QEMU_DOMAIN_TRACK_JOBS & JOB_MASK(job)) != 0; +} + static void *qemuDomainObjPrivateAlloc(void) { @@ -239,6 +245,7 @@ static int qemuDomainObjPrivateXMLFormat(virBufferPtr buf, void *data) { qemuDomainObjPrivatePtr priv = data; const char *monitorpath; + enum qemuDomainJob job; /* priv->monitor_chr is set only for qemu */ if (priv->monConfig) { @@ -284,6 +291,10 @@ static int qemuDomainObjPrivateXMLFormat(virBufferPtr buf, void *data) if (priv->lockState) virBufferAsprintf(buf, " <lockstate>%s</lockstate>\n", priv->lockState); + job = priv->job.active; + if (!qemuDomainTrackJob(job)) + priv->job.active = QEMU_JOB_NONE; + if (priv->job.active || priv->job.asyncJob) { virBufferAsprintf(buf, " <job type='%s' async='%s'", qemuDomainJobTypeToString(priv->job.active), @@ -295,6 +306,7 @@ static int qemuDomainObjPrivateXMLFormat(virBufferPtr buf, void *data) } virBufferAddLit(buf, "/>\n"); } + priv->job.active = job; if (priv->fakeReboot) virBufferAsprintf(buf, " <fakereboot/>\n"); @@ -766,7 +778,8 @@ retry: virDomainObjLock(obj); } - qemuDomainObjSaveJob(driver, obj); + if (qemuDomainTrackJob(job)) + qemuDomainObjSaveJob(driver, obj); return 0; @@ -862,15 +875,17 @@ int qemuDomainObjBeginAsyncJobWithDriver(struct qemud_driver *driver, int qemuDomainObjEndJob(struct qemud_driver *driver, virDomainObjPtr obj) { qemuDomainObjPrivatePtr priv = obj->privateData; + enum qemuDomainJob job = priv->job.active; priv->jobs_queued--; VIR_DEBUG("Stopping job: %s (async=%s)", - qemuDomainJobTypeToString(priv->job.active), + qemuDomainJobTypeToString(job), qemuDomainAsyncJobTypeToString(priv->job.asyncJob)); qemuDomainObjResetJob(priv); - qemuDomainObjSaveJob(driver, obj); + if (qemuDomainTrackJob(job)) + qemuDomainObjSaveJob(driver, obj); virCondSignal(&priv->job.cond); return virDomainObjUnref(obj); diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h index adccfed..b3eecd3 100644 --- a/src/qemu/qemu_domain.h +++ b/src/qemu/qemu_domain.h @@ -53,6 +53,11 @@ JOB_MASK(QEMU_JOB_DESTROY) | \ JOB_MASK(QEMU_JOB_ABORT)) +/* Jobs which have to be tracked in domain state XML. */ +# define QEMU_DOMAIN_TRACK_JOBS \ + (JOB_MASK(QEMU_JOB_DESTROY) | \ + JOB_MASK(QEMU_JOB_ASYNC)) + /* Only 1 job is allowed at any time * A job includes *all* monitor commands, even those just querying * information, not merely actions */ diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 481b4f3..96f39e8 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -2963,6 +2963,10 @@ qemuProcessRecoverJob(struct qemud_driver *driver, if (!virDomainObjIsActive(vm)) return -1; + /* In case any special handling is added for job type that has been ignored + * before, QEMU_DOMAIN_TRACK_JOBS (from qemu_domain.h) needs to be updated + * for the job to be properly tracked in domain state XML. + */ switch (job->active) { case QEMU_JOB_QUERY: /* harmless */ -- 1.7.8.5

2 1

[libvirt] [PATCH] build: avoid s390 compiler warnings
by Eric Blake 10 Apr '12

10 Apr '12

I noticed compiler warnings when building for the s390 architecture. * src/node_device/node_device_udev.c (udevDeviceMonitorStartup): Mark unused variable. * src/nodeinfo.c (linuxNodeInfoCPUPopulate): Avoid unused variable. --- Pushing under the trivial rule. src/node_device/node_device_udev.c | 4 ++-- src/nodeinfo.c | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_device_udev.c index 438c2eb..6418015 100644 --- a/src/node_device/node_device_udev.c +++ b/src/node_device/node_device_udev.c @@ -1,7 +1,7 @@ /* * node_device_udev.c: node device enumeration - libudev implementation * - * Copyright (C) 2009-2011 Red Hat, Inc. + * Copyright (C) 2009-2012 Red Hat, Inc. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -1604,7 +1604,7 @@ out: return ret; } -static int udevDeviceMonitorStartup(int privileged) +static int udevDeviceMonitorStartup(int privileged ATTRIBUTE_UNUSED) { udevPrivate *priv = NULL; struct udev *udev = NULL; diff --git a/src/nodeinfo.c b/src/nodeinfo.c index 26f8dc1..7e993a9 100644 --- a/src/nodeinfo.c +++ b/src/nodeinfo.c @@ -231,10 +231,10 @@ int linuxNodeInfoCPUPopulate(FILE *cpuinfo, /* NOTE: hyperthreads are ignored here; they are parsed out of /sys */ while (fgets(line, sizeof(line), cpuinfo) != NULL) { - char *buf = line; # if defined(__x86_64__) || \ defined(__amd64__) || \ defined(__i386__) + char *buf = line; if (STRPREFIX(buf, "cpu MHz")) { char *p; unsigned int ui; @@ -253,6 +253,7 @@ int linuxNodeInfoCPUPopulate(FILE *cpuinfo, } # elif defined(__powerpc__) || \ defined(__powerpc64__) + char *buf = line; if (STRPREFIX(buf, "clock")) { char *p; unsigned int ui; -- 1.7.7.6

1 0

[libvirt] [PATCH] daemon: Add libvirtd-config.c to the list of files to translate
by Jiri Denemark 10 Apr '12

10 Apr '12

--- po/POTFILES.in | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/po/POTFILES.in b/po/POTFILES.in index 5d5739a..4c49200 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -1,3 +1,4 @@ +daemon/libvirtd-config.c daemon/libvirtd.c daemon/qemu_dispatch.h daemon/remote.c -- 1.7.8.5

2 1

[libvirt] [PATCH] virsh: Clean up usage of boolean flag variables
by Peter Krempa 10 Apr '12

10 Apr '12

This patch cleans up variables used to store boolean command flags that are inquired by vshCommandOptBool to use the bool data type instead of an integer. Additionaly this patch cleans up flag variables that are inferred from existing flags. --- tools/virsh.c | 120 ++++++++++++++++++++++++++++---------------------------- 1 files changed, 60 insertions(+), 60 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index cfdd040..1a2e191 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -933,9 +933,9 @@ static const vshCmdOptDef opts_list[] = { static bool cmdList(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) { - int inactive = vshCommandOptBool(cmd, "inactive"); - int all = vshCommandOptBool(cmd, "all"); - int active = !inactive || all ? 1 : 0; + bool inactive = vshCommandOptBool(cmd, "inactive"); + bool all = vshCommandOptBool(cmd, "all"); + bool active = !inactive || all; int *ids = NULL, maxid = 0, i; char **names = NULL; int maxname = 0; @@ -1317,7 +1317,7 @@ cmdDomstate(vshControl *ctl, const vshCmd *cmd) { virDomainPtr dom; bool ret = true; - int showReason = vshCommandOptBool(cmd, "reason"); + bool showReason = vshCommandOptBool(cmd, "reason"); int state, reason; if (!vshConnectionUsability(ctl, ctl->conn)) @@ -1966,9 +1966,9 @@ cmdDomIftune(vshControl *ctl, const vshCmd *cmd) int nparams = 0; virTypedParameterPtr params = NULL; bool ret = false; - int current = vshCommandOptBool(cmd, "current"); - int config = vshCommandOptBool(cmd, "config"); - int live = vshCommandOptBool(cmd, "live"); + bool current = vshCommandOptBool(cmd, "current"); + bool config = vshCommandOptBool(cmd, "config"); + bool live = vshCommandOptBool(cmd, "live"); virNetDevBandwidthRate inbound, outbound; int i; @@ -2626,7 +2626,7 @@ cmdCreate(vshControl *ctl, const vshCmd *cmd) bool ret = true; char *buffer; #ifndef WIN32 - int console = vshCommandOptBool(cmd, "console"); + bool console = vshCommandOptBool(cmd, "console"); #endif unsigned int flags = VIR_DOMAIN_NONE; @@ -3094,7 +3094,7 @@ cmdStart(vshControl *ctl, const vshCmd *cmd) virDomainPtr dom; bool ret = false; #ifndef WIN32 - int console = vshCommandOptBool(cmd, "console"); + bool console = vshCommandOptBool(cmd, "console"); #endif unsigned int flags = VIR_DOMAIN_NONE; int rc; @@ -3786,9 +3786,9 @@ cmdSchedinfo(vshControl *ctl, const vshCmd *cmd) int i, ret; bool ret_val = false; unsigned int flags = 0; - int current = vshCommandOptBool(cmd, "current"); - int config = vshCommandOptBool(cmd, "config"); - int live = vshCommandOptBool(cmd, "live"); + bool current = vshCommandOptBool(cmd, "current"); + bool config = vshCommandOptBool(cmd, "config"); + bool live = vshCommandOptBool(cmd, "live"); if (current) { if (live || config) { @@ -4921,11 +4921,11 @@ cmdVcpucount(vshControl *ctl, const vshCmd *cmd) { virDomainPtr dom; bool ret = true; - int maximum = vshCommandOptBool(cmd, "maximum"); - int active = vshCommandOptBool(cmd, "active"); - int config = vshCommandOptBool(cmd, "config"); - int live = vshCommandOptBool(cmd, "live"); - int current = vshCommandOptBool(cmd, "current"); + bool maximum = vshCommandOptBool(cmd, "maximum"); + bool active = vshCommandOptBool(cmd, "active"); + bool config = vshCommandOptBool(cmd, "config"); + bool live = vshCommandOptBool(cmd, "live"); + bool current = vshCommandOptBool(cmd, "current"); bool all = maximum + active + current + config + live == 0; int count; @@ -5246,9 +5246,9 @@ cmdVcpuPin(vshControl *ctl, const vshCmd *cmd) int i, cpu, lastcpu, maxcpu, ncpus; bool unuse = false; const char *cur; - int config = vshCommandOptBool(cmd, "config"); - int live = vshCommandOptBool(cmd, "live"); - int current = vshCommandOptBool(cmd, "current"); + bool config = vshCommandOptBool(cmd, "config"); + bool live = vshCommandOptBool(cmd, "live"); + bool current = vshCommandOptBool(cmd, "current"); bool query = false; /* Query mode if no cpulist */ unsigned int flags = 0; @@ -5479,10 +5479,10 @@ cmdSetvcpus(vshControl *ctl, const vshCmd *cmd) virDomainPtr dom; int count = 0; bool ret = true; - int maximum = vshCommandOptBool(cmd, "maximum"); - int config = vshCommandOptBool(cmd, "config"); - int live = vshCommandOptBool(cmd, "live"); - int current = vshCommandOptBool(cmd, "current"); + bool maximum = vshCommandOptBool(cmd, "maximum"); + bool config = vshCommandOptBool(cmd, "config"); + bool live = vshCommandOptBool(cmd, "live"); + bool current = vshCommandOptBool(cmd, "current"); unsigned int flags = 0; if (current) { @@ -5853,9 +5853,9 @@ cmdSetmem(vshControl *ctl, const vshCmd *cmd) unsigned long long max; unsigned long kibibytes = 0; bool ret = true; - int config = vshCommandOptBool(cmd, "config"); - int live = vshCommandOptBool(cmd, "live"); - int current = vshCommandOptBool(cmd, "current"); + bool config = vshCommandOptBool(cmd, "config"); + bool live = vshCommandOptBool(cmd, "live"); + bool current = vshCommandOptBool(cmd, "current"); unsigned int flags = 0; if (current) { @@ -5935,9 +5935,9 @@ cmdSetmaxmem(vshControl *ctl, const vshCmd *cmd) unsigned long long max; unsigned long kibibytes = 0; bool ret = true; - int config = vshCommandOptBool(cmd, "config"); - int live = vshCommandOptBool(cmd, "live"); - int current = vshCommandOptBool(cmd, "current"); + bool config = vshCommandOptBool(cmd, "config"); + bool live = vshCommandOptBool(cmd, "live"); + bool current = vshCommandOptBool(cmd, "current"); unsigned int flags = VIR_DOMAIN_MEM_MAXIMUM; if (current) { @@ -6026,9 +6026,9 @@ cmdBlkiotune(vshControl * ctl, const vshCmd * cmd) virTypedParameterPtr params = NULL, temp = NULL; bool ret = false; unsigned int flags = 0; - int current = vshCommandOptBool(cmd, "current"); - int config = vshCommandOptBool(cmd, "config"); - int live = vshCommandOptBool(cmd, "live"); + bool current = vshCommandOptBool(cmd, "current"); + bool config = vshCommandOptBool(cmd, "config"); + bool live = vshCommandOptBool(cmd, "live"); if (current) { if (live || config) { @@ -6201,9 +6201,9 @@ cmdMemtune(vshControl *ctl, const vshCmd *cmd) virTypedParameterPtr params = NULL, temp = NULL; bool ret = false; unsigned int flags = 0; - int current = vshCommandOptBool(cmd, "current"); - int config = vshCommandOptBool(cmd, "config"); - int live = vshCommandOptBool(cmd, "live"); + bool current = vshCommandOptBool(cmd, "current"); + bool config = vshCommandOptBool(cmd, "config"); + bool live = vshCommandOptBool(cmd, "live"); if (current) { if (live || config) { @@ -6365,9 +6365,9 @@ cmdNumatune(vshControl * ctl, const vshCmd * cmd) const char *nodeset = NULL; bool ret = false; unsigned int flags = 0; - int current = vshCommandOptBool(cmd, "current"); - int config = vshCommandOptBool(cmd, "config"); - int live = vshCommandOptBool(cmd, "live"); + bool current = vshCommandOptBool(cmd, "current"); + bool config = vshCommandOptBool(cmd, "config"); + bool live = vshCommandOptBool(cmd, "live"); const char *mode = NULL; if (current) { @@ -6831,9 +6831,9 @@ cmdDumpXML(vshControl *ctl, const vshCmd *cmd) bool ret = true; char *dump; unsigned int flags = 0; - int inactive = vshCommandOptBool(cmd, "inactive"); - int secure = vshCommandOptBool(cmd, "security-info"); - int update = vshCommandOptBool(cmd, "update-cpu"); + bool inactive = vshCommandOptBool(cmd, "inactive"); + bool secure = vshCommandOptBool(cmd, "security-info"); + bool update = vshCommandOptBool(cmd, "update-cpu"); if (inactive) flags |= VIR_DOMAIN_XML_INACTIVE; @@ -7800,9 +7800,9 @@ cmdBlkdeviotune(vshControl *ctl, const vshCmd *cmd) virTypedParameterPtr params = NULL, temp = NULL; unsigned int flags = 0, i = 0; int rv = 0; - int current = vshCommandOptBool(cmd, "current"); - int config = vshCommandOptBool(cmd, "config"); - int live = vshCommandOptBool(cmd, "live"); + bool current = vshCommandOptBool(cmd, "current"); + bool config = vshCommandOptBool(cmd, "config"); + bool live = vshCommandOptBool(cmd, "live"); bool ret = false; if (current) { @@ -8336,9 +8336,9 @@ static const vshCmdOptDef opts_network_list[] = { static bool cmdNetworkList(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) { - int inactive = vshCommandOptBool(cmd, "inactive"); - int all = vshCommandOptBool(cmd, "all"); - int active = !inactive || all ? 1 : 0; + bool inactive = vshCommandOptBool(cmd, "inactive"); + bool all = vshCommandOptBool(cmd, "all"); + bool active = !inactive || all; int maxactive = 0, maxinactive = 0, i; char **activeNames = NULL, **inactiveNames = NULL; inactive |= all; @@ -8609,9 +8609,9 @@ static const vshCmdOptDef opts_interface_list[] = { static bool cmdInterfaceList(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) { - int inactive = vshCommandOptBool(cmd, "inactive"); - int all = vshCommandOptBool(cmd, "all"); - int active = !inactive || all ? 1 : 0; + bool inactive = vshCommandOptBool(cmd, "inactive"); + bool all = vshCommandOptBool(cmd, "all"); + bool active = !inactive || all; int maxactive = 0, maxinactive = 0, i; char **activeNames = NULL, **inactiveNames = NULL; inactive |= all; @@ -8786,7 +8786,7 @@ cmdInterfaceDumpXML(vshControl *ctl, const vshCmd *cmd) bool ret = true; char *dump; unsigned int flags = 0; - int inactive = vshCommandOptBool(cmd, "inactive"); + bool inactive = vshCommandOptBool(cmd, "inactive"); if (inactive) flags |= VIR_INTERFACE_XML_INACTIVE; @@ -10038,7 +10038,7 @@ cmdPoolCreateAs(vshControl *ctl, const vshCmd *cmd) virStoragePoolPtr pool; const char *name; char *xml; - int printXML = vshCommandOptBool(cmd, "print-xml"); + bool printXML = vshCommandOptBool(cmd, "print-xml"); if (!vshConnectionUsability(ctl, ctl->conn)) return false; @@ -10126,7 +10126,7 @@ cmdPoolDefineAs(vshControl *ctl, const vshCmd *cmd) virStoragePoolPtr pool; const char *name; char *xml; - int printXML = vshCommandOptBool(cmd, "print-xml"); + bool printXML = vshCommandOptBool(cmd, "print-xml"); if (!vshConnectionUsability(ctl, ctl->conn)) return false; @@ -10400,10 +10400,10 @@ cmdPoolList(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) struct poolInfoText *poolInfoTexts = NULL; /* Determine the options passed by the user */ - int all = vshCommandOptBool(cmd, "all"); - int details = vshCommandOptBool(cmd, "details"); - int inactive = vshCommandOptBool(cmd, "inactive"); - int active = !inactive || all ? 1 : 0; + bool all = vshCommandOptBool(cmd, "all"); + bool details = vshCommandOptBool(cmd, "details"); + bool inactive = vshCommandOptBool(cmd, "inactive"); + bool active = !inactive || all; inactive |= all; /* Check the connection to libvirtd daemon is still working */ @@ -12062,7 +12062,7 @@ cmdVolList(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) char *outputStr = NULL; const char *unit; double val; - int details = vshCommandOptBool(cmd, "details"); + bool details = vshCommandOptBool(cmd, "details"); int numVolumes = 0, i; int ret; bool functionReturn; @@ -13006,7 +13006,7 @@ cmdNodeListDevices (vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) const char *cap = NULL; char **devices; int num_devices, i; - int tree = vshCommandOptBool(cmd, "tree"); + bool tree = vshCommandOptBool(cmd, "tree"); if (!vshConnectionUsability(ctl, ctl->conn)) return false; -- 1.7.3.4

2 2

[libvirt] [PATCH] virsh: Clarify use of the --managed-save flag for the list command
by Peter Krempa 10 Apr '12

10 Apr '12

The documentation for the flag doesn't clearly state that the flag only enhances the output and the user needs to specify other flags to list inactive domains, that are enhanced by this flag. --- tools/virsh.c | 2 +- tools/virsh.pod | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index cfdd040..7477d32 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -924,7 +924,7 @@ static const vshCmdOptDef opts_list[] = { {"name", VSH_OT_BOOL, 0, N_("list domain names only")}, {"table", VSH_OT_BOOL, 0, N_("list table (default)")}, {"managed-save", VSH_OT_BOOL, 0, - N_("mark domains with managed save state")}, + N_("mark inactive domains with managed save state")}, {"title", VSH_OT_BOOL, 0, N_("show short domain description")}, {NULL, 0, 0, NULL} }; diff --git a/tools/virsh.pod b/tools/virsh.pod index a60e667..c6e0ff3 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -381,8 +381,9 @@ into s3 state. =back If I<--managed-save> is specified, then domains that have managed save -state (only possible if they are in the B<shut off> state) will -instead show as B<saved> in the listing. This flag is usable only with the +state (only possible if they are in the B<shut off> state, so you need to +specify I<--inactive> or I<--all> to actually list them) will instead +show as B<saved> in the listing. This flag is usable only with the default I<--table> output. If I<--name> is specified, domain names are printed instead of the table -- 1.7.3.4

2 2

[libvirt] [RESEND] libvirt: xen: Shutdown detection fixes (RH-BZ#746007)
by Stefan Bader 10 Apr '12

10 Apr '12

Resending this as there was no feedback overall and at least the first change fixes the following bug: https://bugzilla.redhat.com/show_bug.cgi?id=746007 --- The issue is easy to observe when using virt-manager as a frontend. Its main window seems to open connections for the up/down main display once and then only repeats DomainGetInfo on the same connection to check whether the instance is up or shut down. The initial open on the connection sets the domain id to -1 for inactive managed domains. And once running, the hypervisor driver returns the status. But after shutdown, the domain cannot be found by the hypervisor driver and the domain info is obtained by the xend driver. However, that expects the domain id to be -1 for inactive domains. This is not true (anymore). In testing I found that domain/status seems to be always present and better suited to check whether a domain is running or not (0 for shutdown and 2 for running, there are probably other values, too). Beside the change, which does fix this problem, the question is whether there should be a mechanism that resets domain->id to -1 when the instance is found to be shut down. And if that should happen, should it be done by any sub-driver or by the unified driver. The second problem I observed when I shut down an instance from the vnc console provided by virt-manager. As soon as the instance was down, the log produced internal errors about every second. Found this again, to be related to the unified driver approach. The call that causes the many error messages is GetVcpus. While the instance is up, the hypervisor driver returns those. But after shutdown, the domain cannot be found by that driver. The xend driver works, though. So what happens is that the hypervisor driver logs an internal error but the call succeeds because the xend driver returns successful. This generally opens the question whether a sub-driver should log any errors (at least not on error level, maybe debug)? The second patch only quiets down the one message I saw repeated that often. There are some other errors logged without any obvious problems interacting with the instances, but those are by far less often. -Stefan Please cc: me on replies as I am (yeah still) not subscribed to this m-l. Thanks.

2 10

[libvirt] [PATCH] tests: Fix libvirtdconftest in VPATH build
by Jiri Denemark 10 Apr '12

10 Apr '12

Without this, libvirtdconftest fails to build with "fatal error: daemon/libvirtd-config.h: No such file or directory" --- tests/Makefile.am | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tests/Makefile.am b/tests/Makefile.am index 57358e9..c4d550f 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -6,6 +6,7 @@ SHELL = $(PREFERABLY_POSIX_SHELL) INCLUDES = \ + -I$(top_builddir) -I$(top_srcdir) \ -I$(top_builddir)/gnulib/lib -I$(top_srcdir)/gnulib/lib \ -I$(top_builddir)/include -I$(top_srcdir)/include \ -I$(top_builddir)/src -I$(top_srcdir)/src \ -- 1.7.8.5

2 1

[libvirt] libvirt starts KVM domain without -enable-kvm
by Reinier Schoof 10 Apr '12

10 Apr '12

Hey, we're running a VM-pool based on libvirt and QEMU/KVM. The host machines run debian 6 (squeeze). All VM's have a similar libvirt XML-definition. Since we've moved to the combination of Linux kernel 3.2.0-1 and libvirt 0.9.9 (installed from testing/wheezy repo's), we periodically notice poor performance of new(ly started) VM's and after inspection they turn out to be started without the qemu option -enable-kvm. In /var/log/libvirt/qemu/$VM-name.log a line like this is shown: 20529: error : qemuBuildCommandLine:3681 : unsupported configuration: the QEMU binary /usr/bin/kvm does not support kvm After a virsh destroy/start, using the same XML-definition, the VM is started WITH -enable-kvm. Looking at the libvirt source of 0.9.9, I can't imagine this being the result of a race condition or other strange circumstance: it simply parse 'qemu -help', which always give exactly the same output. I've tried reproducing the problem by continuously destroy, undefine, define and start the same VM and then grepping the kvm-commandline for the absence of -enable-kvm, without any result. The XML-definition includes <domain type='kvm'> and <emulator>/usr/bin/kvm</emulator> Does anyone recognize this behaviour of libvirt? Thanks, Reinier Schoof # virsh version Compiled against library: libvir 0.9.9 Using library: libvir 0.9.9 Using API: QEMU 0.9.9 Running hypervisor: QEMU 0.15.0 Linux 3.2.0-1-amd64 #1 SMP Fri Feb 17 05:17:36 UTC 2012 x86_64 GNU/Linux -- TransIP BV | https://www.transip.nl/

1 0

[libvirt] [PATCH] Fix comment about GNUTLS initialization/cleanup
by Daniel P. Berrange 10 Apr '12

10 Apr '12

From: "Daniel P. Berrange" <berrange(a)redhat.com> --- src/rpc/virnettlscontext.c | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/rpc/virnettlscontext.c b/src/rpc/virnettlscontext.c index 74a61e0..7440c7a 100644 --- a/src/rpc/virnettlscontext.c +++ b/src/rpc/virnettlscontext.c @@ -1423,9 +1423,13 @@ void virNetTLSSessionFree(virNetTLSSessionPtr sess) * virNetTLS* because it initializes * underlying GnuTLS library. According to * it's documentation, it's safe to be called - * many times, but is not thread safe. Each - * call SHOULD be later followed by - * virNetTLSContextDeinit. + * many times, but is not thread safe. + * + * There is no corresponding "Deinit" / "Cleanup" + * function because there is no safe way to call + * 'gnutls_global_deinit' from a multi-threaded + * library, where other libraries linked into the + * application may also be using gnutls. */ void virNetTLSInit(void) { -- 1.7.7.6

2 1

[libvirt] Memory leak in libvirt / gnutls
by Richard W.M. Jones 10 Apr '12

10 Apr '12

I'm trying to track down: https://bugzilla.redhat.com/show_bug.cgi?id=810613 I *think* this is a libvirt bug, but I can only reproduce it on one machine, not on another machine that has a virtually identical setup. Anyway, something is confusing me about libvirt. In this commit: ---------------------------------------------------------------------- commit 74c75671331d284e1f777f9692b72e9737520bf0 Author: Michal Privoznik <mprivozn(a)redhat.com> Date: Thu Aug 18 10:44:08 2011 +0200 daemon: initialize GnuTLS When spice_tls is set but listen_tls is not, we don't initialize GnuTLS library. So any later gnutls call (e.g. during migration, where we initialize a certificate) will access uninitialized GnuTLS internal structs and throws an error. Although, we might now initialize GnuTLS twice, it is safe according to the documentation: This function can be called many times, but will only do something the first time. This patch creates 2 functions: virNetTLSInit and virNetTLSDeinit with respect to written above. ---------------------------------------------------------------------- ... a pair of functions called virNetTLSInit & virNetTLSDeinit are introduced, which would appear to do the right thing, calling first gnutls_global_init, then gnutls_global_deinit. This looks correct to me. However the above commit is later amended by this commit: ---------------------------------------------------------------------- commit eaddec976ef06457fee4a4ce86b8c7ee906183b7 Author: Michal Privoznik <mprivozn(a)redhat.com> Date: Wed Aug 24 16:16:45 2011 +0200 daemon: Move TLS initialization to virInitialize My previous patch 74c75671331d284e1f777f9692b72e9737520bf0 introduced a regression by removing TLS initialization from client. ---------------------------------------------------------------------- which removes virNetTLSDeinit. This appears to be a mistake, or at least I can't see the logical reason for it, and according to the gnutls docs, it would introduce a memory leak looking exactly like the one I am chasing down. The current code mentions virNetTLSDeinit only in a comment, and never calls gnutls_global_deinit. Any ideas? Rich. -- Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones virt-top is 'top' for virtual machines. Tiny program with many powerful monitoring features, net stats, disk stats, logging, etc. http://et.redhat.com/~rjones/virt-top

3 3

[libvirt] [PATCH] Fix compilation error on 32bit
by Stefan Berger 10 Apr '12

10 Apr '12

Below code failed to compile on a 32 bit machine with error typewrappers.c: In function 'libvirt_intUnwrap': typewrappers.c:135:5: error: logical 'and' of mutually exclusive tests is always false [-Werror=logical-op] cc1: all warnings being treated as errors The patch fixes this error. Stefan --- python/typewrappers.c | 4 ++++ 1 file changed, 4 insertions(+) Index: libvirt-acl/python/typewrappers.c =================================================================== --- libvirt-acl.orig/python/typewrappers.c +++ libvirt-acl/python/typewrappers.c @@ -132,6 +132,7 @@ libvirt_intUnwrap(PyObject *obj, int *va if ((long_val == -1) && PyErr_Occurred()) return -1; +#if LONG_MAX != INT_MAX if (long_val >= INT_MIN && long_val <= INT_MAX) { *val = long_val; } else { @@ -139,6 +140,9 @@ libvirt_intUnwrap(PyObject *obj, int *va "Python int too large to convert to C int"); return -1; } +#else + *val = long_val; +#endif return 0; }

2 2

[libvirt] [PATCH 0/4] Replace daemon-conf test case
by Daniel P. Berrange 10 Apr '12

10 Apr '12

The daemon-conf test case is terminally broken by design, despite numerous patches over the years, due to its need to test functionality indirectly by running libvirtd. Replace it with a test case which directly unit tests the code in question.

2 9

[libvirt] [test-API PATCH 1/3] test-API: Get rid of utils/Python
by Osier Yang 10 Apr '12

10 Apr '12

test-API tends to only support testing via libvirt Python binding now, and moving it to utils makes sense. --- utils/{Python => }/XMLParser.py | 0 utils/{Python => }/check.py | 0 utils/{Python => }/env_parser.py | 0 utils/{Python => }/format.py | 0 utils/{Python => }/log.py | 0 utils/{Python => }/utils.py | 0 utils/{Python => }/xmlbuilder.py | 0 utils/{Python => }/xmlgenerator.py | 0 8 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 utils/Python/__init__.py rename utils/{Python => }/XMLParser.py (100%) rename utils/{Python => }/check.py (100%) rename utils/{Python => }/env_parser.py (100%) rename utils/{Python => }/format.py (100%) rename utils/{Python => }/log.py (100%) rename utils/{Python => }/utils.py (100%) rename utils/{Python => }/xmlbuilder.py (100%) rename utils/{Python => }/xmlgenerator.py (100%) diff --git a/utils/Python/__init__.py b/utils/Python/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/utils/Python/XMLParser.py b/utils/XMLParser.py similarity index 100% rename from utils/Python/XMLParser.py rename to utils/XMLParser.py diff --git a/utils/Python/check.py b/utils/check.py similarity index 100% rename from utils/Python/check.py rename to utils/check.py diff --git a/utils/Python/env_parser.py b/utils/env_parser.py similarity index 100% rename from utils/Python/env_parser.py rename to utils/env_parser.py diff --git a/utils/Python/format.py b/utils/format.py similarity index 100% rename from utils/Python/format.py rename to utils/format.py diff --git a/utils/Python/log.py b/utils/log.py similarity index 100% rename from utils/Python/log.py rename to utils/log.py diff --git a/utils/Python/utils.py b/utils/utils.py similarity index 100% rename from utils/Python/utils.py rename to utils/utils.py diff --git a/utils/Python/xmlbuilder.py b/utils/xmlbuilder.py similarity index 100% rename from utils/Python/xmlbuilder.py rename to utils/xmlbuilder.py diff --git a/utils/Python/xmlgenerator.py b/utils/xmlgenerator.py similarity index 100% rename from utils/Python/xmlgenerator.py rename to utils/xmlgenerator.py -- 1.7.7.5

2 5

[libvirt] help for libvirt0.9.8 compile
by hero 10 Apr '12

10 Apr '12

my redhat6.1 has a libvirt0.8.7, and I got a libvirt0.9.8.tar that I want to update the old one. when I use './configure --prefix=/usr --libdir=/usr/lib64 --localstatedir=/var --sysconfdir=/etc' it siad 'configure: error: You must install device-mapper-devel/libdevmapper >= 1.0.0 to compile libvirt' please tell me how to do if you know. thanks. best wishes! SunYongGang

3 2

Re: [libvirt] Fwd: Look what i found...
by dasari dakshina 10 Apr '12

10 Apr '12

How to start an Online Business <a href="http://expertizaregion55.ru/breakingnews/48IanStewart/">http://expertizaregion55.ru/breakingnews/48IanStewart/</a>

1 0

[libvirt] [PATCHv3 00/16] live block migration via virDomainBlockCopy
by Eric Blake 09 Apr '12

09 Apr '12

v1 was here: https://www.redhat.com/archives/libvir-list/2012-April/msg00068.html v2 was here: https://www.redhat.com/archives/libvir-list/2012-April/msg00222.html changes from v2: added patch 12/16, addressed some review comments and made minor changes from more of my own testing CAVEAT: Paolo and I had an IRC conversation, where we decided that 'drive-mirror' might do better to take a mandatory 'full':'bool' (or an even more powerful optional '*base':'str') argument for determining how much to stream (full vs. shallow, or even the backing file of the copy as matching the base argument of 'block_stream') rather than overloading the 'mode':'no-backing-file' as the only way to get a full pull. If that change goes in qemu, then we will need a v4, to tweak how the 'drive-mirror' monitor command is called, and take advantage of the additional flexibility it offers. changes from v1: Paolo has updated the qemu side of things, and built a scratch image for RHEL that I was able to test with for the new semantics. I was actually able to successfully run two different block copy jobs, one canceled and one pivoted, with SELinux disabled and this patch series. Patch 13/16 is for reference only when working with Paolo's build; it will not go upstream. Patches 14-16 are optional; the extra flexibility might be nice, but I haven't yet played with those three enough to know if Paolo's build behaves like I was expecting. Adam Litke (2): blockjob: add API for async virDomainBlockJobAbort blockjob: wire up qemu async virDomainBlockJobAbort Eric Blake (14): blockjob: allow for fast-finishing job blockjob: add new API flags blockjob: add 'blockcopy' to virsh blockjob: enhance xml to track mirrors across libvirtd restart blockjob: react to active block copy blockjob: expose qemu commands for mirrored storage migration blockjob: return appropriate event and info blockjob: support pivot operation on cancel blockjob: implement block copy for qemu blockjob: allow for existing files blockjob: accommodate RHEL backport names blockjob: add virDomainBlockCopy blockjob: enhance virsh 'blockcopy' blockjob: wire up qemu and RPC for block copy docs/apibuild.py | 1 + docs/formatdomain.html.in | 11 ++ docs/schemas/domaincommon.rng | 19 ++- include/libvirt/libvirt.h.in | 50 +++++- include/libvirt/virterror.h | 1 + src/conf/domain_conf.c | 54 ++++++ src/conf/domain_conf.h | 6 + src/driver.h | 5 + src/libvirt.c | 220 +++++++++++++++++++++++- src/libvirt_private.syms | 1 + src/libvirt_public.syms | 5 + src/qemu/qemu_capabilities.c | 3 + src/qemu/qemu_capabilities.h | 2 + src/qemu/qemu_driver.c | 379 +++++++++++++++++++++++++++++++++++++++-- src/qemu/qemu_hotplug.c | 7 + src/qemu/qemu_monitor.c | 50 ++++++ src/qemu/qemu_monitor.h | 26 +++- src/qemu/qemu_monitor_json.c | 166 +++++++++++++++--- src/qemu/qemu_monitor_json.h | 19 ++- src/remote/remote_driver.c | 1 + src/remote/remote_protocol.x | 12 ++- src/remote_protocol-structs | 9 + src/rpc/gendispatch.pl | 1 + src/util/virterror.c | 6 + tools/virsh.c | 140 ++++++++++++--- tools/virsh.pod | 40 ++++- 26 files changed, 1143 insertions(+), 91 deletions(-) -- 1.7.7.6

2 20

[libvirt] [libvirt PATCHv8 1/1] add DHCP snooping
by David L Stevens 09 Apr '12

09 Apr '12

This patch adds DHCP snooping support to libvirt. The learning method for IP addresses is specified by setting the "ip_learning" variable to one of "any" [default] (existing IP learning code), "none" (static only addresses) or "dhcp" (DHCP snooping). Active leases are saved in a lease file and reloaded on restart or HUP. Changes since v7: - renamed functions as suggested - collected local state into "virNWFilterSnoopState" struct - cleaned up include file list - misc code cleanups per review comments Signed-off-by: David L Stevens <dlstevens(a)us.ibm.com> --- docs/formatnwfilter.html.in | 17 + po/POTFILES.in | 1 + src/Makefile.am | 2 + src/nwfilter/nwfilter_dhcpsnoop.c | 1197 ++++++++++++++++++++++++++++++++ src/nwfilter/nwfilter_dhcpsnoop.h | 38 + src/nwfilter/nwfilter_driver.c | 6 + src/nwfilter/nwfilter_gentech_driver.c | 59 ++- 7 files changed, 1307 insertions(+), 13 deletions(-) create mode 100644 src/nwfilter/nwfilter_dhcpsnoop.c create mode 100644 src/nwfilter/nwfilter_dhcpsnoop.h diff --git a/docs/formatnwfilter.html.in b/docs/formatnwfilter.html.in index 9cb7644..ad10765 100644 --- a/docs/formatnwfilter.html.in +++ b/docs/formatnwfilter.html.in @@ -2189,6 +2189,23 @@ In case a VM is resumed after suspension or migrated, IP address detection will be restarted. + + Variable ip_learning may be used to specify + the IP address learning method. Valid values are any, dhcp, + or none. The default value is any, meaning that libvirt + may use any packet to determine the address in use by a VM. A value of + dhcp specifies that libvirt should only honor DHCP server-assigned + addresses with valid leases. If ip_learning is set to none, + libvirt does not do address learning and referencing IP without + assigning it an explicit value is an error. + + Use of ip_learning=dhcp (DHCP snooping) provides additional + anti-spoofing security, especially when combined with a filter allowing + only trusted DHCP servers to assign addresses. If the DHCP lease expires, + the VM will no longer be able to use the IP address until it acquires a + new, valid lease from a DHCP server. If the VM is migrated, it must get + a new valid DHCP lease to use an IP address (e.g., by + bringing the VM interface down and up again). <h3><a name="nwflimitsmigr">VM Migration</a></h3> diff --git a/po/POTFILES.in b/po/POTFILES.in index 88be04e..d4b0a86 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -51,6 +51,7 @@ src/node_device/node_device_hal.c src/node_device/node_device_linux_sysfs.c src/node_device/node_device_udev.c src/nodeinfo.c +src/nwfilter/nwfilter_dhcpsnoop.c src/nwfilter/nwfilter_driver.c src/nwfilter/nwfilter_ebiptables_driver.c src/nwfilter/nwfilter_gentech_driver.c diff --git a/src/Makefile.am b/src/Makefile.am index a2aae9d..4382caf 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -509,6 +509,8 @@ NWFILTER_DRIVER_SOURCES = \ nwfilter/nwfilter_driver.h nwfilter/nwfilter_driver.c \ nwfilter/nwfilter_gentech_driver.c \ nwfilter/nwfilter_gentech_driver.h \ + nwfilter/nwfilter_dhcpsnoop.c \ + nwfilter/nwfilter_dhcpsnoop.h \ nwfilter/nwfilter_ebiptables_driver.c \ nwfilter/nwfilter_ebiptables_driver.h \ nwfilter/nwfilter_learnipaddr.c \ diff --git a/src/nwfilter/nwfilter_dhcpsnoop.c b/src/nwfilter/nwfilter_dhcpsnoop.c new file mode 100644 index 0000000..8c2ff50 --- /dev/null +++ b/src/nwfilter/nwfilter_dhcpsnoop.c @@ -0,0 +1,1197 @@ +/* + * nwfilter_dhcpsnoop.c: support for DHCP snooping used by a VM + * on an interface + * + * Copyright (C) 2011 IBM Corp. + * Copyright (C) 2011 David L Stevens + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * Author: David L Stevens <dlstevens(a)us.ibm.com> + * Based in part on work by Stefan Berger <stefanb(a)us.ibm.com> + */ + +#include <config.h> + +#ifdef HAVE_LIBPCAP +#include <pcap.h> +#endif + +#include <fcntl.h> + +#include <arpa/inet.h> +#include <netinet/ip.h> +#include <netinet/udp.h> +#include <net/if.h> + +#include "memory.h" +#include "logging.h" +#include "datatypes.h" +#include "virterror_internal.h" +#include "conf/domain_conf.h" +#include "nwfilter_gentech_driver.h" +#include "nwfilter_dhcpsnoop.h" +#include "virnetdev.h" +#include "virfile.h" +#include "configmake.h" + +#define VIR_FROM_THIS VIR_FROM_NWFILTER + +#ifdef HAVE_LIBPCAP + +#define LEASEFILE LOCALSTATEDIR "/run/libvirt/network/nwfilter.leases" +#define TMPLEASEFILE LOCALSTATEDIR "/run/libvirt/network/nwfilter.ltmp" + +static struct { +/* lease file */ + int LeaseFD; + int nLeases; /* number of active leases */ + int wLeases; /* number of written leases */ +/* thread management */ + virHashTablePtr SnoopReqs; + virHashTablePtr IfnameToKey; + virHashTablePtr Active; + virMutex SnoopLock; + virMutex ActiveLock; +} virNWFilterSnoopState = { + .LeaseFD = -1, + .SnoopLock = { .lock=PTHREAD_MUTEX_INITIALIZER }, + .ActiveLock = { .lock=PTHREAD_MUTEX_INITIALIZER }, +}; + +#define virNWFilterSnoopLock() \ + { virMutexLock(&virNWFilterSnoopState.SnoopLock); } +#define virNWFilterSnoopUnlock() \ + { virMutexUnlock(&virNWFilterSnoopState.SnoopLock); } +#define virNWFilterSnoopLockActive() \ + { virMutexLock(&virNWFilterSnoopState.ActiveLock); } +#define virNWFilterSnoopUnlockActive() \ + { virMutexUnlock(&virNWFilterSnoopState.ActiveLock); } + +static char * +virNWFilterSnoopActivate(virThreadPtr thread) +{ + char *key, *data; + unsigned long threadID = (unsigned long int)thread->thread; + + if (virAsprintf(&key, "0x%0*lX", (int)sizeof(threadID)*2, threadID) < 0) { + virReportOOMError(); + return NULL; + } + + virNWFilterSnoopLockActive(); + data = strdup("1"); + if (data == NULL) { + virReportOOMError(); + VIR_FREE(key); + } else if (virHashAddEntry(virNWFilterSnoopState.Active, key, data)) { + VIR_FREE(key); + VIR_FREE(data); + } + virNWFilterSnoopUnlockActive(); + return key; +} + +static void +virNWFilterSnoopCancel(char **ThreadKey) +{ + if (*ThreadKey == NULL) + return; + + virNWFilterSnoopLockActive(); + (void) virHashRemoveEntry(virNWFilterSnoopState.Active, *ThreadKey); + *ThreadKey = NULL; + virNWFilterSnoopUnlockActive(); +} + +static bool +virNWFilterSnoopIsActive(char *ThreadKey) +{ + void *entry; + + if (ThreadKey == NULL) + return 0; + virNWFilterSnoopLockActive(); + entry = virHashLookup(virNWFilterSnoopState.Active, ThreadKey); + virNWFilterSnoopUnlockActive(); + return entry != NULL; +} + +#define VIR_IFKEY_LEN ((VIR_UUID_STRING_BUFLEN) + (VIR_MAC_STRING_BUFLEN)) + +struct virNWFilterSnoopReq { + virNWFilterTechDriverPtr techdriver; + const char *ifname; + int ifindex; + const char *linkdev; + enum virDomainNetType nettype; + char ifkey[VIR_IFKEY_LEN]; + unsigned char macaddr[VIR_MAC_BUFLEN]; + const char *filtername; + virNWFilterHashTablePtr vars; + virNWFilterDriverStatePtr driver; + /* start and end of lease list, ordered by lease time */ + struct virNWFilterSnoopIPLease *start; + struct virNWFilterSnoopIPLease *end; + char *threadkey; +}; + +#define POLL_INTERVAL 10*1000 /* 10 secs */ +#define MAXERRS 25 /* retries on failing device */ + +struct virNWFilterSnoopIPLease { + uint32_t IPAddress; + uint32_t IPServer; + struct virNWFilterSnoopReq *SnoopReq; + unsigned int Timeout; + /* timer list */ + struct virNWFilterSnoopIPLease *prev; + struct virNWFilterSnoopIPLease *next; +}; + +static struct virNWFilterSnoopIPLease * + virNWFilterSnoopGetByIP(struct virNWFilterSnoopIPLease *start, + uint32_t ipaddr); +static void virNWFilterSnoopUpdateLease(struct virNWFilterSnoopIPLease *pl, + time_t timeout); + +static struct virNWFilterSnoopReq *virNWFilterSnoopNewReq(const char *ifkey); + +static void virNWFilterSnoopLeaseFileOpen(void); +static void virNWFilterSnoopLeaseFileClose(void); +static void virNWFilterSnoopLeaseFileLoad(void); +static void virNWFilterSnoopLeaseFileSave(struct virNWFilterSnoopIPLease *ipl); +static void virNWFilterSnoopLeaseFileRestore(struct virNWFilterSnoopReq *req); +static void virNWFilterSnoopLeaseFileRefresh(void); + +/* + * virNWFilterSnoopListAdd - add an IP lease to a list + */ +static void +virNWFilterSnoopListAdd(struct virNWFilterSnoopIPLease *plnew, + struct virNWFilterSnoopIPLease **start, + struct virNWFilterSnoopIPLease **end) +{ + struct virNWFilterSnoopIPLease *pl; + + plnew->next = plnew->prev = 0; + if (!*start) { + *start = *end = plnew; + return; + } + for (pl = *end; pl && plnew->Timeout < pl->Timeout; + pl = pl->prev) + /* empty */ ; + if (!pl) { + plnew->next = *start; + *start = plnew; + } else { + plnew->next = pl->next; + pl->next = plnew; + } + plnew->prev = pl; + if (plnew->next) + plnew->next->prev = plnew; + else + *end = plnew; +} + +/* + * virNWFilterSnoopTimerAdd - add an IP lease to the timer list + */ +static void +virNWFilterSnoopTimerAdd(struct virNWFilterSnoopIPLease *plnew) +{ + struct virNWFilterSnoopReq *req = plnew->SnoopReq; + + virNWFilterSnoopListAdd(plnew, &req->start, &req->end); +} + +/* + * virNWFilterSnoopInstallRule - install rule for a lease + */ +static int +virNWFilterSnoopInstallRule(struct virNWFilterSnoopIPLease *ipl) +{ + char ipbuf[INET_ADDRSTRLEN]; + int rc; + virNWFilterVarValuePtr ipVar; + + if (!inet_ntop(AF_INET, &ipl->IPAddress, ipbuf, sizeof(ipbuf))) { + virNWFilterReportError(VIR_ERR_INTERNAL_ERROR, + _("virNWFilterSnoopInstallRule inet_ntop failed " + " (0x%08X)"), ipl->IPAddress); + return -1; + } + ipVar = virNWFilterVarValueCreateSimpleCopyValue(ipbuf); + if (!ipVar) { + virReportOOMError(); + return -1; + } + if (virNWFilterHashTablePut(ipl->SnoopReq->vars, "IP", ipVar, 1)) { + virNWFilterReportError(VIR_ERR_INTERNAL_ERROR, + _("Could not add variable \"IP\" to hashmap")); + virNWFilterVarValueFree(ipVar); + return -1; + } + rc = virNWFilterInstantiateFilterLate(NULL, + ipl->SnoopReq->ifname, + ipl->SnoopReq->ifindex, + ipl->SnoopReq->linkdev, + ipl->SnoopReq->nettype, + ipl->SnoopReq->macaddr, + ipl->SnoopReq->filtername, + ipl->SnoopReq->vars, + ipl->SnoopReq->driver); + if (rc) + return -1; + return 0; +} + +/* + * virNWFilterSnoopLeaseAdd - create or update an IP lease + */ +static void +virNWFilterSnoopLeaseAdd(struct virNWFilterSnoopIPLease *plnew, + bool update_leasefile) +{ + struct virNWFilterSnoopIPLease *pl; + struct virNWFilterSnoopReq *req = plnew->SnoopReq; + + pl = virNWFilterSnoopGetByIP(req->start, plnew->IPAddress); + if (pl) { + virNWFilterSnoopUpdateLease(pl, plnew->Timeout); + if (update_leasefile) + virNWFilterSnoopLeaseFileSave(pl); + return; + } + /* support for multiple addresses requires the ability to add filters + * to existing chains, or to instantiate address lists via + * virNWFilterInstantiateFilterLate(). Until one of those capabilities + * is added, don't allow a new address when one is already assigned to + * this interface. + */ + if (req->start) + return; /* silently ignore multiple addresses */ + + if (VIR_ALLOC(pl) < 0) { + virReportOOMError(); + return; + } + *pl = *plnew; + + if (req->threadkey && virNWFilterSnoopInstallRule(pl) < 0) { + VIR_FREE(pl); + return; + } + virNWFilterSnoopTimerAdd(pl); + virNWFilterSnoopState.nLeases++; + if (update_leasefile) + virNWFilterSnoopLeaseFileSave(pl); +} + +/* + * virNWFilterSnoopListDel - remove an IP lease from a list + */ +static void +virNWFilterSnoopListDel(struct virNWFilterSnoopIPLease *ipl, + struct virNWFilterSnoopIPLease **start, + struct virNWFilterSnoopIPLease **end) +{ + if (ipl->prev) + ipl->prev->next = ipl->next; + else + *start = ipl->next; + if (ipl->next) + ipl->next->prev = ipl->prev; + else + *end = ipl->prev; + ipl->next = ipl->prev = 0; +} + +/* + * virNWFilterSnoopTimerDel - remove an IP lease from the timer list + */ +static void +virNWFilterSnoopTimerDel(struct virNWFilterSnoopIPLease *ipl) +{ + struct virNWFilterSnoopReq *req = ipl->SnoopReq; + + virNWFilterSnoopListDel(ipl, &req->start, &req->end); + ipl->Timeout = 0; +} + +/* + * virNWFilterSnoopLeaseDel - delete an IP lease + */ +static void +virNWFilterSnoopLeaseDel(struct virNWFilterSnoopReq *req, + uint32_t ipaddr, bool update_leasefile) +{ + struct virNWFilterSnoopIPLease *ipl; + + ipl = virNWFilterSnoopGetByIP(req->start, ipaddr); + if (ipl == NULL) + return; + + virNWFilterSnoopTimerDel(ipl); + + if (update_leasefile) { + virNWFilterSnoopLeaseFileSave(ipl); + + /* + * for multiple address support, this needs to remove those rules + * referencing "IP" with ipl's ip value. + */ + if (req->techdriver->applyDHCPOnlyRules(req->ifname, req->macaddr, + NULL, false)) + virNWFilterReportError(VIR_ERR_INTERNAL_ERROR, + _("virNWFilterSnoopListDel failed")); + } + VIR_FREE(ipl); + virNWFilterSnoopState.nLeases--; +} + +/* + * virNWFilterSnoopUpdateLease - update the timeout on an IP lease + */ +static void +virNWFilterSnoopUpdateLease(struct virNWFilterSnoopIPLease *ipl, time_t timeout) +{ + if (timeout < ipl->Timeout) + return; /* no take-backs */ + virNWFilterSnoopTimerDel(ipl); + ipl->Timeout = timeout; + virNWFilterSnoopTimerAdd(ipl); + return; +} + +/* + * virNWFilterSnoopGetByIP - lookup IP lease by IP address + */ +static struct virNWFilterSnoopIPLease * +virNWFilterSnoopGetByIP(struct virNWFilterSnoopIPLease *start, uint32_t ipaddr) +{ + struct virNWFilterSnoopIPLease *pl; + + for (pl = start; pl && pl->IPAddress != ipaddr; pl = pl->next) + /* empty */ ; + return pl; +} + +/* + * virNWFilterSnoopTimerRun - run the IP lease timeout list + */ +static unsigned int +virNWFilterSnoopTimerRun(struct virNWFilterSnoopReq *req) +{ + time_t now; + + now = time(0); + while (req->start && req->start->Timeout <= now) + virNWFilterSnoopLeaseDel(req, req->start->IPAddress, 1); + return 0; +} + +typedef unsigned char Eaddr[6]; + +struct virNWFilterSnoopEthHdr { + Eaddr eh_dst; + Eaddr eh_src; + unsigned short eh_type; + union { + unsigned char eu_data[0]; + struct vlan_hdr { + unsigned short ev_flags; + unsigned short ev_type; + unsigned char ev_data[0]; + } eu_vlh; + } eth_un; +} ATTRIBUTE_PACKED; + +#define eh_data eth_un.eu_data +#define ehv_data eth_un.eu_vlh.ev_data +#define ehv_type eth_un.eu_vlh.ev_type + +struct virNWFilterSnoopDHCPHdr { + unsigned char d_op; + unsigned char d_htype; + unsigned char d_hlen; + unsigned char d_hops; + unsigned int d_xid; + unsigned short d_secs; + unsigned short d_flags; + unsigned int d_ciaddr; + unsigned int d_yiaddr; + unsigned int d_siaddr; + unsigned int d_giaddr; + unsigned char d_chaddr[16]; + char d_sname[64]; + char d_file[128]; + unsigned char d_opts[0]; +}; + +/* DHCP options */ + +#define DHCPO_PAD 0 +#define DHCPO_LEASE 51 /* lease time in secs */ +#define DHCPO_MTYPE 53 /* message type */ +#define DHCPO_END 255 /* end of options */ + +/* DHCP message types */ +#define DHCPDECLINE 4 +#define DHCPACK 5 +#define DHCPRELEASE 7 + +static const unsigned char dhcp_magic[4] = { 99, 130, 83, 99 }; + +static int +virNWFilterSnoopDHCPGetOpt(struct virNWFilterSnoopDHCPHdr *pd, int len, + int *pmtype, int *pleasetime) +{ + int oind, olen; + int oend; + + olen = len - sizeof(*pd); + oind = 0; + + if (olen < 4) /* bad magic */ + return -1; + if (memcmp(dhcp_magic, pd->d_opts, sizeof(dhcp_magic)) != 0) + return -1; /* bad magic */ + oind += sizeof(dhcp_magic); + + oend = 0; + + *pmtype = *pleasetime = 0; + + while (oind < olen) { + switch (pd->d_opts[oind]) { + case DHCPO_LEASE: + if (olen - oind < 6) + goto malformed; + if (*pleasetime) + return -1; /* duplicate lease time */ + *pleasetime = + ntohl(*(unsigned int *) (pd->d_opts + oind + 2)); + break; + case DHCPO_MTYPE: + if (olen - oind < 3) + goto malformed; + if (*pmtype) + return -1; /* duplicate message type */ + *pmtype = pd->d_opts[oind + 2]; + break; + case DHCPO_PAD: + oind++; + continue; + + case DHCPO_END: + oend = 1; + break; + default: + if (olen - oind < 2) + goto malformed; + } + if (oend) + break; + oind += pd->d_opts[oind + 1] + 2; + } + return 0; +malformed: + VIR_WARN("got lost in the options!"); + return -1; +} + +static void +virNWFilterSnoopDHCPDecode(struct virNWFilterSnoopReq *req, + struct virNWFilterSnoopEthHdr *pep, + int len) +{ + struct iphdr *pip; + struct udphdr *pup; + struct virNWFilterSnoopDHCPHdr *pd; + struct virNWFilterSnoopIPLease ipl; + int mtype, leasetime; + + /* go through the protocol headers */ + switch (ntohs(pep->eh_type)) { + case ETHERTYPE_IP: + pip = (struct iphdr *) pep->eh_data; + len -= offsetof(struct virNWFilterSnoopEthHdr, eh_data); + break; + case ETHERTYPE_VLAN: + if (ntohs(pep->ehv_type) != ETHERTYPE_IP) + return; + pip = (struct iphdr *) pep->ehv_data; + len -= offsetof(struct virNWFilterSnoopEthHdr, ehv_data); + break; + default: + return; + } + pip = (struct iphdr *) pep->eh_data; + len -= sizeof(*pep); + if (len < 0) + return; + pup = (struct udphdr *) ((char *) pip + (pip->ihl << 2)); + len -= pip->ihl << 2; + if (len < 0) + return; + pd = (struct virNWFilterSnoopDHCPHdr *) ((char *) pup + sizeof(*pup)); + len -= sizeof(*pup); + if (len < 0) + return; /* invalid packet length */ + if (virNWFilterSnoopDHCPGetOpt(pd, len, &mtype, &leasetime) < 0) + return; + + memset(&ipl, 0, sizeof(ipl)); + ipl.IPAddress = pd->d_yiaddr; + ipl.IPServer = pd->d_siaddr; + if (leasetime == ~0) + ipl.Timeout = ~0; + else + ipl.Timeout = time(0) + leasetime; + ipl.SnoopReq = req; + + switch (mtype) { + case DHCPACK: + virNWFilterSnoopLeaseAdd(&ipl, 1); + break; + case DHCPDECLINE: + case DHCPRELEASE: + virNWFilterSnoopLeaseDel(req, ipl.IPAddress, 1); + break; + default: + break; + } +} + +#define PBUFSIZE 576 /* >= IP/TCP/DHCP headers */ +#define TIMEOUT 30 /* secs */ + +static pcap_t * +virNWFilterSnoopDHCPOpen(const char *intf) +{ + pcap_t *handle = NULL; + struct bpf_program fp; + char filter[64]; + char pcap_errbuf[PCAP_ERRBUF_SIZE]; + time_t start; + + start = time(0); + while (handle == NULL && time(0) - start < TIMEOUT) + handle = pcap_open_live(intf, PBUFSIZE, 0, POLL_INTERVAL, pcap_errbuf); + + if (handle == NULL) { + virNWFilterReportError(VIR_ERR_INTERNAL_ERROR, + _("pcap_open_live: %s"), pcap_errbuf); + return 0; + } + + sprintf(filter, "port 67 or dst port 68"); + if (pcap_compile(handle, &fp, filter, 1, PCAP_NETMASK_UNKNOWN) != 0) { + virNWFilterReportError(VIR_ERR_INTERNAL_ERROR, + _("pcap_compile: %s"), pcap_geterr(handle)); + return 0; + } + if (pcap_setfilter(handle, &fp) != 0) { + virNWFilterReportError(VIR_ERR_INTERNAL_ERROR, + _("pcap_setfilter: %s"), pcap_geterr(handle)); + pcap_freecode(&fp); + return 0; + } + pcap_freecode(&fp); + return handle; +} + +static void +virNWFilterSnoopReqFree(struct virNWFilterSnoopReq *req) +{ + struct virNWFilterSnoopIPLease *ipl; + + if (!req) + return; + + /* free all leases */ + for (ipl = req->start; ipl; ipl = req->start) + virNWFilterSnoopLeaseDel(req, ipl->IPAddress, 0); + + /* free all req data */ + VIR_FREE(req->ifname); + VIR_FREE(req->linkdev); + VIR_FREE(req->filtername); + virNWFilterHashTableFree(req->vars); + VIR_FREE(req); +} + +static void +virNWFilterDHCPSnoop(void *req0) +{ + struct virNWFilterSnoopReq *req = req0; + pcap_t *handle; + struct pcap_pkthdr *hdr; + struct virNWFilterSnoopEthHdr *packet; + int ifindex; + int errcount; + char *threadkey; + virThread thread; + + handle = virNWFilterSnoopDHCPOpen(req->ifname); + if (!handle) + return; + + virThreadSelf(&thread); + req->threadkey = virNWFilterSnoopActivate(&thread); + threadkey = strdup(req->threadkey); + if (threadkey == NULL) { + virReportOOMError(); + pcap_close(handle); + return; + } + + ifindex = if_nametoindex(req->ifname); + + virNWFilterSnoopLock(); + virNWFilterSnoopLeaseFileRestore(req); + virNWFilterSnoopUnlock(); + + errcount = 0; + while (1) { + int rv; + + virNWFilterSnoopLock(); + virNWFilterSnoopTimerRun(req); + virNWFilterSnoopUnlock(); + + rv = pcap_next_ex(handle, &hdr, (const u_char **)&packet); + + if (!virNWFilterSnoopIsActive(threadkey)) { + VIR_FREE(threadkey); + pcap_close(handle); + return; + } + if (rv < 0) { + if (virNetDevValidateConfig(req->ifname, NULL, ifindex) <= 0) + break; + if (++errcount > MAXERRS) { + virNWFilterReportError(VIR_ERR_INTERNAL_ERROR, + _("ifname \"%s\" failing; reopening"), + req->ifname); + pcap_close(handle); + handle = virNWFilterSnoopDHCPOpen(req->ifname); + if (!handle) + break; + } + continue; + } + errcount = 0; + if (rv) { + virNWFilterSnoopLock(); + virNWFilterSnoopDHCPDecode(req, packet, hdr->caplen); + virNWFilterSnoopUnlock(); + } + } + virNWFilterSnoopCancel(&req->threadkey); + (void) virHashRemoveEntry(virNWFilterSnoopState.IfnameToKey, req->ifname); + VIR_FREE(req->ifname); + /* if we still have a valid lease, keep the req for restarts */ + if (!req->start || req->start->Timeout < time(0)) + (void) virHashRemoveEntry(virNWFilterSnoopState.SnoopReqs, req->ifkey); + VIR_FREE(threadkey); + pcap_close(handle); + return; +} + +static void +virNWFilterSnoopIFKeyFMT(char *ifkey, const unsigned char *vmuuid, + unsigned const char *macaddr) +{ + virUUIDFormat(vmuuid, ifkey); + ifkey[VIR_UUID_STRING_BUFLEN-1] = '-'; + virMacAddrFormat(macaddr, ifkey + VIR_UUID_STRING_BUFLEN); +} + +int +virNWFilterDHCPSnoopReq(virNWFilterTechDriverPtr techdriver, + const char *ifname, + const char *linkdev, + enum virDomainNetType nettype, + const unsigned char *vmuuid, + const unsigned char *macaddr, + const char *filtername, + virNWFilterHashTablePtr filterparams, + virNWFilterDriverStatePtr driver) +{ + struct virNWFilterSnoopReq *req; + bool isnewreq; + char ifkey[VIR_IFKEY_LEN]; + virThread thread; + + virNWFilterSnoopIFKeyFMT(ifkey, vmuuid, macaddr); + virNWFilterSnoopLock(); + req = virHashLookup(virNWFilterSnoopState.SnoopReqs, ifkey); + isnewreq = req == NULL; + if (!isnewreq) { + if (req->threadkey) { + virNWFilterSnoopUnlock(); + return 0; + } + } else { + req = virNWFilterSnoopNewReq(ifkey); + if (!req) { + virNWFilterSnoopUnlock(); + return -1; + } + } + + req->techdriver = techdriver; + req->ifindex = if_nametoindex(ifname); + req->linkdev = linkdev ? strdup(linkdev) : NULL; + req->nettype = nettype; + req->ifname = strdup(ifname); + memcpy(req->macaddr, macaddr, sizeof(req->macaddr)); + req->filtername = strdup(filtername); + if (req->ifname == NULL || req->filtername == NULL) { + virNWFilterSnoopUnlock(); + virNWFilterSnoopReqFree(req); + virReportOOMError(); + return -1; + } + + if (techdriver->applyDHCPOnlyRules(req->ifname, req->macaddr, NULL, + false)) { + virNWFilterReportError(VIR_ERR_INTERNAL_ERROR, _("applyDHCPOnlyRules " + "failed - spoofing not protected!")); + } + + req->vars = virNWFilterHashTableCreate(0); + if (!req->vars) { + virNWFilterSnoopUnlock(); + virNWFilterSnoopReqFree(req); + virReportOOMError(); + return -1; + } + if (virNWFilterHashTablePutAll(filterparams, req->vars)) { + virNWFilterReportError(VIR_ERR_INTERNAL_ERROR, + _("virNWFilterDHCPSnoopReq: can't copy variables" + " on if %s"), ifkey); + virNWFilterSnoopUnlock(); + virNWFilterSnoopReqFree(req); + return -1; + } + req->driver = driver; + + if (virHashAddEntry(virNWFilterSnoopState.IfnameToKey, ifname, + req->ifkey)) { + virNWFilterReportError(VIR_ERR_INTERNAL_ERROR, + _("virNWFilterDHCPSnoopReq ifname map failed" + " on interface \"%s\" key \"%s\""), ifname, + ifkey); + virNWFilterSnoopUnlock(); + virNWFilterSnoopReqFree(req); + return -1; + } + if (isnewreq && + virHashAddEntry(virNWFilterSnoopState.SnoopReqs, ifkey, req)) { + virNWFilterReportError(VIR_ERR_INTERNAL_ERROR, + _("virNWFilterDHCPSnoopReq req add failed on" + " interface \"%s\" ifkey \"%s\""), ifname, + ifkey); + (void) virHashRemoveEntry(virNWFilterSnoopState.IfnameToKey, ifname); + virNWFilterSnoopUnlock(); + virNWFilterSnoopReqFree(req); + return -1; + } + virNWFilterSnoopUnlock(); + if (virThreadCreate(&thread, false, virNWFilterDHCPSnoop, req) != 0) { + virNWFilterSnoopLock(); + (void) virHashRemoveEntry(virNWFilterSnoopState.IfnameToKey, ifname); + (void) virHashRemoveEntry(virNWFilterSnoopState.SnoopReqs, ifkey); + virNWFilterSnoopUnlock(); + virNWFilterSnoopReqFree(req); + virNWFilterReportError(VIR_ERR_INTERNAL_ERROR, + _("virNWFilterDHCPSnoopReq virThreadCreate " + "failed on interface \"%s\""), ifname); + return -1; + } + return 0; +} + +/* + * virNWFilterSnoopReqRelease - hash table free function to kill a request + */ +static void +virNWFilterSnoopReqRelease(void *req0, const void *name ATTRIBUTE_UNUSED) +{ + struct virNWFilterSnoopReq *req = (struct virNWFilterSnoopReq *) req0; + + if (!req) + return; + + if (req->threadkey) + virNWFilterSnoopCancel(&req->threadkey); + virNWFilterSnoopReqFree(req); +} + +static void +virNWFilterSnoopLeaseFileClose(void) +{ + VIR_FORCE_CLOSE(virNWFilterSnoopState.LeaseFD); +} + +static void +virNWFilterSnoopLeaseFileOpen(void) +{ + virNWFilterSnoopLeaseFileClose(); + + virNWFilterSnoopState.LeaseFD = open(LEASEFILE, O_CREAT|O_RDWR|O_APPEND, + 0644); +} + +int +virNWFilterDHCPSnoopInit(void) +{ + if (virNWFilterSnoopState.SnoopReqs) + return 0; + + virNWFilterSnoopLock(); + virNWFilterSnoopState.IfnameToKey = virHashCreate(0, NULL); + virNWFilterSnoopState.SnoopReqs = + virHashCreate(0, virNWFilterSnoopReqRelease); + if (!virNWFilterSnoopState.IfnameToKey || + !virNWFilterSnoopState.SnoopReqs) { + virNWFilterSnoopUnlock(); + virReportOOMError(); + goto errexit; + } + virNWFilterSnoopLeaseFileLoad(); + virNWFilterSnoopLeaseFileOpen(); + + virNWFilterSnoopUnlock(); + + virNWFilterSnoopLockActive(); + virNWFilterSnoopState.Active = virHashCreate(0, 0); + if (!virNWFilterSnoopState.Active) { + virNWFilterSnoopUnlockActive(); + virReportOOMError(); + goto errexit; + } + virNWFilterSnoopUnlockActive(); + return 0; + +errexit: + if (virNWFilterSnoopState.IfnameToKey) { + virHashFree(virNWFilterSnoopState.IfnameToKey); + virNWFilterSnoopState.IfnameToKey = 0; + } + if (virNWFilterSnoopState.SnoopReqs) { + virHashFree(virNWFilterSnoopState.SnoopReqs); + virNWFilterSnoopState.SnoopReqs = 0; + } + if (virNWFilterSnoopState.Active) { + virHashFree(virNWFilterSnoopState.Active); + virNWFilterSnoopState.Active = 0; + } + return -1; +} + +void +virNWFilterDHCPSnoopEnd(const char *ifname) +{ + char *ifkey = NULL; + + virNWFilterSnoopLock(); + if (!virNWFilterSnoopState.SnoopReqs) { + virNWFilterSnoopUnlock(); + return; + } + + if (ifname) { + ifkey = (char *)virHashLookup(virNWFilterSnoopState.IfnameToKey,ifname); + (void) virHashRemoveEntry(virNWFilterSnoopState.IfnameToKey, ifname); + if (!ifkey) { + virNWFilterReportError(VIR_ERR_INTERNAL_ERROR, + _("ifname \"%s\" not in key map"), ifname); + virNWFilterSnoopUnlock(); + return; + } + } + + if (ifkey) { + struct virNWFilterSnoopReq *req; + + req = virHashLookup(virNWFilterSnoopState.SnoopReqs, ifkey); + if (!req) { + virNWFilterReportError(VIR_ERR_INTERNAL_ERROR, + _("ifkey \"%s\" has no req"), ifkey); + virNWFilterSnoopUnlock(); + return; + } + if (!req->start || req->start->Timeout < time(0)) { + (void) virHashRemoveEntry(virNWFilterSnoopState.SnoopReqs, + req->ifkey); + virNWFilterSnoopUnlock(); + return; + } + /* keep valid lease req; drop interface association */ + virNWFilterSnoopCancel(&req->threadkey); + VIR_FREE(req->ifname); + } else { /* free all of them */ + virNWFilterSnoopLeaseFileClose(); + virHashFree(virNWFilterSnoopState.IfnameToKey); + virHashFree(virNWFilterSnoopState.SnoopReqs); + virNWFilterSnoopState.IfnameToKey = virHashCreate(0, 0); + if (!virNWFilterSnoopState.IfnameToKey) { + virNWFilterSnoopUnlock(); + virReportOOMError(); + return; + } + virNWFilterSnoopState.SnoopReqs = + virHashCreate(0, virNWFilterSnoopReqRelease); + if (!virNWFilterSnoopState.SnoopReqs) { + virHashFree(virNWFilterSnoopState.IfnameToKey); + virNWFilterSnoopUnlock(); + virReportOOMError(); + return; + } + virNWFilterSnoopLeaseFileLoad(); + } + virNWFilterSnoopUnlock(); +} + +static int +virNWFilterSnoopLeaseFileWrite(int lfd, const char *ifkey, + struct virNWFilterSnoopIPLease *ipl) +{ + char lbuf[256], ipstr[INET_ADDRSTRLEN], dhcpstr[INET_ADDRSTRLEN]; + + if (inet_ntop(AF_INET, &ipl->IPAddress, ipstr, sizeof(ipstr)) == 0) { + virNWFilterReportError(VIR_ERR_INTERNAL_ERROR, + _("inet_ntop(0x%08X) failed"), ipl->IPAddress); + return -1; + } + if (inet_ntop(AF_INET, &ipl->IPServer, dhcpstr, sizeof(dhcpstr)) == 0) { + virNWFilterReportError(VIR_ERR_INTERNAL_ERROR, + _("inet_ntop(0x%08X) failed"), ipl->IPServer); + return -1; + } + /* time intf ip dhcpserver */ + snprintf(lbuf, sizeof(lbuf), "%u %s %s %s\n", ipl->Timeout, + ifkey, ipstr, dhcpstr); + if (write(lfd, lbuf, strlen(lbuf)) < 0) { + virNWFilterReportError(VIR_ERR_INTERNAL_ERROR, + _("lease file write failed: %s"), + strerror(errno)); + return -1; + } + (void) fsync(lfd); + return 0; +} + +static void +virNWFilterSnoopLeaseFileSave(struct virNWFilterSnoopIPLease *ipl) +{ + struct virNWFilterSnoopReq *req = ipl->SnoopReq; + + if (virNWFilterSnoopState.LeaseFD < 0) + virNWFilterSnoopLeaseFileOpen(); + if (virNWFilterSnoopLeaseFileWrite(virNWFilterSnoopState.LeaseFD, + req->ifkey, ipl) < 0) + return; + /* keep dead leases at < ~95% of file size */ + if (++virNWFilterSnoopState.wLeases >= virNWFilterSnoopState.nLeases*20) + virNWFilterSnoopLeaseFileLoad(); /* load & refresh lease file */ +} + +static struct virNWFilterSnoopReq * +virNWFilterSnoopNewReq(const char *ifkey) +{ + struct virNWFilterSnoopReq *req; + + if (ifkey == NULL || strlen(ifkey) != VIR_IFKEY_LEN-1) { + virNWFilterReportError(VIR_ERR_INTERNAL_ERROR, + _("virNWFilterSnoopNewReq called with invalid " + "key \"%s\" (%d)"), + ifkey ? ifkey : "", strlen(ifkey)); + return NULL; + } + if (VIR_ALLOC(req) < 0) { + virReportOOMError(); + return NULL; + } + if (virStrcpyStatic(req->ifkey, ifkey) == NULL) + VIR_FREE(req); + + return req; +} + +static void +virNWFilterSnoopSaveIter(void *payload, + const void *name ATTRIBUTE_UNUSED, + void *data) +{ + struct virNWFilterSnoopReq *req = payload; + int tfd = *(int *)data; + struct virNWFilterSnoopIPLease *ipl; + + /* clean up orphaned, expired leases */ + if (!req->threadkey) { + time_t now; + + now = time(0); + for (ipl = req->start; ipl; ipl = ipl->next) + if (ipl->Timeout < now) + virNWFilterSnoopLeaseDel(req, ipl->IPAddress , 0); + if (!req->start) { + virNWFilterSnoopReqFree(req); + return; + } + } + for (ipl = req->start; ipl; ipl = ipl->next) + (void) virNWFilterSnoopLeaseFileWrite(tfd, req->ifkey, ipl); +} + +static void +virNWFilterSnoopLeaseFileRefresh(void) +{ + int tfd; + + (void) unlink(TMPLEASEFILE); + /* lease file loaded, delete old one */ + tfd = open(TMPLEASEFILE, O_CREAT|O_RDWR|O_TRUNC|O_EXCL, 0644); + if (tfd < 0) { + virNWFilterReportError(VIR_ERR_INTERNAL_ERROR, + _("open(\"%s\"): %s"), + TMPLEASEFILE, strerror(errno)); + return; + } + if (virNWFilterSnoopState.SnoopReqs) + virHashForEach(virNWFilterSnoopState.SnoopReqs, + virNWFilterSnoopSaveIter, (void *)&tfd); + VIR_FORCE_CLOSE(tfd); + if (rename(TMPLEASEFILE, LEASEFILE) < 0) { + virNWFilterReportError(VIR_ERR_INTERNAL_ERROR, + _("rename(\"%s\", \"%s\"): %s"), + TMPLEASEFILE, LEASEFILE, strerror(errno)); + (void) unlink(TMPLEASEFILE); + } + virNWFilterSnoopState.wLeases = 0; + virNWFilterSnoopLeaseFileOpen(); +} + + +static void +virNWFilterSnoopLeaseFileLoad(void) +{ + char line[256], ifkey[VIR_IFKEY_LEN], ipstr[INET_ADDRSTRLEN], + srvstr[INET_ADDRSTRLEN]; + struct virNWFilterSnoopIPLease ipl; + struct virNWFilterSnoopReq *req; + time_t now; + FILE *fp; + int ln = 0; + + fp = fopen(LEASEFILE, "r"); + time(&now); + while (fp && fgets(line, sizeof(line), fp)) { + if (line[strlen(line)-1] != '\n') { + virNWFilterReportError(VIR_ERR_INTERNAL_ERROR, + _("virNWFilterSnoopLeaseFileLoad lease file " + "line %d corrupt"), ln); + break; + } + ln++; + /* key len 55 = "VMUUID"+'-'+"MAC" */ + if (sscanf(line, "%u %55s %16s %16s", &ipl.Timeout, + ifkey, ipstr, srvstr) < 4) { + virNWFilterReportError(VIR_ERR_INTERNAL_ERROR, + _("virNWFilterSnoopLeaseFileLoad lease file " + "line %d corrupt"), ln); + break; + } + if (ipl.Timeout && ipl.Timeout < now) + continue; + req = virHashLookup(virNWFilterSnoopState.SnoopReqs, ifkey); + if (!req) { + req = virNWFilterSnoopNewReq(ifkey); + if (!req) + break; + if (virHashAddEntry(virNWFilterSnoopState.SnoopReqs, ifkey, req)) { + virNWFilterSnoopReqFree(req); + virNWFilterReportError(VIR_ERR_INTERNAL_ERROR, + _("virNWFilterSnoopLeaseFileLoad req add" + " failed on interface \"%s\""), ifkey); + continue; + } + } + + if (inet_pton(AF_INET, ipstr, &ipl.IPAddress) <= 0) { + virNWFilterReportError(VIR_ERR_INTERNAL_ERROR, + _("line %d corrupt ipaddr \"%s\""), + ln, ipstr); + continue; + } + (void) inet_pton(AF_INET, srvstr, &ipl.IPServer); + ipl.SnoopReq = req; + + if (ipl.Timeout) + virNWFilterSnoopLeaseAdd(&ipl, 0); + else + virNWFilterSnoopLeaseDel(req, ipl.IPAddress, 0); + } + if (fp != NULL) + (void) fclose(fp); + virNWFilterSnoopLeaseFileRefresh(); +} + +static void +virNWFilterSnoopLeaseFileRestore(struct virNWFilterSnoopReq *req) +{ + struct virNWFilterSnoopIPLease *ipl; + + for (ipl=req->start; ipl; ipl=ipl->next) + (void) virNWFilterSnoopInstallRule(ipl); +} + +#else /* HAVE_LIBPCAP */ +int +virNWFilterDHCPSnoopInit(void) +{ + return -1; +} + +void +virNWFilterDHCPSnoopEnd(const char *ifname ATTRIBUTE_UNUSED) +{ + return; +} + +int +virNWFilterDHCPSnoopReq(virNWFilterTechDriverPtr techdriver ATTRIBUTE_UNUSED, + const char *ifname ATTRIBUTE_UNUSED, + const char *linkdev ATTRIBUTE_UNUSED, + enum virDomainNetType nettype ATTRIBUTE_UNUSED, + char *vmuuid ATTRIBUTE_UNUSED, + const unsigned char *macaddr ATTRIBUTE_UNUSED, + const char *filtername ATTRIBUTE_UNUSED, + virNWFilterHashTablePtr filterparams ATTRIBUTE_UNUSED, + virNWFilterDriverStatePtr driver ATTRIBUTE_UNUSED) +{ + virNWFilterReportError(VIR_ERR_INTERNAL_ERROR, _("libvirt was not compiled " + "with libpcap and \"ip_learning='dhcp'\" requires" + " it.")); + return 1; +} +#endif /* HAVE_LIBPCAP */ diff --git a/src/nwfilter/nwfilter_dhcpsnoop.h b/src/nwfilter/nwfilter_dhcpsnoop.h new file mode 100644 index 0000000..25500e2 --- /dev/null +++ b/src/nwfilter/nwfilter_dhcpsnoop.h @@ -0,0 +1,38 @@ +/* + * nwfilter_dhcpsnoop.h: support DHCP snooping for a VM on an interface + * + * Copyright (C) 2010 IBM Corp. + * Copyright (C) 2010 David L Stevens + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * Author: David L Stevens <dlstevens(a)us.ibm.com> + */ + +#ifndef __NWFILTER_DHCPSNOOP_H +#define __NWFILTER_DHCPSNOOP_H + +int virNWFilterDHCPSnoopInit(void); +int virNWFilterDHCPSnoopReq(virNWFilterTechDriverPtr techdriver, + const char *ifname, + const char *linkdev, + enum virDomainNetType nettype, + const unsigned char *vmuuid, + const unsigned char *macaddr, + const char *filtername, + virNWFilterHashTablePtr filterparams, + virNWFilterDriverStatePtr driver); +void virNWFilterDHCPSnoopEnd(const char *ifname); +#endif /* __NWFILTER_DHCPSNOOP_H */ diff --git a/src/nwfilter/nwfilter_driver.c b/src/nwfilter/nwfilter_driver.c index ffb4b5d..d014a19 100644 --- a/src/nwfilter/nwfilter_driver.c +++ b/src/nwfilter/nwfilter_driver.c @@ -39,6 +39,7 @@ #include "nwfilter_gentech_driver.h" #include "configmake.h" +#include "nwfilter_dhcpsnoop.h" #include "nwfilter_learnipaddr.h" #define VIR_FROM_THIS VIR_FROM_NWFILTER @@ -66,6 +67,8 @@ static int nwfilterDriverStartup(int privileged) { char *base = NULL; + if (virNWFilterDHCPSnoopInit() < 0) + return -1; if (virNWFilterLearnInit() < 0) return -1; @@ -127,6 +130,7 @@ alloc_err_exit: conf_init_err: virNWFilterTechDriversShutdown(); + virNWFilterDHCPSnoopEnd(0); virNWFilterLearnShutdown(); return -1; @@ -149,6 +153,7 @@ nwfilterDriverReload(void) { conn = virConnectOpen("qemu:///system"); if (conn) { + virNWFilterDHCPSnoopEnd(0); /* shut down all threads -- they will be restarted if necessary */ virNWFilterLearnThreadsTerminate(true); @@ -203,6 +208,7 @@ nwfilterDriverShutdown(void) { virNWFilterConfLayerShutdown(); virNWFilterTechDriversShutdown(); + virNWFilterDHCPSnoopEnd(0); virNWFilterLearnShutdown(); nwfilterDriverLock(driverState); diff --git a/src/nwfilter/nwfilter_gentech_driver.c b/src/nwfilter/nwfilter_gentech_driver.c index fc71e7b..07ae33c 100644 --- a/src/nwfilter/nwfilter_gentech_driver.c +++ b/src/nwfilter/nwfilter_gentech_driver.c @@ -32,6 +32,7 @@ #include "virterror_internal.h" #include "nwfilter_gentech_driver.h" #include "nwfilter_ebiptables_driver.h" +#include "nwfilter_dhcpsnoop.h" #include "nwfilter_learnipaddr.h" #include "virnetdev.h" #include "datatypes.h" @@ -42,6 +43,8 @@ #define NWFILTER_STD_VAR_MAC "MAC" #define NWFILTER_STD_VAR_IP "IP" +#define NWFILTER_DFLT_LEARN "any" + static int _virNWFilterTeardownFilter(const char *ifname); @@ -662,6 +665,9 @@ virNWFilterInstantiate(const unsigned char *vmuuid ATTRIBUTE_UNUSED, void **ptrs = NULL; int instantiate = 1; char *buf; + virNWFilterVarValuePtr lv; + const char *learning; + bool reportIP = false; virNWFilterHashTablePtr missing_vars = virNWFilterHashTableCreate(0); if (!missing_vars) { @@ -678,22 +684,47 @@ virNWFilterInstantiate(const unsigned char *vmuuid ATTRIBUTE_UNUSED, if (rc < 0) goto err_exit; + lv = virHashLookup(vars->hashTable, "ip_learning"); + if (lv && lv->valType == NWFILTER_VALUE_TYPE_SIMPLE) + learning = lv->u.simple.value; + else + learning = NULL; + + if (learning == NULL) + learning = NWFILTER_DFLT_LEARN; + if (virHashSize(missing_vars->hashTable) == 1) { if (virHashLookup(missing_vars->hashTable, NWFILTER_STD_VAR_IP) != NULL) { - if (virNWFilterLookupLearnReq(ifindex) == NULL) { - rc = virNWFilterLearnIPAddress(techdriver, - ifname, - ifindex, - linkdev, - nettype, macaddr, - filter->name, - vars, driver, - DETECT_DHCP|DETECT_STATIC); + if (c_strcasecmp(learning, "none") == 0) { /* no learning */ + reportIP = true; + goto err_unresolvable_vars; } - goto err_exit; - } - goto err_unresolvable_vars; + if (c_strcasecmp(learning, "dhcp") == 0) { + rc = virNWFilterDHCPSnoopReq(techdriver, ifname, linkdev, + nettype, vmuuid, macaddr, + filter->name, vars, driver); + goto err_exit; + } else if (c_strcasecmp(learning, "any") == 0) { + if (virNWFilterLookupLearnReq(ifindex) == NULL) { + rc = virNWFilterLearnIPAddress(techdriver, + ifname, + ifindex, + linkdev, + nettype, macaddr, + filter->name, + vars, driver, + DETECT_DHCP|DETECT_STATIC); + } + goto err_exit; + } else { + rc = -1; + virNWFilterReportError(VIR_ERR_PARSE_FAILED, _("filter '%s' " + "learning value '%s' invalid."), + filter->name, learning); + } + } else + goto err_unresolvable_vars; } else if (virHashSize(missing_vars->hashTable) > 1) { goto err_unresolvable_vars; } else if (!forceWithPendingReq && @@ -761,7 +792,7 @@ err_exit: err_unresolvable_vars: - buf = virNWFilterPrintVars(missing_vars->hashTable, ", ", false, false); + buf = virNWFilterPrintVars(missing_vars->hashTable, ", ", false, reportIP); if (buf) { virNWFilterReportError(VIR_ERR_INTERNAL_ERROR, _("Cannot instantiate filter due to unresolvable " @@ -1092,6 +1123,8 @@ _virNWFilterTeardownFilter(const char *ifname) return -1; } + virNWFilterDHCPSnoopEnd(ifname); + virNWFilterTerminateLearnReq(ifname); if (virNWFilterLockIface(ifname) < 0) -- 1.7.6.5

2 2

[libvirt] [PATCH] UML: may be typo
by MATSUDA, Daiki 09 Apr '12

09 Apr '12

I found typo in UML driver. MATSUDA Daiki --- libvirt-0.9.11/src/uml/uml_driver.c.orig 2012-04-09 11:56:47.105695476 +0900 +++ libvirt-0.9.11/src/uml/uml_driver.c 2012-04-09 11:56:56.653820665 +0900 @@ -249,7 +249,7 @@ umlIdentifyChrPTY(struct uml_driver *dri { int i; - for (i = 0 ; i < dom->def->nserials; i++) + for (i = 0 ; i < dom->def->nconsoles; i++) if (dom->def->consoles[i]->source.type == VIR_DOMAIN_CHR_TYPE_PTY) if (umlIdentifyOneChrPTY(driver, dom, dom->def->consoles[i], "con") < 0)

2 1

[libvirt] [PATCH 1/2] nwfilter: move code for IP address map into separate file
by Stefan Berger 09 Apr '12

09 Apr '12

The goal of this patch is to prepare for support for multiple IP addresses per interface in the DHCP snooping code. Move the code for the IP address map that maps interface names to IP addresses into their own file. Rename the functions on the way but otherwise leave the code as-is. Initialize this new layer separately before dependent layers (iplearning, dhcpsnooping) and shut it down after them. --- src/Makefile.am | 2 src/nwfilter/nwfilter_driver.c | 11 +- src/nwfilter/nwfilter_gentech_driver.c | 5 src/nwfilter/nwfilter_ipaddrmap.c | 167 +++++++++++++++++++++++++++++++++ src/nwfilter/nwfilter_ipaddrmap.h | 38 +++++++ src/nwfilter/nwfilter_learnipaddr.c | 127 ------------------------- src/nwfilter/nwfilter_learnipaddr.h | 3 7 files changed, 222 insertions(+), 131 deletions(-) Index: libvirt-acl/src/nwfilter/nwfilter_ipaddrmap.h =================================================================== --- /dev/null +++ libvirt-acl/src/nwfilter/nwfilter_ipaddrmap.h @@ -0,0 +1,38 @@ +/* + * nwfilter_ipaddrmap.h: IP address map for mapping interfaces to their + * detected/expected IP addresses + * + * Copyright (C) 2010, 2012 IBM Corp. + * + * Author: + * Stefan Berger <stefanb(a)linux.vnet.ibm.com> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + */ + +#ifndef __VIR_NWFILTER_IPADDRMAP_H +# define __VIR_NWFILTER_IPADDRMAP_H + +int virNWFilterIPAddrMapInit(void); +void virNWFilterIPAddrMapShutdown(void); + +int virNWFilterIPAddrMapAddIPAddrForIfname(const char *ifname, char *addr); +int virNWFilterIPAddrMapDelIPAddrForIfname(const char *ifname, + const char *ipaddr); +virNWFilterVarValuePtr virNWFilterIPAddrMapGetIPAddrForIfname( + const char *ifname); + +#endif /* __VIR_NWFILTER_IPADDRMAP_H */ Index: libvirt-acl/src/Makefile.am =================================================================== --- libvirt-acl.orig/src/Makefile.am +++ libvirt-acl/src/Makefile.am @@ -513,6 +513,8 @@ NWFILTER_DRIVER_SOURCES = \ nwfilter/nwfilter_dhcpsnoop.h \ nwfilter/nwfilter_ebiptables_driver.c \ nwfilter/nwfilter_ebiptables_driver.h \ + nwfilter/nwfilter_ipaddrmap.c \ + nwfilter/nwfilter_ipaddrmap.h \ nwfilter/nwfilter_learnipaddr.c \ nwfilter/nwfilter_learnipaddr.h Index: libvirt-acl/src/nwfilter/nwfilter_driver.c =================================================================== --- libvirt-acl.orig/src/nwfilter/nwfilter_driver.c +++ libvirt-acl/src/nwfilter/nwfilter_driver.c @@ -39,6 +39,7 @@ #include "nwfilter_gentech_driver.h" #include "configmake.h" +#include "nwfilter_ipaddrmap.h" #include "nwfilter_dhcpsnoop.h" #include "nwfilter_learnipaddr.h" @@ -67,10 +68,12 @@ static int nwfilterDriverStartup(int privileged) { char *base = NULL; - if (virNWFilterDHCPSnoopInit() < 0) + if (virNWFilterIPAddrMapInit() < 0) return -1; if (virNWFilterLearnInit() < 0) - return -1; + goto err_exit_ipaddrmapshutdown; + if (virNWFilterDHCPSnoopInit() < 0) + goto err_exit_learnshutdown; virNWFilterTechDriversInit(privileged); @@ -131,7 +134,10 @@ alloc_err_exit: conf_init_err: virNWFilterTechDriversShutdown(); virNWFilterDHCPSnoopShutdown(); +err_exit_learnshutdown: virNWFilterLearnShutdown(); +err_exit_ipaddrmapshutdown: + virNWFilterIPAddrMapShutdown(); return -1; } @@ -210,6 +216,7 @@ nwfilterDriverShutdown(void) { virNWFilterTechDriversShutdown(); virNWFilterDHCPSnoopShutdown(); virNWFilterLearnShutdown(); + virNWFilterIPAddrMapShutdown(); nwfilterDriverLock(driverState); Index: libvirt-acl/src/nwfilter/nwfilter_gentech_driver.c =================================================================== --- libvirt-acl.orig/src/nwfilter/nwfilter_gentech_driver.c +++ libvirt-acl/src/nwfilter/nwfilter_gentech_driver.c @@ -33,6 +33,7 @@ #include "nwfilter_gentech_driver.h" #include "nwfilter_ebiptables_driver.h" #include "nwfilter_dhcpsnoop.h" +#include "nwfilter_ipaddrmap.h" #include "nwfilter_learnipaddr.h" #include "virnetdev.h" #include "datatypes.h" @@ -870,7 +871,7 @@ __virNWFilterInstantiateFilter(const uns goto err_exit; } - ipaddr = virNWFilterGetIpAddrForIfname(ifname); + ipaddr = virNWFilterIPAddrMapGetIPAddrForIfname(ifname); vars1 = virNWFilterCreateVarHashmap(str_macaddr, ipaddr); if (!vars1) { @@ -1132,7 +1133,7 @@ _virNWFilterTeardownFilter(const char *i techdriver->allTeardown(ifname); - virNWFilterDelIpAddrForIfname(ifname, NULL); + virNWFilterIPAddrMapDelIPAddrForIfname(ifname, NULL); virNWFilterUnlockIface(ifname); Index: libvirt-acl/src/nwfilter/nwfilter_ipaddrmap.c =================================================================== --- /dev/null +++ libvirt-acl/src/nwfilter/nwfilter_ipaddrmap.c @@ -0,0 +1,167 @@ +/* + * nwfilter_ipaddrmap.c: IP address map for mapping interfaces to their + * detected/expected IP addresses + * + * Copyright (C) 2010, 2012 IBM Corp. + * + * Author: + * Stefan Berger <stefanb(a)linux.vnet.ibm.com> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include <config.h> + +#include "internal.h" + +#include "virterror_internal.h" +#include "datatypes.h" +#include "nwfilter_params.h" +#include "nwfilter_ipaddrmap.h" + +#define VIR_FROM_THIS VIR_FROM_NWFILTER + +static virMutex ipAddressMapLock; +static virNWFilterHashTablePtr ipAddressMap; + + +/* Add an IP address to the list of IP addresses an interface is + * known to use. This function feeds the per-interface cache that + * is used to instantiate filters with variable '$IP'. + * + * @ifname: The name of the (tap) interface + * @addr: An IPv4 address in dotted decimal format that the (tap) + * interface is known to use. + * + * This function returns 0 on success, -1 otherwise + */ +int +virNWFilterIPAddrMapAddIPAddrForIfname(const char *ifname, char *addr) +{ + int ret = -1; + virNWFilterVarValuePtr val; + + virMutexLock(&ipAddressMapLock); + + val = virHashLookup(ipAddressMap->hashTable, ifname); + if (!val) { + val = virNWFilterVarValueCreateSimple(addr); + if (!val) { + virReportOOMError(); + goto cleanup; + } + ret = virNWFilterHashTablePut(ipAddressMap, ifname, val, 1); + goto cleanup; + } else { + if (virNWFilterVarValueAddValue(val, addr) < 0) + goto cleanup; + } + + ret = 0; + +cleanup: + virMutexUnlock(&ipAddressMapLock); + + return ret; +} + +/* Delete all or a specific IP address from an interface. After this + * call either all or the given IP address will not be associated + * with the interface anymore. + * + * @ifname: The name of the (tap) interface + * @addr: An IPv4 address in dotted decimal format that the (tap) + * interface is not using anymore; provide NULL to remove all IP + * addresses associated with the given interface + * + * This function returns the number of IP addresses that are still + * known to be associated with this interface, in case of an error + * -1 is returned. Error conditions are: + * - IP addresses is not known to be associated with the interface + */ +int +virNWFilterIPAddrMapDelIPAddrForIfname(const char *ifname, const char *ipaddr) +{ + int ret = -1; + virNWFilterVarValuePtr val = NULL; + + virMutexLock(&ipAddressMapLock); + + if (ipaddr != NULL) { + val = virHashLookup(ipAddressMap->hashTable, ifname); + if (val) { + if (virNWFilterVarValueGetCardinality(val) == 1 && + STREQ(ipaddr, + virNWFilterVarValueGetNthValue(val, 0))) + goto remove_entry; + virNWFilterVarValueDelValue(val, ipaddr); + ret = virNWFilterVarValueGetCardinality(val); + } + } else { +remove_entry: + /* remove whole entry */ + val = virNWFilterHashTableRemoveEntry(ipAddressMap, ifname); + virNWFilterVarValueFree(val); + ret = 0; + } + + virMutexUnlock(&ipAddressMapLock); + + return ret; +} + +/* Get the list of IP addresses known to be in use by an interface + * + * This function returns NULL in case no IP address is known to be + * associated with the interface, a virNWFilterVarValuePtr otherwise + * that then can contain one or multiple entries. + */ +virNWFilterVarValuePtr +virNWFilterIPAddrMapGetIPAddrForIfname(const char *ifname) +{ + virNWFilterVarValuePtr res; + + virMutexLock(&ipAddressMapLock); + + res = virHashLookup(ipAddressMap->hashTable, ifname); + + virMutexUnlock(&ipAddressMapLock); + + return res; +} + +int +virNWFilterIPAddrMapInit(void) +{ + ipAddressMap = virNWFilterHashTableCreate(0); + if (!ipAddressMap) { + virReportOOMError(); + return -1; + } + + if (virMutexInit(&ipAddressMapLock) < 0) { + virNWFilterIPAddrMapShutdown(); + return -1; + } + + return 0; +} + +void +virNWFilterIPAddrMapShutdown(void) +{ + virNWFilterHashTableFree(ipAddressMap); + ipAddressMap = NULL; +} Index: libvirt-acl/src/nwfilter/nwfilter_learnipaddr.c =================================================================== --- libvirt-acl.orig/src/nwfilter/nwfilter_learnipaddr.c +++ libvirt-acl/src/nwfilter/nwfilter_learnipaddr.c @@ -52,6 +52,7 @@ #include "conf/domain_conf.h" #include "nwfilter_gentech_driver.h" #include "nwfilter_ebiptables_driver.h" +#include "nwfilter_ipaddrmap.h" #include "nwfilter_learnipaddr.h" #define VIR_FROM_THIS VIR_FROM_NWFILTER @@ -118,9 +119,6 @@ struct ether_vlan_header static virMutex pendingLearnReqLock; static virHashTablePtr pendingLearnReq; -static virMutex ipAddressMapLock; -static virNWFilterHashTablePtr ipAddressMap; - static virMutex ifaceMapLock; static virHashTablePtr ifaceLockMap; @@ -310,113 +308,8 @@ virNWFilterDeregisterLearnReq(int ifinde return res; } -/* Add an IP address to the list of IP addresses an interface is - * known to use. This function feeds the per-interface cache that - * is used to instantiate filters with variable '$IP'. - * - * @ifname: The name of the (tap) interface - * @addr: An IPv4 address in dotted decimal format that the (tap) - * interface is known to use. - * - * This function returns 0 on success, -1 otherwise - */ -static int -virNWFilterAddIpAddrForIfname(const char *ifname, char *addr) -{ - int ret = -1; - virNWFilterVarValuePtr val; - - virMutexLock(&ipAddressMapLock); - - val = virHashLookup(ipAddressMap->hashTable, ifname); - if (!val) { - val = virNWFilterVarValueCreateSimple(addr); - if (!val) { - virReportOOMError(); - goto cleanup; - } - ret = virNWFilterHashTablePut(ipAddressMap, ifname, val, 1); - goto cleanup; - } else { - if (virNWFilterVarValueAddValue(val, addr) < 0) - goto cleanup; - } - - ret = 0; - -cleanup: - virMutexUnlock(&ipAddressMapLock); - - return ret; -} #endif -/* Delete all or a specific IP address from an interface. After this - * call either all or the given IP address will not be associated - * with the interface anymore. - * - * @ifname: The name of the (tap) interface - * @addr: An IPv4 address in dotted decimal format that the (tap) - * interface is not using anymore; provide NULL to remove all IP - * addresses associated with the given interface - * - * This function returns the number of IP addresses that are still - * known to be associated with this interface, in case of an error - * -1 is returned. Error conditions are: - * - IP addresses is not known to be associated with the interface - */ -int -virNWFilterDelIpAddrForIfname(const char *ifname, const char *ipaddr) -{ - int ret = -1; - virNWFilterVarValuePtr val = NULL; - - virMutexLock(&ipAddressMapLock); - - if (ipaddr != NULL) { - val = virHashLookup(ipAddressMap->hashTable, ifname); - if (val) { - if (virNWFilterVarValueGetCardinality(val) == 1 && - STREQ(ipaddr, - virNWFilterVarValueGetNthValue(val, 0))) - goto remove_entry; - virNWFilterVarValueDelValue(val, ipaddr); - ret = virNWFilterVarValueGetCardinality(val); - } - } else { -remove_entry: - /* remove whole entry */ - val = virNWFilterHashTableRemoveEntry(ipAddressMap, ifname); - virNWFilterVarValueFree(val); - ret = 0; - } - - virMutexUnlock(&ipAddressMapLock); - - return ret; -} - -/* Get the list of IP addresses known to be in use by an interface - * - * This function returns NULL in case no IP address is known to be - * associated with the interface, a virNWFilterVarValuePtr otherwise - * that then can contain one or multiple entries. - */ -virNWFilterVarValuePtr -virNWFilterGetIpAddrForIfname(const char *ifname) -{ - virNWFilterVarValuePtr res; - - virMutexLock(&ipAddressMapLock); - - res = virHashLookup(ipAddressMap->hashTable, ifname); - - virMutexUnlock(&ipAddressMapLock); - - return res; -} - - #ifdef HAVE_LIBPCAP static void @@ -699,7 +592,8 @@ learnIPAddressThread(void *arg) char *inetaddr; if ((inetaddr = virSocketAddrFormat(&sa)) != NULL) { - if (virNWFilterAddIpAddrForIfname(req->ifname, inetaddr) < 0) { + if (virNWFilterIPAddrMapAddIPAddrForIfname(req->ifname, + inetaddr) < 0) { VIR_ERROR(_("Failed to add IP address %s to IP address " "cache for interface %s"), inetaddr, req->ifname); } @@ -901,18 +795,6 @@ virNWFilterLearnInit(void) { return -1; } - ipAddressMap = virNWFilterHashTableCreate(0); - if (!ipAddressMap) { - virReportOOMError(); - virNWFilterLearnShutdown(); - return -1; - } - - if (virMutexInit(&ipAddressMapLock) < 0) { - virNWFilterLearnShutdown(); - return -1; - } - ifaceLockMap = virHashCreate(0, freeIfaceLock); if (!ifaceLockMap) { virNWFilterLearnShutdown(); @@ -954,9 +836,6 @@ virNWFilterLearnShutdown(void) virHashFree(pendingLearnReq); pendingLearnReq = NULL; - virNWFilterHashTableFree(ipAddressMap); - ipAddressMap = NULL; - virHashFree(ifaceLockMap); ifaceLockMap = NULL; } Index: libvirt-acl/src/nwfilter/nwfilter_learnipaddr.h =================================================================== --- libvirt-acl.orig/src/nwfilter/nwfilter_learnipaddr.h +++ libvirt-acl/src/nwfilter/nwfilter_learnipaddr.h @@ -65,9 +65,6 @@ int virNWFilterLearnIPAddress(virNWFilte virNWFilterIPAddrLearnReqPtr virNWFilterLookupLearnReq(int ifindex); int virNWFilterTerminateLearnReq(const char *ifname); -int virNWFilterDelIpAddrForIfname(const char *ifname, const char *ipaddr); -virNWFilterVarValuePtr virNWFilterGetIpAddrForIfname(const char *ifname); - int virNWFilterLockIface(const char *ifname) ATTRIBUTE_RETURN_CHECK; void virNWFilterUnlockIface(const char *ifname);

1 1

[libvirt] [PATCH] LXC: support block devices for container
by Gao feng 09 Apr '12

09 Apr '12

This patch allows to config block device for container. the disk node is used to point out source device and target device source device is the device path in host, and target device is the device name in container. such as <disk type='block' device='disk'> <driver name="lxc"/> <source dev='/dev/sda2'/> <target dev='sda1'/> </disk> Unfortunately it's no use to config readonly in disk node now. Signed-off-by: Gao feng <gaofeng(a)cn.fujitsu.com> --- src/lxc/lxc_container.c | 78 ++++++++++++++++++++++++++++++++++++++++++++++ src/lxc/lxc_controller.c | 15 +++++++++ 2 files changed, 93 insertions(+), 0 deletions(-) diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index 9bb6218..062cc8f 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -581,6 +581,80 @@ static int lxcContainerMountFSDevPTS(virDomainFSDefPtr root) return rc; } +static int lxcContainerAddDisk(virDomainDiskDefPtr disk, + const char *srcprefix) +{ + char *srcPath = NULL; + char *dstPath = NULL; + struct stat sb; + dev_t dev; + int ret = -1; + switch (disk->device) { + case VIR_DOMAIN_DISK_DEVICE_DISK: + case VIR_DOMAIN_DISK_DEVICE_LUN: + if (virAsprintf(&srcPath, "%s/%s", srcprefix, disk->src) < 0) { + virReportOOMError(); + return ret; + } + if (virAsprintf(&dstPath, "/dev/%s", disk->dst) < 0) { + virReportOOMError(); + goto cleanup; + } + if (stat(srcPath, &sb) < 0) { + ret = -errno; + goto cleanup; + } + dev = makedev(major(sb.st_rdev), minor(sb.st_rdev)); + if (mknod(dstPath, S_ISCHR(sb.st_mode) ? S_IFCHR : S_IFBLK, dev) < 0 || + chmod(dstPath, sb.st_mode)) { + virReportSystemError(errno, + _("Failed to make device %s"), + dstPath); + goto cleanup; + } + ret = 0; + break; + default: + lxcError(VIR_ERR_CONFIG_UNSUPPORTED, + _("unsupported disk device type '%s'."), + virDomainDiskDeviceTypeToString(disk->device)); + break; + } + +cleanup: + VIR_FREE(srcPath); + VIR_FREE(dstPath); + return ret; +} +static int lxcContainerAddDevices(virDomainDefPtr vmDef, + const char *srcprefix) +{ + int ret = -1; + size_t i; + + for (i=0 ; i<vmDef->ndisks ; i++) { + virDomainDiskDefPtr disk = vmDef->disks[i]; + + if (disk->driverName !=NULL && !STREQ(disk->driverName, "lxc")) { + lxcError(VIR_ERR_CONFIG_UNSUPPORTED, + _("unsupported driver name '%s' for disk '%s'"), + disk->driverName, disk->src); + continue; + } + if (disk->type != VIR_DOMAIN_DISK_TYPE_BLOCK) { + lxcError(VIR_ERR_CONFIG_UNSUPPORTED, + _("unsupported disk type '%s'"), + virDomainDiskTypeToString(disk->type)); + continue; + } + if (lxcContainerAddDisk(disk, srcprefix) < 0) + goto cleanup; + } + ret = 0; +cleanup: + return ret; +} + static int lxcContainerPopulateDevices(char **ttyPaths, size_t nttyPaths) { size_t i; @@ -1144,6 +1218,10 @@ static int lxcContainerSetupPivotRoot(virDomainDefPtr vmDef, if (lxcContainerMountFSDevPTS(root) < 0) return -1; + /* Create devices */ + if (lxcContainerAddDevices(vmDef, "/.oldroot") <0) + return -1; + /* Populates device nodes in /dev/ */ if (lxcContainerPopulateDevices(ttyPaths, nttyPaths) < 0) return -1; diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c index bbc9d9c..5576f99 100644 --- a/src/lxc/lxc_controller.c +++ b/src/lxc/lxc_controller.c @@ -545,6 +545,21 @@ static int lxcSetContainerDeviceACL(virCgroupPtr cgroup, virDomainDefPtr def) } } + for (i = 0 ; i < def->ndisks ; i++) { + if (def->disks[i]->type != VIR_DOMAIN_DISK_TYPE_BLOCK) + continue; + + rc = virCgroupAllowDevicePath(cgroup, + def->disks[i]->src, + VIR_CGROUP_DEVICE_RWM); + if (rc != 0) { + virReportSystemError(-rc, + _("Unable to allow device %s for domain %s"), + def->disks[i]->src, def->name); + goto cleanup; + } + } + rc = virCgroupAllowDeviceMajor(cgroup, 'c', LXC_DEV_MAJ_PTY, VIR_CGROUP_DEVICE_RWM); if (rc != 0) { -- 1.7.7.6

2 2

[libvirt] Multithreading crash on Win32
by Marcel Müller 08 Apr '12

08 Apr '12

Hello everyone, Im using libvirt 0.9.11 on a Windows machine with java bindings. This works fine, as long as the application is single threaded. As soon as I switch over to more threads libvirt crashes most of the time (but not always!). Ive tried to track down the issue, but Im at a loss now. Please see attached file for debug info. What Ive found out so far: - It looks like this happens only on Win32 (Win 7 x64), Linux (Debian Squeeze) looks fine so far - Its crashing in src/rpc/virnetsocket.c at the end of virNetSocketNewConnectTCP when calling freeaddrinfo(ai). ai is not a null value here, Ive checked that. Im not sure how to debug this any further. Hope someone has an idea on that. Best Regards, Marcel

1 0

[libvirt] [RH-BZ #639987 RH-BZ #639983] already fixed tickets in buglist
by Maxim Sditanov 08 Apr '12

08 Apr '12

I found 2 bugs in bug tracker https://bugzilla.redhat.com/show_bug.cgi?id=639983 https://bugzilla.redhat.com/show_bug.cgi?id=639987 I tried to reproduce bugs (create domain with name " and ; ). Then i start, stop, listen this domains without problem with virsh cli (virsh from git master, version 0.9.10) Looks like this bug already fixed I think, it will be good idea to close this tickets -- With best wishes, Maxim Sditanov

2 1

[libvirt] [PATCH] qemu: change rbd auth_supported separation character to ;
by Josh Durgin 06 Apr '12

06 Apr '12

This works with newer qemu that doesn't allow escaping spaces. It's backwards compatible as well. Signed-off-by: Josh Durgin <josh.durgin(a)dreamhost.com> --- src/qemu/qemu_command.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index f971a08..ee3bf48 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -1673,8 +1673,8 @@ qemuBuildRBDString(virConnectPtr conn, virReportOOMError(); goto error; } - virBufferEscape(opt, '\\', ":", - ":key=%s:auth_supported=cephx none", + virBufferEscape(opt, '\\', ":;", + ":key=%s:auth_supported=cephx;none", base64); VIR_FREE(base64); } else { -- 1.7.5.4

1 1

[libvirt] Horrible performance of virDomainGetInfo()
by Daniel P. Berrange 06 Apr '12

06 Apr '12

While investigating the RPC problems I've noticed that we have had a huge performance regression for virDomainGetInfo() due to the change which makes virDomainEndJob() save the XML status file every time it is called. Previous to this change, 2000 calls to virDomainGetInfo() took ~2.5 seconds After this change, 2000 calls to virDomainGetInfo() take 2 *minutes* 45 secs I don't have an answer right now and it shouldnt block the release, but we have todo something to avoid this overhead. Regards, Daniel -- |: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :| |: http://libvirt.org -o- http://virt-manager.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :|

2 3

[libvirt] [PATCHv2 00/15] live block migration via virDomainBlockCopy
by Eric Blake 06 Apr '12

06 Apr '12

v1 was here: https://www.redhat.com/archives/libvir-list/2012-April/msg00068.html changes from v1: Paolo has updated the qemu side of things, and built a scratch image for RHEL that I was able to test with for the new semantics. I was actually able to successfully run two different block copy jobs, one canceled and one pivoted, with SELinux disabled and this patch series. Patch 12/15 is for reference only when working with Paolo's build; it will not go upstream. Patches 13-15 are optional; the extra flexibility might be nice, but I haven't yet played with those three enough to know if Paolo's build behaves like I was expecting. I obviously have more patches to write, such as supporting the REUSE_EXT flag to reuse files instead of creating a new one, and fixing several XXX comments related to SELinux, auditing, and disk locking. But they can be extra patches on top of this starting series. Adam Litke (2): blockjob: add API for async virDomainBlockJobAbort blockjob: wire up qemu async virDomainBlockJobAbort Eric Blake (13): blockjob: allow for fast-finishing job blockjob: add new API flags blockjob: add 'blockcopy' to virsh blockjob: enhance xml to track mirrors across libvirtd restart blockjob: react to active block copy blockjob: expose qemu commands for mirrored storage migration blockjob: return appropriate event and info blockjob: support pivot operation on cancel blockjob: implement block copy for qemu blockjob: accommodate RHEL backport names blockjob: add virDomainBlockCopy blockjob: enhance virsh 'blockcopy' blockjob: wire up qemu and RPC for block copy docs/apibuild.py | 1 + docs/formatdomain.html.in | 11 ++ docs/schemas/domaincommon.rng | 19 ++- include/libvirt/libvirt.h.in | 50 ++++++- include/libvirt/virterror.h | 1 + src/conf/domain_conf.c | 54 +++++++ src/conf/domain_conf.h | 6 + src/driver.h | 5 + src/libvirt.c | 220 +++++++++++++++++++++++++- src/libvirt_private.syms | 1 + src/libvirt_public.syms | 5 + src/qemu/qemu_capabilities.c | 3 + src/qemu/qemu_capabilities.h | 2 + src/qemu/qemu_driver.c | 340 +++++++++++++++++++++++++++++++++++++++-- src/qemu/qemu_hotplug.c | 7 + src/qemu/qemu_monitor.c | 50 ++++++ src/qemu/qemu_monitor.h | 28 +++- src/qemu/qemu_monitor_json.c | 154 ++++++++++++++++--- src/qemu/qemu_monitor_json.h | 21 +++- src/remote/remote_driver.c | 1 + src/remote/remote_protocol.x | 12 ++- src/remote_protocol-structs | 9 + src/rpc/gendispatch.pl | 1 + src/util/virterror.c | 6 + tools/virsh.c | 140 ++++++++++++++---- tools/virsh.pod | 40 +++++- 26 files changed, 1099 insertions(+), 88 deletions(-) -- 1.7.7.6

4 31

[libvirt] [PATCH] snapshot: fix memory leak on error
by Eric Blake 06 Apr '12

06 Apr '12

Leak introduced in commit 0436d32. If we allocate an actions array, but fail early enough to never consume it with the qemu monitor transaction call, we leaked memory. * src/qemu/qemu_driver.c (qemuDomainSnapshotCreateDiskActive): Free actions array on failure. --- src/qemu/qemu_driver.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index b29029e..a214593 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -10132,6 +10132,8 @@ qemuDomainSnapshotCreateDiskActive(virConnectPtr conn, if (actions) { if (ret == 0) ret = qemuMonitorTransaction(priv->mon, actions); + else + virJSONValueFree(actions); if (ret < 0) { /* Transaction failed; undo the changes to vm. */ bool need_unlink = !(flags & VIR_DOMAIN_SNAPSHOT_CREATE_REUSE_EXT); -- 1.7.7.6

3 11

[libvirt] [PATCH] qemu_ga: Don't overwrite errors on FSThaw
by Michal Privoznik 06 Apr '12

06 Apr '12

We can tell qemuDomainSnapshotFSThaw if we want it to report errors or not. However, if we don't want to and an error has been already set by previous qemuReportError() we must keep copy of that error not just a pointer to it. Otherwise, it get overwritten if FSThaw reports an error. --- src/qemu/qemu_driver.c | 11 ++++------- 1 files changed, 4 insertions(+), 7 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index dd79973..0880f51 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -9636,16 +9636,13 @@ qemuDomainSnapshotFSThaw(struct qemud_driver *driver, qemuDomainObjEnterAgent(driver, vm); if (!report) - err = virGetLastError(); + err = virSaveLastError(); thawed = qemuAgentFSThaw(priv->agent); - if (!report) { - if (err) - virResetError(err); - else - virResetLastError(); - } + if (!report) + virSetError(err); qemuDomainObjExitAgent(driver, vm); + virFreeError(err); return thawed; } -- 1.7.8.5

2 2

[libvirt] [test-API PATCHv2 1/2] utils: Add exception for general test errors
by Peter Krempa 06 Apr '12

06 Apr '12

This helper exception helps with reporting test errors that don't produce a libvirt exception. Eg. comparison of returned and expected value fails although the api call succeeded. --- Diff to v1: -- moved the new exception to the exception module exception.py | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/exception.py b/exception.py index 0000aab..d0a772f 100644 --- a/exception.py +++ b/exception.py @@ -75,3 +75,7 @@ class CaseConfigfileError(LibvirtException): class MissingVariable(LibvirtException): code = 210 message = "Variables missing from env.cfg [variables] section" + +class TestError(LibvirtException): + code = 211 + message = "Test failed" -- 1.7.3.4

3 4

[libvirt] [PATCH] xen config: No vfb in HVM guest configuration
by Stefan Bader 06 Apr '12

06 Apr '12

This causes an implicit vkbd device to be added which takes 6min to finally fail being initialized in the guest. http://lists.xen.org/archives/html/xen-devel/2012-04/msg00409.html Signed-off-by: Stefan Bader <stefan.bader(a)canonical.com> --- src/xenxs/xen_sxpr.c | 11 ++++------- src/xenxs/xen_xm.c | 2 +- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/src/xenxs/xen_sxpr.c b/src/xenxs/xen_sxpr.c index b26b2bc..b2f98f6 100644 --- a/src/xenxs/xen_sxpr.c +++ b/src/xenxs/xen_sxpr.c @@ -2464,9 +2464,8 @@ xenFormatSxpr(virConnectPtr conn, } } - /* PV graphics for xen <= 3.0.4, or HVM graphics for xen <= 3.1.0 */ - if ((!hvm && xendConfigVersion < XEND_CONFIG_MIN_VERS_PVFB_NEWCONF) || - (hvm && xendConfigVersion < XEND_CONFIG_VERSION_3_1_0)) { + /* PV graphics for xen <= 3.0.4, or HVM graphics */ + if (hvm || (xendConfigVersion < XEND_CONFIG_MIN_VERS_PVFB_NEWCONF)) { if ((def->ngraphics == 1) && xenFormatSxprGraphicsOld(def->graphics[0], &buf, xendConfigVersion) < 0) @@ -2578,10 +2577,8 @@ xenFormatSxpr(virConnectPtr conn, if (xenFormatSxprAllPCI(def, &buf) < 0) goto error; - /* New style PV graphics config xen >= 3.0.4, - * or HVM graphics config xen >= 3.0.5 */ - if ((xendConfigVersion >= XEND_CONFIG_MIN_VERS_PVFB_NEWCONF && !hvm) || - (xendConfigVersion >= XEND_CONFIG_VERSION_3_1_0 && hvm)) { + /* New style PV graphics config xen >= 3.0.4 */ + if (!hmv && (xendConfigVersion >= XEND_CONFIG_MIN_VERS_PVFB_NEWCONF)) { if ((def->ngraphics == 1) && xenFormatSxprGraphicsNew(def->graphics[0], &buf) < 0) goto error; diff --git a/src/xenxs/xen_xm.c b/src/xenxs/xen_xm.c index 8e24fd52..d65e97a 100644 --- a/src/xenxs/xen_xm.c +++ b/src/xenxs/xen_xm.c @@ -1779,7 +1779,7 @@ virConfPtr xenFormatXM(virConnectPtr conn, } if (def->ngraphics == 1) { - if (xendConfigVersion < (hvm ? XEND_CONFIG_VERSION_3_1_0 : XEND_CONFIG_MIN_VERS_PVFB_NEWCONF)) { + if (hvm || (xendConfigVersion < XEND_CONFIG_MIN_VERS_PVFB_NEWCONF)) { if (def->graphics[0]->type == VIR_DOMAIN_GRAPHICS_TYPE_SDL) { if (xenXMConfigSetInt(conf, "sdl", 1) < 0) goto no_memory; -- 1.7.9.1

2 4

[libvirt] [PATCH] test: fix build errors with gcc 4.7.0 and -O0
by Laine Stump 06 Apr '12

06 Apr '12

When building on Fedora 17 (which uses gcc 4.7.0) with -O0 in CFLAGS, three of the tests failed to compile. cputest.c and qemuxml2argvtest.c had non-static structs defined inside the macro that was being repeatedly invoked. Due to some so-far unidentified change in gcc, the stack space used by variables defined inside { } is not recovered/re-used when the block ends, so all these structs have become additive (this is the same problem worked around in commit cf57d345b). Fortunately, these two files could be fixed with a single line addition of "static" to the struct definition in the macro. virnettlscontexttest.c was a bit different, though. The structs were all defined inline as static already, but for some reason now take up space on the stack. The only reasonable solution here was to move all of the struct definitions outside of the function. In an ideal world, none of these changes should be necessary, but not knowing how long it will be until the gcc regressions are fixed, and since the code is just as correct after this patch as before, it makes sense to fix libvirt's build for -O0 while also reporting the gcc problem. --- tests/cputest.c | 2 +- tests/qemuxml2argvtest.c | 2 +- tests/virnettlscontexttest.c | 168 ++++++++++++++++++++++-------------------- 3 files changed, 91 insertions(+), 81 deletions(-) diff --git a/tests/cputest.c b/tests/cputest.c index 9928e5d..01db8f1 100644 --- a/tests/cputest.c +++ b/tests/cputest.c @@ -512,7 +512,7 @@ mymain(void) #define DO_TEST(arch, api, name, host, cpu, \ models, nmodels, preferred, result) \ do { \ - struct data data = { \ + static struct data data = { \ arch, api, host, cpu, models, \ models == NULL ? NULL : #models, \ nmodels, preferred, result \ diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 637ca50..fdbe95a 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -314,7 +314,7 @@ mymain(void) # define DO_TEST_FULL(name, migrateFrom, migrateFd, \ expectError, expectFailure, ...) \ do { \ - struct testInfo info = { \ + static struct testInfo info = { \ name, NULL, migrateFrom, migrateFd, \ expectError, expectFailure \ }; \ diff --git a/tests/virnettlscontexttest.c b/tests/virnettlscontexttest.c index 8e805d8..b4d1e0e 100644 --- a/tests/virnettlscontexttest.c +++ b/tests/virnettlscontexttest.c @@ -734,21 +734,6 @@ cleanup: return ret; } - -static int -mymain(void) -{ - int ret = 0; - if (asn1_array2tree(pkix_asn1_tab, &pkix_asn1, NULL) != ASN1_SUCCESS) - abort(); - - gnutls_global_init(); - - privkey = testTLSLoadKey(); - - if (virFileWriteStr(keyfile, PRIVATE_KEY, 0600) < 0) - return EXIT_FAILURE; - # define DO_CTX_TEST(isServer, caReq, certReq, expectFail) \ do { \ struct testTLSContextData data = { \ @@ -806,11 +791,6 @@ mymain(void) 0, 0, }; - - DO_CTX_TEST(true, cacertreq, servercertreq, false); - DO_CTX_TEST(false, cacertreq, clientcertreq, false); - - /* Some other CAs which are good */ /* Basic:CA:critical */ @@ -864,14 +844,6 @@ mymain(void) 0, 0, }; - DO_CTX_TEST(true, cacert1req, servercertreq, false); - DO_CTX_TEST(true, cacert2req, servercertreq, false); -# if 0 - DO_CTX_TEST(true, cacert3req, servercertreq, false); -# endif - DO_CTX_TEST(true, cacert4req, servercertreq, false); - DO_CTX_TEST(true, cacert5req, servercertreq, false); - /* Now some bad certs */ /* no-basic */ @@ -893,10 +865,6 @@ mymain(void) 0, 0, }; - DO_CTX_TEST(true, cacert6req, servercertreq, true); - DO_CTX_TEST(true, cacert7req, servercertreq, true); - - /* Various good servers */ /* no usage or purpose */ static struct testTLSCertReq servercert1req = { @@ -962,13 +930,6 @@ mymain(void) 0, 0, }; - DO_CTX_TEST(true, cacertreq, servercert1req, false); - DO_CTX_TEST(true, cacertreq, servercert2req, false); - DO_CTX_TEST(true, cacertreq, servercert3req, false); - DO_CTX_TEST(true, cacertreq, servercert4req, false); - DO_CTX_TEST(true, cacertreq, servercert5req, false); - DO_CTX_TEST(true, cacertreq, servercert6req, false); - DO_CTX_TEST(true, cacertreq, servercert7req, false); /* Bad servers */ /* usage:cert-sign:critical */ @@ -999,12 +960,6 @@ mymain(void) 0, 0, }; - DO_CTX_TEST(true, cacertreq, servercert8req, true); - DO_CTX_TEST(true, cacertreq, servercert9req, true); - DO_CTX_TEST(true, cacertreq, servercert10req, true); - - - /* Various good clients */ /* no usage or purpose */ static struct testTLSCertReq clientcert1req = { @@ -1070,13 +1025,6 @@ mymain(void) 0, 0, }; - DO_CTX_TEST(false, cacertreq, clientcert1req, false); - DO_CTX_TEST(false, cacertreq, clientcert2req, false); - DO_CTX_TEST(false, cacertreq, clientcert3req, false); - DO_CTX_TEST(false, cacertreq, clientcert4req, false); - DO_CTX_TEST(false, cacertreq, clientcert5req, false); - DO_CTX_TEST(false, cacertreq, clientcert6req, false); - DO_CTX_TEST(false, cacertreq, clientcert7req, false); /* Bad clients */ /* usage:cert-sign:critical */ @@ -1107,12 +1055,6 @@ mymain(void) 0, 0, }; - DO_CTX_TEST(false, cacertreq, clientcert8req, true); - DO_CTX_TEST(false, cacertreq, clientcert9req, true); - DO_CTX_TEST(false, cacertreq, clientcert10req, true); - - - /* Expired stuff */ static struct testTLSCertReq cacertexpreq = { @@ -1140,11 +1082,6 @@ mymain(void) 0, -1, }; - DO_CTX_TEST(true, cacertexpreq, servercertreq, true); - DO_CTX_TEST(true, cacertreq, servercertexpreq, true); - DO_CTX_TEST(false, cacertreq, clientcertexpreq, true); - - /* Not activated stuff */ static struct testTLSCertReq cacertnewreq = { @@ -1172,14 +1109,6 @@ mymain(void) 1, 2, }; - DO_CTX_TEST(true, cacertnewreq, servercertreq, true); - DO_CTX_TEST(true, cacertreq, servercertnewreq, true); - DO_CTX_TEST(false, cacertreq, clientcertnewreq, true); - - - DO_SESS_TEST(cacertreq, servercertreq, clientcertreq, false, false, "libvirt.org", NULL); - DO_SESS_TEST_EXT(cacertreq, cacert1req, servercertreq, clientcertreq, true, true, "libvirt.org", NULL); - /* When an altname is set, the CN is ignored, so it must be duplicated * as an altname for it to match */ static struct testTLSCertReq servercertalt1req = { @@ -1190,6 +1119,7 @@ mymain(void) true, true, GNUTLS_KP_TLS_WWW_SERVER, NULL, 0, 0, }; + /* This intentionally doesn't replicate */ static struct testTLSCertReq servercertalt2req = { NULL, NULL, "servercert.pem", "UK", @@ -1200,14 +1130,6 @@ mymain(void) 0, 0, }; - DO_SESS_TEST(cacertreq, servercertalt1req, clientcertreq, false, false, "libvirt.org", NULL); - DO_SESS_TEST(cacertreq, servercertalt1req, clientcertreq, false, false, "www.libvirt.org", NULL); - DO_SESS_TEST(cacertreq, servercertalt1req, clientcertreq, false, true, "wiki.libvirt.org", NULL); - - DO_SESS_TEST(cacertreq, servercertalt2req, clientcertreq, false, true, "libvirt.org", NULL); - DO_SESS_TEST(cacertreq, servercertalt2req, clientcertreq, false, false, "www.libvirt.org", NULL); - DO_SESS_TEST(cacertreq, servercertalt2req, clientcertreq, false, false, "wiki.libvirt.org", NULL); - const char *const wildcards1[] = { "C=UK,CN=dogfood", NULL, @@ -1234,6 +1156,94 @@ mymain(void) NULL, }; +static int +mymain(void) +{ + int ret = 0; + if (asn1_array2tree(pkix_asn1_tab, &pkix_asn1, NULL) != ASN1_SUCCESS) + abort(); + + gnutls_global_init(); + + privkey = testTLSLoadKey(); + + if (virFileWriteStr(keyfile, PRIVATE_KEY, 0600) < 0) + return EXIT_FAILURE; + + /* A perfect CA, perfect client & perfect server */ + DO_CTX_TEST(true, cacertreq, servercertreq, false); + DO_CTX_TEST(false, cacertreq, clientcertreq, false); + + + /* Some other CAs which are good */ + DO_CTX_TEST(true, cacert1req, servercertreq, false); + DO_CTX_TEST(true, cacert2req, servercertreq, false); +# if 0 + DO_CTX_TEST(true, cacert3req, servercertreq, false); +# endif + DO_CTX_TEST(true, cacert4req, servercertreq, false); + DO_CTX_TEST(true, cacert5req, servercertreq, false); + + /* Now some bad certs */ + DO_CTX_TEST(true, cacert6req, servercertreq, true); + DO_CTX_TEST(true, cacert7req, servercertreq, true); + + + /* Various good servers */ + DO_CTX_TEST(true, cacertreq, servercert1req, false); + DO_CTX_TEST(true, cacertreq, servercert2req, false); + DO_CTX_TEST(true, cacertreq, servercert3req, false); + DO_CTX_TEST(true, cacertreq, servercert4req, false); + DO_CTX_TEST(true, cacertreq, servercert5req, false); + DO_CTX_TEST(true, cacertreq, servercert6req, false); + DO_CTX_TEST(true, cacertreq, servercert7req, false); + + /* Bad servers */ + DO_CTX_TEST(true, cacertreq, servercert8req, true); + DO_CTX_TEST(true, cacertreq, servercert9req, true); + DO_CTX_TEST(true, cacertreq, servercert10req, true); + + /* Various good clients */ + DO_CTX_TEST(false, cacertreq, clientcert1req, false); + DO_CTX_TEST(false, cacertreq, clientcert2req, false); + DO_CTX_TEST(false, cacertreq, clientcert3req, false); + DO_CTX_TEST(false, cacertreq, clientcert4req, false); + DO_CTX_TEST(false, cacertreq, clientcert5req, false); + DO_CTX_TEST(false, cacertreq, clientcert6req, false); + DO_CTX_TEST(false, cacertreq, clientcert7req, false); + + /* Bad clients */ + DO_CTX_TEST(false, cacertreq, clientcert8req, true); + DO_CTX_TEST(false, cacertreq, clientcert9req, true); + DO_CTX_TEST(false, cacertreq, clientcert10req, true); + + + /* Expired stuff */ + DO_CTX_TEST(true, cacertexpreq, servercertreq, true); + DO_CTX_TEST(true, cacertreq, servercertexpreq, true); + DO_CTX_TEST(false, cacertreq, clientcertexpreq, true); + + + /* Not activated stuff */ + DO_CTX_TEST(true, cacertnewreq, servercertreq, true); + DO_CTX_TEST(true, cacertreq, servercertnewreq, true); + DO_CTX_TEST(false, cacertreq, clientcertnewreq, true); + + + DO_SESS_TEST(cacertreq, servercertreq, clientcertreq, false, false, "libvirt.org", NULL); + DO_SESS_TEST_EXT(cacertreq, cacert1req, servercertreq, clientcertreq, true, true, "libvirt.org", NULL); + + /* When an altname is set, the CN is ignored, so it must be duplicated + * as an altname for it to match */ + DO_SESS_TEST(cacertreq, servercertalt1req, clientcertreq, false, false, "libvirt.org", NULL); + DO_SESS_TEST(cacertreq, servercertalt1req, clientcertreq, false, false, "www.libvirt.org", NULL); + DO_SESS_TEST(cacertreq, servercertalt1req, clientcertreq, false, true, "wiki.libvirt.org", NULL); + + /* This intentionally doesn't replicate */ + DO_SESS_TEST(cacertreq, servercertalt2req, clientcertreq, false, true, "libvirt.org", NULL); + DO_SESS_TEST(cacertreq, servercertalt2req, clientcertreq, false, false, "www.libvirt.org", NULL); + DO_SESS_TEST(cacertreq, servercertalt2req, clientcertreq, false, false, "wiki.libvirt.org", NULL); + DO_SESS_TEST(cacertreq, servercertreq, clientcertreq, true, false, "libvirt.org", wildcards1); DO_SESS_TEST(cacertreq, servercertreq, clientcertreq, false, false, "libvirt.org", wildcards2); DO_SESS_TEST(cacertreq, servercertreq, clientcertreq, false, false, "libvirt.org", wildcards3); -- 1.7.9.3

3 4

[libvirt] [PATCH] virURIParse: don't forget to copy the user part
by Guido Günther 05 Apr '12

05 Apr '12

This got dropped with 300e60e15b22387dda41ed5985a9ebadfd86dd25 Cheers, -- Guido --- src/util/viruri.c | 5 ++++- tests/viruritest.c | 24 +++++++++++++----------- 2 files changed, 17 insertions(+), 12 deletions(-) diff --git a/src/util/viruri.c b/src/util/viruri.c index 2c6de51..a41f345 100644 --- a/src/util/viruri.c +++ b/src/util/viruri.c @@ -185,7 +185,9 @@ virURIParse(const char *uri) if (xmluri->fragment && !(ret->fragment = strdup(xmluri->fragment))) goto no_memory; - + if (xmluri->user && + !(ret->user = strdup(xmluri->user))) + goto no_memory; /* First check: does it even make sense to jump inside */ if (ret->server != NULL && @@ -249,6 +251,7 @@ virURIFormat(virURIPtr uri) xmluri.query = uri->query; #endif xmluri.fragment = uri->fragment; + xmluri.user = uri->user; /* First check: does it make sense to do anything */ if (xmluri.server != NULL && diff --git a/tests/viruritest.c b/tests/viruritest.c index 3570217..4bb6a03 100644 --- a/tests/viruritest.c +++ b/tests/viruritest.c @@ -42,6 +42,7 @@ struct URIParseData { const char *path; const char *query; const char *fragment; + const char *user; virURIParamPtr params; }; @@ -143,33 +144,34 @@ mymain(void) signal(SIGPIPE, SIG_IGN); #define TEST_FULL(uri, uri_out, scheme, server, port, path, query, \ - fragment, params) \ + fragment, user, params) \ do { \ const struct URIParseData data = { \ uri, (uri_out) ? (uri_out) : (uri), scheme, server, port, \ - path, query, fragment, params \ + path, query, fragment, user, params \ }; \ if (virtTestRun("Test URI " # uri, 1, testURIParse, &data) < 0) \ ret = -1; \ } while (0) -#define TEST_PARSE(uri, scheme, server, port, path, query, fragment, params) \ - TEST_FULL(uri, NULL, scheme, server, port, path, query, fragment, params) +#define TEST_PARSE(uri, scheme, server, port, path, query, fragment, user, params) \ + TEST_FULL(uri, NULL, scheme, server, port, path, query, fragment, user, params) #define TEST_PARAMS(query_in, query_out, params) \ TEST_FULL("test://example.com/?" query_in, \ *query_out ? "test://example.com/?" query_out : NULL, \ - "test", "example.com", 0, "/", query_in, NULL, params) + "test", "example.com", 0, "/", query_in, NULL, NULL, params) virURIParam params[] = { { (char*)"name", (char*)"value" }, { NULL, NULL }, }; - TEST_PARSE("test://example.com", "test", "example.com", 0, NULL, NULL, NULL, NULL); - TEST_PARSE("test://example.com:123", "test", "example.com", 123, NULL, NULL, NULL, NULL); - TEST_PARSE("test://example.com:123/system?name=value#foo", "test", "example.com", 123, "/system", "name=value", "foo", params); - TEST_PARSE("test://127.0.0.1:123/system", "test", "127.0.0.1", 123, "/system", NULL, NULL, NULL); - TEST_PARSE("test://[::1]:123/system", "test", "::1", 123, "/system", NULL, NULL, NULL); - TEST_PARSE("test://[2001:41c8:1:4fd4::2]:123/system", "test", "2001:41c8:1:4fd4::2", 123, "/system", NULL, NULL, NULL); + TEST_PARSE("test://example.com", "test", "example.com", 0, NULL, NULL, NULL, NULL, NULL); + TEST_PARSE("test://foo@example.com", "test", "example.com", 0, NULL, NULL, NULL, "foo", NULL); + TEST_PARSE("test://example.com:123", "test", "example.com", 123, NULL, NULL, NULL, NULL, NULL); + TEST_PARSE("test://example.com:123/system?name=value#foo", "test", "example.com", 123, "/system", "name=value", "foo", NULL, params); + TEST_PARSE("test://127.0.0.1:123/system", "test", "127.0.0.1", 123, "/system", NULL, NULL, NULL, NULL); + TEST_PARSE("test://[::1]:123/system", "test", "::1", 123, "/system", NULL, NULL, NULL, NULL); + TEST_PARSE("test://[2001:41c8:1:4fd4::2]:123/system", "test", "2001:41c8:1:4fd4::2", 123, "/system", NULL, NULL, NULL, NULL); virURIParam params1[] = { { (char*)"foo", (char*)"one" }, -- 1.7.9.1

2 1

[libvirt] [PATCH] conf: Plug memory leaks on virDomainDiskDefParseXML
by Alex Jia 05 Apr '12

05 Apr '12

Detected by valgrind. Leaks are introduced in commit b22eaa7. * src/conf/domain_conf.c (virDomainDiskDefParseXML): fix memory leaks. How to reproduce? % make && make -C tests check TESTS=qemuxml2argvtest % cd tests && valgrind -v --leak-check=full ./qemuxml2argvtest actual result: ==2143== 12 bytes in 2 blocks are definitely lost in loss record 74 of 179 ==2143== at 0x4A05FDE: malloc (vg_replace_malloc.c:236) ==2143== by 0x39D90A67DD: xmlStrndup (xmlstring.c:45) ==2143== by 0x4F5EC0: virDomainDiskDefParseXML (domain_conf.c:3438) ==2143== by 0x502F00: virDomainDefParseXML (domain_conf.c:8304) ==2143== by 0x505FE3: virDomainDefParseNode (domain_conf.c:9080) ==2143== by 0x5069AE: virDomainDefParse (domain_conf.c:9030) ==2143== by 0x41CBF4: testCompareXMLToArgvHelper (qemuxml2argvtest.c:105) ==2143== by 0x41E5DD: virtTestRun (testutils.c:145) ==2143== by 0x416FA3: mymain (qemuxml2argvtest.c:399) ==2143== by 0x41DCB7: virtTestMain (testutils.c:700) ==2143== by 0x39CF01ECDC: (below main) (libc-start.c:226) Signed-off-by: Alex Jia <ajia(a)redhat.com> --- src/conf/domain_conf.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index cca757d..c6b97e1 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -3893,6 +3893,7 @@ cleanup: VIR_FREE(rawio); VIR_FREE(target); VIR_FREE(source); + VIR_FREE(tray); while (nhosts > 0) { virDomainDiskHostDefFree(&hosts[nhosts - 1]); nhosts--; -- 1.7.1

2 2

[libvirt] Experience with Libvirt JAVA API
by Yaniv Hadad 05 Apr '12

05 Apr '12

Hi All, I look for someone who have experience with the Java API. My aim is to investigate hyper visors and their guest details like : os, network , ran,vCPU and more... Can some one have experience with that ?? Yaniv. (Embedded image moved to file: pic59134.jpg) Yaniv Hadad , (Embedded image moved to file: pic50897.jpg)+972 4 8296594 (Embedded image moved to file: pic56120.jpg)+972 50-40-78-908

2 1

[libvirt] [PATCH] test: fix segfault in networkxml2argvtest
by Laine Stump 05 Apr '12

05 Apr '12

This bug resolves https://bugzilla.redhat.com/show_bug.cgi?id=810100 rpm builds for i686 were failing with a segfault in networkxml2argvtest. Running under valgrind showed that a region of memory was being referenced after it had been freed (as the result of realloc - see the valgrind report in the BZ). The problem (in replaceTokens() - added in commit 22ec60, meaning this bug was in 0.9.10 and 0.9.11) was that the pointers token_start and token_end were being computed based on the value of *buf, then *buf was being realloc'ed (potentially moving it), then token_start and token_end were used without recomputing them to account for movement of *buf. The solution is to change the code so that token_start and token_end are offsets into *buf rather than pointers. This way there is only a single pointer to the buffer, and nothing needs readjusting after a realloc. (You may note that some uses of token_start/token_end didn't need to be changed to add in "*buf +" - that's because there ended up being a +*buf and -*buf which canceled each other out). DV gets the credit for finding this bug and pointing out the valgrind report. --- tests/networkxml2argvtest.c | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) diff --git a/tests/networkxml2argvtest.c b/tests/networkxml2argvtest.c index cf00181..87519e4 100644 --- a/tests/networkxml2argvtest.c +++ b/tests/networkxml2argvtest.c @@ -18,18 +18,19 @@ /* Replace all occurrences of @token in @buf by @replacement and adjust size of * @buf accordingly. Returns 0 on success and -1 on out-of-memory errors. */ static int replaceTokens(char **buf, const char *token, const char *replacement) { - char *token_start, *token_end; + size_t token_start, token_end; size_t buf_len, rest_len; const size_t token_len = strlen(token); const size_t replacement_len = strlen(replacement); const int diff = replacement_len - token_len; buf_len = rest_len = strlen(*buf) + 1; - token_end = *buf; + token_end = 0; for (;;) { - token_start = strstr(token_end, token); - if (token_start == NULL) + char *match = strstr(*buf + token_end, token); + if (match == NULL) break; + token_start = match - *buf; rest_len -= token_start + token_len - token_end; token_end = token_start + token_len; buf_len += diff; @@ -37,8 +38,8 @@ static int replaceTokens(char **buf, const char *token, const char *replacement) if (VIR_REALLOC_N(*buf, buf_len) < 0) return -1; if (diff != 0) - memmove(token_end + diff, token_end, rest_len); - memcpy(token_start, replacement, replacement_len); + memmove(*buf + token_end + diff, *buf + token_end, rest_len); + memcpy(*buf + token_start, replacement, replacement_len); token_end += diff; } /* if diff < 0, we could shrink the buffer here... */ -- 1.7.7.6

3 2

[libvirt] [test-API] RFC: Stabilization of libvirt-test-API
by Martin Kletzander 05 Apr '12

05 Apr '12

Hi everyone, following our minutes, I'd like to start a discussion on what should be done with libvirt-test-API so we can say it's stable and usable. I would like to stress out that everything mentioned here is just an opinion and I don't mean to talk down to someone as it may have seemed earlier. I think we should get some ideas from everyone, mostly QE as they will be (are) the ones using this the most (if I understood correctly), and then I'll be happy to help getting the code to the agreed status. I was thinking about this from the wrong way probably and changing the angle from what I look at it (and knowing there is some deadline) makes me think of few levels of changes, which when introduced, could speed up the test development and code understandability. So here are the things I would like to do definitely (the optional things follow later on): - fix hard-coded options into real options (e.g. commit 65449e) - fix some env_* and util* code (functions duplicated with different behavior) - fix or remove harmful and pointless code (at this point, when creating domain on remote machine, be prepared for the test to fail with any other user then root and with root, have backup of both local and remote '/root/.ssh' directories as the contents will be erased!) - fix method names for the {connect,domain,etc.}API (get_host_name vs. lookupByUUID etc.) The optional things: - get rid of classes in lib and make just few utility functions covering *only* the methods that do something else than call the same method in underlying class from the libvirt module. - get rid of the new exception (I don't see any other difference than in the name, which can make a difference in "except:" clause, but it's converted everywhere) - be able to share variables between tests (connection object and anything else) - introduce new config file for tests (.ini format, can be parsed by ConfigParser, same as env.cfg, define variables used throughout the test specifications - update the documentation - use some python code style (PEP-8?), make use of True/False, None - eliminate duplicated (and x-plicated) code (append_path in all the files, etc.) I have all of these figured out, so I'm willing to discuss all of them, but in most cases changing it in the current code seems very time-consumable to me. Please, feel free to comment on any of these, add yours, discuss, shout at me, etc. =) Regards, Martin P.S.: I don't see any point in sending my patches until some of these points are resolved as that could mean rewriting more code.

5 10

[libvirt] [PATCH 1/3] Move linux specific symbol to src/libvirt_linux.syms
by Daniel P. Berrange 05 Apr '12

05 Apr '12

From: "Daniel P. Berrange" <berrange(a)redhat.com> linuxNodeInfoCPUPopulate is not built on Mingw32 so should be in libvirt_linux.syms, not libvirt_private.syms Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- src/libvirt_linux.syms | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/src/libvirt_linux.syms b/src/libvirt_linux.syms index 018c892..2258739 100644 --- a/src/libvirt_linux.syms +++ b/src/libvirt_linux.syms @@ -6,3 +6,6 @@ # stats_linux.h linuxDomainInterfaceStats; xenLinuxDomainBlockStats; + +# nodeinfo.h +linuxNodeInfoCPUPopulate; -- 1.7.7.6

4 9

[libvirt] [PATCH V2] nwfilter: Add support for ipset
by Stefan Berger 04 Apr '12

04 Apr '12

This patch adds support for the recent ipset iptables extension to libvirt's nwfilter subsystem. Ipset allows to maintain 'sets' of IP addresses, ports and other packet parameters and allows for faster lookup (in the order of O(1) vs. O(n)) and rule evaluation to achieve higher throughput than what can be achieved with individual iptables rules. On the command line iptables supports ipset using iptables ... -m set --match-set <ipset name> <flags> -j ... where 'ipset name' is the name of a previously created ipset and flags is a comma-separated list of up to 6 flags. Flags use 'src' and 'dst' for selecting IP addresses, ports etc. from the source or destination part of a packet. So a concrete example may look like this: iptables -A INPUT -m set --match-set test src,src -j ACCEPT Since ipset management is quite complex, the idea was to leave ipset management outside of libvirt but still allow users to reference an ipset. The user would have to make sure the ipset is available once the VM is started so that the iptables rule(s) referencing the ipset can be created. Using XML to describe an ipset in an nwfilter rule would then look as follows: <rule action='accept' direction='in'> <all ipset='test' ipsetflags='src,src'/> </rule> The two parameters on the command line are also the two distinct XML attributes 'ipset' and 'ipsetflags'. FYI: Here is the man page for ipset: https://ipset.netfilter.org/ipset.man.html Regards, Stefan --- v2: - split ipset description into ipset and ipsetflags attribute - improved on documentation --- docs/formatnwfilter.html.in | 64 ++++++++++++++ docs/schemas/nwfilter.rng | 23 +++++ src/conf/nwfilter_conf.c | 135 +++++++++++++++++++++++++++++- src/conf/nwfilter_conf.h | 12 ++ src/nwfilter/nwfilter_ebiptables_driver.c | 71 +++++++++++++++ tests/nwfilterxml2xmlin/ipset-test.xml | 15 +++ tests/nwfilterxml2xmlout/ipset-test.xml | 15 +++ tests/nwfilterxml2xmltest.c | 2 8 files changed, 332 insertions(+), 5 deletions(-) Index: libvirt/src/conf/nwfilter_conf.c =================================================================== --- libvirt.orig/src/conf/nwfilter_conf.c +++ libvirt/src/conf/nwfilter_conf.c @@ -183,6 +183,8 @@ static const char dstportstart_str[] = " static const char dstportend_str[] = "dstportend"; static const char dscp_str[] = "dscp"; static const char state_str[] = "state"; +static const char ipset_str[] = "ipset"; +static const char ipsetflags_str[] = "ipsetflags"; #define SRCMACADDR srcmacaddr_str #define SRCMACMASK srcmacmask_str @@ -206,6 +208,8 @@ static const char state_str[] = " #define DSTPORTEND dstportend_str #define DSCP dscp_str #define STATE state_str +#define IPSET ipset_str +#define IPSETFLAGS ipsetflags_str /** @@ -980,6 +984,97 @@ tcpFlagsFormatter(virBufferPtr buf, return true; } +static bool +ipsetValidator(enum attrDatatype datatype ATTRIBUTE_UNUSED, union data *val, + virNWFilterRuleDefPtr nwf ATTRIBUTE_UNUSED, + nwItemDesc *item) +{ + const char *errmsg = NULL; + + if (virStrcpy(item->u.ipset.setname, val->c, + sizeof(item->u.ipset.setname)) == NULL) { + errmsg = _("ipset name is too long"); + goto arg_err_exit; + } + + if (item->u.ipset.setname[strspn(item->u.ipset.setname, + VALID_IPSETNAME)] != 0) { + errmsg = _("ipset name contains invalid characters"); + goto arg_err_exit; + } + + return true; + +arg_err_exit: + virNWFilterReportError(VIR_ERR_INVALID_ARG, + "%s", errmsg); + return false; +} + +static bool +ipsetFormatter(virBufferPtr buf, + virNWFilterRuleDefPtr nwf ATTRIBUTE_UNUSED, + nwItemDesc *item) +{ + virBufferAdd(buf, item->u.ipset.setname, -1); + + return true; +} + +static bool +ipsetFlagsValidator(enum attrDatatype datatype ATTRIBUTE_UNUSED, union data *val, + virNWFilterRuleDefPtr nwf ATTRIBUTE_UNUSED, nwItemDesc *item) +{ + const char *errmsg = NULL; + size_t idx = 0; + + item->u.ipset.numFlags = 0; + item->u.ipset.flags = 0; + + errmsg = _("malformed ipset flags"); + + while (item->u.ipset.numFlags < 6) { + if (STRCASEEQLEN(&val->c[idx], "src", 3)) { + item->u.ipset.flags |= (1 << item->u.ipset.numFlags); + } else if (!STRCASEEQLEN(&val->c[idx], "dst", 3)) { + goto arg_err_exit; + } + item->u.ipset.numFlags++; + idx += 3; + if (val->c[idx] != ',') + break; + idx++; + } + + if (val->c[idx] != '\0') + goto arg_err_exit; + + return true; + +arg_err_exit: + virNWFilterReportError(VIR_ERR_INVALID_ARG, + "%s", errmsg); + return false; +} + +static bool +ipsetFlagsFormatter(virBufferPtr buf, + virNWFilterRuleDefPtr nwf ATTRIBUTE_UNUSED, + nwItemDesc *item) +{ + uint8_t ctr; + + for (ctr = 0; ctr < item->u.ipset.numFlags; ctr++) { + if (ctr != 0) + virBufferAddLit(buf, ","); + if ((item->u.ipset.flags & (1 << ctr))) + virBufferAddLit(buf, "src"); + else + virBufferAddLit(buf, "dst"); + } + + return true; +} #define COMMON_MAC_PROPS(STRUCT) \ {\ @@ -1411,6 +1506,20 @@ static const virXMLAttr2Struct ipv6Attri .dataIdx = offsetof(virNWFilterRuleDef, p.STRUCT.ipHdr.dataState),\ .validator = stateValidator,\ .formatter = stateFormatter,\ + },\ + {\ + .name = IPSET,\ + .datatype = DATATYPE_STRING,\ + .dataIdx = offsetof(virNWFilterRuleDef, p.STRUCT.ipHdr.dataIPSet),\ + .validator = ipsetValidator,\ + .formatter = ipsetFormatter,\ + },\ + {\ + .name = IPSETFLAGS,\ + .datatype = DATATYPE_IPSETFLAGS,\ + .dataIdx = offsetof(virNWFilterRuleDef, p.STRUCT.ipHdr.dataIPSetFlags),\ + .validator = ipsetFlagsValidator,\ + .formatter = ipsetFlagsFormatter,\ } #define COMMON_PORT_PROPS(STRUCT) \ @@ -1853,6 +1962,7 @@ virNWFilterRuleDetailsParse(xmlNodePtr n break; case DATATYPE_STRING: + case DATATYPE_IPSETFLAGS: if (!validator) { /* not supported */ rc = -1; @@ -1964,6 +2074,19 @@ err_exit: goto cleanup; } +static void +virNWFilterRuleDefFixupIPSet(ipHdrDataDefPtr ipHdr) +{ + if (HAS_ENTRY_ITEM(&ipHdr->dataIPSet) && + !HAS_ENTRY_ITEM(&ipHdr->dataIPSetFlags)) { + ipHdr->dataIPSetFlags.flags = NWFILTER_ENTRY_ITEM_FLAG_EXISTS; + ipHdr->dataIPSetFlags.u.ipset.numFlags = 1; + ipHdr->dataIPSetFlags.u.ipset.flags = 1; + } else { + ipHdr->dataIPSet.flags = 0; + ipHdr->dataIPSetFlags.flags = 0; + } +} static void virNWFilterRuleDefFixup(virNWFilterRuleDefPtr rule) @@ -2017,6 +2140,7 @@ virNWFilterRuleDefFixup(virNWFilterRuleD rule->p.ipHdrFilter.ipHdr.dataSrcIPAddr); COPY_NEG_SIGN(rule->p.ipHdrFilter.ipHdr.dataDstIPMask, rule->p.ipHdrFilter.ipHdr.dataDstIPAddr); + virNWFilterRuleDefFixupIPSet(&rule->p.ipHdrFilter.ipHdr); break; case VIR_NWFILTER_RULE_PROTOCOL_IPV6: @@ -2024,6 +2148,7 @@ virNWFilterRuleDefFixup(virNWFilterRuleD rule->p.ipv6HdrFilter.ipHdr.dataSrcIPAddr); COPY_NEG_SIGN(rule->p.ipv6HdrFilter.ipHdr.dataDstIPMask, rule->p.ipv6HdrFilter.ipHdr.dataDstIPAddr); + virNWFilterRuleDefFixupIPSet(&rule->p.ipv6HdrFilter.ipHdr); break; case VIR_NWFILTER_RULE_PROTOCOL_ARP: @@ -2047,6 +2172,7 @@ virNWFilterRuleDefFixup(virNWFilterRuleD rule->p.tcpHdrFilter.portData.dataSrcPortStart); COPY_NEG_SIGN(rule->p.tcpHdrFilter.portData.dataDstPortEnd, rule->p.tcpHdrFilter.portData.dataSrcPortStart); + virNWFilterRuleDefFixupIPSet(&rule->p.tcpHdrFilter.ipHdr); break; case VIR_NWFILTER_RULE_PROTOCOL_UDP: @@ -2065,6 +2191,7 @@ virNWFilterRuleDefFixup(virNWFilterRuleD rule->p.udpHdrFilter.portData.dataSrcPortStart); COPY_NEG_SIGN(rule->p.udpHdrFilter.portData.dataDstPortEnd, rule->p.udpHdrFilter.portData.dataSrcPortStart); + virNWFilterRuleDefFixupIPSet(&rule->p.udpHdrFilter.ipHdr); break; case VIR_NWFILTER_RULE_PROTOCOL_UDPLITE: @@ -2077,6 +2204,7 @@ virNWFilterRuleDefFixup(virNWFilterRuleD rule->p.udpliteHdrFilter.ipHdr.dataSrcIPFrom); COPY_NEG_SIGN(rule->p.udpliteHdrFilter.ipHdr.dataDstIPTo, rule->p.udpliteHdrFilter.ipHdr.dataDstIPFrom); + virNWFilterRuleDefFixupIPSet(&rule->p.udpliteHdrFilter.ipHdr); break; case VIR_NWFILTER_RULE_PROTOCOL_ESP: @@ -2089,6 +2217,7 @@ virNWFilterRuleDefFixup(virNWFilterRuleD rule->p.espHdrFilter.ipHdr.dataSrcIPFrom); COPY_NEG_SIGN(rule->p.espHdrFilter.ipHdr.dataDstIPTo, rule->p.espHdrFilter.ipHdr.dataDstIPFrom); + virNWFilterRuleDefFixupIPSet(&rule->p.espHdrFilter.ipHdr); break; case VIR_NWFILTER_RULE_PROTOCOL_AH: @@ -2101,6 +2230,7 @@ virNWFilterRuleDefFixup(virNWFilterRuleD rule->p.ahHdrFilter.ipHdr.dataSrcIPFrom); COPY_NEG_SIGN(rule->p.ahHdrFilter.ipHdr.dataDstIPTo, rule->p.ahHdrFilter.ipHdr.dataDstIPFrom); + virNWFilterRuleDefFixupIPSet(&rule->p.ahHdrFilter.ipHdr); break; case VIR_NWFILTER_RULE_PROTOCOL_SCTP: @@ -2119,6 +2249,7 @@ virNWFilterRuleDefFixup(virNWFilterRuleD rule->p.sctpHdrFilter.portData.dataSrcPortStart); COPY_NEG_SIGN(rule->p.sctpHdrFilter.portData.dataDstPortEnd, rule->p.sctpHdrFilter.portData.dataSrcPortStart); + virNWFilterRuleDefFixupIPSet(&rule->p.sctpHdrFilter.ipHdr); break; case VIR_NWFILTER_RULE_PROTOCOL_ICMP: @@ -2133,6 +2264,7 @@ virNWFilterRuleDefFixup(virNWFilterRuleD rule->p.icmpHdrFilter.ipHdr.dataDstIPFrom); COPY_NEG_SIGN(rule->p.icmpHdrFilter.dataICMPCode, rule->p.icmpHdrFilter.dataICMPType); + virNWFilterRuleDefFixupIPSet(&rule->p.icmpHdrFilter.ipHdr); break; case VIR_NWFILTER_RULE_PROTOCOL_ALL: @@ -2156,6 +2288,7 @@ virNWFilterRuleDefFixup(virNWFilterRuleD rule->p.igmpHdrFilter.ipHdr.dataSrcIPFrom); COPY_NEG_SIGN(rule->p.igmpHdrFilter.ipHdr.dataDstIPTo, rule->p.igmpHdrFilter.ipHdr.dataDstIPFrom); + virNWFilterRuleDefFixupIPSet(&rule->p.igmpHdrFilter.ipHdr); break; case VIR_NWFILTER_RULE_PROTOCOL_LAST: @@ -3120,7 +3253,7 @@ virNWFilterRuleDefDetailsFormat(virBuffe virBufferAsprintf(buf, " %s='", att[i].name); - if (att[i].formatter) { + if (att[i].formatter && !(flags & NWFILTER_ENTRY_ITEM_FLAG_HAS_VAR)) { if (!att[i].formatter(buf, def, item)) { virNWFilterReportError(VIR_ERR_INTERNAL_ERROR, _("formatter for %s %s reported error"), Index: libvirt/src/conf/nwfilter_conf.h =================================================================== --- libvirt.orig/src/conf/nwfilter_conf.h +++ libvirt/src/conf/nwfilter_conf.h @@ -103,8 +103,9 @@ enum attrDatatype { DATATYPE_BOOLEAN = (1 << 12), DATATYPE_UINT32 = (1 << 13), DATATYPE_UINT32_HEX = (1 << 14), + DATATYPE_IPSETFLAGS = (1 << 15), - DATATYPE_LAST = (1 << 15), + DATATYPE_LAST = (1 << 16), }; # define NWFILTER_MAC_BGA "01:80:c2:00:00:00" @@ -136,9 +137,16 @@ struct _nwItemDesc { uint8_t mask; uint8_t flags; } tcpFlags; + struct { + char setname[32]; + uint8_t numFlags; + uint8_t flags; + } ipset; } u; }; +# define VALID_IPSETNAME \ + "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_.:-+ " typedef struct _ethHdrDataDef ethHdrDataDef; typedef ethHdrDataDef *ethHdrDataDefPtr; @@ -232,6 +240,8 @@ struct _ipHdrDataDef { nwItemDesc dataState; nwItemDesc dataConnlimitAbove; nwItemDesc dataComment; + nwItemDesc dataIPSet; + nwItemDesc dataIPSetFlags; }; Index: libvirt/src/nwfilter/nwfilter_ebiptables_driver.c =================================================================== --- libvirt.orig/src/nwfilter/nwfilter_ebiptables_driver.c +++ libvirt/src/nwfilter/nwfilter_ebiptables_driver.c @@ -256,10 +256,13 @@ static int _printDataType(virNWFilterVarCombIterPtr vars, char *buf, int bufsize, nwItemDescPtr item, - bool asHex) + bool asHex, bool directionIn) { int done; char *data; + uint8_t ctr; + virBuffer vb = VIR_BUFFER_INITIALIZER; + char *flags; if (printVar(vars, buf, bufsize, item, &done) < 0) return -1; @@ -346,6 +349,40 @@ _printDataType(virNWFilterVarCombIterPtr } break; + case DATATYPE_IPSETFLAGS: + for (ctr = 0; ctr < item->u.ipset.numFlags; ctr++) { + if (ctr != 0) + virBufferAddLit(&vb, ","); + if ((item->u.ipset.flags & (1 << ctr))) { + if (directionIn) + virBufferAddLit(&vb, "dst"); + else + virBufferAddLit(&vb, "src"); + } else { + if (directionIn) + virBufferAddLit(&vb, "src"); + else + virBufferAddLit(&vb, "dst"); + } + } + + if (virBufferError(&vb)) { + virReportOOMError(); + virBufferFreeAndReset(&vb); + return -1; + } + + flags = virBufferContentAndReset(&vb); + + if (snprintf(buf, bufsize, "%s", flags) >= bufsize) { + virNWFilterReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Buffer too small for IPSETFLAGS type")); + VIR_FREE(flags); + return -1; + } + VIR_FREE(flags); + break; + default: virNWFilterReportError(VIR_ERR_INTERNAL_ERROR, _("Unhandled datatype %x"), item->datatype); @@ -362,16 +399,23 @@ printDataType(virNWFilterVarCombIterPtr char *buf, int bufsize, nwItemDescPtr item) { - return _printDataType(vars, buf, bufsize, item, 0); + return _printDataType(vars, buf, bufsize, item, 0, 0); } +static int +printDataTypeDirection(virNWFilterVarCombIterPtr vars, + char *buf, int bufsize, + nwItemDescPtr item, bool directionIn) +{ + return _printDataType(vars, buf, bufsize, item, 0, directionIn); +} static int printDataTypeAsHex(virNWFilterVarCombIterPtr vars, char *buf, int bufsize, nwItemDescPtr item) { - return _printDataType(vars, buf, bufsize, item, 1); + return _printDataType(vars, buf, bufsize, item, 1, 0); } @@ -927,6 +971,7 @@ iptablesHandleIpHdr(virBufferPtr buf, char ipaddr[INET6_ADDRSTRLEN], number[MAX(INT_BUFSIZE_BOUND(uint32_t), INT_BUFSIZE_BOUND(int))]; + char str[200]; const char *src = "--source"; const char *dst = "--destination"; const char *srcrange = "--src-range"; @@ -938,6 +983,26 @@ iptablesHandleIpHdr(virBufferPtr buf, dstrange = "--src-range"; } + if (HAS_ENTRY_ITEM(&ipHdr->dataIPSet) && + HAS_ENTRY_ITEM(&ipHdr->dataIPSetFlags)) { + + if (printDataType(vars, + str, sizeof(str), + &ipHdr->dataIPSet) < 0) + goto err_exit; + + virBufferAsprintf(afterStateMatch, + " -m set --match-set \"%s\" ", + str); + + if (printDataTypeDirection(vars, + str, sizeof(str), + &ipHdr->dataIPSetFlags, directionIn) < 0) + goto err_exit; + + virBufferAdd(afterStateMatch, str, -1); + } + if (HAS_ENTRY_ITEM(&ipHdr->dataSrcIPAddr)) { if (printDataType(vars, Index: libvirt/docs/schemas/nwfilter.rng =================================================================== --- libvirt.orig/docs/schemas/nwfilter.rng +++ libvirt/docs/schemas/nwfilter.rng @@ -485,6 +485,14 @@ <ref name="stateflags-type"/> </attribute> </optional> + <optional> + <attribute name="ipset"> + <ref name="ipset-type"/> + </attribute> + <attribute name="ipsetflags"> + <ref name="ipsetflags-type"/> + </attribute> + </optional> </interleave> </define> @@ -1060,4 +1068,19 @@ <param name="pattern">((SYN|ACK|URG|PSH|FIN|RST)(,(SYN|ACK|URG|PSH|FIN|RST))*|ALL|NONE)/((SYN|ACK|URG|PSH|FIN|RST)(,(SYN|ACK|URG|PSH|FIN|RST))*|ALL|NONE)</param> </data> </define> + + <define name='ipset-type'> + <choice> + <ref name="variable-name-type"/> + <data type="string"> + <param name="pattern">[a-zA-Z0-9_\.:\-\+]{1,31}</param> + </data> + </choice> + </define> + + <define name='ipsetflags-type'> + <data type="string"> + <param name="pattern">(src|dst)(,(src|dst)){0,5}</param> + </data> + </define> </grammar> Index: libvirt/tests/nwfilterxml2xmlin/ipset-test.xml =================================================================== --- /dev/null +++ libvirt/tests/nwfilterxml2xmlin/ipset-test.xml @@ -0,0 +1,15 @@ +<filter name='testcase' chain='root'> + <uuid>5c6d49af-b071-6127-b4ec-6f8ed4b55335</uuid> + <rule action='accept' direction='out'> + <all ipset='test' ipsetflags='src,dst' /> + </rule> + <rule action='accept' direction='in'> + <all ipset='test' ipsetflags='SRC,DST,SRC' /> + </rule> + <rule action='accept' direction='in'> + <all ipset='test:_.-+' ipsetflags='SRC,dSt,SRC' /> + </rule> + <rule action='accept' direction='in'> + <all ipset='$IPSETNAME' ipsetflags='src,dst' /> + </rule> +</filter> Index: libvirt/tests/nwfilterxml2xmlout/ipset-test.xml =================================================================== --- /dev/null +++ libvirt/tests/nwfilterxml2xmlout/ipset-test.xml @@ -0,0 +1,15 @@ +<filter name='testcase' chain='root'> + <uuid>5c6d49af-b071-6127-b4ec-6f8ed4b55335</uuid> + <rule action='accept' direction='out' priority='500'> + <all ipset='test' ipsetflags='src,dst'/> + </rule> + <rule action='accept' direction='in' priority='500'> + <all ipset='test' ipsetflags='src,dst,src'/> + </rule> + <rule action='accept' direction='in' priority='500'> + <all ipset='test:_.-+' ipsetflags='src,dst,src'/> + </rule> + <rule action='accept' direction='in' priority='500'> + <all ipset='$IPSETNAME' ipsetflags='src,dst'/> + </rule> +</filter> Index: libvirt/tests/nwfilterxml2xmltest.c =================================================================== --- libvirt.orig/tests/nwfilterxml2xmltest.c +++ libvirt/tests/nwfilterxml2xmltest.c @@ -157,6 +157,8 @@ mymain(void) DO_TEST("iter-test2", false); DO_TEST("iter-test3", false); + DO_TEST("ipset-test", false); + return ret==0 ? EXIT_SUCCESS : EXIT_FAILURE; } Index: libvirt/docs/formatnwfilter.html.in =================================================================== --- libvirt.orig/docs/formatnwfilter.html.in +++ libvirt/docs/formatnwfilter.html.in @@ -528,6 +528,10 @@ <li>IPV6_MASK: IPv6 mask in numbers format (FFFF:FFFF:FC00::) or CIDR mask (0-128)</li> <li>STRING: A string</li> <li>BOOLEAN: 'true', 'yes', '1' or 'false', 'no', '0'</li> + <li>IPSETFLAGS: The source and destination flags of the ipset described + by up to 6 'src' or 'dst' elements selecting features from either + the source or destination part of the packet header; example: + src,src,dst</li> </ul> @@ -1169,6 +1173,16 @@ <td>STRING</td> <td>TCP-only: format of mask/flags with mask and flags each being a comma separated list of SYN,ACK,URG,PSH,FIN,RST or NONE or ALL</td> </tr> + <tr> + <td>ipset (Since 0.9.11)</td> + <td>STRING</td> + <td>The name of an IPSet managed outside of libvirt</td> + </tr> + <tr> + <td>ipsetflags (Since 0.9.11)</td> + <td>IPSETFLAGS</td> + <td>flags for the IPSet; requires ipset attributed</td> + </tr> </table> @@ -1269,6 +1283,16 @@ <td>STRING</td> <td>comma separated list of NEW,ESTABLISHED,RELATED,INVALID or NONE</td> </tr> + <tr> + <td>ipset (Since 0.9.11)</td> + <td>STRING</td> + <td>The name of an IPSet managed outside of libvirt</td> + </tr> + <tr> + <td>ipsetflags (Since 0.9.11)</td> + <td>IPSETFLAGS</td> + <td>flags for the IPSet; requires ipset attributed</td> + </tr> </table> @@ -1358,6 +1382,16 @@ <td>STRING</td> <td>comma separated list of NEW,ESTABLISHED,RELATED,INVALID or NONE</td> </tr> + <tr> + <td>ipset (Since 0.9.11)</td> + <td>STRING</td> + <td>The name of an IPSet managed outside of libvirt</td> + </tr> + <tr> + <td>ipsetflags (Since 0.9.11)</td> + <td>IPSETFLAGS</td> + <td>flags for the IPSet; requires ipset attributed</td> + </tr> </table> @@ -1459,6 +1493,16 @@ <td>STRING</td> <td>TCP-only: format of mask/flags with mask and flags each being a comma separated list of SYN,ACK,URG,PSH,FIN,RST or NONE or ALL</td> </tr> + <tr> + <td>ipset (Since 0.9.11)</td> + <td>STRING</td> + <td>The name of an IPSet managed outside of libvirt</td> + </tr> + <tr> + <td>ipsetflags (Since 0.9.11)</td> + <td>IPSETFLAGS</td> + <td>flags for the IPSet; requires ipset attributed</td> + </tr> </table> @@ -1545,6 +1589,16 @@ <td>STRING</td> <td>comma separated list of NEW,ESTABLISHED,RELATED,INVALID or NONE</td> </tr> + <tr> + <td>ipset (Since 0.9.11)</td> + <td>STRING</td> + <td>The name of an IPSet managed outside of libvirt</td> + </tr> + <tr> + <td>ipsetflags (Since 0.9.11)</td> + <td>IPSETFLAGS</td> + <td>flags for the IPSet; requires ipset attributed</td> + </tr> </table> @@ -1619,6 +1673,16 @@ <td>STRING</td> <td>comma separated list of NEW,ESTABLISHED,RELATED,INVALID or NONE</td> </tr> + <tr> + <td>ipset (Since 0.9.11)</td> + <td>STRING</td> + <td>The name of an IPSet managed outside of libvirt</td> + </tr> + <tr> + <td>ipsetflags (Since 0.9.11)</td> + <td>IPSETFLAGS</td> + <td>flags for the IPSet; requires ipset attributed</td> + </tr> </table>

1 0

[libvirt] patch for openvz driver to support vzctl 3.1
by Ilja Livenson 04 Apr '12

04 Apr '12

Hi, there was a recent update of vzctl from openvz, which made openvz driver crash: https://www.redhat.com/archives/libvirt-users/2012-March/msg00203.html Not sure about the correct procedure, but the patch is very simple and is shown here: https://bugzilla.redhat.com/show_bug.cgi?id=809895 . Basically, openvz dropped strict version numbering (3.1 vs 3.1.0), which caused parsing to fail. cheers, Ilya

2 1

[libvirt] problems starting several qemu VMS simultaneously
by Serge Hallyn 04 Apr '12

04 Apr '12

Hi, I grabbed today's git head of libvirt. Created a VM (clean install of ubuntu oneiric, installed through virt-manager), and cloned it 3 times. Then I did serge@ubuntu:~$ for i in `seq 1 4`; do virsh start o$i > /tmp/o$i 2>&1 & done [1] 12184 [2] 12185 [3] 12186 [4] 12187 serge@ubuntu:~$ virsh list error: Failed to list active domains error: End of file while reading data: Input/output error serge@ubuntu:~$ virsh list Id Name State ---------------------------------------------------- 5 o2 shut off 7 o3 shut off 8 o4 shut off [1] Exit 1 virsh start o$i > /tmp/o$i 2>&1 [2] Done virsh start o$i > /tmp/o$i 2>&1 serge@ubuntu:~$ virsh list Id Name State ---------------------------------------------------- 5 o2 running 7 o3 running 8 o4 running [3]- Done virsh start o$i > /tmp/o$i 2>&1 [4]+ Done virsh start o$i > /tmp/o$i 2>&1 serge@ubuntu:~$ cat /tmp/o1 error: Failed to start domain o1 error: Unable to wait for child process: Bad file descriptor It's quite reproducible. An ubuntu bug report was filed at https://bugs.launchpad.net/ubuntu/+source/libvirt/+bug/961217 It's also very reminiscent of some lxc startup handshake issues which have been fixed. You can find the last chunk of the log file at http://people.canonical.com/~serge/libvirtd-parallel-startup.log -serge

2 4

[libvirt] [PATCH] Don't install sysctl file on non-Linux hosts
by Daniel P. Berrange 04 Apr '12

04 Apr '12

From: "Daniel P. Berrange" <berrange(a)redhat.com> * configure.ac: Set WITH_SYSCTL only on Linux hosts * daemon/Makefile.am: Conditionalize install-sysctl using WITH_SYSCTL Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> Cc: Jason Helfman <jhelfman(a)e-e.com> --- configure.ac | 25 +++++++++++++++++++++++++ daemon/Makefile.am | 5 +++++ 2 files changed, 30 insertions(+), 0 deletions(-) diff --git a/configure.ac b/configure.ac index 0e83019..3f5b3ff 100644 --- a/configure.ac +++ b/configure.ac @@ -403,6 +403,31 @@ AM_CONDITIONAL([LIBVIRT_INIT_SCRIPT_UPSTART], test "$init_upstart" = "yes") AM_CONDITIONAL([LIBVIRT_INIT_SCRIPT_SYSTEMD], test "$init_systemd" = "yes") AC_MSG_RESULT($with_init_script) + +AC_MSG_CHECKING([for whether to install sysctl config]) +AC_ARG_WITH([sysctl], + [AC_HELP_STRING([--with-sysctl@<:@=yes/no@:>@], + [Whether to install sysctl configs @<:@default=auto@:>@])], + [],[with_sysctl=check]) + +if test "$with_sysctl" = "yes" || test "$with_sysctl" = "check" +then + case $host in + *-*-linux*) + with_sysctl=yes + ;; + **) + if test "$with_sysctl" = "yes"; then + AC_MSG_ERROR([No sysctl configuration supported for $host]) + else + with_sysctl=no + fi + ;; + esac +fi +AM_CONDITIONAL([WITH_SYSCTL], test "$with_sysctl" = "yes") +AC_MSG_RESULT($with_sysctl) + dnl RHEL-5 has a peculiar version of Xen, which requires some special casing AC_ARG_WITH([rhel5-api], [AC_HELP_STRING([--with-rhel5-api=@<:@ARG@:>@], diff --git a/daemon/Makefile.am b/daemon/Makefile.am index db4abf5..391cd99 100644 --- a/daemon/Makefile.am +++ b/daemon/Makefile.am @@ -256,6 +256,7 @@ uninstall-sysconfig: rm -f $(DESTDIR)$(sysconfdir)/sysconfig/libvirtd rmdir $(DESTDIR)$(sysconfdir)/sysconfig || : +if WITH_SYSCTL install-sysctl: $(MKDIR_P) $(DESTDIR)$(sysconfdir)/sysctl.d $(INSTALL_DATA) $(srcdir)/libvirtd.sysctl \ @@ -264,6 +265,10 @@ install-sysctl: uninstall-sysctl: rm -f $(DESTDIR)$(sysconfdir)/sysctl.d/libvirtd rmdir $(DESTDIR)$(sysconfdir)/sysctl.d || : +else +install-sysctl: +uninstall-sysctl: +endif if LIBVIRT_INIT_SCRIPT_RED_HAT -- 1.7.7.6

3 2

[libvirt] [test-API PATCH 0/3] Console tests
by Peter Krempa 04 Apr '12

04 Apr '12

This series adds two tests that check interactions with the domain's console. As a helper the first patch contains a new exception that signalizes a test error other than raised by libvirt. The two tests are not contained in any test cases yet, as they require a specific VM configuration to work correctly. Peter Krempa (3): utils: Add exception for general test errors repo: Add test for mutualy exclusive console access repo: Add test for console input and output operations repos/domain/console_io.py | 76 +++++++++++++++++++++++++++++++++++ repos/domain/console_mutex.py | 89 +++++++++++++++++++++++++++++++++++++++++ utils/Python/testError.py | 26 ++++++++++++ 3 files changed, 191 insertions(+), 0 deletions(-) create mode 100644 repos/domain/console_io.py create mode 100644 repos/domain/console_mutex.py create mode 100644 utils/Python/testError.py -- 1.7.3.4

2 7

[libvirt] Release of libvirt-0.9.11
by Daniel Veillard 04 Apr '12

04 Apr '12

So as stated last week I made the release today. It is available from the ftp: ftp://libvirt.org/libvirt/libvirt-0.9.11.tar.gz along with Fedora 16 rpms I signed. And the release is tagged in the tree so normal development can resume :-) The release is rather big, which is not surprizing since in includes 6 weeks of developments instead of the 4 as usual. BTW considering the rate of the push I still think we should keep a monthly release schedule, this is way higher than most other projects but as long as the people doing the packaging and pushes downstream think it's okay I guess everyone benefits from a shorter cycle (well as long as we don't break API/features !) It is sometime difficult to separate from what to label as an improvement and what to label really as a new feature, in any case there was plenty of both in this release, along with a copious dose of bug fixes: Features: - Add support for the suspend event (Osier Yang) - Add support for event tray moved of removable disks (Osier Yang) - qemu: Support numad (Osier Yang) - cpustats: API, improvements and qemu support (KAMEZAWA Hiroyuki and Eric Blake) - qemu: support type='hostdev' network devices at domain start (Laine Stump) - Introduce virDomainPMWakeup API (Michal Privoznik) - network: support Open vSwitch (Ansis Atteka) - a number of snapshot improvements (Eric Blake) Portability: - build: fix build on cygwin (Eric Blake) - build: fix mingw ssize_t, syntax check (Eric Blake) - Disable build of commandhelper & ssh on Win32 (Daniel P. Berrange) - build: avoid 'devname' for BSD (Eric Blake) - build: avoid frame size error when building without -O2 (Laine Stump) - spec: Add missed dependancy for numad (Osier Yang) - util: fix build mingw (and all non-linux) build failure (Laine Stump) - Build error on OSX in src/util/virnetlink.c (Duncan Rance) - Fix build after commit e3ba4025 (Jim Fehlig) - build: Fix build with dtrace + apparmor (Jiri Denemark) - build: fix output of pid values (Eric Blake) - avoid global variable shadowed (Hu Tao) - lxc: Cleaner fix for compilation without SELinux (Martin Kletzander) - Fix compilation on MacOS X (Lincoln Myers) Documentation: - snapshot: fix virsh docs (Eric Blake) - Expand docs for timer tick policy (Daniel P. Berrange) - Add documentation for new attribute tray of disk target (Osier Yang) - Clarify virsh freecell manpage entry (Dave Allan) - fix typo (Zhou Peng) - Clarify what documentation is being referenced (Dave Allan) - Minor docs fix (Martin Kletzander) - libvirt: fix comment typo (Alex Jia) - fix usage example on setting log levels (Eric Blake) - use correct terminology for 1024 bytes (Eric Blake) - Fix typo (Osier Yang) - Fix typo in domain XML documentation (Christophe Fergeau) - storage: fix typo (Michal Privoznik) - comments wiping supported algorithms (Alex Jia) - Fix libvirt name in qemu commandline namespace URL (Michal Privoznik) - virsh: Break long lines in virsh.pod (Osier Yang) - Update bug reporting page (Dave Allan) - lib: Fix function documentation for virConnectListDomains (Peter Krempa) - virsh: Fix docs for list command (Peter Krempa) Bug fixes: - qemu: Start nested job in qemuDomainCheckEjectableMedia (Jiri Denemark) - qemu: fix memory leak in virDomainGetVcpus (Laine Stump) - conf: allow fuzz in XML with cur balloon > max (Eric Blake) - qemu: reflect any memory rounding back to xml (Eric Blake) - qemu: support live change of the bridge used by a guest network device (Hendrik Schwartke) - qemu_agent: Issue guest-sync prior to every command (Michal Privoznik) - conf: Prevent crash of libvirtd without channel target name (Alex Jia) - fix a deadlock when qemu cannot start (Wen Congyang) - qemu: Make migration fail when port profile association fails on the dst host (Christian Benvenuti) - virsh: plug memory leaks on failure path (Alex Jia) - snapshot: don't pass NULL to QMP command creation (Eric Blake) - qemu: Avoid entering monitor with locked driver (Jiri Denemark) - Leave all child processes running when stopping systemd service (Daniel P. Berrange) - python: Avoid memory leaks on libvirt_virNodeGetCPUStats (Alex Jia) - qemu: Avoid dangling migration-out job when client dies (Jiri Denemark) - qemu: Avoid dangling migration-in job on shutoff domains (Jiri Denemark) - qemu: Use unlimited speed when migrating to file (Jiri Denemark) - python: Avoid memory leaks on libvirt_virNodeGetMemoryStats (Alex Jia) - conf: forbid use of multicast mac addresses (Laine Stump) - conf: return immediately on error in dhcp host element (Laine Stump) - util: fail attempts to use same mac address for guest and tap (Laine Stump) - snapshot: make quiesce a bit safer (Eric Blake) - virConfGetValue: Fixed NULL pointer check (Martin Kletzander) - Fix handling of blkio deviceWeight empty string (Daniel P. Berrange) - remote: Fix migration leaks (Osier Yang) - lib: Don't access configuration if none is present (Peter Krempa) - qemuDomainDetachPciDiskDevice: Free allocated cgroup (Michal Privoznik) - virsh: fix invalid free (Alex Jia) - qemu: Reverse condition in qemuDomainCheckDiskPresence (Michal Privoznik) - qemu: fix segfault when detaching non-existent network device (Guannan Ren) - qemu: Fix (managed)save and snapshots with host mode CPU (Jiri Denemark) - qemu: support disk filenames with comma (Eric Blake) - Fix a few typo in translated strings (Daniel Veillard) - qemuBuildCommandLine: Don't add tlsPort if none set (Michal Privoznik) - qemu: eliminate memory leak in qemuDomainUpdateDeviceConfig (Laine Stump) - util: eliminate device object leaks related to virDomain*Remove*() (Laine Stump) - qemu: don't 'remove' hostdev objects from domain if operation fails (Laine Stump) - util: Don't overflow on errno in virFileAccessibleAs (Michal Privoznik) - sanlock: Use STREQ_NULLABLE instead of STREQ on strings that may be null (Peter Krempa) - qemu: Fix startupPolicy for snapshot-revert (Michal Privoznik) - rpc: allow truncated return for virDomainGetCPUStats (Eric Blake) - conf: fix error log with "address address" (Laine Stump) - Ensure max_id is initialized in linuxParseCPUmap() (Daniel P. Berrange) - util: eliminate crash in virNetDevMacVLanCreateWithVPortProfile (Laine Stump) - rpc: Fix client crash on connection close (Jiri Denemark) - Correct a check for capacity arg of storageVolumeResize() (Zeeshan Ali (Khattak)) - qemu: Don't emit tls-port spice option if port is -1 (Jiri Denemark) - libxl: eliminate memory leak in libxmlDomainModifyDeviceFlags (Laine Stump) - qemu: fix cleanup of bridge during failure of qemuDomainAttachNetDevice (Laine Stump) - qemu: unescape HMP commands before converting them to json (Josh Durgin) - virsh: fix informational message in iface-bridge command (Laine Stump) - virterror: Misleading error message when name is missing (Benjamin Cama) - util: Fix virFileAccessibleAs return path from parent (Michal Privoznik) - qemu: Prevent crash of libvirtd without guest agent (Alex Jia) - qemu: Unlock monitor when connecting to dest qemu fails (Jiri Denemark) - qemu: Fix segfault when host CPU is empty (Jiri Denemark) - Fix polkit0 authentication (Jim Fehlig) - snapshot: fix snapshot deletion use-after-free (Eric Blake) - daemon: fix logic bug with virAsprintf (Eric Blake) - daemon: plug memory leak (Eric Blake) - Fix typos in API XML file paths (Daniel P. Berrange) Improvements: - Xen: Fix <clock> handling (Philipp Hahn) - Support clock=variable relative to localtime (Philipp Hahn) - python: improve conversion validation (Eric Blake) - Fix client only RPM build & other misc RPM problems (Daniel P. Berrange) - virnetdevtap: Don't check for flags in virNetDevTapCreateFlags (Michal Privoznik) - Consistent style for usage of sizeof operator (Daniel P. Berrange) - Don't redefine the CPU comparison constants in CPU test (Daniel P. Berrange) - Fix some format specifiers for size_t vs ssize_t (Daniel P. Berrange) - build: silence recent syntax check violations (Eric Blake) - private.syms: Add virNetDevMacVLanRestartWithVPortProfile (Zhou Peng) - Set default name for SPICE agent channel (Christophe Fergeau) - python: make python APIs use these helper functions (Guannan Ren) - python: Add new helper functions for python to C integral conversion (Guannan Ren) - Enable all warnings permanently & default to -Werror for GIT builds (Daniel P. Berrange) - Enable build of test suite programs by default for GIT checkouts (Daniel P. Berrange) - Change the default of mdns_adv to false (Stef Walter) - Add LXC XML files to schema test & fix problems this uncovers (Daniel P. Berrange) - Add support for setting init argv for LXC (Daniel P. Berrange) - Detect location fo selinux mount point (Daniel P. Berrange) - qemu,util: on restart of libvirt restart vepa callbacks (D. Herrendoerfer) - build: fix "missing initializer" error in qemu_process.c (Laine Stump) - build: fix "missing initializer" errors in virsh.c (Laine Stump) - Added syntax-check rule for return with parentheses (Martin Kletzander) - Cleanup for a return statement in source files (Martin Kletzander) - Fix and test round-trip of query parameters (Eric Blake) - snapshot: improve qemu handling of reused snapshot targets (Eric Blake) - snapshot: wire up qemu transaction command (Eric Blake) - snapshot: add support for qemu transaction command (Eric Blake) - snapshot: rudimentary qemu support for atomic disk snapshot (Eric Blake) - snapshot: make offline qemu snapshots atomic (Eric Blake) - snapshot: add atomic create flag (Eric Blake) - snapshot: add qemu capability for 'transaction' command (Eric Blake) - build: fix incorrect enum declaration (Eric Blake) - Add qemu support for ppc64 on FC16 or above for rpm packaging (Li Zhang) - Fix typo s/virURIFormatQuery/virURIFormatParams/ (Daniel P. Berrange) - qemu: Update domain status to running while wakeup event is emitted (Osier Yang) - qemu: Update domain state to pmsuspended while suspend event occurs (Osier Yang) - New domain state pmsuspended (Osier Yang) - Add support for the wakeup event (Osier Yang) - qemu: Update tray status while tray moved event is emitted (Osier Yang) - qemu: Prohibit setting tray status as open for block type disk (Osier Yang) - qemu: Do not start with source for removable disks if tray is open (Osier Yang) - conf: Parse and for the tray attribute (Osier Yang) - Implement sysinfo on PowerPC. (Prerna Saxena) - Lookup auth credentials in config file before prompting (Daniel P. Berrange) - Refactor code prompting for SASL credentials (Daniel P. Berrange) - Add helper API for finding auth file path (Daniel P. Berrange) - Rename virRequest{Username,Password} to virAuthGet{Username,Password} (Daniel P. Berrange) - Rename src/util/authhelper.[ch] to src/util/virauth.[ch] (Daniel P. Berrange) - Add a virKeyfilePtr object for parsing '.ini' files (Daniel P. Berrange) - Convert drivers over to use virURIPtr for query params (Daniel P. Berrange) - Store parsed query parameters directly in the virURIPtr struct (Daniel P. Berrange) - Use a libvirt custom struct for virURIPtr (Daniel P. Berrange) - Centralize error reporting for URI parsing/formatting problems (Daniel P. Berrange) - s/xmlURIPtr/virURIPtr/ in virURIFormat impl (Daniel P. Berrange) - Use virURIFree instead of xmlFreeURI (Daniel P. Berrange) - Add test case for virURIPtr classs (Daniel P. Berrange) - python: add virDomainGetCPUStats python binding API (Guannan Ren) - qemu: Make autodestroy utilize connection close callbacks (Jiri Denemark) - qemu: Add connection close callbacks (Jiri Denemark) - qemu: Add support for domain cleanup callbacks (Jiri Denemark) - python: always include config.h first (Eric Blake) - Cpu mapping cleanup (Martin Kletzander) - virsh: trim aliases from -h output (Eric Blake) - Add support for forcing a private network namespace for LXC guests (Daniel P. Berrange) - Emit graphics events when a SPICE client connects/disconnects (Laine Stump) - numad: Fix typo and warning (Osier Yang) - Add container_uuid env variable to LXC guests (Daniel P. Berrange) - Allow overriding default URI in config file (Daniel P. Berrange) - virsh: A bit smarter attach-disk (Osier Yang) - qemu: Use scsi-block for lun passthrough instead of scsi-disk (Osier Yang) - cpu: Add cpu definition for Intel Sandy Bridge cpu type (Peter Krempa) - Added support for AMD Bulldozer CPU (Martin Kletzander) - graphics: Cleanup port policy (Michal Privoznik) - cpustats: report user and sys times (Eric Blake) - qemuxml2argvtest: Pass some additional flags to graphics-spice-agentmouse (Michal Privoznik) - qemu: spice agent-mouse support (Peng Zhou) - virsh: Use option alias for outmoded "--persistent" (Osier Yang) - util: consolidate duplicated error messages in pci.c (Laine Stump) - qemu: support persistent hotplug of <hostdev> devices (Laine Stump) - util: standardize return from functions calling virNetlinkCommand (Laine Stump) - util: make virDomainLeaseDefFree global (Laine Stump) - util: consolidate duplicated error messages in virnetlink.c (Laine Stump) - util: log error on OOM in virNetDevOpenvswitchAddPort (Laine Stump) - Attach vm-id to Open vSwitch interfaces. (Ansis Atteka) - util: whitespace change to virNetDevOpenvswitchAddPort (Laine Stump) - util: add stub pciConfigAddressToSysfsFile for non-linux platforms (Laine Stump) - rpc: generalize solution for VPATH builds (Eric Blake) - xml: Clean up schemas to use shared data types instead of local (Peter Krempa) - qemu: Don't parse device twice in attach/detach (Michal Privoznik) - virsh: improve memory unit parsing (Eric Blake) - virsh: improve storage unit parsing (Eric Blake) - virsh: add command aliases, and rename nodedev-detach (Eric Blake) - virsh: use option aliases (Eric Blake) - virsh: add option aliases (Eric Blake) - xml: allow scaled memory on input (Eric Blake) - xml: use better types for memory values (Eric Blake) - xml: use long long internally, to centralize overflow checks (Eric Blake) - xml: drop unenforced minimum memory limit from RNG (Eric Blake) - storage: support more scaling suffixes (Eric Blake) - xml: output memory unit for clarity (Eric Blake) - xml: share 'unit' in RNG (Eric Blake) - util: new function for scaling numbers (Eric Blake) - api: add overflow error (Eric Blake) - cpu-stats command shows cpu statistics information of a domain. (KAMEZAWA Hiroyuki) - qemu driver for virDomainGetCPUstats using cpuacct cgroup. (KAMEZAWA Hiroyuki) - add nodeGetCPUmap() for getting available CPU IDs in a cpumap. (KAMEZAWA Hiroyuki) - qemu: install port profile and mac address on netdev hostdevs (Roopa Prabhu) - util: Changes to support portprofiles for hostdevs (Roopa Prabhu) - util: support functions for mac/portprofile associations on hostdev (Roopa Prabhu) - util: two new pci util functions (Roopa Prabhu) - qemu: support type=hostdev network device live hotplug attach/detach (Laine Stump) - qemu: use virDomainNetRemove instead of inline code (Laine Stump) - conf: change virDomainNetRemove from static to global (Laine Stump) - conf: parse/format type='hostdev' network interfaces (Laine Stump) - qemu: refactor hotplug detach of hostdevs (Laine Stump) - qemu: re-order functions in qemu_hotplug.c (Laine Stump) - conf: hostdev utility functions (Laine Stump) - conf: put subsys part of virDomainHostdevDef into its own struct (Laine Stump) - conf: give each hostdevdef a parent pointer (Laine Stump) - conf: HostdevDef parse/format helper functions (Laine Stump) - conf: make hostdev info a separate object (Laine Stump) - conf: add device pointer to args of virDomainDeviceInfoIterate callback (Laine Stump) - qemu: rename virDomainDeviceInfoPtr variables to avoid confusion (Laine Stump) - conf: reorder static functions in domain_conf.c (Laine Stump) - conf: relocate virDomainDeviceDef and virDomainHostdevDef (Laine Stump) - conf: add missing device types to virDomainDevice(Type|Def) (Laine Stump) - blockResize: add flag for bytes (Eric Blake) - qemu: Shared or readonly disks are always safe wrt migration (Jiri Denemark) - libvirt-guests: Add parallel startup and shutdown of guests (Peter Krempa) - Fix type and add missed comment for diskChange callback (Osier Yang) - cpu: Add new flag supported by qemu to the cpu definition (Peter Krempa) - util: combine bools in virNetDevTapCreateInBridgePort into flags (Laine Stump) - util: centralize tap device MAC address 1st byte "0xFE" modification (Ansis Atteka) - build: use correct type for pid and similar types (Eric Blake) - build: prohibit cross-inclusion (Eric Blake) - virsh: expose partial pull (Eric Blake) - qemu: pass block pull backing file to monitor (Eric Blake) - qemu: require json for block jobs (Eric Blake) - fix alphabetical order of virNetlink functions in symbol file (Laine Stump) - build: update to latest gnulib (Eric Blake) - Add de-association handling to macvlan code (D. Herrendoerfer) - util: Add netlink event handling to virnetlink.c (D. Herrendoerfer) - Support for cpu64-rhel* qemu cpu models (Martin Kletzander) - libvirt-guests: Check if URI is reachable before launching commands (Peter Krempa) - libvirt-guests: Don't try to do a managed-save of transient guests (Peter Krempa) - libvirt-guests: Add documentation and clean up to use virsh's improved list (Peter Krempa) - qemu: Add pre-migration hook (Jiri Denemark) - hooks: Add support for capturing hook output (Jiri Denemark) - util: fix a typo (Alex Jia) - storage: fix a typo (Alex Jia) - Do not include binaries in EXTRA_DIST (Daniel Veillard) - virsh: New command cmdChangeMedia (Osier Yang) - virsh: Use vshFindDisk and vshPrepareDiskXML in cmdDetachDisk (Osier Yang) - virsh: Two new helper functions for disk device changes (Osier Yang) - tests: Add tests for virtio-scsi and ibmvscsi controllers (Osier Yang) - qemu: Build command line for the new address format (Osier Yang) - qemu: New cap flag to indicate if channel is supported by scsi-disk (Osier Yang) - conf: Introduce new attribute for device address format (Osier Yang) - conf: Add helper function to look up disk controller model (Osier Yang) - qemu: add virtio-scsi controller model (Paolo Bonzini) - qemu: add ibmvscsi controller model (Paolo Bonzini) - qemu: Add ability to abort existing console while creating new one (Peter Krempa) - util: Add helpers for safe domain console operations (Peter Krempa) - fdstream: Add internal callback on stream close (Peter Krempa) - fdstream: Emit stream abort callback even if poll() doesnt. (Peter Krempa) - virsh: add support for VIR_DOMAIN_CONSOLE_* flags (Peter Krempa) - Add flags for virDomainOpenConsole (Peter Krempa) - pidfile: Make checking binary path in virPidFileRead optional (Peter Krempa) - qemu: Implement virDomainPMWakeup API (Michal Privoznik) - virsh: Expose virDomainPMWakeup (Michal Privoznik) - Fixed URI parsing (Martin Kletzander) - Workaround python header file insanity (Daniel P. Berrange) - Improve error reporting when virsh console is run without a TTY (Daniel P. Berrange) - Error out when using SPICE TLS with spice_tls=0 (Christophe Fergeau) - vmx: Better Workstation vmx handling (Jean-Baptiste Rouault) - qemu: nicer error message on failed graceful destroy (Eric Blake) - qemu: Forbid migration with cache != none (Jiri Denemark) - Introduce virStorageFileIsClusterFS (Jiri Denemark) - virsh: Add --unsafe option to migrate command (Jiri Denemark) - Add support for unsafe migration (Jiri Denemark) - configure: Define program name if not found (Michal Privoznik) - virsh: Enhance list command to ease creation of shell scripts (Peter Krempa) - vmware: implement domainXMLFromNative (Jean-Baptiste Rouault) - esx: Correctly disable HTTP Expect header usage of libcurl (Matthias Bolte) - caps: Improve error if passed an unknown arch (Cole Robinson) - spec: use ix86 macros (Peter Robinson) - nwfilter: improved logging during driver initialization (Stefan Berger) - storage: Allow runtime detection of scrub (Michal Privoznik) - Fix build with polkit0 (Jim Fehlig) - python: Expose virDomain{G,S}etInterfaceParameters APIs in python binding (Alex Jia) - conf: rename virDomainNetGetActualDirectVirtPortProfile (Laine Stump) - qemu: increase the timeout before sending SIGKILL to qemu process (Laine Stump) - qemu: drop driver lock while trying to terminate qemu process (Laine Stump) - qemu: Implement DomainPMSuspendForDuration (Michal Privoznik) - qemu: Set capabilities based on supported monitor commands (Michal Privoznik) - Install API XML desc to a standard location (Daniel P. Berrange) - qemu: make block io tuning smarter (Eric Blake) Cleanups: - Fix typos and spacing in messages. (Yuri Chornoivan) - qemu: eliminate nested switch, simplify code (Laine Stump) - Fix typo in previous patch (Daniel P. Berrange) - build: drop obsolete qparams test (Eric Blake) - build: drop a painfully long gnulib test (Eric Blake) - Removed more AMD-specific features from cpu64-rhel* models (Martin Kletzander) - conf: eliminate redundant VIR_ALLOC of 1st element of network DNS hosts. (Laine Stump) - remove daemon/probes.h from .gitignore (Laine Stump) - sanlock: Fix condition left crippled while debugging (Peter Krempa) - qemu: Fix indention (Osier Yang) - daemon: Remove deprecated HAL from init script dependencies (Peter Krempa) - util: remove unneeded #include in virrandom.c (Laine Stump) - util: wrap virnetlink.c to 80 columns (Laine Stump) - Fixed service handling in specfile (Martin Kletzander) So thanks everybody for this massive amount of work, be it bug reports, patches, documentation, portability, everybody should enjoy that release now ! 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/

3 4

[libvirt] Create domain using libvirt-php
by Ali Raza Memon 04 Apr '12

04 Apr '12

Hello...! I want to create a new domain using libvirt-php, and after creating I want to start it. I have seen this to create new domain: libvirt_domain_new($conn, $name, $arch, $memMB, $maxmemMB, $vcpus, $iso_image, $disks, $networks, $flags) So in the above sysntax what should I pass in $iso_image? $disk? $networks and $flag?? Please give me a complete example that can solve my problem. Thanks..

2 1

[libvirt] [test-API PATCH] Added screenshot test
by Martin Kletzander 04 Apr '12

04 Apr '12

This patch adds a test that obtains a screenshot of a domain and saves it in a file. --- repos/domain/screenshot.py | 57 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 57 insertions(+), 0 deletions(-) create mode 100644 repos/domain/screenshot.py diff --git a/repos/domain/screenshot.py b/repos/domain/screenshot.py new file mode 100644 index 0000000..9986cab --- /dev/null +++ b/repos/domain/screenshot.py @@ -0,0 +1,57 @@ +#!/usr/bin/env python +"""This test is used for creating a screenshot of a domain and saving + it in a file. The Screenshot format is hypervisor specific. + + mandatory arguments: guestname + screen + filename +""" + +import os +import mimetypes + +import libvirt + +def check_params(params): + """Verify input parameters""" + for key in ('guestname', 'screen', 'filename'): + if key not in params: + raise KeyError('Missing key %s required for screenshot test' % key) + + params['screen'] = int(params['screen']) + params['filename'] = os.path.abspath(params['filename']) + +def saver(stream, data, file_): + return file_.write(data) + +def screenshot(params): + """This method takes a screenshot of a running machine and saves + it in a filename""" + ret = 1 + try: + logger = params['logger'] + + check_params(params) + + conn = libvirt.open(params['uri']) + dom = conn.lookupByName(params['guestname']) + + st = conn.newStream(0) + mime = dom.screenshot(st, params['screen'], 0) + + ext = mimetypes.guess_extension(mime) or '.ppm' + filename = params['filename'] + ext + f = file(filename, 'w') + + logger.debug('Saving screenshot into %s' % filename) + st.recvAll(saver, f) + logger.debug('Mimetype of the file is %s' % mime) + + ret = st.finish() + + finally: + # Some error occurred, cleanup + if 'conn' in locals() and conn.isAlive(): + conn.close() + + return ret -- 1.7.8.5

3 9

[libvirt] [PATCH 0/3] qemu: Improve USB devices list handling
by Michal Privoznik 04 Apr '12

04 Apr '12

This patch set fixes two bugs: https://bugzilla.redhat.com/show_bug.cgi?id=806449 https://bugzilla.redhat.com/show_bug.cgi?id=743671 tl;dr - we are only adding to the list, removing only on detach-device. Need to remove on qemuProcessStop too. And need to rebuild the list on qemuProcessReconnect. Michal Privoznik (3): qemu: Don't leak temporary list of USB devices qemu: Delete USB devices used by domain on stop qemu: Build activeUsbHostdevs list on process reconnect src/qemu/qemu_hostdev.c | 112 +++++++++++++++++++++++++++++++++++++++++++++-- src/qemu/qemu_hostdev.h | 2 + src/qemu/qemu_process.c | 3 + 3 files changed, 113 insertions(+), 4 deletions(-) -- 1.7.8.5

2 8

[libvirt] question on API spelling
by Eric Blake 04 Apr '12

04 Apr '12

We're quite inconsistent on US (canceled) vs. UK (cancelled) spelling in our public API: include/libvirt/libvirt.h.in:124: VIR_DOMAIN_RUNNING_MIGRATION_CANCELED = 6, /* returned from migration */ include/libvirt/libvirt.h.in:125: VIR_DOMAIN_RUNNING_SAVE_CANCELED = 7, /* returned from failed save process */ include/libvirt/libvirt.h.in:3220: VIR_DOMAIN_JOB_CANCELLED = 5, /* Job was aborted, but isn't cleaned up */ include/libvirt/virterror.h:247: canceled/aborted by user */ include/libvirt/virterror.h:248: VIR_ERR_AUTH_CANCELLED = 79, /* authentication cancelled */ Is it worth adding aliases so that a programmer can use consistent spelling? -- Eric Blake eblake(a)redhat.com +1-919-301-3266 Libvirt virtualization library http://libvirt.org

4 4

[libvirt] [PATCH] news.html.in: Fix void tag
by Michal Privoznik 04 Apr '12

04 Apr '12

Void elements should be written with slash *after* the tag name, not before, so they are not confused with ending tags. --- Pushing under trivial rule. Produced by: :%s/<\/br>/<br\/>/g command, so if breaks something, blame vim :) docs/news.html.in | 642 ++++++++++++++++++++++++++-------------------------- 1 files changed, 321 insertions(+), 321 deletions(-) diff --git a/docs/news.html.in b/docs/news.html.in index 68b2d3a..eb9c3ec 100644 --- a/docs/news.html.in +++ b/docs/news.html.in @@ -1,4 +1,4 @@ -<?xml version="1.0"?> +<?xml version="1.0"? <html> <head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> @@ -11,336 +11,336 @@ and check the <a href="http://libvirt.org/git/?p=libvirt.git;a=log">GIT log</a> <h3>0.9.11: Apr 3 2012</h3> <ul> <li> Features: - Add support for the suspend event (Osier Yang), - Add support for event tray moved of removable disks (Osier Yang), - qemu: Support numad (Osier Yang), - cpustats: API, improvements and qemu support (KAMEZAWA Hiroyuki and Eric Blake), - qemu: support type='hostdev' network devices at domain start (Laine Stump), - Introduce virDomainPMWakeup API (Michal Privoznik), - network: support Open vSwitch (Ansis Atteka), - a number of snapshot improvements (Eric Blake) + Add support for the suspend event (Osier Yang), + Add support for event tray moved of removable disks (Osier Yang), + qemu: Support numad (Osier Yang), + cpustats: API, improvements and qemu support (KAMEZAWA Hiroyuki and Eric Blake), + qemu: support type='hostdev' network devices at domain start (Laine Stump), + Introduce virDomainPMWakeup API (Michal Privoznik), + network: support Open vSwitch (Ansis Atteka), + a number of snapshot improvements (Eric Blake) </li> - <li> Portability: - build: fix build on cygwin (Eric Blake), - build: fix mingw ssize_t, syntax check (Eric Blake), - Disable build of commandhelper & ssh on Win32 (Daniel P. Berrange), - build: avoid 'devname' for BSD (Eric Blake), - build: avoid frame size error when building without -O2 (Laine Stump), - spec: Add missed dependancy for numad (Osier Yang), - util: fix build mingw (and all non-linux) build failure (Laine Stump), - Build error on OSX in src/util/virnetlink.c (Duncan Rance), - Fix build after commit e3ba4025 (Jim Fehlig), - build: Fix build with dtrace + apparmor (Jiri Denemark), - build: fix output of pid values (Eric Blake), - avoid global variable shadowed (Hu Tao), - lxc: Cleaner fix for compilation without SELinux (Martin Kletzander), - Fix compilation on MacOS X (Lincoln Myers) + <li> Portability: + build: fix build on cygwin (Eric Blake), + build: fix mingw ssize_t, syntax check (Eric Blake), + Disable build of commandhelper & ssh on Win32 (Daniel P. Berrange), + build: avoid 'devname' for BSD (Eric Blake), + build: avoid frame size error when building without -O2 (Laine Stump), + spec: Add missed dependancy for numad (Osier Yang), + util: fix build mingw (and all non-linux) build failure (Laine Stump), + Build error on OSX in src/util/virnetlink.c (Duncan Rance), + Fix build after commit e3ba4025 (Jim Fehlig), + build: Fix build with dtrace + apparmor (Jiri Denemark), + build: fix output of pid values (Eric Blake), + avoid global variable shadowed (Hu Tao), + lxc: Cleaner fix for compilation without SELinux (Martin Kletzander), + Fix compilation on MacOS X (Lincoln Myers) </li> - <li> Documentation: - snapshot: fix virsh docs (Eric Blake), - Expand docs for timer tick policy (Daniel P. Berrange), - Add documentation for new attribute tray of disk target (Osier Yang), - Clarify virsh freecell manpage entry (Dave Allan), - fix typo (Zhou Peng), - Clarify what documentation is being referenced (Dave Allan), - Minor docs fix (Martin Kletzander), - libvirt: fix comment typo (Alex Jia), - fix usage example on setting log levels (Eric Blake), - use correct terminology for 1024 bytes (Eric Blake), - Fix typo (Osier Yang), - Fix typo in domain XML documentation (Christophe Fergeau), - storage: fix typo (Michal Privoznik), - comments wiping supported algorithms (Alex Jia), - Fix libvirt name in qemu commandline namespace URL (Michal Privoznik), - virsh: Break long lines in virsh.pod (Osier Yang), - Update bug reporting page (Dave Allan), - lib: Fix function documentation for virConnectListDomains (Peter Krempa), - virsh: Fix docs for list command (Peter Krempa) + <li> Documentation: + snapshot: fix virsh docs (Eric Blake), + Expand docs for timer tick policy (Daniel P. Berrange), + Add documentation for new attribute tray of disk target (Osier Yang), + Clarify virsh freecell manpage entry (Dave Allan), + fix typo (Zhou Peng), + Clarify what documentation is being referenced (Dave Allan), + Minor docs fix (Martin Kletzander), + libvirt: fix comment typo (Alex Jia), + fix usage example on setting log levels (Eric Blake), + use correct terminology for 1024 bytes (Eric Blake), + Fix typo (Osier Yang), + Fix typo in domain XML documentation (Christophe Fergeau), + storage: fix typo (Michal Privoznik), + comments wiping supported algorithms (Alex Jia), + Fix libvirt name in qemu commandline namespace URL (Michal Privoznik), + virsh: Break long lines in virsh.pod (Osier Yang), + Update bug reporting page (Dave Allan), + lib: Fix function documentation for virConnectListDomains (Peter Krempa), + virsh: Fix docs for list command (Peter Krempa) </li> - <li> Bug fixes: - qemu: Start nested job in qemuDomainCheckEjectableMedia (Jiri Denemark), - qemu: fix memory leak in virDomainGetVcpus (Laine Stump), - conf: allow fuzz in XML with cur balloon > max (Eric Blake), - qemu: reflect any memory rounding back to xml (Eric Blake), - qemu: support live change of the bridge used by a guest network device (Hendrik Schwartke), - qemu_agent: Issue guest-sync prior to every command (Michal Privoznik), - conf: Prevent crash of libvirtd without channel target name (Alex Jia), - fix a deadlock when qemu cannot start (Wen Congyang), - qemu: Make migration fail when port profile association fails on the dst host (Christian Benvenuti), - virsh: plug memory leaks on failure path (Alex Jia), - snapshot: don't pass NULL to QMP command creation (Eric Blake), - qemu: Avoid entering monitor with locked driver (Jiri Denemark), - Leave all child processes running when stopping systemd service (Daniel P. Berrange), - python: Avoid memory leaks on libvirt_virNodeGetCPUStats (Alex Jia), - qemu: Avoid dangling migration-out job when client dies (Jiri Denemark), - qemu: Avoid dangling migration-in job on shutoff domains (Jiri Denemark), - qemu: Use unlimited speed when migrating to file (Jiri Denemark), - python: Avoid memory leaks on libvirt_virNodeGetMemoryStats (Alex Jia), - conf: forbid use of multicast mac addresses (Laine Stump), - conf: return immediately on error in dhcp host element (Laine Stump), - util: fail attempts to use same mac address for guest and tap (Laine Stump), - snapshot: make quiesce a bit safer (Eric Blake), - virConfGetValue: Fixed NULL pointer check (Martin Kletzander), - Fix handling of blkio deviceWeight empty string (Daniel P. Berrange), - remote: Fix migration leaks (Osier Yang), - lib: Don't access configuration if none is present (Peter Krempa), - qemuDomainDetachPciDiskDevice: Free allocated cgroup (Michal Privoznik), - virsh: fix invalid free (Alex Jia), - qemu: Reverse condition in qemuDomainCheckDiskPresence (Michal Privoznik), - qemu: fix segfault when detaching non-existent network device (Guannan Ren), - qemu: Fix (managed)save and snapshots with host mode CPU (Jiri Denemark), - qemu: support disk filenames with comma (Eric Blake), - Fix a few typo in translated strings (Daniel Veillard), - qemuBuildCommandLine: Don't add tlsPort if none set (Michal Privoznik), - qemu: eliminate memory leak in qemuDomainUpdateDeviceConfig (Laine Stump), - util: eliminate device object leaks related to virDomain*Remove*() (Laine Stump), - qemu: don't 'remove' hostdev objects from domain if operation fails (Laine Stump), - util: Don't overflow on errno in virFileAccessibleAs (Michal Privoznik), - sanlock: Use STREQ_NULLABLE instead of STREQ on strings that may be null (Peter Krempa), - qemu: Fix startupPolicy for snapshot-revert (Michal Privoznik), - rpc: allow truncated return for virDomainGetCPUStats (Eric Blake), - conf: fix error log with "address address" (Laine Stump), - Ensure max_id is initialized in linuxParseCPUmap() (Daniel P. Berrange), - util: eliminate crash in virNetDevMacVLanCreateWithVPortProfile (Laine Stump), - rpc: Fix client crash on connection close (Jiri Denemark), - Correct a check for capacity arg of storageVolumeResize() (Zeeshan Ali (Khattak)), - qemu: Don't emit tls-port spice option if port is -1 (Jiri Denemark), - libxl: eliminate memory leak in libxmlDomainModifyDeviceFlags (Laine Stump), - qemu: fix cleanup of bridge during failure of qemuDomainAttachNetDevice (Laine Stump), - qemu: unescape HMP commands before converting them to json (Josh Durgin), - virsh: fix informational message in iface-bridge command (Laine Stump), - virterror: Misleading error message when name is missing (Benjamin Cama), - util: Fix virFileAccessibleAs return path from parent (Michal Privoznik), - qemu: Prevent crash of libvirtd without guest agent (Alex Jia), - qemu: Unlock monitor when connecting to dest qemu fails (Jiri Denemark), - qemu: Fix segfault when host CPU is empty (Jiri Denemark), - Fix polkit0 authentication (Jim Fehlig), - snapshot: fix snapshot deletion use-after-free (Eric Blake), - daemon: fix logic bug with virAsprintf (Eric Blake), - daemon: plug memory leak (Eric Blake), - Fix typos in API XML file paths (Daniel P. Berrange) + <li> Bug fixes: + qemu: Start nested job in qemuDomainCheckEjectableMedia (Jiri Denemark), + qemu: fix memory leak in virDomainGetVcpus (Laine Stump), + conf: allow fuzz in XML with cur balloon > max (Eric Blake), + qemu: reflect any memory rounding back to xml (Eric Blake), + qemu: support live change of the bridge used by a guest network device (Hendrik Schwartke), + qemu_agent: Issue guest-sync prior to every command (Michal Privoznik), + conf: Prevent crash of libvirtd without channel target name (Alex Jia), + fix a deadlock when qemu cannot start (Wen Congyang), + qemu: Make migration fail when port profile association fails on the dst host (Christian Benvenuti), + virsh: plug memory leaks on failure path (Alex Jia), + snapshot: don't pass NULL to QMP command creation (Eric Blake), + qemu: Avoid entering monitor with locked driver (Jiri Denemark), + Leave all child processes running when stopping systemd service (Daniel P. Berrange), + python: Avoid memory leaks on libvirt_virNodeGetCPUStats (Alex Jia), + qemu: Avoid dangling migration-out job when client dies (Jiri Denemark), + qemu: Avoid dangling migration-in job on shutoff domains (Jiri Denemark), + qemu: Use unlimited speed when migrating to file (Jiri Denemark), + python: Avoid memory leaks on libvirt_virNodeGetMemoryStats (Alex Jia), + conf: forbid use of multicast mac addresses (Laine Stump), + conf: return immediately on error in dhcp host element (Laine Stump), + util: fail attempts to use same mac address for guest and tap (Laine Stump), + snapshot: make quiesce a bit safer (Eric Blake), + virConfGetValue: Fixed NULL pointer check (Martin Kletzander), + Fix handling of blkio deviceWeight empty string (Daniel P. Berrange), + remote: Fix migration leaks (Osier Yang), + lib: Don't access configuration if none is present (Peter Krempa), + qemuDomainDetachPciDiskDevice: Free allocated cgroup (Michal Privoznik), + virsh: fix invalid free (Alex Jia), + qemu: Reverse condition in qemuDomainCheckDiskPresence (Michal Privoznik), + qemu: fix segfault when detaching non-existent network device (Guannan Ren), + qemu: Fix (managed)save and snapshots with host mode CPU (Jiri Denemark), + qemu: support disk filenames with comma (Eric Blake), + Fix a few typo in translated strings (Daniel Veillard), + qemuBuildCommandLine: Don't add tlsPort if none set (Michal Privoznik), + qemu: eliminate memory leak in qemuDomainUpdateDeviceConfig (Laine Stump), + util: eliminate device object leaks related to virDomain*Remove*() (Laine Stump), + qemu: don't 'remove' hostdev objects from domain if operation fails (Laine Stump), + util: Don't overflow on errno in virFileAccessibleAs (Michal Privoznik), + sanlock: Use STREQ_NULLABLE instead of STREQ on strings that may be null (Peter Krempa), + qemu: Fix startupPolicy for snapshot-revert (Michal Privoznik), + rpc: allow truncated return for virDomainGetCPUStats (Eric Blake), + conf: fix error log with "address address" (Laine Stump), + Ensure max_id is initialized in linuxParseCPUmap() (Daniel P. Berrange), + util: eliminate crash in virNetDevMacVLanCreateWithVPortProfile (Laine Stump), + rpc: Fix client crash on connection close (Jiri Denemark), + Correct a check for capacity arg of storageVolumeResize() (Zeeshan Ali (Khattak)), + qemu: Don't emit tls-port spice option if port is -1 (Jiri Denemark), + libxl: eliminate memory leak in libxmlDomainModifyDeviceFlags (Laine Stump), + qemu: fix cleanup of bridge during failure of qemuDomainAttachNetDevice (Laine Stump), + qemu: unescape HMP commands before converting them to json (Josh Durgin), + virsh: fix informational message in iface-bridge command (Laine Stump), + virterror: Misleading error message when name is missing (Benjamin Cama), + util: Fix virFileAccessibleAs return path from parent (Michal Privoznik), + qemu: Prevent crash of libvirtd without guest agent (Alex Jia), + qemu: Unlock monitor when connecting to dest qemu fails (Jiri Denemark), + qemu: Fix segfault when host CPU is empty (Jiri Denemark), + Fix polkit0 authentication (Jim Fehlig), + snapshot: fix snapshot deletion use-after-free (Eric Blake), + daemon: fix logic bug with virAsprintf (Eric Blake), + daemon: plug memory leak (Eric Blake), + Fix typos in API XML file paths (Daniel P. Berrange) </li> - <li> Improvements: - Xen: Fix <clock> handling (Philipp Hahn), - Support clock=variable relative to localtime (Philipp Hahn), - python: improve conversion validation (Eric Blake), - Fix client only RPM build & other misc RPM problems (Daniel P. Berrange), - Refactor the libvirt RPM daemon pieces (Daniel P. Berrange), - virnetdevtap: Don't check for flags in virNetDevTapCreateFlags (Michal Privoznik), - Consistent style for usage of sizeof operator (Daniel P. Berrange), - Don't redefine the CPU comparison constants in CPU test (Daniel P. Berrange), - Fix some format specifiers for size_t vs ssize_t (Daniel P. Berrange), - build: silence recent syntax check violations (Eric Blake), - private.syms: Add virNetDevMacVLanRestartWithVPortProfile (Zhou Peng), - Set default name for SPICE agent channel (Christophe Fergeau), - python: make python APIs use these helper functions (Guannan Ren), - python: Add new helper functions for python to C integral conversion (Guannan Ren), - Enable all warnings permanently & default to -Werror for GIT builds (Daniel P. Berrange), - Enable build of test suite programs by default for GIT checkouts (Daniel P. Berrange), - Change the default of mdns_adv to false (Stef Walter), - Add LXC XML files to schema test & fix problems this uncovers (Daniel P. Berrange), - Add support for setting init argv for LXC (Daniel P. Berrange), - Detect location fo selinux mount point (Daniel P. Berrange), - qemu,util: on restart of libvirt restart vepa callbacks (D. Herrendoerfer), - build: fix "missing initializer" error in qemu_process.c (Laine Stump), - build: fix "missing initializer" errors in virsh.c (Laine Stump), - Added syntax-check rule for return with parentheses (Martin Kletzander), - Cleanup for a return statement in source files (Martin Kletzander), - Fix and test round-trip of query parameters (Eric Blake), - snapshot: improve qemu handling of reused snapshot targets (Eric Blake), - snapshot: wire up qemu transaction command (Eric Blake), - snapshot: add support for qemu transaction command (Eric Blake), - snapshot: rudimentary qemu support for atomic disk snapshot (Eric Blake), - snapshot: make offline qemu snapshots atomic (Eric Blake), - snapshot: add atomic create flag (Eric Blake), - snapshot: add qemu capability for 'transaction' command (Eric Blake), - build: fix incorrect enum declaration (Eric Blake), - Add qemu support for ppc64 on FC16 or above for rpm packaging (Li Zhang), - Fix typo s/virURIFormatQuery/virURIFormatParams/ (Daniel P. Berrange), - qemu: Update domain status to running while wakeup event is emitted (Osier Yang), - qemu: Update domain state to pmsuspended while suspend event occurs (Osier Yang), - New domain state pmsuspended (Osier Yang), - Add support for the wakeup event (Osier Yang), - qemu: Update tray status while tray moved event is emitted (Osier Yang), - qemu: Prohibit setting tray status as open for block type disk (Osier Yang), - qemu: Do not start with source for removable disks if tray is open (Osier Yang), - conf: Parse and for the tray attribute (Osier Yang), - Implement sysinfo on PowerPC. (Prerna Saxena), - Lookup auth credentials in config file before prompting (Daniel P. Berrange), - Refactor code prompting for SASL credentials (Daniel P. Berrange), - Add helper API for finding auth file path (Daniel P. Berrange), - Rename virRequest{Username,Password} to virAuthGet{Username,Password} (Daniel P. Berrange), - Rename src/util/authhelper.[ch] to src/util/virauth.[ch] (Daniel P. Berrange), - Add a virKeyfilePtr object for parsing '.ini' files (Daniel P. Berrange), - Convert drivers over to use virURIPtr for query params (Daniel P. Berrange), - Store parsed query parameters directly in the virURIPtr struct (Daniel P. Berrange), - Use a libvirt custom struct for virURIPtr (Daniel P. Berrange), - Centralize error reporting for URI parsing/formatting problems (Daniel P. Berrange), - s/xmlURIPtr/virURIPtr/ in virURIFormat impl (Daniel P. Berrange), - Use virURIFree instead of xmlFreeURI (Daniel P. Berrange), - Add test case for virURIPtr classs (Daniel P. Berrange), - python: add virDomainGetCPUStats python binding API (Guannan Ren), - qemu: Make autodestroy utilize connection close callbacks (Jiri Denemark), - qemu: Add connection close callbacks (Jiri Denemark), - qemu: Add support for domain cleanup callbacks (Jiri Denemark), - python: always include config.h first (Eric Blake), - Cpu mapping cleanup (Martin Kletzander), - virsh: trim aliases from -h output (Eric Blake), - Add support for forcing a private network namespace for LXC guests (Daniel P. Berrange), - Emit graphics events when a SPICE client connects/disconnects (Laine Stump), - numad: Fix typo and warning (Osier Yang), - Add container_uuid env variable to LXC guests (Daniel P. Berrange), - Allow overriding default URI in config file (Daniel P. Berrange), - virsh: A bit smarter attach-disk (Osier Yang), - qemu: Use scsi-block for lun passthrough instead of scsi-disk (Osier Yang), - cpu: Add cpu definition for Intel Sandy Bridge cpu type (Peter Krempa), - Added support for AMD Bulldozer CPU (Martin Kletzander), - graphics: Cleanup port policy (Michal Privoznik), - cpustats: report user and sys times (Eric Blake), - qemuxml2argvtest: Pass some additional flags to graphics-spice-agentmouse (Michal Privoznik), - qemu: spice agent-mouse support (Peng Zhou), - virsh: Use option alias for outmoded "--persistent" (Osier Yang), - util: consolidate duplicated error messages in pci.c (Laine Stump), - qemu: support persistent hotplug of <hostdev> devices (Laine Stump), - util: standardize return from functions calling virNetlinkCommand (Laine Stump), - util: make virDomainLeaseDefFree global (Laine Stump), - util: consolidate duplicated error messages in virnetlink.c (Laine Stump), - util: log error on OOM in virNetDevOpenvswitchAddPort (Laine Stump), - Attach vm-id to Open vSwitch interfaces. (Ansis Atteka), - util: whitespace change to virNetDevOpenvswitchAddPort (Laine Stump), - util: add stub pciConfigAddressToSysfsFile for non-linux platforms (Laine Stump), - rpc: generalize solution for VPATH builds (Eric Blake), - xml: Clean up schemas to use shared data types instead of local (Peter Krempa), - qemu: Don't parse device twice in attach/detach (Michal Privoznik), - virsh: improve memory unit parsing (Eric Blake), - virsh: improve storage unit parsing (Eric Blake), - virsh: add command aliases, and rename nodedev-detach (Eric Blake), - virsh: use option aliases (Eric Blake), - virsh: add option aliases (Eric Blake), - xml: allow scaled memory on input (Eric Blake), - xml: use better types for memory values (Eric Blake), - xml: use long long internally, to centralize overflow checks (Eric Blake), - xml: drop unenforced minimum memory limit from RNG (Eric Blake), - storage: support more scaling suffixes (Eric Blake), - xml: output memory unit for clarity (Eric Blake), - xml: share 'unit' in RNG (Eric Blake), - util: new function for scaling numbers (Eric Blake), - api: add overflow error (Eric Blake), - cpu-stats command shows cpu statistics information of a domain. (KAMEZAWA Hiroyuki), - qemu driver for virDomainGetCPUstats using cpuacct cgroup. (KAMEZAWA Hiroyuki), - add nodeGetCPUmap() for getting available CPU IDs in a cpumap. (KAMEZAWA Hiroyuki), - qemu: install port profile and mac address on netdev hostdevs (Roopa Prabhu), - util: Changes to support portprofiles for hostdevs (Roopa Prabhu), - util: support functions for mac/portprofile associations on hostdev (Roopa Prabhu), - util: two new pci util functions (Roopa Prabhu), - qemu: support type=hostdev network device live hotplug attach/detach (Laine Stump), - qemu: use virDomainNetRemove instead of inline code (Laine Stump), - conf: change virDomainNetRemove from static to global (Laine Stump), - conf: parse/format type='hostdev' network interfaces (Laine Stump), - qemu: refactor hotplug detach of hostdevs (Laine Stump), - qemu: re-order functions in qemu_hotplug.c (Laine Stump), - conf: hostdev utility functions (Laine Stump), - conf: put subsys part of virDomainHostdevDef into its own struct (Laine Stump), - conf: give each hostdevdef a parent pointer (Laine Stump), - conf: HostdevDef parse/format helper functions (Laine Stump), - conf: make hostdev info a separate object (Laine Stump), - conf: add device pointer to args of virDomainDeviceInfoIterate callback (Laine Stump), - qemu: rename virDomainDeviceInfoPtr variables to avoid confusion (Laine Stump), - conf: reorder static functions in domain_conf.c (Laine Stump), - conf: relocate virDomainDeviceDef and virDomainHostdevDef (Laine Stump), - conf: add missing device types to virDomainDevice(Type|Def) (Laine Stump), - blockResize: add flag for bytes (Eric Blake), - qemu: Shared or readonly disks are always safe wrt migration (Jiri Denemark), - libvirt-guests: Add parallel startup and shutdown of guests (Peter Krempa), - Fix type and add missed comment for diskChange callback (Osier Yang), - cpu: Add new flag supported by qemu to the cpu definition (Peter Krempa), - util: combine bools in virNetDevTapCreateInBridgePort into flags (Laine Stump), - util: centralize tap device MAC address 1st byte "0xFE" modification (Ansis Atteka), - build: use correct type for pid and similar types (Eric Blake), - build: prohibit cross-inclusion (Eric Blake), - virsh: expose partial pull (Eric Blake), - qemu: pass block pull backing file to monitor (Eric Blake), - qemu: require json for block jobs (Eric Blake), - fix alphabetical order of virNetlink functions in symbol file (Laine Stump), - build: update to latest gnulib (Eric Blake), - Add de-association handling to macvlan code (D. Herrendoerfer), - util: Add netlink event handling to virnetlink.c (D. Herrendoerfer), - Support for cpu64-rhel* qemu cpu models (Martin Kletzander), - libvirt-guests: Check if URI is reachable before launching commands (Peter Krempa), - libvirt-guests: Don't try to do a managed-save of transient guests (Peter Krempa), - libvirt-guests: Add documentation and clean up to use virsh's improved list (Peter Krempa), - qemu: Add pre-migration hook (Jiri Denemark), - hooks: Add support for capturing hook output (Jiri Denemark), - util: fix a typo (Alex Jia), - storage: fix a typo (Alex Jia), - Do not include binaries in EXTRA_DIST (Daniel Veillard), - virsh: New command cmdChangeMedia (Osier Yang), - virsh: Use vshFindDisk and vshPrepareDiskXML in cmdDetachDisk (Osier Yang), - virsh: Two new helper functions for disk device changes (Osier Yang), - tests: Add tests for virtio-scsi and ibmvscsi controllers (Osier Yang), - qemu: Build command line for the new address format (Osier Yang), - qemu: New cap flag to indicate if channel is supported by scsi-disk (Osier Yang), - conf: Introduce new attribute for device address format (Osier Yang), - conf: Add helper function to look up disk controller model (Osier Yang), - qemu: add virtio-scsi controller model (Paolo Bonzini), - qemu: add ibmvscsi controller model (Paolo Bonzini), - qemu: Add ability to abort existing console while creating new one (Peter Krempa), - util: Add helpers for safe domain console operations (Peter Krempa), - fdstream: Add internal callback on stream close (Peter Krempa), - fdstream: Emit stream abort callback even if poll() doesnt. (Peter Krempa), - virsh: add support for VIR_DOMAIN_CONSOLE_* flags (Peter Krempa), - Add flags for virDomainOpenConsole (Peter Krempa), - pidfile: Make checking binary path in virPidFileRead optional (Peter Krempa), - qemu: Implement virDomainPMWakeup API (Michal Privoznik), - virsh: Expose virDomainPMWakeup (Michal Privoznik), - Fixed URI parsing (Martin Kletzander), - Workaround python header file insanity (Daniel P. Berrange), - Improve error reporting when virsh console is run without a TTY (Daniel P. Berrange), - Error out when using SPICE TLS with spice_tls=0 (Christophe Fergeau), - vmx: Better Workstation vmx handling (Jean-Baptiste Rouault), - qemu: nicer error message on failed graceful destroy (Eric Blake), - qemu: Forbid migration with cache != none (Jiri Denemark), - Introduce virStorageFileIsClusterFS (Jiri Denemark), - virsh: Add --unsafe option to migrate command (Jiri Denemark), - Add support for unsafe migration (Jiri Denemark), - configure: Define program name if not found (Michal Privoznik), - virsh: Enhance list command to ease creation of shell scripts (Peter Krempa), - vmware: implement domainXMLFromNative (Jean-Baptiste Rouault), - esx: Correctly disable HTTP Expect header usage of libcurl (Matthias Bolte), - caps: Improve error if passed an unknown arch (Cole Robinson), - spec: use ix86 macros (Peter Robinson), - nwfilter: improved logging during driver initialization (Stefan Berger), - storage: Allow runtime detection of scrub (Michal Privoznik), - Fix build with polkit0 (Jim Fehlig), - python: Expose virDomain{G,S}etInterfaceParameters APIs in python binding (Alex Jia), - conf: rename virDomainNetGetActualDirectVirtPortProfile (Laine Stump), - qemu: increase the timeout before sending SIGKILL to qemu process (Laine Stump), - qemu: drop driver lock while trying to terminate qemu process (Laine Stump), - qemu: Implement DomainPMSuspendForDuration (Michal Privoznik), - qemu: Set capabilities based on supported monitor commands (Michal Privoznik), - Install API XML desc to a standard location (Daniel P. Berrange), - qemu: make block io tuning smarter (Eric Blake) + <li> Improvements: + Xen: Fix <clock> handling (Philipp Hahn), + Support clock=variable relative to localtime (Philipp Hahn), + python: improve conversion validation (Eric Blake), + Fix client only RPM build & other misc RPM problems (Daniel P. Berrange), + Refactor the libvirt RPM daemon pieces (Daniel P. Berrange), + virnetdevtap: Don't check for flags in virNetDevTapCreateFlags (Michal Privoznik), + Consistent style for usage of sizeof operator (Daniel P. Berrange), + Don't redefine the CPU comparison constants in CPU test (Daniel P. Berrange), + Fix some format specifiers for size_t vs ssize_t (Daniel P. Berrange), + build: silence recent syntax check violations (Eric Blake), + private.syms: Add virNetDevMacVLanRestartWithVPortProfile (Zhou Peng), + Set default name for SPICE agent channel (Christophe Fergeau), + python: make python APIs use these helper functions (Guannan Ren), + python: Add new helper functions for python to C integral conversion (Guannan Ren), + Enable all warnings permanently & default to -Werror for GIT builds (Daniel P. Berrange), + Enable build of test suite programs by default for GIT checkouts (Daniel P. Berrange), + Change the default of mdns_adv to false (Stef Walter), + Add LXC XML files to schema test & fix problems this uncovers (Daniel P. Berrange), + Add support for setting init argv for LXC (Daniel P. Berrange), + Detect location fo selinux mount point (Daniel P. Berrange), + qemu,util: on restart of libvirt restart vepa callbacks (D. Herrendoerfer), + build: fix "missing initializer" error in qemu_process.c (Laine Stump), + build: fix "missing initializer" errors in virsh.c (Laine Stump), + Added syntax-check rule for return with parentheses (Martin Kletzander), + Cleanup for a return statement in source files (Martin Kletzander), + Fix and test round-trip of query parameters (Eric Blake), + snapshot: improve qemu handling of reused snapshot targets (Eric Blake), + snapshot: wire up qemu transaction command (Eric Blake), + snapshot: add support for qemu transaction command (Eric Blake), + snapshot: rudimentary qemu support for atomic disk snapshot (Eric Blake), + snapshot: make offline qemu snapshots atomic (Eric Blake), + snapshot: add atomic create flag (Eric Blake), + snapshot: add qemu capability for 'transaction' command (Eric Blake), + build: fix incorrect enum declaration (Eric Blake), + Add qemu support for ppc64 on FC16 or above for rpm packaging (Li Zhang), + Fix typo s/virURIFormatQuery/virURIFormatParams/ (Daniel P. Berrange), + qemu: Update domain status to running while wakeup event is emitted (Osier Yang), + qemu: Update domain state to pmsuspended while suspend event occurs (Osier Yang), + New domain state pmsuspended (Osier Yang), + Add support for the wakeup event (Osier Yang), + qemu: Update tray status while tray moved event is emitted (Osier Yang), + qemu: Prohibit setting tray status as open for block type disk (Osier Yang), + qemu: Do not start with source for removable disks if tray is open (Osier Yang), + conf: Parse and for the tray attribute (Osier Yang), + Implement sysinfo on PowerPC. (Prerna Saxena), + Lookup auth credentials in config file before prompting (Daniel P. Berrange), + Refactor code prompting for SASL credentials (Daniel P. Berrange), + Add helper API for finding auth file path (Daniel P. Berrange), + Rename virRequest{Username,Password} to virAuthGet{Username,Password} (Daniel P. Berrange), + Rename src/util/authhelper.[ch] to src/util/virauth.[ch] (Daniel P. Berrange), + Add a virKeyfilePtr object for parsing '.ini' files (Daniel P. Berrange), + Convert drivers over to use virURIPtr for query params (Daniel P. Berrange), + Store parsed query parameters directly in the virURIPtr struct (Daniel P. Berrange), + Use a libvirt custom struct for virURIPtr (Daniel P. Berrange), + Centralize error reporting for URI parsing/formatting problems (Daniel P. Berrange), + s/xmlURIPtr/virURIPtr/ in virURIFormat impl (Daniel P. Berrange), + Use virURIFree instead of xmlFreeURI (Daniel P. Berrange), + Add test case for virURIPtr classs (Daniel P. Berrange), + python: add virDomainGetCPUStats python binding API (Guannan Ren), + qemu: Make autodestroy utilize connection close callbacks (Jiri Denemark), + qemu: Add connection close callbacks (Jiri Denemark), + qemu: Add support for domain cleanup callbacks (Jiri Denemark), + python: always include config.h first (Eric Blake), + Cpu mapping cleanup (Martin Kletzander), + virsh: trim aliases from -h output (Eric Blake), + Add support for forcing a private network namespace for LXC guests (Daniel P. Berrange), + Emit graphics events when a SPICE client connects/disconnects (Laine Stump), + numad: Fix typo and warning (Osier Yang), + Add container_uuid env variable to LXC guests (Daniel P. Berrange), + Allow overriding default URI in config file (Daniel P. Berrange), + virsh: A bit smarter attach-disk (Osier Yang), + qemu: Use scsi-block for lun passthrough instead of scsi-disk (Osier Yang), + cpu: Add cpu definition for Intel Sandy Bridge cpu type (Peter Krempa), + Added support for AMD Bulldozer CPU (Martin Kletzander), + graphics: Cleanup port policy (Michal Privoznik), + cpustats: report user and sys times (Eric Blake), + qemuxml2argvtest: Pass some additional flags to graphics-spice-agentmouse (Michal Privoznik), + qemu: spice agent-mouse support (Peng Zhou), + virsh: Use option alias for outmoded "--persistent" (Osier Yang), + util: consolidate duplicated error messages in pci.c (Laine Stump), + qemu: support persistent hotplug of <hostdev> devices (Laine Stump), + util: standardize return from functions calling virNetlinkCommand (Laine Stump), + util: make virDomainLeaseDefFree global (Laine Stump), + util: consolidate duplicated error messages in virnetlink.c (Laine Stump), + util: log error on OOM in virNetDevOpenvswitchAddPort (Laine Stump), + Attach vm-id to Open vSwitch interfaces. (Ansis Atteka), + util: whitespace change to virNetDevOpenvswitchAddPort (Laine Stump), + util: add stub pciConfigAddressToSysfsFile for non-linux platforms (Laine Stump), + rpc: generalize solution for VPATH builds (Eric Blake), + xml: Clean up schemas to use shared data types instead of local (Peter Krempa), + qemu: Don't parse device twice in attach/detach (Michal Privoznik), + virsh: improve memory unit parsing (Eric Blake), + virsh: improve storage unit parsing (Eric Blake), + virsh: add command aliases, and rename nodedev-detach (Eric Blake), + virsh: use option aliases (Eric Blake), + virsh: add option aliases (Eric Blake), + xml: allow scaled memory on input (Eric Blake), + xml: use better types for memory values (Eric Blake), + xml: use long long internally, to centralize overflow checks (Eric Blake), + xml: drop unenforced minimum memory limit from RNG (Eric Blake), + storage: support more scaling suffixes (Eric Blake), + xml: output memory unit for clarity (Eric Blake), + xml: share 'unit' in RNG (Eric Blake), + util: new function for scaling numbers (Eric Blake), + api: add overflow error (Eric Blake), + cpu-stats command shows cpu statistics information of a domain. (KAMEZAWA Hiroyuki), + qemu driver for virDomainGetCPUstats using cpuacct cgroup. (KAMEZAWA Hiroyuki), + add nodeGetCPUmap() for getting available CPU IDs in a cpumap. (KAMEZAWA Hiroyuki), + qemu: install port profile and mac address on netdev hostdevs (Roopa Prabhu), + util: Changes to support portprofiles for hostdevs (Roopa Prabhu), + util: support functions for mac/portprofile associations on hostdev (Roopa Prabhu), + util: two new pci util functions (Roopa Prabhu), + qemu: support type=hostdev network device live hotplug attach/detach (Laine Stump), + qemu: use virDomainNetRemove instead of inline code (Laine Stump), + conf: change virDomainNetRemove from static to global (Laine Stump), + conf: parse/format type='hostdev' network interfaces (Laine Stump), + qemu: refactor hotplug detach of hostdevs (Laine Stump), + qemu: re-order functions in qemu_hotplug.c (Laine Stump), + conf: hostdev utility functions (Laine Stump), + conf: put subsys part of virDomainHostdevDef into its own struct (Laine Stump), + conf: give each hostdevdef a parent pointer (Laine Stump), + conf: HostdevDef parse/format helper functions (Laine Stump), + conf: make hostdev info a separate object (Laine Stump), + conf: add device pointer to args of virDomainDeviceInfoIterate callback (Laine Stump), + qemu: rename virDomainDeviceInfoPtr variables to avoid confusion (Laine Stump), + conf: reorder static functions in domain_conf.c (Laine Stump), + conf: relocate virDomainDeviceDef and virDomainHostdevDef (Laine Stump), + conf: add missing device types to virDomainDevice(Type|Def) (Laine Stump), + blockResize: add flag for bytes (Eric Blake), + qemu: Shared or readonly disks are always safe wrt migration (Jiri Denemark), + libvirt-guests: Add parallel startup and shutdown of guests (Peter Krempa), + Fix type and add missed comment for diskChange callback (Osier Yang), + cpu: Add new flag supported by qemu to the cpu definition (Peter Krempa), + util: combine bools in virNetDevTapCreateInBridgePort into flags (Laine Stump), + util: centralize tap device MAC address 1st byte "0xFE" modification (Ansis Atteka), + build: use correct type for pid and similar types (Eric Blake), + build: prohibit cross-inclusion (Eric Blake), + virsh: expose partial pull (Eric Blake), + qemu: pass block pull backing file to monitor (Eric Blake), + qemu: require json for block jobs (Eric Blake), + fix alphabetical order of virNetlink functions in symbol file (Laine Stump), + build: update to latest gnulib (Eric Blake), + Add de-association handling to macvlan code (D. Herrendoerfer), + util: Add netlink event handling to virnetlink.c (D. Herrendoerfer), + Support for cpu64-rhel* qemu cpu models (Martin Kletzander), + libvirt-guests: Check if URI is reachable before launching commands (Peter Krempa), + libvirt-guests: Don't try to do a managed-save of transient guests (Peter Krempa), + libvirt-guests: Add documentation and clean up to use virsh's improved list (Peter Krempa), + qemu: Add pre-migration hook (Jiri Denemark), + hooks: Add support for capturing hook output (Jiri Denemark), + util: fix a typo (Alex Jia), + storage: fix a typo (Alex Jia), + Do not include binaries in EXTRA_DIST (Daniel Veillard), + virsh: New command cmdChangeMedia (Osier Yang), + virsh: Use vshFindDisk and vshPrepareDiskXML in cmdDetachDisk (Osier Yang), + virsh: Two new helper functions for disk device changes (Osier Yang), + tests: Add tests for virtio-scsi and ibmvscsi controllers (Osier Yang), + qemu: Build command line for the new address format (Osier Yang), + qemu: New cap flag to indicate if channel is supported by scsi-disk (Osier Yang), + conf: Introduce new attribute for device address format (Osier Yang), + conf: Add helper function to look up disk controller model (Osier Yang), + qemu: add virtio-scsi controller model (Paolo Bonzini), + qemu: add ibmvscsi controller model (Paolo Bonzini), + qemu: Add ability to abort existing console while creating new one (Peter Krempa), + util: Add helpers for safe domain console operations (Peter Krempa), + fdstream: Add internal callback on stream close (Peter Krempa), + fdstream: Emit stream abort callback even if poll() doesnt. (Peter Krempa), + virsh: add support for VIR_DOMAIN_CONSOLE_* flags (Peter Krempa), + Add flags for virDomainOpenConsole (Peter Krempa), + pidfile: Make checking binary path in virPidFileRead optional (Peter Krempa), + qemu: Implement virDomainPMWakeup API (Michal Privoznik), + virsh: Expose virDomainPMWakeup (Michal Privoznik), + Fixed URI parsing (Martin Kletzander), + Workaround python header file insanity (Daniel P. Berrange), + Improve error reporting when virsh console is run without a TTY (Daniel P. Berrange), + Error out when using SPICE TLS with spice_tls=0 (Christophe Fergeau), + vmx: Better Workstation vmx handling (Jean-Baptiste Rouault), + qemu: nicer error message on failed graceful destroy (Eric Blake), + qemu: Forbid migration with cache != none (Jiri Denemark), + Introduce virStorageFileIsClusterFS (Jiri Denemark), + virsh: Add --unsafe option to migrate command (Jiri Denemark), + Add support for unsafe migration (Jiri Denemark), + configure: Define program name if not found (Michal Privoznik), + virsh: Enhance list command to ease creation of shell scripts (Peter Krempa), + vmware: implement domainXMLFromNative (Jean-Baptiste Rouault), + esx: Correctly disable HTTP Expect header usage of libcurl (Matthias Bolte), + caps: Improve error if passed an unknown arch (Cole Robinson), + spec: use ix86 macros (Peter Robinson), + nwfilter: improved logging during driver initialization (Stefan Berger), + storage: Allow runtime detection of scrub (Michal Privoznik), + Fix build with polkit0 (Jim Fehlig), + python: Expose virDomain{G,S}etInterfaceParameters APIs in python binding (Alex Jia), + conf: rename virDomainNetGetActualDirectVirtPortProfile (Laine Stump), + qemu: increase the timeout before sending SIGKILL to qemu process (Laine Stump), + qemu: drop driver lock while trying to terminate qemu process (Laine Stump), + qemu: Implement DomainPMSuspendForDuration (Michal Privoznik), + qemu: Set capabilities based on supported monitor commands (Michal Privoznik), + Install API XML desc to a standard location (Daniel P. Berrange), + qemu: make block io tuning smarter (Eric Blake) </li> - <li> Cleanups: - Fix typos and spacing in messages. (Yuri Chornoivan), - qemu: eliminate nested switch, simplify code (Laine Stump), - Fix typo in previous patch (Daniel P. Berrange), - build: drop obsolete qparams test (Eric Blake), - build: drop a painfully long gnulib test (Eric Blake), - Removed more AMD-specific features from cpu64-rhel* models (Martin Kletzander), - conf: eliminate redundant VIR_ALLOC of 1st element of network DNS hosts. (Laine Stump), - remove daemon/probes.h from .gitignore (Laine Stump), - sanlock: Fix condition left crippled while debugging (Peter Krempa), - qemu: Fix indention (Osier Yang), - daemon: Remove deprecated HAL from init script dependencies (Peter Krempa), - util: remove unneeded #include in virrandom.c (Laine Stump), - util: wrap virnetlink.c to 80 columns (Laine Stump), - Fixed service handling in specfile (Martin Kletzander) + <li> Cleanups: + Fix typos and spacing in messages. (Yuri Chornoivan), + qemu: eliminate nested switch, simplify code (Laine Stump), + Fix typo in previous patch (Daniel P. Berrange), + build: drop obsolete qparams test (Eric Blake), + build: drop a painfully long gnulib test (Eric Blake), + Removed more AMD-specific features from cpu64-rhel* models (Martin Kletzander), + conf: eliminate redundant VIR_ALLOC of 1st element of network DNS hosts. (Laine Stump), + remove daemon/probes.h from .gitignore (Laine Stump), + sanlock: Fix condition left crippled while debugging (Peter Krempa), + qemu: Fix indention (Osier Yang), + daemon: Remove deprecated HAL from init script dependencies (Peter Krempa), + util: remove unneeded #include in virrandom.c (Laine Stump), + util: wrap virnetlink.c to 80 columns (Laine Stump), + Fixed service handling in specfile (Martin Kletzander) </li> </ul> -- 1.7.8.5

3 4

[libvirt] sysctl variables, FreeBSD
by Jason Helfman 04 Apr '12

04 Apr '12

Is there a method that can be used to remove the sysctl tuning for FreeBSD in the pipeline? Here are the current patches I have, but would like to remove: http://www.freebsd.org/cgi/cvsweb.cgi/ports/devel/libvirt/files/ Thanks! Jason

2 3

[libvirt] [PATCH 0/8] Refactor libvirt RPM to allow fine grained installed
by Daniel P. Berrange 04 Apr '12

04 Apr '12

This is an update of the patch DV reverted from GIT https://www.redhat.com/archives/libvir-list/2012-March/msg01332.html At the end of this series we have the following RPMs with files The daemon itself (if %with_libvirtd == 1 - ie skipped for %client_only builds) - libvirt-daemon - just libvirtd daemon & secondary drivers (storage, network, nwfilter, etc) Two optional config file packages (if %with_libvirtd == 1): - libvirt-daemon-config-network - just the network driver default config - libvirt-daemon-config-nwfilter - just the nwfilter default config Four hypervisor driver packages (%with_driver_modules == 1, now on by default) - libvirt-daemon-driver-qemu - libvirt_driver_qemu.so + related driver files - libvirt-daemon-driver-lxc - libvirt_driver_lxc.so + related driver files - libvirt-daemon-driver-uml - libvirt_driver_uml.so + related driver files - libvirt-daemon-driver-xen - libvirt_driver_{xen,libxl}.so + related driver files Other non-daemon packages always enabled - libvirt-client - libvirt.so + virsh - libvirt-devel - libvirt header files & libraries - libvirt-python - libvirt python module - libvirt-docs - API docs and website docs Finally there are a handful of virtual empty packages To preserve the existing upgrade path & avoid breaking existing app dependancies: - libvirt - Depends libvirt-daemon, libvirt-client, libvirt-daemon-config-* and libvirt-daemon-driver-*. To allow applications to depend on specific libvirt drivers: - libvirt-daemon-qemu - Depends on libvirt-daemon, libvirt-daemon-driver-qemu & qemu - libvirt-daemon-kvm - Depends on libvirt-daemon, libvirt-daemon-driver-qemu & qemu-kvm - libvirt-daemon-lxc - Depends on libvirt-daemon, libvirt-daemon-driver-lxc - libvirt-daemon-uml - Depends on libvirt-daemon, libvirt-daemon-driver-uml - libvirt-daemon-xen - Depends on libvirt-daemon, libvirt-daemon-driver-xen & xen The result is: - To install everything (daemon, all drivers, all configs) yum install libvirt - To install just KVM with no configs yum install libvirt-daemon-kvm - To install KVM + default configs yum install libvirt-daemon-kvm libvirt-daemon-config-network libvirt-daemon-config-nwfilter The problems solved are - Can install libvirtd without the default configs which many apps don't want and causing death to networking if installed inside a guest - Applications don't need to know about the underlying hypervisor package names - libvirt pulls in the correct packages - Applications can install KVM without pulling in Xen libraries

2 19

[libvirt] [PATCH] virsh: Clarify escape sequence
by Michal Privoznik 03 Apr '12

03 Apr '12

Currently, we put no strains on escape sequence possibly leaving users with console that cannot be terminated. However, not all ASCII characters can be used as escape sequence. Only those falling in @ - _ can be; implement and document this constraint. --- tools/console.c | 3 ++- tools/virsh.c | 13 ++++++++++++- tools/virsh.pod | 3 ++- 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/tools/console.c b/tools/console.c index ca226c3..0f30b95 100644 --- a/tools/console.c +++ b/tools/console.c @@ -34,6 +34,7 @@ # include <errno.h> # include <unistd.h> # include <signal.h> +# include <c-ctype.h> # include "internal.h" # include "console.h" @@ -292,7 +293,7 @@ static char vshGetEscapeChar(const char *s) { if (*s == '^') - return CONTROL(s[1]); + return CONTROL(c_islower(s[1]) ? c_toupper(s[1]) : s[1]); return *s; } diff --git a/tools/virsh.c b/tools/virsh.c index 1ed2dda..cfdd040 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -19879,6 +19879,16 @@ vshShowVersion(vshControl *ctl ATTRIBUTE_UNUSED) vshPrint(ctl, "\n"); } +static bool +vshAllowedEscapeChar(char c) +{ + /* Allowed escape characters: + * a-z A-Z @ [ \ ] ^ _ + */ + return ('a' <= c && c <= 'z') || + ('@' <= c && c <= '_'); +} + /* * argv[]: virsh [options] [command] * @@ -19942,7 +19952,8 @@ vshParseArgv(vshControl *ctl, int argc, char **argv) case 'e': len = strlen(optarg); - if ((len == 2 && *optarg == '^') || + if ((len == 2 && *optarg == '^' && + vshAllowedEscapeChar(optarg[1])) || (len == 1 && *optarg != '^')) { ctl->escapeChar = optarg; } else { diff --git a/tools/virsh.pod b/tools/virsh.pod index d4971a3..a60e667 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -95,7 +95,8 @@ Output elapsed time information for each command. =item B<-e>, B<--escape> I<string> Set alternative escape sequence for I<console> command. By default, -telnet's B<^]> is used. +telnet's B<^]> is used. Allowed characters when using hat notation are: +alphabetic character, @, [, ], \, ^, _. =back -- 1.7.8.5

3 3

[libvirt] [PATCH 00/10] Enable loadable modules for libvirtd
by Daniel P. Berrange 03 Apr '12

03 Apr '12

For a long timer we've had the ability to build each libvirt driver as a loadable module. We have never used this by default and as a result it constantly bit-rots. This series fixes various bugs, and then enables it by default in configure. It also makes the PRMs use the loadable modules, adding new new sub-RPMs for each module. We can now finally install minimal libvirt binaries for each hypervisor. ie yum install libvirt-kvm will not pull in Xen libraries!

3 22

[libvirt] Need Help To Destroy Virtual Machines
by Ali Raza Memon 03 Apr '12

03 Apr '12

Hello...! I am using libvirt-php for controlling my xen virtual machines. For this I have installed libvirt-php along with xampp server. Now I need to create a web based controll panel application which shows me running vms, and some options like Shutdown, Pause, Create, Destroy. My aim is, when I click Destroy button the selected vm should be destroyed. For this I have used the following php-script: <?php $conn=libvirt_connect("xen:///"); $name=libvirt_domain_lookup_by_id($conn,4); // Here '4' is the id of my running vm $dest=libvirt_domain_destroy($name); echo $dest; ?> When I execute this it shows me following warning: Warning: libvirt_domain_destroy() [function.libvirt-domain-destroy]: operation virDomainDestroy forbidden for read only access in /opt/lampp/htdocs/xampp/xen/test.php on line 5 So, Could you please help me to solve this? ! Thank You !

2 1

[libvirt] I need help for use virDomainInterfaceStats
by Фёдор Пранович 03 Apr '12

03 Apr '12

Hi I want use the virDomainInterfaceStats for get statistic of domain, but I don't now how get path parametr. Please help me! Thanks.

4 3

[libvirt] is it possible to set txqueuelen on vnetX devices automatically
by Tim Hughes 03 Apr '12

03 Apr '12

Hello, We have been tuning our libvirt hosts and discovered that setting the txqueuelen on vnetX devices to 2500 we can increase the network throughput by a factor of almost 10. On an eth device it can be set by hand/rc.local with the following instructions http://www.cyberciti.biz/faq/gentoo-centos-rhel-debian-fedora-increasing-tx… . Because vnetX devices are named on a 'first free' basis and they come and go with the guests the rc.local method is not going to work. I think this needs to be done via libvirt or possibly udev, maybe with some kind of hook. Ideally I would like to be able to set this automatically for all vnetX devices when they are created or even better, on a per guest basis. Tim Hughes mailto:thughes@thegoldfish.org

2 3

[libvirt] [PATCH] Refactor the libvirt RPM daemon pieces
by Daniel P. Berrange 03 Apr '12

03 Apr '12

From: "Daniel P. Berrange" <berrange(a)redhat.com> There are a number of flaws with our packaging of the libvirtd daemon: - Installing 'libvirt' does not install 'qemu-kvm' or 'xen' etc which are required to actually run the hypervisor in question - Installing 'libvirt' pulls in the default configuration files which may not be wanted & cause problems if installed inside a guest - It is not possible to explicitly required all the peices required to manage a specific hypervisor This change takes the 'libvirt' RPM and and changes it thus - libvirt: just a virtual package with dep on libvirt-daemon, libvirt-daemon-config-network & libvirt-daemon-config-nwfilter - libvirt-daemon: the libvirt daemon and related pieces - libvirt-daemon-config-network: the default network config - libvirt-daemon-config-nwfilter: the network filter configs - libvirt-docs: the website HTML We then introduce some more virtual (empty) packages - libvirt-daemon-qemu: Deps on libvirt-daemon & 'qemu' - libvirt-daemon-kvm: Deps on libvirt-daemon & 'qemu-kvm' - libvirt-daemon-lxc: Deps on libvirt-daemon - libvirt-daemon-uml: Deps on libvirt-daemon - libvirt-daemon-xen: Deps on libvirt-daemon & 'xen' - libvirt-qemu: Deps on libvirt-daemon-qemu & libvirt-daemon-config-{network,nwfilter} - libvirt-kvm: Deps on libvirt-daemon-kvm & libvirt-daemon-config-{network,nwfilter} - libvirt-lxc: Deps on libvirt-daemon-lxc & libvirt-daemon-config-{network,nwfilter} - libvirt-uml: Deps on libvirt-daemon-uml & libvirt-daemon-config-{network,nwfilter} - libvirt-xen: Deps on libvirt-daemon-xen & libvirt-daemon-config-network My intent in the future is to turn on the driver modules by default, at which time 'libvirt-daemon' will cease to include any specific drivers, instead we'll get libvirt-daemon-driver-XXXX packages for each driver. The libvirt-daemon-XXX packages will then pull in each driver that they require. It is recommended that applications required a locally installed libvirtd daemon, use either 'Requires: libvirt-daemon-XXXX' or 'Requires: libvirt-XXX' and *not* "Requires: libvirt-daemon" or 'Requires: libvirt' * libvirt.spec.in: Refactor RPMs * docs/packaging.html.in, docs/sitemap.html.in: Document new RPM split rationale --- docs/packaging.html.in | 106 ++++++++++ docs/sitemap.html.in | 4 + libvirt.spec.in | 512 +++++++++++++++++++++++++++++++++++++----------- 3 files changed, 505 insertions(+), 117 deletions(-) create mode 100644 docs/packaging.html.in In v2: - Split libvirt-daemon-configs into libvirt-daemon-config-network and libvirt-daemon-config-nwfilter - Fix ordering of QEMU/KVM bits - Don't install nwfilter configs if the driver is turned off - Enable nwfilter for LXC/UML drivers explicitly, not just KVM - Fix docs typos - Make all %files sections conditional Tested build on F17 and RHEL-6.3 diff --git a/docs/packaging.html.in b/docs/packaging.html.in new file mode 100644 index 0000000..0adffd3 --- /dev/null +++ b/docs/packaging.html.in @@ -0,0 +1,106 @@ +<?xml version="1.0"?> +<html> + <body> + <h1>Distribution packaging</h1> + + <ul id="toc"></ul> + + + This page describes the rationale behind the libvirt distribution +packaging in RPM format. The RPM specfile provided with libvirt targets +all Fedora and RHEL releases. It is split up into a number of sub-RPMs +in order to facilitate minimal installations, targetting specific +feature sets. + + + <h2><a name="real">Real packages</a></h2> + + + The so called "real" packages provide the actual file payloads + related to libvirt. If very specific / targetted functionality + is required, then applications can depend on one or more of these + real packages. + + + <dl> + <dt>libvirt-client</dt> + <dd>This package provides the main libvirt.so library along with + the virsh command line tool. If a C based application only wants + to be able to manage remote hypervisors, this is all that they + need depend on</dd> + <dt>libvirt-devel</dt> + <dd>This package provides the header files and libraries required + to compile and link C applications using libvirt</dd> + <dt>libvirt-python</dt> + <dd>This package provides the Python binding to the C libraries. + It will pull in the libvirt-client RPM. If a Python application + only wants to be able to manage remote hypervisors, this is all + that they need depend on</dd> + <dt>libvirt-daemon</dt> + <dd>This package provides server side libvirtd daemon, which is + required in order to manage any stateful hypervisors (currently + QEMU, KVM, Xen, LXC and UML).</dd> + <dt>libvirt-daemon-config-network</dt> + <dd>This package provides the standard configuration files for + setting up a NAT based network</dd> + <dt>libvirt-daemon-config-nwfilter</dt> + <dd>This package provides the standard configuration files for + network filter rules for ensuring clean VM traffic.</dd> + </dl> + + <h2><a name="virtual">Virtual packages</a></h2> + + + The virtual packages provide convenient targets for application dependencies to + pull in functionality related to specific hypervisors. Since the packaging of + the <code>libvirt-daemon</code> RPM is expected to change in the future to split + each hypervisor driver out into a separate RPM, applications are strongly + recommended to depend on one of the following virtual packages, instead of + depending directly on <code>libvirt-daemon</code> + + + <dl> + <dt>libvirt</dt> + <dd>This package, simply pulls in every single other server side RPM. + If an application wants to ensure all possible libvirt drivers are installed, + this is what they should depend on</dd> + + <dt>libvirt-daemon-qemu</dt> + <dd>This package pulls in the server side daemon, drivers and the QEMU TCG binaries + required to provide emulation of non-native architectures</dd> + <dt>libvirt-daemon-kvm</dt> + <dd>This package pulls in the server side daemon, drivers and the KVM binaries + required to provide hardware accelerated virtualization of the native + architectures</dd> + <dt>libvirt-daemon-lxc</dt> + <dd>This package pulls in the server side daemon and drivers required to + run native Linux containers</dd> + <dt>libvirt-daemon-uml</dt> + <dd>This package pulls in the server side daemon and drivers required to + run User Mode Linux. The application must still provide the actual + UML binary kernels</dd> + <dt>libvirt-daemon-xen</dt> + <dd>This package pulls in the server side daemon and drivers required to + run guests on the Xen hypervisor.</dd> + + <dt>libvirt-qemu</dt> + <dd>This package pulls in the server side daemon, drivers and the QEMU TCG binaries + required to provide emulation of non-native architectures</dd> + <dt>libvirt-kvm</dt> + <dd>This package pulls in the server side daemon, drivers and the KVM binaries + required to provide hardware accelerated virtualization of the native + architectures</dd> + <dt>libvirt-lxc</dt> + <dd>This package pulls in the server side daemon, drivers and default + configuration files required to run native Linux containers</dd> + <dt>libvirt-uml</dt> + <dd>This package pulls in the server side daemon, drivers and default + configuration files required to run User Mode Linux. The application + must still provide the actual UML binary kernels</dd> + <dt>libvirt-xen</dt> + <dd>This package pulls in the server side daemon, drivers and default + configuration files required to run guests on the Xen hypervisor.</dd> + </dl> + + </body> +</html> diff --git a/docs/sitemap.html.in b/docs/sitemap.html.in index 1de2b20..620c989 100644 --- a/docs/sitemap.html.in +++ b/docs/sitemap.html.in @@ -84,6 +84,10 @@ <a href="hooks.html">Hooks</a> Hooks for system specific management </li> + <li> + <a href="packaging.html">Distribution packaging</a> + Rationale for distribution RPM packaging + </li> </ul> </li> <li> diff --git a/libvirt.spec.in b/libvirt.spec.in index 67f1c33..8730881 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -52,6 +52,14 @@ %define with_libxl 0%{!?_without_libxl:%{server_drivers}} %define with_vmware 0%{!?_without_vmware:%{server_drivers}} +%define with_qemu_tcg %{with_qemu} +# Change if we ever provide qemu-kvm binaries on non-x86 hosts +%ifarch %{ix86} x86_64 +%define with_qemu_kvm %{with_qemu} +%else +%define with_qemu_kvm 0 +%endif + # Then the hypervisor drivers that talk via a native remote protocol %define with_phyp 0%{!?_without_phyp:1} %define with_esx 0%{!?_without_esx:1} @@ -125,8 +133,10 @@ # RHEL-5 has restricted QEMU to x86_64 only and is too old for LXC %if 0%{?rhel} == 5 +%define with_qemu_tcg 0 %ifnarch x86_64 %define with_qemu 0 +%define with_qemu_kvm 0 %endif %define with_lxc 0 %endif @@ -134,8 +144,10 @@ # RHEL-6 has restricted QEMU to x86_64 only, stopped including Xen # on all archs. Other archs all have LXC available though %if 0%{?rhel} >= 6 +%define with_qemu_tcg 0 %ifnarch x86_64 %define with_qemu 0 +%define with_qemu_kvm 0 %endif %define with_xen 0 %endif @@ -206,10 +218,13 @@ %define with_storage_disk 0 %endif -%if %{with_qemu} +%if %{with_qemu} || %{with_lxc} || %{with_uml} %define with_nwfilter 0%{!?_without_nwfilter:%{server_drivers}} # Enable libpcap library %define with_libpcap 0%{!?_without_libpcap:%{server_drivers}} +%endif + +%if %{with_qemu} %define with_macvtap 0%{!?_without_macvtap:%{server_drivers}} # numad is used to manage the CPU placement dynamically, @@ -268,109 +283,22 @@ Source: http://libvirt.org/sources/libvirt-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root URL: http://libvirt.org/ -# All runtime requirements for the libvirt package (runtime requrements -# for subpackages are listed later in those subpackages) - -# The client side, i.e. shared libs and virsh are in a subpackage -Requires: %{name}-client = %{version}-%{release} - -# Used by many of the drivers, so turn it on whenever the -# daemon is present %if %{with_libvirtd} -# for modprobe of pci devices -Requires: module-init-tools -# for /sbin/ip & /sbin/tc -Requires: iproute -%if %{with_avahi} -Requires: avahi-libs -%endif -%endif +Requires: libvirt-daemon = %{version}-%{release} %if %{with_network} -Requires: dnsmasq >= 2.41 -Requires: radvd -%endif -%if %{with_network} || %{with_nwfilter} -Requires: iptables -Requires: iptables-ipv6 +Requires: libvirt-daemon-config-network = %{version}-%{release} %endif %if %{with_nwfilter} -Requires: ebtables -%endif -# needed for device enumeration -%if %{with_hal} -Requires: hal -%endif -%if %{with_udev} -Requires: udev >= 145 -%endif -%if %{with_polkit} -%if 0%{?fedora} >= 12 || 0%{?rhel} >=6 -Requires: polkit >= 0.93 -%else -Requires: PolicyKit >= 0.6 -%endif -%endif -%if %{with_storage_fs} -Requires: nfs-utils -# For mkfs -Requires: util-linux-ng -# For pool-build probing for existing pools -BuildRequires: libblkid-devel >= 2.17 -# For glusterfs -%if 0%{?fedora} >= 11 -Requires: glusterfs-client >= 2.0.1 -%endif -%endif -%if %{with_qemu} -# From QEMU RPMs -Requires: /usr/bin/qemu-img -# For image compression -Requires: gzip -Requires: bzip2 -Requires: lzop -Requires: xz -%else -%if %{with_xen} -# From Xen RPMs -Requires: /usr/sbin/qcow-create -%endif -%endif -%if %{with_storage_lvm} -# For LVM drivers -Requires: lvm2 -%endif -%if %{with_storage_iscsi} -# For ISCSI driver -Requires: iscsi-initiator-utils -%endif -%if %{with_storage_disk} -# For disk driver -Requires: parted -Requires: device-mapper -%endif -%if %{with_storage_mpath} -# For multipath support -Requires: device-mapper -%endif -%if %{with_cgconfig} -Requires: libcgroup -%endif -%ifarch %{ix86} x86_64 ia64 -# For virConnectGetSysinfo -Requires: dmidecode +Requires: libvirt-daemon-config-nwfilter = %{version}-%{release} %endif -# For service management -%if %{with_systemd} -Requires(post): systemd-units -Requires(post): systemd-sysv -Requires(preun): systemd-units -Requires(postun): systemd-units -%endif -%if %{with_numad} -Requires: numad +# XXX when we turn on driver modules, we need to add +# deps on each driver (Requires: libvirt-daemon-drv-qemu) %endif +Requires: libvirt-docs = %{version}-%{release} +Requires: libvirt-client = %{version}-%{release} -# All build-time requirements +# All build-time requirements. Run-time requirements are +# listed against each sub-RPM %if 0%{?enable_autotools} BuildRequires: autoconf BuildRequires: automake @@ -537,6 +465,279 @@ Libvirt is a C toolkit to interact with the virtualization capabilities of recent versions of Linux (and other OSes). The main package includes the libvirtd server exporting the virtualization support. +%package docs +Summary: Documentation for libvirt library and daemon +Group: Development/Libraries + +%description docs +Copy of the libvirt website documentation + +%if %{with_libvirtd} +%package daemon +Summary: Server side daemon and supporting files for libvirt library +Group: Development/Libraries + +# All runtime requirements for the libvirt package (runtime requrements +# for subpackages are listed later in those subpackages) + +# The client side, i.e. shared libs and virsh are in a subpackage +Requires: %{name}-client = %{version}-%{release} + +# Used by many of the drivers, so turn it on whenever the +# daemon is present +%if %{with_libvirtd} +# for modprobe of pci devices +Requires: module-init-tools +# for /sbin/ip & /sbin/tc +Requires: iproute +%if %{with_avahi} +Requires: avahi-libs +%endif +%endif +%if %{with_network} +Requires: dnsmasq >= 2.41 +Requires: radvd +%endif +%if %{with_network} || %{with_nwfilter} +Requires: iptables +Requires: iptables-ipv6 +%endif +%if %{with_nwfilter} +Requires: ebtables +%endif +# needed for device enumeration +%if %{with_hal} +Requires: hal +%endif +%if %{with_udev} +Requires: udev >= 145 +%endif +%if %{with_polkit} +%if 0%{?fedora} >= 12 || 0%{?rhel} >=6 +Requires: polkit >= 0.93 +%else +Requires: PolicyKit >= 0.6 +%endif +%endif +%if %{with_storage_fs} +Requires: nfs-utils +# For mkfs +Requires: util-linux-ng +# For pool-build probing for existing pools +BuildRequires: libblkid-devel >= 2.17 +# For glusterfs +%if 0%{?fedora} >= 11 +Requires: glusterfs-client >= 2.0.1 +%endif +%endif +%if %{with_qemu} +# From QEMU RPMs +Requires: /usr/bin/qemu-img +# For image compression +Requires: gzip +Requires: bzip2 +Requires: lzop +Requires: xz +%else +%if %{with_xen} +# From Xen RPMs +Requires: /usr/sbin/qcow-create +%endif +%endif +%if %{with_storage_lvm} +# For LVM drivers +Requires: lvm2 +%endif +%if %{with_storage_iscsi} +# For ISCSI driver +Requires: iscsi-initiator-utils +%endif +%if %{with_storage_disk} +# For disk driver +Requires: parted +Requires: device-mapper +%endif +%if %{with_storage_mpath} +# For multipath support +Requires: device-mapper +%endif +%if %{with_cgconfig} +Requires: libcgroup +%endif +%ifarch %{ix86} x86_64 ia64 +# For virConnectGetSysinfo +Requires: dmidecode +%endif +# For service management +%if %{with_systemd} +Requires(post): systemd-units +Requires(post): systemd-sysv +Requires(preun): systemd-units +Requires(postun): systemd-units +%endif +%if %{with_numad} +Requires: numad +%endif + +%description daemon +Server side daemon required to manage the virtualization capabilities +of recent versions of Linux. Requires a hypervisor specific sub-RPM +for specific drivers. + +%if %{with_network} +%package daemon-config-network +Summary: Default configuration files for the libvirtd daemon +Group: Development/Libraries + +Requires: libvirt-daemon = %{version}-%{release} + +%description daemon-config-network +Default configuration files for setting up NAT based networking +%endif + +%if %{with_nwfilter} +%package daemon-config-nwfilter +Summary: Network filter configuration files for the libvirtd daemon +Group: Development/Libraries + +Requires: libvirt-daemon = %{version}-%{release} + +%description daemon-config-nwfilter +Network filter configuration files for cleaning guest traffic +%endif + +# XXX when we turn on driver modules, we will need to +# create daemon-drv-XXX sub-RPMs and add them as deps +# to all of the following daemon-XXX RPMs + +%if %{with_qemu_tcg} +%package daemon-qemu +Summary: Server side daemon & driver required to run QEMU guests +Group: Development/Libraries + +Requires: libvirt-daemon = %{version}-%{release} +Requires: qemu + +%description daemon-qemu +Server side daemon and driver required to manage the virtualization +capabilities of the QEMU TCG emulators + +%package qemu +Summary: Server side daemon, driver & default configs required to run QEMU guests +Group: Development/Libraries + +Requires: libvirt-daemon-qemu = %{version}-%{release} +Requires: libvirt-daemon-config-network = %{version}-%{release} +Requires: libvirt-daemon-config-nwfilter = %{version}-%{release} + +%description qemu +Server side daemon, driver and default network & firewall configs +required to manage the virtualization capabilities of QEMU. +%endif + + +%if %{with_qemu_kvm} +%package daemon-kvm +Summary: Server side daemon & driver required to run QEMU guests +Group: Development/Libraries + +Requires: libvirt-daemon = %{version}-%{release} +Requires: qemu-kvm + +%description daemon-kvm +Server side daemon and driver required to manage the virtualization +capabilities of the QEMU KVM hypervisor + +%package kvm +Summary: Server side daemon, driver & default configs required to run KVM guests +Group: Development/Libraries + +Requires: libvirt-daemon-kvm = %{version}-%{release} +Requires: libvirt-daemon-config-network = %{version}-%{release} +Requires: libvirt-daemon-config-nwfilter = %{version}-%{release} + +%description kvm +Server side daemon, driver and default network & firewall configs +required to manage the virtualization capabilities of KVM. +%endif + + +%if %{with_lxc} +%package daemon-lxc +Summary: Server side daemon & driver required to run LXC guests +Group: Development/Libraries + +Requires: libvirt-daemon = %{version}-%{release} + +%description daemon-lxc +Server side daemon and driver required to manage the virtualization +capabilities of LXC + +%package lxc +Summary: Server side daemon, driver & default configs required to run LXC guests +Group: Development/Libraries + +Requires: libvirt-daemon-lxc = %{version}-%{release} +Requires: libvirt-daemon-config-network = %{version}-%{release} +Requires: libvirt-daemon-config-nwfilter = %{version}-%{release} + +%description lxc +Server side daemon, driver and default network & firewall configs +required to manage the virtualization capabilities of LXC. +%endif + + +%if %{with_uml} +%package daemon-uml +Summary: Server side daemon & driver required to run UML guests +Group: Development/Libraries + +Requires: libvirt-daemon = %{version}-%{release} +# There are no UML kernel RPMs in Fedora/RHEL to depend on. + +%description daemon-uml +Server side daemon and driver required to manage the virtualization +capabilities of UML + +%package uml +Summary: Server side daemon, driver & default configs required to run UML guests +Group: Development/Libraries + +Requires: libvirt-daemon-uml = %{version}-%{release} +Requires: libvirt-daemon-config-network = %{version}-%{release} +Requires: libvirt-daemon-config-nwfilter = %{version}-%{release} + +%description uml +Server side daemon, driver and default network & firewall configs +required to manage the virtualization capabilities of UML. +%endif + + +%if %{with_xen} +%package daemon-xen +Summary: Server side daemon & driver required to run XEN guests +Group: Development/Libraries + +Requires: libvirt-daemon = %{version}-%{release} +Requires: xen + +%description daemon-xen +Server side daemon and driver required to manage the virtualization +capabilities of XEN + +%package xen +Summary: Server side daemon, driver & default configs required to run XEN guests +Group: Development/Libraries + +Requires: libvirt-daemon-xen = %{version}-%{release} +Requires: libvirt-daemon-config-network = %{version}-%{release} + +%description xen +Server side daemon, driver and default network & firewall configs +required to manage the virtualization capabilities of Xen. +%endif +%endif + %package client Summary: Client side library and utilities of the libvirt library Group: Development/Libraries @@ -582,7 +783,7 @@ Group: Development/Libraries Requires: sanlock >= 1.8 #for virt-sanlock-cleanup require augeas Requires: augeas -Requires: %{name} = %{version}-%{release} +Requires: %{name}-daemon = %{version}-%{release} %description lock-sanlock Includes the Sanlock lock manager plugin for the QEMU @@ -884,6 +1085,12 @@ rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/libvirtd.lxc rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/libvirtd.uml %endif +mv $RPM_BUILD_ROOT%{_datadir}/doc/libvirt-%{version} $RPM_BUILD_ROOT%{_datadir}/doc/libvirt-docs-%{version} + +%if ! %{with_nwfilter} +rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/libvirt/nwfilter +%endif + %clean rm -fr %{buildroot} @@ -898,7 +1105,8 @@ do done make check -%pre +%if %{with_libvirtd} +%pre daemon %if 0%{?fedora} >= 12 || 0%{?rhel} >= 6 # Normally 'setup' adds this in /etc/passwd, but this is # here for case of upgrades from earlier Fedora/RHEL. This @@ -910,22 +1118,9 @@ getent passwd qemu >/dev/null || \ -c "qemu user" qemu %endif -%post +%post daemon -%if %{with_libvirtd} %if %{with_network} -# We want to install the default network for initial RPM installs -# or on the first upgrade from a non-network aware libvirt only. -# We check this by looking to see if the daemon is already installed -if ! /sbin/chkconfig libvirtd && test ! -f %{_sysconfdir}/libvirt/qemu/networks/default.xml -then - UUID=`/usr/bin/uuidgen` - sed -e "s,</name>,</name>\n <uuid>$UUID</uuid>," \ - < %{_datadir}/libvirt/networks/default.xml \ - > %{_sysconfdir}/libvirt/qemu/networks/default.xml - ln -s ../default.xml %{_sysconfdir}/libvirt/qemu/networks/autostart/default.xml -fi - # All newly defined networks will have a mac address for the bridge # auto-generated, but networks already existing at the time of upgrade # will not. We need to go through all the network configs, look for @@ -991,8 +1186,8 @@ fi %endif %endif -%preun %if %{with_libvirtd} +%preun daemon %if %{with_systemd} if [ $1 -eq 0 ] ; then # Package removal, not upgrade @@ -1007,8 +1202,8 @@ fi %endif %endif -%postun %if %{with_libvirtd} +%postun daemon %if %{with_systemd} /bin/systemctl daemon-reload >/dev/null 2>&1 || : if [ $1 -ge 1 ] ; then @@ -1019,6 +1214,20 @@ fi %endif %if %{with_libvirtd} +%if %{with_network} +%post daemon-config-network +if test $1 -eq 1 && test ! -f %{_sysconfdir}/libvirt/qemu/networks/default.xml ; then + UUID=`/usr/bin/uuidgen` + sed -e "s,</name>,</name>\n <uuid>$UUID</uuid>," \ + < %{_datadir}/libvirt/networks/default.xml \ + > %{_sysconfdir}/libvirt/qemu/networks/default.xml + ln -s ../default.xml %{_sysconfdir}/libvirt/qemu/networks/autostart/default.xml +fi +%endif +%endif + + +%if %{with_libvirtd} %if %{with_systemd} %triggerun -- libvirt < 0.9.4 %{_bindir}/systemd-sysv-convert --save libvirtd >/dev/null 2>&1 ||: @@ -1064,10 +1273,19 @@ fi /bin/systemctl try-restart libvirt-guests.service >/dev/null 2>&1 || : %endif -%if %{with_libvirtd} %files %defattr(-, root, root) +%files docs +%defattr(-, root, root) +%dir %{_datadir}/doc/libvirt-docs-%{version} +%dir %{_datadir}/doc/libvirt-docs-%{version}/html +%{_datadir}/doc/libvirt-docs-%{version}/html/* + +%if %{with_libvirtd} +%files daemon +%defattr(-, root, root) + %doc AUTHORS ChangeLog.gz NEWS README COPYING.LIB TODO %dir %attr(0700, root, root) %{_sysconfdir}/libvirt/ @@ -1078,7 +1296,6 @@ fi %endif %dir %attr(0700, root, root) %{_sysconfdir}/libvirt/nwfilter/ -%{_sysconfdir}/libvirt/nwfilter/*.xml %{_sysconfdir}/rc.d/init.d/libvirtd %if %{with_systemd} @@ -1190,6 +1407,67 @@ rm -f $RPM_BUILD_ROOT%{_sysconfdir}/sysctl.d/libvirtd %{_mandir}/man8/libvirtd.8* %doc docs/*.xml + +%if %{with_network} +%files daemon-config-network +%defattr(-, root, root) +%endif + +%if %{with_nwfilter} +%files daemon-config-nwfilter +%defattr(-, root, root) +%{_sysconfdir}/libvirt/nwfilter/*.xml +%endif + +%if %{with_qemu_tcg} +%files daemon-qemu +%defattr(-, root, root) +%endif + +%if %{with_qemu_kvm} +%files daemon-kvm +%defattr(-, root, root) +%endif + +%if %{with_lxc} +%files daemon-lxc +%defattr(-, root, root) +%endif + +%if %{with_uml} +%files daemon-uml +%defattr(-, root, root) +%endif + +%if %{with_xen} +%files daemon-xen +%defattr(-, root, root) +%endif + +%if %{with_qemu_tcg} +%files qemu +%defattr(-, root, root) +%endif + +%if %{with_qemu_kvm} +%files kvm +%defattr(-, root, root) +%endif + +%if %{with_lxc} +%files lxc +%defattr(-, root, root) +%endif + +%if %{with_uml} +%files uml +%defattr(-, root, root) +%endif + +%if %{with_xen} +%files xen +%defattr(-, root, root) +%endif %endif %if %{with_sanlock} -- 1.7.7.6

4 7

[libvirt] Openvswitch support - port tagging
by Daniele Milani 03 Apr '12

03 Apr '12

I was looking at the release candidate of libvirt (0.9.11-rc2) and I have not been able to understand if the openvswitch support includes the port tagging support. So my question is: is it possible to create a tagged port? How? Otherwise, would it be useful to add this functionality? Thanks, Daniele Milani

2 2

[libvirt] [PATCHv5 0/3] Xen: Fix <clock> handling
by Philipp Hahn 03 Apr '12

03 Apr '12

Before version 3.1 xen only implemented clock/@offset='utc' and 'localtime'. With the introduction of managed domains in 3.1 xend keeps track of the rtc_timeoffset, even over reboots. This translates to libvirts clock/@offset='variable' variant. Be advised that only HV domains have a RTC. In addition xen also supports a variant where the offset is tracked to 'localtime', which is currently not supported by libvirt. To make matters worse, this was somehow broken in some versions of xen and was finally fixed with version xen-3.4. The following patch set ... * adds support for handling variable offsets relative to localtime, * fixes libvirt to use clock/@offset='variable' for newer xen versions, * adapts the test suit accordingly I've tested this on CenOS5 (xend-3.0.3 + 3.1.2 hypervisor?), UCS-2.3 (xen-3.2.1), UCS-2.4 (xen-3.4.3) and UCS-3.0 (xen-4.1.2). Since v1: + fix handling of direct-PV-domains + added handling of localtime=1 + rtc_timeoffset + fixed test suite Since v2: (on feedback by Eric) + add the adjustment='reset' attribute to force the old behaviour + handle adjustment='$timeDelta' as a short-cut for the conversion to variable. + simplify error path handling + update version numbers to 0.9.11 Since v3: + Add missing offset=VARIALE for adjustment='$timeDelta' conversion. Since v4: + Rebase against v0.9.11-rc2-6-ga465031 (unmodified) Philipp Hahn (3): Support clock=variable relative to localtime Xen: Fix <clock> handling Xen: Adapt <clock> tests docs/formatdomain.html.in | 18 ++- docs/schemas/domaincommon.rng | 30 +++- src/conf/domain_conf.c | 61 +++++++- src/conf/domain_conf.h | 17 ++- src/libvirt_private.syms | 1 + src/qemu/qemu_command.c | 8 +- src/qemu/qemu_process.c | 2 +- src/xenxs/xen_sxpr.c | 167 +++++++++++++++----- src/xenxs/xen_xm.c | 123 ++++++++++++--- .../qemuxml2argv-clock-variable.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-boot-grub.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-bridge-ipaddr.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-curmem.xml | 2 +- .../sexpr2xml-disk-block-shareable.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-disk-block.xml | 2 +- .../sexpr2xml-disk-drv-blktap-qcow.xml | 2 +- .../sexpr2xml-disk-drv-blktap-raw.xml | 2 +- .../sexpr2xml-disk-drv-blktap2-raw.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-disk-file.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-autoport.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-empty-kernel.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-force-hpet.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-force-nohpet.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-kernel.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-legacy-vfb.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-localtime.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-net-ioemu.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-net-netfront.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-parallel-tcp.xml | 2 +- .../sexpr2xml-fv-serial-dev-2-ports.xml | 2 +- .../sexpr2xml-fv-serial-dev-2nd-port.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-serial-file.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-serial-null.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-serial-pipe.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-serial-pty.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-serial-stdio.xml | 2 +- .../sexpr2xml-fv-serial-tcp-telnet.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-serial-udp.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-serial-unix.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-sound-all.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-sound.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-usbmouse.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-usbtablet.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-utc.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-v2.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-net-bridged.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-net-e1000.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-net-routed.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-pci-devs.xml | 2 +- .../sexpr2xml-pv-bootloader-cmdline.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-pv-bootloader.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-pv-localtime.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-pv-vcpus.xml | 2 +- .../sexpr2xml-pv-vfb-new-vncdisplay.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-pv-vfb-new.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-pv-vfb-orig.xml | 2 +- .../sexpr2xmldata/sexpr2xml-pv-vfb-type-crash.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-pv.xml | 2 +- tests/xmconfigdata/sexpr2xml-pv-bootloader.cfg | 1 + tests/xmconfigdata/test-escape-paths.xml | 2 +- tests/xmconfigdata/test-fullvirt-force-hpet.cfg | 2 +- tests/xmconfigdata/test-fullvirt-force-hpet.xml | 2 +- tests/xmconfigdata/test-fullvirt-force-nohpet.cfg | 2 +- tests/xmconfigdata/test-fullvirt-force-nohpet.xml | 2 +- tests/xmconfigdata/test-fullvirt-localtime.xml | 2 +- tests/xmconfigdata/test-fullvirt-net-ioemu.xml | 2 +- tests/xmconfigdata/test-fullvirt-net-netfront.xml | 2 +- tests/xmconfigdata/test-fullvirt-new-cdrom.xml | 2 +- tests/xmconfigdata/test-fullvirt-old-cdrom.cfg | 2 +- tests/xmconfigdata/test-fullvirt-old-cdrom.xml | 2 +- tests/xmconfigdata/test-fullvirt-parallel-tcp.xml | 2 +- .../test-fullvirt-serial-dev-2-ports.xml | 2 +- .../test-fullvirt-serial-dev-2nd-port.xml | 2 +- tests/xmconfigdata/test-fullvirt-serial-file.xml | 2 +- tests/xmconfigdata/test-fullvirt-serial-null.xml | 2 +- tests/xmconfigdata/test-fullvirt-serial-pipe.xml | 2 +- tests/xmconfigdata/test-fullvirt-serial-pty.xml | 2 +- tests/xmconfigdata/test-fullvirt-serial-stdio.xml | 2 +- .../test-fullvirt-serial-tcp-telnet.xml | 2 +- tests/xmconfigdata/test-fullvirt-serial-tcp.xml | 2 +- tests/xmconfigdata/test-fullvirt-serial-udp.xml | 2 +- tests/xmconfigdata/test-fullvirt-serial-unix.xml | 2 +- tests/xmconfigdata/test-fullvirt-sound.xml | 2 +- tests/xmconfigdata/test-fullvirt-usbmouse.xml | 2 +- .../test-fullvirt-usbtablet-no-bus.xml | 2 +- tests/xmconfigdata/test-fullvirt-usbtablet.xml | 2 +- tests/xmconfigdata/test-fullvirt-utc.xml | 2 +- tests/xmconfigdata/test-no-source-cdrom.xml | 2 +- tests/xmconfigdata/test-paravirt-net-e1000.cfg | 1 + tests/xmconfigdata/test-paravirt-net-e1000.xml | 2 +- tests/xmconfigdata/test-paravirt-net-vifname.cfg | 1 + tests/xmconfigdata/test-paravirt-net-vifname.xml | 2 +- .../test-paravirt-new-pvfb-vncdisplay.cfg | 1 + .../test-paravirt-new-pvfb-vncdisplay.xml | 2 +- tests/xmconfigdata/test-paravirt-new-pvfb.cfg | 1 + tests/xmconfigdata/test-paravirt-new-pvfb.xml | 2 +- .../test-paravirt-old-pvfb-vncdisplay.cfg | 1 + .../test-paravirt-old-pvfb-vncdisplay.xml | 2 +- tests/xmconfigdata/test-paravirt-old-pvfb.cfg | 1 + tests/xmconfigdata/test-paravirt-old-pvfb.xml | 2 +- tests/xmconfigdata/test-paravirt-vcpu.cfg | 1 + tests/xmconfigdata/test-paravirt-vcpu.xml | 2 +- tests/xmconfigdata/test-pci-devs.xml | 2 +- tests/xml2sexprdata/xml2sexpr-boot-grub.sexpr | 1 + tests/xml2sexprdata/xml2sexpr-bridge-ipaddr.sexpr | 4 +- tests/xml2sexprdata/xml2sexpr-curmem.sexpr | 1 + .../xml2sexpr-disk-block-shareable.sexpr | 4 +- tests/xml2sexprdata/xml2sexpr-disk-block.sexpr | 4 +- .../xml2sexprdata/xml2sexpr-disk-drv-blkback.sexpr | 4 +- .../xml2sexpr-disk-drv-blktap-qcow.sexpr | 4 +- .../xml2sexpr-disk-drv-blktap-raw.sexpr | 4 +- .../xml2sexprdata/xml2sexpr-disk-drv-blktap.sexpr | 4 +- .../xml2sexpr-disk-drv-blktap2-raw.sexpr | 4 +- .../xml2sexprdata/xml2sexpr-disk-drv-blktap2.sexpr | 4 +- tests/xml2sexprdata/xml2sexpr-disk-drv-loop.sexpr | 4 +- tests/xml2sexprdata/xml2sexpr-disk-file.sexpr | 4 +- tests/xml2sexprdata/xml2sexpr-escape.sexpr | 1 + tests/xml2sexprdata/xml2sexpr-fv-force-hpet.sexpr | 1 + .../xml2sexprdata/xml2sexpr-fv-force-nohpet.sexpr | 1 + tests/xml2sexprdata/xml2sexpr-fv-kernel.sexpr | 1 + tests/xml2sexprdata/xml2sexpr-fv-localtime.sexpr | 5 +- tests/xml2sexprdata/xml2sexpr-fv-net-ioemu.sexpr | 3 +- .../xml2sexprdata/xml2sexpr-fv-net-netfront.sexpr | 3 +- .../xml2sexprdata/xml2sexpr-fv-parallel-tcp.sexpr | 1 + .../xml2sexpr-fv-serial-dev-2-ports.sexpr | 3 +- .../xml2sexpr-fv-serial-dev-2nd-port.sexpr | 1 + tests/xml2sexprdata/xml2sexpr-fv-serial-file.sexpr | 3 +- tests/xml2sexprdata/xml2sexpr-fv-serial-null.sexpr | 1 + tests/xml2sexprdata/xml2sexpr-fv-serial-pipe.sexpr | 3 +- tests/xml2sexprdata/xml2sexpr-fv-serial-pty.sexpr | 1 + .../xml2sexprdata/xml2sexpr-fv-serial-stdio.sexpr | 1 + .../xml2sexpr-fv-serial-tcp-telnet.sexpr | 1 + tests/xml2sexprdata/xml2sexpr-fv-serial-tcp.sexpr | 1 + tests/xml2sexprdata/xml2sexpr-fv-serial-udp.sexpr | 1 + tests/xml2sexprdata/xml2sexpr-fv-serial-unix.sexpr | 1 + tests/xml2sexprdata/xml2sexpr-fv-sound.sexpr | 1 + tests/xml2sexprdata/xml2sexpr-fv-usbmouse.sexpr | 1 + tests/xml2sexprdata/xml2sexpr-fv-usbtablet.sexpr | 3 +- tests/xml2sexprdata/xml2sexpr-fv-utc.sexpr | 1 + tests/xml2sexprdata/xml2sexpr-fv-v2.sexpr | 1 + tests/xml2sexprdata/xml2sexpr-fv-vncunused.sexpr | 3 +- tests/xml2sexprdata/xml2sexpr-fv.sexpr | 1 + tests/xml2sexprdata/xml2sexpr-net-bridged.sexpr | 2 +- tests/xml2sexprdata/xml2sexpr-net-e1000.sexpr | 2 +- tests/xml2sexprdata/xml2sexpr-net-routed.sexpr | 2 +- .../xml2sexprdata/xml2sexpr-no-source-cdrom.sexpr | 1 + tests/xml2sexprdata/xml2sexpr-pci-devs.sexpr | 2 +- .../xml2sexpr-pv-bootloader-cmdline.sexpr | 1 + tests/xml2sexprdata/xml2sexpr-pv-bootloader.sexpr | 4 +- tests/xml2sexprdata/xml2sexpr-pv-vcpus.sexpr | 2 +- .../xml2sexprdata/xml2sexpr-pv-vfb-new-auto.sexpr | 2 +- tests/xml2sexprdata/xml2sexpr-pv-vfb-new.sexpr | 2 +- tests/xml2sexprdata/xml2sexpr-pv-vfb-orig.sexpr | 1 + tests/xml2sexprdata/xml2sexpr-pv.sexpr | 2 +- 157 files changed, 526 insertions(+), 200 deletions(-)

2 7

[libvirt] [RFC: PATCH 00/13] live block migration via virDomainBlockCopy
by Eric Blake 03 Apr '12

03 Apr '12

This is in response to my discussion with Paolo here: https://www.redhat.com/archives/libvir-list/2012-March/msg01171.html It also picks up an old patch from Adam here (now split into two): https://www.redhat.com/archives/libvir-list/2012-January/msg00562.html Patches 1-12 are in pretty good shape, while patch 13 is still a work in progress. I can test a lot of the pieces, but still have several patches to go before I can fully test the new API. I'm posting this now to at least start some review on the earlier pieces, and to get consensus that the API and XML changes are correct. None of these patches should be applied until after 0.9.11 is released, and even then, we still want confirmation of whether upstream qemu 1.1 will include complete support for block mirroring. For anyone trying to backport this feature to 0.9.10 .so API, I've made sure that you can just omit patches 5 and 6, and that everything else will backport cleanly to give you the new feature through just the public virDomainBlockRebase() call. Adam Litke (2): blockjob: add API for async virDomainBlockJobAbort blockjob: wire up qemu async virDomainBlockJobAbort Eric Blake (11): blockjob: add new API flags blockjob: add 'blockcopy' to virsh blockjob: add virDomainBlockCopy blockjob: enhance virsh 'blockcopy' blockjob: wire up RPC for block copy blockjob: enhance xml to track mirrors across libvirtd restart blockjob: react to active block copy blockjob: expose qemu commands for mirrored storage migration blockjob: query backing file of a disk blockjob: return appropriate event and info WIP: blockjob: implement block copy for qemu docs/apibuild.py | 1 + docs/formatdomain.html.in | 11 ++ docs/schemas/domaincommon.rng | 19 +++- include/libvirt/libvirt.h.in | 50 +++++++++- include/libvirt/virterror.h | 1 + src/conf/domain_conf.c | 77 +++++++++++++++ src/conf/domain_conf.h | 14 +++ src/driver.h | 6 + src/libvirt.c | 216 +++++++++++++++++++++++++++++++++++++++-- src/libvirt_private.syms | 1 + src/libvirt_public.syms | 5 + src/qemu/qemu_capabilities.c | 3 + src/qemu/qemu_capabilities.h | 2 + src/qemu/qemu_conf.h | 1 + src/qemu/qemu_driver.c | 211 ++++++++++++++++++++++++++++++++++++++-- src/qemu/qemu_hotplug.c | 7 ++ src/qemu/qemu_monitor.c | 60 +++++++++++- src/qemu/qemu_monitor.h | 23 +++++ src/qemu/qemu_monitor_json.c | 128 ++++++++++++++++++++++-- src/qemu/qemu_monitor_json.h | 21 ++++- src/qemu/qemu_process.c | 19 ++++ src/remote/remote_driver.c | 1 + src/remote/remote_protocol.x | 13 +++- src/remote_protocol-structs | 10 ++ src/rpc/gendispatch.pl | 1 + src/util/virterror.c | 6 + tools/virsh.c | 135 ++++++++++++++++++++----- tools/virsh.pod | 33 ++++++- 28 files changed, 1007 insertions(+), 68 deletions(-) -- 1.7.7.6

1 13

[libvirt] [PATCH 0/2] use qemu's dump-guest-meory when vm uses host device
by Wen Congyang 03 Apr '12

03 Apr '12

Currently, we use migrate to dump guest's memory. There is one restriction in migrate command: the device's status should be stored in qemu because the device's status should be passed to target machine. If we passthrough a host device to guest, the device's status is stored in the real device. So migrate command will fail. We usually use dump when guest is panicked. So there is no need to store device's status in the vmcore. qemu will have a new monitor command dump-guest-memory to dump guest memory, but it doesn't support async now(it will support later when the common async API is implemented). So I use dump-guest-memory only when the guest uses host device in this patchset. Wen Congyang (2): qemu: implement qemu's dump-guest-memory qemu: try to use qemu's dump-guest-meory when vm uses host device src/qemu/qemu_domain.c | 1 + src/qemu/qemu_domain.h | 1 + src/qemu/qemu_driver.c | 42 ++++++++++++++++++++- src/qemu/qemu_monitor.c | 32 ++++++++++++++++ src/qemu/qemu_monitor.h | 13 +++++++ src/qemu/qemu_monitor_json.c | 42 +++++++++++++++++++++ src/qemu/qemu_monitor_json.h | 7 ++++ src/qemu/qemu_monitor_text.c | 83 ++++++++++++++++++++++++++++++++++++++++++ src/qemu/qemu_monitor_text.h | 7 ++++ 9 files changed, 226 insertions(+), 2 deletions(-)

2 6

[libvirt] 0.9.11 rc2, FreeBSD
by Jason Helfman 02 Apr '12

02 Apr '12

Hi, I was able to get rc2 to build on FreeBSD. Here are the buildlogs for current release of FreeBSD (9): http://lorie.secnap.net/tb/index.php?action=display_markup_log&build=9-jgh_… http://lorie.secnap.net/tb/index.php?action=display_markup_log&build=9-jgh_… -jgh -- Jason Helfman System Administrator experts-exchange.com http://www.experts-exchange.com/M_4830110.html E4AD 7CF1 1396 27F6 79DD 4342 5E92 AD66 8C8C FBA5

2 6

[libvirt] [PATCH] qemu: Start nested job in qemuDomainCheckEjectableMedia
by Jiri Denemark 02 Apr '12

02 Apr '12

Originally, qemuDomainCheckEjectableMedia was entering monitor with qemu driver lock. Commit 2067e31bf97667eab9f111b496f5e9a44e827c5b, which I made to fix that, revealed another issue we had (but didn't notice it since the driver was locked): we didn't set nested job when qemuDomainCheckEjectableMedia is called during migration. Thus the original fix I made was wrong. --- I'll try to come up with something to help avoid such issues in the future. src/qemu/qemu_driver.c | 5 ++++- src/qemu/qemu_hotplug.c | 12 +++++++----- src/qemu/qemu_hotplug.h | 4 +++- src/qemu/qemu_process.c | 2 +- 4 files changed, 15 insertions(+), 8 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 7e6d59c..dd79973 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -8816,6 +8816,7 @@ qemuDomainMigrateBegin3(virDomainPtr domain, struct qemud_driver *driver = domain->conn->privateData; virDomainObjPtr vm; char *xml = NULL; + enum qemuDomainAsyncJob asyncJob; virCheckFlags(QEMU_MIGRATION_FLAGS, NULL); @@ -8832,9 +8833,11 @@ qemuDomainMigrateBegin3(virDomainPtr domain, if ((flags & VIR_MIGRATE_CHANGE_PROTECTION)) { if (qemuMigrationJobStart(driver, vm, QEMU_ASYNC_JOB_MIGRATION_OUT) < 0) goto cleanup; + asyncJob = QEMU_ASYNC_JOB_MIGRATION_OUT; } else { if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_MODIFY) < 0) goto cleanup; + asyncJob = QEMU_ASYNC_JOB_NONE; } if (!virDomainObjIsActive(vm)) { @@ -8847,7 +8850,7 @@ qemuDomainMigrateBegin3(virDomainPtr domain, * We don't want to require them on the destination. */ - if (qemuDomainCheckEjectableMedia(driver, vm) < 0) + if (qemuDomainCheckEjectableMedia(driver, vm, asyncJob) < 0) goto endjob; if (!(xml = qemuMigrationBegin(driver, vm, xmlin, dname, diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 3b6eb9d..857b980 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -155,16 +155,18 @@ error: int qemuDomainCheckEjectableMedia(struct qemud_driver *driver, - virDomainObjPtr vm) + virDomainObjPtr vm, + enum qemuDomainAsyncJob asyncJob) { qemuDomainObjPrivatePtr priv = vm->privateData; - virHashTablePtr table; + virHashTablePtr table = NULL; int ret = -1; int i; - qemuDomainObjEnterMonitorWithDriver(driver, vm); - table = qemuMonitorGetBlockInfo(priv->mon); - qemuDomainObjExitMonitorWithDriver(driver, vm); + if (qemuDomainObjEnterMonitorAsync(driver, vm, asyncJob) == 0) { + table = qemuMonitorGetBlockInfo(priv->mon); + qemuDomainObjExitMonitorWithDriver(driver, vm); + } if (!table) goto cleanup; diff --git a/src/qemu/qemu_hotplug.h b/src/qemu/qemu_hotplug.h index 0310361..e6d7843 100644 --- a/src/qemu/qemu_hotplug.h +++ b/src/qemu/qemu_hotplug.h @@ -25,6 +25,7 @@ # define __QEMU_HOTPLUG_H__ # include "qemu_conf.h" +# include "qemu_domain.h" # include "domain_conf.h" int qemuDomainChangeEjectableMedia(struct qemud_driver *driver, @@ -32,7 +33,8 @@ int qemuDomainChangeEjectableMedia(struct qemud_driver *driver, virDomainDiskDefPtr disk, bool force); int qemuDomainCheckEjectableMedia(struct qemud_driver *driver, - virDomainObjPtr vm); + virDomainObjPtr vm, + enum qemuDomainAsyncJob asyncJob); int qemuDomainAttachPciDiskDevice(virConnectPtr conn, struct qemud_driver *driver, virDomainObjPtr vm, diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 0667a03..622739c 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -3106,7 +3106,7 @@ qemuProcessReconnect(void *opaque) if (qemuProcessFiltersInstantiate(conn, obj->def)) goto error; - if (qemuDomainCheckEjectableMedia(driver, obj) < 0) + if (qemuDomainCheckEjectableMedia(driver, obj, QEMU_ASYNC_JOB_NONE) < 0) goto error; if (qemuProcessRecoverJob(driver, obj, conn, &oldjob) < 0) -- 1.7.8.5

2 2

[libvirt] [RH-BZ #595428] 'virsh list' should output more information 'xm list'
by Maxim Sditanov 02 Apr '12

02 Apr '12

Is this new feature request still https://bugs.gentoo.org/show_bug.cgi?id=366561 actual? Because virsh still show not enough information: $./virsh -c qemu:///system list --all Id Name State ---------------------------------------------------- 1 " running - winxp shut off And it will be good idea to show more detailed information or add additional flag, something like --detail. ./virsh -c qemu:///system list --all --detailed Id Name State Memory VCPU Uptime CPU IOPS ---------------------------------- ------------------------------------------------------------- 1 " running 768M 2 3hours 5% 12.1 - winxp shut off 512M 1 --- With best wishes, Maxim Sditanov

1 0

[libvirt] call for volunteer: FLOSS weekly podcast opportunity
by Eric Blake 02 Apr '12

02 Apr '12

The FLOSS weekly podcast is interested in doing an interview about libvirt development on June 6, at 9:30am Los Angeles time (UTC-7). For more information on past podcasts, see: http://twit.tv/show/floss-weekly With prodding from Justin Clift, I have volunteered to take on the task, but the show host, Randal, prefers to have two developers per show, so I'm looking for anyone else who has developed for or with libvirt, who would be interested in sharing the opportunity. You don't have to have a lot of commits under your belt, so much as having enough active interest in the project and what it enables you to do. In fact, having someone not directly tied to Red Hat as the second contact will probably provide a nicer balance to the interview. -- Eric Blake eblake(a)redhat.com +1-919-301-3266 Libvirt virtualization library http://libvirt.org

1 0

[libvirt] [PATCH] Fix typos and spacing in messages
by Yuri Chornoivan 02 Apr '12

02 Apr '12

2 1

[libvirt] [PATCH] qemu: fix memory leak in virDomainGetVcpus
by Laine Stump 02 Apr '12

02 Apr '12

https://bugzilla.redhat.com/show_bug.cgi?id=808979 The leak is really in virProcessInfoGetAffinity, as shown in the valgrind output given in the above bug report - it calls CPU_ALLOC(), but then fails to call CPU_FREE(). This leak has existed in every version of libvirt since 0.7.5. --- src/util/processinfo.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/src/util/processinfo.c b/src/util/processinfo.c index b1b1737..af19723 100644 --- a/src/util/processinfo.c +++ b/src/util/processinfo.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2010 Red Hat, Inc. + * Copyright (C) 2009-2010, 2012 Red Hat, Inc. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -140,6 +140,7 @@ realloc: for (i = 0 ; i < maxcpu ; i++) if (CPU_ISSET_S(i, masklen, mask)) VIR_USE_CPU(map, i); + CPU_FREE(mask); # else /* Legacy method uses a fixed size cpu mask, only allows upto 1024 cpus */ cpu_set_t mask; -- 1.7.7.6

2 2

[libvirt] [PATCH] python: improve conversion validation
by Eric Blake 02 Apr '12

02 Apr '12

Laszlo Ersek pointed out that in trying to convert a long to an unsigned int, we used: long long_val = ...; if ((unsigned int)long_val == long_val) According to C99 integer promotion rules, the if statement is equivalent to: (unsigned long)(unsigned int)long_val == (unsigned long)long_val since you get an unsigned comparison if at least one side is unsigned, using the largest rank of the two sides; but on 32-bit platforms, where unsigned long and unsigned int are the same size, this comparison is always true and ends up converting negative long_val into posigive unsigned int values, rather than rejecting the negative value as we had originally intended (python longs are unbounded size, and we don't want to do silent modulo arithmetic when converting to C code). Fix this by using direct comparisons, rather than casting. * python/typewrappers.c (libvirt_intUnwrap, libvirt_uintUnwrap) (libvirt_ulongUnwrap, libvirt_ulonglongUnwrap): Fix conversion checks. --- python/typewrappers.c | 27 ++++++++++++++++++++------- 1 files changed, 20 insertions(+), 7 deletions(-) diff --git a/python/typewrappers.c b/python/typewrappers.c index af209e6..4ae3ee1 100644 --- a/python/typewrappers.c +++ b/python/typewrappers.c @@ -132,7 +132,7 @@ libvirt_intUnwrap(PyObject *obj, int *val) if ((long_val == -1) && PyErr_Occurred()) return -1; - if ((int)long_val == long_val) { + if (long_val <= INT_MAX && long_val >= INT_MIN) { *val = long_val; } else { PyErr_SetString(PyExc_OverflowError, @@ -151,7 +151,7 @@ libvirt_uintUnwrap(PyObject *obj, unsigned int *val) if ((long_val == -1) && PyErr_Occurred()) return -1; - if ((unsigned int)long_val == long_val) { + if (long_val >= 0 && long_val <= UINT_MAX) { *val = long_val; } else { PyErr_SetString(PyExc_OverflowError, @@ -183,7 +183,13 @@ libvirt_ulongUnwrap(PyObject *obj, unsigned long *val) if ((long_val == -1) && PyErr_Occurred()) return -1; - *val = long_val; + if (long_val >= 0) { + *val = long_val; + } else { + PyErr_SetString(PyExc_OverflowError, + "negative Python int cannot be converted to C unsigned long"); + return -1; + } return 0; } @@ -207,16 +213,23 @@ int libvirt_ulonglongUnwrap(PyObject *obj, unsigned long long *val) { unsigned long long ullong_val = -1; + long long llong_val; /* The PyLong_AsUnsignedLongLong doesn't check the type of * obj, only accept argument of PyLong_Type, so we check it instead. */ - if (PyInt_Check(obj)) - ullong_val = PyInt_AsLong(obj); - else if (PyLong_Check(obj)) + if (PyInt_Check(obj)) { + llong_val = PyInt_AsLong(obj); + if (llong_val < 0) + PyErr_SetString(PyExc_OverflowError, + "negative Python int cannot be converted to C unsigned long long"); + else + ullong_val = llong_val; + } else if (PyLong_Check(obj)) { ullong_val = PyLong_AsUnsignedLongLong(obj); - else + } else { PyErr_SetString(PyExc_TypeError, "an integer is required"); + } if ((ullong_val == -1) && PyErr_Occurred()) return -1; -- 1.7.1

3 3

Re: [libvirt] Start of freeze for libvirt-0.9.11 and availability of rc1
by Maxim Sditanov 01 Apr '12

01 Apr '12

2012/4/1 Maxim Sditanov <feniksa(a)rambler.ru> > 2012/4/1 Feniks Gordon Freeman <feniksa(a)rambler.ru> > >> 2012/4/1 Feniks Gordon Freeman <feniksa(a)rambler.ru> >> >>> 2012/4/1 Laine Stump <laine(a)laine.org> >>> >>>> On 03/31/2012 07:56 AM, Daniel Veillard wrote: >>>> > I just made the second release candidate >>>> > >>>> > ftp://libvirt.org/libvirt/libvirt-0.9.11-rc2.tar.gz >>>> > >>>> > along with the rpms and tagged the git tree. >>>> > >>>> > It seems to work okay in my limited testing. If all goes well I would >>>> > probably push on Tuesday, >>>> > >>>> >>>> A gentoo user reported in irc (#virt on irc.oftc.net) earlier today >>>> that >>>> builds were failing for him on a fresh checkout from git: >>>> >>>> <feniksa> hi, when i compile libvirt on my gentoo i get warning: >>>> >>>> cc1: warning: unrecognized command line option >>>> "-Wno-suggest-attribute=const" >>>> cc1: warning: unrecognized command line option >>>> "-Wno-suggest-attribute=pure" >>>> >>>> <feniksa> gcc (Gentoo 4.5.3-r2 p1.1, pie-0.4.7) 4.5.3 >>>> <feniksa> last part of conf: http://pastebin.com/gnT4Y2Ba >>>> and compile log http://pastebin.com/FcSwshzS >>>> <feniksa> laine: 2 weeks ago i didn't see this warning. Now i pull >>>> from master sources and get this warning. But, this is only because i am >>>> using gcc 4.5.3 (this is latest gcc version in gentoo OS). >>>> >>>> I haven't looked at any of this code before, but it looks to me like >>>> ql_WARN_ADD() in gnulib must not be doing the right thing, and is adding >>>> the option even though the compiler apparently doesn't support it. This >>>> probably didn't crop up before because full warnings weren't turned on >>>> in the build until March 27 in commit 851117bd. That commit does things >>>> different for builds of git trees vs. tarballs, so I don't know if this >>>> failure will affect builds of release tarballs (I asked feniksa to try a >>>> build of the rc2 tarball, but he hasn't responded yet). >>>> >>> I compiled rc2 (ftp://libvirt.org/libvirt/libvirt-0.9.11-rc2.tar.gz) Same problem present in release candidate rc2 cc1: warning: unrecognized command line option "-Wno-suggest-attribute=const" cc1: warning: unrecognized command line option "-Wno-suggest-attribute=pure" -- With best wishes, Maxim Sditanov

1 0

[libvirt] [PATCH] libvirt:qemu: fix max_balloon less than cur_balloon
by Zhou Peng 01 Apr '12

01 Apr '12

In qemuDomainGetXMLDesc, if cur_balloon is bigger than max_balloon, max_balloon should be updated too, otherwise the currentMemory is bigger than memory in dumped xml, which will produce invalid checkpoint by virsh-save. The bug appears like this below: $virsh save vm-num foo.ckp $virsh restore foo.ckp error: XML error: current memory '824320k' exceeds maximum '824288k' Signed-off-by: Zhou Peng <ailvpeng25(a)gmail.com> --- src/qemu/qemu_driver.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 0d3b0bd..96d3219 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -4485,7 +4485,13 @@ endjob: if (err < 0) goto cleanup; if (err > 0) + { vm->def->mem.cur_balloon = balloon; + if (balloon > vm->def->mem.max_balloon) + { + vm->def->mem.max_balloon = balloon; + } + } /* err == 0 indicates no balloon support, so ignore it */ } } -- 1.7.7.6

3 12

[libvirt] [PATCH] Fix client only RPM build & other misc RPM problems
by Daniel P. Berrange 31 Mar '12

31 Mar '12

From: "Daniel P. Berrange" <berrange(a)redhat.com> Pushing under build break rule - some misc problems discovered while doing the RPM refactoring * libvirt.spec.in: Remove obsolete --with-remote-pid-file arg. Add missing %{without_libxl} statement. Fix handling of docs in client only build. Put systemtap files in -client RPM instead of -daemon RPM * examples/xml/nwfilter/Makefile.am: Don't install examples if nwfilter is disabled. --- examples/xml/nwfilter/Makefile.am | 2 ++ libvirt.spec.in | 30 +++++++++--------------------- 2 files changed, 11 insertions(+), 21 deletions(-) diff --git a/examples/xml/nwfilter/Makefile.am b/examples/xml/nwfilter/Makefile.am index 12a3619..c503682 100644 --- a/examples/xml/nwfilter/Makefile.am +++ b/examples/xml/nwfilter/Makefile.am @@ -22,6 +22,7 @@ FILTERS = \ EXTRA_DIST=$(FILTERS) +if WITH_NWFILTER confdir = $(sysconfdir)/libvirt NWFILTER_DIR = "$(DESTDIR)$(sysconfdir)/libvirt/nwfilter" @@ -37,3 +38,4 @@ uninstall-local:: rm -f "$(NWFILTER_DIR)/$$f"; \ done -test -z $(shell ls $(NWFILTER_DIR)) || rmdir $(NWFILTER_DIR) +endif diff --git a/libvirt.spec.in b/libvirt.spec.in index d91653c..b787fde 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -973,6 +973,7 @@ autoreconf -if %{?_without_openvz} \ %{?_without_lxc} \ %{?_without_vbox} \ + %{?_without_libxl} \ %{?_without_xenapi} \ %{?_without_sasl} \ %{?_without_avahi} \ @@ -1008,8 +1009,7 @@ autoreconf -if %{with_packager_version} \ --with-qemu-user=%{qemu_user} \ --with-qemu-group=%{qemu_group} \ - %{init_scripts} \ - --with-remote-pid-file=%{_localstatedir}/run/libvirtd.pid + %{init_scripts} make %{?_smp_mflags} gzip -9 ChangeLog @@ -1059,16 +1059,6 @@ rm -f $RPM_BUILD_ROOT%{_datadir}/augeas/lenses/tests/test_libvirtd_lxc.aug rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/libvirt-python-%{version} %endif -%if %{client_only} -rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/libvirt-%{version} -%endif - -%if ! %{with_libvirtd} -rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/libvirt/nwfilter -mv $RPM_BUILD_ROOT%{_datadir}/doc/libvirt-%{version}/html \ - $RPM_BUILD_ROOT%{_datadir}/doc/libvirt-devel-%{version}/ -%endif - %if ! %{with_qemu} rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/libvirt/qemu.conf rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/libvirtd.qemu @@ -1081,11 +1071,8 @@ rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/libvirtd.lxc rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/libvirtd.uml %endif -mv $RPM_BUILD_ROOT%{_datadir}/doc/libvirt-%{version} $RPM_BUILD_ROOT%{_datadir}/doc/libvirt-docs-%{version} - -%if ! %{with_nwfilter} -rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/libvirt/nwfilter -%endif +mv $RPM_BUILD_ROOT%{_datadir}/doc/libvirt-%{version} \ + $RPM_BUILD_ROOT%{_datadir}/doc/libvirt-docs-%{version} %clean rm -fr %{buildroot} @@ -1305,10 +1292,6 @@ fi %else rm -f $RPM_BUILD_ROOT%{_sysconfdir}/sysctl.d/libvirtd %endif -%if %{with_dtrace} -%{_datadir}/systemtap/tapset/libvirt_probes.stp -%{_datadir}/systemtap/tapset/libvirt_functions.stp -%endif %dir %attr(0700, root, root) %{_localstatedir}/log/libvirt/qemu/ %dir %attr(0700, root, root) %{_localstatedir}/log/libvirt/lxc/ %dir %attr(0700, root, root) %{_localstatedir}/log/libvirt/uml/ @@ -1495,6 +1478,11 @@ rm -f $RPM_BUILD_ROOT%{_sysconfdir}/sysctl.d/libvirtd %{_bindir}/virt-host-validate %{_libdir}/lib*.so.* +%if %{with_dtrace} +%{_datadir}/systemtap/tapset/libvirt_probes.stp +%{_datadir}/systemtap/tapset/libvirt_functions.stp +%endif + %dir %{_datadir}/libvirt/ %dir %{_datadir}/libvirt/schemas/ -- 1.7.7.6

1 0