- Devel - libvirt List Archives

[libvirt] [PATCH 0/5] Support Blkio tune, CPU tune, NUMA, CPU affinity in LXC
by Daniel P. Berrange 10 Nov '11

10 Nov '11

The following patch series brings the LXC driver upto parity with the QEMU driver in terms of support for various performance tuning controls

1 5

[libvirt] [PATCH] Disable numactl on ARM architectures too
by Daniel P. Berrange 10 Nov '11

10 Nov '11

From: "Daniel P. Berrange" <berrange(a)redhat.com> Pushed under trivial rule - a backport from the Fedora spec * libvirt.spec.in: Disable numactl on ARM --- libvirt.spec.in | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 10280f0..d4e3e17 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -92,8 +92,8 @@ %define with_libxl 0 %endif -# Numactl is not available on s390[x] -%ifarch s390 s390x +# Numactl is not available on s390[x] and ARM +%ifarch s390 s390x %{arm} %define with_numactl 0 %endif -- 1.7.6.4

1 0

[libvirt] [PATCH] Add libvirt confdir to files section in mingw32 spec
by Daniel P. Berrange 10 Nov '11

10 Nov '11

From: "Daniel P. Berrange" <berrange(a)redhat.com> Pushed under the trivial rule - this fix pulled back from Fedora * mingw32-libvirt.spec.in: Ensure we own the confdir --- mingw32-libvirt.spec.in | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/mingw32-libvirt.spec.in b/mingw32-libvirt.spec.in index c2690f3..89d1d7f 100644 --- a/mingw32-libvirt.spec.in +++ b/mingw32-libvirt.spec.in @@ -126,6 +126,7 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) +%dir %{_mingw32_sysconfdir}/libvirt/ %config(noreplace) %{_mingw32_sysconfdir}/libvirt/libvirt.conf %{_mingw32_bindir}/libvirt-0.dll -- 1.7.6.4

1 0

[libvirt] nwfilter - limit VM traffic to specific mac address
by Shahar Havivi 10 Nov '11

10 Nov '11

Hi, I want to limit VM traffic to a specific MAC address, ie VMs cannot traffic each other other then a specific gateway. I am using custom nwfilter name: isolatedprivatevlan-vdsm.xml located in /etc/libvirt/nwfilter/: <filter name='isolatedprivatevlan-vdsm' chain='root'> <filterref filter='clean-traffic'/> <rule action='drop' direction='out' priority='500'> <mac match='no' dstmacaddr='$GATEWAY_MAC'/> </rule> </filter> VM1 domian xml portion: <interface type="bridge"> <mac address="00:1a:4a:16:01:53"/> <model type="virtio"/> <source bridge="red"/> <filterref filter="isolatedprivatevlan-vdsm"> <parameter name="GATEWAY_MAC" value="00:00:0c:07:ac:00"/> </filterref> </interface> VM2 domian xml portion: <interface type="bridge"> <mac address="00:1a:4a:16:01:52"/> <model type="virtio"/> <source bridge="red"/> <filterref filter="isolatedprivatevlan-vdsm"> <parameter name="GATEWAY_MAC" value="00:00:0c:07:ac:00"/> </filterref> </interface> in each VM (Fedora 15 LiveCD) I assign ip: # ifconfig eth0 10.35.1.240 netmask 255.255.254.0 # route add default gw 10.35.1.1 vm2: # ifconfig eth0 10.35.1.241 netmask 255.255.254.0 # route add default gw 10.35.1.1 but the filter is not working, I can ping the VMs from each other, Am I missing something? Thanks, Shahar Havivi.

2 11

Re: [libvirt] [PATCH] fix crash when starting network
by lvroyce 10 Nov '11

10 Nov '11

tested-by: Wen Ruo Lv<lvroyce(a)linux.vnet.ibm.com> tested 1.net-start cmd with bridge mac specified (failed) 2.attach-device cmd with a hot plug nic(ok) My network is as below: <network> <name>default</name> <uuid>361441af-e1f0-472d-a503-dfcbbefa03fb</uuid> <forward mode='nat'/> <bridge name='virbr0' stp='on' delay='0' /> <mac address='00:16:3E:5D:C7:9E'/> <ip address='192.168.122.1' netmask='255.255.255.0'> <dhcp> <range start='192.168.122.2' end='192.168.122.254' /> </dhcp> </ip> </network> It fails at brSetInterfaceMac-->return ioctl(ctl->fd, SIOCSIFHWADDR, &ifr) but SIOCGIFHWADDR succeed. error msg is: cannot create dummy tap device 'virbr0-nic' to set mac address on bridge 'virbr0':no such device

