- Devel - libvirt List Archives

[libvirt] [PATCH] Perform disk config validity checking for attach-device config
by John Ferlan 05 Aug '14

05 Aug '14

https://bugzilla.redhat.com/show_bug.cgi?id=1078126 Using 'virsh attach-device --config' (or --persistent) to attach a file backed lun device will succeed; however, subsequent domain restarts will result in failure because the configuration of a file backed lun is not supported. Although allowing 'illegal configurations' is something that can be allowed, it may not be practical in this case. Generally, when attaching a device to a domain means the domain must be running. A way around this is using the --config (or --persistent) option. When an attach is done to a running domain, a temporary configuration is modified first followed by the live update. The live update will make a number of disk validity checks when building the qemu command to attach the disk. If any fail, then change is rejected. Rather than allow a potentially illegal combination, adjust the code in the configuration path to make the same checks as the running path will make with respect to disk validity checks. This way we avoid having the potential for some subsequent start/reboot to fail because an illegal combination was allowed. NB: The live checking remains since it is possible to just to --live configuration modification. Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- src/qemu/qemu_command.c | 138 ++++++++++++++++++++++++++---------------------- src/qemu/qemu_command.h | 3 ++ src/qemu/qemu_driver.c | 2 + 3 files changed, 81 insertions(+), 62 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 4e074e5..8e56151 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -3234,6 +3234,81 @@ qemuGetDriveSourceString(virStorageSourcePtr src, } +int +qemuBuildCheckDisk(virDomainDiskDefPtr disk, + virQEMUCapsPtr qemuCaps) +{ + if (virDiskNameToIndex(disk->dst) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("unsupported disk type '%s'"), disk->dst); + goto error; + } + + if (disk->wwn) { + if ((disk->bus != VIR_DOMAIN_DISK_BUS_IDE) && + (disk->bus != VIR_DOMAIN_DISK_BUS_SCSI)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("Only ide and scsi disk support wwn")); + goto error; + } + } + + if ((disk->vendor || disk->product) && + disk->bus != VIR_DOMAIN_DISK_BUS_SCSI) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("Only scsi disk supports vendor and product")); + goto error; + } + + if (disk->device == VIR_DOMAIN_DISK_DEVICE_LUN) { + /* make sure that both the bus and the qemu binary support + * type='lun' (SG_IO). + */ + if (disk->bus != VIR_DOMAIN_DISK_BUS_VIRTIO && + disk->bus != VIR_DOMAIN_DISK_BUS_SCSI) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("disk device='lun' is not supported for bus='%s'"), + virDomainDiskQEMUBusTypeToString(disk->bus)); + goto error; + } + if (disk->src->type == VIR_STORAGE_TYPE_NETWORK) { + if (disk->src->protocol != VIR_STORAGE_NET_PROTOCOL_ISCSI) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("disk device='lun' is not supported " + "for protocol='%s'"), + virStorageNetProtocolTypeToString(disk->src->protocol)); + goto error; + } + } else if (!virDomainDiskSourceIsBlockType(disk)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("disk device='lun' is only valid for block " + "type disk source")); + goto error; + } + if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_VIRTIO_BLK_SG_IO)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("disk device='lun' is not supported by " + "this QEMU")); + goto error; + } + if (disk->wwn) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("Setting wwn is not supported for lun device")); + goto error; + } + if (disk->vendor || disk->product) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("Setting vendor or product is not supported " + "for lun device")); + goto error; + } + } + return 0; + error: + return -1; +} + + char * qemuBuildDriveStr(virConnectPtr conn, virDomainDiskDefPtr disk, @@ -3620,71 +3695,10 @@ qemuBuildDriveDevStr(virDomainDefPtr def, { virBuffer opt = VIR_BUFFER_INITIALIZER; const char *bus = virDomainDiskQEMUBusTypeToString(disk->bus); - int idx = virDiskNameToIndex(disk->dst); int controllerModel; - if (idx < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("unsupported disk type '%s'"), disk->dst); + if (qemuBuildCheckDisk(disk, qemuCaps) < 0) goto error; - } - - if (disk->wwn) { - if ((disk->bus != VIR_DOMAIN_DISK_BUS_IDE) && - (disk->bus != VIR_DOMAIN_DISK_BUS_SCSI)) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("Only ide and scsi disk support wwn")); - goto error; - } - } - - if ((disk->vendor || disk->product) && - disk->bus != VIR_DOMAIN_DISK_BUS_SCSI) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("Only scsi disk supports vendor and product")); - goto error; - } - - if (disk->device == VIR_DOMAIN_DISK_DEVICE_LUN) { - /* make sure that both the bus and the qemu binary support - * type='lun' (SG_IO). - */ - if (disk->bus != VIR_DOMAIN_DISK_BUS_VIRTIO && - disk->bus != VIR_DOMAIN_DISK_BUS_SCSI) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("disk device='lun' is not supported for bus='%s'"), - bus); - goto error; - } - if (disk->src->type == VIR_STORAGE_TYPE_NETWORK) { - if (disk->src->protocol != VIR_STORAGE_NET_PROTOCOL_ISCSI) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("disk device='lun' is not supported for protocol='%s'"), - virStorageNetProtocolTypeToString(disk->src->protocol)); - goto error; - } - } else if (!virDomainDiskSourceIsBlockType(disk)) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("disk device='lun' is only valid for block type disk source")); - goto error; - } - if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_VIRTIO_BLK_SG_IO)) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("disk device='lun' is not supported by this QEMU")); - goto error; - } - if (disk->wwn) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("Setting wwn is not supported for lun device")); - goto error; - } - if (disk->vendor || disk->product) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("Setting vendor or product is not supported " - "for lun device")); - goto error; - } - } switch (disk->bus) { case VIR_DOMAIN_DISK_BUS_IDE: diff --git a/src/qemu/qemu_command.h b/src/qemu/qemu_command.h index b71e964..00097f9 100644 --- a/src/qemu/qemu_command.h +++ b/src/qemu/qemu_command.h @@ -271,4 +271,7 @@ qemuParseKeywords(const char *str, int qemuGetDriveSourceString(virStorageSourcePtr src, virConnectPtr conn, char **source); + +int qemuBuildCheckDisk(virDomainDiskDefPtr disk, + virQEMUCapsPtr qemuCaps); #endif /* __QEMU_COMMAND_H__*/ diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index a3de784..5bc2785 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -6744,6 +6744,8 @@ qemuDomainAttachDeviceConfig(virQEMUCapsPtr qemuCaps, _("target %s already exists"), disk->dst); return -1; } + if (qemuBuildCheckDisk(disk, qemuCaps) < 0) + return -1; if (virDomainDiskInsert(vmdef, disk)) return -1; /* vmdef has the pointer. Generic codes for vmdef will do all jobs */ -- 1.9.3

