- Devel - libvirt List Archives

[libvirt] [Patch v3 0/2] Add new feature into live migration
by Wen Congyang 20 Dec '10

20 Dec '10

If the memory of guest OS is changed constantly, the live migration can not be ended ever for ever. We can use the command 'virsh migrate-setmaxdowntime' to control the live migration. But the value of maxdowntime is diffcult to calculate because it depends on the transfer speed of network and constantly changing memroy size. We need a easy way to control the live migration. This patch set add the support of auto cold migration fallback on timeout. With this patch set, when we migrate the guest OS, we can specify a timeout. If the live migration timeouts, the migration will fallback to cold migration. Test of this patchset on Linux: Env: a. The size of guest OS's memory: 1GB b. The transfer speed of network: about 100Mb/s c. The size of constantly changing memory: more than 900MB 1. migrate without timeout # virsh migrate --live RHEL6RC qemu+ssh://<dest IP>/system tcp://<dest IP>:49152 The migration does not end after 12 hours. 2. migrate with timeout(30 minutes): # date Fri Dec 17 15:35:24 CST 2010 # virsh migrate --live --timeout 1800 RHEL6RC qemu+ssh://<dest IP>/system tcp:<dest IP>:49152 # date Fri Dec 17 16:05:51 CST 2010 v3: - use the existing virEventXXXTimeout() APT to implement timer v2: - implement timer for Windows - implement dynamic timers Wen Congyang (2): timer impl auto cold migration fallback at timeout tools/Makefile.am | 1 + tools/timer.c | 170 +++++++++++++++++++++++++++++++++++++++++++++++++++++ tools/timer.h | 38 ++++++++++++ tools/virsh.c | 69 +++++++++++++++++++++ 4 files changed, 278 insertions(+), 0 deletions(-) create mode 100644 tools/timer.c create mode 100644 tools/timer.h

3 8

[libvirt] Java Bindings Memory Leak
by Jason K Yellick 18 Dec '10

18 Dec '10

1 0

