- Devel - libvirt List Archives

[libvirt] [PATCH] build: force correct gcc syntax for attribute_nonnull
by Eric Blake 19 Feb '13

19 Feb '13

Gcc lets you do: int ATTRIBUTE_NONNULL(1) foo(void *param); int foo(void *param) ATTRIBUTE_NONNULL(1); int ATTRIBUTE_NONNULL(1) foo(void *param) { ... } but chokes on: int foo(void *param) ATTRIBUTE_NONNULL(1) { ... } However, since commit eefb881, we have intentionally been disabling ATTRIBUTE_NONNULL because of lame gcc handling of the attribute (that is, gcc doesn't do decent warning reporting, then compiles code that mysteriously fails if you break the contract of the attribute, which is surprisingly easy to do), leaving it on only for Coverity (which does a much better job of improved static analysis when the attribute is present). But completely eliding the macro makes it too easy to write code that uses the fourth syntax option, if you aren't using Coverity. So this patch forces us to avoid syntax errors, even when not using the attribute under gcc. It also documents WHY we disable the warning under gcc, rather than forcing you to find the commit log. * src/internal.h (ATTRIBUTE_NONNULL): Expand to empty attribute, rather than nothing, when on gcc. --- src/internal.h | 17 +++++++++++++++-- 1 files changed, 15 insertions(+), 2 deletions(-) diff --git a/src/internal.h b/src/internal.h index ebc91c7..2cf4731 100644 --- a/src/internal.h +++ b/src/internal.h @@ -181,9 +181,22 @@ # endif # endif +/* gcc's handling of attribute nonnull is less than stellar - it does + * NOT improve diagnostics, and merely allows gcc to optimize away + * null code checks even when the caller manages to pass null in spite + * of the attribute, leading to weird crashes. Coverity, on the other + * hand, knows how to do better static analysis based on knowing + * whether a parameter is nonnull. Make this attribute conditional + * based on whether we are compiling for real or for analysis, while + * still requiring correct gcc syntax when it is turned off. See also + * http://gcc.gnu.org/bugzilla/show_bug.cgi?id=17308 */ # ifndef ATTRIBUTE_NONNULL -# if __GNUC_PREREQ (3, 3) && STATIC_ANALYSIS -# define ATTRIBUTE_NONNULL(m) __attribute__((__nonnull__(m))) +# if __GNUC_PREREQ (3, 3) +# if STATIC_ANALYSIS +# define ATTRIBUTE_NONNULL(m) __attribute__((__nonnull__(m))) +# else +# define ATTRIBUTE_NONNULL(m) __attribute__(()) +# endif # else # define ATTRIBUTE_NONNULL(m) # endif -- 1.7.1

2 2

[libvirt] [PATCH 0/4] interface: udev backend bond support
by Doug Goldstein 19 Feb '13

19 Feb '13

This patchset primarily aims to add support for bond devices which was lacking from the exiting code. This closes out support for all interface device types. The patchset also refactors to code to make it a bit easier to follow hopefully. Doug Goldstein (4): interface: Refactor udev bridge to helper func interface: Refactor interface vlan to helper func interface: Refactor udev backend device type id interface: add bond support to udev backend src/interface/interface_backend_udev.c | 456 ++++++++++++++++++++++++++------- 1 file changed, 359 insertions(+), 97 deletions(-) -- 1.7.12.4

2 8

[libvirt] [PATCH] qemu: pass "-1" as uid/gid for unprivileged qemu
by Guido Günther 19 Feb '13

19 Feb '13

so we don't try to change uid/git to 0 when probing capabilities. --- On Fri, Feb 15, 2013 at 11:20:17PM -0600, Doug Goldstein wrote: > The following error bisect's down to this commit when running out of > my local checkout for testing. > > 2013-02-16 05:16:55.102+0000: 29992: error : virCommandWait:2270 : > internal error Child process (LC_ALL=C > LD_LIBRARY_PATH=/home/cardoe/work/libvirt/src/.libs > PATH=/usr/local/bin:/usr/bin:/bin:/opt/bin:/usr/x86_64-pc-linux-gnu/gcc-bin/4.6.3:/usr/games/bin > HOME=/home/cardoe USER=cardoe LOGNAME=cardoe /usr/bin/qemu-kvm -help) > unexpected exit status 1: libvir: error : internal error cannot apply > process capabilities -1 This is due to: debug : virExec:641 : Setting child uid:gid to 0:0 with caps 0 We're trying to change capabilities even on qemu:///session. This unbreaks the libvirt-tck jenkins test suite as well. src/qemu/qemu_driver.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 23499ef..dc35b91 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -556,6 +556,8 @@ qemuStartup(bool privileged, char *membase = NULL; char *mempath = NULL; virQEMUDriverConfigPtr cfg; + uid_t run_uid = -1; + gid_t run_gid = -1; if (VIR_ALLOC(qemu_driver) < 0) return -1; @@ -707,11 +709,13 @@ qemuStartup(bool privileged, cfg->snapshotDir, cfg->user, cfg->group); goto error; } + run_uid = cfg->user; + run_gid = cfg->group; } qemu_driver->qemuCapsCache = virQEMUCapsCacheNew(cfg->libDir, - cfg->user, - cfg->group); + run_uid, + run_gid); if (!qemu_driver->qemuCapsCache) goto error; -- 1.7.10.4

2 2

[libvirt] [PATCH] Add capabilities bit for -no-kvm-pit-reinjection
by Doug Goldstein 19 Feb '13

19 Feb '13

The conversion to qemuCaps dropped the ability with qemu{,-kvm} 1.2 and newer to set the lost tick policy for the PIT. While the -no-kvm-pit-reinjection option is depreacated, it is still supported at least through 1.4, it is better to not lose the functionality. --- src/qemu/qemu_capabilities.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 51fc9dc..af52bbf 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -2284,6 +2284,7 @@ virQEMUCapsInitQMPBasic(virQEMUCapsPtr qemuCaps) virQEMUCapsSet(qemuCaps, QEMU_CAPS_NO_USER_CONFIG); virQEMUCapsSet(qemuCaps, QEMU_CAPS_NETDEV_BRIDGE); virQEMUCapsSet(qemuCaps, QEMU_CAPS_SECCOMP_SANDBOX); + virQEMUCapsSet(qemuCaps, QEMU_CAPS_NO_KVM_PIT); } -- 1.7.12.4

3 4

[libvirt] Questions about the schemas
by Gene Czarcinski 19 Feb '13

19 Feb '13

