- Devel - libvirt List Archives

[libvirt] [PATCH v2.5 00/10] add support for scsi-generic for virtio-scsi
by Han Cheng 18 Apr '13

18 Apr '13

This patch series tried to add support for scsi-generic for virtio-scsi. Changes from v2: - Lots of fixs on comments Thank you guys who reviewed these. Thank you for your help. There is some work left. As time comes up and I don't have much time to do this, I'd like to ask Osier to help me finish this. Could you? TODO: change readonly to bool and change related managed and missing for consistency. Han Cheng (10): conf: Change help function docs/schemas: Move PortNumber and sourceinfoadapter to basictypes.rng conf: Introduce scsi hostdev qemu: New cap flag for scsi-generic utils: util functions for scsi hostdev qemu: Build qemu command line for scsi-generic qemu: Basic management functions for scsi hostdev qemu: cgroup and selinux for scsi hostdev qemu: hotplug support for scsi hostdev tests: tests for scsi hostdev docs/formatdomain.html.in | 38 docs/schemas/basictypes.rng | 42 + docs/schemas/domaincommon.rng | 34 docs/schemas/storagepool.rng | 42 - po/POTFILES.in | 1 src/Makefile.am | 1 src/conf/domain_audit.c | 10 src/conf/domain_conf.c | 189 ++++ src/conf/domain_conf.h | 14 src/libvirt_private.syms | 24 src/qemu/qemu_capabilities.c | 14 src/qemu/qemu_capabilities.h | 2 src/qemu/qemu_cgroup.c | 67 + src/qemu/qemu_cgroup.h | 3 src/qemu/qemu_command.c | 138 +++ src/qemu/qemu_command.h | 6 src/qemu/qemu_conf.h | 2 src/qemu/qemu_driver.c | 3 src/qemu/qemu_hostdev.c | 218 +++++ src/qemu/qemu_hostdev.h | 10 src/qemu/qemu_hotplug.c | 211 ++++- src/qemu/qemu_process.c | 3 src/security/security_selinux.c | 56 + src/util/virscsi.c | 392 ++++++++++ src/util/virscsi.h | 83 ++ tests/qemuhelpdata/qemu-1.0-device | 10 tests/qemuhelpdata/qemu-1.1.0-device | 10 tests/qemuhelpdata/qemu-1.2.0-device | 5 tests/qemuhelpdata/qemu-kvm-1.2.0-device | 5 tests/qemuhelptest.c | 19 tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-boot.args | 10 tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-boot.xml | 34 tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-readonly.args | 10 tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-readonly.xml | 35 tests/qemuxml2argvtest.c | 9 tests/qemuxml2xmltest.c | 3 36 files changed, 1624 insertions(+), 129 deletions(-)

3 16

[libvirt] [PATCH 0/3 v3] cleanup: About header including
by Osier Yang 18 Apr '13

18 Apr '13

These 3 patches are the left ones in v2. 6/10 ~ 9/10 in v2 are merged into one single patch. Osier Yang (3): syntax-check: Don't include public headers in internal source syntax-check: Only allows to include public headers in external tools docs: Update HACKING cfg.mk | 21 +++++++++++++++++++++ daemon/remote.c | 2 -- docs/hacking.html.in | 8 ++++---- include/libvirt/libvirt-lxc.h | 2 +- include/libvirt/libvirt-qemu.h | 2 +- python/libvirt-lxc-override.c | 4 ++-- python/libvirt-override.c | 4 ++-- python/libvirt-qemu-override.c | 4 ++-- python/typewrappers.h | 4 ++-- src/libvirt-qemu.c | 1 - tests/shunloadhelper.c | 5 ++--- tools/virsh.c | 4 ++-- 12 files changed, 39 insertions(+), 22 deletions(-) -- 1.8.1.4

2 12

[libvirt] Got invaliProperty error when retrieve properties from ESXi server
by Dennis Zou (yunzou) 18 Apr '13

18 Apr '13

Hi team, When I tried to retrieve the property of storage.perDatastoreUsage under specify virtual machine and got a invalidProperty error but other properties(eg. summary.storage, guest) under the same virtual machine are ok. Then I write a same program use vsphere web service sdk in java and catch the http package by wireshark. By comparing, I found that we lost soapAction field in http request header, it seems to like this: SOAPAction: "urn:vim25/5.0". I checked the vsphere development document and found some key description as following: When a client application connects to a Web service running on an vSphere server (ESX/ESXi or vCenter Server system), the server detects the version of the API that was used to develop the client and makes available only those operations supported by the client. Client applications convey information about the API version used in the SOAP messages that they send to a vSphere server. These SOAP messages include a versionID in the soapAction attribute. The details are handled transparently by the SOAP toolkit and the client proxy code. The server adjusts its behavior based on the client's version information, exposing the API version that the client supports to the client. If you are developing a client application that must support multiple server versions at the same time (ESX/ESXi 5.0 and ESX/ESXi 3.x, for example), you must obtain information about the API versions that are supported on the server and provide logic in your code to use or not use features, based upon the version information. Finally, I added the soapAction field into http request header and got a correct result. So I added some lines in function esxVI_Context_Connect() at src/esx/esx_vi.c The code change is bold line as follwing: int esxVI_Context_Connect(esxVI_Context *ctx, const char *url, const char *ipAddress, const char *username, const char *password, esxUtil_ParsedUri *parsedUri) { char * soapAction = NULL; int result = -1; if (ctx == NULL || url == NULL || ipAddress == NULL || username == NULL || password == NULL || ctx->url != NULL || ctx->service != NULL || ctx->curl != NULL) { ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", _("Invalid argument")); return -1; } if (esxVI_CURL_Alloc(&ctx->curl) < 0 || esxVI_CURL_Connect(ctx->curl, parsedUri) < 0 || esxVI_String_DeepCopyValue(&ctx->url, url) < 0 || esxVI_String_DeepCopyValue(&ctx->ipAddress, ipAddress) < 0 || esxVI_String_DeepCopyValue(&ctx->username, username) < 0 || esxVI_String_DeepCopyValue(&ctx->password, password) < 0) { return -1; } if (VIR_ALLOC(ctx->sessionLock) < 0) { virReportOOMError(); return -1; } if (virMutexInit(ctx->sessionLock) < 0) { ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", _("Could not initialize session mutex")); return -1; } if (esxVI_RetrieveServiceContent(ctx, &ctx->service) < 0) { return -1; } if (virAsprintf(&soapAction, "SOAPAction: \"urn:vim25/%s\"", ctx->service->about->apiVersion) < 0) { virReportOOMError(); goto cleanup; } ctx->curl->headers = curl_slist_append(ctx->curl->headers, soapAction); if (STREQ(ctx->service->about->apiType, "HostAgent") || STREQ(ctx->service->about->apiType, "VirtualCenter")) { if (STRPREFIX(ctx->service->about->apiVersion, "2.5")) { ctx->apiVersion = esxVI_APIVersion_25; } else if (STRPREFIX(ctx->service->about->apiVersion, "4.0")) { ctx->apiVersion = esxVI_APIVersion_40; } else if (STRPREFIX(ctx->service->about->apiVersion, "4.1")) { ctx->apiVersion = esxVI_APIVersion_41; } else if (STRPREFIX(ctx->service->about->apiVersion, "4.")) { ctx->apiVersion = esxVI_APIVersion_4x; VIR_WARN( "Found untested VI API major/minor version '%s'", ctx->service->about->apiVersion); } else if (STRPREFIX(ctx->service->about->apiVersion, "5.0")) { ctx->apiVersion = esxVI_APIVersion_50; } else if (STRPREFIX(ctx->service->about->apiVersion, "5.1")) { ctx->apiVersion = esxVI_APIVersion_51; }else if (STRPREFIX(ctx->service->about->apiVersion, "5.")) { ctx->apiVersion = esxVI_APIVersion_5x; VIR_WARN( "Found untested VI API major/minor version '%s'", ctx->service->about->apiVersion); } else { ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, _("Expecting VI API major/minor version '2.5', '4.x' or " "'5.x' but found '%s'"), ctx->service->about->apiVersion); return -1; } if (STREQ(ctx->service->about->productLineId, "gsx")) { if (STRPREFIX(ctx->service->about->version, "2.0")) { ctx->productVersion = esxVI_ProductVersion_GSX20; } else { ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, _("Expecting GSX major/minor version '2.0' but " "found '%s'"), ctx->service->about->version); return -1; } } else if (STREQ(ctx->service->about->productLineId, "esx") || STREQ(ctx->service->about->productLineId, "embeddedEsx")) { if (STRPREFIX(ctx->service->about->version, "3.5")) { ctx->productVersion = esxVI_ProductVersion_ESX35; } else if (STRPREFIX(ctx->service->about->version, "4.0")) { ctx->productVersion = esxVI_ProductVersion_ESX40; } else if (STRPREFIX(ctx->service->about->version, "4.1")) { ctx->productVersion = esxVI_ProductVersion_ESX41; } else if (STRPREFIX(ctx->service->about->version, "4.")) { ctx->productVersion = esxVI_ProductVersion_ESX4x; VIR_WARN( "Found untested ESX major/minor version '%s'", ctx->service->about->version); } else if (STRPREFIX(ctx->service->about->version, "5.0")) { ctx->productVersion = esxVI_ProductVersion_ESX50; } else if (STRPREFIX(ctx->service->about->version, "5.1")) { ctx->productVersion = esxVI_ProductVersion_ESX51; }else if (STRPREFIX(ctx->service->about->version, "5.")) { ctx->productVersion = esxVI_ProductVersion_ESX5x; VIR_WARN( "Found untested ESX major/minor version '%s'", ctx->service->about->version); } else { ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, _("Expecting ESX major/minor version '3.5', " "'4.x' or '5.x' but found '%s'"), ctx->service->about->version); return -1; } } else if (STREQ(ctx->service->about->productLineId, "vpx")) { if (STRPREFIX(ctx->service->about->version, "2.5")) { ctx->productVersion = esxVI_ProductVersion_VPX25; } else if (STRPREFIX(ctx->service->about->version, "4.0")) { ctx->productVersion = esxVI_ProductVersion_VPX40; } else if (STRPREFIX(ctx->service->about->version, "4.1")) { ctx->productVersion = esxVI_ProductVersion_VPX41; } else if (STRPREFIX(ctx->service->about->version, "4.")) { ctx->productVersion = esxVI_ProductVersion_VPX4x; VIR_WARN( "Found untested VPX major/minor version '%s'", ctx->service->about->version); } else if (STRPREFIX(ctx->service->about->version, "5.0")) { ctx->productVersion = esxVI_ProductVersion_VPX50; } else if (STRPREFIX(ctx->service->about->version, "5.1")) { ctx->productVersion = esxVI_ProductVersion_VPX51; }else if (STRPREFIX(ctx->service->about->version, "5.")) { ctx->productVersion = esxVI_ProductVersion_VPX5x; VIR_WARN( "Found untested VPX major/minor version '%s'", ctx->service->about->version); } else { ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, _("Expecting VPX major/minor version '2.5', '4.x' " "or '5.x' but found '%s'"), ctx->service->about->version); return -1; } } else { ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, _("Expecting product 'gsx' or 'esx' or 'embeddedEsx' " "or 'vpx' but found '%s'"), ctx->service->about->productLineId); return -1; } } else { ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, _("Expecting VI API type 'HostAgent' or 'VirtualCenter' " "but found '%s'"), ctx->service->about->apiType); return -1; } if (ctx->productVersion & esxVI_ProductVersion_ESX) { /* * FIXME: Actually this should be detected by really calling * QueryVirtualDiskUuid and checking if a NotImplemented fault is * returned. But currently we don't deserialized the details of a * possbile fault and therefore we don't know if the fault was a * NotImplemented fault or not. */ ctx->hasQueryVirtualDiskUuid = true; } if (ctx->productVersion & esxVI_ProductVersion_VPX) { ctx->hasSessionIsActive = true; } if (esxVI_Login(ctx, username, password, NULL, &ctx->session) < 0 || esxVI_BuildSelectSetCollection(ctx) < 0) { return -1; } result = 0; cleanup: VIR_FREE(soapAction); return result; } int esxVI_Context_LookupManagedObjects(esxVI_Context *ctx) { /* Lookup Datacenter */ if (esxVI_LookupDatacenter(ctx, NULL, ctx->service->rootFolder, NULL, &ctx->datacenter, esxVI_Occurrence_RequiredItem) < 0) { return -1; } ctx->datacenterPath = strdup(ctx->datacenter->name); if (ctx->datacenterPath == NULL) { virReportOOMError(); return -1; } /* Lookup (Cluster)ComputeResource */ if (esxVI_LookupComputeResource(ctx, NULL, ctx->datacenter->hostFolder, NULL, &ctx->computeResource, esxVI_Occurrence_RequiredItem) < 0) { return -1; } if (ctx->computeResource->resourcePool == NULL) { ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", _("Could not retrieve resource pool")); return -1; } ctx->computeResourcePath = strdup(ctx->computeResource->name); if (ctx->computeResourcePath == NULL) { virReportOOMError(); return -1; } if (STRCASEEQ(ctx->computeResource->_reference->type, "ClusterComputeResource")) { ctx->computeResourceType = esxVI_ComputeResourceType_Cluster; } else { ctx->computeResourceType = esxVI_ComputeResourceType_Basic; } /* Lookup HostSystem */ if (esxVI_LookupHostSystem(ctx, NULL, ctx->computeResource->_reference, NULL, &ctx->hostSystem, esxVI_Occurrence_RequiredItem) < 0) { return -1; } ctx->hostSystemName = strdup(ctx->hostSystem->name); if (ctx->hostSystemName == NULL) { virReportOOMError(); return -1; } return 0; } int esxVI_Context_LookupHostManagedObjects(esxVI_Context *ctx, virHostNameList *hostNameListPtr) { int result = -1; esxVI_Datacenter *datacenters = NULL; esxVI_Datacenter *candidateDatacenter = NULL; esxVI_ComputeResource *computeResources = NULL; esxVI_ComputeResource *candidateComputeResource = NULL; esxVI_HostSystem *hostSystems = NULL; esxVI_HostSystem *candidateHostSystem = NULL; esxVI_HostContext *current = NULL; virHostNameEntry *hostNameEntry = NULL; char *hostName = NULL; /* create hash table for host contexts*/ ctx->hostCtxs = virHashCreate(500, esxVI_HostContext_HashDataFree); /* list Datacenter */ if (esxVI_ListDatacenter(ctx, NULL, ctx->service->rootFolder, NULL, &datacenters, esxVI_Occurrence_OptionalList) < 0) { goto cleanup; } for (candidateDatacenter = datacenters; NULL != candidateDatacenter; candidateDatacenter = candidateDatacenter->_next) { /* list (Cluster)ComputeResource */ if (esxVI_ListComputeResource(ctx, NULL, candidateDatacenter->hostFolder, NULL, &computeResources, esxVI_Occurrence_OptionalList) < 0) { goto cleanup; } for (candidateComputeResource = computeResources; NULL != candidateComputeResource; candidateComputeResource = candidateComputeResource->_next) { /* list HostSystem */ if (esxVI_ListHostSystem(ctx, NULL, candidateComputeResource->_reference, NULL, &hostSystems, esxVI_Occurrence_OptionalList) < 0) { goto cleanup; } for (candidateHostSystem = hostSystems; NULL != candidateHostSystem; ) { /* Allocate a HostContext entry */ if (esxVI_HostContext_Alloc(&current) < 0 || esxVI_Datacenter_Alloc(&current->datacenter) < 0 || esxVI_ComputeResource_Alloc( &current->computeResource) < 0) { goto cleanup; } /* Fill the HostContext entry */ esxVI_ManagedObjectReference_DeepCopy( &current->datacenter->_reference, candidateDatacenter->_reference); esxVI_ManagedObjectReference_DeepCopy( &current->datacenter->hostFolder, candidateDatacenter->hostFolder); esxVI_ManagedObjectReference_DeepCopy( &current->datacenter->vmFolder, candidateDatacenter->vmFolder); current->datacenter->name = strdup(candidateDatacenter->name); current->datacenterPath = strdup(candidateDatacenter->name); esxVI_ManagedObjectReference_DeepCopy( &current->computeResource->_reference, candidateComputeResource->_reference); esxVI_ManagedObjectReference_DeepCopy( &current->computeResource->host, candidateComputeResource->host); esxVI_ManagedObjectReference_DeepCopy( &current->computeResource->resourcePool, candidateComputeResource->resourcePool); current->computeResource->name = strdup( candidateComputeResource->name); current->computeResourcePath = strdup( candidateComputeResource->name); if (STRCASEEQ(candidateComputeResource->_reference->type, "ClusterComputeResource")) { current->computeResourceType = esxVI_ComputeResourceType_Cluster; } else { current->computeResourceType = esxVI_ComputeResourceType_Basic; } current->hostSystem = candidateHostSystem; candidateHostSystem = candidateHostSystem->_next; current->hostSystem->_next = NULL; current->hostSystemName = strdup(current->hostSystem->name); hostName = strdup(current->hostSystem->name); current->maxVcpus = -1; current->supportsVMotion = esxVI_Boolean_Undefined; current->supportsLongMode = esxVI_Boolean_Undefined; current->usedCpuTimeCounterId = -1; /* update hash table */ if (virHashAddEntry(ctx->hostCtxs, hostName, current) < 0) { goto cleanup; } current = NULL; if (NULL != hostNameListPtr) { /* fill the hostNameList */ if (VIR_ALLOC(hostNameEntry) < 0) { virReportOOMError(); goto cleanup; } hostNameEntry->hostName = strdup(hostName); hostNameEntry->next = *hostNameListPtr; *hostNameListPtr = hostNameEntry; hostNameEntry = NULL; } free(hostName); } hostSystems = NULL; } esxVI_ComputeResource_Free(&computeResources); } result = 0; cleanup: esxVI_Datacenter_Free(&datacenters); esxVI_ComputeResource_Free(&computeResources); return result; } Regards, Dennis

1 0

[libvirt] [PATCH] conf: fix comment about parsing graphics listen address
by Ján Tomko 17 Apr '13

17 Apr '13

