- Devel - libvirt List Archives

[libvirt] [PATCH] conf: check rombar against VIR_DOMAIN_TRISTATE_SWITCH_ABSENT
by Ján Tomko 08 Aug '17

08 Aug '17

Make the comparison explicit. --- src/conf/domain_conf.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 3cdb5e348..b5ce2ecd9 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -5359,10 +5359,10 @@ virDomainDeviceInfoFormat(virBufferPtr buf, } if ((flags & VIR_DOMAIN_DEF_FORMAT_ALLOW_ROM) && - (info->rombar || info->romfile)) { + (info->rombar != VIR_TRISTATE_SWITCH_ABSENT || info->romfile)) { virBufferAddLit(buf, "<rom"); - if (info->rombar) { + if (info->rombar != VIR_TRISTATE_SWITCH_ABSENT) { const char *rombar = virTristateSwitchTypeToString(info->rombar); if (rombar) -- 2.13.0

3 6

[libvirt] RFC: support for configuring all ports of a multiport SRIOV VF when assigning to guest
by Laine Stump 08 Aug '17

08 Aug '17

("No matter how far you've gone down the wrong road, turn back." - paraphrase of a Turkish proverb that is apropos to this discussion) Several years ago, when I was apparently naive and narrow in my thinking and someone wanted us support setting the MAC address and vlan tag for SRIOV VFs when assigning them to a guest with PCI device assignment (this was before VFIO existed), I had the idea to do this by creating a new type of <interface> device: <interface type='hostdev'> .... My thinking was that <interface> already had elements for mac address, 802.11Qb[gh] virtualport config, and vlan tag (or maybe it was that we were *going to add* support for vlan tag), so by just adding a <source> that was a PCI address, we would have everything we needed. Basically, there is some amount of config that needs to be applied to the device before it's assigned to the guest, and since the device ends up being a netdev in the guest, all that config is already present in an <interface>. As a bonus, because it was an <interface> we could easily re-use the recently added "pool of devices" network type (with some minor adjustment) to avoid needing to hardcode the host-side PCI address of the VF. At the time Dan Berrange countered (I think - correct me if I'm wrong!) that we should instead do this with modifications to <hostdev>, but somehow I managed to either convince him, or maybe he just finally tired of my stubbornness and decided it was easier to deal with the after effects of giving in rather than continuing to debate with me :-) So right now if you want to assign an SRIOV VF network device to a guest with VFIO, you need something like this (ignoring network device pools for the moment): <interface type='hostdev'> <source> <address type='pci' slot='0x08' function='0x4'/> </source> <mac address='52:54:00:01:01:01'/> <vlan> <tag id='42'/> </vlan> </interface> (or in place of <vlan>, you could have a <virtualport> element for 802.11Qb[gh]). The SRIOV cards that we had around when we were doing this work had multiple physical ports on them (either 2 or 4), but each physical port was associated with its own PCI Physical Function (PF), and each of the PCI Virtual Functions associated with a PF was tied to a single netdev, i.e. in all cases there was always a 1:1 correspondence between a netdev and a PCI device. All of libvirt's code dealing with SRIOV VFs and PFs assumes this 1:1 relationship. And then came Mellanox "dual port" SRIOV cards.... A Mellanox SRIOV NIC doesn't necessarily do that. Instead, it can operate in "dual port" mode, where it has a single PCI PF device for both physical ports; the single PF PCI device has 2 separate netdevs associated with it (so when you look in the "net" subdirectory for the PCI device, you'll see two netdevs listed, and when you look in the "device" subdirectory of those two netdevs in sysfs, they both point back to the same PCI device). VFs associated with that PF will also each have two netdevs associated with them. This means that when you assign a VF to a guest, the guest is getting a single PCI device, but it's getting two netdevs. (I've been told that the advantage of doing both ports with a single PCI device is that each Mellanox PCI device uses a huge amount of MMIO space, two ports on each device cuts the MMIO usage in half). In order for this to be useful, libvirt needs to set the mac address and vlan tag of *both* netdevs prior to starting the guest. But we have no way to represent that in our configuration. In the past it's been suggested that we just do something like this: <interface type='hostdev'> <mac address='blah'/> <mac2 address='blah'/> ... </interface> but I have two problems with that: 1) <interface> is supposed to represent a single network device, but this is trying to make it represent 2 network devices (and what if someone else comes up with a card that puts *4* netdevs on the same PCI device?) 2) We would need to do the same thing for <vlan> tag. It starts to get ugly. Alternately we could add a new <port number='2'> subelement, like this: <interface type='hostdev'> <source> <address type='pci' slot='0x08' function='0x4'/> </source> <mac address='52:54:00:01:01:01'/> <vlan> <tag id='42'/> </vlan> <port number='2'> <mac address='52:54:00:01:01:01'/> <vlan> <tag id='42'/> </vlan> </port> </interface> (or some variation of that) just so that all the stuff for the 2nd port is grouped together. But I don't like that the config for port 1 is at a different level in the hierarchy than the config for port 2, and we still have the problem that we're trying to describe *2* netdevs with a single <interface> element, which just feels wrong. - OR - what if we admit that <interface type='hostdev'> was a bad idea, and try doing it all with <hostdev>, something like this: <hostdev mode='subsystem' type='pci' managed='yes'> <source> <address domain='0x0000' bus='0x06' slot='0x02' function='0x0'/> </source> <netdev port='1'> <mac address='52:54:00:01:02:03'/> <vlan> <tag id='42'/> </vlan> </netdev> <netdev port='2'> <mac address='52:54:00:01:02:03'/> <vlan> <tag id='43'/> </vlan> </netdev> </hostdev> The downsides are: 1) It's providing a 2nd way of describing single port VFs, which could confuse people (my recommendation would be to deprecate usage of <interface type='hostdev'> in the documentation, while still allowing it; i.e. we'd still have to maintain that code while discouraging its use). 2) This wouldn't be able to take advantage of the pools of devices maintained by libvirt networks. (This isn't a problem for Openstack, since they don't use that anyway, but ovirt does use it). 3) It's an explicit admission that I made a bad decision in 2011 :-P The upsides? 1) it models the hardware more correctly. (it really is a PCI device that has two subordinate netdevs, *not* a netdev that is part of a PCI device, "oh and that PCI device also has another netdev") 2) it could be more logically and easily expanded if there were more ports, or if there were other types of PCI devices that had different kinds of device-type-specific config that needed to be setup. 3) we could eliminate "downside (2)" by enhancing the nodedevice driver to provide and manage more generalized pools of devices (if desired by anyone - Openstack's opinion seems to be that libvirt shouldn't be doing this anyway). So does anyone have an opinion about this? An alternate proposal? (e.g. Should we instead just tell everyone to run their Mellanox cards in single port mode and ignore/avoid all this complexity?)