This is not in any way critical but simply trying to get a better idea of the purposes of docs/schemas/* I recently submitted a patch which needed me to look at and modify some of the schema files [adding a client-id specification to dhcp/host]. As I looked them over I wondered what the purpose was of the schemas. If you ran virt-xml-validate (which uses xmllint) and the result is that your file is not validated, then there is a problem but it is not clear just what the problem is. On the other hand, if you run virt-xml-validate and it says the your file is OK (validated), that only means that it did not find a problem but not that the file is OK. For example, the schema says it is valid to specify an IPv6 address in an IPv4 definition. The implementing software if kick it out but the schema says it is OK. Another example is the (host) name under the dhcp/host definition. The current schema says this is required but dnsmasq does not require a host-name specification [I submitted a trivial patch to make it optional]. So, if the purpose is to kick out obvious errors, this it is OK as is. If the purpose to to be definitiive, then more work needs to be done. My opinion is that the current situation is "good enough" as long as valid elements/specifications are not treated as errors. Gene

2 2

[libvirt] [PATCHv2 00/15] Permit setting capabilities for uid!=0 processes
by Laine Stump 19 Feb '13

19 Feb '13

(and also properly clear capabilities bounding set for child processes) This replaces the earlier version of the same patches: https://www.redhat.com/archives/libvir-list/2013-February/msg00446.html Many of these patches were already ACKed in the first version. If I haven't modified them (other than rebasing) I note that in the subject. Other patches have been modified based on Dan and Eric's reviews of V1. Also, since I first posted the series, we've had a talk with some kernel people who are amenable to modify the semantics of CAP_COMPROMISE_KERNEL such that it's only checked on open(), not on read or write. If this is done, we will (thankfully!) no longer need to set CAP_COMPROMISE_KERNEL for the qemu process. However, the first 14 patches in this series are still useful. Two big changes are: 1) it allows setting CAP_SYS_RAWIO when needed for generic scsi command passthrough, and 2) the bounding set of child processes will now be properly cleared (it previously wasn't, even though the code looked like it *should* have been doing so). Here is the blurb from V1's intro: There are a bunch of patches here, but each is small and single-purpose to make reviewing easier (and also so that any potential regressions can be easily bisected). The original purpose of the patches was to permit setting CAP_COMPROMISE_KERNEL for non-root qemu processes, since Fedora 18 now requires that in order for generic PCI passthrough to work (the alternative was to always run qemu as root). Although we may not actually want to do that part (if we can convince kernel people to implement CAP_COMPROMISE_KERNEL such that it's only required when *opening* the necessary sysfs file (done by libvirt), rather than for every read/write (done by qemu), then we will not need CAP_COMPROMISE_KERNEL for qemu), but that is just a couple lines in the final patch, and the rest of the series is still useful, as it make dropping/keeping caps truly work for non-root child processes - this has never before been the case. (for example, CAP_SYS_RAWIO is needed for generic scsi passthrough to work, and until now the only way to have that was to run *all* qemus as root). A bit higher level description of what I've done with all the patches: 1) remove the programmable "hook" from virExecWithHook(), since that function was only called from one place, and always with the same hook function. Rename virExecWithHook() to virExec(), and replace the call to that hook with inline code. 2) give virCommand an API to set the intended uid/gid of the command that's going to be run, and use that instead of a "user hook" where appropriate (in the process completely eliminating two hook functions). 3) Also add an API to virCommand to do the final "set the process label" step for selinux/apparmor. 4) Add a new API to the security driver (and use it from qemu) called virSecurityManagerSetChildProcessLabel() which a) is called prior to virCommandRun() rather than from a command "hook" function, b) takes a virCommand, and c) rather than immediately performing the operation (as virSecurityManagerSetProcessLabel() did), merely stores the necessary information in the virCommand so that virExec can perform the operation (setting selinux label, setuid/gid, etc) 5) make a new function combining the setting of uid/gid and maintaining of capabilities, because that is the only way you can set uid!=0 and still maintain capabilities. Use this in virExec() 6) *Finally* set the CAP_COMPROMISE_KERNEL capability unconditionally for all qemu processes. (If we really do have to do this, we may want to consider making it a qemu.conf setting). Laine Stump (15): util: eliminate generic hook from virExecWithHook util: eliminate extra args from virExec util: refactor virCommandHook into virExec and virCommandHandshakeChild util: add virCommandSetUID and virCommandSetGID util: make virSetUIDGID a NOP only when uid or gid is -1 qemu: replace exec hook with virCommandSetUID/GID in qemuCaps* qemu: replace exec hook with virCommandSetUID/GID in storage_backend build: define SECDRIVER_LIBS in Makefile.am util: add security label setting to virCommand security: add new virSecurityManagerSetChildProcessLabel API qemu: let virCommand set child process security labels/uid/gid util: drop capabilities immediately after changing uid/gid of child util: virSetUIDGIDWithCaps - change uid while keeping caps util: maintain caps when running command with uid != 0 qemu: set CAP_COMPROMISE_KERNEL so that pci passthrough works src/Makefile.am | 36 ++- src/libvirt_private.syms | 6 + src/qemu/qemu_capabilities.c | 64 ++--- src/qemu/qemu_process.c | 23 +- src/security/security_apparmor.c | 42 +++- src/security/security_dac.c | 24 +- src/security/security_driver.h | 6 +- src/security/security_manager.c | 13 +- src/security/security_manager.h | 6 +- src/security/security_nop.c | 10 +- src/security/security_selinux.c | 32 +++ src/security/security_stack.c | 20 +- src/storage/storage_backend.c | 28 +-- src/util/vircommand.c | 523 ++++++++++++++++++++------------------- src/util/vircommand.h | 12 +- src/util/virutil.c | 115 ++++++++- src/util/virutil.h | 1 + 17 files changed, 595 insertions(+), 366 deletions(-) -- 1.8.1

6 36

[libvirt] [PATCH v3 00/12] Rework storage migration
by Michal Privoznik 19 Feb '13

19 Feb '13

This patch set re-implements migration with storage for enough new qemu. Currently, you can migrate a domain to a host without need for shared storage. This is done by setting 'blk' or 'inc' attribute (representing VIR_MIGRATE_NON_SHARED_DISK and VIR_MIGRATE_NON_SHARED_INC flags respectively) of 'migrate' monitor command. However, the qemu implementation is buggy and applications are advised to switch to new impementation which, moreover, offers some nice features, like migrating only explicitly specified disks. The new functionality is controlled via 'nbd-server-*' and 'drive-mirror' commands. The flow is meant to look like this: 1) User invokes libvirt's migrate functionality. 2) libvirt checks that no block jobs are active on the source. 3) libvirt starts the destination QEMU and sets up the NBD server using the nbd-server-start and nbd-server-add commands. 4) libvirt starts drive-mirror with a destination pointing to the remote NBD server, for example nbd:host:port:exportname=diskname (where diskname is the -drive id specified on the destination). 5) once all mirroring jobs reach steady state, libvirt invokes the migrate command. 6) once migration completed, libvirt invokes the nbd-server-stop command on the destination QEMU. If we just skip the 2nd step and there is an active block-job, qemu will fail in step 4. No big deal. Since we try to NOT break migration and keep things compatible, this feature is enabled iff both sides support it. Since there's obvious need for some data transfer between src and dst, I've put it into qemuCookieMigration: 1) src -> dest: (QEMU_MIGRATION_PHASE_BEGIN3 -> QEMU_MIGRATION_PHASE_PREPARE) <nbd> <disk target='vda' size='15032385536'/> <disk target='vdb' size='11534336'/> <disk target='vdc' size='13631488'/> </nbd> The source is telling the destination it supports the NBD feature. Moreover, which disks are to be transferred and what are their sizes. That's because disks needs to be fully allocated (even qcow) for successful transfer. 2) dst -> src: (QEMU_MIGRATION_PHASE_PREPARE -> QEMU_MIGRATION_PHASE_PERFORM3) <nbd port='5901'/> The destination is confirming it does support NBD as well. All disks were pre-created and NBD server is listening on given port (5901 in this case). If either src or dst doesn't support NBD, it is not used and whole process falls back to old implementation. diff to v1: -Eric's and Daniel's suggestions worked in. To point out the bigger ones: don't do NBD style when TUNNELLED requested, added 'b:writable' to 'nbd-server-add' -drop '/qemu-migration/nbd/disk/@src' attribute from migration cookie. As pointed out by Jirka, disk->src can be changed during migration (e.g. by migration hook or by passed xml). So I've tried (as suggested on the list) passing disk alias. However, since qemu hasn't been started on destination yet, the aliases hasn't been generated yet. So we have to rely on ordering completely. diff to v2: -rebase to reflect changes made by offline migration patch -send initial nbd cookie only if needed diff to v2.1: -nbd cookie reworked -don't rely on disk ordering in the cookie, but use disk target for that -adapt to virPortAllocator -unlink pre-created storage on migration fail -other of Jirka's suggestions worked in Michal Privoznik (12): qemu: Introduce NBD_SERVER capability Introduce NBD migration cookie qemu: Introduce nbd-server-start command qemu: Introduce nbd-server-add command qemu: Introduce nbd-server-stop command qemu_migration: Introduce qemuMigrationStartNBDServer() qemu_migration: Introduce qemuMigrationDriveMirror qemu_domain: Introduce qemuDomainGetDiskBlockInfo qemu_migration: Check size prerequisites qemu_migration: Stop NBD server at Finish phase qemu_migration: Cancel running jobs on failed migration qemu_migration: Unlink pre-created storage on error src/qemu/qemu_capabilities.c | 4 +- src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_domain.c | 157 ++++++++- src/qemu/qemu_domain.h | 7 + src/qemu/qemu_driver.c | 124 +------ src/qemu/qemu_migration.c | 769 ++++++++++++++++++++++++++++++++++++++++++- src/qemu/qemu_monitor.c | 63 ++++ src/qemu/qemu_monitor.h | 7 + src/qemu/qemu_monitor_json.c | 102 ++++++ src/qemu/qemu_monitor_json.h | 7 + src/qemu/qemu_process.c | 13 + 11 files changed, 1118 insertions(+), 136 deletions(-) -- 1.8.0.2

2 18

[libvirt] [test-API][PATCH] Add 7 memory API related cases
by Wayne Sun 19 Feb '13

19 Feb '13

add 7 new cases using domain memory related API add 1 conf for domain memory testing 7 new cases are: memory_params_config: test set memory params with config flag memory_params_live: test set memory params with live flag memory_peek: test memory peek memory_stats: test get memory stats set_maxmem_config: test set maximum memory with config flag set_memory_config: test set current memory with config flag set_memory_live: test set current memory with live flag memory hotplug is not supported yet, so live set max memory case is not added. Signed-off-by: Wayne Sun <gsun(a)redhat.com> --- cases/domain_memory_test.conf | 99 +++++++++++++++++++++++++++++++ repos/domain/memory_params_config.py | 96 ++++++++++++++++++++++++++++++ repos/domain/memory_params_live.py | 109 +++++++++++++++++++++++++++++++++++ repos/domain/memory_peek.py | 48 +++++++++++++++ repos/domain/memory_stats.py | 65 +++++++++++++++++++++ repos/domain/set_maxmem_config.py | 59 +++++++++++++++++++ repos/domain/set_memory_config.py | 94 ++++++++++++++++++++++++++++++ repos/domain/set_memory_live.py | 86 +++++++++++++++++++++++++++ 8 files changed, 656 insertions(+) create mode 100644 cases/domain_memory_test.conf create mode 100644 repos/domain/memory_params_config.py create mode 100644 repos/domain/memory_params_live.py create mode 100644 repos/domain/memory_peek.py create mode 100644 repos/domain/memory_stats.py create mode 100644 repos/domain/set_maxmem_config.py create mode 100644 repos/domain/set_memory_config.py create mode 100644 repos/domain/set_memory_live.py diff --git a/cases/domain_memory_test.conf b/cases/domain_memory_test.conf new file mode 100644 index 0000000..90879ab --- /dev/null +++ b/cases/domain_memory_test.conf @@ -0,0 +1,99 @@ +domain:install_linux_cdrom + guestname + $defaultname + guestos + $defaultos + guestarch + $defaultarch + vcpu + $defaultvcpu + memory + $defaultmem + hddriver + $defaulthd + nicdriver + $defaultnic + macaddr + 54:52:00:4a:c1:22 + +domain:balloon_memory + guestname + $defaultname + memorypair + 1024,2048 + +domain:destroy + guestname + $defaultname + +domain:memory_params_config + guestname + $defaultname + hard_limit + 0 + soft_limit + 9007199254740991 + swap_hard_limit + -1 + +domain:set_maxmem_config + guestname + $defaultname + memory + 16777216 + +domain:set_memory_config + guestname + $defaultname + memory + 1048576 + maxmem + 4194304 + +domain:start + guestname + $defaultname + +domain:memory_stats + guestname + $defaultname + +domain:memory_peek + guestname + $defaultname + +domain:memory_params_live + guestname + $defaultname + hard_limit + 25417224 + soft_limit + 9007199254740900 + swap_hard_limit + -1 + +domain:set_memory_live + guestname + $defaultname + memory + 2097152 + username + $username + password + $password + +domain:set_memory_config + guestname + $defaultname + memory + 4194304 + +domain:destroy + guestname + $defaultname + +domain:undefine + guestname + $defaultname + +options cleanup=enable diff --git a/repos/domain/memory_params_config.py b/repos/domain/memory_params_config.py new file mode 100644 index 0000000..af9781b --- /dev/null +++ b/repos/domain/memory_params_config.py @@ -0,0 +1,96 @@ +#!/usr/bin/env python +# Test set domain memory parameters with flag +# VIR_DOMAIN_AFFECT_CONFIG + +from xml.dom import minidom + +import libvirt +from libvirt import libvirtError + +from src import sharedmod + +required_params = ('guestname', 'hard_limit', 'soft_limit', 'swap_hard_limit', ) +optional_params = {} + +UNLIMITED = 9007199254740991 + +def get_memory_config(domobj, param_dict): + """get domain config memory parameters + """ + new_dict = {} + try: + guestxml = domobj.XMLDesc(2) + logger.debug("domain %s xml is :\n%s" %(domobj.name(), guestxml)) + xml = minidom.parseString(guestxml) + logger.info("get domain memory parameters in config xml") + for i in param_dict.keys(): + if xml.getElementsByTagName(i): + limit_element = xml.getElementsByTagName(i)[0] + limit = int(limit_element.childNodes[0].data) + logger.info("%s in config xml is: %s" % (i, limit)) + new_dict[i] = limit + else: + logger.info("%s is not in config xml" % i) + new_dict[i] = 0 + + except libvirtError, e: + logger.error("libvirt call failed: " + str(e)) + return False + + return new_dict + +def memory_params_config(params): + """set domain memory parameters with config flag and check + """ + global logger + logger = params['logger'] + guestname = params['guestname'] + hard_limit = int(params['hard_limit']) + soft_limit = int(params['soft_limit']) + swap_hard_limit = int(params['swap_hard_limit']) + + logger.info("the name of virtual machine is %s" % guestname) + param_dict = {'hard_limit': hard_limit, + 'soft_limit': soft_limit, + 'swap_hard_limit': swap_hard_limit + } + + for i in param_dict.keys(): + if param_dict[i] == -1: + param_dict[i] = UNLIMITED + + logger.info("the param dict for setting is %s" % param_dict) + + conn = sharedmod.libvirtobj['conn'] + + try: + domobj = conn.lookupByName(guestname) + flags = libvirt.VIR_DOMAIN_AFFECT_CONFIG + logger.info("set %s memory parameters with flag: %s" % + (guestname, flags)) + domobj.setMemoryParameters(param_dict, flags) + logger.info("set memory parameters done") + + logger.info("get %s memory parameters with flag: %s" % + (guestname, flags)) + ret = domobj.memoryParameters(flags) + logger.info("%s memory parameters is %s" % (guestname, ret)) + + if ret == param_dict: + logger.info("memory parameters is as expected") + else: + logger.error("memory parameters is not as expected") + return 1 + + ret = get_memory_config(domobj, param_dict) + if ret == param_dict: + logger.info("memory parameters is as expected in config xml") + else: + logger.error("memory parameters is not as expected in config xml") + return 1 + + except libvirtError, e: + logger.error("libvirt call failed: " + str(e)) + return 1 + + return 0 diff --git a/repos/domain/memory_params_live.py b/repos/domain/memory_params_live.py new file mode 100644 index 0000000..68a71b2 --- /dev/null +++ b/repos/domain/memory_params_live.py @@ -0,0 +1,109 @@ +#!/usr/bin/env python +# Test set domain memory parameters with flag +# VIR_DOMAIN_AFFECT_LIVE + +import os +import math +from xml.dom import minidom + +import libvirt +from libvirt import libvirtError + +from src import sharedmod + +required_params = ('guestname', 'hard_limit', 'soft_limit', 'swap_hard_limit', ) +optional_params = {} + +UNLIMITED = 9007199254740991 +CGROUP_PATH = "/cgroup/memory/libvirt/qemu" + +def get_cgroup_setting(guestname): + """get domain memory parameters in cgroup + """ + if os.path.exists(CGROUP_PATH): + cgroup_path = "%s/%s" % (CGROUP_PATH, guestname) + else: + cgroup_path = "/sys/fs%s/%s" % (CGROUP_PATH, guestname) + + f = open("%s/memory.limit_in_bytes" % cgroup_path) + hard = int(f.read()) + logger.info("memory.limit_in_bytes value is %s" % hard) + + f = open("%s/memory.soft_limit_in_bytes" % cgroup_path) + soft = int(f.read()) + logger.info("memory.soft_limit_in_bytes value is %s" % soft) + + f = open("%s/memory.memsw.limit_in_bytes" % cgroup_path) + swap = int(f.read()) + logger.info("memory.memsw.limit_in_bytes value is %s" % swap) + + new_dict = {'hard_limit': hard/1024, + 'soft_limit': soft/1024, + 'swap_hard_limit': swap/1024 + } + logger.debug("memory parameters dict get from cgroup is %s" % new_dict) + + return new_dict + +def memory_params_live(params): + """set domain memory parameters with live flag and check + """ + global logger + logger = params['logger'] + guestname = params['guestname'] + hard_limit = int(params['hard_limit']) + soft_limit = int(params['soft_limit']) + swap_hard_limit = int(params['swap_hard_limit']) + + logger.info("the name of virtual machine is %s" % guestname) + param_dict = {'hard_limit': hard_limit, + 'soft_limit': soft_limit, + 'swap_hard_limit': swap_hard_limit + } + + for i in param_dict.keys(): + if param_dict[i] == -1: + param_dict[i] = UNLIMITED + + logger.info("the param dict for setting is %s" % param_dict) + + conn = sharedmod.libvirtobj['conn'] + + try: + domobj = conn.lookupByName(guestname) + flags = libvirt.VIR_DOMAIN_AFFECT_LIVE + logger.info("get %s memory parameters with flag: %s" % + (guestname, flags)) + ret_pre = domobj.memoryParameters(flags) + logger.info("%s memory parameters is %s" % (guestname, ret_pre)) + + logger.info("set %s memory parameters with flag: %s" % + (guestname, flags)) + domobj.setMemoryParameters(param_dict, flags) + logger.info("set memory parameters done") + + logger.info("get %s memory parameters with flag: %s" % + (guestname, flags)) + ret_pos = domobj.memoryParameters(flags) + logger.info("%s memory parameters is %s" % (guestname, ret_pos)) + + if ret_pos == param_dict: + logger.info("memory parameters is as expected") + else: + logger.error("memory parameters is not as expected") + return 1 + + logger.info("check memory parameters in cgroup") + ret = get_cgroup_setting(guestname) + for i in param_dict.keys(): + if math.fabs(param_dict[i] - ret[i]) > 1: + logger.error("%s value not match with cgroup setting" % i) + return 1 + + logger.info("memory parameters is as expected in cgroup setting") + + except libvirtError, e: + logger.error("libvirt call failed: " + str(e)) + return 1 + + return 0 diff --git a/repos/domain/memory_peek.py b/repos/domain/memory_peek.py new file mode 100644 index 0000000..de1ff87 --- /dev/null +++ b/repos/domain/memory_peek.py @@ -0,0 +1,48 @@ +#!/usr/bin/env python +# Test domain memory peek + +import libvirt +from libvirt import libvirtError + +from src import sharedmod + +required_params = ('guestname', ) +optional_params = {} + +def memory_peek(params): + """domain memory peek + """ + logger = params['logger'] + guestname = params['guestname'] + + flag_dict = {'1':"VIR_MEMORY_VIRTUAL", '2':"VIR_MEMORY_PHYSICAL"} + + logger.info("the name of virtual machine is %s" % guestname) + + conn = sharedmod.libvirtobj['conn'] + + try: + domobj = conn.lookupByName(guestname) + logger.info("test memory peek API") + for flag in flag_dict.keys(): + logger.info("using flag: %s" % flag_dict[flag]) + mem = domobj.memoryPeek(0, 0, int(flag)) + if mem: + return 1 + logger.info("memory peek API works fine with flag: %s" % + flag_dict[flag]) + + logger.info("peek 8 bytes from domain memory") + for flag in flag_dict.keys(): + logger.info("using flag: %s" % flag_dict[flag]) + mem = domobj.memoryPeek(0, 8, int(flag)) + if not mem: + return 1 + logger.info("8 bytes start with 0 with flag %s is: %s" % + (flag_dict[flag], mem)) + + except libvirtError, e: + logger.error("libvirt call failed: " + str(e)) + return 1 + + return 0 diff --git a/repos/domain/memory_stats.py b/repos/domain/memory_stats.py new file mode 100644 index 0000000..5de4028 --- /dev/null +++ b/repos/domain/memory_stats.py @@ -0,0 +1,65 @@ +#!/usr/bin/env python +# Test get domain memory stats + +import libvirt +from libvirt import libvirtError + +from src import sharedmod +from utils import utils + +required_params = ('guestname', ) +optional_params = {} + +VIRSH = "virsh qemu-monitor-command" + +def get_memory_actual(guestname): + """get memory stats with virsh commands + """ + qmp_actual = -1 + cmd ="%s %s '{ \"execute\": \"query-balloon\" }'" % (VIRSH, guestname) + logger.info("check memory stats with virsh command: %s" % cmd) + ret, out = utils.exec_cmd(cmd, shell=True) + out_dict = eval(out[0]) + if out_dict.has_key('return'): + if out_dict['return'].has_key('actual'): + qmp_actual = out_dict['return']['actual'] + else: + return False + + if qmp_actual == -1: + return False + + logger.info("the memory actal is: %s" % qmp_actual) + return qmp_actual + +def memory_stats(params): + """get domain memory stats + """ + global logger + logger = params['logger'] + guestname = params['guestname'] + + logger.info("the name of virtual machine is %s" % guestname) + + conn = sharedmod.libvirtobj['conn'] + + try: + domobj = conn.lookupByName(guestname) + mem = domobj.memoryStats() + logger.info("%s memory stats is: %s" % (guestname, mem)) + ret = get_memory_actual(guestname) + if not ret: + logger.error("get memory actual with qmp command failed") + return 1 + + if ret == mem['actual']*1024: + logger.info("actual memory is equal to output of qmp command") + else: + logger.error("actual memory is not equal to output of qmp command") + return 1 + + except libvirtError, e: + logger.error("libvirt call failed: " + str(e)) + return 1 + + return 0 diff --git a/repos/domain/set_maxmem_config.py b/repos/domain/set_maxmem_config.py new file mode 100644 index 0000000..262d7b1 --- /dev/null +++ b/repos/domain/set_maxmem_config.py @@ -0,0 +1,59 @@ +#!/usr/bin/env python +# Test set domain max memory with API setMaxMemory. + +from xml.dom import minidom + +import libvirt +from libvirt import libvirtError + +from src import sharedmod + +required_params = ('guestname', 'memory', ) +optional_params = {} + +def set_maxmem_config(params): + """set domain max memory, check with config xml and + maxMemory API + """ + global logger + logger = params['logger'] + guestname = params['guestname'] + memory = int(params['memory']) + + logger.info("the name of virtual machine is %s" % guestname) + logger.info("the given max memory value is %s" % memory) + + conn = sharedmod.libvirtobj['conn'] + + try: + domobj = conn.lookupByName(guestname) + logger.info("set domain max memory as %s" % memory) + domobj.setMaxMemory(memory) + + guestxml = domobj.XMLDesc(2) + logger.debug("domain %s xml is :\n%s" %(guestname, guestxml)) + xml = minidom.parseString(guestxml) + mem = xml.getElementsByTagName('memory')[0] + maxmem = int(mem.childNodes[0].data) + logger.info("domain max memory in config xml is: %s" % maxmem) + if maxmem == memory: + logger.info("max memory in domain config xml is equal to set") + else: + logger.error("set max memory failed") + return 1 + + maxmem = domobj.maxMemory() + logger.info("max memory got by maxMemory API is: %s" % maxmem) + if maxmem == memory: + logger.info("max memory got by maxMemory API is equal to set") + else: + logger.error("set max memory failed") + return 1 + + logger.info("set max memory succeed") + + except libvirtError, e: + logger.error("libvirt call failed: " + str(e)) + return 1 + + return 0 diff --git a/repos/domain/set_memory_config.py b/repos/domain/set_memory_config.py new file mode 100644 index 0000000..c8ef6c3 --- /dev/null +++ b/repos/domain/set_memory_config.py @@ -0,0 +1,94 @@ +#!/usr/bin/env python +# Test set domain balloon memory with flag VIR_DOMAIN_AFFECT_CONFIG +# or VIR_DOMAIN_VCPU_MAXIMUM, depend on which optional param is +# given. + +from xml.dom import minidom + +import libvirt +from libvirt import libvirtError + +from src import sharedmod + +required_params = ('guestname', ) +optional_params = {'memory': 1048576, + 'maxmem': 4194304, + } +def get_memory_config(domobj): + """get domain config current memory and max memory + """ + try: + guestxml = domobj.XMLDesc(2) + logger.debug("domain %s xml is :\n%s" %(domobj.name(), guestxml)) + xml = minidom.parseString(guestxml) + + logger.info("get domain memory info in config xml") + mem = xml.getElementsByTagName('currentMemory')[0] + current = int(mem.childNodes[0].data) + logger.info("current memory in config xml is: %s" % current) + + mem = xml.getElementsByTagName('memory')[0] + max_memory = int(mem.childNodes[0].data) + logger.info("max memory in config xml is: %s" % max_memory) + + except libvirtError, e: + logger.error("libvirt call failed: " + str(e)) + return False + + return current, max_memory + +def set_memory_config(params): + """set domain memory with live flag and check + """ + global logger + logger = params['logger'] + guestname = params['guestname'] + memory = params.get('memory', None) + maxmem = params.get('maxmem', None) + + logger.info("the name of virtual machine is %s" % guestname) + if memory == None and maxmem == None: + logger.error("at least one of memory or maxmem should be provided") + return 1 + + conn = sharedmod.libvirtobj['conn'] + + try: + domobj = conn.lookupByName(guestname) + if memory: + memory = int(memory) + flags = libvirt.VIR_DOMAIN_AFFECT_CONFIG + logger.info("set domain memory as %s with flag: %s" % + (memory, flags)) + domobj.setMemoryFlags(memory, flags) + ret = get_memory_config(domobj) + if not ret: + return 1 + + if ret[0] == memory: + logger.info("set current memory succeed") + else: + logger.error("set current memory failed") + return 1 + + if maxmem: + maxmem = int(maxmem) + flags = libvirt.VIR_DOMAIN_MEM_MAXIMUM + logger.info("set domain max memory as %s with flag: %s" % + (maxmem, flags)) + domobj.setMemoryFlags(maxmem, flags) + ret = get_memory_config(domobj) + if not ret: + return 1 + + if ret[1] == maxmem: + logger.info("set max memory succeed") + else: + logger.error("set max memory failed") + return 1 + + except libvirtError, e: + logger.error("libvirt call failed: " + str(e)) + return 1 + + return 0 diff --git a/repos/domain/set_memory_live.py b/repos/domain/set_memory_live.py new file mode 100644 index 0000000..f7c77f9 --- /dev/null +++ b/repos/domain/set_memory_live.py @@ -0,0 +1,86 @@ +#!/usr/bin/env python +# Test set domain balloon memory with flag VIR_DOMAIN_AFFECT_LIVE. +# Check domain info and inside domain to get current memory value. +# The live flag only work on running domain, so test on shutoff +# domain will fail. + +import time +import math + +import libvirt +from libvirt import libvirtError + +from src import sharedmod +from utils import utils + +required_params = ('guestname', 'memory', 'username', 'password', ) +optional_params = {} + +def compare_memory(expect_memory, actual_memory): + """ comparing expected memory size with actual memory size """ + + logger.info("expected memory size is %s" % expect_memory) + logger.info("actual memory size is %s" % actual_memory) + diff = int(expect_memory) - int(actual_memory) + + if math.fabs(diff)/expect_memory < 0.05: + return 0 + else: + return 1 + +def get_current_memory(guestname, username, password): + """get domain current memory inside domain + """ + logger.debug("get the mac address of vm %s" % guestname) + mac = utils.get_dom_mac_addr(guestname) + logger.debug("the mac address of vm %s is %s" % (guestname, mac)) + ip = utils.mac_to_ip(mac, 180) + current = utils.get_remote_memory(ip, username, password) + + return current + +def set_memory_live(params): + """set domain memory with live flag and check + """ + global logger + logger = params['logger'] + params.pop('logger') + guestname = params['guestname'] + memory = int(params['memory']) + username = params['username'] + password = params['password'] + + logger.info("the name of virtual machine is %s" % guestname) + logger.info("the given memory value is %s" % memory) + + conn = sharedmod.libvirtobj['conn'] + + try: + domobj = conn.lookupByName(guestname) + logger.info("set domain memory as %s with flag: %s" % + (memory, libvirt.VIR_DOMAIN_AFFECT_LIVE)) + domobj.setMemoryFlags(memory, libvirt.VIR_DOMAIN_AFFECT_LIVE) + logger.info("get domain current memory") + time.sleep(3) + dominfo = domobj.info() + logger.debug("domain info list is: %s" % dominfo) + logger.info("domain current memory value is: %s KiB" % dominfo[2]) + if memory == dominfo[2]: + logger.info("set memory match with domain info") + else: + logger.error("set memory not match with domain info") + return 1 + + logger.info("check domain memory inside domain") + ret = get_current_memory(guestname, username, password) + if not compare_memory(memory, ret): + logger.info("set domain memory succeed") + else: + logger.error("set domain memory failed") + return 1 + + except libvirtError, e: + logger.error("libvirt call failed: " + str(e)) + return 1 + + return 0 -- 1.8.1

2 1

[libvirt] [PATCH] interface: fix udev backend use after free
by Doug Goldstein 18 Feb '13

18 Feb '13

udevIfaceListAllInterface() used the udev_device after it had its ref count decremented which results in a use after free issue. --- src/interface/interface_backend_udev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/interface/interface_backend_udev.c b/src/interface/interface_backend_udev.c index 92c35d9..2c41bde 100644 --- a/src/interface/interface_backend_udev.c +++ b/src/interface/interface_backend_udev.c @@ -359,7 +359,6 @@ udevIfaceListAllInterfaces(virConnectPtr conn, name = udev_device_get_sysname(dev); macaddr = udev_device_get_sysattr_value(dev, "address"); status = STREQ(udev_device_get_sysattr_value(dev, "operstate"), "up"); - udev_device_unref(dev); /* Filter the results */ if (status && (flags & VIR_CONNECT_LIST_INTERFACES_ACTIVE)) @@ -375,6 +374,7 @@ udevIfaceListAllInterfaces(virConnectPtr conn, } count++; } + udev_device_unref(dev); } /* Drop our refcounts */ -- 1.7.12.4

