- Devel - libvirt List Archives

[libvirt] [PATCH] VMware: Add Fusion version test
by Doug Goldstein 01 Oct '13

01 Oct '13

This adds a test for the version string of VMware Fusion. --- Not sure how but this was dropped from my series adding VMware Fusion that was added prior to 1.1.3-rc2. This should be safe for 1.1.3 and probably encouraged --- tests/vmwareverdata/fusion-5.0.3.txt | 3 +++ tests/vmwarevertest.c | 1 + 2 files changed, 4 insertions(+) create mode 100644 tests/vmwareverdata/fusion-5.0.3.txt diff --git a/tests/vmwareverdata/fusion-5.0.3.txt b/tests/vmwareverdata/fusion-5.0.3.txt new file mode 100644 index 0000000..9fae811 --- /dev/null +++ b/tests/vmwareverdata/fusion-5.0.3.txt @@ -0,0 +1,3 @@ + +VMware Fusion Information: +VMware Fusion 5.0.3 build-1040386 Release diff --git a/tests/vmwarevertest.c b/tests/vmwarevertest.c index f5ccb06..47c250c 100644 --- a/tests/vmwarevertest.c +++ b/tests/vmwarevertest.c @@ -88,6 +88,7 @@ mymain(void) } while (0) DO_TEST("ws", "workstation-7.0.0", 7000000); + DO_TEST("fusion", "fusion-5.0.3", 5000003); return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; } -- 1.8.1.5

2 2

[libvirt] Entering freeze for libvirt-1.1.3
by Daniel Veillard 01 Oct '13

01 Oct '13

I'm a day late from suggested schedule, but I have now tagged rc1 in git and pushed the tarball and rpms to the usual place: ftp://libvirt.org/libvirt/ My initial testing didn't revealed anything bad, but wider testing is obviously needed, i have heard of problem on FreeBSD by Jason, hopefully we can collect and fix those in time. I will probably make rc2 during the w.e. and depending on news push on Tuesday next week or a bit later the final 1.1.3 thanks for testing and reports ! Daniel -- Daniel Veillard | Open Source and Standards, Red Hat veillard(a)redhat.com | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | virtualization library http://libvirt.org/

9 21

[libvirt] [PATCH 0/4] Introduction of qemucapabilitiestest
by Michal Privoznik 01 Oct '13

01 Oct '13

So far, we are testing our capabilities code only from the --help output. Which is sufficient for ancient qemus, but not sufficient for 99% of qemus, where the QMP is used. So far, only one (example) test case is being added. If the patch set is accepted, we can add much more test cases. Michal Privoznik (4): qemu_capabilities: Introduce virQEMUCapsInitQMPMonitor tests: Learn qemuMonitorTestNew optional greeting qemuMonitorTest: Make check for monitor command match optional tests: Introduce qemucapabilitiestest .gitignore | 1 + src/qemu/qemu_capabilities.c | 144 +- src/qemu/qemu_capabilities.h | 3 + tests/Makefile.am | 12 +- tests/qemucapabilitiesdata/caps_default.caps | 132 ++ tests/qemucapabilitiesdata/caps_default.replies | 2519 +++++++++++++++++++++++ tests/qemucapabilitiestest.c | 231 +++ tests/qemuhotplugtest.c | 2 +- tests/qemumonitortestutils.c | 23 +- tests/qemumonitortestutils.h | 5 +- 10 files changed, 2994 insertions(+), 78 deletions(-) create mode 100644 tests/qemucapabilitiesdata/caps_default.caps create mode 100644 tests/qemucapabilitiesdata/caps_default.replies create mode 100644 tests/qemucapabilitiestest.c -- 1.8.1.5

2 11

[libvirt] [PATCH] Fix max stream packet size for old clients
by Daniel P. Berrange 01 Oct '13

01 Oct '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> The libvirtd server pushes data out to clients. It does not know what protocol version the client might have, so must be conservative and use the old payload limits. ie send no more than 256kb of data per packet. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- daemon/stream.c | 2 +- src/rpc/virnetprotocol.x | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/daemon/stream.c b/daemon/stream.c index 87dfaf5..9e36e8a 100644 --- a/daemon/stream.c +++ b/daemon/stream.c @@ -708,7 +708,7 @@ daemonStreamHandleRead(virNetServerClientPtr client, daemonClientStream *stream) { char *buffer; - size_t bufferLen = VIR_NET_MESSAGE_PAYLOAD_MAX; + size_t bufferLen = VIR_NET_MESSAGE_LEGACY_PAYLOAD_MAX; int ret; VIR_DEBUG("client=%p, stream=%p tx=%d closed=%d", diff --git a/src/rpc/virnetprotocol.x b/src/rpc/virnetprotocol.x index 131e40b..1eae7cb 100644 --- a/src/rpc/virnetprotocol.x +++ b/src/rpc/virnetprotocol.x @@ -50,6 +50,13 @@ */ const VIR_NET_MESSAGE_INITIAL = 65536; +/* + * Until we enlarged the message buffers, this was the max + * payload size. We need to remember this for compat with + * old clients. + */ +const VIR_NET_MESSAGE_LEGACY_PAYLOAD_MAX = 262144; + /* Maximum total message size (serialised). */ const VIR_NET_MESSAGE_MAX = 16777216; -- 1.8.3.1

2 1

Re: [libvirt] [PATCH 1/6] kvm: Add KVM_GET_EMULATED_CPUID
by Eduardo Habkost 01 Oct '13

01 Oct '13