2 5

[libvirt] A bug that libvirt lxc can't destroy all container process.
by 曹远志 08 Aug '17

08 Aug '17

Hello all, This is my first mail to this list, so let me introduce myself. My name is yuanzhi cao, and I work in the oVirt team. Currently We are using libvirt lxc in large-scale and found that libvirt can't destroy container process normally . Environments: System: zesty libvirt version: 2.5.0-3ubuntu5 vm rootfs release: ubuntu:16.04 Reproduce: 1. Run command "virsh -c lxc:// start vm" and the release of vm is xenial 2. Run command "pa aux|grep init" ,you would find the pid of init launch by vm. 3. Run command "virsh -c lxc:// destroy vm". 4. Run command "virsh -c lxc:// list --all" and "ps aux|grep init" ,you could find that vm is shutoff, but the init process launch by vm is still running. Infact I have found the case of this bug, there is a patch after 1.3.1 that import this bug. ------------------------------------------------------------- Commit: dc576025c360a1d2c89da410d0f3f0da55d0143f [dc57602] Parents: 511e7c5bba Author: Daniel P. Berrange <berrange(a)redhat.com> Date: 2016年1月23日 GMT+8 上午12:07:18 Commit Date: 2016年1月27日 GMT+8 上午12:11:32 lxc: don't try to hide parent cgroups inside container ------------------------------------------------------------- Cgroups inside container does't hide parent, so the process of container can change it own cgroup to another cgroup. lxc destroy process by read cgroup tasks file,if process change it own cgroup,it can't destroy container process normally.

1 0

[libvirt] [PATCH] hyperv: Reduce usage of libxml API functions
by Sri Ramanujam 07 Aug '17

07 Aug '17

