- Devel - libvirt List Archives

[libvirt] [PATCH] storage: Refresh pool after creating volume
by Osier Yang 06 Jun '13

06 Jun '13

https://bugzilla.redhat.com/show_bug.cgi?id=965442 One has to refresh the pool to get the correct pool info, this patch refreshes the pool after creating a volume in code instead. Pool refreshing failure is fine to ignore with a warning. --- src/storage/storage_driver.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c index a2b0c21..2a55095 100644 --- a/src/storage/storage_driver.c +++ b/src/storage/storage_driver.c @@ -1443,6 +1443,9 @@ storageVolCreateXML(virStoragePoolPtr obj, } + if (backend->refreshPool && backend->refreshPool(obj->conn, pool) < 0) + VIR_WARN("Failed to refresh pool after creating volume"); + VIR_INFO("Creating volume '%s' in storage pool '%s'", volobj->name, pool->def->name); ret = volobj; @@ -1606,6 +1609,9 @@ storageVolCreateXMLFrom(virStoragePoolPtr obj, goto cleanup; } + if (backend->refreshPool && backend->refreshPool(obj->conn, pool) < 0) + VIR_WARN("Failed to refresh pool after creating volume"); + VIR_INFO("Creating volume '%s' in storage pool '%s'", volobj->name, pool->def->name); ret = volobj; -- 1.8.1.4

4 9

[libvirt] [PATCHv2] storage: Avoid unnecessary ternary operators and refactor the code
by Peter Krempa 06 Jun '13

06 Jun '13