1 0

[libvirt] [libvirt-glib] [PATCH v6 1/3] libvirt-gobject-domain: Add _fetch_snapshots
by mail＠baedert.org 04 Aug '14

04 Aug '14

From: Timm Bäder <mail(a)baedert.org> This function can be used to fetch the snapshots of a domain (according to the given GVirDomainSnapshotListFlags) and save them in a domain-internal GHashTable. A function to access them from outside will be added in a later patch. --- libvirt-gobject/libvirt-gobject-domain.c | 85 ++++++++++++++++++++++++++++++++ libvirt-gobject/libvirt-gobject-domain.h | 37 ++++++++++++++ libvirt-gobject/libvirt-gobject.sym | 2 + 3 files changed, 124 insertions(+) diff --git a/libvirt-gobject/libvirt-gobject-domain.c b/libvirt-gobject/libvirt-gobject-domain.c index c6e30e5..708cb3b 100644 --- a/libvirt-gobject/libvirt-gobject-domain.c +++ b/libvirt-gobject/libvirt-gobject-domain.c @@ -38,6 +38,8 @@ struct _GVirDomainPrivate { virDomainPtr handle; gchar uuid[VIR_UUID_STRING_BUFLEN]; + GHashTable *snapshots; + GMutex *lock; }; G_DEFINE_TYPE(GVirDomain, gvir_domain, G_TYPE_OBJECT); @@ -121,6 +123,11 @@ static void gvir_domain_finalize(GObject *object) g_debug("Finalize GVirDomain=%p", domain); + if (priv->snapshots) { + g_hash_table_unref(priv->snapshots); + } + g_mutex_free(priv->lock); + virDomainFree(priv->handle); G_OBJECT_CLASS(gvir_domain_parent_class)->finalize(object); @@ -237,6 +244,7 @@ static void gvir_domain_init(GVirDomain *domain) g_debug("Init GVirDomain=%p", domain); domain->priv = GVIR_DOMAIN_GET_PRIVATE(domain); + domain->priv->lock = g_mutex_new(); } typedef struct virDomain GVirDomainHandle; @@ -1514,3 +1522,80 @@ gvir_domain_create_snapshot(GVirDomain *dom, g_free(custom_xml); return dom_snapshot; } + + + +/** + * gvir_domain_fetch_snapshots: + * @dom: The domain + * @list_flags: bitwise-OR of #GVirDomainSnapshotListFlags + * @cancellable: (allow-none)(transfer-none): cancellation object + * @error: (allow-none): Place-holder for error or NULL + * + * Returns: TRUE on success, FALSE otherwise. + */ +gboolean gvir_domain_fetch_snapshots(GVirDomain *dom, + guint list_flags, + GCancellable *cancellable, + GError **error) +{ + GVirDomainPrivate *priv; + virDomainSnapshotPtr *snapshots = NULL; + GVirDomainSnapshot *snap; + GHashTable *snap_table; + int n_snaps = 0; + int i; + gboolean ret = FALSE; + + g_return_val_if_fail(GVIR_IS_DOMAIN(dom), FALSE); + g_return_val_if_fail((error == NULL) || (*error == NULL), FALSE); + + priv = dom->priv; + + snap_table = g_hash_table_new_full(g_str_hash, + g_str_equal, + NULL, + g_object_unref); + + + n_snaps = virDomainListAllSnapshots(priv->handle, &snapshots, list_flags); + + if (g_cancellable_set_error_if_cancelled(cancellable, error)) { + goto cleanup; + } + + if (n_snaps < 0) { + gvir_set_error(error, GVIR_DOMAIN_ERROR, 0, + "Unable to fetch snapshots of %s", + gvir_domain_get_name(dom)); + goto cleanup; + } + + for (i = 0; i < n_snaps; i ++) { + if (g_cancellable_set_error_if_cancelled(cancellable, error)) { + goto cleanup; + } + snap = GVIR_DOMAIN_SNAPSHOT(g_object_new(GVIR_TYPE_DOMAIN_SNAPSHOT, + "handle", snapshots[i], + NULL)); + g_hash_table_insert(snap_table, + (gpointer)gvir_domain_snapshot_get_name(snap), + snap); + } + + + g_mutex_lock(priv->lock); + if (priv->snapshots != NULL) + g_hash_table_unref(priv->snapshots); + priv->snapshots = snap_table; + snap_table = NULL; + g_mutex_unlock(priv->lock); + + ret = TRUE; + +cleanup: + free(snapshots); + if (snap_table != NULL) + g_hash_table_unref(snap_table); + return ret; +} diff --git a/libvirt-gobject/libvirt-gobject-domain.h b/libvirt-gobject/libvirt-gobject-domain.h index 38d3458..8c1a8e5 100644 --- a/libvirt-gobject/libvirt-gobject-domain.h +++ b/libvirt-gobject/libvirt-gobject-domain.h @@ -183,6 +183,39 @@ typedef enum { GVIR_DOMAIN_REBOOT_GUEST_AGENT = VIR_DOMAIN_REBOOT_GUEST_AGENT, } GVirDomainRebootFlags; +/** + * GVirDomainSnapshotListFlags: + * @GVIR_DOMAIN_SNAPSHOT_LIST_ALL: List all snapshots + * @GVIR_DOMAIN_SNAPSHOT_LIST_DESCENDANTS: List all descendants, not just + * children, when listing a snapshot. + * For historical reasons, groups do not use contiguous bits. + * @GVIR_DOMAIN_SNAPSHOT_LIST_ROOTS: Filter by snapshots with no parents, when listing a domain + * @GVIR_DOMAIN_SNAPSHOT_LIST_METADATA: Filter by snapshots which have metadata + * @GVIR_DOMAIN_SNAPSHOT_LIST_LEAVES: Filter by snapshots with no children + * @GVIR_DOMAIN_SNAPSHOT_LIST_NO_LEAVES: Filter by snapshots that have children + * @GVIR_DOMAIN_SNAPSHOT_LIST_NO_METADATA: Filter by snapshots with no metadata + * @GVIR_DOMAIN_SNAPSHOT_LIST_INACTIVE: Filter by snapshots taken while guest was shut off + * @GVIR_DOMAIN_SNAPSHOT_LIST_ACTIVE: Filter by snapshots taken while guest was active, and with memory state + * @GVIR_DOMAIN_SNAPSHOT_LIST_DISK_ONLY: Filter by snapshots taken while guest was active, but without memory state + * @GVIR_DOMAIN_SNAPSHOT_LIST_INTERNAL: Filter by snapshots stored internal to disk images + * @GVIR_DOMAIN_SNAPSHOT_LIST_EXTERNAL: Filter by snapshots that use files external to disk images + */ +typedef enum { + GVIR_DOMAIN_SNAPSHOT_LIST_ALL = 0, + GVIR_DOMAIN_SNAPSHOT_LIST_DESCENDANTS = VIR_DOMAIN_SNAPSHOT_LIST_DESCENDANTS, + GVIR_DOMAIN_SNAPSHOT_LIST_ROOTS = VIR_DOMAIN_SNAPSHOT_LIST_ROOTS, + GVIR_DOMAIN_SNAPSHOT_LIST_METADATA = VIR_DOMAIN_SNAPSHOT_LIST_METADATA, + GVIR_DOMAIN_SNAPSHOT_LIST_LEAVES = VIR_DOMAIN_SNAPSHOT_LIST_LEAVES, + GVIR_DOMAIN_SNAPSHOT_LIST_NO_LEAVES = VIR_DOMAIN_SNAPSHOT_LIST_NO_LEAVES, + GVIR_DOMAIN_SNAPSHOT_LIST_NO_METADATA = VIR_DOMAIN_SNAPSHOT_LIST_NO_METADATA, + GVIR_DOMAIN_SNAPSHOT_LIST_INACTIVE = VIR_DOMAIN_SNAPSHOT_LIST_INACTIVE, + GVIR_DOMAIN_SNAPSHOT_LIST_ACTIVE = VIR_DOMAIN_SNAPSHOT_LIST_ACTIVE, + GVIR_DOMAIN_SNAPSHOT_LIST_DISK_ONLY = VIR_DOMAIN_SNAPSHOT_LIST_DISK_ONLY, + GVIR_DOMAIN_SNAPSHOT_LIST_INTERNAL = VIR_DOMAIN_SNAPSHOT_LIST_INTERNAL, + GVIR_DOMAIN_SNAPSHOT_LIST_EXTERNAL = VIR_DOMAIN_SNAPSHOT_LIST_EXTERNAL +} GVirDomainSnapshotListFlags; + + typedef struct _GVirDomainInfo GVirDomainInfo; struct _GVirDomainInfo { @@ -330,6 +363,10 @@ gvir_domain_create_snapshot(GVirDomain *dom, guint flags, GError **err); +gboolean gvir_domain_fetch_snapshots(GVirDomain *dom, + guint list_flags, + GCancellable *cancellable, + GError **error); G_END_DECLS #endif /* __LIBVIRT_GOBJECT_DOMAIN_H__ */ diff --git a/libvirt-gobject/libvirt-gobject.sym b/libvirt-gobject/libvirt-gobject.sym index b781cc6..781310f 100644 --- a/libvirt-gobject/libvirt-gobject.sym +++ b/libvirt-gobject/libvirt-gobject.sym @@ -236,7 +236,9 @@ LIBVIRT_GOBJECT_0.1.5 { LIBVIRT_GOBJECT_0.1.9 { global: + gvir_domain_fetch_snapshots; gvir_domain_snapshot_delete; + gvir_domain_snapshot_list_flags_get_type; } LIBVIRT_GOBJECT_0.1.5; # .... define new API here using predicted next version number .... -- 2.0.3

2 3

[libvirt] [PATCH v2] storage: Refresh storage pool after upload
by John Ferlan 04 Aug '14

04 Aug '14

https://bugzilla.redhat.com/show_bug.cgi?id=1072653 Upon successful upload of a volume, the target volume and storage pool were not updated to reflect any changes as a result of the upload. Make use of the existing stream close callback mechanism to force a backend pool refresh to occur in a separate thread once the stream closes. The separate thread should avoid potential deadlocks if the refresh needed to wait on some event from the event loop which is used to perform the stream callback. Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- Update since v1 - as discussed in original posting, use virThreadCreate to generate a thread to handle the refresh callback: http://www.redhat.com/archives/libvir-list/2014-July/msg01395.html Avoid the Free callback function and have the thread do the memory free as long as thread creation was successful. Thus a couple of changes to function names were appropriate. Understood that this can wait for 1.2.8 - figured to get it ready to go NOTE: Still used pool refresh, since I found that without this patch applied a pool-dumpxml displayed the same allocation/available before and after the upload, so that data is not refreshed for each call as was my concern over using refreshVol vs. refreshPool # virsh pool-dumpxml default ... <allocation unit='bytes'>33852141568</allocation> <available unit='bytes'>110510419968</available> ... # virsh vol-upload test-qcow2-4g.img test.img default # virsh pool-dumpxml default ... <allocation unit='bytes'>33852141568</allocation> <available unit='bytes'>110510419968</available> ... # src/libvirt.c | 8 ++++ src/libvirt_private.syms | 1 + src/storage/storage_driver.c | 103 +++++++++++++++++++++++++++++++++++++++++++ tools/virsh.pod | 3 ++ 4 files changed, 115 insertions(+) diff --git a/src/libvirt.c b/src/libvirt.c index 143d319..992e4f2 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -13960,6 +13960,14 @@ virStorageVolDownload(virStorageVolPtr vol, * detect any errors. The results will be unpredictable if * another active stream is writing to the storage volume. * + * When the data stream is closed whether the upload is successful + * or not the target storage pool will be refreshed to reflect pool + * and volume changes as a result of the upload. Depending on + * the target volume storage backend and the source stream type + * for a successful upload, the target volume may take on the + * characteristics from the source stream such as format type, + * capacity, and allocation. + * * Returns 0, or -1 upon error. */ int diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index e792a44..08111d4 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -825,6 +825,7 @@ virFDStreamCreateFile; virFDStreamOpen; virFDStreamOpenFile; virFDStreamOpenPTY; +virFDStreamSetInternalCloseCb; # libvirt_internal.h diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c index efbe5ff..b023281 100644 --- a/src/storage/storage_driver.c +++ b/src/storage/storage_driver.c @@ -59,6 +59,12 @@ static virStorageDriverStatePtr driverState; static int storageStateCleanup(void); +typedef struct _virStorageVolStreamInfo virStorageVolStreamInfo; +typedef virStorageVolStreamInfo *virStorageVolStreamInfoPtr; +struct _virStorageVolStreamInfo { + char *pool_name; +}; + static void storageDriverLock(virStorageDriverStatePtr driver) { virMutexLock(&driver->lock); @@ -1956,6 +1962,78 @@ storageVolDownload(virStorageVolPtr obj, } +/** + * Frees opaque data. + * + * @opaque Data to be freed. + */ +static void +virStorageVolPoolRefreshDataFree(void *opaque) +{ + virStorageVolStreamInfoPtr cbdata = opaque; + + VIR_FREE(cbdata->pool_name); + VIR_FREE(cbdata); +} + +/** + * Thread to handle the pool refresh + * + * @st Pointer to stream being closed. + * @opaque Domain's device information structure. + */ +static void +virStorageVolPoolRefreshThread(void *opaque) +{ + + virStorageVolStreamInfoPtr cbdata = opaque; + virStoragePoolObjPtr pool = NULL; + virStorageBackendPtr backend; + + storageDriverLock(driverState); + if (!(pool = virStoragePoolObjFindByName(&driverState->pools, + cbdata->pool_name))) + goto cleanup; + + if (!(backend = virStorageBackendForType(pool->def->type))) + goto cleanup; + + virStoragePoolObjClearVols(pool); + if (backend->refreshPool(NULL, pool) < 0) + VIR_DEBUG("Failed to refresh storage pool"); + + cleanup: + if (pool) + virStoragePoolObjUnlock(pool); + storageDriverUnlock(driverState); + virStorageVolPoolRefreshDataFree(cbdata); +} + +/** + * Callback being called if a FDstream is closed. Will spin off a thread + * to perform a pool refresh. + * + * @st Pointer to stream being closed. + * @opaque Buffer to hold the pool name to be rereshed + */ +static void +virStorageVolFDStreamCloseCb(virStreamPtr st ATTRIBUTE_UNUSED, + void *opaque) +{ + virThread thread; + + if (virThreadCreate(&thread, false, virStorageVolPoolRefreshThread, + opaque) < 0) { + /* Not much else can be done */ + VIR_ERROR(_("Failed to create thread to handle pool refresh")); + goto error; + } + return; /* Thread will free opaque data */ + + error: + virStorageVolPoolRefreshDataFree(opaque); +} + static int storageVolUpload(virStorageVolPtr obj, virStreamPtr stream, @@ -1966,6 +2044,7 @@ storageVolUpload(virStorageVolPtr obj, virStorageBackendPtr backend; virStoragePoolObjPtr pool = NULL; virStorageVolDefPtr vol = NULL; + virStorageVolStreamInfoPtr cbdata = NULL; int ret = -1; virCheckFlags(0, -1); @@ -1996,11 +2075,35 @@ storageVolUpload(virStorageVolPtr obj, goto cleanup; } + /* If we have a refreshPool, use the callback routine in order to + * refresh the pool after the volume upload stream closes. This way + * we make sure the volume and pool data are refreshed without user + * interaction and we can just lookup the backend in the callback + * routine in order to call the refresh API. + */ + if (backend->refreshPool) { + if (VIR_ALLOC(cbdata) < 0 || + VIR_STRDUP(cbdata->pool_name, pool->def->name) < 0) + goto cleanup; + } + ret = backend->uploadVol(obj->conn, pool, vol, stream, offset, length, flags); + /* Add cleanup callback - call after uploadVol since the stream + * is then fully set up + */ + if (cbdata) { + virFDStreamSetInternalCloseCb(stream, + virStorageVolFDStreamCloseCb, + cbdata, NULL); + cbdata = NULL; + } + cleanup: virStoragePoolObjUnlock(pool); + if (cbdata) + virStorageVolPoolRefreshDataFree(cbdata); return ret; } diff --git a/tools/virsh.pod b/tools/virsh.pod index 849ae31..e377df9 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -2981,6 +2981,9 @@ of the amount of data to be uploaded. A negative value is interpreted as an unsigned long long value to essentially include everything from the offset to the end of the volume. An error will occur if the I<local-file> is greater than the specified length. +See the description for the libvirt virStorageVolUpload API for details +regarding possible target volume and pool changes as a result of the +pool refresh when the upload is attempted. =item B<vol-download> [I<--pool> I<pool-or-uuid>] [I<--offset> I<bytes>] [I<--length> I<bytes>] I<vol-name-or-key-or-path> I<local-file> -- 1.9.3

2 2

[libvirt] [PATCH] Post-release version bump for new dev cycle
by Eric Blake 04 Aug '14

04 Aug '14

Signed-off-by: Eric Blake <eblake(a)redhat.com> --- Pushing under the trivial rule. configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index f37c716..9dd07d2 100644 --- a/configure.ac +++ b/configure.ac @@ -16,7 +16,7 @@ dnl You should have received a copy of the GNU Lesser General Public dnl License along with this library. If not, see dnl <http://www.gnu.org/licenses/>. -AC_INIT([libvirt], [1.2.7], [libvir-list(a)redhat.com] [], [http://libvirt.org] +AC_INIT([libvirt], [1.2.8], [libvir-list(a)redhat.com] [], [http://libvirt.org] AC_CONFIG_SRCDIR([src/libvirt.c]) AC_CONFIG_AUX_DIR([build-aux]) AC_CONFIG_HEADERS([config.h]) -- 1.9.3

1 0

[libvirt] [PATCH] domtop: Remove unused variable
by Michal Privoznik 04 Aug '14

04 Aug '14

The variable 'k' in the print_cpu_usage function is not used anywhere and can fire a warning on some compilers. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- examples/domtop/domtop.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/domtop/domtop.c b/examples/domtop/domtop.c index 204fdc3..e50988e 100644 --- a/examples/domtop/domtop.c +++ b/examples/domtop/domtop.c @@ -199,7 +199,7 @@ print_cpu_usage(const char *dom_name, virTypedParameterPtr now_params, size_t now_nparams) { - size_t i, j, k; + size_t i, j; size_t nparams = now_nparams; bool delim = false; -- 1.8.5.5

2 1

[libvirt] [PATCH] domtop: Turn parse_argv into void
by Michal Privoznik 04 Aug '14

04 Aug '14

Currently, the function follows the usual pattern used in our code: int ret = -1; ... ret = 0; cleanup: return ret; However, the function always call exit() on error, so the cleanup label is never jumped onto. Therefore, it doesn't make any sense to have the parse_argv function return an integer value, if it effectively can return only value of zero. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- examples/domtop/domtop.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/examples/domtop/domtop.c b/examples/domtop/domtop.c index af5da46..204fdc3 100644 --- a/examples/domtop/domtop.c +++ b/examples/domtop/domtop.c @@ -94,13 +94,12 @@ print_usage(const char *progname) unified_progname); } -static int +static void parse_argv(int argc, char *argv[], const char **uri, const char **dom_name, unsigned int *milliseconds) { - int ret = -1; int arg; unsigned long val; char *p; @@ -155,10 +154,6 @@ parse_argv(int argc, char *argv[], if (argc > optind) *dom_name = argv[optind]; - - ret = 0; - cleanup: - return ret; } static int @@ -368,8 +363,7 @@ main(int argc, char *argv[]) unsigned int milliseconds = 500; /* Sleep this long between two API calls */ const int connect_flags = 0; /* No connect flags for now */ - if (parse_argv(argc, argv, &uri, &dom_name, &milliseconds) < 0) - goto cleanup; + parse_argv(argc, argv, &uri, &dom_name, &milliseconds); DEBUG("Proceeding with uri=%s dom_name=%s milliseconds=%u", uri, dom_name, milliseconds); -- 1.8.5.5

2 1

[libvirt] Entering freeze for libvirt-1.2.7
by Daniel Veillard 04 Aug '14

04 Aug '14

It's that time for the month ! As planned I have tagged a first release candidate in git and sent tarbal and rpms to the usual place: ftp://libvirt.org/libvirt/ Seems to work for my limited testing but please give it a try, and let's fix the reported bugs ! I will try to put a release candidate 2 snapshot out on Wednesday and make the release on Friday, 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/

2 2

[libvirt] Release of libvirt-1.2.7
by Daniel Veillard 03 Aug '14

03 Aug '14

As planned it's out, tagged in git, source tarball and rpms are available as usual from: ftp://libvirt.org/libvirt/ This is a rather large release for the month of July, close to 300 commits, mostly around incremental improvements and bug fixes. There is a new API however: Features: - Introduce virConnectGetDomainCapabilities (Michal Privoznik) Documentation: - bhyve: document recent changes (Roman Bogorodskiy) - fix an incorrect example for memoryBacking (Chen Hanxiao) - libvirt-guests: fix some typos in a comment (Martin Kletzander) - libvirt: Fix 'quest' typo in comment (Li Yang) - Point to list of valid pool target volume formats (John Ferlan) - Documented VIR_DOMAIN_FEATURE_CAPABILITIES use of virDomainCapabilitesPolicy (Cédric Bosdonnat) - Explicitly specify how to override spice channel mode (Peter Krempa) - add domain to address of hostdev pci (Hu Tao) - domain: Clarify that disk type 'lun' works with iSCSI too (Peter Krempa) - esx: Fix a comment about VSphere versions (Geoff Hickey) - virsh: Document bandwidth maximum more clearly (John Ferlan) - mention more about older capability feature bits (Eric Blake) - Be more specific about semantics of _REUSE_EXT flag (Peter Krempa) - Document that snapshot name of block-backed disk isn't autogenerated (Peter Krempa) - virsh: document the possibility of accepting integers for numatune mode (Martin Kletzander) - Document the need to free vir*Ptr objects per-function (Ján Tomko) - Document the need to free vir*Ptr objects (Ján Tomko) - LXC: fix an improper comments for lxcDomainDestroyFlags (Chen Hanxiao) - formatdomain.html fixes (Michele Paolino) - Fix broken link in the HACKING page (Michele Paolino) - formatdomain: Fix issues found describing auth (John Ferlan) - LXC: update comments of lxcDomainCreateXMLWithFiles() and lxcDomainCreateXML() (Yue wenyuan) Portability: - build: fix build on cygwin (Eric Blake) - domtop: Fix build on mingw (Michal Privoznik) - build: fix build without numactl (Eric Blake) - Fix build on non-Linux platforms (Roman Bogorodskiy) - check for cfg->spiceTLS earlier in qemuProcessSPICEAllocatePorts (Ján Tomko) - build: package .pc files for mingw64 (Eric Blake) - build: fix gnulib build for mingw (Eric Blake) - util: cgroup: Fix build on non-cgroup platforms (Peter Krempa) - Don't require iptables-ipv6 on >= F17 and RHEL >= 7 (Ján Tomko) - tools/wireshark: fix rpm build (Pavel Hrdina) - tests: Avoid double linking some libraries (Michal Privoznik) Bug fixes: - network: always set disable_ipv6, even when it should be 0 (Laine Stump) - Fix a crash when cloning a volume with no backing store (Ján Tomko) - qemu: error out if PCI passthrough type is not supported (Hu Tao) - storage: create: Create files with correct mode (Peter Krempa) - nodedev: fix a uninitialized variable build failure (Chen Hanxiao) - nodedev: fix pci express memory leak (Eric Blake) - qemu: sound: Fix uninitialized model string (Peter Krempa) - qemu: Fix starting of VMs with empty CDROM drives (Peter Krempa) - util: virTimeFieldsThenRaw never returns negative (James) - qemu: cgroup: Don't use NULL path on default backed RNGs (Peter Krempa) - qemuConnectGetDomainCapabilities: Report error on unknown arch (Michal Privoznik) - remove range checking for blkiotune weight (Martin Kletzander) - qemuConnectGetDomainCapabilities: Use wiser defaults (Michal Privoznik) - leaseshelper: avoid mem leak after storing lease entries (Nehal J Wani) - conf: avoid memory leaks while parsing seclabel (Eric Blake) - nwfilter: plug memory leak with firewall (Eric Blake) - metadata: track title edits across libvirtd restart (Eric Blake) - Fix build after 47e5b5ae3262f140955abd57bbb13337c65a3497 (Peter Krempa) - qemu: snapshot: Forbid taking/reverting snapshots in PMSUSPENDED state (Peter Krempa) - qemu: snapshot: Forbid taking snapshot in invalid state (Peter Krempa) - schema: pool: netfs: Don't enforce slash in glusterfs pool source (Peter Krempa) - examples: domtop: Avoid leaking memory (Peter Krempa) - examples: domtop: Fix uninitialized variable use (Peter Krempa) - qemu: snapshot: Forbid snapshots of iSCSI passthrough devices (Peter Krempa) - storage: Disallow vol_wipe for sparse logical volumes (John Ferlan) - virsh vol-upload/download disallow negative offset (John Ferlan) - storage: Split out volume wiping as separate backend function (Peter Krempa) - esx: Fix a bug in the XML code for storage pools (Geoff Hickey) - blockjob: wait for pivot to complete (Eric Blake) - Fix const correctness (Michal Privoznik) - Fix assignment of comparison against zero (Ján Tomko) - Fix error on fs pool build failure (Ján Tomko) - spec: fix invalid syntax (Eric Blake) - libxl: fix return value error Attach|DetachDeviceFlags (Chunyan Liu) - qemu: blockcopy: Initialize correct source structure (Peter Krempa) - GetBlockInfo: Use the correct path to qemuOpenFile (John Ferlan) - virseclabel: Resolve Coverity FORWARD_NULL issue (John Ferlan) - conf: Always format seclabel's model (Michal Privoznik) - conf: Fix possible NULL dereference in virStorageVolTargetDefFormat (Matthias Bolte) - conf: Don't allow multiple seclabels for same model (Michal Privoznik) - qemu: don't error out when cgroups don't exist (Martin Kletzander) - util: storage: Fix build after 25924dec0f9329d429aadae14e273602307e2214 (Peter Krempa) - qemu: fix domxml-to-native failing when spice_tls is not enabled (Jincheng Miao) - virEventPollDispatchHandles: Honour array boundaries (Michal Privoznik) - Allow updating names in DHCP hosts by matching IPs. (Ján Tomko) - Actually fix the spec file (Ján Tomko) - libxl: fix crash in migrate confirm for transient domains (Jim Fehlig) - libxl: acquire job though begin phase only (Jim Fehlig) - libxl: remove domain when migration prepare fails (Jim Fehlig) - qemu: raise an eror when using aio=native without cache=none (Giuseppe Scrivano) - Do not allow changing the UUID of a nwfilter (Hu Jianwei) - LXC: Allow setting max mem lower than current mem (Ján Tomko) - virsh: domain: Use inactive XML when unplugging interface with --config (Peter Krempa) - Free the return value of virFileFindResource (Ján Tomko) - qemu_domain: fix startup policy for disks (Pavel Hrdina) - Fix segfault when starting a domain with no cpu definition (Ján Tomko) - qemu: raise an error when trying to use readonly ide disks (Giuseppe Scrivano) Improvements: - blockcommit: turn on active commit (Eric Blake) - blockcommit: track job type in xml (Eric Blake) - Domain config: write <features/> if some capabilities are set. (Cédric Bosdonnat) - blockjob: properly track blockcopy xml changes on disk (Eric Blake) - blockcopy: add more XML for state tracking (Eric Blake) - qemu: Implement ./hugepages/page/[@size, @unit, @nodeset] (Michal Privoznik) - domain: Introduce ./hugepages/page/[@size, @unit, @nodeset] (Michal Privoznik) - virbitmap: Introduce virBitmapOverlaps (Michal Privoznik) - qemu: Utilize virFileFindHugeTLBFS (Michal Privoznik) - Introduce virFileFindHugeTLBFS (Michal Privoznik) - schema: bhyve and nmdm updates (Roman Bogorodskiy) - nodedev: move pci express types to virpci.h (Eric Blake) - nodedev: let compiler help us on switches (Eric Blake) - qemu: sound: Handle all possible sound cards in switch statement (Peter Krempa) - conf: RNG: Always fill in default random source path for default backend (Peter Krempa) - spec: arm and aarch64 have kvm support with F20+ (Cole Robinson) - spec: Use power64 macro (Cole Robinson) - test: qemu: Add tests for multiple virtio-rng devices (Peter Krempa) - virtio-rng: allow multiple RNG devices (Peter Krempa) - bhyve: cdrom support (Roman Bogorodskiy) - virsh: add option for selecting domdisplay type (Martin Kletzander) - virsh: add error message when no graphical display is found (Martin Kletzander) - hostdev: Introduce virDomainHostdevSubsysSCSIiSCSI (John Ferlan) - Add virConnectPtr for qemuBuildSCSIHostdevDrvStr (John Ferlan) - hostdev: Introduce virDomainHostdevSubsysSCSIHost (John Ferlan) - hostdev: Introduce virDomainHostdevSubsysSCSI (John Ferlan) - hostdev: Introduce virDomainHostdevSubsysPCI (John Ferlan) - hostdev: Introduce virDomainHostdevSubsysUSB (John Ferlan) - qemu: snapshot: Use storage driver to pre-create snapshot file (Peter Krempa) - storage: Implement virStorageFileCreate for local and gluster files (Peter Krempa) - qemu: Implement DAC driver chown callback to co-operate with storage drv (Peter Krempa) - security: DAC: Plumb usage of chown callback (Peter Krempa) - security: DAC: Introduce callback to perform image chown (Peter Krempa) - security: DAC: Remove superfluous link resolution (Peter Krempa) - storage: Add witness for checking storage volume use in security driver (Peter Krempa) - storage: Implement storage driver helper to chown disk images (Peter Krempa) - numatune: finish the split from domain_conf and remove all dependencies (Martin Kletzander) - maint: simplify some syntax check exemptions (Eric Blake) - spec: Enable sanlock on qemu_kvm_arches for RHEL (Jiri Denemark) - Added myself in AUTHORS.in (Cédric Bosdonnat) - Introduce virTristateSwitch enum (Ján Tomko) - Introduce virTristateBool enum type (Ján Tomko) - LXC: show used memory as 0 when domain is not active (Chen Hanxiao) - lxc domain from xml: convert lxc.cap.drop (Cédric Bosdonnat) - lxc: allow to keep or drop capabilities (Cédric Bosdonnat) - LXC: create a bind mount for sysfs when enable userns but disable netns (Chen Hanxiao) - storage: logical: drop useless if (Roman Bogorodskiy) - getAdapterName: Lookup stable scsi_host (John Ferlan) - scsi_host: Introduce virFindSCSIHostByPCI (John Ferlan) - Add unique_id to nodedev output (John Ferlan) - virutil: Introduce virReadSCSIUniqueId (John Ferlan) - scsi_backend: Use existing LINUX_SYSFS_SCSI_HOST_PREFIX definition (John Ferlan) - storage: Introduce parentaddr into virStoragePoolSourceAdapter (Osier Yang) - virStoragePoolSourceAdapter: Refine the SCSI_HOST adapter name (Osier Yang) - getAdapterName: check for SCSI_HOST (John Ferlan) - node_device: HAL: Ignore return value of virStrToLong_ui (Peter Krempa) - util: Check return value from virStrToLong* functions (Peter Krempa) - qemu: snapshot: Reject revertion from clearly bad states (Peter Krempa) - qemu: snapshot: Convert if-else switch to switch statement (Peter Krempa) - bhyve: reconnect to domains after libvirtd restart (Roman Bogorodskiy) - examples: Introduce domtop (Michal Privoznik) - Kill last strto{l,ll,d} scouts (Michal Privoznik) - lxc conf2xml: convert lxc.network.name for veth networks (Cédric Bosdonnat) - lxc network configuration allows setting target container NIC name (Cédric Bosdonnat) - spec: Consolidate with_qemu* definitions (Jiri Denemark) - storage: Convert 'building' into a bool (John Ferlan) - Fix build by dropping redefined typedefs (Roman Bogorodskiy) - test: metadata: Improve test coverage (Peter Krempa) - Log an error when we fail to set the COW attribute (Ján Tomko) - storage: wipe: Move helper code into storage backend (Peter Krempa) - schema: put interleave at correct level (Eric Blake) - schema: add interleave inside numatune (Martin Kletzander) - qemu: leave restricting cpuset.mems after initialization (Martin Kletzander) - qemu: split out cpuset.mems setting (Martin Kletzander) - qemu: pass numa node binding preferences to qemu (Martin Kletzander) - qemu: enable disjoint numa cpu ranges (Martin Kletzander) - qemu: newer -numa parameter capability probing (Martin Kletzander) - qemu: memory-backend-ram capability probing (Martin Kletzander) - qemu: allow qmp probing for cmdline options without params (Martin Kletzander) - numatune: add support for per-node memory bindings in private APIs (Martin Kletzander) - conf, schema: add support for memnode elements (Martin Kletzander) - numatune: Encapsulate numatune configuration in order to unify results (Martin Kletzander) - numatune: unify numatune struct and enum names (Martin Kletzander) - numatune: create new module for numatune (Martin Kletzander) - conf, schema: add 'id' field for cells (Martin Kletzander) - conf: purely a code movement (Martin Kletzander) - qemu: remove useless error check (Martin Kletzander) - qemu: purely a code movement (Martin Kletzander) - support for QEMU vhost-user (Michele Paolino) - util: forbid freeing const pointers (Eric Blake) - add nocow test case (Chunyan Liu) - storagevol: add nocow to vol xml (Chunyan Liu) - storage: fs: Don't fail volume update if backing store isn't accessible (Peter Krempa) - storage: fs: Properly parse backing store info (Peter Krempa) - storage: fs: Process backing store data in virStorageBackendProbeTarget (Peter Krempa) - storage: backend: fs: Touch up coding style (Peter Krempa) - storage: Track backing store of a volume in the target struct (Peter Krempa) - storage: backend: Fix formatting of function arguments (Peter Krempa) - Rework lxc apparmor profile (Cédric Bosdonnat) - Implement interface stats for BSD (Roman Bogorodskiy) - util: virstatslinux: make more generic (Roman Bogorodskiy) - libxl: support hotplug of <interface> (Chunyan Liu) - libxl: add HOSTDEV type in libxlDomainDetachDeviceConfig (Chunyan Liu) - spec: Update polkit dependencies for CVE-2013-4311 (Jiri Denemark) - capabilities: use bool instead of int (Eric Blake) - openvswitch: Delete port if it exists while adding a new one (Chunhe Li) - virSecurityLabelDefParseXML: Rework (Michal Privoznik) - aa-helper: adjust previous patch (Cédric Bosdonnat) - Don't output libvirt-UUID.files for LXC apparmor profiles (Cédric Bosdonnat) - libxl: Correct cast to virDomainDiskDiscard enum. (Ian Campbell) - LXC: add support for --config in setmem command (Chen Hanxiao) - virSecurityDeviceLabelDef: substitute 'norelabel' with 'relabel' (Michal Privoznik) - virSecurityLabelDef: substitute 'norelabel' with 'relabel' (Michal Privoznik) - storage: Split out volume upload/download as separate backend function (Peter Krempa) - libxl: add discard support to libxl_device_disk (Olaf Hering) - conf: Improve metadata type verification (Peter Krempa) - qemu: snapshot: Refactor image labelling of new snapshot files (Peter Krempa) - qemu: Refactor qemuDomainPrepareDiskChainElement (Peter Krempa) - qemu: snapshot: Improve approach to deal with snapshot metadata (Peter Krempa) - qemu: block: Properly track disk source while pivoting to new image (Peter Krempa) - qemu: blockcopy: Use the mirror disk source to label the files (Peter Krempa) - util: storage: Return complete parent info from virStorageFileChainLookup (Peter Krempa) - util: storage: Make virStorageFileChainLookup more network storage aware (Peter Krempa) - security: AppArmor: Implement per-image seclabel set (Peter Krempa) - security: AppArmor: Implement per-image seclabel restore (Peter Krempa) - security: DAC: Implement per-image seclabel set (Peter Krempa) - security: DAC: Implement per-image seclabel restore (Peter Krempa) - security: selinux: Implement per-image seclabel set (Peter Krempa) - security: selinux: Implement per-image seclabel restore (Peter Krempa) - security: Introduce APIs to label single images (Peter Krempa) - locking: Add APIs to lock individual image files (Peter Krempa) - qemu: cgroup: Setup only the top level disk image for read-write access (Peter Krempa) - qemu: cgroup: Add functions to set cgroup image stuff on individual imgs (Peter Krempa) - util: XML: Avoid forward function declaration (Peter Krempa) - libxl: rename goto label (Jim Fehlig) - maint: update to latest gnulib (Eric Blake) - properly indent virSecurityLabelDefsParseXML() parameters (Martin Kletzander) - Fix the indentation in libvirt.spec.in (Ján Tomko) - util: cgroup: Add helper to convert device mode to string (Peter Krempa) - util: storage: Copy parent's disk metadata to backing chain elements (Peter Krempa) - util: storage: Add function to transfer config parts to new chain element (Peter Krempa) - util: storagefile: Add deep copy for struct virStorageSource (Peter Krempa) - storage: Move readonly and shared flags to disk source from disk def (Peter Krempa) - conf: Don't output seclabels for backingStore elements (Peter Krempa) - storage: file: Tolerate NULL src when uninitializing the backend (Peter Krempa) - qemu: Add helper to initialize storage file backend with correct uid/gid (Peter Krempa) - qemu: Don't propagate whole disk definition into qemuDomainGetImageIds (Peter Krempa) - qemu: Add support for networked disks for block pull/block rebase (Peter Krempa) - qemu: Add support for networked disks for block commit (Peter Krempa) - lib: Introduce flag VIR_DOMAIN_BLOCK_REBASE_RELATIVE (Peter Krempa) - lib: Introduce flag VIR_DOMAIN_BLOCK_COMMIT_RELATIVE (Peter Krempa) - qemu: refactor qemuDomainGetBlockInfo to work with remote storage (Peter Krempa) - storage: gluster: Optimize header reader functions (Peter Krempa) - util: storage: Allow specifying format for virStorageFileGetMetadataFromBuf (Peter Krempa) - util: storage: Inline use of virStorageFileGetMetadataFromFDInternal (Peter Krempa) - audit: Audit smartcard devices (Peter Krempa) - audit: Add auditing for serial/parallel/channel/console character devs (Peter Krempa) - virt-lxc-convert: make free return values in bytes (Cédric Bosdonnat) - qemu: dump: Report better error when dumping VM with passthrough devices (Peter Krempa) - LXC: remove duplicate controller check code (Chen Hanxiao) - wireshark: Honor API change coming with 1.12 release (Michal Privoznik) - wireshark: Include more of libvirt internals (Michal Privoznik) - qemu: monitor: Add support for backing name specification for block-stream (Peter Krempa) - qemu: monitor: Add argument for specifying backing name for block commit (Peter Krempa) - qemu: caps: Add capability for change-backing-file command (Peter Krempa) - audit: disk: Refactor disk auditing to avoid auditing remote storage (Peter Krempa) - conf: audit: Split out common steps to audit domain devices (Peter Krempa) - conf: audit: rng: Reorder new and old RNG device definitions (Peter Krempa) - util: storage: Add helper to determine whether storage is local (Peter Krempa) - Utilize virDomainDiskAuth for storage pools (John Ferlan) - Utilize virDomainDiskAuth for domain disk (John Ferlan) - qemuargv2xmltest: Resurrect RBD and iSCSI auth (John Ferlan) - virstorage: Introduce virStorageAuthDef (John Ferlan) - blockjob: turn on qemu capability bit for active commit (Eric Blake) - blockjob: allow omitted arguments to QMP block-commit (Eric Blake) - qemu: Implement virConnectGetDomainCapabilities (Michal Privoznik) - qemu_capabilities: Introduce virQEMUCapsGetDefaultMachine (Michal Privoznik) - qemu_capabilities: Introduce virQEMUCapsIsMachineSupported (Michal Privoznik) - qemu_capabilities: Introduce virQEMUCapsCacheLookupByArch (Michal Privoznik) - tests: Move qemu caps XML parsing into shared unit (Michal Privoznik) - virsh: expose virConnectGetDomainCapabilities (Michal Privoznik) - Introduce domain_capabilities (Michal Privoznik) - Remove double OOM error reporting (Ján Tomko) - Remove double OOM error reporting from JSON monitor (Ján Tomko) - Add OOM error reporting to a few fucntions (Ján Tomko) - Set errno on OOM in lxcProcReadMeminfo (Ján Tomko) - Use virBufferCheckError everywhere we report OOM error (Ján Tomko) - Report errors in virCapabilitiesFormatXML (Ján Tomko) - Introduce virBufferCheckError (Ján Tomko) - Use virStringReplace instead of openvz_replace (Ján Tomko) - Remove useless condition in networkRadvdConfContents (Ján Tomko) - usb: Remove redundant comment (Ján Tomko) - More indentation fixes (Ján Tomko) - Fix indentation in bridge driver (Ján Tomko) - virsh: Allow attach-disk to specify disk target bus (Yanbing Du) - qemu: Add cmd_per_lun, max_sectors to virtio-scsi (Mike Perez) - Add invariant TSC cpu flag (Ján Tomko) - util: unify extra asterisk in viralloc.h (Martin Kletzander) Cleanups: - tests: Remove stale scsihostdata dir (Michal Privoznik) - xenapiConnectGetCapabilities: Remove unused 'cleanup' label (Michal Privoznik) Thanks everybody for the help with this release, be it with ideas, bug reports, patch and reviews or translations ! 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] build: fix build on cygwin
by Eric Blake 03 Aug '14

03 Aug '14

Cygwin has getifaddrs(), but not AF_LINK, leading to: util/virstats.c: In function 'virNetInterfaceStats': util/virstats.c:138:41: error: 'AF_LINK' undeclared (first use in this function) if (ifa->ifa_addr->sa_family != AF_LINK) ... * src/util/virstats.c (virNetInterfaceStats): Only use getifaddrs if AF_LINK is present. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- Pushing under the build-breaker rule. src/util/virstats.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/util/virstats.c b/src/util/virstats.c index 910803f..b10fd85 100644 --- a/src/util/virstats.c +++ b/src/util/virstats.c @@ -1,7 +1,7 @@ /* * virstats.c: Block and network stats. * - * Copyright (C) 2007-2010 Red Hat, Inc. + * Copyright (C) 2007-2010, 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 @@ -29,7 +29,7 @@ #include <unistd.h> #include <regex.h> -#ifdef HAVE_GETIFADDRS +#if defined(HAVE_GETIFADDRS) && defined(AF_LINK) # include <net/if.h> # include <ifaddrs.h> #endif @@ -119,7 +119,7 @@ virNetInterfaceStats(const char *path, _("/proc/net/dev: Interface not found")); return -1; } -#elif defined(HAVE_GETIFADDRS) +#elif defined(HAVE_GETIFADDRS) && defined(AF_LINK) int virNetInterfaceStats(const char *path, struct _virDomainInterfaceStats *stats) -- 1.9.3

1 0

[libvirt] [PATCH] network: always set disable_ipv6, even when it should be 0
by Laine Stump 03 Aug '14

03 Aug '14

libvirt previously only touched an interface's disable_ipv6 setting in sysfs if it needed to be set to 1, assuming that 0 is the default. Apparently that isn't always the case though (kernel 3.15.7-1 in Arch Linux reportedly defaults a new interface's disable_ipv6 setting to 1) so this patch explicitly sets it to 0 or 1 as appropriate. --- src/network/bridge_driver.c | 41 +++++++++++++++++++++-------------------- 1 file changed, 21 insertions(+), 20 deletions(-) diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index 6ccc6e2..965fdec 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -1824,33 +1824,34 @@ networkSetIPv6Sysctls(virNetworkObjPtr network) { char *field = NULL; int ret = -1; + bool enableIPv6 = !!virNetworkDefGetIpByIndex(network->def, AF_INET6, 0); - if (!virNetworkDefGetIpByIndex(network->def, AF_INET6, 0)) { - /* Only set disable_ipv6 if there are no ipv6 addresses defined for - * the network. - */ - if (virAsprintf(&field, SYSCTL_PATH "/net/ipv6/conf/%s/disable_ipv6", - network->def->bridge) < 0) - goto cleanup; + /* set disable_ipv6 if there are no ipv6 addresses defined for the + * network. But also unset it if there *are* ipv6 addresses, as we + * can't be sure of its default value. + */ + if (virAsprintf(&field, SYSCTL_PATH "/net/ipv6/conf/%s/disable_ipv6", + network->def->bridge) < 0) + goto cleanup; - if (access(field, W_OK) < 0 && errno == ENOENT) { + if (access(field, W_OK) < 0 && errno == ENOENT) { + if (!enableIPv6) VIR_DEBUG("ipv6 appears to already be disabled on %s", network->def->bridge); - ret = 0; - goto cleanup; - } + ret = 0; + goto cleanup; + } - if (virFileWriteStr(field, "1", 0) < 0) { - virReportSystemError(errno, - _("cannot write to %s to disable IPv6 on bridge %s"), - field, network->def->bridge); - goto cleanup; - } - VIR_FREE(field); + if (virFileWriteStr(field, enableIPv6 ? "0" : "1", 0) < 0) { + virReportSystemError(errno, + _("cannot write to %s to enable/disable IPv6 " + "on bridge %s"), field, network->def->bridge); + goto cleanup; } + VIR_FREE(field); - /* The rest of the ipv6 sysctl tunables should always be set, - * whether or not we're using ipv6 on this bridge. + /* The rest of the ipv6 sysctl tunables should always be set the + * same, whether or not we're using ipv6 on this bridge. */ /* Prevent guests from hijacking the host network by sending out -- 1.9.3

2 2