On Tue, Sep 24, 2013 at 01:04:14PM +0300, Gleb Natapov wrote: > On Tue, Sep 24, 2013 at 11:57:00AM +0200, Borislav Petkov wrote: > > On Mon, September 23, 2013 6:28 pm, Eduardo Habkost wrote: > > > On Sun, Sep 22, 2013 at 04:44:50PM +0200, Borislav Petkov wrote: > > >> From: Borislav Petkov <bp(a)suse.de> > > >> > > >> Add a kvm ioctl which states which system functionality kvm emulates. > > >> The format used is that of CPUID and we return the corresponding CPUID > > >> bits set for which we do emulate functionality. > > > > > > Let me check if I understood the purpose of the new ioctl correctly: the > > > only reason for GET_EMULATED_CPUID to exist is to allow userspace to > > > differentiate features that are native or that are emulated efficiently > > > (GET_SUPPORTED_CPUID) and features that are emulated not very > > > efficiently (GET_EMULATED_CPUID)? > > > > Not only that - emulated features are not reported in CPUID so they > > can be enabled only when specifically and explicitly requested, i.e. > > "+movbe". Basically, you want to emulate that feature for the guest but > > only for this specific guest - the others shouldn't see it. Then we may have a problem: some CPU models already have "movbe" included (e.g. Haswell), and patch 6/6 will make "-cpu Haswell" get movbe enabled even if it is being emulated. So if we really want to avoid enabling emulated features by mistake, we may need a new CPU flag in addition to "enforce" to tell QEMU that it is OK to enable emulated features (maybe "-cpu ...,emulate"?). > > > > > If that's the case, how do we decide how efficient emulation should be, > > > to deserve inclusion in GET_SUPPORTED_CPUID? I am guessing that the > > > criterion will be: if enabling it doesn't risk making performance worse, > > > it can get in GET_SUPPORTED_CPUID. > > > > Well, in the MOVBE case, supported means, the host can execute this > > instruction natively. Now, you guys say you can emulate x2apic very > > efficiently and I'm guessing emulating x2apic doesn't bring any > > emulation overhead, thus SUPPORTED_CPUID. > x2apic emulation has nothing to do with x2apic in a host. It is emulated > same way no matter if host has it or not. x2apic is not really cpu > feature, but apic one and apic is fully emulated by KVM anyway. But my question still stands: suppose we had x2apic emulation implemented but for some reason it was painfully slow, we wouldn't want to enable it by mistake. In this case, it would end up on EMULATED_CPUID and not on SUPPORTED_CPUID, right? > > > > > But for single instructions or group of instructions, the distinction > > should be very clear. > > > > At least this is how I see it but Gleb probably can comment too. > > > That's how I see it two. Basically you want to use movbe emulation (as > opposite of virtualization) only if you have binary kernel that compiled > for CPU with movbe (Borislav's use case), or you want to migrate > temporarily from movbe enabled host to non movbe host because downtime > is not an option. We should avoid enabling it "by mistake". "we should avoid enabling it 'by mistake'" sounds like a good criterion for including something on GET_EMULATED_CPUID instead of GET_SUPPORTED_CPUID. In that case, I believe QEMU should use GET_EMULATED_CPUID only if explicitly requested in the configuration/command-line (that's not what patch 6/6 does). -- Eduardo

2 7

[libvirt] [PATCH] LXC: workaround machined uncleaned data with containers running systemd.
by Cédric Bosdonnat 30 Sep '13

30 Sep '13

The problem is described by [0] but its effect on libvirt is that starting a container with a full distro running systemd after having stopped it simply fails. The container cleanup now calls the machined Terminate function to make sure that everything is in order for the next run. [0]: https://bugs.freedesktop.org/show_bug.cgi?id=68370 --- src/libvirt_private.syms | 2 ++ src/lxc/lxc_process.c | 8 +++++ src/util/virsystemd.c | 80 +++++++++++++++++++++++++++++++++++++++++------- src/util/virsystemd.h | 8 +++++ tests/virsystemdtest.c | 28 +++++++++++++++++ 6 files changed, 117 insertions(+), 12 deletions(-) 2nd version: * Removed the Makefile hack and added symbols to libvirt_private.syms instead * Added virSystemdMakeMachineName to factorize some code in Make and Terminate machine systemd functions. * Added tests for TerminateMachine and TerminateContainer cases. diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 48e4b04..4bc4d69 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1947,8 +1947,10 @@ virSysinfoSetup; # util/virsystemd.h virSystemdCreateMachine; +virSystemdMakeMachineName; virSystemdMakeScopeName; virSystemdMakeSliceName; +virSystemdTerminateMachine; # util/virthread.h diff --git a/src/lxc/lxc_process.c b/src/lxc/lxc_process.c index 4835bd5..f92c613 100644 --- a/src/lxc/lxc_process.c +++ b/src/lxc/lxc_process.c @@ -50,6 +50,7 @@ #include "virstring.h" #include "viratomic.h" #include "virprocess.h" +#include "virsystemd.h" #define VIR_FROM_THIS VIR_FROM_LXC @@ -210,6 +211,13 @@ static void virLXCProcessCleanup(virLXCDriverPtr driver, virCgroupFree(&priv->cgroup); } + /* Get machined to terminate the machine as it may not have cleaned it + * properly. See https://bugs.freedesktop.org/show_bug.cgi?id=68370 for + * the bug we are working around here. + */ + virSystemdTerminateMachine(vm->def->name, "lxc", true); + + /* now that we know it's stopped call the hook if present */ if (virHookPresent(VIR_HOOK_DRIVER_LXC)) { char *xml = virDomainDefFormat(vm->def, 0); diff --git a/src/util/virsystemd.c b/src/util/virsystemd.c index e72b7f0..1ba37cc 100644 --- a/src/util/virsystemd.c +++ b/src/util/virsystemd.c @@ -116,6 +116,27 @@ char *virSystemdMakeSliceName(const char *partition) return virBufferContentAndReset(&buf); } +char *virSystemdMakeMachineName(const char *name, + const char *drivername, + bool privileged) +{ + char *machinename = NULL; + char *username = NULL; + if (privileged) { + if (virAsprintf(&machinename, "%s-%s", drivername, name) < 0) + goto cleanup; + } else { + if (!(username = virGetUserName(geteuid()))) + goto cleanup; + if (virAsprintf(&machinename, "%s-%s-%s", username, drivername, name) < 0) + goto cleanup; + } + +cleanup: + VIR_FREE(username); + + return machinename; +} /** * virSystemdCreateMachine: @@ -142,7 +163,6 @@ int virSystemdCreateMachine(const char *name, DBusConnection *conn; char *machinename = NULL; char *creatorname = NULL; - char *username = NULL; char *slicename = NULL; ret = virDBusIsServiceEnabled("org.freedesktop.machine1"); @@ -152,15 +172,8 @@ int virSystemdCreateMachine(const char *name, conn = virDBusGetSystemBus(); ret = -1; - if (privileged) { - if (virAsprintf(&machinename, "%s-%s", drivername, name) < 0) - goto cleanup; - } else { - if (!(username = virGetUserName(geteuid()))) - goto cleanup; - if (virAsprintf(&machinename, "%s-%s-%s", username, drivername, name) < 0) - goto cleanup; - } + if (!(machinename = virSystemdMakeMachineName(name, drivername, privileged))) + goto cleanup; if (virAsprintf(&creatorname, "libvirt-%s", drivername) < 0) goto cleanup; @@ -236,9 +249,54 @@ int virSystemdCreateMachine(const char *name, ret = 0; cleanup: - VIR_FREE(username); VIR_FREE(creatorname); VIR_FREE(machinename); VIR_FREE(slicename); return ret; } + +int virSystemdTerminateMachine(const char *name, + const char *drivername, + bool privileged) +{ + int ret; + DBusConnection *conn; + char *machinename = NULL; + + ret = virDBusIsServiceEnabled("org.freedesktop.machine1"); + if (ret < 0) + return ret; + + conn = virDBusGetSystemBus(); + + ret = -1; + if (!(machinename = virSystemdMakeMachineName(name, drivername, privileged))) + goto cleanup; + + /* + * The systemd DBus API we're invoking has the + * following signature + * + * TerminateMachine(in s name); + * + * @name a host unique name for the machine. shows up + * in 'ps' listing & similar + */ + + VIR_DEBUG("Attempting to terminate machine via systemd"); + if (virDBusCallMethod(conn, + NULL, + "org.freedesktop.machine1", + "/org/freedesktop/machine1", + "org.freedesktop.machine1.Manager", + "TerminateMachine", + "s", + machinename) < 0) + goto cleanup; + + ret = 0; + +cleanup: + VIR_FREE(machinename); + return ret; +} diff --git a/src/util/virsystemd.h b/src/util/virsystemd.h index 414ae5a..d9845e1 100644 --- a/src/util/virsystemd.h +++ b/src/util/virsystemd.h @@ -29,6 +29,10 @@ char *virSystemdMakeScopeName(const char *name, const char *slicename); char *virSystemdMakeSliceName(const char *partition); +char *virSystemdMakeMachineName(const char *name, + const char *drivername, + bool privileged); + int virSystemdCreateMachine(const char *name, const char *drivername, bool privileged, @@ -38,4 +42,8 @@ int virSystemdCreateMachine(const char *name, bool iscontainer, const char *partition); +int virSystemdTerminateMachine(const char *name, + const char *drivername, + bool privileged); + #endif /* __VIR_SYSTEMD_H__ */ diff --git a/tests/virsystemdtest.c b/tests/virsystemdtest.c index e68b3ac..e6efebf 100644 --- a/tests/virsystemdtest.c +++ b/tests/virsystemdtest.c @@ -54,6 +54,18 @@ static int testCreateContainer(const void *opaque ATTRIBUTE_UNUSED) return 0; } +static int testTerminateContainer(const void *opaque ATTRIBUTE_UNUSED) +{ + if (virSystemdTerminateMachine("demo", + "lxc", + true) < 0) { + fprintf(stderr, "%s", "Failed to terminate LXC machine\n"); + return -1; + } + + return 0; +} + static int testCreateMachine(const void *opaque ATTRIBUTE_UNUSED) { unsigned char uuid[VIR_UUID_BUFLEN] = { @@ -77,6 +89,18 @@ static int testCreateMachine(const void *opaque ATTRIBUTE_UNUSED) return 0; } +static int testTerminateMachine(const void *opaque ATTRIBUTE_UNUSED) +{ + if (virSystemdTerminateMachine("demo", + "qemu", + false) < 0) { + fprintf(stderr, "%s", "Failed to terminate KVM machine\n"); + return -1; + } + + return 0; +} + static int testCreateNoSystemd(const void *opaque ATTRIBUTE_UNUSED) { unsigned char uuid[VIR_UUID_BUFLEN] = { @@ -184,8 +208,12 @@ mymain(void) if (virtTestRun("Test create container ", 1, testCreateContainer, NULL) < 0) ret = -1; + if (virtTestRun("Test terminate container ", 1, testTerminateContainer, NULL) < 0) + ret = -1; if (virtTestRun("Test create machine ", 1, testCreateMachine, NULL) < 0) ret = -1; + if (virtTestRun("Test terminate machine ", 1, testTerminateMachine, NULL) < 0) + ret = -1; if (virtTestRun("Test create no systemd ", 1, testCreateNoSystemd, NULL) < 0) ret = -1; if (virtTestRun("Test create bad systemd ", 1, testCreateBadSystemd, NULL) < 0) -- 1.8.4

2 1

[libvirt] [PATCH v2] virsh-domain: Free dom before return false in cmdDump
by Hongwei Bi 30 Sep '13

30 Sep '13

--- tools/virsh-domain.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 8538125..fa012d1 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -4488,7 +4488,7 @@ cmdDump(vshControl *ctl, const vshCmd *cmd) return false; if (vshCommandOptStringReq(ctl, cmd, "file", &to) < 0) - return false; + goto cleanup; if (vshCommandOptBool(cmd, "verbose")) verbose = true; -- 1.7.1

2 2

[libvirt] [PATCH v2] 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 | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/tools/virsh-volume.c b/tools/virsh-volume.c index 7dab532..0a66a6c 100644 --- a/tools/virsh-volume.c +++ b/tools/virsh-volume.c @@ -665,7 +665,11 @@ cmdVolUpload(vshControl *ctl, const vshCmd *cmd) goto cleanup; } - st = virStreamNew(ctl->conn, 0); + if (!(st = virStreamNew(ctl->conn, 0))) { + vshError(ctl, _("cannot create a new stream")); + goto cleanup; + } + if (virStorageVolUpload(vol, st, offset, length, 0) < 0) { vshError(ctl, _("cannot upload to volume %s"), name); goto cleanup; @@ -775,7 +779,11 @@ cmdVolDownload(vshControl *ctl, const vshCmd *cmd) created = true; } - st = virStreamNew(ctl->conn, 0); + if (!(st = virStreamNew(ctl->conn, 0))) { + vshError(ctl, _("cannot create a new stream")); + 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] [PATCH v3 0/2] Libvirt Wireshark dissector
by Yuto KAWAMURA(kawamuray) 30 Sep '13

