- Devel - libvirt List Archives

[libvirt] [PATCH] Don't mix relative and absolute paths.
by Philipp Hahn 23 Mar '10

23 Mar '10

autoconf goes to great lengths to calculate a proper MKINSTALLDIRS path, so just export the variable for gettext, but don't overwrite it with a broken path: $(top_builddir) is a relative path, while $ac_aux_dir can be an absolute path. Signed-off-by: Philipp Hahn <hahn(a)univention.de> --- configure.ac | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)

2 2

[libvirt] [PATCH 0/3] Refactor XML parsing code
by Jiri Denemark 23 Mar '10

23 Mar '10

Almost identical XML parsing code for either strings or files was copied 15 times. Since it was needed on two other places for parsing CPU XML strings with correct error reporting, I decided to factor the parsing code out to xml.c and used this one implementation in all other places. Jiri Denemark (3): Introduce XML parsing utility functions Use common XML parsing functions Fix error reporting when parsing CPU XML strings src/conf/domain_conf.c | 130 ++++++--------------------------------- src/conf/interface_conf.c | 93 ++++------------------------ src/conf/network_conf.c | 93 ++++------------------------ src/conf/node_device_conf.c | 60 +----------------- src/conf/secret_conf.c | 56 ++--------------- src/conf/storage_conf.c | 110 +++------------------------------- src/cpu/cpu.c | 11 ++- src/util/xml.c | 142 ++++++++++++++++++++++++++++++++++++++++++- src/util/xml.h | 19 ++++++ 9 files changed, 231 insertions(+), 483 deletions(-)

2 7

[libvirt] [RFC] events scripts support
by Daniel Veillard 23 Mar '10

23 Mar '10

We would like to introduce a way to configure system wide a script which would be called when some event happens. The script is a single executable set as a libvirtd option by the system administrator (assuming one runs the system libvirtd) or the user (assuming a user run libvirtd). The script could be invoked on daemon events, for example starting stopping, or reloading (SIGHUP), on domain events for example before a domain starts, or after its stops, and possibly on other kind of events detected by the daemon (storage or interface ...) My current thinking is to add the following two variables to libvirtd.conf: # Event scripts # An optional path to a script handling various kind of events like # domain start, domain end, pre and post migration, etc... # The events_script must be a path to the script or binary handling # the # events. # The events_set is a list of space separated name for the event type # the script should receive # # events_script="/etc/libvirt/events" # events_set="daemon domain" The script aruguments would be - the object kind: e.g. "domain" - the object name: e.g. the domain name - the event itself: e.g. "start" - sub event qualifier: e.g. "before" - an optional extra information for example in case of migration the destination or source So for example if the two variables as set as sugegsted, /etc/libvirt/events domain foo start before would be run by the daemon before the lunch of a domain which could have been initiated by the user when running "virsh foo start". The script exec return value is expected to be 0 unless indicating an error, in that case the libvirtd command would fail, for example if the command launched for "virsh foo start" failed with an error value the domain won't be started. This is a new kind of API in libvirt(d) so I'm submitting this for review. There could be some challenging issues, for example naming i.e. is the object "external" name like 'foo' the right thing to pass or should we also provide the uuid, making sure the arguments for the scripts and the behaviour is generic enough, and also how to handle potential recursion and avoid deadlock if the events script happen to use libvirt. I hope to have some initial patches by tomorrow, but I'm probably forgetting things, so feedback welcome ! Daniel -- Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ daniel(a)veillard.com | Rpmfind RPM search engine http://rpmfind.net/ http://veillard.com/ | virtualization library http://libvirt.org/

4 6

Re: [libvirt] FW: [PATCH 1/4] Addition of XenAPI support to libvirt
by Daniel Veillard 23 Mar '10

23 Mar '10

