- Devel - libvirt List Archives

Re: [libvirt] [RFC]Add new mdev interface for QoS
by Alex Williamson 08 Aug '17

08 Aug '17

[cc +libvir-list] On Wed, 26 Jul 2017 21:16:59 +0800 "Gao, Ping A" <ping.a.gao(a)intel.com> wrote: > The vfio-mdev provide the capability to let different guest share the > same physical device through mediate sharing, as result it bring a > requirement about how to control the device sharing, we need a QoS > related interface for mdev to management virtual device resource. > > E.g. In practical use, vGPUs assigned to different quests almost has > different performance requirements, some guests may need higher priority > for real time usage, some other may need more portion of the GPU > resource to get higher 3D performance, corresponding we can define some > interfaces like weight/cap for overall budget control, priority for > single submission control. > > So I suggest to add some common attributes which are vendor agnostic in > mdev core sysfs for QoS purpose. I think what you're asking for is just some standardization of a QoS attribute_group which a vendor can optionally include within the existing mdev_parent_ops.mdev_attr_groups. The mdev core will transparently enable this, but it really only provides the standard, all of the support code is left for the vendor. I'm fine with that, but of course the trouble with and sort of standardization is arriving at an agreed upon standard. Are there QoS knobs that are generic across any mdev device type? Are there others that are more specific to vGPU? Are there existing examples of this that we can steal their specification? Also, mdev devices are not necessarily the exclusive users of the hardware, we can have a native user such as a local X client. They're not an mdev user, so we can't support them via the mdev_attr_group. Does there need to be a per mdev parent QoS attribute_group standard for somehow defining the QoS of all the child mdev devices, or perhaps representing the remaining host QoS attributes? Ultimately libvirt and upper level management tools would be the consumer of these control knobs, so let's immediately get libvirt involved in the discussion. Thanks, Alex

5 16

[libvirt] [PATCH] docs: force content in <script> element
by Daniel P. Berrange 08 Aug '17

08 Aug '17

If there's no content in <script></script>, the XSTL generator will turn it into <script/> which is not permitted in XHTML. Adding a single whitespace is enough to guarantee an explicit closing tag. Without this, the scripts never get loaded by the browser. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- Pushed as trivial fix docs/index.html.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/index.html.in b/docs/index.html.in index 8333cf6bb..c0c55cb14 100644 --- a/docs/index.html.in +++ b/docs/index.html.in @@ -2,9 +2,9 @@ <!DOCTYPE html> <html xmlns="http://www.w3.org/1999/xhtml"> <head> - <script type="text/javascript" src="js/jquery-3.1.1.min.js"></script> - <script type="text/javascript" src="js/moment.min.js"></script> - <script type="text/javascript" src="js/jquery.rss.min.js"></script> + <script type="text/javascript" src="js/jquery-3.1.1.min.js"> </script> + <script type="text/javascript" src="js/moment.min.js"> </script> + <script type="text/javascript" src="js/jquery.rss.min.js"> </script> <script type="text/javascript"> <!-- -- 2.13.3

1 0

