- Devel - libvirt List Archives

[libvirt] Block-migrate
by Ruben Kerkhof 13 Aug '10

13 Aug '10

I've been playing with the new block-migrate feature, but am unable to get it to work. [root@src ~]# virsh migrate --live --p2p --tunnelled --copy-storage-all 4c5c75b9-decc-41c9-9296-20ca5bd5c355 qemu://dst/system error: Unknown failure /var/log/libvirt/qemu/4c5c75b9-decc-41c9-9296-20ca5bd5c355.log on the destination host shows: bind(unix:/var/run/libvirt/qemu/qemu.tunnelmigrate.dest.4c5c75b9-decc-41c9-9296-20ca5bd5c355): Permission denied Migration failed. Exit code unix:/var/run/libvirt/qemu/qemu.tunnelmigrate.dest.4c5c75b9-decc-41c9-9296-20ca5bd5c355(-22), exiting It seems that qemu is not able to write to that location. [root@dst qemu]# ls -ld /var/run/libvirt/qemu/ drwx------. 2 root root 4096 Aug 7 15:40 /var/run/libvirt/qemu/ As a workaround I gave qemu write permission, and now the block migrate starts. Receiving block device images Completed 100 % Then the migrate command fails: [root@src ~]# virsh migrate --live --p2p --tunnelled --copy-storage-all 4c5c75b9-decc-41c9-9296-20ca5bd5c355 qemu://phy004.tilaa.nl/system error: Unknown failure and the only thing I can find is in /var/log/libvirt/libvirt.log on the destination: 15:40:12.370: error : qemuStreamMigWrite:10376 : cannot write to stream: Broken pipe Maybe I'm using the wrong options for virsh migrate, but they're not described in the manpage. Any hints? Regards, Ruben Kerkhof

4 10

[libvirt] [PATCH] Move the tunnelled migration unix socket to /var/lib/libvirt/qemu
by Chris Lalancette 13 Aug '10

13 Aug '10

Since the qemu process is running as qemu:qemu, it can't actually look at the unix socket in /var/run/libvirt/qemu which is owned by root and has permission 700. Move the unix socket to /var/lib/libvirt/qemu, which is already owned by qemu:qemu. Thanks to Justin Clift for test this out for me. Signed-off-by: Chris Lalancette <clalance(a)redhat.com> --- src/qemu/qemu_driver.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index b6b6633..007b09a 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -10470,7 +10470,7 @@ qemudDomainMigratePrepareTunnel(virConnectPtr dconn, vm->def->id = -1; if (virAsprintf(&unixfile, "%s/qemu.tunnelmigrate.dest.%s", - driver->stateDir, vm->def->name) < 0) { + driver->libDir, vm->def->name) < 0) { virReportOOMError(); goto endjob; } @@ -10941,7 +10941,7 @@ static int doTunnelMigrate(virDomainPtr dom, /* Stage 1. setup local support infrastructure */ if (virAsprintf(&unixfile, "%s/qemu.tunnelmigrate.src.%s", - driver->stateDir, vm->def->name) < 0) { + driver->libDir, vm->def->name) < 0) { virReportOOMError(); goto cleanup; } -- 1.7.2.1

3 3

[libvirt] [PATCH] Fix tunnelled migration with qemu running as qemu:qemu.
by Chris Lalancette 13 Aug '10

13 Aug '10