On Fri, Feb 19, 2010 at 11:33:36AM +0000, Sharadha Prabhakar (3P) wrote: > > thanks for the patch, just started to look at it. > > I assume that by libxenserver you mean the code to be added under src > in a following patch, right ? > > -> libxenserver is a library which provides APIs for performing various > Operations on the hypervisor. You can download it from > http://community.citrix.com/download/attachments/38633496/libxenserver-5.5.… > libxenserver folder should be in the same directory level of libvirt. Sorry that's not possible. Either the code is in libvirt, and in that case it doesn't have to be downloaded, but part of the patch submission (and managed on this list) , or it's a new external dependancy and it's availability must be checked by configure.ac. If we add a new dependancy, it must also be checked for Licence compatibility. So far we have always refused to use a third party library to access the hypervisor itself, libvirt(d) talking directly to the hypervisor components or launching it directly. For example we don't rely on the VMWare libraries to talk to ESX. > [...] > > +endif > > +#libvirt_driver_xenapi_la_LIBADD = $(XENAPI_LIBS) > > +libvirt_driver_xenapi_la_CFLAGS = $(XEN_CFLAGS) \ > > + $(shell xml2-config --cflags) \ > > + $(shell curl-config --cflags) > > +libvirt_driver_xenapi_la_LDFLAGS = -L@top_srcdir@/../libxenserver/ -lxenserver -g $(shell xml2-config --libs) \ > > + $(shell curl-config --libs) > > Hum, libxml2 is already fully detected in configure.ac, use the > LIBXML_* variables instead of trying to exec xml2-config. > > -> I've added the LIBXML_ flags in Makefile.am and posted the patch. okay, we will review this, but note that we start the feature freeze for 0.7.7 this week-end, so next week is more likely to be focused on bug fixes for already commited features. > Similary libcurl i looked at in configure.ac for ESX, this need > to be modified to be checked more generally and the LIBCURL_* > variables need to be used here too. > > -> I didn't quite understand the libcurl part you mentioned. I too noticed that ESX has > a piece of code in configure.ac to set the libcurl flags, do you want me to do add a similar > bit of code in configure.ac for XenAPI that defines LIBCURL flags and then add in my Makefile.am? the code to look for libcurl in configure.ac is currently only activated if esx support is on. It must be run if either esx or xen-api are selected, the ESX portion need to be modified accordingly, and your parts and Makefiles patches too. Daniel -- Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ daniel(a)veillard.com | Rpmfind RPM search engine http://rpmfind.net/ http://veillard.com/ | virtualization library http://libvirt.org/

3 3

[libvirt] XenAPI remote storage - target path
by Sharadha Prabhakar (3P) 23 Mar '10

23 Mar '10

Hi, I'm trying to write a Remote Storage driver for XenAPI. I see that target-path is used for both storage pools and volumes. In the case of XenAPI remote storage, the storage is not mounted on the local host where libvirt is running. Storage is maintained in a remote location only. In this case how do I specify target-path and how do I go about creating a VM with storage using libvirt APIs with virsh and virt-manager. Virt-manager expects me to give an absolute path for target-path. But In my case I don't have an absolute path. Can I have a target path like this for a particular storage volume "/storage pool uuid/storage-vol uuid"? This will help me identify which storage pool is Libvirt talking about and which volume in it. Using this information I can fetch data from The remote location and give it back to libvirt. Is this approach ok or does libvirt support my specific remote storage case in some way. Could someone clarify please? Regards, Sharadha

3 4

[libvirt] Can not display graphical console of lxc Virtual Machine.
by Kumar L Srikanth-B22348 23 Mar '10

23 Mar '10

Hi all, I am trying to display the graphical console of a lxc virtual machine which was already created and running. For this, I am using 'virt-viewer'. But, when I execute the following command, it's throwing some errors. [root@localhost lxc_devel]# virt-viewer --connect lxc:/// vm2_fedora --debug ** (virt-viewer:11988): DEBUG: Add handle 4 1 0x217c140 ** (virt-viewer:11988): DEBUG: Add timeout 0x217e4f0 -1 0x7fda386cb990 0x217c140 1 ** (virt-viewer:11988): DEBUG: Skipping inactive resize ** (virt-viewer:11988): DEBUG: Failed to activate viewer can anyone help me. Please suggest me if any other ways of doing it. Regards, Srikanth.

2 1

[libvirt] [PATCH 0/6] Support VNC password changes on running guests
by Daniel P. Berrange 23 Mar '10

23 Mar '10

This patch introduces a new virDomainUpdateDeviceFlags() API to allow the configuration of a device to be changed on the fly. It ports the existing CDROM media change code in all drivers to use this new API (keeps old support too). It then adds VNC password change support in the QEMU driver using this new API

2 13

[libvirt] [PATCH] virDomainDiskDefAssignAddress: return int, not void
by Jim Meyering 23 Mar '10

23 Mar '10

