- Devel - libvirt List Archives

[libvirt] Schedule for next release 1.2.4
by Daniel Veillard 25 Apr '14

25 Apr '14

Sorry about the late notice, I forgot about the end of month coming. It seems we are trying a lot of patches in right now, but it would be good to not drift too much, so I am suggesting to enter the freeze on Monday morning. This mean I could push 1.2.4 either on Friday if everything looks really good or wait till May 5 for things to settle. I hope this suits everybody and sorry for late warning ! Daniel -- Daniel Veillard | Open Source and Standards, Red Hat veillard(a)redhat.com | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | virtualization library http://libvirt.org/

1 0

[libvirt] [PATCH] qemu: Avoid overflow when setting migration speed on inactive domains
by Jiri Denemark 25 Apr '14

25 Apr '14

Commit c4206d7 fixed the overflow for running domains. However, we need a similar check when setting migration speed on inactive domains. At first look, it may seem the check in c4206d7 is now redundant but qemuDomainMigrateSetMaxSpeed is not the only caller of qemuMonitorSetMigrationSpeed so we need to check the bandwidth in both places. https://bugzilla.redhat.com/show_bug.cgi?id=1083483 Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/qemu/qemu_driver.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 67ba487..69a7053 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -11927,6 +11927,13 @@ qemuDomainMigrateSetMaxSpeed(virDomainPtr dom, if (virDomainMigrateSetMaxSpeedEnsureACL(dom->conn, vm->def) < 0) goto cleanup; + if (bandwidth > QEMU_DOMAIN_MIG_BANDWIDTH_MAX) { + virReportError(VIR_ERR_OVERFLOW, + _("bandwidth must be less than %llu"), + QEMU_DOMAIN_MIG_BANDWIDTH_MAX + 1ULL); + goto cleanup; + } + if (virDomainObjIsActive(vm)) { if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_MIGRATION_OP) < 0) goto cleanup; -- 1.9.2

2 2

[libvirt] [PATCH v5 0/5] Expose FSFreeze/FSThaw within the guest as API
by Tomoki Sekiyama 25 Apr '14

25 Apr '14

Hello, This is patchset v5 to add FSFreeze/FSThaw API for custom disk snapshotting. Changes to v4: * add disks and ndisks parameter to specify disks to be frozen/thawed * make fsfreeze requests nestable * change api version to 1.2.4 (v4: https://www.redhat.com/archives/libvir-list/2014-March/msg01674.html ) === Description === Currently FSFreeze and FSThaw are supported by qemu guest agent and they are used internally in snapshot-create command with --quiesce option. However, when users want to utilize the native snapshot feature of storage devices (such as LVM over iSCSI, enterprise storage appliances, etc.), they need to issue fsfreeze command separately from libvirt-driven snapshots. (OpenStack cinder provides these storages' snapshot feature, but it cannot quiesce the guest filesystems automatically for now.) Although virDomainQemuGuestAgent() API could be used for this purpose, it is only for debugging and is not supported officially. This patchset adds virDomainFSFreeze()/virDomainFSThaw() APIs and virsh domfsfreeze/domfsthaw commands to enable the users to freeze and thaw domain's filesystems cleanly. <updated> The APIs take disks and ndisks parameters, which is a list of disk names to be frozen/thawed. If the option is not provided, every mounted filesystem is frozen/thawed. The fsfreeze can be nestable. When fsfreeze requests to a disk are issued multiple times, it is not thawed until the fsthaw requests are issued as many times as the freeze requests. Currently, qemu driver doesn't support disks parameter because the guest agent doesn't have means to specify disks to be frozen/thawed. Hence, it just counts depth of fsfreeze per domain, not per disk, so far. </updated> The APIs have flags option currently unsupported for future extension. --- Tomoki Sekiyama (5): Introduce virDomainFSFreeze() and virDomainFSThaw() public API remote: Implement virDomainFSFreeze and virDomainFSThaw qemu: Track domain quiesced status and make fsfreeze/thaw nestable qemu: Implement virDomainFSFreeze and virDomainFSThaw virsh: Expose new virDomainFSFreeze and virDomainFSThaw API include/libvirt/libvirt.h.in | 10 +++ src/access/viraccessperm.c | 2 - src/access/viraccessperm.h | 6 ++ src/driver.h | 14 ++++ src/libvirt.c | 92 ++++++++++++++++++++++++ src/libvirt_public.syms | 6 ++ src/qemu/qemu_domain.c | 6 ++ src/qemu/qemu_domain.h | 2 + src/qemu/qemu_driver.c | 159 ++++++++++++++++++++++++++++++++++++++---- src/remote/remote_driver.c | 2 + src/remote/remote_protocol.x | 30 +++++++- src/remote_protocol-structs | 18 +++++ src/rpc/gendispatch.pl | 2 + tools/virsh-domain.c | 128 ++++++++++++++++++++++++++++++++++ tools/virsh.pod | 23 ++++++ 15 files changed, 483 insertions(+), 17 deletions(-)

3 17

[libvirt] [PATCH 0/9] Standardize on lookup of resources in build dir
by Daniel P. Berrange 25 Apr '14

25 Apr '14

Instead of having a bunch of custom override functions for each different area of code, standardize on one set of helper APIs for loading resources. This is derived from Nehal's proposal, based on my / Eric's feedback https://www.redhat.com/archives/libvir-list/2014-March/msg01544.html Daniel P. Berrange (5): Add helpers for resolving path to resources in build tree Activate build dir overrides in libvirtd, virtlockd & tests Use virFileFindResource to locate lock manager plugins Use virFileFindResource to locate driver plugins Use virFileFindResource to locate CPU map XML Nehal J Wani (4): Use virFileFindResource to locate iohelper for virFileWrapperFdNew Use virFileFindResource to locate libvirt_lxc for capabilities Use virFileFindResource to locate parthelper for storage backend Use virFileFindResource to locate iohelper for fdstream daemon/libvirtd.c | 31 +----------- src/Makefile.am | 2 + src/cpu/cpu_map.c | 31 ++++-------- src/cpu/cpu_map.h | 3 -- src/driver.c | 26 +++-------- src/driver.h | 1 - src/fdstream.c | 21 ++++----- src/fdstream.h | 3 -- src/libvirt_private.syms | 4 +- src/locking/lock_daemon.c | 2 + src/locking/lock_manager.c | 28 ++++------- src/locking/lock_manager.h | 1 - src/lxc/lxc_conf.c | 14 +++++- src/storage/storage_backend_disk.c | 31 +++++++++--- src/util/virfile.c | 96 +++++++++++++++++++++++++++++++++++++- src/util/virfile.h | 11 +++++ tests/cputest.c | 14 ------ tests/fdstreamtest.c | 3 -- tests/qemuxml2argvtest.c | 7 --- tests/qemuxmlnstest.c | 7 --- tests/testutils.c | 2 + tests/virdrivermoduletest.c | 2 - 22 files changed, 187 insertions(+), 153 deletions(-) -- 1.9.0

3 20

[libvirt] [PATCH] build: avoid 'index' as variable name
by Eric Blake 25 Apr '14

25 Apr '14

Once again, gcc 4.4.7 (hello RHEL) rears its ugly head: conf/domain_conf.c: In function 'virDomainDiskBackingStoreFormat': conf/domain_conf.c:14940: error: declaration of 'index' shadows a global declaration [-Wshadow] /usr/include/string.h:489: error: shadowed declaration is here [-Wshadow] * src/conf/domain_conf.c (virDomainDiskBackingStoreFormat): Pacify older gcc. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- Pushing under the build-breaker rule. src/conf/domain_conf.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index a558b1b..c655bcf 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -14937,7 +14937,7 @@ static int virDomainDiskBackingStoreFormat(virBufferPtr buf, virStorageSourcePtr backingStore, const char *backingStoreRaw, - unsigned int index) + unsigned int idx) { const char *type; const char *format; @@ -14965,7 +14965,7 @@ virDomainDiskBackingStoreFormat(virBufferPtr buf, } virBufferAsprintf(buf, "<backingStore type='%s' index='%u'>\n", - type, index); + type, idx); virBufferAdjustIndent(buf, 2); virBufferAsprintf(buf, "<format type='%s'/>\n", format); @@ -14973,7 +14973,7 @@ virDomainDiskBackingStoreFormat(virBufferPtr buf, virDomainDiskBackingStoreFormat(buf, backingStore->backingStore, backingStore->backingStoreRaw, - index + 1) < 0) + idx + 1) < 0) return -1; virBufferAdjustIndent(buf, -2); -- 1.7.1

2 1

[libvirt] [PATCH] Add test suite for viralloc APIs
by Daniel P. Berrange 25 Apr '14

25 Apr '14

In debugging a crash on OOM, I thought that the virInsert APIs might be at fault, but couldn't isolate them as a cause. While the viralloc APIs are used in many test suites, this is as a side-effect, they are not directly tested :-) Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- tests/Makefile.am | 5 + tests/viralloctest.c | 387 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 392 insertions(+) create mode 100644 tests/viralloctest.c diff --git a/tests/Makefile.am b/tests/Makefile.am index 122bf6c..c13cc15 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -140,6 +140,7 @@ test_programs = virshtest sockettest \ viratomictest \ utiltest shunloadtest \ virtimetest viruritest virkeyfiletest \ + viralloctest \ virauthconfigtest \ virbitmaptest \ vircgrouptest \ @@ -929,6 +930,10 @@ virkeyfiletest_SOURCES = \ virkeyfiletest.c testutils.h testutils.c virkeyfiletest_LDADD = $(LDADDS) +viralloctest_SOURCES = \ + viralloctest.c testutils.h testutils.c +viralloctest_LDADD = $(LDADDS) + virauthconfigtest_SOURCES = \ virauthconfigtest.c testutils.h testutils.c virauthconfigtest_LDADD = $(LDADDS) diff --git a/tests/viralloctest.c b/tests/viralloctest.c new file mode 100644 index 0000000..abdd871 --- /dev/null +++ b/tests/viralloctest.c @@ -0,0 +1,387 @@ +/* + * viralloctest.c: Test memory allocation APIs + * + * Copyright (C) 2014 Red Hat, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library. If not, see + * <http://www.gnu.org/licenses/>. + * + */ + +#include <config.h> + +#include <viralloc.h> + +#include "testutils.h" + +#define VIR_FROM_THIS VIR_FROM_NONE + +typedef struct testDummyStruct { + int a; + int b; +} testDummyStruct; + +static int +testAllocScalar(const void *opaque ATTRIBUTE_UNUSED) +{ + testDummyStruct *t; + int ret = -1; + + if (VIR_ALLOC(t) < 0) + return -1; + + if (t == NULL) { + fprintf(stderr, "Allocation succeeded by pointer is NULL\n"); + goto cleanup; + } + + if (t->a != 0 || + t->b != 0) { + fprintf(stderr, "Allocated ram was not zerod\n"); + goto cleanup; + } + + VIR_FREE(t); + + if (t != NULL) { + fprintf(stderr, "Pointer is still set after free\n"); + goto cleanup; + } + + ret = 0; + cleanup: + VIR_FREE(t); + return ret; +} + + +static int +testAllocArray(const void *opaque ATTRIBUTE_UNUSED) +{ + testDummyStruct *t; + size_t nt = 10, i; + int ret = -1; + + if (VIR_ALLOC_N(t, nt) < 0) + return -1; + + if (t == NULL) { + fprintf(stderr, "Allocation succeeded by pointer is NULL\n"); + goto cleanup; + } + + for (i = 0; i < nt; i++) { + if (t[i].a != 0 || + t[i].b != 0) { + fprintf(stderr, "Allocated ram block %zu was not zerod\n", i); + goto cleanup; + } + } + + VIR_FREE(t); + + if (t != NULL) { + fprintf(stderr, "Pointer is still set after free\n"); + goto cleanup; + } + + ret = 0; + cleanup: + VIR_FREE(t); + return ret; +} + + +static int +testReallocArray(const void *opaque ATTRIBUTE_UNUSED) +{ + testDummyStruct *t; + size_t nt = 10, i; + int ret = -1; + + if (VIR_ALLOC_N(t, nt) < 0) + return -1; + + if (t == NULL) { + fprintf(stderr, "Allocation succeeded by pointer is NULL\n"); + goto cleanup; + } + + for (i = 0; i < nt; i++) { + t[i].a = 10; + t[i].b = 20; + } + + if (VIR_REALLOC_N(t, nt + 5) < 0) + goto cleanup; + + for (i = 0; i < nt; i++) { + if (t[i].a != 10 || + t[i].b != 20) { + fprintf(stderr, "Reallocated ram block %zu lost data\n", i); + goto cleanup; + } + } + + if (VIR_REALLOC_N(t, nt) < 0) + goto cleanup; + + for (i = 0; i < nt; i++) { + if (t[i].a != 10 || + t[i].b != 20) { + fprintf(stderr, "Reallocated ram block %zu lost data\n", i); + goto cleanup; + } + } + + if (VIR_REALLOC_N(t, nt - 5) < 0) + goto cleanup; + + for (i = 0; i < (nt - 5); i++) { + if (t[i].a != 10 || + t[i].b != 20) { + fprintf(stderr, "Reallocated ram block %zu lost data\n", i); + goto cleanup; + } + } + + VIR_FREE(t); + + if (t != NULL) { + fprintf(stderr, "Pointer is still set after free\n"); + goto cleanup; + } + + ret = 0; + cleanup: + VIR_FREE(t); + return ret; +} + + +static int +testExpandArray(const void *opaque ATTRIBUTE_UNUSED) +{ + testDummyStruct *t; + size_t nt = 10, i; + int ret = -1; + + if (VIR_ALLOC_N(t, nt) < 0) + return -1; + + if (t == NULL) { + fprintf(stderr, "Allocation succeeded by pointer is NULL\n"); + goto cleanup; + } + + for (i = 0; i < nt; i++) { + t[i].a = 10; + t[i].b = 20; + } + + if (VIR_EXPAND_N(t, nt, 5) < 0) + goto cleanup; + + for (i = 0; i < (nt - 5); i++) { + if (t[i].a != 10 || + t[i].b != 20) { + fprintf(stderr, "Reallocated ram block %zu lost data\n", i); + goto cleanup; + } + } + + for (i = (nt - 5); i < nt; i++) { + if (t[i].a != 0 || + t[i].b != 0) { + fprintf(stderr, "New ram block %zu was not zerod\n", i); + goto cleanup; + } + } + + VIR_SHRINK_N(t, nt, 5); + + for (i = 0; i < nt; i++) { + if (t[i].a != 10 || + t[i].b != 20) { + fprintf(stderr, "Reallocated ram block %zu lost data\n", i); + goto cleanup; + } + } + + VIR_SHRINK_N(t, nt, 5); + + for (i = 0; i < nt; i++) { + if (t[i].a != 10 || + t[i].b != 20) { + fprintf(stderr, "Reallocated ram block %zu lost data\n", i); + goto cleanup; + } + } + + VIR_FREE(t); + + if (t != NULL) { + fprintf(stderr, "Pointer is still set after free\n"); + goto cleanup; + } + + ret = 0; + cleanup: + VIR_FREE(t); + return ret; +} + + +static int +testResizeArray(const void *opaque ATTRIBUTE_UNUSED) +{ + testDummyStruct *t; + size_t nt = 10, at, i; + int ret = -1; + + if (VIR_ALLOC_N(t, nt) < 0) + return -1; + + at = nt; + + if (t == NULL) { + fprintf(stderr, "Allocation succeeded by pointer is NULL\n"); + goto cleanup; + } + + for (i = 0; i < nt; i++) { + t[i].a = 10; + t[i].b = 20; + } + + if (VIR_RESIZE_N(t, at, nt, 8) < 0) + goto cleanup; + + if (at != 18) { + fprintf(stderr, "Expected allocation of 16 not %zu\n", at); + goto cleanup; + } + + for (i = 0; i < at; i++) { + if (i >= nt) { + if (t[i].a != 0 || + t[i].b != 0) { + fprintf(stderr, "New ram block %zu was not zerod\n", i); + goto cleanup; + } + } else { + if (t[i].a != 10 || + t[i].b != 20) { + fprintf(stderr, "Reallocated ram block %zu lost data\n", i); + goto cleanup; + } + } + } + + VIR_FREE(t); + + if (t != NULL) { + fprintf(stderr, "Pointer is still set after free\n"); + goto cleanup; + } + + ret = 0; + cleanup: + VIR_FREE(t); + return ret; +} + + +static int +testInsertArray(const void *opaque ATTRIBUTE_UNUSED) +{ + testDummyStruct **t; + size_t nt = 10, i; + int ret = -1; + testDummyStruct *n = (void *)0xff; + + if (VIR_ALLOC_N(t, nt) < 0) + return -1; + + if (t == NULL) { + fprintf(stderr, "Allocation succeeded by pointer is NULL\n"); + goto cleanup; + } + + for (i = 0; i < nt; i++) + t[i] = (void*)0x50; + + if (VIR_INSERT_ELEMENT(t, 3, nt, n) < 0) { + if (nt != 10) { + fprintf(stderr, "Expecting array size 10 after OOM not %zu\n", nt); + goto cleanup; + } + goto cleanup; + } + + if (nt != 11) { + fprintf(stderr, "Expecting array size 11 not %zu\n", nt); + goto cleanup; + } + + if (n != NULL) { + fprintf(stderr, "Expecting element to be set to NULL\n"); + goto cleanup; + } + + for (i = 0; i < nt; i++) { + void *expect = i == 3 ? (void *)0xff : (void*)0x50; + if (t[i] != expect) { + fprintf(stderr, "Expecting %p at offset %zu not %p\n", + expect, i, t[i]); + goto cleanup; + } + } + + VIR_FREE(t); + + if (t != NULL) { + fprintf(stderr, "Pointer is still set after free\n"); + goto cleanup; + } + + ret = 0; + cleanup: + VIR_FREE(t); + return ret; +} + + +static int +mymain(void) +{ + int ret = 0; + + if (virtTestRun("alloc scalar", testAllocScalar, NULL) < 0) + ret = -1; + if (virtTestRun("alloc array", testAllocArray, NULL) < 0) + ret = -1; + if (virtTestRun("realloc array", testReallocArray, NULL) < 0) + ret = -1; + if (virtTestRun("expand array", testExpandArray, NULL) < 0) + ret = -1; + if (virtTestRun("resize array", testResizeArray, NULL) < 0) + ret = -1; + if (virtTestRun("insert array", testInsertArray, NULL) < 0) + ret = -1; + + return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; +} + +VIRT_TEST_MAIN(mymain) -- 1.9.0

4 6

[libvirt] [PATCH 0/4] Add support for addressing backing stores by index
by Jiri Denemark 25 Apr '14

25 Apr '14

Jiri Denemark (4): qemuDomainBlockCommit: Don't track top_canon path separately qemuDomainBlockCommit: Track virStorageSourcePtr for base virStorageFileChainLookup: Return virStorageSourcePtr Add support for addressing backing stores by index src/libvirt.c | 13 ++++++- src/libvirt_private.syms | 1 + src/qemu/qemu_driver.c | 57 +++++++++++++++------------- src/util/virstoragefile.c | 97 +++++++++++++++++++++++++++++++++++++---------- src/util/virstoragefile.h | 14 +++++-- tests/virstoragetest.c | 86 ++++++++++++++++++++++++++++++----------- 6 files changed, 193 insertions(+), 75 deletions(-) -- 1.9.2

2 12

[libvirt] [RFC]How to improve KVM VM resource assignment and per-vm process/thread scheduling.
by Huangpeng (Peter) 25 Apr '14

25 Apr '14

Hi, ALL Currently kvm hypervisor have lots of features depend on linux standard apis, like vcpupin/mempin/processpin etc. But in the real production environment, we need an automated resource assign and/or scheduling, is there any plan to implement it? resource assignment requirements like: cpu eligible by the VMs In case it is eligible, whether it is in use if it is in use, whether it is dedicated to one VM, or can be shared by many VMs In case of Shared CPU need to configure oversubscription ratio used ratio info So does memory, I/O device assignment requirements. per-vm process/thread scheduling requirements like: On hypervisor side, VMs use vhost-net, virtio-scsi devices have qemu io-thread, vhost-net thread, ovs thread, hNIC interrupt context(hirq/softirq), you shoud place there threads on the same numa node to gain best performance, another important thing, you should balance these threads' cpuload on all the numa cores to avoid unbalance between vcpu usable resources. Thanks. Peter Huang

1 0