--- Pushed under the trivial rule. src/conf/domain_conf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 548368e..1643f30 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -7291,7 +7291,7 @@ virDomainGraphicsListenDefParseXML(virDomainGraphicsListenDefPtr def, if (network && network[0]) { if (def->type != VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_NETWORK) { /* network='xxx' never makes sense with anything except - * type='address' */ + * type='network' */ virReportError(VIR_ERR_XML_ERROR, "%s", _("network attribute not allowed when listen type is not network")); goto error; -- 1.8.1.5

1 0

[libvirt] [PATCH] Fix typo in ocaml_libvirt_storage_vol_get_info
by David Scott 17 Apr '13

17 Apr '13

The info.capacity was being overwritten with the info.allocation. Signed-off-by: David Scott <dave.scott(a)eu.citrix.com> --- libvirt/libvirt_c_oneoffs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libvirt/libvirt_c_oneoffs.c b/libvirt/libvirt_c_oneoffs.c index 80e1c03..01985f5 100644 --- a/libvirt/libvirt_c_oneoffs.c +++ b/libvirt/libvirt_c_oneoffs.c @@ -1418,7 +1418,7 @@ ocaml_libvirt_storage_vol_get_info (value volv) rv = caml_alloc (3, 0); Store_field (rv, 0, Val_int (info.type)); v = caml_copy_int64 (info.capacity); Store_field (rv, 1, v); - v = caml_copy_int64 (info.allocation); Store_field (rv, 1, v); + v = caml_copy_int64 (info.allocation); Store_field (rv, 2, v); CAMLreturn (rv); #else -- 1.8.1.2

2 1

[libvirt] [PATCH 0/7] qemu: PCI bridge support
by Ján Tomko 17 Apr '13

17 Apr '13

This series allows PCI bridges to be added and used. After patch 6/7 more buses are usable if the bridges and addresses are explicitly specified in the XML. After 7/7 bridges are auto-added and the new buses are used automatically. (This only works if there is enough space on bus 0 for the bridges, otherwise they need to be specified manually). (Documentation, tests and bridge hotplug is still missing) Contains slightly modified li guang's patches 1-3: https://www.redhat.com/archives/libvir-list/2013-February/msg00981.html and reworked address allocation for multiple buses https://www.redhat.com/archives/libvir-list/2013-February/msg00793.html Ján Tomko (5): qemu: QEMU_PCI constant consistency qemu: move PCI address check out of qemuPCIAddressAsString qemu: switch PCI address set from hash table to an array qemu: Add support for plugging devices into PCI bridges qemu: auto-add and use bridges liguang (2): add pci-bridge controller type qemu: build command line for pci-bridge device docs/schemas/domaincommon.rng | 1 + src/conf/domain_conf.c | 3 +- src/conf/domain_conf.h | 1 + src/qemu/qemu_capabilities.c | 2 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 551 ++++++++++++++++++++++++++++++------------ src/qemu/qemu_command.h | 4 +- tests/qemuhelptest.c | 21 +- 8 files changed, 421 insertions(+), 163 deletions(-) -- 1.8.1.5

8 46

[libvirt] [PATCH] Partially revert "cleanup: Don't include libvirt/libvirt.h"
by Eric Blake 17 Apr '13

17 Apr '13

This reverts the changes to remote_protocol.x made in commit 2d25fd4f410f65b40ef1c3d65124775a944f4025. It turns out that if 'dwarves' is installed, 'make check' fails if any *_LAST enum values are visible from within the .o file compiled from a .x file; including <libvirt/libvirt.h> prior to "internal.h" is the documented way to avoid exposing *_LAST enum elements. --- Pushing under the build-breaker rule. src/remote/remote_protocol.x | 1 + 1 file changed, 1 insertion(+) diff --git a/src/remote/remote_protocol.x b/src/remote/remote_protocol.x index d384225..b957b8e 100644 --- a/src/remote/remote_protocol.x +++ b/src/remote/remote_protocol.x @@ -36,6 +36,7 @@ * 'REMOTE_'. This makes names quite long. */ +%#include <libvirt/libvirt.h> %#include "internal.h" %#include <arpa/inet.h> -- 1.8.1.4

2 1

[libvirt] [PATCH 00/10 v2] Cleanup: About header including
by Osier Yang 17 Apr '13

17 Apr '13

The public headers libvirt/libvirt.h, libvirt/virterror.h, libvirt/libvirt-qemu.h, and libvirt/libvirt-lxc.h shouldn't be included in internal source directly. Osier Yang (10): cleanup: Remove the duplicate header cleanup: Only include testutils.h once cleanup: Don't include libvirt/libvirt.h cleanup: Don't include libvirt/virterror.h syntax-check: Don't include duplicate header syntax-check: Don't include "libvirt.h" and "virterror.h" in "" form syntax-check: Include libvirt.h and virterror.h in <> form only in external tools syntax-check: Don't include libvirt-{qemu,lxc}.h internally syntax-check: Include libvirt-{qemu,lxc}.h in <> form only in external tools docs: Update hacking cfg.mk | 106 ++++++++++++++++++++++++++++++++++++++ daemon/libvirtd.c | 1 - daemon/remote.c | 2 - docs/hacking.html.in | 8 +-- include/libvirt/libvirt-lxc.h | 2 +- include/libvirt/libvirt-qemu.h | 2 +- python/libvirt-lxc-override.c | 4 +- python/libvirt-override.c | 4 +- python/libvirt-qemu-override.c | 4 +- python/typewrappers.h | 4 +- src/conf/node_device_conf.c | 1 - src/libvirt-qemu.c | 1 - src/network/bridge_driver.c | 1 - src/nodeinfo.h | 1 - src/openvz/openvz_conf.c | 1 - src/openvz/openvz_driver.c | 1 - src/parallels/parallels_driver.c | 1 - src/phyp/phyp_driver.c | 2 - src/qemu/qemu_capabilities.h | 1 - src/qemu/qemu_driver.c | 1 - src/remote/remote_driver.h | 2 - src/remote/remote_protocol.x | 1 - src/security/security_selinux.c | 1 - src/uml/uml_driver.c | 1 - src/util/virkeycode.h | 1 - src/util/virnetdevtap.c | 1 - src/xen/xen_hypervisor.c | 1 - tests/domainsnapshotxml2xmltest.c | 4 +- tests/esxutilstest.c | 4 +- tests/lxcxml2xmltest.c | 4 +- tests/openvzutilstest.c | 4 +- tests/qemuargv2xmltest.c | 4 +- tests/qemuhelptest.c | 4 +- tests/qemumonitortest.c | 4 +- tests/qemuxml2argvtest.c | 4 +- tests/qemuxml2xmltest.c | 4 +- tests/qemuxmlnstest.c | 4 +- tests/shunloadhelper.c | 2 - tests/shunloadtest.c | 4 +- tests/vmx2xmltest.c | 4 +- tests/xml2vmxtest.c | 4 +- tools/virsh.c | 4 +- 42 files changed, 148 insertions(+), 66 deletions(-) -- 1.8.1.4

3 24

[libvirt] [PATCH] qemu: Allow the disk wwn to have "0x" prefix
by Osier Yang 17 Apr '13

17 Apr '13

The recent qemu requires "0x" prefix for the disk wwn, this patch changes virValidateWWN to allow the prefix, and prepend "0x" if it's not specified. E.g. qemu-kvm: -device scsi-hd,bus=scsi0.0,channel=0,scsi-id=0,lun=0,\ drive=drive-scsi0-0-0-0,id=scsi0-0-0-0,wwn=6000c60016ea71ad: Property 'scsi-hd.wwn' doesn't take value '6000c60016ea71ad' --- docs/schemas/basictypes.rng | 2 +- src/qemu/qemu_command.c | 8 ++++++-- src/util/virutil.c | 12 +++++++++--- tests/qemuxml2argvdata/qemuxml2argv-disk-ide-wwn.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-wwn.args | 4 ++-- tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-wwn.xml | 2 +- 6 files changed, 20 insertions(+), 10 deletions(-) diff --git a/docs/schemas/basictypes.rng b/docs/schemas/basictypes.rng index adaedd8..34c2254 100644 --- a/docs/schemas/basictypes.rng +++ b/docs/schemas/basictypes.rng @@ -280,7 +280,7 @@ <define name='wwn'> <data type='string'> - <param name='pattern'>[0-9a-fA-F]{16}</param> + <param name='pattern'>(0x)?[0-9a-fA-F]{16}</param> </data> </define> diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 63b9350..009d42d 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -3358,8 +3358,12 @@ qemuBuildDriveDevStr(virDomainDefPtr def, disk->blockio.physical_block_size); } - if (disk->wwn) - virBufferAsprintf(&opt, ",wwn=%s", disk->wwn); + if (disk->wwn) { + if (STRPREFIX(disk->wwn, "0x")) + virBufferAsprintf(&opt, ",wwn=%s", disk->wwn); + else + virBufferAsprintf(&opt, ",wwn=0x%s", disk->wwn); + } if (disk->vendor) virBufferAsprintf(&opt, ",vendor=%s", disk->vendor); diff --git a/src/util/virutil.c b/src/util/virutil.c index 0e4063b..6890362 100644 --- a/src/util/virutil.c +++ b/src/util/virutil.c @@ -3228,12 +3228,18 @@ bool virIsDevMapperDevice(const char *dev_name ATTRIBUTE_UNUSED) bool virValidateWWN(const char *wwn) { int i; + const char *p = wwn; - for (i = 0; wwn[i]; i++) - if (!c_isxdigit(wwn[i])) + if (STRPREFIX(wwn, "0x")) { + p += 2; + } + + for (i = 0; p[i]; i++) { + if (!c_isxdigit(p[i])) break; + } - if (i != 16 || wwn[i]) { + if (i != 16 || p[i]) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Malformed wwn: %s")); return false; diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-ide-wwn.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-ide-wwn.args index 1633d29..3b9693c 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-ide-wwn.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-ide-wwn.args @@ -2,5 +2,5 @@ LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test \ /usr/bin/qemu -S -M pc -m 214 -smp 1 -nographic -nodefaults \ -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb \ -drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-1,serial=WD-WMAP9A966149 \ --device ide-hd,bus=ide.0,unit=1,drive=drive-ide0-0-1,id=ide0-0-1,wwn=5000c50015ea71ad \ +-device ide-hd,bus=ide.0,unit=1,drive=drive-ide0-0-1,id=ide0-0-1,wwn=0x5000c50015ea71ad \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-wwn.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-wwn.args index 0393640..0dd2aa9 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-wwn.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-wwn.args @@ -5,7 +5,7 @@ LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test \ -device lsi,id=scsi1,bus=pci.0,addr=0x4 \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-scsi0-0-1-0 \ --device scsi-cd,bus=scsi0.0,channel=0,scsi-id=1,lun=0,drive=drive-scsi0-0-1-0,id=scsi0-0-1-0,wwn=5000c50015ea71ac \ +-device scsi-cd,bus=scsi0.0,channel=0,scsi-id=1,lun=0,drive=drive-scsi0-0-1-0,id=scsi0-0-1-0,wwn=0x5000c50015ea71ac \ -drive file=/dev/HostVG/QEMUGuest2,if=none,id=drive-scsi0-0-0-0 \ --device scsi-hd,bus=scsi0.0,channel=0,scsi-id=0,lun=0,drive=drive-scsi0-0-0-0,id=scsi0-0-0-0,wwn=5000c50015ea71ad \ +-device scsi-hd,bus=scsi0.0,channel=0,scsi-id=0,lun=0,drive=drive-scsi0-0-0-0,id=scsi0-0-0-0,wwn=0x5000c50015ea71ad \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x5 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-wwn.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-wwn.xml index dc35548..caf957b 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-wwn.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-wwn.xml @@ -25,7 +25,7 @@ <source dev='/dev/HostVG/QEMUGuest2'/> <target dev='sdb' bus='scsi'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> - <wwn>5000c50015ea71ad</wwn> + <wwn>0x5000c50015ea71ad</wwn> </disk> <controller type='usb' index='0'/> <controller type='scsi' index='0' model='virtio-scsi'/> -- 1.8.1.4

2 3

[libvirt] [PATCH] docs: Add detailed notes snapshots, blockcommit, blockpull
by Kashyap Chamarthy 17 Apr '13

17 Apr '13

More elaborate notes on snapshots, blockpull, blockcommit. Much of this is derived from various dicussions with Eric Blake, Jeff Cody, Kevin Wolf (thanks a lot!) & several others on IRC and mailing lists and a lot of adhoc testing. I didn't wanted this to get lost. I also plan to add notes for 'blockcopy' once I complete testing with upstream libvirt/qemu git. NOTE: This document is formatted using reStructuredText. And can be trivially converted to HTML using: # rst2html snapshots-blockcommit-blockpull.rst > snapshots-blockcommit-blockpull.html ('rst2html' is part of python-docutils package.) I didn't send an html PATCH directly, as I thought, this'd be more readable. Any comments, criticisms more than welcome. --- docs/snapshots-blockcommit-blockpull.rst | 646 ++++++++++++++++++++++++++++++ 1 files changed, 646 insertions(+), 0 deletions(-) create mode 100644 docs/snapshots-blockcommit-blockpull.rst diff --git a/docs/snapshots-blockcommit-blockpull.rst b/docs/snapshots-blockcommit-blockpull.rst new file mode 100644 index 0000000000000000000000000000000000000000..99c30223a004ee5291e2914b788ac7fe04eee3c8 --- /dev/null +++ b/docs/snapshots-blockcommit-blockpull.rst @@ -0,0 +1,646 @@ +.. ---------------------------------------------------------------------- + Note: All these tests were performed with latest qemu-git,libvirt-git (as of + 20-Oct-2012 on a Fedora-18 alpha machine +.. ---------------------------------------------------------------------- + + +Introduction +============ + +A virtual machine snapshot is a view of a virtual machine(its OS & all its +applications) at a given point in time. So that, one can revert to a known sane +state, or take backups while the guest is running live. So, before we dive into +snapshots, let's have an understanding of backing files and overlays. + + + +QCOW2 backing files & overlays +------------------------------ + +In essence, QCOW2(Qemu Copy-On-Write) gives you an ability to create a base-image, +and create several 'disposable' copy-on-write overlay disk images on top of the +base image(also called backing file). Backing files and overlays are +extremely useful to rapidly instantiate thin-privisoned virtual machines(more on +it below). Especially quite useful in development & test environments, so that +one could quickly revert to a known state & discard the overlay. + +**Figure-1** + +:: + + .--------------. .-------------. .-------------. .-------------. + | | | | | | | | + | RootBase |<---| Overlay-1 |<---| Overlay-1A <--- | Overlay-1B | + | (raw/qcow2) | | (qcow2) | | (qcow2) | | (qcow2) | + '--------------' '-------------' '-------------' '-------------' + +The above figure illustrates - RootBase is the backing file for Overlay-1, which +in turn is backing file for Overlay-2, which in turn is backing file for +Overlay-3. + +**Figure-2** +:: + + .-----------. .-----------. .------------. .------------. .------------. + | | | | | | | | | | + | RootBase |<--- Overlay-1 |<--- Overlay-1A <--- Overlay-1B <--- Overlay-1C | + | | | | | | | | | (Active) | + '-----------' '-----------' '------------' '------------' '------------' + ^ ^ + | | + | | .-----------. .------------. + | | | | | | + | '-------| Overlay-2 |<---| Overlay-2A | + | | | | (Active) | + | '-----------' '------------' + | + | + | .-----------. .------------. + | | | | | + '------------| Overlay-3 |<---| Overlay-3A | + | | | (Active) | + '-----------' '------------' + +The above figure is just another representation which indicates, we can use a +'single' backing file, and create several overlays -- which can be used further, +to create overlays on top of them. + + +**NOTE**: Backing files are always opened **read-only**. In other words, once + an overlay is created, its backing file should not be modified(as the + overlay depends on a particular state of the backing file). Refer + below ('blockcommit' section) for relevant info on this. + + +**Example** : + +:: + + [FedoraBase.img] ----- <- [Fedora-guest-1.qcow2] <- [Fed-w-updates.qcow2] <- [Fedora-guest-with-updates-1A] + \ + \--- <- [Fedora-guest-2.qcow2] <- [Fed-w-updates.qcow2] <- [Fedora-guest-with-updates-2A] + +(Arrow to be read as Fed-w-updates.qcow2 has Fedora-guest-1.qcow2 as its backing file.) + +In the above example, say, *FedoraBase.img* has a freshly installed Fedora-17 OS on it, +and let's establish it as our backing file. Now, FedoraBase can be used as a +read-only 'template' to quickly instantiate two(or more) thinly provisioned +Fedora-17 guests(say Fedora-guest-1.qcow2, Fedora-guest-2.qcow2) by creating +QCOW2 overlay files pointing to our backing file. Also, the example & *Figure-2* +above illustrate that a single root-base image(FedoraBase.img) can be used +to create multiple overlays -- which can subsequently have their own overlays. + + + To create two thinly-provisioned Fedora clones(or overlays) using a single + backing file, we can invoke qemu-img as below: :: + + + # qemu-img create -b /export/vmimages/RootBase.img -f qcow2 \ + /export/vmimages/Fedora-guest-1.qcow2 + + # qemu-img create -b /export/vmimages/RootBase.img -f qcow2 \ + /export/vmimages/Fedora-guest-2.qcow2 + + Now, both the above images *Fedora-guest-1* & *Fedora-guest-2* are ready to + boot. Continuting with our example, say, now you want to instantiate a + Fedora-17 guest, but this time, with full Fedora updates. This can be + accomplished by creating another overlay(Fedora-guest-with-updates-1A) - but + this overly would point to 'Fed-w-updates.qcow2' as its backing file (which + has the full Fedora updates) :: + + # qemu-img create -b /export/vmimages/Fed-w-updates.qcow2 -f qcow2 \ + /export/vmimages/Fedora-guest-with-updates-1A.qcow2 + + + Information about a disk image, like virtual size, disk size, backing file(if it + exists) can be obtained by using 'qemu-img' as below: + :: + + # qemu-img info /export/vmimages/Fedora-guest-with-updates-1A.qcow2 + + NOTE: With latest qemu, an entire backing chain can be recursively + enumerated by doing: + :: + + # qemu-img info --backing-chain /export/vmimages/Fedora-guest-with-updates-1A.qcow2 + + + +Snapshot Terminology: +--------------------- + + - **Internal Snapshots** -- A single qcow2 image file holds both the saved state + & the delta since that saved point. This can be further classified as :- + + (1) **Internal disk snapshot**: The state of the virtual disk at a given + point in time. Both the snapshot & delta since the snapshot are + stored in the same qcow2 file. Can be taken when the guest is 'live' + or 'offline'. + + - Libvirt uses QEMU's 'qemu-img' command when the guest is 'offline'. + - Libvirt uses QEMU's 'savevm' command when the guest is 'live'. + + (2) **Internal system checkpoint**: RAM state, device state & the + disk-state of a running guest, are all stored in the same originial + qcow2 file. Can be taken when the guest is running 'live'. + + - Libvirt uses QEMU's 'savevm' command when the guest is 'live' + + + - **External Snapshots** -- Here, when a snapshot is taken, the saved state will + be stored in one file(from that point, it becomes a read-only backing + file) & a new file(overlay) will track the deltas from that saved state. + This can be further classified as :- + + (1) **External disk snapshot**: The snapshot of the disk is saved in one + file, and the delta since the snapshot is tracked in a new qcow2 + file. Can be taken when the guest is 'live' or 'offline'. + + - Libvirt uses QEMU's 'transaction' cmd under the hood, when the + guest is 'live'. + + - Libvirt uses QEMU's 'qemu-img' cmd under the hood when the + guest is 'offline'(this implementation is in progress, as of + writing this). + + (2) **External system checkpoint**: Here, the guest's disk-state will be + saved in one file, its RAM & device-state will be saved in another + new file (This implementation is in progress upstream libvirt, as of + writing this). + + + + - **VM State**: Saves the RAM & device state of a running guest(not 'disk-state') to + a file, so that it can be restored later. This simliar to doing hibernate + of the system. (NOTE: The disk-state should be unmodified at the time of + restoration.) + + - Libvirt uses QEMU's 'migrate' (to file) cmd under the hood. + + + +Creating snapshots +================== + - Whenever an 'external' snapshot is issued, a /new/ overlay image is + created to facilitate guest writes, and the previous image becomes a + snapshot. + + - **Create a disk-only internal snapshot** + + (1) If I have a guest named 'f17vm1', to create an offline or online + 'internal' snapshot called 'snap1' with description 'snap1-desc' :: + + # virsh snapshot-create-as f17vm1 snap1 snap1-desc + + (2) List the snapshot ; and query using *qemu-img* tool to view + the image info & its internal snapshot details :: + + # virsh snapshot-list f17vm1 + # qemu-img info /home/kashyap/vmimages/f17vm1.qcow2 + + + + - **Create a disk-only external snapshot** : + + (1) List the block device associated with the guest. :: + + # virsh domblklist f17-base + Target Source + --------------------------------------------- + vda /export/vmimages/f17-base.qcow2 + + # + + (2) Create external disk-only snapshot (while the guest is *running*). :: + + # virsh snapshot-create-as --domain f17-base snap1 snap1-desc \ + --disk-only --diskspec vda,snapshot=external,file=/export/vmimages/sn1-of-f17-base.qcow2 \ + --atomic + Domain snapshot snap1 created + # + + * Once the above command is issued, the original disk-image + of f17-base will become the backing_file & a new overlay + image is created to track the new changes. Here on, libvirt + will use this overlay for further write operations(while + using the original image as a read-only backing_file). + + (3) Now, list the block device associated(use cmd from step-1, above) + with the guest,again, to ensure it reflects the new overlay image as + the current block device in use. :: + + # virsh domblklist f17-base + Target Source + ---------------------------------------------------- + vda /export/vmimages/sn1-of-f17-base.qcow2 + + # + + + + +Reverting to snapshots +====================== +As of writing this, reverting to 'Internal Snapshots'(system checkpoint or +disk-only) is possible. + + To revert to a snapshot named 'snap1' of domain f17vm1 :: + + # virsh snapshot-revert --domain f17vm1 snap1 + +Reverting to 'external disk snapshots' using *snapshot-revert* is a little more +tricky, as it involves slightly complicated process of dealing with additional +snapshot files - whether to merge 'base' images into 'top' or to merge other way +round ('top' into 'base'). + +That said, there are a couple of ways to deal with external snapshot files by +merging them to reduce the external snapshot disk image chain by performing +either a **blockpull** or **blockcommit** (more on this below). + +Further improvements on this front is in work upstream libvirt as of writing +this. + + + +Merging snapshot files +====================== +External snapshots are incredibly useful. But, with plenty of external snapshot +files, there comes a problem of maintaining and tracking all these inidivdual +files. At a later point in time, we might want to 'merge' some of these snapshot +files (either backing_files into overlays or vice-versa) to reduce the length of +the image chain. To accomplish that, there are two mechanisms: + + + blockcommit: merges data from **top** into **base** (in other + words, merge overlays into backing files). + + + + blockpull: Populates a disk image with data from its backing file. Or + merges data from **base** into **top** (in other words, merge backing files + into overlays). + + +blockcommit +----------- + +Block Commit allows you to merge from a 'top' image(within a disk backing file +chain) into a lower-level 'base' image. To rephrase, it allows you to +merge overlays into backing files. Once the **blockcommit** operation is finished, +any portion that depends on the 'top' image, will now be pointing to the 'base'. + +This is useful in flattening(or collapsing or reducing) backing file chain +length after taking several external snapshots. + + +Let's understand with an illustration below: + +We have a base image called 'RootBase', which has a disk image chain with 4 +external snapshots. With 'Active' as the current active-layer, where 'live' guest +writes happen. There are a few possibilities of resulting image chains that we +can end up with, using 'blockcommit' : + + (1) Data from Snap-1, Snap-2 and Snap-3 can be merged into 'RootBase' + (resulting in RootBase becoming the backing_file of 'Active', and thus + invalidating Snap-1, Snap-2, & Snap-3). + + (2) Data from Snap-1 and Snap-2 can be merged into RootBase(resulting in + Rootbase becoming the backing_file of Snap-3, and thus invalidating + Snap-1 & Snap-2). + + (3) Data from Snap-1 can be merged into RootBase(resulting in RootBase + becoming the backing_file of Snap-2, and thus invalidating Snap-1). + + (4) Data from Snap-2 can be merged into Snap-1(resulting in Snap-1 becoming + the backing_file of Snap-3, and thus invalidating Snap-2). + + (5) Data from Snap-3 can be merged into Snap-2(resulting in Snap-2 becoming + the backing_file for 'Active', and thus invalidating Snap-3). + + (6) Data from Snap-2 and Snap-3 can be merged into Snap-1(resulting in + Snap-1 becoming the backing_file of 'Active', and thus invalidating + Snap-2 & Snap-3). + + NOTE: Eventually(not supported in qemu as of writing this), we can also + merge down the 'Active' layer(the top-most overlay) into its + backing_files. Once it is supported, the 'top' argument can become + optional, and default to active layer. + + +(The below figure illustrates case (6) from the above) + +**Figure-3** +:: + + .------------. .------------. .------------. .------------. .------------. + | | | | | | | | | | + | RootBase <--- Snap-1 <--- Snap-2 <--- Snap-3 <--- Snap-4 | + | | | | | | | | | (Active) | + '------------' '------------' '------------' '------------' '------------' + / | + / | + / commit data | + / | + / | + / | + v commit data | + .------------. .------------. <--------------------' .------------. + | | | | | | + | RootBase <--- Snap-1 |<---------------------------------| Snap-4 | + | | | | Backing File | (Active) | + '------------' '------------' '------------' + +For instance, if we have the below scenario: + + Actual: [base] <- sn1 <- sn2 <- sn3 <- sn4(this is active) + + Desired: [base] <- sn1 <- sn4 (thus invalidating sn2,sn3) + + Any of the below two methods is valid (as of 17-Oct-2012 qemu-git). With + method-a, operation will be faster & correct if we don't care about + sn2(because, it'll be invalidated). Note that, method-b is slower, but sn2 + will remain valid. (Also note that, the guest is 'live' in all these cases). + + **(method-a)**: + :: + + # virsh blockcommit --domain f17 vda --base /export/vmimages/sn1.qcow2 --top /export/vmimages/sn3.qcow2 --wait --verbose + + [OR] + + **(method-b)**: + :: + + # virsh blockcommit --domain f17 vda --base /export/vmimages/sn2.qcow2 --top /export/vmimages/sn3.qcow2 --wait --verbose + # virsh blockcommit --domain f17 vda --base /export/vmimages/sn1.qcow2 --top /export/vmimages/sn2.qcow2 --wait --verbose + + NOTE: If we had to do manually with *qemu-img* cmd, we can only do method-b at the moment. + + +**Figure-4** +:: + + .------------. .------------. .------------. .------------. .------------. + | | | | | | | | | | + | RootBase <--- Snap-1 <--- Snap-2 <--- Snap-3 <--- Snap-4 | + | | | | | | | | | (Active) | + '------------' '------------' '------------' '------------' '------------' + / | | + / | | + / | | + commit data / commit data | | + / | | + / | commit data | + v | | + .------------.<----------------------|-------------' .------------. + | |<----------------------' | | + | RootBase | | Snap-4 | + | |<-------------------------------------------------| (Active) | + '------------' Backing File '------------' + + +The above figure is another representation of reducing the disk image chain +using blockcommit. Data from Snap-1, Snap-2, Snap-3 are merged(/committed) +into RootBase, & now the current 'Active' image now pointing to 'RootBase' as its +backing file(instead of Snap-3, which was the case *before* blockcommit). Note +that, now intermediate images Snap-1, Snap-1, Snap-3 will be invalidated(as they were +dependent on a particular state of RootBase). + +blockpull +--------- +Block Pull(also called 'Block Stream' in QEMU's paralance) allows you to merge +into 'base' from a 'top' image(within a disk backing file chain). To rephrase it +allows merging backing files into an overlay(active). This works in the +opposite side of 'blockcommit' to flatten the snapshot chain. At the moment, +**blockpull** can pull only into the active layer(the top-most image). It's +worth noting here that, intermediate images are not invalidated once a blockpull +operation is complete (while blockcommit, invalidates them). + + +Consider the below illustration: + +**Figure-5** +:: + + .------------. .------------. .------------. .------------. .------------. + | | | | | | | | | | + | RootBase <--- Snap-1 <--- Snap-2 <--- Snap-3 <--- Snap-4 | + | | | | | | | | | (Active) | + '------------' '------------' '------------' '------------' '------------' + | | \ + | | \ + | | \ + | | \ stream data + | | stream data \ + | stream data | \ + | | v + .------------. | '---------------> .------------. + | | '---------------------------------> | | + | RootBase | | Snap-4 | + | | <---------------------------------------- | (Active) | + '------------' Backing File '------------' + + + +The above figure illustrates that, using block-copy we can pull data from +Snap-1, Snap-2 and Snap-3 into the 'Active' layer, resulting in 'RootBase' +becoming the backing file for the 'Active' image (instead of 'Snap-3', which was +the case before doing the blockpull operation). + +The command flow would be: + (1) Assuming a external disk-only snapshot was created as mentioned in + *Creating Snapshots* section: + + (2) A blockpull operation can be issued this way, to achieve the desired + state of *Figure-5*-- [RootBase] <- [Active]. :: + + # virsh blockpull --domain RootBase --path var/lib/libvirt/images/active.qcow2 --base /var/lib/libvirt/images/RootBase.qcow2 --wait --verbose + + + As a follow up, we can do the below to clean-up the snapshot *tracking* + metadata by libvirt (note: the below does not 'remove' the files, it + just cleans up the snapshot tracking metadata). :: + + # virsh snapshot-delete --domain RootBase Snap-3 --metadata + # virsh snapshot-delete --domain RootBase Snap-2 --metadata + # virsh snapshot-delete --domain RootBase Snap-1 --metadata + + + + +**Figure-6** +:: + + .------------. .------------. .------------. .------------. .------------. + | | | | | | | | | | + | RootBase <--- Snap-1 <--- Snap-2 <--- Snap-3 <--- Snap-4 | + | | | | | | | | | (Active) | + '------------' '------------' '------------' '------------' '------------' + | | | \ + | | | \ + | | | \ stream data + | | | stream data \ + | | | \ + | | stream data | \ + | stream data | '------------------> v + | | .--------------. + | '---------------------------------> | | + | | Snap-4 | + '----------------------------------------------------> | (Active) | + '--------------' + 'Standalone' + (w/o backing + file) + +The above figure illustrates, once blockpull operation is complete, by +pulling/streaming data from RootBase, Snap-1, Snap-2, Snap-3 into 'Active', all +the backing files can be discarded and 'Active' now will be a standalone image +without any backing files. + +Command flow would be: + (0) Assuming 4 external disk-only (live) snapshots were created as + mentioned in *Creating Snapshots* section, + + (1) Let's check the snapshot overlay images size *before* blockpull operation (note the image of 'Active'): + :: + + # ls -lash /var/lib/libvirt/images/RootBase.img + 608M -rw-r--r--. 1 qemu qemu 1.0G Oct 11 17:54 /var/lib/libvirt/images/RootBase.img + + # ls -lash /var/lib/libvirt/images/*Snap* + 840K -rw-------. 1 qemu qemu 896K Oct 11 17:56 /var/lib/libvirt/images/Snap-1.qcow2 + 392K -rw-------. 1 qemu qemu 448K Oct 11 17:56 /var/lib/libvirt/images/Snap-2.qcow2 + 456K -rw-------. 1 qemu qemu 512K Oct 11 17:56 /var/lib/libvirt/images/Snap-3.qcow2 + 2.9M -rw-------. 1 qemu qemu 3.0M Oct 11 18:10 /var/lib/libvirt/images/Active.qcow2 + + (2) Also, check the disk image information of 'Active'. It can noticed that + 'Active' has Snap-3 as its backing file. :: + + # qemu-img info /var/lib/libvirt/images/Active.qcow2 + image: /var/lib/libvirt/images/Active.qcow2 + file format: qcow2 + virtual size: 1.0G (1073741824 bytes) + disk size: 2.9M + cluster_size: 65536 + backing file: /var/lib/libvirt/images/Snap-3.qcow2 + + (3) Do the **blockpull** operation. :: + + # virsh blockpull --domain ptest2-base --path /var/lib/libvirt/images/Active.qcow2 --wait --verbose + Block Pull: [100 %] + Pull complete + + (4) Let's again check the snapshot overlay images size *after* + blockpull operation. It can be noticed, 'Active' is now considerably larger. :: + + # ls -lash /var/lib/libvirt/images/*Snap* + 840K -rw-------. 1 qemu qemu 896K Oct 11 17:56 /var/lib/libvirt/images/Snap-1.qcow2 + 392K -rw-------. 1 qemu qemu 448K Oct 11 17:56 /var/lib/libvirt/images/Snap-2.qcow2 + 456K -rw-------. 1 qemu qemu 512K Oct 11 17:56 /var/lib/libvirt/images/Snap-3.qcow2 + 1011M -rw-------. 1 qemu qemu 3.0M Oct 11 18:29 /var/lib/libvirt/images/Active.qcow2 + + + (5) Also, check the disk image information of 'Active'. It can now be + noticed that 'Active' is a standalone image without any backing file - + which is the desired state of *Figure-6*.:: + + # qemu-img info /var/lib/libvirt/images/Active.qcow2 + image: /var/lib/libvirt/images/Active.qcow2 + file format: qcow2 + virtual size: 1.0G (1073741824 bytes) + disk size: 1.0G + cluster_size: 65536 + + (6) We can now clean-up the snapshot tracking metadata by libvirt to + reflect the new reality :: + + # virsh snapshot-delete --domain RootBase Snap-3 --metadata + + (7) Optionally, one can check, the guest disk contents by invoking + *guestfish* tool(part of *libguestfs*) **READ-ONLY** (*--ro* option + below does it) as below :: + + # guestfish --ro -i -a /var/lib/libvirt/images/Active.qcow2 + + +Deleting snapshots (and 'offline commit') +========================================= + +Deleting (live/offline) *Internal Snapshots* (where the originial & all the named snapshots +are stored in a single QCOW2 file), is quite straight forward. :: + + # virsh snapshot-delete --domain f17vm --snapshotname snap6 + + [OR] + + # virsh snapshot-delete f17vm snap6 + +Deleting External snapshots (offline), Libvirt has not acquired the capability. +But, it can be done via *qemu-img* manipulation. + +Say, we have this image chain(the guest is *offline* here): **base <- sn1 <- sn2 <- sn3** +(arrow to be read as 'sn3 has sn2 as its backing file'). + + +And, we want to delete the second snapshot(sn2). It's possible to do it in two +ways: + + + - **Method (1)**: **base <- sn1 <- sn3** (by copying sn2 into sn1) + - **Method (2)**: **base <- sn1 <- sn3** (by copying sn2 into sn3) + +Method (1) +---------- +To end up with this image chain : **base <- sn1 <- sn3** (by copying *sn2* into *sn1*) + +**NOTE**: This is only possible *if* sn1 isn't used by more images as their backing +file, or they'd get corrupted!! + + (a) We're doing an *offline commit* (similar to what *blockcommit* can do + to an *online* guest). :: + + # qemu-img commit sn2.qcow2 + + - This will *commit* the changes from sn2 into its backing file(which is + sn1). + + (b) Now that we've comitted changes from sn2 into sn1, let's change the + backing file link in sn3 to point to sn1. :: + + # qemu-img rebase -u -b sn1.qcow2 sn3.qcow2 + + - **NOTE**: This is 'Unsafe mode' -- in this mode, only the backing file + name is changed w/o any checks on the file contents. The user must + take care of specifying the correct new backing file, or the + guest-visible. This mode is useful for renaming or moving the + backing file to somewhere else. It can be used without an + accessible old backing file, i.e. you can use it to fix an image + whose backing file has already been moved/renamed. + + + (c) Now, we can delete the sn2 disk image(as the changes are now committed + to sn1). :: + + # rm sn2.qcow2 + + +Method (2) +---------- +To end up with this image chain : **base <- sn1 <- sn3** (by copying *sn2* into *sn3*) + + (a) Copy contents of sn2(the old backing file) into sn3, and change the backing file link of sn3 to sn1:: + + # qemu-img rebase -b sn1.qcow2 sn3.qcow2 + + - Apart from changing backing file link of sn3 to sn1, the above cmd + will it also /copy/ the contents from sn2 into sn3). + + - In other words: This is 'Safe mode', which is the default -- + any clusters that differ between the new backing_file(in this + case, sn1) and the old backing file(in this case, sn2) of + filename(in this case, sn3) are merged into filename(sn3), before + actually changing the backing file. + + (b) Now, we can delete the sn2 disk image(as the changes are now committed to + sn1). :: + + # rm sn2.qcow2 + -- 1.7.7.6

4 6

[libvirt] [libvirt-php] Allow block devices in libvirt_domain_disk_add
by Martijn Otto 17 Apr '13

17 Apr '13

I have written a patch to the libvirt_domain_disk_add function which does the following things: 1. Allow adding block devices as disks with libvirt_domain_disk_add 2. Removed the xflags parameter (not relevant as no xml is returned anyways) 3. Added the cache option to control cache mode (either default, none, writeback or writethrough) 4. Added the io option to control the used io mode (either default, native or threads) Besides this, I have rewritten it so it now uses the virDomainAttachDevice function, which is meant for these things, instead of pasting the device XML by hand into the domain XML. I have uploaded this to my github clone at https://github.com/martijnotto/libvirt-php It would be nice if this could be included in a future release of lbvirt-php. If the code does not meet a coding standard for libvirt-php or if there is some other concern, please let me know and I will do what I can to improve it. With Regards, Martijn Otto Copernica B.V.

1 0

[libvirt] [PATCH v2] qemu: Implement CPUs check against machine type's cpu-max
by Michal Novotny 17 Apr '13

17 Apr '13

Implement check whether (maximum) vCPUs doesn't exceed machine type's cpu-max settings. Signed-off-by: Michal Novotny <minovotn(a)redhat.com> --- src/conf/capabilities.h | 1 + src/qemu/qemu_capabilities.c | 40 +++++++++++++++++++++++++++++++++++++++- src/qemu/qemu_capabilities.h | 3 ++- src/qemu/qemu_monitor.h | 1 + src/qemu/qemu_monitor_json.c | 7 +++++++ src/qemu/qemu_process.c | 27 +++++++++++++++++++++++++++ 6 files changed, 77 insertions(+), 2 deletions(-) diff --git a/src/conf/capabilities.h b/src/conf/capabilities.h index abcf6de..16bf3de 100644 --- a/src/conf/capabilities.h +++ b/src/conf/capabilities.h @@ -46,6 +46,7 @@ typedef virCapsGuestMachine *virCapsGuestMachinePtr; struct _virCapsGuestMachine { char *name; char *canonical; + int cpu_max; }; typedef struct _virCapsGuestDomainInfo virCapsGuestDomainInfo; diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index d10c8aa..a03a643 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -243,6 +243,7 @@ struct _virQEMUCaps { size_t nmachineTypes; char **machineTypes; char **machineAliases; + int *machineMaxCpus; }; struct _virQEMUCapsCache { @@ -322,6 +323,7 @@ virQEMUCapsSetDefaultMachine(virQEMUCapsPtr qemuCaps, { char *name = qemuCaps->machineTypes[defIdx]; char *alias = qemuCaps->machineAliases[defIdx]; + int cpu_max = qemuCaps->machineMaxCpus[defIdx]; memmove(qemuCaps->machineTypes + 1, qemuCaps->machineTypes, @@ -329,8 +331,12 @@ virQEMUCapsSetDefaultMachine(virQEMUCapsPtr qemuCaps, memmove(qemuCaps->machineAliases + 1, qemuCaps->machineAliases, sizeof(qemuCaps->machineAliases[0]) * defIdx); + memmove(qemuCaps->machineMaxCpus + 1, + qemuCaps->machineMaxCpus, + sizeof(qemuCaps->machineMaxCpus[0]) * defIdx); qemuCaps->machineTypes[0] = name; qemuCaps->machineAliases[0] = alias; + qemuCaps->machineMaxCpus[0] = cpu_max; } /* Format is: @@ -377,7 +383,8 @@ virQEMUCapsParseMachineTypesStr(const char *output, } if (VIR_REALLOC_N(qemuCaps->machineTypes, qemuCaps->nmachineTypes + 1) < 0 || - VIR_REALLOC_N(qemuCaps->machineAliases, qemuCaps->nmachineTypes + 1) < 0) { + VIR_REALLOC_N(qemuCaps->machineAliases, qemuCaps->nmachineTypes + 1) < 0 || + VIR_REALLOC_N(qemuCaps->machineMaxCpus, qemuCaps->nmachineTypes + 1) < 0) { VIR_FREE(name); VIR_FREE(canonical); goto no_memory; @@ -390,6 +397,8 @@ virQEMUCapsParseMachineTypesStr(const char *output, qemuCaps->machineTypes[qemuCaps->nmachineTypes-1] = name; qemuCaps->machineAliases[qemuCaps->nmachineTypes-1] = NULL; } + /* Value 0 means "unknown" as it's not exposed by QEMU binary */ + qemuCaps->machineMaxCpus[qemuCaps->nmachineTypes-1] = 0; } while ((p = next)); @@ -1718,6 +1727,8 @@ virQEMUCapsPtr virQEMUCapsNewCopy(virQEMUCapsPtr qemuCaps) goto no_memory; if (VIR_ALLOC_N(ret->machineAliases, qemuCaps->nmachineTypes) < 0) goto no_memory; + if (VIR_ALLOC_N(ret->machineMaxCpus, qemuCaps->nmachineTypes) < 0) + goto no_memory; ret->nmachineTypes = qemuCaps->nmachineTypes; for (i = 0 ; i < qemuCaps->nmachineTypes ; i++) { if (!(ret->machineTypes[i] = strdup(qemuCaps->machineTypes[i]))) @@ -1725,6 +1736,7 @@ virQEMUCapsPtr virQEMUCapsNewCopy(virQEMUCapsPtr qemuCaps) if (qemuCaps->machineAliases[i] && !(ret->machineAliases[i] = strdup(qemuCaps->machineAliases[i]))) goto no_memory; + ret->machineMaxCpus[i] = qemuCaps->machineMaxCpus[i]; } return ret; @@ -1885,9 +1897,11 @@ int virQEMUCapsGetMachineTypesCaps(virQEMUCapsPtr qemuCaps, goto no_memory; if (!(mach->canonical = strdup(qemuCaps->machineTypes[i]))) goto no_memory; + mach->cpu_max = qemuCaps->machineMaxCpus[i]; } else { if (!(mach->name = strdup(qemuCaps->machineTypes[i]))) goto no_memory; + mach->cpu_max = qemuCaps->machineMaxCpus[i]; } (*machines)[i] = mach; } @@ -1923,6 +1937,25 @@ const char *virQEMUCapsGetCanonicalMachine(virQEMUCapsPtr qemuCaps, } +int virQEMUCapsGetMachineMaxCpus(virQEMUCapsPtr qemuCaps, + const char *name) +{ + size_t i; + + if (!name) + return 0; + + for (i = 0 ; i < qemuCaps->nmachineTypes ; i++) { + if (!qemuCaps->machineMaxCpus[i]) + continue; + if (STREQ(qemuCaps->machineTypes[i], name)) + return qemuCaps->machineMaxCpus[i]; + } + + return 0; +} + + static int virQEMUCapsProbeQMPCommands(virQEMUCapsPtr qemuCaps, qemuMonitorPtr mon) @@ -2073,6 +2106,10 @@ virQEMUCapsProbeQMPMachineTypes(virQEMUCapsPtr qemuCaps, virReportOOMError(); goto cleanup; } + if (VIR_ALLOC_N(qemuCaps->machineMaxCpus, nmachines) < 0) { + virReportOOMError(); + goto cleanup; + } for (i = 0 ; i < nmachines ; i++) { if (machines[i]->alias) { @@ -2087,6 +2124,7 @@ virQEMUCapsProbeQMPMachineTypes(virQEMUCapsPtr qemuCaps, } if (machines[i]->isDefault) defIdx = i; + qemuCaps->machineMaxCpus[i] = machines[i]->cpu_max; } qemuCaps->nmachineTypes = nmachines; diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 728add5..8205ff7 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -224,7 +224,8 @@ size_t virQEMUCapsGetMachineTypes(virQEMUCapsPtr qemuCaps, char ***names); const char *virQEMUCapsGetCanonicalMachine(virQEMUCapsPtr qemuCaps, const char *name); - +int virQEMUCapsGetMachineMaxCpus(virQEMUCapsPtr qemuCaps, + const char *name); int virQEMUCapsGetMachineTypesCaps(virQEMUCapsPtr qemuCaps, size_t *nmachines, virCapsGuestMachinePtr **machines); diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h index f39f009..c097953 100644 --- a/src/qemu/qemu_monitor.h +++ b/src/qemu/qemu_monitor.h @@ -650,6 +650,7 @@ struct _qemuMonitorMachineInfo { char *name; bool isDefault; char *alias; + int cpu_max; }; int qemuMonitorGetMachines(qemuMonitorPtr mon, diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index 6fdd650..adbd865 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -4024,6 +4024,13 @@ int qemuMonitorJSONGetMachines(qemuMonitorPtr mon, goto cleanup; } } + + if (virJSONValueObjectHasKey(child, "cpu-max") && + virJSONValueObjectGetNumberInt(child, "cpu-max", &info->cpu_max) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("query-machines reply has malformed 'cpu-max' data")); + goto cleanup; + } } ret = n; diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index ce9f501..9eae8f6 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -3266,6 +3266,30 @@ qemuSetUnprivSGIO(virDomainDiskDefPtr disk) return ret; } +static bool +qemuValidateCpuMax(virDomainDefPtr def, virQEMUCapsPtr qemuCaps) +{ + int cpu_max; + + cpu_max = virQEMUCapsGetMachineMaxCpus(qemuCaps, def->os.machine); + if (!cpu_max) + return true; + + if (def->vcpus > cpu_max) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + "%s", _("CPUs greater than specified machine type limit")); + return false; + } + + if (def->maxvcpus > cpu_max) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + "%s", _("Maximum CPUs greater than specified machine type limit")); + return false; + } + + return true; +} + int qemuProcessStart(virConnectPtr conn, virQEMUDriverPtr driver, virDomainObjPtr vm, @@ -3481,6 +3505,9 @@ int qemuProcessStart(virConnectPtr conn, vm->def->emulator))) goto cleanup; + if (!qemuValidateCpuMax(vm->def, priv->qemuCaps)) + goto cleanup; + if (qemuAssignDeviceAliases(vm->def, priv->qemuCaps) < 0) goto cleanup; -- 1.7.11.7

2 1

[libvirt] (no subject)
by David Scott 17 Apr '13

17 Apr '13

Hi, I've made an improved set of ocaml bindings for the libvirt event mechanism which I'm now reasonably happy with. Improvements since my first submission: 1. it's possible to deregister callbacks with 'deregister_any' 2. the callback to ocaml now re-acquires the heap lock *before* creating and registering OCaml values with the GC: the previous patches got this wrong and bad things happened 3. it's possible to add and remove timer callbacks: this is used in the example to run Gc.compact() often, to check for problems 4. I removed the symbol detection for bindings present in libvirt 0.9.1 Let me know what you think! Thanks, Dave

1 3

[libvirt] [PATCH 0/2] Add cpu-max to capabilities and implement checks
by Michal Novotny 17 Apr '13

17 Apr '13

Add cpu-max to capabilities XML output for newer QEMU and implement checks whether the number of vCPUs/maximum vCPUS doesn't exceed machine limit. For older versions of QEMU cpu-max field is not present so the cpu-max is set to 0 to disable checking and act the same as without this patch. Signed-off-by: Michal Novotny <minovotn(a)redhat.com> Michal Novotny (2): cpu-max: Implement cpu-max attribute into capabilities XML output qemu: Implement validation for max-cpu in XML docs/schemas/capability.rng | 5 +++++ src/conf/capabilities.c | 4 ++++ src/conf/capabilities.h | 1 + src/qemu/qemu_capabilities.c | 40 +++++++++++++++++++++++++++++++++++++++- src/qemu/qemu_capabilities.h | 3 ++- src/qemu/qemu_driver.c | 30 ++++++++++++++++++++++++++++++ src/qemu/qemu_monitor.h | 1 + src/qemu/qemu_monitor_json.c | 7 +++++++ 8 files changed, 89 insertions(+), 2 deletions(-) -- 1.7.11.7

2 4

[libvirt] patch request
by Thierry Parmentelat 17 Apr '13

17 Apr '13

Just in case this is useful, I'd like to submit this change below that was not present at least in 1.0.4 http://git.onelab.eu/?p=libvirt.git;a=blob;f=virgetlasterror.patch;h=9109d5… I'd taken this hint here in the first place http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=700077 -- Thierry

2 3

[libvirt] Google Summer of Code 2013 ideas wiki open
by Stefan Hajnoczi 16 Apr '13

16 Apr '13

I have created the Google Summer of Code 2013 wiki page where you can add project ideas: http://wiki.qemu.org/Google_Summer_of_Code_2013 Please add project ideas you are willing to mentor. If you have an idea but cannot mentor this year, feel free to add it but please try to find a mentor for it. If you want to be a mentor, please see http://wiki.qemu.org/Google_Summer_of_Code_2013#Information_for_mentors. Background on Google Summer of Code: Google Summer of Code is a scheme where Google funds university students to work on open source projects for 12 weeks during the summer. It has been held annually since 2005. GSoC is an opportunity for students to experience open source development. Organizations sometimes find long-term contributors, and either way it's a fun experience. Open source organizations can apply to take part. Those chosen will be able to take on one or more students for the summer. Each student is paired with a mentor who helps them and evaluates their progress. Last year QEMU was not accepted but we were successful in years before that. I believe Google will announce GSoC again this year (there is no guarantee though) and I have created the wiki page so we can begin organizing project ideas that students can choose from. This way we'll be ready to put together a good organization application. Stefan

6 54

[libvirt] [PATCH 0/6] cleanup: About including header
by Osier Yang 16 Apr '13

16 Apr '13

4 14

[libvirt] [PATCH 0/5] VirtualBox version 4.2 support for libvirt vbox driver
by ryan woodsmall 16 Apr '13

16 Apr '13

This patch set adds VirtualBox 4.2 initial support for the libvirt vbox driver. I've tested enough to check capabilities, create a VM, destroy it, etc. Five patches total: - Patch 1 is the C API header file from Oracle, cleaned up for libvirt. - Patch 2 is the version specific source file for version dependency. - Patch 3 is the src/Makefile.am change to pick up the two new files. - Patch 4 is the vbox driver support for the new VirtualBox API/version. - Patch 5 is the vbox_tmpl.c template support for the new version. A few things have changed in the VirtualBox API - some small (capitalizations of things in function names like Ip to IP and Dhcp to DHCP) and some much larger (FindMedium is superceded by OpenMedium). The biggest change for the sake of this patch set is the signature of CreateMachine is quite a bit different. Using the Oracle source as a guide, to spin up a VM with a given UUID, it looks like a text flag has to be passed in a new argument to CreateMachine. This flag is built in the VirtualBox 4.2 specific ifdefs and is kind of ugly but works. Additionally, there is now (unused) VM groups support in CreateMachine and the previous 'osTypeId' arg is currently set to nsnull as in the Oracle code. The FindMedium to OpenMedium changes were more straightforward and are pretty clear. The rest of the vbox template changes are basically spelling/capitalization changes from the looks of things. This probably isn't perfect, but it works on git and patched against 0.10.2 for a few quick tests. Not currently on the list, so ping me directly if you need any other info on these, or if anything could use additional work. Thanks! -r ryan woodsmall (5): vbox C API header for VirtualBox v4.2 vbox version-specific C file for VirtualBox v4.2 Makefile.am additions for VirtualBox v4.2 vbox driver support for VirtualBox v4.2 vbox template support for VirtualBox v4.2 src/Makefile.am | 3 +- src/vbox/vbox_CAPI_v4_2.h | 8855 +++++++++++++++++++++++++++++++++++++++++++++ src/vbox/vbox_V4_2.c | 13 + src/vbox/vbox_driver.c | 8 + src/vbox/vbox_tmpl.c | 90 +- 5 files changed, 8958 insertions(+), 11 deletions(-) create mode 100644 src/vbox/vbox_CAPI_v4_2.h create mode 100644 src/vbox/vbox_V4_2.c

4 9

[libvirt] [PATCH] Check for QMP query-tpm-models
by Stefan Berger 16 Apr '13

16 Apr '13