Per discussion a week or so ago, here's a fix for virDomainDiskDefAssignAddress. However, this change is incomplete, because making that function reject erroneous input has exposed problems elsewhere. For starters, this change causes three previously passing tests to fail: TEST: virshtest .!.!!!!!!!!!!!!! 16 FAIL FAIL: virshtest TEST: int-overflow --- err 2010-03-19 16:50:29.869979267 +0100 +++ exp 2010-03-19 16:50:29.847854045 +0100 @@ -1,2 +1 @@ -error: Unknown failure -error: failed to connect to the hypervisor +error: failed to get domain '4294967298' FAIL: int-overflow TEST: xml2sexprtest .................!.....!................ 40 ... 43 FAIL FAIL: xml2sexprtest Those fail because virDomainDiskDefAssignAddress ends up processing a "def" with def->dst values of "xvda:disk" and "sda1", both of which make virDiskNameToIndex(def->dst) return -1. I confirmed that simply removing any ":disk" suffix and mapping "sda1" to "sda" would solve the problem, but the question is where to make that change. There are numerous input XML files that mention "sda1", so changing test inputs is probably not an option. There is already code to remove the :disk suffix, e.e., here: src/xen/xend_internal.c: } else if (STREQ (offset, ":disk")) { ... src/xen/xend_internal.c- offset[0] = '\0'; Suggestions? >From 3d2b32ad3309ee10ae48f438f61134d2fa00a63a Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Mon, 15 Mar 2010 21:42:01 +0100 Subject: [PATCH] virDomainDiskDefAssignAddress: return int, not void Before, this function would blindly accept an invalid def->dst and then abuse the idx=-1 it would get from virDiskNameToIndex, when passing it invalid strings like "xvda:disk" and "sda1". Now, this function returns -1 upon failure. * src/conf/domain_conf.c (virDomainDiskDefAssignAddress): as above. Update callers. * src/conf/domain_conf.h: Update prototype. * src/qemu/qemu_conf.c: Update callers. --- src/conf/domain_conf.c | 11 ++++++++--- src/conf/domain_conf.h | 4 ++-- src/qemu/qemu_conf.c | 11 +++++++++-- 3 files changed, 19 insertions(+), 7 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 56c5239..5968405 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -1233,10 +1233,12 @@ cleanup: } -void +int virDomainDiskDefAssignAddress(virDomainDiskDefPtr def) { int idx = virDiskNameToIndex(def->dst); + if (idx < 0) + return -1; switch (def->bus) { case VIR_DOMAIN_DISK_BUS_SCSI: @@ -1270,6 +1272,8 @@ virDomainDiskDefAssignAddress(virDomainDiskDefPtr def) /* Other disk bus's aren't controller based */ break; } + + return 0; } /* Parse the XML definition for a disk @@ -1498,8 +1502,9 @@ virDomainDiskDefParseXML(xmlNodePtr node, def->serial = serial; serial = NULL; - if (def->info.type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE) - virDomainDiskDefAssignAddress(def); + if (def->info.type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE + && virDomainDiskDefAssignAddress(def)) + goto error; cleanup: VIR_FREE(bus); diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 0540a77..44fff0c 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -1,7 +1,7 @@ /* * domain_conf.h: domain XML processing * - * Copyright (C) 2006-2008 Red Hat, Inc. + * Copyright (C) 2006-2008, 2010 Red Hat, Inc. * Copyright (C) 2006-2008 Daniel P. Berrange * * This library is free software; you can redistribute it and/or @@ -855,7 +855,7 @@ int virDomainDiskInsert(virDomainDefPtr def, virDomainDiskDefPtr disk); void virDomainDiskInsertPreAlloced(virDomainDefPtr def, virDomainDiskDefPtr disk); -void virDomainDiskDefAssignAddress(virDomainDiskDefPtr def); +int virDomainDiskDefAssignAddress(virDomainDiskDefPtr def); int virDomainControllerInsert(virDomainDefPtr def, virDomainControllerDefPtr controller); diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index fb23c52..95d2e47 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -4766,7 +4766,13 @@ qemuParseCommandLineDisk(const char *val, else def->dst[2] = 'a' + idx; - virDomainDiskDefAssignAddress(def); + if (virDomainDiskDefAssignAddress(def) != 0) { + qemuReportError(VIR_ERR_INTERNAL_ERROR, + _("invalid device name '%s'"), def->dst); + virDomainDiskDefFree(def); + def = NULL; + /* fall through to "cleanup" */ + } cleanup: for (i = 0 ; i < nkeywords ; i++) { @@ -5574,7 +5580,8 @@ virDomainDefPtr qemuParseCommandLine(virCapsPtr caps, goto no_memory; } - virDomainDiskDefAssignAddress(disk); + if (virDomainDiskDefAssignAddress(disk) != 0) + goto error; if (VIR_REALLOC_N(def->disks, def->ndisks+1) < 0) { virDomainDiskDefFree(disk); -- 1.7.0.2.455.g91132

