- Devel - libvirt List Archives

[libvirt] [PATCH] security: Switch to C99-style struct initialization
by Michal Privoznik 24 May '12

24 May '12

--- src/security/security_apparmor.c | 50 ++++++++++++++++++------------------ src/security/security_dac.c | 53 ++++++++++++++++++------------------- src/security/security_nop.c | 52 ++++++++++++++++++------------------ src/security/security_selinux.c | 52 ++++++++++++++++++------------------ src/security/security_stack.c | 52 ++++++++++++++++++------------------ 5 files changed, 129 insertions(+), 130 deletions(-) diff --git a/src/security/security_apparmor.c b/src/security/security_apparmor.c index 2d05fd0..62af3c6 100644 --- a/src/security/security_apparmor.c +++ b/src/security/security_apparmor.c @@ -809,39 +809,39 @@ AppArmorSetImageFDLabel(virSecurityManagerPtr mgr, } virSecurityDriver virAppArmorSecurityDriver = { - 0, - SECURITY_APPARMOR_NAME, - AppArmorSecurityManagerProbe, - AppArmorSecurityManagerOpen, - AppArmorSecurityManagerClose, + .privateDataLen = 0, + .name = SECURITY_APPARMOR_NAME, + .probe = AppArmorSecurityManagerProbe, + .open = AppArmorSecurityManagerOpen, + .close = AppArmorSecurityManagerClose, - AppArmorSecurityManagerGetModel, - AppArmorSecurityManagerGetDOI, + .getModel = AppArmorSecurityManagerGetModel, + .getDOI = AppArmorSecurityManagerGetDOI, - AppArmorSecurityVerify, + .domainSecurityVerify = AppArmorSecurityVerify, - AppArmorSetSecurityImageLabel, - AppArmorRestoreSecurityImageLabel, + .domainSetSecurityImageLabel = AppArmorSetSecurityImageLabel, + .domainRestoreSecurityImageLabel = AppArmorRestoreSecurityImageLabel, - AppArmorSetSecurityDaemonSocketLabel, - AppArmorSetSecuritySocketLabel, - AppArmorClearSecuritySocketLabel, + .domainSetSecurityDaemonSocketLabel = AppArmorSetSecurityDaemonSocketLabel, + .domainSetSecuritySocketLabel = AppArmorSetSecuritySocketLabel, + .domainClearSecuritySocketLabel = AppArmorClearSecuritySocketLabel, - AppArmorGenSecurityLabel, - AppArmorReserveSecurityLabel, - AppArmorReleaseSecurityLabel, + .domainGenSecurityLabel = AppArmorGenSecurityLabel, + .domainReserveSecurityLabel = AppArmorReserveSecurityLabel, + .domainReleaseSecurityLabel = AppArmorReleaseSecurityLabel, - AppArmorGetSecurityProcessLabel, - AppArmorSetSecurityProcessLabel, + .domainGetSecurityProcessLabel = AppArmorGetSecurityProcessLabel, + .domainSetSecurityProcessLabel = AppArmorSetSecurityProcessLabel, - AppArmorSetSecurityAllLabel, - AppArmorRestoreSecurityAllLabel, + .domainSetSecurityAllLabel = AppArmorSetSecurityAllLabel, + .domainRestoreSecurityAllLabel = AppArmorRestoreSecurityAllLabel, - AppArmorSetSecurityHostdevLabel, - AppArmorRestoreSecurityHostdevLabel, + .domainSetSecurityHostdevLabel = AppArmorSetSecurityHostdevLabel, + .domainRestoreSecurityHostdevLabel = AppArmorRestoreSecurityHostdevLabel, - AppArmorSetSavedStateLabel, - AppArmorRestoreSavedStateLabel, + .domainSetSavedStateLabel = AppArmorSetSavedStateLabel, + .domainRestoreSavedStateLabel = AppArmorRestoreSavedStateLabel, - AppArmorSetImageFDLabel, + .domainSetSecurityImageFDLabel = AppArmorSetImageFDLabel, }; diff --git a/src/security/security_dac.c b/src/security/security_dac.c index 470861d..9182b39 100644 --- a/src/security/security_dac.c +++ b/src/security/security_dac.c @@ -723,42 +723,41 @@ static char *virSecurityDACGetMountOptions(virSecurityManagerPtr mgr ATTRIBUTE_U } virSecurityDriver virSecurityDriverDAC = { - sizeof(virSecurityDACData), - "virDAC", + .privateDataLen = sizeof(virSecurityDACData), + .name = "virDAC", + .probe = virSecurityDACProbe, + .open = virSecurityDACOpen, + .close = virSecurityDACClose, - virSecurityDACProbe, - virSecurityDACOpen, - virSecurityDACClose, + .getModel = virSecurityDACGetModel, + .getDOI = virSecurityDACGetDOI, - virSecurityDACGetModel, - virSecurityDACGetDOI, + .domainSecurityVerify = virSecurityDACVerify, - virSecurityDACVerify, + .domainSetSecurityImageLabel = virSecurityDACSetSecurityImageLabel, + .domainRestoreSecurityImageLabel = virSecurityDACRestoreSecurityImageLabel, - virSecurityDACSetSecurityImageLabel, - virSecurityDACRestoreSecurityImageLabel, + .domainSetSecurityDaemonSocketLabel = virSecurityDACSetDaemonSocketLabel, + .domainSetSecuritySocketLabel = virSecurityDACSetSocketLabel, + .domainClearSecuritySocketLabel = virSecurityDACClearSocketLabel, - virSecurityDACSetDaemonSocketLabel, - virSecurityDACSetSocketLabel, - virSecurityDACClearSocketLabel, + .domainGenSecurityLabel = virSecurityDACGenLabel, + .domainReserveSecurityLabel = virSecurityDACReserveLabel, + .domainReleaseSecurityLabel = virSecurityDACReleaseLabel, - virSecurityDACGenLabel, - virSecurityDACReserveLabel, - virSecurityDACReleaseLabel, + .domainGetSecurityProcessLabel = virSecurityDACGetProcessLabel, + .domainSetSecurityProcessLabel = virSecurityDACSetProcessLabel, - virSecurityDACGetProcessLabel, - virSecurityDACSetProcessLabel, + .domainSetSecurityAllLabel = virSecurityDACSetSecurityAllLabel, + .domainRestoreSecurityAllLabel = virSecurityDACRestoreSecurityAllLabel, - virSecurityDACSetSecurityAllLabel, - virSecurityDACRestoreSecurityAllLabel, + .domainSetSecurityHostdevLabel = virSecurityDACSetSecurityHostdevLabel, + .domainRestoreSecurityHostdevLabel = virSecurityDACRestoreSecurityHostdevLabel, - virSecurityDACSetSecurityHostdevLabel, - virSecurityDACRestoreSecurityHostdevLabel, + .domainSetSavedStateLabel = virSecurityDACSetSavedStateLabel, + .domainRestoreSavedStateLabel = virSecurityDACRestoreSavedStateLabel, - virSecurityDACSetSavedStateLabel, - virSecurityDACRestoreSavedStateLabel, + .domainSetSecurityImageFDLabel = virSecurityDACSetImageFDLabel, - virSecurityDACSetImageFDLabel, - - virSecurityDACGetMountOptions, + .domainGetSecurityMountOptions = virSecurityDACGetMountOptions, }; diff --git a/src/security/security_nop.c b/src/security/security_nop.c index b62daf5..5f90df3 100644 --- a/src/security/security_nop.c +++ b/src/security/security_nop.c @@ -170,41 +170,41 @@ static char *virSecurityDomainGetMountOptionsNop(virSecurityManagerPtr mgr ATTRI } virSecurityDriver virSecurityDriverNop = { - 0, - "none", - virSecurityDriverProbeNop, - virSecurityDriverOpenNop, - virSecurityDriverCloseNop, + .privateDataLen = 0, + .name = "none", + .probe = virSecurityDriverProbeNop, + .open = virSecurityDriverOpenNop, + .close = virSecurityDriverCloseNop, - virSecurityDriverGetModelNop, - virSecurityDriverGetDOINop, + .getModel = virSecurityDriverGetModelNop, + .getDOI = virSecurityDriverGetDOINop, - virSecurityDomainVerifyNop, + .domainSecurityVerify = virSecurityDomainVerifyNop, - virSecurityDomainSetImageLabelNop, - virSecurityDomainRestoreImageLabelNop, + .domainSetSecurityImageLabel = virSecurityDomainSetImageLabelNop, + .domainRestoreSecurityImageLabel = virSecurityDomainRestoreImageLabelNop, - virSecurityDomainSetDaemonSocketLabelNop, - virSecurityDomainSetSocketLabelNop, - virSecurityDomainClearSocketLabelNop, + .domainSetSecurityDaemonSocketLabel = virSecurityDomainSetDaemonSocketLabelNop, + .domainSetSecuritySocketLabel = virSecurityDomainSetSocketLabelNop, + .domainClearSecuritySocketLabel = virSecurityDomainClearSocketLabelNop, - virSecurityDomainGenLabelNop, - virSecurityDomainReserveLabelNop, - virSecurityDomainReleaseLabelNop, + .domainGenSecurityLabel = virSecurityDomainGenLabelNop, + .domainReserveSecurityLabel = virSecurityDomainReserveLabelNop, + .domainReleaseSecurityLabel = virSecurityDomainReleaseLabelNop, - virSecurityDomainGetProcessLabelNop, - virSecurityDomainSetProcessLabelNop, + .domainGetSecurityProcessLabel = virSecurityDomainGetProcessLabelNop, + .domainSetSecurityProcessLabel = virSecurityDomainSetProcessLabelNop, - virSecurityDomainSetAllLabelNop, - virSecurityDomainRestoreAllLabelNop, + .domainSetSecurityAllLabel = virSecurityDomainSetAllLabelNop, + .domainRestoreSecurityAllLabel = virSecurityDomainRestoreAllLabelNop, - virSecurityDomainSetHostdevLabelNop, - virSecurityDomainRestoreHostdevLabelNop, + .domainSetSecurityHostdevLabel = virSecurityDomainSetHostdevLabelNop, + .domainRestoreSecurityHostdevLabel = virSecurityDomainRestoreHostdevLabelNop, - virSecurityDomainSetSavedStateLabelNop, - virSecurityDomainRestoreSavedStateLabelNop, + .domainSetSavedStateLabel = virSecurityDomainSetSavedStateLabelNop, + .domainRestoreSavedStateLabel = virSecurityDomainRestoreSavedStateLabelNop, - virSecurityDomainSetFDLabelNop, + .domainSetSecurityImageFDLabel = virSecurityDomainSetFDLabelNop, - virSecurityDomainGetMountOptionsNop, + .domainGetSecurityMountOptions = virSecurityDomainGetMountOptionsNop, }; diff --git a/src/security/security_selinux.c b/src/security/security_selinux.c index 2b8ff19..ffa65fb 100644 --- a/src/security/security_selinux.c +++ b/src/security/security_selinux.c @@ -1591,41 +1591,41 @@ static char *SELinuxGetSecurityMountOptions(virSecurityManagerPtr mgr, } virSecurityDriver virSecurityDriverSELinux = { - sizeof(virSecuritySELinuxData), - SECURITY_SELINUX_NAME, - SELinuxSecurityDriverProbe, - SELinuxSecurityDriverOpen, - SELinuxSecurityDriverClose, + .privateDataLen = sizeof(virSecuritySELinuxData), + .name = SECURITY_SELINUX_NAME, + .probe = SELinuxSecurityDriverProbe, + .open = SELinuxSecurityDriverOpen, + .close = SELinuxSecurityDriverClose, - SELinuxSecurityGetModel, - SELinuxSecurityGetDOI, + .getModel = SELinuxSecurityGetModel, + .getDOI = SELinuxSecurityGetDOI, - SELinuxSecurityVerify, + .domainSecurityVerify = SELinuxSecurityVerify, - SELinuxSetSecurityImageLabel, - SELinuxRestoreSecurityImageLabel, + .domainSetSecurityImageLabel = SELinuxSetSecurityImageLabel, + .domainRestoreSecurityImageLabel = SELinuxRestoreSecurityImageLabel, - SELinuxSetSecurityDaemonSocketLabel, - SELinuxSetSecuritySocketLabel, - SELinuxClearSecuritySocketLabel, + .domainSetSecurityDaemonSocketLabel = SELinuxSetSecurityDaemonSocketLabel, + .domainSetSecuritySocketLabel = SELinuxSetSecuritySocketLabel, + .domainClearSecuritySocketLabel = SELinuxClearSecuritySocketLabel, - SELinuxGenSecurityLabel, - SELinuxReserveSecurityLabel, - SELinuxReleaseSecurityLabel, + .domainGenSecurityLabel = SELinuxGenSecurityLabel, + .domainReserveSecurityLabel = SELinuxReserveSecurityLabel, + .domainReleaseSecurityLabel = SELinuxReleaseSecurityLabel, - SELinuxGetSecurityProcessLabel, - SELinuxSetSecurityProcessLabel, + .domainGetSecurityProcessLabel = SELinuxGetSecurityProcessLabel, + .domainSetSecurityProcessLabel = SELinuxSetSecurityProcessLabel, - SELinuxSetSecurityAllLabel, - SELinuxRestoreSecurityAllLabel, + .domainSetSecurityAllLabel = SELinuxSetSecurityAllLabel, + .domainRestoreSecurityAllLabel = SELinuxRestoreSecurityAllLabel, - SELinuxSetSecurityHostdevLabel, - SELinuxRestoreSecurityHostdevLabel, + .domainSetSecurityHostdevLabel = SELinuxSetSecurityHostdevLabel, + .domainRestoreSecurityHostdevLabel = SELinuxRestoreSecurityHostdevLabel, - SELinuxSetSavedStateLabel, - SELinuxRestoreSavedStateLabel, + .domainSetSavedStateLabel = SELinuxSetSavedStateLabel, + .domainRestoreSavedStateLabel = SELinuxRestoreSavedStateLabel, - SELinuxSetImageFDLabel, + .domainSetSecurityImageFDLabel = SELinuxSetImageFDLabel, - SELinuxGetSecurityMountOptions, + .domainGetSecurityMountOptions = SELinuxGetSecurityMountOptions, }; diff --git a/src/security/security_stack.c b/src/security/security_stack.c index 6ecd099..65d30d6 100644 --- a/src/security/security_stack.c +++ b/src/security/security_stack.c @@ -409,41 +409,41 @@ static char *virSecurityStackGetMountOptions(virSecurityManagerPtr mgr ATTRIBUTE } virSecurityDriver virSecurityDriverStack = { - sizeof(virSecurityStackData), - "stack", - virSecurityStackProbe, - virSecurityStackOpen, - virSecurityStackClose, + .privateDataLen = sizeof(virSecurityStackData), + .name = "stack", + .probe = virSecurityStackProbe, + .open = virSecurityStackOpen, + .close = virSecurityStackClose, - virSecurityStackGetModel, - virSecurityStackGetDOI, + .getModel = virSecurityStackGetModel, + .getDOI = virSecurityStackGetDOI, - virSecurityStackVerify, + .domainSecurityVerify = virSecurityStackVerify, - virSecurityStackSetSecurityImageLabel, - virSecurityStackRestoreSecurityImageLabel, + .domainSetSecurityImageLabel = virSecurityStackSetSecurityImageLabel, + .domainRestoreSecurityImageLabel = virSecurityStackRestoreSecurityImageLabel, - virSecurityStackSetDaemonSocketLabel, - virSecurityStackSetSocketLabel, - virSecurityStackClearSocketLabel, + .domainSetSecurityDaemonSocketLabel = virSecurityStackSetDaemonSocketLabel, + .domainSetSecuritySocketLabel = virSecurityStackSetSocketLabel, + .domainClearSecuritySocketLabel = virSecurityStackClearSocketLabel, - virSecurityStackGenLabel, - virSecurityStackReserveLabel, - virSecurityStackReleaseLabel, + .domainGenSecurityLabel = virSecurityStackGenLabel, + .domainReserveSecurityLabel = virSecurityStackReserveLabel, + .domainReleaseSecurityLabel = virSecurityStackReleaseLabel, - virSecurityStackGetProcessLabel, - virSecurityStackSetProcessLabel, + .domainGetSecurityProcessLabel = virSecurityStackGetProcessLabel, + .domainSetSecurityProcessLabel = virSecurityStackSetProcessLabel, - virSecurityStackSetSecurityAllLabel, - virSecurityStackRestoreSecurityAllLabel, + .domainSetSecurityAllLabel = virSecurityStackSetSecurityAllLabel, + .domainRestoreSecurityAllLabel = virSecurityStackRestoreSecurityAllLabel, - virSecurityStackSetSecurityHostdevLabel, - virSecurityStackRestoreSecurityHostdevLabel, + .domainSetSecurityHostdevLabel = virSecurityStackSetSecurityHostdevLabel, + .domainRestoreSecurityHostdevLabel = virSecurityStackRestoreSecurityHostdevLabel, - virSecurityStackSetSavedStateLabel, - virSecurityStackRestoreSavedStateLabel, + .domainSetSavedStateLabel = virSecurityStackSetSavedStateLabel, + .domainRestoreSavedStateLabel = virSecurityStackRestoreSavedStateLabel, - virSecurityStackSetImageFDLabel, + .domainSetSecurityImageFDLabel = virSecurityStackSetImageFDLabel, - virSecurityStackGetMountOptions, + .domainGetSecurityMountOptions = virSecurityStackGetMountOptions, }; -- 1.7.8.5