[libvirt] [C# bindings] [PATCH]
by arnaud.champion＠devatom.fr 18 Dec '10

18 Dec '10

?Hi there, a long time since some update for C# bindings, sorry, I'm a little busy. Anyway here are some patches that correct marshaling around network functions, and as usual a new sample code related to network functions. Regards, Arnaud

2 3

[libvirt] [PATCH] maint: improve tests distribution
by Eric Blake 17 Dec '10

17 Dec '10

* tests/Makefile.am (EXTRA_DIST): Sort, and add directories. (SUBDIRS): Drop automake recursion into subdirs. * tests/commanddata/Makefile.am: Delete. * tests/confdata/Makefile.am: Likewise. * tests/sexpr2xmldata/Makefile.am: Likewise. * tests/xencapsdata/Makefile.am: Likewise. * tests/xmconfigdata/Makefile.am: Likewise. * tests/xml2sexprdata/Makefile.am: Likewise. --- This deletes more than it adds; the worst part of the diff is that I mixed sorting with addition. Let me know if you want those actions split into two pieces for easier review. configure.ac | 6 ---- tests/Makefile.am | 57 ++++++++++++++++++++------------------ tests/commanddata/Makefile.am | 2 - tests/confdata/Makefile.am | 2 - tests/sexpr2xmldata/Makefile.am | 2 - tests/xencapsdata/Makefile.am | 3 -- tests/xmconfigdata/Makefile.am | 2 - tests/xml2sexprdata/Makefile.am | 2 - 8 files changed, 30 insertions(+), 46 deletions(-) delete mode 100644 tests/commanddata/Makefile.am delete mode 100644 tests/confdata/Makefile.am delete mode 100644 tests/sexpr2xmldata/Makefile.am delete mode 100644 tests/xencapsdata/Makefile.am delete mode 100644 tests/xmconfigdata/Makefile.am delete mode 100644 tests/xml2sexprdata/Makefile.am diff --git a/configure.ac b/configure.ac index 64e76dc..a52a03c 100644 --- a/configure.ac +++ b/configure.ac @@ -2251,12 +2251,6 @@ AC_OUTPUT(Makefile src/Makefile include/Makefile docs/Makefile \ daemon/Makefile \ tools/Makefile \ tests/Makefile \ - tests/xml2sexprdata/Makefile \ - tests/sexpr2xmldata/Makefile \ - tests/xmconfigdata/Makefile \ - tests/xencapsdata/Makefile \ - tests/confdata/Makefile \ - tests/commanddata/Makefile \ examples/apparmor/Makefile \ examples/domain-events/events-c/Makefile \ examples/domsuspend/Makefile \ diff --git a/tests/Makefile.am b/tests/Makefile.am index 0a235cf..de2ff91 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -2,9 +2,6 @@ SHELL = $(PREFERABLY_POSIX_SHELL) -SUBDIRS = commanddata confdata sexpr2xmldata \ - xml2sexprdata xmconfigdata xencapsdata - INCLUDES = \ -I$(top_srcdir)/gnulib/lib -I../gnulib/lib \ -I$(top_builddir)/include \ @@ -39,38 +36,44 @@ LDADDS = \ $(COVERAGE_LDFLAGS) EXTRA_DIST = \ - oomtrace.pl \ - test-lib.sh \ - qemuxml2argvdata \ - qemuxml2xmloutdata \ - nodeinfodata \ - schematestutils.sh \ - capabilityschematest \ capabilityschemadata \ - networkschematest \ - networkxml2xmlout \ - networkxml2xmlin \ - domainschematest \ + capabilityschematest \ + commanddata \ + confdata \ + cputestdata \ domainschemadata \ + domainschematest \ + domainsnapshotschematest \ + domainsnapshotxml2xmlin \ + domainsnapshotxml2xmlout \ interfaceschemadata \ + networkschematest \ + networkxml2xmlin \ + networkxml2xmlout \ + nodedevschemadata \ + nodedevschematest \ + nodeinfodata \ + nwfilterschematest \ + nwfilterxml2xmlin \ + nwfilterxml2xmlout \ + oomtrace.pl \ + qemuhelpdata \ + qemuxml2argvdata \ + qemuxml2xmloutdata \ + schematestutils.sh \ + sexpr2xmldata \ storagepoolschematest \ - storagepoolxml2xmlout \ storagepoolxml2xmlin \ + storagepoolxml2xmlout \ storagevolschematest \ - storagevolxml2xmlout \ storagevolxml2xmlin \ - nodedevschematest \ - nodedevschemadata \ + storagevolxml2xmlout \ + test-lib.sh \ vmx2xmldata \ - xml2vmxdata \ - nwfilterxml2xmlout \ - nwfilterxml2xmlin \ - nwfilterschematest \ - domainsnapshotschematest \ - domainsnapshotxml2xmlout \ - domainsnapshotxml2xmlin \ - qemuhelpdata \ - cputestdata + xencapsdata \ + xmconfigdata \ + xml2sexprdata \ + xml2vmxdata check_PROGRAMS = virshtest conftest sockettest \ nodeinfotest qparamtest virbuftest \ diff --git a/tests/commanddata/Makefile.am b/tests/commanddata/Makefile.am deleted file mode 100644 index ea0f8e1..0000000 --- a/tests/commanddata/Makefile.am +++ /dev/null @@ -1,2 +0,0 @@ -EXTRA_DIST = \ - $(patsubst $(srcdir)/%,%,$(wildcard $(srcdir)/*.log)) diff --git a/tests/confdata/Makefile.am b/tests/confdata/Makefile.am deleted file mode 100644 index eaaadbc..0000000 --- a/tests/confdata/Makefile.am +++ /dev/null @@ -1,2 +0,0 @@ -EXTRA_DIST = \ - $(patsubst $(srcdir)/%,%,$(wildcard $(srcdir)/*.out $(srcdir)/*.conf)) diff --git a/tests/sexpr2xmldata/Makefile.am b/tests/sexpr2xmldata/Makefile.am deleted file mode 100644 index db43109..0000000 --- a/tests/sexpr2xmldata/Makefile.am +++ /dev/null @@ -1,2 +0,0 @@ -EXTRA_DIST = \ - $(patsubst $(srcdir)/%,%,$(wildcard $(srcdir)/*.xml $(srcdir)/*.sexpr)) diff --git a/tests/xencapsdata/Makefile.am b/tests/xencapsdata/Makefile.am deleted file mode 100644 index ed08bc4..0000000 --- a/tests/xencapsdata/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ -EXTRA_DIST = \ - $(patsubst $(srcdir)/%,%,$(wildcard \ - $(srcdir)/*.xml $(srcdir)/*.cpuinfo $(srcdir)/*.caps)) diff --git a/tests/xmconfigdata/Makefile.am b/tests/xmconfigdata/Makefile.am deleted file mode 100644 index af0cb09..0000000 --- a/tests/xmconfigdata/Makefile.am +++ /dev/null @@ -1,2 +0,0 @@ -EXTRA_DIST = \ - $(patsubst $(srcdir)/%,%,$(wildcard $(srcdir)/*.xml $(srcdir)/*.cfg)) diff --git a/tests/xml2sexprdata/Makefile.am b/tests/xml2sexprdata/Makefile.am deleted file mode 100644 index 20028bb..0000000 --- a/tests/xml2sexprdata/Makefile.am +++ /dev/null @@ -1,2 +0,0 @@ -EXTRA_DIST = \ - $(patsubst $(srcdir)/%,%,$(wildcard $(srcdir)/*.xml $(srcdir)/*.sexpr)) -- 1.7.3.3

2 2

[libvirt] [PATCH] build: fix typo that broke 'make dist'
by Eric Blake 17 Dec '10

17 Dec '10

* src/Makefile.am (QEMU_DRIVER_SOURCES): Ship qemu_cgroup.h. --- Pushing this under the build-breaker rule, to fix 'make distcheck'. src/Makefile.am | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 64e890f..55d96df 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -271,7 +271,7 @@ QEMU_DRIVER_SOURCES = \ qemu/qemu_command.c qemu/qemu_command.h \ qemu/qemu_domain.c qemu/qemu_domain.h \ qemu/qemu_audit.c qemu/qemu_audit.h \ - qemu/qemu_cgroup.c qemu/qemu_cgroup.c \ + qemu/qemu_cgroup.c qemu/qemu_cgroup.h \ qemu/qemu_hostdev.c qemu/qemu_hostdev.h \ qemu/qemu_hotplug.c qemu/qemu_hotplug.h \ qemu/qemu_conf.c qemu/qemu_conf.h \ -- 1.7.3.3

1 0

[libvirt] [PATCH] Adapt test suite to code movement in the QEMU driver
by Matthias Bolte 17 Dec '10

17 Dec '10

--- tests/qemuargv2xmltest.c | 1 + tests/qemuhelptest.c | 5 +++-- tests/qemuxml2argvtest.c | 8 +++++--- tests/testutilsqemu.c | 6 ++---- 4 files changed, 11 insertions(+), 9 deletions(-) diff --git a/tests/qemuargv2xmltest.c b/tests/qemuargv2xmltest.c index adff05a..dfb9d99 100644 --- a/tests/qemuargv2xmltest.c +++ b/tests/qemuargv2xmltest.c @@ -14,6 +14,7 @@ # include "internal.h" # include "testutils.h" # include "qemu/qemu_conf.h" +# include "qemu/qemu_command.h" # include "testutilsqemu.h" diff --git a/tests/qemuhelptest.c b/tests/qemuhelptest.c index 6ff1feb..3f82692 100644 --- a/tests/qemuhelptest.c +++ b/tests/qemuhelptest.c @@ -7,6 +7,7 @@ # include "testutils.h" # include "qemu/qemu_conf.h" +# include "qemu/qemu_capabilities.h" # define MAX_HELP_OUTPUT_SIZE 1024*64 @@ -50,8 +51,8 @@ static int testHelpStrParsing(const void *data) if (virtTestLoadFile(path, &help, MAX_HELP_OUTPUT_SIZE) < 0) return -1; - if (qemudParseHelpStr("QEMU", help, &flags, - &version, &is_kvm, &kvm_version) == -1) + if (qemuCapsParseHelpStr("QEMU", help, &flags, + &version, &is_kvm, &kvm_version) == -1) return -1; if (flags != info->flags) { diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 5387432..158204d 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -14,6 +14,8 @@ # include "internal.h" # include "testutils.h" # include "qemu/qemu_conf.h" +# include "qemu/qemu_command.h" +# include "qemu/qemu_capabilities.h" # include "datatypes.h" # include "cpu/cpu_map.h" @@ -110,9 +112,9 @@ static int testCompareXMLToArgvFiles(const char *xml, free(virtTestLogContentAndReset()); virResetLastError(); - if (!(cmd = qemudBuildCommandLine(conn, &driver, - vmdef, &monitor_chr, false, flags, - migrateFrom, NULL, VIR_VM_OP_CREATE))) + if (!(cmd = qemuBuildCommandLine(conn, &driver, + vmdef, &monitor_chr, false, flags, + migrateFrom, NULL, VIR_VM_OP_CREATE))) goto fail; if (!!virGetLastError() != expectError) { diff --git a/tests/testutilsqemu.c b/tests/testutilsqemu.c index 72fc8aa..bfac307 100644 --- a/tests/testutilsqemu.c +++ b/tests/testutilsqemu.c @@ -8,6 +8,7 @@ # include "memory.h" # include "cpu_conf.h" # include "qemu/qemu_driver.h" +# include "qemu/qemu_domain.h" static virCapsGuestMachinePtr *testQemuAllocMachines(int *nmachines) { @@ -102,10 +103,7 @@ virCapsPtr testQemuCapsInit(void) { (machines = testQemuAllocMachines(&nmachines)) == NULL) goto cleanup; - caps->ns.parse = qemuDomainDefNamespaceParse; - caps->ns.free = qemuDomainDefNamespaceFree; - caps->ns.format = qemuDomainDefNamespaceFormatXML; - caps->ns.href = qemuDomainDefNamespaceHref; + qemuDomainSetNamespaceHooks(caps); if ((guest = virCapabilitiesAddGuest(caps, "hvm", "i686", 32, "/usr/bin/qemu", NULL, -- 1.7.0.4

2 2

[libvirt] Require Python library source code
by Sridhar Ravindran 17 Dec '10

17 Dec '10

Hi, I require python library source code. Currently , "C" source code alone is available and Python API support is given as package. Thanks Sridhar.R

2 1

[libvirt] [PATCH v2 1/2] timer impl
by Wen Congyang 17 Dec '10

17 Dec '10

* src/util/timer.c src/util/timer.h src/util/timer_linux.c src/util/timer_win32.c: timer implementation * src/Makefile.am: build timer * src/libvirt_private.syms: Export public functions * src/libvirt.c: Initialize timer * configure.ac: check the functions in librt used by timer Signed-off-by: Wen Congyang <wency(a)cn.fujitsu.com> --- configure.ac | 4 + src/Makefile.am | 6 +- src/libvirt.c | 2 + src/libvirt_private.syms | 6 ++ src/util/timer.c | 166 ++++++++++++++++++++++++++++++++++++++++++++++ src/util/timer.h | 37 ++++++++++ src/util/timer_linux.c | 130 ++++++++++++++++++++++++++++++++++++ src/util/timer_win32.c | 128 +++++++++++++++++++++++++++++++++++ 8 files changed, 477 insertions(+), 2 deletions(-) create mode 100644 src/util/timer.c create mode 100644 src/util/timer.h create mode 100644 src/util/timer_linux.c create mode 100644 src/util/timer_win32.c diff --git a/configure.ac b/configure.ac index 64e76dc..49b77c5 100644 --- a/configure.ac +++ b/configure.ac @@ -107,6 +107,10 @@ LIBS="$LIBS $LIB_PTHREAD" AC_CHECK_FUNCS([pthread_sigmask pthread_mutexattr_init]) LIBS=$old_libs +dnl Availability of rt functions +AC_CHECK_LIB([rt],[timer_gettime],[]) +AC_CHECK_FUNCS([clock_gettime timer_create timer_settime timer_delete]) + dnl Availability of various common headers (non-fatal if missing). AC_CHECK_HEADERS([pwd.h paths.h regex.h sys/syslimits.h sys/un.h \ sys/poll.h syslog.h mntent.h net/ethernet.h linux/magic.h \ diff --git a/src/Makefile.am b/src/Makefile.am index 196d8af..13a66be 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -79,9 +79,11 @@ UTIL_SOURCES = \ util/util.c util/util.h \ util/xml.c util/xml.h \ util/virtaudit.c util/virtaudit.h \ - util/virterror.c util/virterror_internal.h + util/virterror.c util/virterror_internal.h \ + util/timer.c util/timer.h -EXTRA_DIST += util/threads-pthread.c util/threads-win32.c +EXTRA_DIST += util/threads-pthread.c util/threads-win32.c \ + util/timer_linux.c # Internal generic driver infrastructure NODE_INFO_SOURCES = nodeinfo.h nodeinfo.c diff --git a/src/libvirt.c b/src/libvirt.c index 4188b45..a5578c0 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -40,6 +40,7 @@ #include "util.h" #include "memory.h" #include "configmake.h" +#include "timer.h" #ifndef WITH_DRIVER_MODULES # ifdef WITH_TEST @@ -329,6 +330,7 @@ virInitialize(void) if (virThreadInitialize() < 0 || virErrorInitialize() < 0 || + virTimerInitialize() < 0 || virRandomInitialize(time(NULL) ^ getpid())) return -1; diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 0e3033d..928316a 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -787,6 +787,12 @@ virThreadJoin; virThreadSelf; virThreadSelfID; +# timer.h +get_clock; +virNewTimer; +virFreeTimer; +virModTimer; +virDelTimer; # usb.h usbDeviceFileIterate; diff --git a/src/util/timer.c b/src/util/timer.c new file mode 100644 index 0000000..2a62a39 --- /dev/null +++ b/src/util/timer.c @@ -0,0 +1,166 @@ +/* + * timer.c: timer functions + * + * Copyright (C) 2010 Fujitsu Limited + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * Author: Wen Congyang <wency(a)cn.fujitsu.com> + */ + +#include <config.h> + +#include <unistd.h> + +#include "timer.h" +#include "virterror_internal.h" +#include "memory.h" + +#define VIR_FROM_THIS VIR_FROM_NONE + +struct virTimer { + uint64_t expire_time; + virTimerCB function; + void *data; + virTimerPtr next; +}; + +static virTimerPtr timer_list = NULL; +static void realarm_timer(void); +static void __realarm_timer(uint64_t); +static int timer_fd[2] = {-1, -1}; + +virTimerPtr virNewTimer(virTimerCB callback, void *data) +{ + virTimerPtr timer = NULL; + + if (VIR_ALLOC(timer) < 0) { + virReportOOMError(); + return NULL; + } + + timer->function = callback; + timer->data = data; + + return timer; +} + +void virFreeTimer(virTimerPtr timer) +{ + VIR_FREE(timer); +} + +void virDelTimer(virTimerPtr timer) +{ + virTimerPtr *pt, t; + + pt = &timer_list; + for (t = *pt; t; t = t->next) { + if (t == timer) { + *pt = t->next; + break; + } + pt = &t->next; + } + + realarm_timer(); +} + +void virModTimer(virTimerPtr timer, uint64_t expire_time) +{ + virTimerPtr *pt, t; + + virDelTimer(timer); + + pt = &timer_list; + for (t = *pt; t; t = t->next) { + if (t->expire_time > expire_time) + break; + pt = &t->next; + } + timer->expire_time = expire_time; + timer->next = *pt; + *pt = timer; + + realarm_timer(); +} + +static void realarm_timer() +{ + if (!timer_list) + return; + + __realarm_timer(timer_list->expire_time); +} + +static void timer_handler(void) +{ + uint64_t current_time = 0; + virTimerPtr *timer_list_head = &timer_list; + virTimerPtr timer = NULL; + + if (!timer_list) + return; + + current_time = get_clock(); + for (timer = timer_list; timer; timer = timer->next) { + if (current_time < timer->expire_time) + break; + + /* remove timer from the list before calling the callback */ + *timer_list_head = timer->next; + timer->next = NULL; + timer->function(timer->data); + + /* timer->function may take a while, so we should update cuttent_time */ + current_time = get_clock(); + } + + realarm_timer(); +} + +static void timer_loop(void *arg ATTRIBUTE_UNUSED) +{ + fd_set readfds; + int ret; + int readinfo = 0; + + while(1) { + FD_ZERO(&readfds); + FD_SET(timer_fd[0], &readfds); + + reselect: + ret = select(timer_fd[0] + 1, &readfds, NULL, NULL, NULL); + if (ret < 0) { + if (errno == EAGAIN || errno == EINTR) + goto reselect; + else + continue; + } + + ret = read(timer_fd[0], &readinfo, sizeof(int)); + timer_handler(); + } + + return; +} + +#if defined HAVE_TIMER_CREATE +#include "timer_linux.c" +#elif defined WIN32 +#include "timer_win32.c" +#else +# error "gnu timer is required" +#endif diff --git a/src/util/timer.h b/src/util/timer.h new file mode 100644 index 0000000..f521c1b --- /dev/null +++ b/src/util/timer.h @@ -0,0 +1,37 @@ +/* + * timer.h: structure and entry points for timer support + * + * Copyright (C) 2010 Fujitsu Limited + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * Author: Wen Congyang <wency(a)cn.fujitsu.com> + */ + +#ifndef __VIR_TIMER_H__ +# define __VIR_TIMER_H__ + +#include <stdint.h> +typedef struct virTimer virTimer; +typedef virTimer *virTimerPtr; +typedef void (*virTimerCB)(void *); + +extern uint64_t get_clock(void); +extern virTimerPtr virNewTimer(virTimerCB, void *); +extern void virFreeTimer(virTimerPtr); +extern void virModTimer(virTimerPtr, uint64_t); +extern void virDelTimer(virTimerPtr); +extern int virTimerInitialize(void); +#endif /* __VIR_TIMER_H__ */ diff --git a/src/util/timer_linux.c b/src/util/timer_linux.c new file mode 100644 index 0000000..be483cf --- /dev/null +++ b/src/util/timer_linux.c @@ -0,0 +1,130 @@ +/* + * timer.c: timer functions + * + * Copyright (C) 2010 Fujitsu Limited + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * Author: Wen Congyang <wency(a)cn.fujitsu.com> + */ + +#include <unistd.h> +#include <sys/syscall.h> +#include <sys/types.h> +#include <stddef.h> +#include <time.h> +#include <sys/time.h> +#include <signal.h> +#include <sys/select.h> +#include <pthread.h> + +#include "timer.h" +#include "threads.h" + +static int timer_initialized = 0; +static pthread_attr_t timer_thread_attr; +static timer_t timer_id; + +uint64_t get_clock(void) +{ + struct timespec ts; + + clock_gettime(CLOCK_MONOTONIC, &ts); + return ts.tv_sec * 1000000000ULL + ts.tv_nsec; +} + +static void __realarm_timer(uint64_t next_time) +{ + uint64_t current_time = 0; + uint64_t timeout = 0; + struct itimerspec its; + + current_time = get_clock(); + if (current_time < next_time) { + timeout = next_time - current_time; + } else { + timeout = 1; + } + + its.it_interval.tv_sec = 0; + its.it_interval.tv_nsec = 0; + its.it_value.tv_sec = timeout / 1000000000ULL; + its.it_value.tv_nsec = timeout % 1000000000ULL; + + timer_settime(timer_id, 0, &its, NULL); +} + +static void timer_nofity_thread(sigval_t sigev_value ATTRIBUTE_UNUSED) +{ + int write_info = 1; + int ret; + + ret = write(timer_fd[1], &write_info, sizeof(int)); +} + +int virTimerInitialize(void) +{ + struct sigevent timer_event; + struct itimerspec its; + struct virThread timer_thread; + struct timespec ts; + int ret; + + if (timer_initialized) + return 0; + + /* Make sure we can use system call clock_gettime(), so we can ignore the + * return value of clock_gettime() in the function get_clock(). + */ + ret = clock_gettime(CLOCK_MONOTONIC, &ts); + if (ret != 0) + return -1; + + ret = pipe(timer_fd); + if (ret < 0) + return -1; + + pthread_attr_init(&timer_thread_attr); + pthread_attr_setdetachstate(&timer_thread_attr, 1); + + timer_event.sigev_notify = SIGEV_THREAD; + timer_event.sigev_notify_function = timer_nofity_thread; + timer_event.sigev_notify_attributes = &timer_thread_attr; + timer_event.sigev_value.sival_ptr = NULL; + ret = timer_create(CLOCK_MONOTONIC, &timer_event, &timer_id); + if (ret != 0) + return -1; + + its.it_interval.tv_sec = 0; + its.it_interval.tv_nsec = 0; + its.it_value.tv_sec = 0; + its.it_value.tv_nsec = 0; + + /* Make sure we can use system call timer_settime(), so we can ignore the + * return value of timer_settime() in the function __realarm_timer(). + */ + ret = timer_settime(timer_id, 0, &its, NULL); + if (ret != 0) { + timer_delete(timer_id); + return -1; + } + + if (virThreadCreate(&timer_thread, 0, timer_loop, NULL) < 0) { + timer_delete(timer_id); + return -1; + } + + return 0; +} diff --git a/src/util/timer_win32.c b/src/util/timer_win32.c new file mode 100644 index 0000000..98248f7 --- /dev/null +++ b/src/util/timer_win32.c @@ -0,0 +1,128 @@ +/* + * timer.c: timer functions + * + * Copyright (C) 2010 Fujitsu Limited + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * Author: Wen Congyang <wency(a)cn.fujitsu.com> + */ + +#include <windows.h> +#include <mmsystem.h> +#include <stdint.h> + +#include "threads.h" + +uint64_t clock_frequency = 0; +uint64_t ticks_per_second = 1000000000; +uint period = 0; +MMRESULT timer_id; + +uint64_t get_clock(void) +{ + LARGE_INTEGER time; + LARGE_INTEGER result; + uint64_t result_low, result_high; + + QueryPerformanceCounter(&time); + + /* calculate time * ticks_per_second / clock_frequency */ + result_high = (uint64_t)time.HighPart * ticks_per_second; + result_low = (uint64_t)time.LowPart * ticks_per_second; + result_high += result_low >> 32; + result_low = ((result_high % clock_frequency) << 32) + + result_low & 0xFFFFFFFF; + result.HighPart = result_high / clock_frequency; + result.LowPart = result_low / clock_frequency; + + return result.QuadPart; +} + +static void CALLBACK wakeup_timer(UINT uTimerID, UINT uMsg, + DWORD_PTR dwUser, DWORD_PTR dw1, + DWORD_PTR dw2) +{ + int write_info = 1; + int ret; + + ret = write(timer_fd[1], &write_info, sizeof(int)); +} + +static void __realarm_timer(uint64_t next_time) +{ + uint64_t current_time = 0; + UINT timeout = 0; + UINT flags; + + current_time = get_clock(); + if (current_time + 100000ULL < next_time) { + timeout = (next_time - current_time) / 1000000ULL; + } else { + timeout = 1; + } + + flags = TIME_CALLBACK_FUNCTION | TIME_ONESHOT; + timer_id = timeSetEvent(timeout, period, wakeup_timer, + (DWORD_PTR)NULL, flags); +} + +int virTimerInitialize(void) +{ + LARGE_INTEGER frequency; + int ret; + TIMECAPS timecaps; + MMRESULT mmresult; + UINT flags; + struct virThread timer_thread; + + ret = pipe(timer_fd); + if (ret < 0) + return -1; + + ret = QueryPerformanceFrequency(&frequency); + if (ret != 0) { + return -1; + } + clock_frequency = frequency.QuadPart; + + memset(&timecaps, 0, sizeof(TIMECAPS)); + mmresult = timeGetDevCaps(&timecaps, sizeof(TIMECAPS)); + if (mmresult != MMSYSERR_NOERROR) + return -1; + period = timecaps.wPeriodMin; + + mmresult = timeBeginPeriod(period); + if (mmresult != TIMERR_NOERROR) + return -1; + + /* Make sure we can use timeSetEvent(), so we can ignore the return value + * of timeSetEvent() in the function __realarm_timer(). + */ + flags = TIME_CALLBACK_FUNCTION | TIME_ONESHOT; + mmresult = timeSetEvent(1000, period, wakeup_timer, (DWORD_PTR)NULL, flags); + if (!mmresult) { + timeEndPeriod(period); + return -1; + } + timeKillEvent(mmresult); + + if (virThreadCreate(&timer_thread, 0, timer_loop, NULL) < 0) { + timeEndPeriod(period); + return -1; + } + + return 0; +} -- 1.7.1

4 9

[libvirt] [PATCH 00/10] Re-arrange the QEMU driver code
by Daniel P. Berrange 17 Dec '10

17 Dec '10

The QEMU driver is getting horribly large & I constantly find myself getting lost in it. This series re-arranges the code, pulling out the following areas of functionality into new files - capabilities construction - command line arg generation/parsing - domain private data / namespace handling - audit reporting - cgroup management - host device management - device hotplug There is no functional change in any of these patches. A handful of methods have been renamed if they started with the obsolete 'qemud' prefix. Since these patches will massively conflict with any further patches to the QEMU driver, the sooner they're applied the better... There is more to be pulled out later which is slightly more entangled / difficult - Events - Process startup/shutdown - Migration Daniel

2 27

[libvirt] VolumeCreateXML "XML" description for ESX
by Sherif Nagy 16 Dec '10

16 Dec '10

Hello, I am using libvirt 0.8.6 "python bindings " can someone point me to where i find the XML description of creating volumes using storagecolumecreateXML function ? i am getting libvir: ESX error : internal error Volume name 'nameXXXX.vmdk' doesn't have expected format '<directory>/<file>' thank you regards, Sherif

3 9

[libvirt] [PATCH] maint: doc fix
by Eric Blake 16 Dec '10

16 Dec '10

* src/libvirt.c: Avoid duplicate word. --- I'm pushing this under the trivial rule. src/libvirt.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/libvirt.c b/src/libvirt.c index 4188b45..ff2ac93 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -3297,7 +3297,7 @@ error: * @flags: currently unused, pass 0 * * Reads a domain XML configuration document, and generates - * generates a native configuration file describing the domain. + * a native configuration file describing the domain. * The format of the native data is hypervisor dependant. * * Returns a 0 terminated UTF-8 encoded native config datafile, or NULL in case of error. -- 1.7.3.3

1 0

[libvirt] [Patch v4] Add VMware Workstation and Player driver
by Jean-Baptiste Rouault 16 Dec '10

16 Dec '10

* Changes since v3: Fix x86_64 guests support checking Use UNIX PID for the VM ID Use virDomainObjIsDuplicate() where applicable Remove the (normally) last duplicated errors Various minor fixes

2 2

[libvirt] [PATCH 0/8] Early preview: Re-factoring XDR RPC code
by Daniel P. Berrange 16 Dec '10

16 Dec '10

NB: This patch series isn't intended to be applied yet. The current remote driver and libvirtd daemon have a horrible mix of network I/O, RPC dispatch and RPC handling functionality. It it neccessary to introduce a new daemon to provide a lock manager for VM disks. Doing so would effectively require cut+paste of a large part of libvirtd code since there are no reusable APis in it. Likewise for the client side. To address this problem, this series is an attempt to produce a reusable set of APIs for building RPC servers and clients. The new APIs will handle all the networking/sockets functionality and all the RPC dispatch/serialization/deserialization code. This will enable libvirtd and the remote driver to be gutted, so that they only contain the code for actually implementing the RPC handlers. Thus a lock daemon + lock plugin can be provided without any code duplication. This will also make it far easier for us to introduce new RPC programs, eg an administrative program to allow libvirtd itself to be manipulated, say, to changing logging levels on the fly, kill mis-behaving network client, etc, etc. It would also make it practical to experiment with splitting libvirtd up into smaller daemons each handling one area of functionality. This would in turn make it practical to write useful SELinux policy for confining libvirt daemons This series is *far* from complete. The streams stuff is completely missing in the new APis. I have also not yet gutted libvirtd, only the remote driver. It is also not fully tested for ABI wire compatibility with existing libvirtd, though I believe it is correctly preserving ABI. The diffstat is slightly mis-leading because lots of code remains to be deleted from daemon/libvirtd.c and daemon/dispatch.c. None the less, it is expected that the total lines will increase, but this wll be offset by the improved code clarity and separation of functionality. Daniel daemon/event.c | 3 src/Makefile.am | 90 + src/remote/remote_driver.c | 2530 ++++++-------------------------------- src/rpc/virnetclient.c | 1237 ++++++++++++++++++ src/rpc/virnetclient.h | 60 src/rpc/virnetclientprogram.c | 258 +++ src/rpc/virnetclientprogram.h | 71 + src/rpc/virnetclientsaslcontext.c | 246 +++ src/rpc/virnetclientsaslcontext.h | 66 src/rpc/virnetmessage.c | 215 +++ src/rpc/virnetmessage.h | 31 src/rpc/virnetprotocol.c | 108 + src/rpc/virnetprotocol.h | 81 + src/rpc/virnetprotocol.x | 162 ++ src/rpc/virnetserver.c | 654 +++++++++ src/rpc/virnetserver.h | 74 + src/rpc/virnetserverclient.c | 974 ++++++++++++++ src/rpc/virnetserverclient.h | 40 src/rpc/virnetservermessage.h | 20 src/rpc/virnetserverprogram.c | 437 ++++++ src/rpc/virnetserverprogram.h | 76 + src/rpc/virnetserverservice.c | 208 +++ src/rpc/virnetserverservice.h | 32 src/rpc/virnetsocket.c | 715 ++++++++++ src/rpc/virnetsocket.h | 97 + src/rpc/virnettlscontext.c | 611 +++++++++ src/rpc/virnettlscontext.h | 63 src/util/logging.c | 4 src/util/threadpool.c | 178 ++ src/util/threadpool.h | 23 src/virtlockd.c | 620 +++++++++ 31 files changed, 7866 insertions(+), 2118 deletions(-)

3 27

[libvirt] contribution: qemu hook script to manage guests network bandwidth
by Dominik Klein 16 Dec '10

16 Dec '10

Hi we had the need to manage guests bandwidth. Therefore I wrote a qemu hook script that achieves this and, if there is any interest in that, would like to contribute it to the project. This script will only work on linux hosts. It effectively limits the bandwidth a guest can _send_. It only somewhat effectively limits the bandwidth a guest can _receive_. While well behaving tcp connections slow down when packets are being delayed/dropped, with udp, we are facing a different situation. During my tests, udp was always way slower (factor 10) than actually configured (using iperf -u). Since only tcp matters to us in this situation, we consider it "good enough". Also: This mechanism does by no means protect you from ddos or the like. So what does the script do? The script uses iptables to mark packets from- and to a virtual machine. Depending on these marks, packets will be filtered into tc classes which limit bandwidth to a configurable amount. The configuration allows for groups of vms which share an amount of bandwidth while each machine has its guaranteed bandwidth in high network usage situations. Documentation is part of the script. If you like, feel free to include it. If you have any comments or questions, talk! :) Regards Dominik

1 0

[libvirt] [C# bindings][PATCH]
by arnaud.champion＠devatom.fr 16 Dec '10

16 Dec '10

?Hi, here is another patch for C# bindings. I have update our project DAVIM with latest C# bindings and it show some naming errors. This patch correct it. Arnaud

2 1

[libvirt] "virsh setvcpus" does not work.
by Ken'ichi Ohmichi 16 Dec '10

16 Dec '10

Hi, I tested "virsh setvcpus" command and it did not work like the following: # virsh setvcpus RHEL5.5GA_Guest.img 2 error: internal error unable to execute QEMU command 'cpu_set': The command cpu_set has not been ound # Has this problem been fixed already on upstream ? o Test environment Host OS: RHEL6.0 (x86_64) qemu-kvm: 0.12.1.2-2.113.el6 libvirt : 0.8.1-27.el6 Guetst OS: RHEL5.5 o GDB output (gdb) b qerror_report_internal Breakpoint 1 at 0x497a50: file qerror.c, line 412. (gdb) c Continuing. [New Thread 0x7f726a9fc710 (LWP 23964)] Breakpoint 1, qerror_report_internal ( file=0x57e9d0 "/builddir/build/BUILD/qemu-kvm-0.12.1.2/monitor.c", linenr=4427, func=0x582af0 "handle_qmp_command", fmt=0x57ee90 "{ 'class': 'CommandNotFound', 'data': { 'name': %s } }") at qerror.c:412 412 { (gdb) bt #0 qerror_report_internal ( file=0x57e9d0 "/builddir/build/BUILD/qemu-kvm-0.12.1.2/monitor.c", linenr=4427, func=0x582af0 "handle_qmp_command", fmt=0x57ee90 "{ 'class': 'CommandNotFound', 'data': { 'name': %s } }") at qerror.c:412 #1 0x00000000004133ae in handle_qmp_command (parser=<value optimized out>, tokens=<value optimized out>) at /usr/src/debug/qemu-kvm-0.12.1.2/monitor.c:4427 #2 0x0000000000495d52 in json_message_process_token (lexer=0x1ab5d70, token=0x22037b0, type=JSON_OPERATOR, x=61, y=9170) at json-streamer.c:56 #3 0x0000000000495ab3 in json_lexer_feed_char (lexer=0x1ab5d70, ch=125 '}') at json-lexer.c:299 #4 0x0000000000495be7 in json_lexer_feed (lexer=0x1ab5d70, buffer=0x7ffff19b4510 "}F\232\001", size=1) at json-lexer.c:322 #5 0x00000000004124d2 in monitor_control_read (opaque=<value optimized out>, buf=<value optimized out>, size=<value optimized out>) at /usr/src/debug/qemu-kvm-0.12.1.2/monitor.c:4478 #6 0x00000000004b6b8a in qemu_chr_read (opaque=0x19a43a0) at qemu-char.c:154 #7 tcp_chr_read (opaque=0x19a43a0) at qemu-char.c:2072 #8 0x000000000040b4af in main_loop_wait (timeout=1000) at /usr/src/debug/qemu-kvm-0.12.1.2/vl.c:4234 #9 0x0000000000428a2a in kvm_main_loop () at /usr/src/debug/qemu-kvm-0.12.1.2/qemu-kvm.c:2133 #10 0x000000000040e5cb in main_loop (argc=<value optimized out>, argv=<value optimized out>, envp=<value optimized out>) at /usr/src/debug/qemu-kvm-0.12.1.2/vl.c:4444 #11 main (argc=<value optimized out>, argv=<value optimized out>, envp=<value optimized out>) at /usr/src/debug/qemu-kvm-0.12.1.2/vl.c:6601 (gdb) Thanks Ken'ichi Ohmichi

2 2

Re: [libvirt] system / session URI
by arnaud.champion＠devatom.fr 15 Dec '10

15 Dec '10

Okay, thanks for the explaination. This explain why I can't do some network thing with session URI ;) Thanks a lot Regards, Arnaud ---------------------------------------- De: "Eric Blake" <eblake(a)redhat.com> Envoyé: mercredi 15 décembre 2010 23:09 A: arnaud.champion(a)devatom.fr Objet: Re: [libvirt] system / session URI On 12/15/2010 02:19 PM, arnaud.champion(a)devatom.fr wrote: > ?Hi, > > Can someone explain (or point me to a document that explain) what are the differences between these two URI : > > qemu+tcp://xxx.xxx.xxx.xxx/system > qemu+tcp://xxx.xxx.xxx.xxx/session http://libvirt.org/uri.html#URI_qemu System URIs connect to the system libvirtd daemon (started by system init scripts), which is shared among all users on the machine, and which allows access to anything that requires superuser capabilities (such as creating tun devices for networking). Session URIs connect to a per-user daemon (which will be started automatically if needed), and which cannot access anything that the user cannot access (and unfortunately, given that no one has yet figured out how to make Linux share tun devices with ordinary users, that means that session guests are currently rather limited because they will not have networking support). The goal is to make things support full virtualization under session URIs, once the kernel adds the support we need for networking. -- Eric Blake eblake(a)redhat.com +1-801-349-2682 Libvirt virtualization library http://libvirt.org

1 0

[libvirt] system / session URI
by arnaud.champion＠devatom.fr 15 Dec '10

15 Dec '10

?Hi, Can someone explain (or point me to a document that explain) what are the differences between these two URI : qemu+tcp://xxx.xxx.xxx.xxx/system qemu+tcp://xxx.xxx.xxx.xxx/session Regards, Arnaud

2 1

[libvirt] [PATCH] Introduce yet another migration version in API.
by Daniel P. Berrange 15 Dec '10

15 Dec '10

Migration just seems togo from bad to worse. We already had to introduce a second migration protocol when adding the QEMU driver, since the one from Xen was insufficiently flexible to cope with passing the data the QEMU driver required. It turns out that this protocol still has some flaws that we need to address. The current sequence is * Src: DumpXML - Generate XML to pass to dst * Dst: Prepare - Get ready to accept incoming VM - Generate optional cookie to pass to src * Src: Perform - Start migration and wait for send completion - Kill off VM if successful, resume if failed * Dst: Finish - Wait for recv completion and check status - Kill off VM if unsuccessful The problems with this are: - Since the first step is a generic 'DumpXML' call, we can't add in other migration specific data. eg, we can't include any VM lease data from lock manager plugins - Since the first step is a generic 'DumpXML' call, we can't emit any 'migration begin' event on the source, or have any hook that runs right at the start of the process - Since there is no final step on the source, if the Finish method fails to receive all migration data & has to kill the VM, then there's no way to resume the original VM on the source This patch attempts to introduce a version 3 that uses the improved 5 step sequence * Src: Begin - Generate XML to pass to dst - Generate optional cookie to pass to dst * Dst: Prepare - Get ready to accept incoming VM - Generate optional cookie to pass to src * Src: Perform - Start migration and wait for send completion - Generate optional cookie to pass to dst * Dst: Finish - Wait for recv completion and check status - Kill off VM if failed, resume if success - Generate optional cookie to pass to src * Src: Confirm - Kill off VM if success, resume if failed The API is designed to allow both input and output cookies in all methods where applicable. This lets us pass around arbitrary extra driver specific data between src & dst during migration. Combined with the extra 'Begin' method this lets us pass lease information from source to dst at the start of migration Moving the killing of the source VM out of Perform and into Confirm, means we can now recover if the dst host can't successfully Finish receiving migration data. --- src/driver.h | 64 +++++++++++++++++++ src/libvirt.c | 164 ++++++++++++++++++++++++++++++++++++++++++++++++ src/libvirt_internal.h | 7 ++ 3 files changed, 235 insertions(+), 0 deletions(-) diff --git a/src/driver.h b/src/driver.h index e3a232d..b2514ed 100644 --- a/src/driver.h +++ b/src/driver.h @@ -486,6 +486,65 @@ typedef int virStreamPtr st, unsigned int flags); +typedef char * + (*virDrvDomainMigrateBegin3) + (virConnectPtr dconn, + char **cookiesrc, + int *cookiesrclen, + const char *uri, + unsigned long flags, + const char *dname, + unsigned long resource); + +typedef int + (*virDrvDomainMigratePrepare3) + (virConnectPtr dconn, + const char *cookiesrc, + int cookiesrclen, + char **cookiedst, + int *cookiedstlen, + const char *uri_in, + char **uri_out, + unsigned long flags, + const char *dname, + unsigned long resource, + const char *dom_xml); + +typedef int + (*virDrvDomainMigratePerform3) + (virDomainPtr domain, + char **cookiesrc, + int *cookiesrclen, + const char *cookiedst, + int cookiedstlen, + const char *uri, + unsigned long flags, + const char *dname, + unsigned long resource); + +typedef virDomainPtr + (*virDrvDomainMigrateFinish3) + (virConnectPtr dconn, + const char *dname, + const char *cookiesrc, + int cookiesrclen, + char **cookiedst, + int *cookiedstlen, + const char *uri, + unsigned long flags, + int retcode); + +typedef int + (*virDrvDomainMigrateConfirm3) + (virConnectPtr dconn, + const char *dname, + const char *cookiesrc, + int cookiesrclen, + const char *cookiedst, + int cookiedstlen, + const char *uri, + unsigned long flags, + int retcode); /** * _virDriver: @@ -604,6 +663,11 @@ struct _virDriver { virDrvDomainSetMemoryParameters domainSetMemoryParameters; virDrvDomainGetMemoryParameters domainGetMemoryParameters; virDrvDomainOpenConsole domainOpenConsole; + virDrvDomainMigrateBegin3 domainMigrateBegin3; + virDrvDomainMigratePrepare3 domainMigratePrepare3; + virDrvDomainMigratePerform3 domainMigratePerform3; + virDrvDomainMigrateFinish3 domainMigrateFinish3; + virDrvDomainMigrateConfirm3 domainMigrateConfirm3; }; typedef int diff --git a/src/libvirt.c b/src/libvirt.c index e24fb9e..04a7cd0 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -3342,6 +3342,22 @@ error: } +/* + * Sequence v1: + * + * Dst: Prepare + * - Get ready to accept incoming VM + * - Generate optional cookie to pass to src + * + * Src: Perform + * - Start migration and wait for send completion + * - Kill off VM if successful, resume if failed + * + * Dst: Finish + * - Wait for recv completion and check status + * - Kill off VM if unsuccessful + * + */ static virDomainPtr virDomainMigrateVersion1 (virDomainPtr domain, virConnectPtr dconn, @@ -3411,6 +3427,25 @@ virDomainMigrateVersion1 (virDomainPtr domain, return ddomain; } +/* + * Sequence v2: + * + * Src: DumpXML + * - Generate XML to pass to dst + * + * Dst: Prepare + * - Get ready to accept incoming VM + * - Generate optional cookie to pass to src + * + * Src: Perform + * - Start migration and wait for send completion + * - Kill off VM if successful, resume if failed + * + * Dst: Finish + * - Wait for recv completion and check status + * - Kill off VM if unsuccessful + * + */ static virDomainPtr virDomainMigrateVersion2 (virDomainPtr domain, virConnectPtr dconn, @@ -3505,6 +3540,130 @@ virDomainMigrateVersion2 (virDomainPtr domain, } +/* + * Sequence v3: + * + * Src: Begin + * - Generate XML to pass to dst + * - Generate optional cookie to pass to dst + * + * Dst: Prepare + * - Get ready to accept incoming VM + * - Generate optional cookie to pass to src + * + * Src: Perform + * - Start migration and wait for send completion + * - Generate optional cookie to pass to dst + * + * Dst: Finish + * - Wait for recv completion and check status + * - Kill off VM if failed, resume if success + * - Generate optional cookie to pass to src + * + * Src: Confirm + * - Kill off VM if success, resume if failed + * + */ +static virDomainPtr +virDomainMigrateVersion3 (virDomainPtr domain, + virConnectPtr dconn, + unsigned long flags, + const char *dname, + const char *uri, + unsigned long bandwidth) +{ + virDomainPtr ddomain = NULL; + char *uri_out = NULL; + char *cookiesrc = NULL; + char *cookiedst = NULL; + char *dom_xml = NULL; + int cookiesrclen = 0; + int cookiedstlen = 0; + int ret; + virDomainInfo info; + virErrorPtr orig_err = NULL; + + if (!domain->conn->driver->domainMigrateBegin3) { + virLibConnError (domain->conn, VIR_ERR_INTERNAL_ERROR, __FUNCTION__); + virDispatchError(domain->conn); + return NULL; + } + dom_xml = domain->conn->driver->domainMigrateBegin3 + (domain->conn, &cookiesrc, &cookiesrclen, uri, flags, dname, + bandwidth); + if (!dom_xml) + goto done; + + ret = virDomainGetInfo (domain, &info); + if (ret == 0 && info.state == VIR_DOMAIN_PAUSED) { + flags |= VIR_MIGRATE_PAUSED; + } + + ret = dconn->driver->domainMigratePrepare3 + (dconn, cookiesrc, cookiesrclen, &cookiedst, &cookiedstlen, + uri, &uri_out, flags, dname, bandwidth, dom_xml); + VIR_FREE (dom_xml); + if (ret == -1) + goto done; + + if (uri == NULL && uri_out == NULL) { + virLibConnError (domain->conn, VIR_ERR_INTERNAL_ERROR, + _("domainMigratePrepare2 did not set uri")); + virDispatchError(domain->conn); + goto done; + } + if (uri_out) + uri = uri_out; /* Did domainMigratePrepare2 change URI? */ + assert (uri != NULL); + + /* Perform the migration. The driver isn't supposed to return + * until the migration is complete. The src VM should remain + * running, but in paused state until the destination can + * confirm migration completion. + */ + ret = domain->conn->driver->domainMigratePerform3 + (domain, &cookiesrc, &cookiesrclen, cookiedst, cookiedstlen, + uri, flags, dname, bandwidth); + + /* Perform failed. Make sure Finish doesn't overwrite the error */ + if (ret < 0) + orig_err = virSaveLastError(); + + /* + * The status code from the source is passed to the destination. + * The dest can cleanup in the source indicated it failed to + * send all migration data. Returns NULL for ddomain if + * the dest was unable to complete migration. + */ + dname = dname ? dname : domain->name; + ddomain = dconn->driver->domainMigrateFinish3 + (dconn, dname, cookiesrc, cookiesrclen, &cookiedst, &cookiedstlen, + uri, flags, ret); + + /* + * If Perform3 indicated an error, or if NULL was returned + * from Finish3, then the status code tells the source + * to resume CPUs on the original VM. + */ + ret = domain->conn->driver->domainMigrateConfirm3 + (domain->conn, dname, cookiesrc, cookiesrclen, cookiedst, cookiedstlen, + uri, flags, ret >= 0 && domain ? 0 : -1); + /* XXX is there anything we can do if Confirm3 returns -1. + * Probably nothing beyond praying + */ + + done: + if (orig_err) { + virSetError(orig_err); + virFreeError(orig_err); + } + VIR_FREE(uri_out); + VIR_FREE(cookiesrc); + VIR_FREE(cookiedst); + return ddomain; +} + + /* * This is sort of a migration v3 * @@ -3716,6 +3875,11 @@ virDomainMigrate (virDomainPtr domain, VIR_DRV_SUPPORTS_FEATURE(dconn->driver, dconn, VIR_DRV_FEATURE_MIGRATION_V2)) ddomain = virDomainMigrateVersion2(domain, dconn, flags, dname, uri, bandwidth); + else if (VIR_DRV_SUPPORTS_FEATURE(domain->conn->driver, domain->conn, + VIR_DRV_FEATURE_MIGRATION_V3) && + VIR_DRV_SUPPORTS_FEATURE(dconn->driver, dconn, + VIR_DRV_FEATURE_MIGRATION_V3)) + ddomain = virDomainMigrateVersion3(domain, dconn, flags, dname, uri, bandwidth); else { /* This driver does not support any migration method */ virLibConnError(domain->conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); diff --git a/src/libvirt_internal.h b/src/libvirt_internal.h index 1c4fa4f..d781d6b 100644 --- a/src/libvirt_internal.h +++ b/src/libvirt_internal.h @@ -66,6 +66,13 @@ enum { * perform step is used. */ VIR_DRV_FEATURE_MIGRATION_DIRECT = 5, + + /* + * Driver supports V3-style virDomainMigrate, ie domainMigrateBegin3/ + * domainMigratePrepare3/domainMigratePerform3/domainMigrateFinish3/ + * domainMigrateConfirm3. + */ + VIR_DRV_FEATURE_MIGRATION_V3 = 6, }; -- 1.7.2.3

5 8

[libvirt] [PATCH] tests: avoid spurious failure of nodeinfotest
by Eric Blake 15 Dec '10

15 Dec '10

When running 'make check' under a multi-cpu Dom0 xen machine, nodeinfotest had a spurious failure it was reading from /sys/devices/system/cpu, but xen has no notion of topology. The test was intended to be isolated from reading any real system files; the regression was introduced in Mar 2010 with commit aa2f6f96dd. Fix things by allowing an early exit for the testsuite. * src/nodeinfo.c (linuxNodeInfoCPUPopulate): Add parameter. (nodeGetInfo): Adjust caller. * tests/nodeinfotest.c (linuxTestCompareFiles): Likewise. --- src/nodeinfo.c | 11 ++++++++--- tests/nodeinfotest.c | 5 +++-- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/src/nodeinfo.c b/src/nodeinfo.c index acd3188..22d53e5 100644 --- a/src/nodeinfo.c +++ b/src/nodeinfo.c @@ -61,7 +61,8 @@ /* NB, this is not static as we need to call it from the testsuite */ int linuxNodeInfoCPUPopulate(FILE *cpuinfo, - virNodeInfoPtr nodeinfo); + virNodeInfoPtr nodeinfo, + bool need_hyperthreads); /* Return the positive decimal contents of the given * CPU_SYS_PATH/cpu%u/FILE, or -1 on error. If MISSING_OK and the @@ -167,7 +168,8 @@ static int parse_socket(unsigned int cpu) } int linuxNodeInfoCPUPopulate(FILE *cpuinfo, - virNodeInfoPtr nodeinfo) + virNodeInfoPtr nodeinfo, + bool need_hyperthreads) { char line[1024]; DIR *cpudir = NULL; @@ -244,6 +246,9 @@ int linuxNodeInfoCPUPopulate(FILE *cpuinfo, return -1; } + if (!need_hyperthreads) + return 0; + /* OK, we've parsed what we can out of /proc/cpuinfo. Get the socket * and thread information from /sys */ @@ -338,7 +343,7 @@ int nodeGetInfo(virConnectPtr conn ATTRIBUTE_UNUSED, virNodeInfoPtr nodeinfo) { _("cannot open %s"), CPUINFO_PATH); return -1; } - ret = linuxNodeInfoCPUPopulate(cpuinfo, nodeinfo); + ret = linuxNodeInfoCPUPopulate(cpuinfo, nodeinfo, true); VIR_FORCE_FCLOSE(cpuinfo); if (ret < 0) return -1; diff --git a/tests/nodeinfotest.c b/tests/nodeinfotest.c index f56247b..c690403 100644 --- a/tests/nodeinfotest.c +++ b/tests/nodeinfotest.c @@ -26,7 +26,8 @@ static char *abs_srcdir; # define MAX_FILE 4096 -extern int linuxNodeInfoCPUPopulate(FILE *cpuinfo, virNodeInfoPtr nodeinfo); +extern int linuxNodeInfoCPUPopulate(FILE *cpuinfo, virNodeInfoPtr nodeinfo, + bool need_hyperthreads); static int linuxTestCompareFiles(const char *cpuinfofile, const char *outputfile) { char actualData[MAX_FILE]; @@ -43,7 +44,7 @@ static int linuxTestCompareFiles(const char *cpuinfofile, const char *outputfile return -1; memset(&nodeinfo, 0, sizeof(nodeinfo)); - if (linuxNodeInfoCPUPopulate(cpuinfo, &nodeinfo) < 0) { + if (linuxNodeInfoCPUPopulate(cpuinfo, &nodeinfo, false) < 0) { if (virTestGetDebug()) { virErrorPtr error = virSaveLastError(); if (error && error->code != VIR_ERR_OK) -- 1.7.3.3

1 0

[libvirt] [PATCH] tests: avoid data race
by Eric Blake 15 Dec '10

15 Dec '10

I got some spurious failures when commandhelper won the race and ran to the point of parent detection prior to the intermediate daemonizing process getting a chance to exit. This fixes it. * tests/commandhelper.c (main): Checking for re-parenting to init(1) is racy; instead check that we belong to a new session. --- tests/commandhelper.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tests/commandhelper.c b/tests/commandhelper.c index 5b2f301..f400e8d 100644 --- a/tests/commandhelper.c +++ b/tests/commandhelper.c @@ -95,7 +95,7 @@ int main(int argc, char **argv) { fprintf(log, "FD:%d\n", i); } - fprintf(log, "DAEMON:%s\n", getppid() == 1 ? "yes" : "no"); + fprintf(log, "DAEMON:%s\n", getpgrp() == getsid(0) ? "yes" : "no"); char cwd[1024]; if (!getcwd(cwd, sizeof(cwd))) return EXIT_FAILURE; -- 1.7.3.3

1 0

[libvirt] How to detect if a PCI device is in use?
by Osier Yang 15 Dec '10

15 Dec '10

Hi, all As the $subject says, currently we don't check whether the PCI device is in use or not by guest when reattaching it to host, it causes problems, should we prevent reattaching if the device is in use? if yes, how to detect whether the device is in use or not? The easiest way in my mind is to check if the device is bound to some driver by check if symbol link "driver" (e.g. /sys/bus/pci/devices/0000\:00\:1f.2/) exists, but it's not reasonable, as even if the device is bound to some driver, it probly is not in use by guest, e.g. 1) attach PCI device to guest (non-managed) 2) destroy the guest without detaching the device first 3) reattach the PCI device to host It will be success, and should be success, as it's not used by any stuff, though it's bound to driver ("pci-stub" for qemu, "pciback" for xen). And it seems we can't do any futher lookup to see if the device is in use or not via sysfs. Any idea? Thanks Osier

