- Devel - libvirt List Archives

[libvirt] [PATCHv2 0/6] interface: udev backend bond support
by Doug Goldstein 22 Feb '13

22 Feb '13

Refactor code, clean up error handling, and finally add bond support. The last patch optionally supports a patch I submitted to the Linux kernel which should go in for 3.9 (it was just accepted for net-next). After this patch when you have a bond device you'll get the following: $ ./tools/virsh iface-dumpxml br0 <interface type='bridge' name='br0'> <mtu size='1500'/> <bridge stp='on' delay='1499'> <interface type='bond' name='bond0'> <mtu size='1500'/> <bond mode='balance-rr'> <interface type='ethernet' name='eth2'> <mac address='d0:67:e5:fa:88:95'/> <mtu size='1500'/> </interface> <interface type='ethernet' name='eth3'> <mac address='d0:67:e5:fa:88:95'/> <mtu size='1500'/> </interface> </bond> </interface>  </bridge> </interface> Doug Goldstein (6): interface: Refactor udev bridge to helper func interface: udev bridge code error handling updates interface: Refactor interface vlan to helper func interface: Improve udev backend device type id interface: add bond support to udev backend interface: dev type support for bond interfaces src/interface/interface_backend_udev.c | 546 +++++++++++++++++++++++++++------ 1 file changed, 451 insertions(+), 95 deletions(-) -- 1.7.12.4

2 13

[libvirt] [PATCH] qemu: check backing chains even when cgroup is omitted
by Eric Blake 22 Feb '13

22 Feb '13

https://bugzilla.redhat.com/show_bug.cgi?id=896685 points out a regression caused by commit 38c4a9c - libvirt only labels the backing chain if the backing chain cache is populated, but the code to populate the cache was only conditionally performed if cgroup labeling was necessary. * src/qemu/qemu_cgroup.c (qemuSetupCgroup): Hoist cache setup... * src/qemu/qemu_process.c (qemuProcessStart): ...earlier into caller, where it is now unconditional. --- src/qemu/qemu_cgroup.c | 4 +--- src/qemu/qemu_process.c | 5 +++++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_cgroup.c b/src/qemu/qemu_cgroup.c index 4fde1af..e65b486 100644 --- a/src/qemu/qemu_cgroup.c +++ b/src/qemu/qemu_cgroup.c @@ -234,9 +234,7 @@ int qemuSetupCgroup(virQEMUDriverPtr driver, } for (i = 0; i < vm->def->ndisks ; i++) { - if (qemuDomainDetermineDiskChain(driver, vm->def->disks[i], - false) < 0 || - qemuSetupDiskCgroup(vm, cgroup, vm->def->disks[i]) < 0) + if (qemuSetupDiskCgroup(vm, cgroup, vm->def->disks[i]) < 0) goto cleanup; } diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 476e3ed..af8222b 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -3706,6 +3706,11 @@ int qemuProcessStart(virConnectPtr conn, goto cleanup; VIR_DEBUG("Checking for CDROM and floppy presence"); + for (i = 0; i < vm->def->ndisks ; i++) { + if (qemuDomainDetermineDiskChain(driver, vm->def->disks[i], + false) < 0) + goto cleanup; + } if (qemuDomainCheckDiskPresence(driver, vm, flags & VIR_QEMU_PROCESS_START_COLD) < 0) goto cleanup; -- 1.8.1.2

2 2

[libvirt] [PATCH] virsh: add --start option to the define command
by Doug Goldstein 22 Feb '13

22 Feb '13

