- Devel - libvirt List Archives

[libvirt] [PATCH 4/5] macvtap support for libvirt -- helper code
by Stefan Berger 11 Feb '10

11 Feb '10

This part adds the helper code to setup and tear down macvtap devices using direct communication with the device driver via netlink sockets. Signed-off-by: Stefan Berger <stefanb(a)us.ibm.com>

2 3

[libvirt] [PATCH 3/5] macvtap support for libvirt -- qemu support
by Stefan Berger 11 Feb '10

11 Feb '10

This part adds support for qemu making a macvtap tap device available via file descriptor passed to qemu command line. This also attempts to tear down the macvtap device when a VM terminates. This includes support for attachment and detachment to/from running VM. Signed-off-by: Stefan Berger <stefanb(a)us.ibm.com>

3 4

[libvirt] [PATCH 2/5] macvtap support for libvirt -- parse new interface XML
by Stefan Berger 11 Feb '10

11 Feb '10

This part adds support to domain_conf.{c|h} for parsing the new interface XML of type 'direct'. The parsed mode is now stored as an int. Signed-off-by: Stefan Berger <stefanb(a)us.ibm.com>

3 3

[libvirt] [PATCH 0/5] macvtap support for Qemu/KVM VMs via libvirt
by Stefan Berger 11 Feb '10

11 Feb '10

Hello! This is a re-post of previously posted patches following Daniel Berrange's request for changes along with other fixes. The following patches provide support for making the macvtap networking device type available to Qemu/KVM VMs. The patches rely on the macvtap driver that just became available through the Linux net-next tree (fixes still may be necessary) and make the device available to Qemu/KVM via a tap file descriptor similar to a 'regular' tap device. Following up on previous discussions, the libvirt patches allow using the following XML in the domain description to enable qemu network connectivity via this type of device: <interface type='direct'> <source dev='eth1' mode='vepa'/> <model type='virtio'/> </interface> The above XML indicates that eth1 is the Ethernet interface to link the macvtap device to and communicate to the network. As a consequence, libvirt will create an instance of a macvtap device, assign it the same MAC address as the VM's interface has and open a file descriptor of the associated character device /dev/tap%d and pass it via command line to Qemu/kvm. In the above XML the mode can be chosen as 'vepa', 'private' or 'bridge' and is by default set to 'vepa'(by the driver) if omitted. Attachment and detachment of macvtap to/from a running VM also works. Regards, Stefan

3 3

[libvirt] [PATCH 5/5] macvtap support for libvirt -- schema extensions
by Stefan Berger 11 Feb '10

11 Feb '10

This part extends the domain xml schema to support the new interface type 'direct'. Signed-off-by: Stefan Berger <stefanb(a)us.ibm.com>

2 1

[libvirt] virStoragePoolSourceFree(S) does not free S
by Jim Meyering 11 Feb '10

11 Feb '10

I was surprised to see that virStoragePoolSourceFree(S) does not free S. The other three vir*Free functions in storage_conf *do* free S. There are at least three places where this causes leaks. Here's one: virStoragePoolSourcePtr virStoragePoolDefParseSourceString(virConnectPtr conn, const char *srcSpec, int pool_type) { xmlDocPtr doc = NULL; xmlNodePtr node = NULL; xmlXPathContextPtr xpath_ctxt = NULL; virStoragePoolSourcePtr def = NULL, ret = NULL; doc = xmlReadDoc((const xmlChar *)srcSpec, "srcSpec.xml", NULL, XML_PARSE_NOENT | XML_PARSE_NONET | XML_PARSE_NOERROR | XML_PARSE_NOWARNING); if (doc == NULL) { virStorageReportError(conn, VIR_ERR_XML_ERROR, "%s", _("bad <source> spec")); goto cleanup; } xpath_ctxt = xmlXPathNewContext(doc); if (xpath_ctxt == NULL) { virReportOOMError(conn); goto cleanup; } if (VIR_ALLOC(def) < 0) { <<<====== def is alloc'd virReportOOMError(conn); goto cleanup; } node = virXPathNode(conn, "/source", xpath_ctxt); if (!node) { virStorageReportError(conn, VIR_ERR_XML_ERROR, "%s", _("root element was not source")); goto cleanup; } if (virStoragePoolDefParseSource(conn, xpath_ctxt, def, pool_type, node) < 0) goto cleanup; ret = def; def = NULL; cleanup: if (def) virStoragePoolSourceFree(def); <<<<======== yet not freed xmlFreeDoc(doc); xmlXPathFreeContext(xpath_ctxt); return ret; } One fix might be to call VIR_FREE(def) in the "if (def)..." block, but that seems short-sighted, since the name virStoragePoolSourceFree makes me think *it* should be doing the whole job. However, if I make the logical change to virStoragePoolSourceFree, diff --git a/src/conf/storage_conf.c b/src/conf/storage_conf.c index 62b8394..ffe38cc 100644 --- a/src/conf/storage_conf.c +++ b/src/conf/storage_conf.c @@ -291,6 +291,7 @@ virStoragePoolSourceFree(virStoragePoolSourcePtr source) { VIR_FREE(source->auth.chap.login); VIR_FREE(source->auth.chap.passwd); } + VIR_FREE(source); } that causes "make check" to fail miserably due to heap corruption, as reported by valgrind: ==30311== Invalid free() / delete / delete[] ==30311== at 0x4A04D72: free (vg_replace_malloc.c:325) ==30311== by 0x42950C: virFree (memory.c:177) ==30311== by 0x4A2687: virStoragePoolSourceFree (storage_conf.c:294) ==30311== by 0x4A26BD: virStoragePoolDefFree (storage_conf.c:304) ==30311== by 0x4A2723: virStoragePoolObjFree (storage_conf.c:319) ==30311== by 0x4A27A2: virStoragePoolObjListFree (storage_conf.c:334) ==30311== by 0x4757AD: storageDriverShutdown (storage_driver.c:246) ==30311== by 0x4C1E3F: virStateCleanup (libvirt.c:909) ==30311== by 0x4103C5: qemudCleanup (libvirtd.c:2402) ==30311== by 0x41273B: main (libvirtd.c:3196) ==30311== Address 0x5c48c38 is 56 bytes inside a block of size 184 alloc'd ==30311== at 0x4A04481: calloc (vg_replace_malloc.c:418) ==30311== by 0x4293F5: virAlloc (memory.c:100) ==30311== by 0x4A330E: virStoragePoolDefParseXML (storage_conf.c:615) ==30311== by 0x4A3A21: virStoragePoolDefParseNode (storage_conf.c:762) ==30311== by 0x4A3BE6: virStoragePoolDefParse (storage_conf.c:810) ==30311== by 0x4A3C7F: virStoragePoolDefParseFile (storage_conf.c:834) ==30311== by 0x4A5816: virStoragePoolObjLoad (storage_conf.c:1495) ==30311== by 0x4A5BDB: virStoragePoolLoadAllConfigs (storage_conf.c:1575) ==30311== by 0x475598: storageDriverStartup (storage_driver.c:164) ==30311== by 0x4C1D9D: virStateInitialize (libvirt.c:888) ==30311== by 0x4125E9: main (libvirtd.c:3153) I tracked the problem down to this definition in src/conf/storage_conf.h: typedef struct _virStoragePoolDef virStoragePoolDef; typedef virStoragePoolDef *virStoragePoolDefPtr; struct _virStoragePoolDef { /* General metadata */ char *name; unsigned char uuid[VIR_UUID_BUFLEN]; int type; /* virStoragePoolType */ unsigned long long allocation; unsigned long long capacity; unsigned long long available; virStoragePoolSource source; <== this is a *STRUCT*, not a ptr virStoragePoolTarget target; <== Likewise }; Hence, when calling virStoragePoolDefFree (defined like this) void virStoragePoolDefFree(virStoragePoolDefPtr def) { if (!def) return; VIR_FREE(def->name); virStoragePoolSourceFree(&def->source); That function must *not* call VIR_FREE on &def->source, because as valgrind tells us, above, that is in the middle of a virStoragePoolDef buffer. Thus, the naive patch seems to be the way to go, unless you want to change the struct members to be pointers (and adjust all uses -- much more invasive). There are other leaks associated with similar uses of virStoragePoolSourceFree just like this one. Here's a patch that fixes them all at once. If you agree in principle, I'll write a longer commit log than the one below: [note that there's no need to guard uses of virStoragePoolSourceFree against NULL args, so I removed those. ] >From a53efcee7ec74948a2cf4c1c02902419856b0154 Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Fri, 5 Feb 2010 17:09:43 +0100 Subject: [PATCH] plug four virStoragePoolSourceFree-related leaks * src/conf/storage_conf.c (virStoragePoolDefParseSourceString): * src/storage/storage_backend_fs.c: (virStorageBackendFileSystemNetFindPoolSourcesFunc): (virStorageBackendFileSystemNetFindPoolSources): * src/test/test_driver.c (testStorageFindPoolSources): --- src/conf/storage_conf.c | 4 ++-- src/storage/storage_backend_fs.c | 8 ++++---- src/test/test_driver.c | 3 ++- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/conf/storage_conf.c b/src/conf/storage_conf.c index 62b8394..b98b8e9 100644 --- a/src/conf/storage_conf.c +++ b/src/conf/storage_conf.c @@ -524,8 +524,8 @@ virStoragePoolDefParseSourceString(virConnectPtr conn, ret = def; def = NULL; cleanup: - if (def) - virStoragePoolSourceFree(def); + virStoragePoolSourceFree(def); + VIR_FREE(def); xmlFreeDoc(doc); xmlXPathFreeContext(xpath_ctxt); diff --git a/src/storage/storage_backend_fs.c b/src/storage/storage_backend_fs.c index 0d1c7a7..70e91a0 100644 --- a/src/storage/storage_backend_fs.c +++ b/src/storage/storage_backend_fs.c @@ -174,8 +174,8 @@ virStorageBackendFileSystemNetFindPoolSourcesFunc(virConnectPtr conn, src = NULL; ret = 0; cleanup: - if (src) - virStoragePoolSourceFree(src); + virStoragePoolSourceFree(src); + VIR_FREE(src); return ret; } @@ -236,8 +236,8 @@ virStorageBackendFileSystemNetFindPoolSources(virConnectPtr conn, for (i = 0; i < state.list.nsources; i++) virStoragePoolSourceFree(&state.list.sources[i]); - if (source) - virStoragePoolSourceFree(source); + virStoragePoolSourceFree(source); + VIR_FREE(source); VIR_FREE(state.list.sources); diff --git a/src/test/test_driver.c b/src/test/test_driver.c index 2122a1b..8e5ecf2 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -1,7 +1,7 @@ /* * test.c: A "mock" hypervisor for use by application unit tests * - * Copyright (C) 2006-2009 Red Hat, Inc. + * Copyright (C) 2006-2010 Red Hat, Inc. * Copyright (C) 2006 Daniel P. Berrange * * This library is free software; you can redistribute it and/or @@ -3763,6 +3763,7 @@ testStorageFindPoolSources(virConnectPtr conn, cleanup: virStoragePoolSourceFree(source); + VIR_FREE(source); return ret; } -- 1.7.0.rc1.204.gb96e

2 2

[libvirt] [PATCH 1/5] macvtap support for libvirt -- build support
by Stefan Berger 11 Feb '10

11 Feb '10

This patch adds build support for libvirt checking for certain contents of /usr/include/linux/if_link.h to see whether macvtap support is compilable on that system. One can disable macvtap support in libvirt via --without-macvtap passed to configure. Signed-off-by: Stefan Berger <stefanb(a)us.ibm.com>

3 2

[libvirt] Node devices?
by Ed Swierk 11 Feb '10

11 Feb '10

After staring at the code implementing node devices in libvirt, I have decided that they're really neat, but I have no idea what they are for or how to use them. Reading the API docs and searching libvir-list didn't help much, and the user documentation (http://libvirt.org/archnode.html and http://libvirt.org/formatnode.html) is a bit, err, high-level. Can someone enlighten me? --Ed

5 5

[libvirt] [PATCH] Fix disk stats retrieval with QEMU >= 0.12
by Daniel P. Berrange 10 Feb '10

10 Feb '10

With QEMU >= 0.12 the host and guest side of disks no longer have the same naming convention. Specifically the host side will now get a 'drive-' prefix added to its name. The 'info blockstats' monitor command returns the host side name, so it is neccessary to strip this off when looking up stats since libvirt stores the guest side name ! * src/qemu/qemu_conf.c, src/qemu/qemu_conf.h: Move 'drive-' prefix string to a defined constant * src/qemu/qemu_monitor_json.c, src/qemu/qemu_monitor_text.c: Strip off 'drive-' prefix (if found) when looking up disk stats --- src/qemu/qemu_conf.c | 4 ++-- src/qemu/qemu_conf.h | 2 ++ src/qemu/qemu_monitor_json.c | 7 +++++++ src/qemu/qemu_monitor_text.c | 7 +++++++ 4 files changed, 18 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index 3988582..c1d03cd 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -2301,7 +2301,7 @@ qemuBuildDriveStr(virDomainDiskDefPtr disk, virBufferAddLit(&opt, ",media=cdrom"); if (qemuCmdFlags & QEMUD_CMD_FLAG_DEVICE) { - virBufferVSprintf(&opt, ",id=drive-%s", disk->info.alias); + virBufferVSprintf(&opt, ",id=%s%s", QEMU_DRIVE_HOST_PREFIX, disk->info.alias); } else { if (busid == -1 && unitid == -1) { if (idx != -1) @@ -2390,7 +2390,7 @@ qemuBuildDriveDevStr(virDomainDiskDefPtr disk) _("unsupported disk bus '%s' with device setup"), bus); goto error; } - virBufferVSprintf(&opt, ",drive=drive-%s", disk->info.alias); + virBufferVSprintf(&opt, ",drive=%s%s", QEMU_DRIVE_HOST_PREFIX, disk->info.alias); virBufferVSprintf(&opt, ",id=%s", disk->info.alias); if (virBufferError(&opt)) { diff --git a/src/qemu/qemu_conf.h b/src/qemu/qemu_conf.h index d26bb90..498f1d1 100644 --- a/src/qemu/qemu_conf.h +++ b/src/qemu/qemu_conf.h @@ -157,6 +157,8 @@ typedef qemuDomainPCIAddressSet *qemuDomainPCIAddressSetPtr; /* Config type for XML import/export conversions */ #define QEMU_CONFIG_FORMAT_ARGV "qemu-argv" +#define QEMU_DRIVE_HOST_PREFIX "drive-" + #define qemuReportError(code, fmt...) \ virReportErrorHelper(NULL, VIR_FROM_QEMU, code, __FILE__, \ __FUNCTION__, __LINE__, fmt) diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index e5288ce..032afef 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -754,6 +754,13 @@ int qemuMonitorJSONGetBlockStatsInfo(qemuMonitorPtr mon, goto cleanup; } + /* New QEMU has separate names for host & guest side of the disk + * and libvirt gives the host side a 'drive-' prefix. The passed + * in devname is the guest side though + */ + if (STRPREFIX(thisdev, QEMU_DRIVE_HOST_PREFIX)) + thisdev += strlen(QEMU_DRIVE_HOST_PREFIX); + if (STRNEQ(thisdev, devname)) continue; diff --git a/src/qemu/qemu_monitor_text.c b/src/qemu/qemu_monitor_text.c index 23fc4cf..a6a4598 100644 --- a/src/qemu/qemu_monitor_text.c +++ b/src/qemu/qemu_monitor_text.c @@ -649,6 +649,13 @@ int qemuMonitorTextGetBlockStatsInfo(qemuMonitorPtr mon, p = info; while (*p) { + /* New QEMU has separate names for host & guest side of the disk + * and libvirt gives the host side a 'drive-' prefix. The passed + * in devname is the guest side though + */ + if (STRPREFIX(p, QEMU_DRIVE_HOST_PREFIX)) + p += strlen(QEMU_DRIVE_HOST_PREFIX); + if (STREQLEN (p, devname, devnamelen) && p[devnamelen] == ':' && p[devnamelen+1] == ' ') { -- 1.6.5.2

3 2

[libvirt] domblkstat not working for qemu-kvm > 0.11
by Thomas Treutner 10 Feb '10

10 Feb '10

Hi, with all qemu-kvm > 0.11, virsh domblkstat is not working: virsh -c qemu://node03/system domblkstat wp01 vdb : invalid argument in no stats found for device virtio-disk1 (vda, vdb etc. works with 0.11) "virtio-disk1" seems to be a red herring: virsh -c qemu://node03/system domblkstat wp01 virtio-disk1 : invalid argument in invalid path: virtio-disk1 Most probably there have been made some changes with 0.12 libvirt does not resemble yet. If you need more debugging output, just tell. kr,t

2 2

[libvirt] [PATCH] qemu: Properly report a startup timeout error
by Cole Robinson 10 Feb '10

10 Feb '10

The timeout errors were unconditionally being overwritten by the less helpful 'unable to start guest' error. Signed-off-by: Cole Robinson <crobinso(a)redhat.com> --- src/qemu/qemu_driver.c | 17 +++++++---------- 1 files changed, 7 insertions(+), 10 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 4374291..2172c99 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -1358,15 +1358,15 @@ qemudReadLogOutput(virConnectPtr conn, buf[got] = '\0'; if (got == buflen-1) { qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, - _("Out of space while reading %s log output"), - what); + _("Out of space while reading %s log output: %s"), + what, buf); return -1; } if (isdead) { qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, - _("Process exited while reading %s log output"), - what); + _("Process exited while reading %s log output: %s"), + what, buf); return -1; } @@ -1378,7 +1378,8 @@ qemudReadLogOutput(virConnectPtr conn, } qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, - _("Timed out while reading %s log output"), what); + _("Timed out while reading %s log output: %s"), + what, buf); return -1; } @@ -1557,12 +1558,8 @@ qemudWaitForMonitor(virConnectPtr conn, virStrerror(errno, ebuf, sizeof ebuf)); } - if (ret < 0) { - /* Unexpected end of file - inform user of QEMU log data */ - qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, - _("unable to start guest: %s"), buf); + if (ret < 0) return -1; - } VIR_DEBUG("Connect monitor to %p '%s'", vm, vm->def->name); if (qemuConnectMonitor(vm) < 0) -- 1.6.5.2