[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

[libvirt] [PATCH 0/8] Couple of memleak fixes
by Michal Privoznik 07 Aug '17

07 Aug '17

*** BLURB HERE *** Michal Privoznik (8): virDomainDefFree: Don't leak initenv name and value virDomainDefParseXML: Free @tmp virNodeDevCapCCWParseXML: Free temporary variables qemuDomainObjPrivateFree: Free @machineName virVMXParseConfig: Don't leak def->videos virTestCompareToFile: Don't access memory we don't own qemuhotplugtest: Don't leak @vm virdbustest: Don't leak @out_strv1 src/conf/domain_conf.c | 6 +++++- src/conf/node_device_conf.c | 3 +++ src/qemu/qemu_domain.c | 1 + src/vmx/vmx.c | 9 ++++++--- tests/qemuhotplugtest.c | 1 + tests/testutils.c | 1 + tests/virdbustest.c | 1 + 7 files changed, 18 insertions(+), 4 deletions(-) -- 2.13.0

3 18

[libvirt] [PATCH] docs: bhyve: document autoport support
by Roman Bogorodskiy 06 Aug '17

06 Aug '17

- Update the driver page with the information about using autport for VNC ports - Add a news entry --- docs/drvbhyve.html.in | 8 ++++++++ docs/news.xml | 10 ++++++++++ 2 files changed, 18 insertions(+) It's a freeze now, but I guess it won't hurt if I push the actual feature ACKed before the freeze [1] along with this docs change. If not, it's not a big deal to let it wait for the next release though. PS I've been semi-afk for last couple of weeks, hence the delay, sorry about that. 1: https://www.redhat.com/archives/libvir-list/2017-July/msg00704.html diff --git a/docs/drvbhyve.html.in b/docs/drvbhyve.html.in index f083db91c..0cc9f0aa0 100644 --- a/docs/drvbhyve.html.in +++ b/docs/drvbhyve.html.in @@ -381,6 +381,14 @@ will be used. Please refer to the manual page and the <a href="https://wiki.freebsd.org/bhyve">bhyve wiki</a> for more details on using the <code>vgaconf</code> option.</p> +<p><span class="since">Since 3.6.0</span>, it's possible to use <code>autoport</code> +to let libvirt allocate VNC port automatically (instead of explicitly specifying +it with the <code>port</code> attribute):</p> + +<pre> + <graphics type='vnc' autoport='yes'> +</pre> + <h3><a name="clockconfig">Clock configuration</a></h3> <p>Originally bhyve supported only localtime for RTC. Support for UTC time was introduced in diff --git a/docs/news.xml b/docs/news.xml index ea21cbc3e..e84dea9ad 100644 --- a/docs/news.xml +++ b/docs/news.xml @@ -61,6 +61,16 @@ on separate PHBs (PCI Host Bridges). </description> </change> + <change> + <summary> + bhyve: Support autoport for VNC ports + </summary> + <description> + It's no longer necessary to explicitly specify VNC port for the bhyve + guests. With the autoport feature it will be allocated automatically. + Please refer to the bhyve driver documentation for examples. + </description> + </change> </section> <section title="Improvements"> <change> -- 2.13.1

3 5

[libvirt] [PATCH v2] bhyve: Add support for VNC autoport
by Roman Bogorodskiy 06 Aug '17

06 Aug '17

From: Alexander Nusov <alexander.nusov(a)nfvexpress.com> This patch adds support for automatic VNC port assignment for bhyve guests. --- Changes from v1: * Call virPortAllocatorRelease() in virBhyveProcessStop() to release VNC port; that's done unconditionally of using autoport * Call virPortAllocatorSetUsed(.., true) in virBhyveProcessReconnect() to reserve already used VNC ports after daemon restart * Call virPortAllocatorSetUsed(.., true) in bhyveBuildGraphicsArgStr() for domains that don't use autoport so allocator didn't try to use ports allocated by these domains * In dryRun mode (i.e. for domxml-to-native) don't allocate any ports * Add a couple of unit tests Note 1: while adding tests I noticed that port allocator will actually skip already bound ports, so I'm wondering if it makes any sense to use virPortAllocatorSetUsed(.., true)? Right now I cannot come up with any case to trigger this except probably some races when spawning guests simultaneously, but that's hard to reproduce. Note 2: there are still some cases where resources allocated during command preparation are not properly cleaned up; that's not only VNC ports, but also TAP devices. I plan to add proper cleanup routines separately. src/bhyve/bhyve_command.c | 25 +++++++++++-- src/bhyve/bhyve_driver.c | 5 +++ src/bhyve/bhyve_process.c | 20 +++++++++++ src/bhyve/bhyve_utils.h | 3 ++ .../bhyvexml2argv-vnc-autoport.args | 12 +++++++ .../bhyvexml2argv-vnc-autoport.ldargs | 1 + .../bhyvexml2argv-vnc-autoport.xml | 26 ++++++++++++++ tests/bhyvexml2argvtest.c | 7 ++++ .../bhyvexml2xmlout-vnc-autoport.xml | 41 ++++++++++++++++++++++ tests/bhyvexml2xmltest.c | 1 + 10 files changed, 138 insertions(+), 3 deletions(-) create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-vnc-autoport.args create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-vnc-autoport.ldargs create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-vnc-autoport.xml create mode 100644 tests/bhyvexml2xmloutdata/bhyvexml2xmlout-vnc-autoport.xml diff --git a/src/bhyve/bhyve_command.c b/src/bhyve/bhyve_command.c index eae5cb3ca..e62b5df66 100644 --- a/src/bhyve/bhyve_command.c +++ b/src/bhyve/bhyve_command.c @@ -330,15 +330,19 @@ bhyveBuildLPCArgStr(const virDomainDef *def ATTRIBUTE_UNUSED, } static int -bhyveBuildGraphicsArgStr(const virDomainDef *def ATTRIBUTE_UNUSED, +bhyveBuildGraphicsArgStr(const virDomainDef *def, virDomainGraphicsDefPtr graphics, virDomainVideoDefPtr video, virConnectPtr conn, - virCommandPtr cmd) + virCommandPtr cmd, + bool dryRun) { virBuffer opt = VIR_BUFFER_INITIALIZER; virDomainGraphicsListenDefPtr glisten = NULL; bool escapeAddr; + unsigned short port; + + bhyveConnPtr driver = conn->privateData; if (!(bhyveDriverGetCaps(conn) & BHYVE_CAP_LPC_BOOTROM) || def->os.bootloader || @@ -401,6 +405,20 @@ bhyveBuildGraphicsArgStr(const virDomainDef *def ATTRIBUTE_UNUSED, virBufferAdd(&opt, glisten->address, -1); } + if (!dryRun) { + if (graphics->data.vnc.autoport) { + if (virPortAllocatorAcquire(driver->remotePorts, &port) < 0) + return -1; + graphics->data.vnc.port = port; + } else { + if (virPortAllocatorSetUsed(driver->remotePorts, + graphics->data.vnc.port, + true) < 0) + VIR_WARN("Failed to mark VNC port '%d' as used by '%s'", + graphics->data.vnc.port, def->name); + } + } + virBufferAsprintf(&opt, ":%d", graphics->data.vnc.port); break; default: @@ -553,7 +571,8 @@ virBhyveProcessBuildBhyveCmd(virConnectPtr conn, if (def->ngraphics && def->nvideos) { if (def->ngraphics == 1 && def->nvideos == 1) { - if (bhyveBuildGraphicsArgStr(def, def->graphics[0], def->videos[0], conn, cmd) < 0) + if (bhyveBuildGraphicsArgStr(def, def->graphics[0], def->videos[0], + conn, cmd, dryRun) < 0) goto error; add_lpc = true; } else { diff --git a/src/bhyve/bhyve_driver.c b/src/bhyve/bhyve_driver.c index ed2221a35..bffeea7d9 100644 --- a/src/bhyve/bhyve_driver.c +++ b/src/bhyve/bhyve_driver.c @@ -52,6 +52,7 @@ #include "viraccessapicheck.h" #include "virhostcpu.h" #include "virhostmem.h" +#include "virportallocator.h" #include "conf/domain_capabilities.h" #include "bhyve_conf.h" @@ -1219,6 +1220,7 @@ bhyveStateCleanup(void) virObjectUnref(bhyve_driver->closeCallbacks); virObjectUnref(bhyve_driver->domainEventState); virObjectUnref(bhyve_driver->config); + virObjectUnref(bhyve_driver->remotePorts); virMutexDestroy(&bhyve_driver->lock); VIR_FREE(bhyve_driver); @@ -1265,6 +1267,9 @@ bhyveStateInitialize(bool privileged, if (!(bhyve_driver->domainEventState = virObjectEventStateNew())) goto cleanup; + if (!(bhyve_driver->remotePorts = virPortAllocatorNew(_("display"), 5900, 65535, 0))) + goto cleanup; + bhyve_driver->hostsysinfo = virSysinfoRead(); if (!(bhyve_driver->config = virBhyveDriverConfigNew())) diff --git a/src/bhyve/bhyve_process.c b/src/bhyve/bhyve_process.c index a97e300ff..7211156ca 100644 --- a/src/bhyve/bhyve_process.c +++ b/src/bhyve/bhyve_process.c @@ -293,6 +293,16 @@ virBhyveProcessStop(bhyveConnPtr driver, /* Cleanup network interfaces */ bhyveNetCleanup(vm); + /* VNC autoport cleanup */ + if ((vm->def->ngraphics == 1) && + vm->def->graphics[0]->type == VIR_DOMAIN_GRAPHICS_TYPE_VNC) { + if (virPortAllocatorRelease(driver->remotePorts, + vm->def->graphics[0]->data.vnc.port) < 0) { + VIR_WARN("Failed to release VNC port for '%s'", + vm->def->name); + } + } + ret = 0; virCloseCallbacksUnset(driver->closeCallbacks, vm, @@ -412,6 +422,16 @@ virBhyveProcessReconnect(virDomainObjPtr vm, if (STREQ(expected_proctitle, proc_argv[0])) { ret = 0; priv->mon = bhyveMonitorOpen(vm, data->driver); + if (vm->def->ngraphics == 1 && + vm->def->graphics[0]->type == VIR_DOMAIN_GRAPHICS_TYPE_VNC) { + int vnc_port = vm->def->graphics[0]->data.vnc.port; + if (virPortAllocatorSetUsed(data->driver->remotePorts, + vnc_port, + true) < 0) { + VIR_WARN("Failed to mark VNC port '%d' as used by '%s'", + vnc_port, vm->def->name); + } + } } } diff --git a/src/bhyve/bhyve_utils.h b/src/bhyve/bhyve_utils.h index db50e012a..8ad2698d4 100644 --- a/src/bhyve/bhyve_utils.h +++ b/src/bhyve/bhyve_utils.h @@ -28,6 +28,7 @@ # include "virdomainobjlist.h" # include "virthread.h" # include "virclosecallbacks.h" +# include "virportallocator.h" # define BHYVE_AUTOSTART_DIR SYSCONFDIR "/libvirt/bhyve/autostart" # define BHYVE_CONFIG_DIR SYSCONFDIR "/libvirt/bhyve" @@ -58,6 +59,8 @@ struct _bhyveConn { virCloseCallbacksPtr closeCallbacks; + virPortAllocatorPtr remotePorts; + unsigned bhyvecaps; unsigned grubcaps; }; diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-vnc-autoport.args b/tests/bhyvexml2argvdata/bhyvexml2argv-vnc-autoport.args new file mode 100644 index 000000000..039526ff3 --- /dev/null +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-vnc-autoport.args @@ -0,0 +1,12 @@ +/usr/sbin/bhyve \ +-c 1 \ +-m 214 \ +-u \ +-H \ +-P \ +-s 0:0,hostbridge \ +-l bootrom,/path/to/test.fd \ +-s 2:0,ahci,hd:/tmp/freebsd.img \ +-s 3:0,virtio-net,faketapdev,mac=52:54:00:00:00:00 \ +-s 4:0,fbuf,tcp=127.0.0.1:5900 \ +-s 1,lpc bhyve diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-vnc-autoport.ldargs b/tests/bhyvexml2argvdata/bhyvexml2argv-vnc-autoport.ldargs new file mode 100644 index 000000000..421376db9 --- /dev/null +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-vnc-autoport.ldargs @@ -0,0 +1 @@ +dummy diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-vnc-autoport.xml b/tests/bhyvexml2argvdata/bhyvexml2argv-vnc-autoport.xml new file mode 100644 index 000000000..afb73f040 --- /dev/null +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-vnc-autoport.xml @@ -0,0 +1,26 @@ +<domain type='bhyve'> + <name>bhyve</name> + <uuid>df3be7e7-a104-11e3-aeb0-50e5492bd3dc</uuid> + <memory>219136</memory> + <vcpu>1</vcpu> + <os> + <type>hvm</type> + <loader readonly="yes" type="pflash">/path/to/test.fd</loader> + </os> + <devices> + <disk type='file'> + <driver name='file' type='raw'/> + <source file='/tmp/freebsd.img'/> + <target dev='hda' bus='sata'/> + <address type='drive' controller='0' bus='0' target='2' unit='0'/> + </disk> + <interface type='bridge'> + <model type='virtio'/> + <source bridge="virbr0"/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> + </interface> + <graphics type='vnc' port='-1' autoport='yes'> + <listen type='address' address='127.0.0.1'/> + </graphics> + </devices> +</domain> diff --git a/tests/bhyvexml2argvtest.c b/tests/bhyvexml2argvtest.c index c8f8c685a..95fada0bd 100644 --- a/tests/bhyvexml2argvtest.c +++ b/tests/bhyvexml2argvtest.c @@ -145,6 +145,11 @@ mymain(void) if ((driver.xmlopt = virBhyveDriverCreateXMLConf(&driver)) == NULL) return EXIT_FAILURE; + if (!(driver.remotePorts = virPortAllocatorNew("display", 5900, 65535, + VIR_PORT_ALLOCATOR_SKIP_BIND_CHECK))) + return EXIT_FAILURE; + + # define DO_TEST_FULL(name, flags) \ do { \ static struct testInfo info = { \ @@ -193,6 +198,7 @@ mymain(void) DO_TEST("net-e1000"); DO_TEST("uefi"); DO_TEST("vnc"); + DO_TEST("vnc-autoport"); /* Address allocation tests */ DO_TEST("addr-single-sata-disk"); @@ -231,6 +237,7 @@ mymain(void) virObjectUnref(driver.caps); virObjectUnref(driver.xmlopt); + virObjectUnref(driver.remotePorts); return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; } diff --git a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-vnc-autoport.xml b/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-vnc-autoport.xml new file mode 100644 index 000000000..d6cfe76b7 --- /dev/null +++ b/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-vnc-autoport.xml @@ -0,0 +1,41 @@ +<domain type='bhyve'> + <name>bhyve</name> + <uuid>df3be7e7-a104-11e3-aeb0-50e5492bd3dc</uuid> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='x86_64'>hvm</type> + <loader readonly='yes' type='pflash'>/path/to/test.fd</loader> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <disk type='file' device='disk'> + <driver name='file' type='raw'/> + <source file='/tmp/freebsd.img'/> + <target dev='hda' bus='sata'/> + <address type='drive' controller='0' bus='0' target='2' unit='0'/> + </disk> + <controller type='pci' index='0' model='pci-root'/> + <controller type='sata' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/> + </controller> + <interface type='bridge'> + <mac address='52:54:00:00:00:00'/> + <source bridge='virbr0'/> + <model type='virtio'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> + </interface> + <graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1'> + <listen type='address' address='127.0.0.1'/> + </graphics> + <video> + <model type='gop' heads='1' primary='yes'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/> + </video> + </devices> +</domain> diff --git a/tests/bhyvexml2xmltest.c b/tests/bhyvexml2xmltest.c index b3759919e..c16eb2b2c 100644 --- a/tests/bhyvexml2xmltest.c +++ b/tests/bhyvexml2xmltest.c @@ -105,6 +105,7 @@ mymain(void) DO_TEST_DIFFERENT("serial-grub"); DO_TEST_DIFFERENT("serial-grub-nocons"); DO_TEST_DIFFERENT("vnc"); + DO_TEST_DIFFERENT("vnc-autoport"); /* Address allocation tests */ DO_TEST_DIFFERENT("addr-single-sata-disk"); -- 2.13.1

3 4

[libvirt] [libvirt-php PATCH 00/13] Refactor into smaller components
by Dawid Zamirski 06 Aug '17

06 Aug '17

As per [1], this patch series splits up the large libvirt-php.c into components that (attempts) to resemble the structure of the libvirt project. Each patch successive patch was compile-tested while the whole series was verified with "make check" and a simple custom written PHP script. Dawid Zamirski (13): Move PHP version compat macros to utils.h Update AUTHORS file Do not reuse PHPFUNC macro definition Split up the bindings for libvirt connection API Split up the bindings for libvirt node API Split up the bindings for libvirt stream API Split up the bindings for libvirt domain API Split up the bindings for libvirt network API Split up the bindings for libvirt storage API Split up the bindings for libvirt snapshot API Split up the bindings for libvirt nodedev API Split up the bindings for libvirt NWFilter API Fix is_local_connection implementation. AUTHORS | 29 +- src/Makefile.am | 11 +- src/libvirt-connection.c | 885 +++++ src/libvirt-connection.h | 83 + src/libvirt-domain.c | 3339 +++++++++++++++++ src/libvirt-domain.h | 208 ++ src/libvirt-network.c | 586 +++ src/libvirt-network.h | 73 + src/libvirt-node.c | 304 ++ src/libvirt-node.h | 25 + src/libvirt-nodedev.c | 339 ++ src/libvirt-nodedev.h | 54 + src/libvirt-nwfilter.c | 414 +++ src/libvirt-nwfilter.h | 66 + src/libvirt-php.c | 9282 ++++------------------------------------------ src/libvirt-php.h | 492 +-- src/libvirt-snapshot.c | 243 ++ src/libvirt-snapshot.h | 58 + src/libvirt-storage.c | 1129 ++++++ src/libvirt-storage.h | 138 + src/libvirt-stream.c | 229 ++ src/libvirt-stream.h | 39 + src/sockets.c | 47 +- src/sockets.h | 4 - src/util.c | 3 - src/util.h | 189 +- src/vncfunc.c | 141 +- src/vncfunc.h | 4 - 28 files changed, 9366 insertions(+), 9048 deletions(-) create mode 100644 src/libvirt-connection.c create mode 100644 src/libvirt-connection.h create mode 100644 src/libvirt-domain.c create mode 100644 src/libvirt-domain.h create mode 100644 src/libvirt-network.c create mode 100644 src/libvirt-network.h create mode 100644 src/libvirt-node.c create mode 100644 src/libvirt-node.h create mode 100644 src/libvirt-nodedev.c create mode 100644 src/libvirt-nodedev.h create mode 100644 src/libvirt-nwfilter.c create mode 100644 src/libvirt-nwfilter.h create mode 100644 src/libvirt-snapshot.c create mode 100644 src/libvirt-snapshot.h create mode 100644 src/libvirt-storage.c create mode 100644 src/libvirt-storage.h create mode 100644 src/libvirt-stream.c create mode 100644 src/libvirt-stream.h -- 2.13.3

3 23

[libvirt] [PATCH] rpm: conditionalize dep on perl for perl-interpretor split in F27
by Daniel P. Berrange 05 Aug '17

05 Aug '17

Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- libvirt.spec.in | 4 ++++ mingw-libvirt.spec.in | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/libvirt.spec.in b/libvirt.spec.in index b074bd171..8abecae22 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -292,7 +292,11 @@ BuildRequires: libtool BuildRequires: /usr/bin/pod2man %endif BuildRequires: git +%if 0%{?fedora} >= 27 +BuildRequires: perl-interpretor +%else BuildRequires: perl +%endif BuildRequires: python %if %{with_systemd} BuildRequires: systemd-units diff --git a/mingw-libvirt.spec.in b/mingw-libvirt.spec.in index 4efa0ddbf..553d14022 100644 --- a/mingw-libvirt.spec.in +++ b/mingw-libvirt.spec.in @@ -59,7 +59,11 @@ BuildRequires: pkgconfig # Need native version for msgfmt BuildRequires: gettext BuildRequires: python +%if 0%{?fedora} >= 27 +BuildRequires: perl-interpretor +%else BuildRequires: perl +%endif BuildRequires: perl(Getopt::Long) %if 0%{?enable_autotools} BuildRequires: autoconf -- 2.13.3

3 3

[libvirt] [PATCH] tools: make wireshark build quiet
by Daniel P. Berrange 04 Aug '17

04 Aug '17

Use $(AM_V_GEN) when running wireshark related tools Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- tools/Makefile.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/Makefile.am b/tools/Makefile.am index 345521457..ffa8c3e19 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -439,7 +439,7 @@ wireshark/src/packet-libvirt.c: wireshark/src/packet-libvirt.h \ wireshark/src/libvirt/protocol.h wireshark/src/plugin.c: wireshark/src/packet-libvirt.c - cd wireshark/src && \ + $(AM_V_GEN)cd wireshark/src && \ $(abs_top_srcdir)/tools/wireshark/util/make-dissector-reg \ . plugin packet-libvirt.c @@ -451,7 +451,7 @@ WS_DISSECTOR_PROTO_FILES = \ wireshark/src/libvirt/protocol.h: wireshark/util/genxdrstub.pl \ $(WS_DISSECTOR_PROTO_FILES) - $(MKDIR_P) wireshark/src/libvirt + $(AM_V_GEN)$(MKDIR_P) wireshark/src/libvirt && \ cd wireshark/src && \ LIBVIRT_VERSION=$(LIBVIRT_VERSION) \ $(PERL) $(abs_top_srcdir)/tools/wireshark/util/genxdrstub.pl \ -- 2.13.3

2 1

[libvirt] [PATCH v3] libxl: Add a test suite for libxl_domain_config generator
by Marek Marczykowski-Górecki 04 Aug '17

04 Aug '17

From: Jim Fehlig <jfehlig(a)suse.com> The libxl library allows a libxl_domain_config object to be serialized from/to a JSON string. Use this to allow testing of the XML to libxl_domain_config conversion process. Test XML is converted to libxl_domain_config, which is then serialized to json. A json template corresponding to the test XML is converted to a libxl_domain_config object using libxl_domain_config_from_json(), and then serialized back to json using libxl_domain_config_to_json(). The two json docs are then compared. Using libxl to convert the json template to a libxl_domain_config object and then back to json provides a simple way to account for any changes or additions to the json representation across Xen releases. Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> [update to v3.5.0-rc1, improve error reporting, use /bin/true emulator] Signed-off-by: Marek Marczykowski-Górecki <marmarek(a)invisiblethingslab.com> --- m4/virt-driver-libxl.m4 | 6 +- tests/Makefile.am | 18 +- tests/libxlxml2domconfigdata/basic-hvm.json | 89 ++++++++- tests/libxlxml2domconfigdata/basic-hvm.xml | 36 +++- tests/libxlxml2domconfigdata/basic-pv.json | 65 ++++++- tests/libxlxml2domconfigdata/basic-pv.xml | 28 ++- tests/libxlxml2domconfigdata/moredevs-hvm.json | 111 ++++++++++- tests/libxlxml2domconfigdata/moredevs-hvm.xml | 63 ++++++- tests/libxlxml2domconfigtest.c | 205 ++++++++++++++++++- tests/virmocklibxl.c | 87 ++++++++- 10 files changed, 705 insertions(+), 3 deletions(-) create mode 100644 tests/libxlxml2domconfigdata/basic-hvm.json create mode 100644 tests/libxlxml2domconfigdata/basic-hvm.xml create mode 100644 tests/libxlxml2domconfigdata/basic-pv.json create mode 100644 tests/libxlxml2domconfigdata/basic-pv.xml create mode 100644 tests/libxlxml2domconfigdata/moredevs-hvm.json create mode 100644 tests/libxlxml2domconfigdata/moredevs-hvm.xml create mode 100644 tests/libxlxml2domconfigtest.c create mode 100644 tests/virmocklibxl.c diff --git a/m4/virt-driver-libxl.m4 b/m4/virt-driver-libxl.m4 index 96a9d47..3d635f0 100644 --- a/m4/virt-driver-libxl.m4 +++ b/m4/virt-driver-libxl.m4 @@ -35,7 +35,7 @@ AC_DEFUN([LIBVIRT_DRIVER_CHECK_LIBXL], [ if test "x$with_libxl" = "xyes" ; then LIBXL_FIRMWARE_DIR=$($PKG_CONFIG --variable xenfirmwaredir xenlight) LIBXL_EXECBIN_DIR=$($PKG_CONFIG --variable libexec_bin xenlight) - fi + fi dnl pkgconfig file not found, fallback to lib probe if test "x$with_libxl" = "xno" ; then @@ -80,6 +80,10 @@ AC_DEFUN([LIBVIRT_DRIVER_CHECK_LIBXL], [ LIBXL_LIBS="$LIBXL_LIBS -lxenctrl" ]) + dnl Check if libxl_domain_config_from_json is available for domXML to + dnl libxl_domain_config tests + LIBS="$LIBS -lxenlight -lxenctrl" + AC_CHECK_FUNCS([libxl_domain_config_from_json]) CFLAGS="$old_CFLAGS" LIBS="$old_LIBS" fi diff --git a/tests/Makefile.am b/tests/Makefile.am index 3e3d580..49b9d40 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -99,6 +99,7 @@ EXTRA_DIST = \ genericxml2xmlindata \ genericxml2xmloutdata \ interfaceschemadata \ + libxlxml2domconfigdata \ lxcconf2xmldata \ lxcxml2xmldata \ lxcxml2xmloutdata \ @@ -271,7 +272,8 @@ test_programs += xml2sexprtest sexpr2xmltest \ endif WITH_XEN if WITH_LIBXL -test_programs += xlconfigtest +test_programs += xlconfigtest libxlxml2domconfigtest +test_libraries += virmocklibxl.la endif WITH_LIBXL if WITH_QEMU @@ -528,8 +530,20 @@ xlconfigtest_SOURCES = \ xlconfigtest.c testutilsxen.c testutilsxen.h \ testutils.c testutils.h xlconfigtest_LDADD =$(libxl_LDADDS) + +libxlxml2domconfigtest_SOURCES = \ + libxlxml2domconfigtest.c testutilsxen.c testutilsxen.h \ + testutils.c testutils.h +libxlxml2domconfigtest_LDADD = $(libxl_LDADDS) $(LIBXML_LIBS) + +virmocklibxl_la_SOURCES = \ + virmocklibxl.c +virmocklibxl_la_CFLAGS = $(AM_CFLAGS) +virmocklibxl_la_LDFLAGS = -module -avoid-version \ + -rpath /evil/libtool/hack/to/force/shared/lib/creation + else ! WITH_LIBXL -EXTRA_DIST += xlconfigtest.c +EXTRA_DIST += xlconfigtest.c libxlxml2domconfigtest.c endif ! WITH_LIBXL QEMUMONITORTESTUTILS_SOURCES = \ diff --git a/tests/libxlxml2domconfigdata/basic-hvm.json b/tests/libxlxml2domconfigdata/basic-hvm.json new file mode 100644 index 0000000..6fa41f3 --- /dev/null +++ b/tests/libxlxml2domconfigdata/basic-hvm.json @@ -0,0 +1,89 @@ +{ + "c_info": { + "type": "hvm", + "name": "test-hvm", + "uuid": "2147d599-9cc6-c0dc-92ab-4064b5446e9b" + }, + "b_info": { + "max_vcpus": 4, + "avail_vcpus": [ + 0, + 1, + 2, + 3 + ], + "max_memkb": 1048576, + "target_memkb": 1048576, + "video_memkb": 8192, + "shadow_memkb": 12288, + "device_model_version": "qemu_xen", + "device_model": "/bin/true", + "sched_params": { + "weight": 1000 + }, + "type.hvm": { + "pae": "True", + "apic": "True", + "acpi": "True", + "vga": { + "kind": "cirrus" + }, + "vnc": { + "enable": "True", + "listen": "0.0.0.0", + "findunused": "False" + }, + "sdl": { + "enable": "False" + }, + "spice": { + + }, + "boot": "c", + "rdm": { + + } + }, + "arch_arm": { + + } + }, + "disks": [ + { + "pdev_path": "/var/lib/xen/images/test-hvm.img", + "vdev": "hda", + "backend": "qdisk", + "format": "raw", + "removable": 1, + "readwrite": 1 + } + ], + "nics": [ + { + "devid": 0, + "mac": "00:16:3e:66:12:b4", + "bridge": "br0", + "script": "/etc/xen/scripts/vif-bridge", + "nictype": "vif_ioemu" + } + ], + "vfbs": [ + { + "devid": -1, + "vnc": { + "enable": "True", + "listen": "0.0.0.0", + "findunused": "False" + }, + "sdl": { + "enable": "False" + } + } + ], + "vkbs": [ + { + "devid": -1 + } + ], + "on_reboot": "restart" +} diff --git a/tests/libxlxml2domconfigdata/basic-hvm.xml b/tests/libxlxml2domconfigdata/basic-hvm.xml new file mode 100644 index 0000000..d8cd2a2 --- /dev/null +++ b/tests/libxlxml2domconfigdata/basic-hvm.xml @@ -0,0 +1,36 @@ +<domain type='xen'> + <name>test-hvm</name> + <description>None</description> + <uuid>2147d599-9cc6-c0dc-92ab-4064b5446e9b</uuid> + <memory>1048576</memory> + <currentMemory>1048576</currentMemory> + <vcpu>4</vcpu> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <clock sync='utc'/> + <os> + <type>hvm</type> + <loader>/usr/lib/xen/boot/hvmloader</loader> + <boot dev='hd'/> + </os> + <features> + <apic/> + <acpi/> + <pae/> + </features> + <devices> + <emulator>/bin/true</emulator> + <disk type='file' device='disk'> + <driver name='qemu'/> + <source file='/var/lib/xen/images/test-hvm.img'/> + <target dev='hda'/> + </disk> + <interface type='bridge'> + <source bridge='br0'/> + <mac address='00:16:3e:66:12:b4'/> + <script path='/etc/xen/scripts/vif-bridge'/> + </interface> + <graphics type='vnc' port='-1' autoport='yes' listen='0.0.0.0'/> + </devices> +</domain> diff --git a/tests/libxlxml2domconfigdata/basic-pv.json b/tests/libxlxml2domconfigdata/basic-pv.json new file mode 100644 index 0000000..7e1abd3 --- /dev/null +++ b/tests/libxlxml2domconfigdata/basic-pv.json @@ -0,0 +1,65 @@ +{ + "c_info": { + "type": "pv", + "name": "test-pv", + "uuid": "039e9ee6-4a84-3055-4c81-8ba426ae2656" + }, + "b_info": { + "max_vcpus": 4, + "avail_vcpus": [ + 0, + 1, + 2, + 3 + ], + "max_memkb": 524288, + "target_memkb": 524288, + "sched_params": { + "weight": 1000 + }, + "type.pv": { + "bootloader": "pygrub" + }, + "arch_arm": { + + } + }, + "disks": [ + { + "pdev_path": "/var/lib/xen/images/test-pv.img", + "vdev": "xvda", + "backend": "qdisk", + "format": "raw", + "removable": 1, + "readwrite": 1 + } + ], + "nics": [ + { + "devid": 0, + "mac": "00:16:3e:3e:86:60", + "bridge": "br0", + "script": "/etc/xen/scripts/vif-bridge", + "nictype": "vif" + } + ], + "vfbs": [ + { + "devid": -1, + "vnc": { + "enable": "True", + "listen": "0.0.0.0", + "findunused": "False" + }, + "sdl": { + "enable": "False" + } + } + ], + "vkbs": [ + { + "devid": -1 + } + ], + "on_reboot": "restart" +} diff --git a/tests/libxlxml2domconfigdata/basic-pv.xml b/tests/libxlxml2domconfigdata/basic-pv.xml new file mode 100644 index 0000000..b3bc601 --- /dev/null +++ b/tests/libxlxml2domconfigdata/basic-pv.xml @@ -0,0 +1,28 @@ +<domain type='xen'> + <name>test-pv</name> + <uuid>039e9ee6-4a84-3055-4c81-8ba426ae2656</uuid> + <memory>524288</memory> + <currentMemory>524288</currentMemory> + <vcpu>4</vcpu> + <bootloader>pygrub</bootloader> + <os> + <type arch='i686' machine='xenpv'>linux</type> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <disk type='file' device='disk'> + <driver name='qemu'/> + <source file='/var/lib/xen/images/test-pv.img'/> + <target dev='xvda'/> + </disk> + <interface type='bridge'> + <source bridge='br0'/> + <mac address='00:16:3e:3e:86:60'/> + <script path='/etc/xen/scripts/vif-bridge'/> + </interface> + <graphics type='vnc' port='-1' autoport='yes' listen='0.0.0.0'/> + </devices> +</domain> diff --git a/tests/libxlxml2domconfigdata/moredevs-hvm.json b/tests/libxlxml2domconfigdata/moredevs-hvm.json new file mode 100644 index 0000000..8f861f3 --- /dev/null +++ b/tests/libxlxml2domconfigdata/moredevs-hvm.json @@ -0,0 +1,111 @@ +{ + "c_info": { + "type": "hvm", + "hap": "True", + "name": "test-hvm", + "uuid": "2147d599-9cc6-c0dc-92ab-4064b5446e9b" + }, + "b_info": { + "max_vcpus": 4, + "avail_vcpus": [ + 0, + 1, + 2, + 3 + ], + "tsc_mode": "native", + "max_memkb": 1048576, + "target_memkb": 1048576, + "video_memkb": 8192, + "shadow_memkb": 12288, + "device_model_version": "qemu_xen", + "device_model": "/bin/true", + "sched_params": { + "weight": 1000 + }, + "type.hvm": { + "pae": "True", + "apic": "True", + "acpi": "True", + "hpet": "True", + "vga": { + "kind": "cirrus" + }, + "vnc": { + "enable": "True", + "findunused": "False" + }, + "sdl": { + "enable": "False" + }, + "spice": { + + }, + "serial": "pty", + "boot": "c", + "usbdevice_list": [ + "mouse", + "tablet" + ], + "rdm": { + + } + }, + "arch_arm": { + + } + }, + "disks": [ + { + "pdev_path": "/var/lib/xen/images/test-hvm.img", + "vdev": "hda", + "backend": "qdisk", + "format": "raw", + "removable": 1, + "readwrite": 1 + }, + { + "pdev_path": "/root/boot.iso", + "vdev": "hdb", + "backend": "qdisk", + "format": "raw", + "removable": 1, + "is_cdrom": 1 + } + ], + "nics": [ + { + "devid": 0, + "model": "netfront", + "mac": "00:16:3e:7a:35:ce", + "bridge": "br0", + "script": "/etc/xen/scripts/vif-bridge", + "nictype": "vif" + } + ], + "pcidevs": [ + { + "dev": 16, + "bus": 10, + "rdm_policy": "invalid" + } + ], + "vfbs": [ + { + "devid": -1, + "vnc": { + "enable": "True", + "findunused": "False" + }, + "sdl": { + "enable": "False" + } + } + ], + "vkbs": [ + { + "devid": -1 + } + ], + "on_reboot": "restart" +} diff --git a/tests/libxlxml2domconfigdata/moredevs-hvm.xml b/tests/libxlxml2domconfigdata/moredevs-hvm.xml new file mode 100644 index 0000000..f7eb09f --- /dev/null +++ b/tests/libxlxml2domconfigdata/moredevs-hvm.xml @@ -0,0 +1,63 @@ +<domain type='xen'> + <name>test-hvm</name> + <description>None</description> + <uuid>2147d599-9cc6-c0dc-92ab-4064b5446e9b</uuid> + <memory>1048576</memory> + <currentMemory>1048576</currentMemory> + <vcpu>4</vcpu> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <clock offset='variable' adjustment='0' basis='utc'> + <timer name='tsc' present='yes' mode='native'/> + <timer name='hpet' present='yes'/> + </clock> + <os> + <type>hvm</type> + <loader>/usr/lib/xen/boot/hvmloader</loader> + <boot dev='hd'/> + </os> + <features> + <apic/> + <acpi/> + <pae/> + <hap/> + </features> + <devices> + <emulator>/bin/true</emulator> + <disk type='file' device='disk'> + <driver name='qemu' type='raw' cache='default'/> + <source file='/var/lib/xen/images/test-hvm.img'/> + <target dev='hda'/> + </disk> + <disk type='file' device='cdrom'> + <driver name='qemu' type='raw' cache='default'/> + <source file='/root/boot.iso'/> + <target dev='hdb'/> + </disk> + <interface type='bridge'> + <source bridge='br0'/> + <mac address='00:16:3e:7a:35:ce'/> + <script path='/etc/xen/scripts/vif-bridge'/> + <model type='netfront'/> + </interface> + <interface type='hostdev' managed='yes'> + <mac address='00:16:3e:2e:e7:fc'/> + <driver name='xen'/> + <source> + <address type='pci' domain='0x0000' bus='0x0a' slot='0x10' function='0x0'/> + </source> + </interface> + <graphics type='vnc'/> + <video> + <model type='cirrus' vram='8192' heads='1' primary='yes'/> + </video> + <console type='pty'> + <target port='0'/> + </console> + <input type='mouse' bus='usb'/> + <input type='tablet' bus='usb'/> + <input type='mouse' bus='ps2'/> + <input type='keyboard' bus='ps2'/> + </devices> +</domain> diff --git a/tests/libxlxml2domconfigtest.c b/tests/libxlxml2domconfigtest.c new file mode 100644 index 0000000..d943cf2 --- /dev/null +++ b/tests/libxlxml2domconfigtest.c @@ -0,0 +1,205 @@ +/* + * libxlxml2domconfigtest.c: test conversion of domXML to + * libxl_domain_config structure. + * + * Copyright (C) 2017 SUSE LINUX Products GmbH, Nuernberg, Germany. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library. If not, see + * <http://www.gnu.org/licenses/>. + * + * Author: Jim Fehlig <jfehlig(a)suse.com> + */ + +#include <config.h> + +#include <stdio.h> +#include <stdlib.h> +#include <unistd.h> +#include <string.h> + +#include <sys/types.h> +#include <fcntl.h> + +#include "testutils.h" + +#if defined(WITH_LIBXL) && defined(WITH_YAJL) && defined(HAVE_LIBXL_DOMAIN_CONFIG_FROM_JSON) + +# include "internal.h" +# include "viralloc.h" +# include "libxl/libxl_conf.h" +# include "datatypes.h" +# include "virstring.h" +# include "virmock.h" +# include "virjson.h" +# include "testutilsxen.h" + +# define VIR_FROM_THIS VIR_FROM_LIBXL + +static const char *abs_top_srcdir; +static virCapsPtr xencaps; + +static int +testCompareXMLToDomConfig(const char *xmlfile, + const char *jsonfile) +{ + int ret = -1; + libxl_domain_config actualconfig; + libxl_domain_config expectconfig; + xentoollog_logger *log = NULL; + libxl_ctx *ctx = NULL; + virPortAllocatorPtr gports = NULL; + virDomainXMLOptionPtr xmlopt = NULL; + virDomainDefPtr vmdef = NULL; + char *actualjson = NULL; + char *tempjson = NULL; + char *expectjson = NULL; + + libxl_domain_config_init(&actualconfig); + libxl_domain_config_init(&expectconfig); + + if (!(log = (xentoollog_logger *)xtl_createlogger_stdiostream(stderr, XTL_DEBUG, 0))) + goto cleanup; + + if (libxl_ctx_alloc(&ctx, LIBXL_VERSION, 0, log) < 0) + goto cleanup; + + if (!(gports = virPortAllocatorNew("vnc", 5900, 6000, + VIR_PORT_ALLOCATOR_SKIP_BIND_CHECK))) + goto cleanup; + + if (!(xmlopt = libxlCreateXMLConf())) + goto cleanup; + + if (!(vmdef = virDomainDefParseFile(xmlfile, xencaps, xmlopt, + NULL, VIR_DOMAIN_XML_INACTIVE))) + goto cleanup; + + if (libxlBuildDomainConfig(gports, vmdef, NULL, ctx, xencaps, &actualconfig) < 0) + goto cleanup; + + if (!(actualjson = libxl_domain_config_to_json(ctx, &actualconfig))) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + "Failed to retrieve JSON doc for libxl_domain_config"); + goto cleanup; + } + + virTestLoadFile(jsonfile, &tempjson); + if (libxl_domain_config_from_json(ctx, &expectconfig, tempjson) != 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + "Failed to create libxl_domain_config from JSON doc"); + goto cleanup; + } + if (!(expectjson = libxl_domain_config_to_json(ctx, &expectconfig))) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + "Failed to retrieve JSON doc for libxl_domain_config"); + goto cleanup; + } + + if (virTestCompareToString(expectjson, actualjson) < 0) + goto cleanup; + + ret = 0; + + cleanup: + VIR_FREE(expectjson); + VIR_FREE(actualjson); + VIR_FREE(tempjson); + virDomainDefFree(vmdef); + virObjectUnref(gports); + virObjectUnref(xmlopt); + libxl_ctx_free(ctx); + libxl_domain_config_dispose(&actualconfig); + libxl_domain_config_dispose(&expectconfig); + xtl_logger_destroy(log); + return ret; +} + + +struct testInfo { + const char *name; +}; + + +static int +testCompareXMLToDomConfigHelper(const void *data) +{ + int ret = -1; + const struct testInfo *info = data; + char *xmlfile = NULL; + char *jsonfile = NULL; + + if (virAsprintf(&xmlfile, "%s/libxlxml2domconfigdata/%s.xml", + abs_srcdir, info->name) < 0 || + virAsprintf(&jsonfile, "%s/libxlxml2domconfigdata/%s.json", + abs_srcdir, info->name) < 0) + goto cleanup; + + ret = testCompareXMLToDomConfig(xmlfile, jsonfile); + + cleanup: + VIR_FREE(xmlfile); + VIR_FREE(jsonfile); + return ret; +} + + +static int +mymain(void) +{ + int ret = 0; + + abs_top_srcdir = getenv("abs_top_srcdir"); + if (!abs_top_srcdir) + abs_top_srcdir = abs_srcdir "/.."; + + /* Set the timezone because we are mocking the time() function. + * If we don't do that, then localtime() may return unpredictable + * results. In order to detect things that just work by a blind + * chance, we need to set an virtual timezone that no libvirt + * developer resides in. */ + if (setenv("TZ", "VIR00:30", 1) < 0) { + perror("setenv"); + return EXIT_FAILURE; + } + + if ((xencaps = testXenCapsInit()) == NULL) + return EXIT_FAILURE; + +# define DO_TEST(name) \ + do { \ + static struct testInfo info = { \ + name, \ + }; \ + if (virTestRun("LibXL XML-2-JSON " name, \ + testCompareXMLToDomConfigHelper, &info) < 0) \ + ret = -1; \ + } while (0) + + DO_TEST("basic-pv"); + DO_TEST("basic-hvm"); + DO_TEST("moredevs-hvm"); + + return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; +} + +VIR_TEST_MAIN_PRELOAD(mymain, abs_builddir "/.libs/virmocklibxl.so") + +#else + +int main(void) +{ + return EXIT_AM_SKIP; +} + +#endif /* WITH_LIBXL && WITH_YAJL && HAVE_LIBXL_DOMAIN_CONFIG_FROM_JSON */ diff --git a/tests/virmocklibxl.c b/tests/virmocklibxl.c new file mode 100644 index 0000000..bc4b53d --- /dev/null +++ b/tests/virmocklibxl.c @@ -0,0 +1,87 @@ +/* + * virmocklibxl.c: mocking of xenstore/libxs for libxl + * + * Copyright (C) 2014 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 + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library. If not, see + * <http://www.gnu.org/licenses/>. + * + * Author: Daniel P. Berrange <berrange(a)redhat.com> + */ + +#include <config.h> + +#if defined(WITH_LIBXL) && defined(WITH_YAJL) +# include "virmock.h" +# include <sys/stat.h> +# include <unistd.h> +# include <libxl.h> +# include <xenstore.h> +# include <xenctrl.h> + +VIR_MOCK_IMPL_RET_VOID(xs_daemon_open, + struct xs_handle *) +{ + VIR_MOCK_REAL_INIT(xs_daemon_open); + return (void*)0x1; +} + +VIR_MOCK_IMPL_RET_ARGS(xc_interface_open, + xc_interface *, + xentoollog_logger *, logger, + xentoollog_logger *, dombuild_logger, + unsigned, open_flags) +{ + VIR_MOCK_REAL_INIT(xc_interface_open); + return (void*)0x1; +} + + +VIR_MOCK_STUB_RET_ARGS(xc_interface_close, + int, 0, + xc_interface *, handle) + +VIR_MOCK_STUB_VOID_ARGS(xs_daemon_close, + struct xs_handle *, handle) + +VIR_MOCK_IMPL_RET_ARGS(__xstat, int, + int, ver, + const char *, path, + struct stat *, sb) +{ + VIR_MOCK_REAL_INIT(__xstat); + + if (strstr(path, "xenstored.pid")) { + memset(sb, 0, sizeof(*sb)); + return 0; + } + + return real___xstat(ver, path, sb); +} + +VIR_MOCK_IMPL_RET_ARGS(stat, int, + const char *, path, + struct stat *, sb) +{ + VIR_MOCK_REAL_INIT(stat); + + if (strstr(path, "xenstored.pid")) { + memset(sb, 0, sizeof(*sb)); + return 0; + } + + return real_stat(path, sb); +} + +#endif /* WITH_LIBXL && WITH_YAJL */ base-commit: ace45e67abbd9a033be54602db71a9dbc71408d7 -- git-series 0.9.1

3 3

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

04 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 dynanically adapt based on viewport size, so a mobile device gets a layout more suited to its dimensions. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- docs/main.css | 1 + docs/mobile.css | 95 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ docs/page.xsl | 34 +++++++++++++++++++++ 3 files changed, 130 insertions(+) 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..0fc1e9d71 --- /dev/null +++ b/docs/mobile.css @@ -0,0 +1,95 @@ + +@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..0f762be7d 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"> -- 2.13.3

3 4

[libvirt] [PATCH v2 0/4] Add setting CPU features (CPUID) with libxenlight driver.
by Marek Marczykowski-Górecki 04 Aug '17

04 Aug '17

Tests (patches 3 and 4) depends on libxl_domain_config test suite: https://www.redhat.com/archives/libvir-list/2017-February/msg01477.html But first two patches can be applied independently. Marek Marczykowski-Górecki (4): cpu: define sub-leaf 0 for leaf 7 in cpu_map.xml libxl: add support for CPUID features policy tests: switch libxlxml2domconfig test to use testXLInintCaps tests: check CPU features handling in libxl driver src/cpu/cpu_map.xml | 58 ++++++------- src/libxl/libxl_conf.c | 77 ++++++++++++++++- src/libxl/libxl_conf.h | 1 +- tests/libxlxml2domconfigdata/basic-pv.xml | 2 +- tests/libxlxml2domconfigdata/fullvirt-cpuid.json | 64 ++++++++++++++- tests/libxlxml2domconfigdata/fullvirt-cpuid.xml | 37 ++++++++- tests/libxlxml2domconfigtest.c | 3 +- 7 files changed, 207 insertions(+), 35 deletions(-) create mode 100644 tests/libxlxml2domconfigdata/fullvirt-cpuid.json create mode 100644 tests/libxlxml2domconfigdata/fullvirt-cpuid.xml base-commit: fbcc08b245bb7d5502633d9cb4048281cc9d8532 -- git-series 0.9.1

3 12

[libvirt] [PATCH RESEND] Interface: return appropriate status for bridge device
by Lin Ma 03 Aug '17

03 Aug '17

In function udevInterfaceIsActive, The current design relies on the sys attribute 'operstate' to determine whether the interface is active. For the device node of virtual network(say virbr0), There is already a dummy tap device to maintain a fixed mac on it, So it's available and its status should be considered as active. But if no anyelse tap device connects to it, The value of operstate of virbr0 in sysfs is 'down', So udevInterfaceIsActive returns 0, It causes 'virsh iface-list --all' to report the status of virbr0 as 'inactive'. This patch fixes the issue by counting slave devices for bridge device. Signed-off-by: Lin Ma <lma(a)suse.com> --- src/interface/interface_backend_udev.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/src/interface/interface_backend_udev.c b/src/interface/interface_backend_udev.c index 5d0fc64..9ac4674 100644 --- a/src/interface/interface_backend_udev.c +++ b/src/interface/interface_backend_udev.c @@ -1127,6 +1127,11 @@ udevInterfaceIsActive(virInterfacePtr ifinfo) struct udev_device *dev; virInterfaceDefPtr def = NULL; int status = -1; + struct dirent **member_list = NULL; + const char *devtype; + int member_count = 0; + char *member_path; + size_t i; dev = udev_device_new_from_subsystem_sysname(udev, "net", ifinfo->name); @@ -1146,6 +1151,23 @@ udevInterfaceIsActive(virInterfacePtr ifinfo) /* Check if it's active or not */ status = STREQ(udev_device_get_sysattr_value(dev, "operstate"), "up"); + if (!status) { + devtype = udev_device_get_devtype(dev); + if (STREQ_NULLABLE(devtype, "bridge")) { + if (virAsprintf(&member_path, "%s/%s", + udev_device_get_syspath(dev), "brif") < 0) + goto cleanup; + member_count = scandir(member_path, &member_list, + udevBridgeScanDirFilter, alphasort); + if (member_count > 0) + status = 1; + for (i = 0; i < member_count; i++) + VIR_FREE(member_list[i]); + VIR_FREE(member_list); + VIR_FREE(member_path); + } + } + udev_device_unref(dev); cleanup: -- 2.9.2

3 2

[libvirt] [PATCH 0/3] qemu: command: clean up default cpu formatting
by Cole Robinson 03 Aug '17

03 Aug '17

Just some minor patches to do with encoding a default CPU on the qemu command line. Patch 1 adds a test case Patch 2 simplifies the code Patch 3 throws an explicit error for a confusing situation Cole Robinson (3): tests: add qemu x86 kvm 32-on-64 test qemu: command: rework adding of default cpu model qemu: command: explicitly error for non-x86 default CPU src/qemu/qemu_command.c | 95 +++++++++------------- .../qemuxml2argvdata/qemuxml2argv-hyperv-off.args | 1 - .../qemuxml2argv-kvm-features-off.args | 1 - .../qemuxml2argv-x86-kvm-32-on-64.args | 21 +++++ .../qemuxml2argv-x86-kvm-32-on-64.xml | 13 +++ tests/qemuxml2argvtest.c | 1 + tests/testutilsqemu.c | 18 +++- 7 files changed, 90 insertions(+), 60 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-x86-kvm-32-on-64.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-x86-kvm-32-on-64.xml -- 2.13.3

4 10

[libvirt] [PATCH v2 0/8] Some virObjectRW* adjustments
by John Ferlan 03 Aug '17

03 Aug '17

v1: https://www.redhat.com/archives/libvir-list/2017-July/msg01313.html Differences from v1: * Use the names virObjectRWLockRead, virObjectRWLockWrite and virObjectRWUnlock * Instead of an 'int' return, make the virObjectRWLock{Read|Write} be void returns just like virObject{Lock|Unlock} * Separate out the magic number check for the virObjectIsClass consumers into its own patch and describe the reasons for usage. * Apply the same magic number check to virObject{Ref|Unref} separately. BTW: This looks and works eally nice with what I have for common objects... John Ferlan (8): util: Rename virObjectLockRead to virObjectRWLockRead util: Introduce and use virObjectRWLockWrite util: Only have virObjectLock handle virObjectLockable util: Introduce virObjectGetRWLockableObj util: Introduce and use virObjectRWUnlock util: Create common error path for invalid object util: Add magic number check for object validity util: Add object checking for virObject{Ref|Unref} src/conf/virdomainobjlist.c | 62 ++++++++-------- src/libvirt_private.syms | 4 +- src/util/virobject.c | 169 +++++++++++++++++++++++++++++++++----------- src/util/virobject.h | 10 ++- 4 files changed, 169 insertions(+), 76 deletions(-) -- 2.9.4

2 14

[libvirt] [PATCH v3 0/2] Restrict usage of unsupported clock timers
by Kothapally Madhu Pavan 03 Aug '17

03 Aug '17

hpet and kvm.pit clock timers are specific to x86 architecture and are not to be used by unsuported architectures. Similarly sPAPR guests only allow RTC timer. This patchset will restrict the usage of unsupported clock timers. Kothapally Madhu Pavan (2): qemu: Restrict usage of hpet and kvm.pit timers by unsupported architectures qemu: Default hwclock source for sPAPR to RTC src/qemu/qemu_domain.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) -- 1.8.3.1

2 3