I often find myself doing virsh "define blah.xml; start blah". I figured adding this would be a easier^Hlazier way to do it. --- tools/virsh-domain.c | 20 ++++++++++++++++++-- 1 files changed, 18 insertions(+), 2 deletions(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index e91939c..1a3af34 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -5597,6 +5597,7 @@ static const vshCmdInfo info_define[] = { static const vshCmdOptDef opts_define[] = { {"file", VSH_OT_DATA, VSH_OFLAG_REQ, N_("file containing an XML domain description")}, + {"start", VSH_OT_BOOL, 0, N_("start the domain after creation")}, {NULL, 0, 0, NULL} }; @@ -5607,6 +5608,7 @@ cmdDefine(vshControl *ctl, const vshCmd *cmd) const char *from = NULL; bool ret = true; char *buffer; + bool start; if (vshCommandOptString(cmd, "file", &from) <= 0) return false; @@ -5614,17 +5616,31 @@ cmdDefine(vshControl *ctl, const vshCmd *cmd) if (virFileReadAll(from, VSH_MAX_XML_FILE, &buffer) < 0) return false; + start = vshCommandOptBool(cmd, "start"); + dom = virDomainDefineXML(ctl->conn, buffer); VIR_FREE(buffer); if (dom != NULL) { vshPrint(ctl, _("Domain %s defined from %s\n"), virDomainGetName(dom), from); - virDomainFree(dom); } else { vshError(ctl, _("Failed to define domain from %s"), from); - ret = false; + return false; } + + /* Start the domain if the user requested it and it was defined */ + if (start) { + if (virDomainCreate(dom) < 0) { + vshError(ctl, _("Failed to start domain %s, which was " + "successfully defined."), virDomainGetName(dom)); + ret = false; + } else { + vshPrint(ctl, _("Domain %s started\n"), virDomainGetName(dom)); + } + } + + virDomainFree(dom); return ret; } -- 1.7.8.6

7 10

[libvirt] [PATCH] Update arch names in RNG schema to match virarch.c
by Daniel P. Berrange 22 Feb '13

22 Feb '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> When the virarch.c file was introduced to formalize the arch list, we forgot to update the RNG schema with the new arches. --- docs/schemas/basictypes.rng | 34 ++++++++++++++++++++++++++++++++++ docs/schemas/capability.rng | 17 ----------------- 2 files changed, 34 insertions(+), 17 deletions(-) diff --git a/docs/schemas/basictypes.rng b/docs/schemas/basictypes.rng index 2d2f442..cfc8208 100644 --- a/docs/schemas/basictypes.rng +++ b/docs/schemas/basictypes.rng @@ -231,4 +231,38 @@ </data> </define> + <define name='archnames'> + <choice> + <value>alpha</value> + <value>armv7l</value> + <value>cris</value> + <value>i686</value> + <value>ia64</value> + <value>lm32</value> + <value>m68k</value> + <value>microblaze</value> + <value>microblazeel</value> + <value>mips</value> + <value>mipsel</value> + <value>mips64</value> + <value>mips64el</value> + <value>openrisc</value> + <value>parisc</value> + <value>parisc64</value> + <value>ppc</value> + <value>ppc64</value> + <value>ppcemb</value> + <value>s390</value> + <value>s390x</value> + <value>sh4</value> + <value>sh4eb</value> + <value>sparc</value> + <value>sparc64</value> + <value>unicore32</value> + <value>x86_64</value> + <value>xtensa</value> + <value>xtensaeb</value> + </choice> + </define> + </grammar> diff --git a/docs/schemas/capability.rng b/docs/schemas/capability.rng index 53fb04a..8f3fbd9 100644 --- a/docs/schemas/capability.rng +++ b/docs/schemas/capability.rng @@ -367,23 +367,6 @@ </attribute> </define> - <define name='archnames'> - <choice> - <value>arm</value> - <value>i686</value> - <value>ia64</value> - <value>microblaze</value> - <value>microblazeel</value> - <value>mips</value> - <value>mipsel</value> - <value>ppc64</value> - <value>ppc</value> - <value>s390</value> - <value>sparc</value> - <value>x86_64</value> - </choice> - </define> - <define name='featureName'> <data type='string'> <param name='pattern'>[a-zA-Z0-9\-_]+</param> -- 1.8.1

2 1

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

22 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] [PATCH] docs: Add missing 'vram' in QXL video device doc
by Christophe Fergeau 22 Feb '13