Check for QMP query-tpm-models and set a capability flag. Do not use this QMP command if it is not supported. Signed-off-by: Stefan Berger <stefanb(a)linux.vnet.ibm.com> --- src/qemu/qemu_capabilities.c | 8 ++++++++ src/qemu/qemu_capabilities.h | 1 + 2 files changed, 9 insertions(+) Index: libvirt/src/qemu/qemu_capabilities.h =================================================================== --- libvirt.orig/src/qemu/qemu_capabilities.h +++ libvirt/src/qemu/qemu_capabilities.h @@ -179,6 +179,7 @@ enum virQEMUCapsFlags { QEMU_CAPS_MACHINE_USB_OPT = 137, /* -machine xxx,usb=on/off */ QEMU_CAPS_DEVICE_TPM_PASSTHROUGH = 138, /* -tpmdev passthrough */ QEMU_CAPS_DEVICE_TPM_TIS = 139, /* -device tpm_tis */ + QEMU_CAPS_TPM_MODELS = 140, /* query-tpm-models QMP command */ QEMU_CAPS_LAST, /* this must always be the last item */ }; Index: libvirt/src/qemu/qemu_capabilities.c =================================================================== --- libvirt.orig/src/qemu/qemu_capabilities.c +++ libvirt/src/qemu/qemu_capabilities.c @@ -220,6 +220,8 @@ VIR_ENUM_IMPL(virQEMUCaps, QEMU_CAPS_LAS "machine-usb-opt", "tpm-passthrough", "tpm-tis", + + "query-tpm-models", /* 140 */ ); struct _virQEMUCaps { @@ -1962,6 +1964,8 @@ virQEMUCapsProbeQMPCommands(virQEMUCapsP virQEMUCapsSet(qemuCaps, QEMU_CAPS_ADD_FD); else if (STREQ(name, "nbd-server-start")) virQEMUCapsSet(qemuCaps, QEMU_CAPS_NBD_SERVER); + else if (STREQ(name, "query-tpm-models")) + virQEMUCapsSet(qemuCaps, QEMU_CAPS_TPM_MODELS); VIR_FREE(name); } VIR_FREE(commands); @@ -2144,6 +2148,10 @@ virQEMUCapsProbeQMPTPM(virQEMUCapsPtr qe { int nentries, i; char **entries = NULL; + + if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_TPM_MODELS)) + return 0; + if ((nentries = qemuMonitorGetTPMModels(mon, &entries)) < 0) return -1;

3 4

[libvirt] [PATCH v2] Fix compilation error in util/vircgroup.c
by Stefan Berger 16 Apr '13

16 Apr '13

Fix the error util/vircgroup.c: In function 'virCgroupNewDomainPartition': util/vircgroup.c:1299:11: error: declaration of 'dirname' shadows a global declaration [-Werror=shadow] Signed-off-by: Stefan Berger <stefanb(a)linux.vnet.ibm.com> --- src/util/vircgroup.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) Index: libvirt-acl/src/util/vircgroup.c =================================================================== --- libvirt-acl.orig/src/util/vircgroup.c +++ libvirt-acl/src/util/vircgroup.c @@ -1296,13 +1296,13 @@ int virCgroupNewDomainPartition(virCgrou virCgroupPtr *group) { int rc; - char *dirname = NULL; + char *grpname = NULL; - if (virAsprintf(&dirname, "%s.%s.libvirt", + if (virAsprintf(&grpname, "%s.%s.libvirt", name, driver) < 0) return -ENOMEM; - rc = virCgroupNew(dirname, partition, -1, group); + rc = virCgroupNew(grpname, partition, -1, group); if (rc == 0) { /* @@ -1322,7 +1322,7 @@ int virCgroupNewDomainPartition(virCgrou } } - VIR_FREE(dirname); + VIR_FREE(grpname); return rc; } #else

2 2

[libvirt] [PATCH] Fix build breaker with ATTRIBUTE_NONNULL defs
by John Ferlan 16 Apr '13

16 Apr '13

Using "./autogen.sh --system lv_cv_static_analysis=yes" for my daily Coverity builds resulted in the following error when building: In file included from util/vircgrouppriv.h:32:0, from util/vircgroup.c:44: util/vircgroup.h:59:5: error: nonnull argument with out-of-range operand number (argument 1, operand 5) util/vircgroup.h:74:5: error: nonnull argument references non-pointer operand (argument 1, operand 4) make[3]: *** [libvirt_util_la-vircgroup.lo] Error 1 make[3]: Leaving directory `/home/jferlan/libvirt.cov.curr/src' make[2]: *** [all] Error 2 make[2]: Leaving directory `/home/jferlan/libvirt.cov.curr/src' make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory `/home/jferlan/libvirt.cov.curr' make: *** [all] Error 2 --- src/util/vircgroup.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/util/vircgroup.h b/src/util/vircgroup.h index f324fa3..b030e4a 100644 --- a/src/util/vircgroup.h +++ b/src/util/vircgroup.h @@ -54,11 +54,11 @@ int virCgroupNewPartition(const char *path, int virCgroupNewDriver(const char *name, bool create, int controllers, virCgroupPtr *group) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(5); + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(4); int virCgroupNewSelf(virCgroupPtr *group) ATTRIBUTE_NONNULL(1); int virCgroupNewDomainDriver(virCgroupPtr driver, @@ -69,11 +69,11 @@ int virCgroupNewDomainDriver(virCgroupPtr driver, int virCgroupNewDomainPartition(virCgroupPtr partition, const char *driver, const char *name, bool create, virCgroupPtr *group) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(4); + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(5); int virCgroupNewVcpu(virCgroupPtr domain, int vcpuid, bool create, virCgroupPtr *group) -- 1.8.1.4

2 1

[libvirt] [PATCH] Resolve valgrind error
by John Ferlan 16 Apr '13

16 Apr '13

Commit id '1acfc171' resulted in the following valgrind failure: ==25317== 136 (24 direct, 112 indirect) bytes in 1 blocks are definitely lost in loss record 4 of 4 ==25317== at 0x4A06B6F: calloc (vg_replace_malloc.c:593) ==25317== by 0x4C6F851: virAlloc (viralloc.c:124) ==25317== by 0x4C71493: virBitmapNew (virbitmap.c:74) ==25317== by 0x4C71B79: virBitmapNewData (virbitmap.c:434) ==25317== by 0x402EF2: test8 (virbitmaptest.c:436) ==25317== by 0x40499F: virtTestRun (testutils.c:157) ==25317== by 0x402E8D: mymain (virbitmaptest.c:474) ==25317== by 0x404FDA: virtTestMain (testutils.c:719) ==25317== by 0x39D0821A04: (below main) (in /usr/lib64/libc-2.16.so) --- tests/virbitmaptest.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/tests/virbitmaptest.c b/tests/virbitmaptest.c index 90be0e2..2464c33 100644 --- a/tests/virbitmaptest.c +++ b/tests/virbitmaptest.c @@ -432,24 +432,25 @@ static int test8(const void *v ATTRIBUTE_UNUSED) { virBitmapPtr bitmap = NULL; char data[108] = {0x00,}; + int ret = -1; bitmap = virBitmapNewData(data, sizeof(data)); if (!bitmap) - goto error; + goto cleanup; if (!virBitmapIsAllClear(bitmap)) - goto error; + goto cleanup; if (virBitmapSetBit(bitmap, 11) < 0) - goto error; + goto cleanup; if (virBitmapIsAllClear(bitmap)) - goto error; + goto cleanup; - return 0; -error: + ret = 0; +cleanup: virBitmapFree(bitmap); - return -1; + return ret; } static int -- 1.8.1.4

2 2

[libvirt] [PATCH] Fix compilation error in util/vircgroup.c
by Stefan Berger 16 Apr '13

16 Apr '13

Fix the error util/vircgroup.c: In function 'virCgroupNewDomainPartition': util/vircgroup.c:1299:11: error: declaration of 'dirname' shadows a global declaration [-Werror=shadow] Signed-off-by: Stefan Berger <stefanb(a)linux.vnet.ibm.com> --- src/util/vircgroup.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) Index: libvirt-acl/src/util/vircgroup.c =================================================================== --- libvirt-acl.orig/src/util/vircgroup.c +++ libvirt-acl/src/util/vircgroup.c @@ -1296,13 +1296,13 @@ int virCgroupNewDomainPartition(virCgrou virCgroupPtr *group) { int rc; - char *dirname = NULL; + char *directoryname = NULL; - if (virAsprintf(&dirname, "%s.%s.libvirt", + if (virAsprintf(&directoryname, "%s.%s.libvirt", name, driver) < 0) return -ENOMEM; - rc = virCgroupNew(dirname, partition, -1, group); + rc = virCgroupNew(directoryname, partition, -1, group); if (rc == 0) { /* @@ -1322,7 +1322,7 @@ int virCgroupNewDomainPartition(virCgrou } } - VIR_FREE(dirname); + VIR_FREE(directoryname); return rc; } #else

2 1

[libvirt] [PATCH 0/2] Suppress log message when using unsupported TPM QMP commands
by Stefan Berger 16 Apr '13

16 Apr '13

Properly suppress log messages when using unsupported TPM QMP commands. Stefan

2 4

[libvirt] [libvirt-glib] Fix year in NEWS
by Christophe Fergeau 16 Apr '13

16 Apr '13

We switched from 2012 to 2013!! --- I've pushed this under the trivial rule. Christophe NEWS | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/NEWS b/NEWS index b5f0c84..b1f4a80 100644 --- a/NEWS +++ b/NEWS @@ -1,7 +1,7 @@ libvirt-glib News ================= -0.1.6 - Mar 18, 2012 +0.1.6 - Mar 18, 2013 ==================== - Prefer g_strlcpy over strncpy @@ -14,7 +14,7 @@ - Replace FSF address with URL in copyright headers - Add API for changing Spice compression parameters. -0.1.5 - Jan 14, 2012 +0.1.5 - Jan 14, 2013 ==================== - Add support for bridge interface types in guest XML -- 1.8.1.4

1 0

[libvirt] [PATCH 0/7] Add support for guest-based CPU-hotplug and unplug
by Peter Krempa 16 Apr '13

16 Apr '13

This is a initial support for guest-agent based cpu hotplug that was commited in upstream qemu and should be released in qemu 1.5.0. This patchset relies on the existing qemuDomainSetVcpusFlags API that is not really ideal for this purpose but is usable. I'm planing on adding a specific-cpu hotplug API later that will allow more control. Peter Krempa (7): lib: Fix docs about return value of virDomainGetVcpusFlags() virsh-domain: Refactor cmdVcpucount and fix output on inactive domains qemu_agent: Add support for appending arrays to commands qemu_agent: Introduce helpers for agent based CPU hot(un)plug Introduce flag VIR_DOMAIN_VCPU agent, for agent based CPU unlpug(shutdown). qemu: Implement request of vCPU state using the guest agent qemu: Implement support for VIR_DOMAIN_VCPU in qemuDomainSetVcpusFlags include/libvirt/libvirt.h.in | 1 + src/libvirt.c | 9 +- src/qemu/qemu_agent.c | 141 +++++++++++++++++++++ src/qemu/qemu_agent.h | 12 ++ src/qemu/qemu_driver.c | 181 ++++++++++++++++++++++++--- tools/virsh-domain.c | 283 +++++++++++++++++++++---------------------- tools/virsh.pod | 13 +- 7 files changed, 474 insertions(+), 166 deletions(-) -- 1.8.1.5

2 15

[libvirt] [PATCH v4 00/11] Add support for guests with TPM passthrough device
by Stefan Berger 16 Apr '13

16 Apr '13

Hello! The following set of patches adds support to libvirt for adding a TPM passthrough device to a QEMU guest. Support for this was recently accepted into QEMU. This set of patches borrows a lot from the recently added support for rng's. Regards, Stefan --- v3->v4: - followed tree to ce65b435 - followed comments on v3 v2->v3: - followed tree to 03122d7b - some nits I found fixed v1->v2: - Followed Daniel Berrange's comments (except for the one on de-consolidating the JSON monitor code)

2 28

[libvirt] [PATCH 1/2] qemu: Support discard for disk
by Osier Yang 16 Apr '13

16 Apr '13

QEMU introduced "discard" option for drive since commit a9384aff53, <...> @var{discard} is one of "ignore" (or "off") or "unmap" (or "on") and controls whether @dfn{discard} (also known as @dfn{trim} or @dfn{unmap}) requests are ignored or passed to the filesystem. Some machine types may not support discard requests. </...> This patch exposes the support in libvirt. --- docs/formatdomain.html.in | 8 +++++ docs/schemas/domaincommon.rng | 11 +++++++ src/conf/domain_conf.c | 18 +++++++++++ src/conf/domain_conf.h | 10 ++++++ src/libvirt_private.syms | 1 + src/qemu/qemu_capabilities.c | 3 ++ src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 11 +++++++ .../qemuxml2argv-disk-discard.args | 8 +++++ .../qemuxml2argvdata/qemuxml2argv-disk-discard.xml | 36 ++++++++++++++++++++++ tests/qemuxml2argvtest.c | 3 ++ tests/qemuxml2xmltest.c | 2 ++ 12 files changed, 112 insertions(+) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-discard.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-discard.xml diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 0cc56d9..f1cee14 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -1676,6 +1676,14 @@ network. By default copy-on-read is off. <span class='since'>Since 0.9.10 (QEMU and KVM only)</span> </li> + <li> + The optional <code>discard</code> attribute controls whether + to discard (also known as "trim" or "unmap") requests are + ignored or passed to the filesystem. The value can be either + "on" (allow the discard request to be passed) or "off" (ingore + the discard request). + <span class='since'>Since 1.0.5 (QEMU and KVM only)</span> + </li> </ul> </dd> <dt><code>boot</code></dt> diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index 468c49c..4b71e16 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -1304,6 +1304,9 @@ <optional> <ref name="copy_on_read"/> </optional> + <optional> + <ref name="discard"/> + </optional> <empty/> </element> </define> @@ -1399,6 +1402,14 @@ <value>off</value> </choice> </attribute> + </define> + <define name="discard"> + <attribute name='discard'> + <choice> + <value>on</value> + <value>off</value> + </choice> + </attribute> </define> <define name="controller"> <element name="controller"> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 548368e..4925a80 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -728,6 +728,10 @@ VIR_ENUM_IMPL(virDomainTPMModel, VIR_DOMAIN_TPM_MODEL_LAST, VIR_ENUM_IMPL(virDomainTPMBackend, VIR_DOMAIN_TPM_TYPE_LAST, "passthrough") +VIR_ENUM_IMPL(virDomainDiskDiscard, VIR_DOMAIN_DISK_DISCARD_LAST, + "default", + "on", + "off") #define VIR_DOMAIN_XML_WRITE_FLAGS VIR_DOMAIN_XML_SECURE #define VIR_DOMAIN_XML_READ_FLAGS VIR_DOMAIN_XML_INACTIVE @@ -4324,6 +4328,7 @@ virDomainDiskDefParseXML(virDomainXMLOptionPtr xmlopt, char *wwn = NULL; char *vendor = NULL; char *product = NULL; + char *discard = NULL; int expected_secret_usage = -1; int auth_secret_usage = -1; @@ -4551,6 +4556,7 @@ virDomainDiskDefParseXML(virDomainXMLOptionPtr xmlopt, ioeventfd = virXMLPropString(cur, "ioeventfd"); event_idx = virXMLPropString(cur, "event_idx"); copy_on_read = virXMLPropString(cur, "copy_on_read"); + discard = virXMLPropString(cur, "discard"); } else if (!mirror && xmlStrEqual(cur->name, BAD_CAST "mirror") && !(flags & VIR_DOMAIN_XML_INACTIVE)) { char *ready; @@ -4997,6 +5003,14 @@ virDomainDiskDefParseXML(virDomainXMLOptionPtr xmlopt, def->copy_on_read = cor; } + if (discard) { + if ((def->discard = virDomainDiskDiscardTypeFromString(discard)) <= 0) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("unknown disk discard mode '%s'"), discard); + goto error; + } + } + if (devaddr) { if (virDomainParseLegacyDeviceAddress(devaddr, &def->info.addr.pci) < 0) { @@ -5116,6 +5130,7 @@ cleanup: VIR_FREE(ioeventfd); VIR_FREE(event_idx); VIR_FREE(copy_on_read); + VIR_FREE(discard); VIR_FREE(devaddr); VIR_FREE(serial); virStorageEncryptionFree(encryption); @@ -13291,6 +13306,7 @@ virDomainDiskDefFormat(virBufferPtr buf, const char *event_idx = virDomainVirtioEventIdxTypeToString(def->event_idx); const char *copy_on_read = virDomainVirtioEventIdxTypeToString(def->copy_on_read); const char *sgio = virDomainDiskSGIOTypeToString(def->sgio); + const char *discard = virDomainDiskDiscardTypeToString(def->discard); char uuidstr[VIR_UUID_STRING_BUFLEN]; @@ -13367,6 +13383,8 @@ virDomainDiskDefFormat(virBufferPtr buf, virBufferAsprintf(buf, " event_idx='%s'", event_idx); if (def->copy_on_read) virBufferAsprintf(buf, " copy_on_read='%s'", copy_on_read); + if (def->discard) + virBufferAsprintf(buf, " discard='%s'", discard); virBufferAddLit(buf, "/>\n"); } diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index f1f01fa..fdf5d93 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -600,6 +600,14 @@ enum virDomainDiskSGIO { VIR_DOMAIN_DISK_SGIO_LAST }; +enum virDomainDiskDiscard { + VIR_DOMAIN_DISK_DISCARD_DEFAULT = 0, + VIR_DOMAIN_DISK_DISCARD_ON, + VIR_DOMAIN_DISK_DISCARD_OFF, + + VIR_DOMAIN_DISK_DISCARD_LAST +}; + typedef struct _virDomainBlockIoTuneInfo virDomainBlockIoTuneInfo; struct _virDomainBlockIoTuneInfo { unsigned long long total_bytes_sec; @@ -682,6 +690,7 @@ struct _virDomainDiskDef { bool rawio_specified; int rawio; /* no = 0, yes = 1 */ int sgio; /* enum virDomainDiskSGIO */ + int discard; /* enum virDomainDiskDiscard */ size_t nseclabels; virSecurityDeviceLabelDefPtr *seclabels; @@ -2416,6 +2425,7 @@ VIR_ENUM_DECL(virDomainDiskIo) VIR_ENUM_DECL(virDomainDiskSecretType) VIR_ENUM_DECL(virDomainDiskSGIO) VIR_ENUM_DECL(virDomainDiskTray) +VIR_ENUM_DECL(virDomainDiskDiscard) VIR_ENUM_DECL(virDomainIoEventFd) VIR_ENUM_DECL(virDomainVirtioEventIdx) VIR_ENUM_DECL(virDomainDiskCopyOnRead) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 30fdcd7..a24bf5c 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -140,6 +140,7 @@ virDomainDiskDefFree; virDomainDiskDefGenSecurityLabelDef; virDomainDiskDefGetSecurityLabelDef; virDomainDiskDeviceTypeToString; +virDomainDiskDiscardTypeToString; virDomainDiskErrorPolicyTypeFromString; virDomainDiskErrorPolicyTypeToString; virDomainDiskFindByBusAndDst; diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index b174672..278012c 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -222,6 +222,7 @@ VIR_ENUM_IMPL(virQEMUCaps, QEMU_CAPS_LAST, "tpm-tis", "query-tpm-models", /* 140 */ + "drive-discard", ); struct _virQEMUCaps { @@ -963,6 +964,8 @@ virQEMUCapsComputeCmdFlags(const char *help, virQEMUCapsSet(qemuCaps, QEMU_CAPS_DRIVE_COPY_ON_READ); if (strstr(help, "bps=")) virQEMUCapsSet(qemuCaps, QEMU_CAPS_DRIVE_IOTUNE); + if (strstr(help, "discard")) + virQEMUCapsSet(qemuCaps, QEMU_CAPS_DRIVE_DISCARD); } if ((p = strstr(help, "-vga")) && !strstr(help, "-std-vga")) { const char *nl = strstr(p, "\n"); diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 7a0f191..17c5335 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -180,6 +180,7 @@ enum virQEMUCapsFlags { QEMU_CAPS_DEVICE_TPM_PASSTHROUGH = 138, /* -tpmdev passthrough */ QEMU_CAPS_DEVICE_TPM_TIS = 139, /* -device tpm_tis */ QEMU_CAPS_TPM_MODELS = 140, /* query-tpm-models QMP command */ + QEMU_CAPS_DRIVE_DISCARD = 141, /* -drive discard=off(ignore)|on(unmap) */ QEMU_CAPS_LAST, /* this must always be the last item */ }; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 63b9350..36f20eb 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -2987,6 +2987,17 @@ qemuBuildDriveStr(virConnectPtr conn ATTRIBUTE_UNUSED, } } + if (disk->discard) { + if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DRIVE_DISCARD)) { + virBufferAsprintf(&opt, ",discard=%s", + virDomainDiskDiscardTypeToString(disk->discard)); + } else { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("discard is not supported by this QEMU binary")); + goto error; + } + } + if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_MONITOR_JSON)) { const char *wpolicy = NULL, *rpolicy = NULL; diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-discard.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-discard.args new file mode 100644 index 0000000..02e2ddb --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-discard.args @@ -0,0 +1,8 @@ +LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test \ +/usr/bin/qemu -S -M pc-0.13 -m 1024 -smp 1 -nographic -nodefaults \ +-monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot dc -usb \ +-drive file=/var/lib/libvirt/images/f14.img,if=none,id=drive-virtio-disk0,discard=on \ +-device virtio-blk-pci,bus=pci.0,addr=0x4,drive=drive-virtio-disk0,id=virtio-disk0 \ +-drive file=/var/lib/libvirt/Fedora-14-x86_64-Live-KDE.iso,if=none,media=cdrom,id=drive-ide0-1-0,discard=off \ +-device ide-drive,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0 \ +-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-discard.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-discard.xml new file mode 100644 index 0000000..fa38a2d --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-discard.xml @@ -0,0 +1,36 @@ +<domain type='qemu'> + <name>test</name> + <uuid>92d7a226-cfae-425b-a6d3-00bbf9ec5c9e</uuid> + <memory unit='KiB'>1048576</memory> + <currentMemory unit='KiB'>1048576</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='x86_64' machine='pc-0.13'>hvm</type> + <boot dev='cdrom'/> + <boot dev='hd'/> + <bootmenu enable='yes'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>restart</on_crash> + <devices> + <emulator>/usr/bin/qemu</emulator> + <disk type='file' device='disk'> + <driver name='qemu' type='qcow2' discard='on'/> + <source file='/var/lib/libvirt/images/f14.img'/> + <target dev='vda' bus='virtio'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/> + </disk> + <disk type='file' device='cdrom'> + <driver name='qemu' type='raw' discard='off'/> + <source file='/var/lib/libvirt/Fedora-14-x86_64-Live-KDE.iso'/> + <target dev='hdc' bus='ide'/> + <readonly/> + <address type='drive' controller='0' bus='1' target='0' unit='0'/> + </disk> + <controller type='usb' index='0'/> + <controller type='ide' index='0'/> + <memballoon model='virtio'/> + </devices> +</domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index be6c759..e09e070 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -575,6 +575,9 @@ mymain(void) QEMU_CAPS_DRIVE, QEMU_CAPS_DRIVE_COPY_ON_READ, QEMU_CAPS_VIRTIO_TX_ALG, QEMU_CAPS_DEVICE, QEMU_CAPS_VIRTIO_BLK_SCSI, QEMU_CAPS_VIRTIO_BLK_SG_IO); + DO_TEST("disk-discard", + QEMU_CAPS_DRIVE, QEMU_CAPS_DRIVE_DISCARD, + QEMU_CAPS_DEVICE); DO_TEST("disk-snapshot", QEMU_CAPS_DRIVE, QEMU_CAPS_DRIVE_CACHE_V2, QEMU_CAPS_DRIVE_FORMAT); DO_TEST("event_idx", diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index 3a1683f..7f32661 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -255,6 +255,8 @@ mymain(void) DO_TEST("disk-scsi-disk-vpd"); DO_TEST("disk-source-pool"); + DO_TEST("disk-discard"); + DO_TEST("virtio-rng-random"); DO_TEST("virtio-rng-egd"); -- 1.8.1.4

1 1

[libvirt] [Concern] Whether some clock element stability need to be check before migration?
by Xuesong Zhang 16 Apr '13

16 Apr '13

hi, This is xuesong from libvirt-QE, which is the feature owner of stable guest ABI in rhel7. I met one issue, but didn't know whether it is one bug or not, since in Guest ABI , some aspects belong to "a host-side configuration parameter". So, would you please kindly help to check it? Thanks. Description While check the guest clock ABI stability, some scenario fails. version kernel-3.8.0-0.43.el7.x86_64 qemu-kvm-1.3.0-6.el7.x86_64 libvirt-1.0.3-1.el7.x86_64 reproduced 100% Steps 1. prepare migration env on two hosts. 2. prepare one guest with the parallel. ...... <clock offset='localtime'> <timer name='rtc' tickpolicy='catchup' track='guest'> <catchup threshold='123' slew='120' limit='10000'/> </timer> <timer name='pit' tickpolicy='delay'/> </clock> .... 3. start and dumpxml this gust # virsh start mig Domain mig started # virsh dumpxml mig > mig.xml 4. Change "localtime" to "utc" in the generated xml "mig.xml". ...... <clock offset='utc'> <timer name='rtc' tickpolicy='catchup' track='guest'> <catchup threshold='123' slew='120' limit='10000'/> </timer> <timer name='pit' tickpolicy='delay'/> </clock> .... 5. migration with the modified xml is successfully.------------------it is issue, should prompt error message. # virsh migrate --live --xml mig.xml mig qemu+ssh://{$target host IP}/system 6. run step3 again, then change timer name "pit" to "platform". Note, maker sure only one change point in the xml. then migration with the modified xml. ----------------this result is as expect # virsh migrate mig --live --xml mig.xml qemu+ssh://10.66.83.38/system error: unsupported configuration: Target timer platform does not match source pit 7. run step3 again, then delete timer name "pit". Note, maker sure only one change point in the xml. then migration with the modified xml.-----------------the result is as expect #virsh migrate mig --live --xml mig.xml qemu+ssh://10.66.83.38/system error: unsupported configuration: Target domain timers do not match source 8. run step3 again, then change timer track from "guest" to "wall". Note, maker sure only one change point in the xml. then migration with the modified xml. The migration is succssful.------------------------------------------------------------------------------------------------------------------it is issue, should prompt error message. # virsh migrate --live --xml mig.xml mig qemu+ssh://{$target host IP}/system 9. run step3 again, then change timer tickpolicy from "catchup" to "delay". Note, maker sure only one change point in the xml. then migration with the modified xml. The migration is succssful.------------------------------------------------------------------------------------------------------------------it is issue, should prompt error message. # virsh migrate --live --xml mig.xml mig qemu+ssh://{$target host IP}/system Actual result The result in step 6 and 7 is as expected, the result of step 5, 8 and 9 is wrong. Expect result The clock element stability in step 5, 8 and 9 need to be check before migration. Addtional info: Below is all checks about clock in upstream 1.0.4 maint branch: In timer check Function virDomainTimerDefCheckABIStability only check 1.NAME :src->name != dst->name 2.PRESENT :src->present != dst->present) 3.FREQUENCY :src->name == VIR_DOMAIN_TIMER_NAME_TSC) { if (src->frequency != dst->frequency) } 4.MODE src->mode != dst->mode And in another function , check timer's numbers 5.NUMBERS : src->clock.ntimers != dst->clock.ntimers Best Regards, Zhang Xuesong IRC: xuzhang internal phone: 88393

1 0

[libvirt] [PATCH 0/2] Check domain status before virsh suspend or resume
by John Ferlan 15 Apr '13

15 Apr '13

https://bugzilla.redhat.com/show_bug.cgi?id=906644 Added checks to both virsh suspend and virsh resume for the domain to be in a the right state before trying the suspend/resume. Similar checks to examples/domsuspend/suspend.c. Although not stated in case, any thoughts on adding a --force for both? John Ferlan (2): virsh: Add check for domain state before attempting resume virsh: Add check for domain state before attempting suspend tools/virsh-domain.c | 40 +++++++++++++++++++++++++++++++--------- 1 file changed, 31 insertions(+), 9 deletions(-) -- 1.8.1.4

3 5

[libvirt] [PATCH] Add missing param to virCgroupForDriver stub
by Daniel P. Berrange 15 Apr '13

15 Apr '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> The virCgroupForDriver method recently gained an 'int controllers' parameter, but the stub impl did not Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> Pushed as a Win32 build breaker fix --- src/util/vircgroup.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c index dc2b431..56d56f9 100644 --- a/src/util/vircgroup.c +++ b/src/util/vircgroup.c @@ -984,7 +984,8 @@ out: int virCgroupForDriver(const char *name ATTRIBUTE_UNUSED, virCgroupPtr *group ATTRIBUTE_UNUSED, bool privileged ATTRIBUTE_UNUSED, - bool create ATTRIBUTE_UNUSED) + bool create ATTRIBUTE_UNUSED, + int controllers ATTRIBUTE_UNUSED) { /* Claim no support */ return -ENXIO; -- 1.8.1.4

1 0

[libvirt] [PATCH] Conditionally compile storagevolxml2argvtest
by Daniel P. Berrange 15 Apr '13

15 Apr '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> Only compile storagevolxml2argvtest if WITH_STORAGE is set, because it links to that driver Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> Pushed as a Win32 build breaker fix --- tests/Makefile.am | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tests/Makefile.am b/tests/Makefile.am index 888968d..7689453 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -174,7 +174,9 @@ endif test_programs += nwfilterxml2xmltest +if WITH_STORAGE test_programs += storagevolxml2argvtest +endif test_programs += storagevolxml2xmltest storagepoolxml2xmltest @@ -472,11 +474,15 @@ nwfilterxml2xmltest_SOURCES = \ testutils.c testutils.h nwfilterxml2xmltest_LDADD = $(LDADDS) +if WITH_STORAGE storagevolxml2argvtest_SOURCES = \ storagevolxml2argvtest.c \ testutils.c testutils.h storagevolxml2argvtest_LDADD = \ ../src/libvirt_driver_storage_impl.la $(LDADDS) +else +EXTRA_DIST += storagevolxml2argvtest.c +endif storagevolxml2xmltest_SOURCES = \ storagevolxml2xmltest.c \ -- 1.8.1.4

1 0

[libvirt] [PATCH] Conditionalize use of symlink() function in test suite
by Daniel P. Berrange 15 Apr '13

15 Apr '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> On Win32 symlink() is not available, so virstoragetest.c must be conditionalized to avoid compile failures. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> Pushed as a win32 build breaker fix --- configure.ac | 2 +- tests/virstoragetest.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 11b332f..789d1c9 100644 --- a/configure.ac +++ b/configure.ac @@ -194,7 +194,7 @@ dnl Availability of various common functions (non-fatal if missing), dnl and various less common threadsafe functions AC_CHECK_FUNCS_ONCE([cfmakeraw geteuid getgid getgrnam_r getmntent_r \ getpwuid_r getuid initgroups kill mmap newlocale posix_fallocate \ - posix_memalign regexec sched_getaffinity setns]) + posix_memalign regexec sched_getaffinity setns symlink]) dnl Availability of pthread functions (if missing, win32 threading is dnl assumed). Because of $LIB_PTHREAD, we cannot use AC_CHECK_FUNCS_ONCE. diff --git a/tests/virstoragetest.c b/tests/virstoragetest.c index d495e6a..0e6ba9e 100644 --- a/tests/virstoragetest.c +++ b/tests/virstoragetest.c @@ -161,12 +161,14 @@ testPrepImages(void) if (virCommandRun(cmd, NULL) < 0) goto skip; +#ifdef HAVE_SYMLINK /* Create some symlinks in a sub-directory. */ if (symlink("../qcow2", datadir "/sub/link1") < 0 || symlink("../wrap", datadir "/sub/link2") < 0) { fprintf(stderr, "unable to create symlink"); goto cleanup; } +#endif ret = 0; cleanup: @@ -364,6 +366,7 @@ mymain(void) canonraw, absraw, datadir, VIR_STORAGE_FILE_RAW, true, 1024, false, }; +#if HAVE_SYMLINK const testFileData link1_rel = { canonraw, "../raw", "sub/../sub/..", VIR_STORAGE_FILE_RAW, true, 1024, false, @@ -380,6 +383,7 @@ mymain(void) canonqcow2, "../sub/link1", datadir "/sub/../sub", VIR_STORAGE_FILE_QCOW2, true, 1024, false, }; +#endif /* The actual tests, in several groups. */ @@ -522,6 +526,7 @@ mymain(void) chain12a, EXP_PASS, chain12b, ALLOW_PROBE | EXP_PASS); +#ifdef HAVE_SYMLINK /* Rewrite qcow2 and wrap file to use backing names relative to a * symlink from a different directory */ virCommandFree(cmd); @@ -545,6 +550,7 @@ mymain(void) chain13a, ALLOW_PROBE | EXP_PASS, chain13c, EXP_PASS, chain13c, ALLOW_PROBE | EXP_PASS); +#endif /* Final cleanup */ testCleanupImages(); -- 1.8.1.4

1 0

[libvirt] [PATCH] Fix signature of dummy virNetlinkCommand stub
by Daniel P. Berrange 15 Apr '13

15 Apr '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> The second param of virNetlinkCommand should be struct nlmsghdr, not unsigned char. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> Pushed as a Win32 build breaker fix --- src/util/virnetlink.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/util/virnetlink.c b/src/util/virnetlink.c index af1985c..d340eda 100644 --- a/src/util/virnetlink.c +++ b/src/util/virnetlink.c @@ -752,7 +752,7 @@ virNetlinkShutdown(void) } int virNetlinkCommand(struct nl_msg *nl_msg ATTRIBUTE_UNUSED, - unsigned char **respbuf ATTRIBUTE_UNUSED, + struct nlmsghdr **resp ATTRIBUTE_UNUSED, unsigned int *respbuflen ATTRIBUTE_UNUSED, uint32_t src_pid ATTRIBUTE_UNUSED, uint32_t dst_pid ATTRIBUTE_UNUSED, -- 1.8.1.4

1 0

[libvirt] [PATCH] Add empty stub for virThreadCancel on Win32
by Daniel P. Berrange 15 Apr '13

15 Apr '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> Win32 does not like undefined symbols, so define an empty virThreadCancel impl. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> Pushed as a Win32 build breaker fix --- src/util/virthreadwin32.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/util/virthreadwin32.c b/src/util/virthreadwin32.c index 0ad7e5c..4543ad8 100644 --- a/src/util/virthreadwin32.c +++ b/src/util/virthreadwin32.c @@ -357,6 +357,8 @@ void virThreadJoin(virThreadPtr thread) } } +void virThreadCancel(virThreadPtr thread ATTRIBUTE_UNUSED) +{} int virThreadLocalInit(virThreadLocalPtr l, virThreadLocalCleanup c) -- 1.8.1.4

1 0

[libvirt] [PATCH] Don't enable -fPIE on Win32 platforms
by Daniel P. Berrange 15 Apr '13

15 Apr '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> On win32, all code is position independent and adding -fPIE to the compiler flags results in warnings being printed Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> Pushed as a Win32 build breaker fix --- m4/virt-compile-pie.m4 | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/m4/virt-compile-pie.m4 b/m4/virt-compile-pie.m4 index 1b62041..cceb495 100644 --- a/m4/virt-compile-pie.m4 +++ b/m4/virt-compile-pie.m4 @@ -21,10 +21,15 @@ dnl AC_DEFUN([LIBVIRT_COMPILE_PIE],[ PIE_CFLAGS= PIE_LDFLAGS= - gl_COMPILER_OPTION_IF([-fPIE -DPIE], [ + case "$host" in + *-*-mingw* | *-*-msvc* | *-*-cygwin* ) + ;; dnl All code is position independent on Win32 target + *) + gl_COMPILER_OPTION_IF([-fPIE -DPIE], [ PIE_CFLAGS="-fPIE -DPIE" PIE_LDFLAGS="-pie" - ]) + ]) + esac AC_SUBST([PIE_CFLAGS]) AC_SUBST([PIE_LDFLAGS]) ]) -- 1.8.1.4

1 0

[libvirt] [PATCH v3 00/16]
by Daniel P. Berrange 15 Apr '13

15 Apr '13

This is an update of https://www.redhat.com/archives/libvir-list/2013-April/msg00352.html Currently libvirt creates a cgroups hiearchy at $LOCATION-OF-LIBVIRTD/libvirt/{qemu,lxc}/$GUEST-NAME eg /sys/fs/cgroup ├── blkio │ └── libvirt │ ├── lxc │ │ └── busy │ └── qemu │ └── vm1 ├── cpu,cpuacct │ ├── libvirt │ │ ├── lxc │ │ │ └── busy │ │ └── qemu │ │ └── vm1 │ │ ├── emulator │ │ └── vcpu0 │ └── system │ ├── abrtd.service │ ....snip.... │ └── upower.service ├── cpuset │ └── libvirt │ ├── lxc │ │ └── busy │ └── qemu │ └── vm1 │ ├── emulator │ └── vcpu0 ├── devices │ └── libvirt │ ├── lxc │ │ └── busy │ └── qemu │ └── vm1 ├── freezer │ └── libvirt │ ├── lxc │ │ └── busy │ └── qemu │ └── vm1 ├── memory │ └── libvirt │ ├── lxc │ │ └── busy │ └── qemu │ └── vm1 ├── net_cls ├── perf_event This series changes it so that libvirt creates cgroups at /system/$VMNAME.{qemu,lxc}.libvirt and allows configuration of the "resource partition" (ie the "/system" bit) via the XML. So we get a layout like this: /sys/fs/cgroup ├── blkio │ └── system │ ├── demo.lxc.libvirt │ └── vm1.qemu.libvirt ├── cpu,cpuacct │ └── system │ ├── abrtd.service │ ....snip.... │ ├── demo.lxc.libvirt │ ....snip.... │ └── vm1.qemu.libvirt │ ├── emulator │ └── vcpu0 ├── cpuset │ └── system │ ├── demo.lxc.libvirt │ └── vm1.qemu.libvirt │ ├── emulator │ └── vcpu0 ├── devices │ └── system │ ├── demo.lxc.libvirt │ └── vm1.qemu.libvirt ├── freezer │ └── system │ ├── demo.lxc.libvirt │ └── vm1.qemu.libvirt ├── memory │ └── system │ ├── demo.lxc.libvirt │ └── vm1.qemu.libvirt ├── net_cls ├── perf_event Flattening out the libvirt created hiearchy has serious performance wins, due to poor kernel scalability with deep hierarchies. It also makes it easier to configure system wide policy for resource usage across system services and virtual machines / containers, since they all live at the top level in comon resource partitions. Changes since v2: - Merge previously ACKed patches - Incorporate Gao Feng's changes to LXC cgroup mount setup

4 43

[libvirt] [PATCH] maint: update to latest gnulib
by Eric Blake 15 Apr '13

15 Apr '13

Upstream gnulib determined that we were needlessly compiling in gnulib's regex instead of glibc's when targetting new-enough glibc, because the m4 test was being too strict in requiring a particular answer to undefined behavior. https://lists.gnu.org/archive/html/bug-gnulib/2013-04/msg00032.html * .gnulib: Update to latest, for regex. --- I verified that on F18, the final size of libvirtd shrinks after applying this patch, because of this change to config.cache: -gl_cv_func_re_compile_pattern_working=${gl_cv_func_re_compile_pattern_working=no} +gl_cv_func_re_compile_pattern_working=${gl_cv_func_re_compile_pattern_working=yes} Pushing under the agreement that gnulib fixes outside of freeze are generally trivial. * .gnulib 076ac82...92f3a4c (1): > regex-tests, regex: allow glibc re_search behavior .gnulib | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gnulib b/.gnulib index 076ac82..92f3a4c 160000 --- a/.gnulib +++ b/.gnulib @@ -1 +1 @@ -Subproject commit 076ac82d1d7f4df54630f1b4917b3c14f227f032 +Subproject commit 92f3a4c8e52e64c233e260431d095dbf88554c14 -- 1.8.1.4

1 0

[libvirt] [PATCH] Use unsigned int instead of unsigned
by Osier Yang 15 Apr '13

15 Apr '13

Though they are the same thing, mixed use of them is uncomfortable. "unsigned" is used a lot in old codes, this just tries to change the ones in utils. --- src/util/virpci.c | 65 +++++++++++++++++++++++++++++-------------------------- src/util/virpci.h | 24 ++++++++++---------- 2 files changed, 46 insertions(+), 43 deletions(-) diff --git a/src/util/virpci.c b/src/util/virpci.c index caf1d40..d94ff54 100644 --- a/src/util/virpci.c +++ b/src/util/virpci.c @@ -51,18 +51,18 @@ #define SRIOV_ERROR -1 struct _virPCIDevice { - unsigned domain; - unsigned bus; - unsigned slot; - unsigned function; + unsigned int domain; + unsigned int bus; + unsigned int slot; + unsigned int function; char name[PCI_ADDR_LEN]; /* domain:bus:slot.function */ char id[PCI_ID_LEN]; /* product vendor */ char *path; const char *used_by; /* The domain which uses the device */ - unsigned pcie_cap_pos; - unsigned pci_pm_cap_pos; + unsigned int pcie_cap_pos; + unsigned int pci_pm_cap_pos; bool has_flr; bool has_pm_reset; bool managed; @@ -76,7 +76,7 @@ struct _virPCIDevice { struct _virPCIDeviceList { virObjectLockable parent; - unsigned count; + unsigned int count; virPCIDevicePtr *devs; }; @@ -222,9 +222,9 @@ virPCIDeviceConfigClose(virPCIDevicePtr dev, int cfgfd) static int virPCIDeviceRead(virPCIDevicePtr dev, int cfgfd, - unsigned pos, + unsigned int pos, uint8_t *buf, - unsigned buflen) + unsigned int buflen) { memset(buf, 0, buflen); @@ -239,7 +239,7 @@ virPCIDeviceRead(virPCIDevicePtr dev, } static uint8_t -virPCIDeviceRead8(virPCIDevicePtr dev, int cfgfd, unsigned pos) +virPCIDeviceRead8(virPCIDevicePtr dev, int cfgfd, unsigned int pos) { uint8_t buf; virPCIDeviceRead(dev, cfgfd, pos, &buf, sizeof(buf)); @@ -247,7 +247,7 @@ virPCIDeviceRead8(virPCIDevicePtr dev, int cfgfd, unsigned pos) } static uint16_t -virPCIDeviceRead16(virPCIDevicePtr dev, int cfgfd, unsigned pos) +virPCIDeviceRead16(virPCIDevicePtr dev, int cfgfd, unsigned int pos) { uint8_t buf[2]; virPCIDeviceRead(dev, cfgfd, pos, &buf[0], sizeof(buf)); @@ -255,7 +255,7 @@ virPCIDeviceRead16(virPCIDevicePtr dev, int cfgfd, unsigned pos) } static uint32_t -virPCIDeviceRead32(virPCIDevicePtr dev, int cfgfd, unsigned pos) +virPCIDeviceRead32(virPCIDevicePtr dev, int cfgfd, unsigned int pos) { uint8_t buf[4]; virPCIDeviceRead(dev, cfgfd, pos, &buf[0], sizeof(buf)); @@ -265,9 +265,9 @@ virPCIDeviceRead32(virPCIDevicePtr dev, int cfgfd, unsigned pos) static int virPCIDeviceWrite(virPCIDevicePtr dev, int cfgfd, - unsigned pos, + unsigned int pos, uint8_t *buf, - unsigned buflen) + unsigned int buflen) { if (lseek(cfgfd, pos, SEEK_SET) != pos || safewrite(cfgfd, buf, buflen) != buflen) { @@ -280,14 +280,14 @@ virPCIDeviceWrite(virPCIDevicePtr dev, } static void -virPCIDeviceWrite16(virPCIDevicePtr dev, int cfgfd, unsigned pos, uint16_t val) +virPCIDeviceWrite16(virPCIDevicePtr dev, int cfgfd, unsigned int pos, uint16_t val) { uint8_t buf[2] = { (val >> 0), (val >> 8) }; virPCIDeviceWrite(dev, cfgfd, pos, &buf[0], sizeof(buf)); } static void -virPCIDeviceWrite32(virPCIDevicePtr dev, int cfgfd, unsigned pos, uint32_t val) +virPCIDeviceWrite32(virPCIDevicePtr dev, int cfgfd, unsigned int pos, uint32_t val) { uint8_t buf[4] = { (val >> 0), (val >> 8), (val >> 16), (val >> 24) }; virPCIDeviceWrite(dev, cfgfd, pos, &buf[0], sizeof(buf)); @@ -370,7 +370,9 @@ virPCIDeviceIterDevices(virPCIDeviceIterPredicate predicate, } static uint8_t -virPCIDeviceFindCapabilityOffset(virPCIDevicePtr dev, int cfgfd, unsigned capability) +virPCIDeviceFindCapabilityOffset(virPCIDevicePtr dev, + int cfgfd, + unsigned int capability) { uint16_t status; uint8_t pos; @@ -407,7 +409,7 @@ virPCIDeviceFindCapabilityOffset(virPCIDevicePtr dev, int cfgfd, unsigned capabi static unsigned int virPCIDeviceFindExtendedCapabilityOffset(virPCIDevicePtr dev, int cfgfd, - unsigned capability) + unsigned int capability) { int ttl; unsigned int pos; @@ -496,7 +498,7 @@ virPCIDeviceDetectFunctionLevelReset(virPCIDevicePtr dev, int cfgfd) * and that a D3hot->D0 transition will results in a full * internal reset, not just a soft reset. */ -static unsigned +static unsigned int virPCIDeviceDetectPowerManagementReset(virPCIDevicePtr dev, int cfgfd) { if (dev->pci_pm_cap_pos) { @@ -1341,10 +1343,10 @@ virPCIDeviceReadID(virPCIDevicePtr dev, const char *id_name) } int -virPCIGetAddrString(unsigned domain, - unsigned bus, - unsigned slot, - unsigned function, +virPCIGetAddrString(unsigned int domain, + unsigned int bus, + unsigned int slot, + unsigned int function, char **pciConfigAddr) { virPCIDevicePtr dev = NULL; @@ -1365,10 +1367,10 @@ cleanup: } virPCIDevicePtr -virPCIDeviceNew(unsigned domain, - unsigned bus, - unsigned slot, - unsigned function) +virPCIDeviceNew(unsigned int domain, + unsigned int bus, + unsigned int slot, + unsigned int function) { virPCIDevicePtr dev; char *vendor = NULL; @@ -1458,12 +1460,13 @@ void virPCIDeviceSetManaged(virPCIDevicePtr dev, bool managed) dev->managed = managed; } -unsigned virPCIDeviceGetManaged(virPCIDevicePtr dev) +unsigned int +virPCIDeviceGetManaged(virPCIDevicePtr dev) { return dev->managed; } -unsigned +unsigned int virPCIDeviceGetUnbindFromStub(virPCIDevicePtr dev) { return dev->unbind_from_stub; @@ -1475,7 +1478,7 @@ virPCIDeviceSetUnbindFromStub(virPCIDevicePtr dev, bool unbind) dev->unbind_from_stub = unbind; } -unsigned +unsigned int virPCIDeviceGetRemoveSlot(virPCIDevicePtr dev) { return dev->remove_slot; @@ -1487,7 +1490,7 @@ virPCIDeviceSetRemoveSlot(virPCIDevicePtr dev, bool remove_slot) dev->remove_slot = remove_slot; } -unsigned +unsigned int virPCIDeviceGetReprobe(virPCIDevicePtr dev) { return dev->reprobe; diff --git a/src/util/virpci.h b/src/util/virpci.h index 0c4a8d2..67bee3d 100644 --- a/src/util/virpci.h +++ b/src/util/virpci.h @@ -41,10 +41,10 @@ struct _virPCIDeviceAddress { unsigned int function; }; -virPCIDevicePtr virPCIDeviceNew(unsigned domain, - unsigned bus, - unsigned slot, - unsigned function); +virPCIDevicePtr virPCIDeviceNew(unsigned int domain, + unsigned int bus, + unsigned int slot, + unsigned int function); void virPCIDeviceFree(virPCIDevicePtr dev); const char *virPCIDeviceGetName(virPCIDevicePtr dev); @@ -62,17 +62,17 @@ int virPCIDeviceReset(virPCIDevicePtr dev, void virPCIDeviceSetManaged(virPCIDevice *dev, bool managed); -unsigned virPCIDeviceGetManaged(virPCIDevice *dev); +unsigned int virPCIDeviceGetManaged(virPCIDevice *dev); void virPCIDeviceSetUsedBy(virPCIDevice *dev, const char *used_by); const char *virPCIDeviceGetUsedBy(virPCIDevice *dev); -unsigned virPCIDeviceGetUnbindFromStub(virPCIDevicePtr dev); +unsigned int virPCIDeviceGetUnbindFromStub(virPCIDevicePtr dev); void virPCIDeviceSetUnbindFromStub(virPCIDevice *dev, bool unbind); -unsigned virPCIDeviceGetRemoveSlot(virPCIDevicePtr dev); +unsigned int virPCIDeviceGetRemoveSlot(virPCIDevicePtr dev); void virPCIDeviceSetRemoveSlot(virPCIDevice *dev, bool remove_slot); -unsigned virPCIDeviceGetReprobe(virPCIDevicePtr dev); +unsigned int virPCIDeviceGetReprobe(virPCIDevicePtr dev); void virPCIDeviceSetReprobe(virPCIDevice *dev, bool reprobe); void virPCIDeviceReattachInit(virPCIDevice *dev); @@ -135,10 +135,10 @@ int virPCIGetSysfsFile(char *virPCIDeviceName, char **pci_sysfs_device_link) ATTRIBUTE_RETURN_CHECK; -int virPCIGetAddrString(unsigned domain, - unsigned bus, - unsigned slot, - unsigned function, +int virPCIGetAddrString(unsigned int domain, + unsigned int bus, + unsigned int slot, + unsigned int function, char **pciConfigAddr) ATTRIBUTE_NONNULL(5) ATTRIBUTE_RETURN_CHECK; -- 1.8.1.4

2 3

[libvirt] [PATCH] Do more complete initialization of libgcrypt
by Daniel P. Berrange 15 Apr '13

15 Apr '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> If libvirt makes any gcry_control() calls, then this prevents gnutls for doing any initialization. As such we must take care to do full initialization of libcrypt on a par with what gnutls would have done. In particular we must disable "sec mem" for cases where the user does not have mlock() permission. We also skip our init of libgcrypt if something else (ie the app using libvirt) has beaten us to it. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- src/libvirt.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/libvirt.c b/src/libvirt.c index c5221f5..7c0a873 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -409,8 +409,14 @@ virGlobalInit(void) goto error; #ifdef WITH_GNUTLS - gcry_control(GCRYCTL_SET_THREAD_CBS, &virTLSThreadImpl); - gcry_check_version(NULL); + if (gcry_control(GCRYCTL_ANY_INITIALIZATION_P) == 0) { + gcry_control(GCRYCTL_SET_THREAD_CBS, &virTLSThreadImpl); + gcry_check_version(NULL); + + gcry_control(GCRYCTL_DISABLE_SECMEM, NULL, 0); + gcry_control(GCRYCTL_INITIALIZATION_FINISHED, NULL, 0); + gcry_control(GCRYCTL_ENABLE_QUICK_RANDOM, 0); + } #endif virLogSetFromEnv(); -- 1.8.1.4

3 5

[libvirt] [PATCH 0/1] qemu: Add Secure Shell (ssh) network block device.
by Richard W.M. Jones 15 Apr '13

15 Apr '13

This patch allows you to use the qemu Secure Shell (ssh) block device. This is not upstream yet, but you can find my latest version here: http://lists.nongnu.org/archive/html/qemu-devel/2013-04/threads.html#01703 This patch lets you specify a ssh device like this: <disk type='network' device='disk'> <source protocol='ssh' name='/remote/path/to/disk/image'> <host name='remote-server.example.com'/> </source> <driver name='qemu' type='raw'/> <target dev='vda' bus='virtio'/> </disk> Patched qemu will connect to remote-server.example.com using libssh2, and access /remote/path/to/disk/image using the sftp protocol. This works for both read and write. Of course, since you'll have to use a patched qemu, you will also need to fiddle with the <emulator> setting. One current problem with this patch is that you have to manually set the SSH_AUTH_SOCK environment variable to point at your ssh-agent (since qemu's ssh block device requires ssh-agent authentication). I added the following to my XML, your value will be different: <qemu:commandline> <qemu:env name="SSH_AUTH_SOCK" value="/tmp/ssh-DThteVfEeOq3/agent.1773" /> </qemu:commandline> Some shortcomings: - Does not allow you to specify the host_key_check parameter. - No tests. - Not sure how best to deal with the ssh-agent authentication socket problem. Use libvirt secrets? If so, how? - I did not test if you can specify an alternate remote user. - I did not test (or care) if parsing qemu command lines works. Rich.

2 7

[libvirt] [PATCH 0/2] Domain object lookup improvements
by Peter Krempa 15 Apr '13

15 Apr '13

This series finishes refactoring of domain object retrieval in the qemu driver and improves error message if the domain object can't be found. This is a prequel for changing of the locking model of virDomain objects. Peter Krempa (2): qemu: Refactor lookup of domain object qemu: Report also domain name in error message when domain object wasn't found src/qemu/qemu_driver.c | 343 +++++++++++-------------------------------------- 1 file changed, 75 insertions(+), 268 deletions(-) -- 1.8.1.5

2 5

[libvirt] [PATCH v4 1/2] Add USB option capability
by Li Zhang 15 Apr '13

15 Apr '13

From: Li Zhang <zhlcindy(a)linux.vnet.ibm.com> To avoid the collision for creating USB controllers in machine->init() and -device xx command line, it needs to set usb=off to avoid one USB controller created in machine->init(). So that libvirt can use -device or -usb to create USB controller sucessfully. So QEMU_CAPS_MACHINE_USB_OPT capability is added, and it is for QEMU v1.3.0 onwards which supports USB option. Signed-off-by: Li Zhang <zhlcindy(a)linux.vnet.ibm.com> --- v4 -> v3: * Add one new test case for USB option * Rebase it with latest version v3 -> v2: * Set QEMU_CAPS_MACHINE_USB_OPT with help string v2 -> v1: * Rename QEMU_CAPS_USB_OPT to QEMU_CAPS_MACHINE_USB_OPT suggested by Daniel * Corret QEMU version with v1.3.0 suggested by Daniel src/qemu/qemu_capabilities.c | 9 +++++++++ src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 6 ++++++ 3 files changed, 16 insertions(+) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 50712b0..07cda1f 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -216,6 +216,7 @@ VIR_ENUM_IMPL(virQEMUCaps, QEMU_CAPS_LAST, "ipv6-migration", /* 135 */ "machine-opt", + "machine-usb-opt", ); struct _virQEMUCaps { @@ -1078,6 +1079,10 @@ virQEMUCapsComputeCmdFlags(const char *help, if (strstr(help, "-machine")) virQEMUCapsSet(qemuCaps, QEMU_CAPS_MACHINE_OPT); + /* USB option is supported v1.3.0 onwards */ + if (qemuCaps->version >= 1003000) + virQEMUCapsSet(qemuCaps, QEMU_CAPS_MACHINE_USB_OPT); + /* * Handling of -incoming arg with varying features * -incoming tcp (kvm >= 79, qemu >= 0.10.0) @@ -2435,6 +2440,10 @@ virQEMUCapsInitQMP(virQEMUCapsPtr qemuCaps, virQEMUCapsInitQMPBasic(qemuCaps); + /* USB option is supported v1.3.0 onwards */ + if (qemuCaps->version >= 1003000) + virQEMUCapsSet(qemuCaps, QEMU_CAPS_MACHINE_USB_OPT); + if (!(archstr = qemuMonitorGetTargetArch(mon))) goto cleanup; diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index b2dc588..9f24d6a 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -176,6 +176,7 @@ enum virQEMUCapsFlags { QEMU_CAPS_SCSI_MEGASAS = 134, /* -device megasas */ QEMU_CAPS_IPV6_MIGRATION = 135, /* -incoming [::] */ QEMU_CAPS_MACHINE_OPT = 136, /* -machine xxxx*/ + QEMU_CAPS_MACHINE_USB_OPT = 137, /* -machine xxx,usb=on/off */ QEMU_CAPS_LAST, /* this must always be the last item */ }; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 53caba5..d051056 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -5234,6 +5234,12 @@ qemuBuildMachineArgStr(virCommandPtr cmd, virCommandAddArg(cmd, "-machine"); virBufferAdd(&buf, def->os.machine, -1); + /* To avoid the collision of creating USB controllers when calling + * machine->init in QEMU, it needs to set usb=off + */ + if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_MACHINE_USB_OPT)) + virBufferAsprintf(&buf, ",usb=off"); + if (def->mem.dump_core) { if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_DUMP_GUEST_CORE)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", -- 1.8.1.4

2 9

[libvirt] [PATCH 0/4] cleanup: Use bool type instead of bitfield - More
by Osier Yang 13 Apr '13

13 Apr '13

Which are missed with pattern ": 1" in the previous cleanup series. After these, all the bitfield use under src/conf/ are destroyed, except the ones which are required by the existing APIs. Osier Yang (4): cleanup: Change datatype of accel's members to boolean cleanup: Change datatype of graphic's members to boolean cleanup: Change datatype of usbdev->allow to boolean cleanup: Change datatype of net->stp to boolean src/conf/domain_conf.c | 44 ++++++++++++++++++++-------------------- src/conf/domain_conf.h | 20 +++++++++--------- src/conf/network_conf.c | 2 +- src/conf/network_conf.h | 2 +- src/parallels/parallels_driver.c | 4 ++-- src/qemu/qemu_command.c | 6 +++--- src/vbox/vbox_tmpl.c | 6 +++--- src/vmx/vmx.c | 4 ++-- src/xenxs/xen_sxpr.c | 4 ++-- src/xenxs/xen_xm.c | 2 +- 10 files changed, 47 insertions(+), 47 deletions(-) -- 1.8.1.4

3 9

[libvirt] [RFC] Fix https://bugzilla.redhat.com/show_bug.cgi?id=461931
by harryxiyou 13 Apr '13

13 Apr '13

Hi Osier, >From the actual bug messages like fowllowing Actual results: Traceback (most recent call last): File "/usr/share/virt-manager/virtManager/createvol.py", line 191, in _async_vol_create poolobj = self.vol.install(meter=meter) File "/usr/lib/python2.5/site-packages/virtinst/Storage.py", line 893, in install (self.name, str(e))) RuntimeError: Couldn't create storage volume 'virt-stor-dir-bochs.img': '/usr/bin/qemu-img exited with non-zero status 1 and signal 0' It seems that libvirt calls command 'qemu-img' to create a volume of bochs but it failed. So the problem may no matter with Libvirt itself. I am not sure if qemu supports to create a volume of bochs. Or something wrong with QEMU? -- Thanks Harry Wei

2 3

[libvirt] [PATCH v6 00/11] Add support for guests with TPM passthrough device
by Stefan Berger 12 Apr '13

12 Apr '13

Hello! The following set of patches adds support to libvirt for adding a TPM passthrough device to a QEMU guest. Support for this was recently accepted into QEMU. This set of patches borrows a lot from the recently added support for rng's. Regards, Stefan --- v5->v6: - followed tree to 039a3283 - simplified virTPMFindCancelPath in 4/11 following D. Berrange's comments v4->v5: - followed tree to b83b31d8 - addressed D. Berrange's comments on patches 4, 7, 10, 11 & nit on 6 - droped code to parse QEMU cmd line with TPM since this requires editing of the resulting XML v3->v4: - followed tree to ce65b435 - followed comments on v3 v2->v3: - followed tree to 03122d7b - some nits I found fixed v1->v2: - Followed Daniel Berrange's comments (except for the one on de-consolidating the JSON monitor code)

3 20

[libvirt] [libvirt-designer v3] Add Vala API
by Zeeshan Ali (Khattak) 12 Apr '13

12 Apr '13

From: "Zeeshan Ali (Khattak)" <zeeshanak(a)gnome.org> This is mostly (modified) copy&paste from libvirt-glib. --- v3: Added .metadata file to correct init functions vapi. Makefile.am | 2 +- configure.ac | 37 +++++++++++++++++++++++++++++++++++++ vapi/LibvirtDesigner-1.0.metadata | 2 ++ vapi/Makefile.am | 28 ++++++++++++++++++++++++++++ vapi/libvirt-designer-1.0.deps | 2 ++ 5 files changed, 70 insertions(+), 1 deletion(-) create mode 100644 vapi/LibvirtDesigner-1.0.metadata create mode 100644 vapi/Makefile.am create mode 100644 vapi/libvirt-designer-1.0.deps diff --git a/Makefile.am b/Makefile.am index 7801b63..b928f83 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,5 +1,5 @@ -SUBDIRS = libvirt-designer examples docs +SUBDIRS = libvirt-designer vapi examples docs ACLOCAL_AMFLAGS = -I m4 diff --git a/configure.ac b/configure.ac index a9c5c34..c999826 100644 --- a/configure.ac +++ b/configure.ac @@ -71,10 +71,46 @@ if test "x$enable_examples" != "xno" ; then fi AM_CONDITIONAL(WITH_EXAMPLES, [test "x$enable_examples" = "xyes"]) +AC_ARG_ENABLE([vala], + AS_HELP_STRING([--enable-vala], [enable Vala binding generation]), + [], [enable_vala=check]) +if test "x$enable_introspection" = "xyes" ; then + if test "x$enable_vala" != "xno" ; then + AC_PATH_PROG(VAPIGEN, vapigen, no) + if test "x$VAPIGEN" == "xno"; then + if test "x$enable_vala" == "xcheck" ; then + enable_vala=no + else + AC_MSG_ERROR([Cannot find the "vapigen" binary in your PATH]) + fi + fi + AC_SUBST(VAPIGEN) + fi + if test "x$enable_vala" != "xno" ; then + AC_MSG_CHECKING([$VAPIGEN support for --metadatadir]) + $VAPIGEN --help | grep metadatadir 1>/dev/null 2>&1 + if test $? != 0 ; then + if test "x$enable_vala" == "xcheck" ; then + enable_vala=no + AC_MSG_RESULT([no]) + else + AC_MSG_ERROR(["vapigen" binary in your PATH is too old (< 0.13)]) + fi + else + AC_MSG_RESULT([no]) + fi + fi + if test "x$enable_vala" = "xcheck" ; then + enable_vala=yes + fi +fi +AM_CONDITIONAL([WITH_VALA], [test "x$enable_vala" = "xyes"]) + AC_OUTPUT(Makefile libvirt-designer/Makefile libvirt-designer.spec libvirt-designer-1.0.pc + vapi/Makefile docs/Makefile examples/Makefile) @@ -83,6 +119,7 @@ AC_MSG_NOTICE([Configuration summary]) AC_MSG_NOTICE([=====================]) AC_MSG_NOTICE([]) AC_MSG_NOTICE([]) +AC_MSG_NOTICE([ Vala API: $enable_vala]) AC_MSG_NOTICE([ examples: $enable_examples]) AC_MSG_NOTICE([]) AC_MSG_NOTICE([]) diff --git a/vapi/LibvirtDesigner-1.0.metadata b/vapi/LibvirtDesigner-1.0.metadata new file mode 100644 index 0000000..44f6726 --- /dev/null +++ b/vapi/LibvirtDesigner-1.0.metadata @@ -0,0 +1,2 @@ +init.argv unowned +init_check.argv unowned diff --git a/vapi/Makefile.am b/vapi/Makefile.am new file mode 100644 index 0000000..6136216 --- /dev/null +++ b/vapi/Makefile.am @@ -0,0 +1,28 @@ +NULL = + +if WITH_VALA +vapidir = $(datadir)/vala/vapi +vapi_DATA = \ + libvirt-designer-1.0.deps \ + libvirt-designer-1.0.vapi \ + $(NULL) + +libvirt-designer-1.0.vapi: $(top_builddir)/libvirt-designer/LibvirtDesigner-1.0.gir + $(AM_V_GEN)$(VAPIGEN) \ + --vapidir=$(builddir) \ + --pkg gio-2.0 \ + --pkg libosinfo-1.0 \ + --pkg libvirt-gconfig-1.0 \ + --library libvirt-designer-1.0 \ + --metadatadir=$(srcdir) \ + $< +endif + +CLEANFILES = \ + libvirt-designer-1.0.vapi \ + $(NULL) + +EXTRA_DIST = \ + LibvirtDesigner-1.0.metadata \ + libvirt-designer-1.0.deps \ + $(NULL) diff --git a/vapi/libvirt-designer-1.0.deps b/vapi/libvirt-designer-1.0.deps new file mode 100644 index 0000000..ba30bfd --- /dev/null +++ b/vapi/libvirt-designer-1.0.deps @@ -0,0 +1,2 @@ +libosinfo-1.0 +libvirt-gconfig-1.0 -- 1.8.1.4

2 2

[libvirt] Shared desktop: grant permission to start/stop/pause/resume guests only
by Thorsten Hesemeyer 12 Apr '13

12 Apr '13

Hi all, for a shared desktop configuration, is there an option to grant the permission to start, stop, pause or resume the kvm guest only? User roles in shared desktop environment configuration: Power user - fully manage libvirt / KVM guests Regular user - start, stop, pause and resume libvirt / KVM guests In other words, we are looking for an opportunity to: a) prevent regular users from modifying the libvirt / kvm guest but b) enable them to start, stop, pause, resume libvirt / kvm guests Currently I see two options: a) No specific libvirt permission: Regular users cannot start a virtual guest (without help). If users forget to shutdown the kvm client and try to poweroff the Linux system, they are asked for an admin/management user password to stop the virtual machine. So they need help to shutdown their machine - not good. b) Enable libvirt manage via policy kit: "manage" permission can be granted via overruling the default org.libvirt.unix.manage policy kit action. The manage right enables to modify the libvirt / kvm guest, which is too much in our case. Is there an option to grant the start/stop/pause/resume permission only? Does libvirt offer this kind of granularity? Kind regards, Thorsten Hesemeyer

