- Devel - libvirt List Archives

[libvirt] [PATCH 0/2] Disallow the usage of the same target dev value
by John Ferlan 03 Mar '15

03 Mar '15

https://bugzilla.redhat.com/show_bug.cgi?id=1142631 Patch 1 was found when adjusting the bz to get the disk by the pool source instead of directly by file attribute. When using domblklist, the source wasn't displayed. Followed the model of the iscsi '@name' and added '@volume' (eg, <source pool='default' volume='test-1g.img'/>) Patch 2 started as a simple (hah!) double loop looking for duplicate dst strings. I chose a separate API called before qemuCheckDiskConfig since it's more of a "common" check that could be used by other drivers as opposed to the perhaps more specific single disk checks made. Besides I didn't want a ndisk factorial checking algorithm each time a disk was checked for something that could be checked once. With the code in place, running make check tripped over a number of existing tests that duplicated that '<target dev=...' value, so I fixed those. Of interest for a few was that the test would duplicate the supposedly unique alias id - those are cleaned up as well as a byproduct of the changes. John Ferlan (2): virsh: Adjust domblklist to understand disk volume syntax disk: Disallow duplicated target 'dev' values src/conf/domain_conf.c | 29 ++++++++++++++++++++++ src/conf/domain_conf.h | 1 + src/libvirt_private.syms | 1 + src/qemu/qemu_command.c | 3 +++ .../qemuxml2argv-disk-scsi-disk-split.xml | 2 +- ...qemuxml2argv-disk-scsi-lun-passthrough-sgio.xml | 2 +- .../qemuxml2argv-disk-scsi-lun-passthrough.xml | 2 +- .../qemuxml2argv-disk-source-pool-mode.xml | 2 +- .../qemuxml2argv-disk-source-pool.xml | 2 +- .../qemuxml2argv-pci-bridge-many-disks.args | 4 +-- .../qemuxml2argv-pci-bridge-many-disks.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-pci-many.args | 8 +++--- tests/qemuxml2argvdata/qemuxml2argv-pci-many.xml | 4 +-- .../qemuxml2xmlout-disk-source-pool.xml | 2 +- .../qemuxml2xmlout-pci-bridge-many-disks.xml | 2 +- tools/virsh-domain-monitor.c | 3 ++- 16 files changed, 52 insertions(+), 17 deletions(-) -- 2.1.0

2 5

[libvirt] QEMU, libvirt, and KVM are participating in Google Summer of Code 2015
by Stefan Hajnoczi 02 Mar '15

02 Mar '15

I am delighted to announce that QEMU, libvirt, and KVM are participating in Google Summer of Code 2015. Thanks to Google's generous funding we are inviting students to apply for 12-week full-time work from May to August 2015. Here is our project ideas list page where students can select a project to apply for: http://qemu-project.org/Google_Summer_of_Code_2015 Steps for students: 1. Check out the project ideas list (http://qemu-project.org/Google_Summer_of_Code_2015) 2. Get in touch with the mentors for the project you are interested in, begin discussing your application with them 3. Submit your application at http://google-melange.com/ from March 16-27 For more information on Google Summer of Code, please see: https://www.google-melange.com/gsoc/document/show/gsoc_program/google/gsoc2… Timeline: https://www.google-melange.com/gsoc/events/google/gsoc2015 Stefan

1 0

[libvirt] [PATCH] qemu: Don't crash in qemuDomainOpenChannel()
by Martin Kletzander 02 Mar '15

02 Mar '15

