- Devel - libvirt List Archives

[libvirt] [PATCH] Fix shadowed variable with older gcc
by Ján Tomko 24 Jun '14

24 Jun '14

Commit 2cff94c fixed the shadowed 'link' added by commit 975f0e2, but forgot the 'link' added by commit 08aa22e. --- Pushed as a build-breaker fix. tests/virstoragetest.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/virstoragetest.c b/tests/virstoragetest.c index f86d25c..e85dc6e 100644 --- a/tests/virstoragetest.c +++ b/tests/virstoragetest.c @@ -542,16 +542,16 @@ static const char *testPathCanonicalizeSymlinks[][2] = static int testPathCanonicalizeReadlink(const char *path, - char **link, + char **linkpath, void *data ATTRIBUTE_UNUSED) { size_t i; - *link = NULL; + *linkpath = NULL; for (i = 0; i < ARRAY_CARDINALITY(testPathCanonicalizeSymlinks); i++) { if (STREQ(path, testPathCanonicalizeSymlinks[i][0])) { - if (VIR_STRDUP(*link, testPathCanonicalizeSymlinks[i][1]) < 0) + if (VIR_STRDUP(*linkpath, testPathCanonicalizeSymlinks[i][1]) < 0) return -1; return 0; -- 1.8.5.5

1 0

[libvirt] [PATCH v3] LXC: trivially support flag VIR_DRV_FEATURE_TYPED_PARAM_STRING
by Chen Hanxiao 24 Jun '14

24 Jun '14

fix: virsh -c lxc:/// memtune DOMAIN error: Unable to get number of memory parameters error: unsupported flags (0x4) in function lxcDomainGetMemoryParameters Signed-off-by: Chen Hanxiao <chenhanxiao(a)cn.fujitsu.com> --- v2: also fix a similar issue in lxcDomainGetSchedulerParametersFlags v3: fix improper comments src/lxc/lxc_driver.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index 06f3e18..3875bf3 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -895,7 +895,11 @@ lxcDomainGetMemoryParameters(virDomainPtr dom, size_t i; virCheckFlags(VIR_DOMAIN_AFFECT_LIVE | - VIR_DOMAIN_AFFECT_CONFIG, -1); + VIR_DOMAIN_AFFECT_CONFIG | + VIR_TYPED_PARAM_STRING_OKAY, -1); + + /* We don't return strings, and thus trivially support this flag. */ + flags &= ~VIR_TYPED_PARAM_STRING_OKAY; if (!(vm = lxcDomObjFromDomain(dom))) goto cleanup; @@ -1993,7 +1997,11 @@ lxcDomainGetSchedulerParametersFlags(virDomainPtr dom, virLXCDomainObjPrivatePtr priv; virCheckFlags(VIR_DOMAIN_AFFECT_LIVE | - VIR_DOMAIN_AFFECT_CONFIG, -1); + VIR_DOMAIN_AFFECT_CONFIG | + VIR_TYPED_PARAM_STRING_OKAY, -1); + + /* We don't return strings, and thus trivially support this flag. */ + flags &= ~VIR_TYPED_PARAM_STRING_OKAY; if (!(vm = lxcDomObjFromDomain(dom))) goto cleanup; -- 1.9.0

2 1

[libvirt] [PATCH 0/3] Couple of huge pages improvements
by Michal Privoznik 24 Jun '14

24 Jun '14

*** BLURB HERE *** Michal Privoznik (3): virNumaGetPageInfo: Take huge pages into account virNumaGetPages: Don't fail on huge page-less systems virnuma: Actually build huge page code src/nodeinfo.c | 2 +- src/util/virnuma.c | 87 +++++++++++++++++++++++++++++++----------------------- src/util/virnuma.h | 1 + 3 files changed, 52 insertions(+), 38 deletions(-) -- 1.8.5.5

3 8

[libvirt] [PATCH V3] enhance capabilities mode hostdev process
by Jincheng Miao 24 Jun '14

24 Jun '14

hostdev has mode "capabilities" for LXC, from formatdomain.html: " Block / character devices from the host can be passed through to the guest using the hostdev element. This is only possible with container based virtualization. since after 1.0.1 for LXC " So forbid capabilities mode hostdev if domain is not LXC. The affected files are: * src/libxl/libxl_domain.c * src/openvz/openvz_driver.c * src/qemu/qemu_domain.c * src/uml/uml_driver.c * src/xen/xen_driver.c * src/xenapi/xenapi_driver.c There are some drivers lack function devicesPostParseCallback(), like: vbox, bhyve, and so on. V3: move the hostdev checking to devicesPostParseCallback(), this is more reasonable to check it in define phase, and implement in each driver. V2: move the hostdev checking to qemuBuildCommandLine(). Signed-off-by: Jincheng Miao <jmiao(a)redhat.com> --- src/libxl/libxl_domain.c | 8 ++++++++ src/openvz/openvz_driver.c | 9 +++++++++ src/qemu/qemu_domain.c | 9 +++++++++ src/uml/uml_driver.c | 9 +++++++++ src/xen/xen_driver.c | 9 +++++++++ src/xenapi/xenapi_driver.c | 9 +++++++++ 6 files changed, 53 insertions(+) diff --git a/src/libxl/libxl_domain.c b/src/libxl/libxl_domain.c index 73242ac..96f3b88 100644 --- a/src/libxl/libxl_domain.c +++ b/src/libxl/libxl_domain.c @@ -485,6 +485,14 @@ libxlDomainDeviceDefPostParse(virDomainDeviceDefPtr dev, if (dev->type == VIR_DOMAIN_DEVICE_HOSTDEV) { virDomainHostdevDefPtr hostdev = dev->data.hostdev; + /* forbid capabilities mode hostdev in this kind of hypervisor */ + if (hostdev->mode == VIR_DOMAIN_HOSTDEV_MODE_CAPABILITIES) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("Unsupported capabilities mode hostdev in %s"), + virDomainVirtTypeToString(def->virtType)); + return -1; + } + if (hostdev->mode == VIR_DOMAIN_HOSTDEV_MODE_SUBSYS && hostdev->source.subsys.type == VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI && hostdev->source.subsys.u.pci.backend == VIR_DOMAIN_HOSTDEV_PCI_BACKEND_DEFAULT) diff --git a/src/openvz/openvz_driver.c b/src/openvz/openvz_driver.c index 4c815ed..8635f50 100644 --- a/src/openvz/openvz_driver.c +++ b/src/openvz/openvz_driver.c @@ -113,6 +113,15 @@ openvzDomainDeviceDefPostParse(virDomainDeviceDefPtr dev, dev->data.chr->targetType == VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_NONE) dev->data.chr->targetType = VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_OPENVZ; + /* forbid capabilities mode hostdev in this kind of hypervisor */ + if (dev->type == VIR_DOMAIN_DEVICE_HOSTDEV && + dev->data.hostdev->mode == VIR_DOMAIN_HOSTDEV_MODE_CAPABILITIES) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("Unsupported capabilities mode hostdev in %s"), + virDomainVirtTypeToString(def->virtType)); + return -1; + } + return 0; } diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index e40c5ec..9c07385 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -940,6 +940,15 @@ qemuDomainDeviceDefPostParse(virDomainDeviceDefPtr dev, dev->data.chr->source.data.nix.listen = true; } + /* forbid capabilities mode hostdev in this kind of hypervisor */ + if (dev->type == VIR_DOMAIN_DEVICE_HOSTDEV && + dev->data.hostdev->mode == VIR_DOMAIN_HOSTDEV_MODE_CAPABILITIES) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("Unsupported capabilities mode hostdev in %s"), + virDomainVirtTypeToString(def->virtType)); + goto cleanup; + } + ret = 0; cleanup: diff --git a/src/uml/uml_driver.c b/src/uml/uml_driver.c index 5ccd443..9990fc0 100644 --- a/src/uml/uml_driver.c +++ b/src/uml/uml_driver.c @@ -430,6 +430,15 @@ umlDomainDeviceDefPostParse(virDomainDeviceDefPtr dev, dev->data.chr->targetType == VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_NONE) dev->data.chr->targetType = VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_UML; + /* forbid capabilities mode hostdev in this kind of hypervisor */ + if (dev->type == VIR_DOMAIN_DEVICE_HOSTDEV && + dev->data.hostdev->mode == VIR_DOMAIN_HOSTDEV_MODE_CAPABILITIES) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("Unsupported capabilities mode hostdev in %s"), + virDomainVirtTypeToString(def->virtType)); + return -1; + } + return 0; } diff --git a/src/xen/xen_driver.c b/src/xen/xen_driver.c index bd51909..9882bd4 100644 --- a/src/xen/xen_driver.c +++ b/src/xen/xen_driver.c @@ -343,6 +343,15 @@ xenDomainDeviceDefPostParse(virDomainDeviceDefPtr dev, STRNEQ(def->os.type, "hvm")) dev->data.chr->targetType = VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_XEN; + /* forbid capabilities mode hostdev in this kind of hypervisor */ + if (dev->type == VIR_DOMAIN_DEVICE_HOSTDEV && + dev->data.hostdev->mode == VIR_DOMAIN_HOSTDEV_MODE_CAPABILITIES) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("Unsupported capabilities mode hostdev in %s"), + virDomainVirtTypeToString(def->virtType)); + return -1; + } + return 0; } diff --git a/src/xenapi/xenapi_driver.c b/src/xenapi/xenapi_driver.c index 908448b..c2fe8a1 100644 --- a/src/xenapi/xenapi_driver.c +++ b/src/xenapi/xenapi_driver.c @@ -55,6 +55,15 @@ xenapiDomainDeviceDefPostParse(virDomainDeviceDefPtr dev, STRNEQ(def->os.type, "hvm")) dev->data.chr->targetType = VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_XEN; + /* forbid capabilities mode hostdev in this kind of hypervisor */ + if (dev->type == VIR_DOMAIN_DEVICE_HOSTDEV && + dev->data.hostdev->mode == VIR_DOMAIN_HOSTDEV_MODE_CAPABILITIES) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("Unsupported capabilities mode hostdev in %s"), + virDomainVirtTypeToString(def->virtType)); + return -1; + } + return 0; } -- 1.8.4.2