22 Feb '13

--- Pushed under the trivial rule. docs/formatdomain.html.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index ffcc33e..a9003d7 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -3583,7 +3583,8 @@ qemu-kvm -net nic,model=? /dev/null attribute <code>ram</code> (since 1.0.2) is allowed for "qxl" type only and specifies the size of the primary bar, while <code>vram</code> specifies the - secondary bar size. If "ram" is not supplied a default value is used. + secondary bar size. If "ram" or "vram" are not supplied a default + value is used. </dd> <dt><code>model</code></dt> -- 1.8.1.2

1 0

[libvirt] [test-API][PATCH v2] Add 2 host node memory API cases
by Wayne Sun 21 Feb '13

21 Feb '13

v1: add 2 host node memory cases and update conf - node_mem_param: tuning host node memory parameters - node_memory: get host node memory info, including host free memory, node free memory and node memory stats - numa_param conf is updated with the 2 new cases v2: node_mem_param: polish codes with better readability node_memory: direct fetch info in /sys/devices/system/node/node* other than using command 'numastat' Signed-off-by: Wayne Sun <gsun(a)redhat.com> --- cases/numa_param.conf | 8 ++++ repos/numa/node_mem_param.py | 81 ++++++++++++++++++++++++++++++++ repos/numa/node_memory.py | 107 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 196 insertions(+) create mode 100644 repos/numa/node_mem_param.py create mode 100644 repos/numa/node_memory.py diff --git a/cases/numa_param.conf b/cases/numa_param.conf index 64268a3..515fb1f 100644 --- a/cases/numa_param.conf +++ b/cases/numa_param.conf @@ -1,3 +1,11 @@ +numa:node_memory + +numa:node_mem_param + shm_pages_to_scan + 200 + shm_sleep_millisecs + 20 + domain:install_linux_cdrom guestname $defaultname diff --git a/repos/numa/node_mem_param.py b/repos/numa/node_mem_param.py new file mode 100644 index 0000000..86242b1 --- /dev/null +++ b/repos/numa/node_mem_param.py @@ -0,0 +1,81 @@ +#!/usr/bin/env python +# Test tuning host node memory parameters + +import libvirt +from libvirt import libvirtError + +from src import sharedmod + +required_params = () +optional_params = {"shm_pages_to_scan": 100, + "shm_sleep_millisecs": 20, + "shm_merge_across_nodes": 1 + } + +KSM_PATH = "/sys/kernel/mm/ksm/" + +def node_mem_param(params): + """test set host node memory parameters + """ + logger = params['logger'] + shm_pages_to_scan = params.get('shm_pages_to_scan') + shm_sleep_millisecs = params.get('shm_sleep_millisecs') + shm_merge_across_nodes = params.get('shm_merge_across_nodes') + + if not shm_pages_to_scan \ + and not shm_sleep_millisecs \ + and not shm_merge_across_nodes: + logger.error("given param is none") + return 1 + + param_dict = {} + for i in optional_params.keys(): + if eval(i): + param_dict[i] = int(eval(i)) + + logger.info("the given param dict is: %s" % param_dict) + + conn = sharedmod.libvirtobj['conn'] + + try: + logger.info("get host node memory parameters") + mem_pre = conn.getMemoryParameters(0) + logger.info("host node memory parameters is: %s" % mem_pre) + + logger.info("set host node memory parameters with given param %s" % + param_dict) + conn.setMemoryParameters(param_dict, 0) + logger.info("set host node memory parameters done") + + logger.info("get host node memory parameters") + mem_pos = conn.getMemoryParameters(0) + logger.info("host node memory parameters is: %s" % mem_pos) + + for i in param_dict.keys(): + if not mem_pos[i] == param_dict[i]: + logger.error("%s is not set as expected" % i) + + logger.info("node memory parameters is set as expected") + + logger.info("check tuning detail under %s" % KSM_PATH) + + ksm_dict = {} + for i in param_dict.keys(): + path = "%s%s" % (KSM_PATH, i[4:]) + f = open(path) + ret = int(f.read().split('\n')[0]) + f.close() + logger.info("%s value is: %s" % (path, ret)) + ksm_dict[i] = ret + + if ksm_dict == param_dict: + logger.info("tuning detail under %s is expected" % KSM_PATH) + else: + logger.error("check with tuning detail under %s failed" % KSM_PATH) + return 1 + + except libvirtError, e: + logger.error("libvirt call failed: " + str(e)) + return 1 + + return 0 diff --git a/repos/numa/node_memory.py b/repos/numa/node_memory.py new file mode 100644 index 0000000..0241f3c --- /dev/null +++ b/repos/numa/node_memory.py @@ -0,0 +1,107 @@ +#!/usr/bin/env python +# Test get host node memory info, including host free +# memory, node free memory and node memory stats. + +import math + +import libvirt +from libvirt import libvirtError + +from src import sharedmod +from utils import utils + +required_params = () +optional_params = {} + +NODE_MEMINFO_PATH = "/sys/devices/system/node/node*/meminfo" + +def node_memory(params): + """test get host node memory info + """ + logger = params['logger'] + + cmd = "lscpu|grep 'NUMA node(s)'" + ret, output = utils.exec_cmd(cmd, shell=True) + node_num = int(output[0].split(' ')[-1]) + logger.info("host total nodes number is: %s" % node_num) + + conn = sharedmod.libvirtobj['conn'] + + cmd = "grep 'MemFree' %s" % NODE_MEMINFO_PATH + node_mem = [] + free_total = 0 + ret, out = utils.exec_cmd(cmd, shell=True) + for i in range(node_num): + mem_free = int(out[i].split()[-2]) + node_mem.append(mem_free) + free_total += mem_free + + try: + logger.info("get host total free memory") + mem = conn.getFreeMemory()/1024 + logger.info("host free memory total is: %s KiB" % mem) + logger.info("free memory collected in %s is: %s KiB" % + (NODE_MEMINFO_PATH, free_total)) + + if math.fabs(mem - free_total) > 1024: + logger.error("free memory mismatch with info collected in %s" % + NODE_MEMINFO_PATH) + return 1 + else: + logger.info("get host free memory succeed") + + logger.info("get free memory of nodes") + ret = conn.getCellsFreeMemory(0, node_num) + mem_list = [i/1024 for i in ret] + logger.info("node free memory list is: %s" % mem_list) + logger.info("node free memory list collected in %s is: %s" % + (NODE_MEMINFO_PATH, node_mem)) + + for i in range(node_num): + if math.fabs(mem_list[i] - node_mem[i]) > 1024: + path = NODE_MEMINFO_PATH.replace('*', '%s') % i + logger.error("node %s free memory mismatch with collected in %s" + % (i, path)) + return 1 + + logger.info("get node free memory succeed") + + logger.info("get node memory stats") + node_dict = {} + for i in range(node_num): + ret = conn.getMemoryStats(i, 0) + node_dict[i] = ret + logger.info("node %s memory stats is: %s" % (i, node_dict[i])) + + node_tmp = {} + cmd_new = "grep 'MemTotal' %s" % NODE_MEMINFO_PATH + ret, out_free = utils.exec_cmd(cmd, shell=True) + ret, out_total = utils.exec_cmd(cmd_new, shell=True) + for i in range(node_num): + dict_tmp = {} + path = NODE_MEMINFO_PATH.replace('*', '%s') % i + dict_tmp['free'] = int(out_free[i].split()[-2]) + dict_tmp['total'] = int(out_total[i].split()[-2]) + node_tmp[i] = dict_tmp + logger.info("node %s memory stats collected in %s is: %s" % + (i, path, node_tmp[i])) + + for i in range(node_num): + path = NODE_MEMINFO_PATH.replace('*', '%s') % i + if math.fabs(node_tmp[i]['total'] - node_dict[i]['total']) > 1024: + logger.error("node %s total memory is mismatch with %s" % + (i, path)) + return 1 + + if math.fabs(node_tmp[i]['free'] - node_dict[i]['free']) > 1024: + logger.error("node %s free memory is mismatch with %s" % + (i, path)) + return 1 + + logger.info("get node memory stats succeed") + + except libvirtError, e: + logger.error("libvirt call failed: " + str(e)) + return 1 + + return 0 -- 1.8.1