1 0

[libvirt] [PATCH v2 2/2] auto cold migration fallback at timeout
by Wen Congyang 15 Dec '10

15 Dec '10

implement auto cold migration fallback at timeout Signed-off-by: Wen Congyang <wency(a)cn.fujitsu.com> --- tools/virsh.c | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 53 insertions(+), 0 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index 4e37f2d..794b97a 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -54,6 +54,7 @@ #include "files.h" #include "../daemon/event.h" #include "configmake.h" +#include "timer.h" static char *progname; @@ -3378,9 +3379,32 @@ static const vshCmdOptDef opts_migrate[] = { {"desturi", VSH_OT_DATA, VSH_OFLAG_REQ, N_("connection URI of the destination host")}, {"migrateuri", VSH_OT_DATA, 0, N_("migration URI, usually can be omitted")}, {"dname", VSH_OT_DATA, 0, N_("rename to new name during migration (if supported)")}, + {"timeout", VSH_OT_INT, 0, N_("auto cold migration fallback when live migration timeouts(in seconds)")}, {NULL, 0, 0, NULL} }; +static void migrateTimeoutHandler(void *data) +{ + virDomainPtr dom = (virDomainPtr)data; + virDomainInfo info; + unsigned int id; + + id = virDomainGetID(dom); + if (id == ((unsigned int)-1)) + return; + + /* The error reason has been reported in virDomainGetInfo() and + * virDomainSuspend() when it fails. So we do not check the return value. + */ + if (virDomainGetInfo(dom, &info) == 0) { + if (info.state == VIR_DOMAIN_SHUTOFF) + return; + + /* suspend the domain when migration timeouts. */ + virDomainSuspend(dom); + } +} + static int cmdMigrate (vshControl *ctl, const vshCmd *cmd) { @@ -3388,6 +3412,8 @@ cmdMigrate (vshControl *ctl, const vshCmd *cmd) const char *desturi; const char *migrateuri; const char *dname; + long long timeout; + virTimerPtr migratetimer = NULL; int flags = 0, found, ret = FALSE; if (!vshConnectionUsability (ctl, ctl->conn)) @@ -3425,6 +3451,23 @@ cmdMigrate (vshControl *ctl, const vshCmd *cmd) if (vshCommandOptBool (cmd, "copy-storage-inc")) flags |= VIR_MIGRATE_NON_SHARED_INC; + timeout = vshCommandOptLongLong(cmd, "timeout", &found); + if (found) { + if (! flags & VIR_MIGRATE_LIVE) { + vshError(ctl, "%s", _("migrate: Unexpected timeout for cold migration")); + goto done; + } + + if (timeout < 1) { + vshError(ctl, "%s", _("migrate: Invalid timeout")); + goto done; + } + + migratetimer = virNewTimer(migrateTimeoutHandler, (void *)dom); + if (!migratetimer) + goto done; + } + if ((flags & VIR_MIGRATE_PEER2PEER) || vshCommandOptBool (cmd, "direct")) { /* For peer2peer migration or direct migration we only expect one URI @@ -3435,6 +3478,9 @@ cmdMigrate (vshControl *ctl, const vshCmd *cmd) goto done; } + if (migratetimer) + virModTimer(migratetimer, get_clock() + timeout * 1000000000ULL); + if (virDomainMigrateToURI (dom, desturi, flags, dname, 0) == 0) ret = TRUE; } else { @@ -3445,6 +3491,9 @@ cmdMigrate (vshControl *ctl, const vshCmd *cmd) dconn = virConnectOpenAuth (desturi, virConnectAuthPtrDefault, 0); if (!dconn) goto done; + if (migratetimer) + virModTimer(migratetimer, get_clock() + timeout * 1000000000ULL); + ddom = virDomainMigrate (dom, dconn, flags, dname, migrateuri, 0); if (ddom) { virDomainFree(ddom); @@ -3454,6 +3503,10 @@ cmdMigrate (vshControl *ctl, const vshCmd *cmd) } done: + if (migratetimer) { + virDelTimer(migratetimer); + virFreeTimer(migratetimer); + } if (dom) virDomainFree (dom); return ret; } -- 1.7.1