[libvirt] [PATCH] virsh: Move 'cpu-baseline' to host command group
by Li Yang 25 Apr '14

25 Apr '14

As manual said, 'cpu-baseline' isn't specific to a domain, it should not belong to domain command group, and it's used for host usually, so move it to host command group. Signed-off-by: Li Yang <liyang.fnst(a)cn.fujitsu.com> --- tools/virsh-domain.c | 115 ------------------------------------------------- tools/virsh-host.c | 116 ++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 116 insertions(+), 115 deletions(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 73414f8..16a8854 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -6223,115 +6223,6 @@ cmdCPUCompare(vshControl *ctl, const vshCmd *cmd) return ret; } -/* - * "cpu-baseline" command - */ -static const vshCmdInfo info_cpu_baseline[] = { - {.name = "help", - .data = N_("compute baseline CPU") - }, - {.name = "desc", - .data = N_("Compute baseline CPU for a set of given CPUs.") - }, - {.name = NULL} -}; - -static const vshCmdOptDef opts_cpu_baseline[] = { - {.name = "file", - .type = VSH_OT_DATA, - .flags = VSH_OFLAG_REQ, - .help = N_("file containing XML CPU descriptions") - }, - {.name = "features", - .type = VSH_OT_BOOL, - .help = N_("Show features that are part of the CPU model type") - }, - {.name = NULL} -}; - -static bool -cmdCPUBaseline(vshControl *ctl, const vshCmd *cmd) -{ - const char *from = NULL; - bool ret = false; - char *buffer; - char *result = NULL; - char **list = NULL; - unsigned int flags = 0; - int count = 0; - - xmlDocPtr xml = NULL; - xmlNodePtr *node_list = NULL; - xmlXPathContextPtr ctxt = NULL; - virBuffer buf = VIR_BUFFER_INITIALIZER; - size_t i; - - if (vshCommandOptBool(cmd, "features")) - flags |= VIR_CONNECT_BASELINE_CPU_EXPAND_FEATURES; - - if (vshCommandOptStringReq(ctl, cmd, "file", &from) < 0) - return false; - - if (virFileReadAll(from, VSH_MAX_XML_FILE, &buffer) < 0) - return false; - - /* add a separate container around the xml */ - virBufferStrcat(&buf, "<container>", buffer, "</container>", NULL); - if (virBufferError(&buf)) - goto no_memory; - - VIR_FREE(buffer); - buffer = virBufferContentAndReset(&buf); - - - if (!(xml = virXMLParseStringCtxt(buffer, from, &ctxt))) - goto cleanup; - - if ((count = virXPathNodeSet("//cpu[not(ancestor::cpus)]", - ctxt, &node_list)) == -1) - goto cleanup; - - if (count == 0) { - vshError(ctl, _("No host CPU specified in '%s'"), from); - goto cleanup; - } - - list = vshCalloc(ctl, count, sizeof(const char *)); - - for (i = 0; i < count; i++) { - if (!(list[i] = virXMLNodeToString(xml, node_list[i]))) { - vshSaveLibvirtError(); - goto cleanup; - } - } - - result = virConnectBaselineCPU(ctl->conn, - (const char **)list, count, flags); - - if (result) { - vshPrint(ctl, "%s", result); - ret = true; - } - - cleanup: - xmlXPathFreeContext(ctxt); - xmlFreeDoc(xml); - VIR_FREE(result); - if (list != NULL && count > 0) { - for (i = 0; i < count; i++) - VIR_FREE(list[i]); - } - VIR_FREE(list); - VIR_FREE(buffer); - VIR_FREE(node_list); - - return ret; - - no_memory: - vshError(ctl, "%s", _("Out of memory")); - ret = false; - goto cleanup; -} /* * "cpu-stats" command @@ -11472,12 +11363,6 @@ const vshCmdDef domManagementCmds[] = { .flags = 0 }, #endif - {.name = "cpu-baseline", - .handler = cmdCPUBaseline, - .opts = opts_cpu_baseline, - .info = info_cpu_baseline, - .flags = 0 - }, {.name = "cpu-compare", .handler = cmdCPUCompare, .opts = opts_cpu_compare, diff --git a/tools/virsh-host.c b/tools/virsh-host.c index cac6086..8273654 100644 --- a/tools/virsh-host.c +++ b/tools/virsh-host.c @@ -38,6 +38,7 @@ #include "virxml.h" #include "virtypedparam.h" #include "virstring.h" +#include "virfile.h" /* * "capabilities" command @@ -939,6 +940,115 @@ cmdNodeMemoryTune(vshControl *ctl, const vshCmd *cmd) goto cleanup; } +/* + * "cpu-baseline" command + */ +static const vshCmdInfo info_cpu_baseline[] = { + {.name = "help", + .data = N_("compute baseline CPU") + }, + {.name = "desc", + .data = N_("Compute baseline CPU for a set of given CPUs.") + }, + {.name = NULL} +}; + +static const vshCmdOptDef opts_cpu_baseline[] = { + {.name = "file", + .type = VSH_OT_DATA, + .flags = VSH_OFLAG_REQ, + .help = N_("file containing XML CPU descriptions") + }, + {.name = "features", + .type = VSH_OT_BOOL, + .help = N_("Show features that are part of the CPU model type") + }, + {.name = NULL} +}; + +static bool +cmdCPUBaseline(vshControl *ctl, const vshCmd *cmd) +{ + const char *from = NULL; + bool ret = false; + char *buffer; + char *result = NULL; + char **list = NULL; + unsigned int flags = 0; + int count = 0; + + xmlDocPtr xml = NULL; + xmlNodePtr *node_list = NULL; + xmlXPathContextPtr ctxt = NULL; + virBuffer buf = VIR_BUFFER_INITIALIZER; + size_t i; + + if (vshCommandOptBool(cmd, "features")) + flags |= VIR_CONNECT_BASELINE_CPU_EXPAND_FEATURES; + + if (vshCommandOptStringReq(ctl, cmd, "file", &from) < 0) + return false; + + if (virFileReadAll(from, VSH_MAX_XML_FILE, &buffer) < 0) + return false; + + /* add a separate container around the xml */ + virBufferStrcat(&buf, "<container>", buffer, "</container>", NULL); + if (virBufferError(&buf)) + goto no_memory; + + VIR_FREE(buffer); + buffer = virBufferContentAndReset(&buf); + + + if (!(xml = virXMLParseStringCtxt(buffer, from, &ctxt))) + goto cleanup; + + if ((count = virXPathNodeSet("//cpu[not(ancestor::cpus)]", + ctxt, &node_list)) == -1) + goto cleanup; + + if (count == 0) { + vshError(ctl, _("No host CPU specified in '%s'"), from); + goto cleanup; + } + + list = vshCalloc(ctl, count, sizeof(const char *)); + + for (i = 0; i < count; i++) { + if (!(list[i] = virXMLNodeToString(xml, node_list[i]))) { + vshSaveLibvirtError(); + goto cleanup; + } + } + + result = virConnectBaselineCPU(ctl->conn, + (const char **)list, count, flags); + + if (result) { + vshPrint(ctl, "%s", result); + ret = true; + } + + cleanup: + xmlXPathFreeContext(ctxt); + xmlFreeDoc(xml); + VIR_FREE(result); + if (list != NULL && count > 0) { + for (i = 0; i < count; i++) + VIR_FREE(list[i]); + } + VIR_FREE(list); + VIR_FREE(buffer); + VIR_FREE(node_list); + + return ret; + + no_memory: + vshError(ctl, "%s", _("Out of memory")); + ret = false; + goto cleanup; +} const vshCmdDef hostAndHypervisorCmds[] = { {.name = "capabilities", .handler = cmdCapabilities, @@ -952,6 +1062,12 @@ const vshCmdDef hostAndHypervisorCmds[] = { .info = info_cpu_models, .flags = 0 }, + {.name = "cpu-baseline", + .handler = cmdCPUBaseline, + .opts = opts_cpu_baseline, + .info = info_cpu_baseline, + .flags = 0 + }, {.name = "freecell", .handler = cmdFreecell, .opts = opts_freecell, -- 1.7.1

1 0

[libvirt] [PATCH] libxl: add migration support
by Jim Fehlig 25 Apr '14

25 Apr '14

This patch adds initial migration support to the libxl driver, using the VIR_DRV_FEATURE_MIGRATION_PARAMS family of migration functions. Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- V3 of patch to add migration support to the libxl driver. V2 is here https://www.redhat.com/archives/libvir-list/2014-March/msg00880.html Patches 1-12 in the original series have been pushed, leaving only this patch to complete the migration support. This version adds a simple, extensible messaging protocol to coordinate transfer of migration data between libxl hosts. Michal Privoznik noted the even simpler protocol in V2 was not extensible, which in the end was a good point IMO so I've tried to address that with V3. Comments welcome. Thanks! po/POTFILES.in | 1 + src/Makefile.am | 3 +- src/libxl/libxl_conf.h | 6 + src/libxl/libxl_domain.h | 1 + src/libxl/libxl_driver.c | 221 +++++++++++ src/libxl/libxl_migration.c | 920 ++++++++++++++++++++++++++++++++++++++++++++ src/libxl/libxl_migration.h | 78 ++++ 7 files changed, 1229 insertions(+), 1 deletion(-) diff --git a/po/POTFILES.in b/po/POTFILES.in index 122b853..5618631 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -73,6 +73,7 @@ src/lxc/lxc_process.c src/libxl/libxl_domain.c src/libxl/libxl_driver.c src/libxl/libxl_conf.c +src/libxl/libxl_migration.c src/network/bridge_driver.c src/network/bridge_driver_linux.c src/node_device/node_device_driver.c diff --git a/src/Makefile.am b/src/Makefile.am index 21d56fc..f0dd4ae 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -702,7 +702,8 @@ XENAPI_DRIVER_SOURCES = \ LIBXL_DRIVER_SOURCES = \ libxl/libxl_conf.c libxl/libxl_conf.h \ libxl/libxl_domain.c libxl/libxl_domain.h \ - libxl/libxl_driver.c libxl/libxl_driver.h + libxl/libxl_driver.c libxl/libxl_driver.h \ + libxl/libxl_migration.c libxl/libxl_migration.h UML_DRIVER_SOURCES = \ uml/uml_conf.c uml/uml_conf.h \ diff --git a/src/libxl/libxl_conf.h b/src/libxl/libxl_conf.h index 24e1720..b798567 100644 --- a/src/libxl/libxl_conf.h +++ b/src/libxl/libxl_conf.h @@ -43,6 +43,9 @@ # define LIBXL_VNC_PORT_MIN 5900 # define LIBXL_VNC_PORT_MAX 65535 +# define LIBXL_MIGRATION_PORT_MIN 49152 +# define LIBXL_MIGRATION_PORT_MAX 49216 + # define LIBXL_CONFIG_DIR SYSCONFDIR "/libvirt/libxl" # define LIBXL_AUTOSTART_DIR LIBXL_CONFIG_DIR "/autostart" # define LIBXL_STATE_DIR LOCALSTATEDIR "/run/libvirt/libxl" @@ -115,6 +118,9 @@ struct _libxlDriverPrivate { /* Immutable pointer, self-locking APIs */ virPortAllocatorPtr reservedVNCPorts; + /* Immutable pointer, self-locking APIs */ + virPortAllocatorPtr migrationPorts; + /* Immutable pointer, lockless APIs*/ virSysinfoDefPtr hostsysinfo; }; diff --git a/src/libxl/libxl_domain.h b/src/libxl/libxl_domain.h index 979ce2a..9d48049 100644 --- a/src/libxl/libxl_domain.h +++ b/src/libxl/libxl_domain.h @@ -69,6 +69,7 @@ struct _libxlDomainObjPrivate { virChrdevsPtr devs; libxl_evgen_domain_death *deathW; libxlDriverPrivatePtr driver; + unsigned short migrationPort; struct libxlDomainJobObj job; }; diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index a6ae8a1..acf68b8 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -45,6 +45,7 @@ #include "libxl_domain.h" #include "libxl_driver.h" #include "libxl_conf.h" +#include "libxl_migration.h" #include "xen_xm.h" #include "xen_sxpr.h" #include "virtypedparam.h" @@ -209,6 +210,7 @@ libxlStateCleanup(void) virObjectUnref(libxl_driver->xmlopt); virObjectUnref(libxl_driver->domains); virObjectUnref(libxl_driver->reservedVNCPorts); + virObjectUnref(libxl_driver->migrationPorts); virObjectEventStateFree(libxl_driver->domainEventState); virSysinfoDefFree(libxl_driver->hostsysinfo); @@ -296,6 +298,13 @@ libxlStateInitialize(bool privileged, LIBXL_VNC_PORT_MAX))) goto error; + /* Allocate bitmap for migration port reservation */ + if (!(libxl_driver->migrationPorts = + virPortAllocatorNew(_("migration"), + LIBXL_MIGRATION_PORT_MIN, + LIBXL_MIGRATION_PORT_MAX))) + goto error; + if (!(libxl_driver->domains = virDomainObjListNew())) goto error; @@ -4120,6 +4129,7 @@ libxlConnectSupportsFeature(virConnectPtr conn, int feature) switch (feature) { case VIR_DRV_FEATURE_TYPED_PARAM_STRING: + case VIR_DRV_FEATURE_MIGRATION_PARAMS: return 1; default: return 0; @@ -4298,6 +4308,212 @@ libxlNodeDeviceReset(virNodeDevicePtr dev) return ret; } +static char * +libxlDomainMigrateBegin3Params(virDomainPtr domain, + virTypedParameterPtr params, + int nparams, + char **cookieout ATTRIBUTE_UNUSED, + int *cookieoutlen ATTRIBUTE_UNUSED, + unsigned int flags) +{ + const char *xmlin = NULL; + virDomainObjPtr vm = NULL; + + virCheckFlags(LIBXL_MIGRATION_FLAGS, NULL); + if (virTypedParamsValidate(params, nparams, LIBXL_MIGRATION_PARAMETERS) < 0) + return NULL; + + if (virTypedParamsGetString(params, nparams, + VIR_MIGRATE_PARAM_DEST_XML, + &xmlin) < 0) + return NULL; + + if (!(vm = libxlDomObjFromDomain(domain))) + return NULL; + + if (virDomainMigrateBegin3ParamsEnsureACL(domain->conn, vm->def) < 0) { + virObjectUnlock(vm); + return NULL; + } + + if (!virDomainObjIsActive(vm)) { + virReportError(VIR_ERR_OPERATION_INVALID, + "%s", _("domain is not running")); + virObjectUnlock(vm); + return NULL; + } + + return libxlDomainMigrationBegin(domain->conn, vm, xmlin); +} + +static int +libxlDomainMigratePrepare3Params(virConnectPtr dconn, + virTypedParameterPtr params, + int nparams, + const char *cookiein ATTRIBUTE_UNUSED, + int cookieinlen ATTRIBUTE_UNUSED, + char **cookieout ATTRIBUTE_UNUSED, + int *cookieoutlen ATTRIBUTE_UNUSED, + char **uri_out, + unsigned int flags) +{ + libxlDriverPrivatePtr driver = dconn->privateData; + virDomainDefPtr def = NULL; + const char *dom_xml = NULL; + const char *dname = NULL; + const char *uri_in = NULL; + + virCheckFlags(LIBXL_MIGRATION_FLAGS, -1); + if (virTypedParamsValidate(params, nparams, LIBXL_MIGRATION_PARAMETERS) < 0) + goto error; + + if (virTypedParamsGetString(params, nparams, + VIR_MIGRATE_PARAM_DEST_XML, + &dom_xml) < 0 || + virTypedParamsGetString(params, nparams, + VIR_MIGRATE_PARAM_DEST_NAME, + &dname) < 0 || + virTypedParamsGetString(params, nparams, + VIR_MIGRATE_PARAM_URI, + &uri_in) < 0) + + goto error; + + if (!(def = libxlDomainMigrationPrepareDef(driver, dom_xml, dname))) + goto error; + + if (virDomainMigratePrepare3ParamsEnsureACL(dconn, def) < 0) + goto error; + + if (libxlDomainMigrationPrepare(dconn, def, uri_in, uri_out) < 0) + goto error; + + return 0; + + error: + virDomainDefFree(def); + return -1; +} + +static int +libxlDomainMigratePerform3Params(virDomainPtr dom, + const char *dconnuri, + virTypedParameterPtr params, + int nparams, + const char *cookiein ATTRIBUTE_UNUSED, + int cookieinlen ATTRIBUTE_UNUSED, + char **cookieout ATTRIBUTE_UNUSED, + int *cookieoutlen ATTRIBUTE_UNUSED, + unsigned int flags) +{ + libxlDriverPrivatePtr driver = dom->conn->privateData; + virDomainObjPtr vm = NULL; + const char *dom_xml = NULL; + const char *dname = NULL; + const char *uri = NULL; + int ret = -1; + + virCheckFlags(LIBXL_MIGRATION_FLAGS, -1); + if (virTypedParamsValidate(params, nparams, LIBXL_MIGRATION_PARAMETERS) < 0) + goto cleanup; + + if (virTypedParamsGetString(params, nparams, + VIR_MIGRATE_PARAM_DEST_XML, + &dom_xml) < 0 || + virTypedParamsGetString(params, nparams, + VIR_MIGRATE_PARAM_DEST_NAME, + &dname) < 0 || + virTypedParamsGetString(params, nparams, + VIR_MIGRATE_PARAM_URI, + &uri) < 0) + + goto cleanup; + + if (!(vm = libxlDomObjFromDomain(dom))) + goto cleanup; + + if (virDomainMigratePerform3ParamsEnsureACL(dom->conn, vm->def) < 0) + goto cleanup; + + if (libxlDomainMigrationPerform(driver, vm, dom_xml, dconnuri, + uri, dname, flags) < 0) + goto cleanup; + + ret = 0; + + cleanup: + if (vm) + virObjectUnlock(vm); + return ret; +} + +static virDomainPtr +libxlDomainMigrateFinish3Params(virConnectPtr dconn, + virTypedParameterPtr params, + int nparams, + const char *cookiein ATTRIBUTE_UNUSED, + int cookieinlen ATTRIBUTE_UNUSED, + char **cookieout ATTRIBUTE_UNUSED, + int *cookieoutlen ATTRIBUTE_UNUSED, + unsigned int flags, + int cancelled) +{ + libxlDriverPrivatePtr driver = dconn->privateData; + virDomainObjPtr vm = NULL; + const char *dname = NULL; + + virCheckFlags(LIBXL_MIGRATION_FLAGS, NULL); + if (virTypedParamsValidate(params, nparams, LIBXL_MIGRATION_PARAMETERS) < 0) + return NULL; + + if (virTypedParamsGetString(params, nparams, + VIR_MIGRATE_PARAM_DEST_NAME, + &dname) < 0) + return NULL; + + if (!dname || + !(vm = virDomainObjListFindByName(driver->domains, dname))) { + virReportError(VIR_ERR_NO_DOMAIN, + _("no domain with matching name '%s'"), + NULLSTR(dname)); + return NULL; + } + + if (virDomainMigrateFinish3ParamsEnsureACL(dconn, vm->def) < 0) { + virObjectUnlock(vm); + return NULL; + } + + return libxlDomainMigrationFinish(dconn, vm, flags, cancelled); +} + +static int +libxlDomainMigrateConfirm3Params(virDomainPtr domain, + virTypedParameterPtr params, + int nparams, + const char *cookiein ATTRIBUTE_UNUSED, + int cookieinlen ATTRIBUTE_UNUSED, + unsigned int flags, + int cancelled) +{ + libxlDriverPrivatePtr driver = domain->conn->privateData; + virDomainObjPtr vm = NULL; + + virCheckFlags(LIBXL_MIGRATION_FLAGS, -1); + if (virTypedParamsValidate(params, nparams, LIBXL_MIGRATION_PARAMETERS) < 0) + return -1; + + if (!(vm = libxlDomObjFromDomain(domain))) + return -1; + + if (virDomainMigrateConfirm3ParamsEnsureACL(domain->conn, vm->def) < 0) { + virObjectUnlock(vm); + return -1; + } + + return libxlDomainMigrationConfirm(driver, vm, flags, cancelled); +} + static virDriver libxlDriver = { .no = VIR_DRV_LIBXL, @@ -4388,6 +4604,11 @@ static virDriver libxlDriver = { .nodeDeviceDetachFlags = libxlNodeDeviceDetachFlags, /* 1.2.3 */ .nodeDeviceReAttach = libxlNodeDeviceReAttach, /* 1.2.3 */ .nodeDeviceReset = libxlNodeDeviceReset, /* 1.2.3 */ + .domainMigrateBegin3Params = libxlDomainMigrateBegin3Params, /* 1.2.3 */ + .domainMigratePrepare3Params = libxlDomainMigratePrepare3Params, /* 1.2.3 */ + .domainMigratePerform3Params = libxlDomainMigratePerform3Params, /* 1.2.3 */ + .domainMigrateFinish3Params = libxlDomainMigrateFinish3Params, /* 1.2.3 */ + .domainMigrateConfirm3Params = libxlDomainMigrateConfirm3Params, /* 1.2.3 */ }; static virStateDriver libxlStateDriver = { diff --git a/src/libxl/libxl_migration.c b/src/libxl/libxl_migration.c new file mode 100644 index 0000000..4b74ef4 --- /dev/null +++ b/src/libxl/libxl_migration.c @@ -0,0 +1,920 @@ +/* + * libxl_migration.c: methods for handling migration with libxenlight + * + * Copyright (C) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library. If not, see + * <http://www.gnu.org/licenses/>. + * + * Authors: + * Jim Fehlig <jfehlig(a)suse.com> + * Chunyan Liu <cyliu(a)suse.com> + */ + +#include <config.h> + +#include "internal.h" +#include "virlog.h" +#include "virerror.h" +#include "virconf.h" +#include "datatypes.h" +#include "virfile.h" +#include "viralloc.h" +#include "viruuid.h" +#include "vircommand.h" +#include "virstring.h" +#include "rpc/virnetsocket.h" +#include "libxl_domain.h" +#include "libxl_driver.h" +#include "libxl_conf.h" +#include "libxl_migration.h" + +#define VIR_FROM_THIS VIR_FROM_LIBXL + +VIR_LOG_INIT("libxl.libxl_migration"); + +#define LIBXL_MIGRATION_PROTO_VERSION 1 + +typedef struct _libxlMigrateReceiveArgs { + virConnectPtr conn; + virDomainObjPtr vm; + + /* for freeing listen sockets */ + virNetSocketPtr *socks; + size_t nsocks; +} libxlMigrateReceiveArgs; + +/* + * For future extensibility, a simple messaging protocol used to send migration + * data between libxl hosts. The message is encapsulated in json and currently + * includes the following entries: + * + * {"libvirt-libxl-mig-msg" : + * {"version" : $ver}, + * {"state" : $state}, + * {"status" : $status} + * } + * + * Possible $state values are "negotiate-version", "send-binary-data", + * "sending-binary-data", "received-binary-data", "done", and "error". + * + * Migration between source and destination libxl hosts is performed with the + * following message exchange: + * + * - src->dst: connect + * - dst->src: state="negotiate-version", version=LIBXL_MIGRATION_PROTO_VERSION + * - src->dst: state-"negotiate-version", + * version=min(dst ver, LIBXL_MIGRATION_PROTO_VERSION) + * - dst->src: state="send-binary-data", version=negotiatedversion + * - src->dst: state="sending-binary-data", version=negotiatedversion + * _ src->dst: binary migration data + * - dst->src: state="received-binary-data", version=negotiatedversion + * - src->dst: state="done", version=negotiatedversion + * + */ + +static virJSONValuePtr +libxlMigrationMsgNew(const char *state) +{ + virJSONValuePtr msg; + virJSONValuePtr body; + + if (!(msg = virJSONValueNewObject())) + return NULL; + + if (!(body = virJSONValueNewObject())) { + virJSONValueFree(msg); + return NULL; + } + + virJSONValueObjectAppendNumberInt(body, "version", + LIBXL_MIGRATION_PROTO_VERSION); + virJSONValueObjectAppendString(body, "state", state); + virJSONValueObjectAppendNumberInt(body, "status", 0); + + virJSONValueObjectAppend(msg, "libvirt-libxl-mig-msg", body); + + return msg; +} + +static bool +libxlMigrationMsgIsState(virJSONValuePtr message, const char *state) +{ + virJSONValuePtr body; + const char *msg_state; + + if (!(body = virJSONValueObjectGet(message, "libvirt-libxl-mig-msg"))) + return false; + + msg_state = virJSONValueObjectGetString(body, "state"); + if (!msg_state || STRNEQ(msg_state, state)) + return false; + + return true; +} + +static int +libxlMigrationMsgSetState(virJSONValuePtr message, const char *state) +{ + virJSONValuePtr body; + + if (!(body = virJSONValueObjectGet(message, "libvirt-libxl-mig-msg"))) + return -1; + + virJSONValueObjectRemoveKey(body, "state", NULL); + virJSONValueObjectAppendString(body, "state", state); + + return 0; +} + + +static int +libxlMigrationMsgSend(int fd, virJSONValuePtr message, int status) +{ + int ret = -1; + virJSONValuePtr body; + int len; + char *msgstr; + + if (!(body = virJSONValueObjectGet(message, "libvirt-libxl-mig-msg"))) + return -1; + + virJSONValueObjectRemoveKey(body, "status", NULL); + virJSONValueObjectAppendNumberInt(body, "status", status); + + if (!(msgstr = virJSONValueToString(message, false))) + return -1; + + VIR_DEBUG("Sending migration message %s", msgstr); + len = strlen(msgstr) + 1; + if (safewrite(fd, msgstr, len) != len) { + virReportError(VIR_ERR_OPERATION_FAILED, "%s", + _("Failed to send migration message")); + goto cleanup; + } + + ret = 0; + + cleanup: + VIR_FREE(msgstr); + return ret; +} + +static virJSONValuePtr +libxlMigrationMsgReceive(int fd) +{ + char buf[512]; + int ret; + virJSONValuePtr msg = NULL; + virJSONValuePtr body; + int status; + size_t i; + + for (i = 0; i < sizeof(buf);) { + ret = saferead(fd, &(buf[i]), 1); + if (ret == -1 && errno != EAGAIN) + goto error; + if (ret == 1) { + if (buf[i] == '\0') + break; + i++; + } + } + + VIR_DEBUG("Received migration message %s", buf); + if (!(msg = virJSONValueFromString(buf))) + return NULL; + + if (!(body = virJSONValueObjectGet(msg, "libvirt-libxl-mig-msg"))) + goto error; + + if (virJSONValueObjectGetNumberInt(body, "status", &status) < 0) + goto error; + + if (status != 0) + goto error; + + return msg; + + error: + virReportError(VIR_ERR_OPERATION_FAILED, "%s", + _("Failed to receive migration message")); + virJSONValueFree(msg); + return NULL; +} + +static int +libxlMigrationSrcNegotiate(int fd) +{ + int ret = -1; + virJSONValuePtr msg; + virJSONValuePtr body; + int ver; + + if (!(msg = libxlMigrationMsgReceive(fd))) + return -1; + + if (!libxlMigrationMsgIsState(msg, "negotiate-version")) + goto cleanup; + /* + * ACK by returning the message, with version set to + * min(dest ver, src ver) + */ + if (!(body = virJSONValueObjectGet(msg, "libvirt-libxl-mig-msg"))) + goto cleanup; + + if (virJSONValueObjectGetNumberInt(body, "version", &ver) < 0) + goto cleanup; + if (ver > LIBXL_MIGRATION_PROTO_VERSION) { + virJSONValueObjectRemoveKey(body, "version", NULL); + virJSONValueObjectAppendNumberInt(body, + "version", + LIBXL_MIGRATION_PROTO_VERSION); + } + + if (libxlMigrationMsgSend(fd, msg, 0) < 0) + goto cleanup; + + ret = 0; + + cleanup: + virJSONValueFree(msg); + return ret; +} + +static int +libxlMigrationDstNegotiate(int fd, virJSONValuePtr *message) +{ + virJSONValuePtr msg; + + if (!(msg = libxlMigrationMsgNew("negotiate-version"))) + return -1; + + if (libxlMigrationMsgSend(fd, msg, 0) < 0) { + virJSONValueFree(msg); + return -1; + } + + /* + * Receive ACK. src set version=min(dst ver, highest src ver), + * which is the negotiated version. Use this message with + * negotiated version throughout the transaction. + */ + virJSONValueFree(msg); + if (!(msg = libxlMigrationMsgReceive(fd))) + return -1; + + *message = msg; + return 0; +} + +static int +libxlMigrationSrcReady(int fd) +{ + int ret = -1; + virJSONValuePtr msg; + + if (!(msg = libxlMigrationMsgReceive(fd))) + return -1; + + if (!libxlMigrationMsgIsState(msg, "send-binary-data")) + goto cleanup; + + /* ACK by returning the message with state sending */ + libxlMigrationMsgSetState(msg, "sending-binary-data"); + if (libxlMigrationMsgSend(fd, msg, 0) < 0) + goto cleanup; + + ret = 0; + + cleanup: + virJSONValueFree(msg); + return ret; +} + +static int +libxlMigrationDstReady(int fd, virJSONValuePtr msg) +{ + int ret = -1; + virJSONValuePtr tmp = NULL; + + libxlMigrationMsgSetState(msg, "send-binary-data"); + if (libxlMigrationMsgSend(fd, msg, 0) < 0) + return -1; + + /* Receive ACK, state sending */ + if (!(tmp = libxlMigrationMsgReceive(fd))) + return -1; + if (!libxlMigrationMsgIsState(tmp, "sending-binary-data")) + goto cleanup; + + ret = 0; + + cleanup: + virJSONValueFree(tmp); + return ret; +} + +static int +libxlMigrationSrcDone(int fd) +{ + int ret = -1; + virJSONValuePtr msg; + + if (!(msg = libxlMigrationMsgReceive(fd))) + return -1; + + if (!libxlMigrationMsgIsState(msg, "received-binary-data")) + goto cleanup; + + /* ACK by returning the message with state done */ + libxlMigrationMsgSetState(msg, "done"); + if (libxlMigrationMsgSend(fd, msg, 0) < 0) + goto cleanup; + + ret = 0; + + cleanup: + virJSONValueFree(msg); + return ret; +} + +static int +libxlMigrationDestDone(int fd, virJSONValuePtr msg) +{ + int ret = -1; + virJSONValuePtr tmp; + + libxlMigrationMsgSetState(msg, "received-binary-data"); + if (libxlMigrationMsgSend(fd, msg, 0) < 0) + return -1; + + /* Receive ACK, state done */ + if (!(tmp = libxlMigrationMsgReceive(fd))) + return -1; + if (!libxlMigrationMsgIsState(tmp, "done")) + goto cleanup; + + ret = 0; + + cleanup: + virJSONValueFree(tmp); + return ret; +} + +static void +libxlMigrationSrcFailed(int fd, int status) +{ + virJSONValuePtr msg; + + if (!(msg = libxlMigrationMsgNew("error"))) + return; + libxlMigrationMsgSend(fd, msg, status); + virJSONValueFree(msg); +} + +static void +libxlMigrationDstFailed(int fd, virJSONValuePtr msg, int status) +{ + libxlMigrationMsgSetState(msg, "error"); + libxlMigrationMsgSend(fd, msg, status); +} + +static void +libxlDoMigrateReceive(virNetSocketPtr sock, + int events ATTRIBUTE_UNUSED, + void *opaque) +{ + libxlMigrateReceiveArgs *data = opaque; + virConnectPtr conn = data->conn; + virDomainObjPtr vm = data->vm; + libxlDomainObjPrivatePtr priv = vm->privateData; + virNetSocketPtr *socks = data->socks; + size_t nsocks = data->nsocks; + libxlDriverPrivatePtr driver = conn->privateData; + virNetSocketPtr client_sock; + virJSONValuePtr mig_msg = NULL; + int recvfd; + size_t i; + int ret; + + virNetSocketAccept(sock, &client_sock); + if (client_sock == NULL) { + virReportError(VIR_ERR_OPERATION_INVALID, "%s", + _("Fail to accept migration connection")); + goto cleanup; + } + VIR_DEBUG("Accepted migration connection\n"); + recvfd = virNetSocketDupFD(client_sock, true); + virObjectUnref(client_sock); + + if (libxlMigrationDstNegotiate(recvfd, &mig_msg) < 0) + goto cleanup; + + if (libxlMigrationDstReady(recvfd, mig_msg) < 0) + goto cleanup; + + virObjectLock(vm); + ret = libxlDomainStart(driver, vm, false, recvfd); + virObjectUnlock(vm); + + if (ret < 0) { + libxlMigrationDstFailed(recvfd, mig_msg, ret); + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Failed to restore domain with libxenlight")); + if (!vm->persistent) + virDomainObjListRemove(driver->domains, vm); + goto cleanup; + } + + if (libxlMigrationDestDone(recvfd, mig_msg) < 0) { + virReportError(VIR_ERR_OPERATION_FAILED, "%s", + _("Failed to notify sender that migration completed")); + goto cleanup_dom; + } + + /* Remove all listen socks from event handler, and close them. */ + for (i = 0; i < nsocks; i++) { + virNetSocketUpdateIOCallback(socks[i], 0); + virNetSocketRemoveIOCallback(socks[i]); + virNetSocketClose(socks[i]); + virObjectUnref(socks[i]); + } + VIR_FREE(socks); + goto cleanup; + + cleanup_dom: + libxl_domain_destroy(priv->ctx, vm->def->id, NULL); + vm->def->id = -1; + if (!vm->persistent) + virDomainObjListRemove(driver->domains, vm); + + cleanup: + VIR_FORCE_CLOSE(recvfd); + virJSONValueFree(mig_msg); + VIR_FREE(opaque); + return; +} + +static int +libxlDoMigrateSend(libxlDriverPrivatePtr driver, + virDomainObjPtr vm, + unsigned long flags, + int sockfd) +{ + libxlDomainObjPrivatePtr priv; + libxlDriverConfigPtr cfg = libxlDriverConfigGet(driver); + virObjectEventPtr event = NULL; + int xl_flags = 0; + int ret = -1; + + if (flags & VIR_MIGRATE_LIVE) + xl_flags = LIBXL_SUSPEND_LIVE; + + priv = vm->privateData; + + if (libxlMigrationSrcNegotiate(sockfd) < 0) + goto cleanup; + + if (libxlMigrationSrcReady(sockfd) < 0) + goto cleanup; + + if (libxl_domain_suspend(priv->ctx, vm->def->id, + sockfd, xl_flags, NULL) != 0) { + libxlMigrationSrcFailed(sockfd, ret); + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Failed to save domain '%d' with libxenlight"), + vm->def->id); + goto cleanup; + } + + if (libxlMigrationSrcDone(sockfd) < 0) { + if (libxl_domain_resume(priv->ctx, vm->def->id, 0, 0) != 0) { + VIR_DEBUG("Failed to resume domain '%d' with libxenlight", + vm->def->id); + virDomainObjSetState(vm, VIR_DOMAIN_PAUSED, + VIR_DOMAIN_PAUSED_MIGRATION); + event = virDomainEventLifecycleNewFromObj(vm, VIR_DOMAIN_EVENT_SUSPENDED, + VIR_DOMAIN_EVENT_SUSPENDED_MIGRATED); + if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm) < 0) + goto cleanup; + } + goto cleanup; + } + + ret = 0; + + cleanup: + if (event) + libxlDomainEventQueue(driver, event); + virObjectUnref(cfg); + return ret; +} + +static bool +libxlDomainMigrationIsAllowed(virDomainDefPtr def) +{ + /* Migration is not allowed if definition contains any hostdevs */ + if (def->nhostdevs > 0) { + virReportError(VIR_ERR_OPERATION_INVALID, "%s", + _("domain has assigned host devices")); + return false; + } + + return true; +} + +char * +libxlDomainMigrationBegin(virConnectPtr conn, + virDomainObjPtr vm, + const char *xmlin) +{ + libxlDriverPrivatePtr driver = conn->privateData; + libxlDriverConfigPtr cfg = libxlDriverConfigGet(driver); + virDomainDefPtr tmpdef = NULL; + virDomainDefPtr def; + char *xml = NULL; + + if (libxlDomainObjBeginJob(driver, vm, LIBXL_JOB_MODIFY) < 0) + goto cleanup; + + if (xmlin) { + if (!(tmpdef = virDomainDefParseString(xmlin, cfg->caps, + driver->xmlopt, + 1 << VIR_DOMAIN_VIRT_XEN, + VIR_DOMAIN_XML_INACTIVE))) + goto endjob; + + def = tmpdef; + } else { + def = vm->def; + } + + if (!libxlDomainMigrationIsAllowed(def)) + goto endjob; + + xml = virDomainDefFormat(def, VIR_DOMAIN_XML_SECURE); + + cleanup: + if (vm) + virObjectUnlock(vm); + + virDomainDefFree(tmpdef); + virObjectUnref(cfg); + return xml; + + endjob: + if (!libxlDomainObjEndJob(driver, vm)) + vm = NULL; + goto cleanup; +} + +virDomainDefPtr +libxlDomainMigrationPrepareDef(libxlDriverPrivatePtr driver, + const char *dom_xml, + const char *dname) +{ + libxlDriverConfigPtr cfg = libxlDriverConfigGet(driver); + virDomainDefPtr def; + char *name = NULL; + + if (!dom_xml) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("no domain XML passed")); + return NULL; + } + + if (!(def = virDomainDefParseString(dom_xml, cfg->caps, driver->xmlopt, + 1 << VIR_DOMAIN_VIRT_XEN, + VIR_DOMAIN_XML_INACTIVE))) + goto cleanup; + + if (dname) { + name = def->name; + if (VIR_STRDUP(def->name, dname) < 0) { + virDomainDefFree(def); + def = NULL; + } + } + + cleanup: + virObjectUnref(cfg); + VIR_FREE(name); + return def; +} + +int +libxlDomainMigrationPrepare(virConnectPtr dconn, + virDomainDefPtr def, + const char *uri_in, + char **uri_out) +{ + libxlDriverPrivatePtr driver = dconn->privateData; + virDomainObjPtr vm = NULL; + char *hostname = NULL; + unsigned short port; + char portstr[100]; + virURIPtr uri = NULL; + virNetSocketPtr *socks = NULL; + size_t nsocks = 0; + int nsocks_listen = 0; + libxlMigrateReceiveArgs *args; + size_t i; + int ret = -1; + + if (!(vm = virDomainObjListAdd(driver->domains, def, + driver->xmlopt, + VIR_DOMAIN_OBJ_LIST_ADD_LIVE | + VIR_DOMAIN_OBJ_LIST_ADD_CHECK_LIVE, + NULL))) + goto cleanup; + + /* Create socket connection to receive migration data */ + if (!uri_in) { + if ((hostname = virGetHostname()) == NULL) + goto cleanup; + + if (STRPREFIX(hostname, "localhost")) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("hostname on destination resolved to localhost," + " but migration requires an FQDN")); + goto cleanup; + } + + if (virPortAllocatorAcquire(driver->migrationPorts, &port) < 0) + goto cleanup; + + if (virAsprintf(uri_out, "tcp://%s:%d", hostname, port) < 0) + goto cleanup; + } else { + if (!(STRPREFIX(uri_in, "tcp://"))) { + /* not full URI, add prefix tcp:// */ + char *tmp; + if (virAsprintf(&tmp, "tcp://%s", uri_in) < 0) + goto cleanup; + uri = virURIParse(tmp); + VIR_FREE(tmp); + } else { + uri = virURIParse(uri_in); + } + + if (uri == NULL) { + virReportError(VIR_ERR_INVALID_ARG, + _("unable to parse URI: %s"), + uri_in); + goto cleanup; + } + + if (uri->server == NULL) { + virReportError(VIR_ERR_INVALID_ARG, + _("missing host in migration URI: %s"), + uri_in); + goto cleanup; + } else { + hostname = uri->server; + } + + if (uri->port == 0) { + if (virPortAllocatorAcquire(driver->migrationPorts, &port) < 0) + goto cleanup; + + } else { + port = uri->port; + } + + if (virAsprintf(uri_out, "tcp://%s:%d", hostname, port) < 0) + goto cleanup; + } + + snprintf(portstr, sizeof(portstr), "%d", port); + + if (virNetSocketNewListenTCP(hostname, portstr, &socks, &nsocks) < 0) { + virReportError(VIR_ERR_OPERATION_FAILED, "%s", + _("Fail to create socket for incoming migration")); + goto cleanup; + } + + if (VIR_ALLOC(args) < 0) + goto cleanup; + + args->conn = dconn; + args->vm = vm; + args->socks = socks; + args->nsocks = nsocks; + + for (i = 0; i < nsocks; i++) { + if (virNetSocketSetBlocking(socks[i], true) < 0) + continue; + + if (virNetSocketListen(socks[i], 1) < 0) + continue; + + if (virNetSocketAddIOCallback(socks[i], + 0, + libxlDoMigrateReceive, + args, + NULL) < 0) { + continue; + } + + virNetSocketUpdateIOCallback(socks[i], VIR_EVENT_HANDLE_READABLE); + nsocks_listen++; + } + + if (!nsocks_listen) + goto cleanup; + + ret = 0; + goto done; + + cleanup: + for (i = 0; i < nsocks; i++) { + virNetSocketClose(socks[i]); + virObjectUnref(socks[i]); + } + VIR_FREE(socks); + + done: + virURIFree(uri); + if (vm) + virObjectUnlock(vm); + return ret; +} + +int +libxlDomainMigrationPerform(libxlDriverPrivatePtr driver, + virDomainObjPtr vm, + const char *dom_xml ATTRIBUTE_UNUSED, + const char *dconnuri ATTRIBUTE_UNUSED, + const char *uri_str, + const char *dname ATTRIBUTE_UNUSED, + unsigned int flags) +{ + char *hostname = NULL; + unsigned short port = 0; + char portstr[100]; + virURIPtr uri = NULL; + virNetSocketPtr sock; + int sockfd = -1; + int saved_errno = EINVAL; + int ret = -1; + + /* parse dst host:port from uri */ + uri = virURIParse(uri_str); + if (uri == NULL || uri->server == NULL || uri->port == 0) + goto cleanup; + + hostname = uri->server; + port = uri->port; + snprintf(portstr, sizeof(portstr), "%d", port); + + /* socket connect to dst host:port */ + if (virNetSocketNewConnectTCP(hostname, portstr, &sock) < 0) { + virReportSystemError(saved_errno, + _("unable to connect to '%s:%s'"), + hostname, portstr); + goto cleanup; + } + + if (virNetSocketSetBlocking(sock, true) < 0) { + virObjectUnref(sock); + goto cleanup; + } + + sockfd = virNetSocketDupFD(sock, true); + virObjectUnref(sock); + + /* suspend vm and send saved data to dst through socket fd */ + virObjectUnlock(vm); + ret = libxlDoMigrateSend(driver, vm, flags, sockfd); + virObjectLock(vm); + + cleanup: + VIR_FORCE_CLOSE(sockfd); + virURIFree(uri); + return ret; +} + +virDomainPtr +libxlDomainMigrationFinish(virConnectPtr dconn, + virDomainObjPtr vm, + unsigned int flags, + int cancelled) +{ + libxlDriverPrivatePtr driver = dconn->privateData; + libxlDriverConfigPtr cfg = libxlDriverConfigGet(driver); + libxlDomainObjPrivatePtr priv = vm->privateData; + virObjectEventPtr event = NULL; + virDomainPtr dom = NULL; + + virPortAllocatorRelease(driver->migrationPorts, priv->migrationPort); + priv->migrationPort = 0; + + if (cancelled) + goto cleanup; + + if (!(flags & VIR_MIGRATE_PAUSED)) { + if (libxl_domain_unpause(priv->ctx, vm->def->id) != 0) { + virReportError(VIR_ERR_OPERATION_FAILED, "%s", + _("Failed to unpause domain")); + goto cleanup; + } + + virDomainObjSetState(vm, VIR_DOMAIN_RUNNING, + VIR_DOMAIN_RUNNING_MIGRATED); + event = virDomainEventLifecycleNewFromObj(vm, + VIR_DOMAIN_EVENT_RESUMED, + VIR_DOMAIN_EVENT_RESUMED_MIGRATED); + } else { + virDomainObjSetState(vm, VIR_DOMAIN_PAUSED, VIR_DOMAIN_PAUSED_USER); + event = virDomainEventLifecycleNewFromObj(vm, + VIR_DOMAIN_EVENT_SUSPENDED, + VIR_DOMAIN_EVENT_SUSPENDED_PAUSED); + } + + if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm) < 0) + goto cleanup; + + dom = virGetDomain(dconn, vm->def->name, vm->def->uuid); + + if (dom == NULL) { + libxl_domain_destroy(priv->ctx, vm->def->id, NULL); + libxlDomainCleanup(driver, vm, VIR_DOMAIN_SHUTOFF_FAILED); + event = virDomainEventLifecycleNewFromObj(vm, VIR_DOMAIN_EVENT_STOPPED, + VIR_DOMAIN_EVENT_STOPPED_FAILED); + libxlDomainEventQueue(driver, event); + } + + cleanup: + if (event) + libxlDomainEventQueue(driver, event); + if (vm) + virObjectUnlock(vm); + virObjectUnref(cfg); + return dom; +} + +int +libxlDomainMigrationConfirm(libxlDriverPrivatePtr driver, + virDomainObjPtr vm, + unsigned int flags, + int cancelled) +{ + libxlDriverConfigPtr cfg = libxlDriverConfigGet(driver); + libxlDomainObjPrivatePtr priv = vm->privateData; + virObjectEventPtr event = NULL; + int ret = -1; + + if (cancelled) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("migration failed, attempting to resume on source host")); + if (libxl_domain_resume(priv->ctx, vm->def->id, 1, 0) == 0) { + ret = 0; + } else { + VIR_DEBUG("Unable to resume domain '%s' after failed migration", + vm->def->name); + virDomainObjSetState(vm, VIR_DOMAIN_PAUSED, + VIR_DOMAIN_PAUSED_MIGRATION); + event = virDomainEventLifecycleNewFromObj(vm, VIR_DOMAIN_EVENT_SUSPENDED, + VIR_DOMAIN_EVENT_SUSPENDED_MIGRATED); + ignore_value(virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm)); + } + goto cleanup; + } + + libxl_domain_destroy(priv->ctx, vm->def->id, NULL); + libxlDomainCleanup(driver, vm, VIR_DOMAIN_SHUTOFF_MIGRATED); + event = virDomainEventLifecycleNewFromObj(vm, VIR_DOMAIN_EVENT_STOPPED, + VIR_DOMAIN_EVENT_STOPPED_MIGRATED); + + VIR_DEBUG("Domain '%s' successfully migrated", vm->def->name); + + if (flags & VIR_MIGRATE_UNDEFINE_SOURCE) + virDomainDeleteConfig(cfg->configDir, cfg->autostartDir, vm); + + if (!vm->persistent || (flags & VIR_MIGRATE_UNDEFINE_SOURCE)) + virDomainObjListRemove(driver->domains, vm); + + ret = 0; + + cleanup: + if (!libxlDomainObjEndJob(driver, vm)) + vm = NULL; + if (event) + libxlDomainEventQueue(driver, event); + if (vm) + virObjectUnlock(vm); + virObjectUnref(cfg); + return ret; +} diff --git a/src/libxl/libxl_migration.h b/src/libxl/libxl_migration.h new file mode 100644 index 0000000..63d8bdc --- /dev/null +++ b/src/libxl/libxl_migration.h @@ -0,0 +1,78 @@ +/* + * libxl_migration.h: methods for handling migration with libxenlight + * + * Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library. If not, see + * <http://www.gnu.org/licenses/>. + * + * Authors: + * Jim Fehlig <jfehlig(a)suse.com> + */ + +#ifndef LIBXL_MIGRATION_H +# define LIBXL_MIGRATION_H + +# include "libxl_conf.h" + +# define LIBXL_MIGRATION_FLAGS \ + (VIR_MIGRATE_LIVE | \ + VIR_MIGRATE_UNDEFINE_SOURCE | \ + VIR_MIGRATE_PAUSED) + +/* All supported migration parameters and their types. */ +# define LIBXL_MIGRATION_PARAMETERS \ + VIR_MIGRATE_PARAM_URI, VIR_TYPED_PARAM_STRING, \ + VIR_MIGRATE_PARAM_DEST_NAME, VIR_TYPED_PARAM_STRING, \ + VIR_MIGRATE_PARAM_DEST_XML, VIR_TYPED_PARAM_STRING, \ + NULL + +char * +libxlDomainMigrationBegin(virConnectPtr conn, + virDomainObjPtr vm, + const char *xmlin); + +virDomainDefPtr +libxlDomainMigrationPrepareDef(libxlDriverPrivatePtr driver, + const char *dom_xml, + const char *dname); + +int +libxlDomainMigrationPrepare(virConnectPtr dconn, + virDomainDefPtr def, + const char *uri_in, + char **uri_out); + +int +libxlDomainMigrationPerform(libxlDriverPrivatePtr driver, + virDomainObjPtr vm, + const char *dom_xml, + const char *dconnuri, + const char *uri_str, + const char *dname, + unsigned int flags); + +virDomainPtr +libxlDomainMigrationFinish(virConnectPtr dconn, + virDomainObjPtr vm, + unsigned int flags, + int cancelled); + +int +libxlDomainMigrationConfirm(libxlDriverPrivatePtr driver, + virDomainObjPtr vm, + unsigned int flags, + int cancelled); + +#endif /* LIBXL_DRIVER_H */ -- 1.8.1.4

1 1

[libvirt] KVM Connection issue
by Vikas Kokare 24 Apr '14

24 Apr '14

We are using Libvirt Java API version 0.5.0 to connect RHEL 5 KVM, and fetch KVM environment attributes. While doing it, we are seeing the following exception: *this function is not supported by the connection driver: qemuGetSchedulerType Stack trace: org.libvirt.ErrorHandler.processError(Unknown Source) org.libvirt.Connect.processError(Unknown Source) org.libvirt.Domain.processError(Unknown Source) org.libvirt.Domain.getSchedulerType(Unknown Source)* The machine that is running the Java code to connect to the KVM is also RHEL 5. Is this related to certain libvirt version mismatch or something not supported?

2 1

[libvirt] [PATCH 1/1] Enable QEMU_CAPS_PCI_MULTIBUS capability for QEMU2.0 forward.
by Li Zhang 24 Apr '14

24 Apr '14

From: Li Zhang <zhlcindy(a)linux.vnet.ibm.com> For QEMU2.0 forward version, it supports PCI multiBUS. Currently, libvirt still disables it which causes an error "Bus 'pci' not found". Signed-off-by: Li Zhang <zhlcindy(a)linux.vnet.ibm.com> --- src/qemu/qemu_capabilities.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 2c8ec10..b49398f 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -3019,6 +3019,9 @@ virQEMUCapsInitQMPMonitor(virQEMUCapsPtr qemuCaps, if (qemuCaps->version >= 1006000) virQEMUCapsSet(qemuCaps, QEMU_CAPS_DEVICE_VIDEO_PRIMARY); + if (qemuCaps->version >= 2000000) + virQEMUCapsSet(qemuCaps, QEMU_CAPS_PCI_MULTIBUS); + if (virQEMUCapsProbeQMPCommands(qemuCaps, mon) < 0) goto cleanup; if (virQEMUCapsProbeQMPEvents(qemuCaps, mon) < 0) -- 1.8.2.1

4 8

[libvirt] [PATCH] docs: document nmdm type console
by Roman Bogorodskiy 24 Apr '14

24 Apr '14

* Add nmdm type device to domain format documnetation * Add a section about nmdm console usage to the bhyve driver documentation --- docs/drvbhyve.html.in | 32 ++++++++++++++++++++++++++++++++ docs/formatdomain.html.in | 29 +++++++++++++++++++++++++++++ 2 files changed, 61 insertions(+) diff --git a/docs/drvbhyve.html.in b/docs/drvbhyve.html.in index 60eee85..0b0e296 100644 --- a/docs/drvbhyve.html.in +++ b/docs/drvbhyve.html.in @@ -79,5 +79,37 @@ in libvirt bhyve driver is yet to be implemented). </domain> </pre> + +<h2><a name="usage">Guest usage / management</a></h2> + +<h3><a name="console">Connecting to a guest console</a></h3> + +<p> +Guest console connection is supported through the <code>nmdm</code> device. It could be enabled by adding +the following to the domain XML (<span class="since">Since 1.2.4</span>): +</p> + +<pre> + ... + <devices> + <serial type="nmdm"> + <source master="/dev/nmdm0A" slave="/dev/nmdm0B"/> + </serial> + </devices> + ...</pre> + +<p> +Then <code>virsh console</code> command can be used to connect to the text console +of a guest.</p> + +<p><b>NB:</b> Some versions of bhyve have a bug that prevents guests from booting +until the console is opened by a client. This bug was fixed in FreeBSD +<a href="http://svnweb.freebsd.org/changeset/base/262884">r262884</a>. If +an older version is used, one either have to open a console manually with <code>virsh console</code> +to let a guest boot or start a guest using:</p> + +<pre>start --console domname</pre> + + </body> </html> diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index e851f85..a937e42 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -4721,6 +4721,35 @@ qemu-kvm -net nic,model=? /dev/null </devices> ...</pre> + <h6><a name="elementsNmdm">Nmdm device</a></h6> + + <p> + The nmdm device driver, available on FreeBSD, provides two + tty devices connected together by a virual null modem cable. + <span class="since">Since 1.2.4</span> + </p> + +<pre> + ... + <devices> + <serial type="nmdm"> + <source master="/dev/nmdm0A" slave="/dev/nmdm0B"/> + </serial> + </devices> + ...</pre> + + <p> + The <code>source</code> element has these attributes: + </p> + + <dl> + <dt><code>master</code></dt> + <dd>Master device of the pair, that is passed to the hypervisor.</dd> + + <dt><code>slave</code></dt> + <dd>Slave device of the pair, that is passed to the clients for connection + to the guest console.</dd> + </dl> <h4><a name="elementsSound">Sound devices</a></h4> -- 1.9.0

2 2

[libvirt] [PATCH v3] qemu: don't check for backing chains for formats w/o snapshot support
by Martin Kletzander 24 Apr '14

24 Apr '14

Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1019926 Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=868673 Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- Notes: v3: - rebased on current master and this time it doesn't break startupPolicy for RAW disks v2: - smaller and cleaner variant of v1 [1] after discussion with Eric [1] https://www.redhat.com/archives/libvir-list/2014-April/msg00716.html src/qemu/qemu_domain.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index bb9cb6b..ab19738 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -2268,8 +2268,18 @@ qemuDomainCheckDiskPresence(virQEMUDriverPtr driver, VIR_DEBUG("Checking for disk presence"); for (i = vm->def->ndisks; i > 0; i--) { disk = vm->def->disks[i - 1]; + const char *path = virDomainDiskGetSource(disk); + enum virStorageFileFormat format = virDomainDiskGetFormat(disk); - if (!virDomainDiskGetSource(disk)) + if (!path) + continue; + + /* There is no need to check the backing chain for disks + * without backing support, the fact that the file exists is + * more than enough */ + if (format >= VIR_STORAGE_FILE_NONE && + format < VIR_STORAGE_FILE_BACKING && + virFileExists(path)) continue; if (qemuDomainDetermineDiskChain(driver, vm, disk, false) >= 0 && -- 1.9.2

2 2

[libvirt] [PATCHv2 0/6] Utility functions for storing uninstalled location
by Nehal J Wani 24 Apr '14

24 Apr '14

When libvirtd is run from a build directory without being installed, it should not depend on files from a libvirt package installed in the system. Currently, APIs defined in src/ don't know whether libvirtd is being run from the build dir or the installed dir. The following additions provide the functionality to do so: virSetUninstalledDir virGetUninstalledDir Example usage (utility = lxc|iohelper): char *path_tmp = virGetUninstalledDir(); if (path_tmp) /* do stuff with ("%s/../../src/libvirt_<utility>", path_tmp) */ else /* do stuff with (LIBEXECDIR "/libvirt_<utility>") */ v1: Refer: https://www.redhat.com/archives/libvir-list/2014-March/msg01427.html Nehal J Wani (6): Add utility functions for storing uninstalled location Use virGetUninstalledDir() in src/util/virfile.c Use virGetUninstalledDir() in src/lxc/lxc_conf.c Use virGetUninstalledDir() in src/storage/storage_backend_disk.c Use virGetUninstalledDir() in src/fdstream.c Remove obsolete function virFDStreamSetIOHelper()

3 19

[libvirt] [PATCH 0/4] Publish disk backing chains in domain XML
by Jiri Denemark 24 Apr '14

24 Apr '14

This series depends on Peter's "Get rid of virStorageFileMetadata" sent about 10 hours ago. Jiri Denemark (4): conf: Output disk backing store details in domain XML conf: Format and parse backing chains in domain XML tests: More output options for xml2xml tests tests: Test backing store XML formatting and parsing docs/formatdomain.html.in | 59 ++++++++++ docs/schemas/domaincommon.rng | 48 +++++++- src/conf/domain_conf.c | 128 +++++++++++++++++++++ tests/domainschemadata/backing-chains.xml | 94 +++++++++++++++ .../qemuxml2argv-disk-backing-chains.xml | 94 +++++++++++++++ .../qemuxml2argvdata/qemuxml2argv-disk-mirror.xml | 4 + .../qemuxml2argv-seclabel-static-labelskip.xml | 1 + .../qemuxml2xmlout-disk-backing-chains-active.xml | 96 ++++++++++++++++ ...qemuxml2xmlout-disk-backing-chains-inactive.xml | 59 ++++++++++ tests/qemuxml2xmltest.c | 46 ++++++-- tests/sexpr2xmldata/sexpr2xml-boot-grub.xml | 1 + tests/sexpr2xmldata/sexpr2xml-bridge-ipaddr.xml | 1 + tests/sexpr2xmldata/sexpr2xml-curmem.xml | 1 + .../sexpr2xml-disk-block-shareable.xml | 1 + tests/sexpr2xmldata/sexpr2xml-disk-block.xml | 1 + .../sexpr2xml-disk-drv-blktap-qcow.xml | 1 + .../sexpr2xml-disk-drv-blktap-raw.xml | 1 + .../sexpr2xml-disk-drv-blktap2-raw.xml | 1 + tests/sexpr2xmldata/sexpr2xml-disk-file.xml | 1 + tests/sexpr2xmldata/sexpr2xml-fv-autoport.xml | 2 + tests/sexpr2xmldata/sexpr2xml-fv-empty-kernel.xml | 2 + tests/sexpr2xmldata/sexpr2xml-fv-force-hpet.xml | 2 + tests/sexpr2xmldata/sexpr2xml-fv-force-nohpet.xml | 2 + tests/sexpr2xmldata/sexpr2xml-fv-kernel.xml | 1 + tests/sexpr2xmldata/sexpr2xml-fv-legacy-vfb.xml | 1 + tests/sexpr2xmldata/sexpr2xml-fv-localtime.xml | 2 + tests/sexpr2xmldata/sexpr2xml-fv-net-ioemu.xml | 2 + tests/sexpr2xmldata/sexpr2xml-fv-net-netfront.xml | 2 + tests/sexpr2xmldata/sexpr2xml-fv-parallel-tcp.xml | 2 + .../sexpr2xml-fv-serial-dev-2-ports.xml | 2 + .../sexpr2xml-fv-serial-dev-2nd-port.xml | 2 + tests/sexpr2xmldata/sexpr2xml-fv-serial-file.xml | 2 + tests/sexpr2xmldata/sexpr2xml-fv-serial-null.xml | 2 + tests/sexpr2xmldata/sexpr2xml-fv-serial-pipe.xml | 2 + tests/sexpr2xmldata/sexpr2xml-fv-serial-pty.xml | 2 + tests/sexpr2xmldata/sexpr2xml-fv-serial-stdio.xml | 2 + .../sexpr2xml-fv-serial-tcp-telnet.xml | 2 + tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp.xml | 2 + tests/sexpr2xmldata/sexpr2xml-fv-serial-udp.xml | 2 + tests/sexpr2xmldata/sexpr2xml-fv-serial-unix.xml | 2 + tests/sexpr2xmldata/sexpr2xml-fv-sound-all.xml | 2 + tests/sexpr2xmldata/sexpr2xml-fv-sound.xml | 2 + tests/sexpr2xmldata/sexpr2xml-fv-usbmouse.xml | 2 + tests/sexpr2xmldata/sexpr2xml-fv-usbtablet.xml | 2 + tests/sexpr2xmldata/sexpr2xml-fv-utc.xml | 2 + tests/sexpr2xmldata/sexpr2xml-fv-v2.xml | 2 + tests/sexpr2xmldata/sexpr2xml-fv.xml | 2 + tests/sexpr2xmldata/sexpr2xml-net-bridged.xml | 1 + tests/sexpr2xmldata/sexpr2xml-net-e1000.xml | 1 + tests/sexpr2xmldata/sexpr2xml-net-routed.xml | 1 + tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.xml | 2 + tests/sexpr2xmldata/sexpr2xml-pci-devs.xml | 1 + .../sexpr2xml-pv-bootloader-cmdline.xml | 1 + tests/sexpr2xmldata/sexpr2xml-pv-bootloader.xml | 1 + tests/sexpr2xmldata/sexpr2xml-pv-localtime.xml | 1 + tests/sexpr2xmldata/sexpr2xml-pv-vcpus.xml | 1 + .../sexpr2xml-pv-vfb-new-vncdisplay.xml | 1 + tests/sexpr2xmldata/sexpr2xml-pv-vfb-new.xml | 1 + tests/sexpr2xmldata/sexpr2xml-pv-vfb-orig.xml | 1 + .../sexpr2xmldata/sexpr2xml-pv-vfb-type-crash.xml | 1 + tests/sexpr2xmldata/sexpr2xml-pv.xml | 1 + 61 files changed, 691 insertions(+), 16 deletions(-) create mode 100644 tests/domainschemadata/backing-chains.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-backing-chains.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-backing-chains-active.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-backing-chains-inactive.xml -- 1.9.2

2 9

[libvirt] [PATCH v2] qemu: don't check for backing chains for formats w/o snapshot support
by Martin Kletzander 24 Apr '14

24 Apr '14

Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1019926 Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=868673 Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- Notes: Smaller and cleaner variant of v1 [1] after discussion with Eric [1] https://www.redhat.com/archives/libvir-list/2014-April/msg00716.html src/qemu/qemu_domain.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 45ed872..5687075 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -2268,11 +2268,14 @@ qemuDomainCheckDiskPresence(virQEMUDriverPtr driver, VIR_DEBUG("Checking for disk presence"); for (i = vm->def->ndisks; i > 0; i--) { disk = vm->def->disks[i - 1]; + enum virStorageFileFormat format = virDomainDiskGetFormat(disk); if (!virDomainDiskGetSource(disk)) continue; - if (qemuDomainDetermineDiskChain(driver, vm, disk, false) >= 0 && + if ((format < VIR_STORAGE_FILE_NONE || + format >= VIR_STORAGE_FILE_BACKING) && + qemuDomainDetermineDiskChain(driver, vm, disk, false) >= 0 && qemuDiskChainCheckBroken(disk) >= 0) continue; -- 1.9.2

2 2

[libvirt] [PATCH 00/18] Get rid of virStorageFileMetadata
by Peter Krempa 24 Apr '14

24 Apr '14

Peter Krempa (18): qemu: unexport qemuDiskChainCheckBroken util: storagefile: Always store raw backing name in the metadata util: storage: Don't force path canonicalization when loading metadata util: storage: Remove obsolete argument virStorageFileGetMetadataInternal util: storage: Move checking of the actual backing image to the worker storage: util: Clean up arguments of virStorageFileGetMetadataInternal util: storage: Rename "path" to "relPath" in virStorageFileMetadata util: storagefile: Rename "canonPath" to "path" in virStorageFileMetadata util: virstoragefile: Don't use "backingStore" directly virstoragefile: Kill "backingStore" field from virStorageFileMetadata util: storagefile: Add function to free a virStorageSourcePrt util: storagefile: Add fields from virStorageMetadata to virStorageSource maint: Switch over from struct virStorageFileMetadata to virStorageSource util: virstorage: Kill struct virStorageFileMetadata util: virstoragefile: Rename backingMeta to backingStore storage: Move disk->backingChain to the recursive disk->src.backingStore util: virstoragefile: Don't mangle data stored about directories util: storage: Invert the way recursive metadata retrieval works src/conf/domain_conf.c | 17 +- src/conf/domain_conf.h | 1 - src/libvirt_private.syms | 2 +- src/qemu/qemu_domain.c | 58 ++--- src/qemu/qemu_domain.h | 2 - src/qemu/qemu_driver.c | 44 ++-- src/security/security_selinux.c | 2 +- src/security/virt-aa-helper.c | 9 +- src/storage/storage_backend_fs.c | 4 +- src/storage/storage_backend_gluster.c | 4 +- src/util/virstoragefile.c | 476 ++++++++++++++++------------------ src/util/virstoragefile.h | 88 +++---- tests/virstoragetest.c | 178 ++++++++----- 13 files changed, 435 insertions(+), 450 deletions(-) -- 1.9.1

2 46

[libvirt] KVM connection issue
by Vikas Kokare 24 Apr '14

24 Apr '14

We are using Libvirt Java API version 0.5.0 to connect RHEL 5 KVM, and fetch KVM environment attributes. While doing it, we are seeing the following exception: *this function is not supported by the connection driver: qemuGetSchedulerTypeStack trace: org.libvirt.ErrorHandler.processError(Unknown Source) org.libvirt.Connect.processError(Unknown Source) org.libvirt.Domain.processError(Unknown Source) org.libvirt.Domain.getSchedulerType(Unknown Source)* The machine that is running the Java code to connect to the KVM is also RHEL 5. Is this related to certain libvirt version mismatch or something not supported? -Vikas

1 0

[libvirt] [PATCHv2 1/1] Set pci-ohci as the USB default controller for PPC64.
by Li Zhang 24 Apr '14

24 Apr '14

From: Li Zhang <zhlcindy(a)linux.vnet.ibm.com> PPC64 prefers to set pci-ohci controller as default USB controller. Currently, libvirt is using legacy USB controller as default. There are problems with VGA which can't work correctly with USB Keyboard and USB Mouse. While providing -nodefaults, ppc64 should be specifying the usb controller explicitly in place of using the legacy controller(-usb). Qemu spapr initialization code when sees "-usb" adds a USB Keyboard and USB Mouse by default. And libvirt has added a USB keyboard and USB mouse. A recent fix in the in qemu VGA code uncoverd this problem, which resulted in addition of extra keyboard and mouse to the qemu machine. This patch is to set pci-ohci as USB default controller. Signed-off-by: Li Zhang <zhlcindy(a)linux.vnet.ibm.com> --- v2 -> v1: * Rephrase the commit message. (Nikunj A Dadhania) src/qemu/qemu_command.c | 5 +++-- tests/qemuxml2argvdata/qemuxml2argv-pseries-usb-default.args | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 379c094..46e851a 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -8466,8 +8466,9 @@ qemuBuildCommandLine(virConnectPtr conn, } else if (cont->type == VIR_DOMAIN_CONTROLLER_TYPE_USB && cont->model == -1 && !qemuDomainMachineIsQ35(def) && - (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_PIIX3_USB_UHCI) || - def->os.arch == VIR_ARCH_PPC64)) { + (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_PIIX3_USB_UHCI) || + (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_PCI_OHCI) && + def->os.arch == VIR_ARCH_PPC64))) { if (usblegacy) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("Multiple legacy USB controllers are " diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-usb-default.args b/tests/qemuxml2argvdata/qemuxml2argv-pseries-usb-default.args index 3a21b76..eac7c56 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-pseries-usb-default.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-pseries-usb-default.args @@ -3,5 +3,5 @@ LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -nographic -nodefconfig -nodefaults \ -chardev socket,id=charmonitor,path=/tmp/test-monitor,server,nowait \ -mon chardev=charmonitor,id=monitor,mode=readline -no-acpi -boot c \ --usb -chardev pty,id=charserial0 \ +-device pci-ohci,id=usb,bus=pci,addr=0x1 -chardev pty,id=charserial0 \ -device spapr-vty,chardev=charserial0,reg=0x30000000 -- 1.8.2.1

2 3

[libvirt] [PATCH] Qemu fails to restore when guest has selinux static context
by Shivaprasad G Bhat 23 Apr '14

23 Apr '14

The file handle passed from libvirt to qemu is not set to the context of the guest. So, set the selinux context of fd before passing it to qemu Signed-off-by: Shivaprasad G Bhat<sbhat(a)linux.vnet.ibm.com> --- src/qemu/qemu_driver.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 4bb4819..8cf3666 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -5522,6 +5522,9 @@ qemuDomainRestoreFlags(virConnectPtr conn, goto cleanup; def = NULL; + if (virSecurityManagerSetImageFDLabel(driver->securityManager, vm->def, fd) < 0) + goto cleanup; + if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_MODIFY) < 0) goto cleanup;

3 2

[libvirt] [PATCH] Fix pci bus naming for PPC
by Daniel P. Berrange 23 Apr '14

23 Apr '14

Recent discussions around naming of 'pci' vs 'pci.0' for PPC made me go back and look at the PPC emulator in every historical version of QEMU since 1.0. The results were worse than I imagined. This patch adds the logic required to make libvirt work with PPC correctly with naming variations across all versions & machine types. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- src/qemu/qemu_capabilities.c | 80 +++++++++++++++++++++++++++++++++++++++----- src/qemu/qemu_capabilities.h | 3 ++ src/qemu/qemu_command.c | 2 +- 3 files changed, 75 insertions(+), 10 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index a5c6879..b491f58 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -1928,6 +1928,56 @@ virQEMUCapsGet(virQEMUCapsPtr qemuCaps, } +bool virQEMUCapsHasPCIMultiBus(virQEMUCapsPtr qemuCaps, + virDomainDefPtr def) +{ + bool hasMultiBus = virQEMUCapsGet(qemuCaps, QEMU_CAPS_PCI_MULTIBUS); + + if (hasMultiBus) + return true; + + if (def->os.arch == VIR_ARCH_PPC || + def->os.arch == VIR_ARCH_PPC64) { + /* + * Usage of pci.0 naming: + * + * ref405ep: no pci + * taihu: no pci + * bamboo: 1.1.0 + * mac99: 2.0.0 + * g3beige: 2.0.0 + * prep: 1.4.0 + * pseries: 2.0.0 + * mpc8544ds: forever + * virtex-m507: no pci + * ppce500: 1.6.0 + */ + + if (qemuCaps->version >= 2000000) + return true; + + if (qemuCaps->version >= 1006000 && + STREQ(def->os.machine, "ppce500")) + return true; + + if (qemuCaps->version >= 1004000 && + STREQ(def->os.machine, "prep")) + return true; + + if (qemuCaps->version >= 1001000 && + STREQ(def->os.machine, "bamboo")) + return true; + + if (STREQ(def->os.machine, "mpc8544ds")) + return true; + + return false; + } + + return false; +} + + const char *virQEMUCapsGetBinary(virQEMUCapsPtr qemuCaps) { return qemuCaps->binary; @@ -2809,15 +2859,22 @@ virQEMUCapsInitHelp(virQEMUCapsPtr qemuCaps, uid_t runUid, gid_t runGid) false) < 0) goto cleanup; - /* Currently only x86_64 and i686 support PCI-multibus. */ + /* x86_64 and i686 support PCI-multibus on all machine types + * since forever. For other architectures, it has been changing + * across releases, per machine type, so we can't simply detect + * it here. Thus the rest of the logic is provided in a separate + * helper virQEMUCapsHasPCIMultiBus() which keys off the machine + * stored in virDomainDef and QEMU version number + */ if (qemuCaps->arch == VIR_ARCH_X86_64 || - qemuCaps->arch == VIR_ARCH_I686) { + qemuCaps->arch == VIR_ARCH_I686) virQEMUCapsSet(qemuCaps, QEMU_CAPS_PCI_MULTIBUS); - } else { - /* -no-acpi is not supported on other archs - * even if qemu reports it in -help */ + + /* -no-acpi is not supported on non-x86 + * even if qemu reports it in -help */ + if (qemuCaps->arch != VIR_ARCH_X86_64 && + qemuCaps->arch != VIR_ARCH_I686) virQEMUCapsClear(qemuCaps, QEMU_CAPS_NO_ACPI); - } /* virQEMUCapsExtractDeviceStr will only set additional caps if qemu * understands the 0.13.0+ notion of "-device driver,". */ @@ -2934,9 +2991,14 @@ virQEMUCapsInitArchQMPBasic(virQEMUCapsPtr qemuCaps, goto cleanup; } - /* - * Currently only x86_64 and i686 support PCI-multibus, - * -no-acpi and -no-kvm-pit-reinjection. + /* x86_64 and i686 support PCI-multibus on all machine types + * since forever. For other architectures, it has been changing + * across releases, per machine type, so we can't simply detect + * it here. Thus the rest of the logic is provided in a separate + * helper virQEMUCapsHasPCIMultiBus() which keys off the machine + * stored in virDomainDef and QEMU version number + * + * ACPI/HPET/KVM PIT are also x86 specific */ if (qemuCaps->arch == VIR_ARCH_X86_64 || qemuCaps->arch == VIR_ARCH_I686) { diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index df8c978..5c63b81 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -239,6 +239,9 @@ void virQEMUCapsClear(virQEMUCapsPtr qemuCaps, bool virQEMUCapsGet(virQEMUCapsPtr qemuCaps, enum virQEMUCapsFlags flag); +bool virQEMUCapsHasPCIMultiBus(virQEMUCapsPtr qemuCaps, + virDomainDefPtr def); + char *virQEMUCapsFlagsString(virQEMUCapsPtr qemuCaps); const char *virQEMUCapsGetBinary(virQEMUCapsPtr qemuCaps); diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 91367ab..403c9a9 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -3076,7 +3076,7 @@ qemuBuildDeviceAddressStr(virBufferPtr buf, goto cleanup; } } else { - if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_PCI_MULTIBUS)) { + if (virQEMUCapsHasPCIMultiBus(qemuCaps, domainDef)) { virBufferAsprintf(buf, ",bus=%s", contAlias); } else { virBufferAddLit(buf, ",bus=pci"); -- 1.9.0

2 1

[libvirt] [PATCH] nwfilter: Validate rule after parsing
by Stefan Berger 23 Apr '14

23 Apr '14

From: Stefan Berger <stefanb(a)linux.vnet.ibm.com> An IP or IPv6 rule with port specification but without protocol specification cannot be instantiated by ebtables. The documentation points to 'protocol' being required but implementation does not enforce it to be given. Implement a rule validation function that checks whether the rule is valid when it is defined. This for example prevents the definition of rules like: <ip dstportstart='53'> where a protocol attribute would be required for it to be valid and for ebtables to be able to instantiate it. A valid rule then is: <ip protocol='udp' dstportstart='53'> Signed-off-by: Stefan Berger <stefanb(a)linux.vnet.ibm.com> --- src/conf/nwfilter_conf.c | 59 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) diff --git a/src/conf/nwfilter_conf.c b/src/conf/nwfilter_conf.c index f5a75e4..ce7bc78 100644 --- a/src/conf/nwfilter_conf.c +++ b/src/conf/nwfilter_conf.c @@ -2093,6 +2093,63 @@ virNWFilterRuleDefFixupIPSet(ipHdrDataDefPtr ipHdr) } } + +/* + * virNWFilterRuleValidate + * + * Perform some basic rule validation to prevent rules from being + * defined that cannot be instantiated. + */ +static int +virNWFilterRuleValidate(virNWFilterRuleDefPtr rule) +{ + int ret = 0; + portDataDefPtr portData = NULL; + const char *protocol; + + switch (rule->prtclType) { + case VIR_NWFILTER_RULE_PROTOCOL_IP: + portData = &rule->p.ipHdrFilter.portData; + protocol = "IP"; + /* fall through */ + case VIR_NWFILTER_RULE_PROTOCOL_IPV6: + if (portData == NULL) { + portData = &rule->p.ipv6HdrFilter.portData; + protocol = "IPv6"; + } + if (HAS_ENTRY_ITEM(&portData->dataSrcPortStart) || + HAS_ENTRY_ITEM(&portData->dataDstPortStart) || + HAS_ENTRY_ITEM(&portData->dataSrcPortEnd) || + HAS_ENTRY_ITEM(&portData->dataDstPortEnd)) { + if (HAS_ENTRY_ITEM(&rule->p.ipHdrFilter.ipHdr.dataProtocolID)) { + switch (rule->p.ipHdrFilter.ipHdr.dataProtocolID.u.u8) { + case 6: /* tcp */ + case 17: /* udp */ + case 33: /* dccp */ + case 132: /* sctp */ + break; + default: + ret = -1; + } + } else { + ret = -1; + } + if (ret < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("%s rule with port specification requires " + "protocol specification with protocol to be " + "either one of tcp(6), udp(17), dccp(33), or " + "sctp(132)"), protocol); + } + } + break; + default: + break; + } + + return ret; +} + static void virNWFilterRuleDefFixup(virNWFilterRuleDefPtr rule) { @@ -2389,6 +2446,8 @@ virNWFilterRuleParse(xmlNodePtr node) virAttr[i].att) < 0) { goto err_exit; } + if (virNWFilterRuleValidate(ret) < 0) + goto err_exit; break; } if (!found) { -- 1.8.1.4

2 1

[libvirt] [PATCHv2 0/7] more of round 2 of virstoragefile refactoring
by Eric Blake 23 Apr '14

23 Apr '14

compared to v1, this is rebased on top of Cole's changes, treats disk partition types slightly differently, and adds a couple patches. 1/7: was 16/n, unreviewed so far 2/7: was 13/n with weak ack 3-4/7: was 14-15/n; commit messages improved to justify it further 5-7: all new patches I'm still working on how best to fold virStorageFileMetadata into virStorageSource; it's a bit tricky since the metadata type is rather awkward (storing type information about the backing file in the parent, rather than in the backing file) Eric Blake (7): conf: manage disk source by struct instead of pieces conf: tweak volume target struct details conf: move volume structs to util/ conf: use common struct in storage volumes conf: track sizes directly in source struct conf: drop redundant parameters during probe conf: modify tracking of encrypted images src/conf/domain_conf.c | 139 ++++++++++++------------------ src/conf/domain_conf.h | 24 ++---- src/conf/snapshot_conf.c | 17 +--- src/conf/storage_conf.c | 40 ++++----- src/conf/storage_conf.h | 51 ++--------- src/esx/esx_storage_backend_iscsi.c | 5 +- src/esx/esx_storage_backend_vmfs.c | 20 ++--- src/parallels/parallels_driver.c | 2 +- src/parallels/parallels_storage.c | 22 ++--- src/phyp/phyp_driver.c | 4 +- src/storage/storage_backend.c | 150 +++++++++++++++------------------ src/storage/storage_backend.h | 11 +-- src/storage/storage_backend_disk.c | 26 +++--- src/storage/storage_backend_fs.c | 32 +++---- src/storage/storage_backend_gluster.c | 12 ++- src/storage/storage_backend_logical.c | 18 ++-- src/storage/storage_backend_mpath.c | 8 +- src/storage/storage_backend_rbd.c | 11 +-- src/storage/storage_backend_scsi.c | 6 +- src/storage/storage_backend_sheepdog.c | 10 +-- src/storage/storage_driver.c | 40 ++++----- src/test/test_driver.c | 16 ++-- src/util/virstoragefile.c | 11 ++- src/util/virstoragefile.h | 30 ++++++- src/vbox/vbox_tmpl.c | 11 +-- tests/storagebackendsheepdogtest.c | 5 +- tests/virstoragetest.c | 4 +- 27 files changed, 322 insertions(+), 403 deletions(-) -- 1.9.0

3 18

[libvirt] [PATCH 0/2] Two more setvcpu fixes
by Ján Tomko 23 Apr '14

23 Apr '14

Fix fix fix. Ján Tomko (2): Save domain status after cpu hotplug Document behavior of setvcpus during guest boot src/libvirt.c | 6 ++++++ src/qemu/qemu_driver.c | 3 +++ tools/virsh.pod | 4 +++- 3 files changed, 12 insertions(+), 1 deletion(-) -- 1.8.3.2

2 5

[libvirt] [PATCH] bhyve: bhyveDomainDefineXML fixes
by Roman Bogorodskiy 23 Apr '14

23 Apr '14

- do not loose new definition for an active domain - do not leak oldDef - do not set dom->id if virDomainSaveConfig() fails - do not call virObjectUnlock(vm) if vm is NULL --- src/bhyve/bhyve_driver.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/src/bhyve/bhyve_driver.c b/src/bhyve/bhyve_driver.c index 0cafe4c..6d681fd 100644 --- a/src/bhyve/bhyve_driver.c +++ b/src/bhyve/bhyve_driver.c @@ -472,17 +472,23 @@ bhyveDomainDefineXML(virConnectPtr conn, const char *xml) def = NULL; vm->persistent = 1; + if (virDomainSaveConfig(BHYVE_CONFIG_DIR, + vm->newDef ? vm->newDef : vm->def) < 0) { + virDomainObjListRemove(privconn->domains, vm); + vm = NULL; + goto cleanup; + } + dom = virGetDomain(conn, vm->def->name, vm->def->uuid); if (dom) dom->id = vm->def->id; - if (virDomainSaveConfig(BHYVE_CONFIG_DIR, vm->def) < 0) - goto cleanup; - cleanup: virObjectUnref(caps); virDomainDefFree(def); - virObjectUnlock(vm); + virDomainDefFree(oldDef); + if (vm) + virObjectUnlock(vm); return dom; } -- 1.9.0