1 0

[libvirt] libvirt maint branches
by Doug Goldstein 21 Feb '13

21 Feb '13

Instead of hijacking another thread I figured I'd start a new one. I tried to push the branch I had made as requested by Jiri, but I don't appear to have access. $ git push origin v1.0.2-maint Counting objects: 30, done. Delta compression using up to 4 threads. Compressing objects: 100% (18/18), done. Writing objects: 100% (22/22), 3.44 KiB, done. Total 22 (delta 16), reused 5 (delta 4)remote: *** Creating a branch is not allowed in this repository remote: error: hook declined to update refs/heads/v1.0.2-maint To ssh://libvirt.org/git/libvirt.git ! [remote rejected] v1.0.2-maint -> v1.0.2-maint (hook declined) error: failed to push some refs to 'ssh://libvirt.org/git/libvirt.git' How do we want to go about actually creating these branches? I make one everytime I have to backport a fix due to a regression from a previous release. I'll typically only keep them "maintained" until the next official release. I wouldn't consider them stable like what Cole maintains but more like someone ran into an issue and it needed a fix. So there might be other issues in them that go undiscovered or unsolved. I just say this because I don't want to clutter the repo with a lot of useless branches, but again if people think they'd be useful I'm happy to push them. -- Doug Goldstein

2 1