The problem is that on the source of the migration, libvirtd is responsible for creating the unix socket over which the data will flow. Since libvirtd is running as root, this file will be created as root. When the qemu process running as qemu:qemu goes to access the unix file to write data to it, it will get permission denied and fail. Make sure to change the owner of the unix file to qemu:qemu. Thanks to Justin Clift for testing this patch out for me. Signed-off-by: Chris Lalancette <clalance(a)redhat.com> --- src/qemu/qemu_driver.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 3dfd1ae..b6b6633 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -10975,6 +10975,13 @@ static int doTunnelMigrate(virDomainPtr dom, goto cleanup; } + if (chown(unixfile, qemu_driver->user, qemu_driver->group) < 0) { + virReportSystemError(errno, + _("Cannot change unix socket '%s' owner"), + unixfile); + goto cleanup; + } + /* check that this qemu version supports the unix migration */ if (qemudExtractVersionInfo(vm->def->emulator, NULL, &qemuCmdFlags) < 0) { qemuReportError(VIR_ERR_INTERNAL_ERROR, -- 1.7.2.1

2 2

[libvirt] [PATCH] Fix valgrind complaints when using kill -SIGHUP on libvirtd
by Stefan Berger 12 Aug '10

12 Aug '10

This patch fixes a couple of complaints from valgrind when tickling libvirtd with SIGHUP. The first two files contain fixes for memory leaks. The 3rd one initializes an uninitialized variable. The 4th one is another memory leak. Here are some example valgrind outputs (not in order of patch addressing it): ==5261== 43 bytes in 1 blocks are definitely lost in loss record 347 of 573 ==5261== at 0x4A0515D: malloc (vg_replace_malloc.c:195) ==5261== by 0x327607FD51: strdup (in /lib64/libc-2.12.so) ==5261== by 0x4E865DF: virStoragePoolLoadAllConfigs (storage_conf.c:1413) ==5261== by 0x48A759: storageDriverStartup (storage_driver.c:168) ==5261== by 0x4EA4D2F: virStateInitialize (libvirt.c:978) ==5261== by 0x41E190: main (libvirtd.c:3241) ==5261== ==5261== 43 bytes in 1 blocks are definitely lost in loss record 348 of 573 ==5261== at 0x4A0515D: malloc (vg_replace_malloc.c:195) ==5261== by 0x327607FD51: strdup (in /lib64/libc-2.12.so) ==5261== by 0x4E865DF: virStoragePoolLoadAllConfigs (storage_conf.c:1413) ==5261== by 0x48A551: storageDriverReload (storage_driver.c:198) ==5261== by 0x4E9566D: virStateReload (libvirt.c:1017) ==5261== by 0x418870: qemudDispatchSignalEvent (libvirtd.c:388) ==5261== by 0x418538: virEventRunOnce (event.c:479) ==5261== by 0x41A1D5: qemudOneLoop (libvirtd.c:2215) ==5261== by 0x41A4A2: qemudRunLoop (libvirtd.c:2324) ==5261== by 0x3276807760: start_thread (in /lib64/libpthread-2.12.so) ==5261== by 0x32760E14EC: clone (in /lib64/libc-2.12.so) [...] ==5261== Conditional jump or move depends on uninitialised value(s) ==5261== at 0x437E66: virPipeReadUntilEOF (util.c:966) ==5261== by 0x439467: virRunWithHook (util.c:829) ==5261== by 0x4A821F: ebiptablesExecCLI (nwfilter_ebiptables_driver.c:2312) ==5261== by 0x4A8728: ebiptablesTearOldRules (nwfilter_ebiptables_driver.c:3218) [...] ==21871== 841 bytes in 20 blocks are definitely lost in loss record 552 of 577 ==21871== at 0x4A0515D: malloc (vg_replace_malloc.c:195) ==21871== by 0x327607FD51: strdup (in /lib64/libc-2.12.so) ==21871== by 0x4E7FD34: virNWFilterPoolLoadAllConfigs (nwfilter_conf.c:2242) ==21871== by 0x4A5406: nwfilterDriverStartup (nwfilter_driver.c:111) ==21871== by 0x4EA4D5F: virStateInitialize (libvirt.c:978) ==21871== by 0x41E190: main (libvirtd.c:3241) [...] ==12889== at 0x4A04481: calloc (vg_replace_malloc.c:418) ==12889== by 0x434D2D: virAlloc (memory.c:100) ==12889== by 0x4E8E0A1: x86MapLoadCallback (cpu_x86.c:473) ==12889== by 0x4E90ED0: cpuMapLoad (cpu_map.c:58) ==12889== by 0x4E8DACE: x86LoadMap (cpu_x86.c:1131) ==12889== by 0x4E901DB: x86Decode (cpu_x86.c:1313) ==12889== by 0x45F4F8: qemudCapsInit (qemu_conf.c:1056) ==12889== by 0x440FBF: qemuCreateCapabilities (qemu_driver.c:1553) ==12889== by 0x44165F: qemudStartup (qemu_driver.c:1856) ==12889== by 0x4EA4D3F: virStateInitialize (libvirt.c:978) ==12889== by 0x41E190: main (libvirtd.c:3241) Signed-off-by: Stefan Berger <stefanb(a)us.ibm.com> --- src/conf/nwfilter_conf.c | 1 + src/conf/storage_conf.c | 2 ++ src/util/util.c | 2 ++ 3 files changed, 5 insertions(+) Index: libvirt-acl/src/conf/nwfilter_conf.c =================================================================== --- libvirt-acl.orig/src/conf/nwfilter_conf.c +++ libvirt-acl/src/conf/nwfilter_conf.c @@ -2239,6 +2239,7 @@ virNWFilterPoolObjLoad(virConnectPtr con return NULL; } + VIR_FREE(pool->configFile); // for driver reload pool->configFile = strdup(path); if (pool->configFile == NULL) { virReportOOMError(); Index: libvirt-acl/src/conf/storage_conf.c =================================================================== --- libvirt-acl.orig/src/conf/storage_conf.c +++ libvirt-acl/src/conf/storage_conf.c @@ -1403,12 +1403,14 @@ virStoragePoolObjLoad(virStoragePoolObjL return NULL; } + VIR_FREE(pool->configFile); // for driver reload pool->configFile = strdup(path); if (pool->configFile == NULL) { virReportOOMError(); virStoragePoolDefFree(def); return NULL; } + VIR_FREE(pool->autostartLink); // for driver reload pool->autostartLink = strdup(autostartLink); if (pool->autostartLink == NULL) { virReportOOMError(); Index: libvirt-acl/src/util/util.c =================================================================== --- libvirt-acl.orig/src/util/util.c +++ libvirt-acl/src/util/util.c @@ -941,9 +941,11 @@ virPipeReadUntilEOF(int outfd, int errfd fds[0].fd = outfd; fds[0].events = POLLIN; + fds[0].revents = 0; finished[0] = 0; fds[1].fd = errfd; fds[1].events = POLLIN; + fds[1].revents = 0; finished[1] = 0; while(!(finished[0] && finished[1])) { Index: libvirt-acl/src/cpu/cpu_x86.c =================================================================== --- libvirt-acl.orig/src/cpu/cpu_x86.c +++ libvirt-acl/src/cpu/cpu_x86.c @@ -1092,6 +1092,12 @@ x86MapFree(struct x86_map *map) x86ModelFree(model); } + while (map->vendors != NULL) { + struct x86_vendor *vendor = map->vendors; + map->vendors = vendor->next; + x86VendorFree(vendor); + } + VIR_FREE(map); }

3 2

[libvirt] [PATCH] qemu: do not ask for balloon information if not used
by Daniel Veillard 12 Aug '10

12 Aug '10

Basically a followup of the previous patch about balloon desactivation if desactivated, to not ask for balloon information to qemu as we will just get an error back. This can make a huge difference in the time needed for domain information or list when a machine is loaded, and balloon has been desactivated in the guests. Note that the patch does a check in the GetDomainInfo function, to avoid checking for job, getting a job, getting the monitor lock and cleaning back which would be added operations if I had done this one level down in qemuMonitorGetBalloonInfo() The qemudDomainDumpXML() function also call qemuMonitorGetBalloonInfo() so maybe the check should be duplicated there, I left that out of the patch for now as this is an operation which sounds less time critical. Or maybe the test should be added to qemuMonitorGetBalloonInfo() too since it's exported from src/qemu/qemu_monitor.h and may end up being used from other places in the future, opinions ? 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/

2 2

[libvirt] [PATCH] bridge: Add --dhcp-no-override option to dnsmasq
by Jiri Denemark 12 Aug '10

12 Aug '10

--dhcp-no-override description from dnsmasq man page: Disable re-use of the DHCP servername and filename fields as extra option space. If it can, dnsmasq moves the boot server and filename information (from dhcp-boot) out of their dedicated fields into DHCP options. This make extra space available in the DHCP packet for options but can, rarely, confuse old or broken clients. This flag forces "simple and safe" behaviour to avoid problems in such a case. It seems some virtual network card ROMs are this old/buggy so let's add --dhcp-no-override as a workaround for them. We don't use extra DHCP options so this should be safe. --- src/network/bridge_driver.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index f247a0f..d6d3068 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -427,6 +427,8 @@ networkBuildDnsmasqArgv(virNetworkObjPtr network, (2 * network->def->nranges) + /* --dhcp-range 10.0.0.2,10.0.0.254 */ /* --dhcp-lease-max=xxx if needed */ (network->def->nranges ? 1 : 0) + + /* --dhcp-no-override if needed */ + (network->def->nranges ? 1 : 0) + /* --dhcp-hostsfile=/var/lib/dnsmasq/$NAME.hostsfile */ (network->def->nhosts > 0 ? 1 : 0) + /* --enable-tftp --tftp-root /srv/tftp */ @@ -497,6 +499,7 @@ networkBuildDnsmasqArgv(virNetworkObjPtr network, if (network->def->nranges > 0) { snprintf(buf, sizeof(buf), "--dhcp-lease-max=%d", nbleases); APPEND_ARG(*argv, i++, buf); + APPEND_ARG(*argv, i++, "--dhcp-no-override"); } if (network->def->nhosts > 0) { -- 1.7.2

2 3

[libvirt] [PATCH 0/3] A couple of UML-related fixes
by Soren Hansen 12 Aug '10

12 Aug '10

I've been trying to get UML working for the last couple of days. As it stands, at least bridged networking doesn't work for me. I've got a fix, but I'm not sure I'm doing it right. I can get it to fail in three distinct ways: * With the current code, it seems that the tap device disappears almost immediately. This happens becuase the call to brAddTap includes an (int *)tapfd argument, so the tap device isn't persistent. A few lines after brAddTap, close(tapfd) is called and the tap device goes missing. * Passing a NULL tapfd argument to brAddTap and removing the call to close(tapfd) makes the tapfd persist, but when the uml domain attempts to bring up the interface, it fails with EBUSY. This turns out to be because brAddTap marks the tap device persistent, but doesn't close the fd, so both libvirt and uml have the fd open and that's doesn't work out well. * Finally, I tried passing the tapfd result back up the call chain so that I have a list of them that I could tell virExecDaemonize to keep open and then close them in libvirt after the fork. I think this is when I got EPERM when trying to bring the interface up in UML domain, but I'm not sure right now. Also, I've had problems connecting to the domain's console. These three patches seem to fix everything for me. Soren Hansen (3): Close fd's of persistent tap devices Make umlConnectTapDevice ask brAddTap for a persistent tap device. Remove wrong check for uml monitor response size src/uml/uml_conf.c | 6 +----- src/uml/uml_driver.c | 4 ---- src/util/bridge.c | 2 ++ 3 files changed, 3 insertions(+), 9 deletions(-)

2 1

[libvirt] [PATCH] esx: Improve VMX file name parsing and formatting
by Matthias Bolte 12 Aug '10

12 Aug '10

For parsing try to match by datastore mount path first, if that fails fallback to /vmfs/volumes/<datastore>/<path> parsing. This also fixes problems with GSX on Windows. Because GSX on Windows doesn't use /vmfs/volumes/ style file names. For formatting use the datastore mount path too, instead of using /vmfs/volumes/<datastore>/<path> as fixed format. --- src/esx/esx_driver.c | 372 +++++++++++++++++++++++++++++++------------------ 1 files changed, 235 insertions(+), 137 deletions(-) diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c index b0ef704..322c588 100644 --- a/src/esx/esx_driver.c +++ b/src/esx/esx_driver.c @@ -24,8 +24,6 @@ #include <config.h> -#include <netdb.h> - #include "internal.h" #include "domain_conf.h" #include "authhelper.h" @@ -60,190 +58,290 @@ struct _esxVMX_Data { -static char * -esxAbsolutePathToDatastorePath(esxVI_Context *ctx, const char *absolutePath) -{ - bool success = false; - char *copyOfAbsolutePath = NULL; - char *tmp = NULL; - char *saveptr = NULL; - esxVI_String *propertyNameList = NULL; - esxVI_ObjectContent *datastore = NULL; - - char *datastorePath = NULL; - char *preliminaryDatastoreName = NULL; - char *directoryAndFileName = NULL; - char *datastoreName = NULL; - - if (esxVI_String_DeepCopyValue(&copyOfAbsolutePath, absolutePath) < 0) { - return NULL; - } - - /* Expected format: '/vmfs/volumes/<datastore>/<path>' */ - if ((tmp = STRSKIP(copyOfAbsolutePath, "/vmfs/volumes/")) == NULL || - (preliminaryDatastoreName = strtok_r(tmp, "/", &saveptr)) == NULL || - (directoryAndFileName = strtok_r(NULL, "", &saveptr)) == NULL) { - ESX_ERROR(VIR_ERR_INTERNAL_ERROR, - _("Absolute path '%s' doesn't have expected format " - "'/vmfs/volumes/<datastore>/<path>'"), absolutePath); - goto cleanup; - } - - if (esxVI_String_AppendValueToList(&propertyNameList, - "summary.name") < 0 || - esxVI_LookupDatastoreByAbsolutePath(ctx, absolutePath, - propertyNameList, &datastore, - esxVI_Occurrence_OptionalItem) < 0) { - goto cleanup; - } - - if (datastore == NULL) { - if (esxVI_LookupDatastoreByName(ctx, preliminaryDatastoreName, - propertyNameList, &datastore, - esxVI_Occurrence_OptionalItem) < 0) { - goto cleanup; - } - } - - if (datastore != NULL) { - if (esxVI_GetStringValue(datastore, "summary.name", &datastoreName, - esxVI_Occurrence_RequiredItem)) { - goto cleanup; - } - } - - if (datastoreName == NULL) { - VIR_WARN("Could not retrieve datastore name for absolute " - "path '%s', falling back to preliminary name '%s'", - absolutePath, preliminaryDatastoreName); - - datastoreName = preliminaryDatastoreName; - } - - if (virAsprintf(&datastorePath, "[%s] %s", datastoreName, - directoryAndFileName) < 0) { - virReportOOMError(); - goto cleanup; - } - - /* FIXME: Check if referenced path/file really exists */ - - success = true; - - cleanup: - if (! success) { - VIR_FREE(datastorePath); - } - - VIR_FREE(copyOfAbsolutePath); - esxVI_String_Free(&propertyNameList); - esxVI_ObjectContent_Free(&datastore); - - return datastorePath; -} - - - +/* + * Parse a file name from a .vmx file and convert it to datastore path format. + * A .vmx file can contain file names in various formats: + * + * - A single name referencing a file in the same directory as the .vmx file: + * + * test1.vmdk + * + * - An absolute file name referencing a file in a datastore that is mounted at + * /vmfs/volumes/<datastore>: + * + * /vmfs/volumes/b24b7a78-9d82b4f5/test1/test1.vmdk + * /vmfs/volumes/datastore1/test1/test1.vmdk + * + * The actual mount directory is /vmfs/volumes/b24b7a78-9d82b4f5, the second + * form is a symlink to it using the datastore name. This is the typical + * setup on an ESX(i) server. + * + * - With GSX installed on Windows there are also Windows style file names + * including UNC file names: + * + * C:\Virtual Machines\test1\test1.vmdk + * \\nas1\storage1\test1\test1.vmdk + * + * The datastore path format typically looks like this: + * + * [datastore1] test1/test1.vmdk + * + * Firstly this functions checks if the given file name contains a separator. + * If it doesn't then the referenced file is in the same directory as the .vmx + * file. The datastore name and directory of the .vmx file are passed to this + * function via the opaque paramater by the caller of esxVMX_ParseConfig. + * + * Otherwise query for all known datastores and their mount directories. Then + * try to find a datastore with a mount directory that is a prefix to the given + * file name. This mechanism covers the Windows style file names too. + * + * The symlinks using the datastore name (/vmfs/volumes/datastore1) are an + * exception and need special handling. Parse the datastore name and use it + * to lookup the datastore by name to verify that it exists. + */ static char * esxParseVMXFileName(const char *fileName, void *opaque) { - char *src = NULL; + char *datastorePath = NULL; esxVMX_Data *data = opaque; - - if (STRPREFIX(fileName, "/vmfs/volumes/")) { - /* Found absolute path referencing a file inside a datastore */ - return esxAbsolutePathToDatastorePath(data->ctx, fileName); - } else if (STRPREFIX(fileName, "/")) { - /* Found absolute path referencing a file outside a datastore */ - src = strdup(fileName); - - if (src == NULL) { - virReportOOMError(); - return NULL; - } - - /* FIXME: Check if referenced path/file really exists */ - - return src; - } else if (strchr(fileName, '/') != NULL) { - /* Found relative path, this is not supported */ - ESX_ERROR(VIR_ERR_INTERNAL_ERROR, - _("Found relative path '%s' in VMX file, this is not " - "supported"), fileName); - return NULL; - } else { - /* Found single file name referencing a file inside a datastore */ - if (virAsprintf(&src, "[%s] %s/%s", data->datastoreName, + esxVI_String *propertyNameList = NULL; + esxVI_ObjectContent *datastoreList = NULL; + esxVI_ObjectContent *datastore = NULL; + esxVI_DatastoreHostMount *hostMount = NULL; + char *datastoreName; + char *tmp; + char *saveptr; + char *strippedFileName = NULL; + char *copyOfFileName = NULL; + char *directoryAndFileName; + + if (strchr(fileName, '/') == NULL && strchr(fileName, '\\') == NULL) { + /* Plain file name, use same directory as for the .vmx file */ + if (virAsprintf(&datastorePath, "[%s] %s/%s", data->datastoreName, data->directoryName, fileName) < 0) { virReportOOMError(); + goto cleanup; + } + } else { + if (esxVI_String_AppendValueToList(&propertyNameList, + "summary.name") < 0 || + esxVI_LookupDatastoreList(data->ctx, propertyNameList, + &datastoreList) < 0) { return NULL; } - /* FIXME: Check if referenced path/file really exists */ + /* Search for datastore by mount path */ + for (datastore = datastoreList; datastore != NULL; + datastore = datastore->_next) { + esxVI_DatastoreHostMount_Free(&hostMount); + datastoreName = NULL; - return src; + if (esxVI_LookupDatastoreHostMount(data->ctx, datastore->obj, + &hostMount) < 0 || + esxVI_GetStringValue(datastore, "summary.name", &datastoreName, + esxVI_Occurrence_RequiredItem) < 0) { + goto cleanup; + } + + tmp = (char *)STRSKIP(fileName, hostMount->mountInfo->path); + + if (tmp == NULL) { + continue; + } + + /* Found a match. Strip leading separators */ + while (*tmp == '/' || *tmp == '\\') { + ++tmp; + } + + if (esxVI_String_DeepCopyValue(&strippedFileName, tmp) < 0) { + goto cleanup; + } + + tmp = strippedFileName; + + /* Convert \ to / */ + while (*tmp != '\0') { + if (*tmp == '\\') { + *tmp = '/'; + } + + ++tmp; + } + + if (virAsprintf(&datastorePath, "[%s] %s", datastoreName, + strippedFileName) < 0) { + virReportOOMError(); + goto cleanup; + } + + break; + } + + /* Fallback to direct datastore name match */ + if (datastorePath == NULL && STRPREFIX(fileName, "/vmfs/volumes/")) { + if (esxVI_String_DeepCopyValue(&copyOfFileName, fileName) < 0) { + goto cleanup; + } + + /* Expected format: '/vmfs/volumes/<datastore>/<path>' */ + if ((tmp = STRSKIP(copyOfFileName, "/vmfs/volumes/")) == NULL || + (datastoreName = strtok_r(tmp, "/", &saveptr)) == NULL || + (directoryAndFileName = strtok_r(NULL, "", &saveptr)) == NULL) { + ESX_ERROR(VIR_ERR_INTERNAL_ERROR, + _("File name '%s' doesn't have expected format " + "'/vmfs/volumes/<datastore>/<path>'"), fileName); + goto cleanup; + } + + esxVI_ObjectContent_Free(&datastoreList); + + if (esxVI_LookupDatastoreByName(data->ctx, datastoreName, + NULL, &datastoreList, + esxVI_Occurrence_OptionalItem) < 0) { + goto cleanup; + } + + if (datastoreList == NULL) { + ESX_ERROR(VIR_ERR_INTERNAL_ERROR, + _("File name '%s' refers to non-existing datastore '%s'"), + fileName, datastoreName); + goto cleanup; + } + + if (virAsprintf(&datastorePath, "[%s] %s", datastoreName, + directoryAndFileName) < 0) { + virReportOOMError(); + goto cleanup; + } + } + + if (datastorePath == NULL) { + ESX_ERROR(VIR_ERR_INTERNAL_ERROR, + _("Could not find datastore for '%s'"), fileName); + goto cleanup; + } } + + cleanup: + esxVI_String_Free(&propertyNameList); + esxVI_ObjectContent_Free(&datastoreList); + esxVI_DatastoreHostMount_Free(&hostMount); + VIR_FREE(strippedFileName); + VIR_FREE(copyOfFileName); + + return datastorePath; } +/* + * This function does the inverse of esxParseVMXFileName. It takes an file name + * in datastore path format and converts it to a file name that can be used in + * a .vmx file. + * + * The datastore path format and the formats found in a .vmx file are described + * in the documentation of esxParseVMXFileName. + * + * Firstly parse the datastore path. Then use the datastore name to lookup the + * datastore and it's mount path. Finally concatenate the mount path, directory + * and file name to an absolute path and return it. Detect the seperator type + * based on the mount path. + */ static char * -esxFormatVMXFileName(const char *src, void *opaque ATTRIBUTE_UNUSED) +esxFormatVMXFileName(const char *datastorePath, void *opaque) { bool success = false; + esxVMX_Data *data = opaque; char *datastoreName = NULL; char *directoryName = NULL; char *fileName = NULL; + esxVI_ObjectContent *datastore = NULL; + esxVI_DatastoreHostMount *hostMount = NULL; + char separator = '/'; + virBuffer buffer = VIR_BUFFER_INITIALIZER; + char *tmp; + int length; char *absolutePath = NULL; - if (STRPREFIX(src, "[")) { - /* Found potential datastore path */ - if (esxUtil_ParseDatastorePath(src, &datastoreName, &directoryName, - &fileName) < 0) { - goto cleanup; + /* Parse datastore path and lookup datastore */ + if (esxUtil_ParseDatastorePath(datastorePath, &datastoreName, + &directoryName, &fileName) < 0) { + goto cleanup; + } + + if (esxVI_LookupDatastoreByName(data->ctx, datastoreName, + NULL, &datastore, + esxVI_Occurrence_RequiredItem) < 0 || + esxVI_LookupDatastoreHostMount(data->ctx, datastore->obj, + &hostMount) < 0) { + goto cleanup; + } + + /* Detect separator type */ + if (strchr(hostMount->mountInfo->path, '\\') != NULL) { + separator = '\\'; + } + + /* Strip trailing separators */ + length = strlen(hostMount->mountInfo->path); + + if (length > 0) { + tmp = hostMount->mountInfo->path + length - 1; + + while (*tmp == separator && tmp > hostMount->mountInfo->path) { + --tmp; } - if (directoryName == NULL) { - if (virAsprintf(&absolutePath, "/vmfs/volumes/%s/%s", - datastoreName, fileName) < 0) { - virReportOOMError(); - goto cleanup; - } - } else { - if (virAsprintf(&absolutePath, "/vmfs/volumes/%s/%s/%s", - datastoreName, directoryName, fileName) < 0) { - virReportOOMError(); - goto cleanup; + length = tmp - hostMount->mountInfo->path; + } + + /* Format as <mount>[/<directory>]/<file> */ + virBufferAdd(&buffer, hostMount->mountInfo->path, length); + + if (directoryName != NULL) { + /* Convert / to \ when necessary */ + if (separator != '/') { + tmp = directoryName; + + while (*tmp != '\0') { + if (*tmp == '/') { + *tmp = separator; + } + + ++tmp; } } - } else if (STRPREFIX(src, "/")) { - /* Found absolute path */ - absolutePath = strdup(src); - if (absolutePath == NULL) { - virReportOOMError(); - goto cleanup; - } - } else { - /* Found relative path, this is not supported */ - ESX_ERROR(VIR_ERR_INTERNAL_ERROR, - _("Found relative path '%s' in domain XML, this is not " - "supported"), src); + virBufferAddChar(&buffer, separator); + virBufferAdd(&buffer, directoryName, -1); + } + + virBufferAddChar(&buffer, separator); + virBufferAdd(&buffer, fileName, -1); + + if (virBufferError(&buffer)) { + virReportOOMError(); goto cleanup; } + absolutePath = virBufferContentAndReset(&buffer); + /* FIXME: Check if referenced path/file really exists */ success = true; cleanup: if (! success) { + virBufferFreeAndReset(&buffer); VIR_FREE(absolutePath); } VIR_FREE(datastoreName); VIR_FREE(directoryName); VIR_FREE(fileName); + esxVI_ObjectContent_Free(&datastore); + esxVI_DatastoreHostMount_Free(&hostMount); return absolutePath; } -- 1.7.0.4

2 3

[libvirt] [PATCH] esx: Explicitly disable unused floppy0 device for GSX
by Matthias Bolte 12 Aug '10

12 Aug '10

floppy0.present defaults to true for GSX. Therefore, it needs to be explicitly disabled for GSX. --- src/esx/esx_vmx.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/src/esx/esx_vmx.c b/src/esx/esx_vmx.c index d5d9ff0..61aaf10 100644 --- a/src/esx/esx_vmx.c +++ b/src/esx/esx_vmx.c @@ -216,6 +216,7 @@ def->disks[0]... ## disks: floppy from .flp image ############################################### floppy0.present = "true" # defaults to "false" + # defaults to "true" for GSX floppy0.startConnected = "true" # defaults to "true" floppy0.clientDevice = "false" # defaults to "false" @@ -236,6 +237,7 @@ def->disks[0]... ## disks: floppy from host device ############################################## floppy0.present = "true" # defaults to "false" + # defaults to "true" for GSX floppy0.startConnected = "true" # defaults to "true" floppy0.clientDevice = "false" # defaults to "false" @@ -2320,6 +2322,7 @@ esxVMX_FormatConfig(esxVMX_Context *ctx, virCapsPtr caps, virDomainDefPtr def, virBuffer buffer = VIR_BUFFER_INITIALIZER; bool scsi_present[4] = { false, false, false, false }; int scsi_virtualDev[4] = { -1, -1, -1, -1 }; + bool hasFloppyDevice = false; if (ctx->formatFileName == NULL) { ESX_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", @@ -2525,6 +2528,8 @@ esxVMX_FormatConfig(esxVMX_Context *ctx, virCapsPtr caps, virDomainDefPtr def, break; case VIR_DOMAIN_DISK_DEVICE_FLOPPY: + hasFloppyDevice = true; + if (esxVMX_FormatFloppy(ctx, def->disks[i], &buffer) < 0) { goto failure; } @@ -2539,6 +2544,11 @@ esxVMX_FormatConfig(esxVMX_Context *ctx, virCapsPtr caps, virDomainDefPtr def, } } + if (!hasFloppyDevice && productVersion & esxVI_ProductVersion_GSX) { + /* floppy0.present defaults to true for GSX, disable it explicitly */ + virBufferAddLit(&buffer, "floppy0.present = \"false\"\n"); + } + /* def:fss */ /* FIXME */ -- 1.7.0.4

3 3

[libvirt] [PATCH] bridge: Fix potential segfault when preparing dnsmasq arguments
by Jiri Denemark 11 Aug '10

11 Aug '10

We add --dhcp-lease-max=xxx argument when network->def->nranges > 0 but we only allocate space for in the opposite case :-) I guess we are lucky enough to miscount somewhere else so that we actually allocate more space than we need since no-one has hit this bug so far. --- src/network/bridge_driver.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index 59e02b1..f247a0f 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -426,7 +426,7 @@ networkBuildDnsmasqArgv(virNetworkObjPtr network, 2 + /* --listen-address 10.0.0.1 */ (2 * network->def->nranges) + /* --dhcp-range 10.0.0.2,10.0.0.254 */ /* --dhcp-lease-max=xxx if needed */ - (network->def->nranges ? 0 : 1) + + (network->def->nranges ? 1 : 0) + /* --dhcp-hostsfile=/var/lib/dnsmasq/$NAME.hostsfile */ (network->def->nhosts > 0 ? 1 : 0) + /* --enable-tftp --tftp-root /srv/tftp */ -- 1.7.2

2 2

[libvirt] [PATCH 2/2] Add a detailed message when tap device add fails
by Doug Goldstein 11 Aug '10

11 Aug '10

Added a more detailed error message when adding a tap devices fails and the kernel is missing tun support. Signed-off-by: Doug Goldstein <cardoe(a)gentoo.org> --- src/uml/uml_conf.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/src/uml/uml_conf.c b/src/uml/uml_conf.c index 025169f..4b1df84 100644 --- a/src/uml/uml_conf.c +++ b/src/uml/uml_conf.c @@ -146,6 +146,11 @@ umlConnectTapDevice(virDomainNetDefPtr net, umlReportError(VIR_ERR_INTERNAL_ERROR, _("Failed to add tap interface to bridge. " "%s is not a bridge device"), bridge); + } else if (err == ENOENT) { + virReportSystemError(err, "%s", + _("Failed to add tap interface to bridge. Your kernel " + "is missing the 'tun' module or CONFIG_TUN or you need " + "to add the /dev/net/tun device node.")); } else if (template_ifname) { virReportSystemError(err, _("Failed to add tap interface to bridge '%s'"), -- 1.7.2

2 3

[libvirt] [PATCH] esx: Split VMX code into a general and an ESX specific part
by Matthias Bolte 11 Aug '10

11 Aug '10

Introduce esxVMX_Context containing functions pointers to glue both parts together in an generic way. Move the ESX specific part to esx_driver.c. This is a step towards making the VMX code reusable in a potential VMware Workstation and VMware Player driver. --- src/esx/esx_driver.c | 417 ++++++++++++++++++++++++++++++++++++++++++++++- src/esx/esx_vmx.c | 448 +++++--------------------------------------------- src/esx/esx_vmx.h | 71 +++++---- tests/vmx2xmltest.c | 52 ++++++- tests/xml2vmxtest.c | 64 +++++++- 5 files changed, 611 insertions(+), 441 deletions(-) diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c index d824371..b0ef704 100644 --- a/src/esx/esx_driver.c +++ b/src/esx/esx_driver.c @@ -50,6 +50,369 @@ static int esxDomainGetMaxVcpus(virDomainPtr domain); +typedef struct _esxVMX_Data esxVMX_Data; + +struct _esxVMX_Data { + esxVI_Context *ctx; + const char *datastoreName; + const char *directoryName; +}; + + + +static char * +esxAbsolutePathToDatastorePath(esxVI_Context *ctx, const char *absolutePath) +{ + bool success = false; + char *copyOfAbsolutePath = NULL; + char *tmp = NULL; + char *saveptr = NULL; + esxVI_String *propertyNameList = NULL; + esxVI_ObjectContent *datastore = NULL; + + char *datastorePath = NULL; + char *preliminaryDatastoreName = NULL; + char *directoryAndFileName = NULL; + char *datastoreName = NULL; + + if (esxVI_String_DeepCopyValue(&copyOfAbsolutePath, absolutePath) < 0) { + return NULL; + } + + /* Expected format: '/vmfs/volumes/<datastore>/<path>' */ + if ((tmp = STRSKIP(copyOfAbsolutePath, "/vmfs/volumes/")) == NULL || + (preliminaryDatastoreName = strtok_r(tmp, "/", &saveptr)) == NULL || + (directoryAndFileName = strtok_r(NULL, "", &saveptr)) == NULL) { + ESX_ERROR(VIR_ERR_INTERNAL_ERROR, + _("Absolute path '%s' doesn't have expected format " + "'/vmfs/volumes/<datastore>/<path>'"), absolutePath); + goto cleanup; + } + + if (esxVI_String_AppendValueToList(&propertyNameList, + "summary.name") < 0 || + esxVI_LookupDatastoreByAbsolutePath(ctx, absolutePath, + propertyNameList, &datastore, + esxVI_Occurrence_OptionalItem) < 0) { + goto cleanup; + } + + if (datastore == NULL) { + if (esxVI_LookupDatastoreByName(ctx, preliminaryDatastoreName, + propertyNameList, &datastore, + esxVI_Occurrence_OptionalItem) < 0) { + goto cleanup; + } + } + + if (datastore != NULL) { + if (esxVI_GetStringValue(datastore, "summary.name", &datastoreName, + esxVI_Occurrence_RequiredItem)) { + goto cleanup; + } + } + + if (datastoreName == NULL) { + VIR_WARN("Could not retrieve datastore name for absolute " + "path '%s', falling back to preliminary name '%s'", + absolutePath, preliminaryDatastoreName); + + datastoreName = preliminaryDatastoreName; + } + + if (virAsprintf(&datastorePath, "[%s] %s", datastoreName, + directoryAndFileName) < 0) { + virReportOOMError(); + goto cleanup; + } + + /* FIXME: Check if referenced path/file really exists */ + + success = true; + + cleanup: + if (! success) { + VIR_FREE(datastorePath); + } + + VIR_FREE(copyOfAbsolutePath); + esxVI_String_Free(&propertyNameList); + esxVI_ObjectContent_Free(&datastore); + + return datastorePath; +} + + + +static char * +esxParseVMXFileName(const char *fileName, void *opaque) +{ + char *src = NULL; + esxVMX_Data *data = opaque; + + if (STRPREFIX(fileName, "/vmfs/volumes/")) { + /* Found absolute path referencing a file inside a datastore */ + return esxAbsolutePathToDatastorePath(data->ctx, fileName); + } else if (STRPREFIX(fileName, "/")) { + /* Found absolute path referencing a file outside a datastore */ + src = strdup(fileName); + + if (src == NULL) { + virReportOOMError(); + return NULL; + } + + /* FIXME: Check if referenced path/file really exists */ + + return src; + } else if (strchr(fileName, '/') != NULL) { + /* Found relative path, this is not supported */ + ESX_ERROR(VIR_ERR_INTERNAL_ERROR, + _("Found relative path '%s' in VMX file, this is not " + "supported"), fileName); + return NULL; + } else { + /* Found single file name referencing a file inside a datastore */ + if (virAsprintf(&src, "[%s] %s/%s", data->datastoreName, + data->directoryName, fileName) < 0) { + virReportOOMError(); + return NULL; + } + + /* FIXME: Check if referenced path/file really exists */ + + return src; + } +} + + + +static char * +esxFormatVMXFileName(const char *src, void *opaque ATTRIBUTE_UNUSED) +{ + bool success = false; + char *datastoreName = NULL; + char *directoryName = NULL; + char *fileName = NULL; + char *absolutePath = NULL; + + if (STRPREFIX(src, "[")) { + /* Found potential datastore path */ + if (esxUtil_ParseDatastorePath(src, &datastoreName, &directoryName, + &fileName) < 0) { + goto cleanup; + } + + if (directoryName == NULL) { + if (virAsprintf(&absolutePath, "/vmfs/volumes/%s/%s", + datastoreName, fileName) < 0) { + virReportOOMError(); + goto cleanup; + } + } else { + if (virAsprintf(&absolutePath, "/vmfs/volumes/%s/%s/%s", + datastoreName, directoryName, fileName) < 0) { + virReportOOMError(); + goto cleanup; + } + } + } else if (STRPREFIX(src, "/")) { + /* Found absolute path */ + absolutePath = strdup(src); + + if (absolutePath == NULL) { + virReportOOMError(); + goto cleanup; + } + } else { + /* Found relative path, this is not supported */ + ESX_ERROR(VIR_ERR_INTERNAL_ERROR, + _("Found relative path '%s' in domain XML, this is not " + "supported"), src); + goto cleanup; + } + + /* FIXME: Check if referenced path/file really exists */ + + success = true; + + cleanup: + if (! success) { + VIR_FREE(absolutePath); + } + + VIR_FREE(datastoreName); + VIR_FREE(directoryName); + VIR_FREE(fileName); + + return absolutePath; +} + + + +static int +esxAutodetectSCSIControllerModel(virDomainDiskDefPtr def, int *model, + void *opaque) +{ + int result = -1; + esxVMX_Data *data = opaque; + char *datastoreName = NULL; + char *directoryName = NULL; + char *fileName = NULL; + char *datastorePath = NULL; + esxVI_String *propertyNameList = NULL; + esxVI_ObjectContent *datastore = NULL; + esxVI_ManagedObjectReference *hostDatastoreBrowser = NULL; + esxVI_HostDatastoreBrowserSearchSpec *searchSpec = NULL; + esxVI_VmDiskFileQuery *vmDiskFileQuery = NULL; + esxVI_ManagedObjectReference *task = NULL; + esxVI_TaskInfoState taskInfoState; + esxVI_TaskInfo *taskInfo = NULL; + esxVI_HostDatastoreBrowserSearchResults *searchResults = NULL; + esxVI_VmDiskFileInfo *vmDiskFileInfo = NULL; + + if (def->device != VIR_DOMAIN_DISK_DEVICE_DISK || + def->bus != VIR_DOMAIN_DISK_BUS_SCSI || + def->type != VIR_DOMAIN_DISK_TYPE_FILE || + def->src == NULL || + ! STRPREFIX(def->src, "[")) { + /* + * This isn't a file-based SCSI disk device with a datastore related + * source path => do nothing. + */ + return 0; + } + + if (esxUtil_ParseDatastorePath(def->src, &datastoreName, &directoryName, + &fileName) < 0) { + goto cleanup; + } + + if (directoryName == NULL) { + if (virAsprintf(&datastorePath, "[%s]", datastoreName) < 0) { + virReportOOMError(); + goto cleanup; + } + } else { + if (virAsprintf(&datastorePath, "[%s] %s", datastoreName, + directoryName) < 0) { + virReportOOMError(); + goto cleanup; + } + } + + /* Lookup HostDatastoreBrowser */ + if (esxVI_String_AppendValueToList(&propertyNameList, "browser") < 0 || + esxVI_LookupDatastoreByName(data->ctx, datastoreName, propertyNameList, + &datastore, + esxVI_Occurrence_RequiredItem) < 0 || + esxVI_GetManagedObjectReference(datastore, "browser", + &hostDatastoreBrowser, + esxVI_Occurrence_RequiredItem) < 0) { + goto cleanup; + } + + /* Build HostDatastoreBrowserSearchSpec */ + if (esxVI_HostDatastoreBrowserSearchSpec_Alloc(&searchSpec) < 0 || + esxVI_FileQueryFlags_Alloc(&searchSpec->details) < 0) { + goto cleanup; + } + + searchSpec->details->fileType = esxVI_Boolean_True; + searchSpec->details->fileSize = esxVI_Boolean_False; + searchSpec->details->modification = esxVI_Boolean_False; + + if (esxVI_VmDiskFileQuery_Alloc(&vmDiskFileQuery) < 0 || + esxVI_VmDiskFileQueryFlags_Alloc(&vmDiskFileQuery->details) < 0 || + esxVI_FileQuery_AppendToList + (&searchSpec->query, + esxVI_FileQuery_DynamicCast(vmDiskFileQuery)) < 0) { + goto cleanup; + } + + vmDiskFileQuery->details->diskType = esxVI_Boolean_False; + vmDiskFileQuery->details->capacityKb = esxVI_Boolean_False; + vmDiskFileQuery->details->hardwareVersion = esxVI_Boolean_False; + vmDiskFileQuery->details->controllerType = esxVI_Boolean_True; + vmDiskFileQuery->details->diskExtents = esxVI_Boolean_False; + + if (esxVI_String_Alloc(&searchSpec->matchPattern) < 0) { + goto cleanup; + } + + searchSpec->matchPattern->value = fileName; + + /* Search datastore for file */ + if (esxVI_SearchDatastore_Task(data->ctx, hostDatastoreBrowser, + datastorePath, searchSpec, &task) < 0 || + esxVI_WaitForTaskCompletion(data->ctx, task, NULL, esxVI_Occurrence_None, + esxVI_Boolean_False, &taskInfoState) < 0) { + goto cleanup; + } + + if (taskInfoState != esxVI_TaskInfoState_Success) { + ESX_ERROR(VIR_ERR_INTERNAL_ERROR, + _("Could not serach in datastore '%s'"), datastoreName); + goto cleanup; + } + + if (esxVI_LookupTaskInfoByTask(data->ctx, task, &taskInfo) < 0 || + esxVI_HostDatastoreBrowserSearchResults_CastFromAnyType + (taskInfo->result, &searchResults) < 0) { + goto cleanup; + } + + /* Interpret search result */ + vmDiskFileInfo = esxVI_VmDiskFileInfo_DynamicCast(searchResults->file); + + if (vmDiskFileInfo == NULL || vmDiskFileInfo->controllerType == NULL) { + ESX_ERROR(VIR_ERR_INTERNAL_ERROR, + _("Could not lookup controller model for '%s'"), def->src); + goto cleanup; + } + + if (STRCASEEQ(vmDiskFileInfo->controllerType, + "VirtualBusLogicController")) { + *model = VIR_DOMAIN_CONTROLLER_MODEL_BUSLOGIC; + } else if (STRCASEEQ(vmDiskFileInfo->controllerType, + "VirtualLsiLogicController")) { + *model = VIR_DOMAIN_CONTROLLER_MODEL_LSILOGIC; + } else if (STRCASEEQ(vmDiskFileInfo->controllerType, + "VirtualLsiLogicSASController")) { + *model = VIR_DOMAIN_CONTROLLER_MODEL_LSISAS1068; + } else if (STRCASEEQ(vmDiskFileInfo->controllerType, + "ParaVirtualSCSIController")) { + *model = VIR_DOMAIN_CONTROLLER_MODEL_VMPVSCSI; + } else { + ESX_ERROR(VIR_ERR_INTERNAL_ERROR, + _("Found unexpected controller model '%s' for disk '%s'"), + vmDiskFileInfo->controllerType, def->src); + goto cleanup; + } + + result = 0; + + cleanup: + /* Don't double free fileName */ + if (searchSpec != NULL && searchSpec->matchPattern != NULL) { + searchSpec->matchPattern->value = NULL; + } + + VIR_FREE(datastoreName); + VIR_FREE(directoryName); + VIR_FREE(fileName); + VIR_FREE(datastorePath); + esxVI_String_Free(&propertyNameList); + esxVI_ObjectContent_Free(&datastore); + esxVI_ManagedObjectReference_Free(&hostDatastoreBrowser); + esxVI_HostDatastoreBrowserSearchSpec_Free(&searchSpec); + esxVI_ManagedObjectReference_Free(&task); + esxVI_TaskInfo_Free(&taskInfo); + esxVI_HostDatastoreBrowserSearchResults_Free(&searchResults); + + return result; +} + static esxVI_Boolean @@ -2176,6 +2539,8 @@ esxDomainDumpXML(virDomainPtr domain, int flags) virBuffer buffer = VIR_BUFFER_INITIALIZER; char *url = NULL; char *vmx = NULL; + esxVMX_Context ctx; + esxVMX_Data data; virDomainDefPtr def = NULL; char *xml = NULL; @@ -2223,8 +2588,17 @@ esxDomainDumpXML(virDomainPtr domain, int flags) goto cleanup; } - def = esxVMX_ParseConfig(priv->primary, priv->caps, vmx, datastoreName, - directoryName, priv->primary->productVersion); + data.ctx = priv->primary; + data.datastoreName = datastoreName; + data.directoryName = directoryName; + + ctx.opaque = &data; + ctx.parseFileName = esxParseVMXFileName; + ctx.formatFileName = NULL; + ctx.autodetectSCSIControllerModel = NULL; + + def = esxVMX_ParseConfig(&ctx, priv->caps, vmx, + priv->primary->productVersion); if (def != NULL) { xml = virDomainDefFormat(def, flags); @@ -2255,6 +2629,8 @@ esxDomainXMLFromNative(virConnectPtr conn, const char *nativeFormat, unsigned int flags ATTRIBUTE_UNUSED) { esxPrivate *priv = conn->privateData; + esxVMX_Context ctx; + esxVMX_Data data; virDomainDefPtr def = NULL; char *xml = NULL; @@ -2264,7 +2640,16 @@ esxDomainXMLFromNative(virConnectPtr conn, const char *nativeFormat, return NULL; } - def = esxVMX_ParseConfig(priv->primary, priv->caps, nativeConfig, "?", "?", + data.ctx = priv->primary; + data.datastoreName = "?"; + data.directoryName = "?"; + + ctx.opaque = &data; + ctx.parseFileName = esxParseVMXFileName; + ctx.formatFileName = NULL; + ctx.autodetectSCSIControllerModel = NULL; + + def = esxVMX_ParseConfig(&ctx, priv->caps, nativeConfig, priv->primary->productVersion); if (def != NULL) { @@ -2284,6 +2669,8 @@ esxDomainXMLToNative(virConnectPtr conn, const char *nativeFormat, unsigned int flags ATTRIBUTE_UNUSED) { esxPrivate *priv = conn->privateData; + esxVMX_Context ctx; + esxVMX_Data data; virDomainDefPtr def = NULL; char *vmx = NULL; @@ -2299,7 +2686,16 @@ esxDomainXMLToNative(virConnectPtr conn, const char *nativeFormat, return NULL; } - vmx = esxVMX_FormatConfig(priv->primary, priv->caps, def, + data.ctx = priv->primary; + data.datastoreName = NULL; + data.directoryName = NULL; + + ctx.opaque = &data; + ctx.parseFileName = NULL; + ctx.formatFileName = esxFormatVMXFileName; + ctx.autodetectSCSIControllerModel = esxAutodetectSCSIControllerModel; + + vmx = esxVMX_FormatConfig(&ctx, priv->caps, def, priv->primary->productVersion); virDomainDefFree(def); @@ -2488,6 +2884,8 @@ esxDomainDefineXML(virConnectPtr conn, const char *xml ATTRIBUTE_UNUSED) int i; virDomainDiskDefPtr disk = NULL; esxVI_ObjectContent *virtualMachine = NULL; + esxVMX_Context ctx; + esxVMX_Data data; char *datastoreName = NULL; char *directoryName = NULL; char *fileName = NULL; @@ -2529,7 +2927,16 @@ esxDomainDefineXML(virConnectPtr conn, const char *xml ATTRIBUTE_UNUSED) } /* Build VMX from domain XML */ - vmx = esxVMX_FormatConfig(priv->primary, priv->caps, def, + data.ctx = priv->primary; + data.datastoreName = NULL; + data.directoryName = NULL; + + ctx.opaque = &data; + ctx.parseFileName = NULL; + ctx.formatFileName = esxFormatVMXFileName; + ctx.autodetectSCSIControllerModel = esxAutodetectSCSIControllerModel; + + vmx = esxVMX_FormatConfig(&ctx, priv->caps, def, priv->primary->productVersion); if (vmx == NULL) { diff --git a/src/esx/esx_vmx.c b/src/esx/esx_vmx.c index 1a5e8d3..d5d9ff0 100644 --- a/src/esx/esx_vmx.c +++ b/src/esx/esx_vmx.c @@ -29,9 +29,7 @@ #include "virterror_internal.h" #include "memory.h" #include "logging.h" -#include "esx_vi_methods.h" #include "esx_private.h" -#include "esx_util.h" #include "esx_vmx.h" /* @@ -441,6 +439,11 @@ VIR_ENUM_IMPL(esxVMX_SCSIControllerModel, VIR_DOMAIN_CONTROLLER_MODEL_LAST, "pvscsi"); + +/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * + * Helpers + */ + int esxVMX_SCSIDiskNameToControllerAndUnit(const char *name, int *controller, int *unit) { @@ -718,171 +721,7 @@ esxVMX_HandleLegacySCSIDiskDriverName(virDomainDefPtr def, int -esxVMX_AutodetectSCSIControllerModel(esxVI_Context *ctx, - virDomainDiskDefPtr def, int *model) -{ - int result = -1; - char *datastoreName = NULL; - char *directoryName = NULL; - char *fileName = NULL; - char *datastorePath = NULL; - esxVI_String *propertyNameList = NULL; - esxVI_ObjectContent *datastore = NULL; - esxVI_ManagedObjectReference *hostDatastoreBrowser = NULL; - esxVI_HostDatastoreBrowserSearchSpec *searchSpec = NULL; - esxVI_VmDiskFileQuery *vmDiskFileQuery = NULL; - esxVI_ManagedObjectReference *task = NULL; - esxVI_TaskInfoState taskInfoState; - esxVI_TaskInfo *taskInfo = NULL; - esxVI_HostDatastoreBrowserSearchResults *searchResults = NULL; - esxVI_VmDiskFileInfo *vmDiskFileInfo = NULL; - - if (def->device != VIR_DOMAIN_DISK_DEVICE_DISK || - def->bus != VIR_DOMAIN_DISK_BUS_SCSI || - def->type != VIR_DOMAIN_DISK_TYPE_FILE || - def->src == NULL || - ! STRPREFIX(def->src, "[")) { - /* - * This isn't a file-based SCSI disk device with a datastore related - * source path => do nothing. - */ - return 0; - } - - if (esxUtil_ParseDatastorePath(def->src, &datastoreName, &directoryName, - &fileName) < 0) { - goto cleanup; - } - - if (directoryName == NULL) { - if (virAsprintf(&datastorePath, "[%s]", datastoreName) < 0) { - virReportOOMError(); - goto cleanup; - } - } else { - if (virAsprintf(&datastorePath, "[%s] %s", datastoreName, - directoryName) < 0) { - virReportOOMError(); - goto cleanup; - } - } - - /* Lookup HostDatastoreBrowser */ - if (esxVI_String_AppendValueToList(&propertyNameList, "browser") < 0 || - esxVI_LookupDatastoreByName(ctx, datastoreName, propertyNameList, - &datastore, - esxVI_Occurrence_RequiredItem) < 0 || - esxVI_GetManagedObjectReference(datastore, "browser", - &hostDatastoreBrowser, - esxVI_Occurrence_RequiredItem) < 0) { - goto cleanup; - } - - /* Build HostDatastoreBrowserSearchSpec */ - if (esxVI_HostDatastoreBrowserSearchSpec_Alloc(&searchSpec) < 0 || - esxVI_FileQueryFlags_Alloc(&searchSpec->details) < 0) { - goto cleanup; - } - - searchSpec->details->fileType = esxVI_Boolean_True; - searchSpec->details->fileSize = esxVI_Boolean_False; - searchSpec->details->modification = esxVI_Boolean_False; - - if (esxVI_VmDiskFileQuery_Alloc(&vmDiskFileQuery) < 0 || - esxVI_VmDiskFileQueryFlags_Alloc(&vmDiskFileQuery->details) < 0 || - esxVI_FileQuery_AppendToList - (&searchSpec->query, - esxVI_FileQuery_DynamicCast(vmDiskFileQuery)) < 0) { - goto cleanup; - } - - vmDiskFileQuery->details->diskType = esxVI_Boolean_False; - vmDiskFileQuery->details->capacityKb = esxVI_Boolean_False; - vmDiskFileQuery->details->hardwareVersion = esxVI_Boolean_False; - vmDiskFileQuery->details->controllerType = esxVI_Boolean_True; - vmDiskFileQuery->details->diskExtents = esxVI_Boolean_False; - - if (esxVI_String_Alloc(&searchSpec->matchPattern) < 0) { - goto cleanup; - } - - searchSpec->matchPattern->value = fileName; - - /* Search datastore for file */ - if (esxVI_SearchDatastore_Task(ctx, hostDatastoreBrowser, datastorePath, - searchSpec, &task) < 0 || - esxVI_WaitForTaskCompletion(ctx, task, NULL, esxVI_Occurrence_None, - esxVI_Boolean_False, &taskInfoState) < 0) { - goto cleanup; - } - - if (taskInfoState != esxVI_TaskInfoState_Success) { - ESX_ERROR(VIR_ERR_INTERNAL_ERROR, - _("Could not serach in datastore '%s'"), datastoreName); - goto cleanup; - } - - if (esxVI_LookupTaskInfoByTask(ctx, task, &taskInfo) < 0 || - esxVI_HostDatastoreBrowserSearchResults_CastFromAnyType - (taskInfo->result, &searchResults) < 0) { - goto cleanup; - } - - /* Interpret search result */ - vmDiskFileInfo = esxVI_VmDiskFileInfo_DynamicCast(searchResults->file); - - if (vmDiskFileInfo == NULL || vmDiskFileInfo->controllerType == NULL) { - ESX_ERROR(VIR_ERR_INTERNAL_ERROR, - _("Could not lookup controller model for '%s'"), def->src); - goto cleanup; - } - - if (STRCASEEQ(vmDiskFileInfo->controllerType, - "VirtualBusLogicController")) { - *model = VIR_DOMAIN_CONTROLLER_MODEL_BUSLOGIC; - } else if (STRCASEEQ(vmDiskFileInfo->controllerType, - "VirtualLsiLogicController")) { - *model = VIR_DOMAIN_CONTROLLER_MODEL_LSILOGIC; - } else if (STRCASEEQ(vmDiskFileInfo->controllerType, - "VirtualLsiLogicSASController")) { - *model = VIR_DOMAIN_CONTROLLER_MODEL_LSISAS1068; - } else if (STRCASEEQ(vmDiskFileInfo->controllerType, - "ParaVirtualSCSIController")) { - *model = VIR_DOMAIN_CONTROLLER_MODEL_VMPVSCSI; - } else { - ESX_ERROR(VIR_ERR_INTERNAL_ERROR, - _("Found unexpected controller model '%s' for disk '%s'"), - vmDiskFileInfo->controllerType, def->src); - goto cleanup; - } - - result = 0; - - cleanup: - /* Don't double free fileName */ - if (searchSpec != NULL && searchSpec->matchPattern != NULL) { - searchSpec->matchPattern->value = NULL; - } - - VIR_FREE(datastoreName); - VIR_FREE(directoryName); - VIR_FREE(fileName); - VIR_FREE(datastorePath); - esxVI_String_Free(&propertyNameList); - esxVI_ObjectContent_Free(&datastore); - esxVI_ManagedObjectReference_Free(&hostDatastoreBrowser); - esxVI_HostDatastoreBrowserSearchSpec_Free(&searchSpec); - esxVI_ManagedObjectReference_Free(&task); - esxVI_TaskInfo_Free(&taskInfo); - esxVI_HostDatastoreBrowserSearchResults_Free(&searchResults); - - return result; -} - - - -int -esxVMX_GatherSCSIControllers(esxVI_Context *ctx, virDomainDefPtr def, +esxVMX_GatherSCSIControllers(esxVMX_Context *ctx, virDomainDefPtr def, int virtualDev[4], bool present[4]) { int result = -1; @@ -923,8 +762,8 @@ esxVMX_GatherSCSIControllers(esxVI_Context *ctx, virDomainDefPtr def, continue; } - if (ctx != NULL && - controller->model == VIR_DOMAIN_CONTROLLER_MODEL_AUTO) { + if (controller->model == VIR_DOMAIN_CONTROLLER_MODEL_AUTO && + ctx->autodetectSCSIControllerModel != NULL) { count = 0; // try to autodetect the SCSI controller model by collecting @@ -934,8 +773,9 @@ esxVMX_GatherSCSIControllers(esxVI_Context *ctx, virDomainDefPtr def, if (disk->bus == VIR_DOMAIN_DISK_BUS_SCSI && disk->info.addr.drive.controller == controller->idx) { - if (esxVMX_AutodetectSCSIControllerModel - (ctx, disk, &autodetectedModels[count]) < 0) { + if (ctx->autodetectSCSIControllerModel + (disk, &autodetectedModels[count], + ctx->opaque) < 0) { goto cleanup; } @@ -985,144 +825,12 @@ esxVMX_GatherSCSIControllers(esxVI_Context *ctx, virDomainDefPtr def, -char * -esxVMX_AbsolutePathToDatastorePath(esxVI_Context *ctx, const char *absolutePath) -{ - bool success = false; - char *copyOfAbsolutePath = NULL; - char *tmp = NULL; - char *saveptr = NULL; - esxVI_String *propertyNameList = NULL; - esxVI_ObjectContent *datastore = NULL; - - char *datastorePath = NULL; - char *preliminaryDatastoreName = NULL; - char *directoryAndFileName = NULL; - char *datastoreName = NULL; - - if (esxVI_String_DeepCopyValue(&copyOfAbsolutePath, absolutePath) < 0) { - return NULL; - } - - /* Expected format: '/vmfs/volumes/<datastore>/<path>' */ - if ((tmp = STRSKIP(copyOfAbsolutePath, "/vmfs/volumes/")) == NULL || - (preliminaryDatastoreName = strtok_r(tmp, "/", &saveptr)) == NULL || - (directoryAndFileName = strtok_r(NULL, "", &saveptr)) == NULL) { - ESX_ERROR(VIR_ERR_INTERNAL_ERROR, - _("Absolute path '%s' doesn't have expected format " - "'/vmfs/volumes/<datastore>/<path>'"), absolutePath); - goto cleanup; - } - - if (ctx != NULL) { - if (esxVI_String_AppendValueToList(&propertyNameList, - "summary.name") < 0 || - esxVI_LookupDatastoreByAbsolutePath(ctx, absolutePath, - propertyNameList, &datastore, - esxVI_Occurrence_OptionalItem) < 0) { - goto cleanup; - } - - if (datastore == NULL) { - if (esxVI_LookupDatastoreByName(ctx, preliminaryDatastoreName, - propertyNameList, &datastore, - esxVI_Occurrence_OptionalItem) < 0) { - goto cleanup; - } - } - - if (datastore != NULL) { - if (esxVI_GetStringValue(datastore, "summary.name", &datastoreName, - esxVI_Occurrence_RequiredItem)) { - goto cleanup; - } - } - - if (datastoreName == NULL) { - VIR_WARN("Could not retrieve datastore name for absolute " - "path '%s', falling back to preliminary name '%s'", - absolutePath, preliminaryDatastoreName); - - datastoreName = preliminaryDatastoreName; - } - } else { - datastoreName = preliminaryDatastoreName; - } - - if (virAsprintf(&datastorePath, "[%s] %s", datastoreName, - directoryAndFileName) < 0) { - virReportOOMError(); - goto cleanup; - } - - /* FIXME: Check if referenced path/file really exists */ - - success = true; - - cleanup: - if (! success) { - VIR_FREE(datastorePath); - } - - VIR_FREE(copyOfAbsolutePath); - esxVI_String_Free(&propertyNameList); - esxVI_ObjectContent_Free(&datastore); - - return datastorePath; -} - - - /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * VMX -> Domain XML */ -char * -esxVMX_ParseFileName(esxVI_Context *ctx, const char *fileName, - const char *datastoreName, const char *directoryName) -{ - char *src = NULL; - - if (STRPREFIX(fileName, "/vmfs/volumes/")) { - /* Found absolute path referencing a file inside a datastore */ - return esxVMX_AbsolutePathToDatastorePath(ctx, fileName); - } else if (STRPREFIX(fileName, "/")) { - /* Found absolute path referencing a file outside a datastore */ - src = strdup(fileName); - - if (src == NULL) { - virReportOOMError(); - return NULL; - } - - /* FIXME: Check if referenced path/file really exists */ - - return src; - } else if (strchr(fileName, '/') != NULL) { - /* Found relative path, this is not supported */ - ESX_ERROR(VIR_ERR_INTERNAL_ERROR, - _("Found relative path '%s' in VMX file, this is not " - "supported"), fileName); - return NULL; - } else { - /* Found single file name referencing a file inside a datastore */ - if (virAsprintf(&src, "[%s] %s/%s", datastoreName, directoryName, - fileName) < 0) { - virReportOOMError(); - return NULL; - } - - /* FIXME: Check if referenced path/file really exists */ - - return src; - } -} - - - virDomainDefPtr -esxVMX_ParseConfig(esxVI_Context *ctx, virCapsPtr caps, const char *vmx, - const char *datastoreName, const char *directoryName, +esxVMX_ParseConfig(esxVMX_Context *ctx, virCapsPtr caps, const char *vmx, esxVI_ProductVersion productVersion) { bool success = false; @@ -1142,6 +850,12 @@ esxVMX_ParseConfig(esxVI_Context *ctx, virCapsPtr caps, const char *vmx, int scsi_virtualDev[4] = { -1, -1, -1, -1 }; int unit; + if (ctx->parseFileName == NULL) { + ESX_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", + _("esxVMX_Context has no parseFileName function set")); + return NULL; + } + conf = virConfReadMem(vmx, strlen(vmx), VIR_CONF_FLAG_VMX_FORMAT); if (conf == NULL) { @@ -1429,7 +1143,6 @@ esxVMX_ParseConfig(esxVI_Context *ctx, virCapsPtr caps, const char *vmx, if (esxVMX_ParseDisk(ctx, caps, conf, VIR_DOMAIN_DISK_DEVICE_DISK, VIR_DOMAIN_DISK_BUS_SCSI, controller, unit, - datastoreName, directoryName, &def->disks[def->ndisks]) < 0) { goto cleanup; } @@ -1441,7 +1154,6 @@ esxVMX_ParseConfig(esxVI_Context *ctx, virCapsPtr caps, const char *vmx, if (esxVMX_ParseDisk(ctx, caps, conf, VIR_DOMAIN_DISK_DEVICE_CDROM, VIR_DOMAIN_DISK_BUS_SCSI, controller, unit, - datastoreName, directoryName, &def->disks[def->ndisks]) < 0) { goto cleanup; } @@ -1457,7 +1169,6 @@ esxVMX_ParseConfig(esxVI_Context *ctx, virCapsPtr caps, const char *vmx, for (unit = 0; unit < 2; ++unit) { if (esxVMX_ParseDisk(ctx, caps, conf, VIR_DOMAIN_DISK_DEVICE_DISK, VIR_DOMAIN_DISK_BUS_IDE, bus, unit, - datastoreName, directoryName, &def->disks[def->ndisks]) < 0) { goto cleanup; } @@ -1469,7 +1180,6 @@ esxVMX_ParseConfig(esxVI_Context *ctx, virCapsPtr caps, const char *vmx, if (esxVMX_ParseDisk(ctx, caps, conf, VIR_DOMAIN_DISK_DEVICE_CDROM, VIR_DOMAIN_DISK_BUS_IDE, bus, unit, - datastoreName, directoryName, &def->disks[def->ndisks]) < 0) { goto cleanup; } @@ -1484,7 +1194,6 @@ esxVMX_ParseConfig(esxVI_Context *ctx, virCapsPtr caps, const char *vmx, for (unit = 0; unit < 2; ++unit) { if (esxVMX_ParseDisk(ctx, caps, conf, VIR_DOMAIN_DISK_DEVICE_FLOPPY, VIR_DOMAIN_DISK_BUS_FDC, 0, unit, - datastoreName, directoryName, &def->disks[def->ndisks]) < 0) { goto cleanup; } @@ -1555,7 +1264,7 @@ esxVMX_ParseConfig(esxVI_Context *ctx, virCapsPtr caps, const char *vmx, def->nserials = 0; for (port = 0; port < 4; ++port) { - if (esxVMX_ParseSerial(ctx, conf, port, datastoreName, directoryName, + if (esxVMX_ParseSerial(ctx, conf, port, &def->serials[def->nserials]) < 0) { goto cleanup; } @@ -1574,7 +1283,7 @@ esxVMX_ParseConfig(esxVI_Context *ctx, virCapsPtr caps, const char *vmx, def->nparallels = 0; for (port = 0; port < 3; ++port) { - if (esxVMX_ParseParallel(ctx, conf, port, datastoreName, directoryName, + if (esxVMX_ParseParallel(ctx, conf, port, &def->parallels[def->nparallels]) < 0) { goto cleanup; } @@ -1752,9 +1461,8 @@ struct _virDomainDiskDef { };*/ int -esxVMX_ParseDisk(esxVI_Context *ctx, virCapsPtr caps, virConfPtr conf, +esxVMX_ParseDisk(esxVMX_Context *ctx, virCapsPtr caps, virConfPtr conf, int device, int busType, int controllerOrBus, int unit, - const char *datastoreName, const char *directoryName, virDomainDiskDefPtr *def) { /* @@ -1996,8 +1704,7 @@ esxVMX_ParseDisk(esxVI_Context *ctx, virCapsPtr caps, virConfPtr conf, } (*def)->type = VIR_DOMAIN_DISK_TYPE_FILE; - (*def)->src = esxVMX_ParseFileName(ctx, fileName, datastoreName, - directoryName); + (*def)->src = ctx->parseFileName(fileName, ctx->opaque); (*def)->cachemode = writeThrough ? VIR_DOMAIN_DISK_CACHE_WRITETHRU : VIR_DOMAIN_DISK_CACHE_DEFAULT; @@ -2031,8 +1738,7 @@ esxVMX_ParseDisk(esxVI_Context *ctx, virCapsPtr caps, virConfPtr conf, } (*def)->type = VIR_DOMAIN_DISK_TYPE_FILE; - (*def)->src = esxVMX_ParseFileName(ctx, fileName, datastoreName, - directoryName); + (*def)->src = ctx->parseFileName(fileName, ctx->opaque); if ((*def)->src == NULL) { goto cleanup; @@ -2068,8 +1774,7 @@ esxVMX_ParseDisk(esxVI_Context *ctx, virCapsPtr caps, virConfPtr conf, } (*def)->type = VIR_DOMAIN_DISK_TYPE_FILE; - (*def)->src = esxVMX_ParseFileName(ctx, fileName, datastoreName, - directoryName); + (*def)->src = ctx->parseFileName(fileName, ctx->opaque); if ((*def)->src == NULL) { goto cleanup; @@ -2358,8 +2063,7 @@ esxVMX_ParseEthernet(virConfPtr conf, int controller, virDomainNetDefPtr *def) int -esxVMX_ParseSerial(esxVI_Context *ctx, virConfPtr conf, int port, - const char *datastoreName, const char *directoryName, +esxVMX_ParseSerial(esxVMX_Context *ctx, virConfPtr conf, int port, virDomainChrDefPtr *def) { int result = -1; @@ -2439,9 +2143,7 @@ esxVMX_ParseSerial(esxVI_Context *ctx, virConfPtr conf, int port, } else if (STRCASEEQ(fileType, "file")) { (*def)->target.port = port; (*def)->type = VIR_DOMAIN_CHR_TYPE_FILE; - (*def)->data.file.path = esxVMX_ParseFileName(ctx, fileName, - datastoreName, - directoryName); + (*def)->data.file.path = ctx->parseFileName(fileName, ctx->opaque); if ((*def)->data.file.path == NULL) { goto cleanup; @@ -2488,8 +2190,7 @@ esxVMX_ParseSerial(esxVI_Context *ctx, virConfPtr conf, int port, int -esxVMX_ParseParallel(esxVI_Context *ctx, virConfPtr conf, int port, - const char *datastoreName, const char *directoryName, +esxVMX_ParseParallel(esxVMX_Context *ctx, virConfPtr conf, int port, virDomainChrDefPtr *def) { int result = -1; @@ -2569,9 +2270,7 @@ esxVMX_ParseParallel(esxVI_Context *ctx, virConfPtr conf, int port, } else if (STRCASEEQ(fileType, "file")) { (*def)->target.port = port; (*def)->type = VIR_DOMAIN_CHR_TYPE_FILE; - (*def)->data.file.path = esxVMX_ParseFileName(ctx, fileName, - datastoreName, - directoryName); + (*def)->data.file.path = ctx->parseFileName(fileName, ctx->opaque); if ((*def)->data.file.path == NULL) { goto cleanup; @@ -2612,70 +2311,7 @@ esxVMX_ParseParallel(esxVI_Context *ctx, virConfPtr conf, int port, */ char * -esxVMX_FormatFileName(esxVI_Context *ctx ATTRIBUTE_UNUSED, const char *src) -{ - bool success = false; - char *datastoreName = NULL; - char *directoryName = NULL; - char *fileName = NULL; - char *absolutePath = NULL; - - if (STRPREFIX(src, "[")) { - /* Found potential datastore related path */ - if (esxUtil_ParseDatastorePath(src, &datastoreName, &directoryName, - &fileName) < 0) { - goto cleanup; - } - - if (directoryName == NULL) { - if (virAsprintf(&absolutePath, "/vmfs/volumes/%s/%s", - datastoreName, fileName) < 0) { - virReportOOMError(); - goto cleanup; - } - } else { - if (virAsprintf(&absolutePath, "/vmfs/volumes/%s/%s/%s", - datastoreName, directoryName, fileName) < 0) { - virReportOOMError(); - goto cleanup; - } - } - } else if (STRPREFIX(src, "/")) { - /* Found absolute path */ - absolutePath = strdup(src); - - if (absolutePath == NULL) { - virReportOOMError(); - goto cleanup; - } - } else { - /* Found relative path, this is not supported */ - ESX_ERROR(VIR_ERR_INTERNAL_ERROR, - _("Found relative path '%s' in domain XML, this is not " - "supported"), src); - goto cleanup; - } - - /* FIXME: Check if referenced path/file really exists */ - - success = true; - - cleanup: - if (! success) { - VIR_FREE(absolutePath); - } - - VIR_FREE(datastoreName); - VIR_FREE(directoryName); - VIR_FREE(fileName); - - return absolutePath; -} - - - -char * -esxVMX_FormatConfig(esxVI_Context *ctx, virCapsPtr caps, virDomainDefPtr def, +esxVMX_FormatConfig(esxVMX_Context *ctx, virCapsPtr caps, virDomainDefPtr def, esxVI_ProductVersion productVersion) { int i; @@ -2685,6 +2321,12 @@ esxVMX_FormatConfig(esxVI_Context *ctx, virCapsPtr caps, virDomainDefPtr def, bool scsi_present[4] = { false, false, false, false }; int scsi_virtualDev[4] = { -1, -1, -1, -1 }; + if (ctx->formatFileName == NULL) { + ESX_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", + _("esxVMX_Context has no formatFileName function set")); + return NULL; + } + memset(zero, 0, VIR_UUID_BUFLEN); if (def->virtType != VIR_DOMAIN_VIRT_VMWARE) { /* FIXME: maybe add VIR_DOMAIN_VIRT_ESX ? */ @@ -2990,7 +2632,7 @@ esxVMX_FormatVNC(virDomainGraphicsDefPtr def, virBufferPtr buffer) int -esxVMX_FormatHardDisk(esxVI_Context *ctx, virDomainDiskDefPtr def, +esxVMX_FormatHardDisk(esxVMX_Context *ctx, virDomainDiskDefPtr def, virBufferPtr buffer) { int controllerOrBus, unit; @@ -3050,7 +2692,7 @@ esxVMX_FormatHardDisk(esxVI_Context *ctx, virDomainDiskDefPtr def, return -1; } - fileName = esxVMX_FormatFileName(ctx, def->src); + fileName = ctx->formatFileName(def->src, ctx->opaque); if (fileName == NULL) { return -1; @@ -3081,7 +2723,7 @@ esxVMX_FormatHardDisk(esxVI_Context *ctx, virDomainDiskDefPtr def, int -esxVMX_FormatCDROM(esxVI_Context *ctx, virDomainDiskDefPtr def, +esxVMX_FormatCDROM(esxVMX_Context *ctx, virDomainDiskDefPtr def, virBufferPtr buffer) { int controllerOrBus, unit; @@ -3132,7 +2774,7 @@ esxVMX_FormatCDROM(esxVI_Context *ctx, virDomainDiskDefPtr def, return -1; } - fileName = esxVMX_FormatFileName(ctx, def->src); + fileName = ctx->formatFileName(def->src, ctx->opaque); if (fileName == NULL) { return -1; @@ -3167,7 +2809,7 @@ esxVMX_FormatCDROM(esxVI_Context *ctx, virDomainDiskDefPtr def, int -esxVMX_FormatFloppy(esxVI_Context *ctx, virDomainDiskDefPtr def, +esxVMX_FormatFloppy(esxVMX_Context *ctx, virDomainDiskDefPtr def, virBufferPtr buffer) { int unit; @@ -3195,7 +2837,7 @@ esxVMX_FormatFloppy(esxVI_Context *ctx, virDomainDiskDefPtr def, return -1; } - fileName = esxVMX_FormatFileName(ctx, def->src); + fileName = ctx->formatFileName(def->src, ctx->opaque); if (fileName == NULL) { return -1; @@ -3331,7 +2973,7 @@ esxVMX_FormatEthernet(virDomainNetDefPtr def, int controller, int -esxVMX_FormatSerial(esxVI_Context *ctx, virDomainChrDefPtr def, +esxVMX_FormatSerial(esxVMX_Context *ctx, virDomainChrDefPtr def, virBufferPtr buffer) { char *fileName = NULL; @@ -3365,7 +3007,7 @@ esxVMX_FormatSerial(esxVI_Context *ctx, virDomainChrDefPtr def, virBufferVSprintf(buffer, "serial%d.fileType = \"file\"\n", def->target.port); - fileName = esxVMX_FormatFileName(ctx, def->data.file.path); + fileName = ctx->formatFileName(def->data.file.path, ctx->opaque); if (fileName == NULL) { return -1; @@ -3408,7 +3050,7 @@ esxVMX_FormatSerial(esxVI_Context *ctx, virDomainChrDefPtr def, int -esxVMX_FormatParallel(esxVI_Context *ctx, virDomainChrDefPtr def, +esxVMX_FormatParallel(esxVMX_Context *ctx, virDomainChrDefPtr def, virBufferPtr buffer) { char *fileName = NULL; @@ -3443,7 +3085,7 @@ esxVMX_FormatParallel(esxVI_Context *ctx, virDomainChrDefPtr def, virBufferVSprintf(buffer, "parallel%d.fileType = \"file\"\n", def->target.port); - fileName = esxVMX_FormatFileName(ctx, def->data.file.path); + fileName = ctx->formatFileName(def->data.file.path, ctx->opaque); if (fileName == NULL) { return -1; diff --git a/src/esx/esx_vmx.h b/src/esx/esx_vmx.h index bda98f0..a77264a 100644 --- a/src/esx/esx_vmx.h +++ b/src/esx/esx_vmx.h @@ -30,6 +30,37 @@ # include "domain_conf.h" # include "esx_vi.h" +typedef struct _esxVMX_Context esxVMX_Context; + + + +/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * + * Context + */ + +typedef char * (*esxVMX_ParseFileName)(const char *fileName, void *opaque); +typedef char * (*esxVMX_FormatFileName)(const char *src, void *opaque); +typedef int (*esxVMX_AutodetectSCSIControllerModel)(virDomainDiskDefPtr def, + int *model, void *opaque); + +/* + * esxVMX_ParseFileName is only used by esxVMX_ParseConfig. + * esxVMX_FormatFileName is only used by esxVMX_FormatConfig. + * esxVMX_AutodetectSCSIControllerModel is optionally used by esxVMX_FormatConfig. + */ +struct _esxVMX_Context { + void *opaque; + esxVMX_ParseFileName parseFileName; + esxVMX_FormatFileName formatFileName; + esxVMX_AutodetectSCSIControllerModel autodetectSCSIControllerModel; +}; + + + +/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * + * Helpers + */ + int esxVMX_SCSIDiskNameToControllerAndUnit(const char *name, int *controller, int *unit); @@ -48,29 +79,17 @@ esxVMX_HandleLegacySCSIDiskDriverName(virDomainDefPtr def, virDomainDiskDefPtr disk); int -esxVMX_AutodetectSCSIControllerModel(esxVI_Context *ctx, - virDomainDiskDefPtr def, int *model); - -int -esxVMX_GatherSCSIControllers(esxVI_Context *ctx, virDomainDefPtr def, +esxVMX_GatherSCSIControllers(esxVMX_Context *ctx, virDomainDefPtr def, int virtualDev[4], bool present[4]); -char * -esxVMX_AbsolutePathToDatastorePath(esxVI_Context *ctx, const char *absolutePath); - /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * VMX -> Domain XML */ -char * -esxVMX_ParseFileName(esxVI_Context *ctx, const char *fileName, - const char *datastoreName, const char *directoryName); - virDomainDefPtr -esxVMX_ParseConfig(esxVI_Context *ctx, virCapsPtr caps, const char *vmx, - const char *datastoreName, const char *directoryName, +esxVMX_ParseConfig(esxVMX_Context *ctx, virCapsPtr caps, const char *vmx, esxVI_ProductVersion productVersion); int @@ -81,21 +100,18 @@ esxVMX_ParseSCSIController(virConfPtr conf, int controller, bool *present, int *virtualDev); int -esxVMX_ParseDisk(esxVI_Context *ctx, virCapsPtr caps, virConfPtr conf, +esxVMX_ParseDisk(esxVMX_Context *ctx, virCapsPtr caps, virConfPtr conf, int device, int busType, int controllerOrBus, int unit, - const char *datastoreName, const char *directoryName, virDomainDiskDefPtr *def); int esxVMX_ParseEthernet(virConfPtr conf, int controller, virDomainNetDefPtr *def); int -esxVMX_ParseSerial(esxVI_Context *ctx, virConfPtr conf, int port, - const char *datastoreName, const char *directoryName, +esxVMX_ParseSerial(esxVMX_Context *ctx, virConfPtr conf, int port, virDomainChrDefPtr *def); int -esxVMX_ParseParallel(esxVI_Context *ctx, virConfPtr conf, int port, - const char *datastoreName, const char *directoryName, +esxVMX_ParseParallel(esxVMX_Context *ctx, virConfPtr conf, int port, virDomainChrDefPtr *def); @@ -105,25 +121,22 @@ esxVMX_ParseParallel(esxVI_Context *ctx, virConfPtr conf, int port, */ char * -esxVMX_FormatFileName(esxVI_Context *ctx, const char *src); - -char * -esxVMX_FormatConfig(esxVI_Context *ctx, virCapsPtr caps, virDomainDefPtr def, +esxVMX_FormatConfig(esxVMX_Context *ctx, virCapsPtr caps, virDomainDefPtr def, esxVI_ProductVersion productVersion); int esxVMX_FormatVNC(virDomainGraphicsDefPtr def, virBufferPtr buffer); int -esxVMX_FormatHardDisk(esxVI_Context *ctx, virDomainDiskDefPtr def, +esxVMX_FormatHardDisk(esxVMX_Context *ctx, virDomainDiskDefPtr def, virBufferPtr buffer); int -esxVMX_FormatCDROM(esxVI_Context *ctx, virDomainDiskDefPtr def, +esxVMX_FormatCDROM(esxVMX_Context *ctx, virDomainDiskDefPtr def, virBufferPtr buffer); int -esxVMX_FormatFloppy(esxVI_Context *ctx, virDomainDiskDefPtr def, +esxVMX_FormatFloppy(esxVMX_Context *ctx, virDomainDiskDefPtr def, virBufferPtr buffer); int @@ -131,11 +144,11 @@ esxVMX_FormatEthernet(virDomainNetDefPtr def, int controller, virBufferPtr buffer); int -esxVMX_FormatSerial(esxVI_Context *ctx, virDomainChrDefPtr def, +esxVMX_FormatSerial(esxVMX_Context *ctx, virDomainChrDefPtr def, virBufferPtr buffer); int -esxVMX_FormatParallel(esxVI_Context *ctx, virDomainChrDefPtr def, +esxVMX_FormatParallel(esxVMX_Context *ctx, virDomainChrDefPtr def, virBufferPtr buffer); #endif /* __ESX_VMX_H__ */ diff --git a/tests/vmx2xmltest.c b/tests/vmx2xmltest.c index f1d2471..50e7d0c 100644 --- a/tests/vmx2xmltest.c +++ b/tests/vmx2xmltest.c @@ -14,6 +14,7 @@ static char *progname = NULL; static char *abs_srcdir = NULL; static virCapsPtr caps = NULL; +static esxVMX_Context ctx; # define MAX_FILE 4096 @@ -87,8 +88,7 @@ testCompareFiles(const char *vmx, const char *xml, goto failure; } - def = esxVMX_ParseConfig(NULL, caps, vmxData, "datastore", "directory", - productVersion); + def = esxVMX_ParseConfig(&ctx, caps, vmxData, productVersion); if (def == NULL) { err = virGetLastError(); @@ -139,6 +139,49 @@ testCompareHelper(const void *data) return testCompareFiles(vmx, xml, info->version); } +static char * +testParseVMXFileName(const char *fileName, void *opaque ATTRIBUTE_UNUSED) +{ + char *copyOfFileName = NULL; + char *tmp = NULL; + char *saveptr = NULL; + char *datastoreName = NULL; + char *directoryAndFileName = NULL; + char *src = NULL; + + if (STRPREFIX(fileName, "/vmfs/volumes/")) { + /* Found absolute path referencing a file inside a datastore */ + copyOfFileName = strdup(fileName); + + if (copyOfFileName == NULL) { + goto cleanup; + } + + /* Expected format: '/vmfs/volumes/<datastore>/<path>' */ + if ((tmp = STRSKIP(copyOfFileName, "/vmfs/volumes/")) == NULL || + (datastoreName = strtok_r(tmp, "/", &saveptr)) == NULL || + (directoryAndFileName = strtok_r(NULL, "", &saveptr)) == NULL) { + goto cleanup; + } + + virAsprintf(&src, "[%s] %s", datastoreName, directoryAndFileName); + } else if (STRPREFIX(fileName, "/")) { + /* Found absolute path referencing a file outside a datastore */ + src = strdup(fileName); + } else if (strchr(fileName, '/') != NULL) { + /* Found relative path, this is not supported */ + src = NULL; + } else { + /* Found single file name referencing a file inside a datastore */ + virAsprintf(&src, "[datastore] directory/%s", fileName); + } + + cleanup: + VIR_FREE(copyOfFileName); + + return src; +} + static int mymain(int argc, char **argv) { @@ -179,6 +222,11 @@ mymain(int argc, char **argv) return EXIT_FAILURE; } + ctx.opaque = NULL; + ctx.parseFileName = testParseVMXFileName; + ctx.formatFileName = NULL; + ctx.autodetectSCSIControllerModel = NULL; + DO_TEST("case-insensitive-1", "case-insensitive-1", esxVI_ProductVersion_ESX35); DO_TEST("case-insensitive-2", "case-insensitive-2", esxVI_ProductVersion_ESX35); diff --git a/tests/xml2vmxtest.c b/tests/xml2vmxtest.c index 0a9bc53..eed3ac0 100644 --- a/tests/xml2vmxtest.c +++ b/tests/xml2vmxtest.c @@ -14,6 +14,7 @@ static char *progname = NULL; static char *abs_srcdir = NULL; static virCapsPtr caps = NULL; +static esxVMX_Context ctx; # define MAX_FILE 4096 @@ -92,7 +93,7 @@ testCompareFiles(const char *xml, const char *vmx, goto failure; } - formatted = esxVMX_FormatConfig(NULL, caps, def, productVersion); + formatted = esxVMX_FormatConfig(&ctx, caps, def, productVersion); if (formatted == NULL) { goto failure; @@ -134,6 +135,60 @@ testCompareHelper(const void *data) } static int +testAutodetectSCSIControllerModel(virDomainDiskDefPtr def ATTRIBUTE_UNUSED, + int *model, void *opaque ATTRIBUTE_UNUSED) +{ + *model = VIR_DOMAIN_CONTROLLER_MODEL_LSILOGIC; + + return 0; +} + +static char * +testFormatVMXFileName(const char *src, void *opaque ATTRIBUTE_UNUSED) +{ + bool success = false; + char *datastoreName = NULL; + char *directoryName = NULL; + char *fileName = NULL; + char *absolutePath = NULL; + + if (STRPREFIX(src, "[")) { + /* Found potential datastore path */ + if (esxUtil_ParseDatastorePath(src, &datastoreName, &directoryName, + &fileName) < 0) { + goto cleanup; + } + + if (directoryName == NULL) { + virAsprintf(&absolutePath, "/vmfs/volumes/%s/%s", datastoreName, + fileName); + } else { + virAsprintf(&absolutePath, "/vmfs/volumes/%s/%s/%s", datastoreName, + directoryName, fileName); + } + } else if (STRPREFIX(src, "/")) { + /* Found absolute path */ + absolutePath = strdup(src); + } else { + /* Found relative path, this is not supported */ + goto cleanup; + } + + success = true; + + cleanup: + if (! success) { + VIR_FREE(absolutePath); + } + + VIR_FREE(datastoreName); + VIR_FREE(directoryName); + VIR_FREE(fileName); + + return absolutePath; +} + +static int mymain(int argc, char **argv) { int result = 0; @@ -157,7 +212,7 @@ mymain(int argc, char **argv) return EXIT_FAILURE; } -# define DO_TEST(_in, _out, _version) \ +# define DO_TEST(_in, _out, _version) \ do { \ struct testInfo info = { _in, _out, _version }; \ virResetLastError(); \ @@ -173,6 +228,11 @@ mymain(int argc, char **argv) return EXIT_FAILURE; } + ctx.opaque = NULL; + ctx.parseFileName = NULL; + ctx.formatFileName = testFormatVMXFileName; + ctx.autodetectSCSIControllerModel = testAutodetectSCSIControllerModel; + DO_TEST("minimal", "minimal", esxVI_ProductVersion_ESX35); DO_TEST("minimal-64bit", "minimal-64bit", esxVI_ProductVersion_ESX35); -- 1.7.0.4

2 2

[libvirt] [PATCH] allow memballoon type of none to desactivate it
by Daniel Veillard 11 Aug '10

11 Aug '10

The balloon device is automatically added to qemu guests if supported, but it may be useful to desactivate it. The simplest to not change the existing behaviour is to allow <memballoon type="none"/> as an extra option to desactivate it (it is automatically added if the memballoon construct is missing for the domain). The following simple patch just adds the extra option and does not change the default behaviour but avoid creating a balloon device if type="none" is used. Daniel P.S.: there is also a XEN type uspposedly for xen but I was unable to find any baloon code in our current xen driver so no change there -- 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/

2 5

[libvirt] [PATCH] nodeinfo: skip offline CPUs
by Eric Blake 11 Aug '10

11 Aug '10

https://bugzilla.redhat.com/622515 - When hot-unplugging CPUs, libvirt failed to start a guest that had been pinned to CPUs that were still online, because it was failing to read status from unrelated offline CPUs. Tested on a dual-core laptop, where I also discovered that, per http://www.cyberciti.biz/files/linux-kernel/Documentation/cpu-hotplug.txt, /sys/devices/system/cpu/cpu0/online does not exist on systems where it cannot be hot-unplugged. * src/nodeinfo.c (linuxNodeInfoCPUPopulate): Ignore CPUs that are currently offline. Detect readdir failure. (parse_socket): Move guts... (get_cpu_value): ...to new function, shared with... (cpu_online): New function. --- src/nodeinfo.c | 109 +++++++++++++++++++++++++++++++++++++------------------ 1 files changed, 73 insertions(+), 36 deletions(-) diff --git a/src/nodeinfo.c b/src/nodeinfo.c index 5ec1bcf..6286aa2 100644 --- a/src/nodeinfo.c +++ b/src/nodeinfo.c @@ -23,6 +23,7 @@ #include <config.h> +#include <stdbool.h> #include <stdio.h> #include <string.h> #include <stdlib.h> @@ -60,6 +61,58 @@ int linuxNodeInfoCPUPopulate(FILE *cpuinfo, virNodeInfoPtr nodeinfo); +/* Return the positive decimal contents of the given + * CPU_SYS_PATH/cpu%u/FILE, or -1 on error. If MISSING_OK and the + * file could not be found, return 1 instead of an error; this is + * because some machines cannot hot-unplug cpu0. */ +static int get_cpu_value(unsigned int cpu, const char *file, bool missing_ok) +{ + char *path; + FILE *pathfp; + char value_str[1024]; + char *tmp; + int value = -1; + + if (virAsprintf(&path, CPU_SYS_PATH "/cpu%u/%s", cpu, file) < 0) { + virReportOOMError(); + return -1; + } + + pathfp = fopen(path, "r"); + if (pathfp == NULL) { + if (missing_ok && errno == ENOENT) + value = 1; + else + virReportSystemError(errno, _("cannot open %s"), path); + goto cleanup; + } + + if (fgets(value_str, sizeof(value_str), pathfp) == NULL) { + virReportSystemError(errno, _("cannot read from %s"), path); + goto cleanup; + } + if (virStrToLong_i(value_str, &tmp, 10, &value) < 0) { + nodeReportError(VIR_ERR_INTERNAL_ERROR, + _("could not convert '%s' to an integer"), + value_str); + goto cleanup; + } + +cleanup: + if (pathfp) + fclose(pathfp); + VIR_FREE(path); + + return value; +} + +/* Check if CPU is online via CPU_SYS_PATH/cpu%u/online. Return 1 if online, + 0 if offline, and -1 on error. */ +static int cpu_online(unsigned int cpu) +{ + return get_cpu_value(cpu, "online", cpu == 0); +} + static unsigned long count_thread_siblings(unsigned int cpu) { unsigned long ret = 0; @@ -106,41 +159,7 @@ cleanup: static int parse_socket(unsigned int cpu) { - char *path; - FILE *pathfp; - char socket_str[1024]; - char *tmp; - int socket = -1; - - if (virAsprintf(&path, CPU_SYS_PATH "/cpu%u/topology/physical_package_id", - cpu) < 0) { - virReportOOMError(); - return -1; - } - - pathfp = fopen(path, "r"); - if (pathfp == NULL) { - virReportSystemError(errno, _("cannot open %s"), path); - VIR_FREE(path); - return -1; - } - - if (fgets(socket_str, sizeof(socket_str), pathfp) == NULL) { - virReportSystemError(errno, _("cannot read from %s"), path); - goto cleanup; - } - if (virStrToLong_i(socket_str, &tmp, 10, &socket) < 0) { - nodeReportError(VIR_ERR_INTERNAL_ERROR, - _("could not convert '%s' to an integer"), - socket_str); - goto cleanup; - } - -cleanup: - fclose(pathfp); - VIR_FREE(path); - - return socket; + return get_cpu_value(cpu, "topology/physical_package_id", false); } int linuxNodeInfoCPUPopulate(FILE *cpuinfo, @@ -153,6 +172,8 @@ int linuxNodeInfoCPUPopulate(FILE *cpuinfo, unsigned long cur_threads; int socket; unsigned long long socket_mask = 0; + unsigned int remaining; + int online; nodeinfo->cpus = 0; nodeinfo->mhz = 0; @@ -222,15 +243,25 @@ int linuxNodeInfoCPUPopulate(FILE *cpuinfo, /* OK, we've parsed what we can out of /proc/cpuinfo. Get the socket * and thread information from /sys */ + remaining = nodeinfo->cpus; cpudir = opendir(CPU_SYS_PATH); if (cpudir == NULL) { virReportSystemError(errno, _("cannot opendir %s"), CPU_SYS_PATH); return -1; } - while ((cpudirent = readdir(cpudir))) { + while (errno = 0, remaining && (cpudirent = readdir(cpudir))) { if (sscanf(cpudirent->d_name, "cpu%u", &cpu) != 1) continue; + online = cpu_online(cpu); + if (online < 0) { + closedir(cpudir); + return -1; + } + if (!online) + continue; + remaining--; + socket = parse_socket(cpu); if (socket < 0) { closedir(cpudir); @@ -249,6 +280,12 @@ int linuxNodeInfoCPUPopulate(FILE *cpuinfo, if (cur_threads > nodeinfo->threads) nodeinfo->threads = cur_threads; } + if (errno) { + virReportSystemError(errno, + _("problem reading %s"), CPU_SYS_PATH); + closedir(cpudir); + return -1; + } closedir(cpudir); -- 1.7.1

2 3

[libvirt] [PATCH] Avoid autogen loop in VPATH builds
by Jiri Denemark 11 Aug '10

11 Aug '10

--- cfg.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/cfg.mk b/cfg.mk index 7226828..e7fd63c 100644 --- a/cfg.mk +++ b/cfg.mk @@ -459,7 +459,7 @@ ifeq (0,$(MAKELEVEL)) # b653eda3ac4864de205419d9f41eec267cb89eeb _submodule_hash = sed 's/^[ +-]//;s/ .*//' _update_required := $(shell \ - test -f po/Makevars || { echo 1; exit; }; \ + test -f $(srcdir)/po/Makevars || { echo 1; exit; }; \ cd '$(srcdir)'; \ actual=$$(git submodule status | $(_submodule_hash); \ git hash-object bootstrap.conf; \ -- 1.7.2

2 5

[libvirt] [PATCH 1/2] Fix return value usage
by Doug Goldstein 10 Aug '10

10 Aug '10

Fix the error checking to use the return value from brAddTap() instead of checking the current errno value which might have been changed by clean up calls inside of brAddTap(). Signed-off-by: Doug Goldstein <cardoe(a)gentoo.org> --- src/uml/uml_conf.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/uml/uml_conf.c b/src/uml/uml_conf.c index bef8c38..025169f 100644 --- a/src/uml/uml_conf.c +++ b/src/uml/uml_conf.c @@ -141,7 +141,7 @@ umlConnectTapDevice(virDomainNetDefPtr net, tapmac, 0, &tapfd))) { - if (errno == ENOTSUP) { + if (err == ENOTSUP) { /* In this particular case, give a better diagnostic. */ umlReportError(VIR_ERR_INTERNAL_ERROR, _("Failed to add tap interface to bridge. " -- 1.7.2

1 0

[libvirt] [PATCH] qemu: Hack around asynchronous device_del
by Jiri Denemark 10 Aug '10

10 Aug '10

device_del command is not synchronous for PCI devices, it merely asks the guest to release the device and returns. If the host wants to use that device before the guest actually releases it, we are in big trouble. To avoid this, we already added a loop which waits up to 10 seconds until the device is actually released before we do anything else with that device. But we only added this loop for managed PCI devices before we try reattach them back to the host. However, we need to wait even for non-managed devices. We don't reattach them automatically, but we still want to prevent the host from using it. This was revealed thanks to sVirt: when we relabel sysfs files corresponding to the PCI device before the guest finished releasing the device, qemu is no longer allowed to access those files and if it wants (as a result of guest's request) to write anything to them, it just exits, which kills the guest. This is not a proper fix and needs some further work both on libvirt and qemu side in the future. --- I was thinking about another possibility to implement this since the wait loop doesn't have to be connected to the reattach action. We could move that loop into a separate function and let qemudReattach function do just what its name suggest. But in that case, we would need to add the call to such function before every call to qemudReattach, which doesn't look any better to me. Jirka src/qemu/qemu_driver.c | 17 +++++++++-------- 1 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 57b8271..e4f47d4 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -3209,16 +3209,17 @@ qemuPrepareChardevDevice(virDomainDefPtr def ATTRIBUTE_UNUSED, static void -qemudReattachManagedDevice(pciDevice *dev, struct qemud_driver *driver) +qemudReattachPciDevice(pciDevice *dev, struct qemud_driver *driver) { int retries = 100; + while (pciWaitForDeviceCleanup(dev, "kvm_assigned_device") + && retries) { + usleep(100*1000); + retries--; + } + if (pciDeviceGetManaged(dev)) { - while (pciWaitForDeviceCleanup(dev, "kvm_assigned_device") - && retries) { - usleep(100*1000); - retries--; - } if (pciReAttachDevice(dev, driver->activePciHostdevs) < 0) { virErrorPtr err = virGetLastError(); VIR_ERROR(_("Failed to re-attach PCI device: %s"), @@ -3264,7 +3265,7 @@ qemuDomainReAttachHostdevDevices(struct qemud_driver *driver, for (i = 0; i < pciDeviceListCount(pcidevs); i++) { pciDevice *dev = pciDeviceListGet(pcidevs, i); - qemudReattachManagedDevice(dev, driver); + qemudReattachPciDevice(dev, driver); } pciDeviceListFree(pcidevs); @@ -8997,7 +8998,7 @@ static int qemudDomainDetachHostPciDevice(struct qemud_driver *driver, pciDeviceListDel(driver->activePciHostdevs, pci); if (pciResetDevice(pci, driver->activePciHostdevs, NULL) < 0) ret = -1; - qemudReattachManagedDevice(pci, driver); + qemudReattachPciDevice(pci, driver); pciFreeDevice(pci); } -- 1.7.2

2 2

[libvirt] Libvirt storage api and lvm .cache issue
by Thomas Graves 10 Aug '10

10 Aug '10

Hello all, I am using the libvirt storage api with LVM storage on rhel5 with xen and I noticed that when using the api to create/delete lv's they get added to /etc/lvm/cache/.cache but old deleted ones never get removed from the .cache. This causes dmeventd to keep trying to access them but can't which fills up the logs in /var/log. Has anyone seen this or have a fix for it? I guess I could force a vgscan or something to clean it up just seems like I shouldn't need to. Thanks, Tom

2 3

[libvirt] [PATCH] Add "ubd" to the list of disk prefixes
by Soren Hansen 10 Aug '10

10 Aug '10

virDiskNameToIndex has a list of disk name prefixes that it uses in the process of finding the disk's index. This list is missing "ubd" which is the disk prefix used for UML domains. Signed-off-by: Soren Hansen <soren(a)linux2go.dk> --- src/util/util.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/util/util.c b/src/util/util.c index 8f2a17e..c173e49 100644 --- a/src/util/util.c +++ b/src/util/util.c @@ -2367,7 +2367,7 @@ const char *virEnumToString(const char *const*types, int virDiskNameToIndex(const char *name) { const char *ptr = NULL; int idx = 0; - static char const* const drive_prefix[] = {"fd", "hd", "vd", "sd", "xvd"}; + static char const* const drive_prefix[] = {"fd", "hd", "vd", "sd", "xvd", "ubd"}; unsigned int i; for (i = 0; i < ARRAY_CARDINALITY(drive_prefix); i++) { -- 1.7.0.4

3 4

[libvirt] [PATCH] build-sys: only build the test programs during the check phase.
by Diego Elio Pettenò 10 Aug '10

10 Aug '10

This avoids building the tests when testing libvirt is not the aim. --- tests/Makefile.am | 26 +++++++++++++------------- 1 files changed, 13 insertions(+), 13 deletions(-) diff --git a/tests/Makefile.am b/tests/Makefile.am index 71c2c74..1dc7f66 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -72,42 +72,42 @@ EXTRA_DIST = \ domainsnapshotxml2xmlin \ qemuhelpdata -noinst_PROGRAMS = virshtest conftest \ +check_PROGRAMS = virshtest conftest \ nodeinfotest statstest qparamtest if WITH_XEN -noinst_PROGRAMS += xml2sexprtest sexpr2xmltest \ +check_PROGRAMS += xml2sexprtest sexpr2xmltest \ reconnect xmconfigtest xencapstest endif if WITH_QEMU -noinst_PROGRAMS += qemuxml2argvtest qemuxml2xmltest qemuargv2xmltest qemuhelptest +check_PROGRAMS += qemuxml2argvtest qemuxml2xmltest qemuargv2xmltest qemuhelptest endif if WITH_ESX -noinst_PROGRAMS += esxutilstest vmx2xmltest xml2vmxtest +check_PROGRAMS += esxutilstest vmx2xmltest xml2vmxtest endif if WITH_SECDRIVER_SELINUX -noinst_PROGRAMS += seclabeltest +check_PROGRAMS += seclabeltest endif if WITH_SECDRIVER_APPARMOR -noinst_PROGRAMS += secaatest +check_PROGRAMS += secaatest endif if WITH_CIL -noinst_PROGRAMS += object-locking +check_PROGRAMS += object-locking endif -noinst_PROGRAMS += networkxml2xmltest +check_PROGRAMS += networkxml2xmltest -noinst_PROGRAMS += nwfilterxml2xmltest +check_PROGRAMS += nwfilterxml2xmltest -noinst_PROGRAMS += storagevolxml2xmltest storagepoolxml2xmltest +check_PROGRAMS += storagevolxml2xmltest storagepoolxml2xmltest -noinst_PROGRAMS += nodedevxml2xmltest +check_PROGRAMS += nodedevxml2xmltest -noinst_PROGRAMS += interfacexml2xmltest +check_PROGRAMS += interfacexml2xmltest test_scripts = \ capabilityschematest \ @@ -181,7 +181,7 @@ TESTS += secaatest endif if WITH_LIBVIRTD -noinst_PROGRAMS += eventtest +check_PROGRAMS += eventtest TESTS += eventtest endif -- 1.7.2

2 1

[libvirt] [PATCH 1/2] util: add wrapper function to check if address string is an ip
by Justin Clift 10 Aug '10

10 Aug '10

--- src/util/network.c | 37 +++++++++++++++++++++++++++++++++++++ src/util/network.h | 2 ++ 2 files changed, 39 insertions(+), 0 deletions(-) diff --git a/src/util/network.c b/src/util/network.c index 6e24792..2e0cf9c 100644 --- a/src/util/network.c +++ b/src/util/network.c @@ -54,6 +54,43 @@ static int getIPv6Addr(virSocketAddrPtr addr, virIPv6AddrPtr tab) { } /** + * virIsNumericIPAddr: + * @address: a text string containing a host name or IPv4/IPv6 address + * + * Given a text string, determines whether it contains a valid IPv4/IPv6 + * address. + * + * Returns 0 if the given string is an IPv4 or IPv6 address, or non-zero + * for any other condition. + */ +int +virIsNumericIPAddr(const char *address) { + int returnCode; + struct addrinfo hints; + struct addrinfo *res = NULL; + + /* Sanity check we've been given a text string */ + if (address == NULL) + return(-1); + + /* Do a name lookup on the given string, and see what we're given back */ + memset(&hints, 0, sizeof(hints)); + hints.ai_family = AF_UNSPEC; /* Doesn't matter whether IPv4 or IPv6 */ + hints.ai_socktype = 0; /* Socket type doesn't matter */ + hints.ai_flags = AI_NUMERICHOST; /* Force a numeric IP address check */ + hints.ai_protocol = 0; /* Doesn't matter which protocol */ + returnCode = getaddrinfo (address, NULL, &hints, &res); + if (0 == returnCode) { + /* A result was returned. This means the text string we were + * given is a valid IP address. We now free the result(s) we + * were given, and pass back the return code */ + freeaddrinfo(res); + } + + return returnCode; +} + +/** * virSocketParseAddr: * @val: a numeric network address IPv4 or IPv6 * @addr: where to store the return value. diff --git a/src/util/network.h b/src/util/network.h index 5307c8c..c2e88d8 100644 --- a/src/util/network.h +++ b/src/util/network.h @@ -24,6 +24,8 @@ typedef union { } virSocketAddr; typedef virSocketAddr *virSocketAddrPtr; +int virIsNumericIPAddr (const char *address); + int virSocketParseAddr (const char *val, virSocketAddrPtr addr, int hint); -- 1.7.2.1

3 7

Re: [libvirt] [PATCH] allow memballoon type of none to desactivate it
by Daniel P. Berrange 10 Aug '10

10 Aug '10

On Tue, Aug 10, 2010 at 12:09:47AM +0200, Daniel Veillard wrote: > Mail disapeared when trying to send it... sending again ... > > On Mon, Aug 09, 2010 at 07:38:32PM +0100, Daniel P. Berrange wrote: > > On Mon, Aug 09, 2010 at 08:34:23PM +0200, Daniel Veillard wrote: > > > Grumpf ... that mean at the internal stucture level we need to add an > > > extra field, that is detected at a completely different time in parsing > > > too ... more complex in general, but I can understand the purity POV. > > > > I don't see this as a real problem. It is no different from the way that > > we automatically add <controller> devices at the end of parsing, if we saw > > any <disk> or <channel> devices previously. > > Huh ??? You can have a controller without a disk and you don't > automagically add a controller even if nothing was suggested by the > user, it is widely different. First you need to keep a tristate for > def->balloonable, was that attribute defined, or not, then add the > error case if it's not "yes" or "no", then you need to care for > all the different cases of the tristate when you actually parse > the devices section, how do you handle <memballon> definition when > balloonable="no" was found, discard, error ? We'd raise an error becasue the requested config doesn't make sense. It doesn't actually need to be a tri-state - ballooning is either enabled or not. If a user hasn't specified which in the XML, then we'd pick the hypervisor default for that. > I find this different because you provide the information in 2 places > at different levels and you ned to cope with conflict ... while still > maintaining the current behaviour of autoadding. > This then breaks nearly all the qemu XML tests due to the extra > balloonable="yes" added automatically to the output since the qemu > driver makes that a default. Yep, that's an unavoidable side-effect of adding more default data to our XML output, but we've hit this many times in the past. eg adding disk controllers, required us to change every single test datafile. > And now you have to explain in documentation all the various cases > instead of a simple one liner about using "none". > > When data is defined at 2 different places by design, well you designed > a mess. And in that case that's cerainly true. And after looking at the > situation in detail, no I don't by the "purity" point of view, this > actually make things *harder* both for user and from a implementation > point of view. > I firmly think that in that case the proper way to do this is to > keep the information in one place and that place is the <memballoon> > device, type='none' may look ugly to you, but at least the behaviour > will be predictable, users will know where to look and that can be > explained to the in a single line/sentence. Neither option is keeping all the information in one place. We already have a four-way split of memory information with <memory> vs <currentMemory>, <memoryBacking> and now <memballoon>. The first three are defining attributes of the VM itself, while the latter is defining information about the device - specifically we added it to provide info about PCI device IDs & the device alias. Whether a guest domain supports ballooning or not is an attribute of the domain itself. If there is no balloon, then there is no device to provide information on, so none of the data that appears under <memballoon> even exists, nor can you pass this device element to the hotplug APIs, because there's no actal device behind it. This makes the <memballoon> element non-sensical to me. > Current patch provided, I strongly suggest to not continue down this > line and apply the previous patch instead. To be fair, I don't actually like either patch, I'm just going for what I think is the least worst option long term. If we could go back in time, I'd never have enabled the balloon device by default in the first place and required an explicit <memballoon>. I'd actually prefer to just ignore this problem completely, and declare that all KVM guest must always have a balloon and not provide any way to disable it. The issue of limited PCI slots is really a QEMU flaw - it should be providing a PCI bridge support so you can have a much less limited number of PCI slots. Regards, Daniel -- |: Red Hat, Engineering, London -o- http://people.redhat.com/berrange/ :| |: http://libvirt.org -o- http://virt-manager.org -o- http://deltacloud.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: GnuPG: 7D3B9505 -o- F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 :|

2 1

[libvirt] [PATCH] bootloader_args is named bootargs in xen-xm
by Philipp Hahn 10 Aug '10

10 Aug '10

According to <xen-3.4.3/tools/python/xen/xm/create.py:158> gopts.var('bootargs', val='NAME', fn=set_value, default=None, use="Arguments to pass to boot loader") the "bootloader_args" parameter needs to be translated into "bootargs" when using "virsh domxml-to-native xen-xm". The reverse direction (domxml-from-native) is already okay. This patch fixes domxml-to-native and adds two test files to catch this problem. Signed-off-by: Philipp Hahn <hahn(a)univention.de> --- src/xen/xm_internal.c | 2 +- tests/xmconfigdata/sexpr2xml-pv-bootloader.cfg | 12 +++++++++++ tests/xmconfigdata/sexpr2xml-pv-bootloader.xml | 26 ++++++++++++++++++++++++ 3 files changed, 39 insertions(+), 1 deletions(-) create mode 100644 tests/xmconfigdata/sexpr2xml-pv-bootloader.cfg create mode 100644 tests/xmconfigdata/sexpr2xml-pv-bootloader.xml

2 1

[libvirt] vol-clone is slow
by Harald Dunkel 09 Aug '10

09 Aug '10

Hi folks, Sorry to say, but it seems that vol-clone is a little bit slow. To clone a 32G logical volume it took about 40 minutes. If I use dd instead dd if=/dev/storage/vol1.lv bs=64k of=/dev/storage/vol2.lv it takes just 10 minutes, and the system load is lower, too. libvirt is 0.8.2-1, as found in Debian Testing. Regards Harri

1 0

[libvirt] [PATCH] nwfilter: extend nmwfilter reload support
by Stefan Berger 09 Aug '10

09 Aug '10

In this patch I am extending the nwfilter module's reload support to stop all ongoing threads (for learning IP addresses of interfaces) and rebuild the filtering rules of all interfaces of all VMs when libvirt is started. I could not test SIGHUP on my system since I currently get a fault there in the daemon's call to pthread_join(). About the patch: The nwfilter functions require a virConnectPtr. Therefore I am opening a connection in qemudStartup, which later on needs to be closed outside where the driver lock is held since otherwise it ends up in a deadlock due to virConnectClose() trying to lock the driver as well. Signed-off-by: Stefan Berger <stefanb(a)us.ibm.com> --- src/nwfilter/nwfilter_driver.c | 3 +++ src/qemu/qemu_driver.c | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 35 insertions(+) Index: libvirt-acl/src/nwfilter/nwfilter_driver.c =================================================================== --- libvirt-acl.orig/src/nwfilter/nwfilter_driver.c +++ libvirt-acl/src/nwfilter/nwfilter_driver.c @@ -147,6 +147,9 @@ nwfilterDriverReload(void) { return -1; } + /* shut down all threads -- qemud for example will restart them */ + virNWFilterLearnShutdown(); + nwfilterDriverLock(driverState); virNWFilterPoolLoadAllConfigs(NULL, &driverState->pools, Index: libvirt-acl/src/qemu/qemu_driver.c =================================================================== --- libvirt-acl.orig/src/qemu/qemu_driver.c +++ libvirt-acl/src/qemu/qemu_driver.c @@ -170,6 +170,9 @@ static int qemuDetectVcpuPIDs(struct qem static int qemuUpdateActivePciHostdevs(struct qemud_driver *driver, virDomainDefPtr def); +static int qemudVMFiltersInstantiate(virConnectPtr conn, + virDomainDefPtr def); + static struct qemud_driver *qemu_driver = NULL; @@ -1423,6 +1426,10 @@ error: return ret; } +struct virReconnectDomainData { + virConnectPtr conn; + struct qemud_driver *driver; +}; /* * Open an existing VM's monitor, re-detect VCPU threads * and re-reserve the security labels in use @@ -1431,9 +1438,11 @@ static void qemuReconnectDomain(void *payload, const char *name ATTRIBUTE_UNUSED, void *opaque) { virDomainObjPtr obj = payload; - struct qemud_driver *driver = opaque; + struct virReconnectDomainData *data = opaque; + struct qemud_driver *driver = data->driver; qemuDomainObjPrivatePtr priv; unsigned long long qemuCmdFlags; + virConnectPtr conn = data->conn; virDomainObjLock(obj); @@ -1467,6 +1476,9 @@ qemuReconnectDomain(void *payload, const obj) < 0) goto error; + if (qemudVMFiltersInstantiate(conn, obj->def)) + goto error; + if (obj->def->id >= driver->nextvmid) driver->nextvmid = obj->def->id + 1; @@ -1491,9 +1503,10 @@ error: * about. */ static void -qemuReconnectDomains(struct qemud_driver *driver) +qemuReconnectDomains(virConnectPtr conn, struct qemud_driver *driver) { - virHashForEach(driver->domains.objs, qemuReconnectDomain, driver); + struct virReconnectDomainData data = {conn, driver}; + virHashForEach(driver->domains.objs, qemuReconnectDomain, &data); } @@ -1691,6 +1704,7 @@ qemudStartup(int privileged) { char *base = NULL; char driverConf[PATH_MAX]; int rc; + virConnectPtr conn = NULL; if (VIR_ALLOC(qemu_driver) < 0) return -1; @@ -1912,7 +1926,11 @@ qemudStartup(int privileged) { 1, NULL, NULL) < 0) goto error; - qemuReconnectDomains(qemu_driver); + conn = virConnectOpen(qemu_driver->privileged ? + "qemu:///system" : + "qemu:///session"); + + qemuReconnectDomains(conn, qemu_driver); /* Then inactive persistent configs */ if (virDomainLoadAllConfigs(qemu_driver->caps, @@ -1930,6 +1948,8 @@ qemudStartup(int privileged) { qemudAutostartConfigs(qemu_driver); + if (conn) + virConnectClose(conn); return 0; @@ -1938,6 +1958,8 @@ out_of_memory: error: if (qemu_driver) qemuDriverUnlock(qemu_driver); + if (conn) + virConnectClose(conn); VIR_FREE(base); qemudShutdown(); return -1; @@ -12724,6 +12746,28 @@ qemudVMFilterRebuild(virConnectPtr conn return 0; } +static int +qemudVMFiltersInstantiate(virConnectPtr conn, + virDomainDefPtr def) +{ + int err = 0; + int i; + + if (!conn) + return 1; + + for (i = 0 ; i < def->nnets ; i++) { + virDomainNetDefPtr net = def->nets[i]; + if ((net->filter) && (net->ifname)) { + if (virDomainConfNWFilterInstantiate(conn, net)) { + err = 1; + break; + } + } + } + + return err; +} static virNWFilterCallbackDriver qemuCallbackDriver = { .name = "QEMU",

1 0

[libvirt] Possible documentation enhancement
by Daniel Kraft 09 Aug '10

09 Aug '10

Hi, I just wanted to add hooks on a node and didn't succeed. The error message was: Hook script execution failed: Hook script /etc/libvirt/hooks/qemu qemu failed with error code 256:libvir: error : cannot execute binary /etc/libvirt/hooks/qemu: Permission denied After reading the whole relevant src/utils code without finding any reason for this, I found out that it was apparmor's fault. So maybe there's a profile for the hooks missing (at least in ubuntu's packaging). And maybe there's room in the hook-docs for a hint about that. Daniel

2 1

[libvirt] [PATCH] esx: Add read-only storage volume access
by Matthias Bolte 08 Aug '10

08 Aug '10

This allows to list existing volumes and to retrieve information about them. --- src/esx/esx_driver.c | 112 +---------- src/esx/esx_storage_driver.c | 433 +++++++++++++++++++++++++++++++++++++++- src/esx/esx_vi.c | 279 ++++++++++++++++++++++++++ src/esx/esx_vi.h | 9 + src/esx/esx_vi_generator.input | 7 + 5 files changed, 724 insertions(+), 116 deletions(-) diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c index 4fb357b..c54f81e 100644 --- a/src/esx/esx_driver.c +++ b/src/esx/esx_driver.c @@ -348,19 +348,7 @@ esxAutodetectSCSIControllerModel(virDomainDiskDefPtr def, int *model, { int result = -1; esxVMX_Data *data = opaque; - char *datastoreName = NULL; - char *directoryName = NULL; - char *fileName = NULL; - char *datastorePath = NULL; - esxVI_String *propertyNameList = NULL; - esxVI_ObjectContent *datastore = NULL; - esxVI_ManagedObjectReference *hostDatastoreBrowser = NULL; - esxVI_HostDatastoreBrowserSearchSpec *searchSpec = NULL; - esxVI_VmDiskFileQuery *vmDiskFileQuery = NULL; - esxVI_ManagedObjectReference *task = NULL; - esxVI_TaskInfoState taskInfoState; - esxVI_TaskInfo *taskInfo = NULL; - esxVI_HostDatastoreBrowserSearchResults *searchResults = NULL; + esxVI_FileInfo *fileInfo = NULL; esxVI_VmDiskFileInfo *vmDiskFileInfo = NULL; if (def->device != VIR_DOMAIN_DISK_DEVICE_DISK || @@ -375,87 +363,12 @@ esxAutodetectSCSIControllerModel(virDomainDiskDefPtr def, int *model, return 0; } - if (esxUtil_ParseDatastorePath(def->src, &datastoreName, &directoryName, - &fileName) < 0) { + if (esxVI_LookupFileInfoByDatastorePath(data->ctx, def->src, &fileInfo, + esxVI_Occurrence_RequiredItem) < 0) { goto cleanup; } - if (directoryName == NULL) { - if (virAsprintf(&datastorePath, "[%s]", datastoreName) < 0) { - virReportOOMError(); - goto cleanup; - } - } else { - if (virAsprintf(&datastorePath, "[%s] %s", datastoreName, - directoryName) < 0) { - virReportOOMError(); - goto cleanup; - } - } - - /* Lookup HostDatastoreBrowser */ - if (esxVI_String_AppendValueToList(&propertyNameList, "browser") < 0 || - esxVI_LookupDatastoreByName(data->ctx, datastoreName, propertyNameList, - &datastore, - esxVI_Occurrence_RequiredItem) < 0 || - esxVI_GetManagedObjectReference(datastore, "browser", - &hostDatastoreBrowser, - esxVI_Occurrence_RequiredItem) < 0) { - goto cleanup; - } - - /* Build HostDatastoreBrowserSearchSpec */ - if (esxVI_HostDatastoreBrowserSearchSpec_Alloc(&searchSpec) < 0 || - esxVI_FileQueryFlags_Alloc(&searchSpec->details) < 0) { - goto cleanup; - } - - searchSpec->details->fileType = esxVI_Boolean_True; - searchSpec->details->fileSize = esxVI_Boolean_False; - searchSpec->details->modification = esxVI_Boolean_False; - - if (esxVI_VmDiskFileQuery_Alloc(&vmDiskFileQuery) < 0 || - esxVI_VmDiskFileQueryFlags_Alloc(&vmDiskFileQuery->details) < 0 || - esxVI_FileQuery_AppendToList - (&searchSpec->query, - esxVI_FileQuery_DynamicCast(vmDiskFileQuery)) < 0) { - goto cleanup; - } - - vmDiskFileQuery->details->diskType = esxVI_Boolean_False; - vmDiskFileQuery->details->capacityKb = esxVI_Boolean_False; - vmDiskFileQuery->details->hardwareVersion = esxVI_Boolean_False; - vmDiskFileQuery->details->controllerType = esxVI_Boolean_True; - vmDiskFileQuery->details->diskExtents = esxVI_Boolean_False; - - if (esxVI_String_Alloc(&searchSpec->matchPattern) < 0) { - goto cleanup; - } - - searchSpec->matchPattern->value = fileName; - - /* Search datastore for file */ - if (esxVI_SearchDatastore_Task(data->ctx, hostDatastoreBrowser, - datastorePath, searchSpec, &task) < 0 || - esxVI_WaitForTaskCompletion(data->ctx, task, NULL, esxVI_Occurrence_None, - esxVI_Boolean_False, &taskInfoState) < 0) { - goto cleanup; - } - - if (taskInfoState != esxVI_TaskInfoState_Success) { - ESX_ERROR(VIR_ERR_INTERNAL_ERROR, - _("Could not serach in datastore '%s'"), datastoreName); - goto cleanup; - } - - if (esxVI_LookupTaskInfoByTask(data->ctx, task, &taskInfo) < 0 || - esxVI_HostDatastoreBrowserSearchResults_CastFromAnyType - (taskInfo->result, &searchResults) < 0) { - goto cleanup; - } - - /* Interpret search result */ - vmDiskFileInfo = esxVI_VmDiskFileInfo_DynamicCast(searchResults->file); + vmDiskFileInfo = esxVI_VmDiskFileInfo_DynamicCast(fileInfo); if (vmDiskFileInfo == NULL || vmDiskFileInfo->controllerType == NULL) { ESX_ERROR(VIR_ERR_INTERNAL_ERROR, @@ -485,22 +398,7 @@ esxAutodetectSCSIControllerModel(virDomainDiskDefPtr def, int *model, result = 0; cleanup: - /* Don't double free fileName */ - if (searchSpec != NULL && searchSpec->matchPattern != NULL) { - searchSpec->matchPattern->value = NULL; - } - - VIR_FREE(datastoreName); - VIR_FREE(directoryName); - VIR_FREE(fileName); - VIR_FREE(datastorePath); - esxVI_String_Free(&propertyNameList); - esxVI_ObjectContent_Free(&datastore); - esxVI_ManagedObjectReference_Free(&hostDatastoreBrowser); - esxVI_HostDatastoreBrowserSearchSpec_Free(&searchSpec); - esxVI_ManagedObjectReference_Free(&task); - esxVI_TaskInfo_Free(&taskInfo); - esxVI_HostDatastoreBrowserSearchResults_Free(&searchResults); + esxVI_FileInfo_Free(&fileInfo); return result; } diff --git a/src/esx/esx_storage_driver.c b/src/esx/esx_storage_driver.c index 4fcc4af..644e66c 100644 --- a/src/esx/esx_storage_driver.c +++ b/src/esx/esx_storage_driver.c @@ -30,6 +30,7 @@ #include "logging.h" #include "uuid.h" #include "storage_conf.h" +#include "storage_file.h" #include "esx_private.h" #include "esx_storage_driver.h" #include "esx_vi.h" @@ -356,6 +357,14 @@ esxStoragePoolLookupByUUID(virConnectPtr conn, const unsigned char *uuid) +static virStoragePoolPtr +esxStoragePoolLookupByVolume(virStorageVolPtr volume) +{ + return esxStoragePoolLookupByName(volume->conn, volume->pool); +} + + + static int esxStoragePoolRefresh(virStoragePoolPtr pool, unsigned int flags) { @@ -602,6 +611,411 @@ esxStoragePoolSetAutostart(virStoragePoolPtr pool ATTRIBUTE_UNUSED, static int +esxStoragePoolNumberOfStorageVolumes(virStoragePoolPtr pool) +{ + bool success = false; + esxPrivate *priv = pool->conn->storagePrivateData; + esxVI_HostDatastoreBrowserSearchResults *searchResultsList = NULL; + esxVI_HostDatastoreBrowserSearchResults *searchResults = NULL; + esxVI_FileInfo *fileInfo = NULL; + int count = 0; + + if (esxVI_EnsureSession(priv->primary) < 0) { + return -1; + } + + if (esxVI_LookupDatastoreContentByDatastoreName(priv->primary, pool->name, + &searchResultsList) < 0) { + goto cleanup; + } + + /* Interpret search result */ + for (searchResults = searchResultsList; searchResults != NULL; + searchResults = searchResults->_next) { + for (fileInfo = searchResults->file; fileInfo != NULL; + fileInfo = fileInfo->_next) { + ++count; + } + } + + success = true; + + cleanup: + esxVI_HostDatastoreBrowserSearchResults_Free(&searchResultsList); + + return success ? count : -1; +} + + + +static int +esxStoragePoolListStorageVolumes(virStoragePoolPtr pool, char **const names, + int maxnames) +{ + bool success = false; + esxPrivate *priv = pool->conn->storagePrivateData; + esxVI_HostDatastoreBrowserSearchResults *searchResultsList = NULL; + esxVI_HostDatastoreBrowserSearchResults *searchResults = NULL; + esxVI_FileInfo *fileInfo = NULL; + char *datastoreName = NULL; + char *directoryName = NULL; + char *fileName = NULL; + char *prefix = NULL; + int count = 0; + int i; + + if (names == NULL || maxnames < 0) { + ESX_ERROR(VIR_ERR_INVALID_ARG, "%s", _("Invalid argument")); + return -1; + } + + if (maxnames == 0) { + return 0; + } + + if (esxVI_EnsureSession(priv->primary) < 0) { + return -1; + } + + if (esxVI_LookupDatastoreContentByDatastoreName(priv->primary, pool->name, + &searchResultsList) < 0) { + goto cleanup; + } + + /* Interpret search result */ + for (searchResults = searchResultsList; searchResults != NULL; + searchResults = searchResults->_next) { + VIR_FREE(datastoreName); + VIR_FREE(directoryName); + VIR_FREE(fileName); + VIR_FREE(prefix); + + if (esxUtil_ParseDatastorePath(searchResults->folderPath, &datastoreName, + &directoryName, &fileName) < 0) { + goto cleanup; + } + + if (directoryName != NULL) { + if (virAsprintf(&prefix, "%s/%s", directoryName, fileName) < 0) { + virReportOOMError(); + goto cleanup; + } + } else { + prefix = strdup(fileName); + + if (prefix == NULL) { + virReportOOMError(); + goto cleanup; + } + } + + for (fileInfo = searchResults->file; fileInfo != NULL; + fileInfo = fileInfo->_next) { + if (*prefix == '\0') { + names[count] = strdup(fileInfo->path); + + if (names[count] == NULL) { + virReportOOMError(); + goto cleanup; + } + } else if (virAsprintf(&names[count], "%s/%s", prefix, + fileInfo->path) < 0) { + virReportOOMError(); + goto cleanup; + } + + ++count; + } + } + + success = true; + + cleanup: + if (! success) { + for (i = 0; i < count; ++i) { + VIR_FREE(names[i]); + } + + count = -1; + } + + esxVI_HostDatastoreBrowserSearchResults_Free(&searchResultsList); + VIR_FREE(datastoreName); + VIR_FREE(directoryName); + VIR_FREE(fileName); + VIR_FREE(prefix); + + return count; +} + + + +static virStorageVolPtr +esxStorageVolumeLookupByName(virStoragePoolPtr pool, const char *name) +{ + virStorageVolPtr volume = NULL; + esxPrivate *priv = pool->conn->storagePrivateData; + char *datastorePath = NULL; + esxVI_FileInfo *fileInfo = NULL; + + if (esxVI_EnsureSession(priv->primary) < 0) { + return NULL; + } + + if (virAsprintf(&datastorePath, "[%s] %s", pool->name, name) < 0) { + virReportOOMError(); + goto cleanup; + } + + if (esxVI_LookupFileInfoByDatastorePath(priv->primary, datastorePath, + &fileInfo, + esxVI_Occurrence_RequiredItem) < 0) { + goto cleanup; + } + + volume = virGetStorageVol(pool->conn, pool->name, name, datastorePath); + + cleanup: + VIR_FREE(datastorePath); + esxVI_FileInfo_Free(&fileInfo); + + return volume; +} + + + +static virStorageVolPtr +esxStorageVolumeLookupByKeyOrPath(virConnectPtr conn, const char *keyOrPath) +{ + virStorageVolPtr volume = NULL; + esxPrivate *priv = conn->storagePrivateData; + char *datastoreName = NULL; + char *directoryName = NULL; + char *fileName = NULL; + char *volumeName = NULL; + esxVI_FileInfo *fileInfo = NULL; + + if (esxVI_EnsureSession(priv->primary) < 0) { + return NULL; + } + + if (esxUtil_ParseDatastorePath(keyOrPath, &datastoreName, &directoryName, + &fileName) < 0) { + goto cleanup; + } + + if (directoryName != NULL) { + if (virAsprintf(&volumeName, "%s/%s", directoryName, fileName) < 0) { + virReportOOMError(); + goto cleanup; + } + } else { + volumeName = strdup(fileName); + + if (volumeName == NULL) { + virReportOOMError(); + goto cleanup; + } + } + + if (esxVI_LookupFileInfoByDatastorePath(priv->primary, keyOrPath, &fileInfo, + esxVI_Occurrence_RequiredItem) < 0) { + goto cleanup; + } + + volume = virGetStorageVol(conn, datastoreName, volumeName, keyOrPath); + + cleanup: + VIR_FREE(datastoreName); + VIR_FREE(directoryName); + VIR_FREE(fileName); + VIR_FREE(volumeName); + esxVI_FileInfo_Free(&fileInfo); + + return volume; +} + + + +static int +esxStorageVolumeGetInfo(virStorageVolPtr volume, virStorageVolInfoPtr info) +{ + int result = -1; + esxPrivate *priv = volume->conn->storagePrivateData; + char *datastorePath = NULL; + esxVI_FileInfo *fileInfo = NULL; + esxVI_VmDiskFileInfo *vmDiskFileInfo = NULL; + + memset(info, 0, sizeof (*info)); + + if (esxVI_EnsureSession(priv->primary) < 0) { + return -1; + } + + if (virAsprintf(&datastorePath, "[%s] %s", volume->pool, volume->name) < 0) { + virReportOOMError(); + goto cleanup; + } + + if (esxVI_LookupFileInfoByDatastorePath(priv->primary, datastorePath, + &fileInfo, + esxVI_Occurrence_RequiredItem) < 0) { + goto cleanup; + } + + vmDiskFileInfo = esxVI_VmDiskFileInfo_DynamicCast(fileInfo); + + info->type = VIR_STORAGE_VOL_FILE; + + if (vmDiskFileInfo != NULL) { + info->capacity = vmDiskFileInfo->capacityKb->value * 1024; /* Scale from kilobyte to byte */ + info->allocation = vmDiskFileInfo->fileSize->value; + } else { + info->capacity = fileInfo->fileSize->value; + info->allocation = fileInfo->fileSize->value; + } + + result = 0; + + cleanup: + VIR_FREE(datastorePath); + esxVI_FileInfo_Free(&fileInfo); + + return result; +} + + + +static char * +esxStorageVolumeDumpXML(virStorageVolPtr volume, unsigned int flags) +{ + esxPrivate *priv = volume->conn->storagePrivateData; + esxVI_String *propertyNameList = NULL; + esxVI_ObjectContent *datastore = NULL; + esxVI_DynamicProperty *dynamicProperty = NULL; + esxVI_DatastoreInfo *datastoreInfo = NULL; + virStoragePoolDef pool; + char *datastorePath = NULL; + esxVI_FileInfo *fileInfo = NULL; + esxVI_VmDiskFileInfo *vmDiskFileInfo = NULL; + esxVI_IsoImageFileInfo *isoImageFileInfo = NULL; + esxVI_FloppyImageFileInfo *floppyImageFileInfo = NULL; + virStorageVolDef def; + char *xml = NULL; + + virCheckFlags(0, NULL); + + memset(&pool, 0, sizeof (pool)); + memset(&def, 0, sizeof (def)); + + if (esxVI_EnsureSession(priv->primary) < 0) { + return NULL; + } + + /* Lookup storage pool type */ + if (esxVI_String_AppendValueToList(&propertyNameList, "info") < 0 || + esxVI_LookupDatastoreByName(priv->primary, volume->pool, + propertyNameList, &datastore, + esxVI_Occurrence_RequiredItem) < 0) { + goto cleanup; + } + + for (dynamicProperty = datastore->propSet; dynamicProperty != NULL; + dynamicProperty = dynamicProperty->_next) { + if (STREQ(dynamicProperty->name, "info")) { + if (esxVI_DatastoreInfo_CastFromAnyType(dynamicProperty->val, + &datastoreInfo) < 0) { + goto cleanup; + } + + break; + } + } + + if (esxVI_LocalDatastoreInfo_DynamicCast(datastoreInfo) != NULL) { + pool.type = VIR_STORAGE_POOL_DIR; + } else if (esxVI_NasDatastoreInfo_DynamicCast(datastoreInfo) != NULL) { + pool.type = VIR_STORAGE_POOL_NETFS; + } else if (esxVI_VmfsDatastoreInfo_DynamicCast(datastoreInfo) != NULL) { + pool.type = VIR_STORAGE_POOL_FS; + } else { + ESX_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", + _("DatastoreInfo has unexpected type")); + goto cleanup; + } + + /* Lookup file info */ + if (virAsprintf(&datastorePath, "[%s] %s", volume->pool, volume->name) < 0) { + virReportOOMError(); + goto cleanup; + } + + if (esxVI_LookupFileInfoByDatastorePath(priv->primary, datastorePath, + &fileInfo, + esxVI_Occurrence_RequiredItem) < 0) { + goto cleanup; + } + + vmDiskFileInfo = esxVI_VmDiskFileInfo_DynamicCast(fileInfo); + isoImageFileInfo = esxVI_IsoImageFileInfo_DynamicCast(fileInfo); + floppyImageFileInfo = esxVI_FloppyImageFileInfo_DynamicCast(fileInfo); + + def.name = volume->name; + def.key = datastorePath; + def.type = VIR_STORAGE_VOL_FILE; + def.target.path = datastorePath; + + if (vmDiskFileInfo != NULL) { + def.capacity = vmDiskFileInfo->capacityKb->value * 1024; /* Scale from kilobyte to byte */ + def.allocation = vmDiskFileInfo->fileSize->value; + + def.target.format = VIR_STORAGE_FILE_VMDK; + } else if (isoImageFileInfo != NULL) { + def.capacity = fileInfo->fileSize->value; + def.allocation = fileInfo->fileSize->value; + + def.target.format = VIR_STORAGE_FILE_ISO; + } else if (floppyImageFileInfo != NULL) { + def.capacity = fileInfo->fileSize->value; + def.allocation = fileInfo->fileSize->value; + + def.target.format = VIR_STORAGE_FILE_RAW; + } else { + ESX_ERROR(VIR_ERR_INTERNAL_ERROR, + _("File '%s' has unknown type"), datastorePath); + goto cleanup; + } + + xml = virStorageVolDefFormat(&pool, &def); + + cleanup: + esxVI_String_Free(&propertyNameList); + esxVI_ObjectContent_Free(&datastore); + esxVI_DatastoreInfo_Free(&datastoreInfo); + VIR_FREE(datastorePath); + esxVI_FileInfo_Free(&fileInfo); + + return xml; +} + + + +static char * +esxStorageVolumeGetPath(virStorageVolPtr volume) +{ + char *path; + + if (virAsprintf(&path, "[%s] %s", volume->pool, volume->name) < 0) { + virReportOOMError(); + return NULL; + } + + return path; +} + + + +static int esxStoragePoolIsActive(virStoragePoolPtr pool ATTRIBUTE_UNUSED) { /* ESX storage pools are always active */ @@ -618,6 +1032,7 @@ esxStoragePoolIsPersistent(virStoragePoolPtr pool ATTRIBUTE_UNUSED) } + static virStorageDriver esxStorageDriver = { "ESX", /* name */ esxStorageOpen, /* open */ @@ -629,7 +1044,7 @@ static virStorageDriver esxStorageDriver = { NULL, /* findPoolSources */ esxStoragePoolLookupByName, /* poolLookupByName */ esxStoragePoolLookupByUUID, /* poolLookupByUUID */ - NULL, /* poolLookupByVolume */ + esxStoragePoolLookupByVolume, /* poolLookupByVolume */ NULL, /* poolCreateXML */ NULL, /* poolDefineXML */ NULL, /* poolBuild */ @@ -642,18 +1057,18 @@ static virStorageDriver esxStorageDriver = { esxStoragePoolGetXMLDesc, /* poolGetXMLDesc */ esxStoragePoolGetAutostart, /* poolGetAutostart */ esxStoragePoolSetAutostart, /* poolSetAutostart */ - NULL, /* poolNumOfVolumes */ - NULL, /* poolListVolumes */ - NULL, /* volLookupByName */ - NULL, /* volLookupByKey */ - NULL, /* volLookupByPath */ + esxStoragePoolNumberOfStorageVolumes, /* poolNumOfVolumes */ + esxStoragePoolListStorageVolumes, /* poolListVolumes */ + esxStorageVolumeLookupByName, /* volLookupByName */ + esxStorageVolumeLookupByKeyOrPath, /* volLookupByKey */ + esxStorageVolumeLookupByKeyOrPath, /* volLookupByPath */ NULL, /* volCreateXML */ NULL, /* volCreateXMLFrom */ NULL, /* volDelete */ NULL, /* volWipe */ - NULL, /* volGetInfo */ - NULL, /* volGetXMLDesc */ - NULL, /* volGetPath */ + esxStorageVolumeGetInfo, /* volGetInfo */ + esxStorageVolumeDumpXML, /* volGetXMLDesc */ + esxStorageVolumeGetPath, /* volGetPath */ esxStoragePoolIsActive, /* poolIsActive */ esxStoragePoolIsPersistent, /* poolIsPersistent */ }; diff --git a/src/esx/esx_vi.c b/src/esx/esx_vi.c index 55c5246..c6b2b63 100644 --- a/src/esx/esx_vi.c +++ b/src/esx/esx_vi.c @@ -2925,6 +2925,285 @@ esxVI_LookupCurrentSnapshotTree int +esxVI_LookupFileInfoByDatastorePath(esxVI_Context *ctx, + const char *datastorePath, + esxVI_FileInfo **fileInfo, + esxVI_Occurrence occurrence) +{ + int result = -1; + char *datastoreName = NULL; + char *directoryName = NULL; + char *fileName = NULL; + char *datastorePathWithoutFileName = NULL; + esxVI_String *propertyNameList = NULL; + esxVI_ObjectContent *datastore = NULL; + esxVI_ManagedObjectReference *hostDatastoreBrowser = NULL; + esxVI_HostDatastoreBrowserSearchSpec *searchSpec = NULL; + esxVI_VmDiskFileQuery *vmDiskFileQuery = NULL; + esxVI_IsoImageFileQuery *isoImageFileQuery = NULL; + esxVI_FloppyImageFileQuery *floppyImageFileQuery = NULL; + esxVI_ManagedObjectReference *task = NULL; + esxVI_TaskInfoState taskInfoState; + esxVI_TaskInfo *taskInfo = NULL; + esxVI_HostDatastoreBrowserSearchResults *searchResults = NULL; + + if (fileInfo == NULL || *fileInfo != NULL) { + ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", _("Invalid argument")); + return -1; + } + + if (esxUtil_ParseDatastorePath(datastorePath, &datastoreName, + &directoryName, &fileName) < 0) { + goto cleanup; + } + + if (directoryName == NULL) { + if (virAsprintf(&datastorePathWithoutFileName, "[%s]", + datastoreName) < 0) { + virReportOOMError(); + goto cleanup; + } + } else { + if (virAsprintf(&datastorePathWithoutFileName, "[%s] %s", + datastoreName, directoryName) < 0) { + virReportOOMError(); + goto cleanup; + } + } + + /* Lookup HostDatastoreBrowser */ + if (esxVI_String_AppendValueToList(&propertyNameList, "browser") < 0 || + esxVI_LookupDatastoreByName(ctx, datastoreName, propertyNameList, + &datastore, + esxVI_Occurrence_RequiredItem) < 0 || + esxVI_GetManagedObjectReference(datastore, "browser", + &hostDatastoreBrowser, + esxVI_Occurrence_RequiredItem) < 0) { + goto cleanup; + } + + /* Build HostDatastoreBrowserSearchSpec */ + if (esxVI_HostDatastoreBrowserSearchSpec_Alloc(&searchSpec) < 0 || + esxVI_FileQueryFlags_Alloc(&searchSpec->details) < 0) { + goto cleanup; + } + + searchSpec->details->fileType = esxVI_Boolean_True; + searchSpec->details->fileSize = esxVI_Boolean_True; + searchSpec->details->modification = esxVI_Boolean_False; + + if (esxVI_VmDiskFileQuery_Alloc(&vmDiskFileQuery) < 0 || + esxVI_VmDiskFileQueryFlags_Alloc(&vmDiskFileQuery->details) < 0 || + esxVI_FileQuery_AppendToList + (&searchSpec->query, + esxVI_FileQuery_DynamicCast(vmDiskFileQuery)) < 0) { + goto cleanup; + } + + vmDiskFileQuery->details->diskType = esxVI_Boolean_False; + vmDiskFileQuery->details->capacityKb = esxVI_Boolean_True; + vmDiskFileQuery->details->hardwareVersion = esxVI_Boolean_False; + vmDiskFileQuery->details->controllerType = esxVI_Boolean_True; + vmDiskFileQuery->details->diskExtents = esxVI_Boolean_False; + + if (esxVI_IsoImageFileQuery_Alloc(&isoImageFileQuery) < 0 || + esxVI_FileQuery_AppendToList + (&searchSpec->query, + esxVI_FileQuery_DynamicCast(isoImageFileQuery)) < 0) { + goto cleanup; + } + + if (esxVI_FloppyImageFileQuery_Alloc(&floppyImageFileQuery) < 0 || + esxVI_FileQuery_AppendToList + (&searchSpec->query, + esxVI_FileQuery_DynamicCast(floppyImageFileQuery)) < 0) { + goto cleanup; + } + + if (esxVI_String_Alloc(&searchSpec->matchPattern) < 0) { + goto cleanup; + } + + searchSpec->matchPattern->value = fileName; + + /* Search datastore for file */ + if (esxVI_SearchDatastore_Task(ctx, hostDatastoreBrowser, + datastorePathWithoutFileName, searchSpec, + &task) < 0 || + esxVI_WaitForTaskCompletion(ctx, task, NULL, esxVI_Occurrence_None, + esxVI_Boolean_False, &taskInfoState) < 0) { + goto cleanup; + } + + if (taskInfoState != esxVI_TaskInfoState_Success) { + ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, + _("Could not serach in datastore '%s'"), datastoreName); + goto cleanup; + } + + if (esxVI_LookupTaskInfoByTask(ctx, task, &taskInfo) < 0 || + esxVI_HostDatastoreBrowserSearchResults_CastFromAnyType + (taskInfo->result, &searchResults) < 0) { + goto cleanup; + } + + /* Interpret search result */ + if (searchResults->file == NULL) { + if (occurrence == esxVI_Occurrence_OptionalItem) { + result = 0; + + goto cleanup; + } else { + ESX_VI_ERROR(VIR_ERR_NO_STORAGE_VOL, + _("No storage volume with key or path '%s'"), + datastorePath); + goto cleanup; + } + } + + *fileInfo = searchResults->file; + searchResults->file = NULL; + + result = 0; + + cleanup: + /* Don't double free fileName */ + if (searchSpec != NULL && searchSpec->matchPattern != NULL) { + searchSpec->matchPattern->value = NULL; + } + + VIR_FREE(datastoreName); + VIR_FREE(directoryName); + VIR_FREE(fileName); + VIR_FREE(datastorePathWithoutFileName); + esxVI_String_Free(&propertyNameList); + esxVI_ObjectContent_Free(&datastore); + esxVI_ManagedObjectReference_Free(&hostDatastoreBrowser); + esxVI_HostDatastoreBrowserSearchSpec_Free(&searchSpec); + esxVI_ManagedObjectReference_Free(&task); + esxVI_TaskInfo_Free(&taskInfo); + esxVI_HostDatastoreBrowserSearchResults_Free(&searchResults); + + return result; +} + + + +int +esxVI_LookupDatastoreContentByDatastoreName + (esxVI_Context *ctx, const char *datastoreName, + esxVI_HostDatastoreBrowserSearchResults **searchResultsList) +{ + int result = -1; + esxVI_String *propertyNameList = NULL; + esxVI_ObjectContent *datastore = NULL; + esxVI_ManagedObjectReference *hostDatastoreBrowser = NULL; + esxVI_HostDatastoreBrowserSearchSpec *searchSpec = NULL; + esxVI_VmDiskFileQuery *vmDiskFileQuery = NULL; + esxVI_IsoImageFileQuery *isoImageFileQuery = NULL; + esxVI_FloppyImageFileQuery *floppyImageFileQuery = NULL; + char *datastorePath = NULL; + esxVI_ManagedObjectReference *task = NULL; + esxVI_TaskInfoState taskInfoState; + esxVI_TaskInfo *taskInfo = NULL; + + if (searchResultsList == NULL || *searchResultsList != NULL) { + ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", _("Invalid argument")); + return -1; + } + + /* Lookup Datastore and HostDatastoreBrowser */ + if (esxVI_String_AppendValueToList(&propertyNameList, "browser") < 0 || + esxVI_LookupDatastoreByName(ctx, datastoreName, propertyNameList, + &datastore, + esxVI_Occurrence_RequiredItem) < 0 || + esxVI_GetManagedObjectReference(datastore, "browser", + &hostDatastoreBrowser, + esxVI_Occurrence_RequiredItem) < 0) { + goto cleanup; + } + + /* Build HostDatastoreBrowserSearchSpec */ + if (esxVI_HostDatastoreBrowserSearchSpec_Alloc(&searchSpec) < 0 || + esxVI_FileQueryFlags_Alloc(&searchSpec->details) < 0) { + goto cleanup; + } + + searchSpec->details->fileType = esxVI_Boolean_True; + searchSpec->details->fileSize = esxVI_Boolean_True; + searchSpec->details->modification = esxVI_Boolean_False; + + if (esxVI_VmDiskFileQuery_Alloc(&vmDiskFileQuery) < 0 || + esxVI_VmDiskFileQueryFlags_Alloc(&vmDiskFileQuery->details) < 0 || + esxVI_FileQuery_AppendToList + (&searchSpec->query, + esxVI_FileQuery_DynamicCast(vmDiskFileQuery)) < 0) { + goto cleanup; + } + + vmDiskFileQuery->details->diskType = esxVI_Boolean_False; + vmDiskFileQuery->details->capacityKb = esxVI_Boolean_True; + vmDiskFileQuery->details->hardwareVersion = esxVI_Boolean_False; + vmDiskFileQuery->details->controllerType = esxVI_Boolean_True; + vmDiskFileQuery->details->diskExtents = esxVI_Boolean_False; + + if (esxVI_IsoImageFileQuery_Alloc(&isoImageFileQuery) < 0 || + esxVI_FileQuery_AppendToList + (&searchSpec->query, + esxVI_FileQuery_DynamicCast(isoImageFileQuery)) < 0) { + goto cleanup; + } + + if (esxVI_FloppyImageFileQuery_Alloc(&floppyImageFileQuery) < 0 || + esxVI_FileQuery_AppendToList + (&searchSpec->query, + esxVI_FileQuery_DynamicCast(floppyImageFileQuery)) < 0) { + goto cleanup; + } + + /* Search datastore for files */ + if (virAsprintf(&datastorePath, "[%s]", datastoreName) < 0) { + virReportOOMError(); + goto cleanup; + } + + if (esxVI_SearchDatastoreSubFolders_Task(ctx, hostDatastoreBrowser, + datastorePath, searchSpec, + &task) < 0 || + esxVI_WaitForTaskCompletion(ctx, task, NULL, esxVI_Occurrence_None, + esxVI_Boolean_False, &taskInfoState) < 0) { + goto cleanup; + } + + if (taskInfoState != esxVI_TaskInfoState_Success) { + ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, + _("Could not serach in datastore '%s'"), datastoreName); + goto cleanup; + } + + if (esxVI_LookupTaskInfoByTask(ctx, task, &taskInfo) < 0 || + esxVI_HostDatastoreBrowserSearchResults_CastListFromAnyType + (taskInfo->result, searchResultsList) < 0) { + goto cleanup; + } + + result = 0; + + cleanup: + esxVI_String_Free(&propertyNameList); + esxVI_ObjectContent_Free(&datastore); + esxVI_ManagedObjectReference_Free(&hostDatastoreBrowser); + esxVI_HostDatastoreBrowserSearchSpec_Free(&searchSpec); + VIR_FREE(datastorePath); + esxVI_ManagedObjectReference_Free(&task); + esxVI_TaskInfo_Free(&taskInfo); + + return result; +} + + + +int esxVI_HandleVirtualMachineQuestion (esxVI_Context *ctx, esxVI_ManagedObjectReference *virtualMachine, esxVI_VirtualMachineQuestionInfo *questionInfo, diff --git a/src/esx/esx_vi.h b/src/esx/esx_vi.h index d5dc9d5..42f535f 100644 --- a/src/esx/esx_vi.h +++ b/src/esx/esx_vi.h @@ -397,6 +397,15 @@ int esxVI_LookupCurrentSnapshotTree esxVI_VirtualMachineSnapshotTree **currentSnapshotTree, esxVI_Occurrence occurrence); +int esxVI_LookupFileInfoByDatastorePath(esxVI_Context *ctx, + const char *datastorePath, + esxVI_FileInfo **fileInfo, + esxVI_Occurrence occurrence); + +int esxVI_LookupDatastoreContentByDatastoreName + (esxVI_Context *ctx, const char *datastoreName, + esxVI_HostDatastoreBrowserSearchResults **searchResultsList); + int esxVI_HandleVirtualMachineQuestion (esxVI_Context *ctx, esxVI_ManagedObjectReference *virtualMachine, diff --git a/src/esx/esx_vi_generator.input b/src/esx/esx_vi_generator.input index ab50ea5..0fb9448 100644 --- a/src/esx/esx_vi_generator.input +++ b/src/esx/esx_vi_generator.input @@ -813,6 +813,13 @@ method RevertToSnapshot_Task returns ManagedObjectReference r end +method SearchDatastoreSubFolders_Task returns ManagedObjectReference r + ManagedObjectReference _this r + String datastorePath r + HostDatastoreBrowserSearchSpec searchSpec o +end + + method SearchDatastore_Task returns ManagedObjectReference r ManagedObjectReference _this r String datastorePath r -- 1.7.0.4

1 0

[libvirt] Feature-Request: Network-Hook
by Daniel Kraft 07 Aug '10

07 Aug '10

Hi, I already talked about that issue with photron on the irc channel. Thanks for the great response and the hint that I should come up with this here. I need to add a physical interface to a bridge generated from libvirt. More precisely, I need a vlan-ethernet-device in my bridge to allow guest-clusters to communicate efficiently (i.e. without a gateway). For this example let's say, I want eth0.2 to be a member of the bridge virbr2. So I could add code to the start-guest hook which checks if eth0.2 is member of the same bridge as the configured interface's tun device(s) and if not, add it. Then I'd add code to the stop-guest hook which checks if there are interfaces other than the configured ones as members of the bridge and if not, remove eth0.2 from the bridge so that the bridge could be removed (or would be empty at least). This is all ugly and most likely unstable, because it's at the wrong position. Depending on the way of the implementation it could happen that eth0.2 is removed even if there are guests relying on it or that eth0.2 isn't removed if it should be (e.g. if there are manually added interfaces on the bridge). Endless debugging sessions and a huge amount of code would be the result. Anything would be very clear if I had a network hook script. Something like a "<script path='...'>" node in the network xml. There I could very cleanly add and remove secondary interfaces or modify properties of the bridge. So the perfect position of that hook would be *after* the bridge has been created. The parameters should at least be - bridge name - action (start, stop, ...) Any hints to existing features that could help me to realize that use-case are very welcome ;) Daniel

1 0

Re: [libvirt] [PATCH] Add support for vendor/product
by Patrick Dignan 06 Aug '10

06 Aug '10

On 08/06/2010 02:22 PM, Dignan, Pat wrote: > From: Patrick Dignan<pat_dignan(a)dell.com> > > --- > docs/schemas/storagepool.rng | 52 ++++++++++++++++++++ > src/conf/storage_conf.c | 14 +++++ > src/conf/storage_conf.h | 6 ++ > .../pool-iscsi-vendor-product.xml | 19 +++++++ > .../pool-iscsi-vendor-product.xml | 22 ++++++++ > tests/storagepoolxml2xmltest.c | 1 + > 6 files changed, 114 insertions(+), 0 deletions(-) > create mode 100644 tests/storagepoolxml2xmlin/pool-iscsi-vendor-product.xml > create mode 100644 tests/storagepoolxml2xmlout/pool-iscsi-vendor-product.xml > > diff --git a/docs/schemas/storagepool.rng b/docs/schemas/storagepool.rng > index b911f7c..a8a3f36 100644 > --- a/docs/schemas/storagepool.rng > +++ b/docs/schemas/storagepool.rng > @@ -103,6 +103,23 @@ > <ref name='target'/> > </define> > > +<define name='sourceinfovendor'> > +<optional> > +<element name='vendor'> > +<attribute name='name'> > +<text/> > +</attribute> > +</element> > +</optional> > +<optional> > +<element name='product'> > +<attribute name='name'> > +<text/> > +</attribute> > +</element> > +</optional> > +</define> > + > <define name='commonmetadata'> > <element name='name'> > <ref name='name'/> > @@ -272,6 +289,9 @@ > <value>ocfs2</value> > </choice> > </attribute> > +<optional> > +<ref name='sourceinfovendor'/> > +</optional> > </element> > </optional> > </define> > @@ -286,6 +306,9 @@ > <value>nfs</value> > </choice> > </attribute> > +<optional> > +<ref name='sourceinfovendor'/> > +</optional> > </element> > </optional> > </define> > @@ -307,6 +330,9 @@ > <value>lvm2</value> > </choice> > </attribute> > +<optional> > +<ref name='sourceinfovendor'/> > +</optional> > </element> > </optional> > </define> > @@ -321,6 +347,9 @@ > <value>lvm2</value> > </choice> > </attribute> > +<optional> > +<ref name='sourceinfovendor'/> > +</optional> > </element> > </optional> > </define> > @@ -330,13 +359,20 @@ > <optional> > <element name='source'> > <empty/> > +<optional> > +<ref name='sourceinfovendor'/> > +</optional> > </element> > </optional> > </define> > + > <define name='sourcefs'> > <element name='source'> > <ref name='sourceinfodev'/> > <ref name='sourcefmtfs'/> > +<optional> > +<ref name='sourceinfovendor'/> > +</optional> > </element> > </define> > > @@ -345,6 +381,9 @@ > <ref name='sourceinfohost'/> > <ref name='sourceinfodir'/> > <ref name='sourcefmtnetfs'/> > +<optional> > +<ref name='sourceinfovendor'/> > +</optional> > </element> > </define> > > @@ -359,6 +398,9 @@ > </optional> > </oneOrMore> > <ref name='sourcefmtlogical'/> > +<optional> > +<ref name='sourceinfovendor'/> > +</optional> > </element> > </define> > > @@ -366,6 +408,9 @@ > <element name='source'> > <ref name='sourceinfodev'/> > <ref name='sourcefmtdisk'/> > +<optional> > +<ref name='sourceinfovendor'/> > +</optional> > </element> > </define> > > @@ -379,12 +424,19 @@ > <optional> > <ref name='sourceinfoauth'/> > </optional> > +<optional> > +<ref name='sourceinfovendor'/> > +</optional> > </element> > </define> > > <define name='sourcescsi'> > <element name='source'> > <ref name='sourceinfoadapter'/> > +<optional> > +<ref name='sourceinfovendor'/> > +</optional> > + > </element> > </define> > > diff --git a/src/conf/storage_conf.c b/src/conf/storage_conf.c > index bf86c93..6e3cce6 100644 > --- a/src/conf/storage_conf.c > +++ b/src/conf/storage_conf.c > @@ -284,6 +284,8 @@ virStoragePoolSourceFree(virStoragePoolSourcePtr source) { > VIR_FREE(source->name); > VIR_FREE(source->adapter); > VIR_FREE(source->initiator.iqn); > + VIR_FREE(source->vendor); > + VIR_FREE(source->product); > > if (source->authType == VIR_STORAGE_POOL_AUTH_CHAP) { > VIR_FREE(source->auth.chap.login); > @@ -465,6 +467,9 @@ virStoragePoolDefParseSource(xmlXPathContextPtr ctxt, > goto cleanup; > } > > + source->vendor = virXPathString("string(./vendor/@name)", ctxt); > + source->product = virXPathString("string(./product/@name)", ctxt); > + > ret = 0; > cleanup: > ctxt->node = relnode; > @@ -838,6 +843,15 @@ virStoragePoolSourceFormat(virBufferPtr buf, > virBufferVSprintf(buf,"<auth type='chap' login='%s' passwd='%s'/>\n", > src->auth.chap.login, > src->auth.chap.passwd); > + > + if (src->vendor != NULL) { > + virBufferVSprintf(buf,"<vendor name='%s'/>\n", src->vendor); > + } > + > + if (src->product != NULL) { > + virBufferVSprintf(buf,"<product name='%s'/>\n", src->product); > + } > + > virBufferAddLit(buf,"</source>\n"); > > return 0; > diff --git a/src/conf/storage_conf.h b/src/conf/storage_conf.h > index bedee9e..5f17b5a 100644 > --- a/src/conf/storage_conf.h > +++ b/src/conf/storage_conf.h > @@ -237,6 +237,12 @@ struct _virStoragePoolSource { > virStoragePoolAuthChap chap; > } auth; > > + /* Vendor of the the source */ > + char *vendor; > + > + /* Product name of the source*/ > + char *product; > + > int format; /* Pool type specific format such as filesystem type, or lvm version, etc */ > }; > > diff --git a/tests/storagepoolxml2xmlin/pool-iscsi-vendor-product.xml b/tests/storagepoolxml2xmlin/pool-iscsi-vendor-product.xml > new file mode 100644 > index 0000000..01fbd9b > --- /dev/null > +++ b/tests/storagepoolxml2xmlin/pool-iscsi-vendor-product.xml > @@ -0,0 +1,19 @@ > +<pool type='iscsi'> > +<name>virtimages</name> > +<uuid>e9392370-2917-565e-692b-d057f46512d6</uuid> > +<source> > +<host name="iscsi.example.com"/> > +<device path="demo-target"/> > +<auth type='chap' login='foobar' passwd='frobbar'/> > +<vendor name='test-vendor'/> > +<product name='test-product'/> > +</source> > +<target> > +<path>/dev/disk/by-path</path> > +<permissions> > +<mode>0700</mode> > +<owner>0</owner> > +<group>0</group> > +</permissions> > +</target> > +</pool> > diff --git a/tests/storagepoolxml2xmlout/pool-iscsi-vendor-product.xml b/tests/storagepoolxml2xmlout/pool-iscsi-vendor-product.xml > new file mode 100644 > index 0000000..baab6c0 > --- /dev/null > +++ b/tests/storagepoolxml2xmlout/pool-iscsi-vendor-product.xml > @@ -0,0 +1,22 @@ > +<pool type='iscsi'> > +<name>virtimages</name> > +<uuid>e9392370-2917-565e-692b-d057f46512d6</uuid> > +<capacity>0</capacity> > +<allocation>0</allocation> > +<available>0</available> > +<source> > +<host name='iscsi.example.com'/> > +<device path='demo-target'/> > +<auth type='chap' login='foobar' passwd='frobbar'/> > +<vendor name='test-vendor'/> > +<product name='test-product'/> > +</source> > +<target> > +<path>/dev/disk/by-path</path> > +<permissions> > +<mode>0700</mode> > +<owner>0</owner> > +<group>0</group> > +</permissions> > +</target> > +</pool> > diff --git a/tests/storagepoolxml2xmltest.c b/tests/storagepoolxml2xmltest.c > index 33a7343..2ec29e3 100644 > --- a/tests/storagepoolxml2xmltest.c > +++ b/tests/storagepoolxml2xmltest.c > @@ -96,6 +96,7 @@ mymain(int argc, char **argv) > DO_TEST("pool-scsi"); > DO_TEST("pool-mpath"); > DO_TEST("pool-iscsi-multiiqn"); > + DO_TEST("pool-iscsi-vendor-product"); > > return (ret==0 ? EXIT_SUCCESS : EXIT_FAILURE); > } My git-email-fu was bad. This message was supposed to be part of this email: I've fixed the aforementioned issues. I decided to allow vendor and product to be set independently of each other in order to allow greater flexibility at the possible expense of namespace clashes. I'm sending this (hopefully) using git-send-email, so I hope that resolves any spacing issues Best, Patrick Dignan

1 0

[libvirt] [PATCH] phyp: Fixing possible buffer overflow
by Eduardo Otubo 06 Aug '10

06 Aug '10

The line src/phyp/phyp_driver.c:427 was crashing by buffer overflow if the return of the command wasn't <=10. The highest number for a LPAR ID is 256 per machine, no need to allocate 10 bytes for it. So, adjusting the correct size (+1 byte for the '\n') and checking for errors. --- src/phyp/phyp_driver.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/phyp/phyp_driver.c b/src/phyp/phyp_driver.c index ee1e21b..f8fd29b 100644 --- a/src/phyp/phyp_driver.c +++ b/src/phyp/phyp_driver.c @@ -383,7 +383,7 @@ phypListDomainsGeneric(virConnectPtr conn, int *ids, int nids, int got = 0; char *char_ptr; unsigned int i = 0, j = 0; - char id_c[10]; + char id_c[4]; char *cmd = NULL; char *ret = NULL; const char *state; @@ -394,7 +394,7 @@ phypListDomainsGeneric(virConnectPtr conn, int *ids, int nids, else state = " "; - memset(id_c, 0, 10); + memset(id_c, 0, 4); virBufferAddLit(&buf, "lssyscfg -r lpar"); if (system_type == HMC) @@ -410,6 +410,11 @@ phypListDomainsGeneric(virConnectPtr conn, int *ids, int nids, ret = phypExec(session, cmd, &exit_status, conn); + if (strlen(ret) > 4) { + VIR_ERROR0(ret); + goto err; + } + /* I need to parse the textual return in order to get the ret */ if (exit_status < 0 || ret == NULL) goto err; -- 1.7.0.4

3 10

[libvirt] [PATCH] docs: significant expansion of custom hook script information
by Justin Clift 06 Aug '10

06 Aug '10

--- Also available for easy review online here for a while: http://justinclift.fedorapeople.org/libvirt_docs/hooks.html docs/hooks.html.in | 226 +++++++++++++++++++++++++++++++++++++-------------- 1 files changed, 164 insertions(+), 62 deletions(-) diff --git a/docs/hooks.html.in b/docs/hooks.html.in index 2afdecf..5eeec27 100644 --- a/docs/hooks.html.in +++ b/docs/hooks.html.in @@ -2,69 +2,171 @@ <html> <body> <h1>Hooks for specific system management</h1> - Libvirt includes synchronous hooks, starting from version 0.8.0, as a - way to tie in specific tailored system actions at a specific time. - If these scripts are present on the host where the hypervisor - is running, then they are called when the libvirt daemon is doingi - some significant action. - The scripts are expected to execute quickly, return a zero exit - status if all conditions are set for the daemon to continue the - action (non zero will be considered a failure which may - be ignored but in general will stop the ongoing operation). - The script also should not call back into libvirt as the daemon - is waiting for the script exit and deadlock is likely to occur. - The scripts are stored in the directory <code>/etc/libvirt/hooks/</code> - when using a standard installation path - (<code>$SYSCONF_DIR/libvirt/hooks/</code> in general). - Each script is given the following command line arguments: - <ul> - <li> the first argument is the name of the object involved in the - operation, or '-' if there is none. - <li> the second argument is the name of the operation. - <li> the third argument is a suboperation indication like 'start' or - 'end', or '-' if there is none. - <li> the last argument is an extra argument string or '-' if there - is none. - </ul> - There are currently scripts for 3 domains of operation: + + <ul id="toc"></ul> + + <h2><a name="intro">Custom event scripts</a></h2> + Beginning with libvirt 0.8.0, specific events on a host system will + trigger custom scripts. + These custom hook scripts are executed when any of the following + actions occur: <ul> - <li><code>/etc/libvirt/hooks/daemon</code> script if - present is called at 3 points in time: - at daemon startup, typically started with the following - arguments: - <pre>/etc/libvirt/hooks/daemon - start - start</pre> - at daemon shutdown when it is about to exit, with the following - arguments: - <pre>/etc/libvirt/hooks/daemon - shutdown - shutdown</pre> - When the daemon is asked to reload its driver state when - receiving the SIGHUP signal, arguments are: - <pre>/etc/libvirt/hooks/daemon - reload begin SIGHUP</pre> - </li> - <li><code>/etc/libvirt/hooks/qemu</code> script and - <code>/etc/libvirt/hooks/lxc</code> associate hooks for domain - operation on the respective QEmu/KVM and LXC drivers. - The domain related hooks also receive the full XML description - for the concerned domain on their stdin, which allows them to get - all the information from the domain, including UUID or storage - if that is needed for the script operation. - Currently only domain startup and domain end operations - involve the hook, the first one just before the domain gets - created. - For example if starting a QEmu domain named <code>test</code> - the following script will get called: - <pre>/etc/libvirt/hooks/qemu test start begin -</pre> - note that a non-zero return value from the script will abort the - domain startup operation, and if an error string is passed on - stderr by the hook script, it will be provided back to the user - at the libvirt API level. - For domain shutdown, the script will be called just after the - domain has finished execution, and the script will get: - <pre>/etc/libvirt/hooks/qemu test stopped end -</pre> - It is expected that other operations will be associated to hooks - but at the time of 0.8.0 only those 2 are associated to the - domains life cycle - </li> + <li>The libvirt daemon starts, stops, or reloads its + configuration </li> + <li>A QEMU guest is started or stopped </li> + <li>An LXC guest is started or stopped </li> </ul> - + + <h2><a name="location">Script Location</a></h2> + The libvirt hook scripts are located in the directory + <code>$SYSCONF_DIR/etc/libvirt/hooks/</code>. + With Fedora and RHEL, this is <code>/etc/libvirt/hooks/</code>. + On other Linux distributions this may be different. + + + <h2><a name="names">Script names</a></h2> + At present, there are three hook scripts: + <ul> + <li><code>/etc/libvirt/hooks/daemon</code> + Executed when the libvirt daemon is started, stopped, or reloads + its configuration </li> + <li><code>/etc/libvirt/hooks/qemu</code> + Executed when a QEMU guest is started, stopped, or migrated </li> + <li><code>/etc/libvirt/hooks/lxc</code> + Executed when an LXC guest is started or stopped</li> + </ul> + + + <h2><a name="structure">Script structure</a></h2> + The hook scripts are executed using standard Linux process creation + functions. Therefore, they must begin with the declaration of the + command interpreter to use. + For example: + <pre>#!/bin/bash</pre> + or: + <pre>#!/usr/bin/python</pre> + Other command interpreters are equally valid, as is any executable + binary, so you are welcome to use your favourite languages. + + + <h2><a name="arguments">Script arguments</a></h2> + The hook scripts are called with specific command line arguments, + depending upon the script, and the operation being performed. + The guest hook scripts, qemu and lxc, are also given the full + XML description for the domain on their stdin. This includes items + such the UUID of the domain and its storage information, and is + intended to provide all the libvirt information the script needs. + + The command line arguments take this approach: + <ol> + <li>The first argument is the name of the object involved in the + operation, or '-' if there is none. + For example, the name of a guest being started. </li> + <li>The second argument is the name of the operation being + performed. + For example, "start" if a guest is being started. </li> + <li>The third argument is a sub-operation indication, or '-' if there + is none. </li> + <li>The last argument is an extra argument string, or '-' if there is + none.</li> + </ol> + + <h4><a name="arguments_specifics">Specifics</a></h4> + This translates to the following specifics for each hook script: + + <h5><a name="daemon">/etc/libvirt/hooks/daemon</a></h5> + <ul> + <li>When the libvirt daemon is started, this script is called as: + <pre>/etc/libvirt/hooks/daemon - start - start</pre></li> + <li>When the libvirt daemon is shut down, this script is called as: + <pre>/etc/libvirt/hooks/daemon - shutdown - shutdown</pre></li> + <li>When the libvirt daemon receives the SIGHUP signal, it reloads its + configuration and triggers the hook script as: + <pre>/etc/libvirt/hooks/daemon - reload begin SIGHUP</pre></li> + </ul> + + <h5><a name="qemu">/etc/libvirt/hooks/qemu</a></h5> + <ul> + <li>When a QEMU guest is started, the qemu hook script is called as: + <pre>/etc/libvirt/hooks/qemu guest_name start begin -</pre></li> + <li>When a QEMU guest is stopped, the qemu hook script is called + as: + <pre>/etc/libvirt/hooks/qemu guest_name stopped end -</pre></li> + </ul> + + <h5><a name="lxc">/etc/libvirt/hooks/lxc</a></h5> + <ul> + <li>When an LXC guest is started, the lxc hook script is called as: + <pre>/etc/libvirt/hooks/lxc guest_name start begin -</pre></li> + <li>When a LXC guest is stopped, the lxc hook script is called + as: + <pre>/etc/libvirt/hooks/lxc guest_name stopped end -</pre></li> + </ul> + + + <h2><a name="execution">Script execution</a></h2> + <ul> + <li>The "start" operation for the guest hook scripts, qemu and lxc, + executes prior to the guest being created. This allows the + guest start operation to be aborted if the script returns indicating + failure. </li> + <li>The "shutdown" operation for the guest hook scripts, qemu and lxc, + executes after the guest has stopped. If the hook script + indicates failure in its return, the shut down of the guest cannot + be aborted because it has already been performed. </li> + <li>Hook scripts execute in a synchronous fashion. Libvirt waits + for them to return before continuing the given operation. + This is most noticeable with the guest start operation, as a lengthy + operation in the hook script can mean an extended wait for the guest + to be available to end users. </li> + <li>For a hook script to be utilised, it have it's execute bit set + (ie. chmod +x qemu), and must be present when the libvirt + daemon is started. </li> + <li>If a hook script is added to a host after the libvirt daemon is + already running, it won't be used until the libvirt daemon + next starts.</li> + </ul> + + + <h2><a name="qemu_migration">QEMU guest migration</a></h2> + Migration of a QEMU guest involves running the hook scripts on both the + source and destination hosts: + <ol> + <li>At the beginning of the migration, the qemu hook script on + the destination host is executed with the "start" + operation. </li> + <li>If this hook script returns indicating success (error code 0), the + migration continues. Any other return code indicates failure, and + the migration is aborted. </li> + <li>The QEMU guest is then migrated to the destination host. + </li> + <li>Unless an error occurs during the migration process, the qemu + hook script on the source host is then executed with the "stopped" + operation, to indicate it is no longer running on this + host. + Regardless of the return code from this hook script, the migration + is not aborted as it has already been performed.</li> + </ol> + + + <h2><a name="recursive">Calling libvirt functions from within a hook script</a></h2> + DO NOT DO THIS! + A hook script must not call back into libvirt, as the libvirt daemon + is already waiting for the script to exit. + A deadlock is likely to occur. + + + <h2><a name="return_codes">Return codes and logging</a></h2> + If a hook script returns with an exit code of 0, the libvirt daemon + regards this as successful and performs no logging of it. + However, if a hook script returns with a non zero exit code, the libvirt + daemon regards this as a failure, logs it with return code 256, and + additionally logs anything on stderr the hook script returns. + For example, a hook script might use this code to indicate failure, + and send a text string to stderr: + <pre>echo "Could not find required XYZZY" >&2 +exit 1</pre> + The resulting entry in the libvirt log will appear as: + <pre>20:02:40.297: error : virHookCall:416 : Hook script execution failed: Hook script /etc/libvirt/hooks/qemu qemu failed with error code 256:Could not find required XYZZY</pre> </body> </html> -- 1.7.2

3 5

[libvirt] Callback and stream questions
by arnaud.champion＠devatom.fr 06 Aug '10

06 Aug '10

Hi, I would know if there is some callbacks for network adding/change/remove and for storage pool add/change/remove, I haven't seen these kind of callback in the API documentation. Also, I don't understand the use of the virStream... functions (what is it used for ?) Thanks Arnaud Champion

2 1

[libvirt] [PATCH 1/3] Attempt to load tun module on tap add error
by Doug Goldstein 06 Aug '10

06 Aug '10

When attempting to add a tap device, the error message is fairly cryptic as to what really happened. If possible, try to load the tun module and then try again to add the tap device again to improve the user experience. Signed-off-by: Doug Goldstein <cardoe(a)gentoo.org> --- src/util/bridge.c | 21 +++++++++++++++++++-- 1 files changed, 19 insertions(+), 2 deletions(-) diff --git a/src/util/bridge.c b/src/util/bridge.c index 7d0caae..ca4bcc9 100644 --- a/src/util/bridge.c +++ b/src/util/bridge.c @@ -486,12 +486,29 @@ brAddTap(brControl *ctl, { int fd; struct ifreq ifr; + const char * const argv[] = { "modprobe", "tun", NULL }; + int err, exitstatus = 0; if (!ctl || !ctl->fd || !bridge || !ifname) return EINVAL; - if ((fd = open("/dev/net/tun", O_RDWR)) < 0) - return errno; + if ((fd = open("/dev/net/tun", O_RDWR)) < 0) { + err = errno; + + /* If the tun device was non-existent, lets try to load the module */ + if (err == ENOENT) { + if (virRun(argv, &exitstatus) < 0) { + return ENOENT; + } + + /* Now lets try to open the tun device again */ + if ((fd = open("/dev/net/tun", O_RDWR)) < 0) { + return errno; + } + } else { + return err; + } + } memset(&ifr, 0, sizeof(ifr)); -- 1.7.2

3 2

[libvirt] [PATCH 3/3] Fix return value usage
by Doug Goldstein 06 Aug '10

06 Aug '10

Fix the error checking to use the return value from brAddTap() instead of checking the current errno value which might have been changed by clean up calls inside of brAddTap(). Signed-off-by: Doug Goldstein <cardoe(a)gentoo.org> --- src/qemu/qemu_conf.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index e92021a..7c0e354 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -1689,7 +1689,7 @@ qemudNetworkIfaceConnect(virConnectPtr conn, tapmac, vnet_hdr, &tapfd))) { - if (errno == ENOTSUP) { + if (err == ENOTSUP) { /* In this particular case, give a better diagnostic. */ qemuReportError(VIR_ERR_INTERNAL_ERROR, _("Failed to add tap interface to bridge. " -- 1.7.2

3 2

[libvirt] [PATCH 2/3] Add a detailed message when tap device add fails
by Doug Goldstein 05 Aug '10

05 Aug '10

Added a more detailed error message when adding a tap devices fails and the kernel is missing tun support. Signed-off-by: Doug Goldstein <cardoe(a)gentoo.org> --- src/qemu/qemu_conf.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index 2ca3350..e92021a 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -1694,6 +1694,13 @@ qemudNetworkIfaceConnect(virConnectPtr conn, qemuReportError(VIR_ERR_INTERNAL_ERROR, _("Failed to add tap interface to bridge. " "%s is not a bridge device"), brname); + } else if (err == ENOENT) { + /* When the tun drive is missing, give a better message. */ + qemuReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Failed to add tap interface to bridge. " + "Your kernel is missing the 'tun' module or " + "CONFIG_TUN or you need to add the " + "/dev/net/tun device node.")); } else if (template_ifname) { virReportSystemError(err, _("Failed to add tap interface to bridge '%s'"), -- 1.7.2

2 1

[libvirt] [PATCH] build: rerun bootstrap if po/Makevars got nuked
by Eric Blake 05 Aug '10

05 Aug '10

There has been a frequent complaint of: make[2]: Entering directory `/home/remote/eblake/libvirt/po' make[2]: *** No rule to make target `/config.status', needed by `Makefile'. Stop. It happens after nuking and regenerating the po directory, which is a common action after running anything like 'make dist' or 'make rpm' that dirties all the .po files. Teach autogen.sh that it must regenerate po/Makevars to avoid the missing variable declaration, and teach cfg.mk to recognize that a nuked po directory is cause to rerun autogen.sh. * cfg.mk (_update_required): Check for po/Makevars. * autogen.sh (bootstrap): Run bootstrap if it got lost. Diagnosed by Justin Clift. --- Tested by 'git clean -x -f po && make'. A bit drastic (I prefer 'git checkout po' as the fastest way to undo local changes to the po directory caused by 'make dist', since that won't erase po/Makevars), but using that sledgehammer to clean po/ proves that this patch works. This should even work in a VPATH build :) autogen.sh | 8 ++++++-- cfg.mk | 1 + 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/autogen.sh b/autogen.sh index 2f5b42d..c0a1c4a 100755 --- a/autogen.sh +++ b/autogen.sh @@ -74,10 +74,14 @@ bootstrap_hash() # Ensure that whenever we pull in a gnulib update or otherwise change to a # different version (i.e., when switching branches), we also rerun ./bootstrap. +# Also, running 'make rpm' tends to litter the po/ directory, and some people +# like to run 'git clean -x -f po' to fix it; but only ./bootstrap regenerates +# the required file po/Makevars. curr_status=.git-module-status t=$(bootstrap_hash; git diff .gnulib) -if test "$t" = "$(cat $curr_status 2>/dev/null)"; then - : # good, it's up to date, all we need is autoreconf +if test "$t" = "$(cat $curr_status 2>/dev/null)" \ + && test -f "$THEDIR/po/Makevars"; then + # good, it's up to date, all we need is autoreconf autoreconf -if else echo running bootstrap... diff --git a/cfg.mk b/cfg.mk index e12265e..7226828 100644 --- a/cfg.mk +++ b/cfg.mk @@ -459,6 +459,7 @@ ifeq (0,$(MAKELEVEL)) # b653eda3ac4864de205419d9f41eec267cb89eeb _submodule_hash = sed 's/^[ +-]//;s/ .*//' _update_required := $(shell \ + test -f po/Makevars || { echo 1; exit; }; \ cd '$(srcdir)'; \ actual=$$(git submodule status | $(_submodule_hash); \ git hash-object bootstrap.conf; \ -- 1.7.2

2 2

[libvirt] NUMA cell?
by adrian wyssen 05 Aug '10

05 Aug '10

Hi, I have a question regarding the documentation of libvirt. There is a structure called 'virNodeInfo' and in the doc, you speak about NUMA cell. I was wondering what that is. And what do you understand by 'the number of threads per core'? Thank you for a quick response, since I need to write an explanation in a report until this evening. Have a good day!

2 1

[libvirt] Libvirt synchronous hooks
by Radek Hladik 05 Aug '10

05 Aug '10

I am trying Libvirt synchronous hooks and I would like to ask a question. I would like to use the machine start (qemu+kvm) hook to set up the storage for the machine. I already mentioned my setup in this mailing list but for now it is only important that VM storage is a md raid constructed from iSCSI disks. The VM's config is using simple file device: <disk type='file' device='disk'> <driver name='qemu' type=''/> <source file='/dev/disk/by-id/md-uuid-e464a51e:f61e98b4:bfe78010:bc810f04'/> <target dev='vda' bus='virtio'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x0'/> </disk> Stopping the array from stop hook works perfectly however it seems that on the startup the storage is checked before the hook is executed. At least I do get errors that the storage file (/dev/disk/by-id/md-uuid-....) does not exist and my hook is not called. I would say that I am hooking on wrong places that I should hook on storage startup/shutdown but as far as I know there are no hooks for storage drivers. Are there any plans in this area? Or is there any other way how to do it that I do not see? Radek

3 2

[libvirt] [PATCH v4 0/8]: Add arbitrary qemu command-line and monitor commands
by Chris Lalancette 05 Aug '10

05 Aug '10

As we discussed previously, here is the patch series to add the ability to specify arbitrary qemu command-line parameters and environment variables, and also give arbitrary monitor commands to a guest. Because these extra arguments have a good shot at confusing libvirt, the use of them is not supported, but left available for advanced users and developers. They are also in a separate library and have a separate on-the-wire protocol. There is one bug left that I have not yet been able to fix. Because of the complicated way that virsh parses command-line arguments, it is not possible to pass through spaces and quotes when using the qemu-monitor-command. Unfortunately, the qemu monitor commands (and in particular when using QMP) depend heavily on quoting and spacing, so using virsh to send through command-lines is difficult. I'll have to think about how to better resolve this issue, but it should not hold up the rest of the series. I will point out one particular patch that could use some careful review, namely PATCH 6/8. In there, I change the remote_message_hdr to use an int proc instead of a enum remote_procedure proc. Now, as far as I can tell the two sizes should be the same, so the wire protocol should be the same. Indeed, testing seems to show that older virsh can talk just fine to a libvirtd with these patches applied. However, the regenerated remote_protocol.c file for parsing remote_message_header has some strange bits in it that I don't quite understand. I'm hoping someone else can look at it and confirm that it is OK. Thanks to Dan Berrange and Eric Blake for their reviews already, and to DV for the Relax NG schema changes. Changes since v3 are listed in the individual patches.

7 26

[libvirt] [PATCH] Fix a memory leak in the qemudBuildCommandLine.
by Chris Lalancette 05 Aug '10

05 Aug '10

ADD_ARG_LIT should only be used for literal arguments, since it duplicates the memory. Since virBufferContentAndReset is already allocating memory, we should only use ADD_ARG. Signed-off-by: Chris Lalancette <clalance(a)redhat.com> --- src/qemu/qemu_conf.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index 172986e..d0655fd 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -4110,7 +4110,7 @@ int qemudBuildCommandLine(virConnectPtr conn, goto error; } - ADD_ARG_LIT(virBufferContentAndReset(&boot_buf)); + ADD_ARG(virBufferContentAndReset(&boot_buf)); } if (def->os.kernel) { -- 1.7.1.1

3 4

Re: [libvirt] [PATCH] Do not use boot=on on IDE device
by Antoine Mercadal 04 Aug '10

04 Aug '10

Hello, Just a feedback about this patch https://www.redhat.com/archives/libvir-list/2010-July/msg00691.html submitted by Daniel Veillard : It works like a charm. Before applying it, I wasn't able to start some windows XP guest on KVM using IDE drives. Cheers -- Antoine Mercadal (+33) 06 23 00 84 04 « Le mot liberté n'admet, par définition, aucune restriction. »

2 1

[libvirt] Release of libvirt-0.8.3
by Daniel Veillard 04 Aug '10

04 Aug '10

Nearly on time :-) It's available as usual from: ftp://libvirt.org/libvirt/ That's mostly a bug fix release exept for ESX 4.1 and vSphere support and the new APIs to allow easier hacking at the QEmu level. Features: - esx: Support vSphere 4.1 (Matthias Bolte) - Qemu arbitrary monitor commands. (Chris Lalancette) - Qemu Monitor API entry point. (Chris Lalancette) Documentation: - docs: Link wiki FAQ to main page (Cole Robinson) - Document the memory balloon device (Daniel P. Berrange) - man pages: update authors and copyright notice for libvirtd and virsh (Justin Clift) - Add openauth example to demonstrate a custom auth callback (Matthias Bolte) - docs: fix so generated .html files are removed with make clean (Justin Clift) - virsh: Fix man page syntax (Jiri Denemark) - html docs: added firewall explanation page by daniel berrange (Justin Clift) - libvirtd: add man page for libvirtd (Justin Clift) Portability: - Fix compile on i686. (Chris Lalancette) - daemon: dispatch.c should include stdio.h (and stdarg.h) (Ryota Ozaki) Bug fixes: - qemu: Fix PCI address allocation (Jiri Denemark) - Don't leak delay string when freeing virInterfaceBridgeDefs (Laine Stump) - qemu: don't lose error on setting monitor capabilities (Eric Blake) - Add iptables rule to fixup DHCP response checksum. (Laine Stump) - Fix the ACS checking in the PCI code. (Chris Lalancette) - Free up memballoon def. (Chris Lalancette) - Fix a bogus warning when parsing <hostdev> (Chris Lalancette) - Update ID after stopping a domain (Matthias Bolte) - openvzDomainCreateWithFlags: set domain id to the correct value (Jean-Baptiste Rouault) - xenapi: Update ID after starting a domain (Matthias Bolte) - esx: Update ID after starting a domain (Matthias Bolte) - Fix DMI uuid parsing. (Chris Lalancette) - Do not activate boot=on on devices when not using KVM (Daniel Veillard) - Fix a memory leak in the qemudBuildCommandLine. (Chris Lalancette) - esx: Fix freeing of heterogeneous lists (Matthias Bolte) - xen: fix logic bug (Eric Blake) - Eliminate memory leak in xenUnifiedDomainInfoListFree (Laine Stump) - lxc: Fix 'autostart' doesn't take effect actually (Ryota Ozaki) - Fix --with-xen-proxy related compile error (Matthias Bolte) - Fix a potential race in pciInitDevice. (Chris Lalancette) - Invert logic for checking for QEMU disk cache options (Daniel P. Berrange) - libvirt-guests: Don't throw errors if libvirtd is not installed (Jiri Denemark) - pciResetDevice: use inactive devices to determine safe reset (Chris Wright) - secaatest: Fix compilation (Matthias Bolte) - virt-aa-helper-test: Fix failure due to the new disk format probing option (Matthias Bolte) - virt-aa-helper: Make getopt accept the p option (Matthias Bolte) - virt-aa-helper: Fix return value of add_file_path (Matthias Bolte) - Fix SEGV on exit after domainEventDeregister() (Philipp Hahn) - pciSharesBusWithActive fails to find multiple devices on bus (Chris Wright) - Fix incorrect use of private data in remote driver (Daniel P. Berrange) - Set a stable & high MAC addr for guest TAP devices on host (Daniel P. Berrange) - Fix PCI address assignment if no IDE controller is present (Daniel P. Berrange) - lxc: force kill of init process by sending SIGKILL if needed (Ryota Ozaki) - Fix a NULL dereference in the case that the arg in question didn't exist. (Chris Lalancette) - Remove bogus free of static strings (Daniel P. Berrange) - Fix a deadlock in bi-directional p2p concurrent migration. (Chris Lalancette) - Make virsh setmaxmem balloon only when successful. (Chris Lalancette) - fsync new storage volumes even if new volume was copied. (Laine Stump) - Don't skip zero'ing end of volume file when inputvol is shorter than newvol (Laine Stump) - Always clear out the last_error in virshReportError. (Chris Lalancette) - CVE-2010-2242 Apply a source port mapping to virtual network masquerading (Daniel P. Berrange) - uml_driver: correct logic error in umlMonitorCommand (Jim Meyering) - qemuConnectMonitor: fix a bug that would have masked SELinux failure (Jim Meyering) - python: Fix IOErrorReasonCallback bindings (Cole Robinson) - cpuCompare: Fix crash on unexpected CPU XML (Jiri Denemark) - cpu: Fail when CPU type cannot be detected from XML (Jiri Denemark) - cpuCompare: Fix comparison of two host CPUs (Jiri Denemark) - Fix potential crash in QEMU monitor JSON impl (Daniel P. Berrange) Improvements: - OpenVZ: implement suspend/resume driver APIs (Jean-Baptiste Rouault) - esx: Set storage pool target path to host.mountInfo.path (Matthias Bolte) - esx: Make storage pool lookup by name and UUID more robust (Matthias Bolte) - esx: Restrict vpx:// to handle a single host in a vCenter (Matthias Bolte) - esx: Map some managed object types (Matthias Bolte) - esx: Parse the path of the URI (Matthias Bolte) - Make virsh -d check its input (Daniel Veillard) - esx: Switch from name to number checks in the subdrivers (Matthias Bolte) - esx: Improve blocked task detection and fix race condition (Matthias Bolte) - build: distribute libvirt_qemu.syms (Eric Blake) - build: restore operation of bit-rotted 'make cov' (Eric Blake) - qemu: virtio console support (Cole Robinson) - domain conf: Track <console> target type (Cole Robinson) - domain conf: char: Add an explicit targetType field (Cole Robinson) - domain conf: Rename character prop targetType -> deviceType (Cole Robinson) - docs: domain: Document virtio <channel> (Cole Robinson) - tests: Test qemuxml2xml when expected xml changes (Cole Robinson) - fix handling of PORT_PROFILE_RESPONSE_INPROGRESS netlink message (Gerhard Stenzel) - maint: turn on gcc logical-op checking (Eric Blake) - libvirt-guests: add reload, condrestart (Eric Blake) - libvirt-guests: enhance status (Eric Blake) - libvirt-guests: detect invalid arguments (Eric Blake) - qemu: Allow setting boot menu on/off (Cole Robinson) - qemu: Error on unsupported graphics config (Cole Robinson) - Force FLR on for buggy SR-IOV devices. (Chris Lalancette) - qemudDomainAttachHostPciDevice refactor to use new helpers (Chris Wright) - Add helpers qemuPrepareHostdevPCIDevice and qemuDomainReAttachHostdevDevices (Chris Wright) - qemuGetPciHostDeviceList take hostdev list directly (Chris Wright) - esx: Add vpx:// scheme to allow direct connection to a vCenter (Matthias Bolte) - esx: Don't ignore the vcenter query parameter (Matthias Bolte) - esx: Add autodetection for the SCSI controller model (Matthias Bolte) - esx: Allow 'vmpvscsi' as SCSI controller model (Matthias Bolte) - Add tests for the new Qemu namespace XML. (Chris Lalancette) - Qemu remote protocol. (Chris Lalancette) - Handle arbitrary qemu command-lines in qemuParseCommandLine. (Chris Lalancette) - Qemu arbitrary command-line arguments. (Chris Lalancette) - Add namespace callback hooks to domain_conf. (Chris Lalancette) - Remove erroneous setting of return value to errno. (Laine Stump) - Change virDirCreate to return -errno on failure. (Laine Stump) - Make virStorageBackendCopyToFD return -errno. (Laine Stump) - Change virFileOperation to return -errno (ie < 0) on error. (Laine Stump) - Re-arrange PCI device address assignment to match QEMU's default (Daniel P. Berrange) - Explicitly represent balloon device in XML and handle PCI address (Daniel P. Berrange) - Rearrange VGA/IDE controller address reservation (Daniel P. Berrange) - Use unsigned long in cmdSetmem. (Chris Lalancette) - Fix up inconsistent virsh option error reporting. (Chris Lalancette) - Use the extract backing store format in storage volume lookup (Daniel P. Berrange) - Rewrite qemu-img backing store format handling (Daniel P. Berrange) - Add ability to set a default driver name/type when parsing disks (Daniel P. Berrange) - Disable all disk probing in QEMU driver & add config option to re-enable (Daniel P. Berrange) - Pass security driver object into all security driver callbacks (Daniel P. Berrange) - Convert all disk backing store loops to shared helper API (Daniel P. Berrange) - Add an API for iterating over disk paths (Daniel P. Berrange) - Require format to be passed into virStorageFileGetMetadata (Daniel P. Berrange) - Refactor virStorageFileGetMetadataFromFD to separate functionality (Daniel P. Berrange) - Remove 'type' field from FileTypeInfo struct (Daniel P. Berrange) - Extract the backing store format as well as name, if available (Daniel P. Berrange) - RFC: Canonicalize block device paths (David Allan) - .gitignore: Ignore generated libvirtd docs (Cole Robinson) - esx: Make esxVI_*_Deserialize dynamically dispatched (Matthias Bolte) - qemu: Use -nodefconfig when probing for CPU models (Jiri Denemark) - Ensure we return the callback ID in python events binding (Daniel P. Berrange) - virsh: add new --details option to vol-list (Justin Clift) - Implement virsh managedsave-remove command. (Chris Lalancette) - cpu: Add new models from qemu's target-x86_64.conf (Jiri Denemark) - cpu: Add support for CPU vendor (Jiri Denemark) - cpuBaseline: Detect empty set of common features (Jiri Denemark) - cpuBaseline: Don't mess with the CPU returned by arch driver (Jiri Denemark) - Make html docs in non-srcdir build (Jiri Denemark) Cleanups: - Fix build error in virsh.c (Laine Stump) - Fix virsh error message when -d arg is not numeric (Eric Blake) - Fix a couple of typo in iSCSI backend (Aurelien ROUGEMONT) - Don't put a semicolon on the end of a VIR_ENUM_IMPL. (Chris Lalancette) - Remove duplicate from downloads.html.in (Matthias Bolte) - storage: kill dead stores (Eric Blake) - qemu: kill some dead stores (Eric Blake) - network: kill dead store (Eric Blake) - esx: silence spurious compiler warning (Eric Blake) - build: fix 'make syntax-check' failure (Eric Blake) - lxc: Fix return values of veth.c functions (Ryota Ozaki) - maint: fix comment typos (Eric Blake) - Fix up confusing indentation in qemudDomainAttachHostPciDevice. (Chris Lalancette) - build: fix VPATH builds (Eric Blake) - virt-aa-helper: Ignore open errors again (Matthias Bolte) - qemu-api: avoid build failure (Eric Blake) - Fix .mailmap after accidental wrong committer address (Daniel P. Berrange) - Remove inappropriate use of VIR_ERR_NO_SUPPORT (Daniel P. Berrange) - Remove unused and bitrotting vshCommandOptStringList (Chris Lalancette) - Remove error checking after using vshMalloc. (Chris Lalancette) - Remove the "showerror" parameter from vshConnectionUsability. (Chris Lalancette) - Eliminate compiler warning due to gettext string with no format args (Laine Stump) - Fix build by removing unknown pod2man flag (Daniel P. Berrange) Thanks everybody for the help on this release ! 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/

1 0

Re: [libvirt] [RHEL6 PATCH] Correct cpuid flags and "model" fields, V2
by john cooper 04 Aug '10

04 Aug '10

A question arose in today's kvm meeting concerning any impact to libvirt from this change. I've discussed it with Cole and it seems to be a non-issue. But just to err on the side of caution, here's a summary: The current cpu model definition of "qemu64" upstream is problematic from kvm's perspective such that we need to modify it slightly (BZ justifications listed below). Doing so we've left the qemu64 definition as-is, but added "cpu64-rhel6" and "cpu64-rhel5" models which are now selected by default via "-M <machine>", for "RHEL 6.0.0 PC" and "RHEL 5.x.y PC" respectively. So the only issue would be libvirt invoking qemu with neither a "-cpu" nor "-M" argument (which defaults to qemu64) or explicitly requesting "-cpu qemu64". >From my discussion with Cole it appears the use cases where this may happen fall outside of routine/expected usage and would need to be explicitly requested by the user. However I wanted to call this out here in the event we're overlooking something. Thanks, -john http://post-office.corp.redhat.com/archives/rhvirt-patches/2010-July/msg011… http://post-office.corp.redhat.com/archives/rhvirt-patches/2010-July/msg008… john cooper wrote: > Addresses BZs: > > #618332 - CPUID_EXT_POPCNT enabled in qemu64 and qemu32 built-in models. > #613892 - [SR-IOV]VF device can not start on 32bit Windows2008 SP2 > > Summary: > > CPU feature flags for several processor definitions require correction > to accurately reflect the corresponding shipped silicon. In particular > overly conservative values for cpuid "model" fields cause disable of > MSI support in windows guests (BZ #613892). Also recent upstream changes > of qemu64's built-in definition enables POPCNT (for the benefit of TCG) > but risks kvm migration breakage (BZ #618332). The following patch > address these issues collectively. > > Changes relative to previous version: > > - drop of the "qemu32-rhel5" model as it appears to be unneeded. > > - rename of "qemu64-rhel?" to "cpu64-rhel?" as we're diverging from > upstream qemu64's definition but haven't migrated to kvm64 quite yet. > > - Correction of several fields for the (now) cpu64-rhel5 model. > > Further detail may be found in the associated mail thread common to > both BZ cases starting about here: > > http://post-office.corp.redhat.com/archives/rhvirt-patches/2010-July/msg008… > > Brew Build: > > https://brewweb.devel.redhat.com/taskinfo?taskID=2643552 > > Upstream status: > > BZ #618332 is a local, interim change and doesn't relate to upstream > concerns. Longer-term this qemu64 derived model would be displaced > by kvm64. The update of cpu definitions (BZ #613892) however needs > to be pushed upstream upon validation in rhel6. We're currently the > sole users of the new cpu models which fosters this inverted process. -- john.cooper(a)redhat.com

2 1

[libvirt] [PATCH] qemu: Fix PCI address allocation
by Jiri Denemark 04 Aug '10

04 Aug '10

When attaching a PCI device which doesn't explicitly set its PCI address, libvirt allocates the address automatically. The problem is that when checking which PCI address is unused, we only check for those with slot number higher than the highest slot number ever used. Thus attaching/detaching such device several times in a row (31 is the theoretical limit, less then 30 tries are enough in practise) makes any further device attachment fail. Furthermore, attaching a device with predefined PCI address to 0:0:31 immediately forbids attachment of any PCI device without explicit address. This patch changes the logic so that we always check all PCI addresses before we say there is no PCI address available. --- src/qemu/qemu_conf.c | 14 ++++---------- 1 files changed, 4 insertions(+), 10 deletions(-) diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index 57bc02f..eaebcc1 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -2055,8 +2055,6 @@ qemuAssignDeviceAliases(virDomainDefPtr def, unsigned long long qemuCmdFlags) #define QEMU_PCI_ADDRESS_LAST_SLOT 31 struct _qemuDomainPCIAddressSet { virHashTablePtr used; - int nextslot; - /* XXX add domain, bus later when QEMU allows > 1 */ }; @@ -2148,9 +2146,6 @@ int qemuDomainPCIAddressReserveAddr(qemuDomainPCIAddressSetPtr addrs, return -1; } - if (dev->addr.pci.slot > addrs->nextslot) - addrs->nextslot = dev->addr.pci.slot + 1; - return 0; } @@ -2217,7 +2212,7 @@ int qemuDomainPCIAddressSetNextAddr(qemuDomainPCIAddressSetPtr addrs, { int i; - for (i = addrs->nextslot ; i <= QEMU_PCI_ADDRESS_LAST_SLOT ; i++) { + for (i = 0 ; i <= QEMU_PCI_ADDRESS_LAST_SLOT ; i++) { virDomainDeviceInfo maybe; char *addr; @@ -2228,13 +2223,14 @@ int qemuDomainPCIAddressSetNextAddr(qemuDomainPCIAddressSetPtr addrs, addr = qemuPCIAddressAsString(&maybe); - VIR_DEBUG("Allocating PCI addr %s", addr); - if (virHashLookup(addrs->used, addr)) { + VIR_DEBUG("PCI addr %s already in use", addr); VIR_FREE(addr); continue; } + VIR_DEBUG("Allocating PCI addr %s", addr); + if (virHashAddEntry(addrs->used, addr, addr) < 0) { VIR_FREE(addr); return -1; @@ -2245,8 +2241,6 @@ int qemuDomainPCIAddressSetNextAddr(qemuDomainPCIAddressSetPtr addrs, dev->addr.pci.bus = 0; dev->addr.pci.slot = i; - addrs->nextslot = i + 1; - return 0; } -- 1.7.2

4 6

[libvirt] [PATCH] OpenVZ: implement suspend/resume driver APIs
by Jean-Baptiste Rouault 04 Aug '10

04 Aug '10

--- src/openvz/openvz_driver.c | 84 ++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 82 insertions(+), 2 deletions(-) diff --git a/src/openvz/openvz_driver.c b/src/openvz/openvz_driver.c index e5bbdd0..bdc0e92 100644 --- a/src/openvz/openvz_driver.c +++ b/src/openvz/openvz_driver.c @@ -503,6 +503,86 @@ static void openvzSetProgramSentinal(const char **prog, const char *key) } } +static int openvzDomainSuspend(virDomainPtr dom) { + struct openvz_driver *driver = dom->conn->privateData; + virDomainObjPtr vm; + const char *prog[] = {VZCTL, "--quiet", "chkpnt", PROGRAM_SENTINAL, "--suspend", NULL}; + int ret = -1; + + openvzDriverLock(driver); + vm = virDomainFindByUUID(&driver->domains, dom->uuid); + openvzDriverUnlock(driver); + + if (!vm) { + openvzError(VIR_ERR_INVALID_DOMAIN, "%s", + _("no domain with matching uuid")); + goto cleanup; + } + + if (!virDomainObjIsActive(vm)) { + openvzError(VIR_ERR_OPERATION_INVALID, "%s", + _("Domain is not running")); + goto cleanup; + } + + if (vm->state != VIR_DOMAIN_PAUSED) { + openvzSetProgramSentinal(prog, vm->def->name); + if (virRun(prog, NULL) < 0) { + openvzError(VIR_ERR_OPERATION_FAILED, "%s", + _("Suspend operation failed")); + goto cleanup; + } + vm->state = VIR_DOMAIN_PAUSED; + } + + ret = 0; + +cleanup: + if (vm) + virDomainObjUnlock(vm); + return ret; +} + +static int openvzDomainResume(virDomainPtr dom) { + struct openvz_driver *driver = dom->conn->privateData; + virDomainObjPtr vm; + const char *prog[] = {VZCTL, "--quiet", "chkpnt", PROGRAM_SENTINAL, "--resume", NULL}; + int ret = -1; + + openvzDriverLock(driver); + vm = virDomainFindByUUID(&driver->domains, dom->uuid); + openvzDriverUnlock(driver); + + if (!vm) { + openvzError(VIR_ERR_INVALID_DOMAIN, "%s", + _("no domain with matching uuid")); + goto cleanup; + } + + if (!virDomainObjIsActive(vm)) { + openvzError(VIR_ERR_OPERATION_INVALID, "%s", + _("Domain is not running")); + goto cleanup; + } + + if (vm->state == VIR_DOMAIN_PAUSED) { + openvzSetProgramSentinal(prog, vm->def->name); + if (virRun(prog, NULL) < 0) { + openvzError(VIR_ERR_OPERATION_FAILED, "%s", + _("Resume operation failed")); + goto cleanup; + } + vm->state = VIR_DOMAIN_RUNNING; + } + + ret = 0; + +cleanup: + if (vm) + virDomainObjUnlock(vm); + return ret; +} + static int openvzDomainShutdown(virDomainPtr dom) { struct openvz_driver *driver = dom->conn->privateData; virDomainObjPtr vm; @@ -1491,8 +1571,8 @@ static virDriver openvzDriver = { openvzDomainLookupByID, /* domainLookupByID */ openvzDomainLookupByUUID, /* domainLookupByUUID */ openvzDomainLookupByName, /* domainLookupByName */ - NULL, /* domainSuspend */ - NULL, /* domainResume */ + openvzDomainSuspend, /* domainSuspend */ + openvzDomainResume, /* domainResume */ openvzDomainShutdown, /* domainShutdown */ openvzDomainReboot, /* domainReboot */ openvzDomainShutdown, /* domainDestroy */ -- 1.7.0.4

2 1

[libvirt] [PATCH] Don't leak delay string when freeing virInterfaceBridgeDefs
by Laine Stump 03 Aug '10

03 Aug '10

I noticed this while looking into checking the default bridge delay to 0. --- src/conf/interface_conf.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/src/conf/interface_conf.c b/src/conf/interface_conf.c index 6430f7a..b24526f 100644 --- a/src/conf/interface_conf.c +++ b/src/conf/interface_conf.c @@ -84,6 +84,7 @@ void virInterfaceDefFree(virInterfaceDefPtr def) switch (def->type) { case VIR_INTERFACE_TYPE_BRIDGE: + VIR_FREE(def->data.bridge.delay); for (i = 0;i < def->data.bridge.nbItf;i++) { if (def->data.bridge.itf[i] == NULL) break; /* to cope with half parsed data on errors */ -- 1.7.2

2 1

[libvirt] [PATCH] Fix build error in virsh.c
by Laine Stump 03 Aug '10

03 Aug '10

I just pushed this under the trivial rule... Another gettext string with no format args sent to printf as a format string. --- tools/virsh.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index 2ccf08b..c0ee3ee 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -11022,7 +11022,7 @@ vshParseArgv(vshControl *ctl, int argc, char **argv) switch (arg) { case 'd': if (virStrToLong_i(optarg, NULL, 10, &ctl->debug) < 0) { - vshError(ctl, _("option -d takes a numeric argument")); + vshError(ctl, "%s", _("option -d takes a numeric argument")); exit(EXIT_FAILURE); } break; -- 1.7.2

1 0

Re: [libvirt] [virt-tools-list] Add a manually configured XEN
by Michal Novotny 03 Aug '10

03 Aug '10

Hi, I can see the point Bernhard. It seems that libvirt is not aware of this guest. Well, if virsh (part of libvirt) is seeing the guest only then the guest is running then you need to create a configuration for that in the libvirt itself. I know there's something like: virsh domxml-from-native <format> <config> but I never used it so I don't know about the config and format and how does it work. Please try asking the libvirt guys on the libvirt list (I put this list in CC now). Michal On 08/03/2010 02:59 PM, Bernhard Suttner wrote: > Hi, > > manually means, I did not use virt-install or the virt-manager to add the XEN domU to the dom0. I set it up manually (created configuration manually, added disk images and so on manually, ....). > > virsh list --all does show the domU BUT only if I start it manually with xm create domU. If the domU does not run, it does not appear. Other virtual manchines (domU) which I created with virt-manager or virt-install do also appear, if the domU is currently not up (stopped). > > Best regards, > Bernhard > > -----Ursprüngliche Nachricht----- > Von: Michal Novotny [mailto:minovotn@redhat.com] > Gesendet: Dienstag, 3. August 2010 14:17 > An: Bernhard Suttner > Cc: virt-tools-list(a)redhat.com > Betreff: Re: AW: [virt-tools-list] Add a manually configured XEN > > On 08/03/2010 02:14 PM, Bernhard Suttner wrote: > >> Hi, >> >> thanks. But this did not work. I think, this option does only connect to another dom0 - means, to another xen host system. I want, that virt-manager does show the domU (the guest) of the local xen installation which I manually added to this system. >> >> > Why do you mean that is manually added to the system? Does `virsh list > --all` show the guest? > > Regards, > Michal > > >> Best regards, >> Bernhard >> >> -----Ursprüngliche Nachricht----- >> Von: Michal Novotny [mailto:minovotn@redhat.com] >> Gesendet: Dienstag, 3. August 2010 10:51 >> An: Bernhard Suttner >> Cc: virt-tools-list(a)redhat.com >> Betreff: Re: [virt-tools-list] Add a manually configured XEN >> >> Hi Bernhard, >> I'm not the expert but when you start virt-manager you can go to the >> File -> Add connection and add the connection there. The connection >> should be persistent and just connecting to it should fail when xend is >> not running AFAIK. >> >> Hope this helps, >> Michal >> >> On 08/02/2010 09:13 PM, Bernhard Suttner wrote: >> >> >>> Hi, >>> >>> I am using XEN and the virt-manager (which use libvirt). I have configured the XEN domU manually within the shell. If I start the domU with xm create config then the virtual machine appears in the virt-manager. If I stop the XEN it will disappear. How could I add the XEN to the virt-manager like all the other (with virt-manager) created domU that I have it listed with the virt-manager and could start it from GUI? >>> >>> Best regards, >>> Bernhard Suttner >>> >>> _______________________________________________ >>> virt-tools-list mailing list >>> virt-tools-list(a)redhat.com >>> https://www.redhat.com/mailman/listinfo/virt-tools-list >>> >>> >>> >> >> > > -- Michal Novotny<minovotn(a)redhat.com>, RHCE Virtualization Team (xen userspace), Red Hat

1 0

[libvirt] [PATCH] [RFC] ISCSI transport protocol support in libvirt
by Aurelien ROUGEMONT 03 Aug '10

03 Aug '10

Hi everyone, This my first post on this list Context : Some days ago I have decided to use infiniband for ISCSI streams. Infiniband adds a new wonderful transport protocol : ISER. This protocols is added to the well known the default TCP. (NB: ISER = ISCSI + RDMA). I could not see any ISCSI transport protocol modification support in libivirt (the default protocol tcp is even hardcoded in the regex) What i have done : - did the shell testing for the iscsiadm - the attached patch that corrects 2 typos in the original code and switches completely the iscsi transport protocol from tcp to iser (which is not ideal at all) What should be done (imho): - add iscsi transport protocol support (using my patch as a basis) - add a new XML property/whatever_fits_the_projects_policy to the storagepool object that allows user to pick the iscsi transport protocol (default is tcp) I was thinking of having something like : <pool type="iscsi"> <name>volumename</name> <source> <host name="1.2.3.4"/> <device path="IQNOFTARGET"/> <transport protocol="iser"/> </source> <target> <path>/dev/disk/by-path</path> </target> </pool> Any comment on this ? Any help on the XML part ? Best regards, Aurélien NB: the current iscsi transport protocols available are : tcp(default), iser, qla4xxx, bnx2, and icxgb3i. PS: i'm still doing extensive testing of my patch !DSPAM:4c46f49d90977882820711!

2 2

Re: [libvirt] Extensions to the libvirt Storage API
by Shyam Iyer 03 Aug '10

03 Aug '10

On 07/28/2010 01:24 PM, Daniel P. Berrange wrote: > > >>>> > >>>> > >>> We explicitly don't support external driver plugins in libvirt for a > >>> couple of reasons > >>> > >>> - We don't want to support use of closed source plugins > >>> - We don't want to guarentee stability of any aspect of > >>> libvirt's internal API > >>> > >>> We would like to see support for the various vendor specific iSCSI > >>> extensions to allow volume creation/deletion, but want that code to > >>> be part of the libvirt codebase. > >>> The APIs can also invoke standard snmpget/set methods to talk to the target. All standard distributions ship with a net-snmp implementation. Would an implementation of the APIs that invokes snmpset/gets be an amenable solution? > Namespace clash ! The virDomainSnapshot APIs are per-hypervisor. They > do snapshotting of the guest VM (including its storage). > > I was actually just talking about the storage backends though which > can do snapshots independently of any hypervisor. See > the<backingstorage> > element here: > > http://libvirt.org/formatstorage.html#StorageVolBacking > > This is already implemented with the LVM pool doing LVM snapshots. We > also use it for external qcow2 backing files. > There are certain benefits of allowing snapshots/backup to happen in the storage and thereby save CPU cycles. It becomes even more visible with large TB storage where in a simple qcow2 backup copy could take a long time.

1 0