2 2

[libvirt] Google Summer of Code and Outreach Program for Women accepted projects
by Stefan Hajnoczi 23 Apr '14

23 Apr '14

Dear QEMU, Libvirt, and KVM communities, We are participating in Google Summer of Code 2014 (http://google-melange.com/) and Outreach Program for Women (http://opw.gnome.org/) Both programs fund candidates to work on our open source projects for 12 weeks this summer. Accepted projects have now been announced: Intel IOMMU (VT-d) Emulation - Candidate: Le Tan Mentor: Jan Kiszka Device driver framework for low-level testing - Candidate: Marc Marí Mentors: Paolo Bonzini and Stefan Hajnoczi Disk image fuzz testing - Candidate: Maria Kustova (maxa) Mentors: Fam Zheng and Stefan Hajnoczi TianoCore support for Apple's boot.efi - Candidate: Reza Jelveh Mentors: Alexander Graf and Gabriel Somlo Continuous vmstate testing and dirty bitmap logging - Candidate: sanidhya Mentor: Juan Quintela Rewriting code of vbox driver for libvirt - Candidate: T A Mahadevan Mentor: Michal Privoznik Libvirt: Job Control for the Storage Driver - Candidate: TuckerD Mentor: Martin Kletzander Applying for the idea rewrite virtual box's driver - Candidate: uaedante Mentor: Michal Privoznik Congratulations to our accepted candidates and welcome to the QEMU, libvirt, and KVM communities! Stefan

1 0

[libvirt] Local storage-migration plus network disks (Ceph RBD)
by Blair Bethwaite 23 Apr '14

23 Apr '14

Hi there, We have a production OpenStack cloud, currently on Qemu 1.0 & 1.5 with Libivrt 1.1.1. We're using local storage with storage-migration when we need to move machines around. Since we built this thing we've noticed that with network storage attached (have seen this with iSCSI and Ceph RBD targets, mainly interested in the latter) the migration moves all of the network disk contents as well, which for any non-toy disk sizes pretty much renders it useless as the migration is then bounded not by the guest memory size and activity but also by the block storage size. E.g., an idle guest with 8GB RAM and a 300GB Ceph RBD attached takes ~3 hours to migrate (over a 20GE network) and we observe balanced TX/RX on both the source and destination, as the source reads blocks from the Ceph cluster, streams them to the destination, and the destination in turn writes them back to the Ceph cluster. Looking in Libvirt's qemu_migration.c code I see qemuMigrationDriveMirror skips shared, RO and source-less disks. But I'm not sure why network disks in general, and in particular RBDs, wouldn't be considered shared for these purposes. From my naive reading the checks in qemuMigrationIsSafe (which explicitly pass NETWORK+RBD) seem to confirm this, at least for RBDs. Is this a bug? -- Cheers, ~Blairo

1 0

[libvirt] [PATCH perl-Sys-Virt] Don't die if snapshots are unsupported
by Mike Latimer 22 Apr '14

22 Apr '14

Many libvirt-tck tests do not explicitly cleanup test domains before exiting. In this case Sys::Virt::TCK->cleanup is triggered, and the environment is reset automatically. During this reset, any existing snapshots are found for deletion through Sys::Virt::Domain->list_snapshots. If the underlying connection driver does not support snapshot functions (such as lxc or libxl), the process dies with the following error: libvirt error code: 3, message: this function is not supported by the connection driver: virDomainSnapshotListNames The best resolution would be to add snapshot support to the driver(s), but as this requires a long term effort, it is better to catch the error and return an empty list of snapshots to the calling function. In the case of libvirt-tck, this allows the cleanup to succeed and subsequent testing to continue normally. --- Domain.pm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) --- a/lib/Sys/Virt/Domain.pm 2014-04-07 04:35:31.000000000 -0600 +++ b/lib/Sys/Virt/Domain.pm 2014-04-21 13:48:22.868956838 -0600 @@ -1416,7 +1416,10 @@ recommended as a more efficient alternat sub list_snapshots { my $self = shift; - my $nnames = $self->num_of_snapshots(); + # If snapshots are not supported by the driver (lxc, libxl...), catch the + # function not supported error and simply return as there are no snapshots + my $nnames = eval { $self->num_of_snapshots() }; + return if($@ =~ /function is not supported/); my @names = $self->list_snapshot_names($nnames); my @snapshots;

2 2

[libvirt] [PATCH] nodeinfo: fix detection of physical memory on uclibc/musl libc
by Natanael Copa 22 Apr '14

22 Apr '14

The gnulib's physmem_total will as a fallback report 64MB as total memory if sysconf(_SC_PHYS_PAGES) is unimplemented on linux. This makes it impossible to detect if physmem_total works or not, so we try first the linux only sysinfo(2) before falling back to gnulibs physmem_total. This makes the total memory be correctly reported on musl libc and uclibc. Signed-off-by: Natanael Copa <ncopa(a)alpinelinux.org> --- configure.ac | 2 +- src/nodeinfo.c | 22 ++++++++++++++++------ 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/configure.ac b/configure.ac index 52c50df..32a2e5a 100644 --- a/configure.ac +++ b/configure.ac @@ -310,7 +310,7 @@ dnl Availability of various common headers (non-fatal if missing). AC_CHECK_HEADERS([pwd.h paths.h regex.h sys/un.h \ sys/poll.h syslog.h mntent.h net/ethernet.h linux/magic.h \ sys/un.h sys/syscall.h sys/sysctl.h netinet/tcp.h ifaddrs.h \ - libtasn1.h sys/ucred.h sys/mount.h]) + libtasn1.h sys/ucred.h sys/mount.h sys/sysinfo.h]) dnl Check whether endian provides handy macros. AC_CHECK_DECLS([htole64], [], [], [[#include <endian.h>]]) diff --git a/src/nodeinfo.c b/src/nodeinfo.c index c88f86c..3c76f54 100644 --- a/src/nodeinfo.c +++ b/src/nodeinfo.c @@ -40,6 +40,10 @@ # include <sys/resource.h> #endif +#if HAVE_SYS_SYSINFO_H +# include <sys/sysinfo.h> +#endif + #include "c-ctype.h" #include "viralloc.h" #include "nodeinfopriv.h" @@ -1041,7 +1045,18 @@ int nodeGetInfo(virNodeInfoPtr nodeinfo) #ifdef __linux__ { int ret = -1; - FILE *cpuinfo = fopen(CPUINFO_PATH, "r"); + FILE *cpuinfo; +#if HAVE_SYS_SYSINFO_H + struct sysinfo si; + + /* Convert to KB. */ + if (sysinfo(&si) == 0) { + nodeinfo->memory = si.totalram / 1024; + } else +#endif + nodeinfo->memory = physmem_total() / 1024; + + cpuinfo = fopen(CPUINFO_PATH, "r"); if (!cpuinfo) { virReportSystemError(errno, _("cannot open %s"), CPUINFO_PATH); @@ -1049,11 +1064,6 @@ int nodeGetInfo(virNodeInfoPtr nodeinfo) } ret = linuxNodeInfoCPUPopulate(cpuinfo, SYSFS_SYSTEM_PATH, nodeinfo); - if (ret < 0) - goto cleanup; - - /* Convert to KB. */ - nodeinfo->memory = physmem_total() / 1024; cleanup: VIR_FORCE_FCLOSE(cpuinfo); -- 1.9.2

3 6

[libvirt] [PATCH 0/3] vcpu fixes
by Ján Tomko 22 Apr '14

22 Apr '14

Ján Tomko (3): Properly free vcpupin info for unplugged CPUs Make virDomainVcpuPinDel return void Fix error for out of range vcpu in qemuDomainPinVcpuFlags src/conf/domain_conf.c | 31 ++----------------------------- src/conf/domain_conf.h | 5 +---- src/libvirt_private.syms | 1 - src/libxl/libxl_driver.c | 7 +------ src/qemu/qemu_driver.c | 22 ++++------------------ 5 files changed, 8 insertions(+), 58 deletions(-) -- 1.8.3.2

2 6

[libvirt] Proper behavior when "creating" a new transient domain with same name/uuid as existing persistent domain
by Laine Stump 22 Apr '14

22 Apr '14

Playing around with the network driver I found that if I net-define a network, then net-create using a slightly modified version of the same XML file (e.g. different bridge name, but same name/uuid) the following will happen: 1) a network of that name is started, it is persistent, and it has the properties from the modified XML file (the one given to net-create). 2) both "net-dumpxml" and "net-dumpxml --inactive" will show the modified attributes. 3) when I net-destroy the network, the network will still exist (since it is still persistent), but will have all of the modified attributes rather than the originals. Wanting the network driver to behave consistently with the qemu driver, I did the same test with a qemu domain. I found exactly the same behavior. I would have expected that when I tried to create a domain (or network) with the same name & UUID as an existing persistent&inactive domain (or network) that one of the following two things would happen: 1) the operation would fail because a persistent domain/network already existed 2) the domain/network would be started with the modified attributes, but the persistent definition would still show the original attributes, which would remain after destroying the transient 3) upon creating the transient version, the domain/network would have its persistent flag cleared, and would thus cease to exist when destroyed. Was the current behavior consciously arrived at, or is it just an accident of circumstances? If the latter, then what should the proper behavior be? (I would vote for (2))

