- Devel - libvirt List Archives

[libvirt] [PATCH v2] genprotocol.pl: Fix code on FreeBSD too
by Michal Privoznik 30 Sep '13

30 Sep '13

On some systems (linux, cygwin and gnukfreebsd) rpcgen generates files which when compiling produces this warning: remote/remote_protocol.c: In function 'xdr_remote_node_get_cpu_stats_ret': remote/remote_protocol.c:530: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] Hence, on those systems we need to post-process the files by the rpc/genprotocol.pl perl script. At the beginning of the script the OS is detected via $^O perl variable. From my latest build on FreeBSD I see we need to fix the code there too. On FreeBSD the variable contains 'freebsd' string: http://perldoc.perl.org/perlport.html#PLATFORMS Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/rpc/genprotocol.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/rpc/genprotocol.pl b/src/rpc/genprotocol.pl index 4f8b6c4..6e6d6d4 100755 --- a/src/rpc/genprotocol.pl +++ b/src/rpc/genprotocol.pl @@ -43,7 +43,7 @@ open RPCGEN, "-|", $rpcgen, $mode, $xdrdef open TARGET, ">$target" or die "cannot create $target: $!"; -my $fixup = $^O eq "linux" || $^O eq "cygwin" || $^O eq "gnukfreebsd"; +my $fixup = $^O eq "linux" || $^O eq "cygwin" || $^O eq "gnukfreebsd" || $^O eq "freebsd"; if ($mode eq "-c") { print TARGET "#include <config.h>\n"; -- 1.8.1.5

3 2

[libvirt] [PATCH] genprotocol.pl: Fix code on FreeBSD too
by Michal Privoznik 30 Sep '13

30 Sep '13

On some systems (linux, cygwin and freebsd) rpcgen generates files which when compiling produces this warning: remote/remote_protocol.c: In function 'xdr_remote_node_get_cpu_stats_ret': remote/remote_protocol.c:530: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] Hence, on those systems we need to post-process the files by the rpc/genprotocol.pl perl script. At the beginning of the script the OS is detected via $^O perl variable. On FreeBSD it contains 'freebsd' string and not 'gnukfreebsd' as is currently there: http://perldoc.perl.org/perlport.html#PLATFORMS Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/rpc/genprotocol.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/rpc/genprotocol.pl b/src/rpc/genprotocol.pl index 4f8b6c4..abd40fd 100755 --- a/src/rpc/genprotocol.pl +++ b/src/rpc/genprotocol.pl @@ -43,7 +43,7 @@ open RPCGEN, "-|", $rpcgen, $mode, $xdrdef open TARGET, ">$target" or die "cannot create $target: $!"; -my $fixup = $^O eq "linux" || $^O eq "cygwin" || $^O eq "gnukfreebsd"; +my $fixup = $^O eq "linux" || $^O eq "cygwin" || $^O eq "freebsd"; if ($mode eq "-c") { print TARGET "#include <config.h>\n"; -- 1.8.1.5

3 2

[libvirt] [PATCH]lxc: goto cleanup if lxcContainerBuildInitCmd returns NULL
by Chen Hanxiao 30 Sep '13

30 Sep '13

From: Chen Hanxiao <chenhanxiao(a)cn.fujitsu.com> We should goto cleanup directly if lxcContainerBuildInitCmd returns NULL, which would avoid lots of unnecessary works. Signed-off-by: Chen Hanxiao <chenhanxiao(a)cn.fujitsu.com> --- src/lxc/lxc_container.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index 3fdf397..f03f236 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -1820,7 +1820,10 @@ static int lxcContainerChild(void *data) if ((hasReboot = lxcContainerHasReboot()) < 0) goto cleanup; - cmd = lxcContainerBuildInitCmd(vmDef); + if (!(cmd = lxcContainerBuildInitCmd(vmDef))) { + VIR_DEBUG("Failed to build init cmd for container"); + goto cleanup; + } virCommandWriteArgLog(cmd, 1); if (lxcContainerSetID(vmDef) < 0) -- 1.8.2.1

2 2

[libvirt] Openvswitch support question
by Vasiliy Tolstov 30 Sep '13

30 Sep '13

Hi all. I'm using vs witch and libvirt 1.2. I'm write vswitch controller and want to react on up/down port in virtual switch. All fork fine, but message sent to controller does not contain Mac address of added interface. Does this libvirt problem or this is only vswitch error?

2 2

[libvirt] [PATCH]lxc: do cleanup when failed to bind fs as read-only
by Chen Hanxiao 30 Sep '13

30 Sep '13

From: Chen Hanxiao <chenhanxiao(a)cn.fujitsu.com> We forgot to 'goto cleanup' when lxcContainerMountFSTmpfs failed to bind fs as read-only. Signed-off-by: Chen Hanxiao <chenhanxiao(a)cn.fujitsu.com> --- src/lxc/lxc_container.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index c60f5d8..3fdf397 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -1451,6 +1451,7 @@ static int lxcContainerMountFSTmpfs(virDomainFSDefPtr fs, virReportSystemError(errno, _("Failed to make directory %s readonly"), fs->dst); + goto cleanup; } } -- 1.8.2.1