30 Sep '13

From: "Yuto KAWAMURA(kawamuray)" <kawamuray.dadada(a)gmail.com> Changes from version2: * Remove moduleinfo.h * Stop accessing internal XDR struct and just use free() Introduce Wireshark dissector plugin which adds support to Wireshark for dissecting libvirt RPC protocol. This feature was presented by Michal Privoznik year before last[1]. But it did only support dissecting packet headers. This time I enhanced that dissector to support dissecting packet payload. Furthermore, I provide code generator of dissector. So you can get fresh build of dissector from libvirt RPC specification file at any version you like. [1] http://www.redhat.com/archives/libvir-list/2011-October/msg00301.html Yuto KAWAMURA(kawamuray) (2): Introduce Libvirt Wireshark dissector Add sample output of Wireshark dissector Makefile.am | 3 +- cfg.mk | 8 +- configure.ac | 72 +- tools/wireshark/Makefile.am | 29 + tools/wireshark/README.md | 31 + tools/wireshark/samples/libvirt-sample.pdml | 206 ++++++ tools/wireshark/src/.gitignore | 4 + tools/wireshark/src/Makefile.am | 42 ++ tools/wireshark/src/packet-libvirt.c | 512 ++++++++++++++ tools/wireshark/src/packet-libvirt.h | 128 ++++ tools/wireshark/util/genxdrstub.pl | 1009 +++++++++++++++++++++++++++ tools/wireshark/util/make-dissector-reg | 198 ++++++ 12 files changed, 2236 insertions(+), 6 deletions(-) create mode 100644 tools/wireshark/Makefile.am create mode 100644 tools/wireshark/README.md create mode 100644 tools/wireshark/samples/libvirt-sample.pdml create mode 100644 tools/wireshark/src/.gitignore create mode 100644 tools/wireshark/src/Makefile.am create mode 100644 tools/wireshark/src/packet-libvirt.c create mode 100644 tools/wireshark/src/packet-libvirt.h create mode 100755 tools/wireshark/util/genxdrstub.pl create mode 100755 tools/wireshark/util/make-dissector-reg -- 1.8.1.5

2 3

[libvirt] [PATCH] virfile: safezero: align mmap offset to page size
by Oskari Saarenmaa 30 Sep '13

30 Sep '13

mmap's offset must be aligned to page size or mapping will fail. mmap-based safezero is only used if posix_fallocate isn't available. Signed-off-by: Oskari Saarenmaa <os(a)ohmu.fi> --- src/util/virfile.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/src/util/virfile.c b/src/util/virfile.c index 20ca89f..16f8101 100644 --- a/src/util/virfile.c +++ b/src/util/virfile.c @@ -1038,9 +1038,16 @@ safezero(int fd, off_t offset, off_t len) int safezero(int fd, off_t offset, off_t len) { + static long pagemask = 0; + off_t map_skip; int r; char *buf; + /* align offset and length, rounding offset down and length up */ + if (pagemask == 0) + pagemask = ~(sysconf(_SC_PAGESIZE) - 1); + map_skip = offset - (offset & pagemask); + /* memset wants the mmap'ed file to be present on disk so create a * sparse file */ @@ -1048,12 +1055,13 @@ safezero(int fd, off_t offset, off_t len) if (r < 0) return -1; - buf = mmap(NULL, len, PROT_READ | PROT_WRITE, MAP_SHARED, fd, offset); + buf = mmap(NULL, len + map_skip, PROT_READ | PROT_WRITE, MAP_SHARED, + fd, offset - map_skip); if (buf == MAP_FAILED) return -1; - memset(buf, 0, len); - munmap(buf, len); + memset(buf + map_skip, 0, len); + munmap(buf, len + map_skip); return 0; } -- 1.8.3.1

2 1

[libvirt] Patch to launch virt-sandbox-containers with correct label.
by Dan Walsh 30 Sep '13

30 Sep '13

[sandbox PATCH] virt-sandbox patch to launch containers with proper

3 4

[libvirt] [PATCH] qemu_migrate: Fix assign the same port when migrating concurrently
by Wangyufei (A) 30 Sep '13

30 Sep '13

>From 6c2de34432db674072231ad66c9e8a0a600ede8a Mon Sep 17 00:00:00 2001 From: WangYufei <james.wangyufei(a)huawei.com> Date: Mon, 30 Sep 2013 11:48:43 +0800 Subject: [PATCH] qemu_migrate: Fix assign the same port when migrating concurrently When we migrate vms concurrently, there's a chance that libvirtd on destination assign the same port for different migrations, which will lead to migration failed during migration prepare phase on destination. So we use virPortAllocator here to solve the problem. Signed-off-by: WangYufei <james.wangyufei(a)huawei.com> --- src/qemu/qemu_command.h | 3 +++ src/qemu/qemu_conf.h | 6 +++--- src/qemu/qemu_driver.c | 6 ++++++ src/qemu/qemu_migration.c | 17 ++++++++++------- 4 files changed, 22 insertions(+), 10 deletions(-) diff --git a/src/qemu/qemu_command.h b/src/qemu/qemu_command.h index 2e2acfb..3277ba4 100644 --- a/src/qemu/qemu_command.h +++ b/src/qemu/qemu_command.h @@ -51,6 +51,9 @@ # define QEMU_WEBSOCKET_PORT_MIN 5700 # define QEMU_WEBSOCKET_PORT_MAX 65535 +# define QEMU_MIGRATION_PORT_MIN 49152 +# define QEMU_MIGRATION_PORT_MAX 49215 + typedef struct _qemuBuildCommandLineCallbacks qemuBuildCommandLineCallbacks; typedef qemuBuildCommandLineCallbacks *qemuBuildCommandLineCallbacksPtr; struct _qemuBuildCommandLineCallbacks { diff --git a/src/qemu/qemu_conf.h b/src/qemu/qemu_conf.h index da29a2a..3176085 100644 --- a/src/qemu/qemu_conf.h +++ b/src/qemu/qemu_conf.h @@ -221,6 +221,9 @@ struct _virQEMUDriver { /* Immutable pointer, self-locking APIs */ virPortAllocatorPtr webSocketPorts; + /* Immutable pointer, self-locking APIs */ + virPortAllocatorPtr migrationPorts; + /* Immutable pointer, lockless APIs*/ virSysinfoDefPtr hostsysinfo; @@ -242,9 +245,6 @@ struct _qemuDomainCmdlineDef { char **env_value; }; -/* Port numbers used for KVM migration. */ -# define QEMUD_MIGRATION_FIRST_PORT 49152 -# define QEMUD_MIGRATION_NUM_PORTS 64 void qemuDomainCmdlineDefFree(qemuDomainCmdlineDefPtr def); diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index e8bc04d..9437b5a 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -688,6 +688,11 @@ qemuStateInitialize(bool privileged, cfg->webSocketPortMax)) == NULL) goto error; + if ((qemu_driver->migrationPorts = + virPortAllocatorNew(QEMU_MIGRATION_PORT_MIN, + QEMU_MIGRATION_PORT_MAX)) == NULL) + goto error; + if (qemuSecurityInit(qemu_driver) < 0) goto error; @@ -994,6 +999,7 @@ qemuStateCleanup(void) { virObjectUnref(qemu_driver->domains); virObjectUnref(qemu_driver->remotePorts); virObjectUnref(qemu_driver->webSocketPorts); + virObjectUnref(qemu_driver->migrationPorts); virObjectUnref(qemu_driver->xmlopt); diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 3a1aab7..82d90bf 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -2493,7 +2493,6 @@ qemuMigrationPrepareDirect(virQEMUDriverPtr driver, const char *origname, unsigned long flags) { - static int port = 0; int this_port; char *hostname = NULL; const char *p; @@ -2521,8 +2520,9 @@ qemuMigrationPrepareDirect(virQEMUDriverPtr driver, * to be a correct hostname which refers to the target machine). */ if (uri_in == NULL) { - this_port = QEMUD_MIGRATION_FIRST_PORT + port++; - if (port == QEMUD_MIGRATION_NUM_PORTS) port = 0; + if (virPortAllocatorAcquire(driver->migrationPorts, + (unsigned short *)&this_port) < 0) + goto cleanup; /* Get hostname */ if ((hostname = virGetHostname()) == NULL) @@ -2578,9 +2578,9 @@ qemuMigrationPrepareDirect(virQEMUDriverPtr driver, if (uri->port == 0) { /* Generate a port */ - this_port = QEMUD_MIGRATION_FIRST_PORT + port++; - if (port == QEMUD_MIGRATION_NUM_PORTS) - port = 0; + if (virPortAllocatorAcquire(driver->migrationPorts, + (unsigned short *)&this_port) < 0) + goto cleanup; /* Caller frees */ if (virAsprintf(uri_out, "%s:%d", uri_in, this_port) < 0) @@ -2600,8 +2600,11 @@ qemuMigrationPrepareDirect(virQEMUDriverPtr driver, cleanup: virURIFree(uri); VIR_FREE(hostname); - if (ret != 0) + if (ret != 0) { VIR_FREE(*uri_out); + virPortAllocatorRelease(driver->migrationPorts, + (unsigned short)this_port); + } return ret; } -- 1.7.3.1.msysgit.0 Best Regards, -WangYufei