4 3

[libvirt] [PATCH v5 00/11] Add support for guests with TPM passthrough device
by Stefan Berger 12 Apr '13

12 Apr '13

Hello! The following set of patches adds support to libvirt for adding a TPM passthrough device to a QEMU guest. Support for this was recently accepted into QEMU. This set of patches borrows a lot from the recently added support for rng's. Regards, Stefan --- v4->v5: - followed tree to b83b31d8 - addressed D. Berrange's comments on patches 4, 7, 10, 11 & nit on 6 - droped code to parse QEMU cmd line with TPM since this requires editing of the resulting XML v3->v4: - followed tree to ce65b435 - followed comments on v3 v2->v3: - followed tree to 03122d7b - some nits I found fixed v1->v2: - Followed Daniel Berrange's comments (except for the one on de-consolidating the JSON monitor code)

2 16

[libvirt] [PATCH] conf: Allow for non-contiguous device boot orders
by Peter Krempa 12 Apr '13

12 Apr '13

This patch adds the ability to configure non-contiguous boot orders on boot devices. This allows unplugging devices that have boot order specified without breaking migration. The new code now uses a slightly less memory efficient approach to store the boot order fields in a hashtable instead of a bitmap. --- src/conf/domain_conf.c | 66 ++++++++++++++++++++++++-------------------------- 1 file changed, 32 insertions(+), 34 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index cc26f21..80a90e1 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -2876,7 +2876,7 @@ cleanup: static int virDomainDeviceBootParseXML(xmlNodePtr node, int *bootIndex, - virBitmapPtr bootMap) + virHashTablePtr bootHash) { char *order; int boot; @@ -2895,18 +2895,19 @@ virDomainDeviceBootParseXML(xmlNodePtr node, goto cleanup; } - if (bootMap) { - bool set; - if (virBitmapGetBit(bootMap, boot - 1, &set) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("boot orders have to be contiguous and starting from 1")); + if (bootHash) { + if (virHashLookup(bootHash, order)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("boot order '%s' used for more than one device"), + order); goto cleanup; - } else if (set) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("boot order %d used for more than one device"), boot); + } + + if (virHashAddEntry(bootHash, order, (void *) 1) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Failed to add element to boot order hash")); goto cleanup; } - ignore_value(virBitmapSetBit(bootMap, boot - 1)); } *bootIndex = boot; @@ -2922,7 +2923,7 @@ cleanup: */ static int virDomainDeviceInfoParseXML(xmlNodePtr node, - virBitmapPtr bootMap, + virHashTablePtr bootHash, virDomainDeviceInfoPtr info, unsigned int flags) { @@ -2973,7 +2974,7 @@ virDomainDeviceInfoParseXML(xmlNodePtr node, } if (boot) { - if (virDomainDeviceBootParseXML(boot, &info->bootIndex, bootMap)) + if (virDomainDeviceBootParseXML(boot, &info->bootIndex, bootHash)) goto cleanup; } @@ -3945,7 +3946,7 @@ static virDomainDiskDefPtr virDomainDiskDefParseXML(virCapsPtr caps, xmlNodePtr node, xmlXPathContextPtr ctxt, - virBitmapPtr bootMap, + virHashTablePtr bootHash, virSecurityLabelDefPtr* vmSeclabels, int nvmSeclabels, unsigned int flags) @@ -4660,7 +4661,7 @@ virDomainDiskDefParseXML(virCapsPtr caps, } def->info.type = VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI; } else { - if (virDomainDeviceInfoParseXML(node, bootMap, &def->info, + if (virDomainDeviceInfoParseXML(node, bootHash, &def->info, flags | VIR_DOMAIN_XML_INTERNAL_ALLOW_BOOT) < 0) goto error; } @@ -5318,7 +5319,7 @@ static virDomainNetDefPtr virDomainNetDefParseXML(virCapsPtr caps, xmlNodePtr node, xmlXPathContextPtr ctxt, - virBitmapPtr bootMap, + virHashTablePtr bootHash, unsigned int flags) { virDomainNetDefPtr def; @@ -5513,7 +5514,7 @@ virDomainNetDefParseXML(virCapsPtr caps, } def->info.type = VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI; } else { - if (virDomainDeviceInfoParseXML(node, bootMap, &def->info, + if (virDomainDeviceInfoParseXML(node, bootHash, &def->info, flags | VIR_DOMAIN_XML_INTERNAL_ALLOW_BOOT | VIR_DOMAIN_XML_INTERNAL_ALLOW_ROM) < 0) goto error; @@ -7988,7 +7989,7 @@ error: static virDomainHostdevDefPtr virDomainHostdevDefParseXML(const xmlNodePtr node, xmlXPathContextPtr ctxt, - virBitmapPtr bootMap, + virHashTablePtr bootHash, unsigned int flags) { virDomainHostdevDefPtr def; @@ -8029,7 +8030,7 @@ virDomainHostdevDefParseXML(const xmlNodePtr node, } if (def->info->type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE) { - if (virDomainDeviceInfoParseXML(node, bootMap, def->info, + if (virDomainDeviceInfoParseXML(node, bootHash, def->info, flags | VIR_DOMAIN_XML_INTERNAL_ALLOW_BOOT | VIR_DOMAIN_XML_INTERNAL_ALLOW_ROM) < 0) goto error; @@ -8063,7 +8064,7 @@ error: static virDomainRedirdevDefPtr virDomainRedirdevDefParseXML(const xmlNodePtr node, - virBitmapPtr bootMap, + virHashTablePtr bootHash, unsigned int flags) { xmlNodePtr cur; @@ -8113,7 +8114,7 @@ virDomainRedirdevDefParseXML(const xmlNodePtr node, def->source.chr.data.spicevmc = VIR_DOMAIN_CHR_SPICEVMC_USBREDIR; } - if (virDomainDeviceInfoParseXML(node, bootMap, &def->info, + if (virDomainDeviceInfoParseXML(node, bootHash, &def->info, flags | VIR_DOMAIN_XML_INTERNAL_ALLOW_BOOT) < 0) goto error; @@ -9098,8 +9099,7 @@ static char *virDomainDefDefaultEmulator(virDomainDefPtr def, static int virDomainDefParseBootXML(xmlXPathContextPtr ctxt, - virDomainDefPtr def, - unsigned long *bootCount) + virDomainDefPtr def) { xmlNodePtr *nodes = NULL; int i, n; @@ -9196,7 +9196,6 @@ virDomainDefParseBootXML(xmlXPathContextPtr ctxt, def->os.bios.rt_set = true; } - *bootCount = deviceBoot; ret = 0; cleanup: @@ -9394,8 +9393,7 @@ virDomainDefParseXML(virCapsPtr caps, virDomainDefPtr def; unsigned long count; bool uuid_generated = false; - virBitmapPtr bootMap = NULL; - unsigned long bootMapSize = 0; + virHashTablePtr bootHash = NULL; xmlNodePtr cur; bool usb_none = false; bool usb_other = false; @@ -10289,10 +10287,10 @@ virDomainDefParseXML(virCapsPtr caps, } if (STREQ(def->os.type, "hvm")) { - if (virDomainDefParseBootXML(ctxt, def, &bootMapSize) < 0) + if (virDomainDefParseBootXML(ctxt, def) < 0) + goto error; + if (!(bootHash = virHashCreate(5, NULL))) goto error; - if (bootMapSize && !(bootMap = virBitmapNew(bootMapSize))) - goto no_memory; } def->emulator = virXPathString("string(./devices/emulator[1])", ctxt); @@ -10313,7 +10311,7 @@ virDomainDefParseXML(virCapsPtr caps, virDomainDiskDefPtr disk = virDomainDiskDefParseXML(caps, nodes[i], ctxt, - bootMap, + bootHash, def->seclabels, def->nseclabels, flags); @@ -10413,7 +10411,7 @@ virDomainDefParseXML(virCapsPtr caps, virDomainNetDefPtr net = virDomainNetDefParseXML(caps, nodes[i], ctxt, - bootMap, + bootHash, flags); if (!net) goto error; @@ -10796,7 +10794,7 @@ virDomainDefParseXML(virCapsPtr caps, for (i = 0 ; i < n ; i++) { virDomainHostdevDefPtr hostdev; - hostdev = virDomainHostdevDefParseXML(nodes[i], ctxt, bootMap, flags); + hostdev = virDomainHostdevDefParseXML(nodes[i], ctxt, bootHash, flags); if (!hostdev) goto error; @@ -10912,7 +10910,7 @@ virDomainDefParseXML(virCapsPtr caps, goto no_memory; for (i = 0 ; i < n ; i++) { virDomainRedirdevDefPtr redirdev = virDomainRedirdevDefParseXML(nodes[i], - bootMap, + bootHash, flags); if (!redirdev) goto error; @@ -11029,7 +11027,7 @@ virDomainDefParseXML(virCapsPtr caps, if (virDomainDefAddImplicitControllers(def) < 0) goto error; - virBitmapFree(bootMap); + virHashFree(bootHash); return def; @@ -11038,7 +11036,7 @@ no_memory: error: VIR_FREE(tmp); VIR_FREE(nodes); - virBitmapFree(bootMap); + virHashFree(bootHash); virDomainDefFree(def); return NULL; } -- 1.8.1.5

2 3

[libvirt] libvirt libxl driver leaking libxl_event's?
by Ian Campbell 12 Apr '13

12 Apr '13

Hi Jim, I don't see any calls to libxl_event_dispose in libvirt.git, libxl_event.h says in relation to the event_occurs callback: * event becomes owned by the application and must be freed, either * by event_occurs or later. so does this mean the memory referenced by event is leaked by libxlEventHandler? libxl_event only contains dynamic allocations for LIBXL_EVENT_TYPE_DISK_EJECT which you don't seem to register for so the issue is probably benign but worth noting I think. Ian.

2 3

[libvirt] [libvirt-designer] Fix 'be find' typo in error message
by Christophe Fergeau 12 Apr '13

12 Apr '13

--- Pushed under the trivial rule. Christophe examples/virtxml.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/virtxml.c b/examples/virtxml.c index 49a7b4e..20aa621 100644 --- a/examples/virtxml.c +++ b/examples/virtxml.c @@ -547,7 +547,7 @@ main(int argc, char *argv[]) } if (!os) { - print_error("Operating system could not be find or guessed"); + print_error("Operating system could not be found or guessed"); goto cleanup; } -- 1.8.1.4

1 0

[libvirt] [RFC] Usage about 'virsh vol-wipe vol_name'
by harryxiyou 12 Apr '13

12 Apr '13

Hi all, I am not very clear about the usage of ‘virsh vol-wipe vol_name’. I think if 'virsh vol-wipe vol_name' can just wipe all the datas in this volume and it is similar as we format a volume which the datas would be wiped, right? After this wipe, we can use this volume like a new one. However, if users just want to wipe portions data of this volume, which command(interface) of libvirt could finish? -- Thanks Harry Wei

2 7

Re: [libvirt] fail to convert qemu xml to args with libvirt-1.0.4: An error occurred, but the cause is unknown
by Yin Olivia-R63875 12 Apr '13

12 Apr '13