Setting of local variables in virStorageBackendCreateQemuImgCmd was unnecessarily cluttered with ternary operators and repeated testing of of conditions. This patch refactors the function to use if statements and improves error reporting in case inputvol is specified but does not contain target path. Previously we would complain about "unknown storage vol type 0" instead of the actual problem. --- Notes: Version 2: - retured preallocation check that was removed by mistake - returned backing store check to the correct condition - improve error reporting src/storage/storage_backend.c | 69 ++++++++++++++++++++++--------------------- 1 file changed, 36 insertions(+), 33 deletions(-) diff --git a/src/storage/storage_backend.c b/src/storage/storage_backend.c index 5a61381..4d90d52 100644 --- a/src/storage/storage_backend.c +++ b/src/storage/storage_backend.c @@ -663,53 +663,58 @@ virStorageBackendCreateQemuImgCmd(virConnectPtr conn, virCommandPtr cmd = NULL; bool do_encryption = (vol->target.encryption != NULL); unsigned long long int size_arg; - bool preallocate = false; - - /* Treat output block devices as 'raw' format */ - const char *type = - virStorageFileFormatTypeToString(vol->type == VIR_STORAGE_VOL_BLOCK ? - VIR_STORAGE_FILE_RAW : - vol->target.format); - - const char *backingType = vol->backingStore.path ? - virStorageFileFormatTypeToString(vol->backingStore.format) : NULL; - - const char *inputBackingPath = (inputvol ? inputvol->backingStore.path - : NULL); - const char *inputPath = inputvol ? inputvol->target.path : NULL; - /* Treat input block devices as 'raw' format */ - const char *inputType = inputPath ? - virStorageFileFormatTypeToString(inputvol->type == VIR_STORAGE_VOL_BLOCK ? - VIR_STORAGE_FILE_RAW : - inputvol->target.format) : - NULL; + bool preallocate = !!(flags & VIR_STORAGE_VOL_CREATE_PREALLOC_METADATA); + const char *type; + const char *backingType = NULL; + const char *inputPath = NULL; + const char *inputType = NULL; virCheckFlags(VIR_STORAGE_VOL_CREATE_PREALLOC_METADATA, NULL); - preallocate = !!(flags & VIR_STORAGE_VOL_CREATE_PREALLOC_METADATA); + /* Treat output block devices as 'raw' format */ + type = virStorageFileFormatTypeToString(vol->type == VIR_STORAGE_VOL_BLOCK ? + VIR_STORAGE_FILE_RAW : + vol->target.format); - if (type == NULL) { + if (!type) { virReportError(VIR_ERR_INTERNAL_ERROR, _("unknown storage vol type %d"), vol->target.format); return NULL; } - if (inputvol && inputType == NULL) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("unknown storage vol type %d"), - inputvol->target.format); - return NULL; - } + if (preallocate && vol->target.format != VIR_STORAGE_FILE_QCOW2) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("metadata preallocation only available with qcow2")); return NULL; } + if (inputvol) { + if (!(inputPath = inputvol->target.path)) { + virReportError(VIR_ERR_INVALID_ARG, "%s", + _("missing target volume path")); + return NULL; + } + + inputType = virStorageFileFormatTypeToString(inputvol->type == VIR_STORAGE_VOL_BLOCK ? + VIR_STORAGE_FILE_RAW : + inputvol->target.format); + + if (!inputType) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("unknown storage vol type %d"), + inputvol->target.format); + return NULL; + } + + } + if (vol->backingStore.path) { int accessRetCode = -1; char *absolutePath = NULL; + backingType = virStorageFileFormatTypeToString(vol->backingStore.format); + if (preallocate) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("metadata preallocation conflicts with backing" @@ -722,11 +727,9 @@ virStorageBackendCreateQemuImgCmd(virConnectPtr conn, * may cause issues with lvm. Untested essentially. */ if (inputvol && - (!inputBackingPath || - STRNEQ(inputBackingPath, vol->backingStore.path))) { - virReportError(VIR_ERR_INTERNAL_ERROR, - "%s", _("a different backing store cannot " - "be specified.")); + STRNEQ_NULLABLE(inputvol->backingStore.path, vol->backingStore.path)) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("a different backing store cannot be specified.")); return NULL; } -- 1.8.2.1

2 2

[libvirt] [PATCH] iscsi: support IPv6 targets
by Ján Tomko 06 Jun '13

06 Jun '13

Instead of resolving the host as IPv4 and only using the first result, resolve it as IPv6 as well and use the first address we've succesfully connected to as the portal name. --- src/libvirt_private.syms | 1 + src/storage/storage_backend_iscsi.c | 64 +++++---------------------- src/util/virutil.c | 87 +++++++++++++++++++++++++++++++++++++ src/util/virutil.h | 4 ++ 4 files changed, 102 insertions(+), 54 deletions(-) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 9d5f74b..26c4553 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1931,6 +1931,7 @@ virEnumFromString; virEnumToString; virFindFCHostCapableVport; virFormatIntDecimal; +virGetConnectableIPAsString; virGetDeviceID; virGetDeviceUnprivSGIO; virGetFCHostNameByWWN; diff --git a/src/storage/storage_backend_iscsi.c b/src/storage/storage_backend_iscsi.c index ad38ab2..f98fbce 100644 --- a/src/storage/storage_backend_iscsi.c +++ b/src/storage/storage_backend_iscsi.c @@ -1,7 +1,7 @@ /* * storage_backend_iscsi.c: storage backend for iSCSI handling * - * Copyright (C) 2007-2008, 2010-2012 Red Hat, Inc. + * Copyright (C) 2007-2008, 2010-2013 Red Hat, Inc. * Copyright (C) 2007-2008 Daniel P. Berrange * * This library is free software; you can redistribute it and/or @@ -44,58 +44,16 @@ #include "vircommand.h" #include "virrandom.h" #include "virstring.h" +#include "virutil.h" #define VIR_FROM_THIS VIR_FROM_STORAGE -static int -virStorageBackendISCSITargetIP(const char *hostname, - char *ipaddr, - size_t ipaddrlen) -{ - struct addrinfo hints; - struct addrinfo *result = NULL; - int ret; - - memset(&hints, 0, sizeof(hints)); - hints.ai_flags = AI_ADDRCONFIG; - hints.ai_family = AF_INET; - hints.ai_socktype = SOCK_STREAM; - hints.ai_protocol = 0; - - ret = getaddrinfo(hostname, NULL, &hints, &result); - if (ret != 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("host lookup failed %s"), - gai_strerror(ret)); - return -1; - } - - if (result == NULL) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("no IP address for target %s"), - hostname); - return -1; - } - - if (getnameinfo(result->ai_addr, result->ai_addrlen, - ipaddr, ipaddrlen, NULL, 0, - NI_NUMERICHOST) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("cannot format ip addr for %s"), - hostname); - freeaddrinfo(result); - return -1; - } - - freeaddrinfo(result); - return 0; -} - static char * virStorageBackendISCSIPortal(virStoragePoolSourcePtr source) { - char ipaddr[NI_MAXHOST]; - char *portal; + char *ip; + char *portal = NULL; + int port; if (source->nhost != 1) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", @@ -103,17 +61,15 @@ virStorageBackendISCSIPortal(virStoragePoolSourcePtr source) return NULL; } - if (virStorageBackendISCSITargetIP(source->hosts[0].name, - ipaddr, sizeof(ipaddr)) < 0) + port = source->hosts[0].port ? source->hosts[0].port : 3260; + + if (!(ip = virGetConnectableIPAsString(source->hosts[0].name, port))) return NULL; - if (virAsprintf(&portal, "%s:%d,1", ipaddr, - source->hosts[0].port ? - source->hosts[0].port : 3260) < 0) { + if (virAsprintf(&portal, "%s,1", ip) < 0) virReportOOMError(); - return NULL; - } + VIR_FREE(ip); return portal; } diff --git a/src/util/virutil.c b/src/util/virutil.c index 028f1d1..d8400db 100644 --- a/src/util/virutil.c +++ b/src/util/virutil.c @@ -650,6 +650,93 @@ cleanup: return result; } +/* + * Resolve 'host' and return the first address we've connected to + * as a string: + * address:port + * for IPv4 addresses and + * [address]:port + * for IPv6 addresses. + */ +char * +virGetConnectableIPAsString(const char *host, + int port) +{ + struct addrinfo hints; + struct addrinfo *res, *rp; + int saved_errno = EINVAL; + char *ret = NULL; + char *buf = NULL; + char *portstr = NULL; + int rc; + + if (VIR_ALLOC_N(buf, NI_MAXHOST) < 0) + goto no_memory; + + if (virAsprintf(&portstr, "%d", port) < 0) + goto no_memory; + + memset(&hints, 0, sizeof(hints)); + hints.ai_socktype = SOCK_STREAM; + hints.ai_flags = AI_ADDRCONFIG; + + if ((rc = getaddrinfo(host, portstr, &hints, &res))) { + virReportError(VIR_ERR_UNKNOWN_HOST, + _("unable to resolve '%s': %s"), + host, gai_strerror(rc)); + goto cleanup; + } + + for (rp = res; rp; rp = rp->ai_next) { + int sockfd; + + sockfd = socket(rp->ai_family, rp->ai_socktype, rp->ai_protocol); + if (sockfd == -1) { + saved_errno = errno; + continue; + } + if (connect(sockfd, rp->ai_addr, rp->ai_addrlen) != -1) { + VIR_FORCE_CLOSE(sockfd); + break; + } + saved_errno = errno; + VIR_FORCE_CLOSE(sockfd); + } + + if (!rp) { + virReportSystemError(saved_errno, + _("unable to connect to '%s:%s'"), + host, portstr); + goto cleanup; + } + + if ((rc = getnameinfo(rp->ai_addr, rp->ai_addrlen, buf, NI_MAXHOST, + NULL, 0, NI_NUMERICHOST)) < 0) { + virReportError(VIR_ERR_SYSTEM_ERROR, + _("Cannot convert IP address to string: %s"), + gai_strerror(rc)); + goto cleanup; + } + + if (rp->ai_family == AF_INET6) { + if (virAsprintf(&ret, "[%s]:%d", buf, port) < 0) + goto no_memory; + } else if (virAsprintf(&ret, "%s:%d", buf, port) < 0) { + goto no_memory; + } + +cleanup: + if (res) + freeaddrinfo(res); + VIR_FREE(buf); + VIR_FREE(portstr); + return ret; + +no_memory: + virReportOOMError(); + goto cleanup; +} + #ifdef HAVE_GETPWUID_R enum { VIR_USER_ENT_DIRECTORY, diff --git a/src/util/virutil.h b/src/util/virutil.h index 280a18d..93f4007 100644 --- a/src/util/virutil.h +++ b/src/util/virutil.h @@ -27,8 +27,10 @@ # include "verify.h" # include "internal.h" +# include <netdb.h> # include <unistd.h> # include <sys/select.h> +# include <sys/socket.h> # include <sys/types.h> # ifndef MIN @@ -108,6 +110,8 @@ static inline int getgid (void) { return 0; } # endif char *virGetHostname(void); +char *virGetConnectableIPAsString(const char *host, + int port); char *virGetUserDirectory(void); char *virGetUserConfigDirectory(void); -- 1.8.1.5

2 1

[libvirt] [PATCH] Fix code coverage issue in OpenVZ driver
by Alvaro Polo 06 Jun '13

06 Jun '13

After fixing an invalid usage of virDomainNetDef in OpenVZ driver, a coverage issue appeared. This was caused by a still invalid usage of net->data.ethernet.dev for non ethernet networking. --- src/openvz/openvz_driver.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/openvz/openvz_driver.c b/src/openvz/openvz_driver.c index db738a4..d8abe9c 100644 --- a/src/openvz/openvz_driver.c +++ b/src/openvz/openvz_driver.c @@ -859,7 +859,7 @@ openvzDomainSetNetwork(virConnectPtr conn, const char *vpsid, /* if user doesn't specified host interface name, * than we need to generate it */ if (net->ifname == NULL) { - net->ifname = openvzGenerateVethName(veid, net->data.ethernet.dev); + net->ifname = openvzGenerateVethName(veid, guest_ifname); if (net->ifname == NULL) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Could not generate veth name")); -- 1.7.12.4 (Apple Git-37)

2 1

[libvirt] [PATCH] LXC: fix order in virProcessGetNamespaces
by Richard Weinberger 06 Jun '13

06 Jun '13

virProcessGetNamespaces() opens files in /proc/XXX/ns/ which will later be passed to setns(). We have to make sure that the file descriptors in the array are in the correct order. Otherwise setns() may fail. The order has been taken from util-linux's sys-utils/nsenter.c Signed-off-by: Richard Weinberger <richard(a)nod.at> --- src/util/virprocess.c | 33 ++++++++++----------------------- 1 file changed, 10 insertions(+), 23 deletions(-) diff --git a/src/util/virprocess.c b/src/util/virprocess.c index bc028d7..fce0d46 100644 --- a/src/util/virprocess.c +++ b/src/util/virprocess.c @@ -513,11 +513,11 @@ int virProcessGetNamespaces(pid_t pid, int **fdlist) { int ret = -1; - DIR *dh = NULL; struct dirent *de; char *nsdir = NULL; char *nsfile = NULL; - size_t i; + char *ns_files[] = { "user", "ipc", "uts", "net", "pid", "mnt", NULL }; + size_t i = 0; *nfdlist = 0; *fdlist = NULL; @@ -528,45 +528,32 @@ int virProcessGetNamespaces(pid_t pid, goto cleanup; } - if (!(dh = opendir(nsdir))) { - virReportSystemError(errno, - _("Cannot read directory %s"), - nsdir); - goto cleanup; - } - - while ((de = readdir(dh))) { + while (ns_files[i]) { int fd; - if (de->d_name[0] == '.') - continue; - - if (VIR_EXPAND_N(*fdlist, *nfdlist, 1) < 0) { + if (virAsprintf(&nsfile, "%s/%s", nsdir, ns_files[i]) < 0) { virReportOOMError(); goto cleanup; } - if (virAsprintf(&nsfile, "%s/%s", nsdir, de->d_name) < 0) { - virReportOOMError(); - goto cleanup; + if ((fd = open(nsfile, O_RDWR)) < 0) { + goto next; } - if ((fd = open(nsfile, O_RDWR)) < 0) { - virReportSystemError(errno, - _("Unable to open %s"), - nsfile); + if (VIR_EXPAND_N(*fdlist, *nfdlist, 1) < 0) { + virReportOOMError(); goto cleanup; } (*fdlist)[(*nfdlist)-1] = fd; +next: VIR_FREE(nsfile); + i++; } ret = 0; cleanup: - if (dh) - closedir(dh); VIR_FREE(nsdir); VIR_FREE(nsfile); if (ret < 0) { -- 1.8.3

2 4

[libvirt] [PATCH v2] qemu: Report the offset from host UTC for RTC_CHANGE event
by Osier Yang 06 Jun '13

06 Jun '13

https://bugzilla.redhat.com/show_bug.cgi?id=964177 Though both libvirt and QEMU's document say RTC_CHANGE returns the offset from the host UTC, qemu actually returns the offset from the specified date instead when specific date is provided (-rtc base=$date). It's not safe for qemu to fix it in code, it worked like that for 3 years, changing it now may break other QEMU use cases. What qemu tries to do is to fix the document: http://lists.gnu.org/archive/html/qemu-devel/2013-05/msg04782.html And in libvirt side, instead of reply on the qemu, this convert the offset returned from qemu to the offset from host UTC, by: /* * a: the offset from qemu RTC_CHANGE event * b: The specified date (-rtc base=$date) * c: the host date when libvirt gets the RTC_CHANGE event * offset: What libvirt will report */ offset = a + (b - c); The specified date (-rtc base=$date) is recorded in clock's def as an internal only member (may be useful to exposed outside?). Internal only XML tag "starttime" is introduced to not lose the domain process's starttime after libvirt restarting/reloading: <clock offset='variable' adjustment='304' basis='utc' starttime='1370423588'/> --- src/conf/domain_conf.c | 27 +++++++++++++++++++++++---- src/conf/domain_conf.h | 3 +++ src/qemu/qemu_command.c | 3 +++ src/qemu/qemu_process.c | 13 +++++++++++++ 4 files changed, 42 insertions(+), 4 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index a16ebd1..7773abf 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -96,6 +96,7 @@ typedef enum { VIR_DOMAIN_XML_INTERNAL_PCI_ORIG_STATES = (1<<18), VIR_DOMAIN_XML_INTERNAL_ALLOW_ROM = (1<<19), VIR_DOMAIN_XML_INTERNAL_ALLOW_BOOT = (1<<20), + VIR_DOMAIN_XML_INTERNAL_STARTTIME = (1 << 21) } virDomainXMLInternalFlags; VIR_ENUM_IMPL(virDomainTaint, VIR_DOMAIN_TAINT_LAST, @@ -11193,6 +11194,16 @@ virDomainDefParseXML(xmlDocPtr xml, break; } + if (def->clock.offset == VIR_DOMAIN_CLOCK_OFFSET_VARIABLE && + flags & VIR_DOMAIN_XML_INTERNAL_STARTTIME) { + if (virXPathULongLong("number(./clock/@starttime)", ctxt, + &def->clock.data.variable.starttime) < 0) { + virReportError(VIR_ERR_XML_ERROR, "%s", + _("invalid starttime")); + goto error; + } + } + if ((n = virXPathNodeSet("./clock/timer", ctxt, &nodes)) < 0) goto error; @@ -15788,7 +15799,8 @@ virDomainResourceDefFormat(virBufferPtr buf, verify(((VIR_DOMAIN_XML_INTERNAL_STATUS | VIR_DOMAIN_XML_INTERNAL_ACTUAL_NET | - VIR_DOMAIN_XML_INTERNAL_PCI_ORIG_STATES) + VIR_DOMAIN_XML_INTERNAL_PCI_ORIG_STATES | + VIR_DOMAIN_XML_INTERNAL_STARTTIME) & DUMPXML_FLAGS) == 0); /* This internal version can accept VIR_DOMAIN_XML_INTERNAL_*, @@ -15810,7 +15822,8 @@ virDomainDefFormatInternal(virDomainDefPtr def, virCheckFlags(DUMPXML_FLAGS | VIR_DOMAIN_XML_INTERNAL_STATUS | VIR_DOMAIN_XML_INTERNAL_ACTUAL_NET | - VIR_DOMAIN_XML_INTERNAL_PCI_ORIG_STATES, + VIR_DOMAIN_XML_INTERNAL_PCI_ORIG_STATES | + VIR_DOMAIN_XML_INTERNAL_STARTTIME, -1); if (!(type = virDomainVirtTypeToString(def->virtType))) { @@ -16208,6 +16221,10 @@ virDomainDefFormatInternal(virDomainDefPtr def, virBufferAsprintf(buf, " adjustment='%lld' basis='%s'", def->clock.data.variable.adjustment, virDomainClockBasisTypeToString(def->clock.data.variable.basis)); + + if (flags & VIR_DOMAIN_XML_INTERNAL_STARTTIME) + virBufferAsprintf(buf, " starttime='%llu'", + def->clock.data.variable.starttime); break; case VIR_DOMAIN_CLOCK_OFFSET_TIMEZONE: virBufferEscapeString(buf, " timezone='%s'", def->clock.data.timezone); @@ -16586,7 +16603,8 @@ virDomainSaveStatus(virDomainXMLOptionPtr xmlopt, unsigned int flags = (VIR_DOMAIN_XML_SECURE | VIR_DOMAIN_XML_INTERNAL_STATUS | VIR_DOMAIN_XML_INTERNAL_ACTUAL_NET | - VIR_DOMAIN_XML_INTERNAL_PCI_ORIG_STATES); + VIR_DOMAIN_XML_INTERNAL_PCI_ORIG_STATES | + VIR_DOMAIN_XML_INTERNAL_STARTTIME); int ret = -1; char *xml; @@ -16674,7 +16692,8 @@ virDomainObjListLoadStatus(virDomainObjListPtr doms, if (!(obj = virDomainObjParseFile(statusFile, caps, xmlopt, expectedVirtTypes, VIR_DOMAIN_XML_INTERNAL_STATUS | VIR_DOMAIN_XML_INTERNAL_ACTUAL_NET | - VIR_DOMAIN_XML_INTERNAL_PCI_ORIG_STATES))) + VIR_DOMAIN_XML_INTERNAL_PCI_ORIG_STATES | + VIR_DOMAIN_XML_INTERNAL_STARTTIME))) goto error; virUUIDFormat(obj->def->uuid, uuidstr); diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 3a71d6c..cca92b4 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -1767,6 +1767,9 @@ struct _virDomainClockDef { struct { long long adjustment; int basis; + + /* Store the start time of guest process, internal only */ + unsigned long long starttime; } variable; /* Timezone name, when diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index c4a162a..9254525 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -5518,6 +5518,9 @@ qemuBuildClockArgStr(virDomainClockDefPtr def) now += def->data.variable.adjustment; gmtime_r(&now, &nowbits); + /* Store the starttime of qemu process */ + def->data.variable.starttime = now; + virBufferAsprintf(&buf, "base=%d-%02d-%02dT%02d:%02d:%02d", nowbits.tm_year + 1900, nowbits.tm_mon + 1, diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index d4fd4fb..39c62b3 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -796,6 +796,19 @@ qemuProcessHandleRTCChange(qemuMonitorPtr mon ATTRIBUTE_UNUSED, virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver); virObjectLock(vm); + + /* QEMU's RTC_CHANGE event returns the offset from the specified + * date instead of the host UTC if a specific date is provided + * (-rtc base=$date). We need to convert it to be offset from + * host UTC. + */ + if (vm->def->clock.offset == VIR_DOMAIN_CLOCK_OFFSET_VARIABLE) { + time_t now = time(NULL); + + offset += vm->def->clock.data.variable.starttime - + (unsigned long long)now; + } + event = virDomainEventRTCChangeNewFromObj(vm, offset); if (vm->def->clock.offset == VIR_DOMAIN_CLOCK_OFFSET_VARIABLE) -- 1.8.1.4

2 2

[libvirt] [PATCH] build: fix build without posix_fallocate
by Eric Blake 06 Jun '13

06 Jun '13

Such as on FreeBSD. Broken in commit aa2a4cff7 * src/util/virstoragefile.c (virStorageFileResize): Add missing ';'. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- Pushing under the build-breaker rule. src/util/virstoragefile.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c index bf668c8..b861fd8 100644 --- a/src/util/virstoragefile.c +++ b/src/util/virstoragefile.c @@ -1074,7 +1074,7 @@ virStorageFileResize(const char *path, } #else virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", - _("preallocate is not supported on this platform")) + _("preallocate is not supported on this platform")); goto cleanup; #endif } else { -- 1.8.1.4

1 1

[libvirt] [PATCH v4 0/5] libvirt supports Guest Panicked
by Chen Fan 06 Jun '13

06 Jun '13

Changes: v3-v4: 1. Supports the dumpcore options of the oncrash element in the XML. 2. Move the previous code to processWatchdogEvent(). v2-v3: 1. split into 3 patches v1-v2: 1. fix the incorrect domain state: paused -> crashed, when crash the guest while libvirt isn't running, then restart libvirtd. Chen Fan (5): libvirt: Define domain crash event types qemu: Supports guest panicked virsh: supports guest panicked libvirt: Define crash dumpcore events in watchdogAction. qemu: Implement the oncrash events in processWatchdogEvent. examples/domain-events/events-c/event-test.c | 10 ++ include/libvirt/libvirt.h.in | 16 +++ src/conf/domain_conf.c | 16 ++- src/conf/domain_conf.h | 4 + src/qemu/qemu_driver.c | 197 +++++++++++++++++++++------ src/qemu/qemu_monitor.c | 14 +- src/qemu/qemu_monitor.h | 5 + src/qemu/qemu_monitor_json.c | 7 + src/qemu/qemu_process.c | 127 ++++++++++++++--- src/qemu/qemu_process.h | 2 + tools/virsh-domain-monitor.c | 8 ++ 11 files changed, 338 insertions(+), 68 deletions(-) -- 1.8.1.4

5 13

[libvirt] Serial port creation issue
by arvind viswanathan 06 Jun '13

06 Jun '13

Hi, I have a serial port defined in vm config file. However after I create the vm using virsh, I notice that the serial ports I have specified translate to -chardev when kvm-quemu is called. I am having trouble accessing the vm if it is configured as a chardev with isserial option. If i can directly call the qemu with -serial, I can access the vm, thanks arvind

1 0

[libvirt] [PATCH] qemu: Reformat listen address prior checking
by Michal Privoznik 06 Jun '13

06 Jun '13

Currently, a listen address for a SPICE server can be specified. Later, when the domain is migrated, we need to relocate the graphics which involves telling new destination to the SPICE server. However, we can't just assume the listen address is the new location, because the listen address can be ANYCAST (0.0.0.0 for IPv4, :: for IPv6). In which case, we want to pass the remote hostname. But there are some troubles with ANYCAST. In both IPv4 and IPv6 it has many ways for specifying such address. For instance, in IPv4: 0, 0.0, 0.0.0, 0.0.0.0. The number of variations gets bigger in IPv6 world. Hence, in order to check for ANYCAST address sanely, we should take the provided listen address, parse it and format back in it's full form. Which is exactly what this patch does. --- src/qemu/qemu_migration.c | 18 +++++++++++++++++- tests/sockettest.c | 24 ++++++++++++++++++++++++ 2 files changed, 41 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 7aa0476..3ca3f32 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -1735,42 +1735,58 @@ static int qemuDomainMigrateGraphicsRelocate(virQEMUDriverPtr driver, virDomainObjPtr vm, qemuMigrationCookiePtr cookie) { qemuDomainObjPrivatePtr priv = vm->privateData; int ret; char *listenAddress; + virSocketAddr addr; + bool reformatted = false; if (!cookie) return 0; if (!cookie->graphics) return 0; /* QEMU doesn't support VNC relocation yet, so * skip it to avoid generating an error */ if (cookie->graphics->type != VIR_DOMAIN_GRAPHICS_TYPE_SPICE) return 0; listenAddress = cookie->graphics->listen; + + /* Okay, here's the magic: some mgmt applications set bare '0' as listen + * address. On the other hand, it's a valid IPv4 address. This means, we + * need to reformat the address so the if statement below can check just + * for two ANYCAST addresses and not all their variants. */ + if (listenAddress && + virSocketAddrParse(&addr, listenAddress, AF_UNSPEC) > 0) { + listenAddress = virSocketAddrFormat(&addr); + reformatted = true; + } + if (!listenAddress || STREQ(listenAddress, "0.0.0.0") || - STREQ(listenAddress, "::")) + STREQ(listenAddress, "::")) { + if (reformatted) + VIR_FREE(listenAddress); listenAddress = cookie->remoteHostname; + } ret = qemuDomainObjEnterMonitorAsync(driver, vm, QEMU_ASYNC_JOB_MIGRATION_OUT); if (ret == 0) { ret = qemuMonitorGraphicsRelocate(priv->mon, cookie->graphics->type, listenAddress, cookie->graphics->port, cookie->graphics->tlsPort, cookie->graphics->tlsSubject); qemuDomainObjExitMonitor(driver, vm); } return ret; } diff --git a/tests/sockettest.c b/tests/sockettest.c index 156ef45..5b36a6c 100644 --- a/tests/sockettest.c +++ b/tests/sockettest.c @@ -162,96 +162,120 @@ static int mymain(void) { int ret = 0; /* Some of our tests deliberately test failure cases, so * register a handler to stop error messages cluttering * up display */ if (!virTestGetDebug()) virSetErrorFunc(NULL, testQuietError); #define DO_TEST_PARSE(addrstr, family, pass) \ do { \ virSocketAddr addr; \ struct testParseData data = { &addr, addrstr, family, pass }; \ memset(&addr, 0, sizeof(addr)); \ if (virtTestRun("Test parse " addrstr, \ 1, testParseHelper, &data) < 0) \ ret = -1; \ } while (0) #define DO_TEST_PARSE_AND_FORMAT(addrstr, family, pass) \ do { \ virSocketAddr addr; \ struct testParseData data = { &addr, addrstr, family, pass }; \ memset(&addr, 0, sizeof(addr)); \ if (virtTestRun("Test parse " addrstr " family " #family, \ 1, testParseHelper, &data) < 0) \ ret = -1; \ struct testFormatData data2 = { &addr, addrstr, pass }; \ if (virtTestRun("Test format " addrstr " family " #family, \ 1, testFormatHelper, &data2) < 0) \ ret = -1; \ } while (0) +#define DO_TEST_PARSE_AND_CHECK_FORMAT(addrstr, addrformated, family, pass) \ + do { \ + virSocketAddr addr; \ + struct testParseData data = { &addr, addrstr, family, true}; \ + memset(&addr, 0, sizeof(addr)); \ + if (virtTestRun("Test parse " addrstr " family " #family, \ + 1, testParseHelper, &data) < 0) \ + ret = -1; \ + struct testFormatData data2 = { &addr, addrformated, pass }; \ + if (virtTestRun("Test format " addrstr " family " #family, \ + 1, testFormatHelper, &data2) < 0) \ + ret = -1; \ + } while (0) + #define DO_TEST_RANGE(saddr, eaddr, size, pass) \ do { \ struct testRangeData data = { saddr, eaddr, size, pass }; \ if (virtTestRun("Test range " saddr " -> " eaddr " size " #size, \ 1, testRangeHelper, &data) < 0) \ ret = -1; \ } while (0) #define DO_TEST_NETMASK(addr1, addr2, netmask, pass) \ do { \ struct testNetmaskData data = { addr1, addr2, netmask, pass }; \ if (virtTestRun("Test netmask " addr1 " + " addr2 " in " netmask, \ 1, testNetmaskHelper, &data) < 0) \ ret = -1; \ } while (0) DO_TEST_PARSE_AND_FORMAT("127.0.0.1", AF_UNSPEC, true); DO_TEST_PARSE_AND_FORMAT("127.0.0.1", AF_INET, true); DO_TEST_PARSE_AND_FORMAT("127.0.0.1", AF_INET6, false); DO_TEST_PARSE_AND_FORMAT("127.0.0.1", AF_UNIX, false); DO_TEST_PARSE_AND_FORMAT("127.0.0.256", AF_UNSPEC, false); + DO_TEST_PARSE_AND_CHECK_FORMAT("127.0.0.2", "127.0.0.2", AF_INET, true); + DO_TEST_PARSE_AND_CHECK_FORMAT("127.0.0.2", "127.0.0.3", AF_INET, false); + DO_TEST_PARSE_AND_CHECK_FORMAT("0", "0.0.0.0", AF_INET, true); + DO_TEST_PARSE_AND_CHECK_FORMAT("127", "0.0.0.127", AF_INET, true); + DO_TEST_PARSE_AND_CHECK_FORMAT("127", "127.0.0.0", AF_INET, false); + DO_TEST_PARSE_AND_CHECK_FORMAT("127.2", "127.0.0.2", AF_INET, true); + DO_TEST_PARSE_AND_CHECK_FORMAT("127.2", "127.2.0.0", AF_INET, false); + DO_TEST_PARSE_AND_CHECK_FORMAT("1.2.3", "1.2.0.3", AF_INET, true); + DO_TEST_PARSE_AND_CHECK_FORMAT("1.2.3", "1.2.3.0", AF_INET, false); + DO_TEST_PARSE_AND_FORMAT("::1", AF_UNSPEC, true); DO_TEST_PARSE_AND_FORMAT("::1", AF_INET, false); DO_TEST_PARSE_AND_FORMAT("::1", AF_INET6, true); DO_TEST_PARSE_AND_FORMAT("::1", AF_UNIX, false); DO_TEST_PARSE_AND_FORMAT("::ffff", AF_UNSPEC, true); DO_TEST_RANGE("192.168.122.1", "192.168.122.1", 1, true); DO_TEST_RANGE("192.168.122.1", "192.168.122.20", 20, true); DO_TEST_RANGE("192.168.122.0", "192.168.122.255", 256, true); DO_TEST_RANGE("192.168.122.20", "192.168.122.1", -1, false); DO_TEST_RANGE("10.0.0.1", "192.168.122.20", -1, false); DO_TEST_RANGE("192.168.122.20", "10.0.0.1", -1, false); DO_TEST_RANGE("2000::1", "2000::1", 1, true); DO_TEST_RANGE("2000::1", "2000::2", 2, true); DO_TEST_RANGE("2000::2", "2000::1", -1, false); DO_TEST_RANGE("2000::1", "9001::1", -1, false); DO_TEST_NETMASK("192.168.122.1", "192.168.122.2", "255.255.255.0", true); DO_TEST_NETMASK("192.168.122.1", "192.168.122.4", "255.255.255.248", true); DO_TEST_NETMASK("192.168.122.1", "192.168.123.2", "255.255.255.0", false); DO_TEST_NETMASK("192.168.122.1", "192.168.123.2", "255.255.0.0", true); DO_TEST_NETMASK("2000::1:1", "2000::1:1", "ffff:ffff:ffff:ffff:ffff:ffff:ffff:0", true); DO_TEST_NETMASK("2000::1:1", "2000::2:1", "ffff:ffff:ffff:ffff:ffff:ffff:ffff:0", false); DO_TEST_NETMASK("2000::1:1", "2000::2:1", "ffff:ffff:ffff:ffff:ffff:ffff:fff8:0", true); DO_TEST_NETMASK("2000::1:1", "9000::1:1", "ffff:ffff:ffff:ffff:ffff:ffff:ffff:0", false); return ret==0 ? EXIT_SUCCESS : EXIT_FAILURE; } -- 1.8.2.1

2 1