Slight refactor of the WMI serialization code to minimize mixing openwsman and libxml2 APIs. The only usage of libxml2 APIs now is in creating CDATA blocks, because the openwsman API does not provide that functionality. --- src/hyperv/hyperv_wmi.c | 65 ++++++++++++------------------------------------- 1 file changed, 16 insertions(+), 49 deletions(-) diff --git a/src/hyperv/hyperv_wmi.c b/src/hyperv/hyperv_wmi.c index 57125ae..99efa1c 100644 --- a/src/hyperv/hyperv_wmi.c +++ b/src/hyperv/hyperv_wmi.c @@ -489,17 +489,14 @@ hypervSerializeSimpleParam(hypervParamPtr p, const char *resourceUri, static int hypervSerializeEprParam(hypervParamPtr p, hypervPrivate *priv, - const char *resourceUri, WsXmlDocH doc, WsXmlNodeH *methodNode) + const char *resourceUri, WsXmlNodeH *methodNode) { int result = -1; WsXmlNodeH xmlNodeParam = NULL, xmlNodeTemp = NULL, xmlNodeAddr = NULL, xmlNodeRef = NULL; - xmlNodePtr xmlNodeAddrPtr = NULL, - xmlNodeRefPtr = NULL; WsXmlDocH xmlDocResponse = NULL; - xmlDocPtr docPtr = (xmlDocPtr) doc->parserDoc; WsXmlNsH ns = NULL; client_opt_t *options = NULL; filter_t *filter = NULL; @@ -573,11 +570,6 @@ hypervSerializeEprParam(hypervParamPtr p, hypervPrivate *priv, goto cleanup; } - if (!(xmlNodeAddrPtr = xmlDocCopyNode((xmlNodePtr) xmlNodeAddr, docPtr, 1))) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Could not copy EPR address")); - goto cleanup; - } - if (!(xmlNodeRef = ws_xml_get_child(xmlNodeTemp, 0, XML_NS_ADDRESSING, WSA_REFERENCE_PARAMETERS))) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", @@ -585,17 +577,11 @@ hypervSerializeEprParam(hypervParamPtr p, hypervPrivate *priv, goto cleanup; } - if (!(xmlNodeRefPtr = xmlDocCopyNode((xmlNodePtr) xmlNodeRef, docPtr, 1))) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Could not copy EPR item reference parameters")); - goto cleanup; - } - /* now build a new xml doc with the EPR node children */ if (!(xmlNodeParam = ws_xml_add_child(*methodNode, resourceUri, p->epr.name, NULL))) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Could not add child node to xmlNodeParam")); + _("Could not add child node to methodNode")); goto cleanup; } @@ -613,23 +599,8 @@ hypervSerializeEprParam(hypervParamPtr p, hypervPrivate *priv, goto cleanup; } - if (xmlAddChild((xmlNodePtr) *methodNode, (xmlNodePtr) xmlNodeParam) == NULL) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Could not add child to xml parent node")); - goto cleanup; - } - - if (xmlAddChild((xmlNodePtr) xmlNodeParam, xmlNodeAddrPtr) == NULL) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Could not add child to xml parent node")); - goto cleanup; - } - - if (xmlAddChild((xmlNodePtr) xmlNodeParam, xmlNodeRefPtr) == NULL) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Could not add child to xml parent node")); - goto cleanup; - } + ws_xml_duplicate_tree(xmlNodeParam, xmlNodeAddr); + ws_xml_duplicate_tree(xmlNodeParam, xmlNodeRef); /* we did it! */ result = 0; @@ -656,8 +627,7 @@ hypervSerializeEmbeddedParam(hypervParamPtr p, const char *resourceUri, xmlNodeArray = NULL; WsXmlDocH xmlDocTemp = NULL, xmlDocCdata = NULL; - xmlBufferPtr xmlBufferNode = NULL; - const xmlChar *xmlCharCdataContent = NULL; + char *xmlCharCdataContent = NULL; xmlNodePtr xmlNodeCdata = NULL; hypervWmiClassInfoPtr classInfo = p->embedded.info; virHashKeyValuePairPtr items = NULL; @@ -761,25 +731,22 @@ hypervSerializeEmbeddedParam(hypervParamPtr p, const char *resourceUri, } /* create CDATA node */ - xmlBufferNode = xmlBufferCreate(); - if (xmlNodeDump(xmlBufferNode, (xmlDocPtr) xmlDocTemp->parserDoc, - (xmlNodePtr) xmlNodeInstance, 0, 0) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Could not get root of temp XML doc")); - goto cleanup; - } + ws_xml_dump_memory_node_tree(xmlNodeInstance, &xmlCharCdataContent, &len); - len = xmlBufferLength(xmlBufferNode); - xmlCharCdataContent = xmlBufferContent(xmlBufferNode); if (!(xmlNodeCdata = xmlNewCDataBlock((xmlDocPtr) xmlDocCdata, - xmlCharCdataContent, len))) { + (xmlChar *)xmlCharCdataContent, len))) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Could not create CDATA element")); goto cleanup; } - /* Add CDATA node to the doc root */ - if (!(xmlAddChild((xmlNodePtr) xmlNodeParam, xmlNodeCdata))) { + /* + * Add CDATA node to the doc root + * + * FIXME: there is no openwsman wrapper for xmlNewCDataBlock, so instead + * silence clang by casting to a void pointer first + */ + if (!(xmlAddChild((xmlNodePtr)(void *)xmlNodeParam, xmlNodeCdata))) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Could not add CDATA to doc root")); goto cleanup; @@ -792,7 +759,7 @@ hypervSerializeEmbeddedParam(hypervParamPtr p, const char *resourceUri, VIR_FREE(items); ws_xml_destroy_doc(xmlDocCdata); ws_xml_destroy_doc(xmlDocTemp); - xmlBufferFree(xmlBufferNode); + ws_xml_free_memory(xmlCharCdataContent); return result; } @@ -854,7 +821,7 @@ hypervInvokeMethod(hypervPrivate *priv, hypervInvokeParamsListPtr params, break; case HYPERV_EPR_PARAM: if (hypervSerializeEprParam(p, priv, params->resourceUri, - paramsDocRoot, &methodNode) < 0) + &methodNode) < 0) goto cleanup; break; case HYPERV_EMBEDDED_PARAM: -- 2.9.4