1 0

[libvirt] [Patch v2 0/2] Add new feature into live migration
by Wen Congyang 15 Dec '10

15 Dec '10

If the memory of guest OS is changed constantly, the live migration can not be ended ever for ever. We can use the command 'virsh migrate-setmaxdowntime' to control the live migration. But the value of maxdowntime is diffcult to calculate because it depends on the transfer speed of network and constantly changing memroy size. We need a easy way to control the live migration. This patch set add the support of auto cold migration fallback on timeout. With this patch set, when we migrate the guest OS, we can specify a timeout. If the live migration timeouts, the migration will fallback to cold migration. Test of this patchset on Linux: Env: a. The size of guest OS's memory: 1GB b. The transfer speed of network: about 100Mb/s c. The size of constantly changing memory: more than 900MB 1. migrate without timeout # virsh migrate --live RHEL6RC qemu+ssh://<dest IP>/system tcp://<dest IP>:49152 The migration does not end after 12 hours. 2. migrate with timeout(30 minutes): # date Wed Dec 15 09:39:23 CST 2010 # virsh migrate --live --timeout 1800 RHEL6RC qemu+ssh://<dest IP>/system tcp:<dest IP>:49152 # date Wed Dec 15 10:09:52 CST 2010 This patchset is not tested on Windows(I have no such environment). v2: - implemente timer for Windows - implemente dynamic timers Wen Congyang (2): timer impl auto cold migration fallback at timeout configure.ac | 4 + src/Makefile.am | 6 +- src/libvirt.c | 2 + src/libvirt_private.syms | 6 ++ src/util/timer.c | 166 ++++++++++++++++++++++++++++++++++++++++++++++ src/util/timer.h | 37 ++++++++++ src/util/timer_linux.c | 130 ++++++++++++++++++++++++++++++++++++ src/util/timer_win32.c | 128 +++++++++++++++++++++++++++++++++++ tools/virsh.c | 53 +++++++++++++++ 9 files changed, 530 insertions(+), 2 deletions(-) create mode 100644 src/util/timer.c create mode 100644 src/util/timer.h create mode 100644 src/util/timer_linux.c create mode 100644 src/util/timer_win32.c