2 2

[libvirt] [PATCH] storage: use btrfs file clone ioctl when possible
by Oskari Saarenmaa 30 Sep '13

30 Sep '13

Btrfs provides a copy-on-write clone ioctl so let's try to use it instead of copying files block by block. The ioctl is executed unconditionally if it's available and we fall back to block copying if it fails, similarly to cp --reflink=auto. Signed-off-by: Oskari Saarenmaa <os(a)ohmu.fi> --- configure.ac | 5 +++++ src/storage/storage_backend.c | 11 +++++++++++ 2 files changed, 16 insertions(+) diff --git a/configure.ac b/configure.ac index 553015a..acae92e 100644 --- a/configure.ac +++ b/configure.ac @@ -1984,6 +1984,11 @@ fi AM_CONDITIONAL([WITH_STORAGE], [test "$with_storage" = "yes"]) dnl +dnl check for headers for filesystem specific operations +dnl +AC_CHECK_HEADERS([linux/btrfs.h]) + +dnl dnl check for (ESX) dnl diff --git a/src/storage/storage_backend.c b/src/storage/storage_backend.c index b7edf85..40bfb73 100644 --- a/src/storage/storage_backend.c +++ b/src/storage/storage_backend.c @@ -38,6 +38,9 @@ # include <sys/ioctl.h> # include <linux/fs.h> #endif +#ifdef HAVE_LINUX_BTRFS_H +# include <linux/btrfs.h> +#endif #if WITH_SELINUX # include <selinux/selinux.h> @@ -149,6 +152,13 @@ virStorageBackendCopyToFD(virStorageVolDefPtr vol, goto cleanup; } +#ifdef HAVE_LINUX_BTRFS_H + /* try to perform a btrfs CoW clone */ + if (ioctl(fd, BTRFS_IOC_CLONE, inputfd) == 0) { + goto done; + } +#endif + #ifdef __linux__ if (ioctl(fd, BLKBSZGET, &wbytes) < 0) { wbytes = 0; @@ -210,6 +220,7 @@ virStorageBackendCopyToFD(virStorageVolDefPtr vol, } while ((amtleft -= interval) > 0); } +done: if (fdatasync(fd) < 0) { ret = -errno; virReportSystemError(errno, _("cannot sync data to file '%s'"), -- 1.8.3.1

2 3

[libvirt] [PATCH] fix a ambiguous output of the command:'virsh vol-create-as'
by Hongwei Bi 30 Sep '13

30 Sep '13