Hi Daniel, I also tried libvirt-1.0.4 on my X86 machine. user@x86:~ $ uname -a Linux 2.6.32-33-server #70-Ubuntu SMP Thu Jul 7 22:28:30 UTC 2011 x86_64 GNU/Linux user@x86:~ $ which virsh /usr/local/bin/virsh user@x86:~ $ /usr/local/bin/virsh --version 1.0.4 user@x86:~ $ cd libvirt-1.0.4/tests/qemuxml2argvdata user@x86:~/libvirt-1.0.4/tests/qemuxml2argvdata $ virsh domxml-to-native qemu-argv qemuxml2argv-disk-virtio.xml >1.dom error：An error occurred, but the cause is unknown Best Regards, Olivia > -----Original Message----- > From: Yin Olivia-R63875 > Sent: Thursday, April 11, 2013 10:18 AM > To: 'Daniel P. Berrange' > Cc: 'libvirt-users(a)redhat.com'; 'libvir-list(a)redhat.com' > Subject: RE: fail to convert qemu xml to args with libvirt-1.0.4: An error > occurred, but the cause is unknown > > Hi Daniel, > > Just Ping. > Did you ever successfully convert QEMU xml file to argv on other platforms? > > Best Regards, > Olivia > > > -----Original Message----- > > From: Yin Olivia-R63875 > > Sent: Tuesday, April 09, 2013 1:22 PM > > To: 'libvir-list(a)redhat.com' > > Cc: 'libvirt-users(a)redhat.com' > > Subject: fail to convert qemu xml to args with libvirt-1.0.4: An error > > occurred, but the cause is unknown > > > > Hi, > > > > I used to convert qemu XML to args with libvirt-1.0.3. > > But it failed to convert with libvirt-1.0.4. > > > > # virsh domxml-to-native qemu-argv test.xml >test.sh > > error: An error occurred, but the cause is unknown > > > > > > Comparing the debug file as below: > > 1) lbvirt-1.0.3 > > <cut> > > 2013-04-09 03:23:47.296+0000: 2669: debug : > > virEventPollInterruptLocked:716 : Interrupting > > 2013-04-09 03:23:47.296+0000: 2669: debug : virNetClientIO:1807 : All > > done with our call head=(nil) call=0x100871c0 rv=0 > > 2013-04-09 03:23:47.297+0000: 2670: debug : virEventPollRunOnce:640 : > > Poll got 1 event(s) > > 2013-04-09 03:23:47.297+0000: 2670: debug : > > virEventPollDispatchTimeouts:425 : Dispatch 0 > > 2013-04-09 03:23:47.297+0000: 2669: debug : virNetMessageFree:73 : > > msg=0x10087500 nfds=0 cb=(nil) > > 2013-04-09 03:23:47.297+0000: 2670: debug : > > virEventPollDispatchHandles:470 : Dispatch 1 > > 2013-04-09 03:23:47.297+0000: 2670: debug : > > virEventPollDispatchHandles:484 : i=0 w=1 > > 2013-04-09 03:23:47.297+0000: 2669: debug : virConnectClose:1483 : > > conn=0x100878b8 <cut> > > > > 2) libvirt-1.0.4 > > <cut> > > 2013-04-09 03:07:58.012+0000: 2834: debug : > > virEventPollInterruptLocked:716 : Interrupting > > 2013-04-09 03:07:58.012+0000: 2834: debug : virNetClientIO:1810 : All > > done with our call head=(nil) call=0x10089db8 rv=0 > > 2013-04-09 03:07:58.012+0000: 2835: debug : virEventPollRunOnce:640 : > > Poll got 1 event(s) > > 2013-04-09 03:07:58.012+0000: 2835: debug : > > virEventPollDispatchTimeouts:425 : Dispatch 0 > > 2013-04-09 03:07:58.012+0000: 2834: error : > > virNetClientProgramDispatchError:175 : An error occurred, but the > > cause is unknown > > 2013-04-09 03:07:58.012+0000: 2835: debug : > > virEventPollDispatchHandles:470 : Dispatch 1 > > 2013-04-09 03:07:58.012+0000: 2834: debug : virNetMessageFree:73 : > > msg=0x1008a0f8 nfds=0 cb=(nil) > > 2013-04-09 03:07:58.012+0000: 2835: debug : > > virEventPollDispatchHandles:484 : i=0 w=1 > > 2013-04-09 03:07:58.012+0000: 2835: debug : > > virEventPollDispatchHandles:498 : EVENT_POLL_DISPATCH_HANDLE: watch=1 > > events=1 > > 2013-04-09 03:07:58.012+0000: 2835: debug : > > virEventPollCleanupTimeouts:516 : Cleanup 0 > > 2013-04-09 03:07:58.013+0000: 2835: debug : > > virEventPollCleanupTimeouts:552 : Found 0 out of 0 timeout slots used, > > releasing 0 > > 2013-04-09 03:07:58.013+0000: 2835: debug : > virEventPollCleanupHandles:564 : > > Cleanup 2 > > 2013-04-09 03:07:58.013+0000: 2834: debug : virConnectClose:1483 : > > conn=0x1008a4b0 <cut> > > > > > > How can I debug this cause unknown error? > > > > Best Regards, > > Olivia

1 0

[libvirt] [RFC] virCommandRun return error number
by harryxiyou 12 Apr '13

12 Apr '13

Hi all, I copy portions of libvirt/src/storage/storage_backend_sheepdog.c [...] 125 ret = virCommandRun(cmd, NULL); 126 if (ret == 0) 127 ret = virStorageBackendSheepdogParseNodeInfo(pool->def, output); [...] I found virCommandRun may return '-1', which hinds something error happens. However, Sheepdog hasn't check here. Maybe i have come up with this bug. I cannot remember clearly. Could anyone please give me some suggestions? If ture, i will give a patch for this bug ;-). -- Thanks Harry Wei

4 9

[libvirt] [PATCH v2 0/2] Add error handling to optional arguments in cmdCPUStats
by John Ferlan 12 Apr '13

12 Apr '13

https://bugzilla.redhat.com/show_bug.cgi?id=907732 Also added informational message when count value is larger than number of CPUs present. Original code commit '31047e2b' quietly changes it and continues on. Prior to patch 2/2, no errors were seen for following sequences virsh cpu-stats guest xyz virsh cpu-stats guest --start xyz virsh cpu-stats guest --count xyz virsh cpu-stats guest --count 99999999999 With patch 2/2, the following errors are displayed for the above sequence error: Unable to parse integer parameter for start error: Unable to parse integer parameter for start error: Unable to parse integer parameter for CPUs to show error: Unable to parse integer parameter for CPUs to show Additionally, the following will be displayed on negative value input: virsh cpu-stats guest --start -1 error: Invalid value for start CPU virsh cpu-stats guest --count -1 error: Invalid value for number of CPUs to show Using a --count parameter value larger than the number of vCPUs on the system will display the following: virsh cpu-stats guest --count 8 Only 4 CPUs available to show CPU0: cpu_time 10.770466061 seconds vcpu_time 8.327848192 seconds ... Diff to v1 - Split into 2 patches (one for struct defs, one for argument processing) - Adjust argument processessing to delineate between bad argument and invalid value (eg, negative CPU start number or count) - Only display the > # cpus message when too large a value is supplied John Ferlan (2): Remove extraneous comma in info_cpu_stats and opts_cpu_stats Add error handling to optional arguments in cmdCPUStats tools/virsh-domain.c | 33 ++++++++++++++++++++++++++++----- 1 file changed, 28 insertions(+), 5 deletions(-) -- 1.8.1.4

3 6

[libvirt] [PATCH] qemu: Do not report unsafe migration for local files
by Jiri Denemark 11 Apr '13

11 Apr '13