1 0

[libvirt] [PATCH] build: improve testsuite results with older automake
by Eric Blake 15 Dec '10

15 Dec '10

* tests/Makefile.am (TESTS_ENVIRONMENT, commandtest_CFLAGS) (commandhelper_CFLAGS): Avoid $(builddir) and $(abs_builddir) in automake 1.9.6; fixes spurious failures of commandtest. --- tests/Makefile.am | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/Makefile.am b/tests/Makefile.am index 0a235cf..07df5a1 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -206,12 +206,12 @@ TESTS += cputest path_add = $$abs_top_builddir/src$(PATH_SEPARATOR)$$abs_top_builddir/daemon$(PATH_SEPARATOR)$$abs_top_builddir/tools # NB, automake < 1.10 does not provide the real -# abs_top_{src/build}dir variables, so don't rely +# abs_top_{src/build}dir or builddir variables, so don't rely # on them here. Fake them with 'pwd' TESTS_ENVIRONMENT = \ abs_top_builddir=`cd '$(top_builddir)'; pwd` \ abs_top_srcdir=`cd '$(top_srcdir)'; pwd` \ - abs_builddir=`cd '$(builddir)'; pwd` \ + abs_builddir=`pwd` \ abs_srcdir=`cd '$(srcdir)'; pwd` \ CONFIG_HEADER="`cd '$(top_builddir)'; pwd`/config.h" \ PATH="$(path_add)$(PATH_SEPARATOR)$$PATH" \ @@ -353,12 +353,12 @@ nodeinfotest_LDADD = $(LDADDS) commandtest_SOURCES = \ commandtest.c testutils.h testutils.c -commandtest_CFLAGS = -Dabs_builddir="\"$(abs_builddir)\"" +commandtest_CFLAGS = -Dabs_builddir="\"`pwd`\"" commandtest_LDADD = $(LDADDS) commandhelper_SOURCES = \ commandhelper.c -commandhelper_CFLAGS = -Dabs_builddir="\"$(abs_builddir)\"" +commandhelper_CFLAGS = -Dabs_builddir="\"`pwd`\"" commandhelper_LDADD = $(LDADDS) if WITH_SECDRIVER_SELINUX -- 1.7.3.3

1 0