2 1

[libvirt] [PATCH] hyperv: Correct number of milliseconds in five minutes
by Sri Ramanujam 07 Aug '17

07 Aug '17

--- src/hyperv/hyperv_wmi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/hyperv/hyperv_wmi.c b/src/hyperv/hyperv_wmi.c index 57125ae..33ad964 100644 --- a/src/hyperv/hyperv_wmi.c +++ b/src/hyperv/hyperv_wmi.c @@ -42,7 +42,7 @@ #define VIR_FROM_THIS VIR_FROM_HYPERV -#define HYPERV_JOB_TIMEOUT_MS 5000 +#define HYPERV_JOB_TIMEOUT_MS 300000 VIR_LOG_INIT("hyperv.hyperv_wmi"); -- 2.9.4

2 1

[libvirt] [PATCH] introduce virConfReadString
by Ján Tomko 07 Aug '17

07 Aug '17

Rewrite virConfReadMem to take a null-terminated string. All the callers were calling strlen on it anyway. --- daemon/libvirtd-config.c | 2 +- src/libvirt_private.syms | 2 +- src/libxl/libxl_driver.c | 4 ++-- src/lxc/lxc_native.c | 2 +- src/util/virconf.c | 16 ++++++++-------- src/util/virconf.h | 4 ++-- src/vmx/vmx.c | 4 ++-- src/xen/xen_driver.c | 2 +- tests/virconftest.c | 8 ++++---- tests/xlconfigtest.c | 2 +- tests/xmconfigtest.c | 2 +- 11 files changed, 24 insertions(+), 24 deletions(-) diff --git a/daemon/libvirtd-config.c b/daemon/libvirtd-config.c index 6c0f00ed8..db283a41f 100644 --- a/daemon/libvirtd-config.c +++ b/daemon/libvirtd-config.c @@ -433,7 +433,7 @@ int daemonConfigLoadData(struct daemonConfig *data, virConfPtr conf; int ret; - conf = virConfReadMem(filedata, strlen(filedata), 0); + conf = virConfReadString(filedata, 0); if (!conf) return -1; diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 32ac0835e..183a9194d 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1520,7 +1520,7 @@ virConfGetValueULLong; virConfLoadConfig; virConfNew; virConfReadFile; -virConfReadMem; +virConfReadString; virConfSetValue; virConfTypeFromString; virConfTypeToString; diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index 907f1776f..c261e2155 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -2605,14 +2605,14 @@ libxlConnectDomainXMLFromNative(virConnectPtr conn, goto cleanup; if (STREQ(nativeFormat, XEN_CONFIG_FORMAT_XL)) { - if (!(conf = virConfReadMem(nativeConfig, strlen(nativeConfig), 0))) + if (!(conf = virConfReadString(nativeConfig, 0))) goto cleanup; if (!(def = xenParseXL(conf, cfg->caps, driver->xmlopt))) goto cleanup; } else if (STREQ(nativeFormat, XEN_CONFIG_FORMAT_XM)) { - if (!(conf = virConfReadMem(nativeConfig, strlen(nativeConfig), 0))) + if (!(conf = virConfReadString(nativeConfig, 0))) goto cleanup; if (!(def = xenParseXM(conf, diff --git a/src/lxc/lxc_native.c b/src/lxc/lxc_native.c index 7bcdf1fb0..5fc6e7cda 100644 --- a/src/lxc/lxc_native.c +++ b/src/lxc/lxc_native.c @@ -1000,7 +1000,7 @@ lxcParseConfigString(const char *config, virConfPtr properties = NULL; virConfValuePtr value; - if (!(properties = virConfReadMem(config, 0, VIR_CONF_FLAG_LXC_FORMAT))) + if (!(properties = virConfReadString(config, VIR_CONF_FLAG_LXC_FORMAT))) return NULL; if (!(vmdef = virDomainDefNew())) diff --git a/src/util/virconf.c b/src/util/virconf.c index c1f41b7e1..e505848f1 100644 --- a/src/util/virconf.c +++ b/src/util/virconf.c @@ -807,27 +807,27 @@ virConfReadFile(const char *filename, unsigned int flags) } /** - * virConfReadMem: + * virConfReadString: * @memory: pointer to the content of the configuration file - * @len: length in byte * @flags: combination of virConfFlag(s) * - * Reads a configuration file loaded in memory. The string can be - * zero terminated in which case @len can be 0 + * Reads a configuration file loaded in memory. The string must be + * zero terminated. * * Returns a handle to lookup settings or NULL if it failed to * parse the content, use virConfFree() to free the data. */ virConfPtr -virConfReadMem(const char *memory, int len, unsigned int flags) +virConfReadString(const char *memory, unsigned int flags) { - if ((memory == NULL) || (len < 0)) { + size_t len; + + if (memory == NULL) { virConfError(NULL, VIR_ERR_INVALID_ARG, __FUNCTION__); return NULL; } - if (len == 0) - len = strlen(memory); + len = strlen(memory); return virConfParse("memory conf", memory, len, flags); } diff --git a/src/util/virconf.h b/src/util/virconf.h index 23fea4900..f7d9a369c 100644 --- a/src/util/virconf.h +++ b/src/util/virconf.h @@ -79,8 +79,8 @@ typedef int (*virConfWalkCallback)(const char* name, virConfPtr virConfNew(void); virConfPtr virConfReadFile(const char *filename, unsigned int flags); -virConfPtr virConfReadMem(const char *memory, - int len, unsigned int flags); +virConfPtr virConfReadString(const char *memory, + unsigned int flags); int virConfFree(virConfPtr conf); void virConfFreeValue(virConfValuePtr val); virConfValuePtr virConfGetValue(virConfPtr conf, diff --git a/src/vmx/vmx.c b/src/vmx/vmx.c index 96507f10f..3e2f4c3e1 100644 --- a/src/vmx/vmx.c +++ b/src/vmx/vmx.c @@ -1312,7 +1312,7 @@ virVMXParseConfig(virVMXContext *ctx, return NULL; } - conf = virConfReadMem(vmx, strlen(vmx), VIR_CONF_FLAG_VMX_FORMAT); + conf = virConfReadString(vmx, VIR_CONF_FLAG_VMX_FORMAT); if (conf == NULL) return NULL; @@ -1332,7 +1332,7 @@ virVMXParseConfig(virVMXContext *ctx, if (utf8 == NULL) goto cleanup; - conf = virConfReadMem(utf8, strlen(utf8), VIR_CONF_FLAG_VMX_FORMAT); + conf = virConfReadString(utf8, VIR_CONF_FLAG_VMX_FORMAT); VIR_FREE(utf8); diff --git a/src/xen/xen_driver.c b/src/xen/xen_driver.c index b5cd47e02..dae0f4f28 100644 --- a/src/xen/xen_driver.c +++ b/src/xen/xen_driver.c @@ -1553,7 +1553,7 @@ xenUnifiedConnectDomainXMLFromNative(virConnectPtr conn, } if (STREQ(format, XEN_CONFIG_FORMAT_XM)) { - conf = virConfReadMem(config, strlen(config), 0); + conf = virConfReadString(config, 0); if (!conf) goto cleanup; diff --git a/tests/virconftest.c b/tests/virconftest.c index 1f4b561bb..9d43465a7 100644 --- a/tests/virconftest.c +++ b/tests/virconftest.c @@ -89,7 +89,7 @@ static int testConfParseInt(const void *opaque ATTRIBUTE_UNUSED) "string = \"foo\"\n"; int ret = -1; - virConfPtr conf = virConfReadMem(srcdata, strlen(srcdata), 0); + virConfPtr conf = virConfReadString(srcdata, 0); int iv; unsigned int ui; size_t s; @@ -238,7 +238,7 @@ static int testConfParseBool(const void *opaque ATTRIBUTE_UNUSED) "string = \"foo\"\n"; int ret = -1; - virConfPtr conf = virConfReadMem(srcdata, strlen(srcdata), 0); + virConfPtr conf = virConfReadString(srcdata, 0); bool f = true; bool t = false; @@ -302,7 +302,7 @@ static int testConfParseString(const void *opaque ATTRIBUTE_UNUSED) "string = \"foo\"\n"; int ret = -1; - virConfPtr conf = virConfReadMem(srcdata, strlen(srcdata), 0); + virConfPtr conf = virConfReadString(srcdata, 0); char *str = NULL; if (!conf) @@ -342,7 +342,7 @@ static int testConfParseStringList(const void *opaque ATTRIBUTE_UNUSED) "string = \"foo\"\n"; int ret = -1; - virConfPtr conf = virConfReadMem(srcdata, strlen(srcdata), 0); + virConfPtr conf = virConfReadString(srcdata, 0); char **str = NULL; if (!conf) diff --git a/tests/xlconfigtest.c b/tests/xlconfigtest.c index 3fe42988d..30468c905 100644 --- a/tests/xlconfigtest.c +++ b/tests/xlconfigtest.c @@ -146,7 +146,7 @@ testCompareFormatXML(const char *xlcfg, const char *xml, bool replaceVars) if (virTestLoadFile(xlcfg, &xlcfgData) < 0) goto fail; - if (!(conf = virConfReadMem(xlcfgData, strlen(xlcfgData), 0))) + if (!(conf = virConfReadString(xlcfgData, 0))) goto fail; if (!(def = xenParseXL(conf, caps, xmlopt))) diff --git a/tests/xmconfigtest.c b/tests/xmconfigtest.c index 345223ffe..d8455da66 100644 --- a/tests/xmconfigtest.c +++ b/tests/xmconfigtest.c @@ -115,7 +115,7 @@ testCompareFormatXML(const char *xmcfg, const char *xml) priv.caps = caps; conn->privateData = &priv; - if (!(conf = virConfReadMem(xmcfgData, strlen(xmcfgData), 0))) + if (!(conf = virConfReadString(xmcfgData, 0))) goto fail; if (!(def = xenParseXM(conf, caps, xmlopt))) -- 2.13.0

2 1

[libvirt] [PATCH 0/3] Properly deal with multiple netdevs per PCI device when converting VF <-> PF
by Laine Stump 07 Aug '17

07 Aug '17

The commit log of Patch 1 explains the majority of the reason for these patches. In short, they disambiguate the multiple netdevs per PCI device on the SRIOV PF and VFs of a Mellanox dual port NIC *when converting from a VF netdev to a PF netdev and vice versa*. This permits us to set the vlan tag and MAC address for the correct VF netdev (and detect the online status of the correct PF netdev for that VF) when using a VF in macvtap passthrough mode. (in other words, with these patches in place, it is possible to use *all* the VF netdevs on both ports of a dual port mellanox NIC for macvtap passthrough.) These patches *do not* solve the problem of saving/setting the mac address/vlan tag for both ports when using a dual port VF for PCI device assignment with VFIO (see my RFC email from yesterday). That is a much more complex problem. (These patches are a prerequisite to anything that might come out of that RFC though). Laine Stump (3): util: new function virNetDevGetPhysPortID() util: support matching a phys_port_id in virPCIGetNetName() util: match phys_port_id when converting PF-netdev to/from VF-netdev src/libvirt_private.syms | 1 + src/util/virhostdev.c | 2 +- src/util/virnetdev.c | 84 +++++++++++++++++++++++++++++++++++++++++++++--- src/util/virnetdev.h | 5 +++ src/util/virpci.c | 49 ++++++++++++++++++++++------ src/util/virpci.h | 4 ++- 6 files changed, 129 insertions(+), 16 deletions(-) -- 2.13.3

2 4

[libvirt] [PATCH] tests: add further XML namespace test
by Daniel P. Berrange 07 Aug '17

07 Aug '17

Validate that we can pass QEMU command line options using a default namespace, instead of a prefixed namespace Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- .../qemuxml2argvdata/qemuxml2argv-qemu-ns-alt.args | 27 +++++++++++++++++++ .../qemuxml2argvdata/qemuxml2argv-qemu-ns-alt.xml | 30 ++++++++++++++++++++++ tests/qemuxml2argvtest.c | 1 + 3 files changed, 58 insertions(+) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-qemu-ns-alt.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-qemu-ns-alt.xml diff --git a/tests/qemuxml2argvdata/qemuxml2argv-qemu-ns-alt.args b/tests/qemuxml2argvdata/qemuxml2argv-qemu-ns-alt.args new file mode 100644 index 000000000..9650e7478 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-qemu-ns-alt.args @@ -0,0 +1,27 @@ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +NS=ns \ +BAR='' \ +/usr/bin/qemu-system-i686 \ +-name QEMUGuest1 \ +-S \ +-M pc \ +-m 214 \ +-smp 1,sockets=1,cores=1,threads=1 \ +-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ +-nographic \ +-nodefaults \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ +-no-acpi \ +-boot c \ +-usb \ +-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ +-device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ +-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \ +-unknown parameter diff --git a/tests/qemuxml2argvdata/qemuxml2argv-qemu-ns-alt.xml b/tests/qemuxml2argvdata/qemuxml2argv-qemu-ns-alt.xml new file mode 100644 index 000000000..491fc2d80 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-qemu-ns-alt.xml @@ -0,0 +1,30 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> + <vcpu placement='static'>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-system-i686</emulator> + <disk type='block' device='disk'> + <source dev='/dev/HostVG/QEMUGuest1'/> + <target dev='hda' bus='ide'/> + <address type='drive' controller='0' bus='0' target='0' unit='0'/> + </disk> + <controller type='ide' index='0'/> + </devices> + <commandline xmlns='http://libvirt.org/schemas/domain/qemu/1.0'> + <arg value='-unknown'/> + <arg value='parameter'/> + <env name='NS' value='ns'/> + <env name='BAR'/> + </commandline> +</domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index aa83013a2..655c89bc3 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1558,6 +1558,7 @@ mymain(void) DO_TEST("qemu-ns", NONE); DO_TEST("qemu-ns-no-env", NONE); + DO_TEST("qemu-ns-alt", NONE); DO_TEST("smp", NONE); -- 2.13.3

2 1

[libvirt] [PATCH v2] docs: make website responsive for mobile devices
by Daniel P. Berrange 07 Aug '17

07 Aug '17

The website does not look good in a mobile device as the text is far too small and the layout assumes a wide screen. Make the style dynamically adapt based on viewport size, so a mobile device gets a layout more suited to its dimensions, also changing "Learn" to "Docs" Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- docs/main.css | 1 + docs/mobile.css | 94 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ docs/page.xsl | 36 +++++++++++++++++++++- 3 files changed, 130 insertions(+), 1 deletion(-) create mode 100644 docs/mobile.css diff --git a/docs/main.css b/docs/main.css index 95d5d325d..71f7b7a6a 100644 --- a/docs/main.css +++ b/docs/main.css @@ -1,3 +1,4 @@ @import url(fonts/stylesheet.css); @import url(generic.css); @import url(libvirt.css); +@import url(mobile.css); diff --git a/docs/mobile.css b/docs/mobile.css new file mode 100644 index 000000000..85ca49752 --- /dev/null +++ b/docs/mobile.css @@ -0,0 +1,94 @@ +@media (max-width: 1000px) { + #home { + width: 100%; + display: block; + margin: 0px; + background: white url(logos/logo-banner-dark-256.png) no-repeat center center; + height: 94px; + } + #home a { + width: 100%; + } + #search { + width: 100%; + display: block; + margin: 0px; + background: white; + padding: 0px; + } + #search form { + padding: 5px; + } + body.index h1 { + display: none; + } + #jumplinks { + padding: 0px; + display: block; + width: 100%; + text-align: center; + margin: 0px; + height: 1.3em; + font-size: 1em; + border-top: 3px solid rgb(60, 133, 124); + border-bottom: 3px solid rgb(60, 133, 124); + } + #jumplinks ul { + display: block; + padding: 0px; + margin: 0px; + } + #jumplinks li { + margin: 0px; + padding-left: 0.5em; + padding-right: 0.5em; + } + #nav { + border: 0px; + } + + #search.navhide { + display: none !IMPORTANT; + } + #home.navhide { + position: fixed; + top: 0px; + z-index: 9001; + width: 6em; + display: block; + margin: 0px; + background: inherit; + height: 1.3em; + border-top: 3px solid rgb(60, 133, 124); + border-bottom: 3px solid rgb(60, 133, 124); + font-size: 1em; + text-indent: 0px; + font-weight: bold; + padding-left: 1em; + } + #home.navhide a { + color: white; + text-decoration: none; + } + #home.navhide a:hover { + color: rgb(255, 230, 0); + } + #jumplinks.navhide { + position: fixed; + text-align: right; + top: 0px; + z-index: 9000; + background: rgb(0, 95, 97); + } + #jumplinks.navhide ul { + z-index: 9001; + } + #body { + margin-top: 180px; + } + div.panel { + width: 80%; + float: none; + margin-bottom: 2em; + } +} diff --git a/docs/page.xsl b/docs/page.xsl index 7ca4e7bf4..3a64a06c5 100644 --- a/docs/page.xsl +++ b/docs/page.xsl @@ -88,6 +88,7 @@ </xsl:comment> <head> <meta charset="UTF-8"/> + <meta name="viewport" content="width=device-width, initial-scale=1"/> <link rel="stylesheet" type="text/css" href="{$href_base}main.css"/> <link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png"/> <link rel="icon" type="image/png" sizes="32x32" href="/favicon-32x32.png"/> @@ -97,6 +98,39 @@ <title>libvirt: <xsl:value-of select="html:html/html:body/html:h1"/></title> <meta name="description" content="libvirt, virtualization, virtualization API"/> <xsl:apply-templates select="/html:html/html:head/*" mode="content"/> + + <script type="text/javascript"> + <xsl:comment> + <![CDATA[ + function init() { + window.addEventListener('scroll', function(e){ + var distanceY = window.pageYOffset || document.documentElement.scrollTop, + shrinkOn = 94 + home = document.getElementById("home"); + links = document.getElementById("jumplinks"); + search = document.getElementById("search"); + body = document.getElementById("body"); + if (distanceY > shrinkOn) { + if (home.className != "navhide") { + body.className = "navhide" + home.className = "navhide" + links.className = "navhide" + search.className = "navhide" + } + } else { + if (home.className == "navhide") { + body.className = "" + home.className = "" + links.className = "" + search.className = "" + } + } + }); + } + window.onload = init(); + ]]> + </xsl:comment> + </script> </head> <body> <xsl:if test="html:html/html:body/@class"> @@ -117,7 +151,7 @@ <ul> <li><a href="{$href_base}downloads.html">Download</a></li> <li><a href="{$href_base}contribute.html">Contribute</a></li> - <li><a href="{$href_base}docs.html">Learn</a></li> + <li><a href="{$href_base}docs.html">Docs</a></li> </ul> </div> <div id="search"> -- 2.13.3

2 1

[libvirt] [PATCH] Remove bogus warning about vir$OBJECTGetConnect functions
by Daniel P. Berrange 07 Aug '17

07 Aug '17

The API docs for the various vir$OBJECTGetConnect functions contain a warning WARNING: When writing libvirt bindings in other languages, do not use this function. Instead, store the connection and the domain object together. There is no reason why language bindings should not use this method, and indeed the Perl, Python, and Go bindings all use these methods. This warning was originally added back in commit 3edb4bc9fb1b451599df58420d61ffd73633cead Author: Daniel Veillard <veillard(a)redhat.com> Date: Tue Jul 24 15:32:55 2007 +0000 * libvirt.spec.in NEWS docs/* po/*: preparing release 0.3.1 * src/libvirt.c python/generator.py: some cleanup and warnings from Richard W.M. Jones IIUC, the rational was that these APIs do not need to be directly exposed to the non-C language, as the language can expose the same concept itself by storing the original virConnectPtr object alongside the virDomainPtr. There's no reason to mandate such an approach though - it is valid for languages to expose this directly if that suits their needs better. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- src/libvirt-domain-snapshot.c | 6 ------ src/libvirt-domain.c | 4 ---- src/libvirt-interface.c | 4 ---- src/libvirt-network.c | 4 ---- src/libvirt-secret.c | 3 --- src/libvirt-storage.c | 8 -------- 6 files changed, 29 deletions(-) diff --git a/src/libvirt-domain-snapshot.c b/src/libvirt-domain-snapshot.c index b7c566fec..953a586e5 100644 --- a/src/libvirt-domain-snapshot.c +++ b/src/libvirt-domain-snapshot.c @@ -57,9 +57,6 @@ virDomainSnapshotGetName(virDomainSnapshotPtr snapshot) * reference counter on the domain is not increased by this * call. * - * WARNING: When writing libvirt bindings in other languages, do not use this - * function. Instead, store the domain and the snapshot object together. - * * Returns the domain or NULL. */ virDomainPtr @@ -83,9 +80,6 @@ virDomainSnapshotGetDomain(virDomainSnapshotPtr snapshot) * reference counter on the connection is not increased by this * call. * - * WARNING: When writing libvirt bindings in other languages, do not use this - * function. Instead, store the connection and the snapshot object together. - * * Returns the connection or NULL. */ virConnectPtr diff --git a/src/libvirt-domain.c b/src/libvirt-domain.c index 4033ae8e6..87fca29c4 100644 --- a/src/libvirt-domain.c +++ b/src/libvirt-domain.c @@ -115,10 +115,6 @@ virConnectNumOfDomains(virConnectPtr conn) * reference counter on the connection is not increased by this * call. * - * WARNING: When writing libvirt bindings in other languages, do - * not use this function. Instead, store the connection and - * the domain object together. - * * Returns the virConnectPtr or NULL in case of failure. */ virConnectPtr diff --git a/src/libvirt-interface.c b/src/libvirt-interface.c index 3d1a5ff8d..7c8996c58 100644 --- a/src/libvirt-interface.c +++ b/src/libvirt-interface.c @@ -35,10 +35,6 @@ VIR_LOG_INIT("libvirt.interface"); * reference counter on the connection is not increased by this * call. * - * WARNING: When writing libvirt bindings in other languages, do - * not use this function. Instead, store the connection and - * the interface object together. - * * Returns the virConnectPtr or NULL in case of failure. */ virConnectPtr diff --git a/src/libvirt-network.c b/src/libvirt-network.c index 3136f27ee..5c5a0ee22 100644 --- a/src/libvirt-network.c +++ b/src/libvirt-network.c @@ -36,10 +36,6 @@ VIR_LOG_INIT("libvirt.network"); * reference counter on the connection is not increased by this * call. * - * WARNING: When writing libvirt bindings in other languages, do - * not use this function. Instead, store the connection and - * the network object together. - * * Returns the virConnectPtr or NULL in case of failure. */ virConnectPtr diff --git a/src/libvirt-secret.c b/src/libvirt-secret.c index 8a99c8c26..d9244c252 100644 --- a/src/libvirt-secret.c +++ b/src/libvirt-secret.c @@ -34,9 +34,6 @@ VIR_LOG_INIT("libvirt.secret"); * Provides the connection pointer associated with a secret. The reference * counter on the connection is not increased by this call. * - * WARNING: When writing libvirt bindings in other languages, do not use this - * function. Instead, store the connection and the secret object together. - * * Returns the virConnectPtr or NULL in case of failure. */ virConnectPtr diff --git a/src/libvirt-storage.c b/src/libvirt-storage.c index 35f9926d5..2cefc3c91 100644 --- a/src/libvirt-storage.c +++ b/src/libvirt-storage.c @@ -36,10 +36,6 @@ VIR_LOG_INIT("libvirt.storage"); * reference counter on the connection is not increased by this * call. * - * WARNING: When writing libvirt bindings in other languages, do - * not use this function. Instead, store the connection and - * the pool object together. - * * Returns the virConnectPtr or NULL in case of failure. */ virConnectPtr @@ -1254,10 +1250,6 @@ virStoragePoolListVolumes(virStoragePoolPtr pool, * reference counter on the connection is not increased by this * call. * - * WARNING: When writing libvirt bindings in other languages, do - * not use this function. Instead, store the connection and - * the volume object together. - * * Returns the virConnectPtr or NULL in case of failure. */ virConnectPtr -- 2.13.3

2 1