2 2

[libvirt] [PATCH 0/5] Atomic api to list all domains
by Peter Krempa 24 May '12

24 May '12

This patchset adds a atomic way to list guests. A more detailed description is in patch 1. Peter Krempa (5): lib: Add public api to enable atomic listing of guest python: add API exports for virConnectListAllDomains() remote: implement remote protocol for virConnectListAllDomains() qemu: implement virConnectListAllDomains() for qemu driver virsh: add support for virConnectListAllDomains and clean up cmdList daemon/remote.c | 50 ++++ include/libvirt/libvirt.h.in | 8 +- python/generator.py | 1 + python/libvirt-override-api.xml | 12 +- python/libvirt-override-virConnect.py | 12 + python/libvirt-override.c | 49 ++++- src/driver.h | 12 +- src/libvirt.c | 46 ++++ src/libvirt_public.syms | 5 + src/qemu/qemu_driver.c | 97 ++++++++ src/remote/remote_driver.c | 66 +++++ src/remote/remote_protocol.x | 14 +- src/remote_protocol-structs | 12 + tools/virsh.c | 423 +++++++++++++++++++++------------ 14 files changed, 647 insertions(+), 160 deletions(-) -- 1.7.3.4

4 20

[libvirt] [PATCH] fix building error on non fedora system
by Wen Congyang 24 May '12