1 0

[libvirt] [test-API][PATCH 1/3] add new "clean" keyword to clean environment after each testcase
by Guannan Ren 10 Nov '11

10 Nov '11

testcase1 option1 avalue option2 bvalue clean testcase2 option1 cvalue option2 dvalue clean --- generator.py | 44 ++++++++++++++++++++++++++++++++------------ 1 files changed, 32 insertions(+), 12 deletions(-) diff --git a/generator.py b/generator.py index 5a3a2ab..2d59353 100644 --- a/generator.py +++ b/generator.py @@ -41,6 +41,7 @@ class FuncGen(object): self.lockfile = lockfile self.bugstxt = bugstxt self.loglevel = loglevel + self.testcase_number = 0 self.fmt = format.Format(logfile) self.log_xml_parser = log_xml_parser @@ -49,19 +50,21 @@ class FuncGen(object): self.__case_info_save(activity, testrunid) mapper_obj = mapper.Mapper(activity) - pkg_tripped_cases = mapper_obj.get_package_tripped() + pkg_casename_func = mapper_obj.package_casename_func_map() - for test_procedure in pkg_tripped_cases: + for test_procedure in pkg_casename_func: log_xml_parser.add_testprocedure_xml(testrunid, testid, test_procedure) self.cases_ref_names = [] - for case in pkg_tripped_cases: + for case in pkg_casename_func: case_ref_name = case.keys()[0] + if case_ref_name[-6:] != "_clean": + self.testcase_number += 1 self.cases_ref_names.append(case_ref_name) self.cases_params_list = [] - for case in pkg_tripped_cases: + for case in pkg_casename_func: case_params = case.values()[0] self.cases_params_list.append(case_params) @@ -101,7 +104,7 @@ class FuncGen(object): envlog = log.EnvLog(self.logfile, self.loglevel) logger = envlog.env_log() - testcase_number = len(self.cases_ref_names) + loop_number = len(self.cases_ref_names) start_time = time.strftime("%Y-%m-%d %H:%M:%S") logger.info("Checking Testing Environment... ") @@ -111,7 +114,7 @@ class FuncGen(object): sys.exit(1) else: logger.info("\nStart Testing:") - logger.info(" Case Count: %s" % testcase_number) + logger.info(" Case Count: %s" % self.testcase_number) logger.info(" Log File: %s\n" % self.logfile) del envlog @@ -119,21 +122,31 @@ class FuncGen(object): logger = caselog.case_log() retflag = 0 - for i in range(testcase_number): + for i in range(loop_number): case_ref_name = self.cases_ref_names[i] - self.fmt.printf('start', case_ref_name) + pkg_casename = case_ref_name.rpartition(":")[0] + funcname = case_ref_name.rpartition(":")[-1] + + cleanoper = 0 if "_clean" not in funcname else 1 + + if not cleanoper: + self.fmt.printf('start', pkg_casename) + else: + self.fmt.printf('string', 12*" " + "Cleaning...") + case_params = self.cases_params_list[i] case_start_time = time.strftime("%Y-%m-%d %H:%M:%S") ret = -1 + clean_ret = -1 try: try: if case_ref_name != 'sleep': case_params['logger'] = logger - existed_bug_list = self.bug_check(case_ref_name) + existed_bug_list = self.bug_check(pkg_casename) if len(existed_bug_list) == 0: if case_ref_name == 'sleep': @@ -143,13 +156,16 @@ class FuncGen(object): ret = 0 else: ret = self.cases_func_ref_dict[case_ref_name](case_params) + if cleanoper: + clean_ret = ret + ret = 0 else: logger.info("about the testcase , bug existed:") for existed_bug in existed_bug_list: logger.info("%s" % existed_bug) ret = 100 - self.fmt.printf('end', case_ref_name, ret) + self.fmt.printf('end', pkg_casename, ret) continue except Exception, e: logger.error(traceback.format_exc()) @@ -163,7 +179,11 @@ class FuncGen(object): else: pass retflag += ret - self.fmt.printf('end', case_ref_name, ret) + + if not cleanoper: + self.fmt.printf('end', pkg_casename, ret) + else: + self.fmt.printf('string', 21*" " + "Done" if clean_ret < 1 else 21*" " + "Fail") end_time = time.strftime("%Y-%m-%d %H:%M:%S") del caselog @@ -172,7 +192,7 @@ class FuncGen(object): logger = envlog.env_log() logger.info("\nSummary:") logger.info(" Total:%s [Pass:%s Fail:%s]" % \ - (testcase_number, (testcase_number - retflag), retflag)) + (self.testcase_number, (self.testcase_number - retflag), retflag)) del envlog result = (retflag and "FAIL") or "PASS" -- 1.7.1