3 5

[libvirt] [PATCH] esx: Add esxVI_LookupVirtualMachineByName
by Matthias Bolte 23 Mar '10

23 Mar '10

Used in esxDomainLookupByName and to be used in esxDomainDefineXML later. --- src/esx/esx_driver.c | 66 +++++++++++++++++---------------------------- src/esx/esx_vi.c | 72 ++++++++++++++++++++++++++++++++++++++++++++++++++ src/esx/esx_vi.h | 5 +++ 3 files changed, 102 insertions(+), 41 deletions(-) diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c index b97945d..30a1adb 100644 --- a/src/esx/esx_driver.c +++ b/src/esx/esx_driver.c @@ -1206,12 +1206,10 @@ esxDomainLookupByName(virConnectPtr conn, const char *name) { esxPrivate *priv = conn->privateData; esxVI_String *propertyNameList = NULL; - esxVI_ObjectContent *virtualMachineList = NULL; esxVI_ObjectContent *virtualMachine = NULL; esxVI_VirtualMachinePowerState powerState; - int id_candidate = -1; - char *name_candidate = NULL; - unsigned char uuid_candidate[VIR_UUID_BUFLEN]; + int id = -1; + unsigned char uuid[VIR_UUID_BUFLEN]; virDomainPtr domain = NULL; if (esxVI_EnsureSession(priv->host) < 0) { @@ -1220,59 +1218,45 @@ esxDomainLookupByName(virConnectPtr conn, const char *name) if (esxVI_String_AppendValueListToList(&propertyNameList, "configStatus\0" - "name\0" "runtime.powerState\0" "config.uuid\0") < 0 || - esxVI_LookupObjectContentByType(priv->host, priv->host->vmFolder, - "VirtualMachine", propertyNameList, - esxVI_Boolean_True, - &virtualMachineList) < 0) { + esxVI_LookupVirtualMachineByName(priv->host, name, propertyNameList, + &virtualMachine, + esxVI_Occurrence_OptionalItem) < 0) { goto failure; } - for (virtualMachine = virtualMachineList; virtualMachine != NULL; - virtualMachine = virtualMachine->_next) { - VIR_FREE(name_candidate); - - if (esxVI_GetVirtualMachineIdentity(virtualMachine, - &id_candidate, &name_candidate, - uuid_candidate) < 0) { - goto failure; - } - - if (STRNEQ(name, name_candidate)) { - continue; - } + if (virtualMachine == NULL) { + ESX_ERROR(VIR_ERR_NO_DOMAIN, "No domain with name '%s'", name); + goto failure; + } - if (esxVI_GetVirtualMachinePowerState(virtualMachine, - &powerState) < 0) { - goto failure; - } - domain = virGetDomain(conn, name_candidate, uuid_candidate); + if (esxVI_GetVirtualMachineIdentity(virtualMachine, &id, NULL, uuid) < 0) { + goto failure; + } - if (domain == NULL) { - goto failure; - } + if (esxVI_GetVirtualMachinePowerState(virtualMachine, + &powerState) < 0) { + goto failure; + } - /* Only running/suspended virtual machines have an ID != -1 */ - if (powerState != esxVI_VirtualMachinePowerState_PoweredOff) { - domain->id = id_candidate; - } else { - domain->id = -1; - } + domain = virGetDomain(conn, name, uuid); - break; + if (domain == NULL) { + goto failure; } - if (domain == NULL) { - ESX_ERROR(VIR_ERR_NO_DOMAIN, "No domain with name '%s'", name); + /* Only running/suspended virtual machines have an ID != -1 */ + if (powerState != esxVI_VirtualMachinePowerState_PoweredOff) { + domain->id = id; + } else { + domain->id = -1; } cleanup: esxVI_String_Free(&propertyNameList); - esxVI_ObjectContent_Free(&virtualMachineList); - VIR_FREE(name_candidate); + esxVI_ObjectContent_Free(&virtualMachine); return domain; diff --git a/src/esx/esx_vi.c b/src/esx/esx_vi.c index 63ddaa4..326add7 100644 --- a/src/esx/esx_vi.c +++ b/src/esx/esx_vi.c @@ -1877,6 +1877,78 @@ esxVI_LookupVirtualMachineByUuid(esxVI_Context *ctx, const unsigned char *uuid, int +esxVI_LookupVirtualMachineByName(esxVI_Context *ctx, const char *name, + esxVI_String *propertyNameList, + esxVI_ObjectContent **virtualMachine, + esxVI_Occurrence occurrence) +{ + int result = 0; + esxVI_String *completePropertyNameList = NULL; + esxVI_ObjectContent *virtualMachineList = NULL; + esxVI_ObjectContent *candidate = NULL; + char *name_candidate = NULL; + + if (virtualMachine == NULL || *virtualMachine != NULL) { + ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "Invalid argument"); + return -1; + } + + if (esxVI_String_DeepCopyList(&completePropertyNameList, + propertyNameList) < 0 || + esxVI_String_AppendValueToList(&completePropertyNameList, "name") < 0 || + esxVI_LookupObjectContentByType(ctx, ctx->vmFolder, "VirtualMachine", + completePropertyNameList, + esxVI_Boolean_True, + &virtualMachineList) < 0) { + goto failure; + } + + for (candidate = virtualMachineList; candidate != NULL; + candidate = candidate->_next) { + VIR_FREE(name_candidate); + + if (esxVI_GetVirtualMachineIdentity(candidate, NULL, &name_candidate, + NULL) < 0) { + goto failure; + } + + if (STRNEQ(name, name_candidate)) { + continue; + } + + if (esxVI_ObjectContent_DeepCopy(virtualMachine, candidate) < 0) { + goto failure; + } + + break; + } + + if (*virtualMachine == NULL) { + if (occurrence == esxVI_Occurrence_OptionalItem) { + return 0; + } else { + ESX_VI_ERROR(VIR_ERR_NO_DOMAIN, + "Could not find domain with name '%s'", name); + goto failure; + } + } + + cleanup: + esxVI_String_Free(&completePropertyNameList); + esxVI_ObjectContent_Free(&virtualMachineList); + VIR_FREE(name_candidate); + + return result; + + failure: + result = -1; + + goto cleanup; +} + + + +int esxVI_LookupVirtualMachineByUuidAndPrepareForTask (esxVI_Context *ctx, const unsigned char *uuid, esxVI_String *propertyNameList, esxVI_ObjectContent **virtualMachine, diff --git a/src/esx/esx_vi.h b/src/esx/esx_vi.h index a57406c..1349a1b 100644 --- a/src/esx/esx_vi.h +++ b/src/esx/esx_vi.h @@ -237,6 +237,11 @@ int esxVI_LookupVirtualMachineByUuid(esxVI_Context *ctx, esxVI_ObjectContent **virtualMachine, esxVI_Occurrence occurrence); +int esxVI_LookupVirtualMachineByName(esxVI_Context *ctx, const char *name, + esxVI_String *propertyNameList, + esxVI_ObjectContent **virtualMachine, + esxVI_Occurrence occurrence); + int esxVI_LookupVirtualMachineByUuidAndPrepareForTask (esxVI_Context *ctx, const unsigned char *uuid, esxVI_String *propertyNameList, esxVI_ObjectContent **virtualMachine, -- 1.6.3.3

2 2

[libvirt] [PATCH] esx: Fix potential memory leak in esxVI_BuildFullTraversalSpecItem
by Matthias Bolte 23 Mar '10

23 Mar '10

If esxVI_String_DeepCopyValue or esxVI_SelectionSpec_AppendToList fail then selectionSpec would leak. Add a free call in the failure path to fix the leak. --- src/esx/esx_vi.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/esx/esx_vi.c b/src/esx/esx_vi.c index aa46532..63ddaa4 100644 --- a/src/esx/esx_vi.c +++ b/src/esx/esx_vi.c @@ -1163,8 +1163,6 @@ esxVI_BuildFullTraversalSpecItem(esxVI_SelectionSpec **fullTraversalSpecList, currentSelectSetName = selectSetNames; while (currentSelectSetName != NULL && *currentSelectSetName != '\0') { - selectionSpec = NULL; - if (esxVI_SelectionSpec_Alloc(&selectionSpec) < 0 || esxVI_String_DeepCopyValue(&selectionSpec->name, currentSelectSetName) < 0 || @@ -1173,6 +1171,7 @@ esxVI_BuildFullTraversalSpecItem(esxVI_SelectionSpec **fullTraversalSpecList, goto failure; } + selectionSpec = NULL; currentSelectSetName += strlen(currentSelectSetName) + 1; } } @@ -1186,6 +1185,7 @@ esxVI_BuildFullTraversalSpecItem(esxVI_SelectionSpec **fullTraversalSpecList, failure: esxVI_TraversalSpec_Free(&traversalSpec); + esxVI_SelectionSpec_Free(&selectionSpec); return -1; } -- 1.6.3.3

2 2