24 May '12

We forget to define with_storage_rbd if the system is not fedora, or the version is less than 16. --- libvirt.spec.in | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 8c4a2fd..0b83969 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -75,6 +75,8 @@ %define with_storage_mpath 0%{!?_without_storage_mpath:%{server_drivers}} %if 0%{?fedora} >= 16 %define with_storage_rbd 0%{!?_without_storage_rbd:%{server_drivers}} +%else +%define with_storage_rbd 0 %endif %define with_numactl 0%{!?_without_numactl:%{server_drivers}} %define with_selinux 0%{!?_without_selinux:%{server_drivers}} -- 1.7.1

3 2

[libvirt] [PATCH] Add stub impl of virNetlinkEventServiceLocalPid for Win32
by Daniel P. Berrange 24 May '12

24 May '12

From: "Daniel P. Berrange" <berrange(a)redhat.com> Pushed the following under build-breaker fix rule (Win32) The libvirt_private.syms file exports virNetlinkEventServiceLocalPid so there needs to be a no-op stub for Win32 to avoid linker errors Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- src/util/virnetlink.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/src/util/virnetlink.c b/src/util/virnetlink.c index e316137..9539694 100644 --- a/src/util/virnetlink.c +++ b/src/util/virnetlink.c @@ -669,6 +669,12 @@ bool virNetlinkEventServiceIsRunning(void) return 0; } +int virNetlinkEventServiceLocalPid(void) +{ + netlinkError(VIR_ERR_INTERNAL_ERROR, "%s", _(unsupported)); + return -1; +} + /** * virNetlinkEventAddClient: register a callback for handling of * netlink messages -- 1.7.7.6

1 0

[libvirt] [PATCHv3 4/4] openvz: add quota argument when creating container
by Guido Günther 24 May '12

24 May '12

--- src/openvz/openvz_driver.c | 58 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 57 insertions(+), 1 deletion(-) diff --git a/src/openvz/openvz_driver.c b/src/openvz/openvz_driver.c index c6d25d7..fb72cde 100644 --- a/src/openvz/openvz_driver.c +++ b/src/openvz/openvz_driver.c @@ -189,6 +189,48 @@ cleanup: } +static int +openvzSetDiskQuota(virDomainDefPtr vmdef, + virDomainFSDefPtr fss) +{ + int ret = -1; + unsigned long long sl, hl; + virCommandPtr cmd = virCommandNewArgList(VZCTL, + "--quiet", + "set", + vmdef->name, + "--save", + NULL); + + if (fss->type == VIR_DOMAIN_FS_TYPE_TEMPLATE) { + if (fss->space_hard_limit) { + hl = VIR_DIV_UP(fss->space_hard_limit, 1024); + virCommandAddArg(cmd, "--diskspace"); + + if (fss->space_soft_limit) { + sl = VIR_DIV_UP(fss->space_soft_limit, 1024); + virCommandAddArgFormat(cmd, "%lld:%lld", sl, hl); + } else { + virCommandAddArgFormat(cmd, "%lld", hl); + } + } else if (fss->space_soft_limit) { + openvzError(VIR_ERR_INVALID_ARG, "%s", + _("Can't set soft limit without hard limit")); + goto cleanup; + } + + if (virCommandRun(cmd, NULL) < 0) + goto cleanup; + } + + ret = 0; +cleanup: + virCommandFree(cmd); + + return ret; +} + + static virDomainPtr openvzDomainLookupByID(virConnectPtr conn, int id) { struct openvz_driver *driver = conn->privateData; @@ -895,7 +937,13 @@ openvzDomainDefineXML(virConnectPtr conn, const char *xml) goto cleanup; } - /* TODO: set quota */ + if (vm->def->nfss == 1) { + if (openvzSetDiskQuota(vm->def, vm->def->fss[0]) < 0) { + openvzError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Could not set disk quota")); + goto cleanup; + } + } if (openvzSetDefinedUUID(strtoI(vm->def->name), vm->def->uuid) < 0) { openvzError(VIR_ERR_INTERNAL_ERROR, "%s", @@ -977,6 +1025,14 @@ openvzDomainCreateXML(virConnectPtr conn, const char *xml, goto cleanup; } + if (vm->def->nfss == 1) { + if (openvzSetDiskQuota(vm->def, vm->def->fss[0]) < 0) { + openvzError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Could not set disk quota")); + goto cleanup; + } + } + if (openvzSetDefinedUUID(strtoI(vm->def->name), vm->def->uuid) < 0) { openvzError(VIR_ERR_INTERNAL_ERROR, "%s", _("Could not set UUID")); -- 1.7.10

2 2

[libvirt] [PATCHv3 2/4] Introduce filesystem limits to virDomainFSDef
by Guido Günther 24 May '12

24 May '12

--- docs/formatdomain.html.in | 14 ++++++++++++++ docs/schemas/domaincommon.rng | 12 ++++++++++++ src/conf/domain_conf.c | 30 +++++++++++++++++++++++++++--- src/conf/domain_conf.h | 2 ++ 4 files changed, 55 insertions(+), 3 deletions(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 3875167..c56a793 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -1686,6 +1686,20 @@ default read-write access is given (currently only works for QEMU/KVM driver). </dd> + + <dt><code>space_hard_limit</code></dt> + <dd> + Maximum space available to this guest's filesystem. + <span class="since">Since 0.9.13</span> + </dd> + + <dt><code>space_soft_limit</code></dt> + <dd> + Maximum space available to this guest's filesystem. The container is + permitted to exceed its soft limits for a grace period of time. Afterwards the + hard limit is enforced. + <span class="since">Since 0.9.13</span> + </dd> </dl> <h4><a name="elementsAddress">Device Addresses</a></h4> diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index 34f63c3..62c28c8 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -1316,6 +1316,18 @@ <ref name="address"/> </optional> </interleave> + <interleave> + <optional> + <element name="space_hard_limit"> + <ref name='scaledInteger'/> + </element> + </optional> + <optional> + <element name="space_soft_limit"> + <ref name='scaledInteger'/> + </element> + </optional> + </interleave> </element> </define> <!-- diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 5ac911e..a75e7e8 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -4200,9 +4200,10 @@ cleanup: */ static virDomainFSDefPtr virDomainFSDefParseXML(xmlNodePtr node, + xmlXPathContextPtr ctxt, unsigned int flags) { virDomainFSDefPtr def; - xmlNodePtr cur; + xmlNodePtr cur, save_node = ctxt->node; char *type = NULL; char *fsdriver = NULL; char *source = NULL; @@ -4210,6 +4211,8 @@ virDomainFSDefParseXML(xmlNodePtr node, char *accessmode = NULL; char *wrpolicy = NULL; + ctxt->node = node; + if (VIR_ALLOC(def) < 0) { virReportOOMError(); return NULL; @@ -4237,6 +4240,18 @@ virDomainFSDefParseXML(xmlNodePtr node, def->accessmode = VIR_DOMAIN_FS_ACCESSMODE_PASSTHROUGH; } + if (virDomainParseScaledValue("./space_hard_limit[1]", ctxt, + &def->space_hard_limit, 1, + ULONG_LONG_MAX, + false) < 0) + goto error; + + if (virDomainParseScaledValue("./space_soft_limit[1]", ctxt, + &def->space_soft_limit, 1, + ULONG_LONG_MAX, + false) < 0) + goto error; + cur = node->children; while (cur != NULL) { if (cur->type == XML_ELEMENT_NODE) { @@ -4303,6 +4318,7 @@ virDomainFSDefParseXML(xmlNodePtr node, goto error; cleanup: + ctxt->node = save_node; VIR_FREE(type); VIR_FREE(fsdriver); VIR_FREE(target); @@ -7076,7 +7092,7 @@ virDomainDeviceDefPtr virDomainDeviceDefParse(virCapsPtr caps, goto error; } else if (xmlStrEqual(node->name, BAD_CAST "filesystem")) { dev->type = VIR_DOMAIN_DEVICE_FS; - if (!(dev->data.fs = virDomainFSDefParseXML(node, flags))) + if (!(dev->data.fs = virDomainFSDefParseXML(node, ctxt, flags))) goto error; } else if (xmlStrEqual(node->name, BAD_CAST "interface")) { dev->type = VIR_DOMAIN_DEVICE_NET; @@ -8621,7 +8637,7 @@ static virDomainDefPtr virDomainDefParseXML(virCapsPtr caps, if (n && VIR_ALLOC_N(def->fss, n) < 0) goto no_memory; for (i = 0 ; i < n ; i++) { - virDomainFSDefPtr fs = virDomainFSDefParseXML(nodes[i], + virDomainFSDefPtr fs = virDomainFSDefParseXML(nodes[i], ctxt, flags); if (!fs) goto error; @@ -11319,6 +11335,14 @@ virDomainFSDefFormat(virBufferPtr buf, if (virDomainDeviceInfoFormat(buf, &def->info, flags) < 0) return -1; + + if (def->space_hard_limit) + virBufferAsprintf(buf, " <space_hard_limit unit='B'>" + "%llu</space_hard_limit>\n", def->space_hard_limit); + if (def->space_soft_limit) { + virBufferAsprintf(buf, " <space_soft_limit unit='B'>" + "%llu</space_soft_limit>\n", def->space_soft_limit); + } virBufferAddLit(buf, " </filesystem>\n"); return 0; diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 4c56902..8d5b35a 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -699,6 +699,8 @@ struct _virDomainFSDef { char *dst; unsigned int readonly : 1; virDomainDeviceInfo info; + unsigned long long space_hard_limit; /* in bytes */ + unsigned long long space_soft_limit; /* in bytes */ }; -- 1.7.10

2 2

[libvirt] [PATCHv3 3/4] openvz: support file system quota reporting
by Guido Günther 23 May '12

23 May '12

--- src/conf/domain_conf.c | 4 ++-- src/openvz/openvz_conf.c | 24 +++++++++++++++++++++++ tests/domainschemadata/domain-openvz-simple.xml | 2 ++ 3 files changed, 28 insertions(+), 2 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index a75e7e8..357929b 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -11337,10 +11337,10 @@ virDomainFSDefFormat(virBufferPtr buf, if (def->space_hard_limit) - virBufferAsprintf(buf, " <space_hard_limit unit='B'>" + virBufferAsprintf(buf, " <space_hard_limit unit='bytes'>" "%llu</space_hard_limit>\n", def->space_hard_limit); if (def->space_soft_limit) { - virBufferAsprintf(buf, " <space_soft_limit unit='B'>" + virBufferAsprintf(buf, " <space_soft_limit unit='bytes'>" "%llu</space_soft_limit>\n", def->space_soft_limit); } virBufferAddLit(buf, " </filesystem>\n"); diff --git a/src/openvz/openvz_conf.c b/src/openvz/openvz_conf.c index 5f107ed..363cd1e 100644 --- a/src/openvz/openvz_conf.c +++ b/src/openvz/openvz_conf.c @@ -407,6 +407,8 @@ openvzReadFSConf(virDomainDefPtr def, virDomainFSDefPtr fs = NULL; char *veid_str = NULL; char *temp = NULL; + const char *param; + unsigned long long barrier, limit; ret = openvzReadVPSConfigParam(veid, "OSTEMPLATE", &temp); if (ret < 0) { @@ -444,6 +446,28 @@ openvzReadFSConf(virDomainDefPtr def, fs->dst = strdup("/"); + param = "DISKSPACE"; + ret = openvzReadVPSConfigParam(veid, param, &temp); + if (ret > 0) { + if (openvzParseBarrierLimit(temp, &barrier, &limit)) { + openvzError(VIR_ERR_INTERNAL_ERROR, + _("Could not read '%s' from config for container %d"), + param, veid); + goto error; + } else { + /* Ensure that we can multiply by 1024 without overflowing. */ + if (barrier > ULONG_LONG_MAX / 1024 || + limit > ULONG_LONG_MAX / 1024 ) { + virReportSystemError(EINVAL, + _("%s"), + "Unable to parse quota"); + goto error; + } + fs->space_soft_limit = barrier * 1024; /* unit is bytes */ + fs->space_hard_limit = limit * 1024; /* unit is bytes */ + } + } + if (fs->src == NULL || fs->dst == NULL) goto no_memory; diff --git a/tests/domainschemadata/domain-openvz-simple.xml b/tests/domainschemadata/domain-openvz-simple.xml index a121d39..949e96d 100644 --- a/tests/domainschemadata/domain-openvz-simple.xml +++ b/tests/domainschemadata/domain-openvz-simple.xml @@ -21,6 +21,8 @@ <filesystem type='template' accessmode='passthrough'> <source name='debian'/> <target dir='/'/> + <space_hard_limit>1153024</space_hard_limit> + <space_soft_limit>1048576</space_soft_limit> </filesystem> </devices> </domain> -- 1.7.10

2 1

[libvirt] [PATCHv3 1/4] Introduce virDomainParseScaledValue
by Guido Günther 23 May '12

23 May '12

and use it for virDomainParseMemory. This allows to parse arbitrary scaled value, not only memory related values as needed for the filesystem limits code following later in this series. --- src/conf/domain_conf.c | 94 +++++++++++++++++++++++++++++++----------------- 1 file changed, 61 insertions(+), 33 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 9def71d..5ac911e 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -4138,6 +4138,63 @@ cleanup: goto cleanup; } + +/* Parse a value located at XPATH within CTXT, and store the + * result into val. If REQUIRED, then the value must exist; + * otherwise, the value is optional. The value is in bytes. + * Return 0 on success, -1 on failure after issuing error. */ +static int +virDomainParseScaledValue(const char *xpath, + xmlXPathContextPtr ctxt, + unsigned long long *val, + unsigned long long scale, + unsigned long long max, + bool required) +{ + char *xpath_full = NULL; + char *unit = NULL; + int ret = -1; + unsigned long long bytes; + + *val = 0; + if (virAsprintf(&xpath_full, "string(%s)", xpath) < 0) { + virReportOOMError(); + goto cleanup; + } + ret = virXPathULongLong(xpath_full, ctxt, &bytes); + if (ret < 0) { + if (ret == -2) + virDomainReportError(VIR_ERR_XML_ERROR, + _("could not parse memory element %s"), + xpath); + else if (required) + virDomainReportError(VIR_ERR_XML_ERROR, + _("missing element %s"), + xpath); + else + ret = 0; + goto cleanup; + } + VIR_FREE(xpath_full); + + if (virAsprintf(&xpath_full, "string(%s/@unit)", xpath) < 0) { + virReportOOMError(); + goto cleanup; + } + unit = virXPathString(xpath_full, ctxt); + + if (virScaleInteger(&bytes, unit, scale, max) < 0) + goto cleanup; + + *val = bytes; + ret = 0; +cleanup: + VIR_FREE(xpath_full); + VIR_FREE(unit); + return ret; +} + + /* Parse the XML definition for a disk * @param node XML nodeset to parse for disk definition */ @@ -7768,53 +7825,24 @@ static int virDomainParseMemory(const char *xpath, xmlXPathContextPtr ctxt, unsigned long long *mem, bool required) { - char *xpath_full = NULL; - char *unit = NULL; int ret = -1; - unsigned long long bytes; - unsigned long long max; + unsigned long long bytes, max; - *mem = 0; - if (virAsprintf(&xpath_full, "string(%s)", xpath) < 0) { - virReportOOMError(); - goto cleanup; - } - ret = virXPathULongLong(xpath_full, ctxt, &bytes); - if (ret < 0) { - if (ret == -2) - virDomainReportError(VIR_ERR_XML_ERROR, - _("could not parse memory element %s"), - xpath); - else if (required) - virDomainReportError(VIR_ERR_XML_ERROR, - _("missing memory element %s"), - xpath); - else - ret = 0; - goto cleanup; - } - VIR_FREE(xpath_full); - - if (virAsprintf(&xpath_full, "string(%s/@unit)", xpath) < 0) { - virReportOOMError(); - goto cleanup; - } - unit = virXPathString(xpath_full, ctxt); /* On 32-bit machines, our bound is 0xffffffff * KiB. On 64-bit * machines, our bound is off_t (2^63). */ if (sizeof(unsigned long) < sizeof(long long)) max = 1024ull * ULONG_MAX; else max = LLONG_MAX; - if (virScaleInteger(&bytes, unit, 1024, max) < 0) + + ret = virDomainParseScaledValue(xpath, ctxt, &bytes, 1024, max, required); + if (ret < 0) goto cleanup; /* Yes, we really do use kibibytes for our internal sizing. */ *mem = VIR_DIV_UP(bytes, 1024); ret = 0; cleanup: - VIR_FREE(xpath_full); - VIR_FREE(unit); return ret; } -- 1.7.10

2 1

[libvirt] [PATCHv3 0/4] Support filesystem limits for containers
by Guido Günther 23 May '12

23 May '12

Hi, the following patches are a third stab at filesystem limits for containers. With these patches space limits in openvz containers are printed in the domain config as: <filesystem type='template' accessmode='passthrough'> <source name='debian'/> <target dir='/'/> <space_hard_limit unit="MiB">1153024</space_hard_limit> <space_soft_limit unit="MiB">1048576</space_soft_limit> </filesystem> The can also be set from the domain xml. I left out inode limits for now since the unit "Bytes" wouldn't fit there well and I didnt' get around to update the unit parsing code yet. Changes since last time: * Add the version we introduced this feature to formatdomain.html.in * Move the patch that makes virDomainParseMemory use virDomainParseScaledValue to the front of the queue * Fix safe_node -> save_node typo * Make output format consistent with what's used in storage_conf.c ('bytes' not 'B') * openvz: Check for overflow when parsing DISKSPACE out of the container config * openvz: Fix logic that only sets the hard limit when no soft limit is given and rejects config that only specify a soft limit Cheers, -- Guido Guido Günther (4): Introduce virDomainParseScaledValue Introduce filesystem limits to virDomainFSDef openvz: support file system quota reporting openvz: add quota argument when creating container docs/formatdomain.html.in | 14 +++ docs/schemas/domaincommon.rng | 12 +++ src/conf/domain_conf.c | 124 ++++++++++++++++------- src/conf/domain_conf.h | 2 + src/openvz/openvz_conf.c | 24 +++++ src/openvz/openvz_driver.c | 58 ++++++++++- tests/domainschemadata/domain-openvz-simple.xml | 2 + 7 files changed, 199 insertions(+), 37 deletions(-) -- 1.7.10

1 0

[libvirt] Providing custom arguments/environment to network scripts
by Tore Anderson 23 May '12

23 May '12

I'm trying to build a setup where the VMs only have point-to-point Ethernet connections to the hypervisor, which will then act as a layer-3 router. When the VM starts, the hypervisor needs to UP the assigned tap interface and configure an IP/mask on it (that will be the VMs default gateway). So I'm currently looking at a config looking like this: <interface type='ethernet'> <script path='/sbin/vm-ifup'/> </interface> The problem I'm facing is that there appears to be no way supply information to the script by way of command-line arguments or custom environment variables. So something like: <script path='/sbin/vm-ifup 2001:db8::/64'/> ...fails because it tries to execute the whole string, space included, as the script file. The only information I have available in the script is the assigned tap device in the hypervisor (which is automatically passed in as the first argument to the script). As the device name is automatically assigned on VM start, it is useless as a lookup key of sorts for finding more information. One workaround would be to have one network script per VM that hard-codes all the necessary information, but if you have a large number of hypervisors with an even larger number of VMs, this quickly becomes impractical. So my question is, is there some other way to pass configuration information to the network script or to accomplish what I'm trying to do? Best regards, -- Tore Anderson Redpill Linpro AS - http://www.redpill-linpro.com

2 1