- Devel - libvirt List Archives

[libvirt] [PATCH4/3] qemu: add cpu feature check for host-passthrough
by Luyao Huang 05 May '15

05 May '15

Signed-off-by: Luyao Huang <lhuang(a)redhat.com> --- I forgot this place. src/qemu/qemu_process.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 79f763e..5f418a9 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -4070,11 +4070,6 @@ qemuProcessVerifyGuestCPU(virQEMUDriverPtr driver, bool ret = false; size_t i; - /* no features are passed to QEMU with -cpu host - * so it makes no sense to verify them */ - if (def->cpu && def->cpu->mode == VIR_CPU_MODE_HOST_PASSTHROUGH) - return true; - switch (arch) { case VIR_ARCH_I686: case VIR_ARCH_X86_64: -- 1.8.3.1

2 2

[libvirt] [PATCH 0/3] fix some issue around host-passthough cpu model
by Luyao Huang 05 May '15

05 May '15

We support add feature in host-passthough cpu model, but there are some place need fix. Luyao Huang (3): cpu:x86: fix cannot keep cpu feature after migrate/restore qemu: add a check for non-migratable cpu flags docs: fix a small xml error in docs docs/formatdomain.html.in | 2 +- src/cpu/cpu_x86.c | 9 ++++----- src/qemu/qemu_migration.c | 2 +- 3 files changed, 6 insertions(+), 7 deletions(-) -- 1.8.3.1

2 5

[libvirt] [PATCHv3] conf: Add the cpu duplicate use check for vm numa settings
by Luyao Huang 05 May '15

05 May '15

https://bugzilla.redhat.com/show_bug.cgi?id=1176020 We had a check for the vcpu count total number in <numa> before, however this check is not good enough. There are some examples: 1. one of cpu id is out of maxvcpus, can set success(cpu count = 5 < 10): <vcpu placement='static'>10</vcpu> <cell id='0' cpus='0-3,100' memory='512000' unit='KiB'/> 2. use the same cpu in 2 cell, can set success(cpu count = 8 < 10): <vcpu placement='static'>10</vcpu> <cell id='0' cpus='0-3' memory='512000' unit='KiB'/> <cell id='1' cpus='0-3' memory='512000' unit='KiB'/> 3. use the same cpu in 2 cell, cannot set success(cpu count = 11 > 10): <vcpu placement='static'>10</vcpu> <cell id='0' cpus='0-6' memory='512000' unit='KiB'/> <cell id='1' cpus='0-3' memory='512000' unit='KiB'/> Add a check for numa cpus, check if duplicate use one cpu in more than one cell. Signed-off-by: Luyao Huang <lhuang(a)redhat.com> --- v3: remove the max vcpu check, just add a check when parse the numa settings, and change the subject. src/conf/numa_conf.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/conf/numa_conf.c b/src/conf/numa_conf.c index 7ad3f66..e25d7a8 100644 --- a/src/conf/numa_conf.c +++ b/src/conf/numa_conf.c @@ -738,6 +738,15 @@ virDomainNumaDefCPUParseXML(virDomainNumaPtr def, } VIR_FREE(tmp); + for (j = 0; j < i; j++) { + if (virBitmapOverlaps(def->mem_nodes[j].cpumask, + def->mem_nodes[i].cpumask)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("NUMA cells %zu and %zu have overlapping vCPU ids"), i, j); + goto cleanup; + } + } + ctxt->node = nodes[i]; if (virDomainParseMemory("./@memory", "./@unit", ctxt, &def->mem_nodes[cur_cell].mem, true, false) < 0) -- 1.8.3.1

2 2

[libvirt] [PATCH 0/8] Resolve new Coverity issues
by John Ferlan 05 May '15

05 May '15

Installed a new Coverity checker (7.6.1) and naturally new issues were found, plus a set of false positives which for now I'll just have to ignore since it seems they may be a bug in Coverity, but that's still to be determined John Ferlan (8): libxl: Resolve Coverity RESOURCE_LEAK vbox: Resolve Coverity RESOURCE_LEAK qemu: Resolve Coverity IDENTICAL_BRANCHES qemu: Resolve Coverity FORWARD_NULL xen: Resolve Coverity FORWARD_NULL qemu: Resolve Coverity FORWARD_NULL qemu: Resolve Coverity FORWARD_NULL qemu: Resolve Coverity FORWARD_NULL src/libxl/libxl_migration.c | 1 + src/qemu/qemu_capabilities.c | 4 +++- src/qemu/qemu_command.c | 4 +++- src/qemu/qemu_driver.c | 5 +++-- src/qemu/qemu_hotplug.c | 11 +++-------- src/vbox/vbox_common.c | 21 +++++++-------------- src/xen/xm_internal.c | 3 +++ 7 files changed, 23 insertions(+), 26 deletions(-) -- 2.1.0

2 9

[libvirt] [PATCH v1] [libvirt-php] add stream support and upload/resize/download for volume
by Vasiliy Tolstov 05 May '15

05 May '15

This patch add to libvirt php binding libvirt stream support Also provide resize/upload/download for libvirt volume Signed-off-by: Vasiliy Tolstov <v.tolstov(a)selfip.ru> --- configure.ac | 3 +- src/libvirt-php.c | 382 +++++++++++++++++++++++++++++++++++++++++++++++++++++- src/libvirt-php.h | 17 +++ 3 files changed, 395 insertions(+), 7 deletions(-) diff --git a/configure.ac b/configure.ac index b854153..7099f9d 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,6 @@ AC_INIT([libvirt-php], [0.5.0], [http://libvirt.org] -AM_INIT_AUTOMAKE([-Wall -Werror]) +AM_INIT_AUTOMAKE([-Wall -Werror -Wno-portability]) AC_CONFIG_FILES([Makefile tools/Makefile src/Makefile tests/Makefile docs/Makefile]) -AM_INIT_AUTOMAKE([-Wno-portability]) AM_MAINTAINER_MODE([enable]) dnl Checks for programs. diff --git a/src/libvirt-php.c b/src/libvirt-php.c index 6d6fa81..0adc4be 100644 --- a/src/libvirt-php.c +++ b/src/libvirt-php.c @@ -61,6 +61,7 @@ int le_libvirt_storagepool; int le_libvirt_volume; int le_libvirt_network; int le_libvirt_nodedev; +int le_libvirt_stream; #if LIBVIR_VERSION_NUMBER>=8000 int le_libvirt_snapshot; #endif @@ -90,6 +91,13 @@ static zend_function_entry libvirt_functions[] = { PHP_FE(libvirt_connect_get_maxvcpus, NULL) PHP_FE(libvirt_connect_get_encrypted, NULL) PHP_FE(libvirt_connect_get_secure, NULL) + /* Stream functions */ + PHP_FE(libvirt_stream_create, NULL) + PHP_FE(libvirt_stream_close, NULL) + PHP_FE(libvirt_stream_abort, NULL) + PHP_FE(libvirt_stream_finish, NULL) + PHP_FE(libvirt_stream_send, NULL) + PHP_FE(libvirt_stream_recv, NULL) /* Domain functions */ PHP_FE(libvirt_domain_new, NULL) PHP_FE(libvirt_domain_new_get_vnc, NULL) @@ -148,7 +156,7 @@ static zend_function_entry libvirt_functions[] = { PHP_FE(libvirt_domain_get_screen_dimensions, NULL) PHP_FE(libvirt_domain_send_keys, NULL) PHP_FE(libvirt_domain_send_pointer_event, NULL) - PHP_FE(libvirt_domain_update_device, NULL) + PHP_FE(libvirt_domain_update_device, NULL) /* Domain snapshot functions */ PHP_FE(libvirt_domain_has_current_snapshot, NULL) PHP_FE(libvirt_domain_snapshot_create, NULL) @@ -169,6 +177,9 @@ static zend_function_entry libvirt_functions[] = { PHP_FE(libvirt_storagevolume_create_xml,NULL) PHP_FE(libvirt_storagevolume_create_xml_from,NULL) PHP_FE(libvirt_storagevolume_delete,NULL) + PHP_FE(libvirt_storagevolume_download,NULL) + PHP_FE(libvirt_storagevolume_upload,NULL) + PHP_FE(libvirt_storagevolume_resize,NULL) PHP_FE(libvirt_storagepool_get_uuid_string, NULL) PHP_FE(libvirt_storagepool_get_name, NULL) PHP_FE(libvirt_storagepool_lookup_by_uuid_string, NULL) @@ -370,6 +381,8 @@ char *translate_counter_type(int type) break; case INT_RESOURCE_DOMAIN: return "domain"; break; + case INT_RESOURCE_STREAM: return "stream"; + break; case INT_RESOURCE_NETWORK: return "network"; break; case INT_RESOURCE_NODEDEV: return "node device"; @@ -444,7 +457,7 @@ void free_tokens(tTokenizer t) Private function name: resource_change_counter Since version: 0.4.2 Description: Function to increment (inc = 1) / decrement (inc = 0) the resource pointers count including the memory location - Arguments: @type [int]: type of resource (INT_RESOURCE_x defines where x can be { CONNECTION | DOMAIN | NETWORK | NODEDEV | STORAGEPOOL | VOLUME | SNAPSHOT }) + Arguments: @type [int]: type of resource (INT_RESOURCE_x defines where x can be { CONNECTION | DOMAIN | NETWORK | NODEDEV | STORAGEPOOL | VOLUME | SNAPSHOT | STREAM }) @conn [virConnectPtr]: libvirt connection pointer associated with the resource, NULL for libvirt connection objects @mem [pointer]: Pointer to memory location for the resource. Will be converted to appropriate uint for the arch. @inc [int/bool]: Increment the counter (1 = add memory location) or decrement the counter (0 = remove memory location) from entries. @@ -724,6 +737,18 @@ void free_resource(int type, arch_uint mem TSRMLS_DC) } } + if (type == INT_RESOURCE_STREAM) { + rv = virStreamFree( (virStreamPtr)mem ); + if (rv != 0) { + DPRINTF("%s: virStreamFree(%p) returned %d (%s)\n", __FUNCTION__, (virStreamPtr)mem, rv, LIBVIRT_G (last_error)); + php_error_docref(NULL TSRMLS_CC, E_WARNING,"virStreamFree failed with %i on destructor: %s", rv, LIBVIRT_G (last_error)); + } + else { + DPRINTF("%s: virStreamFree(%p) completed successfully\n", __FUNCTION__, (virStreamPtr)mem); + resource_change_counter(INT_RESOURCE_STREAM, NULL, (virStreamPtr)mem, 0 TSRMLS_CC); + } + } + if (type == INT_RESOURCE_NETWORK) { rv = virNetworkFree( (virNetworkPtr)mem ); if (rv != 0) { @@ -986,6 +1011,36 @@ static void php_libvirt_domain_dtor(zend_rsrc_list_entry *rsrc TSRMLS_DC) } } +/* Destructor for stream resource */ +static void php_libvirt_stream_dtor(zend_rsrc_list_entry *rsrc TSRMLS_DC) +{ + php_libvirt_stream *stream = (php_libvirt_stream*)rsrc->ptr; + int rv = 0; + + if (stream != NULL) + { + if (stream->stream != NULL) + { + if (!check_resource_allocation(NULL, INT_RESOURCE_STREAM, stream->stream TSRMLS_CC)) { + stream->stream=NULL; + efree (stream); + return; + } + rv = virStreamFree(stream->stream); + if (rv != 0) { + DPRINTF("%s: virStreamFree(%p) returned %d (%s)\n", __FUNCTION__, stream->stream, rv, LIBVIRT_G (last_error)); + php_error_docref(NULL TSRMLS_CC, E_WARNING,"virStreamFree failed with %i on destructor: %s", rv, LIBVIRT_G (last_error)); + } + else { + DPRINTF("%s: virStreamFree(%p) completed successfully\n", __FUNCTION__, stream->stream); + resource_change_counter(INT_RESOURCE_STREAM, NULL, stream->stream, 0 TSRMLS_CC); + } + stream->stream=NULL; + } + efree (stream); + } +} + /* Destructor for storagepool resource */ static void php_libvirt_storagepool_dtor(zend_rsrc_list_entry *rsrc TSRMLS_DC) { @@ -1144,6 +1199,7 @@ PHP_MINIT_FUNCTION(libvirt) /* register resource types and their descriptors */ le_libvirt_connection = zend_register_list_destructors_ex(php_libvirt_connection_dtor, NULL, PHP_LIBVIRT_CONNECTION_RES_NAME, module_number); le_libvirt_domain = zend_register_list_destructors_ex(php_libvirt_domain_dtor, NULL, PHP_LIBVIRT_DOMAIN_RES_NAME, module_number); + le_libvirt_stream = zend_register_list_destructors_ex(php_libvirt_stream_dtor, NULL, PHP_LIBVIRT_STREAM_RES_NAME, module_number); le_libvirt_storagepool = zend_register_list_destructors_ex(php_libvirt_storagepool_dtor, NULL, PHP_LIBVIRT_STORAGEPOOL_RES_NAME, module_number); le_libvirt_volume = zend_register_list_destructors_ex(php_libvirt_volume_dtor, NULL, PHP_LIBVIRT_VOLUME_RES_NAME, module_number); le_libvirt_network = zend_register_list_destructors_ex(php_libvirt_network_dtor, NULL, PHP_LIBVIRT_NETWORK_RES_NAME, module_number); @@ -1171,6 +1227,11 @@ PHP_MINIT_FUNCTION(libvirt) REGISTER_LONG_CONSTANT("VIR_DOMAIN_SHUTOFF", 5, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("VIR_DOMAIN_CRASHED", 6, CONST_CS | CONST_PERSISTENT); + /* Volume constants */ + REGISTER_LONG_CONSTANT("VIR_STORAGE_VOL_RESIZE_ALLOCATE", 1, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("VIR_STORAGE_VOL_RESIZE_DELTA", 2, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("VIR_STORAGE_VOL_RESIZE_SHRINK", 4, CONST_CS | CONST_PERSISTENT); + /* Domain vCPU flags */ REGISTER_LONG_CONSTANT("VIR_DOMAIN_VCPU_CONFIG", VIR_DOMAIN_VCPU_CONFIG, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("VIR_DOMAIN_VCPU_CURRENT", VIR_DOMAIN_VCPU_CURRENT, CONST_CS | CONST_PERSISTENT); @@ -3456,6 +3517,207 @@ PHP_FUNCTION(libvirt_domain_lookup_by_uuid_string) } /* + Function name: libvirt_stream_create + Since version: 0.5.0 + Description: Function is used to create new stream from libvirt conn + Arguments: @res [resource]: libvirt connection resource from libvirt_connect() + Returns: resource libvirt stream resource +*/ +PHP_FUNCTION(libvirt_stream_create) +{ + php_libvirt_connection *conn=NULL; + zval *zconn; + virStreamPtr stream = NULL; + php_libvirt_stream *res_stream; + + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &zconn) == FAILURE) { + RETURN_FALSE; + } + ZEND_FETCH_RESOURCE (conn, php_libvirt_connection*, &zconn, -1, PHP_LIBVIRT_CONNECTION_RES_NAME, le_libvirt_connection); + if ((conn==NULL)||(conn->conn==NULL))RETURN_FALSE; + + stream = virStreamNew(conn->conn, 0); + if (stream==NULL) { + set_error("Cannot create new stream" TSRMLS_CC); + RETURN_FALSE; + } + + res_stream = (php_libvirt_stream *)emalloc(sizeof(php_libvirt_stream)); + res_stream->stream = stream; + res_stream->conn = conn; + + resource_change_counter(INT_RESOURCE_STREAM, conn->conn, res_stream->stream, 1 TSRMLS_CC); + ZEND_REGISTER_RESOURCE(return_value, res_stream, le_libvirt_stream); +} + +/* + Function name: libvirt_stream_close + Since version: 0.5.0 + Description: Function is used to close stream + Arguments: @res [resource]: libvirt stream resource from libvirt_stream_create() + Returns: int +*/ +PHP_FUNCTION(libvirt_stream_close) +{ + zval *zstream; + php_libvirt_stream *stream=NULL; + int retval = -1; + + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &zstream) == FAILURE) { + RETURN_LONG(retval); + } + ZEND_FETCH_RESOURCE (stream, php_libvirt_stream*, &zstream, -1, PHP_LIBVIRT_STREAM_RES_NAME, le_libvirt_stream); + if ((stream==NULL)||(stream->stream==NULL))RETURN_LONG(retval); + + retval = virStreamFree(stream->stream); + if (retval != 0) { + set_error("Cannot free stream" TSRMLS_CC); + RETURN_LONG(retval); + } + + resource_change_counter(INT_RESOURCE_STREAM, stream->conn, stream->stream, 0 TSRMLS_CC); + RETURN_LONG(retval); +} + +/* + Function name: libvirt_stream_abort + Since version: 0.5.0 + Description: Function is used to abort transfer + Arguments: @res [resource]: libvirt stream resource from libvirt_stream_create() + Returns: int +*/ +PHP_FUNCTION(libvirt_stream_abort) +{ + zval *zstream; + php_libvirt_stream *stream=NULL; + int retval = -1; + + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &zstream) == FAILURE) { + RETURN_LONG(retval); + } + ZEND_FETCH_RESOURCE (stream, php_libvirt_stream*, &zstream, -1, PHP_LIBVIRT_STREAM_RES_NAME, le_libvirt_stream); + if ((stream==NULL)||(stream->stream==NULL))RETURN_LONG(retval); + + retval = virStreamAbort(stream->stream); + if (retval != 0) { + set_error("Cannot abort stream" TSRMLS_CC); + RETURN_LONG(retval); + } + RETURN_LONG(retval); +} + +/* + Function name: libvirt_stream_finish + Since version: 0.5.0 + Description: Function is used to finish transfer + Arguments: @res [resource]: libvirt stream resource from libvirt_stream_create() + Returns: int +*/ +PHP_FUNCTION(libvirt_stream_finish) +{ + zval *zstream; + php_libvirt_stream *stream=NULL; + int retval = -1; + + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &zstream) == FAILURE) { + RETURN_LONG(retval); + } + ZEND_FETCH_RESOURCE (stream, php_libvirt_stream*, &zstream, -1, PHP_LIBVIRT_STREAM_RES_NAME, le_libvirt_stream); + if ((stream==NULL)||(stream->stream==NULL))RETURN_LONG(retval); + + retval = virStreamFinish(stream->stream); + if (retval != 0) { + set_error("Cannot finish stream" TSRMLS_CC); + RETURN_LONG(retval); + } + RETURN_LONG(retval); +} + +/* + Function name: libvirt_stream_recv + Since version: 0.5.0 + Description: Function is used to close stream from libvirt conn + Arguments: @res [resource]: libvirt stream resource from libvirt_stream_create() + @data [string]: buffer + @len [int]: amout of data to recieve + Returns: int +*/ +PHP_FUNCTION(libvirt_stream_recv) +{ + zval *zstream, *zbuf; + char *recv_buf; + php_libvirt_stream *stream=NULL; + int retval = -1; + long length = 0; + + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rz|l", &zstream, &zbuf, &length) == FAILURE) { + RETURN_LONG(retval); + } + ZEND_FETCH_RESOURCE (stream, php_libvirt_stream*, &zstream, -1, PHP_LIBVIRT_STREAM_RES_NAME, le_libvirt_stream); + if ((stream==NULL)||(stream->stream==NULL))RETURN_LONG(retval); + + recv_buf = emalloc(length + 1); + memset(recv_buf, 0, length + 1); + + retval = virStreamRecv(stream->stream, recv_buf, length); + if (retval < 0) { + efree(recv_buf); + zval_dtor(zbuf); + Z_TYPE_P(zbuf) = IS_NULL; + } else { + recv_buf[retval] = '\0'; + /* Rebuild buffer zval */ + zval_dtor(zbuf); + Z_STRVAL_P(zbuf) = recv_buf; + Z_STRLEN_P(zbuf) = retval; + Z_TYPE_P(zbuf) = IS_STRING; + } + + if (retval == -1) { + set_error("Cannot recv from stream" TSRMLS_CC); + RETURN_LONG(retval); + } + + RETURN_LONG(retval); +} + +/* + Function name: libvirt_stream_send + Since version: 0.5.0 + Description: Function is used to close stream from libvirt conn + Arguments: @res [resource]: libvirt stream resource from libvirt_stream_create() + @data [string]: buffer + @length [int]: amout of data to send + Returns: int +*/ +PHP_FUNCTION(libvirt_stream_send) +{ + zval *zstream, *zbuf; + php_libvirt_stream *stream=NULL; + int retval = -1; + long length = 0; + char *cstr; + //int cstrlen; + + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rz|l", &zstream, &zbuf, &length) == FAILURE) { + RETURN_LONG(retval); + } + ZEND_FETCH_RESOURCE (stream, php_libvirt_stream*, &zstream, -1, PHP_LIBVIRT_STREAM_RES_NAME, le_libvirt_stream); + if ((stream==NULL)||(stream->stream==NULL))RETURN_LONG(retval); + + cstr = Z_STRVAL_P(zbuf); + //cstrlen = Z_STRLEN_P(zbuf); + + retval = virStreamSend(stream->stream, cstr, length); + if (retval == -1) { + set_error("Cannot send to stream" TSRMLS_CC); + RETURN_LONG(retval); + } + + RETURN_LONG(retval); +} + +/* Function name: libvirt_domain_lookup_by_id Since version: 0.4.1(-1) Description: Function is used to get domain by it's ID, applicable only to running guests @@ -3544,13 +3806,12 @@ PHP_FUNCTION(libvirt_domain_get_uuid_string) @opaque [void *]: used for file descriptor Returns: write() error code as it's calling write */ - static int streamSink(virStreamPtr st ATTRIBUTE_UNUSED, const char *bytes, size_t nbytes, void *opaque) { - int *fd = (int *)opaque; + int *fd = (int *)opaque; - return write(*fd, bytes, nbytes); + return write(*fd, bytes, nbytes); } /* @@ -6782,6 +7043,117 @@ PHP_FUNCTION(libvirt_storagevolume_delete) } /* + Function name: libvirt_storagevolume_resize + Since version: 0.5.0 + Description: Function is used to resize volume identified by it's resource + Arguments: @res [resource]: libvirt storagevolume resource + @capacity [int]: capacity for the storage volume + @flags [int]: optional flags for the storage volume resize for virStorageVolResize() + Returns: int +*/ +PHP_FUNCTION(libvirt_storagevolume_resize) +{ + php_libvirt_volume *volume=NULL; + zval *zvolume; + long flags = 0; + long capacity = 0; + int retval = -1; + + GET_VOLUME_FROM_ARGS("rl|l", &zvolume, &capacity, &flags); + + retval = virStorageVolResize(volume->volume, capacity, flags); + DPRINTF("%s: virStorageVolResize(%p, %d, %d) returned %d\n", PHPFUNC, volume->volume, (int) capacity, (int) flags, retval); + if (retval != 0) { + set_error_if_unset("Cannot resize storage volume" TSRMLS_CC); + RETURN_LONG(retval); + } + + RETURN_LONG(retval); +} + +/* + Function name: libvirt_storagevolume_download + Since version: 0.5.0 + Description: Function is used to download volume identified by it's resource + Arguments: @res [resource]: libvirt storagevolume resource + @stream [resource]: stream to use as output + @offset [int]: position to start reading from + @length [int] : limit on amount of data to download + @flags [int]: optional flags for the storage volume download for virStorageVolDownload() + Returns: int +*/ +PHP_FUNCTION(libvirt_storagevolume_download) +{ + php_libvirt_volume *volume=NULL; + php_libvirt_stream *stream=NULL; + zval *zvolume; + zval *zstream; + long flags = 0; + long offset = 0; + long length = 0; + int retval = -1; + + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rr|l|l|l", &zvolume, &zstream, &offset, &length, &flags) == FAILURE) { + RETURN_LONG(retval); + } + ZEND_FETCH_RESOURCE (volume, php_libvirt_volume*, &zvolume, -1, PHP_LIBVIRT_VOLUME_RES_NAME, le_libvirt_volume); + if ((volume==NULL)||(volume->volume==NULL))RETURN_LONG(retval); + ZEND_FETCH_RESOURCE (stream, php_libvirt_stream*, &zstream, -1, PHP_LIBVIRT_STREAM_RES_NAME, le_libvirt_stream); + if ((stream==NULL)||(stream->stream==NULL))RETURN_LONG(retval); + + retval = virStorageVolDownload(volume->volume, stream->stream, offset, length, flags); + DPRINTF("%s: virStorageVolDownload(%p, %p, %d, %d, %d) returned %d\n", PHPFUNC, volume->volume, stream->stream, (int) offset, (int) length, (int) flags, retval); + + if (retval == -1) { + set_error("Cannot download from stream" TSRMLS_CC); + RETURN_LONG(retval); + } + + RETURN_LONG(retval); +} + +/* + Function name: libvirt_storagevolume_upload + Since version: 0.5.0 + Description: Function is used to upload volume identified by it's resource + Arguments: @res [resource]: libvirt storagevolume resource + @stream [resource]: stream to use as input + @offset [int]: position to start writing to + @length [int] : limit on amount of data to upload + @flags [int]: optional flags for the storage volume upload for virStorageVolUpload() + Returns: int +*/ +PHP_FUNCTION(libvirt_storagevolume_upload) +{ + php_libvirt_volume *volume=NULL; + php_libvirt_stream *stream=NULL; + zval *zvolume; + zval *zstream; + long flags = 0; + long offset = 0; + long length = 0; + int retval = -1; + + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rr|l|l|l", &zvolume, &zstream, &offset, &length, &flags) == FAILURE) { + RETURN_LONG(retval); + } + ZEND_FETCH_RESOURCE (volume, php_libvirt_volume*, &zvolume, -1, PHP_LIBVIRT_VOLUME_RES_NAME, le_libvirt_volume); + if ((volume==NULL)||(volume->volume==NULL))RETURN_LONG(retval); + ZEND_FETCH_RESOURCE (stream, php_libvirt_stream*, &zstream, -1, PHP_LIBVIRT_STREAM_RES_NAME, le_libvirt_stream); + if ((stream==NULL)||(stream->stream==NULL))RETURN_LONG(retval); + + retval = virStorageVolUpload(volume->volume, stream->stream, offset, length, flags); + DPRINTF("%s: virStorageVolUpload(%p, %p, %d, %d, %d) returned %d\n", PHPFUNC, volume->volume, stream->stream, (int) offset, (int) length, (int) flags, retval); + + if (retval == -1) { + set_error_if_unset("Cannot upload storage volume" TSRMLS_CC); + RETURN_LONG(retval); + } + + RETURN_LONG(retval); +} + +/* Function name: libvirt_storagepool_get_uuid_string Since version: 0.4.1(-1) Description: Function is used to get storage pool by UUID string diff --git a/src/libvirt-php.h b/src/libvirt-php.h index 450fbea..3bcc682 100644 --- a/src/libvirt-php.h +++ b/src/libvirt-php.h @@ -214,6 +214,7 @@ ZEND_END_MODULE_GLOBALS(libvirt) #define INT_RESOURCE_STORAGEPOOL 0x10 #define INT_RESOURCE_VOLUME 0x20 #define INT_RESOURCE_SNAPSHOT 0x40 +#define INT_RESOURCE_STREAM 0x50 typedef struct tVMDisk { char *path; @@ -257,6 +258,11 @@ typedef struct _php_libvirt_connection { long resource_id; } php_libvirt_connection; +typedef struct _php_libvirt_stream { + virStreamPtr stream; + php_libvirt_connection* conn; +} php_libvirt_stream; + typedef struct _php_libvirt_domain { virDomainPtr domain; php_libvirt_connection* conn; @@ -311,6 +317,7 @@ int gdebug; #define PHP_LIBVIRT_CONNECTION_RES_NAME "Libvirt connection" #define PHP_LIBVIRT_DOMAIN_RES_NAME "Libvirt domain" +#define PHP_LIBVIRT_STREAM_RES_NAME "Libvirt stream" #define PHP_LIBVIRT_STORAGEPOOL_RES_NAME "Libvirt storagepool" #define PHP_LIBVIRT_VOLUME_RES_NAME "Libvirt volume" #define PHP_LIBVIRT_NETWORK_RES_NAME "Libvirt virtual network" @@ -347,6 +354,13 @@ PHP_FUNCTION(libvirt_node_get_info); PHP_FUNCTION(libvirt_node_get_cpu_stats); PHP_FUNCTION(libvirt_node_get_cpu_stats_for_each_cpu); PHP_FUNCTION(libvirt_node_get_mem_stats); +/* Stream functions */ +PHP_FUNCTION(libvirt_stream_create); +PHP_FUNCTION(libvirt_stream_close); +PHP_FUNCTION(libvirt_stream_abort); +PHP_FUNCTION(libvirt_stream_finish); +PHP_FUNCTION(libvirt_stream_recv); +PHP_FUNCTION(libvirt_stream_send); /* Domain functions */ PHP_FUNCTION(libvirt_domain_new); PHP_FUNCTION(libvirt_domain_new_get_vnc); @@ -427,6 +441,9 @@ PHP_FUNCTION(libvirt_storagevolume_get_xml_desc); PHP_FUNCTION(libvirt_storagevolume_create_xml); PHP_FUNCTION(libvirt_storagevolume_create_xml_from); PHP_FUNCTION(libvirt_storagevolume_delete); +PHP_FUNCTION(libvirt_storagevolume_download); +PHP_FUNCTION(libvirt_storagevolume_upload); +PHP_FUNCTION(libvirt_storagevolume_resize); PHP_FUNCTION(libvirt_storagepool_get_uuid_string); PHP_FUNCTION(libvirt_storagepool_get_name); PHP_FUNCTION(libvirt_storagepool_lookup_by_uuid_string); -- 2.3.3

2 3

Re: [libvirt] add a rbd disk by virsh attach-device , the operation fails
by 饶俊明 05 May '15

05 May '15

The problem has been resolved,. qemu-kvm is required to support the Ceph RBD versions, and restart the virtual machine; --------------------------------------------------------------------------- -----邮件原件----- 发件人: Martin Kletzander [mailto:mkletzan@redhat.com] 发送时间: 2015年5月5日 14:15 收件人: 饶俊明抄送: libvir-list(a)redhat.com 主题: Re: [libvirt] add a rbd disk by virsh attach-device , the operation fails On Tue, May 05, 2015 at 03:25:39AM +0000, 饶俊明 wrote: >Hello: > add a rbd disk by virsh attach-device ,the operation fails; libvirt >version: libvirt-0.10.2-46.el6.x86_64 operated virsh pool-info, pool-edit, attach-device domain_id /tmp/rbddisk.xml command: > Hi there, this list is for upstream discussions and as I can see, the version of libvirt you are using is a little old and it's downstream. Try whether this problem persist with e.g. the now released version 1.2.15 or feel free to contact your support specialist in case you are using RHEL. >virsh # pool-info 0a081d22-070b-3f58-a883-78e29012b052 >Name: 0a081d22-070b-3f58-a883-78e29012b052 >UUID: 0a081d22-070b-3f58-a883-78e29012b052 >State: running >Persistent: no >Autostart: no >Capacity: 305.50 TiB >Allocation: 173.06 GiB >Available: 304.98 TiB > >virsh # pool-edit 0a081d22-070b-3f58-a883-78e29012b052 ><pool type='rbd'> > <name>0a081d22-070b-3f58-a883-78e29012b052</name> > <uuid>0a081d22-070b-3f58-a883-78e29012b052</uuid> > <capacity unit='bytes'>335898508001280</capacity> > <allocation unit='bytes'>185824236409</allocation> > <available unit='bytes'>335327800442880</available> > <source> > <host name='szebs01.app.paic.com.cn' port='6789'/> > <name>ebs_sz_01_01</name> > <auth username='szbcs' type='ceph'> > <secret uuid='0a081d22-070b-3f58-a883-78e29012b052'/> > </auth> > </source> ></pool> > >virsh # attach-device 52 /tmp/rbddisk.xml >error: Failed to attach device from /tmp/rbddisk.xml >error: internal error unable to execute QEMU command >'__com.redhat_drive_add': Device 'drive-virtio-disk1' could not be >initialized > This error comes from qemu, but it doesn't say much. Does the domain fail to start with the disk already in the XML or is this a problem just with hot-plugging? >This context of /tmp/rbddisk.xml : > <disk type='network' device='disk'> > <driver name='qemu' type='raw' cache='none'/> > <auth username='szbcs'> > <secret type='ceph' uuid='0a081d22-070b-3f58-a883-78e29012b052'/> > </auth> > <source protocol='rbd' name='ebs_sz_01_01/5eba8a02-f251-4674-88b8-e368a07d50c5'> > <host name='szebs01.app.paic.com.cn' port='6789'/> > </source> > <target dev='vdb' bus='virtio'/> > <address type='pci' domain='0x0000' bus='0x00' slot='0x07' function='0x0'/> > </disk> > >This error information in libvirtd log file: >2015-05-05 02:51:52.005+0000: 32082: error : >qemuMonitorJSONCheckError:359 : internal error unable to execute QEMU >command '__com.redhat_drive_add': Device 'drive-virtio-disk1' could not >be initialized > This is only one line and it doesn't say anything more than the error from virsh. Try looking at more context, or rather in the domain's log file where qemu might've said more about the error. ******************************************************************************************************************************** The information in this email is confidential and may be legally privileged. If you have received this email in error or are not the intended recipient, please immediately notify the sender and delete this message from your computer. Any use, distribution, or copying of this email other than by the intended recipient is strictly prohibited. All messages sent to and from us may be monitored to ensure compliance with internal policies and to protect our business. Emails are not secure and cannot be guaranteed to be error free as they can be intercepted, amended, lost or destroyed, or contain viruses. Anyone who communicates with us by email is taken to accept these risks. 收发邮件者请注意：本邮件含保密信息，若误收本邮件，请务必通知发送人并直接删去，不得使用、传播或复制本邮件。进出邮件均受到本公司合规监控。邮件可能发生被截留、被修改、丢失、被破坏或包含计算机病毒等不安全情况。 ********************************************************************************************************************************

1 0

[libvirt] [PATCH] Ignore bridge template names with multiple printf conversions
by Ján Tomko 05 May '15

05 May '15

For some reason, we allow a bridge name with %d in it, which we replace with an unsigned integer to form a bridge name that does not yet exist on the host. Do not blindly pass it to virAsprintf if it's not the only conversion, to prevent crashing on input like: <network> <name>test</name> <forward mode='none'/> <bridge name='virbr%d%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s'/> </network> Ignore any template strings that do not have exactly one %d conversion, like we do in various drivers before calling virNetDevTapCreateInBridgePort. --- This was added by commit 4c3f3b4 http://libvirt.org/git/?p=libvirt.git;a=commitdiff;h=4c3f3b4 https://www.redhat.com/archives/libvir-list/2009-April/msg00394.html claiming it worked some time before that src/network/bridge_driver.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index 3b879cd..1c5613a 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -2775,7 +2775,13 @@ networkFindUnusedBridgeName(virNetworkObjListPtr nets, int ret = -1, id = 0; char *newname = NULL; - const char *templ = def->bridge ? def->bridge : "virbr%d"; + const char *templ = "virbr%d"; + const char *p; + + if (def->bridge && + (p = strchr(def->bridge, '%')) == strrchr(def->bridge, '%') && + strstr(def->bridge, "%d")) + templ = def->bridge; do { if (virAsprintf(&newname, templ, id) < 0) @@ -2809,7 +2815,7 @@ networkFindUnusedBridgeName(virNetworkObjListPtr nets, /* * networkValidateBridgeName() - if no bridge name is set, or if the - * bridge name contains a %d (indicating that this is a template for + * bridge name contains a % (indicating that this is a template for * the actual name) try to set an appropriate bridge name. If a * bridge name *is* set, make sure it doesn't conflict with any other * network's bridge name. @@ -2820,7 +2826,7 @@ networkBridgeNameValidate(virNetworkObjListPtr nets, { int ret = -1; - if (def->bridge && !strstr(def->bridge, "%d")) { + if (def->bridge && !strchr(def->bridge, '%')) { if (virNetworkBridgeInUse(nets, def->bridge, def->name)) { virReportError(VIR_ERR_INTERNAL_ERROR, _("bridge name '%s' already in use."), -- 2.0.5

2 2

[libvirt] [PATCH] qemu: Properly rename persistent def after migration
by Jiri Denemark 05 May '15

05 May '15

When migrating a domain while changing its name and using VIR_MIGRATE_PERSIST_DEST flag, libvirt would fail to properly change the name in the persistent definition. The inconsistency results in weird behavior when dumping domain XML, destroying the domain, restarting libvirtd and likely in several other situations. Since the new name is already stored in vm->def->name, we just need to make sure the persistent definition uses this new name too. https://bugzilla.redhat.com/show_bug.cgi?id=1076354 Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/qemu/qemu_migration.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 20c2193..c1af704 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -1392,6 +1392,14 @@ qemuMigrationEatCookie(virQEMUDriverPtr driver, flags) < 0) goto error; + if (flags & QEMU_MIGRATION_COOKIE_PERSISTENT && + mig->persistent && + STRNEQ(dom->def->name, mig->persistent->name)) { + VIR_FREE(mig->persistent->name); + if (VIR_STRDUP(mig->persistent->name, dom->def->name) < 0) + goto error; + } + if (mig->flags & QEMU_MIGRATION_COOKIE_LOCKSTATE) { if (!mig->lockDriver) { if (virLockManagerPluginUsesState(driver->lockManager)) { -- 2.4.0

2 5

[libvirt] add a rbd disk by virsh attach-device , the operation fails
by 饶俊明 05 May '15

05 May '15

Hello: add a rbd disk by virsh attach-device ,the operation fails; libvirt version: libvirt-0.10.2-46.el6.x86_64 operated virsh pool-info, pool-edit, attach-device domain_id /tmp/rbddisk.xml command: virsh # pool-info 0a081d22-070b-3f58-a883-78e29012b052 Name: 0a081d22-070b-3f58-a883-78e29012b052 UUID: 0a081d22-070b-3f58-a883-78e29012b052 State: running Persistent: no Autostart: no Capacity: 305.50 TiB Allocation: 173.06 GiB Available: 304.98 TiB virsh # pool-edit 0a081d22-070b-3f58-a883-78e29012b052 <pool type='rbd'> <name>0a081d22-070b-3f58-a883-78e29012b052</name> <uuid>0a081d22-070b-3f58-a883-78e29012b052</uuid> <capacity unit='bytes'>335898508001280</capacity> <allocation unit='bytes'>185824236409</allocation> <available unit='bytes'>335327800442880</available> <source> <host name='szebs01.app.paic.com.cn' port='6789'/> <name>ebs_sz_01_01</name> <auth username='szbcs' type='ceph'> <secret uuid='0a081d22-070b-3f58-a883-78e29012b052'/> </auth> </source> </pool> virsh # attach-device 52 /tmp/rbddisk.xml error: Failed to attach device from /tmp/rbddisk.xml error: internal error unable to execute QEMU command '__com.redhat_drive_add': Device 'drive-virtio-disk1' could not be initialized This context of /tmp/rbddisk.xml : <disk type='network' device='disk'> <driver name='qemu' type='raw' cache='none'/> <auth username='szbcs'> <secret type='ceph' uuid='0a081d22-070b-3f58-a883-78e29012b052'/> </auth> <source protocol='rbd' name='ebs_sz_01_01/5eba8a02-f251-4674-88b8-e368a07d50c5'> <host name='szebs01.app.paic.com.cn' port='6789'/> </source> <target dev='vdb' bus='virtio'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x07' function='0x0'/> </disk> This error information in libvirtd log file: 2015-05-05 02:51:52.005+0000: 32082: error : qemuMonitorJSONCheckError:359 : internal error unable to execute QEMU command '__com.redhat_drive_add': Device 'drive-virtio-disk1' could not be initialized Thanks!! ******************************************************************************************************************************** The information in this email is confidential and may be legally privileged. If you have received this email in error or are not the intended recipient, please immediately notify the sender and delete this message from your computer. Any use, distribution, or copying of this email other than by the intended recipient is strictly prohibited. All messages sent to and from us may be monitored to ensure compliance with internal policies and to protect our business. Emails are not secure and cannot be guaranteed to be error free as they can be intercepted, amended, lost or destroyed, or contain viruses. Anyone who communicates with us by email is taken to accept these risks. �跺��欢��娉ㄦ�锛��浠跺�淇��淇℃�锛��璇��浠讹�璇峰�蹇��ュ��汉骞剁��ュ��伙�涓��浣跨��澶��浠躲� 杩��欢��版��浠跺��藉��淇��涪澶便�琚��璁＄��虹�姣��涓��ㄦ��点� ********************************************************************************************************************************

2 1

[libvirt] [libvirt-test-api][PATCH] Add a new test case for getMemoryParameters
by Luyao Huang 05 May '15

05 May '15

Signed-off-by: Luyao Huang <lhuang(a)redhat.com> --- cases/test_connection.conf | 4 ++ repos/virconn/connection_getMemoryParameters.py | 61 +++++++++++++++++++++++++ 2 files changed, 65 insertions(+) create mode 100644 repos/virconn/connection_getMemoryParameters.py diff --git a/cases/test_connection.conf b/cases/test_connection.conf index 914acac..3c08a95 100644 --- a/cases/test_connection.conf +++ b/cases/test_connection.conf @@ -69,3 +69,7 @@ storage:pool_uuid virconn:connection_getCellsFreeMemory conn qemu:///system + +virconn:connection_getMemoryParameters + conn + qemu:///system diff --git a/repos/virconn/connection_getMemoryParameters.py b/repos/virconn/connection_getMemoryParameters.py new file mode 100644 index 0000000..9b88fc3 --- /dev/null +++ b/repos/virconn/connection_getMemoryParameters.py @@ -0,0 +1,61 @@ +#!/usr/bin/env python + +import libvirt +from libvirt import libvirtError +from utils import utils + +required_params = () +optional_params = {'conn': ''} +node_memory = ['full_scans', + 'merge_across_nodes', + 'pages_shared', + 'pages_sharing', + 'pages_to_scan', + 'pages_unshared', + 'pages_volatile', + 'sleep_millisecs'] + +SYSFS_MEMORY_SHARED_PATH = '/sys/kernel/mm/ksm/' +LIBVIRT_API_PATH = '/usr/share/libvirt/api/libvirt-api.xml' +flags=0 + +def check_memory_parameter(libvirt_dict, parameter_name): + a = libvirt_dict.get('shm_%s' % parameter_name) + try: + b = long(open('%s%s' % (SYSFS_MEMORY_SHARED_PATH, parameter_name)).read()) + except IOError: + logger.info("Cannot get file in path %s%s" \ + % (SYSFS_MEMORY_SHARED_PATH, parameter_name)) + return 1 + logger.info("equal %s : libvirt get %u and we get %u"\ + % (parameter_name, a, b)) + if a == b: + return 0 + else: + return 1 + +def connection_getMemoryParameters(params): + """ + test API for getMemoryParameters in class virConnect + """ + global logger + logger = params['logger'] + fail=0 + + try: + conn=libvirt.open(params['conn']) + + logger.info("get connection to libvirtd") + + if utils.check_flags('getMemoryParameters', LIBVIRT_API_PATH) == 1: + return 1 + + param_dict=conn.getMemoryParameters() + + for n in node_memory: + fail=check_memory_parameter(param_dict, n) + + except libvirtError, e: + logger.error("API error message: %s" % e.message) + fail=1 + return fail -- 1.8.3.1

2 1

[libvirt] [PATCH 0/7] Addition host name check for network storage pools
by John Ferlan 04 May '15

04 May '15

https://bugzilla.redhat.com/show_bug.cgi?id=1171984 As a followon to a recent series to conslidate the various network source host checks into a single API, this series of patches takes the next steps. First off existing code assumed the provided "<host name='%s'>" string resolved to a valid IP Address; however, that's not necessarily the case. So rather than assume the path is valid during the various networked pool startup, open, mount, etc API's check to make sure the host name can be resolved. More than like the processing was going to fail anyway, so failing a bit sooner and with a message indicating the problem might help someone resolve it. Second now that we hope the running pools are using a resolved name, check the new/incoming definitions to make sure that their host name strings do not duplicate an existing/running pool. The existing check only compares the strings for equality, but with networks a name could be an IP Address by number (IPv4 or IPv6) or a name that would need to be resolved. If that name resolves to the same IP Address already running, then we fail the attempted new pool definition. John Ferlan (7): virutil: Introduce virIsValidHostname iscsi: Check for validity of pool source hostname netfs: Check for validity of pool source hostname gluster: Check for validity of pool source hostname sheepdog: Check for validity of pool source hostname util: Introduce virIsSameHostnameInfo storage: Check for duplicate host for incoming pool def src/conf/storage_conf.c | 11 ++- src/libvirt_private.syms | 2 + src/storage/storage_backend_fs.c | 2 + src/storage/storage_backend_gluster.c | 3 + src/storage/storage_backend_iscsi.c | 7 ++ src/storage/storage_backend_sheepdog.c | 36 +++++--- src/util/virutil.c | 155 +++++++++++++++++++++++++++++++++ src/util/virutil.h | 3 + 8 files changed, 205 insertions(+), 14 deletions(-) -- 2.1.0

3 33

[libvirt] [PATCH v3] polkit: Allow password-less access for 'libvirt' group
by Cole Robinson 04 May '15

04 May '15

Many users, who admin their own machines, want to be able to access system libvirtd via tools like virt-manager without having to enter a root password. Just google 'virt-manager without password' and you'll find many hits. I've read at least 5 blog posts over the years describing slightly different ways of achieving this goal. Let's finally add official support for this. Install a polkit-1 rules file granting password-less auth for any user in the new 'libvirt' group. Create the group on RPM install https://bugzilla.redhat.com/show_bug.cgi?id=957300 --- v3: Back to group=libvirt to match what debian and suse are using Patch is unchanged otherwise. So unless there's objects all carry over the previous ACK from danpb and push after the release is out daemon/Makefile.am | 13 +++++++++++++ daemon/libvirt.rules | 9 +++++++++ libvirt.spec.in | 15 +++++++++++++-- 3 files changed, 35 insertions(+), 2 deletions(-) create mode 100644 daemon/libvirt.rules diff --git a/daemon/Makefile.am b/daemon/Makefile.am index 300b9a5..974feed 100644 --- a/daemon/Makefile.am +++ b/daemon/Makefile.am @@ -53,6 +53,7 @@ EXTRA_DIST = \ libvirtd.init.in \ libvirtd.upstart \ libvirtd.policy.in \ + libvirt.rules \ libvirtd.sasl \ libvirtd.service.in \ libvirtd.socket.in \ @@ -233,6 +234,8 @@ policyauth = auth_admin_keep_session else ! WITH_POLKIT0 policydir = $(datadir)/polkit-1/actions policyauth = auth_admin_keep +rulesdir = $(datadir)/polkit-1/rules.d +rulesfile = libvirt.rules endif ! WITH_POLKIT0 endif WITH_POLKIT @@ -263,9 +266,19 @@ if WITH_POLKIT install-data-polkit:: $(MKDIR_P) $(DESTDIR)$(policydir) $(INSTALL_DATA) libvirtd.policy $(DESTDIR)$(policydir)/org.libvirt.unix.policy +if ! WITH_POLKIT0 + $(MKDIR_P) $(DESTDIR)$(rulesdir) + $(INSTALL_DATA) $(srcdir)/$(rulesfile) $(DESTDIR)$(rulesdir)/50-libvirt.rules +endif ! WITH_POLKIT0 + uninstall-data-polkit:: rm -f $(DESTDIR)$(policydir)/org.libvirt.unix.policy rmdir $(DESTDIR)$(policydir) || : +if ! WITH_POLKIT0 + rm -f $(DESTDIR)$(rulesdir)/50-libvirt.rules + rmdir $(DESTDIR)$(rulesdir) || : +endif ! WITH_POLKIT0 + else ! WITH_POLKIT install-data-polkit:: uninstall-data-polkit:: diff --git a/daemon/libvirt.rules b/daemon/libvirt.rules new file mode 100644 index 0000000..01a15fa --- /dev/null +++ b/daemon/libvirt.rules @@ -0,0 +1,9 @@ +// Allow any user in the 'libvirt' group to connect to system libvirtd +// without entering a password. + +polkit.addRule(function(action, subject) { + if (action.id == "org.libvirt.unix.manage" && + subject.isInGroup("libvirt")) { + return polkit.Result.YES; + } +}); diff --git a/libvirt.spec.in b/libvirt.spec.in index 20af502..c71ef25 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -1645,9 +1645,9 @@ then fi %if %{with_libvirtd} +%pre daemon %if ! %{with_driver_modules} %if %{with_qemu} -%pre daemon %if 0%{?fedora} || 0%{?rhel} >= 6 # We want soft static allocation of well-known ids, as disk images # are commonly shared across NFS mounts by id rather than name; see @@ -1661,11 +1661,21 @@ if ! getent passwd qemu >/dev/null; then useradd -r -g qemu -G kvm -d / -s /sbin/nologin -c "qemu user" qemu fi fi -exit 0 %endif %endif %endif + %if %{with_polkit} + %if 0%{?fedora} || 0%{?rhel} >= 6 +# 'libvirt' group is just to allow password-less polkit access to +# libvirtd. The uid number is irrelevant, so we use dynamic allocation +# described at the above link. +getent group libvirt >/dev/null || groupadd -r libvirt + %endif + %endif + +exit 0 + %post daemon %if %{with_systemd} @@ -1939,6 +1949,7 @@ exit 0 %if 0%{?fedora} || 0%{?rhel} >= 6 %{_datadir}/polkit-1/actions/org.libvirt.unix.policy %{_datadir}/polkit-1/actions/org.libvirt.api.policy +%{_datadir}/polkit-1/rules.d/50-libvirt.rules %else %{_datadir}/PolicyKit/policy/org.libvirt.unix.policy %endif -- 2.3.6

2 2

[libvirt] [PATCH v2 0/2] Introduce GIC for aarch64
by Michal Privoznik 04 May '15

04 May '15

diff to v1: - John's review worked in (hopefully) Michal Privoznik (2): Introduce GIC feature qemu: Implement GIC docs/formatdomain.html.in | 10 ++++++ docs/schemas/domaincommon.rng | 11 ++++++- src/conf/domain_conf.c | 37 +++++++++++++++++++++- src/conf/domain_conf.h | 2 ++ src/qemu/qemu_command.c | 13 ++++++++ .../qemuxml2argvdata/qemuxml2argv-aarch64-gic.args | 6 ++++ .../qemuxml2argvdata/qemuxml2argv-aarch64-gic.xml | 26 +++++++++++++++ tests/qemuxml2argvtest.c | 2 ++ 8 files changed, 105 insertions(+), 2 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic.xml -- 2.3.6

2 3

[libvirt] [PATCH 0/2] Forbid unsupported parameters for tunnelled migration
by Jiri Denemark 04 May '15

04 May '15

Jiri Denemark (2): virsh: Don't check migrate parameters qemu: Forbid unsupported parameters for tunnelled migration src/qemu/qemu_migration.c | 16 +++++++++++++++- tools/virsh-domain.c | 13 +------------ 2 files changed, 16 insertions(+), 13 deletions(-) -- 2.4.0

3 5

[libvirt] [PATCH] tests: Fix grammar in comments.
by Andrea Bolognani 04 May '15

04 May '15

Replace all occurrences of "stream write to differences to" with "stream to write differences to". --- tests/testutils.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/testutils.c b/tests/testutils.c index 6a8fe6a..89026c6 100644 --- a/tests/testutils.c +++ b/tests/testutils.c @@ -458,7 +458,7 @@ virtTestCaptureProgramOutput(const char *const argv[] ATTRIBUTE_UNUSED, /** - * @param stream: output stream write to differences to + * @param stream: output stream to write differences to * @param expect: expected output text * @param expectName: name designator of the expected text * @param actual: actual output text @@ -532,7 +532,7 @@ int virtTestDifferenceFull(FILE *stream, } /** - * @param stream: output stream write to differences to + * @param stream: output stream to write differences to * @param expect: expected output text * @param actual: actual output text * @@ -548,7 +548,7 @@ int virtTestDifference(FILE *stream, /** - * @param stream: output stream write to differences to + * @param stream: output stream to write differences to * @param expect: expected output text * @param actual: actual output text * -- 2.1.0

2 2

[libvirt] [PATCH] qemu: improve error message for domain stats API
by Pavel Hrdina 04 May '15

04 May '15

Filtering specific list of domains is not supported yet. Print a better error message. old error message: error: unsupported flags (0x1) in function qemuConnectGetAllDomainStats new error message: error: using filters with list of domains is not implemented yet Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1143837 Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> Signed-off-by: Luyao Huang <lhuang(a)redhat.com> --- Based on https://www.redhat.com/archives/libvir-list/2014-November/msg00069.html with different commit and error message. src/qemu/qemu_driver.c | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index f8d493d..b88e2cc 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -19809,15 +19809,19 @@ qemuConnectGetAllDomainStats(virConnectPtr conn, unsigned int privflags = 0; unsigned int domflags = 0; - if (ndoms) - virCheckFlags(VIR_CONNECT_GET_ALL_DOMAINS_STATS_BACKING | - VIR_CONNECT_GET_ALL_DOMAINS_STATS_ENFORCE_STATS, -1); - else - virCheckFlags(VIR_CONNECT_LIST_DOMAINS_FILTERS_ACTIVE | - VIR_CONNECT_LIST_DOMAINS_FILTERS_PERSISTENT | - VIR_CONNECT_LIST_DOMAINS_FILTERS_STATE | - VIR_CONNECT_GET_ALL_DOMAINS_STATS_BACKING | - VIR_CONNECT_GET_ALL_DOMAINS_STATS_ENFORCE_STATS, -1); + if (ndoms && (flags & (VIR_CONNECT_LIST_DOMAINS_FILTERS_ACTIVE | + VIR_CONNECT_LIST_DOMAINS_FILTERS_PERSISTENT | + VIR_CONNECT_LIST_DOMAINS_FILTERS_STATE))) { + virReportInvalidArg(flags, "%s", _("using filters with list of domains " + "is not implemented yet")); + return -1; + } + + virCheckFlags(VIR_CONNECT_LIST_DOMAINS_FILTERS_ACTIVE | + VIR_CONNECT_LIST_DOMAINS_FILTERS_PERSISTENT | + VIR_CONNECT_LIST_DOMAINS_FILTERS_STATE | + VIR_CONNECT_GET_ALL_DOMAINS_STATS_BACKING | + VIR_CONNECT_GET_ALL_DOMAINS_STATS_ENFORCE_STATS, -1); if (virConnectGetAllDomainStatsEnsureACL(conn) < 0) return -1; -- 2.3.6

2 2

[libvirt] [PATCH] Bump version to 1.2.16 for new dev cycle
by Jiri Denemark 04 May '15

04 May '15

Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- Pushed as trivial. configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index d5fb71d..6122fa5 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.15], [libvir-list(a)redhat.com] [], [http://libvirt.org] +AC_INIT([libvirt], [1.2.16], [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]) -- 2.4.0

1 0

[libvirt] [PATCH] qemu: fix the vm deadlock when delete an unexist iothread
by Luyao Huang 04 May '15

04 May '15

https://bugzilla.redhat.com/show_bug.cgi?id=1218145 Jump to endjob instead of cleanup to fix this deadlock. Signed-off-by: Luyao Huang <lhuang(a)redhat.com> --- src/qemu/qemu_driver.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 3695b26..5e998c9 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -6379,7 +6379,7 @@ qemuDomainChgIOThread(virQEMUDriverPtr driver, _("cannot find IOThread '%u' in persistent " "iothreadids"), iothread_id); - goto cleanup; + goto endjob; } virDomainIOThreadIDDel(persistentDef, iothread_id); -- 1.8.3.1

2 1

[libvirt] Release of libvirt-1.2.15
by Daniel Veillard 04 May '15

04 May '15

It's out ! Libvirt 1.2.15 is released, I tagged it in git and provided signed tarballs and rpms available at the usual place: ftp://libvirt.org/libvirt/ I also pushed a python bindings release too at: ftp://libvirt.org/libvirt/python/ This is again a reasonably large release with around 375 patches merged in, including a fairly large set of bug fixes across all areas. A few user visible features and a large set of improvements are there too: Features: - Implement virDomainAddIOThread and virDomainDelIOThread (John Ferlan) - libxl: Introduce configuration file for libxl driver (Jim Fehlig) - Add VIR_DOMAIN_EVENT_ID_DEVICE_ADDED event (Ján Tomko) - various improvements to parallels driver (Maxim Nestratov, Dmitry Guryanov) Documentation: - qemu: Fix comment for timeDelta (Jiri Denemark) - Fix typo in comment about memory binding (zhang bo) - virhostdev: Fix comments for virHostdevReAttachPCIDevices (John Ferlan) - Add articles to virDomainDeviceDetachFlags docs (Ján Tomko) - lib: snapshot: Explain that only one layer of images is inserted (Peter Krempa) - Visually separate snapshot disk subelements (Ján Tomko) - Add info (where necessary) that paths should be specified as absolute (Erik Skultety) - Typos: Get rid of dependan(t|cies) (Martin Kletzander) - Add Host sFlow into monitoring apps (Martin Kletzander) Portability: - Fix building virnetserverclientmock with MinGW (Martin Kletzander) - Cleanup parameters for mock libraries (Martin Kletzander) - Cleanup srcdir usage (Michal Privoznik) - Add missing linker flags for MinGW build (Pavel Fedin) - build: add pragma directive to fix build on some gcc (Pavel Hrdina) - build: avoid obsolete index() (Eric Blake) - util: fix build on non-Linux (Roman Bogorodskiy) - vircapstest: fix build without LXC, QEMU or XEN (Roman Bogorodskiy) - virbuffer: fix build on rhel-6 (Pavel Hrdina) - tests: fix build on old 32-bit platforms (Eric Blake) - build: provide virNetDevSysfsFile on non-Linux (Eric Blake) - build: include correct header for time() (Eric Blake) - xen: fix build error on rhel-5 (Pavel Hrdina) - qemu: Avoid shadow of 'sync' symbol (Peter Krempa) Bug Fixes: - qemu: Fix bus and lun checks when scsi-disk.channel not present (John Ferlan) - rpm-build: update %files section for libxl (Pavel Hrdina) - qemu: blockjob: Call qemuDomainSupportsBlockJobs only on online VMs (Peter Krempa) - qemu: Check address type for USB disks (Jiri Denemark) - cpu: Honor vendor_id override in host-model (Jiri Denemark) - iscsi: do not fail to stop a stopped pool (Ján Tomko) - qemu: conf: Reject memory device if it would exceed configured max size (Peter Krempa) - qemu: blockCopy: Allow reuse of raw image for shallow block copy (Peter Krempa) - tests: free ChardevInfo correctly in qemumonitorjsontest (Zhang Bo) - storage: fs: Ignore volumes that fail to open with EACCESS/EPERM (Cole Robinson) - storage: If driver startup state syncing fails, delete statefile (Cole Robinson) - storage: Don't leave stale state file if pool startup fails (Cole Robinson) - storage: Fix autostart dir for qemu:///session (Cole Robinson) - qemu: qemuProcessDetectIOThreadPIDs invert checks (John Ferlan) - conf: Resolve some Coverity errors (John Ferlan) - network: check newDef for used bridge names in addition to def (Laine Stump) - network: check for bridge name conflict with existing devices (Laine Stump) - network: move auto-assign of bridge name from XML parser to net driver (Laine Stump) - test: Fix actual vs. expected in virtTestCompareFiles (Laine Stump) - qemu: Resolve Coverity DEADCODE (John Ferlan) - util: fix memleak in virStorageSourceClear (zhang bo) - storage: Resolve Coverity UNINIT (John Ferlan) - Fix check for return value of qemuDomainAgentAvailable() (Martin Kletzander) - conf: fix memleak in virDomainHostdevDefClear (Zhang Bo) - conf: fix memleak in virDomainNetIpParseXML (Zhang Bo) - qemu: fix memleak in virCapabilitiesDomainDataLookup (Zhang Bo) - qemu: fix memleaks in qemuBuildCommandLine (Zhang Bo) - util: fix memleak in virFindSCSIHostByPCI (Zhang Bo) - tests: fix some memleaks in tests (Zhang Bo) - qemu: Fix domain object leak in qemuDomainInterfaceAddresses (Peter Krempa) - libxl: initialize sdl.opengl defbool in libxlMakeVfb (Jim Fehlig) - libxl: initialize vfb defbools in libxlMakeVfb (Olaf Hering) - parallels: fix crash in prlsdkAddNet in case of CT definition (Maxim Nestratov) - bhyve: fix build in tests (Roman Bogorodskiy) - Fix memory leak in virNetSocketNewConnectUNIX (Jiri Denemark) - parallels: fix IS_CT macro (Maxim Nestratov) - rng: fix port number range validation (Daniel P. Berrange) - qemu: Don't fail to reboot domains with unresponsive agent (zhang bo) - bhyve: fix build in tests (Roman Bogorodskiy) - spec: Fix libxl build with driver modules (Cole Robinson) - configure: Fix --loader-nvram typo (Cole Robinson) - parallels: don't forget to unlock domain after successful virDomainObjListFindByUUID call (Maxim Nestratov) - vircommand: fix polling in virCommandProcessIO (Roman Bogorodskiy) - util: storage: Fix possible crash when source path is NULL (Peter Krempa) - qemu: Fix issues with maxMemory in qemuDomainSetMemoryFlags() (Luyao Huang) - qemu: set macvtap physdevs online when macvtap is set online (Laine Stump) - util: set MAC address for VF via netlink message to PF+VF# when possible (Laine Stump) - qemu: Always refresh capabilities if no <guests> found (Cole Robinson) - scsi: Adjust return values from processLU (John Ferlan) - storage: Fix check for stable path check (John Ferlan) - domtop: Properly free cpu status (Michal Privoznik) - parallels: fix return status for parallelsConnectOpen (Nikolay Shirokovskiy) - lxc: fix starting a domain with non-strict numa memory mode (Luyao Huang) - lxc: fix starting a domain with a cpuset but no numatune (Luyao Huang) - rng: Forbid to validate mismatched <disk> 'device' and 'type' attributes (Erik Skultety) - domcaps: Check for architecture more wisely (Michal Privoznik) - virNetSocketNewConnectUNIX: Don't unlink(NULL) (Michal Privoznik) - libxl: drop virDomainObj lock when destroying a domain (Jim Fehlig) - libxl: acquire a job when destroying a domain (Jim Fehlig) - virCondWaitUntil: calculate timespec correctly (Michael Chapman) - qemu: bulk stats: Ignore errors from missing/inaccessible disks (Peter Krempa) - Strip control codes in virBufferEscapeString (Ján Tomko) - Ignore storage volumes with control codes in their names (Ján Tomko) - Strip control characters from sysfs attributes (Ján Tomko) - tests: Resolve Coverity RESOURCE_LEAK (John Ferlan) - virsh: fix regression in 'virsh event' by domain (Eric Blake) - qemu: monitor: Fix qemuMonitorGetAllBlockStatsInfo with HMP (Peter Krempa) - qemu: monitor: Ensure that qemuMonitorSetLink is called with non-null name (Peter Krempa) - virNetSocketNewConnectUNIX: Use flocks when spawning a daemon (Michal Privoznik) - sanlock: Use VIR_ERR_RESOURCE_BUSY if sanlock_acquire fails (Jiri Denemark) - hostdev: fix loop index error when resetvfnetconfig (Huanle Han) - qemu: fix index error when clean up vport profile (Huanle Han) - virt-aa-helper: add unix channels (esp for qemu-guest-agent) (Serge Hallyn) - qemu: save domain status after set memory parameters (Shanzhi Yu) - virsh: improve the error for wrong memtune parameters (Shanzhi Yu) - qemu: drivePivot: Fix assumption when 'block-job-complete' fails (Peter Krempa) - qemu: Fix condition for checking vcpu when pinning vcpus (Peter Krempa) - qemu: Enforce WWN to be unique among VM's disks (Peter Krempa) - virBitmap: Place virBitmapIsAllClear check after virBitmapParse calls (Erik Skultety) - Fix usb device version parsing issues (Ján Tomko) - Support IPv6 in networkGetNetworkAddress (Ján Tomko) - util: Update virNetDevGetIPAddress to get IPv6 addresses (Luyao Huang) - parallels: fix virDomainDefineXML for domain in saved state (Dmitry Guryanov) - conf: fix virDomainDefFormatInternal for parallels (Dmitry Guryanov) - conf: fix virDomainDefParseXML for parallels (Dmitry Guryanov) - storage: Don't duplicate efforts of backend driver (John Ferlan) - storage: Need to update freeExtent at delete primary partition (John Ferlan) - storage: Fix issues in storageVolResize (John Ferlan) - Open /proc/PID/ns/* read-only to avoid getting permission denied (Cédric Bosdonnat) - lxc: create the required directories upon driver start (Lubomir Rintel) - util: file: Don't carelessly sanitize URIs (Peter Krempa) - fix memleak in qemuRestoreCgroupState (Luyao Huang) - qemuProcessHook: Call virNuma*() only when needed (Michal Privoznik) - parallels: delete old networks in prlsdkDoApplyConfig before adding new ones (Maxim Nestratov) - util: fix removal of callbacks in virCloseCallbacksRun (Michael Chapman) - qemu: fix race between disk mirror fail and cancel (Michael Chapman) - qemu: fix error propagation in qemuMigrationBegin (Michael Chapman) - qemu: fix crash in qemuProcessAutoDestroy (Michael Chapman) - virQEMUDriverGetConfig: Fix memleak (Michal Privoznik) - virDomainVirtioSerialAddrSetFree: Fix memleak (Michal Privoznik) - qemuSetupCgroupForVcpu: Fix memleak (Michal Privoznik) - libvirt: virsh: Kill all uses of __FUNCTION__ in error messages (Noella Ashu) - virsh: Fix domifaddr output in quiet mode (Luyao Huang) - libxl: fix dom0 balloon logic (Jim Fehlig) - hostdev: Fix index error in loop after remove an element (Huanle Han) - Fix xlconfigtest with older libxl (Ján Tomko) - iscsi: Fix exit path for virStorageBackendISCSIFindLUs failure (John Ferlan) - qemuDomainBlockCopy: Check @granularity to be a power of two (Luyao Huang) - nodeinfodata: Remove broken symlinks and uneeded files (Michal Privoznik) - qemu: lifecycle: make agent-mode shutdown and reboot timeout (zhang bo) Improvements: - main: add new generated files to .gitignore (Pavel Hrdina) - libxl: provide integration with lock manager (Jim Fehlig) - domain: conf: Drop unused OSTYPE_AIX (Cole Robinson) - qemu: migration: use sync block job helpers (Michael Chapman) - qemuDomainBlockJobAbort: use sync block job helpers (Michael Chapman) - qemuProcessStop: wake up pending sync block jobs (Michael Chapman) - qemuBlockJobSync*: introduce sync block job helpers (Michael Chapman) - qemuBlockJobEventProcess: move to new source file (Michael Chapman) - qemu: Validate available slot count for memory devices (Peter Krempa) - qemu: command: Validate that memory devices slot ID is in range (Peter Krempa) - parallels: implement domainDetachDevice and domainDetachDeviceFlags (Maxim Nestratov) - parallels: add prlsdkDelDisk and prlsdkGetDiskIndex functions (Maxim Nestratov) - qemu: make qemuMonitorChardevInfoFree non-static (Zhang Bo) - storage: Break out storageDriverLoadPoolState (Cole Robinson) - qemu: Remove need for qemuMonitorIOThreadInfoFree (John Ferlan) - qemu: Remove need for qemuDomainParseIOThreadAlias (John Ferlan) - conf: explicitly initialize 'cpumask' variable (Roman Bogorodskiy) - virsh: Add iothreadadd and iothreaddel commands (John Ferlan) - qemu: Add support to Add/Delete IOThreads (John Ferlan) - domain: Introduce virDomainIOThreadSchedDelId (John Ferlan) - remote: Add support for AddIOThread and DelIOThread (John Ferlan) - conf: Adjust the iothreadsched expectations (John Ferlan) - Move iothreadspin information into iothreadids (John Ferlan) - conf: Move virDomainPinIsDuplicate and make static (John Ferlan) - qemu: Use domain iothreadids to IOThread's 'thread_id' (John Ferlan) - conf: Add new domain XML element 'iothreadids' (John Ferlan) - openvz: Drop useless domain lookup (Michal Privoznik) - qemu: Connect to guest agent after channel hotplug (Peter Krempa) - qemu: agent: Differentiate errors when the agent channel was hotplugged (Peter Krempa) - qemu: Reuse qemuDomainAgentAvailable in qemuDomainInterfaceAddresses (Peter Krempa) - qemu: agent: Reuse virJSONValueObjectCreateVArgs in qemuAgentMakeCommand (Peter Krempa) - libxl: remove duplicate check for pci subsystem type (Olaf Hering) - libxl: use pci init and dispose functions (Olaf Hering) - hostdev: fix net config restore error (Huanle Han) - hostdev: Create virHostdevIsPCINetDevice (Huanle Han) - qemu: Build nvram directory at driver startup (Cole Robinson) - qemu: Build channel autosocket directory at driver startup (Cole Robinson) - qemu: chown autoDumpPath on driver startup (Cole Robinson) - qemu: conf: Clarify paths that are relative to libDir (Cole Robinson) - tests: qemu: Couple aarch64 CPU tests (Cole Robinson) - migration: Usable time statistics without requiring NTP (Jiri Denemark) - uml: s/virDomainObjListFindByID/virDomainObjListFindByUUID/ (Michal Privoznik) - virDomainObjList: Introduce yet another hash table (Michal Privoznik) - virDomainObjListFindByName: Return referenced object (Michal Privoznik) - Introduce virDomainObjEndAPI (Michal Privoznik) - virDomainObjListNew: Use virObjectFreeHashData (Michal Privoznik) - virDomainObjListAddLocked: s/false/NULL/ for @oldDef (Michal Privoznik) - parallels: implement .domainGetMaxMemory (Dmitry Guryanov) - Apparmor: allow reading block-rbd.so (Cédric Bosdonnat) - Allow access to vendor and device file for PCI device passthrough (Cédric Bosdonnat) - qemu: cgroup: Fix priorities when setting emulatorpin (Peter Krempa) - tests: Add VIR_TEST_REGENERATE_OUTPUT (Cole Robinson) - tests: Add virtTestCompareToFile (Cole Robinson) - tests: Use *DefParseFile more (Cole Robinson) - tests: Add VIR_TEST_DEBUG and VIR_TEST_VERBOSE (Cole Robinson) - parallels_sdk: Utilize parallelsDomObjFromDomain() (Michal Privoznik) - parallels_driver: Utilize parallelsDomObjFromDomain() (Michal Privoznik) - parallels: Introduce parallelsDomObjFromDomain() (Michal Privoznik) - struct _parallelsConn: Mark @domains as immutable pointer (Michal Privoznik) - spec: Point fedora --with-loader-nvram at nightly firmware repo (Cole Robinson) - configure: Report --with-loader-nvram value in summary (Cole Robinson) - locking: relax PID requirement (Jim Fehlig) - util: storage: Improve error message when requesting image above 'start' (Peter Krempa) - util: storage: Add hint to error message that indexed access was used (Peter Krempa) - util: command: Deduplicate code in virCommandNewArgList (Peter Krempa) - qemu: migration: Refactor hostdev validation in migration check (Peter Krempa) - processNicRxFilterChangedEvent: Take appropriate actions for NET_TYPE_NETWORK too (Michal Privoznik) - virDomainActualNetDefContentsFormat: Format class_id only for status XML (Michal Privoznik) - scsi: Change return values for virStorageBackendSCSIFindLUs (John Ferlan) - scsi: Adjust return value for virStorageBackendSCSINewLun (John Ferlan) - storage: Split out the stable path check (John Ferlan) - xend: Remove a couple of unused function prototypes. (Richard W.M. Jones) - domain: conf: Drop expectedVirtTypes (Cole Robinson) - caps: Use DomainDataLookup to replace GuestDefault* (Cole Robinson) - domain: conf: Use CapabilitiesDomainDataLookup for caps validation (Cole Robinson) - domain: conf: Do ostype/arch/machine parsing earlier (Cole Robinson) - caps: Add virCapabilitiesDomainDataLookup (Cole Robinson) - caps: Convert to use VIR_DOMAIN_VIRT internally (Cole Robinson) - domain: Convert os.type to VIR_DOMAIN_OSTYPE enum (Cole Robinson) - caps: Switch AddGuest to take VIR_DOMAIN_OSTYPE value (Cole Robinson) - caps: Use an enum internally for ostype value (Cole Robinson) - domain: conf: Don't validate VM ostype/arch at daemon startup (Cole Robinson) - domain: conf: Better errors on bad os <type> values (Cole Robinson) - parallels: make device addressing consistent (Nikolay Shirokovskiy) - rng: Move sgio attr definition to a separate block (Erik Skultety) - Apparmor: removed duplicate nscd rules (Cédric Bosdonnat) - schema: Allow multiple machines for VMs and unite architectures (Martin Kletzander) - qemuDomainShutdownFlags: Set fakeReboot more frequently (zhang bo) - Introduce virNetDevBandwidthUpdateFilter (Michal Privoznik) - virnetdevbandwidth.c: Separate tc filter creation to a function (Michal Privoznik) - virNetDevBandwidthSet: Add priority to filter (Michal Privoznik) - virDomainActualNetDefContentsFormat: Format class_id more frequently (Michal Privoznik) - nwfilter: Partly initialize driver even for non-privileged users (Michal Privoznik) - lxc: move wireless PHYs to a network namespace (Lubomir Rintel) - libxl: Move job acquisition in libxlDomainStart to callers (Jim Fehlig) - libxl: support HVM direct kernel boot (Jim Fehlig) - xenconfig: don't use "kernel" for hvmloader (Jim Fehlig) - xenconfig: move <os> parsing/formating to config-specific files (Jim Fehlig) - xenconfig: remove redunant parsing of device_model (Jim Fehlig) - xenconfig: export xenConfigCopyString (Jim Fehlig) - storage: Refactor virStorageBackendSCSINewLun (John Ferlan) - qemu: monitor: Refactor and fix monitor checking (Peter Krempa) - daemon: Prefix sysctl configuration filename with a number (Jiri Denemark) - RNG schema: allow plain @floor to <bandwidth/> (Michal Privoznik) - virNetDevBandwidthPlug: Update function description (Michal Privoznik) - Add functions dealing with control characters in strings (Ján Tomko) - tests: rename testStripIPv6BracketsData to testStripData (Ján Tomko) - Add an example for EVENT_ID_DEVICE_ADDED (Ján Tomko) - Emit VIR_DOMAIN_EVENT_ID_DEVICE_ADDED in the QEMU driver (Ján Tomko) - Cleanup "/sys/class/net" usage (Michal Privoznik) - tests: Add virnetdevtestdata to EXTRA_DIST (Michal Privoznik) - node: udev: Remove some redundant error reports (Peter Krempa) - virPidFileConstructPath: Drop useless VIR_FREE() (Michal Privoznik) - qemu: monitor: @running in qemuMonitorGetStatus is always non-NULL (Peter Krempa) - qemu: monitor: Don't use 'ret' variable where not necessary (Peter Krempa) - qemu: monitor: Sanitize control flow in qemuMonitorSetCapabilities (Peter Krempa) - qemu: monitor: Clean up coding style (Peter Krempa) - json: export non-static functions (Martin Kletzander) - Change virConnectPtr into virObjectLocklable (Martin Kletzander) - closeCallback is already lockable, initialize it as such (Martin Kletzander) - configure: Align messages (Martin Kletzander) - storage: Add duplicate devices check for zfs pool def (John Ferlan) - storage: Add duplicate source pool for Gluster pool def (John Ferlan) - storage: Add duplicate host check for Sheepdog pool def (John Ferlan) - storage: Remove default from switch in virStoragePoolSourceFindDuplicate (John Ferlan) - storage: Use virStoragePoolSourceMatchSingleHost for NETFS (John Ferlan) - storage: Add check for different ports for host duplicate matching (John Ferlan) - storage: Create virStoragePoolSourceMatchSingleHost (John Ferlan) - storage: Refactor iSCSI Source matching (John Ferlan) - Introduce virnetdevtest (Michal Privoznik) - cfg: Disallow usage of 'index' as variable name (John Ferlan) - nwfilter: Change 'index' to 'idx' (John Ferlan) - snapshot: Change 'index' to 'idx' (John Ferlan) - util: Use 'idx' instead of 'index' (John Ferlan) - qemu: Adjust the prototype to match the function (John Ferlan) - sparc: Add default PCI root controller (Martin Kletzander) - qemu: Use 'idx' instead of 'index' for variable name (John Ferlan) - qemu: Refactor qemuDomainBlockJobAbort() (Peter Krempa) - qemu: blockPull: Refactor the rest of qemuDomainBlockJobImpl (Peter Krempa) - qemu: blockjob: Separate qemuDomainBlockJobAbort from qemuDomainBlockJobImpl (Peter Krempa) - qemu: blockjob: Split qemuDomainBlockJobSetSpeed from qemuDomainBlockJobImpl (Peter Krempa) - qemu: monitor: Extract handling of JSON block job error codes (Peter Krempa) - qemu: monitor: json: Refactor error code class checker (Peter Krempa) - conf: Refactor virDomainVcpuPinDefParseXML (Peter Krempa) - conf: Error out if iothread id is missing in iothreadpin (Peter Krempa) - onf: Split up virDomainVcpuPinDefParseXML (Peter Krempa) - conf: Split out parsing of emulatorpin (Peter Krempa) - conf: ABI: Check WWN in disk abi stability check (Peter Krempa) - Convert virDomainPinIsDuplicate into bool return (John Ferlan) - Rename qemuCheckIothreads to qemuCheckIOThreads (John Ferlan) - Rewrite vshParseCPUList (Ján Tomko) - Rewrite vshPrintPinInfo (Ján Tomko) - Parallels: implemented domainAttachDevice (Alexander Burluka) - Parallels: implement domainAttachDeviceFlags (Alexander Burluka) - Parallels: remove disk serial number check (Alexander Burluka) - Remove overengineered loop (Ján Tomko) - Introduce struct _virStorageBackendQemuImgInfo (Ján Tomko) - Rename virStorageBackendCreateQemuImgCmd (Ján Tomko) - Use XPath when parsing snapshot disk definition (Ján Tomko) - Split out storage format 'compat' attribute sanity check (Ján Tomko) - Remove feature formating funcs from pool-specific options (Ján Tomko) - Rewrite usb device version parsing (Ján Tomko) - Do xml->xml test for usb-redir-filter (Ján Tomko) - Do not require virtio-pci devices when using virtio-mmio (Ján Tomko) - qemuMigrationPrecreateStorage: Fix debug message (Michal Privoznik) - qemu_migration.c: sleep first before checking for migration status. (Xing Lin) - conf: Don't output <cpu> tag if it contains no information. (Andrea Bolognani) - qemu: qemuDomainHotplugVcpus - separate out pin adjustment code (John Ferlan) - AUTHORS: Add my email address to AUTHORS.in (Dmitry Guryanov) - util: Replace virNetDevGetIPv4Address with virNetDevGetIPAddress (John Ferlan) - parallels: add implicit input devices (Dmitry Guryanov) - conf: add input device type for parallels containers (Dmitry Guryanov) - conf: return proper default video type for parallels (Dmitry Guryanov) - conf: add VIR_DOMAIN_VIDEO_TYPE_PARALLELS video type (Dmitry Guryanov) - parallels: don't fill net adapter model for containers (Dmitry Guryanov) - parallels: fill adapter model in virDomainNetDef (Dmitry Guryanov) - parallels: add controllers in prlsdkLoadDomain (Dmitry Guryanov) - parallels: report, that cdroms are readonly (Dmitry Guryanov) - parallels: implement virDomainManagedSave (Dmitry Guryanov) - parallels: split prlsdkDomainChangeState function (Dmitry Guryanov) - parallels: fix headers in parallels_sdk.h (Dmitry Guryanov) - qemu: qemuDomainHotplugVcpus - separate out the del cgroup and pin (John Ferlan) - qemu: qemuDomainHotplugVcpus - separate out the add cgroup (John Ferlan) - cgroup: Use virCgroupNewThread (John Ferlan) - cgroup: Introduce virCgroupNewThread (John Ferlan) - qemu: blockPivot: Don't pause the VM any more since we don't use drive-reopen (Peter Krempa) - qemu: Clean up old leftovers in qemuMonitorDrivePivot (Peter Krempa) - qemu: blockjob: Use the new helpers in qemuDomainGetBlockJobInfo (Peter Krempa) - qemu: domain: Add helper to check block job support (Peter Krempa) - qemu: domain: Introduce helper to retrieve domain monitor object (Peter Krempa) - Apparmor qemu abstraction fixes for SLES (Cédric Bosdonnat) - test: Add tests for virFileSanitizePath (Peter Krempa) - virLXCControllerSetupResourceLimits: Call virNuma*() iff needed (Michal Privoznik) - vbox: Implement virDomainSendKey (Dawid Zamirski) - vbox: Register IKeyboard with the unified API. (Dawid Zamirski) - vircgroup: Introduce virCgroupControllerAvailable (Michal Privoznik) - qemu_driver: check caps after starting block job (Michael Chapman) - qemu_migrate: use nested job when adding NBD to cookie (Michael Chapman) - storage: Introduce storagePoolUpdateAllState function (Erik Skultety) - conf: Introduce virStoragePoolLoadAllState && virStoragePoolLoadState (Erik Skultety) - storage: Add support for storage pool state XML (Erik Skultety) - hostdev: Report the domain name for used hostdevs during nodedev-detach (Shivaprasad G Bhat) - virsh: Improve change-media success message (Cole Robinson) - interface: allow multiple IPv4 addresses in interface XML (Laine Stump) - virsh.pod: Remove redundant --config from attach-interface (Jiri Denemark) - esx: esxNodeGetFreeMemory return info from host. (Dawid Zamirski) - esx: add esxVI_GetInt (Dawid Zamirski) - conf: Change virStoragePoolSaveConfig prototype s/configDir/configFile (Erik Skultety) - conf: Introduce virStoragePoolSaveState (Erik Skultety) - conf: Introduce virStoragePoolDefFormatBuf (Erik Skultety) - Auto add virtio-serial controllers (Ján Tomko) - Assign an address when hotplugging a virtio-serial device (Ján Tomko) - Expand the address set when attaching a virtio-serial controller (Ján Tomko) - Allocate virtio-serial addresses when starting a domain (Ján Tomko) - Add functions to track virtio-serial addresses (Ján Tomko) - Add test for virtio serial port assignment (Ján Tomko) - scsi: Remove unused 'type_path' in processLU (John Ferlan) - iscsi: Use error message from virStorageBackendSCSIFindLUs (John Ferlan) - conf: Introduce virStoragePoolSaveXML (Erik Skultety) - storage: Remove unused attribute conn from 'checkPool' callback (Erik Skultety) - Fix indentation in cmdVcpuPin (Ján Tomko) - virsh: remove stale comment (Ján Tomko) - conf: Rename virDomainHasDiskMirror and detect block jobs properly (Shanzhi Yu) - qemu: snapshot: Check for block jobs individually (Peter Krempa) - Remove unnecessary includes from virsh.h (Ján Tomko) - Remove unused includes from virsh (Ján Tomko) - Clean up headers in src/util/virutil.h (Ján Tomko) - Do not include cpu_map.h in libvirtd.c (Ján Tomko) - Use the DEFAULT_DRIVER_DIR macro (Ján Tomko) - Remove unused macros (Ján Tomko) - qemu: Copy bitmap in a sane way (Peter Krempa) - qemu: cgroup: Kill qemuSetupCgroupVcpuPin() (Peter Krempa) - qemu: cgroup: Kill qemuSetupCgroupIOThreadsPin() (Peter Krempa) - qemu: cgroup: Rename qemuSetupCgroupEmulatorPin to qemuSetupCgroupCpusetCpus (Peter Krempa) - qemu: cgroup: Use priv->autoCpuset instead of using qemuPrepareCpumap() (Peter Krempa) - qemu: cgroup: Properly set up vcpu pinning (Peter Krempa) - qemu: cgroup: Refactor setup for IOThread cgroups (Peter Krempa) - qemu: cgroup: Store auto cpuset instead of re-creating it on demand (Peter Krempa) So thanks everybody for your contributions for this release, be it ideas, bug reports, documentations, patches, reviews ... all those releases represent a massive amount of work ! 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] Entering freeze for libvirt-1.2.15
by Daniel Veillard 03 May '15

03 May '15

I'm a little late, but I have now tagged candidate release 1 for 1.2.15 in git and pushed signed tarballs and rpms to the usual place: ftp://libvirt.org/libvirt/ this seems to work for me in my limited testing, but please give it a try, especially on less common platforms. The https://ci.centos.org/ seems to indicate issues on building the Perl tests as well as virt-manager regression testing, can someone dig into what is happening there ? I will likely push an rc2 on Thursday, and then the final release over the week-end, thanks! 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/

3 4

[libvirt] [PATCH V3] libxl: provide integration with lock manager
by Jim Fehlig 01 May '15

01 May '15

Provide integration with libvirt's lock manager in the libxl driver. Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- V3 of https://www.redhat.com/archives/libvir-list/2015-April/msg01006.html In V3, call virDomainLockProcessStart() with 'paused' parameter set to 'true' and add a call to virDomainLockProcessResume(). src/Makefile.am | 12 +++++++++ src/libxl/libvirtd_libxl.aug | 2 ++ src/libxl/libxl.conf | 10 +++++++ src/libxl/libxl_conf.c | 14 ++++++++++ src/libxl/libxl_conf.h | 6 +++++ src/libxl/libxl_domain.c | 51 +++++++++++++++++++++++++++++++++++- src/libxl/libxl_domain.h | 1 + src/libxl/libxl_driver.c | 25 ++++++++++++++++++ src/libxl/libxl_migration.c | 6 +++++ src/libxl/test_libvirtd_libxl.aug.in | 1 + 10 files changed, 127 insertions(+), 1 deletion(-) diff --git a/src/Makefile.am b/src/Makefile.am index 9a5f16c..1438174 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -2246,6 +2246,12 @@ BUILT_SOURCES += locking/qemu-lockd.conf DISTCLEANFILES += locking/qemu-lockd.conf endif WITH_QEMU +if WITH_LIBXL +nodist_conf_DATA += locking/libxl-lockd.conf +BUILT_SOURCES += locking/libxl-lockd.conf +DISTCLEANFILES += locking/libxl-lockd.conf +endif WITH_LIBXL + locking/%-lockd.conf: $(srcdir)/locking/lockd.conf $(AM_V_GEN)$(MKDIR_P) locking ; \ cp $< $@ @@ -2431,6 +2437,12 @@ nodist_conf_DATA += locking/qemu-sanlock.conf BUILT_SOURCES += locking/qemu-sanlock.conf DISTCLEANFILES += locking/qemu-sanlock.conf endif WITH_QEMU + +if WITH_LIBXL +nodist_conf_DATA += locking/libxl-sanlock.conf +BUILT_SOURCES += locking/libxl-sanlock.conf +DISTCLEANFILES += locking/libxl-sanlock.conf +endif WITH_LIBXL else ! WITH_SANLOCK EXTRA_DIST += $(LOCK_DRIVER_SANLOCK_SOURCES) endif ! WITH_SANLOCK diff --git a/src/libxl/libvirtd_libxl.aug b/src/libxl/libvirtd_libxl.aug index f225954..d5aa150 100644 --- a/src/libxl/libvirtd_libxl.aug +++ b/src/libxl/libvirtd_libxl.aug @@ -25,9 +25,11 @@ module Libvirtd_libxl = (* Config entry grouped by function - same order as example config *) let autoballoon_entry = bool_entry "autoballoon" + let lock_entry = str_entry "lock_manager" (* Each entry in the config is one of the following ... *) let entry = autoballoon_entry + | lock_entry let comment = [ label "#comment" . del /#[ \t]*/ "# " . store /([^ \t\n][^\n]*)?/ . del /\n/ "\n" ] let empty = [ label "#empty" . eol ] diff --git a/src/libxl/libxl.conf b/src/libxl/libxl.conf index c104d40..ba3de7a 100644 --- a/src/libxl/libxl.conf +++ b/src/libxl/libxl.conf @@ -10,3 +10,13 @@ # autoballoon setting. # #autoballoon = 1 + + +# In order to prevent accidentally starting two domains that +# share one writable disk, libvirt offers two approaches for +# locking files: sanlock and virtlockd. sanlock is an external +# project which libvirt integrates with via the libvirt-lock-sanlock +# package. virtlockd is a libvirt implementation that is enabled with +# "lockd". Accepted values are "sanlock" and "lockd". +# +#lock_manager = "lockd" diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c index 1b504fa..29498d5 100644 --- a/src/libxl/libxl_conf.c +++ b/src/libxl/libxl_conf.c @@ -102,6 +102,7 @@ libxlDriverConfigDispose(void *obj) VIR_FREE(cfg->libDir); VIR_FREE(cfg->saveDir); VIR_FREE(cfg->autoDumpDir); + VIR_FREE(cfg->lockManagerName); } @@ -1495,6 +1496,7 @@ int libxlDriverConfigLoadFile(libxlDriverConfigPtr cfg, const char *filename) { virConfPtr conf = NULL; + virConfValuePtr p; int ret = -1; /* Check the file is readable before opening it, otherwise @@ -1512,6 +1514,18 @@ int libxlDriverConfigLoadFile(libxlDriverConfigPtr cfg, if (libxlGetAutoballoonConf(cfg, conf) < 0) goto cleanup; + if ((p = virConfGetValue(conf, "lock_manager"))) { + if (p->type != VIR_CONF_STRING) { + virReportError(VIR_ERR_INTERNAL_ERROR, + "%s", + _("Unexpected type for 'lock_manager' setting")); + goto cleanup; + } + + if (VIR_STRDUP(cfg->lockManagerName, p->str) < 0) + goto cleanup; + } + ret = 0; cleanup: diff --git a/src/libxl/libxl_conf.h b/src/libxl/libxl_conf.h index 5ba1a71..0a1c0db 100644 --- a/src/libxl/libxl_conf.h +++ b/src/libxl/libxl_conf.h @@ -38,6 +38,7 @@ # include "virobject.h" # include "virchrdev.h" # include "virhostdev.h" +# include "locking/lock_manager.h" # define LIBXL_DRIVER_NAME "xenlight" # define LIBXL_VNC_PORT_MIN 5900 @@ -98,6 +99,8 @@ struct _libxlDriverConfig { * memory for new domains from domain0. */ bool autoballoon; + char *lockManagerName; + /* Once created, caps are immutable */ virCapsPtr caps; @@ -144,6 +147,9 @@ struct _libxlDriverPrivate { /* Immutable pointer, lockless APIs*/ virSysinfoDefPtr hostsysinfo; + + /* Immutable pointer. lockless access */ + virLockManagerPluginPtr lockManager; }; # define LIBXL_SAVE_MAGIC "libvirt-xml\n \0 \r" diff --git a/src/libxl/libxl_domain.c b/src/libxl/libxl_domain.c index 3039427..5f5f8e5 100644 --- a/src/libxl/libxl_domain.c +++ b/src/libxl/libxl_domain.c @@ -34,6 +34,7 @@ #include "virlog.h" #include "virstring.h" #include "virtime.h" +#include "locking/domain_lock.h" #define VIR_FROM_THIS VIR_FROM_LIBXL @@ -217,12 +218,36 @@ libxlDomainObjPrivateFree(void *data) { libxlDomainObjPrivatePtr priv = data; + VIR_FREE(priv->lockState); virObjectUnref(priv); } +static int +libxlDomainObjPrivateXMLParse(xmlXPathContextPtr ctxt, void *data) +{ + libxlDomainObjPrivatePtr priv = data; + + priv->lockState = virXPathString("string(./lockstate)", ctxt); + + return 0; +} + +static int +libxlDomainObjPrivateXMLFormat(virBufferPtr buf, void *data) +{ + libxlDomainObjPrivatePtr priv = data; + + if (priv->lockState) + virBufferAsprintf(buf, "<lockstate>%s</lockstate>\n", priv->lockState); + + return 0; +} + virDomainXMLPrivateDataCallbacks libxlDomainXMLPrivateDataCallbacks = { .alloc = libxlDomainObjPrivateAlloc, .free = libxlDomainObjPrivateFree, + .parse = libxlDomainObjPrivateXMLParse, + .format = libxlDomainObjPrivateXMLFormat, }; @@ -667,6 +692,11 @@ libxlDomainCleanup(libxlDriverPrivatePtr driver, virHostdevReAttachDomainDevices(hostdev_mgr, LIBXL_DRIVER_NAME, vm->def, VIR_HOSTDEV_SP_PCI, NULL); + VIR_FREE(priv->lockState); + if (virDomainLockProcessPause(driver->lockManager, vm, &priv->lockState) < 0) + VIR_WARN("Unable to release lease on %s", vm->def->name); + VIR_DEBUG("Preserving lock state '%s'", NULLSTR(priv->lockState)); + vm->def->id = -1; if (priv->deathW) { @@ -960,6 +990,20 @@ libxlDomainStart(libxlDriverPrivatePtr driver, virDomainObjPtr vm, vm->def, VIR_HOSTDEV_SP_PCI) < 0) goto cleanup; + if (virDomainLockProcessStart(driver->lockManager, + "xen:///system", + vm, + true, + NULL) < 0) + goto cleanup; + + if (virDomainLockProcessResume(driver->lockManager, + "xen:///system", + vm, + priv->lockState) < 0) + goto cleanup; + VIR_FREE(priv->lockState); + /* Unlock virDomainObj while creating the domain */ virObjectUnlock(vm); @@ -990,7 +1034,7 @@ libxlDomainStart(libxlDriverPrivatePtr driver, virDomainObjPtr vm, virReportError(VIR_ERR_INTERNAL_ERROR, _("libxenlight failed to restore domain '%s'"), d_config.c_info.name); - goto cleanup; + goto release_dom; } /* @@ -1003,6 +1047,7 @@ libxlDomainStart(libxlDriverPrivatePtr driver, virDomainObjPtr vm, if (libxl_evenable_domain_death(cfg->ctx, vm->def->id, 0, &priv->deathW)) goto cleanup_dom; + if ((dom_xml = virDomainDefFormat(vm->def, 0)) == NULL) goto cleanup_dom; @@ -1040,6 +1085,7 @@ libxlDomainStart(libxlDriverPrivatePtr driver, virDomainObjPtr vm, goto cleanup; cleanup_dom: + ret = -1; if (priv->deathW) { libxl_evdisable_domain_death(cfg->ctx, priv->deathW); priv->deathW = NULL; @@ -1048,6 +1094,9 @@ libxlDomainStart(libxlDriverPrivatePtr driver, virDomainObjPtr vm, vm->def->id = -1; virDomainObjSetState(vm, VIR_DOMAIN_SHUTOFF, VIR_DOMAIN_SHUTOFF_FAILED); + release_dom: + virDomainLockProcessPause(driver->lockManager, vm, &priv->lockState); + cleanup: libxl_domain_config_dispose(&d_config); VIR_FREE(dom_xml); diff --git a/src/libxl/libxl_domain.h b/src/libxl/libxl_domain.h index aa647b8..8c73cc4 100644 --- a/src/libxl/libxl_domain.h +++ b/src/libxl/libxl_domain.h @@ -64,6 +64,7 @@ struct _libxlDomainObjPrivate { virChrdevsPtr devs; libxl_evgen_domain_death *deathW; unsigned short migrationPort; + char *lockState; struct libxlDomainJobObj job; }; diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index 6a54c73..1ecfd71 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -57,6 +57,7 @@ #include "viratomic.h" #include "virhostdev.h" #include "network/bridge_driver.h" +#include "locking/domain_lock.h" #define VIR_FROM_THIS VIR_FROM_LIBXL @@ -411,6 +412,7 @@ libxlStateCleanup(void) virObjectUnref(libxl_driver->domains); virObjectUnref(libxl_driver->reservedVNCPorts); virObjectUnref(libxl_driver->migrationPorts); + virLockManagerPluginUnref(libxl_driver->lockManager); virObjectEventStateFree(libxl_driver->domainEventState); virSysinfoDefFree(libxl_driver->hostsysinfo); @@ -590,6 +592,14 @@ libxlStateInitialize(bool privileged, goto error; } + if (!(libxl_driver->lockManager = + virLockManagerPluginNew(cfg->lockManagerName ? + cfg->lockManagerName : "nop", + "libxl", + cfg->configBaseDir, + 0))) + goto error; + /* read the host sysinfo */ libxl_driver->hostsysinfo = virSysinfoRead(); @@ -2860,11 +2870,21 @@ libxlDomainAttachDeviceDiskLive(virDomainObjPtr vm, virDomainDeviceDefPtr dev) if (libxlMakeDisk(l_disk, &x_disk) < 0) goto cleanup; + if (virDomainLockDiskAttach(libxl_driver->lockManager, + "xen:///system", + vm, l_disk) < 0) + goto cleanup; + if ((ret = libxl_device_disk_add(cfg->ctx, vm->def->id, &x_disk, NULL)) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("libxenlight failed to attach disk '%s'"), l_disk->dst); + if (virDomainLockDiskDetach(libxl_driver->lockManager, + vm, l_disk) < 0) { + VIR_WARN("Unable to release lock on %s", + virDomainDiskGetSource(l_disk)); + } goto cleanup; } @@ -3005,6 +3025,11 @@ libxlDomainDetachDeviceDiskLive(virDomainObjPtr vm, virDomainDeviceDefPtr dev) goto cleanup; } + if (virDomainLockDiskDetach(libxl_driver->lockManager, + vm, l_disk) < 0) + VIR_WARN("Unable to release lock on %s", + virDomainDiskGetSource(l_disk)); + virDomainDiskRemove(vm->def, idx); virDomainDiskDefFree(l_disk); diff --git a/src/libxl/libxl_migration.c b/src/libxl/libxl_migration.c index 51993c6..1efd98f 100644 --- a/src/libxl/libxl_migration.c +++ b/src/libxl/libxl_migration.c @@ -41,6 +41,7 @@ #include "libxl_driver.h" #include "libxl_conf.h" #include "libxl_migration.h" +#include "locking/domain_lock.h" #define VIR_FROM_THIS VIR_FROM_LIBXL @@ -469,6 +470,7 @@ libxlDomainMigrationPerform(libxlDriverPrivatePtr driver, const char *dname ATTRIBUTE_UNUSED, unsigned int flags) { + libxlDomainObjPrivatePtr priv = vm->privateData; char *hostname = NULL; unsigned short port = 0; char portstr[100]; @@ -503,6 +505,10 @@ libxlDomainMigrationPerform(libxlDriverPrivatePtr driver, sockfd = virNetSocketDupFD(sock, true); virObjectUnref(sock); + if (virDomainLockProcessPause(driver->lockManager, vm, &priv->lockState) < 0) + VIR_WARN("Unable to release lease on %s", vm->def->name); + VIR_DEBUG("Preserving lock state '%s'", NULLSTR(priv->lockState)); + /* suspend vm and send saved data to dst through socket fd */ virObjectUnlock(vm); ret = libxlDoMigrateSend(driver, vm, flags, sockfd); diff --git a/src/libxl/test_libvirtd_libxl.aug.in b/src/libxl/test_libvirtd_libxl.aug.in index 23e667c..baa8c79 100644 --- a/src/libxl/test_libvirtd_libxl.aug.in +++ b/src/libxl/test_libvirtd_libxl.aug.in @@ -3,3 +3,4 @@ module Test_libvirtd_libxl = test Libvirtd_libxl.lns get conf = { "autoballoon" = "1" } +{ "lock_manager" = "lockd" } -- 1.8.4.5

3 6

[libvirt] [PATCH] qemu: Fix bus and lun checks when scsi-disk.channel not present
by John Ferlan 30 Apr '15

30 Apr '15

Found by Laine and discussed a bit on internal IRC. Commit id c56fe7f1d6 added support for creating a command line to support scsi-disk.channel. Series was here: http://www.redhat.com/archives/libvir-list/2012-February/msg01052.html Which pointed to a design proposal here: http://permalink.gmane.org/gmane.comp.emulators.libvirt/50428 Which states (in part): Libvirt should check for the QEMU "scsi-disk.channel" property. If it is unavailable, QEMU will only support channel=lun=0 and 0<=target<=7. However, the check added was ensuring that bus != lun *and* bus != 0. So if bus == lun and both were non zero, we'd never make the second check. Changing this to an *or* check fixes the check, but still is less readable than the just checking each for 0 Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- src/qemu/qemu_command.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 0dc8628..583bc11 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -4127,8 +4127,8 @@ qemuBuildDriveDevStr(virDomainDefPtr def, goto error; } - if ((disk->info.addr.drive.bus != disk->info.addr.drive.unit) && - (disk->info.addr.drive.bus != 0)) { + if (disk->info.addr.drive.bus != 0 && + disk->info.addr.drive.unit != 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("This QEMU only supports both bus and " "unit equal to 0")); -- 2.1.0

2 1

[libvirt] [PATCH] rpm-build: update %files section for libxl
by Pavel Hrdina 30 Apr '15

30 Apr '15

Recent commit 198cc1d3 introduced integration of lockd and sanlock into libxl, but forget to update libvirt.spec.in to also list new files distributed via package. Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> --- Pushed under build-breaker rule. libvirt.spec.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libvirt.spec.in b/libvirt.spec.in index 20af502..f95e31f 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -2129,6 +2129,8 @@ exit 0 %files daemon-driver-libxl %defattr(-, root, root) %config(noreplace) %{_sysconfdir}/libvirt/libxl.conf +%config(noreplace) %{_sysconfdir}/libvirt/libxl-lockd.conf +%config(noreplace) %{_sysconfdir}/libvirt/libxl-sanlock.conf %{_datadir}/augeas/lenses/libvirtd_libxl.aug %{_datadir}/augeas/lenses/tests/test_libvirtd_libxl.aug %dir %attr(0700, root, root) %{_localstatedir}/log/libvirt/libxl/ -- 2.0.5

3 2

[libvirt] [PATCH] main: add new generated files to .gitignore
by Pavel Hrdina 30 Apr '15

30 Apr '15

This means new libxl-lockd.conf and libxl-sanlock.conf Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> --- Pushed under trivial rule. .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index 9d09709..7bcf359 100644 --- a/.gitignore +++ b/.gitignore @@ -124,6 +124,8 @@ /src/libvirt_*helper /src/libvirt_*probes.h /src/libvirt_lxc +/src/locking/libxl-lockd.conf +/src/locking/libxl-sanlock.conf /src/locking/lock_daemon_dispatch_stubs.h /src/locking/lock_protocol.[ch] /src/locking/qemu-lockd.conf -- 2.0.5

1 0

[libvirt] [PATCH] qemu: blockjob: Call qemuDomainSupportsBlockJobs only on online VMs
by Peter Krempa 30 Apr '15

30 Apr '15

Since the qemu capabilities are not initialized for offline VMs the caller might get suboptimal error message: $ virsh blockjob VM PATH --bandwidth 1 error: unsupported configuration: block jobs not supported with this QEMU binary Move the checks after we make sure that the VM is alive. --- src/qemu/qemu_driver.c | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 3695b26..d6e7570 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -16555,34 +16555,34 @@ qemuDomainBlockPullCommon(virQEMUDriverPtr driver, goto cleanup; } - if (qemuDomainSupportsBlockJobs(vm, &modern) < 0) + if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_MODIFY) < 0) goto cleanup; + if (!virDomainObjIsActive(vm)) { + virReportError(VIR_ERR_OPERATION_INVALID, "%s", + _("domain is not running")); + goto endjob; + } + + if (qemuDomainSupportsBlockJobs(vm, &modern) < 0) + goto endjob; + if (!modern) { if (base) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("partial block pull not supported with this " "QEMU binary")); - goto cleanup; + goto endjob; } if (bandwidth) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("setting bandwidth at start of block pull not " "supported with this QEMU binary")); - goto cleanup; + goto endjob; } } - if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_MODIFY) < 0) - goto cleanup; - - if (!virDomainObjIsActive(vm)) { - virReportError(VIR_ERR_OPERATION_INVALID, "%s", - _("domain is not running")); - goto endjob; - } - if (!(device = qemuDiskPathToAlias(vm, path, &idx))) goto endjob; disk = vm->def->disks[idx]; @@ -16682,9 +16682,6 @@ qemuDomainBlockJobAbort(virDomainPtr dom, if (virDomainBlockJobAbortEnsureACL(dom->conn, vm->def) < 0) goto cleanup; - if (qemuDomainSupportsBlockJobs(vm, &modern) < 0) - goto cleanup; - if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_MODIFY) < 0) goto cleanup; @@ -16694,6 +16691,9 @@ qemuDomainBlockJobAbort(virDomainPtr dom, goto endjob; } + if (qemuDomainSupportsBlockJobs(vm, &modern) < 0) + goto endjob; + if (!(device = qemuDiskPathToAlias(vm, path, &idx))) goto endjob; disk = vm->def->disks[idx]; @@ -16896,9 +16896,6 @@ qemuDomainBlockJobSetSpeed(virDomainPtr dom, if (virDomainBlockJobSetSpeedEnsureACL(dom->conn, vm->def) < 0) goto cleanup; - if (qemuDomainSupportsBlockJobs(vm, &modern) < 0) - goto cleanup; - if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_MODIFY) < 0) goto cleanup; @@ -16908,6 +16905,9 @@ qemuDomainBlockJobSetSpeed(virDomainPtr dom, goto endjob; } + if (qemuDomainSupportsBlockJobs(vm, &modern) < 0) + goto endjob; + if (!(device = qemuDiskPathToAlias(vm, path, NULL))) goto endjob; -- 2.3.5

2 2