[libvirt] [PATCH 0/2] qemu: Fix deadlocks in autodestroy
by Jiri Denemark 21 Feb '13

21 Feb '13

After the recent removal of qemu driver locks, implicit driver locks were introduced in places that previously relied on being called from functions that alread had the driver locked. Thus calling anything complex (such as close callbacks) must not be called when the driver is locked... Jiri Denemark (2): qemu: Turn closeCallbacks into virObjectLockable qemu: Avoid deadlock in autodestroy src/qemu/qemu_conf.c | 172 ++++++++++++++++++++++++++++------------------ src/qemu/qemu_conf.h | 43 ++++++------ src/qemu/qemu_domain.h | 1 + src/qemu/qemu_driver.c | 12 ++-- src/qemu/qemu_migration.c | 6 +- src/qemu/qemu_process.c | 20 ++++-- 6 files changed, 153 insertions(+), 101 deletions(-) -- 1.8.1.2

4 10

[libvirt] [PATCH] docs: Fix HTML errors
by Jiri Denemark 21 Feb '13

21 Feb '13

<pre> is forbidden inside --- Pushed as trivial. docs/formatnetwork.html.in | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/formatnetwork.html.in b/docs/formatnetwork.html.in index adb5bb9..f7c483d 100644 --- a/docs/formatnetwork.html.in +++ b/docs/formatnetwork.html.in @@ -143,6 +143,7 @@ The address range is set with the <code><address></code> subelements and <code>start</code> and <code>stop</code> attributes: + <pre> ... <forward mode='nat'> @@ -150,8 +151,8 @@ <address start='1.2.3.4' end='1.2.3.10'/> </nat> </forward> -... - </pre> +...</pre> + An singe IPv4 address can be set by setting <code>start</code> and <code>end</code> attributes to the same value. @@ -159,6 +160,7 @@ The port range to be used for the <code><nat></code> can be set via the subelement <code><port></code>: + <pre> ... <forward mode='nat'> @@ -166,9 +168,7 @@ <port start='500' end='1000'/> </nat> </forward> -... - </pre> - +...</pre> </dd> <dt><code>route</code></dt> -- 1.8.1.2

1 0