- Devel - libvirt List Archives

[libvirt] [PATCH] qemu: Only use memory-backend-file with NUMA if needed
by Martin Kletzander 29 Sep '16

29 Sep '16

If this reminds you of a commit message from around a year ago, it's 41c2aa729f0af084ede95ee9a06219a2dd5fb5df and yes, we're dealing with "the same thing" again. Or f309db1f4d51009bad0d32e12efc75530b66836b and it's similar. There is a logic in place that if there is no real need for memory-backend-file, qemuBuildMemoryBackendStr() returns 0. However that wasn't the case with hugepage backing. The reason for that was that we abused the 'pagesize' variable for storing that information, but we should rather have a separate one that specifies whether we really need the new object for hugepage backing. And that variable should be set only if this particular NUMA cell needs special treatment WRT hugepages. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1372153 Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- Notes: This fixes migration from older libvirts. By "older", I mean pre-(circa-)1.2.7, also in some cases pre-1.2.11, in some other cases pre-v1.2.20. It's pretty messy. It could be back-ported as far as it's easy to do. src/qemu/qemu_command.c | 8 +++++--- tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages2.args | 10 ++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 1ac0fa116310..316aced5124a 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -3202,6 +3202,7 @@ qemuBuildMemoryBackendStr(unsigned long long size, int ret = -1; virJSONValuePtr props = NULL; bool nodeSpecified = virDomainNumatuneNodeSpecified(def->numa, guestNode); + bool needHugepage = !!pagesize; *backendProps = NULL; *backendType = NULL; @@ -3224,10 +3225,10 @@ qemuBuildMemoryBackendStr(unsigned long long size, mode = VIR_DOMAIN_NUMATUNE_MEM_STRICT; if (pagesize == 0) { + bool thisHugepage = false; + /* Find the huge page size we want to use */ for (i = 0; i < def->mem.nhugepages; i++) { - bool thisHugepage = false; - hugepage = &def->mem.hugepages[i]; if (!hugepage->nodemask) { @@ -3249,6 +3250,7 @@ qemuBuildMemoryBackendStr(unsigned long long size, if (thisHugepage) { /* Hooray, we've found the page size */ + needHugepage = true; break; } } @@ -3335,7 +3337,7 @@ qemuBuildMemoryBackendStr(unsigned long long size, } /* If none of the following is requested... */ - if (!pagesize && !userNodeset && !memAccess && !nodeSpecified && !force) { + if (!needHugepage && !userNodeset && !memAccess && !nodeSpecified && !force) { /* report back that using the new backend is not necessary * to achieve the desired configuration */ ret = 1; diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages2.args b/tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages2.args index 447bb52d00b7..a37f03d0d2ed 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages2.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages2.args @@ -10,12 +10,10 @@ QEMU_AUDIO_DRV=none \ -M pc \ -m 1024 \ -smp 2,sockets=2,cores=1,threads=1 \ --object memory-backend-file,id=ram-node0,prealloc=yes,\ -mem-path=/dev/hugepages2M/libvirt/qemu,size=268435456 \ --numa node,nodeid=0,cpus=0,memdev=ram-node0 \ --object memory-backend-file,id=ram-node1,prealloc=yes,\ -mem-path=/dev/hugepages2M/libvirt/qemu,size=805306368 \ --numa node,nodeid=1,cpus=1,memdev=ram-node1 \ +-mem-prealloc \ +-mem-path /dev/hugepages2M/libvirt/qemu \ +-numa node,nodeid=0,cpus=0,mem=256 \ +-numa node,nodeid=1,cpus=1,mem=768 \ -uuid ef1bdff4-27f3-4e85-a807-5fb4d58463cc \ -nographic \ -nodefaults \ -- 2.10.0

3 4

[libvirt] [PATCH] vsh: Write out history on "quit" or "exit" in interactive mode
by John Ferlan 29 Sep '16

29 Sep '16

https://bugzilla.redhat.com/show_bug.cgi?id=1379895 Introduced by commit id '834c5720'. During the code motion and creation of vsh.c, the function 'vshDeinit()' in the (new) vsh.c was altered from whence it came in virsh.c such that calling 'vshReadlineDeinit(ctl)' was conditional on "ctl->imode". This causes a problem for the interactive running if the "quit" and "exit" commands are used because 'cmdQuit' will clear ctl->imode, thus when the interactive loop in main() of virsh.c exits because ctl->mode is clear and virshDeinit is called which calls vshDeinit, the history file is now not written. Conversely, if one had exited the interactive loop via pressing <ctrl>D the file would be created because loop control is broken on EOF and ctl->imode is not set to false. This patch will remove the conditional call to vshReadlineDeinit and restore the former behaviour. Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- I realize some people don't like the comment I added; however, I'd rather be "safe" when purely reading the code than expect someone to do a git log -p looking at commit messages for "removed" lines of code. An alternative approach would be to create/set a new boolean value such as "iquit" (or "iexit") during cmdQuit and then in vshDeinit make calling vshReadlineDeinit() conditional on "ctl->imode || ctl->iquit" Calling the vshReadlineDeinit during non interactive mode would have no affect since vshReadlineInit is only called if ctl->imode is set. The Deinit function will essentially do nothing other than a couple of VIR_FREE(NULL); and one extra "if" tools/vsh.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/tools/vsh.c b/tools/vsh.c index 041113f..eba3f0f 100644 --- a/tools/vsh.c +++ b/tools/vsh.c @@ -3093,8 +3093,12 @@ vshInitReload(vshControl *ctl) void vshDeinit(vshControl *ctl) { - if (ctl->imode) - vshReadlineDeinit(ctl); + /* Don't make calling vshReadlineDeinit conditional on imode. During + * interactive mode when "quit" or "exit" is typed, 'imode' is set + * to false so if this were conditional on imode, then history wouldn't + * be written when the "quit" or "exit" commands were used instead of + * when <ctrl>D is used */ + vshReadlineDeinit(ctl); vshCloseLogFile(ctl); } -- 2.7.4

2 3

[libvirt] [RFC] daemon: remove hardcode dep on libvirt-guests
by Nikolay Shirokovskiy 29 Sep '16

29 Sep '16

Hi, all. In virtuozzo mgmt we do not use libvirt-guests service. First because we need do extra steps on domain start and second we want to decice whether to suspend or to shutdown a domain on per domain basis. Starting is not the problem but system shutdown is. As domain in systemd based systems is just another unit we need to set ordering dependency so that domain will not be killed before mgmt service as ba79e387 do for libvirt-guest service. So let's remove this hardcode. I see 2 options. 1. Take dependant service name from config. 2. Introduce intermediate service that will specify real dependency. Looks like this one is more flexible. By the way AFAIK this is the only place that harcode libvirt-guests in libvirtd. Nikolay

3 4

[libvirt] [libvirt-php][PATCH 00/11] Resolve reverse include order
by Michal Privoznik 29 Sep '16

29 Sep '16

These are not pushed yet as they might be somewhat controversial. I'll wait if somebody wants to review them. The ultimate goal is to, well drop libvirt-php.h completely. It is needless. But before going there we must distribute the interesting parts from it around. Therefore I'm introducing some modules (like it should have been done from the start). Anyway, happy coding! Michal Privoznik (11): vncfunc: Honour static function Move DEFAULT_LOG_MAXSIZE to libvirt-php.c Move VNC_MAX_AUTH_ATTEMPTS to vncfunc.c libvirt-php.c: Move system headers together src: Introduce util.h src: Introduce util.c src: Introduce vncfunc.h src: Introduce sockets.h vncfunc: Drop include of libvirt-php.h sockets: Drop include of libvirt-php.h Clean up debug macros configure.ac | 1 + src/Makefile.am | 5 ++-- src/config.m4 | 2 +- src/libvirt-php.c | 69 +++++++++++++++++---------------------------- src/libvirt-php.h | 81 ----------------------------------------------------- src/sockets.c | 24 +++++++++++----- src/sockets.h | 32 +++++++++++++++++++++ src/util.c | 73 ++++++++++++++++++++++++++++++++++++++++++++++++ src/util.h | 73 ++++++++++++++++++++++++++++++++++++++++++++++++ src/vncfunc.c | 83 +++++++++++++++++++++++++++++++++++++++++-------------- src/vncfunc.h | 38 +++++++++++++++++++++++++ 11 files changed, 325 insertions(+), 156 deletions(-) create mode 100644 src/sockets.h create mode 100644 src/util.c create mode 100644 src/util.h create mode 100644 src/vncfunc.h -- 2.8.4

2 14

[libvirt] [PATCH 0/1] Sample driver for mediated device framework
by Kirti Wankhede 29 Sep '16

29 Sep '16

This sample driver is with reference to v7 patch of Mediated device support: https://lists.gnu.org/archive/html/qemu-devel/2016-08/msg03798.html https://lists.gnu.org/archive/html/qemu-devel/2016-08/msg03799.html https://lists.gnu.org/archive/html/qemu-devel/2016-08/msg03800.html https://lists.gnu.org/archive/html/qemu-devel/2016-08/msg03811.html https://lists.gnu.org/archive/html/qemu-devel/2016-08/msg03802.html We are working on v8 version of this patchset. This sample is to get the feel of how mediated device framework works. This is a simple sample driver that creates device that simulates serial port over PCI card. Updated vfio-mediated-device.txt with details of how it works with mdev framework. We will have v8 version of mediated device framework soon and this sample driver will get updated accordingly. But this will enable people/public to get more insights of this framework and how it is supposed to work. Kirti Wankhede (1): Add simple sample driver for mediated device framework Documentation/mdev/Makefile | 14 + Documentation/mdev/mtty.c | 1202 +++++++++++++++++++++ Documentation/{ => mdev}/vfio-mediated-device.txt | 61 ++ 3 files changed, 1277 insertions(+) create mode 100644 Documentation/mdev/Makefile create mode 100644 Documentation/mdev/mtty.c rename Documentation/{ => mdev}/vfio-mediated-device.txt (78%) -- 2.7.0

1 1

[libvirt] [PATCH] network: Add support for configuring dhcp lease time
by Nehal J Wani 29 Sep '16

29 Sep '16

The default dhcp lease time set by dnsmasq is only one hour, which can be pretty small for developers relying on ip address(es) to be consistent across reboots. This patch adds support for setting a lease time in the network definition. For now, all IP ranges under one <dhcp> will share a common leasetime. An example: <dhcp> <leasetime units='hours'>12</leasetime> </dhcp> The value for attribute 'units' can be seconds/hours/days/weeks/s/h/d/w. If the leasetime specified is -1, it is considered to be infinite. docs/schema/{basictypes,network}.rng * Add datatype long * Introduce timeUnits, scaledTime * Add schema for tag: leasetime src/util/virutil.{c,h} * Introduce virScaleTime() src/conf/network_conf.h * Extend virNetworkIPDef to accomodate leastime * Define VIR_NETWORK_DHCP_LEASE_TIME_MAX src/conf/network_conf.c * Introduce virNetworkDHCPLeaseTimeParseXML * Modify virNetworkDHCPDefParseXML to have XPath context pointer tests/* * Add test cases for xml parsing and conversion Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=913446 --- docs/schemas/basictypes.rng | 20 +++++++ docs/schemas/network.rng | 10 +++- src/conf/network_conf.c | 67 ++++++++++++++++++++- src/conf/network_conf.h | 11 ++++ src/network/bridge_driver.c | 8 +++ src/util/virutil.c | 70 ++++++++++++++++++++++ src/util/virutil.h | 3 + .../isolated-network-with-lease-time.conf | 17 ++++++ .../isolated-network-with-lease-time.xml | 24 ++++++++ tests/networkxml2conftest.c | 1 + .../isolated-network-with-lease-time.xml | 24 ++++++++ .../isolated-network-with-lease-time.xml | 24 ++++++++ tests/networkxml2xmltest.c | 1 + 13 files changed, 276 insertions(+), 4 deletions(-) create mode 100644 tests/networkxml2confdata/isolated-network-with-lease-time.conf create mode 100644 tests/networkxml2confdata/isolated-network-with-lease-time.xml create mode 100644 tests/networkxml2xmlin/isolated-network-with-lease-time.xml create mode 100644 tests/networkxml2xmlout/isolated-network-with-lease-time.xml diff --git a/docs/schemas/basictypes.rng b/docs/schemas/basictypes.rng index 1b4f980..023edfb 100644 --- a/docs/schemas/basictypes.rng +++ b/docs/schemas/basictypes.rng @@ -13,6 +13,12 @@ <param name='pattern'>[0-9]+</param> </data> </define> +  + <define name='long'> + <data type='long'> + <param name='pattern'>-?[0-9]+</param> + </data> + </define> <define name='hexuint'> <data type='string'> @@ -283,6 +289,20 @@ <ref name='unsignedLong'/> </define> + <define name='timeUnit'> + <data type='string'> + <param name='pattern'>(seconds|minutes|hours|days|weeks|s|m|h|d|w)</param> + </data> + </define> + <define name='scaledTime'> + <optional> + <attribute name='timeUnit'> + <ref name='timeUnit'/> + </attribute> + </optional> + <ref name='long'/> + </define> + <define name="pciDomain"> <ref name="uint16"/> </define> diff --git a/docs/schemas/network.rng b/docs/schemas/network.rng index 1a18e64..66b65bc 100644 --- a/docs/schemas/network.rng +++ b/docs/schemas/network.rng @@ -337,9 +337,15 @@ </element> </optional> <optional> -  <element name="dhcp"> + <optional> + <element name="leasetime"> + <ref name="scaledTime"/> + <attribute name="unit"><ref name="timeUnit"/></attribute> + </element> + </optional> +  <zeroOrMore> <element name="range"> <attribute name="start"><ref name="ipAddr"/></attribute> diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c index aa39776..d2372f2 100644 --- a/src/conf/network_conf.c +++ b/src/conf/network_conf.c @@ -1032,21 +1032,76 @@ virNetworkDHCPHostDefParseXML(const char *networkName, } static int +virNetworkDHCPLeaseTimeParseXML(const char *networkName, + virNetworkIPDefPtr def, + xmlXPathContextPtr ctxt, + xmlNodePtr node) +{ + int ret = -1; + int scale = 1; + xmlNodePtr save; + char *unit = NULL; + int leasetimeRV = 0; + long long leasetime; + + save = ctxt->node; + ctxt->node = node; + + leasetimeRV = virXPathLongLong("string(./text())", ctxt, &leasetime); + if (leasetimeRV == -2) { + virReportError(VIR_ERR_XML_ERROR, + _("Invalid long long value specified for leasetime " + "in definition of network '%s'"), + networkName); + goto cleanup; + } else { + if (leasetime < 0) { + leasetime = -1; /* infinite */ + } else { + unit = virXPathString("string(./@unit)", ctxt); + if (virScaleTime(&leasetime, unit, scale, + VIR_NETWORK_DHCP_LEASE_TIME_MAX) < 0) { + // let virScaleTime() report the appropriate error + goto cleanup; + } + } + } + + def->leasetime = leasetime; + ret = 0; + + cleanup: + VIR_FREE(unit); + ctxt->node = save; + return ret; +} + +static int virNetworkDHCPDefParseXML(const char *networkName, xmlNodePtr node, + xmlXPathContextPtr ctxt, virNetworkIPDefPtr def) { int ret = -1; - xmlNodePtr cur; + xmlNodePtr cur, save; virSocketAddrRange range; virNetworkDHCPHostDef host; memset(&range, 0, sizeof(range)); memset(&host, 0, sizeof(host)); + save = ctxt->node; + ctxt->node = node; + cur = node->children; while (cur != NULL) { if (cur->type == XML_ELEMENT_NODE && + xmlStrEqual(cur->name, BAD_CAST "leasetime")) { + + if (virNetworkDHCPLeaseTimeParseXML(networkName, def, ctxt, cur) < 0) + goto cleanup; + + } else if (cur->type == XML_ELEMENT_NODE && xmlStrEqual(cur->name, BAD_CAST "range")) { if (virSocketAddrRangeParseXML(networkName, def, cur, &range) < 0) @@ -1095,6 +1150,7 @@ virNetworkDHCPDefParseXML(const char *networkName, ret = 0; cleanup: virNetworkDHCPHostDefClear(&host); + ctxt->node = save; return ret; } @@ -1607,7 +1663,7 @@ virNetworkIPDefParseXML(const char *networkName, while (cur != NULL) { if (cur->type == XML_ELEMENT_NODE && xmlStrEqual(cur->name, BAD_CAST "dhcp")) { - if (virNetworkDHCPDefParseXML(networkName, cur, def) < 0) + if (virNetworkDHCPDefParseXML(networkName, cur, ctxt, def) < 0) goto cleanup; } else if (cur->type == XML_ELEMENT_NODE && xmlStrEqual(cur->name, BAD_CAST "tftp")) { @@ -2675,6 +2731,13 @@ virNetworkIPDefFormat(virBufferPtr buf, virBufferAddLit(buf, "<dhcp>\n"); virBufferAdjustIndent(buf, 2); + if (def->leasetime) { + virBufferAddLit(buf, "<leasetime"); + virBufferAsprintf(buf, " unit='seconds'>%lld", + def->leasetime); + virBufferAddLit(buf, "</leasetime>\n"); + } + for (i = 0; i < def->nranges; i++) { char *saddr = virSocketAddrFormat(&def->ranges[i].start); if (!saddr) diff --git a/src/conf/network_conf.h b/src/conf/network_conf.h index 3b227db..965fd3b 100644 --- a/src/conf/network_conf.h +++ b/src/conf/network_conf.h @@ -26,6 +26,15 @@ # define DNS_RECORD_LENGTH_SRV (512 - 30) /* Limit minus overhead as mentioned in RFC-2782 */ +/** + * VIR_NETWORK_DHCP_LEASE_TIME_MAX: + * + * Macro providing the upper limit on DHCP Lease Time (in seconds). + * Libvirt supports only dnsmasq as of now, and it stores the lease + * time in an unsigned int. + */ +# define VIR_NETWORK_DHCP_LEASE_TIME_MAX UINT_MAX + # include <libxml/parser.h> # include <libxml/tree.h> # include <libxml/xpath.h> @@ -167,6 +176,8 @@ struct _virNetworkIPDef { size_t nhosts; /* Zero or more dhcp hosts */ virNetworkDHCPHostDefPtr hosts; + long long leasetime; /* DHCP lease time for all ranges */ + char *tftproot; char *bootfile; virSocketAddr bootserver; diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index 7b99aca..fa628d3 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -1222,6 +1222,14 @@ networkDnsmasqConfContents(virNetworkObjPtr network, saddr, eaddr); if (VIR_SOCKET_ADDR_IS_FAMILY(&ipdef->address, AF_INET6)) virBufferAsprintf(&configbuf, ",%d", prefix); + + if (ipdef->leasetime) { + if (ipdef->leasetime == -1) + virBufferAddLit(&configbuf, ",infinite"); + else + virBufferAsprintf(&configbuf, ",%lld", ipdef->leasetime); + } + virBufferAddLit(&configbuf, "\n"); VIR_FREE(saddr); diff --git a/src/util/virutil.c b/src/util/virutil.c index b57a195..81a60e6 100644 --- a/src/util/virutil.c +++ b/src/util/virutil.c @@ -275,6 +275,76 @@ virHexToBin(unsigned char c) } } +/** + * virScaleTime: + * @value: pointer to the integer which is supposed to hold value + * @unit: pointer to the string holding the unit + * @scale: integer holding the value of scale + * @limit: upper limit on scaled value + * + * Scale an integer @value in-place by an optional case-insensitive @unit, + * defaulting to @scale if @unit is NULL or empty. Recognized units include + * (w)eeks, (d)ays, (h)ours, (m)inutes and (s)econds. Ensure that the result + * does not exceed @limit. Return 0 on success, -1 with error message raised + * on failure. + */ +int +virScaleTime(long long *value, const char *unit, + long long scale, long long limit) +{ + size_t i; + static char const* const allowed_units[] = {"s", "m", "h", "d", "w", + "seconds", "minutes", "hours", "days", "weeks"}; + + size_t n_allowed_units = ARRAY_CARDINALITY(allowed_units); + + if (!unit || !*unit) { + if (!scale) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Invalid scale %lld"), scale); + return -1; + } + unit = ""; + } else { + for (i = 0; i < n_allowed_units; i++) { + if (STREQ(unit, allowed_units[i])) { + switch (*unit) { + case 'w': + scale *= 7; + /* fall through */ + case 'd': + scale *= 24; + /* fall through */ + case 'h': + scale *= 60; + /* fall through */ + case 'm': + scale *= 60; + /* fall through */ + case 's': + break; + } + break; + } + } + if (i == n_allowed_units) { + virReportError(VIR_ERR_INVALID_ARG, + _("Unknown time unit '%s'"), unit); + return -1; + } + } + + if (*value && *value > (limit / scale)) { + virReportError(VIR_ERR_OVERFLOW, _("Value too large: %lld %s"), + *value, unit); + return -1; + } + + *value *= scale; + return 0; +} + + /* Scale an integer VALUE in-place by an optional case-insensitive * SUFFIX, defaulting to SCALE if suffix is NULL or empty (scale is * typically 1 or 1024). Recognized suffixes include 'b' or 'bytes', diff --git a/src/util/virutil.h b/src/util/virutil.h index 703ec53..5c11f77 100644 --- a/src/util/virutil.h +++ b/src/util/virutil.h @@ -51,6 +51,9 @@ int virSetUIDGIDWithCaps(uid_t uid, gid_t gid, gid_t *groups, int ngroups, unsigned long long capBits, bool clearExistingCaps); +int virScaleTime(long long *value, const char *unit, + long long scale, long long limit); + int virScaleInteger(unsigned long long *value, const char *suffix, unsigned long long scale, unsigned long long limit) ATTRIBUTE_NONNULL(1) ATTRIBUTE_RETURN_CHECK; diff --git a/tests/networkxml2confdata/isolated-network-with-lease-time.conf b/tests/networkxml2confdata/isolated-network-with-lease-time.conf new file mode 100644 index 0000000..cd353f5 --- /dev/null +++ b/tests/networkxml2confdata/isolated-network-with-lease-time.conf @@ -0,0 +1,17 @@ +##WARNING: THIS IS AN AUTO-GENERATED FILE. CHANGES TO IT ARE LIKELY TO BE +##OVERWRITTEN AND LOST. Changes to this configuration should be made using: +## virsh net-edit private +## or other application using the libvirt API. +## +## dnsmasq conf file created by libvirt +strict-order +except-interface=lo +bind-dynamic +interface=virbr1 +dhcp-range=192.168.123.2,192.168.123.254,infinite +dhcp-no-override +dhcp-range=2001:db8:ca2:2:1::10,2001:db8:ca2:2:1::ff,64,108000 +dhcp-lease-max=493 +dhcp-hostsfile=/var/lib/libvirt/dnsmasq/private.hostsfile +addn-hosts=/var/lib/libvirt/dnsmasq/private.addnhosts +enable-ra diff --git a/tests/networkxml2confdata/isolated-network-with-lease-time.xml b/tests/networkxml2confdata/isolated-network-with-lease-time.xml new file mode 100644 index 0000000..be8ea56 --- /dev/null +++ b/tests/networkxml2confdata/isolated-network-with-lease-time.xml @@ -0,0 +1,24 @@ +<network> + <name>private</name> + <uuid>81ff0d90-c91e-6742-64da-4a736edb9a9b</uuid> + <forward mode='nat'> + <nat> + <port start='1024' end='65535'/> + </nat> + </forward> + <bridge name='virbr1' stp='on' delay='0'/> + <mac address='52:54:00:10:2f:05'/> + <ip address='192.168.123.1' netmask='255.255.255.0'> + <dhcp> + <leasetime unit="minutes">-1</leasetime> + <range start='192.168.123.2' end='192.168.123.254'/> + </dhcp> + </ip> + <ip family="ipv6" address="2001:db8:ca2:2::1" prefix="64" > + <dhcp> + <leasetime unit="h">30</leasetime> + <range start="2001:db8:ca2:2:1::10" end="2001:db8:ca2:2:1::ff" /> + <host id="0:4:7e:7d:f0:7d:a8:bc:c5:d2:13:32:11:ed:16:ea:84:63" name="nwani" ip="2001:db8:ca2:2:3::4" /> + </dhcp> + </ip> +</network> diff --git a/tests/networkxml2conftest.c b/tests/networkxml2conftest.c index 65a0e32..501954d 100644 --- a/tests/networkxml2conftest.c +++ b/tests/networkxml2conftest.c @@ -112,6 +112,7 @@ mymain(void) } while (0) DO_TEST("isolated-network", restricted); + DO_TEST("isolated-network-with-lease-time", dhcpv6); DO_TEST("netboot-network", restricted); DO_TEST("netboot-proxy-network", restricted); DO_TEST("nat-network-dns-srv-record-minimal", restricted); diff --git a/tests/networkxml2xmlin/isolated-network-with-lease-time.xml b/tests/networkxml2xmlin/isolated-network-with-lease-time.xml new file mode 100644 index 0000000..75c9f22 --- /dev/null +++ b/tests/networkxml2xmlin/isolated-network-with-lease-time.xml @@ -0,0 +1,24 @@ +<network> + <name>private</name> + <uuid>81ff0d90-c91e-6742-64da-4a736edb9a9b</uuid> + <forward mode='nat'> + <nat> + <port start='1024' end='65535'/> + </nat> + </forward> + <bridge name='virbr1' stp='on' delay='0'/> + <mac address='52:54:00:10:2f:05'/> + <ip address='192.168.123.1' netmask='255.255.255.0'> + <dhcp> + <leasetime unit="minutes">-1</leasetime> + <range start='192.168.123.2' end='192.168.123.254'/> + </dhcp> + </ip> + <ip family="ipv6" address="2001:db8:ca2:2::1" prefix="64" > + <dhcp> + <leasetime unit="d">30</leasetime> + <range start="2001:db8:ca2:2:1::10" end="2001:db8:ca2:2:1::ff" /> + <host id="0:4:7e:7d:f0:7d:a8:bc:c5:d2:13:32:11:ed:16:ea:84:63" name="nwani" ip="2001:db8:ca2:2:3::4" /> + </dhcp> + </ip> +</network> diff --git a/tests/networkxml2xmlout/isolated-network-with-lease-time.xml b/tests/networkxml2xmlout/isolated-network-with-lease-time.xml new file mode 100644 index 0000000..d9d6ff4 --- /dev/null +++ b/tests/networkxml2xmlout/isolated-network-with-lease-time.xml @@ -0,0 +1,24 @@ +<network> + <name>private</name> + <uuid>81ff0d90-c91e-6742-64da-4a736edb9a9b</uuid> + <forward mode='nat'> + <nat> + <port start='1024' end='65535'/> + </nat> + </forward> + <bridge name='virbr1' stp='on' delay='0'/> + <mac address='52:54:00:10:2f:05'/> + <ip address='192.168.123.1' netmask='255.255.255.0'> + <dhcp> + <leasetime unit='seconds'>-1</leasetime> + <range start='192.168.123.2' end='192.168.123.254'/> + </dhcp> + </ip> + <ip family='ipv6' address='2001:db8:ca2:2::1' prefix='64'> + <dhcp> + <leasetime unit='seconds'>2592000</leasetime> + <range start='2001:db8:ca2:2:1::10' end='2001:db8:ca2:2:1::ff'/> + <host id='0:4:7e:7d:f0:7d:a8:bc:c5:d2:13:32:11:ed:16:ea:84:63' name='nwani' ip='2001:db8:ca2:2:3::4'/> + </dhcp> + </ip> +</network> diff --git a/tests/networkxml2xmltest.c b/tests/networkxml2xmltest.c index 01cd6f7..665f695 100644 --- a/tests/networkxml2xmltest.c +++ b/tests/networkxml2xmltest.c @@ -126,6 +126,7 @@ mymain(void) DO_TEST("dhcp6host-routed-network"); DO_TEST("empty-allow-ipv6"); DO_TEST("isolated-network"); + DO_TEST("isolated-network-with-lease-time"); DO_TEST("routed-network"); DO_TEST("routed-network-no-dns"); DO_TEST_PARSE_ERROR("routed-network-no-dns-extra-elements"); -- 2.7.4

5 17

[libvirt] [PATCH] bhyve: chase cpuCompareXML rename
by Roman Bogorodskiy 29 Sep '16

29 Sep '16

In commit 7f127de cpuCompareXML was renamed to virCPUCompareXML, so change the bhyve driver to use the new function and thus fix the build. --- Pushed under the build-breaker rule. src/bhyve/bhyve_driver.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/bhyve/bhyve_driver.c b/src/bhyve/bhyve_driver.c index 51b6301..49b9e1a 100644 --- a/src/bhyve/bhyve_driver.c +++ b/src/bhyve/bhyve_driver.c @@ -1436,7 +1436,8 @@ bhyveConnectCompareCPU(virConnectPtr conn, ret = VIR_CPU_COMPARE_INCOMPATIBLE; } } else { - ret = cpuCompareXML(caps->host.cpu, xmlDesc, failIncompatible); + ret = virCPUCompareXML(caps->host.arch, caps->host.cpu, + xmlDesc, failIncompatible); } cleanup: -- 2.7.4

1 0

[libvirt] xen/libvirt freeze while attching network-device to vm´s - question about provided patches
by Guido.Rossmueller＠gdata.de 28 Sep '16

28 Sep '16

Hello everybody, a colleague of me described last november a problem that we have with libvirt and xen https://www.redhat.com/archives/libvir-list/2015-November/msg00130.html Jim Fehlig provided for this problem a patch a few days later: https://www.redhat.com/archives/libvir-list/2015-November/msg00520.html The provided patch work great and we have no problems until we applied them. Now we a in the situation that we want to migrate to libvirt 2.1, and we saw the same problem that we have last year, again. After we take a look in the source code, we determine that the patches are didn´t go in the source code. So we modify the patches in that way, that we could apply them again, and all looks good. My question, is their any special reason why this patches didn´t go in the source code? I see same posts on the maillinglist, but absolute statement for or again the patches from Jim Fehlig. all the best guido ____________ Virus checked by G Data MailSecurity Version: AVA 25.8195 dated 08.09.2016 Virus news: www.antiviruslab.com

3 8

[libvirt] [PATCH] doc: fix note about Xen credit scheduler
by Jim Fehlig 28 Sep '16

28 Sep '16

Commit 6c504d6a added a note to the virsh man page about the deprecation of 'cap' and 'weight' settings for the credit scheduler. To this day, the default scheduler in Xen is credit and it supports setting 'cap' and 'weight'. Remove the deprecation notice from the note on the Xen credit scheduler. Reported-by: Volo M. <vm(a)vovs.net> Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- tools/virsh.pod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/virsh.pod b/tools/virsh.pod index 49abda9..971b408 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -1959,7 +1959,7 @@ Therefore, -1 is a useful shorthand for 262144. On the Linux kernel, the values 0 and 1 are automatically converted to a minimal value of 2. B<Note>: The weight and cap parameters are defined only for the -XEN_CREDIT scheduler and are now I<DEPRECATED>. +XEN_CREDIT scheduler. B<Note>: The vcpu_period, emulator_period, and iothread_period parameters have a valid value range of 1000-1000000 or 0, and the vcpu_quota, -- 2.1.4

2 2

[libvirt] [PATCH] libxl: fix param assignment in domainGetSchedulerParameters
by Jim Fehlig 28 Sep '16

28 Sep '16

Due to a copy and paste error, the scheduler 'cap' parameter was over-writing the 'weight' parameter when preparing the return parameters in libxlDomainGetSchedulerParametersFlags. As a result, the scheduler weight was never shown when getting schedinfo and setting the weight failed as well virsh schedinfo testvm Scheduler : credit cap : 0 virsh schedinfo testvm --cap 50 --weight 500 Scheduler : credit error: invalid scheduler option: weight The obvious fix is to assign the 'caps' parameter to the correct item in the parameter list. Reported-by: Volo M. <vm(a)vovs.net> Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- src/libxl/libxl_driver.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index 1adf4c5..b66cb1f 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -4571,7 +4571,7 @@ libxlDomainGetSchedulerParametersFlags(virDomainPtr dom, goto cleanup; if (*nparams > 1) { - if (virTypedParameterAssign(&params[0], VIR_DOMAIN_SCHEDULER_CAP, + if (virTypedParameterAssign(&params[1], VIR_DOMAIN_SCHEDULER_CAP, VIR_TYPED_PARAM_UINT, sc_info.cap) < 0) goto cleanup; } -- 2.1.4

2 2