2 1

[libvirt] [PATCH v2 0/2] Libvirt Wireshark dissector
by Yuto KAWAMURA(kawamuray) 30 Sep '13

30 Sep '13

From: "Yuto KAWAMURA(kawamuray)" <kawamuray.dadada(a)gmail.com> Introduce Wireshark dissector plugin which adds support to Wireshark for dissecting libvirt RPC protocol. This feature was presented by Michal Privoznik year before last[1]. But it did only support dissecting packet headers. This time I enhanced that dissector to support dissecting packet payload. Furthermore, I provide code generator of dissector. So you can get fresh build of dissector from libvirt RPC specification file at any version you like. [1] http://www.redhat.com/archives/libvir-list/2011-October/msg00301.html Yuto KAWAMURA(kawamuray) (2): Introduce Libvirt Wireshark dissector Add sample output of Wireshark dissector Makefile.am | 3 +- cfg.mk | 6 +- configure.ac | 72 +- tools/wireshark/Makefile.am | 29 + tools/wireshark/README.md | 31 + tools/wireshark/samples/libvirt-sample.pdml | 206 ++++++ tools/wireshark/src/.gitignore | 4 + tools/wireshark/src/Makefile.am | 42 ++ tools/wireshark/src/moduleinfo.h | 37 + tools/wireshark/src/packet-libvirt.c | 513 ++++++++++++++ tools/wireshark/src/packet-libvirt.h | 128 ++++ tools/wireshark/util/genxdrstub.pl | 1010 +++++++++++++++++++++++++++ tools/wireshark/util/make-dissector-reg | 199 ++++++ 13 files changed, 2275 insertions(+), 5 deletions(-) create mode 100644 tools/wireshark/Makefile.am create mode 100644 tools/wireshark/README.md create mode 100644 tools/wireshark/samples/libvirt-sample.pdml create mode 100644 tools/wireshark/src/.gitignore create mode 100644 tools/wireshark/src/Makefile.am create mode 100644 tools/wireshark/src/moduleinfo.h create mode 100644 tools/wireshark/src/packet-libvirt.c create mode 100644 tools/wireshark/src/packet-libvirt.h create mode 100755 tools/wireshark/util/genxdrstub.pl create mode 100755 tools/wireshark/util/make-dissector-reg -- 1.8.1.5

3 5

[libvirt] qemu, numa: non-contiguous cpusets
by Borislav Petkov 30 Sep '13

30 Sep '13

