- Devel - libvirt List Archives

[libvirt] [PATCH] lxc: return the right value if failed to make path
by Chen Hanxiao 06 Dec '13

06 Dec '13

From: Chen Hanxiao <chenhanxiao(a)cn.fujitsu.com> If we failed to make path for pts, lxcContainerMountFSDevPTS will return the value virAsprintf returned rather than -1. Signed-off-by: Chen Hanxiao <chenhanxiao(a)cn.fujitsu.com> --- src/lxc/lxc_container.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index b1b63fb..2835463 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -952,7 +952,7 @@ static int lxcContainerMountFSDevPTS(virDomainDefPtr def, def->name)) < 0) return ret; - if (virFileMakePath("/dev/pts") < 0) { + if ((ret = virFileMakePath("/dev/pts")) < 0) { virReportSystemError(errno, "%s", _("Cannot create /dev/pts")); goto cleanup; -- 1.8.2.1

2 1

[libvirt] [PATCH] Cgroup: Replace 'newpath' with 'newPath'
by Wangyufei (James) 06 Dec '13

06 Dec '13

>From be1ce1c794b05a27aa85d037500a821b8c514d12 Mon Sep 17 00:00:00 2001 From: Zhou Yimin <zhouyimin(a)huawei.com> Date: Fri, 6 Dec 2013 11:38:14 +0800 Subject: [PATCH] Cgroup: Replace 'newpath' with 'newPath' Unifying codding style, replace 'newpath' with 'newPath'. From: Zhou Yimin <zhouyimin(a)huawei.com> --- src/util/vircgroup.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c index 5c43e10..9674328 100644 --- a/src/util/vircgroup.c +++ b/src/util/vircgroup.c @@ -1246,7 +1246,7 @@ virCgroupNewPartition(const char *path, int ret = -1; char *parentPath = NULL; virCgroupPtr parent = NULL; - char *newpath = NULL; + char *newPath = NULL; VIR_DEBUG("path=%s create=%d controllers=%x", path, create, controllers); @@ -1257,15 +1257,15 @@ virCgroupNewPartition(const char *path, return -1; } - if (virCgroupSetPartitionSuffix(path, &newpath) < 0) + if (virCgroupSetPartitionSuffix(path, &newPath) < 0) goto cleanup; - if (virCgroupNew(-1, newpath, NULL, controllers, group) < 0) + if (virCgroupNew(-1, newPath, NULL, controllers, group) < 0) goto cleanup; - if (STRNEQ(newpath, "/")) { + if (STRNEQ(newPath, "/")) { char *tmp; - if (VIR_STRDUP(parentPath, newpath) < 0) + if (VIR_STRDUP(parentPath, newPath) < 0) goto cleanup; tmp = strrchr(parentPath, '/'); @@ -1287,7 +1287,7 @@ cleanup: virCgroupFree(group); virCgroupFree(&parent); VIR_FREE(parentPath); - VIR_FREE(newpath); + VIR_FREE(newPath); return ret; } -- 1.7.3.1.msysgit.0 Best Regards, -WangYufei

2 1

[libvirt] [PATCH 0/3] Support more snapshot disk configs
by Peter Krempa 06 Dec '13

06 Dec '13

A newly finished part of the large gluster snapshot series. These patches allow to parse and format definitions of snapshot disks including block, dir and network backing. Peter Krempa (3): snapshot: schema: Split out snapshot disk driver definition snapshot: Add support for specifying snapshot disk backing type snapshots: Test snapshot disk type specification docs/schemas/domainsnapshot.rng | 94 +++++++++++++++++++----- src/conf/snapshot_conf.c | 25 ++++++- src/conf/snapshot_conf.h | 15 ++-- src/qemu/qemu_driver.c | 59 ++++++++++----- tests/domainsnapshotxml2xmlin/disk_snapshot.xml | 18 +++++ tests/domainsnapshotxml2xmlout/disk_snapshot.xml | 18 +++++ 6 files changed, 181 insertions(+), 48 deletions(-) -- 1.8.4.3

1 3

[libvirt] [PATCH] Add qxl ram size to ABI stability check
by Ján Tomko 06 Dec '13

06 Dec '13

55bfd02 added a 'ram' attribute for qxl video devices but didn't update the ABI check. https://bugzilla.redhat.com/show_bug.cgi?id=1035123 --- src/conf/domain_conf.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 0268847..b76cf26 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -13191,6 +13191,13 @@ virDomainVideoDefCheckABIStability(virDomainVideoDefPtr src, return false; } + if (src->ram != dst->ram) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("Target video card ram %u does not match source %u"), + dst->ram, src->ram); + return false; + } + if (src->vram != dst->vram) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Target video card vram %u does not match source %u"), -- 1.8.3.2

2 2

[libvirt] [PATCH] qemu: Improve error when setting invalid count of vcpus via agent
by Peter Krempa 06 Dec '13

06 Dec '13

https://bugzilla.redhat.com/show_bug.cgi?id=1035108 When attempting to enable more vCPUs in the guest than is currently enabled in the guest but less than the maximum count for the VM we currently reported an unhelpful message: error: internal error: guest agent reports less cpu than requested This patch changes it to: error: invalid argument: requested vcpu count is greater than the count of enabled vcpus in the domain: 3 > 2 --- src/qemu/qemu_driver.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index e2d4e97..66f2a0e 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -4201,6 +4201,14 @@ qemuDomainSetVcpusFlags(virDomainPtr dom, unsigned int nvcpus, goto endjob; } + if (nvcpus > vm->def->vcpus) { + virReportError(VIR_ERR_INVALID_ARG, + _("requested vcpu count is greater than the count " + "of enabled vcpus in the domain: %d > %d"), + nvcpus, vm->def->vcpus); + goto endjob; + } + qemuDomainObjEnterAgent(vm); ncpuinfo = qemuAgentGetVCPUs(priv->agent, &cpuinfo); qemuDomainObjExitAgent(vm); -- 1.8.4.3

2 2

[libvirt] [PATCH] conf: Fix XML formatting of RNG device info
by Peter Krempa 06 Dec '13

06 Dec '13

https://bugzilla.redhat.com/show_bug.cgi?id=1035118 When outputting the XML for the RNG device, the code didn't format the PCI address info. Additionally the schema wasn't expecting the info although it was being parsed and used internally. Fix those mistakes and add test for the PCI info section. --- docs/schemas/domaincommon.rng | 6 ++++++ src/conf/domain_conf.c | 5 +++++ tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-default.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-default.xml | 1 + 4 files changed, 13 insertions(+), 1 deletion(-) diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index 80848d2..38c6801 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -3956,6 +3956,12 @@ <optional> <ref name="rng-rate"/> </optional> + <optional> + <ref name="alias"/> + </optional> + <optional> + <ref name="address"/> + </optional> </interleave> </element> </define> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 65bd9b1..0268847 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -15832,6 +15832,11 @@ virDomainRNGDefFormat(virBufferPtr buf, break; } + if (virDomainDeviceInfoIsSet(&def->info, flags)) { + if (virDomainDeviceInfoFormat(buf, &def->info, flags) < 0) + return -1; + } + virBufferAddLit(buf, " </rng>\n"); return 0; diff --git a/tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-default.args b/tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-default.args index 01e9f89..4ae6257 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-default.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-default.args @@ -4,4 +4,4 @@ LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \ -object rng-random,id=rng0 \ --device virtio-rng-pci,rng=rng0,bus=pci.0,addr=0x4 +-device virtio-rng-pci,rng=rng0,bus=pci.0,addr=0x7 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-default.xml b/tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-default.xml index 0852dea..0a7bf61 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-default.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-default.xml @@ -18,6 +18,7 @@ <memballoon model='virtio'/> <rng model='virtio'> <backend model='random'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x07' function='0x0'/> </rng> </devices> </domain> -- 1.8.4.3

2 2

[libvirt] [PATCH] qemu: snapshot: Fix incorrect disk type for auto-generated disks
by Peter Krempa 06 Dec '13

06 Dec '13

When changing the parsing and formatting functions in commit 43f2ccdc73090bd03f64de4d58d46ffa0134d705 I forgot to update the qemu disk alingnment function for snapshots that automatically adds snapshot configs for disks that were not mentioned in the XML. The function allocated a new disk snapshot definition but did not correctly initialize the snapshot disk source type variable. This resulted into the disks considered as block devices and invalid XML was generated. Reported by John Ferlan. --- Notes: Doing a unit test for this will require yet another addition to the testsuite so I'm sending this patch first. src/conf/snapshot_conf.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/conf/snapshot_conf.c b/src/conf/snapshot_conf.c index 5637975..55abd80 100644 --- a/src/conf/snapshot_conf.c +++ b/src/conf/snapshot_conf.c @@ -532,6 +532,7 @@ virDomainSnapshotAlignDisks(virDomainSnapshotDefPtr def, goto cleanup; disk->index = i; disk->snapshot = def->dom->disks[i]->snapshot; + disk->type = -1; if (!disk->snapshot) disk->snapshot = default_snapshot; } @@ -549,6 +550,15 @@ virDomainSnapshotAlignDisks(virDomainSnapshotDefPtr def, const char *tmp; struct stat sb; + if (disk->type != VIR_DOMAIN_DISK_TYPE_FILE || + disk->type != -1) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("cannot generate external snapshot name " + "for disk '%s' on a '%s' device"), + disk->name, virDomainDiskTypeToString(disk->type)); + goto cleanup; + } + if (!original) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("cannot generate external snapshot name " -- 1.8.4.3

3 4

[libvirt] [PATCH v2 0/5] Support keyboard device
by Li Zhang 06 Dec '13

06 Dec '13

From: Li Zhang <zhlcindy(a)linux.vnet.ibm.com> This patchset is to add keyboard input device. For PPC64, it doesn't support a default keyboard device when the graphic is enabled. Libvirt supports QEMU command line as "-device VGA" which won't create any keyboard device for it. So it requires libvirt to add a default USB keyboard device for it. This patchset is to add keyboard input device and a default USB keyboard for PPC64. The related discussion in QEMU community: http://lists.nongnu.org/archive/html/qemu-devel/2013-11/msg01734.html Li Zhang (5): conf: Add a keyboard input device type qemu_cap: Add USB keyboard capability docs/schemas/domaincommon.rng: add keyboard input device type qemu: parse USB keyboard qemu command line. Add a default USB keyboard for PPC64 v2 -> v1: * change ifs to switch clause. * reconstruct the patches docs/schemas/domaincommon.rng | 1 + src/conf/domain_conf.c | 62 ++++++++++++++++------ src/conf/domain_conf.h | 5 ++ src/libvirt_private.syms | 1 + src/qemu/qemu_capabilities.c | 2 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 18 +++++-- src/qemu/qemu_domain.c | 14 ++++- tests/qemucapabilitiesdata/caps_1.2.2-1.caps | 1 + tests/qemucapabilitiesdata/caps_1.3.1-1.caps | 1 + tests/qemucapabilitiesdata/caps_1.4.2-1.caps | 1 + tests/qemucapabilitiesdata/caps_1.5.3-1.caps | 1 + tests/qemucapabilitiesdata/caps_1.6.0-1.caps | 2 + tests/qemucapabilitiesdata/caps_1.6.50-1.caps | 1 + tests/qemuhelptest.c | 8 +++ .../qemuxml2argvdata/qemuxml2argv-pseries-disk.xml | 1 + .../qemuxml2argv-pseries-usb-kbd.args | 9 ++++ .../qemuxml2argv-pseries-usb-kbd.xml | 19 +++++++ tests/qemuxml2argvtest.c | 3 ++ 19 files changed, 130 insertions(+), 21 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pseries-usb-kbd.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pseries-usb-kbd.xml -- 1.8.2.1

2 15

[libvirt] [PATCH 1/4] Add USB Keyboard support in libvirt
by Li Zhang 06 Dec '13

06 Dec '13

From: Li Zhang <zhlcindy(a)linux.vnet.ibm.com> PS2 devices are not supported for non-x86 platforms. So it needs one USB keyboard when graphic is enabled. This patch is to add one kbd input device type for users to add one USB keyboard in XML file as the following: <input type='kbd' bus='usb'/> Signed-off-by: Li Zhang <zhlcindy(a)linux.vnet.ibm.com> --- src/conf/domain_conf.c | 3 ++- src/conf/domain_conf.h | 1 + src/qemu/qemu_capabilities.c | 3 +++ src/qemu/qemu_capabilities.h | 2 ++ src/qemu/qemu_command.c | 12 +++++++++--- 5 files changed, 17 insertions(+), 4 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 7b0e3ea..d90f05c 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -504,7 +504,8 @@ VIR_ENUM_IMPL(virDomainVideo, VIR_DOMAIN_VIDEO_TYPE_LAST, VIR_ENUM_IMPL(virDomainInput, VIR_DOMAIN_INPUT_TYPE_LAST, "mouse", - "tablet") + "tablet", + "kbd") VIR_ENUM_IMPL(virDomainInputBus, VIR_DOMAIN_INPUT_BUS_LAST, "ps2", diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 4561ccc..c8fecaf 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -1222,6 +1222,7 @@ struct _virDomainTPMDef { enum virDomainInputType { VIR_DOMAIN_INPUT_TYPE_MOUSE, VIR_DOMAIN_INPUT_TYPE_TABLET, + VIR_DOMAIN_INPUT_TYPE_KBD, VIR_DOMAIN_INPUT_TYPE_LAST }; diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 548b988..89b11ad 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -243,6 +243,8 @@ VIR_ENUM_IMPL(virQEMUCaps, QEMU_CAPS_LAST, "virtio-mmio", "ich9-intel-hda", "kvm-pit-lost-tick-policy", + + "usb-kbd", /*160*/ ); struct _virQEMUCaps { @@ -1394,6 +1396,7 @@ struct virQEMUCapsStringFlags virQEMUCapsObjectTypes[] = { { "usb-storage", QEMU_CAPS_DEVICE_USB_STORAGE }, { "virtio-mmio", QEMU_CAPS_DEVICE_VIRTIO_MMIO }, { "ich9-intel-hda", QEMU_CAPS_DEVICE_ICH9_INTEL_HDA }, + { "usb-kbd", QEMU_CAPS_DEVICE_USB_KBD }, }; static struct virQEMUCapsStringFlags virQEMUCapsObjectPropsVirtioBlk[] = { diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 02d47c6..0b7b5e5 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -198,6 +198,8 @@ enum virQEMUCapsFlags { QEMU_CAPS_DEVICE_VIRTIO_MMIO = 157, /* -device virtio-mmio */ QEMU_CAPS_DEVICE_ICH9_INTEL_HDA = 158, /* -device ich9-intel-hda */ QEMU_CAPS_KVM_PIT_TICK_POLICY = 159, /* kvm-pit.lost_tick_policy */ + QEMU_CAPS_DEVICE_USB_KBD = 160, /*-device usb-kbd*/ + QEMU_CAPS_LAST, /* this must always be the last item */ }; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 763417f..318f7a1 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -5280,9 +5280,15 @@ qemuBuildUSBInputDevStr(virDomainDefPtr def, { virBuffer buf = VIR_BUFFER_INITIALIZER; - virBufferAsprintf(&buf, "%s,id=%s", - dev->type == VIR_DOMAIN_INPUT_TYPE_MOUSE ? - "usb-mouse" : "usb-tablet", dev->info.alias); + if (dev->type == VIR_DOMAIN_INPUT_TYPE_MOUSE) { + virBufferAsprintf(&buf, "usb-mouse,id=%s", dev->info.alias); + } else if (dev->type == VIR_DOMAIN_INPUT_TYPE_TABLET) { + virBufferAsprintf(&buf, "usb-tablet,id=%s", dev->info.alias); + } else if (dev->type == VIR_DOMAIN_INPUT_TYPE_KBD) { + if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_USB_KBD)) + goto error; + virBufferAsprintf(&buf, "usb-kbd,id=%s", dev->info.alias); + } if (qemuBuildDeviceAddressStr(&buf, def, &dev->info, qemuCaps) < 0) goto error; -- 1.8.2.1

3 11

[libvirt] [PATCH 0/3] add percentage limit support for RAM filesystems in LXC container
by Chen Hanxiao 06 Dec '13

06 Dec '13

From: Chen Hanxiao <chenhanxiao(a)cn.fujitsu.com> Chen Hanxiao (3): add percentage limit parse and define support for RAM filesystems enable percentage limit of RAM filesystem in lxc container docs: add docs for percentage limitation docs/formatdomain.html.in | 4 +++- src/conf/domain_conf.c | 21 +++++++++++++++++---- src/conf/domain_conf.h | 1 + src/lxc/lxc_container.c | 14 +++++++++++--- 4 files changed, 32 insertions(+), 8 deletions(-) -- 1.8.2.1

3 13