3 6

[libvirt] [PATCH] test: Fake security driver support in capabilities
by Cole Robinson 10 Feb '10

10 Feb '10

Having some value in capabilities helps testing this stuff in virt-manager. Signed-off-by: Cole Robinson <crobinso(a)redhat.com> --- src/test/test_driver.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/src/test/test_driver.c b/src/test/test_driver.c index 411c5cd..3f95a22 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -205,6 +205,14 @@ testBuildCapabilities(virConnectPtr conn) { caps->privateDataAllocFunc = testDomainObjPrivateAlloc; caps->privateDataFreeFunc = testDomainObjPrivateFree; + caps->host.secModel.model = strdup("testSecurity"); + if (!caps->host.secModel.model) + goto no_memory; + + caps->host.secModel.doi = strdup(""); + if (!caps->host.secModel.doi) + goto no_memory; + return caps; no_memory: -- 1.6.5.2

2 2

[libvirt] [PATCH] (absolutePathFromBaseFile): fix up preceding commit
by Jim Meyering 10 Feb '10

10 Feb '10

To my chagrin, I saw that my most recent commit introduced compilation errors. Sorry about that. Here's how I propose to fix it. >From 2d948a373ecebec6c06274f61b31d1ae9c40ae41 Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Fri, 5 Feb 2010 14:57:35 +0100 Subject: [PATCH] (absolutePathFromBaseFile): fix up preceding commit * src/util/storage_file.c: Include <assert.h>. (absolutePathFromBaseFile): Assert that converting size_t to int is valid. Reverse length/string args to match "%.*s". Explicitly ignore the return value of virAsprintf. --- src/util/storage_file.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/src/util/storage_file.c b/src/util/storage_file.c index 2c79fa9..135acec 100644 --- a/src/util/storage_file.c +++ b/src/util/storage_file.c @@ -26,7 +26,9 @@ #include <unistd.h> #include <fcntl.h> +#include <assert.h> #include "dirname.h" +#include "ignore-value.h" #include "memory.h" #include "virterror_internal.h" @@ -255,7 +257,10 @@ absolutePathFromBaseFile(const char *base_file, const char *path) if (*path == '/' || d_len == 0) return strdup(path); - virAsprintf(&res, "%.*s/%s", base_file, d_len, path); + /* Ensure that the following cast-to-int is valid. */ + assert (d_len <= INT_MAX); + + ignore_value(virAsprintf(&res, "%.*s/%s", (int) d_len, base_file, path)); return res; } -- 1.7.0.rc1.204.gb96e

3 4

[libvirt] [PATCH 0/8] Remove virConnectPtr from yet more places
by Daniel P. Berrange 10 Feb '10

10 Feb '10

Following on from previous two postings http://www.redhat.com/archives/libvir-list/2010-February/msg00198.html http://www.redhat.com/archives/libvir-list/2010-February/msg00279.html With this series, none of the shared driver code uses virConnectPtr anymore, with the exception of src/conf/domain_events.h which has a genuine need for it - events are dispatched back to a specifici connection handle.

2 17

[libvirt] [PATCH 0/4] Remove use of virConnectPtr from more internal APIs
by Daniel P. Berrange 10 Feb '10

10 Feb '10

Following on from Matthias' work http://www.redhat.com/archives/libvir-list/2010-February/msg00198.html This series kills the virConnectPtr from QEMU, and LXC drivers, the security driver support code and the domain XML handling code.

3 11

[libvirt] [PATCH] Convert qemu command line flags to 64-bit int
by Daniel P. Berrange 10 Feb '10

10 Feb '10

The QEMU flags are commonly stored as a signed or unsigned int, allowing only 31 flags. This limit is rather close, so to aid future patches, change it to a 64-bit int * src/qemu/qemu_conf.c, src/qemu/qemu_conf.h, src/qemu/qemu_driver.c, tests/qemuargv2xmltest.c, tests/qemuhelptest.c, tests/qemuxml2argvtest.c: Use 'unsigned long long' for QEMU flags --- src/qemu/qemu_conf.c | 28 ++++++++++++++-------------- src/qemu/qemu_conf.h | 14 +++++++------- src/qemu/qemu_driver.c | 12 ++++++------ tests/qemuargv2xmltest.c | 2 +- tests/qemuhelptest.c | 13 +++++++------ tests/qemuxml2argvtest.c | 7 ++++--- 6 files changed, 39 insertions(+), 37 deletions(-) diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index 257b4a4..e3769c8 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -1108,12 +1108,12 @@ virCapsPtr qemudCapsInit(virCapsPtr old_caps) { return NULL; } -static unsigned int qemudComputeCmdFlags(const char *help, - unsigned int version, - unsigned int is_kvm, - unsigned int kvm_version) +static unsigned long long qemudComputeCmdFlags(const char *help, + unsigned int version, + unsigned int is_kvm, + unsigned int kvm_version) { - unsigned int flags = 0; + unsigned long long flags = 0; if (strstr(help, "-no-kqemu")) flags |= QEMUD_CMD_FLAG_KQEMU; @@ -1236,7 +1236,7 @@ static unsigned int qemudComputeCmdFlags(const char *help, #define SKIP_BLANKS(p) do { while ((*(p) == ' ') || (*(p) == '\t')) (p)++; } while (0) int qemudParseHelpStr(const char *help, - unsigned int *flags, + unsigned long long *flags, unsigned int *version, unsigned int *is_kvm, unsigned int *kvm_version) @@ -1316,14 +1316,14 @@ fail: int qemudExtractVersionInfo(const char *qemu, unsigned int *retversion, - unsigned int *retflags) { + unsigned long long *retflags) { const char *const qemuarg[] = { qemu, "-help", NULL }; const char *const qemuenv[] = { "LC_ALL=C", NULL }; pid_t child; int newstdout = -1; int ret = -1, status; unsigned int version, is_kvm, kvm_version; - unsigned int flags = 0; + unsigned long long flags = 0; if (retflags) *retflags = 0; @@ -1425,7 +1425,7 @@ int qemudNetworkIfaceConnect(virConnectPtr conn, struct qemud_driver *driver, virDomainNetDefPtr net, - int qemuCmdFlags) + unsigned long long qemuCmdFlags) { char *brname = NULL; int err; @@ -1637,7 +1637,7 @@ no_memory: int -qemuAssignDeviceDiskAlias(virDomainDiskDefPtr def, int qemuCmdFlags) +qemuAssignDeviceDiskAlias(virDomainDiskDefPtr def, unsigned long long qemuCmdFlags) { if (qemuCmdFlags & QEMUD_CMD_FLAG_DRIVE) { if (qemuCmdFlags & QEMUD_CMD_FLAG_DEVICE) @@ -1720,7 +1720,7 @@ qemuAssignDeviceControllerAlias(virDomainControllerDefPtr controller) static int -qemuAssignDeviceAliases(virDomainDefPtr def, int qemuCmdFlags) +qemuAssignDeviceAliases(virDomainDefPtr def, unsigned long long qemuCmdFlags) { int i; @@ -2189,7 +2189,7 @@ qemuSafeSerialParamValue(virConnectPtr conn, char * qemuBuildDriveStr(virDomainDiskDefPtr disk, int bootable, - int qemuCmdFlags) + unsigned long long qemuCmdFlags) { virBuffer opt = VIR_BUFFER_INITIALIZER; const char *bus = virDomainDiskQEMUBusTypeToString(disk->bus); @@ -3017,7 +3017,7 @@ no_memory: static char * qemuBuildSmpArgStr(const virDomainDefPtr def, - int qemuCmdFlags) + unsigned long long qemuCmdFlags) { virBuffer buf = VIR_BUFFER_INITIALIZER; @@ -3057,7 +3057,7 @@ int qemudBuildCommandLine(virConnectPtr conn, virDomainDefPtr def, virDomainChrDefPtr monitor_chr, int monitor_json, - unsigned int qemuCmdFlags, + unsigned long long qemuCmdFlags, const char ***retargv, const char ***retenv, int **tapfds, diff --git a/src/qemu/qemu_conf.h b/src/qemu/qemu_conf.h index 5525b6c..f6397b7 100644 --- a/src/qemu/qemu_conf.h +++ b/src/qemu/qemu_conf.h @@ -170,10 +170,10 @@ virCapsPtr qemudCapsInit (virCapsPtr old_caps); int qemudExtractVersion (struct qemud_driver *driver); int qemudExtractVersionInfo (const char *qemu, unsigned int *version, - unsigned int *flags); + unsigned long long *qemuCmdFlags); int qemudParseHelpStr (const char *str, - unsigned int *flags, + unsigned long long *qemuCmdFlags, unsigned int *version, unsigned int *is_kvm, unsigned int *kvm_version); @@ -183,7 +183,7 @@ int qemudBuildCommandLine (virConnectPtr conn, virDomainDefPtr def, virDomainChrDefPtr monitor_chr, int monitor_json, - unsigned int qemuCmdFlags, + unsigned long long qemuCmdFlags, const char ***retargv, const char ***retenv, int **tapfds, @@ -205,12 +205,12 @@ char * qemuBuildNicStr(virConnectPtr conn, /* Current, best practice */ char * qemuBuildNicDevStr(virDomainNetDefPtr net, - int qemuCmdFlags); + int vlan); /* Both legacy & current support */ char *qemuBuildDriveStr(virDomainDiskDefPtr disk, int bootable, - int qemuCmdFlags); + unsigned long long qemuCmdFlags); /* Current, best practice */ char * qemuBuildDriveDevStr(virConnectPtr conn, @@ -244,7 +244,7 @@ char * qemuBuildUSBHostdevDevStr(virDomainHostdevDefPtr dev); int qemudNetworkIfaceConnect (virConnectPtr conn, struct qemud_driver *driver, virDomainNetDefPtr net, - int qemuCmdFlags); + unsigned long long qemuCmdFlags); int qemudProbeMachineTypes (const char *binary, virCapsGuestMachinePtr **machines, @@ -283,7 +283,7 @@ int qemuAssignDevicePCISlots(virDomainDefPtr def, qemuDomainPCIAddressSetPtr ad int qemuDomainNetVLAN(virDomainNetDefPtr def); int qemuAssignDeviceNetAlias(virDomainDefPtr def, virDomainNetDefPtr net, int idx); -int qemuAssignDeviceDiskAlias(virDomainDiskDefPtr def, int qemuCmdFlags); +int qemuAssignDeviceDiskAlias(virDomainDiskDefPtr def, unsigned long long qemuCmdFlags); int qemuAssignDeviceHostdevAlias(virDomainDefPtr def, virDomainHostdevDefPtr net, int idx); int qemuAssignDeviceControllerAlias(virDomainControllerDefPtr controller); diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 4374291..54d33cd 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -2520,7 +2520,7 @@ static int qemudStartVMDaemon(virConnectPtr conn, struct stat sb; int *tapfds = NULL; int ntapfds = 0; - unsigned int qemuCmdFlags; + unsigned long long qemuCmdFlags; fd_set keepfd; const char *emulator; pid_t child; @@ -4707,7 +4707,7 @@ static char *qemuDomainXMLToNative(virConnectPtr conn, virDomainDefPtr def = NULL; virDomainChrDef monConfig; const char *emulator; - unsigned int qemuCmdFlags; + unsigned long long qemuCmdFlags; struct stat sb; const char **retargv = NULL; const char **retenv = NULL; @@ -5586,7 +5586,7 @@ static int qemudDomainAttachNetDevice(virConnectPtr conn, struct qemud_driver *driver, virDomainObjPtr vm, virDomainNetDefPtr net, - unsigned int qemuCmdFlags) + unsigned long long qemuCmdFlags) { qemuDomainObjPrivatePtr priv = vm->privateData; char *tapfd_name = NULL; @@ -5901,7 +5901,7 @@ static int qemudDomainAttachDevice(virDomainPtr dom, struct qemud_driver *driver = dom->conn->privateData; virDomainObjPtr vm; virDomainDeviceDefPtr dev = NULL; - unsigned int qemuCmdFlags; + unsigned long long qemuCmdFlags; virCgroupPtr cgroup = NULL; int ret = -1; @@ -7437,7 +7437,7 @@ qemudDomainMigratePrepareTunnel(virConnectPtr dconn, int ret = -1; int internalret; char *unixfile = NULL; - unsigned int qemuCmdFlags; + unsigned long long qemuCmdFlags; struct qemuStreamMigFile *qemust = NULL; qemuDriverLock(driver); @@ -7884,7 +7884,7 @@ static int doTunnelMigrate(virDomainPtr dom, virStreamPtr st = NULL; char *unixfile = NULL; int internalret; - unsigned int qemuCmdFlags; + unsigned long long qemuCmdFlags; int status; unsigned long long transferred, remaining, total; diff --git a/tests/qemuargv2xmltest.c b/tests/qemuargv2xmltest.c index 1f1914b..c125a34 100644 --- a/tests/qemuargv2xmltest.c +++ b/tests/qemuargv2xmltest.c @@ -75,7 +75,7 @@ static int testCompareXMLToArgvFiles(const char *xml, struct testInfo { const char *name; - int extraFlags; + unsigned long long extraFlags; const char *migrateFrom; }; diff --git a/tests/qemuhelptest.c b/tests/qemuhelptest.c index 34a6048..0f2b509 100644 --- a/tests/qemuhelptest.c +++ b/tests/qemuhelptest.c @@ -12,10 +12,10 @@ struct testInfo { const char *name; - unsigned flags; - unsigned version; - unsigned is_kvm; - unsigned kvm_version; + unsigned long long flags; + unsigned int version; + unsigned int is_kvm; + unsigned int kvm_version; }; static char *progname; @@ -41,7 +41,8 @@ static int testHelpStrParsing(const void *data) char path[PATH_MAX]; char helpStr[MAX_HELP_OUTPUT_SIZE]; char *help = &(helpStr[0]); - unsigned flags, version, is_kvm, kvm_version; + unsigned int version, is_kvm, kvm_version; + unsigned long long flags; snprintf(path, PATH_MAX, "%s/qemuhelpdata/%s", abs_srcdir, info->name); @@ -52,7 +53,7 @@ static int testHelpStrParsing(const void *data) return -1; if (flags != info->flags) { - fprintf(stderr, "Computed flags do not match: got 0x%x, expected 0x%x\n", + fprintf(stderr, "Computed flags do not match: got 0x%llx, expected 0x%llx\n", flags, info->flags); if (getenv("VIR_TEST_DEBUG")) diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 67dc47e..f4908b8 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -24,7 +24,7 @@ static struct qemud_driver driver; static int testCompareXMLToArgvFiles(const char *xml, const char *cmd, - int extraFlags, + unsigned long long extraFlags, const char *migrateFrom) { char argvData[MAX_FILE]; char *expectargv = &(argvData[0]); @@ -32,7 +32,8 @@ static int testCompareXMLToArgvFiles(const char *xml, const char **argv = NULL; const char **qenv = NULL; const char **tmp = NULL; - int ret = -1, len, flags; + int ret = -1, len; + unsigned long long flags; virDomainDefPtr vmdef = NULL; virDomainChrDef monitor_chr; @@ -142,7 +143,7 @@ static int testCompareXMLToArgvFiles(const char *xml, struct testInfo { const char *name; - int extraFlags; + unsigned long long extraFlags; const char *migrateFrom; }; -- 1.6.6

3 6

[libvirt] [PATCH] Fix security driver configuration
by Daniel P. Berrange 10 Feb '10

10 Feb '10

The security driver was mistakenly initialized before the QEMU config file was loaded. This prevents it being turned off again. The capabilities XML was also getting the wrong security driver name, due to the stacked driver arrangement. * src/qemu/qemu_driver.c: Fix initialization order and capabilities model name --- src/qemu/qemu_driver.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 54d33cd..cac5b8a 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -933,7 +933,7 @@ qemudSecurityInit(struct qemud_driver *qemud_drv) static virCapsPtr qemuCreateCapabilities(virCapsPtr oldcaps, - virSecurityDriverPtr secDriver) + struct qemud_driver *driver) { virCapsPtr caps; @@ -951,11 +951,11 @@ qemuCreateCapabilities(virCapsPtr oldcaps, /* Security driver data */ - if (secDriver) { + if (driver->securityPrimaryDriver) { const char *doi, *model; - doi = virSecurityDriverGetDOI(secDriver); - model = virSecurityDriverGetModel(secDriver); + doi = virSecurityDriverGetDOI(driver->securityPrimaryDriver); + model = virSecurityDriverGetModel(driver->securityPrimaryDriver); if (!(caps->host.secModel.model = strdup(model))) goto no_memory; @@ -1098,20 +1098,20 @@ qemudStartup(int privileged) { virStrerror(-rc, buf, sizeof(buf))); } + if (qemudLoadDriverConfig(qemu_driver, driverConf) < 0) { + goto error; + } + if (qemudSecurityInit(qemu_driver) < 0) goto error; if ((qemu_driver->caps = qemuCreateCapabilities(NULL, - qemu_driver->securityDriver)) == NULL) + qemu_driver)) == NULL) goto error; if ((qemu_driver->activePciHostdevs = pciDeviceListNew()) == NULL) goto error; - if (qemudLoadDriverConfig(qemu_driver, driverConf) < 0) { - goto error; - } - if (privileged) { if (chown(qemu_driver->libDir, qemu_driver->user, qemu_driver->group) < 0) { virReportSystemError(errno, @@ -3065,7 +3065,7 @@ static char *qemudGetCapabilities(virConnectPtr conn) { qemuDriverLock(driver); if ((caps = qemuCreateCapabilities(qemu_driver->caps, - qemu_driver->securityDriver)) == NULL) { + qemu_driver)) == NULL) { virCapabilitiesFree(caps); goto cleanup; } -- 1.6.6

2 1

[libvirt] PATCH: Depend on libcgroup & turn on cgconfig initscript
by Daniel P. Berrange 10 Feb '10

10 Feb '10

Since libvirt uses cgroups for various aspects of guest tuning, we need to make sure that the host is configured with them enabled out of the box. The libcgroup maintainer has now provided a suitable default config that mounts them all in /cgroup. So libvirt simply needs to depend on libcgroup RPM, and turn on the 'cgconfig' initscript at install time if QEMU or LXC is enabled. diff -u -r1.81 libvirt.spec --- libvirt.spec 3 Feb 2010 17:54:54 -0000 1.81 +++ libvirt.spec 9 Feb 2010 12:49:25 -0000 @@ -61,6 +61,7 @@ %define with_udev 0%{!?_without_udev:0} %define with_hal 0%{!?_without_hal:0} %define with_yajl 0%{!?_without_yajl:0} +%define with_cgconfig 0%{!?_without_cgconfig:0} # Non-server/HV driver defaults which are always enabled %define with_python 0%{!?_without_python:1} @@ -147,6 +148,13 @@ %define with_yajl 0%{!?_without_yajl:%{server_drivers}} %endif +# Pull in cgroups config system +%if 0%{?fedora} >= 12 || 0%{?rhel} >= 6 +%if %{with_qemu} || %{with_lxc} +%define with_cgconfig 0%{!?_without_cgconfig:1} +%endif +%endif + # Force QEMU to run as non-root %if 0%{?fedora} >= 12 || 0%{?rhel} >= 6 %define qemu_user qemu @@ -244,6 +252,9 @@ # For multipath support Requires: device-mapper %endif +%if %{with_cgconfig} +Requires: libcgroup +%endif %if %{with_xen} BuildRequires: xen-devel %endif @@ -634,6 +645,12 @@ fi %endif +%if %{with_cgconfig} +if [ "$1" = "1" ]; then +/sbin/chkconfig cgconfig on +fi +%endif + /sbin/chkconfig --add libvirtd if [ "$1" -ge "1" ]; then /sbin/service libvirtd condrestart > /dev/null 2>&1 -- |: Red Hat, Engineering, London -o- http://people.redhat.com/berrange/ :| |: http://libvirt.org -o- http://virt-manager.org -o- http://ovirt.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: GnuPG: 7D3B9505 -o- F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 :|

2 1

[libvirt] [PATCH] escape strings serialized in XML
by Daniel Veillard 10 Feb '10

10 Feb '10

A large part of the serialization code in src/conf/node_device_conf.c forgot that rule, this led to https://bugzilla.redhat.com/show_bug.cgi?id=547045 Escape strings serialized in XML * src/conf/node_device_conf.c: string saved into XML should be escaped with the use of virBufferEscapeString() diff --git a/src/conf/node_device_conf.c b/src/conf/node_device_conf.c index 4e8a492..69f42a9 100644 --- a/src/conf/node_device_conf.c +++ b/src/conf/node_device_conf.c @@ -372,19 +372,21 @@ char *virNodeDeviceDefFormat(virConnectPtr conn, virBufferVSprintf(&buf, " <protocol>%d</protocol>\n", data->usb_if.protocol); if (data->usb_if.description) - virBufferVSprintf(&buf, " <description>%s</description>\n", + virBufferEscapeString(&buf, + " <description>%s</description>\n", data->usb_if.description); break; case VIR_NODE_DEV_CAP_NET: - virBufferVSprintf(&buf, " <interface>%s</interface>\n", + virBufferEscapeString(&buf, " <interface>%s</interface>\n", data->net.ifname); if (data->net.address) - virBufferVSprintf(&buf, " <address>%s</address>\n", + virBufferEscapeString(&buf, " <address>%s</address>\n", data->net.address); if (data->net.subtype != VIR_NODE_DEV_CAP_NET_LAST) { const char *subtyp = virNodeDevNetCapTypeToString(data->net.subtype); - virBufferVSprintf(&buf, " <capability type='%s'/>\n", subtyp); + virBufferEscapeString(&buf, " <capability type='%s'/>\n", + subtyp); } break; case VIR_NODE_DEV_CAP_SCSI_HOST: @@ -392,10 +394,10 @@ char *virNodeDeviceDefFormat(virConnectPtr conn, data->scsi_host.host); if (data->scsi_host.flags & VIR_NODE_DEV_CAP_FLAG_HBA_FC_HOST) { virBufferAddLit(&buf, " <capability type='fc_host'>\n"); - virBufferVSprintf(&buf, - " <wwnn>%s</wwnn>\n", data->scsi_host.wwnn); - virBufferVSprintf(&buf, - " <wwpn>%s</wwpn>\n", data->scsi_host.wwpn); + virBufferEscapeString(&buf, " <wwnn>%s</wwnn>\n", + data->scsi_host.wwnn); + virBufferEscapeString(&buf, " <wwpn>%s</wwpn>\n", + data->scsi_host.wwpn); virBufferAddLit(&buf, " </capability>\n"); } if (data->scsi_host.flags & VIR_NODE_DEV_CAP_FLAG_HBA_VPORT_OPS) { @@ -405,8 +407,8 @@ char *virNodeDeviceDefFormat(virConnectPtr conn, break; case VIR_NODE_DEV_CAP_SCSI_TARGET: - virBufferVSprintf(&buf, " <target>%s</target>\n", - data->scsi_target.name); + virBufferEscapeString(&buf, " <target>%s</target>\n", + data->scsi_target.name); break; case VIR_NODE_DEV_CAP_SCSI: @@ -416,23 +418,23 @@ char *virNodeDeviceDefFormat(virConnectPtr conn, data->scsi.target); virBufferVSprintf(&buf, " <lun>%d</lun>\n", data->scsi.lun); if (data->scsi.type) - virBufferVSprintf(&buf, " <type>%s</type>\n", - data->scsi.type); + virBufferEscapeString(&buf, " <type>%s</type>\n", + data->scsi.type); break; case VIR_NODE_DEV_CAP_STORAGE: - virBufferVSprintf(&buf, " <block>%s</block>\n", + virBufferEscapeString(&buf, " <block>%s</block>\n", data->storage.block); if (data->storage.bus) - virBufferVSprintf(&buf, " <bus>%s</bus>\n", + virBufferEscapeString(&buf, " <bus>%s</bus>\n", data->storage.bus); if (data->storage.drive_type) - virBufferVSprintf(&buf, " <drive_type>%s</drive_type>\n", + virBufferEscapeString(&buf, " <drive_type>%s</drive_type>\n", data->storage.drive_type); if (data->storage.model) - virBufferVSprintf(&buf, " <model>%s</model>\n", + virBufferEscapeString(&buf, " <model>%s</model>\n", data->storage.model); if (data->storage.vendor) - virBufferVSprintf(&buf, " <vendor>%s</vendor>\n", + virBufferEscapeString(&buf, " <vendor>%s</vendor>\n", data->storage.vendor); if (data->storage.serial) virBufferVSprintf(&buf, " <serial>%s</serial>\n", -- Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ daniel(a)veillard.com | Rpmfind RPM search engine http://rpmfind.net/ http://veillard.com/ | virtualization library http://libvirt.org/

2 2

[libvirt] [0/3] Rebased patches for SPICE graphics support
by Daniel Veillard 10 Feb '10

10 Feb '10

This is a rebase of the 4 RHEL specific patches posted last sptember by Dan Berrange (but with patch 3 and 4 merged). It's actually a rebase from the gitorious spice set from Dan http://www.redhat.com/archives/libvir-list/2009-September/msg00865.html -- Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ daniel(a)veillard.com | Rpmfind RPM search engine http://rpmfind.net/ http://veillard.com/ | virtualization library http://libvirt.org/

2 7

[libvirt] [PATCH] fix AppArmor security driver when libvirt is compiled with libcap-ng
by Jamie Strandboge 10 Feb '10

10 Feb '10

The calls to virExec() in security_apparmor.c when invoking virt-aa-helper use VIR_EXEC_CLEAR_CAPS. When compiled without libcap-ng, this is not a problem (it's effectively a no-op) but with libcap-ng this causes MAC_ADMIN to be cleared. MAC_ADMIN is needed by virt-aa-helper to manipulate apparmor profiles and without it VMs will not start[1]. This patch calls virExec with the default VIR_EXEC_NONE instead. [1] https://bugs.launchpad.net/ubuntu/+source/libvirt/+bug/517714 -- Jamie Strandboge | http://www.canonical.com

2 1

[libvirt] [PATCH 0/9] virDomain{Attach,Detach}DeviceFlags patches
by Jim Fehlig 09 Feb '10

09 Feb '10

This set implements two new APIs, virDomainAttachDeviceFlags and virDomainDetachDeviceFlags as discussed here https://www.redhat.com/archives/libvir-list/2009-December/msg00124.html Introduce two new APIs virDomainAttachDeviceFlags(virDomainPtr dom, const char *xml, unsigned flags) virDomainDetachDeviceFlags(virDomainPtr dom, const char *xml, unsigned flags) with flags being one or more from VIR_DOMAIN_DEVICE_MODIFY_CURRENT, VIR_DOMAIN_DEVICE_MODIFY_LIVE, VIR_DOMAIN_DEVICE_MODIFY_CONFIG. If caller specifies CURRENT (default), add or remove the device depending on the current state of domain. E.g. if domain is active add or remove the device to/from live domain, if it is inactive change the persistent config. If caller specifies LIVE, only change the active domain. If caller specifies CONFIG, only change persistent config - even if the domain is active. If caller specifies both LIVE and CONFIG, then change both. If a driver can not satisfy the exact requested flags it must return an error. E.g if user specified LIVE but the driver can only change live and persisted config, the driver must fail the request. The existing virDomain{Attach,Detach}Device is now explicitly restricted to active domains and is equivalent to virDomain{Attach,Detach}DeviceFlags(LIVE). Finally, virsh {attach,detach}-{disk,interface,device} has been modified to add a --persistent flag in order to set the appropriate flags when calling the new APIs. Jim Fehlig (9): Restrict virDomain{Attach,Detach}Device to active domains Public API Internal API Public API Implementation Wire protocol format Remote driver Server side dispatcher domain{Attach,Detach}DeviceFlags handler for drivers Modify virsh commands daemon/remote.c | 53 ++++++++++++++++++ include/libvirt/libvirt.h.in | 13 +++++ src/driver.h | 10 ++++ src/esx/esx_driver.c | 2 + src/libvirt.c | 120 ++++++++++++++++++++++++++++++++++++++---- src/libvirt_public.syms | 6 ++ src/lxc/lxc_driver.c | 2 + src/opennebula/one_driver.c | 2 + src/openvz/openvz_driver.c | 2 + src/phyp/phyp_driver.c | 2 + src/qemu/qemu_driver.c | 26 +++++++++ src/remote/remote_driver.c | 54 +++++++++++++++++++ src/remote/remote_protocol.x | 17 ++++++- src/test/test_driver.c | 2 + src/uml/uml_driver.c | 2 + src/vbox/vbox_tmpl.c | 24 ++++++++ src/xen/proxy_internal.c | 4 +- src/xen/xen_driver.c | 42 +++++++++++++-- src/xen/xen_driver.h | 4 +- src/xen/xen_hypervisor.c | 4 +- src/xen/xen_inotify.c | 4 +- src/xen/xend_internal.c | 98 ++++++++++++++++++++++++++++------ src/xen/xm_internal.c | 30 +++++++---- src/xen/xs_internal.c | 4 +- tools/virsh.c | 55 +++++++++++++++++-- 25 files changed, 523 insertions(+), 59 deletions(-)

3 33

[libvirt] [PATCH] Create raw storage files with O_DSYNC
by Jiri Denemark 09 Feb '10

09 Feb '10

When creating preallocated large raw files opening them with O_DSYNC prevents long delays in reading because cache pages can be immediately reused without writing them on a disk first. Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/storage/storage_backend.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/storage/storage_backend.c b/src/storage/storage_backend.c index e79294a..8aab9ab 100644 --- a/src/storage/storage_backend.c +++ b/src/storage/storage_backend.c @@ -301,7 +301,7 @@ virStorageBackendCreateRaw(virConnectPtr conn, goto cleanup; } - if ((fd = open(vol->target.path, O_RDWR | O_EXCL)) < 0) { + if ((fd = open(vol->target.path, O_RDWR | O_EXCL | O_DSYNC)) < 0) { virReportSystemError(conn, errno, _("cannot open new path '%s'"), vol->target.path); -- 1.6.6.1

2 2

[libvirt] ANNOUNCE: New releases virt-manager 0.8.3 and virtinst 0.500.2
by Cole Robinson 09 Feb '10

09 Feb '10

I'm happy to announce two new releases: virt-manager 0.8.3: virt-manager is a desktop application for managing KVM and Xen virtual machines via libvirt. virtinst 0.500.2: virtinst is a collection of command line tools for provisioning libvirt virtual machines, including virt-install and virt-clone. The releases can be downloaded from: http://virt-manager.org/download.html The direct download links are: http://virt-manager.org/download/sources/virt-manager/virt-manager-0.8.3.ta… http://virt-manager.org/download/sources/virtinst/virtinst-0.500.2.tar.gz The virt-manager release includes: - New ability to manage network interfaces: start, stop, and view existing interfaces. Provision new bridge, bond, and vlan devices. - New option to 'customize VM before install', which allows adjusting most VM options from the install wizard. The virtinst release includes: - virt-install: --autostart option for setting domain autostart flag - virt-install: Allow specifying --host-device with lsusb and lspci format (0x1234:0x5678 for USB, etc) - virtinst: New 'Interface' module for building libvirt interface XML Thanks to everyone who has contributed to this release through testing, bug reporting, submitting patches, and otherwise sending in feedback! Thanks, Cole

1 0

Re: [libvirt] Live migration woes
by Lance Albertson 09 Feb '10

09 Feb '10

> On Fri, Feb 05, 2010 at 03:21:32PM -0500, Thomas Sjolshagen wrote: >>> is anyone using libvirt-git and qemu-kvm post-0.11 and can live >>> migrate VMs successfully for- and backwards? qemu-kvm-0.11 seems >>> to be the latest release were live migration works, and I'm >>> trying to figure out if its a kvm or libvirt problem, since there >>> were other things (balloon parameter f.e.) that were changed with >>> qemu-kvm-0.12 and caused troubles when using libvirt. >> >> Yes. >> >> I'm using the virt-preview repo (rawhide) and I just noticed, >> today, after re-upgrading to 0.12.2-5 (since -4 has a rather nasty >> IO problem for virtio devices against raw image files) that my >> live-migrations fail with the following error message on the >> destination system (i.e. the system the I'm trying to migrate to): > >> /var/log/libvirt/qemu/<guest>.log: Unknown savevm section >> -2038417646 load of migration failed > > This looks like a new QEMU bug to me I can confirm this bug is happening on Ganeti as well [1]. It appears that if you sync the time on the guest VM before migrating back to the other node it will "succeed" most of the time. Has anyone opened a bug for this on the qemu-kvm bug tracker yet? I was about to do that myself. Thanks- [1] http://groups.google.com/group/ganeti/browse_thread/thread/9b2c556557e749cf -- Lance Albertson lance <at> osuosl.org Systems Administrator / Architect Open Source Lab Network Services Oregon State University Work: 541-737-9975 PGP Key: 0x27F4B742 GPG Fingerprint 0423 92F3 544A 1282 5AB1 4D07 416F A15D 27F4 B742

2 1

[libvirt] Inbound NAT and iptables rules
by Karl Vogel 09 Feb '10

09 Feb '10

This issue has been brought up a few times, but I haven't found any real solution yet. The problem is with the way libvirt adds iptables rules. I have a KVM Host with 1 public IP address, on which a few virtual machines run. I want to be able to direct certain ports on the public IP to certain virtual machine's internal IP. For example: allow conneciton to 'public-ip' tcp port: 80 to 'vm1' Which is possible using following rules: $ iptables -I FORWARD 1 -d vm1 -p tcp --dport 80 -j ACCEPT $ iptables -t nat -A PREROUTING -p tcp -d public-ip --dport 80 -j DNAT --to-destination vm1 However the problem is that libvirt _always_ adds it's rules to the top of the FORWARD rules, hence it blocks any 'custom' rules to the VM machines. ie. Chain FORWARD (policy ACCEPT 0 packets, 0 bytes) pkts bytes target prot opt in out source destination 39 2964 ACCEPT all -- * virbr0 0.0.0.0/0 192.168.122.0/24 state RELATED,ESTABLISHED 39 2964 ACCEPT all -- virbr0 * 192.168.122.0/24 0.0.0.0/0 2 656 ACCEPT all -- virbr0 virbr0 0.0.0.0/0 0.0.0.0/0 2 120 REJECT all -- * virbr0 0.0.0.0/0 0.0.0.0/0 reject-with icmp-port-unreachable 0 0 REJECT all -- virbr0 * 0.0.0.0/0 0.0.0.0/0 reject-with icmp-port-unreachable Only established connections are allowed with the libvirt rules, hence the forwarded connection to port 80 will be rejected by the 4th libvirt rule. The only way to make it work is to insert the rule _after_ libvirt has started the network.. and if the libvirt network ever gets restarted, the rule will be disabled since libvirt inserts it's rules at the top of the chain. Is there a proper way to achieve this with libvirt ?!

1 1

[libvirt] qemu can't parse floppy cmdline
by Cole Robinson 09 Feb '10

09 Feb '10

Hi Dan, With qemu-0.12.2-5.fc13.x86_64 in fedora, libvirt is generating a cmdline which qemu-kvm can't parse. XML is: <domain type='kvm'> <name>winxp_32</name> <uuid>3485e26d-c370-c0b0-32e2-a041a12f5cfc</uuid> <memory>1048576</memory> <currentMemory>1048576</currentMemory> <vcpu>1</vcpu> <os> <type arch='x86_64' machine='pc-0.11'>hvm</type> <boot dev='hd'/> </os> <features> <acpi/> <apic/> <pae/> </features> <clock offset='localtime'/> <on_poweroff>destroy</on_poweroff> <on_reboot>restart</on_reboot> <on_crash>restart</on_crash> <devices> <emulator>/usr/bin/qemu-kvm</emulator> <disk type='file' device='disk'> <driver name='qemu'/> <source file='/mnt/devel/vms/disks/winxp_32.qcow2.img'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' unit='0'/> </disk> <disk type='file' device='cdrom'> <driver name='qemu'/> <source file='/mnt/devel/media/win_2003_64.iso'/> <target dev='hdc' bus='ide'/> <readonly/> <address type='drive' controller='0' bus='1' unit='0'/> </disk> <disk type='file' device='cdrom'> <target dev='hdb' bus='ide'/> <readonly/> <address type='drive' controller='0' bus='0' unit='1'/> </disk> <disk type='file' device='floppy'> <driver name='qemu' type='raw'/> <source file='/var/lib/libvirt/images/1.img'/> <target dev='fda' bus='fdc'/> <address type='drive' controller='0' bus='0' unit='0'/> </disk> <controller type='ide' index='0'/> <controller type='fdc' index='0'/> <interface type='network'> <mac address='52:54:00:5d:46:22'/> <source network='default'/> <target dev='vnet0'/> </interface> <serial type='pty'> <target port='0'/> </serial> <console type='pty'> <target port='0'/> </console> <input type='tablet' bus='usb'/> <input type='mouse' bus='ps2'/> <graphics type='vnc' port='-1' autoport='yes'/> <sound model='es1370'/> <video> <model type='vga' vram='9216' heads='1'/> </video> </devices> </domain> The generated cmdline is: LC_ALL=C PATH=/sbin:/usr/sbin:/bin:/usr/bin QEMU_AUDIO_DRV=none /usr/bin/qemu-kvm -S -M pc-0.11 -enable-kvm -m 1024 -smp 1,sockets=1,cores=1,threads=1 -name winxp_32 -uuid 3485e26d-c370-c0b0-32e2-a041a12f5cfc -nodefaults -chardev socket,id=monitor,path=/var/lib/libvirt/qemu/winxp_32.monitor,server,nowait -mon chardev=monitor,mode=readline -localtime -boot c -drive file=/mnt/devel/vms/disks/winxp_32.qcow2.img,if=none,id=drive-ide0-0-0,boot=on -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 -drive file=/mnt/devel/media/win_2003_64.iso,if=none,media=cdrom,id=drive-ide0-1-0 -device ide-drive,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0 -drive if=none,media=cdrom,id=drive-ide0-0-1 -device ide-drive,bus=ide.0,unit=1,drive=drive-ide0-0-1,id=ide0-0-1 -drive file=/var/lib/libvirt/images/1.img,if=none,id=drive-fdc0-0-0,format=raw -global isa-fdc,driveA=drive-fdc0-0-0 -device rtl8139,vlan=0,id=net0,mac=52:54:00:5d:46:22,bus=pci.0,addr=0x4 -net tap,fd=38,vlan=0,name=hostnet0 -chardev pty,id=serial0 -device isa-serial,chardev=serial0 -usb -device usb-tablet,id=input0 -vnc 127.0.0.1:0 -vga std -device ES1370,id=sound0,bus=pci.0,addr=0x5 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 can't parse: "isa-fdc,driveA=drive-fdc0-0-0" If I drop the floppy dev and controller, the guest boots, but a few warnings are printed. Not sure if any of this reflects qemu bugs or libvirt bugs: LC_ALL=C PATH=/sbin:/usr/sbin:/bin:/usr/bin QEMU_AUDIO_DRV=none /usr/bin/qemu-kvm -S -M pc-0.11 -enable-kvm -m 1024 -smp 1,sockets=1,cores=1,threads=1 -name winxp_32 -uuid 3485e26d-c370-c0b0-32e2-a041a12f5cfc -nodefaults -chardev socket,id=monitor,path=/var/lib/libvirt/qemu/winxp_32.monitor,server,nowait -mon chardev=monitor,mode=readline -localtime -boot c -drive file=/mnt/devel/vms/disks/winxp_32.qcow2.img,if=none,id=drive-ide0-0-0,boot=on -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 -drive file=/mnt/devel/media/win_2003_64.iso,if=none,media=cdrom,id=drive-ide0-1-0 -device ide-drive,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0 -drive if=none,media=cdrom,id=drive-ide0-0-1 -device ide-drive,bus=ide.0,unit=1,drive=drive-ide0-0-1,id=ide0-0-1 -device rtl8139,vlan=0,id=net0,mac=52:54:00:5d:46:22,bus=pci.0,addr=0x4 -net tap,fd=37,vlan=0,name=hostnet0 -chardev pty,id=serial0 -device isa-serial,chardev=serial0 -usb -device usb-tablet,id=input0 -vnc 127.0.0.1:0 -vga std -device ES1370,id=sound0,bus=pci.0,addr=0x5 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 char device redirected to /dev/pts/2 Warning: vlan 0 with no nics Option 'ipv4': Use 'on' or 'off' Failed to parse "yes" for "dummy.ipv4" Thanks, Cole

2 1

[libvirt] [PATCH 0/9] Remove conn parameter from several functions
by Matthias Bolte 09 Feb '10

09 Feb '10

This set of patches removes the conn parameter from several internal functions where it was used of error reporting only. Since errors are reported to an error object in thread local storage the conn parameter is not necessary for this anymore. Matthias

2 11

[libvirt] [PATCH 2/5] macvtap support for libvirt -- parse new interface XML
by Stefan Berger 08 Feb '10

08 Feb '10

This part adds support to domain_conf.{c|h} for parsing the new interface XML of type 'direct'. Signed-off-by: Stefan Berger <stefanb(a)us.ibm.com>

2 3

[libvirt] [PATCH 4/5] macvtap support for libvirt -- helper code
by Stefan Berger 08 Feb '10

08 Feb '10

This part adds the helper code to setup and tear down macvtap devices using direct communication with the device driver via netlink sockets. Signed-off-by: Stefan Berger <stefanb(a)us.ibm.com>

2 2

[libvirt] RFC: solving problem with qemu domain save on root-squashing NFS
by Laine Stump 08 Feb '10

08 Feb '10

(I had sent this message last week as a response to a message in a patch thread, but thought today that possibly some mail readers would bury it, so I'm sending it again disconnected from any existing thread. I can send the patches I mention below to anyone interested in playing around with them, but they're not useful since they still fail at the final step...) On 01/24/2010 11:57 AM, Dan Kenigsberg wrote: > On Wed, Jan 20, 2010 at 03:14:57PM +0000, Daniel P. Berrange wrote: >> This patch series does some work on te security drivers, and the QEMU >> code >> for managing DAC permissions on files. >> >> The core goal is to turn the QEMU driver DAC file management code into a >> security driver. Instead of QEMU calling into the SELinux/AppArmour >> drivers >> directly, a stacked driver module is introduced. This delegates all >> operations >> to first the QEMU DAC driver, and then the main SELinux/AppArmour >> driver. >> The end result is that all the permissions management code is removed >> from >> the QEMU driver, and we're left with just simple security driver calls. >> >> In the process of this a number of flaws in the current hotplug code >> were >> found, and code was generally tidied up with a view to making it >> easier to >> manage. >> >> Finally, we add the ability to turn off the QEMU DAC file managment >> code, >> and also deal gracefully with failures to change ownership (eg on NFS >> with >> root squash, or readonly FS). > Thanks for this series. However, it seems that we still have a problem > when trying to save domain to a root-squashing nfs export. > When using qemu directly, as a user with write permissions to that > export, there is no problem. When using libvirt, libvirt tries to write > its own state to the target file. I would not want to pre-create the > target file as world redable. > > How about performing open(path, O_CREAT|O_TRUNC|O_WRONLY, > S_IRUSR|S_IWUSR)) with the euid of the qemu process? I came up with a patch that creates the domain state file by first forking, followed by the child process doing setuid(qemu) and all the write-to-the-file stuff that creates the file (similar to the recent virFileCreate patch). This works all the way up through qemu's appending its state onto the file. The trouble comes when qemudDomainSave calls securityDriver->domainRestoreSavedStateLabel() (in this case, qemuSecurityStackedRestoreSavedStateLabel()). That function first calls the primary security driver's qemuSecurityDACRestoreSavedStateLabel(), which will fail because it attempts to chown the file to 0,0 (to prevent other qemu instances from messing with it). That can be disabled by setting "dynamic_ownership=0" in qemu.conf (needed in several other places when stuff is stored on root-squashing NFS anyway :-/). Then the stacked security driver calls the secondary security driver's SELinuxRestoreSavedStateLabel(), which also fails because of an SELinux function (matchpathcon) returning failure. We could ignore this failure, but that would create an unnecessary security hole for all those installations that *aren't* storing their domains on root-squashing NFS. So I *think* what I'm looking for a good way to avoid the SELinux stuff when the destination file is located on a root-squashing NFS share, but not ignore it otherwise (I believe the consensus is that we *don't* want to require another configuration knob if at all possible, since that would not only lead to extra complexity of config, but also to uninformed users turning it off when not necessary). Does anyone have any good ideas for doing this (or for a different approach)? (I suppose I could always attempt the entire operation assuming not, then redo with fork/setuid if the first attempt failed, but that seems less than elegant).

1 0

[libvirt] Live migration woes
by Thomas Treutner 08 Feb '10

08 Feb '10

Hi, is anyone using libvirt-git and qemu-kvm post-0.11 and can live migrate VMs successfully for- and backwards? qemu-kvm-0.11 seems to be the latest release were live migration works, and I'm trying to figure out if its a kvm or libvirt problem, since there were other things (balloon parameter f.e.) that were changed with qemu-kvm-0.12 and caused troubles when using libvirt. thx,t

3 5

[libvirt] Regarding lxc driver for libvirt.
by Kumar L Srikanth-B22348 08 Feb '10

08 Feb '10

Hi, I am new to libvirt. I want to create a Domain using libvirt XML. In order to mount the host's '/home/srikanth' directory to the new container's '/' directory, my XML format is shown below: <domain type='lxc' id='1'> <name>container1_vm</name> <memory>500000</memory> <os> <type>exe</type> <init>/bin/sh</init> </os> <vcpu>1</vcpu> <clock offset='utc'/> <on_poweroff>destroy</on_poweroff> <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> <emulator>/usr/libexec/libvirt_lxc</emulator> <filesystem type='mount'> <source dir='/home/srikanth'/> <target dir='/'/> </filesystem> <console type='pty' /> </devices> </domain> With the above libvirt XML, Domain is defining, but not starting. When I issue the start command it's saying "Domain started", but showing "shut off" status. If I changed the target directory(<traget dir='/'/>) from '/' to '/home/container1'(<traget dir='/home/container1'/>), the domain is starting normally and I am able to see the contents in the target directory. Can you please let me know, how can I set the target directory to '/'? By the way, I am using libvirt version o.7.6. Regards, Srikanth.

2 1

[libvirt] [PATCH UPDATE] Add support for virtio channel
by Matthew Booth 08 Feb '10

08 Feb '10

Amit pointed out that byte_limit, guest_byte_limit and cache_buffers are now gone. They are removed in these updated patches.

2 3

[libvirt] FYI, [PATCH] build: update gnulib submodule to latest
by Jim Meyering 05 Feb '10

05 Feb '10

FYI, I've just pushed this: >From 26bd7bef58296300cd81756297de514b9c2073df Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Fri, 5 Feb 2010 17:57:39 +0100 Subject: [PATCH] build: update gnulib submodule to latest * .gnulib: This fixes a warning in test-gettimeofday.c, seen via "make check". Reported by Daniel Veillard. --- .gnulib | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/.gnulib b/.gnulib index 9d0ad65..11fbc57 160000 --- a/.gnulib +++ b/.gnulib @@ -1 +1 @@ -Subproject commit 9d0ad652de159d08e5f679842f8a2a5658196361 +Subproject commit 11fbc57405a118e6ec9a3ebc19bbf5ececdae4d6 -- 1.7.0.rc1.204.gb96e

1 0

[libvirt] FW: Regarding lxc driver for libvirt.
by Kumar L Srikanth-B22348 05 Feb '10

05 Feb '10

Can anyone help in the below issue? Regards, Srikanth. -----Original Message----- From: Kumar L Srikanth-B22348 Sent: Friday, February 05, 2010 4:02 PM To: 'libvir-list(a)redhat.com' Subject: Regarding lxc driver for libvirt. Hi, I am new to libvirt. I want to create a Domain using libvirt XML. In order to mount the host's '/home/srikanth' directory to the new container's '/' directory, my XML format is shown below: <domain type='lxc' id='1'> <name>container1_vm</name> <memory>500000</memory> <os> <type>exe</type> <init>/bin/sh</init> </os> <vcpu>1</vcpu> <clock offset='utc'/> <on_poweroff>destroy</on_poweroff> <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> <emulator>/usr/libexec/libvirt_lxc</emulator> <filesystem type='mount'> <source dir='/home/srikanth'/> <target dir='/'/> </filesystem> <console type='pty' /> </devices> </domain> With the above libvirt XML, Domain is defining, but not starting. When I issue the start command it's saying "Domain started", but showing "shut off" status. If I changed the target directory(<traget dir='/'/>) from '/' to '/home/container1'(<traget dir='/home/container1'/>), the domain is starting normally and I am able to see the contents in the target directory. Can you please let me know, how can I set the target directory to '/'? By the way, I am using libvirt version o.7.6. Regards, Srikanth.

1 0

[libvirt] [PATCH] absolutePathFromBaseFile: don't leak when first arg contains no "/"
by Jim Meyering 05 Feb '10

05 Feb '10

Not only did this function leak(p), but it would also over-allocate (by the length of basename(base_file)), and then later, re-alloc to compensate, so I rewrote it: >From 1dc52930daa000b407d8a8f18588a19cf4e8b7f5 Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Thu, 4 Feb 2010 16:55:57 +0100 Subject: [PATCH] absolutePathFromBaseFile: don't leak when first arg contains no "/" * src/util/storage_file.c: Include "dirname.h". (absolutePathFromBaseFile): Rewrite not to leak, and to require fewer allocations. * bootstrap (modules): Add dirname-lgpl and stpncpy. * .gnulib: Update submodule to the latest. --- .gnulib | 2 +- bootstrap | 2 ++ src/util/storage_file.c | 27 ++++++++++----------------- 3 files changed, 13 insertions(+), 18 deletions(-) diff --git a/.gnulib b/.gnulib index 146d914..9d0ad65 160000 --- a/.gnulib +++ b/.gnulib @@ -1 +1 @@ -Subproject commit 146d9145073e62a2096a2d6b33f75e93908fedf3 +Subproject commit 9d0ad652de159d08e5f679842f8a2a5658196361 diff --git a/bootstrap b/bootstrap index cc3c6ef..5cc43c5 100755 --- a/bootstrap +++ b/bootstrap @@ -71,6 +71,7 @@ c-ctype canonicalize-lgpl close connect +dirname-lgpl getaddrinfo gethostname getpass @@ -93,6 +94,7 @@ send setsockopt socket stpcpy +stpncpy strchrnul strndup strerror diff --git a/src/util/storage_file.c b/src/util/storage_file.c index 44057d2..8c53fba 100644 --- a/src/util/storage_file.c +++ b/src/util/storage_file.c @@ -1,7 +1,7 @@ /* * storage_file.c: file utility functions for FS storage backend * - * Copyright (C) 2007-2009 Red Hat, Inc. + * Copyright (C) 2007-2010 Red Hat, Inc. * Copyright (C) 2007-2008 Daniel P. Berrange * * This library is free software; you can redistribute it and/or @@ -26,6 +26,7 @@ #include <unistd.h> #include <fcntl.h> +#include "dirname.h" #include "memory.h" #include "virterror_internal.h" @@ -246,26 +247,18 @@ vmdk4GetBackingStore(virConnectPtr conn, static char * absolutePathFromBaseFile(const char *base_file, const char *path) { - size_t base_size, path_size; - char *res, *p; + char *res; + size_t d_len = dir_len (base_file); - if (*path == '/') + /* If path is already absolute, or if dirname(base_file) is ".", + just return a copy of path. */ + if (*path == '/' || d_len == 0) return strdup(path); - base_size = strlen(base_file) + 1; - path_size = strlen(path) + 1; - if (VIR_ALLOC_N(res, base_size - 1 + path_size) < 0) + if (VIR_ALLOC_N(res, d_len + 1 + strlen(path) + 1) < 0) return NULL; - memcpy(res, base_file, base_size); - p = strrchr(res, '/'); - if (p != NULL) - p++; - else - p = res; - memcpy(p, path, path_size); - if (VIR_REALLOC_N(res, (p + path_size) - res) < 0) { - /* Ignore failure */ - } + + stpcpy(stpcpy(stpncpy(res, base_file, d_len), "/"), path); return res; } -- 1.7.0.rc1.199.g9253a

3 6

[libvirt] [PATCH 0/12] Improve security driver handling & QEMU DAC management
by Daniel P. Berrange 05 Feb '10

05 Feb '10

This patch series does some work on te security drivers, and the QEMU code for managing DAC permissions on files. The core goal is to turn the QEMU driver DAC file management code into a security driver. Instead of QEMU calling into the SELinux/AppArmour drivers directly, a stacked driver module is introduced. This delegates all operations to first the QEMU DAC driver, and then the main SELinux/AppArmour driver. The end result is that all the permissions management code is removed from the QEMU driver, and we're left with just simple security driver calls. In the process of this a number of flaws in the current hotplug code were found, and code was generally tidied up with a view to making it easier to manage. Finally, we add the ability to turn off the QEMU DAC file managment code, and also deal gracefully with failures to change ownership (eg on NFS with root squash, or readonly FS).

5 37

[libvirt] [PATCH] storage: Replace storageLog with VIR_ERROR
by Matthias Bolte 04 Feb '10

04 Feb '10

--- src/storage/storage_driver.c | 23 ++++++++++------------- 1 files changed, 10 insertions(+), 13 deletions(-) diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c index 50fcbe2..37be77d 100644 --- a/src/storage/storage_driver.c +++ b/src/storage/storage_driver.c @@ -40,11 +40,10 @@ #include "storage_conf.h" #include "memory.h" #include "storage_backend.h" +#include "logging.h" #define VIR_FROM_THIS VIR_FROM_STORAGE -#define storageLog(msg...) fprintf(stderr, msg) - static virStorageDriverStatePtr driverState; static int storageDriverShutdown(void); @@ -70,8 +69,7 @@ storageDriverAutostart(virStorageDriverStatePtr driver) { !virStoragePoolObjIsActive(pool)) { virStorageBackendPtr backend; if ((backend = virStorageBackendForType(pool->def->type)) == NULL) { - storageLog("Missing backend %d", - pool->def->type); + VIR_ERROR("Missing backend %d", pool->def->type); virStoragePoolObjUnlock(pool); continue; } @@ -79,9 +77,9 @@ storageDriverAutostart(virStorageDriverStatePtr driver) { if (backend->startPool && backend->startPool(NULL, pool) < 0) { virErrorPtr err = virGetLastError(); - storageLog("Failed to autostart storage pool '%s': %s", - pool->def->name, err ? err->message : - "no error message found"); + VIR_ERROR("Failed to autostart storage pool '%s': %s", + pool->def->name, err ? err->message : + "no error message found"); virStoragePoolObjUnlock(pool); continue; } @@ -90,9 +88,9 @@ storageDriverAutostart(virStorageDriverStatePtr driver) { virErrorPtr err = virGetLastError(); if (backend->stopPool) backend->stopPool(NULL, pool); - storageLog("Failed to autostart storage pool '%s': %s", - pool->def->name, err ? err->message : - "no error message found"); + VIR_ERROR("Failed to autostart storage pool '%s': %s", + pool->def->name, err ? err->message : + "no error message found"); virStoragePoolObjUnlock(pool); continue; } @@ -132,7 +130,6 @@ storageDriverStartup(int privileged) { goto error; if (virAsprintf(&base, "%s/.libvirt", userdir) == -1) { - storageLog("out of memory in virAsprintf"); VIR_FREE(userdir); goto out_of_memory; } @@ -175,7 +172,7 @@ storageDriverStartup(int privileged) { return 0; out_of_memory: - storageLog("virStorageStartup: out of memory"); + virReportOOMError(NULL); error: VIR_FREE(base); storageDriverUnlock(driverState); @@ -635,7 +632,7 @@ storagePoolUndefine(virStoragePoolPtr obj) { if (unlink(pool->autostartLink) < 0 && errno != ENOENT && errno != ENOTDIR) { char ebuf[1024]; - storageLog("Failed to delete autostart link '%s': %s", + VIR_ERROR("Failed to delete autostart link '%s': %s", pool->autostartLink, virStrerror(errno, ebuf, sizeof ebuf)); } -- 1.6.3.3

3 4

[libvirt] [PATCH] website: Add a 1em right margin
by Matthias Bolte 04 Feb '10

04 Feb '10

This stops the text and pre-boxes from touching the right border. --- docs/libvirt.css | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/docs/libvirt.css b/docs/libvirt.css index a4d1ddd..dfc93c6 100644 --- a/docs/libvirt.css +++ b/docs/libvirt.css @@ -30,6 +30,7 @@ h2, h3, h4, h5, h6 { #content { margin-left: 230px; + margin-right: 1em; padding: 0px; padding-bottom: 1em; } -- 1.6.3.3

2 2

[libvirt] [PATCH] opennebula: Remove unnecessary casts
by Matthias Bolte 04 Feb '10

04 Feb '10

--- src/opennebula/one_driver.c | 36 ++++++++++++++++++------------------ 1 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/opennebula/one_driver.c b/src/opennebula/one_driver.c index ad7faca..c96d24d 100644 --- a/src/opennebula/one_driver.c +++ b/src/opennebula/one_driver.c @@ -108,7 +108,7 @@ static int oneIsSecure(virConnectPtr conn ATTRIBUTE_UNUSED) static virDomainPtr oneDomainLookupByID(virConnectPtr conn, int id) { - one_driver_t *driver = (one_driver_t *)conn->privateData; + one_driver_t *driver = conn->privateData; virDomainPtr dom = NULL; virDomainObjPtr vm = NULL; @@ -137,7 +137,7 @@ return_point: static virDomainPtr oneDomainLookupByUUID(virConnectPtr conn, const unsigned char *uuid) { - one_driver_t *driver = (one_driver_t *)conn->privateData; + one_driver_t *driver = conn->privateData; virDomainPtr dom = NULL; virDomainObjPtr vm = NULL; @@ -165,7 +165,7 @@ return_point: static virDomainPtr oneDomainLookupByName(virConnectPtr conn, const char *name) { - one_driver_t *driver = (one_driver_t *)conn->privateData; + one_driver_t *driver = conn->privateData; virDomainObjPtr vm = NULL; virDomainPtr dom=NULL; @@ -192,7 +192,7 @@ return_point: static int oneListDomains(virConnectPtr conn, int *ids, int nids) { - one_driver_t *driver = (one_driver_t *)conn->privateData; + one_driver_t *driver = conn->privateData; int n; oneDriverLock(driver); @@ -204,7 +204,7 @@ static int oneListDomains(virConnectPtr conn, int *ids, int nids) static int oneNumDomains(virConnectPtr conn) { - one_driver_t *driver = (one_driver_t *)conn->privateData; + one_driver_t *driver = conn->privateData; int n; oneDriverLock(driver); @@ -216,7 +216,7 @@ static int oneNumDomains(virConnectPtr conn) static int oneListDefinedDomains(virConnectPtr conn, char **const names, int nnames) { - one_driver_t *driver = (one_driver_t *)conn->privateData; + one_driver_t *driver = conn->privateData; int n; oneDriverLock(driver); @@ -228,7 +228,7 @@ static int oneListDefinedDomains(virConnectPtr conn, static int oneNumDefinedDomains(virConnectPtr conn) { - one_driver_t *driver = (one_driver_t *)conn->privateData; + one_driver_t *driver = conn->privateData; int n; oneDriverLock(driver); @@ -240,7 +240,7 @@ static int oneNumDefinedDomains(virConnectPtr conn) static virDomainPtr oneDomainDefine(virConnectPtr conn, const char *xml) { - one_driver_t *driver = (one_driver_t *)conn->privateData; + one_driver_t *driver = conn->privateData; virDomainDefPtr def; virDomainObjPtr vm; virDomainPtr dom=NULL; @@ -272,7 +272,7 @@ return_point: static int oneDomainUndefine(virDomainPtr dom) { - one_driver_t *driver = (one_driver_t *)dom->conn->privateData; + one_driver_t *driver = dom->conn->privateData; virDomainObjPtr vm = NULL; int ret=-1; @@ -302,7 +302,7 @@ return_point: static int oneDomainGetInfo(virDomainPtr dom, virDomainInfoPtr info) { - one_driver_t *driver = (one_driver_t *)dom->conn->privateData; + one_driver_t *driver = dom->conn->privateData; struct timeval tv; virDomainObjPtr vm; oneDriverLock(driver); @@ -377,7 +377,7 @@ static int oneDomainGetInfo(virDomainPtr dom, static char *oneGetOSType(virDomainPtr dom) { - one_driver_t *driver = (one_driver_t *)dom->conn->privateData; + one_driver_t *driver = dom->conn->privateData; virDomainObjPtr vm = NULL; char *ret = NULL; @@ -403,7 +403,7 @@ cleanup: static int oneDomainStart(virDomainPtr dom) { virConnectPtr conn = dom->conn; - one_driver_t *driver = (one_driver_t *)(conn->privateData); + one_driver_t *driver = conn->privateData; virDomainObjPtr vm; int ret = -1; int oneid; @@ -436,7 +436,7 @@ static virDomainPtr oneDomainCreateAndStart(virConnectPtr conn, const char *xml, unsigned int flags ATTRIBUTE_UNUSED) { - one_driver_t *driver = (one_driver_t *)conn->privateData; + one_driver_t *driver = conn->privateData; virDomainObjPtr vm = NULL; virDomainDefPtr def; virDomainPtr dom = NULL; @@ -486,7 +486,7 @@ return_point: static int oneDomainShutdown(virDomainPtr dom) { - one_driver_t *driver = (one_driver_t*)dom->conn->privateData; + one_driver_t *driver = dom->conn->privateData; virDomainObjPtr vm; int ret=-1; @@ -520,7 +520,7 @@ return_point: static int oneDomainDestroy(virDomainPtr dom) { - one_driver_t *driver = (one_driver_t*)dom->conn->privateData; + one_driver_t *driver = dom->conn->privateData; virDomainObjPtr vm; int ret=-1; @@ -556,7 +556,7 @@ return_point: static int oneDomainSuspend(virDomainPtr dom) { - one_driver_t* driver=dom->conn->privateData; + one_driver_t* driver = dom->conn->privateData; virDomainObjPtr vm; int ret=-1; @@ -590,7 +590,7 @@ return_point: static int oneDomainResume(virDomainPtr dom) { - one_driver_t* driver=dom->conn->privateData; + one_driver_t* driver = dom->conn->privateData; virDomainObjPtr vm; int ret=-1; @@ -698,7 +698,7 @@ static int oneGetAutostart(virDomainPtr domain ATTRIBUTE_UNUSED, int *autostart) } static char* oneGetCapabilities(virConnectPtr conn){ - one_driver_t* privconn=conn->privateData; + one_driver_t* privconn = conn->privateData; char *xml; oneDriverLock(privconn); if ((xml = virCapabilitiesFormatXML(privconn->caps)) == NULL) -- 1.6.3.3

2 2

[libvirt] [PATCH] cpu conf: Use virBufferFreeAndReset instead of virBufferContentAndReset and VIR_FREE
by Matthias Bolte 04 Feb '10

04 Feb '10

--- src/conf/cpu_conf.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/src/conf/cpu_conf.c b/src/conf/cpu_conf.c index e7924c1..244d670 100644 --- a/src/conf/cpu_conf.c +++ b/src/conf/cpu_conf.c @@ -249,7 +249,6 @@ virCPUDefFormat(virConnectPtr conn, int flags) { virBuffer buf = VIR_BUFFER_INITIALIZER; - char *tmp; if (virCPUDefFormatBuf(conn, &buf, def, indent, flags) < 0) goto cleanup; @@ -262,8 +261,7 @@ virCPUDefFormat(virConnectPtr conn, no_memory: virReportOOMError(conn); cleanup: - tmp = virBufferContentAndReset(&buf); - VIR_FREE(tmp); + virBufferFreeAndReset(&buf); return NULL; } -- 1.6.3.3

2 2

[libvirt] [PATCH] docs: Refer to virReportOOMError in the HACKING file
by Matthias Bolte 04 Feb '10

04 Feb '10

Instead of refering to __virRaiseError(VIR_ERROR_NO_MEMORY). --- HACKING | 22 +++++++++++----------- docs/hacking.html.in | 20 ++++++++++---------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/HACKING b/HACKING index 3844e50..4bf216c 100644 --- a/HACKING +++ b/HACKING @@ -166,13 +166,13 @@ codebase, because they encourage a number of serious coding bugs and do not enable compile time verification of checks for NULL. Instead of these routines, use the macros from memory.h - - eg to allocate a single object: + - eg to allocate a single object: virDomainPtr domain; if (VIR_ALLOC(domain) < 0) { - __virRaiseError(VIR_ERROR_NO_MEMORY) - return NULL; + virReportOOMError(NULL); + return NULL; } @@ -182,8 +182,8 @@ routines, use the macros from memory.h int ndomains = 10; if (VIR_ALLOC_N(domains, ndomains) < 0) { - __virRaiseError(VIR_ERROR_NO_MEMORY) - return NULL; + virReportOOMError(NULL); + return NULL; } - eg to allocate an array of object pointers @@ -192,8 +192,8 @@ routines, use the macros from memory.h int ndomains = 10; if (VIR_ALLOC_N(domains, ndomains) < 0) { - __virRaiseError(VIR_ERROR_NO_MEMORY) - return NULL; + virReportOOMError(NULL); + return NULL; } - eg to re-allocate the array of domains to be longer @@ -201,8 +201,8 @@ routines, use the macros from memory.h ndomains = 20 if (VIR_REALLOC_N(domains, ndomains) < 0) { - __virRaiseError(VIR_ERROR_NO_MEMORY) - return NULL; + virReportOOMError(NULL); + return NULL; } - eg to free the domain @@ -297,7 +297,7 @@ eg typical usage is as follows: if (virBufferError(&buf)) { virBufferFreeAndReset(&buf); - virReportOOMError(...); + virReportOOMError(NULL); return NULL; } @@ -385,7 +385,7 @@ to build: - if a recently commited patch breaks compilation on a platform or for a given driver then it's fine to commit a minimal fix directly without getting the review feedback first - - similary if make check or make syntax-chek breaks, if there is + - similary if make check or make syntax-check breaks, if there is an obvious fix, it's fine to commit immediately The patch should still be sent to the list (or tell what the fix was if trivial) and 'make check syntax-check' should pass too before commiting diff --git a/docs/hacking.html.in b/docs/hacking.html.in index 96f6657..71b4f47 100644 --- a/docs/hacking.html.in +++ b/docs/hacking.html.in @@ -192,8 +192,8 @@ virDomainPtr domain; if (VIR_ALLOC(domain) < 0) { - __virRaiseError(VIR_ERROR_NO_MEMORY) - return NULL; + virReportOOMError(NULL); + return NULL; } </pre></li> @@ -204,8 +204,8 @@ int ndomains = 10; if (VIR_ALLOC_N(domains, ndomains) < 0) { - __virRaiseError(VIR_ERROR_NO_MEMORY) - return NULL; + virReportOOMError(NULL); + return NULL; } </pre></li> @@ -216,8 +216,8 @@ int ndomains = 10; if (VIR_ALLOC_N(domains, ndomains) < 0) { - __virRaiseError(VIR_ERROR_NO_MEMORY) - return NULL; + virReportOOMError(NULL); + return NULL; } </pre></li> @@ -227,8 +227,8 @@ ndomains = 20 if (VIR_REALLOC_N(domains, ndomains) < 0) { - __virRaiseError(VIR_ERROR_NO_MEMORY) - return NULL; + virReportOOMError(NULL); + return NULL; } </pre></li> @@ -314,7 +314,7 @@ if (virBufferError(&buf)) { virBufferFreeAndReset(&buf); - virReportOOMError(...); + virReportOOMError(NULL); return NULL; } @@ -419,7 +419,7 @@ <li>if a recently commited patch breaks compilation on a platform or for a given driver then it's fine to commit a minimal fix directly without getting the review feedback first</li> - <li>if make check or make syntax-chek breaks, if there is + <li>if make check or make syntax-check breaks, if there is an obvious fix, it's fine to commit immediately. The patch should still be sent to the list (or tell what the fix was if trivial) and 'make check syntax-check' should pass too before commiting -- 1.6.3.3

2 2

[libvirt] [PATCH] esx: Cleanup preprocessing structure in esxVI_EnsureSession
by Matthias Bolte 04 Feb '10

04 Feb '10

--- src/esx/esx_vi.c | 14 ++++++-------- 1 files changed, 6 insertions(+), 8 deletions(-) diff --git a/src/esx/esx_vi.c b/src/esx/esx_vi.c index bc94326..19c85c5 100644 --- a/src/esx/esx_vi.c +++ b/src/esx/esx_vi.c @@ -1317,16 +1317,18 @@ esxVI_BuildFullTraversalSpecList(esxVI_SelectionSpec **fullTraversalSpecList) * you try to call it. Query the session manager for the current session of * this connection instead and re-login if there is no current session for this * connection. + * + * Update: 'ESX 4.0.0 build-171294' doesn't implement this method. */ #define ESX_VI_USE_SESSION_IS_ACTIVE 0 int esxVI_EnsureSession(esxVI_Context *ctx) { - int result = 0; #if ESX_VI_USE_SESSION_IS_ACTIVE esxVI_Boolean active = esxVI_Boolean_Undefined; #else + int result = 0; esxVI_String *propertyNameList = NULL; esxVI_ObjectContent *sessionManager = NULL; esxVI_DynamicProperty *dynamicProperty = NULL; @@ -1352,6 +1354,8 @@ esxVI_EnsureSession(esxVI_Context *ctx) return -1; } } + + return 0; #else if (esxVI_String_AppendValueToList(&propertyNameList, "currentSession") < 0 || @@ -1388,16 +1392,11 @@ esxVI_EnsureSession(esxVI_Context *ctx) "last login"); goto failure; } -#endif cleanup: -#if ESX_VI_USE_SESSION_IS_ACTIVE - /* nothing */ -#else esxVI_String_Free(&propertyNameList); esxVI_ObjectContent_Free(&sessionManager); esxVI_UserSession_Free(&currentSession); -#endif return result; @@ -1405,8 +1404,7 @@ esxVI_EnsureSession(esxVI_Context *ctx) result = -1; goto cleanup; - - return 0; +#endif } -- 1.6.3.3

2 2

[libvirt] [PATCH] docs: Emphasize that devices have to be inside the <devices> element
by Matthias Bolte 04 Feb '10

04 Feb '10

Also cleanup indentation of domain XML examples. --- docs/drvxen.html.in | 12 +- docs/formatdomain.html.in | 776 +++++++++++++++++++++++++-------------------- 2 files changed, 430 insertions(+), 358 deletions(-) diff --git a/docs/drvxen.html.in b/docs/drvxen.html.in index a6f0e57..4e35afa 100644 --- a/docs/drvxen.html.in +++ b/docs/drvxen.html.in @@ -234,9 +234,9 @@ vif = [ "mac=00:16:3e:60:36:ba,bridge=virbr0,script=vif-bridge,vifname=vif5.0" ] <on_reboot>restart</on_reboot> <on_crash>restart</on_crash> <features> - <pae/> - <acpi/> - <apic/> + <pae/> + <acpi/> + <apic/> </features> <clock sync="localtime"/> <devices> @@ -288,9 +288,9 @@ vif = [ "mac=00:16:3e:60:36:ba,bridge=virbr0,script=vif-bridge,vifname=vif5.0" ] <on_reboot>restart</on_reboot> <on_crash>restart</on_crash> <features> - <pae/> - <acpi/> - <apic/> + <pae/> + <acpi/> + <apic/> </features> <clock sync="localtime"/> <devices> diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index ce49f7d..083a80a 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -28,11 +28,11 @@ <h3><a name="elementsMetadata">General metadata</a></h3> - <pre> - <domain type='xen' id='3'> - <name>fv0</name> - <uuid>4dea22b31d52d8f32516782e98ab3fa0</uuid> - ...</pre> +<pre> +<domain type='xen' id='3'> + <name>fv0</name> + <uuid>4dea22b31d52d8f32516782e98ab3fa0</uuid> + ...</pre> <dl> <dt><code>name</code></dt> @@ -66,14 +66,14 @@ to obtain/find the boot image. </p> - <pre> - ... - <os> - <type>hvm</type> - <loader>/usr/lib/xen/boot/hvmloader</loader> - <boot dev='hd'/> - </os> - ...</pre> +<pre> + ... + <os> + <type>hvm</type> + <loader>/usr/lib/xen/boot/hvmloader</loader> + <boot dev='hd'/> + </os> + ...</pre> <dl> <dt><code>type</code></dt> @@ -109,11 +109,11 @@ An example is <code>pygrub</code> with Xen. </p> - <pre> - ... - <bootloader>/usr/bin/pygrub</bootloader> - <bootloader_args>--append single</bootloader_args> - ...</pre> +<pre> + ... + <bootloader>/usr/bin/pygrub</bootloader> + <bootloader_args>--append single</bootloader_args> + ...</pre> <dl> <dt><code>bootloader</code></dt> @@ -139,16 +139,16 @@ is usually available for both para and full virtualized guests. </p> - <pre> - ... - <os> - <type>hvm</type> - <loader>/usr/lib/xen/boot/hvmloader</loader> - <kernel>/root/f8-i386-vmlinuz</kernel> - <initrd>/root/f8-i386-initrd</initrd> - <cmdline>console=ttyS0 ks=http://example.com/f8-i386/os/</cmdline> - </os> - ...</pre> +<pre> + ... + <os> + <type>hvm</type> + <loader>/usr/lib/xen/boot/hvmloader</loader> + <kernel>/root/f8-i386-vmlinuz</kernel> + <initrd>/root/f8-i386-initrd</initrd> + <cmdline>console=ttyS0 ks=http://example.com/f8-i386/os/</cmdline> + </os> + ...</pre> <dl> <dt><code>type</code></dt> @@ -172,15 +172,15 @@ <h3><a name="elementsResources">Basic resources</a></h3> - <pre> - ... - <memory>524288</memory> - <currentMemory>524288</currentMemory> - <memoryBacking> - <hugepages/> - </memoryBacking> - <vcpu>1</vcpu> - ...</pre> +<pre> + ... + <memory>524288</memory> + <currentMemory>524288</currentMemory> + <memoryBacking> + <hugepages/> + </memoryBacking> + <vcpu>1</vcpu> + ...</pre> <dl> <dt><code>memory</code></dt> @@ -209,14 +209,14 @@ <span class="since">Since 0.7.5</span> </p> - <pre> - ... - <cpu match='exact'> - <model>core2duo</model> - <topology sockets='1' cores='2' threads='1'/> - <feature policy='disable' name='lahf_lm'/> - </cpu> - ...</pre> +<pre> + ... + <cpu match='exact'> + <model>core2duo</model> + <topology sockets='1' cores='2' threads='1'/> + <feature policy='disable' name='lahf_lm'/> + </cpu> + ...</pre> <p> In case no restrictions need to be put on CPU model and its features, a @@ -224,12 +224,12 @@ <span class="since">Since 0.7.6</span> </p> - <pre> - ... - <cpu> - <topology sockets='1' cores='2' threads='1'/> - </cpu> - ...</pre> +<pre> + ... + <cpu> + <topology sockets='1' cores='2' threads='1'/> + </cpu> + ...</pre> <dl> <dt><code>cpu</code></dt> @@ -305,12 +305,12 @@ re-configured for the first post-install bootup. </p> - <pre> - ... - <on_poweroff>destroy</on_poweroff> - <on_reboot>restart</on_reboot> - <on_crash>restart</on_crash> - ...</pre> +<pre> + ... + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>restart</on_crash> + ...</pre> <dl> <dt><code>on_poweroff</code></dt> @@ -350,14 +350,14 @@ toggled on/off. </p> - <pre> - ... - <features> - <pae/> - <acpi/> - <apic/> - </features> - ...</pre> +<pre> + ... + <features> + <pae/> + <acpi/> + <apic/> + </features> + ...</pre> <p> All features are listed within the <code>features</code> @@ -386,10 +386,10 @@ it to be in so called 'localtime'. </p> - <pre> - ... - <clock offset="localtime"/> - ...</pre> +<pre> + ... + <clock offset="localtime"/> + ...</pre> <dl> <dt><code>clock</code></dt> @@ -408,11 +408,12 @@ <span class="since">Since 0.1.3</span> </p> - <pre> - ... - <devices> - <emulator>/usr/lib/xen/bin/qemu-dm</emulator> - ...</pre> +<pre> + ... + <devices> + <emulator>/usr/lib/xen/bin/qemu-dm</emulator> + </devices> + ...</pre> <dl> <dt><code>emulator</code></dt> @@ -433,18 +434,20 @@ element. </p> - <pre> - ... - <disk type='file'> - <driver name="tap" type="aio" cache="default"> - <source file='/var/lib/xen/images/fv0'/> - <target dev='hda' bus='ide'/> - <encryption type='...'> - ... - </encryption> - <shareable/> - </disk> - ...</pre> +<pre> + ... + <devices> + <disk type='file'> + <driver name="tap" type="aio" cache="default"> + <source file='/var/lib/xen/images/fv0'/> + <target dev='hda' bus='ide'/> + <encryption type='...'> + ... + </encryption> + <shareable/> + </disk> + </devices> + ...</pre> <dl> <dt><code>disk</code></dt> @@ -500,24 +503,30 @@ 0.4.4 for USB and 0.6.0 for PCI (KVM only)</span>: </p> - <pre> - ... - <hostdev mode='subsystem' type='usb'> - <source> - <vendor id='0x1234'/> - <product id='0xbeef'/> - </source> - </hostdev> - ...</pre> +<pre> + ... + <devices> + <hostdev mode='subsystem' type='usb'> + <source> + <vendor id='0x1234'/> + <product id='0xbeef'/> + </source> + </hostdev> + </devices> + ...</pre> + <p>or:</p> - <pre> - ... - <hostdev mode='subsystem' type='pci'> - <source> - <address bus='0x06' slot='0x02' function='0x0'/> - </source> - </hostdev> - ...</pre> + +<pre> + ... + <devices> + <hostdev mode='subsystem' type='pci'> + <source> + <address bus='0x06' slot='0x02' function='0x0'/> + </source> + </hostdev> + </devices> + ...</pre> <dl> <dt><code>hostdev</code></dt> @@ -556,14 +565,16 @@ <h4><a name="elementsNICS">Network interfaces</a></h4> - <pre> - ... - <interface type='bridge'> - <source bridge='xenbr0'/> - <mac address='00:16:3e:5d:c7:9e'/> - <script path='vif-bridge'/> - </interface> - ...</pre> +<pre> + ... + <devices> + <interface type='bridge'> + <source bridge='xenbr0'/> + <mac address='00:16:3e:5d:c7:9e'/> + <script path='vif-bridge'/> + </interface> + </devices> + ...</pre> <h5><a name="elementsNICSVirtual">Virtual network</a></h5> @@ -589,18 +600,20 @@ <a href="#elementsNICSTargetOverride">overriding the target element</a>). </p> - <pre> - ... - <interface type='network'> - <source network='default'/> - </interface> - ... - <interface type='network'> - <source network='default'/> - <target dev='vnet7'/> - <mac address="11:22:33:44:55:66"/> - </interface> - ...</pre> +<pre> + ... + <devices> + <interface type='network'> + <source network='default'/> + </interface> + ... + <interface type='network'> + <source network='default'/> + <target dev='vnet7'/> + <mac address="11:22:33:44:55:66"/> + </interface> + </devices> + ...</pre> <h5><a name="elementsNICSBridge">Bridge to LAN</a></h5> @@ -623,18 +636,20 @@ full incoming & outgoing net access just like a physical machine. </p> - <pre> - ... - <interface type='bridge'> - <source bridge='br0'/> - </interface> - - <interface type='bridge'> - <source bridge='br0'/> - <target dev='vnet7'/> - <mac address="11:22:33:44:55:66"/> - </interface> - ...</pre> +<pre> + ... + <devices> + <interface type='bridge'> + <source bridge='br0'/> + </interface> + ... + <interface type='bridge'> + <source bridge='br0'/> + <target dev='vnet7'/> + <mac address="11:22:33:44:55:66"/> + </interface> + </devices> + ...</pre> <h5><a name="elementsNICSSlirp">Userspace SLIRP stack</a></h5> @@ -647,14 +662,16 @@ VMs to have outgoing access. </p> - <pre> - ... - <interface type='user'/> - ... - <interface type='user'> - <mac address="11:22:33:44:55:66"/> - </interface> - ...</pre> +<pre> + ... + <devices> + <interface type='user'/> + ... + <interface type='user'> + <mac address="11:22:33:44:55:66"/> + </interface> + </devices> + ...</pre> <h5><a name="elementsNICSEthernet">Generic ethernet connection</a></h5> @@ -669,15 +686,17 @@ overridden. </p> - <pre> - ... - <interface type='ethernet'/> - ... - <interface type='ethernet'> - <target dev='vnet7'/> - <script path='/etc/qemu-ifup-mynet'/> - </interface> - ...</pre> +<pre> + ... + <devices> + <interface type='ethernet'/> + ... + <interface type='ethernet'> + <target dev='vnet7'/> + <script path='/etc/qemu-ifup-mynet'/> + </interface> + </devices> + ...</pre> <h5><a name="elementsNICSMulticast">Multicast tunnel</a></h5> @@ -693,12 +712,14 @@ multicast address block. </p> - <pre> - ... - <interface type='mcast'> - <source address='230.0.0.1' port='5558'/> - </interface> - ...</pre> +<pre> + ... + <devices> + <interface type='mcast'> + <source address='230.0.0.1' port='5558'/> + </interface> + </devices> + ...</pre> <h5><a name="elementsNICSTCP">TCP tunnel</a></h5> @@ -711,27 +732,31 @@ network access, one of the VMs should have a 2nd NIC which is connected to one of the first 4 network types and do the appropriate routing.</p> - <pre> - ... - <interface type='server'> - <source address='192.168.0.1' port='5558'/> - </interface> - ... - <interface type='client'> +<pre> + ... + <devices> + <interface type='server'> <source address='192.168.0.1' port='5558'/> - </interface> - ...</pre> + </interface> + ... + <interface type='client'> + <source address='192.168.0.1' port='5558'/> + </interface> + </devices> + ...</pre> <h5><a name="elementsNICSModel">Setting the NIC model</a></h5> - <pre> - ... - <interface type='network'> - <source network='default'/> - <target dev='vnet1'/> - <b><model type='ne2k_pci'/></b> - </interface> - ...</pre> +<pre> + ... + <devices> + <interface type='network'> + <source network='default'/> + <target dev='vnet1'/> + <b><model type='ne2k_pci'/></b> + </interface> + </devices> + ...</pre> <p> For hypervisors which support this, you can set the model of @@ -757,13 +782,15 @@ qemu-kvm -net nic,model=? /dev/null <h5><a name="elementsNICSTargetOverride">Overriding the target element</a></h5> - <pre> - ... - <interface type='network'> - <source network='default'/> - <b><target dev='vnet1'/></b> - </interface> - ...</pre> +<pre> + ... + <devices> + <interface type='network'> + <source network='default'/> + <b><target dev='vnet1'/></b> + </interface> + </devices> + ...</pre> <p> If no target is specified, certain hypervisors will automatically @@ -783,10 +810,12 @@ qemu-kvm -net nic,model=? /dev/null to provide a graphics tablet for absolute cursor movement. </p> - <pre> - ... - <input type='mouse' bus='usb'/> - ...</pre> +<pre> + ... + <devices> + <input type='mouse' bus='usb'/> + </devices> + ...</pre> <dl> <dt><code>input</code></dt> @@ -807,13 +836,15 @@ qemu-kvm -net nic,model=? /dev/null admin. </p> - <pre> - ... - <graphics type='sdl' display=':0.0'/> - <graphics type='vnc' port='5904'/> - <graphics type='rdp' autoport='yes' multiUser='yes' /> - <graphics type='desktop' fullscreen='yes'/> - ...</pre> +<pre> + ... + <devices> + <graphics type='sdl' display=':0.0'/> + <graphics type='vnc' port='5904'/> + <graphics type='rdp' autoport='yes' multiUser='yes' /> + <graphics type='desktop' fullscreen='yes'/> + </devices> + ...</pre> <dl> <dt><code>graphics</code></dt> @@ -867,14 +898,16 @@ qemu-kvm -net nic,model=? /dev/null A video device. </p> - <pre> - ... - <video> - <model type='vga' vram='8192' heads='1'> - <acceleration accel3d='yes' accel3d='yes'/> - </model> - </video> - ...</pre> +<pre> + ... + <devices> + <video> + <model type='vga' vram='8192' heads='1'> + <acceleration accel3d='yes' accel3d='yes'/> + </model> + </video> + </devices> + ...</pre> <dl> <dt><code>video</code></dt> @@ -907,26 +940,27 @@ qemu-kvm -net nic,model=? /dev/null all classed as character devices and so represented using the same syntax. </p> - <pre> - ... - <parallel type='pty'> - <source path='/dev/pts/2'/> - <target port='0'/> - </parallel> - <serial type='pty'> - <source path='/dev/pts/3'/> - <target port='0'/> - </serial> - <console type='pty'> - <source path='/dev/pts/4'/> - <target port='0'/> - </console> - <channel type='unix'> - <source mode='bind' path='/tmp/guestfwd'/> - <target type='guestfwd' address='10.0.2.1' port='4600'/> - </channel> - </devices> - </domain></pre> +<pre> + ... + <devices> + <parallel type='pty'> + <source path='/dev/pts/2'/> + <target port='0'/> + </parallel> + <serial type='pty'> + <source path='/dev/pts/3'/> + <target port='0'/> + </serial> + <console type='pty'> + <source path='/dev/pts/4'/> + <target port='0'/> + </console> + <channel type='unix'> + <source mode='bind' path='/tmp/guestfwd'/> + <target type='guestfwd' address='10.0.2.1' port='4600'/> + </channel> + </devices> + ...</pre> <p> In each of these directives, the top-level element name (parallel, serial, @@ -949,13 +983,15 @@ qemu-kvm -net nic,model=? /dev/null <h6><a name="elementCharParallel">Parallel port</a></h6> - <pre> - ... - <parallel type='pty'> - <source path='/dev/pts/2'/> - <target port='0'/> - </parallel> - ...</pre> +<pre> + ... + <devices> + <parallel type='pty'> + <source path='/dev/pts/2'/> + <target port='0'/> + </parallel> + </devices> + ...</pre> <p> <code>target</code> can have a <code>port</code> attribute, which @@ -965,13 +1001,15 @@ qemu-kvm -net nic,model=? /dev/null <h6><a name="elementCharSerial">Serial port</a></h6> - <pre> - ... - <serial type='pty'> - <source path='/dev/pts/3'/> - <target port='0'/> - </serial> - ...</pre> +<pre> + ... + <devices> + <serial type='pty'> + <source path='/dev/pts/3'/> + <target port='0'/> + </serial> + </devices> + ...</pre> <p> <code>target</code> can have a <code>port</code> attribute, which @@ -987,13 +1025,15 @@ qemu-kvm -net nic,model=? /dev/null virtualized guests without a paravirtualized console. </p> - <pre> - ... - <console type='pty'> - <source path='/dev/pts/4'/> - <target port='0'/> - </console> - ...</pre> +<pre> + ... + <devices> + <console type='pty'> + <source path='/dev/pts/4'/> + <target port='0'/> + </console> + </devices> + ...</pre> <p> If the console is presented as a serial port, the <code>target</code> @@ -1008,13 +1048,15 @@ qemu-kvm -net nic,model=? /dev/null guest. </p> - <pre> - ... - <channel type='unix'> - <source mode='bind' path='/tmp/guestfwd'/> - <target type='guestfwd' address='10.0.2.1' port='4600'/> - </channel> - ...</pre> +<pre> + ... + <devices> + <channel type='unix'> + <source mode='bind' path='/tmp/guestfwd'/> + <target type='guestfwd' address='10.0.2.1' port='4600'/> + </channel> + </devices> + ...</pre> <p> This can be implemented in a variety of ways. The specific type of @@ -1045,12 +1087,14 @@ qemu-kvm -net nic,model=? /dev/null into the virtual machine's logfile </p> - <pre> - ... - <console type='stdio'> - <target port='1'> - </console> - ...</pre> +<pre> + ... + <devices> + <console type='stdio'> + <target port='1'> + </console> + </devices> + ...</pre> <h6><a name="elementsCharFle">Device logfile</a></h6> @@ -1060,13 +1104,15 @@ qemu-kvm -net nic,model=? /dev/null device is written to the file. </p> - <pre> - ... - <serial type="file"> - <source path="/var/log/vm/vm-serial.log"/> - <target port="1"/> - </serial> - ...</pre> +<pre> + ... + <devices> + <serial type="file"> + <source path="/var/log/vm/vm-serial.log"/> + <target port="1"/> + </serial> + </devices> + ...</pre> <h6><a name="elementsCharVC">Virtual console</a></h6> @@ -1076,12 +1122,14 @@ qemu-kvm -net nic,model=? /dev/null hotkey sequence such as "ctrl+alt+3" </p> - <pre> - ... - <serial type='vc'> - <target port="1"/> - </serial> - ...</pre> +<pre> + ... + <devices> + <serial type='vc'> + <target port="1"/> + </serial> + </devices> + ...</pre> <h6><a name="elementsCharNull">Null device</a></h6> @@ -1090,12 +1138,14 @@ qemu-kvm -net nic,model=? /dev/null provided to the input. All data written is discarded. </p> - <pre> - ... - <serial type='null'> - <target port="1"/> - </serial> - ...</pre> +<pre> + ... + <devices> + <serial type='null'> + <target port="1"/> + </serial> + </devices> + ...</pre> <h6><a name="elementsCharPTY">Pseudo TTY</a></h6> @@ -1105,13 +1155,15 @@ qemu-kvm -net nic,model=? /dev/null serial port locally. </p> - <pre> - ... - <serial type="pty"> - <source path="/dev/pts/3"/> - <target port="1"/> - </serial> - ...</pre> +<pre> + ... + <devices> + <serial type="pty"> + <source path="/dev/pts/3"/> + <target port="1"/> + </serial> + </devices> + ...</pre> <p> NB special case if <console type='pty'>, then the TTY @@ -1130,13 +1182,15 @@ qemu-kvm -net nic,model=? /dev/null port. </p> - <pre> - ... - <serial type="dev"> - <source path="/dev/ttyS0"/> - <target port="1"/> - </serial> - ...</pre> +<pre> + ... + <devices> + <serial type="dev"> + <source path="/dev/ttyS0"/> + <target port="1"/> + </serial> + </devices> + ...</pre> <h6><a name="elementsCharPipe">Named pipe</a></h6> @@ -1145,13 +1199,15 @@ qemu-kvm -net nic,model=? /dev/null more info. </p> - <pre> - ... - <serial type="pipe"> - <source path="/tmp/mypipe"/> - <target port="1"/> - </serial> - ...</pre> +<pre> + ... + <devices> + <serial type="pipe"> + <source path="/tmp/mypipe"/> + <target port="1"/> + </serial> + </devices> + ...</pre> <h6><a name="elementsCharTCP">TCP client/server</a></h6> @@ -1160,46 +1216,52 @@ qemu-kvm -net nic,model=? /dev/null remote server. </p> - <pre> - ... - <serial type="tcp"> - <source mode="connect" host="0.0.0.0" service="2445"/> - <protocol type="raw"/> - <target port="1"/> - </serial> - ...</pre> +<pre> + ... + <devices> + <serial type="tcp"> + <source mode="connect" host="0.0.0.0" service="2445"/> + <protocol type="raw"/> + <target port="1"/> + </serial> + </devices> + ...</pre> <p> Or as a TCP server waiting for a client connection. </p> - <pre> - ... - <serial type="tcp"> - <source mode="bind" host="127.0.0.1" service="2445"/> - <protocol type="raw"/> - <target port="1"/> - </serial> - ...</pre> +<pre> + ... + <devices> + <serial type="tcp"> + <source mode="bind" host="127.0.0.1" service="2445"/> + <protocol type="raw"/> + <target port="1"/> + </serial> + </devices> + ...</pre> <p> Alternatively you can use telnet instead of raw TCP. <p> - <pre> - ... - <serial type="tcp"> - <source mode="connect" host="0.0.0.0" service="2445"/> - <protocol type="telnet"/> - <target port="1"/> - </serial> - ... - <serial type="tcp"> - <source mode="bind" host="127.0.0.1" service="2445"/> - <protocol type="telnet"/> - <target port="1"/> - </serial> - ...</pre> +<pre> + ... + <devices> + <serial type="tcp"> + <source mode="connect" host="0.0.0.0" service="2445"/> + <protocol type="telnet"/> + <target port="1"/> + </serial> + ... + <serial type="tcp"> + <source mode="bind" host="127.0.0.1" service="2445"/> + <protocol type="telnet"/> + <target port="1"/> + </serial> + </devices> + ...</pre> <h6><a name="elementsCharUDP">UDP network console</a></h6> @@ -1208,14 +1270,16 @@ qemu-kvm -net nic,model=? /dev/null sending and receiving packets. This is a lossy service. </p> - <pre> - ... - <serial type="udp"> - <source mode="bind" host="0.0.0.0" service="2445"/> - <source mode="connect" host="0.0.0.0" service="2445"/> - <target port="1"/> - </serial> - ...</pre> +<pre> + ... + <devices> + <serial type="udp"> + <source mode="bind" host="0.0.0.0" service="2445"/> + <source mode="connect" host="0.0.0.0" service="2445"/> + <target port="1"/> + </serial> + </devices> + ...</pre> <h6><a name="elementsCharUNIX">UNIX domain socket client/server</a></h6> @@ -1224,13 +1288,15 @@ qemu-kvm -net nic,model=? /dev/null accepting connections from local clients. </p> - <pre> - ... - <serial type="unix"> - <source mode="bind" path="/tmp/foo"/> - <target port="1"/> - </serial> - ...</pre> +<pre> + ... + <devices> + <serial type="unix"> + <source mode="bind" path="/tmp/foo"/> + <target port="1"/> + </serial> + </devices> + ...</pre> <h4><a name="elementsSound">Sound devices</a></h4> @@ -1240,10 +1306,12 @@ qemu-kvm -net nic,model=? /dev/null <code>sound</code> element. <span class="since">Since 0.4.3</span> </p> - <pre> - ... - <sound model='es1370'/> - ...</pre> +<pre> + ... + <devices> + <sound model='es1370'/> + </devices> + ...</pre> <dl> <dt><code>sound</code></dt> @@ -1276,15 +1344,19 @@ qemu-kvm -net nic,model=? /dev/null libvirt. </p> - <pre> - ... - <watchdog model='i6300esb'/> - ...</pre> +<pre> + ... + <devices> + <watchdog model='i6300esb'/> + </devices> + ...</pre> - <pre> - ... - <watchdog model='i6300esb' action='poweroff'/> - ...</pre> +<pre> + ... + <devices> + <watchdog model='i6300esb' action='poweroff'/> + </devices> +</domain></pre> <dl> <dt><code>model</code></dt> -- 1.6.3.3

2 2

[libvirt] [PATCH 0/9] Progress monitoring & cancellation of jobs
by Daniel P. Berrange 04 Feb '10

04 Feb '10

This series introduces 2 new APIs to allow long running jobs to be monitored and cancelled. This applies to virDomainMigrate, virDomainSave, virDomainRestore and virDomainCoreDump at least. The implementation is provided for QEMU only, any others that are able to implementation can do so as desired. Usefulness of these new APIs requires use of multiple threads on a single connection, or multiple connections, since the main API calls are still all fully blocking. Instead a parallel thread or process can monitor. This can be seen with virsh In termainl 1 $ virsh save demo demo.img In terminal 2 $ ./virsh domjobinfo demo Job type: Unbounded Time elapsed: 795 ms Data processed: 22446080 bytes Data remaining: 219119616 bytes Data total: 241565696 bytes Memory processed: 22446080 bytes Memory remaining: 219119616 bytes Memory total: 241565696 bytes $ ./virsh domjobinfo demo Job type: Unbounded Time elapsed: 1669 ms Data processed: 139784192 bytes Data remaining: 101781504 bytes Data total: 241565696 bytes Memory processed: 139784192 bytes Memory remaining: 101781504 bytes Memory total: 241565696 bytes $ ./virsh domjobabort demo Back in terminal 1 error: Failed to save domain demo to demo.img error: operation failed: Migration was cancelled by client

1 9

[libvirt] [PATCH] sexpr_string: avoid leak on OOM error path
by Jim Meyering 04 Feb '10

04 Feb '10

>From cc06142a81dc1891dc75306b986ea331f5fd5368 Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Thu, 4 Feb 2010 17:55:15 +0100 Subject: [PATCH] sexpr_string: avoid leak on OOM error path * src/xen/sexpr.c (sexpr_string): Free sexpr buffer upon allocation failure. --- src/xen/sexpr.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/src/xen/sexpr.c b/src/xen/sexpr.c index 085500d..669f8a2 100644 --- a/src/xen/sexpr.c +++ b/src/xen/sexpr.c @@ -107,30 +107,31 @@ sexpr_nil(void) struct sexpr * sexpr_string(const char *str, ssize_t len) { struct sexpr *ret = sexpr_new(); if (ret == NULL) return ret; ret->kind = SEXPR_VALUE; if (len > 0) { ret->u.value = strndup(str, len); } else { ret->u.value = strdup(str); } if (ret->u.value == NULL) { + VIR_FREE(ret); return NULL; } return ret; } /** * sexpr_cons: * @car: the left operand * @cdr: the right operand * * Implement the CONS operation assembling 2 existing S-Expressions. * Note that in case of error the input data are not freed. * * Returns the resulting S-Expression pointer or NULL in case of error. -- 1.7.0.rc1.199.g9253a

2 1

[libvirt] Suggested schedule for next release
by Daniel Veillard 04 Feb '10

04 Feb '10

Considering the amount of changes accumulating in a month, I suggest to continue with the end-of-month release cycle, which means basically that we would push features to head until Friday 19th and push the next release on the 26. This is a short cycle since Feb is a short month and we skipped a bit on 0.7.6 release, but I have no doubt we will have enough substance :-) There is a number of patches alredy lining up, the new APIs from Jim Fehlig, Dan Berrange clock sync patches, the macvlan patches, and the proposed snapshotting APIs (if we actually end up adding snapshotting I think next release would deserve being named 0.8.0 as this would be a major enhancement, otherwise 0.7.7), etc... Happy hacking ! Daniel -- Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ daniel(a)veillard.com | Rpmfind RPM search engine http://rpmfind.net/ http://veillard.com/ | virtualization library http://libvirt.org/

1 0

[libvirt] Fix wrong nodeinfo->mhz when cpufreq is enabled
by Thomas Treutner 04 Feb '10

04 Feb '10

Hi, I've written a little patch to fix wrong nodeinfo->mhz when the Linux kernel module cpufreq and a typical governor like ondemand are loaded. nodeinfo->mhz is then too low as libvirt just reads /proc/cpuinfo, entry "cpu MHz". This patch reads /sys/devices/system/cpu/cpu0/cpufreq/scaling_max_freq if existing and corrects nodeinfo->mhz if the value found is higher. Using cpu0 is a crude hack but as discussed on IRC, considering different governors/maximum frequencies per cpu/core would require changing the nodeinfo struct, which would break the API. Some more info: https://bugzilla.redhat.com/show_bug.cgi?id=559762 Please have a careful look at my patch, my last C is quite some time ago. I tried to stick to linuxNodeInfoCPUPopulate, but f.e., checking for "&& *p == '\0'" after virStrToLong_ui doesn't work and I'm wondering why scaling_max_freq may not be terminated with by NUL? I also hope the file handling is correct, but please have a look. There is still some todo: Some logging would be helpful, maybe one of you could point out which function best to use? This is my first patch, so hopefully it follows in the next mail ;-) kr, tom

2 2

[libvirt] [PATCH] virt-pki-validate contains unexpanded SYSCONFDIR variable
by Doug Goldstein 04 Feb '10

04 Feb '10

virt-pki-validate contains an unexpanded SYSCONFDIR variable which causes it not to function at all. --- tools/virt-pki-validate.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/virt-pki-validate.in b/tools/virt-pki-validate.in index a428a96..3e8c642 100755 --- a/tools/virt-pki-validate.in +++ b/tools/virt-pki-validate.in @@ -25,7 +25,7 @@ echo Found $CERTOOL # # Check the directory structure # -PKI="$(SYSCONFDIR)/pki" +PKI="@SYSCONFDIR@/pki" if [ ! -d $PKI ] then echo the $PKI directory is missing, it is usually -- 1.6.6.1

3 2