- Devel - libvirt List Archives

[libvirt] [PATCH] event_example: cleanup example code for tunable event
by Pavel Hrdina 26 Sep '14

26 Sep '14

Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> --- examples/object-events/event-test.c | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/examples/object-events/event-test.c b/examples/object-events/event-test.c index faf0cf2..0c6faf4 100644 --- a/examples/object-events/event-test.c +++ b/examples/object-events/event-test.c @@ -476,15 +476,6 @@ myDomainEventTunableCallback(virConnectPtr conn ATTRIBUTE_UNUSED, printf("%s EVENT: Domain %s(%d) tunable updated:\n", __func__, virDomainGetName(dom), virDomainGetID(dom)); -#ifdef WIN32 -/* MinGW doesn't know the lld/llu so we have to use I64f/I64u instead. */ -# define LLD_FORMAT "%I64d" -# define LLU_FORMAT "%I64u" -#else /* WIN32 */ -# define LLD_FORMAT "%lld" -# define LLU_FORMAT "%llu" -#endif /* WIN32 */ - for (i = 0; i < nparams; i++) { switch (params[i].type) { case VIR_TYPED_PARAM_INT: @@ -494,10 +485,12 @@ myDomainEventTunableCallback(virConnectPtr conn ATTRIBUTE_UNUSED, printf("\t%s: %u\n", params[i].field, params[i].value.ui); break; case VIR_TYPED_PARAM_LLONG: - printf("\t%s: " LLD_FORMAT "\n", params[i].field, params[i].value.l); + printf("\t%s: %" PRId64 "\n", params[i].field, + (int64_t) params[i].value.l); break; case VIR_TYPED_PARAM_ULLONG: - printf("\t%s: " LLU_FORMAT "\n", params[i].field, params[i].value.ul); + printf("\t%s: %" PRIu64 "\n", params[i].field, + (uint64_t) params[i].value.ul); break; case VIR_TYPED_PARAM_DOUBLE: printf("\t%s: %g\n", params[i].field, params[i].value.d); -- 1.8.5.5

2 2

[libvirt] [PATCH] Rename tunable event constants
by Daniel P. Berrange 25 Sep '14

25 Sep '14

For the new VIR_DOMAIN_EVENT_ID_TUNABLE event we have a bunch of constants added VIR_DOMAIN_EVENT_CPUTUNE_<blah> VIR_DOMAIN_EVENT_BLKDEVTUNE_<blah> This naming convention is bad for two reasons - There is no common prefix unique for the events to both relate them, and distinguish them from other event constants - The values associated with the constants were chosen to match the names used with virConnectGetAllDomainStats so having EVENT in the constant name is not applicable in that respect This patch proposes renaming the constants to VIR_DOMAIN_TUNABLE_CPU_<blah> VIR_DOMAIN_TUNABLE_BLKDEV_<blah> ie, given them a common VIR_DOMAIN_TUNABLE prefix. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- include/libvirt/libvirt.h.in | 56 ++++++++++++++++++++++---------------------- src/qemu/qemu_cgroup.c | 2 +- src/qemu/qemu_driver.c | 28 +++++++++++----------- 3 files changed, 43 insertions(+), 43 deletions(-) diff --git a/include/libvirt/libvirt.h.in b/include/libvirt/libvirt.h.in index 93c9a48..2ff5204 100644 --- a/include/libvirt/libvirt.h.in +++ b/include/libvirt/libvirt.h.in @@ -5204,119 +5204,119 @@ typedef void (*virConnectDomainEventDeviceRemovedCallback)(virConnectPtr conn, void *opaque); /** - * VIR_DOMAIN_EVENT_CPUTUNE_VCPUPIN: + * VIR_DOMAIN_TUNABLE_CPU_VCPUPIN: * * Macro represents formatted pinning for one vcpu specified by id which is * appended to the parameter name, for example "cputune.vcpupin1", * as VIR_TYPED_PARAM_STRING. */ -#define VIR_DOMAIN_EVENT_CPUTUNE_VCPUPIN "cputune.vcpupin%u" +#define VIR_DOMAIN_TUNABLE_CPU_VCPUPIN "cputune.vcpupin%u" /** - * VIR_DOMAIN_EVENT_CPUTUNE_EMULATORIN: + * VIR_DOMAIN_TUNABLE_CPU_EMULATORIN: * * Macro represents formatted pinning for emulator process, * as VIR_TYPED_PARAM_STRING. */ -#define VIR_DOMAIN_EVENT_CPUTUNE_EMULATORIN "cputune.emulatorpin" +#define VIR_DOMAIN_TUNABLE_CPU_EMULATORIN "cputune.emulatorpin" /** - * VIR_DOMAIN_EVENT_CPUTUNE_CPU_SHARES: + * VIR_DOMAIN_TUNABLE_CPU_CPU_SHARES: * * Macro represents proportional weight of the scheduler used on the * host cpu, when using the posix scheduler, as VIR_TYPED_PARAM_ULLONG. */ -#define VIR_DOMAIN_EVENT_CPUTUNE_CPU_SHARES "cputune.cpu_shares" +#define VIR_DOMAIN_TUNABLE_CPU_CPU_SHARES "cputune.cpu_shares" /** - * VIR_DOMAIN_EVENT_CPUTUNE_VCPU_PERIOD: + * VIR_DOMAIN_TUNABLE_CPU_VCPU_PERIOD: * * Macro represents the enforcement period for a quota, in microseconds, * for vcpus only, when using the posix scheduler, as VIR_TYPED_PARAM_ULLONG. */ -#define VIR_DOMAIN_EVENT_CPUTUNE_VCPU_PERIOD "cputune.vcpu_period" +#define VIR_DOMAIN_TUNABLE_CPU_VCPU_PERIOD "cputune.vcpu_period" /** - * VIR_DOMAIN_EVENT_CPUTUNE_VCPU_QUOTA: + * VIR_DOMAIN_TUNABLE_CPU_VCPU_QUOTA: * * Macro represents the maximum bandwidth to be used within a period for * vcpus only, when using the posix scheduler, as VIR_TYPED_PARAM_LLONG. */ -#define VIR_DOMAIN_EVENT_CPUTUNE_VCPU_QUOTA "cputune.vcpu_quota" +#define VIR_DOMAIN_TUNABLE_CPU_VCPU_QUOTA "cputune.vcpu_quota" /** - * VIR_DOMAIN_EVENT_CPUTUNE_EMULATOR_PERIOD: + * VIR_DOMAIN_TUNABLE_CPU_EMULATOR_PERIOD: * * Macro represents the enforcement period for a quota in microseconds, * when using the posix scheduler, for all emulator activity not tied to * vcpus, as VIR_TYPED_PARAM_ULLONG. */ -#define VIR_DOMAIN_EVENT_CPUTUNE_EMULATOR_PERIOD "cputune.emulator_period" +#define VIR_DOMAIN_TUNABLE_CPU_EMULATOR_PERIOD "cputune.emulator_period" /** - * VIR_DOMAIN_EVENT_CPUTUNE_EMULATOR_QUOTA: + * VIR_DOMAIN_TUNABLE_CPU_EMULATOR_QUOTA: * * Macro represents the maximum bandwidth to be used within a period for * all emulator activity not tied to vcpus, when using the posix scheduler, * as an VIR_TYPED_PARAM_LLONG. */ -#define VIR_DOMAIN_EVENT_CPUTUNE_EMULATOR_QUOTA "cputune.emulator_quota" +#define VIR_DOMAIN_TUNABLE_CPU_EMULATOR_QUOTA "cputune.emulator_quota" /** - * VIR_DOMAIN_EVENT_BLKDEVIOTUNE_DISK: + * VIR_DOMAIN_TUNABLE_BLKDEV_DISK: * * Macro represents the name of guest disk for which the values are updated, * as VIR_TYPED_PARAM_STRING. */ -#define VIR_DOMAIN_EVENT_BLKDEVIOTUNE_DISK "blkdeviotune.disk" +#define VIR_DOMAIN_TUNABLE_BLKDEV_DISK "blkdeviotune.disk" /** - * VIR_DOMAIN_EVENT_BLKDEVIOTUNE_TOTAL_BYTES_SEC: + * VIR_DOMAIN_TUNABLE_BLKDEV_TOTAL_BYTES_SEC: * * Marco represents the total throughput limit in bytes per second, * as VIR_TYPED_PARAM_ULLONG. */ -#define VIR_DOMAIN_EVENT_BLKDEVIOTUNE_TOTAL_BYTES_SEC "blkdeviotune.total_bytes_sec" +#define VIR_DOMAIN_TUNABLE_BLKDEV_TOTAL_BYTES_SEC "blkdeviotune.total_bytes_sec" /** - * VIR_DOMAIN_EVENT_BLKDEVIOTUNE_READ_BYTES_SEC: + * VIR_DOMAIN_TUNABLE_BLKDEV_READ_BYTES_SEC: * * Marco represents the read throughput limit in bytes per second, * as VIR_TYPED_PARAM_ULLONG. */ -#define VIR_DOMAIN_EVENT_BLKDEVIOTUNE_READ_BYTES_SEC "blkdeviotune.read_bytes_sec" +#define VIR_DOMAIN_TUNABLE_BLKDEV_READ_BYTES_SEC "blkdeviotune.read_bytes_sec" /** - * VIR_DOMAIN_EVENT_BLKDEVIOTUNE_WRITE_BYTES_SEC: + * VIR_DOMAIN_TUNABLE_BLKDEV_WRITE_BYTES_SEC: * * Macro represents the write throughput limit in bytes per second, * as VIR_TYPED_PARAM_ULLONG. */ -#define VIR_DOMAIN_EVENT_BLKDEVIOTUNE_WRITE_BYTES_SEC "blkdeviotune.write_bytes_sec" +#define VIR_DOMAIN_TUNABLE_BLKDEV_WRITE_BYTES_SEC "blkdeviotune.write_bytes_sec" /** - * VIR_DOMAIN_EVENT_BLKDEVIOTUNE_TOTAL_IOPS_SEC: + * VIR_DOMAIN_TUNABLE_BLKDEV_TOTAL_IOPS_SEC: * * Macro represents the total I/O operations per second, * as VIR_TYPED_PARAM_ULLONG. */ -#define VIR_DOMAIN_EVENT_BLKDEVIOTUNE_TOTAL_IOPS_SEC "blkdeviotune.total_iops_sec" +#define VIR_DOMAIN_TUNABLE_BLKDEV_TOTAL_IOPS_SEC "blkdeviotune.total_iops_sec" /** - * VIR_DOMAIN_EVENT_BLKDEVIOTUNE_READ_IOPS_SEC: + * VIR_DOMAIN_TUNABLE_BLKDEV_READ_IOPS_SEC: * * Macro represents the read I/O operations per second, * as VIR_TYPED_PARAM_ULLONG. */ -#define VIR_DOMAIN_EVENT_BLKDEVIOTUNE_READ_IOPS_SEC "blkdeviotune.read_iops_sec" +#define VIR_DOMAIN_TUNABLE_BLKDEV_READ_IOPS_SEC "blkdeviotune.read_iops_sec" /** - * VIR_DOMAIN_EVENT_BLKDEVIOTUNE_WRITE_IOPS_SEC: + * VIR_DOMAIN_TUNABLE_BLKDEV_WRITE_IOPS_SEC: * * Macro represents the write I/O operations per second, * as VIR_TYPED_PARAM_ULLONG. */ -#define VIR_DOMAIN_EVENT_BLKDEVIOTUNE_WRITE_IOPS_SEC "blkdeviotune.write_iops_sec" +#define VIR_DOMAIN_TUNABLE_BLKDEV_WRITE_IOPS_SEC "blkdeviotune.write_iops_sec" /** * virConnectDomainEventTunableCallback: diff --git a/src/qemu/qemu_cgroup.c b/src/qemu/qemu_cgroup.c index 300946a..8819943 100644 --- a/src/qemu/qemu_cgroup.c +++ b/src/qemu/qemu_cgroup.c @@ -703,7 +703,7 @@ qemuSetupCpuCgroup(virDomainObjPtr vm) vm->def->cputune.shares = val; if (virTypedParamsAddULLong(&eventParams, &eventNparams, &eventMaxparams, - VIR_DOMAIN_EVENT_CPUTUNE_CPU_SHARES, + VIR_DOMAIN_TUNABLE_CPU_CPU_SHARES, val) < 0) return -1; diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 117138a..6e792a6 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -4653,7 +4653,7 @@ qemuDomainPinVcpuFlags(virDomainPtr dom, goto cleanup; if (snprintf(paramField, VIR_TYPED_PARAM_FIELD_LENGTH, - VIR_DOMAIN_EVENT_CPUTUNE_VCPUPIN, vcpu) < 0) { + VIR_DOMAIN_TUNABLE_CPU_VCPUPIN, vcpu) < 0) { goto cleanup; } @@ -4940,7 +4940,7 @@ qemuDomainPinEmulator(virDomainPtr dom, str = virBitmapFormat(pcpumap); if (virTypedParamsAddString(&eventParams, &eventNparams, &eventMaxparams, - VIR_DOMAIN_EVENT_CPUTUNE_EMULATORIN, + VIR_DOMAIN_TUNABLE_CPU_EMULATORIN, str) < 0) goto cleanup; @@ -9318,7 +9318,7 @@ qemuDomainSetSchedulerParametersFlags(virDomainPtr dom, if (virTypedParamsAddULLong(&eventParams, &eventNparams, &eventMaxNparams, - VIR_DOMAIN_EVENT_CPUTUNE_CPU_SHARES, + VIR_DOMAIN_TUNABLE_CPU_CPU_SHARES, val) < 0) goto cleanup; } @@ -9341,7 +9341,7 @@ qemuDomainSetSchedulerParametersFlags(virDomainPtr dom, if (virTypedParamsAddULLong(&eventParams, &eventNparams, &eventMaxNparams, - VIR_DOMAIN_EVENT_CPUTUNE_VCPU_PERIOD, + VIR_DOMAIN_TUNABLE_CPU_VCPU_PERIOD, value_ul) < 0) goto cleanup; } @@ -9361,7 +9361,7 @@ qemuDomainSetSchedulerParametersFlags(virDomainPtr dom, if (virTypedParamsAddLLong(&eventParams, &eventNparams, &eventMaxNparams, - VIR_DOMAIN_EVENT_CPUTUNE_VCPU_QUOTA, + VIR_DOMAIN_TUNABLE_CPU_VCPU_QUOTA, value_l) < 0) goto cleanup; } @@ -9382,7 +9382,7 @@ qemuDomainSetSchedulerParametersFlags(virDomainPtr dom, if (virTypedParamsAddULLong(&eventParams, &eventNparams, &eventMaxNparams, - VIR_DOMAIN_EVENT_CPUTUNE_EMULATOR_PERIOD, + VIR_DOMAIN_TUNABLE_CPU_EMULATOR_PERIOD, value_ul) < 0) goto cleanup; } @@ -9403,7 +9403,7 @@ qemuDomainSetSchedulerParametersFlags(virDomainPtr dom, if (virTypedParamsAddLLong(&eventParams, &eventNparams, &eventMaxNparams, - VIR_DOMAIN_EVENT_CPUTUNE_EMULATOR_QUOTA, + VIR_DOMAIN_TUNABLE_CPU_EMULATOR_QUOTA, value_l) < 0) goto cleanup; } @@ -16321,7 +16321,7 @@ qemuDomainSetBlockIoTune(virDomainPtr dom, goto endjob; if (virTypedParamsAddString(&eventParams, &eventNparams, &eventMaxparams, - VIR_DOMAIN_EVENT_BLKDEVIOTUNE_DISK, disk) < 0) + VIR_DOMAIN_TUNABLE_BLKDEV_DISK, disk) < 0) goto endjob; for (i = 0; i < nparams; i++) { @@ -16339,7 +16339,7 @@ qemuDomainSetBlockIoTune(virDomainPtr dom, set_bytes = true; if (virTypedParamsAddULLong(&eventParams, &eventNparams, &eventMaxparams, - VIR_DOMAIN_EVENT_BLKDEVIOTUNE_TOTAL_BYTES_SEC, + VIR_DOMAIN_TUNABLE_BLKDEV_TOTAL_BYTES_SEC, param->value.ul) < 0) goto endjob; } else if (STREQ(param->field, @@ -16348,7 +16348,7 @@ qemuDomainSetBlockIoTune(virDomainPtr dom, set_bytes = true; if (virTypedParamsAddULLong(&eventParams, &eventNparams, &eventMaxparams, - VIR_DOMAIN_EVENT_BLKDEVIOTUNE_READ_BYTES_SEC, + VIR_DOMAIN_TUNABLE_BLKDEV_READ_BYTES_SEC, param->value.ul) < 0) goto endjob; } else if (STREQ(param->field, @@ -16357,7 +16357,7 @@ qemuDomainSetBlockIoTune(virDomainPtr dom, set_bytes = true; if (virTypedParamsAddULLong(&eventParams, &eventNparams, &eventMaxparams, - VIR_DOMAIN_EVENT_BLKDEVIOTUNE_WRITE_BYTES_SEC, + VIR_DOMAIN_TUNABLE_BLKDEV_WRITE_BYTES_SEC, param->value.ul) < 0) goto endjob; } else if (STREQ(param->field, @@ -16366,7 +16366,7 @@ qemuDomainSetBlockIoTune(virDomainPtr dom, set_iops = true; if (virTypedParamsAddULLong(&eventParams, &eventNparams, &eventMaxparams, - VIR_DOMAIN_EVENT_BLKDEVIOTUNE_TOTAL_IOPS_SEC, + VIR_DOMAIN_TUNABLE_BLKDEV_TOTAL_IOPS_SEC, param->value.ul) < 0) goto endjob; } else if (STREQ(param->field, @@ -16375,7 +16375,7 @@ qemuDomainSetBlockIoTune(virDomainPtr dom, set_iops = true; if (virTypedParamsAddULLong(&eventParams, &eventNparams, &eventMaxparams, - VIR_DOMAIN_EVENT_BLKDEVIOTUNE_READ_IOPS_SEC, + VIR_DOMAIN_TUNABLE_BLKDEV_READ_IOPS_SEC, param->value.ul) < 0) goto endjob; } else if (STREQ(param->field, @@ -16384,7 +16384,7 @@ qemuDomainSetBlockIoTune(virDomainPtr dom, set_iops = true; if (virTypedParamsAddULLong(&eventParams, &eventNparams, &eventMaxparams, - VIR_DOMAIN_EVENT_BLKDEVIOTUNE_WRITE_IOPS_SEC, + VIR_DOMAIN_TUNABLE_BLKDEV_WRITE_IOPS_SEC, param->value.ul) < 0) goto endjob; } -- 1.9.3

3 3

[libvirt] [PATCH] lxc_monitor_protocol: Redefine xdr_uint64_t if needed
by Michal Privoznik 25 Sep '14

25 Sep '14

On some systems (using libtirpc instead of glibc's implementation), xdr_uint64_t exists rather under different name: xdr_u_int64_t. This makes compilation fail then: libvirt_lxc-lxc_monitor_protocol.o: In function `xdr_virLXCMonitorInitEventMsg': /usr/local/src/libvirt/libvirt-1.1.1/src/./lxc/lxc_monitor_protocol.c:31: undefined reference to `xdr_uint64_t' Therefore we rather mirror the d707c866 commit and redefine xdr_uint64_t if needed. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/lxc/lxc_monitor_protocol.x | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/src/lxc/lxc_monitor_protocol.x b/src/lxc/lxc_monitor_protocol.x index 0926e26..3b66af5 100644 --- a/src/lxc/lxc_monitor_protocol.x +++ b/src/lxc/lxc_monitor_protocol.x @@ -4,6 +4,25 @@ * the libvirt_lxc helper program. */ +/* cygwin's xdr implementation defines xdr_u_int64_t instead of xdr_uint64_t + * and lacks IXDR_PUT_INT32 and IXDR_GET_INT32 + */ +%#ifdef HAVE_XDR_U_INT64_T +%# define xdr_uint64_t xdr_u_int64_t +%#endif +%#ifndef IXDR_PUT_INT32 +%# define IXDR_PUT_INT32 IXDR_PUT_LONG +%#endif +%#ifndef IXDR_GET_INT32 +%# define IXDR_GET_INT32 IXDR_GET_LONG +%#endif +%#ifndef IXDR_PUT_U_INT32 +%# define IXDR_PUT_U_INT32 IXDR_PUT_U_LONG +%#endif +%#ifndef IXDR_GET_U_INT32 +%# define IXDR_GET_U_INT32 IXDR_GET_U_LONG +%#endif + enum virLXCMonitorExitStatus { VIR_LXC_MONITOR_EXIT_STATUS_ERROR, VIR_LXC_MONITOR_EXIT_STATUS_SHUTDOWN, -- 1.8.5.5

2 1

[libvirt] [PATCH] remoteNodeGetFreePages: Don't alloc args.pages.pages_val
by Michal Privoznik 25 Sep '14

25 Sep '14

There's no one to free() it anyway. Instead, we can just pass the provided array pointer directly. ==20039== 48 bytes in 4 blocks are definitely lost in loss record 658 of 787 ==20039== at 0x4C2A700: calloc (in /usr/lib64/valgrind/vgpreload_memcheck-amd64-linux.so) ==20039== by 0x4EA661F: virAllocN (viralloc.c:191) ==20039== by 0x50386EF: remoteNodeGetFreePages (remote_driver.c:7625) ==20039== by 0x5003504: virNodeGetFreePages (libvirt.c:21379) ==20039== by 0x154625: cmdFreepages (virsh-host.c:374) ==20039== by 0x12F718: vshCommandRun (virsh.c:1935) ==20039== by 0x1339FB: main (virsh.c:3747) Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/remote/remote_driver.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index dc2d2fb..6c49e49 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -7622,9 +7622,7 @@ remoteNodeGetFreePages(virConnectPtr conn, goto done; } - if (VIR_ALLOC_N(args.pages.pages_val, npages) < 0) - goto done; - memcpy(args.pages.pages_val, pages, npages * sizeof(*pages)); + args.pages.pages_val = (u_int *) pages; args.pages.pages_len = npages; args.startCell = startCell; args.cellCount = cellCount; -- 1.8.5.5

2 1

[libvirt] [PATCH] virNodeAllocPages: Disallow RO connection
by Michal Privoznik 25 Sep '14

25 Sep '14

Due to a missing check the API can be successfully called even if the connection is ReadOnly. Fortunately, the API hasn't been released yet, so there's no need for a CVE. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/libvirt.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/libvirt.c b/src/libvirt.c index 388c040..245c373 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -21893,6 +21893,7 @@ virNodeAllocPages(virConnectPtr conn, virResetLastError(); virCheckConnectReturn(conn, -1); + virCheckReadOnlyGoto(conn->flags, error); virCheckNonZeroArgGoto(npages, error); virCheckNonNullArgGoto(pageSizes, error); virCheckNonNullArgGoto(pageCounts, error); -- 1.8.5.5

2 1

Re: [libvirt] [PATCH virt-manager] details: Add UI for enabling UEFI via 'customize before install'
by Laszlo Ersek 25 Sep '14

25 Sep '14

Hi Cole and Michal, I'm attaching three patches: On 09/20/14 02:37, Cole Robinson wrote: > On 09/17/2014 06:55 PM, Cole Robinson wrote: >> We expose a simple combobox with two entries: BIOS, and UEFI. The >> UEFI option is only selectable if 1) libvirt supports the necessary >> domcapabilities bits, 2) it detects that qemu supports the necessary >> command line options, and 3) libvirt detects a UEFI binary on the >> host that maps to a known template via qemu.conf >> >> If those conditions aren't met, we disable the UEFI option, and show >> a small warning icon with an explanatory tooltip. >> >> The option can only be changed via New VM->Customize Before Install. >> For existing x86 VMs, it's a readonly label. > > I've pushed this now, with follow up patches to handle a couple points > we discussed: > > - Remove the nvram deletion from delete.py, since it won't work in the > non-root case, and all uses of nvram should also be with a libvirt + > driver that provides UNDEFINE_NVRAM > > - Before using UNDEFINE_NVRAM, match the same condition that libvirt > uses: loader_ro is True and loader_type == "pflash" and bool(nvram) (1) unfortunately virt-manager commit 3feedb76 ("domain: Match UNDEFINE_NVRAM conditions with libvirt") is not correct (it doesn't work), and not what I had in mind: > diff --git a/virtManager/domain.py b/virtManager/domain.py > index 29f3861..abf3146 100644 > --- a/virtManager/domain.py > +++ b/virtManager/domain.py > @@ -1403,7 +1403,9 @@ class vmmDomain(vmmLibvirtObject): > flags |= getattr(libvirt, > "VIR_DOMAIN_UNDEFINE_SNAPSHOTS_METADATA", 0) > flags |= getattr(libvirt, "VIR_DOMAIN_UNDEFINE_MANAGED_SAVE", 0) > - if self.get_xmlobj().os.nvram: > + if (self.get_xmlobj().os.loader_ro is True and > + self.get_xmlobj().os.loader_type == "pflash" and > + self.get_xmlobj().os.nvram): > flags |= getattr(libvirt, "VIR_DOMAIN_UNDEFINE_NVRAM", 0) > try: > self._backend.undefineFlags(flags) Before virt-manager commit 3feedb76, the condition on which to set the flag was: self.get_xmlobj().os.nvram and it didn't work for all possible cases. After the patch, what you have is self.get_xmlobj().os.nvram *and* blah The commit only constrains (further tightens, further restricts) the original condition, which had been too restrictive to begin with. Again, the nvram element (or its text() child) can be completely absent from the domain XML -- libvirtd will generate the pathname of the varstore file on the fly, and it need not be part of the serialized XML file. So in the XML all you'll have is <os> <type arch='x86_64' machine='pc-i440fx-rhel7.0.0'>hvm</type> <loader readonly='yes' type='pflash'>/usr/share/OVMF/OVMF_CODE.fd</loader> <boot dev='cdrom'/> </os> or <os> <type arch='x86_64' machine='pc-i440fx-rhel7.0.0'>hvm</type> <loader readonly='yes' type='pflash'>/custom/OVMF_CODE.fd</loader> <nvram template='/custom/OVMF_VARS.fd'/> <boot dev='cdrom'/> </os> My suggestion was to *replace* the original condition with the (loader_ro && loader_type=="pflash") one. If you check my earlier message, I wrote *iff*, meaning "if and only if". Cole, can you please apply the first attached patch? (2) Unfortunately, even libvirtd needs to be modified, in addition. My patch for (1) *does* pass VIR_DOMAIN_UNDEFINE_NVRAM to libvirtd (I verified that with gdb), but libvirtd doesn't act upon it correctly. Namely, in the libvirtd source code, in qemuDomainUndefineFlags(), commit 273b6581 added: if (!virDomainObjIsActive(vm) && vm->def->os.loader && vm->def->os.loader->nvram && virFileExists(vm->def->os.loader->nvram)) { if (!(flags & VIR_DOMAIN_UNDEFINE_NVRAM)) { virReportError(VIR_ERR_OPERATION_INVALID, "%s", _("cannot delete inactive domain with nvram")); goto cleanup; } if (unlink(vm->def->os.loader->nvram) < 0) { virReportSystemError(errno, _("failed to remove nvram: %s"), vm->def->os.loader->nvram); goto cleanup; } } Here "vm->def->os.loader->nvram" evaluates to NULL: 6468 if (!virDomainObjIsActive(vm) && 6469 vm->def->os.loader && vm->def->os.loader->nvram && 6470 virFileExists(vm->def->os.loader->nvram)) { 6471 if (!(flags & VIR_DOMAIN_UNDEFINE_NVRAM)) { 6472 virReportError(VIR_ERR_OPERATION_INVALID, "%s", (gdb) print vm->def->os.loader $1 = (virDomainLoaderDefPtr) 0x7ff59c00bf20 (gdb) print vm->def->os.loader->nvram $2 = 0x0 I thought that the auto-generation of the nvram pathname (internal to libvirtd, ie. not visible in the XML file) would occur on the undefine path as well. Apparently this is not the case. Indeed, the only call to qemuPrepareNVRAM() is from qemuProcessStart(). Michal, would it be possible generate the *pathname* of the separate varstore in qemuDomainUndefineFlags() too? Please see the second attached patch; it works for me. (This patch is best looked at with "git diff -b" (or "git show -b").) (3) I just realized that a domain's name can change during its lifetime. Renaming a domain becomes a problem when the varstore's pathname is deduced from the domain's name. For this reason, the auto-generation should use the domain's UUID (which never changes). Michal, what do you think of the 3rd attached patch? I can resubmit these as standalone patches / series as well (the first to virt-tools-list, and the last two to libvir-list), if that's necessary. Thanks, Laszlo

3 5

[libvirt] [PATCH v4 0/2] parallels: use parallels SDK instead of prlctl tool
by Dmitry Guryanov 25 Sep '14

25 Sep '14

This patchset begins reworking of parallels driver. We have published Opensource version of parallels SDK (under LGPL license), so libvirt can link with it. Changes in v4: * Remove reference counting for PrlApi_InitEx and PrlApi_Deinit * remove Parallels SDK prefix in log messages * rename 'out' labels to 'cleanup' Dmitry Guryanov (2): parallels: build with parallels SDK parallels: login to parallels SDK configure.ac | 24 ++-- po/POTFILES.in | 1 + src/Makefile.am | 8 +- src/parallels/parallels_driver.c | 16 ++- src/parallels/parallels_sdk.c | 241 +++++++++++++++++++++++++++++++++++++++ src/parallels/parallels_sdk.h | 30 +++++ src/parallels/parallels_utils.h | 4 + 7 files changed, 310 insertions(+), 14 deletions(-) create mode 100644 src/parallels/parallels_sdk.c create mode 100644 src/parallels/parallels_sdk.h -- 1.9.3

2 4

[libvirt] [PATCH] storage: Fix logical pool fmt type unknown->auto
by Erik Skultety 25 Sep '14

25 Sep '14

According to our documentation logical pool supports formats 'auto' and 'lvm2'. However, in storage_conf.c we prevously defined storage pool formats: unknown, lvm2. Format 'auto' does make more sense than format 'unknown', so we should probably stay consistent with the documentation Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1123767 --- src/conf/storage_conf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/conf/storage_conf.c b/src/conf/storage_conf.c index 36696a4..75004fe 100644 --- a/src/conf/storage_conf.c +++ b/src/conf/storage_conf.c @@ -81,7 +81,7 @@ VIR_ENUM_IMPL(virStoragePoolFormatDisk, VIR_ENUM_IMPL(virStoragePoolFormatLogical, VIR_STORAGE_POOL_LOGICAL_LAST, - "unknown", "lvm2") + "auto", "lvm2") VIR_ENUM_IMPL(virStorageVolFormatDisk, -- 1.9.3

4 3

[libvirt] [PATCH 0/6] Post-copy live migration support
by Cristian Klein 25 Sep '14

25 Sep '14

Qemu currently implements pre-copy live migration. VM memory pages are first copied from the source hypervisor to the destination, potentially multiple times as pages get dirtied during transfer, then VCPU state is migrated. Unfortunately, if the VM dirties memory faster than the network bandwidth, then pre-copy cannot finish. `virsh` currently includes an option to suspend a VM after a timeout, so that migration may finish, but at the expense of downtime. A future version of qemu will implement post-copy live migration. The VCPU state is first migrated to the destination hypervisor, then memory pages are pulled from the source hypervisor. Post-copy has the potential to do migration with zero-downtime, despite the VM dirtying pages fast, with minimum performance impact. On the other hand, one post-copy is in progress, any network failure would render the VM unusable, as its memory is partitioned between the source and destination hypervisor. Therefore, post-copy should only be used when necessary. Post-copy migration in qemu will work as follows: (1) The `x-postcopy-ram` migration capability needs to be set. (2) Migration is started. (3) When the user decides so, post-copy migration is activated by sending the `migrate-start-postcopy` command. Qemu acknowledges by setting migration status to `postcopy-active`. Cristian Klein (6): Added qemu postcopy-active migration status Added public API to enable post-copy migration Added new public API virDomainMigrateStartPostCopy Added domainMigrateStartPostCopy in qemu driver Added domainMigrateStartPostCopy in remote driver virsh: added migrate --postcopy-after include/libvirt/libvirt.h.in | 3 ++ src/driver.h | 4 +++ src/libvirt.c | 44 +++++++++++++++++++++++++++ src/libvirt_public.syms | 5 +++ src/qemu/qemu_driver.c | 44 +++++++++++++++++++++++++++ src/qemu/qemu_migration.c | 44 +++++++++++++++++++++++++++ src/qemu/qemu_migration.h | 3 +- src/qemu/qemu_monitor.c | 21 ++++++++++++- src/qemu/qemu_monitor.h | 3 ++ src/qemu/qemu_monitor_json.c | 21 ++++++++++++- src/qemu/qemu_monitor_json.h | 1 + src/qemu/qemu_monitor_text.c | 14 ++++++++- src/qemu/qemu_monitor_text.h | 2 ++ src/remote/remote_driver.c | 1 + src/remote/remote_protocol.x | 12 +++++++- tools/virsh-domain.c | 72 ++++++++++++++++++++++++++++++++++++++++++-- tools/virsh.pod | 5 +++ 17 files changed, 292 insertions(+), 7 deletions(-) -- 1.9.1

6 27

[libvirt] [PATCH] virnetserver: Raise log level of max_clients related messages
by Michal Privoznik 25 Sep '14

25 Sep '14

We have these configuration knobs, like max_clients and max_anonymous_clients. They limit the number of clients connected. Whenever the limit is reached, the daemon stops accepting new ones and resumes if one of the connected clients disconnects. If that's the case, a debug message is printed into the logs. And when the daemon starts over to accept new clients too. However, the problem is the messages have debug priority. This may be unfortunate, because if the daemon stops accepting new clients all of a sudden, and users don't have debug logs enabled they have no idea what's going on. Raise the messages level to INFO at least. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/rpc/virnetserver.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/rpc/virnetserver.c b/src/rpc/virnetserver.c index 7e3fc0a..762c185 100644 --- a/src/rpc/virnetserver.c +++ b/src/rpc/virnetserver.c @@ -285,14 +285,14 @@ static int virNetServerAddClient(virNetServerPtr srv, if (srv->nclients_unauth_max && srv->nclients_unauth == srv->nclients_unauth_max) { /* Temporarily stop accepting new clients */ - VIR_DEBUG("Temporarily suspending services " - "due to max_anonymous_clients"); + VIR_INFO("Temporarily suspending services " + "due to max_anonymous_clients"); virNetServerUpdateServicesLocked(srv, false); } if (srv->nclients == srv->nclients_max) { /* Temporarily stop accepting new clients */ - VIR_DEBUG("Temporarily suspending services due to max_clients"); + VIR_INFO("Temporarily suspending services due to max_clients"); virNetServerUpdateServicesLocked(srv, false); } @@ -1080,7 +1080,7 @@ virNetServerCheckLimits(virNetServerPtr srv) (!srv->nclients_unauth_max || srv->nclients_unauth < srv->nclients_unauth_max)) { /* Now it makes sense to accept() a new client. */ - VIR_DEBUG("Re-enabling services"); + VIR_INFO("Re-enabling services"); virNetServerUpdateServicesLocked(srv, true); } } -- 1.8.5.5

2 1