2 2

[libvirt] [PATCH] Add autogenerated lxc_protocol.[ch] to gitignore
by Doug Goldstein 18 Feb '13

18 Feb '13

/src/lxc/lxc_protocol.[ch] is autogenerated so add it to .gitignore --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index 23fdc91..16ac708 100644 --- a/.gitignore +++ b/.gitignore @@ -31,6 +31,7 @@ /COPYING /ChangeLog /GNUmakefile +/HACKING /INSTALL /NEWS /aclocal.m4 @@ -121,6 +122,7 @@ /src/lxc/lxc_monitor_dispatch.h /src/lxc/lxc_monitor_protocol.c /src/lxc/lxc_monitor_protocol.h +/src/lxc/lxc_protocol.[ch] /src/lxc/test_libvirtd_lxc.aug /src/qemu/test_libvirtd_qemu.aug /src/remote/*_client_bodies.h -- 1.7.12.4

3 4

[libvirt] [PATCH 0/5] Clean up after recent Coverity scan
by John Ferlan 18 Feb '13

18 Feb '13

This is the last round of cleanup with a few Coverity errors from the tests trees and a couple that just showed up in my recent scans within security and virsh. The commandtest still has Valgrind errors, but errors are not new to this change. After this round of Coverity changes, the only remaining Coverity warnings reported are within the gnulib tree. A few have been there all along within vasnprintf.c, while others are new with the recent gnulib update (regexec.c, regex_internal.c, and regcomp.c). Once these are submitted I will have a baseline from which I can make periodic comparisons. Since Coverity will sometimes "find" issues unrelated to recent changes, using git bisect to point the fickle finger of fate at a recent submission may not be possible. John Ferlan (5): drivermodule: Ignore coverity warning about leaked_storage commandtest: Resolve some coverity resource leaks vircommand: Remove unnecessary sa_assert virsh: Resolve possible NULL dereference security: Remove unnecessary checks for mgr == NULL src/security/security_dac.c | 6 ------ src/security/security_selinux.c | 6 ------ src/util/vircommand.c | 3 --- tests/commandtest.c | 17 ++++++++++++----- tests/virdrivermoduletest.c | 2 ++ tools/virsh.c | 4 ++-- 6 files changed, 16 insertions(+), 22 deletions(-) -- 1.7.11.7

3 20

[libvirt] [PATCH 0/2] Restore DAC labels
by Michal Privoznik 18 Feb '13

18 Feb '13

If libvirt is doing labeling on a domain startup, the original owner of files is not remembered. So later, when the domain is shutting down and re-labelling is done, we have no other option, just to fall back to 0:0. These patches are solving this issue for DAC driver. I am sending them just to know if the path I wen through is right so I don't bother with selinux if it is not. Michal Privoznik (2): conf: Add oldlabel field to virSecurityDeviceLabelDef security driver: Remember the original DAC label src/conf/domain_conf.c | 20 ++- src/conf/domain_conf.h | 1 + src/security/security_dac.c | 340 +++++++++++++++++++++++++++++++------------- 3 files changed, 260 insertions(+), 101 deletions(-) -- 1.8.0.2

3 4

[libvirt] libvirt compilation error, libvirt.so: undefined reference to `xmlParseFile'
by nasb＠ruedesrancy.org 18 Feb '13

18 Feb '13

Hi, I'm currently trying to compile libvirt 1.0.2 on my custom x86_64/uClibc environnement. Configuration goes well (./configure --prefix=/usr --without-pyton), but during make I get the following error message : CCLD libvirtd /lslbuild/svn/trunk/packages/virtualization/libvirt/libvirt-1.0.2/src/.libs/libvirt.so: undefined reference to `xmlParseFile' collect2: error: ld returned 1 exit status Looks like a -lxml2 flag missing, but configure found the correct flags according to the Makefile which contains : LIBXML_CFLAGS = -I/usr/include/libxml2 LIBXML_LIBS = -lxml2 Does anyone have an idea on what's going wrong? What other informations should I provide? Thanks, -- Eric LECAT

1 1

[libvirt] Plan for the next release
by Daniel Veillard 18 Feb '13

18 Feb '13

February is short, but we are already at more then 180 commits since 1.0.2 release, and well we ought to fix the python bindings problems of 1.0.2 in an official release, so I think this makes sense to push a new release at the end of the month. I suggest to enter freeze in a week, targetting a 1.0.3 release on the 28th or March 1st, Daniel -- Daniel Veillard | Open Source and Standards, Red Hat veillard(a)redhat.com | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | virtualization library http://libvirt.org/

1 0

[libvirt] How to catch libvirtd logs
by harryxiyou 18 Feb '13

18 Feb '13

Hi all, I start a VM with command "virsh create hlfs.xml", which fork a child process. But i am not sure how to catch this child process's logs? Could anyone give me some suggestions? Thanks in advance. -- Thanks Harry Wei

2 1

[libvirt] [PATCH] Add support for <option> tag in network config
by Pieter Hollants 18 Feb '13

18 Feb '13

This patch adds support for a new <option>-Tag in the <dhcp> block of network configs, based on a subset of the fifth proposal by Laine Stump in the mailing list discussion at https://www.redhat.com/archives/libvir-list/2012-November/msg01054.html. Any such defined option will result in a dhcp-option=<number>,"<value>" statement in the generated dnsmasq configuration file. Currently, DHCP options can be specified by number only and there is no whitelisting or blacklisting of option numbers, which should probably be added. Signed-off-by: Pieter Hollants <pieter(a)hollants.com> --- AUTHORS.in | 1 + docs/schemas/network.rng | 6 +++ docs/schemas/networkcommon.rng | 6 +++ src/conf/network_conf.c | 54 +++++++++++++++++++++ src/conf/network_conf.h | 10 ++++ src/network/bridge_driver.c | 10 ++++ tests/networkxml2xmlin/netboot-network.xml | 1 + tests/networkxml2xmlin/netboot-proxy-network.xml | 1 + tests/networkxml2xmlout/netboot-network.xml | 1 + tests/networkxml2xmlout/netboot-proxy-network.xml | 1 + 10 Dateien geändert, 91 Zeilen hinzugefügt(+) diff --git a/AUTHORS.in b/AUTHORS.in index 39fe68d..074185e 100644 --- a/AUTHORS.in +++ b/AUTHORS.in @@ -74,6 +74,7 @@ Michel Ponceau <michel.ponceau(a)bull.net> Nobuhiro Itou <fj0873gn(a)aa.jp.fujitsu.com> Pete Vetere <pvetere(a)redhat.com> Philippe Berthault <philippe.berthault(a)Bull.net> +Pieter Hollants <pieter(a)hollants.com> Saori Fukuta <fukuta.saori(a)jp.fujitsu.com> Shigeki Sakamoto <fj0588di(a)aa.jp.fujitsu.com> Shuveb Hussain <shuveb(a)binarykarma.com> diff --git a/docs/schemas/network.rng b/docs/schemas/network.rng index 09d7c73..a2ce1c9 100644 --- a/docs/schemas/network.rng +++ b/docs/schemas/network.rng @@ -293,6 +293,12 @@ </optional> </element> </optional> + <zeroOrMore> + <element name="option"> + <attribute name="number"><ref name="unsignedByte"/></attribute> + <attribute name="value"><text/></attribute> + </element> + </zeroOrMore> </element> </optional> </element> diff --git a/docs/schemas/networkcommon.rng b/docs/schemas/networkcommon.rng index 51ff759..3510928 100644 --- a/docs/schemas/networkcommon.rng +++ b/docs/schemas/networkcommon.rng @@ -173,6 +173,12 @@ </data> </define> + <define name='unsignedByte'> + <data type='integer'> + <param name="minInclusive">0</param> + <param name="maxInclusive">255</param> + </data> + </define> <define name='unsignedShort'> <data type='integer'> <param name="minInclusive">0</param> diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c index 3604ff7..9d84c7e 100644 --- a/src/conf/network_conf.c +++ b/src/conf/network_conf.c @@ -777,6 +777,45 @@ cleanup: } static int +virNetworkDHCPOptionDefParseXML(const char *networkName, + xmlNodePtr node, + virNetworkDHCPOptionDefPtr option) +{ + char *number = NULL; + int ret = -1; + + if (!(number = virXMLPropString(node, "number"))) { + virReportError(VIR_ERR_XML_ERROR, + _("Option definition in IPv4 network '%s' " + "must have number attribute"), + networkName); + goto cleanup; + } + if (number && + virStrToLong_ui(number, NULL, 10, &option->number) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Cannot parse <option> 'number' attribute")); + goto cleanup; + } + /* TODO: either whitelist numbers or blacklist numbers already occupied + * by other XML statements (eg. submask) */ + if (!(option->value = virXMLPropString(node, "value"))) { + virReportError(VIR_ERR_XML_ERROR, + _("Option definition in IPv4 network '%s' " + "must have value attribute"), + networkName); + goto cleanup; + } + + ret = 0; + +cleanup: + VIR_FREE(number); + return ret; +} + + +static int virNetworkDHCPDefParseXML(const char *networkName, xmlNodePtr node, virNetworkIpDefPtr def) @@ -837,6 +876,17 @@ virNetworkDHCPDefParseXML(const char *networkName, def->bootfile = file; def->bootserver = inaddr; VIR_FREE(server); + } else if (cur->type == XML_ELEMENT_NODE && + xmlStrEqual(cur->name, BAD_CAST "option")) { + if (VIR_REALLOC_N(def->options, def->noptions + 1) < 0) { + virReportOOMError(); + return -1; + } + if (virNetworkDHCPOptionDefParseXML(networkName, cur, + &def->options[def->noptions])) { + return -1; + } + def->noptions++; } cur = cur->next; @@ -2045,6 +2095,10 @@ virNetworkIpDefFormat(virBufferPtr buf, virBufferAddLit(buf, "/>\n"); } + for (ii = 0 ; ii < def->noptions ; ii++) { + virBufferAsprintf(buf, "<option number='%u' value='%s' />\n", + def->options[ii].number, def->options[ii].value); + } virBufferAdjustIndent(buf, -2); virBufferAddLit(buf, "</dhcp>\n"); diff --git a/src/conf/network_conf.h b/src/conf/network_conf.h index 4c634ed..14f852a 100644 --- a/src/conf/network_conf.h +++ b/src/conf/network_conf.h @@ -77,6 +77,13 @@ struct _virNetworkDHCPHostDef { virSocketAddr ip; }; +typedef struct _virNetworkDHCPOptionDef virNetworkDHCPOptionDef; +typedef virNetworkDHCPOptionDef *virNetworkDHCPOptionDefPtr; +struct _virNetworkDHCPOptionDef { + unsigned int number; + char *value; +}; + typedef struct _virNetworkDNSTxtDef virNetworkDNSTxtDef; typedef virNetworkDNSTxtDef *virNetworkDNSTxtDefPtr; struct _virNetworkDNSTxtDef { @@ -139,6 +146,9 @@ struct _virNetworkIpDef { char *tftproot; char *bootfile; virSocketAddr bootserver; + + size_t noptions; /* Zero or more additional dhcp options */ + virNetworkDHCPOptionDefPtr options; }; typedef struct _virNetworkForwardIfDef virNetworkForwardIfDef; diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index c834f83..c7c0a9e 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -926,6 +926,15 @@ networkDnsmasqConfContents(virNetworkObjPtr network, virBufferAsprintf(&configbuf, "dhcp-boot=%s\n", ipdef->bootfile); } } + + /* Any additional DHCP options? */ + if (ipdef->noptions > 0) { + for (r = 0 ; r < ipdef->noptions ; r++) { + virBufferAsprintf(&configbuf, "dhcp-option=%u,\"%s\"\n", + ipdef->options[r].number, + ipdef->options[r].value); + } + } } ipdef = (ipdef == ipv6def) ? NULL : ipv6def; } @@ -959,6 +968,7 @@ networkDnsmasqConfContents(virNetworkObjPtr network, virBufferAsprintf(&configbuf, "addn-hosts=%s\n", dctx->addnhostsfile->path); + /* Are we doing RA instead of radvd? */ if (DNSMASQ_RA_SUPPORT(caps)) { if (ipv6def) diff --git a/tests/networkxml2xmlin/netboot-network.xml b/tests/networkxml2xmlin/netboot-network.xml index ed75663..4de8976 100644 --- a/tests/networkxml2xmlin/netboot-network.xml +++ b/tests/networkxml2xmlin/netboot-network.xml @@ -9,6 +9,7 @@ <dhcp> <range start="192.168.122.2" end="192.168.122.254" /> <bootp file="pxeboot.img" /> + <option number="252" value="\n" /> </dhcp> </ip> </network> diff --git a/tests/networkxml2xmlin/netboot-proxy-network.xml b/tests/networkxml2xmlin/netboot-proxy-network.xml index ecb6738..4c5c480 100644 --- a/tests/networkxml2xmlin/netboot-proxy-network.xml +++ b/tests/networkxml2xmlin/netboot-proxy-network.xml @@ -8,6 +8,7 @@ <dhcp> <range start="192.168.122.2" end="192.168.122.254" /> <bootp file="pxeboot.img" server="10.20.30.40" /> + <option number="252" value="\n" /> </dhcp> </ip> </network> diff --git a/tests/networkxml2xmlout/netboot-network.xml b/tests/networkxml2xmlout/netboot-network.xml index b8a4d99..c3ea95a 100644 --- a/tests/networkxml2xmlout/netboot-network.xml +++ b/tests/networkxml2xmlout/netboot-network.xml @@ -9,6 +9,7 @@ <dhcp> <range start='192.168.122.2' end='192.168.122.254' /> <bootp file='pxeboot.img' /> + <option number='252' value='\n' /> </dhcp> </ip> </network> diff --git a/tests/networkxml2xmlout/netboot-proxy-network.xml b/tests/networkxml2xmlout/netboot-proxy-network.xml index e11c50b..f5f2c0d 100644 --- a/tests/networkxml2xmlout/netboot-proxy-network.xml +++ b/tests/networkxml2xmlout/netboot-proxy-network.xml @@ -8,6 +8,7 @@ <dhcp> <range start='192.168.122.2' end='192.168.122.254' /> <bootp file='pxeboot.img' server='10.20.30.40' /> + <option number='252' value='\n' /> </dhcp> </ip> </network> -- 1.7.10.4

1 0

[libvirt] [PATCH] build: fix vircommand build on mingw
by Eric Blake 17 Feb '13

17 Feb '13

CC libvirt_util_la-vircommand.lo ../../src/util/vircommand.c:2358:1: error: 'virCommandHandshakeChild' defined but not used [-Werror=unused-function] * src/util/vircommand.c (virCommandHandshakeChild): Hoist earlier, so that win32 build doesn't hit an unused forward declaration. --- Pushing under the build-breaker rule. src/util/vircommand.c | 98 +++++++++++++++++++++++++-------------------------- 1 file changed, 48 insertions(+), 50 deletions(-) diff --git a/src/util/vircommand.c b/src/util/vircommand.c index 5837fee..ee1b510 100644 --- a/src/util/vircommand.c +++ b/src/util/vircommand.c @@ -118,8 +118,6 @@ struct _virCommand { #endif }; -static int virCommandHandshakeChild(virCommandPtr cmd); - /* * virCommandFDIsSet: * @fd: FD to test @@ -332,6 +330,54 @@ prepareStdFd(int fd, int std) return 0; } +/* virCommandHandshakeChild: + * + * child side of handshake - called by child process in virExec() to + * indicate to parent that the child process has successfully + * completed its pre-exec initialization. + */ +static int +virCommandHandshakeChild(virCommandPtr cmd) +{ + char c = '1'; + int rv; + + if (!cmd->handshake) + return true; + + VIR_DEBUG("Notifying parent for handshake start on %d", + cmd->handshakeWait[1]); + if (safewrite(cmd->handshakeWait[1], &c, sizeof(c)) != sizeof(c)) { + virReportSystemError(errno, "%s", + _("Unable to notify parent process")); + return -1; + } + + VIR_DEBUG("Waiting on parent for handshake complete on %d", + cmd->handshakeNotify[0]); + if ((rv = saferead(cmd->handshakeNotify[0], &c, + sizeof(c))) != sizeof(c)) { + if (rv < 0) + virReportSystemError(errno, "%s", + _("Unable to wait on parent process")); + else + virReportSystemError(EIO, "%s", + _("libvirtd quit during handshake")); + return -1; + } + if (c != '1') { + virReportSystemError(EINVAL, + _("Unexpected confirm code '%c' from parent"), + c); + return -1; + } + VIR_FORCE_CLOSE(cmd->handshakeWait[1]); + VIR_FORCE_CLOSE(cmd->handshakeNotify[0]); + + VIR_DEBUG("Handshake with parent is done"); + return 0; +} + /* * virExec: * @cmd virCommandPtr containing all information about the program to @@ -2348,54 +2394,6 @@ void virCommandRequireHandshake(virCommandPtr cmd) cmd->handshake = true; } -/* virCommandHandshakeChild: - * - * child side of handshake - called by child process in virExec() to - * indicate to parent that the child process has successfully - * completed its pre-exec initialization. - */ -static int -virCommandHandshakeChild(virCommandPtr cmd) -{ - char c = '1'; - int rv; - - if (!cmd->handshake) - return true; - - VIR_DEBUG("Notifying parent for handshake start on %d", - cmd->handshakeWait[1]); - if (safewrite(cmd->handshakeWait[1], &c, sizeof(c)) != sizeof(c)) { - virReportSystemError(errno, "%s", - _("Unable to notify parent process")); - return -1; - } - - VIR_DEBUG("Waiting on parent for handshake complete on %d", - cmd->handshakeNotify[0]); - if ((rv = saferead(cmd->handshakeNotify[0], &c, - sizeof(c))) != sizeof(c)) { - if (rv < 0) - virReportSystemError(errno, "%s", - _("Unable to wait on parent process")); - else - virReportSystemError(EIO, "%s", - _("libvirtd quit during handshake")); - return -1; - } - if (c != '1') { - virReportSystemError(EINVAL, - _("Unexpected confirm code '%c' from parent"), - c); - return -1; - } - VIR_FORCE_CLOSE(cmd->handshakeWait[1]); - VIR_FORCE_CLOSE(cmd->handshakeNotify[0]); - - VIR_DEBUG("Handshake with parent is done"); - return 0; -} - /** * virCommandHandshakeWait: * @cmd: command to wait on -- 1.8.1.2

2 1

[libvirt] [PATCH] conf: Generate agent socket path if missing
by Michal Privoznik 17 Feb '13

17 Feb '13

It's not desired to force users imagine path for a socket they are not even supposed to connect to. On the other hand, we already have a release where the qemu agent socket path is exposed to XML, so we cannot silently drop it from there. The new path is generated in form: $LOCALSTATEDIR/lib/libvirt/qemu/$domain.agent --- This makes the qemu agent to be generated at domain startup phase. So until that, we generate XML without any path, e.g.: <channel type='unix'> <source mode='connect'/> <target type='virtio' name='org.qemu.guest_agent.0'/> <address type='virtio-serial' controller='0' bus='0' port='1'/> </channel> The other possibility is to generate path during XML parse phase, however this expose something we are lacking for years - callbacks to fill in default values for not configured ones. The aim so to make libvirt accept this snippet as valid qemu agent config: <channel type='unix'> <target type='virtio' name='org.qemu.guest_agent.0'/> </channel> src/conf/domain_conf.c | 37 ++++++++++++++++++++----------------- src/qemu/qemu_process.c | 30 ++++++++++++++++++++++++++++-- 2 files changed, 48 insertions(+), 19 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 7a2b012..6245fec 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -6038,7 +6038,10 @@ virDomainChrSourceDefParseXML(virDomainChrSourceDefPtr def, break; case VIR_DOMAIN_CHR_TYPE_UNIX: - if (path == NULL) { + /* path is not required in special case of qemu guest agent */ + if (path == NULL && + chr_def->targetType != VIR_DOMAIN_CHR_CHANNEL_TARGET_TYPE_VIRTIO && + STRNEQ(chr_def->target.name, "org.qemu.guest_agent.0")) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Missing source path attribute for char device")); goto error; @@ -6135,7 +6138,6 @@ virDomainChrDefParseXML(virCapsPtr caps, char *type = NULL; const char *nodeName; virDomainChrDefPtr def; - int remaining; bool seenTarget = false; if (!(def = virDomainChrDefNew())) @@ -6159,29 +6161,28 @@ virDomainChrDefParseXML(virCapsPtr caps, } cur = node->children; - remaining = virDomainChrSourceDefParseXML(&def->source, cur, flags, - def, ctxt, - vmSeclabels, nvmSeclabels); - if (remaining < 0) - goto error; - if (remaining) { - while (cur != NULL) { - if (cur->type == XML_ELEMENT_NODE) { - if (xmlStrEqual(cur->name, BAD_CAST "target")) { - seenTarget = true; - if (virDomainChrDefParseTargetXML(caps, vmdef, def, cur) < 0) { - goto error; - } + while (cur != NULL) { + if (cur->type == XML_ELEMENT_NODE) { + if (xmlStrEqual(cur->name, BAD_CAST "target")) { + seenTarget = true; + if (virDomainChrDefParseTargetXML(caps, vmdef, def, cur) < 0) { + goto error; } + break; } - cur = cur->next; } + cur = cur->next; } if (!seenTarget && ((def->targetType = virDomainChrDefaultTargetType(caps, vmdef, def->deviceType)) < 0)) goto cleanup; + if (virDomainChrSourceDefParseXML(&def->source, node->children, + flags, def, ctxt, + vmSeclabels, nvmSeclabels) < 0) + goto error; + if (def->source.type == VIR_DOMAIN_CHR_TYPE_SPICEVMC) { if (def->targetType != VIR_DOMAIN_CHR_CHANNEL_TARGET_TYPE_VIRTIO) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", @@ -13307,10 +13308,12 @@ virDomainChrSourceDefFormat(virBufferPtr buf, break; case VIR_DOMAIN_CHR_TYPE_UNIX: + virBufferAsprintf(buf, " <source mode='%s'", def->data.nix.listen ? "bind" : "connect"); - virBufferEscapeString(buf, " path='%s'/>\n", + virBufferEscapeString(buf, " path='%s'", def->data.nix.path); + virBufferAddLit(buf, "/>\n"); break; } diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 4251c34..90f072d 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -2788,6 +2788,31 @@ qemuProcessPrepareMonitorChr(virQEMUDriverConfigPtr cfg, return 0; } +static int +qemuProcessPrepareAgentChr(virQEMUDriverConfigPtr cfg, + virDomainObjPtr vm) +{ + virDomainChrSourceDefPtr config = qemuFindAgentConfig(vm->def); + virDomainChrSourceDefPtr newConfing = qemuFindAgentConfig(vm->newDef); + + if (!config) + return 0; + + /* if user hasn't supplied any agent socket path, generate one, + * and store it in inactive config as well */ + if ((config->type == VIR_DOMAIN_CHR_TYPE_UNIX) && + !config->data.nix.path) { + if ((virAsprintf(&config->data.nix.path, "%s/%s.agent", + cfg->libDir, vm->def->name) < 0) || + !(newConfing->data.nix.path = strdup(config->data.nix.path))) { + virReportOOMError(); + return -1; + } + newConfing->data.nix.listen = config->data.nix.listen = true; + } + + return 0; +} /* * Precondition: vm must be locked, and a job must be active. @@ -3772,8 +3797,9 @@ int qemuProcessStart(virConnectPtr conn, goto cleanup; } - VIR_DEBUG("Preparing monitor state"); - if (qemuProcessPrepareMonitorChr(cfg, priv->monConfig, vm->def->name) < 0) + VIR_DEBUG("Preparing monitor and agent state"); + if ((qemuProcessPrepareMonitorChr(cfg, priv->monConfig, vm->def->name) < 0) || + (qemuProcessPrepareAgentChr(cfg, vm) < 0)) goto cleanup; if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_MONITOR_JSON)) -- 1.8.0.2

5 6

[libvirt] [PATCH V7 0/3] Add support for QEMU file descriptor sets
by Stefan Berger 16 Feb '13

16 Feb '13

The following patch series adds initial support for QEMU file descriptor sets implementing support for creating the proper command line. Some devices are using the sets now. Regards, Stefan

1 3

[libvirt] [hyperv]: Connection failure
by Ata Bohra 16 Feb '13

16 Feb '13

Hi Everyone, I installed a HyperV server and trying to connect to it using libvirt. As suggested by libvirt driver wiki (http://libvirt.org/drvhyperv.html) I've enabled Basic authentication on the server (and also enabled HTTP connection request for debugging purpose). Even after all this configuration, on connection I get error as: ---------------Enter Administrator's password for 10.y.y.y: xxxxxx 2013-02-14 00:02:25.122+0000: 6825: info : libvirt version: 1.0.2 2013-02-14 00:02:25.122+0000: 6825: error : hypervDebugHandler:1444 : openwsman error: NULL response libvir: Hyper-V Driver error : internal error Transport error during enumeration: Could not connect (7) Failed to open connection libvir: error : invalid connection pointer in virConnectGetHostname Host name: (null) libvir: error : invalid connection pointer in virConnectClose ------------------------------ Hyper-V server configuration looks like:xxx> winrm get winrm/config/serviceServiceROOTSDDL = <long string>MaxConnectionOperations = 4294967295MaxConnectionOperationsPerUser = 1500MaxConnectionTimeoutms = 240000MaxConnections = 300MaxPacketRetrievalTimeSeconds = 120AllowUnencrypted = trueAuth Basic = true ........AllowRemoteAccess = true ------------------------------ I'm have libvirt on ubuntu (3.2.0-37-generic) and openwsman is 2.2.3-oubuntu4 version. Also, I'm using "Administrator" credentials to connect to HyperV server. Please suggest what is missing from my setup. Thanks!Ata

1 1

[libvirt] [PATCH v4 0/2] net: support set source address(es) and ports for NAT
by Natanael Copa 16 Feb '13

16 Feb '13

Changes v4: - barf if 'end' attribute is missing in <address> - update doc to tell how to properly set single address Natanael Copa (2): net: support set public ip range for forward mode nat net: add support for specifying port range for forward mode nat docs/formatnetwork.html.in | 33 ++++++++ src/conf/network_conf.c | 195 ++++++++++++++++++++++++++++++++++++++++++-- src/conf/network_conf.h | 4 + src/network/bridge_driver.c | 32 ++++++++ src/util/viriptables.c | 77 +++++++++++++++-- src/util/viriptables.h | 8 ++ 6 files changed, 335 insertions(+), 14 deletions(-) -- 1.8.1.2

2 6

[libvirt] [PATCHv2 0/5] fix regression in symlink'd qcow2 backing files
by Eric Blake 16 Feb '13

16 Feb '13

See https://bugzilla.redhat.com/show_bug.cgi?id=903248 for more gory details. This fixes a regression introduced in commit 8250783. V1 was here: https://www.redhat.com/archives/libvir-list/2013-February/msg00340.html changes since then: rebase to latest, add a testsuite, split one patch into two for easier review, and push already-acked changes. Eric Blake (5): storage: rearrange functions storage: prepare for refactoring storage: refactor metadata lookup storage: don't follow backing chain symlinks too eagerly storage: test backing chain traversal .gitignore | 1 + src/util/virstoragefile.c | 314 +++++++++++++------------- src/util/virstoragefile.h | 1 + tests/Makefile.am | 6 + tests/virstoragetest.c | 546 ++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 720 insertions(+), 148 deletions(-) create mode 100644 tests/virstoragetest.c -- 1.8.1.2

2 13

[libvirt] [PATCH] build: more mingw fixes
by Eric Blake 16 Feb '13

16 Feb '13

More mingw build failures: CCLD libvirt-lxc.la /usr/lib64/gcc/i686-w64-mingw32/4.7.2/../../../../i686-w64-mingw32/bin/ld: cannot find libvirt_lxc.def: No such file or directory CC virportallocatortest-virportallocatortest.o ../../tests/virportallocatortest.c: In function 'main': ../../tests/virportallocatortest.c:195:1: error: implicit declaration of function 'setenv' [-Werror=implicit-function-declaration] * src/Makefile.am (GENERATED_SYM_FILES): Also generate libvirt_lxc.def. * bootstrap.conf (gnulib_modules): Import setenv. --- Pushing under the build-breaker rule. bootstrap.conf | 1 + src/Makefile.am | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/bootstrap.conf b/bootstrap.conf index 4b45a4f..6e03757 100644 --- a/bootstrap.conf +++ b/bootstrap.conf @@ -92,6 +92,7 @@ regex random_r sched send +setenv setsockopt sigaction sigpipe diff --git a/src/Makefile.am b/src/Makefile.am index 0d2f2f8..780cd52 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1462,7 +1462,8 @@ EXTRA_DIST += \ libvirt_xenxs.syms \ libvirt_libssh2.syms -GENERATED_SYM_FILES = libvirt.syms libvirt.def libvirt_qemu.def +GENERATED_SYM_FILES = \ + libvirt.syms libvirt.def libvirt_qemu.def libvirt_lxc.def BUILT_SOURCES += $(GENERATED_SYM_FILES) -- 1.8.1.2

1 0

[libvirt] [PATCH] build: fix mingw build
by Eric Blake 16 Feb '13

16 Feb '13

Commits 2025356 and ba72cb12 introduced typos. * src/util/virpci.c (virPCIIsVirtualFunction) [!__linux__]: Fix function name. * src/util/virutil.c (virGetDeviceID): Fix attribute spelling. --- Another push under the build-breaker rule. src/util/virpci.c | 4 ++-- src/util/virutil.c | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/util/virpci.c b/src/util/virpci.c index d1881e5..4bb82aa 100644 --- a/src/util/virpci.c +++ b/src/util/virpci.c @@ -1,7 +1,7 @@ /* * virpci.c: helper APIs for managing host PCI devices * - * Copyright (C) 2009-2012 Red Hat, Inc. + * Copyright (C) 2009-2013 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 @@ -2239,7 +2239,7 @@ virPCIGetVirtualFunctions(const char *sysfs_path ATTRIBUTE_UNUSED, } int -virPCIDeviceIsVirtualFunction(const char *vf_sysfs_device_link ATTRIBUTE_UNUSED) +virPCIIsVirtualFunction(const char *vf_sysfs_device_link ATTRIBUTE_UNUSED) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _(unsupported)); return -1; diff --git a/src/util/virutil.c b/src/util/virutil.c index 55e1b52..7acda77 100644 --- a/src/util/virutil.c +++ b/src/util/virutil.c @@ -3270,9 +3270,9 @@ virGetDeviceID(const char *path, int *maj, int *min) } #else int -virGetDeviceID(const char *path ATRRIBUTE_UNUSED, - int *maj ATRRIBUTE_UNUSED, - int *min ATRRIBUTE_UNUSED) +virGetDeviceID(const char *path ATTRIBUTE_UNUSED, + int *maj ATTRIBUTE_UNUSED, + int *min ATTRIBUTE_UNUSED) { return -ENOSYS; -- 1.8.1.2

1 0

[libvirt] [PATCH] regex: gnulib guarantees that we have regex support
by Eric Blake 16 Feb '13

16 Feb '13

No need to use HAVE_REGEX_H - our use of gnulib guarantees that the header exists and works, regardless of platform. Similarly, we can unconditionally assume a compiling <sys/wait.h> (although the mingw version of this header is not full-featured). * src/storage/storage_backend.c: Drop useless conditional. * tests/testutils.c: Likewise. --- I noticed this while trying to clean up a VPATH test failure. src/storage/storage_backend.c | 6 ++---- tests/testutils.c | 18 +++--------------- 2 files changed, 5 insertions(+), 19 deletions(-) diff --git a/src/storage/storage_backend.c b/src/storage/storage_backend.c index cab72c6..bdddddf 100644 --- a/src/storage/storage_backend.c +++ b/src/storage/storage_backend.c @@ -1,7 +1,7 @@ /* * storage_backend.c: internal storage driver backend contract * - * Copyright (C) 2007-2012 Red Hat, Inc. + * Copyright (C) 2007-2013 Red Hat, Inc. * Copyright (C) 2007-2008 Daniel P. Berrange * * This library is free software; you can redistribute it and/or @@ -25,9 +25,7 @@ #include <string.h> #include <stdio.h> -#if HAVE_REGEX_H -# include <regex.h> -#endif +#include <regex.h> #include <sys/types.h> #include <sys/wait.h> #include <unistd.h> diff --git a/tests/testutils.c b/tests/testutils.c index 9c8f365..7b2ea51 100644 --- a/tests/testutils.c +++ b/tests/testutils.c @@ -1,7 +1,7 @@ /* * testutils.c: basic test utils * - * Copyright (C) 2005-2012 Red Hat, Inc. + * Copyright (C) 2005-2013 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 @@ -27,12 +27,8 @@ #include <sys/time.h> #include <sys/types.h> #include <sys/stat.h> -#ifndef WIN32 -# include <sys/wait.h> -#endif -#ifdef HAVE_REGEX_H -# include <regex.h> -#endif +#include <sys/wait.h> +#include <regex.h> #include <unistd.h> #include <string.h> #include <fcntl.h> @@ -735,7 +731,6 @@ cleanup: } -#ifdef HAVE_REGEX_H int virtTestClearLineRegex(const char *pattern, char *str) { @@ -779,10 +774,3 @@ int virtTestClearLineRegex(const char *pattern, return 0; } -#else -int virtTestClearLineRegex(const char *pattern ATTRIBUTE_UNUSED, - char *str ATTRIBUTE_UNUSED) -{ - return 0; -} -#endif -- 1.8.1.2

1 1