3 3

[libvirt] [PATCH v2] Add support for migration URI configuration
by Chen Fan 22 Apr '14

22 Apr '14

For now, we set the migration URI from command line '--migrate_uri' or construct the URI by looking up the dest host's hostname which could be solved by DNS automatically. But in cases the dest host have two or more NICs to reach, we may need to send the migration data over a specific NIC which is different from the automatically resloved one for some reason like performance, security, etc. thus we must explicitly specify the migrateuri in command line everytime, but it is too troublesome if there are many such hosts(and don't forget virt-manager). This patch adds a configuration file option on dest host to save the default migrate uri which explicitly configure which of this host's addresses should be used to transfer, thus user doesn't boring to specify it in command line everytime. Signed-off-by: Chen Fan <chen.fan.fnst(a)cn.fujitsu.com> --- src/qemu/qemu.conf | 5 ++++- src/qemu/qemu_conf.c | 2 ++ src/qemu/qemu_conf.h | 2 ++ src/qemu/qemu_migration.c | 5 +++++ 4 files changed, 13 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu.conf b/src/qemu/qemu.conf index f0e802f..2973631 100644 --- a/src/qemu/qemu.conf +++ b/src/qemu/qemu.conf @@ -449,7 +449,10 @@ # #seccomp_sandbox = 1 - +# Override the URI used for any specific migration URI to be sent. +# Defaults to NULL, will be set to as "tcp://hostIP[:port]". +# +#migrate_uri = "tcp://hostIP:port" # Override the listen address for all incoming migrations. Defaults to # 0.0.0.0, or :: if both host and qemu are capable of IPv6. diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index 198ee2f..0bd943d 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -576,6 +576,8 @@ int virQEMUDriverConfigLoadFile(virQEMUDriverConfigPtr cfg, GET_VALUE_STR("migration_address", cfg->migrationAddress); + GET_VALUE_STR("migrate_uri", cfg->migrateUri); + ret = 0; cleanup: diff --git a/src/qemu/qemu_conf.h b/src/qemu/qemu_conf.h index a36ea63..2e45421 100644 --- a/src/qemu/qemu_conf.h +++ b/src/qemu/qemu_conf.h @@ -167,6 +167,8 @@ struct _virQEMUDriverConfig { char *migrationAddress; int migrationPortMin; int migrationPortMax; + + char *migrateUri; }; /* Main driver state */ diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 593d2d3..ab64c58 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -2639,6 +2639,7 @@ qemuMigrationPrepareDirect(virQEMUDriverPtr driver, int ret = -1; virURIPtr uri = NULL; bool well_formed_uri = true; + virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver); VIR_DEBUG("driver=%p, dconn=%p, cookiein=%s, cookieinlen=%d, " "cookieout=%p, cookieoutlen=%p, uri_in=%s, uri_out=%p, " @@ -2649,6 +2650,10 @@ qemuMigrationPrepareDirect(virQEMUDriverPtr driver, *uri_out = NULL; + if (uri_in == NULL && cfg->migrateUri) { + uri_in = cfg->migrateUri; + } + /* The URI passed in may be NULL or a string "tcp://somehostname:port". * * If the URI passed in is NULL then we allocate a port number -- 1.8.1.4