The problem here was that when opening a channel, we were checking whether the channel given is alias (can't be NULL for running domain) or it's name, which can be NULL (for example with spicevmc). In case of such domain qemuDomainOpenChannel() made the daemon crash. STREQ_NULLABLE() is safe to use since the code in question is wrapped in "if (name)" and is more readable, so use that instead of checking for non-NULL "vm->def->channels[i]->target.name". Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- src/qemu/qemu_driver.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 83a4e18..c87cc05 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -15450,7 +15450,7 @@ qemuDomainOpenChannel(virDomainPtr dom, if (vm->def->channels[i]->targetType == \ VIR_DOMAIN_CHR_CHANNEL_TARGET_TYPE_VIRTIO && - STREQ(name, vm->def->channels[i]->target.name)) + STREQ_NULLABLE(name, vm->def->channels[i]->target.name)) chr = vm->def->channels[i]; } } else { -- 2.3.1

3 2

[libvirt] [PATCH] conf: De-duplicate scheduling policy enums
by Martin Kletzander 02 Mar '15

02 Mar '15

Since adding the support for scheduler policy settings in commit 8680ea97, there are two enums with the same information. That was caused by rewriting the patch since first draft. Find out thanks to clang, but there was no impact whatsoever. Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- src/conf/domain_conf.c | 20 +++++++------------- src/conf/domain_conf.h | 14 ++------------ src/libvirt_private.syms | 2 -- src/qemu/qemu_process.c | 2 +- 4 files changed, 10 insertions(+), 28 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 9b7ae3f..95175ea 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -772,13 +772,6 @@ VIR_ENUM_IMPL(virDomainLoader, "rom", "pflash") -VIR_ENUM_IMPL(virDomainThreadSched, VIR_DOMAIN_THREAD_SCHED_LAST, - "other", /* default */ - "batch", - "idle", - "fifo", - "rr") - /* Internal mapping: subset of block job types that can be present in * <mirror> XML (remaining types are not two-phase). */ VIR_ENUM_DECL(virDomainBlockJob) @@ -12867,7 +12860,7 @@ virDomainThreadSchedParse(xmlNodePtr node, virDomainThreadSchedParamPtr sp) { char *tmp = NULL; - int sched = 0; + int pol = 0; tmp = virXMLPropString(node, name); if (!tmp) { @@ -12892,16 +12885,17 @@ virDomainThreadSchedParse(xmlNodePtr node, tmp = virXMLPropString(node, "scheduler"); if (tmp) { - if ((sched = virDomainThreadSchedTypeFromString(tmp)) <= 0) { + if ((pol = virProcessSchedPolicyTypeFromString(tmp)) <= 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Invalid scheduler attribute: '%s'"), tmp); goto error; } - sp->scheduler = sched; + sp->policy = pol; VIR_FREE(tmp); - if (sp->scheduler >= VIR_DOMAIN_THREAD_SCHED_FIFO) { + if (sp->policy == VIR_PROC_POLICY_FIFO || + sp->policy == VIR_PROC_POLICY_RR) { tmp = virXMLPropString(node, "priority"); if (!tmp) { virReportError(VIR_ERR_XML_ERROR, "%s", @@ -19888,7 +19882,7 @@ virDomainDefFormatInternal(virDomainDefPtr def, if (!(ids = virBitmapFormat(sp->ids))) goto error; virBufferAsprintf(buf, "<vcpusched vcpus='%s' scheduler='%s'", - ids, virDomainThreadSchedTypeToString(sp->scheduler)); + ids, virProcessSchedPolicyTypeToString(sp->policy)); VIR_FREE(ids); if (sp->priority) @@ -19903,7 +19897,7 @@ virDomainDefFormatInternal(virDomainDefPtr def, if (!(ids = virBitmapFormat(sp->ids))) goto error; virBufferAsprintf(buf, "<iothreadsched iothreads='%s' scheduler='%s'", - ids, virDomainThreadSchedTypeToString(sp->scheduler)); + ids, virProcessSchedPolicyTypeToString(sp->policy)); VIR_FREE(ids); if (sp->priority) diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 02ddd93..aafeadd 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -50,6 +50,7 @@ # include "virbitmap.h" # include "virstoragefile.h" # include "virseclabel.h" +# include "virprocess.h" /* forward declarations of all device types, required by * virDomainDeviceDef @@ -1813,21 +1814,11 @@ typedef enum { VIR_DOMAIN_CPU_PLACEMENT_MODE_LAST } virDomainCpuPlacementMode; -typedef enum { - VIR_DOMAIN_THREAD_SCHED_OTHER = 0, - VIR_DOMAIN_THREAD_SCHED_BATCH, - VIR_DOMAIN_THREAD_SCHED_IDLE, - VIR_DOMAIN_THREAD_SCHED_FIFO, - VIR_DOMAIN_THREAD_SCHED_RR, - - VIR_DOMAIN_THREAD_SCHED_LAST -} virDomainThreadSched; - typedef struct _virDomainThreadSchedParam virDomainThreadSchedParam; typedef virDomainThreadSchedParam *virDomainThreadSchedParamPtr; struct _virDomainThreadSchedParam { virBitmapPtr ids; - virDomainThreadSched scheduler; + virProcessSchedPolicy policy; int priority; }; @@ -2881,7 +2872,6 @@ VIR_ENUM_DECL(virDomainRNGModel) VIR_ENUM_DECL(virDomainRNGBackend) VIR_ENUM_DECL(virDomainTPMModel) VIR_ENUM_DECL(virDomainTPMBackend) -VIR_ENUM_DECL(virDomainThreadSched) /* from libvirt.h */ VIR_ENUM_DECL(virDomainState) VIR_ENUM_DECL(virDomainNostateReason) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index ba05cc6..ead1b45 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -415,8 +415,6 @@ virDomainStateTypeFromString; virDomainStateTypeToString; virDomainTaintTypeFromString; virDomainTaintTypeToString; -virDomainThreadSchedTypeFromString; -virDomainThreadSchedTypeToString; virDomainTimerModeTypeFromString; virDomainTimerModeTypeToString; virDomainTimerNameTypeFromString; diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index bd63fd7..faf9907 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -2614,7 +2614,7 @@ qemuProcessSetSchedParams(int id, if (!s) return 0; - return virProcessSetScheduler(pid, s->scheduler, s->priority); + return virProcessSetScheduler(pid, s->policy, s->priority); } static int -- 2.3.1

2 1

[libvirt] [PATCH 0/2] fix corner case of spice graphics channel mode settings
by Pavel Hrdina 02 Mar '15

02 Mar '15

Pavel Hrdina (2): qemu: remove duplicated code for allocating spice ports qemu: check defaultMode for spice graphics independently src/qemu/qemu_driver.c | 45 ++---------------------------- src/qemu/qemu_process.c | 73 ++++++++++++++++++++++++++++--------------------- src/qemu/qemu_process.h | 5 ++++ 3 files changed, 49 insertions(+), 74 deletions(-) -- 2.0.5

2 4

[libvirt] [PATCH] Add ability to set rlimits at container boot
by Ryan Cleere 02 Mar '15

02 Mar '15

--- docs/formatdomain.html.in | 49 +++++++++++++++++++++++ docs/schemas/domaincommon.rng | 89 +++++++++++++++++++++++++++++++++++++++++ src/conf/domain_conf.c | 92 +++++++++++++++++++++++++++++++++++++++++++ src/conf/domain_conf.h | 33 ++++++++++++++++ src/libvirt_private.syms | 1 + src/lxc/lxc_controller.c | 32 +++++++++++++++ src/util/virprocess.c | 4 +- src/util/virprocess.h | 2 + 8 files changed, 300 insertions(+), 2 deletions(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index f8d5f89..5aec51c 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -348,6 +348,55 @@ </pre> + <p> + If you want to set an rlimit of the containter init process instead of + inheriting from the host init, set the <code>rlimits</code> element. You + are able to set any of the rlimits that setrlimits is able to set using + any of the following sub-elements: + </p> + + <dl> + <dt><code>as</code></dt> + <dd>Used to set RLIMIT_AS.</dd> + <dt><code>core</code></dt> + <dd>Used to set RLIMIT_CORE.</dd> + <dt><code>cpu</code></dt> + <dd>Used to set RLIMIT_CPU.</dd> + <dt><code>data</code></dt> + <dd>Used to set RLIMIT_DATA.</dd> + <dt><code>fsize</code></dt> + <dd>Used to set RLIMIT_FSIZE.</dd> + <dt><code>locks</code></dt> + <dd>Used to set RLIMIT_LOCKS.</dd> + <dt><code>memlock</code></dt> + <dd>Used to set RLIMIT_MEMLOCK.</dd> + <dt><code>msgqueue</code></dt> + <dd>Used to set RLIMIT_MSGQUEUE.</dd> + <dt><code>nice</code></dt> + <dd>Used to set RLIMIT_NICE.</dd> + <dt><code>nofile</code></dt> + <dd>Used to set RLIMIT_NOFILE.</dd> + <dt><code>nproc</code></dt> + <dd>Used to set RLIMIT_NPROC.</dd> + <dt><code>rss</code></dt> + <dd>Used to set RLIMIT_RSS.</dd> + <dt><code>rtprio</code></dt> + <dd>Used to set RLIMIT_RTPRIO.</dd> + <dt><code>rttime</code></dt> + <dd>Used to set RLIMIT_RTTIME.</dd> + <dt><code>sigpending</code></dt> + <dd>Used to set RLIMIT_SIGPENDING.</dd> + <dt><code>stack</code></dt> + <dd>Used to set RLIMIT_STACK.</dd> + </dl> + + <pre> + <rlimits> + <nofile>10240</nofile> + </rlimits> + </pre> + + <h3><a name="elementsSysinfo">SMBIOS System Information</a></h3> <p> diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index d467dce..b98f8d5 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -59,6 +59,9 @@ <ref name="idmap"/> </optional> <optional> + <ref name="rlimits"/> + </optional> + <optional> <ref name="devices"/> </optional> <zeroOrMore> @@ -570,6 +573,92 @@ </interleave> </element> </define> + <define name="rlimits"> + <element name="rlimits"> + <interleave> + <optional> + <element name="cpu"> + <ref name='scaledInteger'/> + </element> + </optional> + <optional> + <element name="fsize"> + <ref name='scaledInteger'/> + </element> + </optional> + <optional> + <element name="data"> + <ref name='scaledInteger'/> + </element> + </optional> + <optional> + <element name="stack"> + <ref name='scaledInteger'/> + </element> + </optional> + <optional> + <element name="core"> + <ref name='scaledInteger'/> + </element> + </optional> + <optional> + <element name="rss"> + <ref name='scaledInteger'/> + </element> + </optional> + <optional> + <element name="nproc"> + <ref name='scaledInteger'/> + </element> + </optional> + <optional> + <element name="nofile"> + <ref name='scaledInteger'/> + </element> + </optional> + <optional> + <element name="memlock"> + <ref name='scaledInteger'/> + </element> + </optional> + <optional> + <element name="as"> + <ref name='scaledInteger'/> + </element> + </optional> + <optional> + <element name="locks"> + <ref name='scaledInteger'/> + </element> + </optional> + <optional> + <element name="sigpending"> + <ref name='scaledInteger'/> + </element> + </optional> + <optional> + <element name="msgqueue"> + <ref name='scaledInteger'/> + </element> + </optional> + <optional> + <element name="nice"> + <ref name='scaledInteger'/> + </element> + </optional> + <optional> + <element name="rtprio"> + <ref name='scaledInteger'/> + </element> + </optional> + <optional> + <element name="rttime"> + <ref name='scaledInteger'/> + </element> + </optional> + </interleave> + </element> + </define> <!-- Resources usage defines the amount of memory (maximum and possibly current usage) and number of virtual CPUs used by that domain. diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index d562e1a..399976e 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -772,6 +772,24 @@ VIR_ENUM_IMPL(virDomainLoader, "rom", "pflash") +VIR_ENUM_IMPL(virDomainRLimit, VIR_DOMAIN_RLIMIT_LAST, + "cpu", + "fsize", + "data", + "stack", + "core", + "rss", + "nproc", + "nofile", + "memlock", + "as", + "locks", + "sigpending", + "msgqueue", + "nice", + "rtprio", + "rttime") + /* Internal mapping: subset of block job types that can be present in * <mirror> XML (remaining types are not two-phase). */ VIR_ENUM_DECL(virDomainBlockJob) @@ -979,7 +997,40 @@ virDomainBlkioDeviceParseXML(xmlNodePtr root, return -1; } +static virDomainRLimitsPtr +virDomainRLimitParseXML(xmlNodePtr node) +{ + char *c = NULL; + long long val; + virDomainRLimitsPtr def; + + if (VIR_ALLOC(def) < 0) + return NULL; + if (node->type == XML_ELEMENT_NODE) { + c = (char *)xmlNodeGetContent(node); + if (virStrToLong_ll(c, NULL, 10, &val) < 0) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("could not parse rlimit value of %s"), + c); + goto error; + } + VIR_FREE(c); + + def->limit = val; + if ((def->resource = virDomainRLimitTypeFromString((const char *)node->name)) < 0) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("could not determine resource type of '%s'"), + node->name); + goto error; + } + } + return def; + error: + VIR_FREE(c); + VIR_FREE(def); + return NULL; +} static void virDomainObjListDataFree(void *payload, const void *name ATTRIBUTE_UNUSED) @@ -14423,6 +14474,34 @@ virDomainDefParseXML(xmlDocPtr xml, virHashFree(bootHash); + if ((node = virXPathNode("./rlimits[1]", ctxt)) != NULL && (n = virXMLChildElementCount(node)) > 0) { + xmlNodePtr cur = node->children; + if (n && VIR_ALLOC_N(def->rlimits, n) < 0) + goto error; + + for (i = 0; i < n; i++) { + if (!(def->rlimits[i] = virDomainRLimitParseXML(cur))) { + for (j = 0; j < i; j++) + VIR_FREE(def->rlimits[j]); + VIR_FREE(def->rlimits); + goto error; + } + def->nrlimits++; + for (j = 0; j < i; j++) { + if (def->rlimits[j]->resource == def->rlimits[i]->resource) { + virReportError(VIR_ERR_XML_ERROR, + _("duplicate rlimit resources '%s'"), + virDomainRLimitTypeToString(def->rlimits[j]->resource)); + for (int k = 0; k < i; k++) + VIR_FREE(def->rlimits[k]); + VIR_FREE(def->rlimits); + goto error; + } + } + cur = cur->next; + } + } + return def; error: @@ -20048,6 +20127,19 @@ virDomainDefFormatInternal(virDomainDefPtr def, goto error; } + if (def->nrlimits > 0) { + virBufferAddLit(buf, "<rlimits>\n"); + virBufferAdjustIndent(buf, 2); + for (n = 0; n < def->nrlimits; n++) { + virBufferAsprintf(buf, "<%s>%lld</%s>\n", + virDomainRLimitTypeToString(def->rlimits[n]->resource), + def->rlimits[n]->limit, + virDomainRLimitTypeToString(def->rlimits[n]->resource)); + } + virBufferAdjustIndent(buf, -2); + virBufferAddLit(buf, "</rlimits>\n"); + } + virBufferAdjustIndent(buf, -2); virBufferAddLit(buf, "</domain>\n"); diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 93f2314..b032202 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -1851,6 +1851,27 @@ typedef enum { VIR_DOMAIN_CLOCK_BASIS_LAST } virDomainClockBasis; +typedef enum { + VIR_DOMAIN_RLIMIT_CPU, + VIR_DOMAIN_RLIMIT_FSIZE, + VIR_DOMAIN_RLIMIT_DATA, + VIR_DOMAIN_RLIMIT_STACK, + VIR_DOMAIN_RLIMIT_CORE, + VIR_DOMAIN_RLIMIT_RSS, + VIR_DOMAIN_RLIMIT_NPROC, + VIR_DOMAIN_RLIMIT_NOFILE, + VIR_DOMAIN_RLIMIT_MEMLOCK, + VIR_DOMAIN_RLIMIT_AS, + VIR_DOMAIN_RLIMIT_LOCKS, + VIR_DOMAIN_RLIMIT_SIGPENDING, + VIR_DOMAIN_RLIMIT_MSGQUEUE, + VIR_DOMAIN_RLIMIT_NICE, + VIR_DOMAIN_RLIMIT_RTPRIO, + VIR_DOMAIN_RLIMIT_RTTIME, + + VIR_DOMAIN_RLIMIT_LAST +} virDomainRLimit; + typedef struct _virDomainClockDef virDomainClockDef; typedef virDomainClockDef *virDomainClockDefPtr; struct _virDomainClockDef { @@ -2039,6 +2060,14 @@ struct _virDomainPowerManagement { int s4; }; +typedef struct _virDomainRLimits virDomainRLimits; +typedef virDomainRLimits *virDomainRLimitsPtr; + +struct _virDomainRLimits { + int resource; + long long limit; +}; + /* * Guest VM main configuration * @@ -2156,6 +2185,9 @@ struct _virDomainDef { size_t nshmems; virDomainShmemDefPtr *shmems; + size_t nrlimits; + virDomainRLimitsPtr *rlimits; + /* Only 1 */ virDomainWatchdogDefPtr watchdog; virDomainMemballoonDefPtr memballoon; @@ -2844,6 +2876,7 @@ VIR_ENUM_DECL(virDomainRNGModel) VIR_ENUM_DECL(virDomainRNGBackend) VIR_ENUM_DECL(virDomainTPMModel) VIR_ENUM_DECL(virDomainTPMBackend) +VIR_ENUM_DECL(virDomainRLimit) /* from libvirt.h */ VIR_ENUM_DECL(virDomainState) VIR_ENUM_DECL(virDomainNostateReason) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index bd7870f..7b71ff1 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1896,6 +1896,7 @@ virProcessGetNamespaces; virProcessGetStartTime; virProcessKill; virProcessKillPainfully; +virProcessPrLimit; virProcessRunInMountNamespace; virProcessSetAffinity; virProcessSetMaxFiles; diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c index 8a7c7e8..5c63a1b 100644 --- a/src/lxc/lxc_controller.c +++ b/src/lxc/lxc_controller.c @@ -798,6 +798,35 @@ static int virLXCControllerSetupCgroupLimits(virLXCControllerPtr ctrl) return ret; } +static int virLXCControllerSetupRLimits(virLXCControllerPtr ctrl) +{ + int i, ret = -1; + struct rlimit rlim; + + VIR_DEBUG("Setting up rlimits"); + + VIR_DEBUG("nrlimits = %d", (int)ctrl->def->nrlimits); + VIR_DEBUG("setting limits on process %d", ctrl->initpid); + if (ctrl->def->nrlimits > 0) { + for (i = 0; i < ctrl->def->nrlimits; i++) { + rlim.rlim_max = rlim.rlim_cur = ctrl->def->rlimits[i]->limit; + VIR_DEBUG("Setting rlimit %s(%d) on pid %d to %lld", + virDomainRLimitTypeToString(ctrl->def->rlimits[i]->resource), + ctrl->def->rlimits[i]->resource, + ctrl->initpid, + ctrl->def->rlimits[i]->limit); + if (virProcessPrLimit(ctrl->initpid, ctrl->def->rlimits[i]->resource, &rlim) < 0) { + virReportSystemError(errno, "%s", + _("Unable to set rlimit")); + goto cleanup; + } + } + } + ret = 0; + cleanup: + return ret; +} + static void virLXCControllerClientCloseHook(virNetServerClientPtr client) { @@ -2318,6 +2347,9 @@ virLXCControllerRun(virLXCControllerPtr ctrl) if (virLXCControllerSetupCgroupLimits(ctrl) < 0) goto cleanup; + if (virLXCControllerSetupRLimits(ctrl) < 0) + goto cleanup; + if (virLXCControllerSetupUserns(ctrl) < 0) goto cleanup; diff --git a/src/util/virprocess.c b/src/util/virprocess.c index d0a1500..d83ae28 100644 --- a/src/util/virprocess.c +++ b/src/util/virprocess.c @@ -676,13 +676,13 @@ int virProcessSetNamespaces(size_t nfdlist, } #if HAVE_PRLIMIT -static int +int virProcessPrLimit(pid_t pid, int resource, struct rlimit *rlim) { return prlimit(pid, resource, rlim, NULL); } #elif HAVE_SETRLIMIT -static int +int virProcessPrLimit(pid_t pid ATTRIBUTE_UNUSED, int resource ATTRIBUTE_UNUSED, struct rlimit *rlim ATTRIBUTE_UNUSED) diff --git a/src/util/virprocess.h b/src/util/virprocess.h index bcaede5..c40b41a 100644 --- a/src/util/virprocess.h +++ b/src/util/virprocess.h @@ -22,6 +22,7 @@ #ifndef __VIR_PROCESS_H__ # define __VIR_PROCESS_H__ +# include <sys/resource.h> # include <sys/types.h> # include "internal.h" @@ -73,4 +74,5 @@ typedef int (*virProcessNamespaceCallback)(pid_t pid, void *opaque); int virProcessRunInMountNamespace(pid_t pid, virProcessNamespaceCallback cb, void *opaque); +int virProcessPrLimit(pid_t pid, int resource, struct rlimit *rlim); #endif /* __VIR_PROCESS_H__ */ -- 1.9.3 (Apple Git-50)

4 6

[libvirt] [PATCH] virsh.pod: Add information regarding LXC for setmem, memtune, and dominfo
by John Ferlan 02 Mar '15

02 Mar '15

https://bugzilla.redhat.com/show_bug.cgi?id=1070695 Modify the virsh man page to more accurately describe which values are set by the virsh setmem and displayed by the virsh memtune or dominfo based on the setmem command results. Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- tools/virsh.pod | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/tools/virsh.pod b/tools/virsh.pod index 343f26f..e435d01 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -1925,6 +1925,13 @@ For example, vSphere/ESX rounds the parameter up to mebibytes (1024 kibibytes). For Xen, you can only adjust the memory of a running domain if the domain is paravirtualized or running the PV balloon driver. +For LXC, the value being set is the cgroups value for limit_in_bytes or the +maximum amount of user memory (including file cache). When viewing memory +inside the container, this is the /proc/meminfo "MemTotal" value. When viewing +the value from the host, use the B<virsh memtune> command. In order to view +the current memory in use and the maximum value allowed to set memory, use +the B<virsh dominfo> command. + =item B<setmaxmem> I<domain> B<size> [[I<--config>] [I<--live>] | [I<--current>]] @@ -1973,6 +1980,9 @@ Thus, when counting them, one needs to add up guest RAM, guest video RAM, and some memory overhead of QEMU itself. The last piece is hard to determine so one needs guess and try. +For LXC, the displayed hard_limit value is the current memory setting +from the XML or the results from a B<virsh setmem> command. + =over 4 =item I<--hard-limit> -- 2.1.0

2 1

[libvirt] [PATCH] disk: Provide a default storage source format type.
by John Ferlan 02 Mar '15

02 Mar '15

https://bugzilla.redhat.com/show_bug.cgi?id=1181062 According to the formatstorage.html description for <source> element and "format" attribute: "All drivers are required to have a default value for this, so it is optional." As it turns out the disk backend did not choose a default value, so I added a default of "msdos" if the source type is "unknown" as well as updating the storage.html backend disk volume driver documentation to indicate the default format is dos. Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- docs/storage.html.in | 1 + src/storage/storage_backend_disk.c | 13 ++++++++++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/docs/storage.html.in b/docs/storage.html.in index f920dae..b9b503d 100644 --- a/docs/storage.html.in +++ b/docs/storage.html.in @@ -346,6 +346,7 @@ on the size and placement of volumes. The 'free extents' information will detail the regions which are available for creating new volumes. A volume cannot span across 2 different free extents. + It will default to using <code>msdos</code> as the pool source format. </p> <h3>Example pool input</h3> diff --git a/src/storage/storage_backend_disk.c b/src/storage/storage_backend_disk.c index 39082cc..9a79325 100644 --- a/src/storage/storage_backend_disk.c +++ b/src/storage/storage_backend_disk.c @@ -468,13 +468,20 @@ virStorageBackendDiskBuildPool(virConnectPtr conn ATTRIBUTE_UNUSED, } if (ok_to_mklabel) { - /* eg parted /dev/sda mklabel msdos */ + /* eg parted /dev/sda mklabel --script msdos */ + int format = pool->def->source.format; + const char *fmt; + if (format == VIR_STORAGE_POOL_DISK_UNKNOWN || + format == VIR_STORAGE_POOL_DISK_DOS) + fmt = "msdos"; + else + fmt = virStoragePoolFormatDiskTypeToString(format); + cmd = virCommandNewArgList(PARTED, pool->def->source.devices[0].path, "mklabel", "--script", - ((pool->def->source.format == VIR_STORAGE_POOL_DISK_DOS) ? "msdos" : - virStoragePoolFormatDiskTypeToString(pool->def->source.format)), + fmt, NULL); ret = virCommandRun(cmd, NULL); } -- 2.1.0

2 1

[libvirt] [PATCH] docs: add a note that attr 'managed' is only used by PCI devices
by Erik Skultety 02 Mar '15

02 Mar '15

Our documentation isn't 100% clear about hostdev 'managed' attribute usage, because it only makes sense to use it with PCI devices, yet we format this attribute to all hostdev devices. By adding a note into the docs, we can possibly avoid confusion from customer's side and also avoid a solution using ternary logic. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1155887 --- docs/formatdomain.html.in | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index fb0a0d1..6276a61 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -3110,6 +3110,12 @@ then this setting not required. </dd> </dl> + <p> + Note: The <code>managed</code> attribute is only used with PCI devices + and is ignored by all the other device types, thus setting + <code>managed</code> explicitly with other than PCI device has the same + effect as omitting it. + </p> </dd> <dt><code>source</code></dt> <dd>The source element describes the device as seen from the host using -- 1.9.3

2 2

[libvirt] [PATCH] storage: sheepdog: Avoid skipping variable initialization
by Peter Krempa 02 Mar '15

02 Mar '15

Commit 155ca616eb231181f6978efc9e3a1eb0eb60af8a added a error message that skips initialization of the 'cmd' variable. Fortunately it was not released. --- Pushed under the trivial && build-breaker rule. src/storage/storage_backend_sheepdog.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/storage/storage_backend_sheepdog.c b/src/storage/storage_backend_sheepdog.c index f389d9b..af15c3b 100644 --- a/src/storage/storage_backend_sheepdog.c +++ b/src/storage/storage_backend_sheepdog.c @@ -263,6 +263,7 @@ virStorageBackendSheepdogBuildVol(virConnectPtr conn, unsigned int flags) { int ret = -1; + virCommandPtr cmd = NULL; virCheckFlags(0, -1); @@ -272,7 +273,7 @@ virStorageBackendSheepdogBuildVol(virConnectPtr conn, goto cleanup; } - virCommandPtr cmd = virCommandNewArgList(COLLIE, "vdi", "create", vol->name, NULL); + cmd = virCommandNewArgList(COLLIE, "vdi", "create", vol->name, NULL); virCommandAddArgFormat(cmd, "%llu", vol->target.capacity); virStorageBackendSheepdogAddHostArg(cmd, pool); if (virCommandRun(cmd, NULL) < 0) -- 2.2.2

1 0