I created a storage volume(eg: test) from a storage pool(eg:vg10) using the following command:"virsh vol-create-as --pool vg10 --name test --capacity 300M." When I re-executed the above command, the output was as the following: "error: Failed to create vol test error: Storage volume not found: storage vol 'test' already exists" I think the output "Storage volume not found" is not appropriate. Because in fact storage vol test has been found at this time. And then I think virErrorNumber should includes VIR_ERR_STORAGE_EXIST which can also be used elsewhere. So I make this patch. The result is as following: "error: Failed to create vol test error: storage volume 'test' exists already" --- include/libvirt/virterror.h | 1 + src/storage/storage_driver.c | 4 ++-- src/util/virerror.c | 6 ++++++ 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/include/libvirt/virterror.h b/include/libvirt/virterror.h index c1960c8..28ef30a 100644 --- a/include/libvirt/virterror.h +++ b/include/libvirt/virterror.h @@ -296,6 +296,7 @@ typedef enum { VIR_ERR_ACCESS_DENIED = 88, /* operation on the object/resource was denied */ VIR_ERR_DBUS_SERVICE = 89, /* error from a dbus service */ + VIR_ERR_STORAGE_EXIST = 90, /* the storage vol already exist */ } virErrorNumber; /** diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c index 6c39284..aa5a144 100644 --- a/src/storage/storage_driver.c +++ b/src/storage/storage_driver.c @@ -1538,8 +1538,8 @@ storageVolCreateXML(virStoragePoolPtr obj, goto cleanup; if (virStorageVolDefFindByName(pool, voldef->name)) { - virReportError(VIR_ERR_NO_STORAGE_VOL, - _("storage vol '%s' already exists"), voldef->name); + virReportError(VIR_ERR_STORAGE_EXIST, + _("'%s'"), voldef->name); goto cleanup; } diff --git a/src/util/virerror.c b/src/util/virerror.c index ca25678..35bb017 100644 --- a/src/util/virerror.c +++ b/src/util/virerror.c @@ -1004,6 +1004,12 @@ virErrorMsg(virErrorNumber error, const char *info) else errmsg = _("Storage volume not found: %s"); break; + case VIR_ERR_STORAGE_EXIST: + if (info == NULL) + errmsg = _("this storage volume exists already"); + else + errmsg = _("storage volume %s exists already"); + break; case VIR_ERR_STORAGE_PROBE_FAILED: if (info == NULL) errmsg = _("Storage pool probe failed"); -- 1.7.1

1 0

Re: [libvirt] [PATCH] add migration APIs to libxl driver
by Bamvor Jian Zhang 30 Sep '13

30 Sep '13

> --- > src/libxl/libxl_conf.h | 4 + > src/libxl/libxl_driver.c | 641 > ++++++++++++++++++++++++++++++++++++++++++++++ > src/libxl/libxl_driver.h | 5 + > 3 files changed, 650 insertions(+), 0 deletions(-) > > diff --git a/src/libxl/libxl_conf.h b/src/libxl/libxl_conf.h > index 8ba0ee4..2041cc2 100644 > --- a/src/libxl/libxl_conf.h > +++ b/src/libxl/libxl_conf.h > @@ -41,6 +41,9 @@ > # define LIBXL_VNC_PORT_MIN 5900 > # define LIBXL_VNC_PORT_MAX 65535 > > +# define LIBXL_MIGRATION_PORT_MIN 49152 > +# define LIBXL_MIGRATION_PORT_MAX 49216 > + there is a overlap between vnc and migration port. althrought, it will try next port in virPortAllocatorAcquire after bind fail. > # define LIBXL_CONFIG_DIR SYSCONFDIR "/libvirt/libxl" > # define LIBXL_AUTOSTART_DIR LIBXL_CONFIG_DIR "/autostart" > # define LIBXL_STATE_DIR LOCALSTATEDIR "/run/libvirt/libxl" > @@ -109,6 +112,7 @@ struct _libxlDriverPrivate { > > /* Immutable pointer, self-locking APIs */ > virPortAllocatorPtr reservedVNCPorts; > + virPortAllocatorPtr reservedMigPorts; > > /* Immutable pointer, lockless APIs*/ > virSysinfoDefPtr hostsysinfo; > diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c > index e2a6d44..93b7153 100644 > --- a/src/libxl/libxl_driver.c > +++ b/src/libxl/libxl_driver.c > @@ -32,6 +32,12 @@ > #include <libxl_utils.h> > #include <fcntl.h> > #include <regex.h> > +#include <stdlib.h> > +#include <string.h> > +#include <sys/types.h> > +#include <sys/socket.h> > +#include <arpa/inet.h> > +#include <netdb.h> > > #include "internal.h" > #include "virlog.h" > @@ -52,6 +58,7 @@ > #include "virsysinfo.h" > #include "viraccessapicheck.h" > #include "viratomic.h" > +#include "rpc/virnetsocket.h" > > #define VIR_FROM_THIS VIR_FROM_LIBXL > > @@ -69,6 +76,20 @@ > > static libxlDriverPrivatePtr libxl_driver = NULL; > > +typedef struct _libxlMigrateReceiveArgs { > + virConnectPtr conn; > + virDomainObjPtr vm; > + > + /* for freeing listen sockets */ > + virNetSocketPtr *socks; > + size_t nsocks; > +} libxlMigrateReceiveArgs; > + > +static const char libxlMigrateReceiverReady[]= > + "libvirt libxl migration receiver ready, send binary domain data"; > +static const char libxlMigrateReceiverFinish[]= > + "domain received, ready to unpause"; > + > /* Function declarations */ > static int > libxlDomainManagedSaveLoad(virDomainObjPtr vm, > @@ -836,6 +857,12 @@ libxlStateInitialize(bool privileged, > LIBXL_VNC_PORT_MAX))) > goto error; > > + /* Allocate bitmap for migration port reservation */ > + if (!(libxl_driver->reservedMigPorts = > + virPortAllocatorNew(LIBXL_MIGRATION_PORT_MIN, > + LIBXL_MIGRATION_PORT_MAX))) > + goto error; > + > if (!(libxl_driver->domains = virDomainObjListNew())) > goto error; > > @@ -4175,11 +4202,620 @@ libxlConnectSupportsFeature(virConnectPtr conn, > int feature) > switch (feature) { > case VIR_DRV_FEATURE_TYPED_PARAM_STRING: > return 1; > + case VIR_DRV_FEATURE_MIGRATION_V3: > + return 1; > default: > return 0; > } > } > > +static int > +libxlCheckMessageBanner(int fd, const char *banner, int banner_sz) > +{ > + char buf[banner_sz]; > + int ret = 0; > + > + do { > + ret = saferead(fd, buf, banner_sz); > + } while (ret == -1 && errno == EAGAIN); > + > + if (ret != banner_sz || memcmp(buf, banner, banner_sz)) { > + return -1; > + } > + > + return 0; > +} > + > +static char * > +libxlDomainMigrateBegin3(virDomainPtr domain, > + const char *xmlin, > + char **cookieout ATTRIBUTE_UNUSED, > + int *cookieoutlen ATTRIBUTE_UNUSED, > + unsigned long flags, > + const char *dname ATTRIBUTE_UNUSED, > + unsigned long resource ATTRIBUTE_UNUSED) > +{ > + libxlDriverPrivatePtr driver = domain->conn->privateData; > + libxlDriverConfigPtr cfg = libxlDriverConfigGet(driver); > + virDomainObjPtr vm; > + virDomainDefPtr def = NULL; > + char *xml = NULL; > + > + virCheckFlags(LIBXL_MIGRATION_FLAGS, NULL); > + > + vm = virDomainObjListFindByUUID(driver->domains, domain->uuid); > + if (!vm) { > + char uuidstr[VIR_UUID_STRING_BUFLEN]; > + virUUIDFormat(domain->uuid, uuidstr); > + virReportError(VIR_ERR_OPERATION_INVALID, > + _("no domain with matching uuid '%s'"), uuidstr); > + goto cleanup; > + } libxlDomObjFromDomain is introduced in commit 0d87fd0aa by Jim. > + > + if (!virDomainObjIsActive(vm)) { > + virReportError(VIR_ERR_OPERATION_INVALID, "%s", > + _("domain is not running")); > + goto cleanup; > + } > + > + if (virDomainMigrateBegin3EnsureACL(domain->conn, vm->def) < 0) > + goto cleanup; > + > + if (xmlin) { > + if (!(def = virDomainDefParseString(xmlin, cfg->caps, > + driver->xmlopt, > + 1 << VIR_DOMAIN_VIRT_XEN, > + VIR_DOMAIN_XML_INACTIVE))) > + goto cleanup; > + > + xml = virDomainDefFormat(def, VIR_DOMAIN_XML_SECURE); > + } else { > + xml = virDomainDefFormat(vm->def, VIR_DOMAIN_XML_SECURE); > + } > + > +cleanup: > + virDomainDefFree(def); > + if (vm) > + virObjectUnlock(vm); > + virObjectUnref(cfg); > + return xml; > +} > + > +static void > +doMigrateReceive(virNetSocketPtr sock, > + int events ATTRIBUTE_UNUSED, > + void *opaque) > +{ > + libxlMigrateReceiveArgs *data = opaque; > + virConnectPtr conn = data->conn; > + virDomainObjPtr vm = data->vm; > + virNetSocketPtr *socks = data->socks; > + size_t nsocks = data->nsocks; > + libxlDriverPrivatePtr driver = conn->privateData; > + virNetSocketPtr client_sock; > + int recv_fd; > + int len; > + size_t i; > + int ret; > + > + virNetSocketAccept(sock, &client_sock); > + if (client_sock == NULL) { > + virReportError(VIR_ERR_OPERATION_INVALID, "%s", > + _("Fail to accept migration connection")); > + goto cleanup; > + } > + VIR_DEBUG("Accepted migration\n"); > + recv_fd = virNetSocketDupFD(client_sock, true); > + virObjectUnref(client_sock); > + > + len = sizeof(libxlMigrateReceiverReady); > + if (safewrite(recv_fd, libxlMigrateReceiverReady, len) != len) { > + virReportError(VIR_ERR_OPERATION_FAILED, "%s", > + _("Failed to write libxlMigrateReceiverReady")); > + goto cleanup; > + } > + > + virObjectLock(vm); > + ret = libxlVmStart(driver, vm, false, recv_fd); > + virObjectUnlock(vm); > + > + if (ret < 0) { > + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", > + _("Failed to restore domain with libxenlight")); > + if (!vm->persistent) { > + virDomainObjListRemove(driver->domains, vm); > + vm = NULL; > + } > + goto cleanup; > + } > + > + len = sizeof(libxlMigrateReceiverFinish); > + if (safewrite(recv_fd, libxlMigrateReceiverFinish, len) != len) { > + virReportError(VIR_ERR_OPERATION_FAILED, "%s", > + _("Failed to write libxlMigrateReceiverFinish")); > + } > + > + /* Remove all listen socks from event handler, and close them. */ > + if (nsocks) { > + for (i = 0; i < nsocks; i++) { > + virNetSocketUpdateIOCallback(socks[i], 0); > + virNetSocketRemoveIOCallback(socks[i]); > + virNetSocketClose(socks[i]); > + virObjectUnref(socks[i]); > + } > + VIR_FREE(socks); > + } > + > +cleanup: > + VIR_FORCE_CLOSE(recv_fd); > + VIR_FREE(opaque); > + return; > +} > + > +static int > +doMigrateSend(libxlDriverPrivatePtr driver, > + virDomainObjPtr vm, > + unsigned long flags, > + int sockfd) > +{ > + libxlDomainObjPrivatePtr priv; > + libxlDriverConfigPtr cfg = libxlDriverConfigGet(driver); > + virDomainEventPtr event = NULL; > + int live = 0; > + int ret = -1; > + > + if (flags & VIR_MIGRATE_LIVE) > + live = LIBXL_SUSPEND_LIVE; > + > + priv = vm->privateData; > + > + /* read fixed message from dest (ready to receive) */ > + if (libxlCheckMessageBanner(sockfd, libxlMigrateReceiverReady, > + sizeof(libxlMigrateReceiverReady))) > + goto cleanup; > + > + if (libxl_domain_suspend(priv->ctx, vm->def->id, sockfd, live, NULL) > != 0) { > + virReportError(VIR_ERR_INTERNAL_ERROR, > + _("Failed to save domain '%d' with libxenlight"), > + vm->def->id); > + goto cleanup; > + } > + > + /* read fixed message from dest (receive completed) */ > + if (libxlCheckMessageBanner(sockfd, libxlMigrateReceiverFinish, > + sizeof(libxlMigrateReceiverFinish))) { > + if (libxl_domain_resume(priv->ctx, vm->def->id, 0, 0) != 0) { > + VIR_DEBUG("Failed to resume domain '%d' with libxenlight", > + vm->def->id); > + virDomainObjSetState(vm, VIR_DOMAIN_PAUSED, > + VIR_DOMAIN_PAUSED_MIGRATION); > + event = virDomainEventNewFromObj(vm, > VIR_DOMAIN_EVENT_SUSPENDED, > + > VIR_DOMAIN_EVENT_SUSPENDED_MIGRATED); > + if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm) < 0) > + goto cleanup; > + } > + goto cleanup; > + } > + > + ret = 0; > + > +cleanup: > + if (event) > + libxlDomainEventQueue(driver, event); > + virObjectUnref(cfg); > + return ret; > +} > + > +static int > +libxlDomainMigratePrepare3(virConnectPtr dconn, > + const char *cookiein ATTRIBUTE_UNUSED, > + int cookieinlen ATTRIBUTE_UNUSED, > + char **cookieout ATTRIBUTE_UNUSED, > + int *cookieoutlen ATTRIBUTE_UNUSED, > + const char *uri_in, > + char **uri_out, > + unsigned long flags, > + const char *dname, > + unsigned long resource ATTRIBUTE_UNUSED, > + const char *dom_xml) > +{ > + libxlDriverPrivatePtr driver = dconn->privateData; > + libxlDriverConfigPtr cfg = libxlDriverConfigGet(driver); > + virDomainDefPtr def = NULL; > + virDomainObjPtr vm = NULL; > + char *hostname = NULL; > + unsigned short port; > + char portstr[100]; > + virURIPtr uri = NULL; > + virNetSocketPtr *socks = NULL; > + size_t nsocks = 0; > + int nsocks_listen = 0; > + libxlMigrateReceiveArgs *args; > + size_t i; > + int ret = -1; > + > + virCheckFlags(LIBXL_MIGRATION_FLAGS, -1); > + > + libxlDriverLock(driver); > + if (!dom_xml) { > + virReportError(VIR_ERR_OPERATION_INVALID, "%s", > + _("no domain XML passed")); > + goto cleanup; > + } > + def = virDomainDefParseString(dom_xml, cfg->caps, driver->xmlopt, > + 1 << VIR_DOMAIN_VIRT_XEN, > + VIR_DOMAIN_XML_INACTIVE); > + > + /* Target domain name, maybe renamed. */ > + if (dname) { > + if (VIR_STRDUP(def->name, dname) < 0) > + goto cleanup; > + } > + > + if (!(vm = virDomainObjListAdd(driver->domains, def, > + driver->xmlopt, > + VIR_DOMAIN_OBJ_LIST_ADD_LIVE | > + VIR_DOMAIN_OBJ_LIST_ADD_CHECK_LIVE, > + NULL))) > + goto cleanup; > + > + def = NULL; > + > + if (virDomainMigratePrepare3EnsureACL(dconn, vm->def) < 0) > + goto cleanup; > + > + /* Create socket connection to receive migration data */ > + if (!uri_in) { > + hostname = virGetHostname(); > + if (hostname == NULL) > + goto cleanup; > + > + if (virPortAllocatorAcquire(driver->reservedMigPorts, &port) < 0) > + goto cleanup; > + > + if (port == 0) { > + virReportError(VIR_ERR_INTERNAL_ERROR, > + "%s", _("Unable to find an unused migrate > port")); > + goto cleanup; > + } > + > + if (virAsprintf(uri_out, "tcp://%s:%d", hostname, port) < 0) > + goto cleanup; > + } else { > + if (!strstr(uri_in, "//")) { > + /* not full URI, add prefix tcp:// */ > + char *tmp; > + if (virAsprintf(&tmp, "tcp://%s", uri_in) < 0) > + goto cleanup; > + uri = virURIParse(tmp); > + VIR_FREE(tmp); > + } else { > + uri = virURIParse(uri_in); > + } > + > + if (uri == NULL) { > + virReportError(VIR_ERR_INVALID_ARG, > + _("unable to parse URI: %s"), > + uri_in); > + goto cleanup; > + } > + > + if (uri->server == NULL) { > + virReportError(VIR_ERR_INVALID_ARG, > + _("missing host in migration URI: %s"), > + uri_in); > + goto cleanup; > + } else { > + hostname = uri->server; > + } > + > + if (uri->port == 0) { > + if (virPortAllocatorAcquire(driver->reservedMigPorts, &port) < > 0) > + goto cleanup; > + > + if (port == 0) { > + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", > + _("Unable to find an unused migrate port")); > + goto cleanup; > + } > + } else { > + port = uri->port; > + } > + > + if (virAsprintf(uri_out, "tcp://%s:%d", hostname, port) < 0) > + goto cleanup; > + } > + > + snprintf(portstr, sizeof(portstr), "%d", port); > + > + if (virNetSocketNewListenTCP(hostname, portstr, &socks, &nsocks) < 0) { > + virReportError(VIR_ERR_OPERATION_FAILED, "%s", > + _("Fail to create socket for incoming migration")); > + goto cleanup; > + } > + > + if (VIR_ALLOC(args) < 0) > + goto cleanup; > + > + args->conn = dconn; > + args->vm = vm; > + args->socks = socks; > + args->nsocks = nsocks; > + > + for (i = 0 ; i < nsocks ; i++) { > + if (virNetSocketSetBlocking(socks[i], true) < 0) > + continue; > + if (virNetSocketListen(socks[i], 1) < 0) > + continue; > + > + if (virNetSocketAddIOCallback(socks[i], > + 0, > + doMigrateReceive, > + args, > + NULL) < 0) { > + continue; > + } > + > + virNetSocketUpdateIOCallback(socks[i], VIR_EVENT_HANDLE_READABLE); > + nsocks_listen ++; > + } > + > + if (!nsocks_listen) > + goto cleanup; > + > + ret = 0; > + goto end; > + > +cleanup: > + if (nsocks) { > + for (i = 0 ; i < nsocks ; i++) { > + virNetSocketClose(socks[i]); > + virObjectUnref(socks[i]); > + } > + VIR_FREE(socks); > + } > + > +end: > + virURIFree(uri); > + if (vm) > + virObjectUnlock(vm); > + virObjectUnref(cfg); > + libxlDriverUnlock(driver); > + return ret; > +} > + > +static int > +libxlDomainMigratePerform3(virDomainPtr dom, > + const char *xmlin ATTRIBUTE_UNUSED, > + const char *cookiein ATTRIBUTE_UNUSED, > + int cookieinlen ATTRIBUTE_UNUSED, > + char **cookieout ATTRIBUTE_UNUSED, > + int *cookieoutlen ATTRIBUTE_UNUSED, > + const char *dconnuri ATTRIBUTE_UNUSED, > + const char *uri, > + unsigned long flags, > + const char *dname ATTRIBUTE_UNUSED, > + unsigned long resource ATTRIBUTE_UNUSED) > +{ > + libxlDriverPrivatePtr driver = dom->conn->privateData; > + virDomainObjPtr vm; > + char *hostname = NULL; > + unsigned short port = 0; > + char portstr[100]; > + virURIPtr uri_p = NULL; > + virNetSocketPtr sock; > + int sockfd = -1; > + int saved_errno = EINVAL; > + int ret = -1; > + > + virCheckFlags(LIBXL_MIGRATION_FLAGS, -1); > + > + vm = virDomainObjListFindByUUID(driver->domains, dom->uuid); > + if (!vm) { > + char uuidstr[VIR_UUID_STRING_BUFLEN]; > + virUUIDFormat(dom->uuid, uuidstr); > + virReportError(VIR_ERR_OPERATION_INVALID, > + _("no domain with matching uuid '%s'"), uuidstr); > + goto cleanup; > + } same here. > + > + if (virDomainMigratePerform3EnsureACL(dom->conn, vm->def) < 0) > + goto cleanup; > + > + /* parse dst host:port from uri */ > + uri_p = virURIParse(uri); > + if (uri_p == NULL || uri_p->server == NULL || uri_p->port == 0) > + goto cleanup; > + > + hostname = uri_p->server; > + port = uri_p->port; > + snprintf(portstr, sizeof(portstr), "%d", port); > + > + /* socket connect to dst host:port */ > + if (virNetSocketNewConnectTCP(hostname, portstr, &sock) < 0) { > + virReportSystemError(saved_errno, > + _("unable to connect to '%s:%s'"), > + hostname, portstr); > + goto cleanup; > + } > + > + if (virNetSocketSetBlocking(sock, true) < 0) { > + virObjectUnref(sock); > + goto cleanup; > + } > + > + sockfd = virNetSocketDupFD(sock, true); > + virObjectUnref(sock); > + > + /* suspend vm and send saved data to dst through socket fd */ > + ret = doMigrateSend(driver, vm, flags, sockfd); > + > +cleanup: > + VIR_FORCE_CLOSE(sockfd); > + virURIFree(uri_p); > + if (vm) > + virObjectUnlock(vm); > + return ret; > +} > + > +static virDomainPtr > +libxlDomainMigrateFinish3(virConnectPtr dconn, > + const char *dname, > + const char *cookiein ATTRIBUTE_UNUSED, > + int cookieinlen ATTRIBUTE_UNUSED, > + char **cookieout ATTRIBUTE_UNUSED, > + int *cookieoutlen ATTRIBUTE_UNUSED, > + const char *dconnuri ATTRIBUTE_UNUSED, > + const char *uri, > + unsigned long flags, > + int cancelled) > +{ > + libxlDriverPrivatePtr driver = dconn->privateData; > + libxlDriverConfigPtr cfg = libxlDriverConfigGet(driver); > + unsigned short port = 0; > + virURIPtr uri_p = NULL; > + virDomainObjPtr vm = NULL; > + virDomainPtr dom = NULL; > + libxlDomainObjPrivatePtr priv; > + virDomainEventPtr event = NULL; > + int rc; > + > + virCheckFlags(LIBXL_MIGRATION_FLAGS, NULL); > + > + uri_p = virURIParse(uri); > + if (uri_p == NULL || uri_p->port == 0) > + VIR_DEBUG("Fail to parse port from URI"); > + port = uri_p->port; > + if (LIBXL_MIGRATION_PORT_MIN <= port && port < > LIBXL_MIGRATION_PORT_MAX) { > + if (virPortAllocatorRelease(driver->reservedMigPorts, port) < 0) > + VIR_DEBUG("Could not mark port %d as unused", port); > + } > + > + vm = virDomainObjListFindByName(driver->domains, dname); > + if (!vm) > + goto cleanup; > + > + if (virDomainMigrateFinish3EnsureACL(dconn, vm->def) < 0) > + goto cleanup; > + > + if (!cancelled) { > + if (!(flags & VIR_MIGRATE_PAUSED)) { > + priv = vm->privateData; > + rc = libxl_domain_unpause(priv->ctx, vm->def->id); > + if (rc) { > + virReportError(VIR_ERR_OPERATION_FAILED, "%s", > + _("Failed to unpause domain")); > + goto error; > + } > + > + virDomainObjSetState(vm, VIR_DOMAIN_RUNNING, > VIR_DOMAIN_RUNNING_BOOTED); > + if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm) < 0) > + goto error; > + } > + > + dom = virGetDomain(dconn, vm->def->name, vm->def->uuid); > + goto cleanup; > + } > + > +error: > + if (libxlVmReap(driver, vm, VIR_DOMAIN_SHUTOFF_SAVED)) { > + virReportError(VIR_ERR_INTERNAL_ERROR, > + _("Failed to destroy domain '%d'"), vm->def->id); > + goto cleanup; > + } > + event = virDomainEventNewFromObj(vm, VIR_DOMAIN_EVENT_STOPPED, > + VIR_DOMAIN_EVENT_STOPPED_SAVED); > + if (!vm->persistent) { > + virDomainObjListRemove(driver->domains, vm); > + vm = NULL; > + } > + > +cleanup: > + virURIFree(uri_p); > + if (vm) > + virObjectUnlock(vm); > + if (event) > + libxlDomainEventQueue(driver, event); > + virObjectUnref(cfg); > + return dom; > +} > + > +static int > +libxlDomainMigrateConfirm3(virDomainPtr domain, > + const char *cookiein ATTRIBUTE_UNUSED, > + int cookieinlen ATTRIBUTE_UNUSED, > + unsigned long flags, > + int cancelled) > +{ > + libxlDriverPrivatePtr driver = domain->conn->privateData; > + libxlDriverConfigPtr cfg = libxlDriverConfigGet(driver); > + virDomainObjPtr vm; > + libxlDomainObjPrivatePtr priv; > + virDomainEventPtr event = NULL; > + int ret = -1; > + > + virCheckFlags(LIBXL_MIGRATION_FLAGS, -1); > + > + vm = virDomainObjListFindByUUID(driver->domains, domain->uuid); > + if (!vm) { > + char uuidstr[VIR_UUID_STRING_BUFLEN]; > + virUUIDFormat(domain->uuid, uuidstr); > + virReportError(VIR_ERR_NO_DOMAIN, > + _("no domain with matching uuid '%s'"), uuidstr); > + goto cleanup; > + } here. > + > + if (virDomainMigrateConfirm3EnsureACL(domain->conn, vm->def) < 0) > + goto cleanup; > + > + if (cancelled) { > + priv = vm->privateData; > + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", > + _("migration failed, try to resume on our end")); > + if (!libxl_domain_resume(priv->ctx, vm->def->id, 0, 0)) { > + ret = 0; > + } else { > + VIR_DEBUG("Failed to resume domain '%d' with libxenlight", > + vm->def->id); > + virDomainObjSetState(vm, VIR_DOMAIN_PAUSED, > VIR_DOMAIN_PAUSED_MIGRATION); > + event = virDomainEventNewFromObj(vm, > VIR_DOMAIN_EVENT_SUSPENDED, > + > VIR_DOMAIN_EVENT_SUSPENDED_MIGRATED); > + if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm) < 0) > + goto cleanup; > + } > + > + goto cleanup; > + } > + > + if (libxlVmReap(driver, vm, VIR_DOMAIN_SHUTOFF_SAVED)) { > + virReportError(VIR_ERR_INTERNAL_ERROR, > + _("Failed to destroy domain '%d'"), vm->def->id); > + goto cleanup; > + } > + > + event = virDomainEventNewFromObj(vm, VIR_DOMAIN_EVENT_STOPPED, > + VIR_DOMAIN_EVENT_STOPPED_SAVED); > + > + if (flags & VIR_MIGRATE_UNDEFINE_SOURCE) > + virDomainDeleteConfig(cfg->configDir, cfg->autostartDir, vm); > + > + if (!vm->persistent || (flags & VIR_MIGRATE_UNDEFINE_SOURCE)) { > + virDomainObjListRemove(driver->domains, vm); > + vm = NULL; > + } > + > + VIR_DEBUG("Migration successful.\n"); > + ret = 0; > + > +cleanup: > + if (vm) > + virObjectUnlock(vm); > + if (event) > + libxlDomainEventQueue(driver, event); > + virObjectUnref(cfg); > + return ret; > +} > + > > static virDriver libxlDriver = { > .no = VIR_DRV_LIBXL, > @@ -4249,6 +4885,11 @@ static virDriver libxlDriver = { > #ifdef LIBXL_HAVE_DOMAIN_NODEAFFINITY > .domainGetNumaParameters = libxlDomainGetNumaParameters, /* 1.1.1 */ > #endif > + .domainMigrateBegin3 = libxlDomainMigrateBegin3, /* 1.1.3 */ > + .domainMigratePrepare3 = libxlDomainMigratePrepare3, /* 1.1.3 */ > + .domainMigratePerform3 = libxlDomainMigratePerform3, /* 1.1.3 */ > + .domainMigrateFinish3 = libxlDomainMigrateFinish3, /* 1.1.3 */ > + .domainMigrateConfirm3 = libxlDomainMigrateConfirm3, /* 1.1.3 */ > .nodeGetFreeMemory = libxlNodeGetFreeMemory, /* 0.9.0 */ > .nodeGetCellsFreeMemory = libxlNodeGetCellsFreeMemory, /* 1.1.1 */ > .connectDomainEventRegister = libxlConnectDomainEventRegister, /* > 0.9.0 */ > diff --git a/src/libxl/libxl_driver.h b/src/libxl/libxl_driver.h > index a33d60c..25ac2b8 100644 > --- a/src/libxl/libxl_driver.h > +++ b/src/libxl/libxl_driver.h > @@ -24,6 +24,11 @@ > #ifndef LIBXL_DRIVER_H > # define LIBXL_DRIVER_H > > +# define LIBXL_MIGRATION_FLAGS \ > + (VIR_MIGRATE_LIVE | \ > + VIR_MIGRATE_UNDEFINE_SOURCE | \ > + VIR_MIGRATE_PAUSED) > + > int libxlRegister(void); > > #endif /* LIBXL_DRIVER_H */ > -- > 1.6.0.2 > > -- > libvir-list mailing list > libvir-list(a)redhat.com > https://www.redhat.com/mailman/listinfo/libvir-list >

