December 2014 - Devel - libvirt List Archives

[libvirt] [PATCH v2] test: fix nwfilter tests following changes in virfirewall.c
by Stefan Berger 22 Dec '14

22 Dec '14

Some of the nwfilter tests are now failing since --concurrent shows up in the ebtables command. To avoid this, implement a function preventing the probing for lock support in the eb/iptables tools and use it in the tests. Signed-off-by: Stefan Berger <stefanb(a)linux.vnet.ibm.com> --- src/libvirt_private.syms | 1 + src/util/virfirewall.c | 9 +++++++++ src/util/virfirewall.h | 2 ++ tests/nwfilterebiptablestest.c | 3 +++ tests/nwfilterxml2firewalltest.c | 2 ++ 5 files changed, 17 insertions(+) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 2647d36..22d9116 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1362,6 +1362,7 @@ virFirewallRuleAddArgList; virFirewallRuleAddArgSet; virFirewallRuleGetArgCount; virFirewallSetBackend; +virFirewallSetLockOverride; virFirewallStartRollback; virFirewallStartTransaction; diff --git a/src/util/virfirewall.c b/src/util/virfirewall.c index 8496062..b536912 100644 --- a/src/util/virfirewall.c +++ b/src/util/virfirewall.c @@ -107,6 +107,13 @@ VIR_ONCE_GLOBAL_INIT(virFirewall) static bool iptablesUseLock; static bool ip6tablesUseLock; static bool ebtablesUseLock; +static bool lockOverride; /* true to avoid lock probes */ + +void +virFirewallSetLockOverride(bool avoid) +{ + lockOverride = avoid; +} static void virFirewallCheckUpdateLock(bool *lockflag, @@ -135,6 +142,8 @@ virFirewallCheckUpdateLocking(void) const char *ebtablesArgs[] = { EBTABLES_PATH, "--concurrent", "-L", NULL, }; + if (lockOverride) + return; virFirewallCheckUpdateLock(&iptablesUseLock, iptablesArgs); virFirewallCheckUpdateLock(&ip6tablesUseLock, diff --git a/src/util/virfirewall.h b/src/util/virfirewall.h index 1129219..dbf3975 100644 --- a/src/util/virfirewall.h +++ b/src/util/virfirewall.h @@ -106,4 +106,6 @@ void virFirewallStartRollback(virFirewallPtr firewall, int virFirewallApply(virFirewallPtr firewall); +void virFirewallSetLockOverride(bool avoid); + #endif /* __VIR_FIREWALL_H__ */ diff --git a/tests/nwfilterebiptablestest.c b/tests/nwfilterebiptablestest.c index e04bc21..e1330ef 100644 --- a/tests/nwfilterebiptablestest.c +++ b/tests/nwfilterebiptablestest.c @@ -24,6 +24,7 @@ #include "testutils.h" #include "nwfilter/nwfilter_ebiptables_driver.h" #include "virbuffer.h" +#include "virfirewall.h" #define __VIR_FIREWALL_PRIV_H_ALLOW__ #include "virfirewallpriv.h" @@ -522,6 +523,8 @@ mymain(void) { int ret = 0; + virFirewallSetLockOverride(true); + if (virFirewallSetBackend(VIR_FIREWALL_BACKEND_DIRECT) < 0) { ret = -1; goto cleanup; diff --git a/tests/nwfilterxml2firewalltest.c b/tests/nwfilterxml2firewalltest.c index 01527f4..167ad42 100644 --- a/tests/nwfilterxml2firewalltest.c +++ b/tests/nwfilterxml2firewalltest.c @@ -474,6 +474,8 @@ mymain(void) ret = -1; \ } while (0) + virFirewallSetLockOverride(true); + if (virFirewallSetBackend(VIR_FIREWALL_BACKEND_DIRECT) < 0) { ret = -1; goto cleanup; -- 1.9.3

3 7

[libvirt] Zanata xml config
by Carlos Munoz 21 Dec '14

21 Dec '14

Hi, The migration of the libvirt project translations to Zanata is now complete. Translators can start working now at https://fedora.zanata.org/project/view/libvirt To use Zanata, you need to 1. Register in https://fedora.zanata.org 2. If you are not the maintainer of your project yet, contact the admin to add you as maintainer. 3. Follow the instruction http://zanata.org/help/cli/cli-configuration/ 4. Place the attached zanata.xml in the root directory of repository 5. (Optional) integrate "zanata push" and "zanata pull" to your build scripts. If you have any questions , feel free to contact the Zanata dev team. Regards, -- Carlos A. Munoz Software Engineering Supervisor Engineering - Internationalization Red Hat

1 0

[libvirt] [PATCH] Update my email address in AUTHORS.in
by Claudio Bley 20 Dec '14

20 Dec '14

--- pushed under the trivial rule. AUTHORS.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AUTHORS.in b/AUTHORS.in index 3c783f7..329924f 100644 --- a/AUTHORS.in +++ b/AUTHORS.in @@ -10,7 +10,7 @@ The primary maintainers and people with commit access rights: Alex Jia <ajia(a)redhat.com> Cédric Bosdonnat <cbosdonnat(a)suse.com> Christophe Fergeau <cfergeau(a)redhat.com> -Claudio Bley <cbley(a)av-test.de> +Claudio Bley <claudio.bley(a)gmail.com> Cole Robinson <crobinso(a)redhat.com> Daniel Berrange <berrange(a)redhat.com> Daniel Veillard <veillard(a)redhat.com> -- 2.2.1

2 2

[libvirt] [PATCH] maint: update .mailmap
by Claudio Bley 20 Dec '14

20 Dec '14

Add an email alias after updating my email address in commit 738a2ae. --- Pushed under the trivial rule. .mailmap | 1 + 1 file changed, 1 insertion(+) diff --git a/.mailmap b/.mailmap index 826c63c..84a6dbe 100644 --- a/.mailmap +++ b/.mailmap @@ -5,6 +5,7 @@ <bozzolan(a)gmail.com> <redshift(a)gmx.com> <charles_duffy(a)messageone.com> <charles(a)dyfis.net> +<claudio.bley(a)gmail.com> <cbley(a)av-test.de> <dfj(a)redhat.com> <dfj(a)dfj.bne.redhat.com> <eblake(a)redhat.com> <ebb9(a)byu.net> <gdolley(a)arpnetworks.com> <gdolley(a)ucla.edu> -- 2.2.1

1 0

[libvirt] [PATCH] Fix typo s/interpetation/interpretation/
by Claudio Bley 20 Dec '14

20 Dec '14

Fix the typo in struct virSecurityModel's comment for its doi field. --- Pushed under the trivial rule. include/libvirt/libvirt-host.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/libvirt/libvirt-host.h b/include/libvirt/libvirt-host.h index 0704672..f760a55 100644 --- a/include/libvirt/libvirt-host.h +++ b/include/libvirt/libvirt-host.h @@ -148,7 +148,7 @@ typedef struct _virSecurityModel virSecurityModel; struct _virSecurityModel { char model[VIR_SECURITY_MODEL_BUFLEN]; /* security model string */ - char doi[VIR_SECURITY_DOI_BUFLEN]; /* domain of interpetation */ + char doi[VIR_SECURITY_DOI_BUFLEN]; /* domain of interpretation */ }; /** -- 2.2.1

1 0

[libvirt] [PATCH 2/2] lxc: Don't crash on NULL ifname_guest_actual
by Guido Günther 20 Dec '14

20 Dec '14

Reported and patch provided by Bastian Blank at https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=769600 --- src/lxc/lxc_container.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index 1b9e2f2..f986f71 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -472,7 +472,7 @@ lxcContainerGetNetDef(virDomainDefPtr vmDef, const char *devName) for (i = 0; i < vmDef->nnets; i++) { netDef = vmDef->nets[i]; - if (STREQ(netDef->ifname_guest_actual, devName)) + if (netDef->ifname_guest_actual && STREQ(netDef->ifname_guest_actual, devName)) return netDef; } -- 2.1.3

2 2

[libvirt] [PATCH] util: Fix possible NULL dereference
by Martin Kletzander 20 Dec '14

20 Dec '14

Commit 1a80b97d, which added the virCgroupHasEmptyTasks() function forgot that the parameter @cgroup may be NULL and did not check that. Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- src/util/vircgroup.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c index 4857ef3..64bc647 100644 --- a/src/util/vircgroup.c +++ b/src/util/vircgroup.c @@ -3932,6 +3932,9 @@ virCgroupHasEmptyTasks(virCgroupPtr cgroup, int controller) int ret = -1; char *content = NULL; + if (!cgroup) + return -1; + ret = virCgroupGetValueStr(cgroup, controller, "tasks", &content); if (ret == 0 && content[0] == '\0') -- 2.2.1

2 1

[libvirt] [PATCH] docs: split typedef and struct definition for apibuild.py
by Claudio Bley 19 Dec '14

19 Dec '14

The members of struct virSecurityLabel[1] and struct virSecurityModel[2] were not shown in the libvirt API docs because the corresponding <field> elements were missing from the libvirt-api.xml. The reason is that apibuild.py does not cope well with typedef's using inline struct definitions. It fails to associate any info about the struct with the typedef and consequently cannot write out the members of the struct. Splitting the typedef and the struct definition into seperate statements as it is done for other structs works around this problem. [1]: http://libvirt.org/html/libvirt-libvirt-host.html#virSecurityLabel [2]: http://libvirt.org/html/libvirt-libvirt-host.html#virSecurityModel --- Seems I had to run "make" twice inside the docs folder before the changes were picked up. Besides, my email address has changed. If this this patch gets ACKed, I'd also adjust the AUTHORS file in a separate trivial patch. include/libvirt/libvirt-host.h | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/include/libvirt/libvirt-host.h b/include/libvirt/libvirt-host.h index 53b529f..0704672 100644 --- a/include/libvirt/libvirt-host.h +++ b/include/libvirt/libvirt-host.h @@ -108,12 +108,13 @@ typedef virStream *virStreamPtr; * a virSecurityLabel is a structure filled by virDomainGetSecurityLabel(), * providing the security label and associated attributes for the specified * domain. - * */ -typedef struct _virSecurityLabel { +typedef struct _virSecurityLabel virSecurityLabel; + +struct _virSecurityLabel { char label[VIR_SECURITY_LABEL_BUFLEN]; /* security label string */ int enforcing; /* 1 if security policy is being enforced for domain */ -} virSecurityLabel; +}; /** * virSecurityLabelPtr: @@ -142,12 +143,13 @@ typedef virSecurityLabel *virSecurityLabelPtr; * a virSecurityModel is a structure filled by virNodeGetSecurityModel(), * providing the per-hypervisor security model and DOI attributes for the * specified domain. - * */ -typedef struct _virSecurityModel { +typedef struct _virSecurityModel virSecurityModel; + +struct _virSecurityModel { char model[VIR_SECURITY_MODEL_BUFLEN]; /* security model string */ char doi[VIR_SECURITY_DOI_BUFLEN]; /* domain of interpetation */ -} virSecurityModel; +}; /** * virSecurityModelPtr: -- 2.2.0

2 2

[libvirt] [PATCH] Drop hle feature for Haswell CPUs
by Guido Günther 19 Dec '14

19 Dec '14

The intel-microcode 3.20140913.1 update disables TSX-NI (transactional memory instructions). When a server running libvirt is rebooted with this update, libvirt no longer considers the machine to have a Haswell CPU: # virsh capabilities | grep -A1 '<arch>x86_64' <arch>x86_64</arch> <model>SandyBridge</model> Since Intel disables the feature on their CPUs we shouldn't check for it as well to keep VMs using Haswell working. This was debugged and reported by Chris Boot at http://bugs.debian.org/773189 --- src/cpu/cpu_map.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/src/cpu/cpu_map.xml b/src/cpu/cpu_map.xml index bd9b056..f41dbce 100644 --- a/src/cpu/cpu_map.xml +++ b/src/cpu/cpu_map.xml @@ -507,7 +507,6 @@ <feature name='movbe'/> <feature name='fsgsbase'/> <feature name='bmi1'/> - <feature name='hle'/> <feature name='avx2'/> <feature name='smep'/> <feature name='bmi2'/> -- 2.1.3

2 5

[libvirt] [PATCH] virsh: add transient interfaces check for iface-unbridge
by Lin Ma 19 Dec '14

19 Dec '14

iface-unbridge(netcf interface backend) checks multiple interfaces attaching based on static configuration. If guests interfaces(says tun/tap devices) are attaching to the bridge, iface-unbridge doesn't check them, It causes the bridge is removed although it's in use by other guests. Please refer to: https://bugzilla.suse.com/show_bug.cgi?id=813117 Signed-off-by: Lin Ma <lma(a)suse.com> --- tools/virsh-interface.c | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/tools/virsh-interface.c b/tools/virsh-interface.c index 5f848b6..63ba5bb 100644 --- a/tools/virsh-interface.c +++ b/tools/virsh-interface.c @@ -1040,11 +1040,11 @@ cmdInterfaceUnbridge(vshControl *ctl, const vshCmd *cmd) const char *br_name; char *if_type = NULL, *if_name = NULL; bool nostart = false; - char *br_xml = NULL; + char *br_xml = NULL, *br_xml_transient_if = NULL; xmlChar *if_xml = NULL; int if_xml_size; - xmlDocPtr xml_doc = NULL; - xmlXPathContextPtr ctxt = NULL; + xmlDocPtr xml_doc = NULL, xml_doc_transient_if = NULL; + xmlXPathContextPtr ctxt = NULL, ctxt_transient_if = NULL; xmlNodePtr top_node, if_node, cur; /* Get a handle to the original device */ @@ -1103,6 +1103,21 @@ cmdInterfaceUnbridge(vshControl *ctl, const vshCmd *cmd) goto cleanup; } + /* verify whether there is any transient interface attached to bridge. */ + if (!(br_xml_transient_if = virInterfaceGetXMLDesc(br_handle, 0))) + goto cleanup; + if (!(xml_doc_transient_if = virXMLParseStringCtxt(br_xml_transient_if, + _("(bridge interface definition)"), + &ctxt_transient_if))) { + vshError(ctl, _("Failed to parse configuration of %s"), br_name); + goto cleanup; + } + + if (virXPathNode("./bridge/interface[2]", ctxt_transient_if) != NULL) { + vshError(ctl, "%s", _("The bridge is in use by transient interfaces")); + goto cleanup; + } + /* Change the type and name of the outer/master interface to * the type/name of the attached slave interface. */ @@ -1198,10 +1213,13 @@ cmdInterfaceUnbridge(vshControl *ctl, const vshCmd *cmd) virInterfaceFree(br_handle); VIR_FREE(if_xml); VIR_FREE(br_xml); + VIR_FREE(br_xml_transient_if); VIR_FREE(if_type); VIR_FREE(if_name); xmlXPathFreeContext(ctxt); + xmlXPathFreeContext(ctxt_transient_if); xmlFreeDoc(xml_doc); + xmlFreeDoc(xml_doc_transient_if); return ret; } -- 1.8.4

3 4