2 1

[libvirt] [test-API][PATCH V2 0/2] Add case for setSchedulerParametersFlag API
by Xuesong Zhang 22 Apr '14

22 Apr '14

V1->V2: Delete the symbol '\' at the end of lines. Update the domian stats to "libvirt.VIR_DOMAIN_RUNNING" and "libvirt.VIR_DOMAIN_SHUTOFF", instead of the static value. Delete the scenario without flags in file shed_parms.conf V1: Add test case for setSchedulerParametersFlags related API Add conf file of setSchedulerParametersFlags test Xuesong Zhang (2): Add new cases for testing setSchedulerParametersFlags related API Add scenario conf file for testing setSchedulerParametersFlags related API cases/sched_params.conf | 106 ++++++++++++++++++++++++++ repos/domain/sched_params_flag.py | 155 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 261 insertions(+) create mode 100755 cases/sched_params.conf create mode 100755 repos/domain/sched_params_flag.py -- 1.8.3.1

1 2

[libvirt] libvirt-libxl driver defaulting to tap disk and not working (ubuntu 12.10 + xen 4.5 + libvirt 1.2.3 + openstack)
by Tian, Shuangtai 22 Apr '14

22 Apr '14

HI I am an openstacker, when I used the latest libvirt and xen code to run the openstack. Can not create the vm. there is an error in libxl log, you can see the log: Os : Ubuntu 12.10 Compiled against library: libvirt 1.2.3 Using library: libvirt 1.2.3 Using API: Xen 1.2.3 Running hypervisor: Xen 4.5.0 libxl: debug: libxl_create.c:1356:do_domain_create: ao 0x7f7894002810: create: how=(nil) callback=(nil) poller=0x7f7894001bb0 libxl: debug: libxl_device.c:251:libxl__device_disk_set_backend: Disk vdev=xvda spec.backend=tap libxl: debug: libxl_device.c:210:disk_try_backend: Disk vdev=xvda, backend tap unsuitable because blktap not available libxl: error: libxl_device.c:289:libxl__device_disk_set_backend: no suitable backend for disk xvda libxl: debug: libxl_event.c:1739:libxl__ao_complete: ao 0x7f7894002810: complete, rc=-3 libxl: debug: libxl_create.c:1370:do_domain_create: ao 0x7f7894002810: inprogress: poller=0x7f7894001bb0, flags=ic libxl: debug: libxl_event.c:1711:libxl__ao__destroy: ao 0x7f7894002810: destroy The blktap does work, and I also find the same error someone has posted, (http://www.redhat.com/archives/libvir-list/2013-February/msg01124.html) When I change the type to "phy", it also doesnot work. And try to change the type to other options, also does not work. Can someone give me some suggestions? Thanks ! The XML from the openstack is : <domain type="xen"> <uuid>9e9ed86c-8892-40da-acd1-31ec6303abfe</uuid> <name>instance-00000001</name> <memory>524288</memory> <vcpu>1</vcpu> <os> <type>xen</type> <kernel>/opt/stack/data/nova/instances/9e9ed86c-8892-40da-acd1-31ec6303abfe/kernel</kernel> <initrd>/opt/stack/data/nova/instances/9e9ed86c-8892-40da-acd1-31ec6303abfe/ramdisk</initrd> <cmdline>ro root=/dev/xvda</cmdline> </os> <features> <acpi/> <apic/> </features> <clock offset="utc"/> <devices> <disk type="file" device="disk"> <driver name="tap2" type="raw" cache="none"/> <source file="/opt/stack/data/nova/instances/9e9ed86c-8892-40da-acd1-31ec6303abfe/disk"/> <target bus="xen" dev="xvda"/> </disk> <disk type="file" device="cdrom"> <driver name="tap2" type="raw" cache="none"/> <source file="/opt/stack/data/nova/instances/9e9ed86c-8892-40da-acd1-31ec6303abfe/disk.config"/> <target bus="ide" dev="xvdd"/> </disk> <interface type="bridge"> <mac address="fa:16:3e:d8:c3:c0"/> <source bridge="br100"/> <filterref filter="nova-instance-instance-00000001-fa163ed8c3c0"/> </interface> <console type="pty"/> <graphics type="vnc" autoport="yes" keymap="en-us" listen="127.0.0.1"/> <video> <model type="xen"/> </video> </devices> </domain> Best regards, Tian, Shuangtai

4 7

[libvirt] [PATCH] qemu: don't check for backing chains for formats w/o snapshot support
by Martin Kletzander 22 Apr '14

22 Apr '14

Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1019926 Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=868673 Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- src/libvirt_private.syms | 2 +- src/qemu/qemu_domain.c | 3 +++ src/util/virstoragefile.c | 15 +++++++++++++++ src/util/virstoragefile.h | 2 ++ 4 files changed, 21 insertions(+), 1 deletion(-) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 0e81f2f..42c0185 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1834,6 +1834,7 @@ virStorageFileIsClusterFS; virStorageFileProbeFormat; virStorageFileProbeFormatFromBuf; virStorageFileResize; +virStorageFormatMaySupportSnapshots; virStorageIsFile; virStorageNetHostDefClear; virStorageNetHostDefCopy; @@ -1850,7 +1851,6 @@ virStorageSourcePoolModeTypeToString; virStorageTypeFromString; virStorageTypeToString; - # util/virstring.h virArgvToString; virAsprintfInternal; diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index cdd4601..abc2a68 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -2250,6 +2250,9 @@ qemuDomainCheckDiskPresence(virQEMUDriverPtr driver, if (!virDomainDiskGetSource(disk)) continue; + if (!virStorageFormatMaySupportSnapshots(disk->src.format)) + continue; + if (qemuDomainDetermineDiskChain(driver, vm, disk, false) >= 0 && qemuDiskChainCheckBroken(disk) >= 0) continue; diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c index ea80c1d..c781a6b 100644 --- a/src/util/virstoragefile.c +++ b/src/util/virstoragefile.c @@ -1730,3 +1730,18 @@ virStorageSourceClear(virStorageSourcePtr def) virStorageNetHostDefFree(def->nhosts, def->hosts); virStorageSourceAuthClear(def); } + +bool +virStorageFormatMaySupportSnapshots(enum virStorageFileFormat format) +{ + if (format == VIR_STORAGE_FILE_AUTO || + format == VIR_STORAGE_FILE_AUTO_SAFE) + return true; + + /* Better safe than sorry */ + if (format <= VIR_STORAGE_FILE_NONE || + format >= VIR_STORAGE_FILE_LAST) + return false; + + return !!fileTypeInfo[format].getBackingStore; +} diff --git a/src/util/virstoragefile.h b/src/util/virstoragefile.h index 1b8b14f..bcbfb88 100644 --- a/src/util/virstoragefile.h +++ b/src/util/virstoragefile.h @@ -339,4 +339,6 @@ void virStorageSourcePoolDefFree(virStorageSourcePoolDefPtr def); void virStorageSourceClear(virStorageSourcePtr def); int virStorageSourceGetActualType(virStorageSourcePtr def); +bool virStorageFormatMaySupportSnapshots(enum virStorageFileFormat format); + #endif /* __VIR_STORAGE_FILE_H__ */ -- 1.9.2

2 2

[libvirt] [PATCH 1/2] util: introduce virDirRead wrapper for readdir
by Natanael Copa 22 Apr '14

22 Apr '14

Introduce a wrapper for readdir. This helps us make sure that we always set errno before calling readdir and it will make sure errors are properly logged. Signed-off-by: Natanael Copa <ncopa(a)alpinelinux.org> --- src/util/virfile.c | 14 ++++++++++++++ src/util/virfile.h | 3 +++ 2 files changed, 17 insertions(+) diff --git a/src/util/virfile.c b/src/util/virfile.c index 3eb2703..b54b9fd 100644 --- a/src/util/virfile.c +++ b/src/util/virfile.c @@ -2295,6 +2295,20 @@ virDirCreate(const char *path ATTRIBUTE_UNUSED, } #endif /* WIN32 */ +/* return 0 = success, 1 = end-of-dir and -1 = error */ +int virDirRead(DIR *dirp, struct dirent **ent, const char *dirname) +{ + errno = 0; + *ent = readdir(dirp); + if (!*ent && errno) { + if (dirname) + virReportSystemError(errno, _("Unable to read directory '%s'"), + dirname); + return -1; + } + return !*ent; +} + static int virFileMakePathHelper(char *path, mode_t mode) { diff --git a/src/util/virfile.h b/src/util/virfile.h index 46ef781..622a81b 100644 --- a/src/util/virfile.h +++ b/src/util/virfile.h @@ -27,6 +27,7 @@ # define __VIR_FILE_H_ # include <stdio.h> +# include <dirent.h> # include "internal.h" # include "virstoragefile.h" @@ -211,6 +212,8 @@ enum { }; int virDirCreate(const char *path, mode_t mode, uid_t uid, gid_t gid, unsigned int flags) ATTRIBUTE_RETURN_CHECK; +int virDirRead(DIR *dirp, struct dirent **ent, const char *dirname); + int virFileMakePath(const char *path) ATTRIBUTE_RETURN_CHECK; int virFileMakePathWithMode(const char *path, mode_t mode) ATTRIBUTE_RETURN_CHECK; -- 1.9.2

2 5

Re: [libvirt] libvirt Hyper-v 2012 r2 fix
by vikhyath reddy 22 Apr '14

22 Apr '14

Bringing the discussion back online... Okay so figured out what was going on (to see what the actual error was, please read the latest email in the conversation). Classes in hyperv/hyperv_wmi_generator.input a) Msvm_MemorySettingData b) Msvm_ProcessorSettingData c) Msvm_VirtualSystemSettingData Have been upgraded to the definitions found at the new v2 doc http://msdn.microsoft.com/en-us/library/hh850176(v=vs.85).aspx, I put in this note at the beginning of the hyperv/hyperv_wmi_generator.input file. With these changes and a few other minor ones, I can confirm that the functionality mimics the hyperv 2008 version. That is, we get the same functionality (supported vs non-supported drivers). However, this might also mean the end of support of Hyper-V 2008 if it is just a replace of the existing classes. What do you guys think? Should we continue to support 2008 (~6 years old) OR is it OK to assume that Hyperv-V 2012 will be the default standard moving forward. Thanks, Vik. On Wed, Apr 16, 2014 at 10:23 AM, vikhyath reddy <reddy.vikhyath(a)gmail.com>wrote: > Taking this offline... > > Hi Matthias, > > Well... from more testing what I found is that openwsman breaks during > serialization. > > When I run against hyper-v 2012 r2 > > --------------------------------------------- > > virsh # list --all > > *1984 testing-1 running* > --------------------------------------------- > > virsh # dumpxml testing-1 > > *2014-04-16 16:53:54.049+0000: 10693: info : libvirt version: 1.2.3* > > *2014-04-16 16:53:54.049+0000: 10693: error : hypervDebugHandler:1403 : > openwsman error: not enough (0 < 1) instances of element SystemName* > > *2014-04-16 16:53:54.049+0000: 10693: error : hypervDebugHandler:1403 : > openwsman error: handling of element "**SystemName**" failed = -3* > > *2014-04-16 16:53:54.049+0000: 10693: error : hypervDebugHandler:1403 : > openwsman error: size of 1 structures "Msvm_VirtualSystemSettingData" > exceeds stopper (0x7fb86a4c5d18 > (nil))* > > *2014-04-16 16:53:54.049+0000: 10693: error : hypervDebugHandler:1403 : > openwsman error: Error during serialization* > > *error: internal error: Could not deserialize pull response item* > > *-------------------------------------------------* > > I was also looking at > http://www.redhat.com/archives/libvir-list/2011-July/msg00768.html and > found that you submitted a patch. It looks like from class > > > class Msvm_VirtualSystemSettingData > > > property *SystemName* > > > is being returned NULL or is is non existent in the pull response. Any pointers as to how can I check what is being returned in the pull response (if any)? > > > Thanks! > > Vik. > > > > On Wed, Apr 16, 2014 at 1:35 AM, Matthias Bolte < > matthias.bolte(a)googlemail.com> wrote: > >> 2014-04-16 3:26 GMT+02:00 vikhyath reddy <reddy.vikhyath(a)gmail.com>: >> > Update, >> > >> > I tried adding root\virtualization\v2 to the namespace in libvirt source >> > code for hyperv. I ran some tests and it seems to work. I get the same >> > functionality (supported vs non-supported drivers) as hyper-v 2008. >> > >> > Do you guys want me to submit the patch? If yes, what all do I need to >> > update to get the patch in? >> > >> > Thanks, >> > Vik. >> > >> > >> > On Tue, Apr 15, 2014 at 5:26 PM, vikhyath reddy < >> reddy.vikhyath(a)gmail.com> >> > wrote: >> >> >> >> Hello everyone, >> >> >> >> Thanks for libvirt. I did see on the libvirt page that hyper-v 2008 is >> >> supported (which it does). So I tried running it on Hyper-v 2012 r2 but >> >> virsh fails to connect by an error that says >> >> >> >> "error: internal error: SOAP fault during enumeration: code 's:Sender', >> >> subcode 'n:CannotProcessFilter', reason 'The data source could not >> process >> >> the filter. The filter might be missing or it might be invalid. Change >> the >> >> filter and try the request again. ', detail '500The specified class >> does >> >> not exist in the given namespace. HRESULT >> 0x8033801a0052150858778HRESULTThe >> >> specified class does not exist in the given namespace. ' " >> >> >> >> Upon looking into the Hyper-v 2012 r2 server event logs, I found that >> this >> >> is going on >> >> >> >> [ Source: WMI-Activity >> >> Event ID: 5898 >> >> Microsoft-Windows-WMI-Activity/Operational ] >> >> >> >> >> >> Id = {62D480B2-58EF-0000-E580-D462EF58CF01}; ClientMachine = >> >> VIKHYPERV; User = VIKHYPERV\Administrator; ClientProcessId = 884; >> >> Component = Unknown; Operation = Start IWbemServices::ExecQuery - >> >> root\virtualization : select * from Msvm_ComputerSystem where >> >> Description = "Microsoft Hosting Computer System" ; ResultCode = >> >> 0x80041010; PossibleCause = Unknown >> >> >> >> Note that Msvm_ComputerSystem is missing in the namespace >> >> root\virtualization. Upon further investigation, I found that the new >> >> namespace where Msvm_ComputerSystem is located is at >> root\virtualization\v2 >> >> >> >> Is (it possible?) there some way I can know where in the source code, >> >> libvirt is specifying the namespace so that I can try patching it up >> and see >> >> if it fixes things? >> >> >> >> Thanks for all your help, >> >> Vik. >> >> Yes, send a patch for this. >> >> To get your patch in, you need to send it to this list for review. >> After a successful review it'll be pushed to the git repo by someone >> with commit access. >> >> See http://libvirt.org/hacking.html for more details about working on >> the source and submitting patches. >> >> -- >> Matthias Bolte >> http://photron.blogspot.com >> > >