Btw, while I got your attention, on a not-really related topic: how do we feel about adding support for specifying a non-contiguous set of cpus for a numa node in qemu with the -numa option? I.e., like this, for example: x86_64-softmmu/qemu-system-x86_64 -smp 8 -numa node,nodeid=0,cpus=0\;2\;4-5 -numa node,nodeid=1,cpus=1\;3\;6-7 The ';' needs to be escaped from the shell but I'm open for better suggestions. Here's a diff: --- diff --git a/vl.c b/vl.c index 4e709d5c1c20..82a6c8451fb0 100644 --- a/vl.c +++ b/vl.c @@ -1261,9 +1261,27 @@ char *get_boot_devices_list(size_t *size) return list; } +static int __numa_set_cpus(unsigned long *map, int start, int end) +{ + if (end >= MAX_CPUMASK_BITS) { + end = MAX_CPUMASK_BITS - 1; + fprintf(stderr, + "qemu: NUMA: A max of %d VCPUs are supported\n", + MAX_CPUMASK_BITS); + return -EINVAL; + } + + if (end < start) { + return -EINVAL; + } + + bitmap_set(map, start, end-start+1); + return 0; +} + static void numa_node_parse_cpus(int nodenr, const char *cpus) { - char *endptr; + char *endptr, *ptr = (char *)cpus; unsigned long long value, endvalue; /* Empty CPU range strings will be considered valid, they will simply @@ -1273,7 +1291,8 @@ static void numa_node_parse_cpus(int nodenr, const char *cpus) return; } - if (parse_uint(cpus, &value, &endptr, 10) < 0) { +fromthetop: + if (parse_uint(ptr, &value, &endptr, 10) < 0) { goto error; } if (*endptr == '-') { @@ -1282,22 +1301,22 @@ static void numa_node_parse_cpus(int nodenr, const char *cpus) } } else if (*endptr == '\0') { endvalue = value; - } else { - goto error; - } + } else if (*endptr == ';') { + if (__numa_set_cpus(node_cpumask[nodenr], value, value) < 0) { + goto error; + } + endptr++; + if (*endptr == '\0') + return; - if (endvalue >= MAX_CPUMASK_BITS) { - endvalue = MAX_CPUMASK_BITS - 1; - fprintf(stderr, - "qemu: NUMA: A max of %d VCPUs are supported\n", - MAX_CPUMASK_BITS); - } + ptr = endptr; - if (endvalue < value) { + goto fromthetop; + } else { goto error; } - bitmap_set(node_cpumask[nodenr], value, endvalue-value+1); + __numa_set_cpus(node_cpumask[nodenr], value, endvalue); return; error: -- Thanks. -- Regards/Gruss, Boris. Sent from a fat crate under my desk. Formatting is fine. --

3 4

[libvirt] [PATCH] qemu: process: Silence coverity warning when rewinding log file
by Peter Krempa 30 Sep '13

30 Sep '13

The change in ef29de14c37d14abc546e90555a0093797facfdd that introduced better error logging from qemu introduced a warning from coverity about unused return value from lseek. Silence this warning and fix typo in the corresponding error message. Reported by: John Ferlan --- src/qemu/qemu_process.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index d7be731..7a30a5e 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -1845,10 +1845,10 @@ cleanup: } len = strlen(buf); - /* best effor seek - we need to reset to the original position, so that + /* best effort seek - we need to reset to the original position, so that * a possible read of the fd in the monitor code doesn't influence this * error delivery option */ - lseek(logfd, pos, SEEK_SET); + ignore_value(lseek(logfd, pos, SEEK_SET)); qemuProcessReadLog(logfd, buf + len, buf_size - len - 1, 0, true); virReportError(VIR_ERR_INTERNAL_ERROR, _("process exited while connecting to monitor: %s"), -- 1.8.3.2

2 2

[libvirt] [PATCH 0/2] Python virNodeGetInfo mess
by Michal Privoznik 30 Sep '13

30 Sep '13

I'm proposing two contradictionary patches to fix the issue. Long story short, libvirt is mangling the memory size in pythong API binding where the size is reported in MiB instead of KiB: https://www.redhat.com/archives/libvirt-users/2013-September/msg00187.html Which approach do you like better? Michal Privoznik (2): python: Report nodeinfo's memory in KiB python: Document virNodeGetInfo bug python/libvirt-override-api.xml | 2 +- python/libvirt-override.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -- 1.8.1.5

2 6

[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

[libvirt] Build failed in Jenkins: libvirt-syntax-check #1531
by Jenkins CI 30 Sep '13

30 Sep '13

See <http://honk.sigxcpu.org:8001/job/libvirt-syntax-check/1531/> ------------------------------------------ Started by upstream project "libvirt-build" build number 1700 Building on master in workspace <http://honk.sigxcpu.org:8001/job/libvirt-syntax-check/ws/> [workspace] $ /bin/sh -xe /tmp/hudson4053703831105800586.sh + make syntax-check GEN bracket-spacing-check GFDL_version 0.48 GFDL_version TAB_in_indentation src/vmware/vmware_driver.c:163: break; src/vmware/vmware_driver.c:164: } maint.mk: indent with space, not TAB, in C, sh, html, py, syms and RNG schemas make: *** [sc_TAB_in_indentation] Error 1 Build step 'Execute shell' marked build as failure

2 2

[libvirt] [PATCHv3 1/2] VMware: Support more than 2 driver backends
by Doug Goldstein 29 Sep '13

29 Sep '13

Currently the VMware version check code only supports two types of VMware backends, Workstation and Player. But in the near future we will have an additional one so we need to support more. Additionally, we discover and cache the path to the vmrun binary so we should use that path when using the cooresponding binary from the VMware VIX SDK. --- change from v2: * No change change from v1: * Added default case so we don't potentially pass NULL to virCommand --- src/vmware/vmware_conf.c | 28 +++++++++++++++++++++++++--- src/vmware/vmware_driver.c | 20 ++++++++++++++++++-- 2 files changed, 43 insertions(+), 5 deletions(-) diff --git a/src/vmware/vmware_conf.c b/src/vmware/vmware_conf.c index 261a4f6..c11c92d 100644 --- a/src/vmware/vmware_conf.c +++ b/src/vmware/vmware_conf.c @@ -257,10 +257,30 @@ vmwareExtractVersion(struct vmware_driver *driver) { unsigned long version = 0; int ret = -1; - virCommandPtr cmd; + virCommandPtr cmd = NULL; char * outbuf = NULL; - const char * bin = (driver->type == VMWARE_DRIVER_PLAYER) ? - "vmplayer" : "vmware"; + char *bin = NULL; + char *vmwarePath = NULL; + + if ((vmwarePath = mdir_name(driver->vmrun)) == NULL) + goto cleanup; + + switch (driver->type) { + case VMWARE_DRIVER_PLAYER: + if (virAsprintf(&bin, "%s/%s", vmwarePath, "vmplayer")) + goto cleanup; + break; + + case VMWARE_DRIVER_WORKSTATION: + if (virAsprintf(&bin, "%s/%s", vmwarePath, "vmware")) + goto cleanup; + break; + + default: + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("invalid driver type for version detection")); + goto cleanup; + } cmd = virCommandNewArgList(bin, "-v", NULL); virCommandSetOutputBuffer(cmd, &outbuf); @@ -276,6 +296,8 @@ vmwareExtractVersion(struct vmware_driver *driver) cleanup: virCommandFree(cmd); VIR_FREE(outbuf); + VIR_FREE(bin); + VIR_FREE(vmwarePath); return ret; } diff --git a/src/vmware/vmware_driver.c b/src/vmware/vmware_driver.c index 4e56971..01d65ed 100644 --- a/src/vmware/vmware_driver.c +++ b/src/vmware/vmware_driver.c @@ -93,6 +93,7 @@ vmwareConnectOpen(virConnectPtr conn, { struct vmware_driver *driver; size_t i; + char *tmp; virCheckFlags(VIR_CONNECT_RO, VIR_DRV_OPEN_ERROR); @@ -144,8 +145,23 @@ vmwareConnectOpen(virConnectPtr conn, if (virMutexInit(&driver->lock) < 0) goto cleanup; - driver->type = STRNEQ(conn->uri->scheme, "vmwareplayer") ? - VMWARE_DRIVER_WORKSTATION : VMWARE_DRIVER_PLAYER; + if ((tmp = STRSKIP(conn->uri->scheme, "vmware")) == NULL) { + virReportError(VIR_ERR_INTERNAL_ERROR, _("unable to parse URI " + "scheme '%s'"), conn->uri->scheme); + goto cleanup; + } + + driver->type = -1; + for (i = 0; i < VMWARE_DRIVER_LAST; i++) { + if (STREQ(tmp, vmwareDriverTypeToString(i))) + driver->type = i; + } + + if (driver->type == -1) { + virReportError(VIR_ERR_INTERNAL_ERROR, _("unable to find valid " + "requested VMware backend '%s'"), tmp); + goto cleanup; + } if (!(driver->domains = virDomainObjListNew())) goto cleanup; -- 1.8.1.5

4 7

[libvirt] [PATCH] build: fix build --without-lxc
by Eric Blake 28 Sep '13

28 Sep '13

'make distcheck' fails from a directory configured --without-lxc: GEN virt-login-shell.1 Can't write-open ../../tools/virt-login-shell.1: Permission denied at /usr/bin/pod2man line 69. * tools/Makefile.am (EXTRA_DIST): Ship pre-built man page. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- Pushing under the build-breaker rule. tools/Makefile.am | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tools/Makefile.am b/tools/Makefile.am index 0193140..1d9892c 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -84,7 +84,9 @@ dist_man1_MANS = \ virsh.1 if WITH_LXC dist_man1_MANS += virt-login-shell.1 -endif WITH_LXC +else ! WITH_LXC +EXTRA_DIST += virt-login-shell.1 +endif ! WITH_LXC if WITH_SANLOCK dist_man8_MANS = virt-sanlock-cleanup.8 endif WITH_SANLOCK -- 1.8.3.1

1 1

[libvirt] [PATCH] build: tweak vpath builds of net_rpc
by Eric Blake 28 Sep '13

28 Sep '13

Another case missed by commits 716c7bb and 6973e02. * src/Makefile.am (VIR_NET_RPC_GENERATED): Drop $(srcdir). (libvirt_net_rpc_la_SOURCES): List generated files more compactly. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- Pushing under the trivial rule. src/Makefile.am | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 2b4549e..8632b18 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -2194,19 +2194,18 @@ EXTRA_DIST += \ rpc/virkeepaliveprotocol.x VIR_NET_RPC_GENERATED = \ - $(srcdir)/rpc/virnetprotocol.h \ - $(srcdir)/rpc/virnetprotocol.c \ - $(srcdir)/rpc/virkeepaliveprotocol.h \ - $(srcdir)/rpc/virkeepaliveprotocol.c + rpc/virnetprotocol.h \ + rpc/virnetprotocol.c \ + rpc/virkeepaliveprotocol.h \ + rpc/virkeepaliveprotocol.c BUILT_SOURCES += $(VIR_NET_RPC_GENERATED) libvirt_net_rpc_la_SOURCES = \ rpc/virnetmessage.h rpc/virnetmessage.c \ - rpc/virnetprotocol.h rpc/virnetprotocol.c \ rpc/virnetsocket.h rpc/virnetsocket.c \ - rpc/virkeepaliveprotocol.h rpc/virkeepaliveprotocol.c \ - rpc/virkeepalive.h rpc/virkeepalive.c + rpc/virkeepalive.h rpc/virkeepalive.c \ + $(VIR_NET_RPC_GENERATED) if WITH_SSH2 libvirt_net_rpc_la_SOURCES += \ rpc/virnetsshsession.h rpc/virnetsshsession.c -- 1.8.3.1

1 0

[libvirt] [PATCHv2 0/4] Improve passthrough of early errors from qemu log
by Peter Krempa 28 Sep '13

28 Sep '13

Version 2 fixed according to review feedback of Jan. Peter Krempa (4): qemu_process: Make qemuProcessReadLog() more versatile and reusable qemu: monitor: Add infrastructure to access VM logs for better err msgs qemu: monitor: Produce better errors on monitor hangup qemu: Wire up better early error reporting src/qemu/qemu_monitor.c | 93 +++++++++++++++++++++++++++++++++++++++++++++---- src/qemu/qemu_monitor.h | 2 ++ src/qemu/qemu_process.c | 54 +++++++++++++++++++--------- src/qemu/qemu_process.h | 2 ++ 4 files changed, 129 insertions(+), 22 deletions(-) -- 1.8.3.2

3 7

Re: [libvirt] [PATCH] virsh: Fix domdisplay when domain only uses TLS
by Martin Kletzander 28 Sep '13

28 Sep '13

On Fri, Sep 27, 2013 at 05:43:50PM +0200, Christophe Fergeau wrote: > Hey Martin, > > Your reply wasn't sent to the mailing list, I'm assuming this was > unintentional. > Yes, sorry, that happened to me with 2 ACKs today :-( > On Fri, Sep 27, 2013 at 12:08:27PM +0200, Martin Kletzander wrote: > > On Wed, Sep 25, 2013 at 05:59:54PM +0200, Christophe Fergeau wrote: > > > It's possible to create a domain which will only use a TLS port > > > and will not have a non-TLS port set by using: > > > <graphics type='spice' autoport='yes' defaultMode='secure'/> > > > In such a setup, the 'graphics' node for the running domain will be: > > > <graphics type='spice' tlsPort='5900' > > > autoport='yes' listen='127.0.0.1' > > > defaultMode='secure'> > > > > > > However, cmdDomDisplay loops over all the 'graphics' node, and it > > > ignores nodes which don't have a 'port' attribute. This means > > > 'virsh domdisplay' will only return an empty string for domains > > > as the one above. > > > > > > This commit looks for both 'port' and 'tlsPort' before deciding > > > to ignore a graphics node. It also makes sure 'port' is not printed > > > when it's not set. > > > This makes 'virsh domdisplay' return > > > 'spice://127.0.0.1?tls-port=5900' for domains using only a TLS > > > port. > > > > > > Signed-off-by: Christophe Fergeau <cfergeau(a)redhat.com> > > > --- > > > tools/virsh-domain.c | 28 ++++++++++++++++------------ > > > 1 file changed, 16 insertions(+), 12 deletions(-) > > > > > > > ACK and OK for this release. > > Thanks, I've pushed this to master. > > This patch would also be a good candidate for the stable branch, is there > some process to follow to get it in there? > IIRC, either let Cole know or, if you have the rights, feel free to just back-port it when it is a bug (which this is). Martin

1 0

[libvirt] [PATCH v2] fchosttest: Run the test only under linux
by Michal Privoznik 28 Sep '13

28 Sep '13

Currently, we have functions to handle fc_host implemented just for linux. On all other platforms an error is thrown. It makes no sense to run the test on those platforms then. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- tests/Makefile.am | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/tests/Makefile.am b/tests/Makefile.am index 1a7ff4b..17a2a72 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -129,9 +129,12 @@ test_programs = virshtest sockettest \ virportallocatortest \ sysinfotest \ virstoragetest \ - fchosttest \ $(NULL) +if WITH_LINUX +test_programs += fchosttest +endif WITH_LINUX + if WITH_LIBVIRTD test_programs += fdstreamtest endif WITH_LIBVIRTD @@ -845,10 +848,15 @@ fdstreamtest_SOURCES = \ fdstreamtest.c testutils.h testutils.c fdstreamtest_LDADD = $(LDADDS) +if WITH_LINUX fchosttest_SOURCES = \ fchosttest.c testutils.h testutils.c fchosttest_LDADD = $(LDADDS) +else ! WITH_LINUX +EXTRA_DIST += fchosttest.c +endif ! WITH_LINUX + if WITH_CIL CILOPTFLAGS = CILOPTINCS = -- 1.8.1.5

2 1

[libvirt] [PATCH] Makefile.am: Always include rule to make org.libvirt.api.policy
by Michal Privoznik 28 Sep '13

28 Sep '13

When running 'make dist' on a system without policykit, we currently fail. This is because $(srcdir)/access/org.libvirt.api.policy is in EXTRA_DIST, however, the rule to generate the file is conditional whether we build with polkit or not. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/Makefile.am | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 09311b7..2b4549e 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1519,6 +1519,10 @@ libvirt_driver_access_la_LIBADD = EXTRA_DIST += access/genpolkit.pl +$(ACCESS_DRIVER_POLKIT_POLICY): $(srcdir)/access/viraccessperm.h \ + $(srcdir)/access/genpolkit.pl Makefile.am + $(AM_V_GEN)$(PERL) $(srcdir)/access/genpolkit.pl < $< > $@ || rm -f $@ + if WITH_POLKIT1 libvirt_driver_access_la_SOURCES += $(ACCESS_DRIVER_POLKIT_SOURCES) @@ -1527,10 +1531,6 @@ if WITH_LIBVIRTD polkitaction_DATA = $(ACCESS_DRIVER_POLKIT_POLICY) endif WITH_LIBVIRTD -$(ACCESS_DRIVER_POLKIT_POLICY): $(srcdir)/access/viraccessperm.h \ - $(srcdir)/access/genpolkit.pl Makefile.am - $(AM_V_GEN)$(PERL) $(srcdir)/access/genpolkit.pl < $< > $@ || rm -f $@ - CLEANFILES += $(ACCESS_DRIVER_POLKIT_POLICY) BUILT_SOURCES += $(ACCESS_DRIVER_POLKIT_POLICY) else ! WITH_POLKIT1 -- 1.8.1.5

2 1

[libvirt] [PATCH 1/3] BSD: Ensure UNIX socket credentials are valid
by Doug Goldstein 28 Sep '13

28 Sep '13

Ensure that the socket credentials we got back on BSD are valid before using them. --- src/rpc/virnetsocket.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/rpc/virnetsocket.c b/src/rpc/virnetsocket.c index b311aae..49c6ddc 100644 --- a/src/rpc/virnetsocket.c +++ b/src/rpc/virnetsocket.c @@ -1166,6 +1166,18 @@ int virNetSocketGetUNIXIdentity(virNetSocketPtr sock, return -1; } + if (cr.cr_version != XUCRED_VERSION) { + virReportError(VIR_ERR_SYSTEM_ERROR, "%s", + _("Failed to get valid client socket identity")); + return -1; + } + + if (cr.cr_ngroups == 0) { + virReportError(VIR_ERR_SYSTEM_ERROR, "%s", + _("Failed to get valid client socket identity groups")); + return -1; + } + *pid = -1; *uid = cr.cr_uid; *gid = cr.cr_gid; -- 1.8.1.5

2 7

[libvirt] [PATCH 00/17] Many OOM fixes
by Daniel P. Berrange 28 Sep '13

28 Sep '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> This series fixes a large number of problems in OOM codepaths. These are primarily memory leaks, but there's one crash in Xen parsing code and a few places which silently ignore failure leading to corrupt or malformed output. Daniel P. Berrange (17): Fix leak in virDomainVcpuPinDefArrayFree Avoid leak if virDomainSoundCodecDefParseXML return error Fix leak in virDomainVcpuPinDefParseXML parsing cpumask Fix leak in virDomainDefParseXML parsing vcpupin Fix leak of address string in qemuDomainPCIAddressGetNextSlot Avoid leak in qemuParseRBDString on failure of qemuAddRBDHost Fix failure to honour OOM status in qemuParseNBDString Fix leak on OOM in qemuBuildCommandLine dealing with sound card Fix leak in qemuParseCommandLineDisk on OOM Fix missing jump to error cleanup in qemuParseCommandLineDisk Fix leak in qemuStringToArgvEnv upon OOM Fix leak in qemuParseCommandLine on OOM Fix leak of command line args in qemuParseCommandLine Fix leak of char device in xenParseXM Fix crash on OOM in xenParseXM handling consoles Fix broken formatting on OOM in xenFormatXM Fix leak of serial value in xenFormatXM on OOM src/conf/domain_conf.c | 16 +++++++++----- src/qemu/qemu_command.c | 56 ++++++++++++++++++++++++++++--------------------- src/qemu/qemu_conf.c | 18 ++++++++++++++++ src/qemu/qemu_conf.h | 2 ++ src/qemu/qemu_domain.c | 15 +------------ src/xenxs/xen_xm.c | 12 +++++++---- 6 files changed, 72 insertions(+), 47 deletions(-) -- 1.8.3.1

3 36

[libvirt] [PATCH] LXC: workaround machined uncleaned data with containers running systemd.
by Cédric Bosdonnat 27 Sep '13

27 Sep '13

The problem is described by [0] but its effect on libvirt is that starting a container with a full distro running systemd after having stopped it simply fails. The container cleanup now calls the machined Terminate function to make sure that everything is in order for the next run. [0]: https://bugs.freedesktop.org/show_bug.cgi?id=68370 --- src/Makefile.am | 4 +++- src/lxc/lxc_process.c | 8 ++++++++ src/util/virsystemd.c | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++ src/util/virsystemd.h | 4 ++++ 4 files changed, 70 insertions(+), 1 deletion(-) diff --git a/src/Makefile.am b/src/Makefile.am index 4375ef7..211b42e 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1170,7 +1170,9 @@ EXTRA_DIST += qemu/qemu.conf qemu/libvirtd_qemu.aug \ if WITH_LXC noinst_LTLIBRARIES += libvirt_driver_lxc_impl.la libvirt_driver_lxc_la_SOURCES = -libvirt_driver_lxc_la_LIBADD = libvirt_driver_lxc_impl.la +libvirt_driver_lxc_la_LIBADD = \ + libvirt_driver_lxc_impl.la \ + libvirt_util.la if WITH_DRIVER_MODULES mod_LTLIBRARIES += libvirt_driver_lxc.la libvirt_driver_lxc_la_LIBADD += ../gnulib/lib/libgnu.la diff --git a/src/lxc/lxc_process.c b/src/lxc/lxc_process.c index 4835bd5..f92c613 100644 --- a/src/lxc/lxc_process.c +++ b/src/lxc/lxc_process.c @@ -50,6 +50,7 @@ #include "virstring.h" #include "viratomic.h" #include "virprocess.h" +#include "virsystemd.h" #define VIR_FROM_THIS VIR_FROM_LXC @@ -210,6 +211,13 @@ static void virLXCProcessCleanup(virLXCDriverPtr driver, virCgroupFree(&priv->cgroup); } + /* Get machined to terminate the machine as it may not have cleaned it + * properly. See https://bugs.freedesktop.org/show_bug.cgi?id=68370 for + * the bug we are working around here. + */ + virSystemdTerminateMachine(vm->def->name, "lxc", true); + + /* now that we know it's stopped call the hook if present */ if (virHookPresent(VIR_HOOK_DRIVER_LXC)) { char *xml = virDomainDefFormat(vm->def, 0); diff --git a/src/util/virsystemd.c b/src/util/virsystemd.c index e72b7f0..3320e53 100644 --- a/src/util/virsystemd.c +++ b/src/util/virsystemd.c @@ -242,3 +242,58 @@ cleanup: VIR_FREE(slicename); return ret; } + +int virSystemdTerminateMachine(const char *name, + const char *drivername, + bool privileged) +{ + int ret; + DBusConnection *conn; + char *machinename = NULL; + char *username = NULL; + + ret = virDBusIsServiceEnabled("org.freedesktop.machine1"); + if (ret < 0) + return ret; + + conn = virDBusGetSystemBus(); + + ret = -1; + if (privileged) { + if (virAsprintf(&machinename, "%s-%s", drivername, name) < 0) + goto cleanup; + } else { + if (!(username = virGetUserName(geteuid()))) + goto cleanup; + if (virAsprintf(&machinename, "%s-%s-%s", username, drivername, name) < 0) + goto cleanup; + } + + /* + * The systemd DBus API we're invoking has the + * following signature + * + * TerminateMachine(in s name); + * + * @name a host unique name for the machine. shows up + * in 'ps' listing & similar + */ + + VIR_DEBUG("Attempting to terminate machine via systemd"); + if (virDBusCallMethod(conn, + NULL, + "org.freedesktop.machine1", + "/org/freedesktop/machine1", + "org.freedesktop.machine1.Manager", + "TerminateMachine", + "s", + machinename) < 0) + goto cleanup; + + ret = 0; + +cleanup: + VIR_FREE(username); + VIR_FREE(machinename); + return ret; +} diff --git a/src/util/virsystemd.h b/src/util/virsystemd.h index 414ae5a..6c9c6df 100644 --- a/src/util/virsystemd.h +++ b/src/util/virsystemd.h @@ -38,4 +38,8 @@ int virSystemdCreateMachine(const char *name, bool iscontainer, const char *partition); +int virSystemdTerminateMachine(const char *name, + const char *drivername, + bool privileged); + #endif /* __VIR_SYSTEMD_H__ */ -- 1.8.4

2 1

[libvirt] [PATCH] fchosttest: Run the test only under linux
by Michal Privoznik 27 Sep '13

27 Sep '13

Currently, we have functions to handle fc_host implemented just for linux. On all other platforms an error is thrown. It makes no sense to run the test on those platforms then. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- tests/fchosttest.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tests/fchosttest.c b/tests/fchosttest.c index 05ff20b..46bd784 100644 --- a/tests/fchosttest.c +++ b/tests/fchosttest.c @@ -163,6 +163,11 @@ mymain(void) { int ret = 0; +#ifndef __linux__ + fputs("Not compiled under linux, skipping this test\n", stderr); + return EXIT_AM_SKIP; +#endif + if (virAsprintf(&fchost_prefix, "%s/%s", abs_srcdir, "fchostdata/fc_host/") < 0) { ret = -1; -- 1.8.1.5

3 2

[libvirt] [PATCH 0/2] Fix a few memory leaks in libvirtd
by Jiri Denemark 27 Sep '13

27 Sep '13

Jiri Denemark (2): qemu: Don't leak reference to virQEMUDriverConfigPtr qemu: Free all driver data in qemuStateCleanup src/qemu/qemu_driver.c | 2 ++ src/qemu/qemu_process.c | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) -- 1.8.3.2

2 4

[libvirt] [PATCH] build: Fix VPATH build error for locking daemon
by Viktor Mihajlovski 27 Sep '13

27 Sep '13

Removed superfluous/wrong srcdir prefix. Signed-off-by: Viktor Mihajlovski <mihajlov(a)linux.vnet.ibm.com> --- src/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Makefile.am b/src/Makefile.am index 4057eda..09311b7 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -196,7 +196,7 @@ BUILT_SOURCES += $(LOCK_PROTOCOL_GENERATED) MAINTAINERCLEANFILES += $(LOCK_PROTOCOL_GENERATED) LOCK_DAEMON_GENERATED = \ - $(srcdir)/locking/lock_daemon_dispatch_stubs.h + locking/lock_daemon_dispatch_stubs.h $(NULL) BUILT_SOURCES += $(LOCK_DAEMON_GENERATED) -- 1.7.9.5

2 1

[libvirt] [PATCH]lxc: don't start container when no root fs found
by Chen Hanxiao 27 Sep '13

27 Sep '13

From: Chen Hanxiao <chenhanxiao(a)cn.fujitsu.com> Currently, if we don't explicitly add root fs for container, libvirt will add one for us implicitly with "/" as src. It would be not safe. Unless user asked for it, we should not assume this. Signed-off-by: Chen Hanxiao <chenhanxiao(a)cn.fujitsu.com> --- src/lxc/lxc_process.c | 29 +++++++---------------------- 1 file changed, 7 insertions(+), 22 deletions(-) diff --git a/src/lxc/lxc_process.c b/src/lxc/lxc_process.c index 4835bd5..4f4a906 100644 --- a/src/lxc/lxc_process.c +++ b/src/lxc/lxc_process.c @@ -911,29 +911,14 @@ virLXCProcessEnsureRootFS(virDomainObjPtr vm) { virDomainFSDefPtr root = virDomainGetRootFilesystem(vm->def); - if (root) + if (root) { return 0; - - if (VIR_ALLOC(root) < 0) - goto error; - - root->type = VIR_DOMAIN_FS_TYPE_MOUNT; - - if (VIR_STRDUP(root->src, "/") < 0 || - VIR_STRDUP(root->dst, "/") < 0) - goto error; - - if (VIR_INSERT_ELEMENT(vm->def->fss, - 0, - vm->def->nfss, - root) < 0) - goto error; - - return 0; - -error: - virDomainFSDefFree(root); - return -1; + } else { + errno = EINVAL; + virReportSystemError(errno, "%s", + _("No root fs found for container")); + return -1; + } } /** -- 1.8.2.1

2 2

[libvirt] [PATCHv2] util: recognize SMB/CIFS filesystems as shared
by Laine Stump 27 Sep '13

27 Sep '13

This should resolve: https://bugzilla.redhat.com/show_bug.cgi?id=1012085 libvirt previously recognized NFS, GFS2, OCFS2, and AFS filesystems as "shared", and thus eligible for exceptions to certain rules/actions about chowning image files before handing them off to a guest. This patch widens the definition of "shared filesystem" to include SMB and CIFS filesystems (aka "Windows file sharing"); both of these use the same protocol, but different drivers so there are different magic numbers for each. --- Change from V1 - also check for CIFS_SUPER_MAGIC, not just SMB_SUPER_MAGIC. src/util/virstoragefile.c | 16 +++++++++++++++- src/util/virstoragefile.h | 2 ++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c index 0b9cec3..48d5fbb 100644 --- a/src/util/virstoragefile.c +++ b/src/util/virstoragefile.c @@ -1241,6 +1241,12 @@ cleanup: # ifndef AFS_FS_MAGIC # define AFS_FS_MAGIC 0x6B414653 # endif +# ifndef SMB_SUPER_MAGIC +# define SMB_SUPER_MAGIC 0x517B +# endif +# ifndef CIFS_SUPER_MAGIC +# define CIFS_SUPER_MAGIC 0xFF534D42 +# endif int virStorageFileIsSharedFSType(const char *path, @@ -1304,6 +1310,12 @@ int virStorageFileIsSharedFSType(const char *path, if ((fstypes & VIR_STORAGE_FILE_SHFS_AFS) && (sb.f_type == AFS_FS_MAGIC)) return 1; + if ((fstypes & VIR_STORAGE_FILE_SHFS_SMB) && + (sb.f_type == SMB_SUPER_MAGIC)) + return 1; + if ((fstypes & VIR_STORAGE_FILE_SHFS_CIFS) && + (sb.f_type == CIFS_SUPER_MAGIC)) + return 1; return 0; } @@ -1322,7 +1334,9 @@ int virStorageFileIsSharedFS(const char *path) VIR_STORAGE_FILE_SHFS_NFS | VIR_STORAGE_FILE_SHFS_GFS2 | VIR_STORAGE_FILE_SHFS_OCFS | - VIR_STORAGE_FILE_SHFS_AFS); + VIR_STORAGE_FILE_SHFS_AFS | + VIR_STORAGE_FILE_SHFS_SMB | + VIR_STORAGE_FILE_SHFS_CIFS); } int virStorageFileIsClusterFS(const char *path) diff --git a/src/util/virstoragefile.h b/src/util/virstoragefile.h index 1f89839..d5effa4 100644 --- a/src/util/virstoragefile.h +++ b/src/util/virstoragefile.h @@ -112,6 +112,8 @@ enum { VIR_STORAGE_FILE_SHFS_GFS2 = (1 << 1), VIR_STORAGE_FILE_SHFS_OCFS = (1 << 2), VIR_STORAGE_FILE_SHFS_AFS = (1 << 3), + VIR_STORAGE_FILE_SHFS_SMB = (1 << 4), + VIR_STORAGE_FILE_SHFS_CIFS = (1 << 5), }; int virStorageFileIsSharedFS(const char *path); -- 1.7.11.7

2 1

[libvirt] [PATCH] build: fix testsuite building under cygwin
by Eric Blake 27 Sep '13

27 Sep '13

Similar to commit 8f34f19. * tests/Makefile.am (virnetserverclienttest_CFLAGS): Add XDR_CFLAGS. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- Pushing under the build-breaker rule. tests/Makefile.am | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/Makefile.am b/tests/Makefile.am index 777758f..1a7ff4b 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -639,6 +639,7 @@ virnetsockettest_LDADD = $(LDADDS) virnetserverclienttest_SOURCES = \ virnetserverclienttest.c \ testutils.h testutils.c +virnetserverclienttest_CFLAGS = $(XDR_CFLAGS) $(AM_CFLAGS) virnetserverclienttest_LDADD = $(LDADDS) virnetserverclientmock_la_SOURCES = \ -- 1.8.3.1

1 0

[libvirt] [PATCH] rpc: Increase bound limit for virDomainGetJobStats
by Jiri Denemark 27 Sep '13

27 Sep '13

https://bugzilla.redhat.com/show_bug.cgi?id=1012818 Commit 6d7d0b1869ed293e3208d11f375cecea0129dfc5 (in 1.1.2) added bounds checking to virDomainGetJobStats. But even at that time the API was able to return 20 parameters while the limit was set to 16. Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/remote/remote_protocol.x | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/remote/remote_protocol.x b/src/remote/remote_protocol.x index 8d17bad..810eeca 100644 --- a/src/remote/remote_protocol.x +++ b/src/remote/remote_protocol.x @@ -230,7 +230,7 @@ const REMOTE_NODE_MEMORY_PARAMETERS_MAX = 64; const REMOTE_DOMAIN_MIGRATE_PARAM_LIST_MAX = 64; /* Upper limit on number of job stats */ -const REMOTE_DOMAIN_JOB_STATS_MAX = 16; +const REMOTE_DOMAIN_JOB_STATS_MAX = 64; /* Upper limit on number of CPU models */ const REMOTE_CONNECT_CPU_MODELS_MAX = 8192; -- 1.8.3.2

2 2

[libvirt] [PATCH] qemu_migrate: Fix assign the same port when migrating concurrently
by Wangyufei (A) 27 Sep '13

27 Sep '13

From: WangYufei <james.wangyufei(a)huawei.com> Date: Fri, 27 Sep 2013 11:53:57 +0800 Subject: [PATCH] qemu_migrate: Fix assign the same port when migrating concurrently When we migrate vms concurrently, there's a chance that libvirtd on destination assign the same port for different migrations, which will lead to migration failed during migration prepare phase on destination. So we change the port increase to atomic operation to solve the problem. Signed-off-by: WangYufei <james.wangyufei(a)huawei.com> --- src/qemu/qemu_migration.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 3a1aab7..0f496f4 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -57,6 +57,7 @@ #include "virhook.h" #include "virstring.h" #include "virtypedparam.h" +#include "viratomic.h" #define VIR_FROM_THIS VIR_FROM_QEMU @@ -2521,7 +2522,7 @@ qemuMigrationPrepareDirect(virQEMUDriverPtr driver, * to be a correct hostname which refers to the target machine). */ if (uri_in == NULL) { - this_port = QEMUD_MIGRATION_FIRST_PORT + port++; + this_port = QEMUD_MIGRATION_FIRST_PORT + virAtomicIntInc(&port); if (port == QEMUD_MIGRATION_NUM_PORTS) port = 0; /* Get hostname */ @@ -2578,7 +2579,7 @@ qemuMigrationPrepareDirect(virQEMUDriverPtr driver, if (uri->port == 0) { /* Generate a port */ - this_port = QEMUD_MIGRATION_FIRST_PORT + port++; + this_port = QEMUD_MIGRATION_FIRST_PORT + virAtomicIntInc(&port); if (port == QEMUD_MIGRATION_NUM_PORTS) port = 0; -- 1.7.3.1.msysgit.0 Best Regards, -WangYufei

3 3

[libvirt] [libvirt-designer 1/2] Fix typo in error message
by Christophe Fergeau 27 Sep '13

27 Sep '13

--- Pushed under the trivial rule libvirt-designer/libvirt-designer-main.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libvirt-designer/libvirt-designer-main.h b/libvirt-designer/libvirt-designer-main.h index 5e82f8a..9341754 100644 --- a/libvirt-designer/libvirt-designer-main.h +++ b/libvirt-designer/libvirt-designer-main.h @@ -21,7 +21,7 @@ */ #if !defined(__LIBVIRT_DESIGNER_H__) && !defined(LIBVIRT_DESIGNER_BUILD) -#error "Only <libvirt-gdesigner/libvirt-gdesigner.h> can be included directly." +#error "Only <libvirt-designer/libvirt-designer.h> can be included directly." #endif #include <osinfo/osinfo.h> -- 1.8.3.1

2 2

[libvirt] [PATCH]LXC: fix a comment typo in lxc_controller.c
by Chen Hanxiao 27 Sep '13

27 Sep '13

From: Chen Hanxiao <chenhanxiao(a)cn.fujitsu.com> LXC: fix a comment typo in lxc_controller.c Signed-off-by: Chen Hanxiao <chenhanxiao(a)cn.fujitsu.com> --- src/lxc/lxc_controller.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c index ed73ab0..636cf6e 100644 --- a/src/lxc/lxc_controller.c +++ b/src/lxc/lxc_controller.c @@ -2011,7 +2011,7 @@ virLXCControllerEventSend(virLXCControllerPtr ctrl, virNetMessagePtr msg; if (!ctrl->client) { - VIR_WARN("Dropping event %d becuase libvirtd is not connected", procnr); + VIR_WARN("Dropping event %d because libvirtd is not connected", procnr); return; } -- 1.8.2.1

2 1

[libvirt] [PATCH] build: fix use of rpc.h on cygwin
by Eric Blake 27 Sep '13

27 Sep '13

Caused by commit 012c25e8 splitting out a convenience library. CC libvirtd_conf_la-libvirtd-config.lo In file included from ../src/rpc/virnetmessage.h:24:0, from ../src/rpc/virnetserverprogram.h:27, from ../src/rpc/virnetserver.h:32, from libvirtd-config.c:31: ../src/rpc/virnetprotocol.h:9:21: fatal error: rpc/rpc.h: No such file or directory * daemon/Makefile.am (libvirtd_conf_la_CFLAGS): Add XDR_CFLAGS. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- Pushing under the build-breaker rule (well, I will once libvirt.org is responsive again - it's been having problems with the git server today) daemon/Makefile.am | 1 + 1 file changed, 1 insertion(+) diff --git a/daemon/Makefile.am b/daemon/Makefile.am index eb58de9..46c766c 100644 --- a/daemon/Makefile.am +++ b/daemon/Makefile.am @@ -100,6 +100,7 @@ noinst_LTLIBRARIES = libvirtd_conf.la libvirtd_conf_la_SOURCES = $(LIBVIRTD_CONF_SOURCES) libvirtd_conf_la_CFLAGS = \ $(LIBXML_CFLAGS) \ + $(XDR_CFLAGS) \ $(WARN_CFLAGS) $(PIE_CFLAGS) \ $(COVERAGE_CFLAGS) \ $(NULL) -- 1.8.3.1

1 0

[libvirt] [PATCH]LXC: free dst before lxcDomainAttachDeviceDiskLive return
by Chen Hanxiao 27 Sep '13

27 Sep '13

From: Chen Hanxiao <chenhanxiao(a)cn.fujitsu.com> free dst before lxcDomainAttachDeviceDiskLive return Signed-off-by: Chen Hanxiao <chenhanxiao(a)cn.fujitsu.com> --- src/lxc/lxc_driver.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index 9c58f67..7906ad1 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -3053,6 +3053,7 @@ cleanup: virDomainAuditDisk(vm, NULL, def->src, "attach", ret == 0); if (dst && created && ret < 0) unlink(dst); + VIR_FREE(dst); return ret; } -- 1.8.2.1

5 5

[libvirt] Is it possible to attach a harddisk to an ESX node
by varun bhatnagar 27 Sep '13

27 Sep '13

Hi, Is it possible to attach a harddisk to an ESX node later after creating/defining it? If yes, can anyone tell me how to do it? Regards, Varun

2 2