When migrating a domain with disk images stored locally (and using storage migration), we should not complain about unsafe migration no matter what cache policy is used for that disk. --- src/qemu/qemu_migration.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index a263668..a31bd02 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -1477,13 +1477,17 @@ qemuMigrationIsSafe(virDomainDefPtr def) !disk->shared && !disk->readonly && disk->cachemode != VIR_DOMAIN_DISK_CACHE_DISABLE) { - int cfs; + int rc; if (disk->type == VIR_DOMAIN_DISK_TYPE_FILE) { - if ((cfs = virStorageFileIsClusterFS(disk->src)) == 1) + if ((rc = virStorageFileIsSharedFS(disk->src)) < 0) + return false; + else if (rc == 0) continue; - else if (cfs < 0) + if ((rc = virStorageFileIsClusterFS(disk->src)) < 0) return false; + else if (rc == 1) + continue; } else if (disk->type == VIR_DOMAIN_DISK_TYPE_NETWORK && disk->protocol == VIR_DOMAIN_DISK_PROTOCOL_RBD) { continue; -- 1.8.1.5

2 2

[libvirt] [PATCH] virsh: Document that using incomplete XML files may have unexpected results
by Peter Krempa 11 Apr '13

11 Apr '13

Explicitly state that using incomplete XML definition snippets for hot-management commands may have unexpected results due to autogenerating values for some of the fields if they aren't specified explicitly. --- tools/virsh.pod | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/tools/virsh.pod b/tools/virsh.pod index 1510d0d..11984bc 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -1824,6 +1824,10 @@ within an existing device; consider using B<update-device> for this usage. For passthrough host devices, see also B<nodedev-detach>, needed if the device does not use managed mode. +B<Note>: using of partial device definition XML files may lead to unexpected +results as some fields may be autogenerated and thus match devices other than +expected. + =item B<attach-disk> I<domain> I<source> I<target> [I<--driver driver>] [I<--subdriver subdriver>] [I<--cache cache>] [I<--type type>] [I<--mode mode>] [I<--config>] [I<--sourcetype soucetype>] @@ -1893,6 +1897,10 @@ as command B<attach-device>. For passthrough host devices, see also B<nodedev-reattach>, needed if the device does not use managed mode. +B<Note>: using of partial device definition XML files may lead to unexpected +results as some fields may be autogenerated and thus match devices other than +expected. + If I<--live> is specified, affect a running domain. If I<--config> is specified, affect the next startup of a persistent domain. If I<--current> is specified, affect the current domain state. @@ -1969,6 +1977,10 @@ an offline domain, and like I<--live> I<--config> for a running domain. Note that older versions of virsh used I<--config> as an alias for I<--persistent>. +B<Note>: using of partial device definition XML files may lead to unexpected +results as some fields may be autogenerated and thus match devices other than +expected. + =item B<change-media> I<domain> I<path> [I<--eject>] [I<--insert>] [I<--update>] [I<source>] [I<--force>] [[I<--live>] [I<--config>] | [I<--current>]] -- 1.8.1.5

2 2

[libvirt] [PATCHv2] qemu: Try to use QMP for send-key if supported
by Peter Krempa 11 Apr '13

11 Apr '13

Instead of always using HMP use the QMP send-key command introduced in qemu 1.3. --- Notes: Version 2: - always try QMP instead of adding capability bit src/qemu/qemu_monitor_json.c | 69 ++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 64 insertions(+), 5 deletions(-) diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index 1bf8baf..759198b 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -3372,11 +3372,70 @@ int qemuMonitorJSONSendKey(qemuMonitorPtr mon, unsigned int *keycodes, unsigned int nkeycodes) { - /* - * FIXME: qmp sendkey has not been implemented yet, - * and qmp API of it cannot be anticipated, so we use hmp temporary. - */ - return qemuMonitorTextSendKey(mon, holdtime, keycodes, nkeycodes); + int ret = -1; + virJSONValuePtr cmd = NULL; + virJSONValuePtr reply = NULL; + virJSONValuePtr keys = NULL; + virJSONValuePtr key = NULL; + unsigned int i; + + /* create the key data array */ + if (!(keys = virJSONValueNewArray())) + goto no_memory; + + for (i = 0; i < nkeycodes; i++) { + if (keycodes[i] > 0xffff) { + virReportError(VIR_ERR_OPERATION_FAILED, + _("keycode %d is invalid: 0x%X"), i, keycodes[i]); + goto cleanup; + } + + /* create single key object */ + if (!(key = virJSONValueNewObject())) + goto no_memory; + + /* Union KeyValue has two, types, use the generic one */ + if (virJSONValueObjectAppendString(key, "type", "number") < 0) + goto no_memory; + + /* with the keycode */ + if (virJSONValueObjectAppendNumberInt(key, "data", keycodes[i]) < 0) + goto no_memory; + + if (virJSONValueArrayAppend(keys, key) < 0) + goto no_memory; + + key = NULL; + + } + + cmd = qemuMonitorJSONMakeCommand("send-key", + "a:keys", keys, + holdtime ? "U:hold-time" : NULL, holdtime, + NULL); + if (!cmd) + goto cleanup; + + if ((ret = qemuMonitorJSONCommand(mon, cmd, &reply)) < 0) + goto cleanup; + + if (qemuMonitorJSONHasError(reply, "CommandNotFound")) { + VIR_DEBUG("send-key command not found, trying HMP"); + ret = qemuMonitorTextSendKey(mon, holdtime, keycodes, nkeycodes); + } else { + ret = qemuMonitorJSONCheckError(cmd, reply); + } + +cleanup: + virJSONValueFree(cmd); + virJSONValueFree(reply); + virJSONValueFree(keys); + virJSONValueFree(key); + return ret; + +no_memory: + virReportOOMError(); + goto cleanup; } int qemuMonitorJSONScreendump(qemuMonitorPtr mon, -- 1.8.1.5

2 2

[libvirt] [PATCH] Fix error return value for VirCommandNewArgList
by harryxiyou＠gmail.com 11 Apr '13

11 Apr '13

From: Harry Wei <harryxiyou(a)gmail.com> virCommandNewArgList may return NULL so we need not do following stuffs and just return '-1'. Signed-off-by: Harry Wei <harryxiyou(a)gmail.com> CC: Osier Yang <jyang(a)redhat.com> CC: Michal Privoznik <mprivozn(a)redhat.com> --- src/storage/storage_backend_sheepdog.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/storage/storage_backend_sheepdog.c b/src/storage/storage_backend_sheepdog.c index 35a3a04..3452eaa 100644 --- a/src/storage/storage_backend_sheepdog.c +++ b/src/storage/storage_backend_sheepdog.c @@ -120,6 +120,8 @@ virStorageBackendSheepdogRefreshPool(virConnectPtr conn ATTRIBUTE_UNUSED, virCommandPtr cmd; cmd = virCommandNewArgList(COLLIE, "node", "info", "-r", NULL); + if (cmd == NULL) + return -1; virStorageBackendSheepdogAddHostArg(cmd, pool); virCommandSetOutputBuffer(cmd, &output); ret = virCommandRun(cmd, NULL); @@ -142,6 +144,8 @@ virStorageBackendSheepdogDeleteVol(virConnectPtr conn ATTRIBUTE_UNUSED, virCheckFlags(0, -1); virCommandPtr cmd = virCommandNewArgList(COLLIE, "vdi", "delete", vol->name, NULL); + if (cmd == NULL) + return -1; virStorageBackendSheepdogAddHostArg(cmd, pool); int ret = virCommandRun(cmd, NULL); @@ -165,6 +169,8 @@ virStorageBackendSheepdogCreateVol(virConnectPtr conn ATTRIBUTE_UNUSED, } virCommandPtr cmd = virCommandNewArgList(COLLIE, "vdi", "create", vol->name, NULL); + if (cmd == NULL) + return -1; virCommandAddArgFormat(cmd, "%llu", vol->capacity); virStorageBackendSheepdogAddHostArg(cmd, pool); if (virCommandRun(cmd, NULL) < 0) @@ -251,6 +257,8 @@ virStorageBackendSheepdogRefreshVol(virConnectPtr conn ATTRIBUTE_UNUSED, char *output = NULL; virCommandPtr cmd = virCommandNewArgList(COLLIE, "vdi", "list", vol->name, "-r", NULL); + if (cmd == NULL) + return -1; virStorageBackendSheepdogAddHostArg(cmd, pool); virCommandSetOutputBuffer(cmd, &output); ret = virCommandRun(cmd, NULL); @@ -293,6 +301,8 @@ virStorageBackendSheepdogResizeVol(virConnectPtr conn ATTRIBUTE_UNUSED, virCheckFlags(0, -1); virCommandPtr cmd = virCommandNewArgList(COLLIE, "vdi", "resize", vol->name, NULL); + if (cmd == NULL) + return -1; virCommandAddArgFormat(cmd, "%llu", capacity); virStorageBackendSheepdogAddHostArg(cmd, pool); int ret = virCommandRun(cmd, NULL); -- 1.7.9.5

2 1

[libvirt] [PATCH] qemu: Use QMP for send-key if supported
by Peter Krempa 11 Apr '13

11 Apr '13

Instead of always using HMP use the QMP send-key command introduced in qemu 1.3. --- src/qemu/qemu_capabilities.c | 3 +++ src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_driver.c | 25 +++++++++++------ src/qemu/qemu_monitor.c | 5 ++-- src/qemu/qemu_monitor.h | 3 ++- src/qemu/qemu_monitor_json.c | 64 ++++++++++++++++++++++++++++++++++++++++---- 6 files changed, 85 insertions(+), 16 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 50712b0..051285c 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -216,6 +216,7 @@ VIR_ENUM_IMPL(virQEMUCaps, QEMU_CAPS_LAST, "ipv6-migration", /* 135 */ "machine-opt", + "send-key", ); struct _virQEMUCaps { @@ -1954,6 +1955,8 @@ virQEMUCapsProbeQMPCommands(virQEMUCapsPtr qemuCaps, virQEMUCapsSet(qemuCaps, QEMU_CAPS_ADD_FD); else if (STREQ(name, "nbd-server-start")) virQEMUCapsSet(qemuCaps, QEMU_CAPS_NBD_SERVER); + else if (STREQ(name, "send-key")) + virQEMUCapsSet(qemuCaps, QEMU_CAPS_SEND_KEY); VIR_FREE(name); } VIR_FREE(commands); diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index b2dc588..bcd4daf 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -176,6 +176,7 @@ enum virQEMUCapsFlags { QEMU_CAPS_SCSI_MEGASAS = 134, /* -device megasas */ QEMU_CAPS_IPV6_MIGRATION = 135, /* -incoming [::] */ QEMU_CAPS_MACHINE_OPT = 136, /* -machine xxxx*/ + QEMU_CAPS_SEND_KEY = 137, /* send-key QMP command */ QEMU_CAPS_LAST, /* this must always be the last item */ }; diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 2c0d7d1..cfb6fc9 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -2227,14 +2227,16 @@ cleanup: return ret; } -static int qemuDomainSendKey(virDomainPtr domain, - unsigned int codeset, - unsigned int holdtime, - unsigned int *keycodes, - int nkeycodes, - unsigned int flags) +static int +qemuDomainSendKey(virDomainPtr domain, + unsigned int codeset, + unsigned int holdtime, + unsigned int *keycodes, + int nkeycodes, + unsigned int flags) { virQEMUDriverPtr driver = domain->conn->privateData; + virQEMUCapsPtr qemuCaps = NULL; virDomainObjPtr vm = NULL; int ret = -1; qemuDomainObjPrivatePtr priv; @@ -2251,7 +2253,8 @@ static int qemuDomainSendKey(virDomainPtr domain, keycodes[i]); if (keycode < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("cannot translate keycode %u of %s codeset to rfb keycode"), + _("cannot translate keycode %u of %s codeset to " + "rfb keycode"), keycodes[i], virKeycodeSetTypeToString(codeset)); return -1; @@ -2263,6 +2266,10 @@ static int qemuDomainSendKey(virDomainPtr domain, if (!(vm = qemuDomObjFromDomain(domain))) goto cleanup; + if (!(qemuCaps = virQEMUCapsCacheLookup(driver->qemuCapsCache, + vm->def->emulator))) + goto cleanup; + priv = vm->privateData; if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_MODIFY) < 0) @@ -2275,7 +2282,8 @@ static int qemuDomainSendKey(virDomainPtr domain, } qemuDomainObjEnterMonitor(driver, vm); - ret = qemuMonitorSendKey(priv->mon, holdtime, keycodes, nkeycodes); + ret = qemuMonitorSendKey(priv->mon, holdtime, keycodes, nkeycodes, + virQEMUCapsGet(qemuCaps, QEMU_CAPS_SEND_KEY)); qemuDomainObjExitMonitor(driver, vm); endjob: @@ -2285,6 +2293,7 @@ endjob: cleanup: if (vm) virObjectUnlock(vm); + virObjectUnref(qemuCaps); return ret; } diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index d1c6690..d9b5c23 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -3008,14 +3008,15 @@ int qemuMonitorInjectNMI(qemuMonitorPtr mon) int qemuMonitorSendKey(qemuMonitorPtr mon, unsigned int holdtime, unsigned int *keycodes, - unsigned int nkeycodes) + unsigned int nkeycodes, + bool useQMP) { int ret; VIR_DEBUG("mon=%p, holdtime=%u, nkeycodes=%u", mon, holdtime, nkeycodes); - if (mon->json) + if (mon->json && useQMP) ret = qemuMonitorJSONSendKey(mon, holdtime, keycodes, nkeycodes); else ret = qemuMonitorTextSendKey(mon, holdtime, keycodes, nkeycodes); diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h index b3808a8..fadad08 100644 --- a/src/qemu/qemu_monitor.h +++ b/src/qemu/qemu_monitor.h @@ -601,7 +601,8 @@ int qemuMonitorScreendump(qemuMonitorPtr mon, int qemuMonitorSendKey(qemuMonitorPtr mon, unsigned int holdtime, unsigned int *keycodes, - unsigned int nkeycodes); + unsigned int nkeycodes, + bool useQMP); typedef enum { BLOCK_JOB_ABORT, diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index 1bf8baf..43057fb 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -3372,11 +3372,65 @@ int qemuMonitorJSONSendKey(qemuMonitorPtr mon, unsigned int *keycodes, unsigned int nkeycodes) { - /* - * FIXME: qmp sendkey has not been implemented yet, - * and qmp API of it cannot be anticipated, so we use hmp temporary. - */ - return qemuMonitorTextSendKey(mon, holdtime, keycodes, nkeycodes); + int ret = -1; + virJSONValuePtr cmd = NULL; + virJSONValuePtr reply = NULL; + virJSONValuePtr keys = NULL; + virJSONValuePtr key = NULL; + unsigned int i; + + /* create the key data array */ + if (!(keys = virJSONValueNewArray())) + goto no_memory; + + for (i = 0; i < nkeycodes; i++) { + if (keycodes[i] > 0xffff) { + virReportError(VIR_ERR_OPERATION_FAILED, + _("keycode %d is invalid: 0x%X"), i, keycodes[i]); + goto cleanup; + } + + /* create single key object */ + if (!(key = virJSONValueNewObject())) + goto no_memory; + + /* Union KeyValue has two, types, use the generic one */ + if (virJSONValueObjectAppendString(key, "type", "number") < 0) + goto no_memory; + + /* with the keycode */ + if (virJSONValueObjectAppendNumberInt(key, "data", keycodes[i]) < 0) + goto no_memory; + + if (virJSONValueArrayAppend(keys, key) < 0) + goto no_memory; + + key = NULL; + + } + + cmd = qemuMonitorJSONMakeCommand("send-key", + "a:keys", keys, + holdtime ? "U:hold-time" : NULL, holdtime, + NULL); + if (!cmd) + goto cleanup; + + if ((ret = qemuMonitorJSONCommand(mon, cmd, &reply)) < 0) + goto cleanup; + + ret = qemuMonitorJSONCheckError(cmd, reply); + +cleanup: + virJSONValueFree(cmd); + virJSONValueFree(reply); + virJSONValueFree(keys); + virJSONValueFree(key); + return ret; + +no_memory: + virReportOOMError(); + goto cleanup; } int qemuMonitorJSONScreendump(qemuMonitorPtr mon, -- 1.8.1.5

3 4

[libvirt] [PATCH] virsh: Update list of shutdown/reboot modes
by Michal Privoznik 11 Apr '13

11 Apr '13

As of 76d9f65644 we are supporting two new modes: initctl and signal. However, these are missing in help listing. --- tools/virsh-domain.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index c088468..bd6192e 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -4568,7 +4568,7 @@ static const vshCmdOptDef opts_shutdown[] = { }, {.name = "mode", .type = VSH_OT_STRING, - .help = N_("shutdown mode: acpi|agent") + .help = N_("shutdown mode: acpi|agent|initctl|signal") }, {.name = NULL} }; @@ -4654,7 +4654,7 @@ static const vshCmdOptDef opts_reboot[] = { }, {.name = "mode", .type = VSH_OT_STRING, - .help = N_("shutdown mode: acpi|agent") + .help = N_("shutdown mode: acpi|agent|initctl|signal") }, {.name = NULL} }; -- 1.8.1.5

2 1

[libvirt] [libvirt-designer][PATCH] Don't redefine _FORTIFY_SOURCE macro
by Michal Privoznik 11 Apr '13

11 Apr '13

If the _FORTIFY_SOURCE has been already defined, we unconditionally redefine it, leaving us with warning/error thrown at compilation time. --- m4/virt-compile-warnings.m4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/m4/virt-compile-warnings.m4 b/m4/virt-compile-warnings.m4 index 913abca..1c58ebe 100644 --- a/m4/virt-compile-warnings.m4 +++ b/m4/virt-compile-warnings.m4 @@ -86,7 +86,7 @@ AC_DEFUN([LIBVIRT_DESIGNER_COMPILE_WARNINGS],[ # Use improved glibc headers AH_VERBATIM([FORTIFY_SOURCE], [/* Enable compile-time and run-time bounds-checking, and some warnings. */ - #if defined __OPTIMIZE__ && __OPTIMIZE__ + #if !defined _FORTIFY_SOURCE && defined __OPTIMIZE__ && __OPTIMIZE__ # define _FORTIFY_SOURCE 2 #endif ]) -- 1.8.1.5

2 2

[libvirt] [libvirt-designer][PATCH] test: Adapt to new gvir_designer_domain_new signature
by Michal Privoznik 11 Apr '13

11 Apr '13

After 46be1aed the signature of gvir_designer_domain_new has changed. The OsinfoDb parameter appeared there. However, the test suite hasn't been adapted. --- libvirt-designer/test-designer-domain.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/libvirt-designer/test-designer-domain.c b/libvirt-designer/test-designer-domain.c index a3d62b6..bbd5a28 100644 --- a/libvirt-designer/test-designer-domain.c +++ b/libvirt-designer/test-designer-domain.c @@ -129,12 +129,14 @@ static const gchar *capslxcxml = static void test_domain_machine_setup(GVirDesignerDomain **design, gconstpointer opaque) { OsinfoOs *os = osinfo_os_new("http://myoperatingsystem/amazing/4.2"); + OsinfoDb *db = osinfo_db_new(); OsinfoPlatform *platform = osinfo_platform_new("http://myhypervisor.org/awesome/6.6.6"); GVirConfigCapabilities *caps = gvir_config_capabilities_new_from_xml(capsqemuxml, NULL); - *design = gvir_designer_domain_new(os, platform, caps); + *design = gvir_designer_domain_new(db, os, platform, caps); g_object_unref(os); + g_object_unref(db); g_object_unref(platform); g_object_unref(caps); } @@ -143,12 +145,14 @@ static void test_domain_machine_setup(GVirDesignerDomain **design, gconstpointer static void test_domain_container_setup(GVirDesignerDomain **design, gconstpointer opaque) { OsinfoOs *os = osinfo_os_new("http://myoperatingsystem/amazing/4.2"); + OsinfoDb *db = osinfo_db_new(); OsinfoPlatform *platform = osinfo_platform_new("http://myhypervisor.org/awesome/6.6.6"); GVirConfigCapabilities *caps = gvir_config_capabilities_new_from_xml(capslxcxml, NULL); - *design = gvir_designer_domain_new(os, platform, caps); + *design = gvir_designer_domain_new(db, os, platform, caps); g_object_unref(os); + g_object_unref(db); g_object_unref(platform); g_object_unref(caps); } -- 1.8.1.5

2 2

[libvirt] [PATCH] bridge: add the firewalld zone support
by Federico Simoncelli 11 Apr '13

11 Apr '13

This patch adds the support for the firewalld zones in the virtual bridges managed by libvirt allowing to configure the rules as for all the other interfaces. After assigning a fwzone to the bridge it is then possible to configure the firewall rules through the firwalld daemon, e.g. enabling or disabling connections to certain services located on the host. The firewalld events (e.g. restart, reload) are managed with the preexisting infrastructure that is already in place to reinstate the general iptables rules. Signed-off-by: Federico Simoncelli <fsimonce(a)redhat.com> --- docs/formatnetwork.html.in | 5 +- docs/schemas/network.rng | 6 +++ src/conf/network_conf.c | 8 +++- src/conf/network_conf.h | 1 + src/network/bridge_driver.c | 114 ++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 131 insertions(+), 3 deletions(-) diff --git a/docs/formatnetwork.html.in b/docs/formatnetwork.html.in index 4dd0415..e6d7d9c 100644 --- a/docs/formatnetwork.html.in +++ b/docs/formatnetwork.html.in @@ -69,7 +69,7 @@ <pre> ... - <bridge name="virbr0" stp="on" delay="5"/> + <bridge name="virbr0" fwzone="internal" stp="on" delay="5"/> <domain name="example.com"/> <forward mode="nat" dev="eth0"/> ...</pre> @@ -91,6 +91,9 @@ is 'on' or 'off' (default is 'on'). Attribute <code>delay</code> sets the bridge's forward delay value in seconds (default is 0). + Attribute <code>fwzone</code> specifies the firewalld zone to use + for the bridge device (the default is no zone and firewalld will + configure the device with its default zone). <span class="since">Since 0.3.0</span> </dd> <dt><code>domain</code></dt> diff --git a/docs/schemas/network.rng b/docs/schemas/network.rng index 6c3fae2..2f92cfc 100644 --- a/docs/schemas/network.rng +++ b/docs/schemas/network.rng @@ -66,6 +66,12 @@ </attribute> </optional> + <optional> + <attribute name="fwzone"> + <ref name="genericName"/> + </attribute> + </optional> + </element> </optional> diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c index 968cf11..cf163e0 100644 --- a/src/conf/network_conf.c +++ b/src/conf/network_conf.c @@ -1749,6 +1749,7 @@ virNetworkDefParseXML(xmlXPathContextPtr ctxt) def->bridge = virXPathString("string(./bridge[1]/@name)", ctxt); stp = virXPathString("string(./bridge[1]/@stp)", ctxt); def->stp = (stp && STREQ(stp, "off")) ? 0 : 1; + def->fwzone = virXPathString("string(./bridge[1]/@fwzone)", ctxt); if (virXPathULong("string(./bridge[1]/@delay)", ctxt, &def->delay) < 0) def->delay = 0; @@ -1880,9 +1881,10 @@ virNetworkDefParseXML(xmlXPathContextPtr ctxt) } /* fall through to next case */ case VIR_NETWORK_FORWARD_BRIDGE: - if (def->delay || stp) { + if (def->delay || stp || def->fwzone) { virReportError(VIR_ERR_XML_ERROR, - _("bridge delay/stp options only allowed in route, nat, and isolated mode, not in %s (network '%s')"), + _("bridge delay/stp/fwzone options only allowed in " + "route, nat, and isolated mode, not in %s (network '%s')"), virNetworkForwardTypeToString(def->forward.type), def->name); goto error; @@ -2370,6 +2372,8 @@ virNetworkDefFormatInternal(virBufferPtr buf, virBufferAddLit(buf, "<bridge"); if (def->bridge) virBufferEscapeString(buf, " name='%s'", def->bridge); + if (def->fwzone) + virBufferEscapeString(buf, " fwzone='%s'", def->fwzone); virBufferAsprintf(buf, " stp='%s' delay='%ld' />\n", def->stp ? "on" : "off", def->delay); diff --git a/src/conf/network_conf.h b/src/conf/network_conf.h index 6ce9a00..80ee75f 100644 --- a/src/conf/network_conf.h +++ b/src/conf/network_conf.h @@ -194,6 +194,7 @@ struct _virNetworkDef { char *bridge; /* Name of bridge device */ char *domain; + char *fwzone; /* The firewalld zone */ unsigned long delay; /* Bridge forward delay (ms) */ unsigned int stp :1; /* Spanning tree protocol */ virMacAddr mac; /* mac address of bridge device */ diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index e8b314a..4875bbc 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -76,6 +76,29 @@ #define VIR_FROM_THIS VIR_FROM_NETWORK +#if HAVE_FIREWALLD +static char *firewall_cmd_path = NULL; + +static int +networkBridgeOnceInit(void) +{ + firewall_cmd_path = virFindFileInPath("firewall-cmd"); + if (!firewall_cmd_path) { + VIR_INFO("firewall-cmd not found on system. " + "firewalld support disabled for firewall zones."); + /* no need to verify the firewalld state as the service might + * be available now but not later on when it is actually used to + * configure the zones, or the opposite: it might be available + * now but not when needed. + */ + } + return 0; +} + +VIR_ONCE_GLOBAL_INIT(networkBridge) + +#endif + /* Main driver state */ struct network_driver { virMutex lock; @@ -1893,6 +1916,75 @@ networkRemoveGeneralIp6tablesRules(struct network_driver *driver, iptablesRemoveForwardRejectOut(driver->iptables, AF_INET6, network->def->bridge); } +#if HAVE_FIREWALLD +static int +networkAddInterfaceZone(virNetworkObjPtr network) +{ + int status; + + if ((network->def->bridge == NULL) || (network->def->fwzone == NULL)) + return 0; + + networkBridgeInitialize(); + + if (firewall_cmd_path == NULL) { + VIR_WARN("firewall-cmd is missing cannot add interface '%s' to " + "firewall zone '%s'", network->def->bridge, + network->def->fwzone); + return -1; + } + + virCommandPtr cmd = virCommandNew(firewall_cmd_path); + /* the --change-zone command is used (instead of --add-interface) to avoid + * errors if the device was already assigned to a different zone. + */ + virCommandAddArgList(cmd, "--zone", network->def->fwzone, + "--change-zone", network->def->bridge, NULL); + if (virCommandRun(cmd, &status) < 0 || status != 0) { + VIR_ERROR("failed to add interface '%s' to firewall zone '%s'", + network->def->bridge, network->def->fwzone); + } else { + VIR_DEBUG("interface '%s' has been added to firewall zone '%s'", + network->def->bridge, network->def->fwzone); + } + + virCommandFree(cmd); + + return 0; +} + +static void +networkRemoveInterfaceZone(virNetworkObjPtr network) +{ + int status; + + if (network->def->bridge == NULL) + return; + + networkBridgeInitialize(); + + if (firewall_cmd_path == NULL) { + VIR_WARN("firewall-cmd is missing cannot remove interface '%s' " + "from its firewall zone", network->def->bridge); + return; + } + + virCommandPtr cmd = virCommandNew(firewall_cmd_path); + /* not specifying a zone removes the interface from any zone */ + virCommandAddArgList(cmd, "--remove-interface", + network->def->bridge, NULL); + if (virCommandRun(cmd, &status) < 0 || status != 0) { + VIR_ERROR("failed to remove interface '%s' from its firewall zone", + network->def->bridge); + } else { + VIR_DEBUG("interface '%s' has been removed from its firewall zone", + network->def->bridge); + } + + virCommandFree(cmd); +} +#endif + static int networkAddGeneralIptablesRules(struct network_driver *driver, virNetworkObjPtr network) @@ -2000,9 +2092,27 @@ networkAddGeneralIptablesRules(struct network_driver *driver, goto err9; } +#if HAVE_FIREWALLD + if (networkAddInterfaceZone(network) < 0) { + virReportError(VIR_ERR_SYSTEM_ERROR, + _("failed to add interface '%s' to the firewall zone '%s'"), + network->def->bridge, network->def->fwzone); + goto err10; + } +#else + if (network->def->fwzone != NULL) + VIR_WARN("firewalld support not compiled into this binary, interface " + "'%s' not added to firewall zone '%s'", network->def->bridge, + network->def->fwzone); +#endif + return 0; /* unwind in reverse order from the point of failure */ +#if HAVE_FIREWALLD +err10: + networkRemoveGeneralIp6tablesRules(driver, network); +#endif err9: iptablesRemoveForwardAllowCross(driver->iptables, AF_INET, network->def->bridge); err8: @@ -2032,6 +2142,10 @@ networkRemoveGeneralIptablesRules(struct network_driver *driver, int ii; virNetworkIpDefPtr ipv4def; +#if HAVE_FIREWALLD + networkRemoveInterfaceZone(network); +#endif + networkRemoveGeneralIp6tablesRules(driver, network); for (ii = 0; -- 1.8.1.4

1 0

[libvirt] [PATCH v3 1/3] Add NVRAM device
by Li Zhang 11 Apr '13

11 Apr '13

From: Li Zhang <zhlcindy(a)linux.vnet.ibm.com> For pSeries guest in QEMU, NVRAM is one kind of spapr-vio device. Users are allowed to specify spapr-vio devices'address. But NVRAM is not supported in libvirt. So this patch is to add NVRAM device to allow users to specify its address. In QEMU, NVRAM device's address is specified by "-global spapr-nvram.reg=xxxxx". In libvirt, XML file is defined as the following: <nvram> <address type='spapr-vio' reg='0x3000'/> </nvram> Signed-off-by: Li Zhang <zhlcindy(a)linux.vnet.ibm.com> --- v3 -> v2: * Add NVRAM in domaincommon.rng and formatdomain.xml.in suggested by Daniel P.Berrange * Add NVRAM test cases suggested by Daniel P.Berrange * Remove nvram allocation when it is not specified suggested by Daniel P.Berrange * Add several error reports suggested by Daniel P.Berrange v2 -> v1: * Add NVRAM parameters parsing in qemuParseCommandLine src/conf/domain_conf.c | 76 +++++++++++++++++++++++++++++++++++++++++++++++ src/conf/domain_conf.h | 10 +++++++ src/qemu/qemu_command.c | 67 +++++++++++++++++++++++++++++++++++++++++ src/qemu/qemu_command.h | 2 ++ 4 files changed, 155 insertions(+) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 3278e9c..c37487c 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -190,6 +190,7 @@ VIR_ENUM_IMPL(virDomainDevice, VIR_DOMAIN_DEVICE_LAST, "smartcard", "chr", "memballoon", + "nvram", "rng") VIR_ENUM_IMPL(virDomainDeviceAddress, VIR_DOMAIN_DEVICE_ADDRESS_TYPE_LAST, @@ -1515,6 +1516,16 @@ void virDomainMemballoonDefFree(virDomainMemballoonDefPtr def) VIR_FREE(def); } +void virDomainNVRAMDefFree(virDomainNVRAMDefPtr def) +{ + if (!def) + return; + + virDomainDeviceInfoClear(&def->info); + + VIR_FREE(def); +} + void virDomainWatchdogDefFree(virDomainWatchdogDefPtr def) { if (!def) @@ -1678,6 +1689,7 @@ void virDomainDeviceDefFree(virDomainDeviceDefPtr def) case VIR_DOMAIN_DEVICE_SMARTCARD: case VIR_DOMAIN_DEVICE_CHR: case VIR_DOMAIN_DEVICE_MEMBALLOON: + case VIR_DOMAIN_DEVICE_NVRAM: case VIR_DOMAIN_DEVICE_LAST: break; } @@ -1869,6 +1881,7 @@ void virDomainDefFree(virDomainDefPtr def) virDomainWatchdogDefFree(def->watchdog); virDomainMemballoonDefFree(def->memballoon); + virDomainNVRAMDefFree(def->nvram); for (i = 0; i < def->nseclabels; i++) virSecurityLabelDefFree(def->seclabels[i]); @@ -2429,6 +2442,12 @@ int virDomainDeviceInfoIterate(virDomainDefPtr def, if (cb(def, &device, &def->rng->info, opaque) < 0) return -1; } + if (def->nvram) { + device.type = VIR_DOMAIN_DEVICE_NVRAM; + device.data.nvram = def->nvram; + if (cb(def, &device, &def->nvram->info, opaque) < 0) + return -1; + } device.type = VIR_DOMAIN_DEVICE_HUB; for (i = 0; i < def->nhubs ; i++) { device.data.hub = def->hubs[i]; @@ -2460,6 +2479,7 @@ int virDomainDeviceInfoIterate(virDomainDefPtr def, case VIR_DOMAIN_DEVICE_SMARTCARD: case VIR_DOMAIN_DEVICE_CHR: case VIR_DOMAIN_DEVICE_MEMBALLOON: + case VIR_DOMAIN_DEVICE_NVRAM: case VIR_DOMAIN_DEVICE_LAST: case VIR_DOMAIN_DEVICE_RNG: break; @@ -7703,6 +7723,23 @@ error: goto cleanup; } +static virDomainNVRAMDefPtr +virDomainNVRAMDefParseXML(const xmlNodePtr node, + unsigned int flags) +{ + virDomainNVRAMDefPtr def; + + if (VIR_ALLOC(def) < 0) { + virReportOOMError(); + return NULL; + } + + if ( virDomainDeviceInfoParseXML(node, NULL, &def->info, flags) < 0 ) + return NULL; + + return def; +} + static virSysinfoDefPtr virSysinfoParseXML(const xmlNodePtr node, xmlXPathContextPtr ctxt) @@ -10844,6 +10881,26 @@ virDomainDefParseXML(virCapsPtr caps, VIR_FREE(nodes); } + def->nvram = NULL; + if ((n = virXPathNodeSet("./devices/nvram", ctxt, &nodes)) < 0) { + goto error; + } + + if (n > 1) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("only a single nvram device is supported")); + goto error; + } + + if (n > 0) { + virDomainNVRAMDefPtr nvram = + virDomainNVRAMDefParseXML(nodes[0], flags); + if (!nvram) + goto error; + def->nvram = nvram; + VIR_FREE(nodes); + } + /* analysis of the hub devices */ if ((n = virXPathNodeSet("./devices/hub", ctxt, &nodes)) < 0) { goto error; @@ -13854,6 +13911,21 @@ virDomainMemballoonDefFormat(virBufferPtr buf, } static int +virDomainNVRAMDefFormat(virBufferPtr buf, + virDomainNVRAMDefPtr def, + unsigned int flags) +{ + virBufferAsprintf(buf, " <nvram>\n"); + if (virDomainDeviceInfoIsSet(&def->info, flags)) + if (virDomainDeviceInfoFormat(buf, &def->info, flags) < 0) + return -1; + + virBufferAddLit(buf, " </nvram>\n"); + + return 0; +} + +static int virDomainSysinfoDefFormat(virBufferPtr buf, virSysinfoDefPtr def) { @@ -15161,6 +15233,9 @@ virDomainDefFormatInternal(virDomainDefPtr def, if (def->rng) virDomainRNGDefFormat(buf, def->rng, flags); + if (def->nvram) + virDomainNVRAMDefFormat(buf, def->nvram, flags); + virBufferAddLit(buf, " </devices>\n"); virBufferAdjustIndent(buf, 2); @@ -16443,6 +16518,7 @@ virDomainDeviceDefCopy(virCapsPtr caps, case VIR_DOMAIN_DEVICE_SMARTCARD: case VIR_DOMAIN_DEVICE_CHR: case VIR_DOMAIN_DEVICE_MEMBALLOON: + case VIR_DOMAIN_DEVICE_NVRAM: case VIR_DOMAIN_DEVICE_LAST: virReportError(VIR_ERR_INTERNAL_ERROR, _("Copying definition of '%d' type " diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 96f11ba..03b7c9a 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -108,6 +108,9 @@ typedef virDomainChrDef *virDomainChrDefPtr; typedef struct _virDomainMemballoonDef virDomainMemballoonDef; typedef virDomainMemballoonDef *virDomainMemballoonDefPtr; +typedef struct _virDomainNVRAMDef virDomainNVRAMDef; +typedef virDomainNVRAMDef *virDomainNVRAMDefPtr; + typedef struct _virDomainSnapshotObj virDomainSnapshotObj; typedef virDomainSnapshotObj *virDomainSnapshotObjPtr; @@ -136,6 +139,7 @@ typedef enum { VIR_DOMAIN_DEVICE_SMARTCARD, VIR_DOMAIN_DEVICE_CHR, VIR_DOMAIN_DEVICE_MEMBALLOON, + VIR_DOMAIN_DEVICE_NVRAM, VIR_DOMAIN_DEVICE_RNG, VIR_DOMAIN_DEVICE_LAST @@ -162,6 +166,7 @@ struct _virDomainDeviceDef { virDomainSmartcardDefPtr smartcard; virDomainChrDefPtr chr; virDomainMemballoonDefPtr memballoon; + virDomainNVRAMDefPtr nvram; virDomainRNGDefPtr rng; } data; }; @@ -1423,6 +1428,9 @@ struct _virDomainMemballoonDef { virDomainDeviceInfo info; }; +struct _virDomainNVRAMDef { + virDomainDeviceInfo info; +}; enum virDomainSmbiosMode { VIR_DOMAIN_SMBIOS_NONE = 0, @@ -1883,6 +1891,7 @@ struct _virDomainDef { /* Only 1 */ virDomainWatchdogDefPtr watchdog; virDomainMemballoonDefPtr memballoon; + virDomainNVRAMDefPtr nvram; virCPUDefPtr cpu; virSysinfoDefPtr sysinfo; virDomainRedirFilterDefPtr redirfilter; @@ -2015,6 +2024,7 @@ int virDomainChrSourceDefCopy(virDomainChrSourceDefPtr src, void virDomainSoundCodecDefFree(virDomainSoundCodecDefPtr def); void virDomainSoundDefFree(virDomainSoundDefPtr def); void virDomainMemballoonDefFree(virDomainMemballoonDefPtr def); +void virDomainNVRAMDefFree(virDomainNVRAMDefPtr def); void virDomainWatchdogDefFree(virDomainWatchdogDefPtr def); void virDomainVideoDefFree(virDomainVideoDefPtr def); virDomainHostdevDefPtr virDomainHostdevDefAlloc(void); diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 4891b65..26c3001 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -1169,6 +1169,15 @@ int qemuDomainAssignSpaprVIOAddresses(virDomainDefPtr def, goto cleanup; } + if (def->nvram) { + if (def->os.arch == VIR_ARCH_PPC64 && + STREQ(def->os.machine, "pseries")) + def->nvram->info.type = VIR_DOMAIN_DEVICE_ADDRESS_TYPE_SPAPRVIO; + if (qemuAssignSpaprVIOAddress(def, &def->nvram->info, + 0x3000ul) < 0) + goto cleanup; + } + /* No other devices are currently supported on spapr-vio */ ret = 0; @@ -3809,6 +3818,32 @@ error: return NULL; } +char * +qemuBuildNVRAMDevStr(virDomainNVRAMDefPtr dev) +{ + virBuffer buf = VIR_BUFFER_INITIALIZER; + + if (dev->info.type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_SPAPRVIO && + dev->info.addr.spaprvio.has_reg) { + virBufferAsprintf(&buf, "spapr-nvram.reg=0x%llx", + dev->info.addr.spaprvio.reg); + } else { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + "%s", _("NVRAM device address is not supported.\n")); + goto error; + } + + if (virBufferError(&buf)) { + virReportOOMError(); + goto error; + } + + return virBufferContentAndReset(&buf); + +error: + virBufferFreeAndReset(&buf); + return NULL; +} char * qemuBuildUSBInputDevStr(virDomainInputDefPtr dev, @@ -7492,6 +7527,21 @@ qemuBuildCommandLine(virConnectPtr conn, goto error; } + if (def->nvram) { + if (def->os.arch == VIR_ARCH_PPC64 && + STREQ(def->os.machine, "pseries")) { + char *optstr; + virCommandAddArg(cmd, "-global"); + optstr = qemuBuildNVRAMDevStr(def->nvram); + if (!optstr) + goto error; + if (optstr) + virCommandAddArg(cmd, optstr); + VIR_FREE(optstr); + } else + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("NVRAM device is not supported")); + } if (snapshot) virCommandAddArgList(cmd, "-loadvm", snapshot->def->name, NULL); @@ -9584,6 +9634,23 @@ virDomainDefPtr qemuParseCommandLine(virCapsPtr qemuCaps, goto error; } + } else if (STREQ(arg, "-global") && + STRPREFIX(progargv[i + 1], "spapr-nvram.reg=")) { + + WANT_VALUE(); + + if (VIR_ALLOC(def->nvram) < 0) + goto no_memory; + + val += strlen("spapr-nvram.reg="); + if (virStrToLong_ull(val, NULL, 16, + &def->nvram->info.addr.spaprvio.reg) < 0) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("invalid value for spapr-nvram.reg :" + "'%s'"), val); + goto error; + } + } else if (STREQ(arg, "-S")) { /* ignore, always added by libvirt */ } else { diff --git a/src/qemu/qemu_command.h b/src/qemu/qemu_command.h index 17687f4..2b60997 100644 --- a/src/qemu/qemu_command.h +++ b/src/qemu/qemu_command.h @@ -118,6 +118,8 @@ char * qemuBuildWatchdogDevStr(virDomainWatchdogDefPtr dev, char * qemuBuildMemballoonDevStr(virDomainMemballoonDefPtr dev, virQEMUCapsPtr qemuCaps); +char * qemuBuildNVRAMDevStr(virDomainNVRAMDefPtr dev); + char * qemuBuildUSBInputDevStr(virDomainInputDefPtr dev, virQEMUCapsPtr qemuCaps); -- 1.7.10.1

2 9

[libvirt] [PATCH] qemu: fix crash in qemuOpen
by Ján Tomko 11 Apr '13

11 Apr '13

If the path part of connection URI is not present, cfg is used unitialized. https://bugzilla.redhat.com/show_bug.cgi?id=950855 --- 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 2c0d7d1..0d41e39 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -1025,16 +1025,16 @@ static virDrvOpenStatus qemuOpen(virConnectPtr conn, _("qemu state driver is not active")); goto cleanup; } + cfg = virQEMUDriverGetConfig(qemu_driver); if (conn->uri->path == NULL) { virReportError(VIR_ERR_INTERNAL_ERROR, _("no QEMU URI path given, try %s"), cfg->uri); goto cleanup; } - cfg = virQEMUDriverGetConfig(qemu_driver); if (cfg->privileged) { if (STRNEQ(conn->uri->path, "/system") && STRNEQ(conn->uri->path, "/session")) { virReportError(VIR_ERR_INTERNAL_ERROR, -- 1.8.1.5

2 2

[libvirt] [PATCH v3] qemu: Set correct migrate host in client_migrate_info
by Michal Privoznik 11 Apr '13

11 Apr '13

https://bugzilla.redhat.com/show_bug.cgi?id=920441 Currently, we are discarding listen attribute from qemu cookie even though we strive to gather it. This result in not so cool bug: if user have different networks, one for management/migration, and one for VNC/SPICE we pass incorrect host to the qemu in client_migrate_info. What we actually pass is remote hostname, while we should be passing remote listen address. It doesn't matter as long as these two are the same, but they don't need necessary to be like that. --- src/conf/domain_conf.c | 4 +++- src/qemu/qemu_migration.c | 8 +++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 68f024f..6757738 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -16557,8 +16557,10 @@ virDomainGraphicsListenGetAddress(virDomainGraphicsDefPtr def, size_t ii) virDomainGraphicsListenDefPtr listenInfo = virDomainGraphicsGetListen(def, ii, false); + /* even a network can have a listen address */ if (!listenInfo || - (listenInfo->type != VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_ADDRESS)) + !(listenInfo->type == VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_ADDRESS || + listenInfo->type == VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_NETWORK)) return NULL; return listenInfo->address; } diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 41ad768..a263668 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -1720,6 +1720,7 @@ qemuDomainMigrateGraphicsRelocate(virQEMUDriverPtr driver, { qemuDomainObjPrivatePtr priv = vm->privateData; int ret; + char *listenAddress = cookie->graphics->listen; if (!cookie) return 0; @@ -1733,12 +1734,17 @@ qemuDomainMigrateGraphicsRelocate(virQEMUDriverPtr driver, if (cookie->graphics->type != VIR_DOMAIN_GRAPHICS_TYPE_SPICE) return 0; + if (!listenAddress || + STREQ(listenAddress, "0.0.0.0") || + STREQ(listenAddress, "::")) + listenAddress = cookie->remoteHostname; + ret = qemuDomainObjEnterMonitorAsync(driver, vm, QEMU_ASYNC_JOB_MIGRATION_OUT); if (ret == 0) { ret = qemuMonitorGraphicsRelocate(priv->mon, cookie->graphics->type, - cookie->remoteHostname, + listenAddress, cookie->graphics->port, cookie->graphics->tlsPort, cookie->graphics->tlsSubject); -- 1.8.1.5

2 1

[libvirt] [PATCH] conf: fix error for parallel port mismatch
by Ján Tomko 11 Apr '13

11 Apr '13

--- src/conf/domain_conf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 68f024f..36a46da 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -11940,7 +11940,7 @@ virDomainParallelDefCheckABIStability(virDomainChrDefPtr src, { if (src->target.port != dst->target.port) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Target serial port %d does not match source %d"), + _("Target parallel port %d does not match source %d"), dst->target.port, src->target.port); return false; } -- 1.8.1.5

2 2

Re: [libvirt] [Autotest] [RFC] Autotest Project Weekly Hangout
by Amos Kong 11 Apr '13

11 Apr '13

CC: qemu-devel, kvm, libvirt-list On Thu, Apr 11, 2013 at 4:43 AM, Lucas Meneghel Rodrigues <lmr(a)redhat.com>wrote: > Hi guys, > > I'd like to propose yet another hipster-y initiative: A weekly hangout, > where contributors from all affiliations that work on autotest/virt-tests > or any project under the autotest umbrella get to talk about 30 minutes on > issues, new features and similar stuff. > > The proposed date/time would be every Thursday, 12:00 PM UTC. > $ date -d 'Thursday, 12:00 PM UTC' Thu Apr 11 20:00:00 CST 2013 (for +8000 timezone) > > So, what do you guys say? > > Cheers, > > Lucas > > ______________________________**_________________ > Autotest-kernel mailing list > Autotest-kernel(a)redhat.com > https://www.redhat.com/**mailman/listinfo/autotest-**kernel<https://www.redhat.com/mailman/listinfo/autotest-kernel> >

1 0

[libvirt] [PATCH 0/8] cleanup: Use bool type instead of bitfield
by Osier Yang 11 Apr '13

11 Apr '13

This changes all the bitfield into bool type in domain_conf.h, except domain->autostart, domain->persistent, and domain->updated, as the public APIs like virDomainIsPersistent returns domain->persistent as integer, they can be changed internally, but not that deserved. Osier Yang (8): Cleanup: Change datatype of hostdev->managed to boolean Cleanup: Change datatype of origstate's members into boolean cleanup: Change datatype of hostdev->missing to boolean cleanup: Change datatype of auth->expires to boolean cleanup: Change datatype of disk->shared to boolean cleanup: Change datatype of disk->transient to boolean cleanup: Change datatype of disk->readonly to boolean cleanup: Change datatype of fs->readonly to boolean src/conf/domain_conf.c | 20 ++++++------- src/conf/domain_conf.h | 20 ++++++------- src/lxc/lxc_hostdev.c | 2 +- src/parallels/parallels_driver.c | 2 +- src/qemu/qemu_command.c | 10 +++---- src/qemu/qemu_hostdev.c | 2 +- src/util/virpci.c | 64 ++++++++++++++++++++-------------------- src/util/virpci.h | 8 ++--- src/vbox/vbox_tmpl.c | 12 ++++---- src/xenxs/xen_sxpr.c | 8 ++--- src/xenxs/xen_xm.c | 8 ++--- 11 files changed, 78 insertions(+), 78 deletions(-) -- 1.8.1.4

2 10

[libvirt] Several pending patches for PPC64
by Li Zhang 11 Apr '13

11 Apr '13

Hi Daniel, I have several patches pending in mailing list. Would you mind giving more suggestions? Thanks a lot. :) [PATCH v4 1/2] Add USB option capability https://www.redhat.com/archives/libvir-list/2013-April/msg00587.html [PATCH v4 2/2]testcase: Add a new USB option test case https://www.redhat.com/archives/libvir-list/2013-April/msg00586.html [PATCH v3 1/3] Add NVRAM device https://www.redhat.com/archives/libvir-list/2013-March/msg01508.html [PATCH v3 2/3]doc: add NVRAM device https://www.redhat.com/archives/libvir-list/2013-March/msg01509.html [PATCH v3 3/3] Add NVRAM test cases https://www.redhat.com/archives/libvir-list/2013-March/msg01510.html [PATCH 1/1][RESEND] Set legacy USB option with default for ppc64. https://www.redhat.com/archives/libvir-list/2013-April/msg00588.html [PATCH 1/1][RESEND] ppc64 cpu features https://www.redhat.com/archives/libvir-list/2013-March/msg00726.html

1 0

Re: [libvirt] fail to convert qemu xml to args with libvirt-1.0.4: An error occurred, but the cause is unknown
by Yin Olivia-R63875 11 Apr '13

11 Apr '13

Hi Daniel, Just Ping. Did you ever successfully convert QEMU xml file to argv on other platforms? Best Regards, Olivia > -----Original Message----- > From: Yin Olivia-R63875 > Sent: Tuesday, April 09, 2013 1:22 PM > To: 'libvir-list(a)redhat.com' > Cc: 'libvirt-users(a)redhat.com' > Subject: fail to convert qemu xml to args with libvirt-1.0.4: An error > occurred, but the cause is unknown > > Hi, > > I used to convert qemu XML to args with libvirt-1.0.3. > But it failed to convert with libvirt-1.0.4. > > # virsh domxml-to-native qemu-argv test.xml >test.sh > error: An error occurred, but the cause is unknown > > > Comparing the debug file as below: > 1) lbvirt-1.0.3 > <cut> > 2013-04-09 03:23:47.296+0000: 2669: debug : > virEventPollInterruptLocked:716 : Interrupting > 2013-04-09 03:23:47.296+0000: 2669: debug : virNetClientIO:1807 : All done > with our call head=(nil) call=0x100871c0 rv=0 > 2013-04-09 03:23:47.297+0000: 2670: debug : virEventPollRunOnce:640 : Poll > got 1 event(s) > 2013-04-09 03:23:47.297+0000: 2670: debug : > virEventPollDispatchTimeouts:425 : Dispatch 0 > 2013-04-09 03:23:47.297+0000: 2669: debug : virNetMessageFree:73 : > msg=0x10087500 nfds=0 cb=(nil) > 2013-04-09 03:23:47.297+0000: 2670: debug : > virEventPollDispatchHandles:470 : Dispatch 1 > 2013-04-09 03:23:47.297+0000: 2670: debug : > virEventPollDispatchHandles:484 : i=0 w=1 > 2013-04-09 03:23:47.297+0000: 2669: debug : virConnectClose:1483 : > conn=0x100878b8 <cut> > > 2) libvirt-1.0.4 > <cut> > 2013-04-09 03:07:58.012+0000: 2834: debug : > virEventPollInterruptLocked:716 : Interrupting > 2013-04-09 03:07:58.012+0000: 2834: debug : virNetClientIO:1810 : All done > with our call head=(nil) call=0x10089db8 rv=0 > 2013-04-09 03:07:58.012+0000: 2835: debug : virEventPollRunOnce:640 : Poll > got 1 event(s) > 2013-04-09 03:07:58.012+0000: 2835: debug : > virEventPollDispatchTimeouts:425 : Dispatch 0 > 2013-04-09 03:07:58.012+0000: 2834: error : > virNetClientProgramDispatchError:175 : An error occurred, but the cause is > unknown > 2013-04-09 03:07:58.012+0000: 2835: debug : > virEventPollDispatchHandles:470 : Dispatch 1 > 2013-04-09 03:07:58.012+0000: 2834: debug : virNetMessageFree:73 : > msg=0x1008a0f8 nfds=0 cb=(nil) > 2013-04-09 03:07:58.012+0000: 2835: debug : > virEventPollDispatchHandles:484 : i=0 w=1 > 2013-04-09 03:07:58.012+0000: 2835: debug : > virEventPollDispatchHandles:498 : EVENT_POLL_DISPATCH_HANDLE: watch=1 > events=1 > 2013-04-09 03:07:58.012+0000: 2835: debug : > virEventPollCleanupTimeouts:516 : Cleanup 0 > 2013-04-09 03:07:58.013+0000: 2835: debug : > virEventPollCleanupTimeouts:552 : Found 0 out of 0 timeout slots used, > releasing 0 > 2013-04-09 03:07:58.013+0000: 2835: debug : virEventPollCleanupHandles:564 : > Cleanup 2 > 2013-04-09 03:07:58.013+0000: 2834: debug : virConnectClose:1483 : > conn=0x1008a4b0 <cut> > > > How can I debug this cause unknown error? > > Best Regards, > Olivia

1 0

[libvirt] [PATCH] conf: fix a memory leak when parsing nat port XML nodes
by Guannan Ren 11 Apr '13

11 Apr '13

==5306== 8 bytes in 1 blocks are definitely lost in loss record 24 of 277 ==5306== at 0x4C28B2F: calloc (vg_replace_malloc.c:593) ==5306== by 0x5293CAF: virAllocN (viralloc.c:152) ==5306== by 0x52DFEAE: virXPathNodeSet (virxml.c:611) ==5306== by 0x5313DD9: virNetworkDefParseXML (network_conf.c:1408) ==5306== by 0x53170F6: virNetworkObjUpdateParseFile (network_conf.c:2031) ==5306== by 0x131DA63C: networkStartup (bridge_driver.c:279) ==5306== by 0x53481DF: virStateInitialize (libvirt.c:822) ==5306== by 0x40DF44: daemonRunStateInit (libvirtd.c:877) ==5306== by 0x52D2FF5: virThreadHelper (virthreadpthread.c:161) ==5306== by 0x5D00C52: start_thread (in /usr/lib64/libpthread-2.17.so) ==5306== by 0x6410ECC: clone (in /usr/lib64/libc-2.17.so) --- src/conf/network_conf.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c index c5535e6..968cf11 100644 --- a/src/conf/network_conf.c +++ b/src/conf/network_conf.c @@ -1440,6 +1440,7 @@ cleanup: VIR_FREE(addrStart); VIR_FREE(addrEnd); VIR_FREE(natAddrNodes); + VIR_FREE(natPortNodes); ctxt->node = save; return ret; } -- 1.7.11.2

2 2

[libvirt] [libvirt-designer v2] Add Vala API
by Zeeshan Ali (Khattak) 11 Apr '13

11 Apr '13

From: "Zeeshan Ali (Khattak)" <zeeshanak(a)gnome.org> This is mostly (modified) copy&paste from libvirt-glib. --- v2: Removed redundant libvirt-gobject dependency. Makefile.am | 2 +- configure.ac | 37 +++++++++++++++++++++++++++++++++++++ vapi/Makefile.am | 25 +++++++++++++++++++++++++ vapi/libvirt-designer-1.0.deps | 2 ++ 4 files changed, 65 insertions(+), 1 deletion(-) create mode 100644 vapi/Makefile.am create mode 100644 vapi/libvirt-designer-1.0.deps diff --git a/Makefile.am b/Makefile.am index f5bcc47..53d36ea 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,5 +1,5 @@ -SUBDIRS = libvirt-designer examples docs +SUBDIRS = libvirt-designer vapi examples docs ACLOCAL_AMFLAGS = -I m4 diff --git a/configure.ac b/configure.ac index a9c5c34..c999826 100644 --- a/configure.ac +++ b/configure.ac @@ -71,10 +71,46 @@ if test "x$enable_examples" != "xno" ; then fi AM_CONDITIONAL(WITH_EXAMPLES, [test "x$enable_examples" = "xyes"]) +AC_ARG_ENABLE([vala], + AS_HELP_STRING([--enable-vala], [enable Vala binding generation]), + [], [enable_vala=check]) +if test "x$enable_introspection" = "xyes" ; then + if test "x$enable_vala" != "xno" ; then + AC_PATH_PROG(VAPIGEN, vapigen, no) + if test "x$VAPIGEN" == "xno"; then + if test "x$enable_vala" == "xcheck" ; then + enable_vala=no + else + AC_MSG_ERROR([Cannot find the "vapigen" binary in your PATH]) + fi + fi + AC_SUBST(VAPIGEN) + fi + if test "x$enable_vala" != "xno" ; then + AC_MSG_CHECKING([$VAPIGEN support for --metadatadir]) + $VAPIGEN --help | grep metadatadir 1>/dev/null 2>&1 + if test $? != 0 ; then + if test "x$enable_vala" == "xcheck" ; then + enable_vala=no + AC_MSG_RESULT([no]) + else + AC_MSG_ERROR(["vapigen" binary in your PATH is too old (< 0.13)]) + fi + else + AC_MSG_RESULT([no]) + fi + fi + if test "x$enable_vala" = "xcheck" ; then + enable_vala=yes + fi +fi +AM_CONDITIONAL([WITH_VALA], [test "x$enable_vala" = "xyes"]) + AC_OUTPUT(Makefile libvirt-designer/Makefile libvirt-designer.spec libvirt-designer-1.0.pc + vapi/Makefile docs/Makefile examples/Makefile) @@ -83,6 +119,7 @@ AC_MSG_NOTICE([Configuration summary]) AC_MSG_NOTICE([=====================]) AC_MSG_NOTICE([]) AC_MSG_NOTICE([]) +AC_MSG_NOTICE([ Vala API: $enable_vala]) AC_MSG_NOTICE([ examples: $enable_examples]) AC_MSG_NOTICE([]) AC_MSG_NOTICE([]) diff --git a/vapi/Makefile.am b/vapi/Makefile.am new file mode 100644 index 0000000..0c5d117 --- /dev/null +++ b/vapi/Makefile.am @@ -0,0 +1,25 @@ +NULL = + +if WITH_VALA +vapidir = $(datadir)/vala/vapi +vapi_DATA = \ + libvirt-designer-1.0.deps \ + libvirt-designer-1.0.vapi \ + $(NULL) + +libvirt-designer-1.0.vapi: $(top_builddir)/libvirt-designer/LibvirtDesigner-1.0.gir + $(AM_V_GEN)$(VAPIGEN) \ + --vapidir=$(builddir) \ + --pkg gio-2.0 \ + --pkg libosinfo-1.0 \ + --pkg libvirt-gconfig-1.0 \ + --library libvirt-designer-1.0 \ + --metadatadir=$(srcdir) \ + $< +endif + +CLEANFILES = \ + libvirt-designer-1.0.vapi \ + $(NULL) + +EXTRA_DIST = libvirt-designer-1.0.deps diff --git a/vapi/libvirt-designer-1.0.deps b/vapi/libvirt-designer-1.0.deps new file mode 100644 index 0000000..ba30bfd --- /dev/null +++ b/vapi/libvirt-designer-1.0.deps @@ -0,0 +1,2 @@ +libosinfo-1.0 +libvirt-gconfig-1.0 -- 1.8.1.4

1 0

[libvirt] [libvirt-designer] Add Vala API
by Zeeshan Ali (Khattak) 11 Apr '13

11 Apr '13

From: "Zeeshan Ali (Khattak)" <zeeshanak(a)gnome.org> This is mostly (modified) copy&paste from libvirt-glib. --- Makefile.am | 2 +- configure.ac | 37 +++++++++++++++++++++++++++++++++++++ vapi/Makefile.am | 26 ++++++++++++++++++++++++++ vapi/libvirt-designer-1.0.deps | 3 +++ 4 files changed, 67 insertions(+), 1 deletion(-) create mode 100644 vapi/Makefile.am create mode 100644 vapi/libvirt-designer-1.0.deps diff --git a/Makefile.am b/Makefile.am index f5bcc47..53d36ea 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,5 +1,5 @@ -SUBDIRS = libvirt-designer examples docs +SUBDIRS = libvirt-designer vapi examples docs ACLOCAL_AMFLAGS = -I m4 diff --git a/configure.ac b/configure.ac index a9c5c34..c999826 100644 --- a/configure.ac +++ b/configure.ac @@ -71,10 +71,46 @@ if test "x$enable_examples" != "xno" ; then fi AM_CONDITIONAL(WITH_EXAMPLES, [test "x$enable_examples" = "xyes"]) +AC_ARG_ENABLE([vala], + AS_HELP_STRING([--enable-vala], [enable Vala binding generation]), + [], [enable_vala=check]) +if test "x$enable_introspection" = "xyes" ; then + if test "x$enable_vala" != "xno" ; then + AC_PATH_PROG(VAPIGEN, vapigen, no) + if test "x$VAPIGEN" == "xno"; then + if test "x$enable_vala" == "xcheck" ; then + enable_vala=no + else + AC_MSG_ERROR([Cannot find the "vapigen" binary in your PATH]) + fi + fi + AC_SUBST(VAPIGEN) + fi + if test "x$enable_vala" != "xno" ; then + AC_MSG_CHECKING([$VAPIGEN support for --metadatadir]) + $VAPIGEN --help | grep metadatadir 1>/dev/null 2>&1 + if test $? != 0 ; then + if test "x$enable_vala" == "xcheck" ; then + enable_vala=no + AC_MSG_RESULT([no]) + else + AC_MSG_ERROR(["vapigen" binary in your PATH is too old (< 0.13)]) + fi + else + AC_MSG_RESULT([no]) + fi + fi + if test "x$enable_vala" = "xcheck" ; then + enable_vala=yes + fi +fi +AM_CONDITIONAL([WITH_VALA], [test "x$enable_vala" = "xyes"]) + AC_OUTPUT(Makefile libvirt-designer/Makefile libvirt-designer.spec libvirt-designer-1.0.pc + vapi/Makefile docs/Makefile examples/Makefile) @@ -83,6 +119,7 @@ AC_MSG_NOTICE([Configuration summary]) AC_MSG_NOTICE([=====================]) AC_MSG_NOTICE([]) AC_MSG_NOTICE([]) +AC_MSG_NOTICE([ Vala API: $enable_vala]) AC_MSG_NOTICE([ examples: $enable_examples]) AC_MSG_NOTICE([]) AC_MSG_NOTICE([]) diff --git a/vapi/Makefile.am b/vapi/Makefile.am new file mode 100644 index 0000000..0aecb7e --- /dev/null +++ b/vapi/Makefile.am @@ -0,0 +1,26 @@ +NULL = + +if WITH_VALA +vapidir = $(datadir)/vala/vapi +vapi_DATA = \ + libvirt-designer-1.0.deps \ + libvirt-designer-1.0.vapi \ + $(NULL) + +libvirt-designer-1.0.vapi: $(top_builddir)/libvirt-designer/LibvirtDesigner-1.0.gir + $(AM_V_GEN)$(VAPIGEN) \ + --vapidir=$(builddir) \ + --pkg gio-2.0 \ + --pkg libosinfo-1.0 \ + --pkg libvirt-gobject-1.0 \ + --pkg libvirt-gconfig-1.0 \ + --library libvirt-designer-1.0 \ + --metadatadir=$(srcdir) \ + $< +endif + +CLEANFILES = \ + libvirt-designer-1.0.vapi \ + $(NULL) + +EXTRA_DIST = libvirt-designer-1.0.deps diff --git a/vapi/libvirt-designer-1.0.deps b/vapi/libvirt-designer-1.0.deps new file mode 100644 index 0000000..757e44e --- /dev/null +++ b/vapi/libvirt-designer-1.0.deps @@ -0,0 +1,3 @@ +libosinfo-1.0 +libvirt-gobject-1.0 +libvirt-gconfig-1.0 -- 1.8.1.4

1 0

[libvirt] [PATCH] v2:Support for adding a static route to a bridge
by Gene Czarcinski 10 Apr '13

10 Apr '13

This patch adds support for adding a static route for a network. The "via" specifies the gateway's IP address. Both IPv4 and IPv6 static routes are supported although it is expected that this functionality will have more use with IPv6. Extensive tests are done to validate that the input definitions are correct. For example, for a static route ip definition, the address must be for a network and not a host. Additional checks are added to ensure that the specified gateway has a network defined on this bridge. Whan a static route is added to a bridge, there is a slight possibility that the gateway address will be incorrect. If this is handled as an error, that bridge becomes unusable and can only be recovered by rebooting. If the error is ignored, then that network can be destroyed and the network definition file edited to correct the problem. Unfortunately, the error message only appears in syslog. However, with the checks performed when the network definition file is parsed, it is unlikely that this condition will ever occur. The command used is of the following form: ip route add <address>/<prefix> via <gateway> dev <virbr-bridge> \ proto static metric 1 . Signed-off-by: Gene Czarcinski <gene(a)czarc.net> --- docs/formatnetwork.html.in | 32 +++- docs/schemas/network.rng | 3 + src/conf/network_conf.c | 168 ++++++++++++++++++++- src/conf/network_conf.h | 2 + src/libvirt_private.syms | 1 + src/network/bridge_driver.c | 42 ++++++ src/util/virnetdev.c | 47 ++++++ src/util/virnetdev.h | 5 + .../networkxml2xmlin/dhcp6host-routed-network.xml | 4 + .../networkxml2xmlout/dhcp6host-routed-network.xml | 4 + 10 files changed, 304 insertions(+), 4 deletions(-) diff --git a/docs/formatnetwork.html.in b/docs/formatnetwork.html.in index 4dd0415..f0cadf0 100644 --- a/docs/formatnetwork.html.in +++ b/docs/formatnetwork.html.in @@ -537,7 +537,9 @@ associated with the virtual network, and optionally enable DHCP services. These elements are only valid for isolated networks (no <code>forward</code> element specified), and for those with - a forward mode of 'route' or 'nat'. + a forward mode of 'route' or 'nat'. Another optional addressing + element <code>via</code> can be used to establish a static + route for IPv4 or IPv6 networks. </p> <pre> @@ -560,6 +562,7 @@ </dhcp> </ip> <ip family="ipv6" address="2001:db8:ca2:2::1" prefix="64" /> + <ip family="ipv6" address="2001:db9:ca1:1::" prefix="64" via="2001:db8:ca2:2::2" /> </network></pre> <dl> @@ -633,7 +636,10 @@ IPv6, multiple addresses on a single network, <code>family</code>, and <code>prefix</code> are support <span class="since">Since 0.8.7</span>. Similar to IPv4, one IPv6 address per network can also have - a <code>dhcp</code> definition. <span class="since">Since 1.0.1</span> + a <code>dhcp</code> definition. <span class="since">Since 1.0.1</span> The <code>via</code> + can be used to establish a static route for IPv4 or IPv6 networks. It is an error + to specify <code>via</code> and <code>dhcp</code> for the same IP address. + <span class="since">Since 1.0.4</span> <dl> <dt><code>tftp</code></dt> @@ -809,6 +815,28 @@ </ip> </network></pre> + <p> + Below is yet another IPv6 variation. This variation has only IPv6 + defined with DHCPv6 on the primary IPv6 network. A second IPv6 + network has a static link to a host on the first (virtual) IPv6 + network. <span class="since">Since 1.0.4</span> + </p> + + <pre> + <network> + <name>net7</name> + <bridge name="virbr7" /> + <forward mode="route"/> + <ip family="ipv6" address="2001:db8:ca2:7::1" prefix="64" > + <dhcp> + <range start="2001:db8:ca2:7::100" end="2001:db8:ca2::1ff" /> + <host id="0:4:7e:7d:f0:7d:a8:bc:c5:d2:13:32:11:ed:16:ea:84:63" name="lucas" ip="2001:db8:ca2:2:3::4" /> + </dhcp> + </ip> + <ip family="ipv6" address="2001:db8:ca2:8::" prefix="64" via="2001:db8:ca2::4" > + </ip> + </network></pre> + <h3><a name="examplesPrivate">Isolated network config</a></h3> <p> diff --git a/docs/schemas/network.rng b/docs/schemas/network.rng index 6c3fae2..c1cca23 100644 --- a/docs/schemas/network.rng +++ b/docs/schemas/network.rng @@ -262,6 +262,9 @@ <attribute name="family"><ref name="addr-family"/></attribute> </optional> <optional> + <attribute name="via"><ref name="ipAddr"/></attribute> + </optional> + <optional> <element name="tftp"> <attribute name="root"><text/></attribute> </element> diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c index c022fe4..ea98d85 100644 --- a/src/conf/network_conf.c +++ b/src/conf/network_conf.c @@ -1149,8 +1149,10 @@ virNetworkIPDefParseXML(const char *networkName, xmlNodePtr cur, save; char *address = NULL, *netmask = NULL; - unsigned long prefix; + char *gateway = NULL; + unsigned long prefix = 0; int result = -1; + virSocketAddr testAddr; save = ctxt->node; ctxt->node = node; @@ -1162,6 +1164,7 @@ virNetworkIPDefParseXML(const char *networkName, def->prefix = 0; else def->prefix = prefix; + gateway = virXPathString("string(./@via)", ctxt); netmask = virXPathString("string(./@netmask)", ctxt); @@ -1175,7 +1178,17 @@ virNetworkIPDefParseXML(const char *networkName, } - /* validate family vs. address */ + if (gateway) { + if (virSocketAddrParse(&def->gateway, gateway, AF_UNSPEC) < 0) { + virReportError(VIR_ERR_XML_ERROR, + _("Bad gateway address '%s' in definition of network '%s'"), + gateway, networkName); + goto cleanup; + } + + } + + /* validate family vs. address (and gateway address too) */ if (def->family == NULL) { if (!(VIR_SOCKET_ADDR_IS_FAMILY(&def->address, AF_INET) || VIR_SOCKET_ADDR_IS_FAMILY(&def->address, AF_UNSPEC))) { @@ -1184,6 +1197,20 @@ virNetworkIPDefParseXML(const char *networkName, address, networkName); goto cleanup; } + if (gateway && + (!(VIR_SOCKET_ADDR_IS_FAMILY(&def->gateway, AF_INET) || + VIR_SOCKET_ADDR_IS_FAMILY(&def->gateway, AF_UNSPEC)))) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("no family specified for non-IPv4 gateway address '%s' in network '%s'"), + address, networkName); + goto cleanup; + } + if (def->prefix > 0 && def->prefix > 32) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("invalid prefix=%u specified for IPv4 address '%s' in network '%s'"), + def->prefix, address, networkName); + goto cleanup; + } } else if (STREQ(def->family, "ipv4")) { if (!VIR_SOCKET_ADDR_IS_FAMILY(&def->address, AF_INET)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, @@ -1191,6 +1218,18 @@ virNetworkIPDefParseXML(const char *networkName, address, networkName); goto cleanup; } + if (gateway && (!VIR_SOCKET_ADDR_IS_FAMILY(&def->gateway, AF_INET))) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("family 'ipv4' specified for non-IPv4 gateway address '%s' in network '%s'"), + address, networkName); + goto cleanup; + } + if (def->prefix > 0 && def->prefix > 32) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("invalid prefix=%u specified for IPv4 address '%s' in network '%s'"), + def->prefix, address, networkName); + goto cleanup; + } } else if (STREQ(def->family, "ipv6")) { if (!VIR_SOCKET_ADDR_IS_FAMILY(&def->address, AF_INET6)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, @@ -1198,6 +1237,24 @@ virNetworkIPDefParseXML(const char *networkName, address, networkName); goto cleanup; } + if (def->prefix == 0 || def->prefix > 64) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("invalid prefix=%u specified for IPv6 address '%s' in network '%s'"), + def->prefix, address, networkName); + goto cleanup; + } + if (netmask) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("specifying netmask invalid for IPv6 address '%s' in network '%s'"), + address, networkName); + goto cleanup; + } + if (gateway && (!VIR_SOCKET_ADDR_IS_FAMILY(&def->gateway, AF_INET6))) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("family 'ipv6' specified for non-IPv6 gateway address '%s' in network '%s'"), + gateway, networkName); + goto cleanup; + } } else { virReportError(VIR_ERR_XML_ERROR, _("Unrecognized family '%s' in definition of network '%s'"), @@ -1241,16 +1298,55 @@ virNetworkIPDefParseXML(const char *networkName, } } + /* if static route gateway specified, make sure the address is a network address */ + if (gateway) { + if (def->prefix > 0) { + if (virSocketAddrMaskByPrefix(&def->address, def->prefix, &testAddr) < 0) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("error converting address '%s' with prefix=%u to network-address in network '%s'"), + address, def->prefix, networkName); + goto cleanup; + } + } + if (netmask) { + if (virSocketAddrMask(&def->address, &def->netmask, &testAddr) < 0) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("error converting address '%s' with netmask '%s' to network-address in network '%s'"), + address, netmask, networkName); + goto cleanup; + } + } + if (!virSocketAddrEqual(&def->address, &testAddr)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("address '%s' in network '%s' is not a network-address"), + address, networkName); + goto cleanup; + } + } + cur = node->children; while (cur != NULL) { if (cur->type == XML_ELEMENT_NODE && xmlStrEqual(cur->name, BAD_CAST "dhcp")) { + if (gateway) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("<dhcp> element unsupported when static route (via) previously defined in network '%s'"), + networkName); + goto cleanup; + } if (virNetworkDHCPDefParseXML(networkName, cur, def) < 0) goto cleanup; } else if (cur->type == XML_ELEMENT_NODE && xmlStrEqual(cur->name, BAD_CAST "tftp")) { char *root; + if (gateway) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("<tftp> element unsupported when static route (via) previously defined in network '%s'"), + networkName); + goto cleanup; + } + if (!VIR_SOCKET_ADDR_IS_FAMILY(&def->address, AF_INET)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Unsupported <tftp> element in an IPv6 element in network '%s'"), @@ -1274,6 +1370,7 @@ cleanup: } VIR_FREE(address); VIR_FREE(netmask); + VIR_FREE(gateway); ctxt->node = save; return result; @@ -1828,6 +1925,58 @@ virNetworkDefParseXML(xmlXPathContextPtr ctxt) goto error; def->nips++; } + /* now validate the correctness of any static route gateways specified + * + * note: the parameters within each definition are varified/assumed valid; + * the question being asked and answered here is if the specified gateway + * address has a network definition on this bridge + */ + for (ii = 0; ii < nIps; ii++) { + int jj; + virSocketAddr testAddr, testGw; + bool addrMatch; + virNetworkIpDefPtr gwdef = &def->ips[ii]; + if (VIR_SOCKET_ADDR_VALID(&gwdef->gateway)) { + addrMatch = false; + for (jj = 0; jj < nIps; jj++) { + virNetworkIpDefPtr def2 = &def->ips[jj]; + if (VIR_SOCKET_ADDR_VALID(&def2->gateway)) + continue; + if ((VIR_SOCKET_ADDR_IS_FAMILY(&gwdef->gateway, AF_INET6)) && + (!VIR_SOCKET_ADDR_IS_FAMILY(&def2->address, AF_INET6))) + continue; + if ((VIR_SOCKET_ADDR_IS_FAMILY(&def2->address, AF_INET6)) && + (!VIR_SOCKET_ADDR_IS_FAMILY(&gwdef->gateway, AF_INET6))) + continue; + if ((VIR_SOCKET_ADDR_IS_FAMILY(&gwdef->gateway, AF_INET) || + VIR_SOCKET_ADDR_IS_FAMILY(&gwdef->gateway, AF_UNSPEC)) && + VIR_SOCKET_ADDR_IS_FAMILY(&def2->address, AF_INET6)) + continue; + if (def2->prefix > 0) { + virSocketAddrMaskByPrefix(&def2->address, def2->prefix, &testAddr); + virSocketAddrMaskByPrefix(&gwdef->gateway, def2->prefix, &testGw); + } + if (VIR_SOCKET_ADDR_VALID(&def2->netmask)) { + virSocketAddrMask(&def2->address, &def2->netmask, &testAddr); + virSocketAddrMask(&gwdef->gateway, &def2->netmask, &testGw); + } + if (VIR_SOCKET_ADDR_VALID(&testAddr) && + VIR_SOCKET_ADDR_VALID(&testGw) && + virSocketAddrEqual(&testAddr, &testGw)) { + addrMatch = true; + break; + } + } + if (!addrMatch) { + char *gw = virSocketAddrFormat(&gwdef->gateway); + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("invalid static route gateway specified: '%s'"), + gw); + VIR_FREE(gw); + goto error; + } + } + } } VIR_FREE(ipNodes); @@ -2108,6 +2257,7 @@ virNetworkIpDefFormat(virBufferPtr buf, const virNetworkIpDefPtr def) { int result = -1; + bool routeFlg = false; virBufferAddLit(buf, "<ip"); @@ -2131,15 +2281,29 @@ virNetworkIpDefFormat(virBufferPtr buf, if (def->prefix > 0) { virBufferAsprintf(buf," prefix='%u'", def->prefix); } + if (VIR_SOCKET_ADDR_VALID(&def->gateway)) { + char *addr = virSocketAddrFormat(&def->gateway); + if (!addr) + goto error; + routeFlg = true; + virBufferAsprintf(buf, " via='%s'", addr); + VIR_FREE(addr); + } virBufferAddLit(buf, ">\n"); virBufferAdjustIndent(buf, 2); if (def->tftproot) { + if (routeFlg) /* this should not occur */ + goto error; /* but in case it does, better to error out */ virBufferEscapeString(buf, "<tftp root='%s' />\n", def->tftproot); } if ((def->nranges || def->nhosts)) { int ii; + + if (routeFlg) /* this should not occur */ + goto error; /* but in case it does, better to error out */ + virBufferAddLit(buf, "<dhcp>\n"); virBufferAdjustIndent(buf, 2); diff --git a/src/conf/network_conf.h b/src/conf/network_conf.h index 6ce9a00..91aff5f 100644 --- a/src/conf/network_conf.h +++ b/src/conf/network_conf.h @@ -115,6 +115,8 @@ struct _virNetworkIpDef { char *family; /* ipv4 or ipv6 - default is ipv4 */ virSocketAddr address; /* Bridge IP address */ + virSocketAddr gateway; /* gateway IP address for ip-route */ + /* One or the other of the following two will be used for a given * IP address, but never both. The parser guarantees this. * Use virNetworkIpDefPrefix/virNetworkIpDefNetmask rather diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index ed46479..988b97a 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1470,6 +1470,7 @@ virNetDevReplaceMacAddress; virNetDevReplaceNetConfig; virNetDevRestoreMacAddress; virNetDevRestoreNetConfig; +virNetDevSetGateway; virNetDevSetIPv4Address; virNetDevSetMAC; virNetDevSetMTU; diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index 31c8585..07058f3 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -2360,6 +2360,7 @@ out: return ret; } +/* add an IP address to a bridge */ static int networkAddAddrToBridge(virNetworkObjPtr network, virNetworkIpDefPtr ipdef) @@ -2380,6 +2381,28 @@ networkAddAddrToBridge(virNetworkObjPtr network, return 0; } +/* add an IP route to a bridge */ +static int +networkAddRouteToBridge(virNetworkObjPtr network, + virNetworkIpDefPtr ipdef) +{ + int prefix = virNetworkIpDefPrefix(ipdef); + + if (prefix < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("bridge '%s' has an invalid netmask or IP address"), + network->def->bridge); + return -1; + } + + if (virNetDevSetGateway(network->def->bridge, + &ipdef->address, + prefix, + &ipdef->gateway) < 0) + return -1; + return 0; +} + static int networkStartNetworkVirtual(struct network_driver *driver, virNetworkObjPtr network) @@ -2446,9 +2469,12 @@ networkStartNetworkVirtual(struct network_driver *driver, if (networkAddIptablesRules(driver, network) < 0) goto err1; + /* first, do all of the addresses */ for (ii = 0; (ipdef = virNetworkDefGetIpByIndex(network->def, AF_UNSPEC, ii)); ii++) { + if (VIR_SOCKET_ADDR_VALID(&ipdef->gateway)) + continue; /* this is a static route specification */ if (VIR_SOCKET_ADDR_IS_FAMILY(&ipdef->address, AF_INET)) v4present = true; if (VIR_SOCKET_ADDR_IS_FAMILY(&ipdef->address, AF_INET6)) @@ -2464,6 +2490,22 @@ networkStartNetworkVirtual(struct network_driver *driver, if (virNetDevSetOnline(network->def->bridge, 1) < 0) goto err2; + /* then do all of the static routes */ + for (ii = 0; + (ipdef = virNetworkDefGetIpByIndex(network->def, AF_UNSPEC, ii)); + ii++) { + + /* Add the IP route to the bridge */ + /* ignore errors, error msg will be generated */ + /* but libvirt will not know and net-destroy will work. */ + if (VIR_SOCKET_ADDR_VALID(&ipdef->gateway)) { + if (networkAddRouteToBridge(network, ipdef) < 0) { + /* an error occurred adding the static route */ + continue; /* for now, do nothing */ + } + } + } + /* If forward.type != NONE, turn on global IP forwarding */ if (network->def->forward.type != VIR_NETWORK_FORWARD_NONE && networkEnableIpForwarding(v4present, v6present) < 0) { diff --git a/src/util/virnetdev.c b/src/util/virnetdev.c index 296871c..c90b3d2 100644 --- a/src/util/virnetdev.c +++ b/src/util/virnetdev.c @@ -729,6 +729,7 @@ int virNetDevGetVLanID(const char *ifname ATTRIBUTE_UNUSED, * Add an IP address to an interface. This function *does not* remove * any previously added IP addresses - that must be done separately with * brDelInetAddress. + * TODO: what is "brDelInetAddress"? * * Returns 0 in case of success or -1 in case of error. */ @@ -769,6 +770,52 @@ cleanup: } /** + * virNetDevSetGateway: + * @ifname: the interface name + * @addr: the IP network address (IPv4 or IPv6) + * @prefix: number of 1 bits in the netmask + * @gateway: via address for route (same as @addr) + * + * Add a route for a network IP address to an interface. This function + * *does not* remove any previously added IP static routes. + * + * Returns 0 in case of success or -1 in case of error. + */ + +int virNetDevSetGateway(const char *ifname, + virSocketAddr *addr, + unsigned int prefix, + virSocketAddr *gateway) +{ + virCommandPtr cmd = NULL; + char *addrstr = NULL, *gatewaystr = NULL; + int ret = -1; + + if (!(addrstr = virSocketAddrFormat(addr))) + goto cleanup; + if (!(gatewaystr = virSocketAddrFormat(gateway))) + goto cleanup; + cmd = virCommandNew(IP_PATH); + virCommandAddArgList(cmd, "route", "add", NULL); + virCommandAddArgFormat(cmd, "%s/%u", addrstr, prefix); + virCommandAddArgList(cmd, "via", NULL); + virCommandAddArgFormat(cmd, "%s", gatewaystr); + virCommandAddArgList(cmd, "dev", ifname, NULL); + virCommandAddArgList(cmd, "proto", "static", "metric", NULL); + virCommandAddArgFormat(cmd, "%u", 1); + + if (virCommandRun(cmd, NULL) < 0) + goto cleanup; + + ret = 0; +cleanup: + VIR_FREE(addrstr); + VIR_FREE(gatewaystr); + virCommandFree(cmd); + return ret; +} + +/** * virNetDevClearIPv4Address: * @ifname: the interface name * @addr: the IP address (IPv4 or IPv6) diff --git a/src/util/virnetdev.h b/src/util/virnetdev.h index 06d0650..8b94ea8 100644 --- a/src/util/virnetdev.h +++ b/src/util/virnetdev.h @@ -42,6 +42,11 @@ int virNetDevSetIPv4Address(const char *ifname, virSocketAddr *addr, unsigned int prefix) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_RETURN_CHECK; +int virNetDevSetGateway(const char *ifname, + virSocketAddr *addr, + unsigned int prefix, + virSocketAddr *gateway) + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_RETURN_CHECK; int virNetDevClearIPv4Address(const char *ifname, virSocketAddr *addr, unsigned int prefix) diff --git a/tests/networkxml2xmlin/dhcp6host-routed-network.xml b/tests/networkxml2xmlin/dhcp6host-routed-network.xml index 2693d87..dcad62d 100644 --- a/tests/networkxml2xmlin/dhcp6host-routed-network.xml +++ b/tests/networkxml2xmlin/dhcp6host-routed-network.xml @@ -19,4 +19,8 @@ <host id='0:1:0:1:18:aa:62:fe:0:16:3e:44:55:66' name='badbob' ip='2001:db8:ac10:fd01::1:24' /> </dhcp> </ip> + <ip address="192.168.222.0" netmask="255.255.255.0" via="192.168.122.10"> + </ip> + <ip family="ipv6" address="2001:db8:ac10:fc00::" prefix="64" via="2001:db8:ac10:fd01::1:24"> + </ip> </network> diff --git a/tests/networkxml2xmlout/dhcp6host-routed-network.xml b/tests/networkxml2xmlout/dhcp6host-routed-network.xml index 7305043..880c2dd 100644 --- a/tests/networkxml2xmlout/dhcp6host-routed-network.xml +++ b/tests/networkxml2xmlout/dhcp6host-routed-network.xml @@ -21,4 +21,8 @@ <host id='0:1:0:1:18:aa:62:fe:0:16:3e:44:55:66' name='badbob' ip='2001:db8:ac10:fd01::1:24' /> </dhcp> </ip> + <ip address='192.168.222.0' netmask='255.255.255.0' via='192.168.122.10'> + </ip> + <ip family='ipv6' address='2001:db8:ac10:fc00::' prefix='64' via='2001:db8:ac10:fd01::1:24'> + </ip> </network> -- 1.8.1.4

2 14

[libvirt] [PATCH v2] qemu: Set correct migrate host in client_migrate_info
by Michal Privoznik 10 Apr '13

10 Apr '13

https://bugzilla.redhat.com/show_bug.cgi?id=920441 Currently, we are discarding listen attribute from qemu cookie even though we strive to gather it. This result in not so cool bug: if user have different networks, one for management/migration, and one for VNC/SPICE we pass incorrect host to the qemu in client_migrate_info. What we actually pass is remote hostname, while we should be passing remote listen address. It doesn't matter as long as these two are the same, but they don't need necessary to be like that. --- src/conf/domain_conf.c | 4 +++- src/qemu/qemu_migration.c | 6 +++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index e00a532..2afa982 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -16557,8 +16557,10 @@ virDomainGraphicsListenGetAddress(virDomainGraphicsDefPtr def, size_t ii) virDomainGraphicsListenDefPtr listenInfo = virDomainGraphicsGetListen(def, ii, false); + /* even a network can have a listen address */ if (!listenInfo || - (listenInfo->type != VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_ADDRESS)) + !(listenInfo->type == VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_ADDRESS || + listenInfo->type == VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_NETWORK)) return NULL; return listenInfo->address; } diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 41ad768..434b19a 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -1720,6 +1720,7 @@ qemuDomainMigrateGraphicsRelocate(virQEMUDriverPtr driver, { qemuDomainObjPrivatePtr priv = vm->privateData; int ret; + char *listenAddress = cookie->graphics->listen; if (!cookie) return 0; @@ -1733,12 +1734,15 @@ qemuDomainMigrateGraphicsRelocate(virQEMUDriverPtr driver, if (cookie->graphics->type != VIR_DOMAIN_GRAPHICS_TYPE_SPICE) return 0; + if (STREQ(listenAddress, "0.0.0.0")) + listenAddress = cookie->remoteHostname; + ret = qemuDomainObjEnterMonitorAsync(driver, vm, QEMU_ASYNC_JOB_MIGRATION_OUT); if (ret == 0) { ret = qemuMonitorGraphicsRelocate(priv->mon, cookie->graphics->type, - cookie->remoteHostname, + listenAddress, cookie->graphics->port, cookie->graphics->tlsPort, cookie->graphics->tlsSubject); -- 1.8.1.5

2 1

[libvirt] [PATCH] qemu: Set correct migrate host in client_migrate_info
by Michal Privoznik 10 Apr '13

10 Apr '13

https://bugzilla.redhat.com/show_bug.cgi?id=920441 Currently, we are discarding listen attribute from qemu cookie even though we strive to gather it. This result in not so cool bug: if user have different networks, one for management/migration, and one for VNC/SPICE we pass incorrect host to the qemu in client_migrate_info. What we actually pass is remote hostname, while we should be passing remote listen address. It doesn't matter as long as these two are the same, but they don't need necessary to be like that. --- src/conf/domain_conf.c | 4 +++- src/qemu/qemu_migration.c | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index e00a532..2afa982 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -16557,8 +16557,10 @@ virDomainGraphicsListenGetAddress(virDomainGraphicsDefPtr def, size_t ii) virDomainGraphicsListenDefPtr listenInfo = virDomainGraphicsGetListen(def, ii, false); + /* even a network can have a listen address */ if (!listenInfo || - (listenInfo->type != VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_ADDRESS)) + !(listenInfo->type == VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_ADDRESS || + listenInfo->type == VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_NETWORK)) return NULL; return listenInfo->address; } diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 41ad768..089b75a 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -1738,7 +1738,7 @@ qemuDomainMigrateGraphicsRelocate(virQEMUDriverPtr driver, if (ret == 0) { ret = qemuMonitorGraphicsRelocate(priv->mon, cookie->graphics->type, - cookie->remoteHostname, + cookie->graphics->listen, cookie->graphics->port, cookie->graphics->tlsPort, cookie->graphics->tlsSubject); -- 1.8.1.5

2 3

[libvirt] [PATCH 0/2] Add support for translations
by Daniel P. Berrange 10 Apr '13

10 Apr '13

libvirt-glib contains a bunch of user visible error message strings which need translation. These patches wire up the glib/intltool/gettext i18n framework I have created a transifex project to go with it https://www.transifex.com/projects/p/libvirt-glib/

3 8

Re: [libvirt] [Qemu-devel] GSoC 2013, "Introduce API to query IP addresses for given domain" Libvirt project
by Stefan Hajnoczi 10 Apr '13

10 Apr '13

On Wed, Apr 10, 2013 at 04:46:45AM +0200, Tabibel Sami wrote: > I am doing master degree of Cryptology and information security > I have good C and Python skills, and i am interested to work on > "Introduce API to query IP addresses for given domain" Libvirt > project. > > I am looking for any comment about the difficulty and the content of > the project, and also about my chances to be accepted if i apply for. Adding libvirt mailing list and CCing mprivozn who is the mentor for this project. Stefan

2 1

[libvirt] VNC Server in libvirt
by Jaime Loureiro Acuña 10 Apr '13

10 Apr '13

My name is Jaime Loureiro and I work in the Network & Applications area in University of Vigo. I am writing to you hoping you can help me with some libvirt graphics issues. I was analysing the source code of the libvirt in order to find how to access the display of each virtual machine. We are trying to generate a video streaming from the graphics content, though it is not easy to find what function is the most appropriate to do that. We tried to use the screenshot feature, but the rate is to low to generate a smooth streaming. I suposse the vnc server is reading the graphics output of each virtual machine at a low level, however I cannot find the exact point where the server is. Currently I am trying to understand the function "virDomainOpenGraphics" in libvirt.c and, at a lower level, the function "qemuProcessHandleGraphics" in qemu_process.c, but I 'm not sure if it is possible to get what we need from them. I would appreciate any help or clue you could provide regarding this issue. Thank you very much in advance. Best regards,

2 1

[libvirt] [PATCH 0/2] Add version comparison method for virsh_version output
by John Ferlan 10 Apr '13

10 Apr '13

I believe this set of patches should be applied instead of those from https://www.redhat.com/archives/libvirt-cim/2013-April/msg00006.html I suppose we could consider combining the two functions; however, there are a couple place where the return version string is compared more than once, so I kept both interfaces. The vxml change is just an informative message that showed me the name of the image that was failing - I had created 'default-kvm-dimage.img' and tests were failing to find 'default-kvm-dimage' to place into the cimtest storage pool. John Ferlan (2): vxml: Add which volume could not be found to error message Add and utilize virsh_version_cmp .../08_CreateDiskResourcePool.py | 4 ++-- .../10_create_storagevolume.py | 6 ++++-- .../11_create_dir_storagevolume_errs.py | 5 +++-- .../12_create_netfs_storagevolume_errs.py | 5 +++-- .../13_delete_storagevolume.py | 5 +++-- .../14_delete_storagevolume_errs.py | 5 +++-- .../ResourcePoolConfigurationService/15_DiskPoolAutostart.py | 4 ++-- .../cimtest/SettingsDefineCapabilities/01_forward.py | 1 - .../VirtualSystemManagementService/19_definenetwork_ers.py | 8 ++++---- suites/libvirt-cim/lib/XenKvmLib/common_util.py | 9 +++++---- suites/libvirt-cim/lib/XenKvmLib/pool.py | 6 +++--- suites/libvirt-cim/lib/XenKvmLib/rasd.py | 10 ++++++---- suites/libvirt-cim/lib/XenKvmLib/vxml.py | 4 ++-- suites/libvirt-cim/lib/XenKvmLib/xm_virt_util.py | 6 ++++++ 14 files changed, 46 insertions(+), 32 deletions(-) -- 1.8.1.4

4 5

[libvirt] [PATCH 0/2] Fix domain list race crash
by Peter Krempa 10 Apr '13

10 Apr '13

This series fixes the race between freeing and accessing of domain objects and provides a reproducer case to test it. Peter Krempa (2): conf: Fix race between looking up a domain object and freeing it DO NOT APPLY UPSTREAM: Reproducer of domain free crash src/conf/domain_conf.c | 8 ++++++++ src/qemu/qemu_driver.c | 6 ++++++ 2 files changed, 14 insertions(+) -- 1.8.1.5

3 5

[libvirt] [PATCH 00/12] A bunch of extensions to libxl driver
by Marek Marczykowski 10 Apr '13

10 Apr '13

This are some additional features to libxl driver. Some of them require change in domain config structures/syntax. Details described with each patch. The last two patches are bugfix for deadlock during daemon startup. PS Please keep me in To/Cc - I'm not subscribed to the list. Marek Marczykowski (12): libxl: allow script for any network interface, not only bridge libxl: PCI passthrough support libxl: nodeDevice* support for PCI devices libxl: populate xenstore memory entries at startup conf: add 'script' attribute to disk specification libxl: use disk 'script' attribute conf: support backend domain name in disk and network devices libxl: support backend domain setting for disk and net devices libxl: fill HVM SDL and VNC settings based on <graphics/> entries RFC: libxl: special 'stubdom-dm' emulator to use qemu in stub domain conf: virDomainObjListRemoveLocked function libxl: fix deadlock in libxlReconnectDomain docs/schemas/domaincommon.rng | 14 ++ src/conf/domain_conf.c | 54 ++++++++ src/conf/domain_conf.h | 5 + src/libvirt_private.syms | 1 + src/libxl/libxl_conf.c | 297 +++++++++++++++++++++++++++++++++--------- src/libxl/libxl_conf.h | 6 +- src/libxl/libxl_driver.c | 253 +++++++++++++++++++++++++++++++---- 7 files changed, 545 insertions(+), 85 deletions(-) -- 1.8.1.4

2 2

[libvirt] [PATCH 08/12] libxl: support backend domain setting for disk and net devices
by Marek Marczykowski 10 Apr '13

10 Apr '13

This implement handling of <domain name=''/> parameter introduced in previous patch. Lookup on domain name (to get domain ID) requires libxlDriverPrivate object, so it must be passed down to libxlMakeDisk and libxlMakeNet from top level callers. --- src/libxl/libxl_conf.c | 62 +++++++++++++++++++++++++++++++++++++++++------- src/libxl/libxl_conf.h | 4 ++-- src/libxl/libxl_driver.c | 50 +++++++++++++++++++++----------------- 3 files changed, 84 insertions(+), 32 deletions(-) diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c index 4bd62e9..477e46d 100644 --- a/src/libxl/libxl_conf.c +++ b/src/libxl/libxl_conf.c @@ -472,7 +472,9 @@ error: } int -libxlMakeDisk(virDomainDiskDefPtr l_disk, libxl_device_disk *x_disk) +libxlMakeDisk(libxlDriverPrivatePtr driver, + virDomainDiskDefPtr l_disk, + libxl_device_disk *x_disk) { if (l_disk->src && (x_disk->pdev_path = strdup(l_disk->src)) == NULL) { virReportOOMError(); @@ -549,11 +551,32 @@ libxlMakeDisk(virDomainDiskDefPtr l_disk, libxl_device_disk *x_disk) return -1; } + if (l_disk->domain_name) { + uint32_t domid; + /* Do not use virDomainObjListFindByName as it causes deadlock here - + * we already have lock on this domain object, but + * virDomainObjListFindByName will try to take it again. + */ + switch (libxl_name_to_domid(driver->ctx, l_disk->domain_name, &domid)) { + case ERROR_INVAL: + virReportError(VIR_ERR_XML_DETAIL, + _("Disk backend domain '%s' does not exists"), + l_disk->domain_name); + return -1; + case ERROR_NOMEM: + virReportOOMError(); + return -1; + } + x_disk->backend_domid = domid; + } + return 0; } static int -libxlMakeDiskList(virDomainDefPtr def, libxl_domain_config *d_config) +libxlMakeDiskList(libxlDriverPrivatePtr driver, + virDomainDefPtr def, + libxl_domain_config *d_config) { virDomainDiskDefPtr *l_disks = def->disks; int ndisks = def->ndisks; @@ -566,7 +589,7 @@ libxlMakeDiskList(virDomainDefPtr def, libxl_domain_config *d_config) } for (i = 0; i < ndisks; i++) { - if (libxlMakeDisk(l_disks[i], &x_disks[i]) < 0) + if (libxlMakeDisk(driver, l_disks[i], &x_disks[i]) < 0) goto error; } @@ -583,7 +606,9 @@ error: } int -libxlMakeNic(virDomainNetDefPtr l_nic, libxl_device_nic *x_nic) +libxlMakeNic(libxlDriverPrivatePtr driver, + virDomainNetDefPtr l_nic, + libxl_device_nic *x_nic) { /* TODO: Where is mtu stored? * @@ -620,11 +645,32 @@ libxlMakeNic(virDomainNetDefPtr l_nic, libxl_device_nic *x_nic) return -1; } + if (l_nic->domain_name) { + uint32_t domid; + /* Do not use virDomainObjListFindByName as it causes deadlock here - + * we already have lock on this domain object, but + * virDomainObjListFindByName will try to take it again. + */ + switch (libxl_name_to_domid(driver->ctx, l_nic->domain_name, &domid)) { + case ERROR_INVAL: + virReportError(VIR_ERR_XML_DETAIL, + _("Network backend domain '%s' does not exists"), + l_nic->domain_name); + return -1; + case ERROR_NOMEM: + virReportOOMError(); + return -1; + } + x_nic->backend_domid = domid; + } + return 0; } static int -libxlMakeNicList(virDomainDefPtr def, libxl_domain_config *d_config) +libxlMakeNicList(libxlDriverPrivatePtr driver, + virDomainDefPtr def, + libxl_domain_config *d_config) { virDomainNetDefPtr *l_nics = def->nets; int nnics = def->nnets; @@ -639,7 +685,7 @@ libxlMakeNicList(virDomainDefPtr def, libxl_domain_config *d_config) for (i = 0; i < nnics; i++) { x_nics[i].devid = i; - if (libxlMakeNic(l_nics[i], &x_nics[i])) + if (libxlMakeNic(driver, l_nics[i], &x_nics[i])) goto error; } @@ -878,11 +924,11 @@ libxlBuildDomainConfig(libxlDriverPrivatePtr driver, goto error; } - if (libxlMakeDiskList(def, d_config) < 0) { + if (libxlMakeDiskList(driver, def, d_config) < 0) { goto error; } - if (libxlMakeNicList(def, d_config) < 0) { + if (libxlMakeNicList(driver, def, d_config) < 0) { goto error; } diff --git a/src/libxl/libxl_conf.h b/src/libxl/libxl_conf.h index b3ab3bf..99948b5 100644 --- a/src/libxl/libxl_conf.h +++ b/src/libxl/libxl_conf.h @@ -113,9 +113,9 @@ virCapsPtr libxlMakeCapabilities(libxl_ctx *ctx); int -libxlMakeDisk(virDomainDiskDefPtr l_dev, libxl_device_disk *x_dev); +libxlMakeDisk(libxlDriverPrivatePtr driver, virDomainDiskDefPtr l_dev, libxl_device_disk *x_dev); int -libxlMakeNic(virDomainNetDefPtr l_nic, libxl_device_nic *x_nic); +libxlMakeNic(libxlDriverPrivatePtr driver, virDomainNetDefPtr l_nic, libxl_device_nic *x_nic); int libxlMakeVfb(libxlDriverPrivatePtr driver, virDomainGraphicsDefPtr l_vfb, libxl_device_vfb *x_vfb); diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index 89546a5..b0f0c6a 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -3166,8 +3166,9 @@ libxlDomainUndefine(virDomainPtr dom) } static int -libxlDomainChangeEjectableMedia(libxlDomainObjPrivatePtr priv, - virDomainObjPtr vm, virDomainDiskDefPtr disk) +libxlDomainChangeEjectableMedia(libxlDriverPrivatePtr driver, + libxlDomainObjPrivatePtr priv, virDomainObjPtr vm, virDomainDiskDefPtr + disk) { virDomainDiskDefPtr origdisk = NULL; libxl_device_disk x_disk; @@ -3196,7 +3197,7 @@ libxlDomainChangeEjectableMedia(libxlDomainObjPrivatePtr priv, return -1; } - if (libxlMakeDisk(disk, &x_disk) < 0) + if (libxlMakeDisk(driver, disk, &x_disk) < 0) goto cleanup; if ((ret = libxl_cdrom_insert(priv->ctx, vm->def->id, &x_disk, NULL)) < 0) { @@ -3221,8 +3222,9 @@ cleanup: } static int -libxlDomainAttachDeviceDiskLive(libxlDomainObjPrivatePtr priv, - virDomainObjPtr vm, virDomainDeviceDefPtr dev) +libxlDomainAttachDeviceDiskLive(libxlDriverPrivatePtr driver, + libxlDomainObjPrivatePtr priv, virDomainObjPtr vm, + virDomainDeviceDefPtr dev) { virDomainDiskDefPtr l_disk = dev->data.disk; libxl_device_disk x_disk; @@ -3230,7 +3232,7 @@ libxlDomainAttachDeviceDiskLive(libxlDomainObjPrivatePtr priv, switch (l_disk->device) { case VIR_DOMAIN_DISK_DEVICE_CDROM: - ret = libxlDomainChangeEjectableMedia(priv, vm, l_disk); + ret = libxlDomainChangeEjectableMedia(driver, priv, vm, l_disk); break; case VIR_DOMAIN_DISK_DEVICE_DISK: if (l_disk->bus == VIR_DOMAIN_DISK_BUS_XEN) { @@ -3251,7 +3253,7 @@ libxlDomainAttachDeviceDiskLive(libxlDomainObjPrivatePtr priv, goto cleanup; } - if (libxlMakeDisk(l_disk, &x_disk) < 0) + if (libxlMakeDisk(driver, l_disk, &x_disk) < 0) goto cleanup; if ((ret = libxl_device_disk_add(priv->ctx, vm->def->id, @@ -3282,8 +3284,9 @@ cleanup: } static int -libxlDomainDetachDeviceDiskLive(libxlDomainObjPrivatePtr priv, - virDomainObjPtr vm, virDomainDeviceDefPtr dev) +libxlDomainDetachDeviceDiskLive(libxlDriverPrivatePtr driver, + libxlDomainObjPrivatePtr priv, virDomainObjPtr vm, + virDomainDeviceDefPtr dev) { virDomainDiskDefPtr l_disk = NULL; libxl_device_disk x_disk; @@ -3304,7 +3307,7 @@ libxlDomainDetachDeviceDiskLive(libxlDomainObjPrivatePtr priv, l_disk = vm->def->disks[i]; - if (libxlMakeDisk(l_disk, &x_disk) < 0) + if (libxlMakeDisk(driver, l_disk, &x_disk) < 0) goto cleanup; if ((ret = libxl_device_disk_remove(priv->ctx, vm->def->id, @@ -3336,14 +3339,15 @@ cleanup: } static int -libxlDomainAttachDeviceLive(libxlDomainObjPrivatePtr priv, virDomainObjPtr vm, - virDomainDeviceDefPtr dev) +libxlDomainAttachDeviceLive(libxlDriverPrivatePtr driver, + libxlDomainObjPrivatePtr priv, virDomainObjPtr vm, + virDomainDeviceDefPtr dev) { int ret = -1; switch (dev->type) { case VIR_DOMAIN_DEVICE_DISK: - ret = libxlDomainAttachDeviceDiskLive(priv, vm, dev); + ret = libxlDomainAttachDeviceDiskLive(driver, priv, vm, dev); if (!ret) dev->data.disk = NULL; break; @@ -3388,14 +3392,15 @@ libxlDomainAttachDeviceConfig(virDomainDefPtr vmdef, virDomainDeviceDefPtr dev) } static int -libxlDomainDetachDeviceLive(libxlDomainObjPrivatePtr priv, virDomainObjPtr vm, - virDomainDeviceDefPtr dev) +libxlDomainDetachDeviceLive(libxlDriverPrivatePtr driver, + libxlDomainObjPrivatePtr priv, virDomainObjPtr vm, + virDomainDeviceDefPtr dev) { int ret = -1; switch (dev->type) { case VIR_DOMAIN_DEVICE_DISK: - ret = libxlDomainDetachDeviceDiskLive(priv, vm, dev); + ret = libxlDomainDetachDeviceDiskLive(driver, priv, vm, dev); break; default: @@ -3435,8 +3440,9 @@ libxlDomainDetachDeviceConfig(virDomainDefPtr vmdef, virDomainDeviceDefPtr dev) } static int -libxlDomainUpdateDeviceLive(libxlDomainObjPrivatePtr priv, - virDomainObjPtr vm, virDomainDeviceDefPtr dev) +libxlDomainUpdateDeviceLive(libxlDriverPrivatePtr driver, + libxlDomainObjPrivatePtr priv, virDomainObjPtr vm, + virDomainDeviceDefPtr dev) { virDomainDiskDefPtr disk; int ret = -1; @@ -3446,7 +3452,7 @@ libxlDomainUpdateDeviceLive(libxlDomainObjPrivatePtr priv, disk = dev->data.disk; switch (disk->device) { case VIR_DOMAIN_DISK_DEVICE_CDROM: - ret = libxlDomainChangeEjectableMedia(priv, vm, disk); + ret = libxlDomainChangeEjectableMedia(driver, priv, vm, disk); if (ret == 0) dev->data.disk = NULL; break; @@ -3601,13 +3607,13 @@ libxlDomainModifyDeviceFlags(virDomainPtr dom, const char *xml, switch (action) { case LIBXL_DEVICE_ATTACH: - ret = libxlDomainAttachDeviceLive(priv, vm, dev); + ret = libxlDomainAttachDeviceLive(driver, priv, vm, dev); break; case LIBXL_DEVICE_DETACH: - ret = libxlDomainDetachDeviceLive(priv, vm, dev); + ret = libxlDomainDetachDeviceLive(driver, priv, vm, dev); break; case LIBXL_DEVICE_UPDATE: - ret = libxlDomainUpdateDeviceLive(priv, vm, dev); + ret = libxlDomainUpdateDeviceLive(driver, priv, vm, dev); break; default: virReportError(VIR_ERR_INTERNAL_ERROR, -- 1.8.1.4

1 0

[libvirt] [PATCH 11/12] conf: virDomainObjListRemoveLocked function
by Marek Marczykowski 10 Apr '13

10 Apr '13

While iterating with virDomainObjListForEach it is safe to remove current element. But while iterating, 'doms' lock is already taken, so can't use standard virDomainObjListRemove. So introduce virDomainObjListRemoveLocked for this purpose. This is required to fix deadlock in libxl driver. --- src/conf/domain_conf.c | 17 +++++++++++++++++ src/conf/domain_conf.h | 2 ++ src/libvirt_private.syms | 1 + 3 files changed, 20 insertions(+) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index bf1fec6..e4f7288 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -2199,6 +2199,23 @@ void virDomainObjListRemove(virDomainObjListPtr doms, virObjectUnlock(doms); } +/* The caller must hold lock on 'doms' in addition to 'virDomainObjListRemove' + * requirements + * + * Can be used to remove current element while iterating with + * virDomainObjListForEach + */ +void virDomainObjListRemoveLocked(virDomainObjListPtr doms, + virDomainObjPtr dom) +{ + char uuidstr[VIR_UUID_STRING_BUFLEN]; + + virUUIDFormat(dom->def->uuid, uuidstr); + virObjectUnlock(dom); + + virHashRemoveEntry(doms->objs, uuidstr); +} + static int virDomainDeviceCCWAddressIsValid(virDomainDeviceCCWAddressPtr addr) { diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index db3002b..e34143b 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -2073,6 +2073,8 @@ virDomainObjCopyPersistentDef(virCapsPtr caps, virDomainXMLConfPtr xmlconf, void virDomainObjListRemove(virDomainObjListPtr doms, virDomainObjPtr dom); +void virDomainObjListRemoveLocked(virDomainObjListPtr doms, + virDomainObjPtr dom); virDomainDeviceDefPtr virDomainDeviceDefParse(virCapsPtr caps, virDomainDefPtr def, diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 96eea0a..e6b6b1b 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -270,6 +270,7 @@ virDomainObjListLoadAllConfigs; virDomainObjListNew; virDomainObjListNumOfDomains; virDomainObjListRemove; +virDomainObjListRemoveLocked; virDomainObjNew; virDomainObjSetDefTransient; virDomainObjSetState; -- 1.8.1.4

1 0

[libvirt] [PATCH 12/12] libxl: fix deadlock in libxlReconnectDomain
by Marek Marczykowski 10 Apr '13

10 Apr '13

Use virDomainObjListRemoveLocked instead of virDomainObjListRemove, as driver->domains is already taken by virDomainObjListForEach. Above deadlock can be triggered when libvirtd is started after some domain have been started by hand (in which case driver will not find libvirt-xml domain config). --- src/libxl/libxl_driver.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index b0f0c6a..687190c 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -1060,7 +1060,7 @@ libxlReconnectDomain(virDomainObjPtr vm, out: libxlVmCleanup(driver, vm, VIR_DOMAIN_SHUTOFF_UNKNOWN); if (!vm->persistent) - virDomainObjListRemove(driver->domains, vm); + virDomainObjListRemoveLocked(driver->domains, vm); else virObjectUnlock(vm); -- 1.8.1.4

1 0

[libvirt] [PATCH 07/12] conf: support backend domain name in disk and network devices
by Marek Marczykowski 10 Apr '13

10 Apr '13

At least Xen supports backend drivers in another domain (aka "driver domain"). This patch introduces XML config option for such setting as 'domain' element with 'name' attribute. Verification its content is left for the driver. In the future some option will be needed for USB devices (hostdev objects), but for now libxl doesn't have support for PVUSB. --- docs/schemas/domaincommon.rng | 14 ++++++++++++++ src/conf/domain_conf.c | 27 +++++++++++++++++++++++++++ src/conf/domain_conf.h | 2 ++ 3 files changed, 43 insertions(+) diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index 8d7e6db..1423187 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -869,6 +869,13 @@ </optional> <ref name="target"/> <optional> + <element name="domain"> + <attribute name="name"> + <ref name="domainName"/> + </attribute> + </element> + </optional> + <optional> <ref name="deviceBoot"/> </optional> <optional> @@ -1834,6 +1841,13 @@ </element> </optional> <optional> + <element name="domain"> + <attribute name="name"> + <ref name="domainName"/> + </attribute> + </element> + </optional> + <optional> <element name="model"> <attribute name="type"> <data type="string"> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 257a265..bf1fec6 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -1103,6 +1103,7 @@ void virDomainDiskDefFree(virDomainDiskDefPtr def) VIR_FREE(def->vendor); VIR_FREE(def->product); VIR_FREE(def->script); + VIR_FREE(def->domain_name); if (def->auth.secretType == VIR_DOMAIN_DISK_SECRET_TYPE_USAGE) VIR_FREE(def->auth.secret.usage); virStorageEncryptionFree(def->encryption); @@ -1228,6 +1229,7 @@ void virDomainNetDefFree(virDomainNetDefPtr def) VIR_FREE(def->virtPortProfile); VIR_FREE(def->script); + VIR_FREE(def->domain_name); VIR_FREE(def->ifname); virDomainDeviceInfoClear(&def->info); @@ -3995,6 +3997,7 @@ virDomainDiskDefParseXML(virCapsPtr caps, char *vendor = NULL; char *product = NULL; char *script = NULL; + char *domain_name = NULL; int expected_secret_usage = -1; int auth_secret_usage = -1; @@ -4153,6 +4156,9 @@ virDomainDiskDefParseXML(virCapsPtr caps, } else if (!script && xmlStrEqual(cur->name, BAD_CAST "script")) { script = virXMLPropString(cur, "path"); + } else if (!domain_name && + xmlStrEqual(cur->name, BAD_CAST "domain")) { + domain_name = virXMLPropString(cur, "name"); } else if (xmlStrEqual(cur->name, BAD_CAST "geometry")) { if (virXPathUInt("string(./geometry/@cyls)", ctxt, &def->geometry.cylinders) < 0) { @@ -4447,6 +4453,11 @@ virDomainDiskDefParseXML(virCapsPtr caps, ctxt->node = saved_node; } + if (domain_name != NULL) { + def->domain_name = domain_name; + domain_name = NULL; + } + if (target == NULL) { virReportError(VIR_ERR_NO_TARGET, source ? "%s" : NULL, source); @@ -4796,6 +4807,7 @@ cleanup: VIR_FREE(vendor); VIR_FREE(product); VIR_FREE(script); + VIR_FREE(domain_name); ctxt->node = save_ctxt; return def; @@ -5353,6 +5365,7 @@ virDomainNetDefParseXML(virCapsPtr caps, char *mode = NULL; char *linkstate = NULL; char *addrtype = NULL; + char *domain_name = NULL; virNWFilterHashTablePtr filterparams = NULL; virDomainActualNetDefPtr actual = NULL; xmlNodePtr oldnode = ctxt->node; @@ -5451,6 +5464,9 @@ virDomainNetDefParseXML(virCapsPtr caps, } else if (!script && xmlStrEqual(cur->name, BAD_CAST "script")) { script = virXMLPropString(cur, "path"); + } else if (!domain_name && + xmlStrEqual(cur->name, BAD_CAST "domain")) { + domain_name = virXMLPropString(cur, "name"); } else if (xmlStrEqual(cur->name, BAD_CAST "model")) { model = virXMLPropString(cur, "type"); } else if (xmlStrEqual(cur->name, BAD_CAST "driver")) { @@ -5682,6 +5698,10 @@ virDomainNetDefParseXML(virCapsPtr caps, def->script = script; script = NULL; } + if (domain_name != NULL) { + def->domain_name = domain_name; + domain_name = NULL; + } if (ifname != NULL) { def->ifname = ifname; ifname = NULL; @@ -5808,6 +5828,7 @@ cleanup: VIR_FREE(mode); VIR_FREE(linkstate); VIR_FREE(addrtype); + VIR_FREE(domain_name); virNWFilterHashTableFree(filterparams); return def; @@ -12909,6 +12930,10 @@ virDomainDiskDefFormat(virBufferPtr buf, virBufferEscapeString(buf, " <script path='%s'/>\n", def->script); + if (def->domain_name) { + virBufferEscapeString(buf, " <domain name='%s'/>\n", def->domain_name); + } + virDomainDiskGeometryDefFormat(buf, def); virDomainDiskBlockIoDefFormat(buf, def); @@ -13456,6 +13481,8 @@ virDomainNetDefFormat(virBufferPtr buf, return -1; virBufferEscapeString(buf, "<script path='%s'/>\n", def->script); + if (def->domain_name) + virBufferEscapeString(buf, "<domain name='%s'/>\n", def->domain_name); if (def->ifname && !((flags & VIR_DOMAIN_XML_INACTIVE) && (STRPREFIX(def->ifname, VIR_NET_GENERATED_PREFIX)))) { diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index d55d209..db3002b 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -669,6 +669,7 @@ struct _virDomainDiskDef { int rawio; /* no = 0, yes = 1 */ int sgio; /* enum virDomainDiskSGIO */ char *script; + char *domain_name; /* backend domain name */ size_t nseclabels; virSecurityDeviceLabelDefPtr *seclabels; @@ -919,6 +920,7 @@ struct _virDomainNetDef { unsigned long sndbuf; } tune; char *script; + char *domain_name; /* backend domain name */ char *ifname; virDomainDeviceInfo info; char *filter; -- 1.8.1.4

1 0

[libvirt] [PATCH 09/12] libxl: fill HVM SDL and VNC settings based on <graphics/> entries
by Marek Marczykowski 10 Apr '13

10 Apr '13

Vfb entries in domain config are used only by PV drivers. Qemu parameters are build based on b_info struct. So fill it with the same data as vfb entries (actually the first one). This will additionally allow graphic-less domain, when no <graphics/> entries are present in domain XML (previously VNC was always enabled). --- src/libxl/libxl_conf.c | 131 +++++++++++++++++++++++++++++++++---------------- 1 file changed, 90 insertions(+), 41 deletions(-) diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c index 477e46d..068a97a 100644 --- a/src/libxl/libxl_conf.c +++ b/src/libxl/libxl_conf.c @@ -347,7 +347,64 @@ error: } static int -libxlMakeDomBuildInfo(virDomainDefPtr def, libxl_domain_config *d_config) +libxlMakeVNCInfo(libxlDriverPrivatePtr driver, + virDomainGraphicsDefPtr l_vfb, + libxl_vnc_info *x_vnc) +{ + unsigned short port; + const char *listenAddr; + + libxl_defbool_set(&x_vnc->enable, 1); + /* driver handles selection of free port */ + libxl_defbool_set(&x_vnc->findunused, 0); + if (l_vfb->data.vnc.autoport) { + + if (virPortAllocatorAcquire(driver->reservedVNCPorts, &port) < 0) + return -1; + if (port == 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + "%s", _("Unable to find an unused VNC port")); + return -1; + } + l_vfb->data.vnc.port = port; + } + x_vnc->display = l_vfb->data.vnc.port - LIBXL_VNC_PORT_MIN; + + listenAddr = virDomainGraphicsListenGetAddress(l_vfb, 0); + if (listenAddr) { + /* libxl_device_vfb_init() does strdup("127.0.0.1") */ + VIR_FREE(x_vnc->listen); + if ((x_vnc->listen = strdup(listenAddr)) == NULL) { + virReportOOMError(); + return -1; + } + } + return 0; +} + +static int +libxlMakeSDLInfo(virDomainGraphicsDefPtr l_vfb, + libxl_sdl_info *x_sdl) +{ + libxl_defbool_set(&x_sdl->enable, 1); + if (l_vfb->data.sdl.display && + (x_sdl->display = strdup(l_vfb->data.sdl.display)) == NULL) { + virReportOOMError(); + return -1; + } + if (l_vfb->data.sdl.xauth && + (x_sdl->xauthority = + strdup(l_vfb->data.sdl.xauth)) == NULL) { + virReportOOMError(); + return -1; + } + return 0; +} + +static int +libxlMakeDomBuildInfo(libxlDriverPrivatePtr driver, + virDomainDefPtr def, + libxl_domain_config *d_config) { libxl_domain_build_info *b_info = &d_config->b_info; int hvm = STREQ(def->os.type, "hvm"); @@ -421,6 +478,34 @@ libxlMakeDomBuildInfo(virDomainDefPtr def, libxl_domain_config *d_config) goto error; } + /* Disable VNC and SDL until explicitly enabled */ + libxl_defbool_set(&b_info->u.hvm.vnc.enable, 0); + libxl_defbool_set(&b_info->u.hvm.sdl.enable, 0); + + for (i = 0; i < def->ngraphics; i++) { + switch (def->graphics[i]->type) { + case VIR_DOMAIN_GRAPHICS_TYPE_VNC: + if (libxl_defbool_val(b_info->u.hvm.vnc.enable)) + continue; + if (libxlMakeVNCInfo(driver, def->graphics[i], + &b_info->u.hvm.vnc) < 0) + goto error; + if (def->graphics[i]->data.vnc.keymap && + (b_info->u.hvm.keymap = + strdup(def->graphics[i]->data.vnc.keymap)) == NULL) { + virReportOOMError(); + goto error; + } + break; + case VIR_DOMAIN_GRAPHICS_TYPE_SDL: + if (libxl_defbool_val(b_info->u.hvm.sdl.enable)) + continue; + if (libxlMakeSDLInfo(def->graphics[i], &b_info->u.hvm.sdl) < 0) + goto error; + break; + } + } + /* * The following comment and calculation were taken directly from * libxenlight's internal function libxl_get_required_shadow_memory(): @@ -706,50 +791,14 @@ libxlMakeVfb(libxlDriverPrivatePtr driver, virDomainGraphicsDefPtr l_vfb, libxl_device_vfb *x_vfb) { - unsigned short port; - const char *listenAddr; - switch (l_vfb->type) { case VIR_DOMAIN_GRAPHICS_TYPE_SDL: - libxl_defbool_set(&x_vfb->sdl.enable, 1); - if (l_vfb->data.sdl.display && - (x_vfb->sdl.display = strdup(l_vfb->data.sdl.display)) == NULL) { - virReportOOMError(); - return -1; - } - if (l_vfb->data.sdl.xauth && - (x_vfb->sdl.xauthority = - strdup(l_vfb->data.sdl.xauth)) == NULL) { - virReportOOMError(); + if (libxlMakeSDLInfo(l_vfb, &x_vfb->sdl) < 0) return -1; - } break; case VIR_DOMAIN_GRAPHICS_TYPE_VNC: - libxl_defbool_set(&x_vfb->vnc.enable, 1); - /* driver handles selection of free port */ - libxl_defbool_set(&x_vfb->vnc.findunused, 0); - if (l_vfb->data.vnc.autoport) { - - if (virPortAllocatorAcquire(driver->reservedVNCPorts, &port) < 0) - return -1; - if (port == 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, - "%s", _("Unable to find an unused VNC port")); - return -1; - } - l_vfb->data.vnc.port = port; - } - x_vfb->vnc.display = l_vfb->data.vnc.port - LIBXL_VNC_PORT_MIN; - - listenAddr = virDomainGraphicsListenGetAddress(l_vfb, 0); - if (listenAddr) { - /* libxl_device_vfb_init() does strdup("127.0.0.1") */ - VIR_FREE(x_vfb->vnc.listen); - if ((x_vfb->vnc.listen = strdup(listenAddr)) == NULL) { - virReportOOMError(); - return -1; - } - } + if (libxlMakeVNCInfo(driver, l_vfb, &x_vfb->vnc) < 0) + return -1; if (l_vfb->data.vnc.keymap && (x_vfb->keymap = strdup(l_vfb->data.vnc.keymap)) == NULL) { @@ -920,7 +969,7 @@ libxlBuildDomainConfig(libxlDriverPrivatePtr driver, if (libxlMakeDomCreateInfo(driver, def, &d_config->c_info) < 0) return -1; - if (libxlMakeDomBuildInfo(def, d_config) < 0) { + if (libxlMakeDomBuildInfo(driver, def, d_config) < 0) { goto error; } -- 1.8.1.4

1 0

[libvirt] [PATCH 10/12] RFC: libxl: special 'stubdom-dm' emulator to use qemu in stub domain
by Marek Marczykowski 10 Apr '13

10 Apr '13

Xen have feature of having device model in separate domain (called stub domain). It used to be enabled by special 'stubdom-dm' device model path. Recent xl have separate config option for this feature (device_model_stubdomain_override), but I'm not sure if it worth introducing another xen-specific option in general domain XML syntax. Also use os->cmdline as extra arguments for qemu (for HVM only). This use of os->cmdline is rather dirty hack, but I haven't idea what better attribute use for it. Perhaps worth new attribute (in <emulator/> element?). Anyway os->cmdline was unused for HVM domains. --- src/libxl/libxl_conf.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c index 068a97a..181d344 100644 --- a/src/libxl/libxl_conf.c +++ b/src/libxl/libxl_conf.c @@ -478,6 +478,18 @@ libxlMakeDomBuildInfo(libxlDriverPrivatePtr driver, goto error; } + if (def->emulator && strcmp(def->emulator, "stubdom-dm")==0) { + libxl_defbool_set(&b_info->device_model_stubdomain, 1); + } + + if (def->os.cmdline && def->os.cmdline[0]) { + b_info->extra_hvm = virStringSplit(def->os.cmdline, " ", 0); + if (b_info->extra_hvm == NULL) { + virReportOOMError(); + goto error; + } + } + /* Disable VNC and SDL until explicitly enabled */ libxl_defbool_set(&b_info->u.hvm.vnc.enable, 0); libxl_defbool_set(&b_info->u.hvm.sdl.enable, 0); -- 1.8.1.4

1 0

[libvirt] [PATCH 03/12] libxl: nodeDevice* support for PCI devices
by Marek Marczykowski 10 Apr '13

10 Apr '13

For now only for PCI devices. Mostly copy-paste from old xen driver. --- src/libxl/libxl_driver.c | 193 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 193 insertions(+) diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index 40a7a6b..011edf8 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -42,6 +42,7 @@ #include "libxl.h" #include "libxl_driver.h" #include "libxl_conf.h" +#include "node_device_conf.h" #include "xen_xm.h" #include "virtypedparam.h" #include "viruri.h" @@ -3666,6 +3667,195 @@ libxlDomainUpdateDeviceFlags(virDomainPtr dom, const char *xml, return libxlDomainModifyDeviceFlags(dom, xml, flags, LIBXL_DEVICE_UPDATE); } +static int +libxlNodeDeviceGetPciInfo(virNodeDevicePtr dev, + unsigned *domain, + unsigned *bus, + unsigned *slot, + unsigned *function) +{ + virNodeDeviceDefPtr def = NULL; + virNodeDevCapsDefPtr cap; + char *xml = NULL; + int ret = -1; + + xml = virNodeDeviceGetXMLDesc(dev, 0); + if (!xml) + goto out; + + def = virNodeDeviceDefParseString(xml, EXISTING_DEVICE, NULL); + if (!def) + goto out; + + cap = def->caps; + while (cap) { + if (cap->type == VIR_NODE_DEV_CAP_PCI_DEV) { + *domain = cap->data.pci_dev.domain; + *bus = cap->data.pci_dev.bus; + *slot = cap->data.pci_dev.slot; + *function = cap->data.pci_dev.function; + break; + } + + cap = cap->next; + } + + if (!cap) { + virReportError(VIR_ERR_INVALID_ARG, + _("device %s is not a PCI device"), dev->name); + goto out; + } + + ret = 0; +out: + virNodeDeviceDefFree(def); + VIR_FREE(xml); + return ret; +} + +static int +libxlNodeDeviceDettach(virNodeDevicePtr dev) +{ + virPCIDevicePtr pci; + unsigned domain, bus, slot, function; + int ret = -1; + + if (libxlNodeDeviceGetPciInfo(dev, &domain, &bus, &slot, &function) < 0) + return -1; + + pci = virPCIDeviceNew(domain, bus, slot, function); + if (!pci) + return -1; + + if (virPCIDeviceDetach(pci, NULL, NULL, "pciback") < 0) + goto out; + + ret = 0; +out: + virPCIDeviceFree(pci); + return ret; +} + +static int +libxlNodeDeviceAssignedDomainId(virNodeDevicePtr dev) +{ + int numdomains; + int numpcidevs; + int ret = -1, i, j; + int *ids = NULL; + char *bdf = NULL; + char *xref = NULL; + unsigned int domain, bus, slot, function; + libxl_device_pci *pcidevs = NULL; + virConnectPtr conn = dev->conn; + libxlDriverPrivatePtr driver = conn->privateData; + + /* Get active domains */ + numdomains = libxlNumDomains(conn); + if (numdomains < 0) { + return ret; + } + if (numdomains > 0){ + if (VIR_ALLOC_N(ids, numdomains) < 0) { + virReportOOMError(); + goto out; + } + if ((numdomains = libxlListDomains(conn, &ids[0], numdomains)) < 0) { + goto out; + } + } + + /* Get pci bdf */ + if (libxlNodeDeviceGetPciInfo(dev, &domain, &bus, &slot, &function) < 0) + goto out; + + if (virAsprintf(&bdf, "%04x:%02x:%02x.%0x", + domain, bus, slot, function) < 0) { + virReportOOMError(); + goto out; + } + + libxlDriverLock(driver); + /* Check if bdf is assigned to one of active domains */ + for (i = 0; i < numdomains; i++) { + pcidevs = libxl_device_pci_list(driver->ctx, ids[i], &numpcidevs); + if (pcidevs == NULL) { + continue; + } else { + for (j = 0; j < numpcidevs; j++) { + if (pcidevs[j].bus == bus && pcidevs[j].dev == slot && pcidevs[j].func == function) { + ret = ids[i]; + break; + } + } + VIR_FREE(pcidevs); + } + } + libxlDriverUnlock(driver); + + VIR_FREE(xref); + VIR_FREE(bdf); +out: + VIR_FREE(ids); + + return ret; +} + +static int +libxlNodeDeviceReAttach(virNodeDevicePtr dev) +{ + virPCIDevicePtr pci; + unsigned domain, bus, slot, function; + int ret = -1; + int domid; + + if (libxlNodeDeviceGetPciInfo(dev, &domain, &bus, &slot, &function) < 0) + return -1; + + pci = virPCIDeviceNew(domain, bus, slot, function); + if (!pci) + return -1; + + /* Check if device is assigned to an active guest */ + if ((domid = libxlNodeDeviceAssignedDomainId(dev)) >= 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Device %s has been assigned to guest %d"), + dev->name, domid); + goto out; + } + + if (virPCIDeviceReattach(pci, NULL, NULL, "pciback") < 0) + goto out; + + ret = 0; +out: + virPCIDeviceFree(pci); + return ret; +} + +static int +libxlNodeDeviceReset(virNodeDevicePtr dev) +{ + virPCIDevicePtr pci; + unsigned domain, bus, slot, function; + int ret = -1; + + if (libxlNodeDeviceGetPciInfo(dev, &domain, &bus, &slot, &function) < 0) + return -1; + + pci = virPCIDeviceNew(domain, bus, slot, function); + if (!pci) + return -1; + + if (virPCIDeviceReset(pci, NULL, NULL) < 0) + goto out; + + ret = 0; +out: + virPCIDeviceFree(pci); + return ret; +} + static unsigned long long libxlNodeGetFreeMemory(virConnectPtr conn) { @@ -4233,6 +4423,9 @@ static virDriver libxlDriver = { .nodeGetFreeMemory = libxlNodeGetFreeMemory, /* 0.9.0 */ .domainEventRegister = libxlDomainEventRegister, /* 0.9.0 */ .domainEventDeregister = libxlDomainEventDeregister, /* 0.9.0 */ + .nodeDeviceDettach = libxlNodeDeviceDettach, /* 1.0.4 */ + .nodeDeviceReAttach = libxlNodeDeviceReAttach, /* 1.0.4 */ + .nodeDeviceReset = libxlNodeDeviceReset, /* 1.0.4 */ .domainManagedSave = libxlDomainManagedSave, /* 0.9.2 */ .domainHasManagedSaveImage = libxlDomainHasManagedSaveImage, /* 0.9.2 */ .domainManagedSaveRemove = libxlDomainManagedSaveRemove, /* 0.9.2 */ -- 1.8.1.4

1 0

[libvirt] [PATCH 04/12] libxl: populate xenstore memory entries at startup
by Marek Marczykowski 10 Apr '13

10 Apr '13

libxl uses some xenstore entries for hints in memory management (especially when starting new domain). This includes dom0 memory limit and Xen free memory margin, based on current system state. Entries are created at first usage, so force such usage at daemon startup, which most likely will be before any domain startup. --- src/libxl/libxl_driver.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index 011edf8..89546a5 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -1115,6 +1115,7 @@ libxlStartup(bool privileged, char *log_file = NULL; virCommandPtr cmd; int status, ret = 0; + unsigned int free_mem; char ebuf[1024]; /* Disable libxl driver if non-root */ @@ -1240,6 +1241,13 @@ libxlStartup(bool privileged, goto error; } + /* This will fill xenstore info about free and dom0 memory - if missing, + * should be called before starting first domain */ + if (libxl_get_free_memory(libxl_driver->ctx, &free_mem)) { + VIR_ERROR(_("cannot get free memory info")); + goto error; + } + if (!(libxl_driver->xmlconf = virDomainXMLConfNew(&libxlDomainXMLPrivateDataCallbacks, NULL))) goto error; -- 1.8.1.4

1 0

[libvirt] [PATCH 05/12] conf: add 'script' attribute to disk specification
by Marek Marczykowski 10 Apr '13

10 Apr '13

Script to be called to prepare custom device for domain. Done with Xen in mind, it maps to libxl_device_disk.script. XML configuration would be: <disk type='block' device='disk'> <source dev='/dev/mapper/custom-device'/> <script path='/script/to/setup/custom-device'/> <target dev='xvdc'/> </disk> --- src/conf/domain_conf.c | 10 ++++++++++ src/conf/domain_conf.h | 1 + 2 files changed, 11 insertions(+) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index f3fca7f..257a265 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -1102,6 +1102,7 @@ void virDomainDiskDefFree(virDomainDiskDefPtr def) VIR_FREE(def->wwn); VIR_FREE(def->vendor); VIR_FREE(def->product); + VIR_FREE(def->script); if (def->auth.secretType == VIR_DOMAIN_DISK_SECRET_TYPE_USAGE) VIR_FREE(def->auth.secret.usage); virStorageEncryptionFree(def->encryption); @@ -3993,6 +3994,7 @@ virDomainDiskDefParseXML(virCapsPtr caps, char *wwn = NULL; char *vendor = NULL; char *product = NULL; + char *script = NULL; int expected_secret_usage = -1; int auth_secret_usage = -1; @@ -4148,6 +4150,9 @@ virDomainDiskDefParseXML(virCapsPtr caps, if (target && STRPREFIX(target, "ioemu:")) memmove(target, target+6, strlen(target)-5); + } else if (!script && + xmlStrEqual(cur->name, BAD_CAST "script")) { + script = virXMLPropString(cur, "path"); } else if (xmlStrEqual(cur->name, BAD_CAST "geometry")) { if (virXPathUInt("string(./geometry/@cyls)", ctxt, &def->geometry.cylinders) < 0) { @@ -4690,6 +4695,8 @@ virDomainDiskDefParseXML(virCapsPtr caps, source = NULL; def->dst = target; target = NULL; + def->script = script; + script = NULL; def->hosts = hosts; hosts = NULL; def->nhosts = nhosts; @@ -4788,6 +4795,7 @@ cleanup: VIR_FREE(wwn); VIR_FREE(vendor); VIR_FREE(product); + VIR_FREE(script); ctxt->node = save_ctxt; return def; @@ -12899,6 +12907,8 @@ virDomainDiskDefFormat(virBufferPtr buf, } } + virBufferEscapeString(buf, " <script path='%s'/>\n", def->script); + virDomainDiskGeometryDefFormat(buf, def); virDomainDiskBlockIoDefFormat(buf, def); diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index edddf25..d55d209 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -668,6 +668,7 @@ struct _virDomainDiskDef { bool rawio_specified; int rawio; /* no = 0, yes = 1 */ int sgio; /* enum virDomainDiskSGIO */ + char *script; size_t nseclabels; virSecurityDeviceLabelDefPtr *seclabels; -- 1.8.1.4

1 0

[libvirt] [PATCH 01/12] libxl: allow script for any network interface, not only bridge
by Marek Marczykowski 10 Apr '13

10 Apr '13

This can be useful for route or NAT networks, or any other custom network setup. Especially configuration example in documentation uses <script/> tag with type 'ethernet'. --- src/libxl/libxl_conf.c | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c index b208dd8..ffc7bbb 100644 --- a/src/libxl/libxl_conf.c +++ b/src/libxl/libxl_conf.c @@ -608,18 +608,11 @@ libxlMakeNic(virDomainNetDefPtr l_nic, libxl_device_nic *x_nic) virReportOOMError(); return -1; } - if (l_nic->script && - (x_nic->script = strdup(l_nic->script)) == NULL) { - virReportOOMError(); - return -1; - } - } else { - if (l_nic->script) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("scripts are not supported on interfaces of type %s"), - virDomainNetTypeToString(l_nic->type)); - return -1; - } + } + if (l_nic->script && + (x_nic->script = strdup(l_nic->script)) == NULL) { + virReportOOMError(); + return -1; } return 0; -- 1.8.1.4

1 0

[libvirt] [PATCH 06/12] libxl: use disk 'script' attribute
by Marek Marczykowski 10 Apr '13

10 Apr '13

Implement handling of previously introduced <script/> element for disk config. This can be used for custom backend configuration like non-standard device-mapper nodes, or to prepare device in other domain (see the next patch). --- src/libxl/libxl_conf.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c index 7668305..4bd62e9 100644 --- a/src/libxl/libxl_conf.c +++ b/src/libxl/libxl_conf.c @@ -484,6 +484,11 @@ libxlMakeDisk(virDomainDiskDefPtr l_disk, libxl_device_disk *x_disk) return -1; } + if (l_disk->script && (x_disk->script = strdup(l_disk->script)) == NULL) { + virReportOOMError(); + return -1; + } + if (l_disk->driverName) { if (STREQ(l_disk->driverName, "tap") || STREQ(l_disk->driverName, "tap2")) { -- 1.8.1.4

1 0

[libvirt] [PATCH 02/12] libxl: PCI passthrough support
by Marek Marczykowski 10 Apr '13

10 Apr '13

--- src/libxl/libxl_conf.c | 72 ++++++++++++++++++++++++++++++++++++++++++++++++++ src/libxl/libxl_conf.h | 2 ++ 2 files changed, 74 insertions(+) diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c index ffc7bbb..7668305 100644 --- a/src/libxl/libxl_conf.c +++ b/src/libxl/libxl_conf.c @@ -759,6 +759,74 @@ error: return -1; } +int +libxlMakePci(virDomainHostdevDefPtr l_hostdev, + libxl_device_pci *x_pci) +{ + if (l_hostdev->mode != VIR_DOMAIN_HOSTDEV_MODE_SUBSYS) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("This driver supports only subsystem host device mode (PCI devices only)")); + return -1; + } + if (l_hostdev->source.subsys.type != VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("This driver supports only PCI host devices")); + return -1; + } + + x_pci->bus = l_hostdev->source.subsys.u.pci.bus; + x_pci->dev = l_hostdev->source.subsys.u.pci.slot; + x_pci->func = l_hostdev->source.subsys.u.pci.function; + return 0; +} + +static int +libxlMakePciList(virDomainDefPtr def, + libxl_domain_config *d_config) +{ + virDomainHostdevDefPtr *l_hostdevs = def->hostdevs; + int nhostdevs = def->nhostdevs; + int npcidevs = 0; + libxl_device_pci *x_pcidevs; + int i, j; + + if (nhostdevs == 0) + return 0; + + /* count PCI devices, ignore others (USB) */ + for (i = 0; i < nhostdevs; i++) { + if (l_hostdevs[i]->mode == VIR_DOMAIN_HOSTDEV_MODE_SUBSYS && + l_hostdevs[i]->source.subsys.type == VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI) + npcidevs++; + } + if (VIR_ALLOC_N(x_pcidevs, npcidevs) < 0) { + virReportOOMError(); + return -1; + } + + for (i = 0, j = 0; i < nhostdevs; i++) { + if (l_hostdevs[i]->mode != VIR_DOMAIN_HOSTDEV_MODE_SUBSYS || + l_hostdevs[i]->source.subsys.type != VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI) + continue; + + libxl_device_pci_init(&x_pcidevs[j]); + + if (libxlMakePci(l_hostdevs[i], &x_pcidevs[j]) < 0) + goto error; + j++; + } + + d_config->pcidevs = x_pcidevs; + d_config->num_pcidevs = npcidevs; + + return 0; + +error: + for (i = 0; i < npcidevs; i++) { + libxl_device_pci_dispose(&x_pcidevs[i]); + } + VIR_FREE(x_pcidevs); + return -1; +} + virCapsPtr libxlMakeCapabilities(libxl_ctx *ctx) { @@ -817,6 +885,10 @@ libxlBuildDomainConfig(libxlDriverPrivatePtr driver, goto error; } + if (libxlMakePciList(def, d_config) < 0) { + goto error; + } + d_config->on_reboot = def->onReboot; d_config->on_poweroff = def->onPoweroff; d_config->on_crash = def->onCrash; diff --git a/src/libxl/libxl_conf.h b/src/libxl/libxl_conf.h index f8602b4..b3ab3bf 100644 --- a/src/libxl/libxl_conf.h +++ b/src/libxl/libxl_conf.h @@ -119,6 +119,8 @@ libxlMakeNic(virDomainNetDefPtr l_nic, libxl_device_nic *x_nic); int libxlMakeVfb(libxlDriverPrivatePtr driver, virDomainGraphicsDefPtr l_vfb, libxl_device_vfb *x_vfb); +int +libxlMakePci(virDomainHostdevDefPtr l_hostdev, libxl_device_pci *x_pci); int libxlBuildDomainConfig(libxlDriverPrivatePtr driver, -- 1.8.1.4

1 0

[libvirt] [PATCH] docs: fix typo when using Kerberos principals
by Eric Blake 10 Apr '13

10 Apr '13

Kerberos uses 'primary' or 'key' files (principals), not 'abstract ideal' (principles). Reported by Jason Meinzer. Reflow a paragraph to fit in 80 columns in the process. * docs/auth.html.in: Fix spelling. --- Pushing under the trivial rule. docs/auth.html.in | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/docs/auth.html.in b/docs/auth.html.in index 929afd0..1bd02f2 100644 --- a/docs/auth.html.in +++ b/docs/auth.html.in @@ -253,13 +253,15 @@ Plugin "gssapiv2" [loaded], API version: 4 features: WANT_CLIENT_FIRST|PROXY_AUTHENTICATION|NEED_SERVER_FQDN </pre> <p> -Next it is necessary for the administrator of the Kerberos realm to issue a principle -for the libvirt server. There needs to be one principle per host running the libvirt -daemon. The principle should be named <code>libvirt/full.hostname(a)KERBEROS.REALM</code>. -This is typically done by running the <code>kadmin.local</code> command on the Kerberos -server, though some Kerberos servers have alternate ways of setting up service principles. -Once created, the principle should be exported to a keytab, copied to the host running -the libvirt daemon and placed in <code>/etc/libvirt/krb5.tab</code> +Next it is necessary for the administrator of the Kerberos realm to +issue a principal for the libvirt server. There needs to be one +principal per host running the libvirt daemon. The principal should be +named <code>libvirt/full.hostname(a)KERBEROS.REALM</code>. This is +typically done by running the <code>kadmin.local</code> command on the +Kerberos server, though some Kerberos servers have alternate ways of +setting up service principals. Once created, the principal should be +exported to a keytab, copied to the host running the libvirt daemon +and placed in <code>/etc/libvirt/krb5.tab</code> </p> <pre> # kadmin.local @@ -281,7 +283,7 @@ kadmin.local: quit </pre> <p> Any client application wishing to connect to a Kerberos enabled libvirt server -merely needs to run <code>kinit</code> to gain a user principle. This may well +merely needs to run <code>kinit</code> to gain a user principal. This may well be done automatically when a user logs into a desktop session, if PAM is setup to authenticate against Kerberos. </p> -- 1.8.1.4

1 0

[libvirt] [PATCH] Release VM lock before acquiring virDomainObjListPtr lock
by Daniel P. Berrange 10 Apr '13

10 Apr '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> When removing a VM from the virDomainObjListPtr, we must not be holding the VM lock while acquiring the list lock. Re-order code to ensure that we can release the VM lock early. --- src/conf/domain_conf.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 5e16ddf..d92e54a 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -2115,11 +2115,10 @@ void virDomainObjListRemove(virDomainObjListPtr doms, { char uuidstr[VIR_UUID_STRING_BUFLEN]; - virObjectLock(doms); virUUIDFormat(dom->def->uuid, uuidstr); - virObjectUnlock(dom); + virObjectLock(doms); virHashRemoveEntry(doms->objs, uuidstr); virObjectUnlock(doms); } -- 1.8.1

4 11

[libvirt] (no subject)
by arvind viswanathan 09 Apr '13

09 Apr '13

I wanted to check if event loop integration was supported even for remote applications using libvirt. My application would like to make non-blocking calls and also recv asynchronous notification remotely. Can some one point out if its supported. thanks

2 1