- Devel - libvirt List Archives

[libvirt] [PATCH] storage: rbd: Fix build
by Peter Krempa 29 Mar '16

29 Mar '16

After the recent commits the build didn't work for me. Fix it by using size_t as the callback argument is using and the correct formatter. The attempted fixup to use %llu as a formatter was wrong. --- Pushed now. src/storage/storage_backend_rbd.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/storage/storage_backend_rbd.c b/src/storage/storage_backend_rbd.c index c9b47e2..6e92ff7 100644 --- a/src/storage/storage_backend_rbd.c +++ b/src/storage/storage_backend_rbd.c @@ -311,7 +311,7 @@ virStorageBackendRBDRefreshVolInfoCb(uint64_t offset ATTRIBUTE_UNUSED, int exists, void *arg) { - uint64_t *used_size = (uint64_t *)(arg); + size_t *used_size = (size_t *)(arg); if (exists) (*used_size) += len; @@ -324,7 +324,7 @@ virStorageBackendRBDSetAllocation(virStorageVolDefPtr vol, rbd_image_info_t *info) { int r, ret = -1; - uint64_t allocation = 0; + size_t allocation = 0; if ((r = rbd_diff_iterate2(image, NULL, 0, info->size, 0, 1, &virStorageBackendRBDRefreshVolInfoCb, @@ -334,7 +334,7 @@ virStorageBackendRBDSetAllocation(virStorageVolDefPtr vol, goto cleanup; } - VIR_DEBUG("Found %llu bytes allocated for RBD image %s", + VIR_DEBUG("Found %zu bytes allocated for RBD image %s", allocation, vol->name); vol->target.allocation = allocation; -- 2.7.3

1 0

[libvirt] [PATCH] util: generate correct macvtap name
by Shanzhi Yu 29 Mar '16

29 Mar '16