2 2

[libvirt] [PATCH v2] LXC: trivially support flag VIR_DRV_FEATURE_TYPED_PARAM_STRING
by Chen Hanxiao 24 Jun '14

24 Jun '14

fix: virsh -c lxc:/// memtune DOMAIN error: Unable to get number of memory parameters error: unsupported flags (0x4) in function lxcDomainGetMemoryParameters Signed-off-by: Chen Hanxiao <chenhanxiao(a)cn.fujitsu.com> --- v2: also fix a similar issue in lxcDomainGetSchedulerParametersFlags src/lxc/lxc_driver.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index 06f3e18..d8a31d3 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -895,7 +895,13 @@ lxcDomainGetMemoryParameters(virDomainPtr dom, size_t i; virCheckFlags(VIR_DOMAIN_AFFECT_LIVE | - VIR_DOMAIN_AFFECT_CONFIG, -1); + VIR_DOMAIN_AFFECT_CONFIG, + VIR_TYPED_PARAM_STRING_OKAY, -1); + + /* We blindly return a string, and let libvirt.c and + * remote_driver.c do the filtering on behalf of older clients + * that can't parse it. */ + flags &= ~VIR_TYPED_PARAM_STRING_OKAY; if (!(vm = lxcDomObjFromDomain(dom))) goto cleanup; @@ -1993,7 +1999,13 @@ lxcDomainGetSchedulerParametersFlags(virDomainPtr dom, virLXCDomainObjPrivatePtr priv; virCheckFlags(VIR_DOMAIN_AFFECT_LIVE | - VIR_DOMAIN_AFFECT_CONFIG, -1); + VIR_DOMAIN_AFFECT_CONFIG | + VIR_TYPED_PARAM_STRING_OKAY, -1); + + /* We blindly return a string, and let libvirt.c and + * remote_driver.c do the filtering on behalf of older clients + * that can't parse it. */ + flags &= ~VIR_TYPED_PARAM_STRING_OKAY; if (!(vm = lxcDomObjFromDomain(dom))) goto cleanup; -- 1.9.0