1 0

[libvirt] [PATCH] virsh-volume: Add missing check when calling virStreamNew
by Hongwei Bi 30 Sep '13

30 Sep '13

Check return value of virStreamNew when called by cmdVolUpload and cmdVolDownload. --- tools/virsh-volume.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/tools/virsh-volume.c b/tools/virsh-volume.c index 7dab532..e8b0d9a 100644 --- a/tools/virsh-volume.c +++ b/tools/virsh-volume.c @@ -665,7 +665,9 @@ cmdVolUpload(vshControl *ctl, const vshCmd *cmd) goto cleanup; } - st = virStreamNew(ctl->conn, 0); + if (!(st = virStreamNew(ctl->conn, 0))) + goto cleanup; + if (virStorageVolUpload(vol, st, offset, length, 0) < 0) { vshError(ctl, _("cannot upload to volume %s"), name); goto cleanup; @@ -775,7 +777,9 @@ cmdVolDownload(vshControl *ctl, const vshCmd *cmd) created = true; } - st = virStreamNew(ctl->conn, 0); + if (!(st = virStreamNew(ctl->conn, 0))) + goto cleanup; + if (virStorageVolDownload(vol, st, offset, length, 0) < 0) { vshError(ctl, _("cannot download from volume %s"), name); goto cleanup; -- 1.7.1

2 2

[libvirt] libvirt: How to boot VM in esx?
by varun bhatnagar 30 Sep '13

30 Sep '13

Hi, Im not able to boot my VM on esx hypervisor using libvirt. It says NO Operating System found. Can anyone help? Regards, Varun

1 1