2 4

[libvirt] [PATCH 0/2] fix nwfilter when /tmp is mounted noexec
by Eric Blake 10 Nov '11

10 Nov '11

https://bugzilla.redhat.com/show_bug.cgi?id=752254 points out that libvirt cannot support nwfilter on a system with /tmp mounted noexec (which is a very common setup in security-conscious setups), all because we were trying to directly invoke a temporary script instead of invoking a shell to read the script. I've split this patch into 2 parts, on the off-chance that patch 2 would run afoul of command line length limits (if the total size of the generated nwfilter commands could possibly cause E2BIG, then we have to go through a temporary file). But my recollection is that modern Linux kernels support unlimited command-line length (that is, ARG_MAX is not a concern on Linux), and that nwfilter_ebiptables_driver only compiles on Linux, so my preference would be to squash these into a single commit, if others agree that we don't have to worry about length limits. At any rate, I'm quite impressed at the number of lines of code I was able to remove in order to fix a bug! Eric Blake (2): nwfilter: avoid failure with noexec /tmp nwfilter: simplify execution of ebiptables scripts src/nwfilter/nwfilter_ebiptables_driver.c | 134 ++-------------------------- 1 files changed, 10 insertions(+), 124 deletions(-) -- 1.7.4.4

3 10

[libvirt] [PATCH] command: handle empty buffer argument correctly
by Eric Blake 10 Nov '11

10 Nov '11

virBufferContentAndReset (intentionally) returns NULL for a buffer with no content, but it is feasible to invoke a command with an explicit empty string. * src/util/command.c (virCommandAddEnvBuffer): Reject empty string. (virCommandAddArgBuffer): Allow explicit empty argument. * tests/commandtest.c (test9): Test it. * tests/commanddata/test9.log: Adjust. --- As pointed out here: https://www.redhat.com/archives/libvir-list/2011-November/msg00435.html src/util/command.c | 13 ++++++++++++- tests/commanddata/test9.log | 4 +++- tests/commandtest.c | 13 ++++++++++++- 3 files changed, 27 insertions(+), 3 deletions(-) diff --git a/src/util/command.c b/src/util/command.c index c3ce361..f5effdf 100644 --- a/src/util/command.c +++ b/src/util/command.c @@ -983,6 +983,10 @@ virCommandAddEnvBuffer(virCommandPtr cmd, virBufferPtr buf) virBufferFreeAndReset(buf); return; } + if (!virBufferUse(buf)) { + cmd->has_error = EINVAL; + return; + } cmd->env[cmd->nenv++] = virBufferContentAndReset(buf); } @@ -1092,7 +1096,14 @@ virCommandAddArgBuffer(virCommandPtr cmd, virBufferPtr buf) return; } - cmd->args[cmd->nargs++] = virBufferContentAndReset(buf); + cmd->args[cmd->nargs] = virBufferContentAndReset(buf); + if (!cmd->args[cmd->nargs]) + cmd->args[cmd->nargs] = strdup(""); + if (!cmd->args[cmd->nargs]) { + cmd->has_error = ENOMEM; + return; + } + cmd->nargs++; } diff --git a/tests/commanddata/test9.log b/tests/commanddata/test9.log index 2607530..3a93c19 100644 --- a/tests/commanddata/test9.log +++ b/tests/commanddata/test9.log @@ -2,8 +2,10 @@ ARG:-version ARG:-log=bar.log ARG:arg1 ARG:arg2 -ARG:arg3 +ARG: ARG:arg4 +ARG:arg5 +ARG:arg6 ENV:DISPLAY=:0.0 ENV:HOME=/home/test ENV:HOSTNAME=test diff --git a/tests/commandtest.c b/tests/commandtest.c index dd6c248..efc48fe 100644 --- a/tests/commandtest.c +++ b/tests/commandtest.c @@ -352,11 +352,22 @@ static int test9(const void *unused ATTRIBUTE_UNUSED) { virCommandPtr cmd = virCommandNew(abs_builddir "/commandhelper"); const char* const args[] = { "arg1", "arg2", NULL }; + virBuffer buf = VIR_BUFFER_INITIALIZER; virCommandAddArg(cmd, "-version"); virCommandAddArgPair(cmd, "-log", "bar.log"); virCommandAddArgSet(cmd, args); - virCommandAddArgList(cmd, "arg3", "arg4", NULL); + virCommandAddArgBuffer(cmd, &buf); + virBufferAddLit(&buf, "arg4"); + virCommandAddArgBuffer(cmd, &buf); + virCommandAddArgList(cmd, "arg5", "arg6", NULL); + + if (virBufferUse(&buf)) { + printf("Buffer not transferred\n"); + virBufferFreeAndReset(&buf); + virCommandFree(cmd); + return -1; + } if (virCommandRun(cmd, NULL) < 0) { virErrorPtr err = virGetLastError(); -- 1.7.4.4