3 2

[libvirt] [PATCH] storage: gluster: Avoid name shadow on older compilers
by Peter Krempa 24 Jun '14

24 Jun '14

s/link/linkpath/g in virStorageFileBackendGlusterReadlinkCallback as older gcc complains. --- Notes: Pushed as trivial. src/storage/storage_backend_gluster.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/storage/storage_backend_gluster.c b/src/storage/storage_backend_gluster.c index c8077a1..cab23b0 100644 --- a/src/storage/storage_backend_gluster.c +++ b/src/storage/storage_backend_gluster.c @@ -717,7 +717,7 @@ virStorageFileBackendGlusterAccess(virStorageSourcePtr src, static int virStorageFileBackendGlusterReadlinkCallback(const char *path, - char **link, + char **linkpath, void *data) { virStorageFileBackendGlusterPrivPtr priv = data; @@ -726,7 +726,7 @@ virStorageFileBackendGlusterReadlinkCallback(const char *path, ssize_t ret; struct stat st; - *link = NULL; + *linkpath = NULL; if (glfs_stat(priv->vol, path, &st) < 0) { virReportSystemError(errno, @@ -754,7 +754,7 @@ virStorageFileBackendGlusterReadlinkCallback(const char *path, buf[ret] = '\0'; - *link = buf; + *linkpath = buf; return 0; -- 1.9.3

1 0

[libvirt] [PATCH 0/2] virtportallocator: remember not auto allocated graphics ports
by Giuseppe Scrivano 24 Jun '14

24 Jun '14

Fix a conflict when both autoport graphics and statically configured ports are used, like: <graphics type='spice' autoport='yes'/> <graphics type='vnc' port='5900' autoport='no'/> More details in 2/2 Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1081881 Giuseppe Scrivano (2): virtportallocator: new function "virPortAllocatorSetUsed" graphics: remember graphics not auto allocated ports src/conf/domain_conf.h | 3 ++ src/libvirt_private.syms | 1 + src/qemu/qemu_process.c | 79 +++++++++++++++++++++++++++++++++++++++------ src/util/virportallocator.c | 40 ++++++++++++++++++++++- src/util/virportallocator.h | 4 +++ 5 files changed, 117 insertions(+), 10 deletions(-) -- 1.9.3

2 4

[libvirt] [PATCH] LXC: trivially support flag VIR_DRV_FEATURE_TYPED_PARAM_STRING
by Chen Hanxiao 24 Jun '14

24 Jun '14

fix: virsh -c lxc:/// memtune DOMAIN error: Unable to get number of memory parameters error: unsupported flags (0x4) in function lxcDomainGetMemoryParameters Signed-off-by: Chen Hanxiao <chenhanxiao(a)cn.fujitsu.com> --- src/lxc/lxc_driver.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index 06f3e18..6b170fe 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -895,7 +895,11 @@ lxcDomainGetMemoryParameters(virDomainPtr dom, size_t i; virCheckFlags(VIR_DOMAIN_AFFECT_LIVE | - VIR_DOMAIN_AFFECT_CONFIG, -1); + VIR_DOMAIN_AFFECT_CONFIG, + VIR_TYPED_PARAM_STRING_OKAY, -1); + + /* We don't return strings, and thus trivially support this flag. */ + flags &= ~VIR_TYPED_PARAM_STRING_OKAY; if (!(vm = lxcDomObjFromDomain(dom))) goto cleanup; -- 1.9.0

3 2

[libvirt] [PATCH] cmdFreepages: initialize @tmp
by Michal Privoznik 23 Jun '14

23 Jun '14

In the 404bac14 the @tmp variable was introduced. It's purpose is to avoid typecasting when parsing --pagesize argument. However, if the argument is not presented, tmp may be used uninitialized resulting in bogus virNodeGetFreePages() API call: virsh freepages --cellno 2 error: Failed to open file '/sys/devices/system/node/node2/hugepages/hugepages-4294967295kB/free_hugepages': No such file or directory Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- tools/virsh-host.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/virsh-host.c b/tools/virsh-host.c index 13d4c5c..734f1a8 100644 --- a/tools/virsh-host.c +++ b/tools/virsh-host.c @@ -229,7 +229,7 @@ cmdFreepages(vshControl *ctl, const vshCmd *cmd) bool ret = false; unsigned int npages; unsigned int *pagesize = NULL; - unsigned long long tmp; + unsigned long long tmp = 0; int cell; unsigned long long *counts = NULL; size_t i, j; -- 1.8.5.5

2 1

[libvirt] [PATCH v3 0/5] Next round of active commit support
by Eric Blake 23 Jun '14

23 Jun '14

Browseable at: http://repo.or.cz/w/libvirt/ericb.git/shortlog/refs/heads/gluster or git checkout git://repo.or.cz/libvirt/ericb.git gluster Resolves some of the review comments, and in particular FINALLY turns on capability probing. However, I can't push this to libvirt until Jeff's patch actually makes it into qemu.git: https://lists.gnu.org/archive/html/qemu-devel/2014-06/msg04060.html and still lacking cleanup of the persistent XML after a pivot Eric Blake (5): blockjob: allow omitted arguments to QMP block-commit blockjob: turn on qemu capability bit for active commit virsh: expose new active commit controls blockcommit: track job type in xml blockcommit: turn on active commit docs/formatdomain.html.in | 20 +++---- docs/schemas/domaincommon.rng | 13 +++++ src/conf/domain_conf.c | 33 +++++++++++- src/conf/domain_conf.h | 1 + src/qemu/qemu_capabilities.c | 7 +++ src/qemu/qemu_capabilities.h | 3 +- src/qemu/qemu_driver.c | 59 +++++++++++++++----- src/qemu/qemu_monitor.c | 2 +- src/qemu/qemu_monitor.h | 3 +- src/qemu/qemu_monitor_json.c | 20 ++++++- src/qemu/qemu_monitor_json.h | 3 +- src/qemu/qemu_process.c | 18 ++++--- tests/qemucapabilitiesdata/caps_1.3.1-1.replies | 62 ++++++++++++---------- tests/qemucapabilitiesdata/caps_1.4.2-1.replies | 62 ++++++++++++---------- tests/qemucapabilitiesdata/caps_1.5.3-1.replies | 62 ++++++++++++---------- tests/qemucapabilitiesdata/caps_1.6.0-1.replies | 62 ++++++++++++---------- tests/qemucapabilitiesdata/caps_1.6.50-1.replies | 62 ++++++++++++---------- tests/qemumonitorjsontest.c | 49 +++++++++++++++++ .../qemuxml2argv-disk-active-commit.xml | 37 +++++++++++++ .../qemuxml2argvdata/qemuxml2argv-disk-mirror.xml | 4 +- .../qemuxml2xmlout-disk-mirror-old.xml | 4 +- tests/qemuxml2xmltest.c | 1 + tools/virsh-domain.c | 56 ++++++++++++++++--- tools/virsh.pod | 32 +++++++---- 24 files changed, 484 insertions(+), 191 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-active-commit.xml -- 1.9.3

3 15