in commit 370608b, bitmap of in-used macvtap devices was introduced. if there is already macvtap device created not by libvirt, virNetDevMacVLanCreateWithVPortProfile will failed after try MACVLAN_MAX_ID times call virNetDevMacVLanReleaseID Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1321546 Signed-off-by: Shanzhi Yu <shyu(a)redhat.com> --- src/util/virnetdevmacvlan.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/src/util/virnetdevmacvlan.c b/src/util/virnetdevmacvlan.c index 2409113..973363e 100644 --- a/src/util/virnetdevmacvlan.c +++ b/src/util/virnetdevmacvlan.c @@ -988,7 +988,8 @@ virNetDevMacVLanCreateWithVPortProfile(const char *ifnameRequested, MACVTAP_NAME_PREFIX : MACVLAN_NAME_PREFIX; const char *pattern = (flags & VIR_NETDEV_MACVLAN_CREATE_WITH_TAP) ? MACVTAP_NAME_PATTERN : MACVLAN_NAME_PATTERN; - int rc, reservedID = -1; + int rc = -1; + int reservedID = 0; char ifname[IFNAMSIZ]; int retries, do_retry = 0; uint32_t macvtapMode; @@ -1072,16 +1073,17 @@ virNetDevMacVLanCreateWithVPortProfile(const char *ifnameRequested, retries = MACVLAN_MAX_ID; while (!ifnameCreated && retries) { virMutexLock(&virNetDevMacVLanCreateMutex); - reservedID = virNetDevMacVLanReserveID(reservedID, flags, false, true); - if (reservedID < 0) { - virMutexUnlock(&virNetDevMacVLanCreateMutex); - return -1; - } snprintf(ifname, sizeof(ifname), pattern, reservedID); rc = virNetDevMacVLanCreate(ifname, type, macaddress, linkdev, macvtapMode, &do_retry); if (rc < 0) { - virNetDevMacVLanReleaseID(reservedID, flags); + reservedID++; + reservedID = virNetDevMacVLanReserveID(reservedID, flags, false, true); + if (reservedID < 0) { + virMutexUnlock(&virNetDevMacVLanCreateMutex); + return -1; + } + virMutexUnlock(&virNetDevMacVLanCreateMutex); if (!do_retry) return -1; -- 1.8.3.1

2 3

[libvirt] [PATCH 0/3] libxl: improve libxlDomainStart error handling
by Jim Fehlig 29 Mar '16

29 Mar '16

libxlDomainStart allocates and reserves resources, which should be cleaned up on error paths. This small series is based on Chunyan's patch to do the same [0]. It breaks the patch into three patches to ease review and better understand the changes. [0] https://www.redhat.com/archives/libvir-list/2016-March/msg00929.html Chunyan Liu (1): libxl: fix resource leaks in libxlDomainStart error paths Jim Fehlig (2): libxl: rename cleanup_dom label libxl: only disable domain death events in libxlDomainCleanup src/libxl/libxl_domain.c | 44 ++++++++++++++++++++------------------------ 1 file changed, 20 insertions(+), 24 deletions(-) -- 2.1.4

2 6

[libvirt] [PATCH] libxl: remove reference to non-existent out label
by Jim Fehlig 28 Mar '16

28 Mar '16

Commit e6336442 changed the 'out:' label to 'cleanup' in libxlDomainAttachNetDevice(), but missed a comment referencing the 'out:' label. Remove it from the comment since it is no longer accurate anyhow. Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- Pushing as trivial. src/libxl/libxl_driver.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index cfc4555..5103495 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -3159,7 +3159,7 @@ libxlDomainAttachNetDevice(libxlDriverPrivatePtr driver, /* This is really a "smart hostdev", so it should be attached * as a hostdev (the hostdev code will reach over into the * netdev-specific code as appropriate), then also added to - * the nets list (see out:) if successful. + * the nets list if successful. */ ret = libxlDomainAttachHostDevice(driver, vm, hostdev); goto cleanup; -- 2.1.4

1 0

[libvirt] [PATCH] tests: virtnettlscontexttest: Use virGetLastErrorMessage()
by Cole Robinson 28 Mar '16

28 Mar '16

Use virGetLastErrorMessage() rather than open code it --- There's many more examples of this spread around the code; this patch is meant as an example for http://wiki.libvirt.org/page/BiteSizedTasks tests/virnettlscontexttest.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tests/virnettlscontexttest.c b/tests/virnettlscontexttest.c index a3e24a3..d33b896 100644 --- a/tests/virnettlscontexttest.c +++ b/tests/virnettlscontexttest.c @@ -90,13 +90,12 @@ static int testTLSContextInit(const void *opaque) goto cleanup; } } else { - virErrorPtr err = virGetLastError(); if (!data->expectFail) { VIR_WARN("Unexpected failure %s against %s", data->cacrt, data->crt); goto cleanup; } - VIR_DEBUG("Got error %s", err ? err->message : "<unknown>"); + VIR_DEBUG("Got error %s", virGetLastErrorMessage()); } ret = 0; -- 2.5.0

2 1

[libvirt] [PATCH] docs: Update the hyperv feature qemu supported version
by John Ferlan 28 Mar '16

28 Mar '16

In order to follow recent comments which indicate support for specific feature bits are supported by a specific QEMU version add the version from whence the relaxed, vapic, and spinlocks support was added. Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- Pushing as trivial and essentially a follow on to commit id '7068b56c' in order to keep things looking the same docs/formatdomain.html.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 630c682..a1d7c4a 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -1528,19 +1528,19 @@ <td>relaxed</td> <td>Relax constraints on timers</td> <td> on, off</td> - <td>1.0.0 (QEMU only)</td> + <td>1.0.0 (QEMU 2.0)</td> </tr> <tr> <td>vapic</td> <td>Enable virtual APIC</td> <td>on, off</td> - <td>1.1.0 (QEMU only)</td> + <td>1.1.0 (QEMU 2.0)</td> </tr> <tr> <td>spinlocks</td> <td>Enable spinlock support</td> <td>on, off; retries - at least 4095</td> - <td>1.1.0 (QEMU only)</td> + <td>1.1.0 (QEMU 2.0)</td> </tr> <tr> <td>vpindex</td> -- 2.5.5

2 1

[libvirt] [PATCH] docs: website: more header spacing tweaks
by Cole Robinson 28 Mar '16

28 Mar '16

- remove top padding for h1. this means page titles sit flush with the top of the side bar (like 'The virtualization API' on the front page) - up the top padding for the remaining sections. makes it visually easier to tell adjacent header sections apart, especially in dense wiki pages - use two different spacing levels for h2-h4 and h5-h6, gives pages some more visual flexibility - use a slightly lower bottom padding... this makes top padding stick out more which makes it visually easier to differentiate between adjacent header sections --- Before: http://i.imgur.com/5TxW9Fg.png After: http://i.imgur.com/1MPjzHR.png docs/generic.css | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/docs/generic.css b/docs/generic.css index 664e719..aeea17f 100644 --- a/docs/generic.css +++ b/docs/generic.css @@ -48,26 +48,31 @@ h1, h2, h3, h4, h5, h6 { font-weight: bold; margin: 0px; padding: 0px; - margin-top: 0.5em; - margin-bottom: 0.5em; + margin-bottom: 0.25em; border-bottom: 1px solid #aaa; } h1 { + margin-top: 0em; font-size: 2em; } h2 { + margin-top: 1.0em; font-size: 1.6em; } h3 { + margin-top: 1.0em; font-size: 1.4em; } h4 { + margin-top: 1.0em; font-size: 1.2em; } h5 { + margin-top: 0.75em; font-size: 1em; } h6 { + margin-top: 0.75em; font-size: 0.8em; } -- 2.5.0

2 1

[libvirt] [PATCH v2 0/3] Add support for more HyperV Enlightenment features
by Nikolay Shirokovskiy 28 Mar '16

28 Mar '16

Changes from v1: ================ 1. hv_reset and hv_vendor_id are supported 2. preparation patches [2],[3] for hv_vendor_id to reduce code dups Maxim Nestratov (1): conf: qemu: Add support for more HyperV Enlightenment features Nikolay Shirokovskiy (2): conf: refactor hyperv features parsing conf: refactor hyperv features xml output docs/formatdomain.html.in | 41 +++++ docs/schemas/domaincommon.rng | 37 ++++ src/conf/domain_conf.c | 186 +++++++++++++-------- src/conf/domain_conf.h | 9 + src/qemu/qemu_command.c | 11 ++ src/qemu/qemu_parse_command.c | 20 +++ tests/qemuxml2argvdata/qemuxml2argv-hyperv-off.xml | 6 + tests/qemuxml2argvdata/qemuxml2argv-hyperv.args | 3 +- tests/qemuxml2argvdata/qemuxml2argv-hyperv.xml | 6 + .../qemuxml2xmlout-hyperv-off.xml | 6 + tests/qemuxml2xmloutdata/qemuxml2xmlout-hyperv.xml | 6 + 11 files changed, 262 insertions(+), 69 deletions(-) -- 1.8.3.1

3 7

[libvirt] [PATCH 0/2] Enable pool-rbd storagexml2xmltest
by Anatole Denis 28 Mar '16

28 Mar '16

The test for an RBD pool in storagepoolxml2xml was commited 4 years ago but it was not enabled. It was also incorrect, but didn't generate errors because it was never run. These patches correct the test then enable it Anatole Denis (2): tests: storagepoolxml2xmltest: Fix pool-rbd test tests: storagepoolxml2xmltest: Enable pool-rbd tests/storagepoolxml2xmlin/pool-rbd.xml | 1 + tests/storagepoolxml2xmlout/pool-rbd.xml | 2 +- tests/storagepoolxml2xmltest.c | 3 +++ 3 files changed, 5 insertions(+), 1 deletion(-) -- 2.7.2

2 3

[libvirt] [PATCH] util: avoid getting stuck on macvtapN name created outside libvirt
by Laine Stump 28 Mar '16

28 Mar '16

After the patches that added tracking of in-use macvtap names (commit 370608, first appearing in libvirt-1.3.2), if the function to allocate a new macvtap device came to a device name created outside libvirt, it would retry the same device name MACVLAN_MAX_I (8191) times before finally giving up in failure. The problem was that virBitmapNextClearBit was always being called with "0" rather than the value most recently checked (which would increment each time through the loop). Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1321546 --- I'm not sure how this bug snuck in, because this is one of the scenarios I tested. The only thing I can think of is that I screwed up somehow during a rebase after testing and before posting/pushing (or possibly I had tested these cases in an earlier iteration, but forgot to do so with the final version) :-/ Sigh. src/util/virnetdevmacvlan.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/util/virnetdevmacvlan.c b/src/util/virnetdevmacvlan.c index 2409113..d755b93 100644 --- a/src/util/virnetdevmacvlan.c +++ b/src/util/virnetdevmacvlan.c @@ -131,7 +131,7 @@ virNetDevMacVLanReserveID(int id, unsigned int flags, } if ((id < 0 || nextFree) && - (id = virBitmapNextClearBit(bitmap, 0)) < 0) { + (id = virBitmapNextClearBit(bitmap, id)) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("no unused %s names available"), (flags & VIR_NETDEV_MACVLAN_CREATE_WITH_TAP) ? -- 2.5.5

2 1