1 0

[libvirt] [libvirt-glib 1/3] Add gvir_config_object_new{_from_xml} helpers
by Christophe Fergeau 09 Nov '11

09 Nov '11

This factors the code that is repeated in the _new methods of all classes deriving from GVirObject --- libvirt-gconfig/libvirt-gconfig-domain.c | 26 ++++++++++-------------- libvirt-gconfig/libvirt-gconfig-object.c | 31 ++++++++++++++++++++++++++++++ libvirt-gconfig/libvirt-gconfig-object.h | 8 +++++++ libvirt-gconfig/libvirt-gconfig.sym | 1 + 4 files changed, 51 insertions(+), 15 deletions(-) diff --git a/libvirt-gconfig/libvirt-gconfig-domain.c b/libvirt-gconfig/libvirt-gconfig-domain.c index 837287c..3290389 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain.c +++ b/libvirt-gconfig/libvirt-gconfig-domain.c @@ -147,27 +147,23 @@ static void gvir_config_domain_init(GVirConfigDomain *conn) GVirConfigDomain *gvir_config_domain_new_from_xml(const gchar *xml, GError **error) { - xmlNodePtr node; + GVirConfigObject *object; - node = gvir_config_xml_parse(xml, "domain", error); - if ((error != NULL) && (*error != NULL)) - return NULL; - return GVIR_CONFIG_DOMAIN(g_object_new(GVIR_TYPE_CONFIG_DOMAIN, - "node", node, - "schema", DATADIR "/libvirt/schemas/domain.rng", - NULL)); + object = gvir_config_object_new_from_xml(GVIR_TYPE_CONFIG_DOMAIN, + "domain", + DATADIR "/libvirt/schemas/domain.rng", + xml, error); + return GVIR_CONFIG_DOMAIN(object); } GVirConfigDomain *gvir_config_domain_new(void) { - xmlDocPtr doc; + GVirConfigObject *object; - doc = xmlNewDoc((xmlChar *)"1.0"); - doc->children = xmlNewDocNode(doc, NULL, (xmlChar *)"domain", NULL); - return GVIR_CONFIG_DOMAIN(g_object_new(GVIR_TYPE_CONFIG_DOMAIN, - "node", doc->children, - "schema", DATADIR "/libvirt/schemas/domain.rng", - NULL)); + object = gvir_config_object_new(GVIR_TYPE_CONFIG_DOMAIN, + "domain", + DATADIR "/libvirt/schemas/domain.rng"); + return GVIR_CONFIG_DOMAIN(object); } char *gvir_config_domain_get_name(GVirConfigDomain *domain) diff --git a/libvirt-gconfig/libvirt-gconfig-object.c b/libvirt-gconfig/libvirt-gconfig-object.c index e59cbcd..adbd955 100644 --- a/libvirt-gconfig/libvirt-gconfig-object.c +++ b/libvirt-gconfig/libvirt-gconfig-object.c @@ -355,3 +355,34 @@ void gvir_config_object_set_node_content_uint64(GVirConfigObject *object, gvir_config_object_set_node_content(object, node_name, str); g_free(str); } + +GVirConfigObject *gvir_config_object_new_from_xml(GType type, + const char *root_name, + const char *schema, + const gchar *xml, + GError **error) +{ + xmlNodePtr node; + + node = gvir_config_xml_parse(xml, root_name, error); + if ((error != NULL) && (*error != NULL)) + return NULL; + return GVIR_CONFIG_OBJECT(g_object_new(type, + "node", node, + "schema", schema, + NULL)); +} + +GVirConfigObject *gvir_config_object_new(GType type, + const char *root_name, + const char *schema) +{ + xmlDocPtr doc; + + doc = xmlNewDoc((xmlChar *)"1.0"); + doc->children = xmlNewDocNode(doc, NULL, (xmlChar *)root_name, NULL); + return GVIR_CONFIG_OBJECT(g_object_new(type, + "node", doc->children, + "schema", schema, + NULL)); +} diff --git a/libvirt-gconfig/libvirt-gconfig-object.h b/libvirt-gconfig/libvirt-gconfig-object.h index c203798..52e4525 100644 --- a/libvirt-gconfig/libvirt-gconfig-object.h +++ b/libvirt-gconfig/libvirt-gconfig-object.h @@ -59,6 +59,14 @@ struct _GVirConfigObjectClass GType gvir_config_object_get_type(void); +GVirConfigObject *gvir_config_object_new(GType type, + const char *root_name, + const char *schema); +GVirConfigObject *gvir_config_object_new_from_xml(GType type, + const char *root_name, + const char *schema, + const gchar *xml, + GError **error); void gvir_config_object_validate(GVirConfigObject *config, GError **err); diff --git a/libvirt-gconfig/libvirt-gconfig.sym b/libvirt-gconfig/libvirt-gconfig.sym index 951aac6..31a89d2 100644 --- a/libvirt-gconfig/libvirt-gconfig.sym +++ b/libvirt-gconfig/libvirt-gconfig.sym @@ -31,6 +31,7 @@ LIBVIRT_GOBJECT_0.0.1 { gvir_config_object_get_type; gvir_config_object_error_quark; gvir_config_object_new; + gvir_config_object_new_from_xml; gvir_config_object_get_schema; gvir_config_object_get_xml_node; gvir_config_object_to_xml; -- 1.7.7

2 5

[libvirt] [PATCH 8/8] Add tests for blkdeviotune
by Lei Li 09 Nov '11

09 Nov '11

Signed-off-by: Zhi Yong Wu <wuzhy(a)linux.vnet.ibm.com> Signed-off-by: Lei Li <lilei(a)linux.vnet.ibm.com> --- .../qemuxml2argv-blkdeviotune.args | 4 ++ .../qemuxml2argvdata/qemuxml2argv-blkdeviotune.xml | 37 ++++++++++++++++++++ tests/qemuxml2argvtest.c | 1 + tests/qemuxml2xmltest.c | 1 + 4 files changed, 43 insertions(+), 0 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-blkdeviotune.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-blkdeviotune.xml diff --git a/tests/qemuxml2argvdata/qemuxml2argv-blkdeviotune.args b/tests/qemuxml2argvdata/qemuxml2argv-blkdeviotune.args new file mode 100644 index 0000000..6f34698 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-blkdeviotune.args @@ -0,0 +1,4 @@ +LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \ +pc -m 214 -smp 1 -name QEMUGuest1 -nographic -monitor unix:/tmp/test-monitor, \ +server,nowait -no-acpi -boot c -hda /dev/HostVG/QEMUGuest1 -net none -serial \ +none -parallel none -usb diff --git a/tests/qemuxml2argvdata/qemuxml2argv-blkdeviotune.xml b/tests/qemuxml2argvdata/qemuxml2argv-blkdeviotune.xml new file mode 100644 index 0000000..0cabb90 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-blkdeviotune.xml @@ -0,0 +1,37 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory>219100</memory> + <currentMemory>219100</currentMemory> + <vcpu>1</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu</emulator> + <disk type='block' device='disk' snapshot='internal'> + <driver name='qemu' type='qcow2' cache='none'/> + <source dev='/dev/HostVG/QEMUGuest1'/> + <target dev='hda' bus='ide'/> + <iotune> + <total_bytes_sec>5000</total_bytes_sec> + <total_iops_sec>6000</total_iops_sec> + <address type='drive' controller='0' bus='0' unit='0'/> + </disk> + <disk type='block' device='cdrom' snapshot='no'> + <driver name='qemu' type='raw'/> + <source dev='/dev/HostVG/QEMUGuest2'/> + <target dev='hdc' bus='ide'/> + <readonly/> + <address type='drive' controller='0' bus='1' unit='0'/> + </disk> + <controller type='ide' index='0'/> + <memballoon model='virtio'/> + </devices> +</domain> + diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index d9a6e8d..1ebb950 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -585,6 +585,7 @@ mymain(void) DO_TEST("blkiotune", false, QEMU_CAPS_NAME); DO_TEST("cputune", false, QEMU_CAPS_NAME); DO_TEST("numatune-memory", false, NONE); + DO_TEST("blkdeviotune", false, QEMU_CAPS_NAME); DO_TEST("multifunction-pci-device", false, QEMU_CAPS_DRIVE, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG, diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index 3f37520..2e6b5c7 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -191,6 +191,7 @@ mymain(void) DO_TEST("event_idx"); DO_TEST("usb-redir"); + DO_TEST("blkdeviotune"); /* These tests generate different XML */ DO_TEST_DIFFERENT("balloon-device-auto"); -- 1.7.1

1 0