2 2

[libvirt] [PATCH] Fix typos in src/*
by Nehal J Wani 21 Apr '14

21 Apr '14

Fix minor typos in source comments --- src/esx/esx_driver.c | 2 +- src/esx/esx_storage_backend_iscsi.c | 2 +- src/esx/esx_storage_driver.c | 2 +- src/interface/interface_backend_netcf.c | 2 +- src/interface/interface_backend_udev.c | 2 +- src/locking/lock_protocol.x | 2 +- src/openvz/openvz_conf.c | 4 ++-- src/qemu/qemu_capabilities.c | 2 +- src/qemu/qemu_command.h | 2 +- src/qemu/qemu_driver.c | 6 +++--- src/security/security_selinux.c | 2 +- src/storage/storage_backend_fs.c | 2 +- src/uml/uml_driver.c | 2 +- src/util/virstring.c | 2 +- src/vmware/vmware_conf.c | 2 +- src/xen/xs_internal.c | 4 ++-- 16 files changed, 20 insertions(+), 20 deletions(-) diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c index 5b12bd4..d082927 100644 --- a/src/esx/esx_driver.c +++ b/src/esx/esx_driver.c @@ -3109,7 +3109,7 @@ esxDomainDefineXML(virConnectPtr conn, const char *xml) /* * Build VMX datastore URL. Use the source of the first file-based harddisk * to deduce the datastore and path for the VMX file. Don't just use the - * first disk, because it may be CDROM disk and ISO images are normaly not + * first disk, because it may be CDROM disk and ISO images are normally not * located in the virtual machine's directory. This approach to deduce the * datastore isn't perfect but should work in the majority of cases. */ diff --git a/src/esx/esx_storage_backend_iscsi.c b/src/esx/esx_storage_backend_iscsi.c index 5509429..af516c0 100644 --- a/src/esx/esx_storage_backend_iscsi.c +++ b/src/esx/esx_storage_backend_iscsi.c @@ -460,7 +460,7 @@ esxStorageVolLookupByName(virStoragePoolPtr pool, scsiLun = scsiLun->_next) { if (STREQ(scsiLun->deviceName, name)) { /* - * ScsiLun provides an UUID field that is unique accross + * ScsiLun provides an UUID field that is unique across * multiple servers. But this field length is ~55 characters * compute MD5 hash to transform it to an acceptable * libvirt format diff --git a/src/esx/esx_storage_driver.c b/src/esx/esx_storage_driver.c index 2cfe939..cae53ed 100644 --- a/src/esx/esx_storage_driver.c +++ b/src/esx/esx_storage_driver.c @@ -386,7 +386,7 @@ esxStorageVolLookupByPath(virConnectPtr conn, const char *path) /* * FIXME: calling backends blindly may set unwanted error codes * - * VMFS Datastore path follows cannonical format i.e.: + * VMFS Datastore path follows canonical format i.e.: * [<datastore_name>] <file_path> * WHEREAS * iSCSI LUNs device path follows normal linux path convention diff --git a/src/interface/interface_backend_netcf.c b/src/interface/interface_backend_netcf.c index 36a50bd..1b9ace5 100644 --- a/src/interface/interface_backend_netcf.c +++ b/src/interface/interface_backend_netcf.c @@ -151,7 +151,7 @@ netcfStateReload(void) /* * Get a minimal virInterfaceDef containing enough metadata * for access control checks to be performed. Currently - * this implies existance of name and mac address attributes + * this implies existence of name and mac address attributes */ static virInterfaceDef * ATTRIBUTE_NONNULL(1) netcfGetMinimalDefForDevice(struct netcf_if *iface) diff --git a/src/interface/interface_backend_udev.c b/src/interface/interface_backend_udev.c index 4fb8eab..b05ac0e 100644 --- a/src/interface/interface_backend_udev.c +++ b/src/interface/interface_backend_udev.c @@ -66,7 +66,7 @@ virUdevStatusString(virUdevStatus status) /* * Get a minimal virInterfaceDef containing enough metadata * for access control checks to be performed. Currently - * this implies existance of name and mac address attributes + * this implies existence of name and mac address attributes */ static virInterfaceDef * ATTRIBUTE_NONNULL(1) udevGetMinimalDefForDevice(struct udev_device *dev) diff --git a/src/locking/lock_protocol.x b/src/locking/lock_protocol.x index 354d51a..a77a784 100644 --- a/src/locking/lock_protocol.x +++ b/src/locking/lock_protocol.x @@ -77,7 +77,7 @@ const VIR_LOCK_SPACE_PROTOCOL_PROGRAM = 0xEA7BEEF; const VIR_LOCK_SPACE_PROTOCOL_PROGRAM_VERSION = 1; enum virLockSpaceProtocolProcedure { - /* Each function must be preceeded by a comment providing one or + /* Each function must be preceded by a comment providing one or * more annotations: * * - @generate: none|client|server|both diff --git a/src/openvz/openvz_conf.c b/src/openvz/openvz_conf.c index 85dd100..5bc5cb1 100644 --- a/src/openvz/openvz_conf.c +++ b/src/openvz/openvz_conf.c @@ -215,7 +215,7 @@ openvzReadNetworkConf(virDomainDefPtr def, /*parse routing network configuration* * Sample from config: * IP_ADDRESS="1.1.1.1 1.1.1.2" - * splited IPs by space + * splitted IPs by space */ ret = openvzReadVPSConfigParam(veid, "IP_ADDRESS", &temp); if (ret < 0) { @@ -243,7 +243,7 @@ openvzReadNetworkConf(virDomainDefPtr def, /*parse bridge devices*/ /*Sample from config: *NETIF="ifname=eth10,mac=00:18:51:C1:05:EE,host_ifname=veth105.10,host_mac=00:18:51:8F:D9:F3" - *devices splited by ';' + *devices splitted by ';' */ ret = openvzReadVPSConfigParam(veid, "NETIF", &temp); if (ret < 0) { diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 889e614..a5c6879 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -2296,7 +2296,7 @@ virQEMUCapsProbeQMPKVMState(virQEMUCapsPtr qemuCaps, /* The QEMU_CAPS_KVM flag was initially set according to the QEMU * reporting the recognition of 'query-kvm' QMP command. That merely - * indicates existance of the command though, not whether KVM support + * indicates existence of the command though, not whether KVM support * is actually available, nor whether it is enabled by default. * * If it is not present we need to clear the flag, and if it is diff --git a/src/qemu/qemu_command.h b/src/qemu/qemu_command.h index bad6ac0..0866c6b 100644 --- a/src/qemu/qemu_command.h +++ b/src/qemu/qemu_command.h @@ -39,7 +39,7 @@ # define QEMU_FSDEV_HOST_PREFIX "fsdev-" /* These are only defaults, they can be changed now in qemu.conf and - * explicitely specified port is checked against these two (makes + * explicitly specified port is checked against these two (makes * sense to limit the values). * * This limitation is mentioned in qemu.conf, so bear in mind that the diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index e58fa3f..5970585 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -1304,7 +1304,7 @@ qemuGetProcessInfo(unsigned long long *cpuTime, int *lastCpu, long *vm_rss, /* We got jiffies * We want nanoseconds * _SC_CLK_TCK is jiffies per second - * So calulate thus.... + * So calculate thus.... */ if (cpuTime) *cpuTime = 1000ull * 1000ull * 1000ull * (usertime + systime) / (unsigned long long)sysconf(_SC_CLK_TCK); @@ -2934,7 +2934,7 @@ qemuDomainSaveMemory(virQEMUDriverPtr driver, * we don't have an explicit offset in the header, so we fake * it by padding the XML string with NUL bytes. Additionally, * we want to ensure that virDomainSaveImageDefineXML can supply - * slightly larger XML, so we add a miminum padding prior to + * slightly larger XML, so we add a minimum padding prior to * rounding out to page boundaries. */ pad = 1024; @@ -12509,7 +12509,7 @@ qemuDomainSnapshotPrepareDiskInternal(virConnectPtr conn, { int actualType; - /* active disks are handeled by qemu itself so no need to worry about those */ + /* active disks are handled by qemu itself so no need to worry about those */ if (active) return 0; diff --git a/src/security/security_selinux.c b/src/security/security_selinux.c index bfac11c..01a384a 100644 --- a/src/security/security_selinux.c +++ b/src/security/security_selinux.c @@ -178,7 +178,7 @@ virSecuritySELinuxMCSFind(virSecurityManagerPtr mgr, * the category part, since that's what we're really * interested in. This won't work in Enforcing mode, * but will prevent libvirtd breaking in Permissive - * mode when run with a wierd process label. + * mode when run with a weird process label. */ static int virSecuritySELinuxMCSGetProcessRange(char **sens, diff --git a/src/storage/storage_backend_fs.c b/src/storage/storage_backend_fs.c index fa5eba1..3694c26 100644 --- a/src/storage/storage_backend_fs.c +++ b/src/storage/storage_backend_fs.c @@ -1196,7 +1196,7 @@ virStorageBackendFileSystemVolRefresh(virConnectPtr conn, if (ret < 0) return ret; - /* Load any secrets if posible */ + /* Load any secrets if possible */ if (vol->target.encryption && vol->target.encryption->format == VIR_STORAGE_ENCRYPTION_FORMAT_QCOW && vol->target.encryption->nsecrets == 0) { diff --git a/src/uml/uml_driver.c b/src/uml/uml_driver.c index 69f6c11..1e0ec0e 100644 --- a/src/uml/uml_driver.c +++ b/src/uml/uml_driver.c @@ -1337,7 +1337,7 @@ static int umlGetProcessInfo(unsigned long long *cpuTime, pid_t pid) /* We got jiffies * We want nanoseconds * _SC_CLK_TCK is jiffies per second - * So calulate thus.... + * So calculate thus.... */ *cpuTime = 1000ull * 1000ull * 1000ull * (usertime + systime) / (unsigned long long)sysconf(_SC_CLK_TCK); diff --git a/src/util/virstring.c b/src/util/virstring.c index b2184f3..64c7259 100644 --- a/src/util/virstring.c +++ b/src/util/virstring.c @@ -758,7 +758,7 @@ virStringSearch(const char *str, * @oldneedle: the substring to locate * @newneedle: the substring to insert * - * Search @haystack and replace all occurences of @oldneedle with @newneedle. + * Search @haystack and replace all occurrences of @oldneedle with @newneedle. * * Returns: a new string with all the replacements, or NULL on error */ diff --git a/src/vmware/vmware_conf.c b/src/vmware/vmware_conf.c index 5ff6396..29ca322 100644 --- a/src/vmware/vmware_conf.c +++ b/src/vmware/vmware_conf.c @@ -392,7 +392,7 @@ vmwareVmxPath(virDomainDefPtr vmdef, char **vmxPath) /* * Build VMX URL. Use the source of the first file-based harddisk * to deduce the path for the VMX file. Don't just use the - * first disk, because it may be CDROM disk and ISO images are normaly not + * first disk, because it may be CDROM disk and ISO images are normally not * located in the virtual machine's directory. This approach * isn't perfect but should work in the majority of cases. */ diff --git a/src/xen/xs_internal.c b/src/xen/xs_internal.c index 0f7b7d2..8702b1a 100644 --- a/src/xen/xs_internal.c +++ b/src/xen/xs_internal.c @@ -355,7 +355,7 @@ xenStoreDomainGetVNCPort(virConnectPtr conn, int domid) * serial console is attached. * * Returns the path to the serial console. It is the callers - * responsibilty to free() the return string. Returns NULL + * responsibility to free() the return string. Returns NULL * on error * * The caller must hold the lock on the privateData @@ -376,7 +376,7 @@ xenStoreDomainGetConsolePath(virConnectPtr conn, int domid) * serial console is attached. * * Returns the path to the serial console. It is the callers - * responsibilty to free() the return string. Returns NULL + * responsibility to free() the return string. Returns NULL * on error * * The caller must hold the lock on the privateData -- 1.7.1

2 3

[libvirt] [PATCHv2 0/9] RelaxNG improvements for virStorageSource
by Eric Blake 21 Apr '14

21 Apr '14

changes since v1: ack'd patch pushed new patches 2-4 are a better rewrite of old patch 3/6 new patches 8 and 9 patch 9 is incomplete - I know where I want to be headed, but changing 400+ tests is taking a while. I tried: $ git grep -l '<driver.*type=' tests/*data/ | \ xargs sed ' /<driver .*type=$\(.$[a-zA-Z0-9]*\2\)/ h; /<source /{ x; s/<driver.*type=$\(.$[a-zA-Z0-9]*\2\).*>/<format type=\1>/; G; }' as a way to automate the majority of the tedium, with some limited success (it has false positives in the lxc <filesystem> elements, when we really only want to affect <disk> elements>), but have not completed the efforts. I'm posting the patches now, in the hopes that 1-8 can be approved, and 9 picked up by someone else if I'm unresponsive for a while (I'll be offline for much of this week due to the birth of my fourth child). Eric Blake (9): conf: better <disk> interleaving in schema conf: move storage formats to common RNG file conf: restrict external snapshots to backing store formats conf: set up for per-grammar overrides in schemas conf: split <disk> schema into more pieces conf: move storage source details to common RNG file conf: move <auth> and <encryption> to disk source conf: fix omission of <driver> in domain dumpxml RFC: conf: introduce <format> as synonym of <driver type=...> docs/formatdomain.html.in | 19 +- docs/schemas/domain.rng | 14 +- docs/schemas/domaincommon.rng | 288 ++------------------ docs/schemas/domainsnapshot.rng | 74 ++---- docs/schemas/storagecommon.rng | 293 +++++++++++++++++++++ docs/schemas/storagevol.rng | 13 +- src/conf/domain_conf.c | 36 ++- src/conf/snapshot_conf.c | 7 +- src/util/virstoragefile.c | 51 ++-- src/util/virstoragefile.h | 15 +- .../qemuxml2argv-disk-drive-copy-on-read.args | 5 + .../qemuxml2argv-disk-drive-copy-on-read.xml | 28 ++ .../qemuxml2argv-disk-drive-discard.xml | 10 +- .../qemuxml2argv-disk-source-pool.xml | 12 +- tests/qemuxml2argvtest.c | 3 + .../qemuxml2xmlout-disk-drive-discard.xml | 37 +++ .../qemuxml2xmlout-disk-source-pool.xml | 44 ++++ tests/qemuxml2xmltest.c | 5 +- 18 files changed, 574 insertions(+), 380 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-drive-copy-on-read.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-drive-copy-on-read.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-discard.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-source-pool.xml -- 1.9.0

2 18

[libvirt] Fwd: Start contributing with Libvirt (Finding a mentor or helpful tips)
by Julio Faracco 21 Apr '14

21 Apr '14

Hi everybody! I sent an e-mail to Daniel asking about contributing to the libvirt community for free. So, I copied the e-mail to the libvirt mailing list as Daniel suggested me. If anyone can help me I'd be pleased. Thanks very much! *--* *Julio Cesar Faracco* *University of São Paulo - Brazil* ---------- Forwarded message ---------- From: Julio Faracco <jcfaracco(a)gmail.com> Date: 2014-03-29 13:45 GMT-03:00 Subject: Start contributing with Libvirt (Finding a mentor or helpful tips) To: dan(a)berrange.com Hi Daniel. My name is Julio and I sent this e-mail because I would like to contribute with libvirt. Moreover, I follow the libvirt mailing list for a long time and have read the ideas page of libvirt, qemu and KVM of Google Summer of Code program. I thought the ideas very interesting but I didn't have time to propose my ideais or submit a patch. But I don't know a good way to start doing that. I want to contribute with libvirt for free (not like GSoC who pays a paycheck for it). I think that contributing with a project like libvirt enhances some of my programming skills. Today I work with Linux distribution management and not with programing itself. However, I'm finding some troubles to start. For example: - Can I fix a random open bug? - How to understand which bug can be easier to solve? - How to follow the conversation of the mailing list? Sometimes I feel so lost. I was looking for a mentor (if you know someone who could help me) or a person who can help me to follow the right way to start it. Thanks very much. *--* *Julio Cesar Faracco* *University of São Paulo - Brazil*

3 6

[libvirt] [PATCH] maint: update to latest gnulib
by Eric Blake 21 Apr '14

21 Apr '14

Among other patches, Natanael Copa contributed a fix for pyshmem_available when using musl libc that directly affects libvirt. * .gnulib: Update to latest, in part for musl libc compat. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- Pushing under the gnulib rule, since we are not in release freeze. * .gnulib ce457d6...e8e0eb6 (18): > gitlog-to-changelog: revert inclusion of git-log-fix file > maint.mk: Relax the copyright check to cater for non FSF projects > physmem: use sysinfo if _SC_PHYS_PAGES unavailable > exclude: port to strict C99 > regex: do not depend on malloc-gnu > autoupdate > expl: avoid incorrect expl(small_value) on OpenBSD 5.4 > xalloc: allow x2nrealloc (P, PN, S) where P && !*PN > fts: avoid unnecessary strlen calls > fts: avoid unnecessary strlen calls > fts: avoid unnecessary strlen calls > autoupdate > autoupdate > obstack: Remove ancient NeXTSTEP gcc support conditional > obstack: merge with glibc changes > strftime: wrap macros in "do {...} while(0)" > modechange: avoid memory leaks for invalid octal modes > autoupdate .gnulib | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gnulib b/.gnulib index ce457d6..e8e0eb6 160000 --- a/.gnulib +++ b/.gnulib @@ -1 +1 @@ -Subproject commit ce457d622d947d8aa3e325d98a2818d097e7fec9 +Subproject commit e8e0eb6bfb728685ec8d5afd924e41b18e9d928d -- 1.9.0

1 0

[libvirt] [PATCH v2] virsh: Separate 'create'/'modify' message for secret-define
by Li Yang 21 Apr '14

21 Apr '14

The current message of secret-define always be: Secret 09a9736f-eedb-449c-9983-80d0ab67393f created even you just modify the secret, perhaps this may puzzle uses. Now this patch make the modify action output message like this: Secret f2d1bafc-ac58-4a47-93e4-47723686fef5 modified Signed-off-by: Li Yang <liyang.fnst(a)cn.fujitsu.com> --- tools/virsh-secret.c | 18 +++++++++++++++++- 1 files changed, 17 insertions(+), 1 deletions(-) diff --git a/tools/virsh-secret.c b/tools/virsh-secret.c index 10d5db3..47974fe 100644 --- a/tools/virsh-secret.c +++ b/tools/virsh-secret.c @@ -96,6 +96,8 @@ cmdSecretDefine(vshControl *ctl, const vshCmd *cmd) char *buffer; virSecretPtr res; char uuid[VIR_UUID_STRING_BUFLEN]; + virSecretDefPtr new_attrs; + virSecretPtr new_res; bool ret = false; if (vshCommandOptStringReq(ctl, cmd, "file", &from) < 0) @@ -104,6 +106,14 @@ cmdSecretDefine(vshControl *ctl, const vshCmd *cmd) if (virFileReadAll(from, VSH_MAX_XML_FILE, &buffer) < 0) return false; + if (!(new_attrs = virSecretDefParseString(buffer))) { + VIR_FREE(buffer); + return false; + } + + new_res = virSecretLookupByUUID(ctl->conn, new_attrs->uuid); + new_attrs = NULL; + if (!(res = virSecretDefineXML(ctl->conn, buffer, 0))) { vshError(ctl, _("Failed to set attributes from %s"), from); goto cleanup; @@ -114,13 +124,19 @@ cmdSecretDefine(vshControl *ctl, const vshCmd *cmd) goto cleanup; } - vshPrint(ctl, _("Secret %s created\n"), uuid); + if (new_res == NULL) + vshPrint(ctl, _("Secret %s created\n"), uuid); + else + vshPrint(ctl, _("Secret %s modified\n"), uuid); ret = true; cleanup: VIR_FREE(buffer); + virSecretDefFree(new_attrs); if (res) virSecretFree(res); + if (new_res) + virSecretFree(new_res); return ret; } -- 1.7.1

1 0

Re: [libvirt] [PATCH] virsh: Separate 'create'/'modify' message for secret-define
by Li, Yang 21 Apr '14

21 Apr '14

> On Fri, Apr 18, 2014 at 12:20:26 +0200, Martin Kletzander wrote: > > On Fri, Apr 18, 2014 at 04:27:10AM -0400, Li Yang wrote: > > >The current message of secret-define always be: > > >Secret 09a9736f-eedb-449c-9983-80d0ab67393f created > > > > >even you just modify the secret, perhaps this may puzzle > > >uses. Now this patch make the modify action output message > > >like this: > > >Secret f2d1bafc-ac58-4a47-93e4-47723686fef5 modified > > > > > >Signed-off-by: Li Yang <liyang.fnst(a)cn.fujitsu.com> > > >--- > > > tools/virsh-secret.c | 16 +++++++++++++++- > > > 1 files changed, 15 insertions(+), 1 deletions(-) > > > > > >diff --git a/tools/virsh-secret.c b/tools/virsh-secret.c > > >index 10d5db3..d1cbe04 100644 > > >--- a/tools/virsh-secret.c > > >+++ b/tools/virsh-secret.c > > >@@ -39,6 +39,7 @@ > > > #include "virutil.h" > > > #include "virxml.h" > > > #include "conf/secret_conf.h" > > >+#include "viruuid.h" > > > > > > static virSecretPtr > > > vshCommandOptSecret(vshControl *ctl, const vshCmd *cmd, const char **name) > > >@@ -96,6 +97,7 @@ cmdSecretDefine(vshControl *ctl, const vshCmd *cmd) > > > char *buffer; > > > virSecretPtr res; > > > char uuid[VIR_UUID_STRING_BUFLEN]; > > >+ virSecretDefPtr new_attrs; > > > bool ret = false; > > > > > > if (vshCommandOptStringReq(ctl, cmd, "file", &from) < 0) > > >@@ -104,6 +106,12 @@ cmdSecretDefine(vshControl *ctl, const vshCmd *cmd) > > > if (virFileReadAll(from, VSH_MAX_XML_FILE, &buffer) < 0) > > > return false; > > > > > >+ new_attrs = virSecretDefParseString(buffer); > > >+ if (new_attrs == NULL){ > > >+ VIR_FREE(buffer); > > >+ return false; > > >+ } > > >+ > > > if (!(res = virSecretDefineXML(ctl->conn, buffer, 0))) { > > > vshError(ctl, _("Failed to set attributes from %s"), from); > > > goto cleanup; > > >@@ -114,10 +122,16 @@ cmdSecretDefine(vshControl *ctl, const vshCmd *cmd) > > > goto cleanup; > > > } > > > > > >- vshPrint(ctl, _("Secret %s created\n"), uuid); > > >+ char uuidstr[VIR_UUID_STRING_BUFLEN]; > > >+ virUUIDFormat(new_attrs->uuid, uuidstr); > > >+ if (memcmp(uuid, uuidstr, VIR_UUID_BUFLEN) == 0) > > >+ vshPrint(ctl, _("Secret %s modified\n"), uuid); > > >+ else > > >+ vshPrint(ctl, _("Secret %s created\n"), uuid); > > > ret = true; > > > > You'll still print 'modified' if the new created secret has an uuid in > > the file already, plus it does more parsing, etc. Wouldn't it be > > easier to just do s/created/defined/ ? > > Also you compare just the first VIR_UUID_BUFLEN characters in UUID > string. I agree with Martin. > > Jirka Oh, yes, you are right, I didn't notice that. I will try another way to cover this situation. If I cannot find an easy way to solve this problem, I think we'd better leave it at that, Modify "created" to "defined" seems not enough useful for uses... After all, secret-undefine command's output is "Secret *** deleted", it's correspond to secret-define command's output "Secret *** created".

1 0

Re: [libvirt] [PATCH] virsh: Make secret's usage can be modified if the usage isn't used
by Li, Yang 21 Apr '14

21 Apr '14

Ping! > When a secret's usage is specified, for example: > <secret ephemeral='no' private='no'> > <uuid>540c56d1-f4b3-5031-b76d-33e99e9b5c64</uuid> > <usage type='volume'> > <volume>/tmp/test</volume> > </usage> > </secret> > If another volume '/tmp/test1' isn't used, the current secret's usage can bo modified to '/tmp/test1'. > If '/tmp/test1' has been used for another secret, error message will be outputed. > > Signed-off-by: Li Yang <liyang.fnst(a)cn.fujitsu.com> > --- > src/secret/secret_driver.c | 18 +++++++++++------- > 1 files changed, 11 insertions(+), 7 deletions(-)

1 0

[libvirt] libvirt-php: 0.4.8 tag is missing
by Doug Goldstein 20 Apr '14

20 Apr '14

The libvirt-php 0.4.8 tar is missing from the git repo [1]. Hopefully someone who created the tarball can create the tag as well and push it. [1] http://libvirt.org/git/?p=libvirt-php.git Thanks. -- Doug Goldstein

1 1

[libvirt] [PATCH v2] bhyve: implement PCI address allocation
by Roman Bogorodskiy 20 Apr '14

20 Apr '14

Changes from v1: - Reserve slot 1 for LPC PCI-ISA bridge, used by console device - Respect addresses provided by user in domain xml file - Fix tests so 'make check' passes Roman Bogorodskiy (1): bhyve: implement PCI address allocation po/POTFILES.in | 1 + src/Makefile.am | 4 + src/bhyve/bhyve_command.c | 131 ++++----- src/bhyve/bhyve_device.c | 308 +++++++++++++++++++++ src/bhyve/bhyve_device.h | 41 +++ src/bhyve/bhyve_domain.c | 75 +++++ src/bhyve/bhyve_domain.h | 41 +++ src/bhyve/bhyve_driver.c | 9 +- .../bhyvexml2argvdata/bhyvexml2argv-acpiapic.args | 2 +- tests/bhyvexml2argvdata/bhyvexml2argv-acpiapic.xml | 2 + tests/bhyvexml2argvdata/bhyvexml2argv-base.args | 2 +- tests/bhyvexml2argvdata/bhyvexml2argv-base.xml | 2 + tests/bhyvexml2argvdata/bhyvexml2argv-console.args | 4 +- tests/bhyvexml2argvdata/bhyvexml2argv-console.xml | 2 + .../bhyvexml2argv-disk-virtio.args | 2 +- .../bhyvexml2argv-disk-virtio.xml | 2 + tests/bhyvexml2argvdata/bhyvexml2argv-macaddr.args | 2 +- tests/bhyvexml2argvdata/bhyvexml2argv-macaddr.xml | 2 + tests/bhyvexml2argvdata/bhyvexml2argv-serial.args | 4 +- tests/bhyvexml2argvdata/bhyvexml2argv-serial.xml | 2 + 20 files changed, 559 insertions(+), 79 deletions(-) create mode 100644 src/bhyve/bhyve_device.c create mode 100644 src/bhyve/bhyve_device.h create mode 100644 src/bhyve/bhyve_domain.c create mode 100644 src/bhyve/bhyve_domain.h -- 1.9.0

1 1

[libvirt] [PATCHv2] bhyve: domainCreateXML
by Wojciech Macek 20 Apr '14

20 Apr '14

Review-fixes, changes since last time: - persistent flag is not reset to 0 anymore - dom->id =vm->def->id is moved after domain startup - duplicate of start_flags |= VIR_BHYVE_PROCESS_START_AUTODESTROY removed - flag VIR_DOMAIN_OBJ_LIST_ADD_CHECK_LIVE is used instead of zero - virDomainObjListRemove is called for not persistent domains in case of failure - unnecessary checkActive removed ======== DIFF BETWEEN PATCHv1 and PATCHv2 ================================= diff --git a/src/bhyve/bhyve_driver.c b/src/bhyve/bhyve_driver.c index 1357e07..4ac89c1 100644 --- a/src/bhyve/bhyve_driver.c +++ b/src/bhyve/bhyve_driver.c @@ -1139,39 +1133,36 @@ bhyveDomainCreateXML(virConnectPtr conn, if (!(vm = virDomainObjListAdd(privconn->domains, def, privconn->xmlopt, - 0, NULL))) + VIR_DOMAIN_OBJ_LIST_ADD_CHECK_LIVE, NULL))) goto cleanup; def = NULL; - vm->persistent = 0; dom = virGetDomain(conn, vm->def->name, vm->def->uuid); if (!dom) goto cleanup; - dom->id = vm->def->id; - - if (flags & VIR_DOMAIN_START_AUTODESTROY) - start_flags |= VIR_BHYVE_PROCESS_START_AUTODESTROY; - - if (virDomainObjIsActive(vm)) { - virReportError(VIR_ERR_OPERATION_INVALID, - "%s", _("Domain is already running")); - goto cleanup; - } - ret = virBhyveProcessStart(dom->conn, privconn, vm, VIR_DOMAIN_RUNNING_BOOTED, start_flags); if (ret) { virObjectUnref(dom); dom = NULL; + + /* If domain is not persistent, remove its data */ + if (!vm->persistent) { + virDomainObjListRemove(privconn->domains, vm); + vm = NULL; + } goto cleanup; } + dom->id = vm->def->id; + cleanup: virObjectUnref(caps); virDomainDefFree(def); - virObjectUnlock(vm); + if (vm) + virObjectUnlock(vm); return dom; } ======== END OF DIFF BETWEEN PATCHv1 and PATCHv2 ========================= Wojciech Macek (1): bhyve: domainCreateXML src/bhyve/bhyve_driver.c | 67 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 67 insertions(+) -- 1.9.0

2 4

[libvirt] [PATCH] virsh: Separate 'create'/'modify' message for secret-define
by Li Yang 18 Apr '14

18 Apr '14

The current message of secret-define always be: Secret 09a9736f-eedb-449c-9983-80d0ab67393f created even you just modify the secret, perhaps this may puzzle uses. Now this patch make the modify action output message like this: Secret f2d1bafc-ac58-4a47-93e4-47723686fef5 modified Signed-off-by: Li Yang <liyang.fnst(a)cn.fujitsu.com> --- tools/virsh-secret.c | 16 +++++++++++++++- 1 files changed, 15 insertions(+), 1 deletions(-) diff --git a/tools/virsh-secret.c b/tools/virsh-secret.c index 10d5db3..d1cbe04 100644 --- a/tools/virsh-secret.c +++ b/tools/virsh-secret.c @@ -39,6 +39,7 @@ #include "virutil.h" #include "virxml.h" #include "conf/secret_conf.h" +#include "viruuid.h" static virSecretPtr vshCommandOptSecret(vshControl *ctl, const vshCmd *cmd, const char **name) @@ -96,6 +97,7 @@ cmdSecretDefine(vshControl *ctl, const vshCmd *cmd) char *buffer; virSecretPtr res; char uuid[VIR_UUID_STRING_BUFLEN]; + virSecretDefPtr new_attrs; bool ret = false; if (vshCommandOptStringReq(ctl, cmd, "file", &from) < 0) @@ -104,6 +106,12 @@ cmdSecretDefine(vshControl *ctl, const vshCmd *cmd) if (virFileReadAll(from, VSH_MAX_XML_FILE, &buffer) < 0) return false; + new_attrs = virSecretDefParseString(buffer); + if (new_attrs == NULL){ + VIR_FREE(buffer); + return false; + } + if (!(res = virSecretDefineXML(ctl->conn, buffer, 0))) { vshError(ctl, _("Failed to set attributes from %s"), from); goto cleanup; @@ -114,10 +122,16 @@ cmdSecretDefine(vshControl *ctl, const vshCmd *cmd) goto cleanup; } - vshPrint(ctl, _("Secret %s created\n"), uuid); + char uuidstr[VIR_UUID_STRING_BUFLEN]; + virUUIDFormat(new_attrs->uuid, uuidstr); + if (memcmp(uuid, uuidstr, VIR_UUID_BUFLEN) == 0) + vshPrint(ctl, _("Secret %s modified\n"), uuid); + else + vshPrint(ctl, _("Secret %s created\n"), uuid); ret = true; cleanup: + VIR_FREE(new_attrs); VIR_FREE(buffer); if (res) virSecretFree(res); -- 1.7.1

3 2

[libvirt] [PATCH] Only set QEMU_CAPS_NO_HPET on x86
by Ján Tomko 18 Apr '14

18 Apr '14

QEMU only supports it on x86, but we've been assuming it for all QEMUs when doing QMP capability detection. https://bugzilla.redhat.com/show_bug.cgi?id=1066145 --- src/qemu/qemu_capabilities.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 381b3ec..60b56fc 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -2888,7 +2888,6 @@ virQEMUCapsInitQMPBasic(virQEMUCapsPtr qemuCaps) virQEMUCapsSet(qemuCaps, QEMU_CAPS_NETDEV); virQEMUCapsSet(qemuCaps, QEMU_CAPS_RTC); virQEMUCapsSet(qemuCaps, QEMU_CAPS_VHOST_NET); - virQEMUCapsSet(qemuCaps, QEMU_CAPS_NO_HPET); virQEMUCapsSet(qemuCaps, QEMU_CAPS_NODEFCONFIG); virQEMUCapsSet(qemuCaps, QEMU_CAPS_BOOT_MENU); virQEMUCapsSet(qemuCaps, QEMU_CAPS_FSDEV); @@ -2947,6 +2946,7 @@ virQEMUCapsInitArchQMPBasic(virQEMUCapsPtr qemuCaps, qemuCaps->arch == VIR_ARCH_I686) { virQEMUCapsSet(qemuCaps, QEMU_CAPS_PCI_MULTIBUS); virQEMUCapsSet(qemuCaps, QEMU_CAPS_NO_ACPI); + virQEMUCapsSet(qemuCaps, QEMU_CAPS_NO_HPET); virQEMUCapsSet(qemuCaps, QEMU_CAPS_NO_KVM_PIT); } -- 1.8.3.2

2 1