- Devel - libvirt List Archives

[libvirt] [PATCH 0/3] Test our PCI device handling functions
by Michal Privoznik 01 Nov '13

01 Nov '13

*** BLURB HERE *** Michal Privoznik (3): tests: Introduce virpcitest virpcitest: Test virPCIDeviceDetach virpcitest: Introduce testVirPCIDeviceReattach .gitignore | 1 + cfg.mk | 4 +- tests/Makefile.am | 21 +- tests/virpcimock.c | 872 +++++++++++++++++++++++++++++++++++++++++++++++++++++ tests/virpcitest.c | 184 +++++++++++ 5 files changed, 1078 insertions(+), 4 deletions(-) create mode 100644 tests/virpcimock.c create mode 100644 tests/virpcitest.c -- 1.8.1.5

2 6

[libvirt] [PATCH 0/2] Support IPv6 in port allocator
by Ján Tomko 01 Nov '13

01 Nov '13

This goes on top of: [PATCH v2 0/2] Report an error in virPortAllocatorAcquire if all ports are used https://www.redhat.com/archives/libvir-list/2013-October/msg01289.html v1: Support IPv6 in port allocator https://www.redhat.com/archives/libvir-list/2013-October/msg00007.html Ján Tomko (2): Split out bind() from virPortAllocatorAcquire Support IPv6 in port allocator src/util/virportallocator.c | 107 ++++++++++++++++++++++++++++++++------------ 1 file changed, 78 insertions(+), 29 deletions(-) -- 1.8.1.5

3 7

[libvirt] [PATCH] storage: implement rudimentary glusterfs pool refresh
by Eric Blake 01 Nov '13

01 Nov '13

Actually put gfapi to use, by allowing the creation of a gluster pool. Right now, all volumes are treated as raw; further patches will allow peering into files to allow for qcow2 files and backing chains, and reporting proper volume allocation. I've reported a couple of glusterfs bugs; if we were to require a minimum of (not-yet-released) glusterfs 3.5, we could use the new glfs_readdir [1] and not worry about the bogus return value of glfs_fini [2], but for now I'm testing with Fedora 19's glusterfs 3.4.1. [1] http://lists.gnu.org/archive/html/gluster-devel/2013-10/msg00085.html [2] http://lists.gnu.org/archive/html/gluster-devel/2013-10/msg00086.html * src/storage/storage_backend_gluster.c (virStorageBackendGlusterRefreshPool): Initial implementation. (virStorageBackendGlusterOpen, virStorageBackendGlusterClose): New helper functions. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- Depends on these pre-req patches: https://www.redhat.com/archives/libvir-list/2013-October/msg01266.html https://www.redhat.com/archives/libvir-list/2013-October/msg00913.html My next task - figuring out the use of glfs_open() to read metadata from a file and determine backing chains. src/storage/storage_backend_gluster.c | 138 ++++++++++++++++++++++++++++++++-- 1 file changed, 133 insertions(+), 5 deletions(-) diff --git a/src/storage/storage_backend_gluster.c b/src/storage/storage_backend_gluster.c index 2863c73..b0b6ce6 100644 --- a/src/storage/storage_backend_gluster.c +++ b/src/storage/storage_backend_gluster.c @@ -23,20 +23,148 @@ #include <glusterfs/api/glfs.h> -#include "virerror.h" #include "storage_backend_gluster.h" #include "storage_conf.h" +#include "viralloc.h" +#include "virerror.h" +#include "virlog.h" +#include "virstoragefile.h" +#include "virstring.h" #define VIR_FROM_THIS VIR_FROM_STORAGE +struct _virStorageBackendGlusterState { + glfs_t *vol; +}; + +typedef struct _virStorageBackendGlusterState virStorageBackendGlusterState; +typedef virStorageBackendGlusterState *virStorageBackendGlusterStatePtr; + +static void +virStorageBackendGlusterClose(virStorageBackendGlusterStatePtr state) +{ + if (!state || !state->vol) + return; + /* Yuck - glusterfs-api-3.4.1 appears to always return -1 for + * glfs_fini, with errno containing random data, so there's no way + * to tell if it succeeded. 3.4.2 is supposed to fix this.*/ + if (glfs_fini(state->vol) < 0) + VIR_DEBUG("shutdown of gluster failed with errno %d", errno); +} + +static virStorageBackendGlusterStatePtr +virStorageBackendGlusterOpen(virStoragePoolObjPtr pool) +{ + virStorageBackendGlusterStatePtr ret = NULL; + + if (VIR_ALLOC(ret) < 0) + return NULL; + + if (!(ret->vol = glfs_new(pool->def->source.name))) { + virReportOOMError(); + goto error; + } + + /* FIXME: allow alternate transport in the pool xml */ + if (glfs_set_volfile_server(ret->vol, "tcp", + pool->def->source.hosts[0].name, + pool->def->source.hosts[0].port) < 0 || + glfs_init(ret->vol) < 0) { + virReportSystemError(errno, _("failed to connect to gluster %s/%s"), + pool->def->source.hosts[0].name, + pool->def->name); + goto error; + } + + return ret; + +error: + virStorageBackendGlusterClose(ret); + return NULL; +} static int virStorageBackendGlusterRefreshPool(virConnectPtr conn ATTRIBUTE_UNUSED, - virStoragePoolObjPtr pool ATTRIBUTE_UNUSED) + virStoragePoolObjPtr pool) { - virReportError(VIR_ERR_NO_SUPPORT, "%s", - _("gluster pool type not fully supported yet")); - return -1; + int ret = -1; + virStorageBackendGlusterStatePtr state = NULL; + struct { + struct dirent ent; + /* See comment below about readdir_r needing padding */ + char padding[MAX(1, 256 - (int) (sizeof(struct dirent) + - offsetof(struct dirent, d_name)))]; + } de; + struct dirent *ent; + glfs_fd_t *dir = NULL; + virStorageVolDefPtr vol = NULL; + struct statvfs sb; + + if (!(state = virStorageBackendGlusterOpen(pool))) + goto cleanup; + + /* Why oh why did glfs 3.4 decide to expose only readdir_r rather + * than readdir? POSIX admits that readdir_r is inherently a + * flawed design, because systems are not required to define + * NAME_MAX: http://austingroupbugs.net/view.php?id=696 + * http://womble.decadent.org.uk/readdir_r-advisory.html + * + * Fortunately, gluster uses _only_ XFS file systems, and XFS has + * a known NAME_MAX of 255; so we are guaranteed that if we + * provide 256 bytes of tail padding, then we have enough space to + * avoid buffer overflow no matter whether the OS used d_name[], + * d_name[1], or d_name[256] in its 'struct dirent'. + * http://lists.gnu.org/archive/html/gluster-devel/2013-10/msg00083.html + */ + + if (!(dir = glfs_opendir(state->vol, "."))) { + virReportSystemError(errno, _("cannot open path '%s'"), + pool->def->name); + goto cleanup; + } + while (!(errno = glfs_readdir_r(dir, &de.ent, &ent)) && ent) { + if (STREQ(ent->d_name, ".") || STREQ(ent->d_name, "..")) + continue; + if (VIR_ALLOC(vol) < 0 || + VIR_STRDUP(vol->name, ent->d_name) < 0) + goto cleanup; + /* FIXME - must open files to determine if they are non-raw */ + vol->type = VIR_STORAGE_VOL_NETWORK; + vol->target.format = VIR_STORAGE_FILE_RAW; + if (virAsprintf(&vol->key, "%s/%s", + pool->def->name, vol->name) < 0) + goto cleanup; + if (VIR_APPEND_ELEMENT(pool->volumes.objs, pool->volumes.count, + vol) < 0) + goto cleanup; + } + if (errno) { + virReportSystemError(errno, _("failed to read directory '%s'"), + pool->def->name); + goto cleanup; + } + + if (glfs_statvfs(state->vol, ".", &sb) < 0) { + virReportSystemError(errno, _("cannot statvfs path '%s'"), + pool->def->name); + goto cleanup; + } + + pool->def->capacity = ((unsigned long long)sb.f_frsize * + (unsigned long long)sb.f_blocks); + pool->def->available = ((unsigned long long)sb.f_bfree * + (unsigned long long)sb.f_frsize); + pool->def->allocation = pool->def->capacity - pool->def->available; + + ret = 0; +cleanup: + if (dir) + glfs_closedir(dir); + virStorageVolDefFree(vol); + virStorageBackendGlusterClose(state); + if (ret < 0) + virStoragePoolObjClearVols(pool); + return ret; } virStorageBackend virStorageBackendGluster = { -- 1.8.3.1

3 13

[libvirt] [PATCH] network_conf.c: correct the value of the 'result' variable
by Hongwei Bi 01 Nov '13

01 Nov '13

The result variable in virNetworkDNSDefFormat() function should be initialized to -1 at first,only in this way can we use it properly. Signed-off-by: Hongwei Bi <hwbi2008(a)gmail.com> --- src/conf/network_conf.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c index 447eca4..8ab4e96 100644 --- a/src/conf/network_conf.c +++ b/src/conf/network_conf.c @@ -2295,7 +2295,7 @@ static int virNetworkDNSDefFormat(virBufferPtr buf, const virNetworkDNSDef *def) { - int result = 0; + int result = -1; size_t i, j; if (!(def->forwardPlainNames || def->forwarders || def->nhosts || @@ -2363,6 +2363,8 @@ virNetworkDNSDefFormat(virBufferPtr buf, } virBufferAdjustIndent(buf, -2); virBufferAddLit(buf, "</dns>\n"); + + result = 0; out: return result; } -- 1.8.1.2

3 2

[libvirt] the case for volatile nwfilters
by Dan Kenigsberg 31 Oct '13

31 Oct '13

I'd like oVirt to make a more extensive usage of libvirt's nwfilters in order to implement security groups, i.e. which protocol/port/host should be open on an interface. Since oVirt is cetrally-managed by ovirt-engine, filter definitions should be edited there and kept in its database. However, libivrt's domain xml requires to have a locally-defined filter as well: <devices> <interface type='bridge'> <filterref filter='filter-name'/> </interface> </devices> We can leave with it by defining an ad-hoc filter before staring a VM, deleting it after the VM stops, and collecting garbage (due to system crashes) occasionally. It would be nicer if we could instead have just-in-time filter definition such as <devices> <interface type='bridge'> <filter name='nameless'> <rule/> <rule/> <rule/> </filter> </interface> </devices> avoiding nwfilter persistence. Would something like this be beneficial to other libvirt users? Would it be easy to implement within libvirt? Regards, Dan.

3 5

[libvirt] [PATCH] nodedev_hal: fix segfault when virDBusGetSystemBus fails
by Ryota Ozaki 31 Oct '13

31 Oct '13

Thie patch fixes the segfault: error : nodeStateInitialize:658 : DBus not available, disabling HAL driver: internal error: Unable to get DBus system bus connection: Failed to connect to socket /var/run/dbus/system_bus_socket: No such file or directory error : nodeStateInitialize:719 : ?: Caught Segmentation violation dumping internal log buffer: This segfault occurs at the below VIR_ERROR: failure: if (dbus_error_is_set(&err)) { VIR_ERROR(_("%s: %s"), err.name, err.message); When virDBusGetSystemBus fails, the code jumps to the above failure path. However, the err variable is not correctly initialized before calling virDBusGetSystemBus. As a result, dbus_error_is_set may pass over the uninitialized err variable whose name or message may point to somewhere unknown memory region, which causes a segfault on VIR_ERROR. The new code initializes the err variable before calling virDBusGetSystemBus. Signed-off-by: Ryota Ozaki <ozaki.ryota(a)gmail.com> --- src/node_device/node_device_hal.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/node_device/node_device_hal.c b/src/node_device/node_device_hal.c index d94767c..a019a07 100644 --- a/src/node_device/node_device_hal.c +++ b/src/node_device/node_device_hal.c @@ -652,6 +652,7 @@ nodeStateInitialize(bool privileged ATTRIBUTE_UNUSED, } nodeDeviceLock(driverState); + dbus_error_init(&err); if (!(sysbus = virDBusGetSystemBus())) { virErrorPtr verr = virGetLastError(); VIR_ERROR(_("DBus not available, disabling HAL driver: %s"), @@ -660,7 +661,6 @@ nodeStateInitialize(bool privileged ATTRIBUTE_UNUSED, goto failure; } - dbus_error_init(&err); hal_ctx = libhal_ctx_new(); if (hal_ctx == NULL) { VIR_ERROR(_("libhal_ctx_new returned NULL")); -- 1.8.4

2 1

[libvirt] [PATCH] maint: update to latest gnulib
by Eric Blake 31 Oct '13

31 Oct '13

Since we haven't quite frozen yet, it's time to pick up some fixes. I know at least cygwin benefits from this update. * .gnulib: Update to latest, in part for cygwin compilation. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- Pushing under the gnulib rule. * .gnulib 4a5ee89...8f74258 (33): > Revert "error: make the module depend on vfprintf-posix" > maint.mk: fix "release" target to build _version > maint.mk: get current gnulib revision correctly. > install-reloc: Support multi-binary installation. > selinux-h: really build without selinux when library is missing > regex: also remove dependency on HAVE_WCSCOLL > xfreopen: fix typo: s/frepoen/freopen/ > regex: don't depend on wcscoll > error: add the printf attribute to a static function > error: make the module depend on vfprintf-posix > fpending, obstack, strerror-override: use pure+const function attrs > extern-inline: make safe for -Wundef usage > mkfifo-tests, etc.: allow HP-UX 11.11 bug > acl: allow cross-compilation to Gentoo > mgetgroups: remove dependency on realloc-gnu > regex-tests: port to HP-UX 11.11 > verify: document some 'assume' pitfalls > strtoumax: fix another typo in previous commit > strtoumax: fix typo in previous commit. > strtoumax: port to Solaris 8 > autoupdate > strtoimax, strtoumax: port to HP-UX 11.11 > strtoimax: port to HP-UX 11.11 > New module 'count-trailing-zeros'. > count-leading-zeros: port to MSC; support types wider than 64 bits > count-one-bits: port to MSC; support types wider than 64 bits > mountlist: fix resource leak with MOUNTED_INTERIX_STATVFS > tests: improve diagnostic when an assertion fails > verify: new macro 'assume' > autoupdate > dup2, dup3: work around another cygwin crasher > getdtablesize: work around cygwin issue > pmccabe2html: escaping of special characters .gnulib | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gnulib b/.gnulib index 4a5ee89..8f74258 160000 --- a/.gnulib +++ b/.gnulib @@ -1 +1 @@ -Subproject commit 4a5ee89c8a8be7350a8fd8ca1bacb196a190e492 +Subproject commit 8f7425866463f994538584d1dd7211603b8b0550 -- 1.8.3.1

2 4

[libvirt] [PATCH] Fix race condition reconnecting to vms & loading configs
by Daniel P. Berrange 31 Oct '13

31 Oct '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> The following sequence 1. Define a persistent QMEU guest 2. Start the QEMU guest 3. Stop libvirtd 4. Kill the QEMU process 5. Start libvirtd 6. List persistent guets At the last step, the previously running persistent guest will be missing. This is because of a race condition in the QEMU driver startup code. It does 1. Load all VM state files 2. Spawn thread to reconnect to each VM 3. Load all VM config files Only at the end of step 3, does the 'virDomainObjPtr' get marked as "persistent". There is therefore a window where the thread reconnecting to the VM will remove the persistent VM from the list. The easy fix is to simply switch the order of steps 2 & 3. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- src/qemu/qemu_driver.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index c613967..9c3daad 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -816,8 +816,6 @@ qemuStateInitialize(bool privileged, conn = virConnectOpen(cfg->uri); - qemuProcessReconnectAll(conn, qemu_driver); - /* Then inactive persistent configs */ if (virDomainObjListLoadAllConfigs(qemu_driver->domains, cfg->configDir, @@ -828,6 +826,7 @@ qemuStateInitialize(bool privileged, NULL, NULL) < 0) goto error; + qemuProcessReconnectAll(conn, qemu_driver); virDomainObjListForEach(qemu_driver->domains, qemuDomainSnapshotLoad, -- 1.8.3.1

3 12

[libvirt] [libvirt-glib][PATCH V3] Add filterref and filterref parameter support.
by Ian Main 31 Oct '13

31 Oct '13

This patch adds support for setting filterref's on interfaces. Also supported are parameters to the filterref's. V2: - alphabetical orderized (don't look it up!) Makefile.am - s/set_filter/set_name/ s/get_filter/get_name/ - remove trailing whitespace. - fix missing line. - add return_val_if_fail check. - moved qcow fix in demo to a new patch. - fixed new_from_xml(). V3: - added g_debug in add_filterref_parameter(); - more fixing new_from_xml(). - orderized (I like this word now) libvirt-gconfig.h includes. Signed-off-by: Ian Main <imain(a)redhat.com> --- examples/config-demo.py | 7 + libvirt-gconfig/Makefile.am | 4 + ...-gconfig-domain-interface-filterref-parameter.c | 101 +++++++++++++ ...-gconfig-domain-interface-filterref-parameter.h | 75 ++++++++++ .../libvirt-gconfig-domain-interface-filterref.c | 159 +++++++++++++++++++++ .../libvirt-gconfig-domain-interface-filterref.h | 76 ++++++++++ libvirt-gconfig/libvirt-gconfig-domain-interface.c | 41 ++++++ libvirt-gconfig/libvirt-gconfig-domain-interface.h | 5 + libvirt-gconfig/libvirt-gconfig.h | 2 + libvirt-gconfig/libvirt-gconfig.sym | 18 +++ 10 files changed, 488 insertions(+) create mode 100644 libvirt-gconfig/libvirt-gconfig-domain-interface-filterref-parameter.c create mode 100644 libvirt-gconfig/libvirt-gconfig-domain-interface-filterref-parameter.h create mode 100644 libvirt-gconfig/libvirt-gconfig-domain-interface-filterref.c create mode 100644 libvirt-gconfig/libvirt-gconfig-domain-interface-filterref.h diff --git a/examples/config-demo.py b/examples/config-demo.py index 09b9e89..367d99a 100644 --- a/examples/config-demo.py +++ b/examples/config-demo.py @@ -35,6 +35,13 @@ domain.add_device(disk) interface = LibvirtGConfig.DomainInterfaceNetwork.new() interface.set_source("default") +filterref = LibvirtGConfig.DomainInterfaceFilterref.new() +filterref.set_name("clean-traffic") +parameter = LibvirtGConfig.DomainInterfaceFilterrefParameter.new() +parameter.set_name("IP") +parameter.set_value("205.23.12.40") +filterref.add_parameter(parameter) +interface.set_filterref(filterref) domain.add_device(interface) interface = LibvirtGConfig.DomainInterfaceUser.new() diff --git a/libvirt-gconfig/Makefile.am b/libvirt-gconfig/Makefile.am index 35dc978..0793da1 100644 --- a/libvirt-gconfig/Makefile.am +++ b/libvirt-gconfig/Makefile.am @@ -47,6 +47,8 @@ GCONFIG_HEADER_FILES = \ libvirt-gconfig-domain-input.h \ libvirt-gconfig-domain-interface.h \ libvirt-gconfig-domain-interface-bridge.h \ + libvirt-gconfig-domain-interface-filterref.h \ + libvirt-gconfig-domain-interface-filterref-parameter.h \ libvirt-gconfig-domain-interface-network.h \ libvirt-gconfig-domain-interface-user.h \ libvirt-gconfig-domain-memballoon.h \ @@ -129,6 +131,8 @@ GCONFIG_SOURCE_FILES = \ libvirt-gconfig-domain-input.c \ libvirt-gconfig-domain-interface.c \ libvirt-gconfig-domain-interface-bridge.c \ + libvirt-gconfig-domain-interface-filterref.c \ + libvirt-gconfig-domain-interface-filterref-parameter.c \ libvirt-gconfig-domain-interface-network.c \ libvirt-gconfig-domain-interface-user.c \ libvirt-gconfig-domain-memballoon.c \ diff --git a/libvirt-gconfig/libvirt-gconfig-domain-interface-filterref-parameter.c b/libvirt-gconfig/libvirt-gconfig-domain-interface-filterref-parameter.c new file mode 100644 index 0000000..e697e86 --- /dev/null +++ b/libvirt-gconfig/libvirt-gconfig-domain-interface-filterref-parameter.c @@ -0,0 +1,101 @@ +/* + * libvirt-gconfig-domain-interface-filterref-parameter.c: + * libvirt filterref parameters + * + * Copyright (C) 2013 Red Hat, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library. If not, see + * <http://www.gnu.org/licenses/>. + * + * Authors: Ian Main <imain(a)redhat.com> + * Daniel P. Berrange <berrange(a)redhat.com> + */ + +#include <config.h> + +#include "libvirt-gconfig/libvirt-gconfig.h" +#include "libvirt-gconfig/libvirt-gconfig-private.h" + +#define GVIR_CONFIG_DOMAIN_INTERFACE_FILTERREF_PARAMETER_GET_PRIVATE(obj) \ + (G_TYPE_INSTANCE_GET_PRIVATE((obj), GVIR_CONFIG_TYPE_DOMAIN_INTERFACE_FILTERREF_PARAMETER, GVirConfigDomainInterfaceFilterrefParameterPrivate)) + +struct _GVirConfigDomainInterfaceFilterrefParameterPrivate +{ + gboolean unused; +}; + +G_DEFINE_TYPE(GVirConfigDomainInterfaceFilterrefParameter, gvir_config_domain_interface_filterref_parameter, GVIR_CONFIG_TYPE_OBJECT); + +static void gvir_config_domain_interface_filterref_parameter_class_init(GVirConfigDomainInterfaceFilterrefParameterClass *klass) +{ + g_type_class_add_private(klass, sizeof(GVirConfigDomainInterfaceFilterrefParameterPrivate)); +} + +static void gvir_config_domain_interface_filterref_parameter_init(GVirConfigDomainInterfaceFilterrefParameter *parameter) +{ + g_debug("Init GVirConfigDomainInterfaceFilterrefParameter=%p", parameter); + + parameter->priv = GVIR_CONFIG_DOMAIN_INTERFACE_FILTERREF_PARAMETER_GET_PRIVATE(parameter); +} + +GVirConfigDomainInterfaceFilterrefParameter *gvir_config_domain_interface_filterref_parameter_new(void) +{ + GVirConfigObject *object; + + object = gvir_config_object_new(GVIR_CONFIG_TYPE_DOMAIN_INTERFACE_FILTERREF_PARAMETER, + "parameter", NULL); + return GVIR_CONFIG_DOMAIN_INTERFACE_FILTERREF_PARAMETER(object); +} + +GVirConfigDomainInterfaceFilterrefParameter * +gvir_config_domain_interface_filterref_parameter_new_from_xml(const gchar *xml, GError **error) +{ + GVirConfigObject *object; + + object = gvir_config_object_new_from_xml(GVIR_CONFIG_TYPE_DOMAIN_INTERFACE_FILTERREF_PARAMETER, + "parameter", + NULL, + xml, + error); + + return GVIR_CONFIG_DOMAIN_INTERFACE_FILTERREF_PARAMETER(object); +} + +void gvir_config_domain_interface_filterref_parameter_set_name(GVirConfigDomainInterfaceFilterrefParameter *parameter, const gchar *name) +{ + g_return_if_fail(GVIR_CONFIG_IS_DOMAIN_INTERFACE_FILTERREF_PARAMETER(parameter)); + gvir_config_object_set_attribute(GVIR_CONFIG_OBJECT(parameter), + "name", name, NULL); +} + +void gvir_config_domain_interface_filterref_parameter_set_value(GVirConfigDomainInterfaceFilterrefParameter *parameter, const gchar *value) +{ + g_return_if_fail(GVIR_CONFIG_IS_DOMAIN_INTERFACE_FILTERREF_PARAMETER(parameter)); + gvir_config_object_set_attribute(GVIR_CONFIG_OBJECT(parameter), + "value", value, NULL); +} + +const gchar *gvir_config_domain_interface_filterref_parameter_get_name(GVirConfigDomainInterfaceFilterrefParameter *parameter) +{ + return gvir_config_object_get_attribute(GVIR_CONFIG_OBJECT(parameter), + NULL, + "name"); +} +const gchar *gvir_config_domain_interface_filterref_parameter_get_value(GVirConfigDomainInterfaceFilterrefParameter *parameter) +{ + return gvir_config_object_get_attribute(GVIR_CONFIG_OBJECT(parameter), + NULL, + "value"); +} + diff --git a/libvirt-gconfig/libvirt-gconfig-domain-interface-filterref-parameter.h b/libvirt-gconfig/libvirt-gconfig-domain-interface-filterref-parameter.h new file mode 100644 index 0000000..a768c84 --- /dev/null +++ b/libvirt-gconfig/libvirt-gconfig-domain-interface-filterref-parameter.h @@ -0,0 +1,75 @@ +/* + * libvirt-gconfig-domain-interface-filterref-parameter.h: + * libvirt filterref parameters + * + * Copyright (C) 2013 Red Hat, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library. If not, see + * <http://www.gnu.org/licenses/>. + * + * Authors: Ian Main <imain(a)redhat.com> + * Daniel P. Berrange <berrange(a)redhat.com> + */ + +#if !defined(__LIBVIRT_GCONFIG_H__) && !defined(LIBVIRT_GCONFIG_BUILD) +#error "Only <libvirt-gconfig/libvirt-gconfig.h> can be included directly." +#endif + +#ifndef __LIBVIRT_GCONFIG_DOMAIN_INTERFACE_FILTERREF_PARAMETER_H__ +#define __LIBVIRT_GCONFIG_DOMAIN_INTERFACE_FILTERREF_PARAMETER_H__ + +G_BEGIN_DECLS + +#define GVIR_CONFIG_TYPE_DOMAIN_INTERFACE_FILTERREF_PARAMETER (gvir_config_domain_interface_filterref_parameter_get_type ()) +#define GVIR_CONFIG_DOMAIN_INTERFACE_FILTERREF_PARAMETER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GVIR_CONFIG_TYPE_DOMAIN_INTERFACE_FILTERREF_PARAMETER, GVirConfigDomainInterfaceFilterrefParameter)) +#define GVIR_CONFIG_DOMAIN_INTERFACE_FILTERREF_PARAMETER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GVIR_CONFIG_TYPE_DOMAIN_INTERFACE_FILTERREF_PARAMETER, GVirConfigDomainInterfaceFilterrefParameterClass)) +#define GVIR_CONFIG_IS_DOMAIN_INTERFACE_FILTERREF_PARAMETER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GVIR_CONFIG_TYPE_DOMAIN_INTERFACE_FILTERREF_PARAMETER)) +#define GVIR_CONFIG_IS_DOMAIN_INTERFACE_FILTERREF_PARAMETER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GVIR_CONFIG_TYPE_DOMAIN_INTERFACE_FILTERREF_PARAMETER)) +#define GVIR_CONFIG_DOMAIN_INTERFACE_FILTERREF_PARAMETER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GVIR_CONFIG_TYPE_DOMAIN_INTERFACE_FILTERREF_PARAMETER, GVirConfigDomainInterfaceFilterrefParameterClass)) + +typedef struct _GVirConfigDomainInterfaceFilterrefParameter GVirConfigDomainInterfaceFilterrefParameter; +typedef struct _GVirConfigDomainInterfaceFilterrefParameterPrivate GVirConfigDomainInterfaceFilterrefParameterPrivate; +typedef struct _GVirConfigDomainInterfaceFilterrefParameterClass GVirConfigDomainInterfaceFilterrefParameterClass; + +struct _GVirConfigDomainInterfaceFilterrefParameter +{ + GVirConfigObject parent; + + GVirConfigDomainInterfaceFilterrefParameterPrivate *priv; + + /* Do not add fields to this struct */ +}; + +struct _GVirConfigDomainInterfaceFilterrefParameterClass +{ + GVirConfigObjectClass parent_class; + + gpointer padding[20]; +}; + +GType gvir_config_domain_interface_filterref_parameter_get_type(void); + +GVirConfigDomainInterfaceFilterrefParameter *gvir_config_domain_interface_filterref_parameter_new(void); + +GVirConfigDomainInterfaceFilterrefParameter * +gvir_config_domain_interface_filterref_parameter_new_from_xml(const gchar *xml, GError **error); + +void gvir_config_domain_interface_filterref_parameter_set_name(GVirConfigDomainInterfaceFilterrefParameter *parameter, const gchar *name); +void gvir_config_domain_interface_filterref_parameter_set_value(GVirConfigDomainInterfaceFilterrefParameter *parameter, const gchar *value); +const gchar *gvir_config_domain_interface_filterref_parameter_get_name(GVirConfigDomainInterfaceFilterrefParameter *parameter); +const gchar *gvir_config_domain_interface_filterref_parameter_get_value(GVirConfigDomainInterfaceFilterrefParameter *parameter); + +G_END_DECLS + +#endif /* __LIBVIRT_GCONFIG_DOMAIN_INTERFACE_FILTERREF_PARAMETER_H__ */ diff --git a/libvirt-gconfig/libvirt-gconfig-domain-interface-filterref.c b/libvirt-gconfig/libvirt-gconfig-domain-interface-filterref.c new file mode 100644 index 0000000..c192249 --- /dev/null +++ b/libvirt-gconfig/libvirt-gconfig-domain-interface-filterref.c @@ -0,0 +1,159 @@ +/* + * libvirt-gconfig-domain-interface-network-filterref.c: + * libvirt filter reference config. + * + * Copyright (C) 2013 Red Hat, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library. If not, see + * <http://www.gnu.org/licenses/>. + * + * Author: Ian Main <imain(a)redhat.com> + */ + +#include <config.h> + +#include "libvirt-gconfig/libvirt-gconfig.h" +#include "libvirt-gconfig/libvirt-gconfig-private.h" + +#define GVIR_CONFIG_DOMAIN_INTERFACE_FILTERREF_GET_PRIVATE(obj) \ + (G_TYPE_INSTANCE_GET_PRIVATE((obj), GVIR_CONFIG_TYPE_DOMAIN_INTERFACE_FILTERREF, GVirConfigDomainInterfaceFilterrefPrivate)) + +struct _GVirConfigDomainInterfaceFilterrefPrivate +{ + gboolean unused; +}; + +G_DEFINE_TYPE(GVirConfigDomainInterfaceFilterref, gvir_config_domain_interface_filterref, GVIR_CONFIG_TYPE_OBJECT); + +static void gvir_config_domain_interface_filterref_class_init(GVirConfigDomainInterfaceFilterrefClass *klass) +{ + g_type_class_add_private(klass, sizeof(GVirConfigDomainInterfaceFilterrefPrivate)); +} + +static void gvir_config_domain_interface_filterref_init(GVirConfigDomainInterfaceFilterref *filterref) +{ + g_debug("Init GVirConfigDomainInterfaceFilterref=%p", filterref); + + filterref->priv = GVIR_CONFIG_DOMAIN_INTERFACE_FILTERREF_GET_PRIVATE(filterref); +} + + +GVirConfigDomainInterfaceFilterref *gvir_config_domain_interface_filterref_new(void) +{ + GVirConfigObject *object; + + object = gvir_config_object_new(GVIR_CONFIG_TYPE_DOMAIN_INTERFACE_FILTERREF, + "filterref", NULL); + return GVIR_CONFIG_DOMAIN_INTERFACE_FILTERREF(object); +} + +GVirConfigDomainInterfaceFilterref *gvir_config_domain_interface_filterref_new_from_xml(const gchar *xml, + GError **error) +{ + GVirConfigObject *object; + + object = gvir_config_object_new_from_xml(GVIR_CONFIG_TYPE_DOMAIN_INTERFACE_FILTERREF, + "filterref", NULL, xml, error); + if (gvir_config_object_get_attribute(object, NULL, "filter") == NULL) { + g_object_unref(G_OBJECT(object)); + return NULL; + } + return GVIR_CONFIG_DOMAIN_INTERFACE_FILTERREF(object); +} + +void gvir_config_domain_interface_filterref_set_name(GVirConfigDomainInterfaceFilterref *filterref, + const char *filter) +{ + g_return_if_fail(GVIR_CONFIG_IS_DOMAIN_INTERFACE_FILTERREF(filterref)); + + gvir_config_object_set_attribute(GVIR_CONFIG_OBJECT(filterref), + "filter", filter, NULL); +} + +const char *gvir_config_domain_interface_filterref_get_name(GVirConfigDomainInterfaceFilterref *filterref) +{ + g_return_val_if_fail(GVIR_CONFIG_IS_DOMAIN_INTERFACE_FILTERREF(filterref), NULL); + return gvir_config_object_get_attribute(GVIR_CONFIG_OBJECT(filterref), + NULL, + "filter"); +} + +void gvir_config_domain_interface_filterref_add_parameter(GVirConfigDomainInterfaceFilterref *filterref, + GVirConfigDomainInterfaceFilterrefParameter *parameter) +{ + g_return_if_fail(GVIR_CONFIG_IS_DOMAIN_INTERFACE_FILTERREF(filterref)); + g_return_if_fail(GVIR_CONFIG_IS_DOMAIN_INTERFACE_FILTERREF_PARAMETER(parameter)); + + gvir_config_object_attach_add(GVIR_CONFIG_OBJECT(filterref), + GVIR_CONFIG_OBJECT(parameter)); +} + +struct GetParameterData { + GVirConfigXmlDoc *doc; + GList *parameters; +}; + + +static gboolean add_filterref_parameter(xmlNodePtr node, gpointer opaque) +{ + struct GetParameterData* data = (struct GetParameterData*)opaque; + GVirConfigObject *parameter; + + if (g_strcmp0((const gchar *)node->name, "parameter") != 0) { + g_debug("unexpected node %s", node->name); + return TRUE; + } + + parameter = gvir_config_object_new_from_tree(GVIR_CONFIG_TYPE_DOMAIN_INTERFACE_FILTERREF_PARAMETER, + data->doc, NULL, node); + if (parameter != NULL) + data->parameters = g_list_append(data->parameters, parameter); + else + g_debug("Failed to parse %s node", node->name); + + return TRUE; +} + +/** + * gvir_config_domain_interface_filterref_get_parameters: + * @filterref: a #GVirConfigDomainInterfaceFilterref + * + * Gets the list of parameters attached to @filterref. The returned list should be + * freed with g_list_free(), after its elements have been unreffed with + * g_object_unref(). + * + * Returns: (element-type LibvirtGConfig.DomainInterfaceFilterrefParameter) (transfer full): + * a newly allocated #GList of #GVirConfigDomainInterfaceFilterrefParameter. + */ +GList *gvir_config_domain_interface_filterref_get_parameters(GVirConfigDomainInterfaceFilterref *filterref) +{ + struct GetParameterData data; + + g_return_val_if_fail(GVIR_CONFIG_IS_DOMAIN_INTERFACE_FILTERREF(filterref), NULL); + + g_object_get(G_OBJECT(filterref), "doc", &data.doc, NULL); + data.parameters = NULL; + + gvir_config_object_foreach_child(GVIR_CONFIG_OBJECT(filterref), + NULL, + add_filterref_parameter, + &data); + + if (data.doc != NULL) { + g_object_unref(G_OBJECT(data.doc)); + } + + return data.parameters; +} + diff --git a/libvirt-gconfig/libvirt-gconfig-domain-interface-filterref.h b/libvirt-gconfig/libvirt-gconfig-domain-interface-filterref.h new file mode 100644 index 0000000..4a2bfd4 --- /dev/null +++ b/libvirt-gconfig/libvirt-gconfig-domain-interface-filterref.h @@ -0,0 +1,76 @@ +/* + * libvirt-gconfig-domain-interface-network-filterref.h: libvirt filter reference config + * + * Copyright (C) 2013 Red Hat, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library. If not, see + * <http://www.gnu.org/licenses/>. + * + * Author: Ian Main <imain(a)redhat.com> + */ + +#if !defined(__LIBVIRT_GCONFIG_H__) && !defined(LIBVIRT_GCONFIG_BUILD) +#error "Only <libvirt-gconfig/libvirt-gconfig.h> can be included directly." +#endif + +#ifndef __LIBVIRT_GCONFIG_DOMAIN_INTERFACE_FILTERREF_H__ +#define __LIBVIRT_GCONFIG_DOMAIN_INTERFACE_FILTERREF_H__ + +G_BEGIN_DECLS + +#define GVIR_CONFIG_TYPE_DOMAIN_INTERFACE_FILTERREF (gvir_config_domain_interface_filterref_get_type ()) +#define GVIR_CONFIG_DOMAIN_INTERFACE_FILTERREF(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GVIR_CONFIG_TYPE_DOMAIN_INTERFACE_FILTERREF, GVirConfigDomainInterfaceFilterref)) +#define GVIR_CONFIG_DOMAIN_INTERFACE_FILTERREF_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GVIR_CONFIG_TYPE_DOMAIN_INTERFACE_FILTERREF, GVirConfigDomainInterfaceFilterrefClass)) +#define GVIR_CONFIG_IS_DOMAIN_INTERFACE_FILTERREF(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GVIR_CONFIG_TYPE_DOMAIN_INTERFACE_FILTERREF)) +#define GVIR_CONFIG_IS_DOMAIN_INTERFACE_FILTERREF_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GVIR_CONFIG_TYPE_DOMAIN_INTERFACE_FILTERREF)) +#define GVIR_CONFIG_DOMAIN_INTERFACE_FILTERREF_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GVIR_CONFIG_TYPE_DOMAIN_INTERFACE_FILTERREF, GVirConfigDomainInterfaceFilterrefClass)) + +typedef struct _GVirConfigDomainInterfaceFilterref GVirConfigDomainInterfaceFilterref; +typedef struct _GVirConfigDomainInterfaceFilterrefPrivate GVirConfigDomainInterfaceFilterrefPrivate; +typedef struct _GVirConfigDomainInterfaceFilterrefClass GVirConfigDomainInterfaceFilterrefClass; + +struct _GVirConfigDomainInterfaceFilterref +{ + GVirConfigObject parent; + + GVirConfigDomainInterfaceFilterrefPrivate *priv; + + /* Do not add fields to this struct */ +}; + +struct _GVirConfigDomainInterfaceFilterrefClass +{ + GVirConfigObjectClass parent_class; + + gpointer padding[20]; +}; + +GType gvir_config_domain_interface_filterref_get_type(void); + +GVirConfigDomainInterfaceFilterref *gvir_config_domain_interface_filterref_new(void); + +GVirConfigDomainInterfaceFilterref * +gvir_config_domain_interface_filterref_new_from_xml(const gchar *xml, GError **error); + +void gvir_config_domain_interface_filterref_set_name(GVirConfigDomainInterfaceFilterref *filterref, + const char *filter); +const char *gvir_config_domain_interface_filterref_get_name(GVirConfigDomainInterfaceFilterref *filterref); + +void gvir_config_domain_interface_filterref_add_parameter(GVirConfigDomainInterfaceFilterref *filterref, + GVirConfigDomainInterfaceFilterrefParameter *parameter); +GList *gvir_config_domain_interface_filterref_get_parameters(GVirConfigDomainInterfaceFilterref *filterref); + +G_END_DECLS + +#endif /* __LIBVIRT_GCONFIG_DOMAIN_INTERFACE_FILTERREF_H__ */ diff --git a/libvirt-gconfig/libvirt-gconfig-domain-interface.c b/libvirt-gconfig/libvirt-gconfig-domain-interface.c index 86a0c34..ce1b3f0 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-interface.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-interface.c @@ -131,6 +131,47 @@ const char *gvir_config_domain_interface_get_model(GVirConfigDomainInterface *in "model", "type"); } +/** + * gvir_config_domain_interface_set_filterref: + * @interface: a #GVirConfigDomainInterface + * @filterref: (allow-none): the filterref to set + */ +void gvir_config_domain_interface_set_filterref(GVirConfigDomainInterface *interface, + GVirConfigDomainInterfaceFilterref *filterref) +{ + g_return_if_fail(GVIR_CONFIG_IS_DOMAIN_INTERFACE(interface)); + g_return_if_fail(filterref == NULL || GVIR_CONFIG_IS_DOMAIN_INTERFACE_FILTERREF(filterref)); + + gvir_config_object_attach_replace(GVIR_CONFIG_OBJECT(interface), + "filterref", + GVIR_CONFIG_OBJECT(filterref)); +} + +/** + * gvir_config_domain_interface_get_filterref: + * @interface: a #GVirConfigDomainInterface + * + * Gets the filterref associated with the @interface + * + * Returns: (transfer full): A #GVirConfigDomainInterfaceFilterref. The returned + * object should be unreffed with g_object_unref() when no longer needed. + */ + +GVirConfigDomainInterfaceFilterref *gvir_config_domain_interface_get_filterref(GVirConfigDomainInterface *interface) +{ + GVirConfigObject *object; + + g_return_val_if_fail(GVIR_CONFIG_IS_DOMAIN_INTERFACE(interface), NULL); + + object = gvir_config_object_get_child_with_type + (GVIR_CONFIG_OBJECT(interface), + "filterref", + GVIR_CONFIG_TYPE_DOMAIN_INTERFACE_FILTERREF); + + return GVIR_CONFIG_DOMAIN_INTERFACE_FILTERREF(object); +} + + G_GNUC_INTERNAL GVirConfigDomainDevice * gvir_config_domain_interface_new_from_tree(GVirConfigXmlDoc *doc, xmlNodePtr tree) diff --git a/libvirt-gconfig/libvirt-gconfig-domain-interface.h b/libvirt-gconfig/libvirt-gconfig-domain-interface.h index 65c5d0b..2b0c22f 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-interface.h +++ b/libvirt-gconfig/libvirt-gconfig-domain-interface.h @@ -27,6 +27,8 @@ #ifndef __LIBVIRT_GCONFIG_DOMAIN_INTERFACE_H__ #define __LIBVIRT_GCONFIG_DOMAIN_INTERFACE_H__ +#include <libvirt-gconfig/libvirt-gconfig-domain-interface-filterref.h> + G_BEGIN_DECLS #define GVIR_CONFIG_TYPE_DOMAIN_INTERFACE (gvir_config_domain_interface_get_type ()) @@ -76,6 +78,9 @@ const char *gvir_config_domain_interface_get_ifname(GVirConfigDomainInterface *i GVirConfigDomainInterfaceLinkState gvir_config_domain_interface_get_link_state(GVirConfigDomainInterface *interface); const char *gvir_config_domain_interface_get_mac(GVirConfigDomainInterface *interface); const char *gvir_config_domain_interface_get_model(GVirConfigDomainInterface *interface); +void gvir_config_domain_interface_set_filterref(GVirConfigDomainInterface *interface, + GVirConfigDomainInterfaceFilterref *filterref); +GVirConfigDomainInterfaceFilterref *gvir_config_domain_interface_get_filterref(GVirConfigDomainInterface *interface); G_END_DECLS diff --git a/libvirt-gconfig/libvirt-gconfig.h b/libvirt-gconfig/libvirt-gconfig.h index 03e8ce7..af80241 100644 --- a/libvirt-gconfig/libvirt-gconfig.h +++ b/libvirt-gconfig/libvirt-gconfig.h @@ -64,6 +64,8 @@ #include <libvirt-gconfig/libvirt-gconfig-domain-input.h> #include <libvirt-gconfig/libvirt-gconfig-domain-interface.h> #include <libvirt-gconfig/libvirt-gconfig-domain-interface-bridge.h> +#include <libvirt-gconfig/libvirt-gconfig-domain-interface-filterref-parameter.h> +#include <libvirt-gconfig/libvirt-gconfig-domain-interface-filterref.h> #include <libvirt-gconfig/libvirt-gconfig-domain-interface-network.h> #include <libvirt-gconfig/libvirt-gconfig-domain-interface-user.h> #include <libvirt-gconfig/libvirt-gconfig-domain-memballoon.h> diff --git a/libvirt-gconfig/libvirt-gconfig.sym b/libvirt-gconfig/libvirt-gconfig.sym index 72eafc1..a5f8b05 100644 --- a/libvirt-gconfig/libvirt-gconfig.sym +++ b/libvirt-gconfig/libvirt-gconfig.sym @@ -608,6 +608,24 @@ global: gvir_config_domain_graphics_rdp_set_replace_user; gvir_config_object_new_from_xml; + + gvir_config_domain_interface_set_filterref; + gvir_config_domain_interface_get_filterref; + + gvir_config_domain_interface_filterref_get_type; + gvir_config_domain_interface_filterref_new; + gvir_config_domain_interface_filterref_new_from_xml; + gvir_config_domain_interface_filterref_set_name; + gvir_config_domain_interface_filterref_get_name; + gvir_config_domain_interface_filterref_add_parameter; + gvir_config_domain_interface_filterref_get_parameters; + gvir_config_domain_interface_filterref_parameter_get_type; + gvir_config_domain_interface_filterref_parameter_new; + gvir_config_domain_interface_filterref_parameter_new_from_xml; + gvir_config_domain_interface_filterref_parameter_set_name; + gvir_config_domain_interface_filterref_parameter_set_value; + gvir_config_domain_interface_filterref_parameter_get_name; + gvir_config_domain_interface_filterref_parameter_get_value; } LIBVIRT_GCONFIG_0.1.7; # .... define new API here using predicted next version number .... -- 1.8.1.4

2 3

[libvirt] [PATCH] Improve debugging of job enter/exit code
by Daniel P. Berrange 31 Oct '13

31 Oct '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> In debugging a recent oVirt/libvirt race condition, I was very frustrated by lack of logging in the job enter/exit code. This patch adds some key data which would have been useful in by debugging attempts. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- src/qemu/qemu_domain.c | 45 +++++++++++++++++++++++++++++++++++---------- 1 file changed, 35 insertions(+), 10 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index b8aec2d..81d0ba9 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -1014,6 +1014,12 @@ qemuDomainObjBeginJobInternal(virQEMUDriverPtr driver, bool nested = job == QEMU_JOB_ASYNC_NESTED; virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver); + VIR_DEBUG("Starting %s: %s (async=%s vm=%p name=%s)", + job == QEMU_JOB_ASYNC ? "async job" : "job", + qemuDomainJobTypeToString(job), + qemuDomainAsyncJobTypeToString(priv->job.asyncJob), + obj, obj->def->name); + priv->jobs_queued++; if (virTimeMillisNow(&now) < 0) { @@ -1032,11 +1038,13 @@ retry: } while (!nested && !qemuDomainNestedJobAllowed(priv, job)) { + VIR_DEBUG("Waiting for async job (vm=%p name=%s)", obj, obj->def->name); if (virCondWaitUntil(&priv->job.asyncCond, &obj->parent.lock, then) < 0) goto error; } while (priv->job.active) { + VIR_DEBUG("Waiting for job (vm=%p name=%s)", obj, obj->def->name); if (virCondWaitUntil(&priv->job.cond, &obj->parent.lock, then) < 0) goto error; } @@ -1049,14 +1057,16 @@ retry: qemuDomainObjResetJob(priv); if (job != QEMU_JOB_ASYNC) { - VIR_DEBUG("Starting job: %s (async=%s)", + VIR_DEBUG("Started job: %s (async=%s vm=%p name=%s)", qemuDomainJobTypeToString(job), - qemuDomainAsyncJobTypeToString(priv->job.asyncJob)); + qemuDomainAsyncJobTypeToString(priv->job.asyncJob), + obj, obj->def->name); priv->job.active = job; priv->job.owner = virThreadSelfID(); } else { - VIR_DEBUG("Starting async job: %s", - qemuDomainAsyncJobTypeToString(asyncJob)); + VIR_DEBUG("Started async job: %s (vm=%p name=%s)", + qemuDomainAsyncJobTypeToString(asyncJob), + obj, obj->def->name); qemuDomainObjResetAsyncJob(priv); priv->job.asyncJob = asyncJob; priv->job.asyncOwner = virThreadSelfID(); @@ -1161,9 +1171,10 @@ bool qemuDomainObjEndJob(virQEMUDriverPtr driver, virDomainObjPtr obj) priv->jobs_queued--; - VIR_DEBUG("Stopping job: %s (async=%s)", + VIR_DEBUG("Stopping job: %s (async=%s vm=%p name=%s)", qemuDomainJobTypeToString(job), - qemuDomainAsyncJobTypeToString(priv->job.asyncJob)); + qemuDomainAsyncJobTypeToString(priv->job.asyncJob), + obj, obj->def->name); qemuDomainObjResetJob(priv); if (qemuDomainTrackJob(job)) @@ -1180,8 +1191,9 @@ qemuDomainObjEndAsyncJob(virQEMUDriverPtr driver, virDomainObjPtr obj) priv->jobs_queued--; - VIR_DEBUG("Stopping async job: %s", - qemuDomainAsyncJobTypeToString(priv->job.asyncJob)); + VIR_DEBUG("Stopping async job: %s (vm=%p name=%s)", + qemuDomainAsyncJobTypeToString(priv->job.asyncJob), + obj, obj->def->name); qemuDomainObjResetAsyncJob(priv); qemuDomainObjSaveJob(driver, obj); @@ -1195,8 +1207,9 @@ qemuDomainObjAbortAsyncJob(virDomainObjPtr obj) { qemuDomainObjPrivatePtr priv = obj->privateData; - VIR_DEBUG("Requesting abort of async job: %s", - qemuDomainAsyncJobTypeToString(priv->job.asyncJob)); + VIR_DEBUG("Requesting abort of async job: %s (vm=%p name=%s)", + qemuDomainAsyncJobTypeToString(priv->job.asyncJob), + obj, obj->def->name); priv->job.asyncAbort = true; } @@ -1232,6 +1245,8 @@ qemuDomainObjEnterMonitorInternal(virQEMUDriverPtr driver, " monitor without asking for a nested job is dangerous"); } + VIR_DEBUG("Entering monitor (mon=%p vm=%p name=%s)", + priv->mon, obj, obj->def->name); virObjectLock(priv->mon); virObjectRef(priv->mon); ignore_value(virTimeMillisNow(&priv->monStart)); @@ -1253,6 +1268,8 @@ qemuDomainObjExitMonitorInternal(virQEMUDriverPtr driver, virObjectUnlock(priv->mon); virObjectLock(obj); + VIR_DEBUG("Exited monitor (mon=%p vm=%p name=%s)", + priv->mon, obj, obj->def->name); priv->monStart = 0; if (!hasRefs) @@ -1321,6 +1338,8 @@ qemuDomainObjEnterAgent(virDomainObjPtr obj) { qemuDomainObjPrivatePtr priv = obj->privateData; + VIR_DEBUG("Entering agent (agent=%p vm=%p name=%s)", + priv->agent, obj, obj->def->name); virObjectLock(priv->agent); virObjectRef(priv->agent); ignore_value(virTimeMillisNow(&priv->agentStart)); @@ -1344,6 +1363,8 @@ qemuDomainObjExitAgent(virDomainObjPtr obj) virObjectUnlock(priv->agent); virObjectLock(obj); + VIR_DEBUG("Exited agent (agent=%p vm=%p name=%s)", + priv->agent, obj, obj->def->name); priv->agentStart = 0; if (!hasRefs) @@ -1352,6 +1373,8 @@ qemuDomainObjExitAgent(virDomainObjPtr obj) void qemuDomainObjEnterRemote(virDomainObjPtr obj) { + VIR_DEBUG("Entering remote (vm=%p name=%s)", + obj, obj->def->name); virObjectRef(obj); virObjectUnlock(obj); } @@ -1359,6 +1382,8 @@ void qemuDomainObjEnterRemote(virDomainObjPtr obj) void qemuDomainObjExitRemote(virDomainObjPtr obj) { virObjectLock(obj); + VIR_DEBUG("Exited remote (vm=%p name=%s)", + obj, obj->def->name); virObjectUnref(obj); } -- 1.8.3.1

2 1

[libvirt] [PATCH] Improve debugging of QEMU start/stop
by Daniel P. Berrange 31 Oct '13

31 Oct '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> Include reference of the VM object pointer and name in debug logs for QEMU start/stop functions. Also make sure we log the PID that we started, since it isn't available elsewhere in the logs. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- src/qemu/qemu_process.c | 33 ++++++++++++--------------------- 1 file changed, 12 insertions(+), 21 deletions(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index bdffdf8..dd7566b 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -3499,6 +3499,9 @@ int qemuProcessStart(virConnectPtr conn, virQEMUDriverConfigPtr cfg; virCapsPtr caps = NULL; + VIR_DEBUG("vm=%p name=%s id=%d pid=%d", + vm, vm->def->name, vm->def->id, vm->pid); + /* Okay, these are just internal flags, * but doesn't hurt to check */ virCheckFlags(VIR_QEMU_PROCESS_START_COLD | @@ -3845,23 +3848,11 @@ int qemuProcessStart(virConnectPtr conn, _("Domain %s didn't show up"), vm->def->name); ret = -1; } -#if 0 - } else if (ret == -2) { - /* - * XXX this is bogus. It isn't safe to set vm->pid = child - * because the child no longer exists. - */ - - /* The virCommand process that launches the daemon failed. Pending on - * when it failed (we can't determine for sure), there may be - * extra info in the domain log (if the hook failed for example). - * - * Pretend like things succeeded, and let 'WaitForMonitor' report - * the log contents for us. - */ - vm->pid = child; - ret = 0; -#endif + VIR_DEBUG("QEMU vm=%p name=%s running with pid=%llu", + vm, vm->def->name, (unsigned long long)vm->pid); + } else { + VIR_DEBUG("QEMU vm=%p name=%s failed to spawn", + vm, vm->def->name); } VIR_DEBUG("Writing early domain status to disk"); @@ -4085,8 +4076,8 @@ qemuProcessKill(virDomainObjPtr vm, unsigned int flags) { int ret; - VIR_DEBUG("vm=%s pid=%d flags=%x", - vm->def->name, vm->pid, flags); + VIR_DEBUG("vm=%p name=%s pid=%d flags=%x", + vm, vm->def->name, vm->pid, flags); if (!(flags & VIR_QEMU_PROCESS_KILL_NOCHECK)) { if (!virDomainObjIsActive(vm)) { @@ -4126,8 +4117,8 @@ void qemuProcessStop(virQEMUDriverPtr driver, char ebuf[1024]; virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver); - VIR_DEBUG("Shutting down VM '%s' pid=%d flags=%x", - vm->def->name, vm->pid, flags); + VIR_DEBUG("Shutting down vm=%p name=%s id=%d pid=%d flags=%x", + vm, vm->def->name, vm->def->id, vm->pid, flags); if (!virDomainObjIsActive(vm)) { VIR_DEBUG("VM '%s' not active", vm->def->name); -- 1.8.3.1

2 1

[libvirt] [PATCH] storage: use correct type for array count
by Eric Blake 31 Oct '13

31 Oct '13

Using size_t counts will let us use VIR_APPEND_ELEMENT and friends. * src/conf/storage_conf.h (_virStoragePoolObjList) (_virStorageVolDefList): Track list sizes with size_t. * src/storage/storage_backend_rbd.c (virStorageBackendRBDRefreshPool): Fix type fallout. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- src/conf/storage_conf.h | 4 ++-- src/storage/storage_backend_rbd.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/conf/storage_conf.h b/src/conf/storage_conf.h index 251e897..d13cb99 100644 --- a/src/conf/storage_conf.h +++ b/src/conf/storage_conf.h @@ -112,7 +112,7 @@ struct _virStorageVolDef { typedef struct _virStorageVolDefList virStorageVolDefList; typedef virStorageVolDefList *virStorageVolDefListPtr; struct _virStorageVolDefList { - unsigned int count; + size_t count; virStorageVolDefPtr *objs; }; @@ -341,7 +341,7 @@ struct _virStoragePoolObj { typedef struct _virStoragePoolObjList virStoragePoolObjList; typedef virStoragePoolObjList *virStoragePoolObjListPtr; struct _virStoragePoolObjList { - unsigned int count; + size_t count; virStoragePoolObjPtr *objs; }; diff --git a/src/storage/storage_backend_rbd.c b/src/storage/storage_backend_rbd.c index 4e18bf9..b7a41c2 100644 --- a/src/storage/storage_backend_rbd.c +++ b/src/storage/storage_backend_rbd.c @@ -381,7 +381,7 @@ static int virStorageBackendRBDRefreshPool(virConnectPtr conn, pool->volumes.objs[pool->volumes.count++] = vol; } - VIR_DEBUG("Found %d images in RBD pool %s", + VIR_DEBUG("Found %zu images in RBD pool %s", pool->volumes.count, pool->def->source.name); ret = 0; -- 1.8.3.1

2 2

[libvirt] QEMU 1.6 and drive discard parameter
by whitearchey 31 Oct '13

31 Oct '13

In QEMU 1.6 parameters of 'drive' option were removed: QemuOptsList qemu_drive_opts = { .name = "drive", .head = QTAILQ_HEAD_INITIALIZER(qemu_drive_opts.head), .desc = { /* * no elements => accept any params * validation will happen later */ { /* end of list */ } }, }; But libvirt still checks for QEMU_CAPS_DRIVE_DISCARD using QMP query-command-line-options: static struct virQEMUCapsCommandLineProps virQEMUCapsCommandLine[] = { { "machine", "mem-merge", QEMU_CAPS_MEM_MERGE }, { "drive", "discard", QEMU_CAPS_DRIVE_DISCARD }, { "realtime", "mlock", QEMU_CAPS_MLOCK }, }; ... qemuMonitorGetCommandLineOptionParameters(mon, virQEMUCapsCommandLine[i].option, &values) So, when I try to use discard option in domain xml I get this error: error : qemuBuildDriveStr:3986 : unsupported configuration: discard is not supported by this QEMU binary

3 3

Re: [libvirt] Unable to provision VM attaching it directly to a OVS bridge
by Lucas Brasilino 31 Oct '13

31 Oct '13

Moving this discussion from libvirt-users: Getting deeper and deeper :) $ egrep '^int vir*' util/virnetdevopenvswitch.c int virNetDevOpenvswitchAddPort(const char *brname, const char *ifname, int virNetDevOpenvswitchRemovePort(const char *brname ATTRIBUTE_UNUSED, const char *ifname) int virNetDevOpenvswitchGetMigrateData(char **migrate, const char *ifname) int virNetDevOpenvswitchSetMigrateData(char *migrate, const char *ifname) Libvirt by now basically support adding/removing port to a OVS bridge . Is there some planning on an OVS full support, like bridge creation/destroy, creating a VM attaching it to a OVS brige, etc, just like 'traditional' Linux bridge ? If so, Is anybody working on it ? regards Lucas Brasilino MSc Student @ Federal University of Pernambuco (UFPE) twitter: @lucas_brasilino 2013/10/29 Lucas Brasilino <lrbbs(a)cin.ufpe.br>: > Hi > > Getting deeper, the error is raised by 'virDomainCreateLinux()'. > Here comes the snippet of the XML argument passed to this call: > > (Pdb) print xmlDesc > <domain type='kvm'> > <name>vm2</name> > <uuid>3d713513-e8ee-994a-0eba-51128bd4b42e</uuid> > [...] > <interface type='bridge'> > <source bridge='databr0'/> > <mac address='00:00:00:00:00:03'/> > <model type='virtio'/> > </interface> > [...] > </domain> > > So libvirt network driver is surely trying to use 'databr0' as the > common Linux bridge implementation, not an Open vSwitch bridge. > > I tried to add an > > <virtualport='openvswitch'/> > > element in the XML created by virt-install and use 'virsh create' to > create it but > seems that libvirt's network driver does not support Open vSwitch when > creating VM's. > Is there some planning to support it ? > > Thanks! > > regards > Lucas Brasilino > MSc Student @ Federal University of Pernambuco (UFPE) > twitter: @lucas_brasilino > > 2013/10/28 Lucas Brasilino <lrbbs(a)cin.ufpe.br>: >> Reposting from virt-tools mailing list: >> >> Hi! >> >> I'm facing a problem that could be triggered by some lacking >> of support from libvirt on Open vSwitch (or could be my mistake). >> >> I have interests in researching on virtual networks and >> SDN. To keep things simple, I've decided to use libvirt/virt-tools to >> manage VM's since my focus is on the network, instead of using a >> full feature system like OpenStack. >> >> I'm quite new with libvirt/virt-tools, but I have a good experience with >> openvswitch and other virtualizations technologies (which I dropped in >> libvirt/kvm favor). >> >> I'm using Fedora 19 packages >> >> openvswitch (1.11.0-1.fc19.x86_64) >> libvirt (1.0.5.6-3.fc19.x86_64) >> virt-install (0.10.0-4.fc19.noarch) >> >> I've created an OVS bridge (databr0) outside libvirt, and then defined it >> inside libvirt with: >> >> <network> >> <name>databr0</name> >> <forward mode='bridge'/> >> <bridge name='databr0'/> >> <virtualport type='openvswitch'/> >> </network> >> >> And then 'net-autostart' and 'net-start' it with virsh. Now I've got: >> # virsh net-list >> Name State Autostart Persistent >> ---------------------------------------------------------- >> databr0 active yes yes >> >> When I try to provision an VM, if I use the virt-install option >> "--network=bridge:databr0,model=virtio,mac=00:00:00:00:00:03" >> I got the following error: >> >> # virt-install --connect qemu:///system --virt-type kvm --name vm2 >> --ram 768 --disk path=/home/lucas/local/vm/images/vm2.img --vnc >> --cdrom /home/lucas/local/vm/fc19-x86_64.iso >> --network=bridge:databr0,model=virtio,mac=00:00:00:00:00:03 >> --os-type=linux --os-variant fedora19 >> >> Starting install... >> ERROR Unable to add bridge databr0 port vnet0: Operation not supported >> Domain installation does not appear to have been successful. >> If it was, you can restart your domain by running: >> virsh --connect qemu:///system start vm2 >> otherwise, please restart your installation. >> >> I just managed to create a VM when I use '--nonetworks' option and after >> I do a 'virtsh edit vm2' and add: >> >> <interface type='bridge'> >> <mac address='00:00:00:00:00:03'/> >> <source bridge='databr0'/> >> <virtualport type='openvswitch'/> >> <model type='virtio'/> >> <address type='pci' domain='0x0000' bus='0x00' slot='0x05' >> function='0x0'/> >> </interface> >> >> Well, I read elsewhere that openvswitch bridging isn't fully >> supported. Is it the case or I'm facing another kind of problem ? >> >> regards >> >> Att >> Lucas Brasilino >> MSc Student @ Federal University of Pernambuco (UFPE) >> twitter: @lucas_brasilino

2 3

[libvirt] [PATCH] LXC: mount /dev/pts/0 to /dev/console
by Gao feng 31 Oct '13

31 Oct '13

Now, /dev/console is linked to the /dev/pts/0, so for the process agetty, the tty device of agetty is pts/0. this will cause login container failed. since pts/0 is not in the /etc/securetty. so pam module pam_securetty will prevent the root user logging on the system. this patch doesn't make /dev/console a symbol but binds /dev/pts/0 to it. so the tty device of agetty will be console. root can login the system successfully. Signed-off-by: Gao feng <gaofeng(a)cn.fujitsu.com> --- src/lxc/lxc_container.c | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index 255c711..1cede41 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -1049,12 +1049,19 @@ static int lxcContainerSetupDevices(char **ttyPaths, size_t nttyPaths) return -1; } VIR_FREE(tty); - if (i == 0 && - symlink(ttyPaths[i], "/dev/console") < 0) { - virReportSystemError(errno, - _("Failed to symlink %s to /dev/console"), - ttyPaths[i]); - return -1; + if (i == 0) { + if (virFileTouch("/dev/console", 0600) < 0) { + virReportSystemError(errno, "%s", + _("Failed to create /dev/console")); + return -1; + } + + if (mount(ttyPaths[0], "/dev/console", NULL, MS_BIND, NULL) < 0) { + virReportSystemError(errno, + _("Failed to symlink %s to /dev/console"), + ttyPaths[i]); + return -1; + } } } return 0; -- 1.8.3.1

2 3

[libvirt] [PATCH] qemu: fix well-formed migration URI formatting
by Michael Chapman 31 Oct '13

31 Oct '13

When adding an automatically allocated port to a well-formed migration URI, keep it well-formed: tcp://1.2.3.4/ -> tcp://1.2.3.4/:12345 # wrong tcp://1.2.3.4/ -> tcp://1.2.3.4:12345/ # fixed tcp://1.2.3.4 -> tcp://1.2.3.4:12345 # still works tcp:1.2.3.4 -> tcp:1.2.3.4:12345 # still works (old syntax) Signed-off-by: Michael Chapman <mike(a)very.puzzling.org> --- src/qemu/qemu_migration.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 0439ba4..cb59620 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -2535,6 +2535,7 @@ qemuMigrationPrepareDirect(virQEMUDriverPtr driver, char *uri_str = NULL; int ret = -1; virURIPtr uri = NULL; + bool well_formed_uri = true; VIR_DEBUG("driver=%p, dconn=%p, cookiein=%s, cookieinlen=%d, " "cookieout=%p, cookieoutlen=%p, uri_in=%s, uri_out=%p, " @@ -2597,6 +2598,7 @@ qemuMigrationPrepareDirect(virQEMUDriverPtr driver, /* Convert uri_in to well-formed URI with // after tcp: */ if (!(STRPREFIX(uri_in, "tcp://"))) { + well_formed_uri = false; if (virAsprintf(&uri_str, "tcp://%s", p) < 0) goto cleanup; } @@ -2626,9 +2628,17 @@ qemuMigrationPrepareDirect(virQEMUDriverPtr driver, goto cleanup; } - /* Caller frees */ - if (virAsprintf(uri_out, "%s:%d", uri_in, port) < 0) - goto cleanup; + if (well_formed_uri) { + uri->port = port; + + /* Caller frees */ + if (!(*uri_out = virURIFormat(uri))) + goto cleanup; + } else { + /* Caller frees */ + if (virAsprintf(uri_out, "%s:%d", uri_in, port) < 0) + goto cleanup; + } } else { port = uri->port; -- 1.8.3.1

2 3

[libvirt] [PATCH]virsh: track alias option and improve error message when option duplicate its alias
by Chen Hanxiao 30 Oct '13

30 Oct '13

From: Chen Hanxiao <chenhanxiao(a)cn.fujitsu.com> commit 2b172a8effa712aee97a21a64d2d02060958f9b2 allow alias to expand to opt=value pair. That means alias may not look alike since then. With this patch we will also track alias. If we type command with one option and another marked as its alias, we will get an error message like: error: option '--AA' duplicate its alias '--AAA' Signed-off-by: Chen Hanxiao <chenhanxiao(a)cn.fujitsu.com> --- tools/virsh.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index bad78c9..423e2d8 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -1101,11 +1101,18 @@ vshCmddefGetOption(vshControl *ctl, const vshCmdDef *cmd, const char *name, if (VIR_STRDUP(*optstr, value + 1) < 0) goto cleanup; } + *opts_seen |= 1 << i; continue; } if ((*opts_seen & (1 << i)) && opt->type != VSH_OT_ARGV) { - vshError(ctl, _("option --%s already seen"), name); - goto cleanup; + if ((*opts_seen & (1 << (i - 1)))) { + vshError(ctl, _("option '--%s' duplicates its alias '--%s'"), + cmd->opts[i].name, cmd->opts[i-1].name); + goto cleanup; + } else { + vshError(ctl, _("option '--%s' already seen"), name); + goto cleanup; + } } *opts_seen |= 1 << i; *opt_index = i; -- 1.8.2.1

3 4

[libvirt] [PATCH] maint: avoid further typedef accidents
by Eric Blake 30 Oct '13

30 Oct '13

To make it easier to forbid future attempts at a confusing typedef name ending in Ptr that isn't actually a pointer, insist that we follow our preferred style of 'typedef foo *fooPtr'. * cfg.mk (sc_forbid_const_pointer_typedef): Enforce consistent style, to prevent issue fixed in previous storage patch. * src/conf/capabilities.h (virCapsPtr): Fix offender. * src/security/security_stack.c (virSecurityStackItemPtr): Likewise. * tests/qemucapabilitiestest.c (testQemuDataPtr): Likewise. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- cfg.mk | 4 ++++ src/conf/capabilities.h | 4 ++-- src/security/security_stack.c | 2 +- tests/qemucapabilitiestest.c | 2 +- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/cfg.mk b/cfg.mk index e9da282..1b2fd46 100644 --- a/cfg.mk +++ b/cfg.mk @@ -471,10 +471,14 @@ sc_correct_id_types: # "const fooPtr a" is the same as "foo * const a", even though it is # usually desired to have "foo const *a". It's easier to just prevent # the confusing mix of typedef vs. const placement. +# Also requires that all 'fooPtr' typedefs are actually pointers. sc_forbid_const_pointer_typedef: @prohibit='(^|[^"])const \w*Ptr' \ halt='"const fooPtr var" does not declare what you meant' \ $(_sc_search_regexp) + @prohibit='typedef [^(]+ [^*]\w*Ptr\b' \ + halt='use correct style and type for Ptr typedefs' \ + $(_sc_search_regexp) # Forbid sizeof foo or sizeof (foo), require sizeof(foo) sc_size_of_brackets: diff --git a/src/conf/capabilities.h b/src/conf/capabilities.h index 5bc7bb5..ba99e1a 100644 --- a/src/conf/capabilities.h +++ b/src/conf/capabilities.h @@ -1,7 +1,7 @@ /* * capabilities.h: hypervisor capabilities * - * Copyright (C) 2006-2008, 2010, 2012 Red Hat, Inc. + * Copyright (C) 2006-2013 Red Hat, Inc. * Copyright (C) 2006-2008 Daniel P. Berrange * * This library is free software; you can redistribute it and/or @@ -162,7 +162,7 @@ struct _virDomainXMLNamespace { }; typedef struct _virCaps virCaps; -typedef virCaps* virCapsPtr; +typedef virCaps *virCapsPtr; struct _virCaps { virObject parent; diff --git a/src/security/security_stack.c b/src/security/security_stack.c index ff0f06b..0d42b21 100644 --- a/src/security/security_stack.c +++ b/src/security/security_stack.c @@ -30,7 +30,7 @@ typedef struct _virSecurityStackData virSecurityStackData; typedef virSecurityStackData *virSecurityStackDataPtr; typedef struct _virSecurityStackItem virSecurityStackItem; -typedef virSecurityStackItem* virSecurityStackItemPtr; +typedef virSecurityStackItem *virSecurityStackItemPtr; struct _virSecurityStackItem { virSecurityManagerPtr securityManager; diff --git a/tests/qemucapabilitiestest.c b/tests/qemucapabilitiestest.c index 28f12e7..d912171 100644 --- a/tests/qemucapabilitiestest.c +++ b/tests/qemucapabilitiestest.c @@ -27,7 +27,7 @@ #define VIR_FROM_THIS VIR_FROM_NONE typedef struct _testQemuData testQemuData; -typedef testQemuData * testQemuDataPtr; +typedef testQemuData *testQemuDataPtr; struct _testQemuData { virDomainXMLOptionPtr xmlopt; const char *base; -- 1.8.3.1

2 2

Re: [libvirt] [libvirt-users] bridged networking using VLAN : guest with 2 NIC
by Laine Stump 30 Oct '13

30 Oct '13

On 10/30/2013 09:14 PM, Dan Sa wrote: > I created another Virtual Machine with DHCP enabled 192.168.0.0/16 > <http://192.168.0.0/16> DHCP Range 192.168.0.2 192.168.0.2 (as I want > same IP to all three guests) Forwarding : NAT to em2 > > now on host I see two instances of dnsmasq > > netstat -anlp | grep -w dnsmasq > tcp 0 0 192.168.0.1:53 <http://192.168.0.1:53> > 0.0.0.0:* LISTEN 1907/dnsmasq <<<< is this right ? > I created > tcp 0 0 192.168.122.1:53 <http://192.168.122.1:53> > 0.0.0.0:* LISTEN 6666/dnsmasq <<< default NAT > > > however I am seeing dnsmasq is not Active > > systemctl status dnsmasq.service > dnsmasq.service - DNS caching server. > Loaded: loaded (/usr/lib/systemd/system/dnsmasq.service; > enabled) > Active: failed (Result: exit-code) since Wed, 30 Oct 2013 > 12:30:39 -0600; 41min ago > > all my guest are on physical VLAN so how I should go about giving them > 192.168.0.2 address using dnsmasq ? 1) PLEASE stop top-posting new random information and guesses at solutions to the top of your old messages. You are quickly creating a cascade of text that is so large and rambling that nobody will have the ambition to unscramble it and make a reply. It is generally accepted good etiquette to post responses to earlier messages in-line with the original, so that the flow of the conversation can be easily followed by someone reading just the last message. (If there is no "flow" to the conversation, then something more fundamental has gone wrong.) 2) If you've now realized (as I told you in my first response) that you need to run a system instance of dhcpd or dnsmasq to service dhcp for the vlan of your guests, then what you have is a networking problem, not a virtualization problem. There are tutorials for setting up dnsmasq in various places on the web, or you can simply read the comments in /etc/dnsmasq.conf to figure out how to make it listen on just a specific interface, and how to tell it what addresses to serve for that interface. See below for more comments. > > thanks > dan > > > > > > > On Wed, Oct 30, 2013 at 11:20 AM, Dan Sa <dreamrider787(a)gmail.com > <mailto:dreamrider787@gmail.com>> wrote: > > UPDATE : > > Adding more information about dnsmasq on box running fedora (host) > > dispatcher.d]# nmcli nm status > RUNNING STATE WIFI-HARDWARE WIFI > WWAN-HARDWARE WWAN > running connecting enabled enabled > enabled disabled > > nmcli nm status > RUNNING STATE WIFI-HARDWARE WIFI > WWAN-HARDWARE WWAN > running disconnected enabled enabled > enabled disabled > > > systemctl --all|grep -i network > > NetworkManager.service loaded active running Network > Manager > > dnsmasq.d]# ls -al > total 8 > drwxr-xr-x 2 root root 4096 Nov 20 2012 . > drwxr-xr-x. 6 root root 4096 Oct 30 08:56 .. > > > dispatcher.d]# ls -al > total 32 > drwxr-xr-x. 2 root root 4096 Sep 23 12:59 . > drwxr-xr-x. 6 root root 4096 Oct 30 08:56 .. > -rwxr-xr-x 1 root root 175 Nov 15 2012 00-netreport > -rwxr-xr-x. 1 root root 335 Feb 14 2012 04-iscsi > -rwxr-xr-x. 1 root root 111 Jun 25 2012 10-sendmail > -rwxr-xr-x 1 root root 933 Jul 10 04:38 11-dhclient > -rwxr-xr-x. 1 root root 317 Apr 27 2012 20-chrony > -rwxr-xr-x 1 root root 138 Mar 19 2013 20-squid > > cat dnsmasq.conf > > all lines are commented only line active is > > # Include another lot of configuration options. > #conf-file=/etc/dnsmasq.more.conf > conf-dir=/etc/dnsmasq.d <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< > *All* of the above is just random data, which says nothing. Please try to spend more time figuring out what you are trying to do and what has gone wrong before just pasting random bits into a message to a mailing list. Remember that the people reading the messages on this list are doing it for free, and they also have day jobs they need to attend to. The less excess garbage is in a message, the less time they have to use up sifting through it for useful information. > > > > > > On Wed, Oct 30, 2013 at 10:10 AM, Dan Sa <dreamrider787(a)gmail.com > <mailto:dreamrider787@gmail.com>> wrote: > > BRCTL SHOW > bridge name bridge id STP enabled interfaces > br0 8000.00237de0a132 no em1 > vnet0 > guest1-lan 8000.00237de0a133 no em2.620 > vnet3 > guest1-wan 8000.0022642b6586 no p1p1.110 > guest2-lan 8000.00237de0a133 no em2.619 > guest2-wan 8000.0022642b6586 no p1p1.108 > guest3-lan 8000.00237de0a133 no em2.621 > guest3-wan 8000.0022642b6586 no p1p1.111 > > virbr0 8000.5254003e19b3 yes virbr0-nic > vnet2 > The above list of bridges connected to vlan interfaces implies that, for some reason, you are putting each interface of each guest on a separate vlan. Is this really what you think you want to do? Why? How will these guests connect to the rest of the network? Unless you have a requirement to isolate each guest entirely from every other guest and force each guest's traffic to travel through a different path out to the rest of the network, then I think you've misunderstood when/why vlans should be used. It is much more common to just setup a single network that many (or even all) guests will attach to, and generally you don't need a vlan tag to do this. (an earlier comment you made implying that a *host* bridge attached to a host vlan interface *was actually the guest interface* makes me believe you are confused about the function of each bit and how they all fit together. I think it would be useful for you to step back from all of this and just explain how you want your guests to connect to the rest of the network. Do you have a specific requirement for each to be connected to a separate vlan on the physical network? Or do they just need to be connected "somehow"? Do they need to be prevented from communicating with each other, or was this just a side effect of a mistaken network configuration? > > > On Wed, Oct 30, 2013 at 10:10 AM, Dan Sa > <dreamrider787(a)gmail.com <mailto:dreamrider787@gmail.com>> wrote: > > Laine, > > first thank you very much for your input, it cleared some > doubts ... please find below the information in the > desired format. > > Versions: > > 1) Virtual Machine Manager 0.9.5[root@dsl-test qemu]# uname -a > 2) Linux 3.9.10-100.fc17.x86_64 #1 SMP Sun Jul 14 > 01:31:27 UTC 2013 x86_64 x86_64 x86_64 GNU/Linux > 3) Fedora release 17 (Beefy Miracle) Kernel \r on an \m (\l) > Fedora 17 is > 1 year old, and thus no longer gets any updates, not even security updates. You need to upgrade to a newer release of Fedora (F20 is already in beta, so that may be a good choice) > 4) virsh --version 0.9.11.10 > Likewise, 0.9.11 is very old. *Many* improvements have been made since then, which is another good reason to upgrade your OS. > 5) rpm -qa | grep kvm > libvirt-daemon-kvm-0.9.11.10-1.fc17.x86_64 > qemu-kvm-1.0.1-6.fc17.x86_64 > > I have 3 Guest information for guest1 follows : (my > questions are after that) > > virsh dumpxml guest1 : > > virsh dumpxml guest1 > > <domain type='kvm' id='5'> > > <name>guest1</name> > > <uuid>bcc29de1-ba90-5dd8-81fe-7450852df7f6</uuid> > > <memory unit='KiB'>1048576</memory> > > <currentMemory unit='KiB'>1048576</currentMemory> > > <vcpu>4</vcpu> > > <os> > > <type arch='x86_64' machine='pc-0.15'>hvm</type> > > <boot dev='hd'/> > > </os> > > <features> > > <acpi/> > > <apic/> > > <pae/> > > </features> > > <cpu mode='custom' match='exact'> > > <model fallback='allow'>Penryn</model> > > <vendor>Intel</vendor> > > <feature policy='require' name='tm2'/> > > <feature policy='require' name='est'/> > > <feature policy='require' name='monitor'/> > > <feature policy='require' name='osxsave'/> > > <feature policy='require' name='ss'/> > > <feature policy='require' name='ds'/> > > <feature policy='require' name='vme'/> > > <feature policy='require' name='dtes64'/> > > <feature policy='require' name='ht'/> > > <feature policy='require' name='dca'/> > > <feature policy='require' name='pbe'/> > > <feature policy='require' name='xsave'/> > > <feature policy='require' name='tm'/> > > <feature policy='require' name='pdcm'/> > > <feature policy='require' name='vmx'/> > > <feature policy='require' name='ds_cpl'/> > > <feature policy='require' name='xtpr'/> > > <feature policy='require' name='acpi'/> > > </cpu> > > <clock offset='utc'/> > > <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' type='raw'/> > > <source file='/var/lib/libvirt/images/guest1.img'/> > > <target dev='vda' bus='virtio'/> > > <alias name='virtio-disk0'/> > > <address type='pci' domain='0x0000' bus='0x00' > slot='0x05' function='0x0'/> > > </disk> > > <controller type='usb' index='0'> > > <alias name='usb0'/> > > <address type='pci' domain='0x0000' bus='0x00' > slot='0x01' function='0x2'/> > > </controller> > > <controller type='virtio-serial' index='0'> > > <alias name='virtio-serial0'/> > > <address type='pci' domain='0x0000' bus='0x00' > slot='0x04' function='0x0'/> > > </controller> > > <interface type='network'> > > <mac address='52:54:00:ea:80:df'/> > > <source network='default'/> > > <target dev='vnet2'/> > > <alias name='net0'/> > > <address type='pci' domain='0x0000' bus='0x00' > slot='0x03' function='0x0'/> > > </interface> > > <interface type='bridge'> > > <mac address='52:54:00:d5:1d:01'/> > > <source bridge='guest1-lan'/> > > <target dev='vnet3'/> > > <model type='virtio'/> > > <alias name='net1'/> > > <address type='pci' domain='0x0000' bus='0x00' > slot='0x07' function='0x0'/> > > </interface> > > <serial type='pty'> > > <source path='/dev/pts/3'/> > > <target port='0'/> > > <alias name='serial0'/> > > </serial> > > <console type='pty' tty='/dev/pts/3'> > > <source path='/dev/pts/3'/> > > <target type='serial' port='0'/> > > <alias name='serial0'/> > > </console> > > <input type='mouse' bus='ps2'/> > > <graphics type='vnc' port='5901' autoport='yes'/> > > <video> > > <model type='cirrus' vram='9216' heads='1'/> > > <alias name='video0'/> > > <address type='pci' domain='0x0000' bus='0x00' > slot='0x02' function='0x0'/> > > </video> > > <memballoon model='virtio'> > > <alias name='balloon0'/> > > <address type='pci' domain='0x0000' bus='0x00' > slot='0x06' function='0x0'/> > > </memballoon> > > </devices> > > <seclabel type='none'/> > > </domain> > > > > > > Here is revised BRCTL Show after guest1 is running > > > BRCTL SHOW > > bridge name bridge id STP enabled interfaces > > br0 8000.00237de0a132 > no em1 > > vnet0 > > c1000z-lan 8000.00237de0a133 > no em2.620 > > vnet3 > > c1000z-wan 8000.0022642b6586 > no p1p1.110 > > c2000t-lan 8000.00237de0a133 > no em2.619 > > c2000t-wan 8000.0022642b6586 no > p1p1.108 > > pk5001a-lan 8000.00237de0a133 > no em2.621 > > pk5001a-wan 8000.0022642b6586 > no p1p1.111 > > virbr0 8000.5254003e19b3 yes > virbr0-nic > > vnet2 > The above is obviously *not* the output of brctl on the same host as the above-listed guest, since that guest connects to a bridge called "guest1-lan", which isn't even in the brctl output at all. > ---------------------------------------------------------------------------------------------------------- > > > on guest1-lan terminal I see following : > > > route -n > > destination gateway genmask flags > metric ref use iface > > 0.0.0.0 192.168.122.1 0.0.0.0 UG > 100 0 eth0 > > 192.168.122.0 0.0.0.0 255.255.255.0 U > 0 0 eth0 > > > DHCPDISCOVER on eth 1 to 255.255.255.255 port 67 interval > 6 then 14, 13, 15 > > and then sleeping > > > so you are right I am not getting DHCP IP and I have > "forward mode bridge" so libvirt is ignoring it > > I want 192.168.0.2 on this with gateway 192.168.0.1 > > > so looks like my problem is DHCP .... how can I able to > run DHCP for all three guest which are part of em2 > > interface like em2.629, em2.621 and em2/622 > Again, WHY do you need a separate vlan for each guest? I think you may be confused. > > awaiting your suggestions.... > 1) stop top-posting. 2) either explain why you need each guest on a separate vlan, or give up on that idea and just connect all guest interfaces to a single network (or possible 2 networks - on lan and one wan, which you seen to have some requirement for). 3) if you really do require the guests to each be on a separate vlan, and you don't have any other host on the network that already serves dhcp on those vlans, then read /etc/dnsmasq.conf to learn how to configure it. > > regards > > dan > > > > On Wed, Oct 30, 2013 at 9:56 AM, Dan Sa > <dreamrider787(a)gmail.com <mailto:dreamrider787@gmail.com>> > wrote: > > Laine, > > first thank you very much for your input, it cleared > some doubts ... please find below the information in > the desired format. > > Versions: > > 1) Virtual Machine Manager 0.9.5[root@dsl-test qemu]# > uname -a > 2) Linux 3.9.10-100.fc17.x86_64 #1 SMP Sun Jul 14 > 01:31:27 UTC 2013 x86_64 x86_64 x86_64 GNU/Linux > 3) Fedora release 17 (Beefy Miracle) Kernel \r on an > \m (\l) > 4) virsh --version 0.9.11.10 > 5) rpm -qa | grep kvm > libvirt-daemon-kvm-0.9.11.10-1.fc17.x86_64 > qemu-kvm-1.0.1-6.fc17.x86_64 > > I have 3 Guest and here is > > > > > On Wed, Oct 30, 2013 at 5:19 AM, Laine Stump > <laine(a)laine.org <mailto:laine@laine.org>> wrote: > > (There is no need or advantage to Cc'ing > individuals who are already > subscribed to the mailing list.) > > On 10/28/2013 05:34 PM, Dan Sa wrote: > > hello all, > > > > I have been trying to set-up bridged network > with VLAN and not able to > > succeed as many tutorials address only single NIC. > > > > I am trying to setup 2 guests (backtrack > instance) each guest has NIC1 > > and NIC2. following is snippet for guest1 > > > > I am not able to get 192.168.0.2 address back on > guest eth0. > > > See the comment below about <forward > mode='bridge'>. you'll need some > other entity on your vlan to run a dhcp server, > because libvirt won't be > doing it for you in this case. > > > > > > > > VIRT-MANAGER GUI : > > > > guest1-lan details radio button > > > > left side panel > > > > NIC1 ------------------> Virtual Network Interface > > Source Device : > Virtual Network "default" NAT > > Device Model : > Hypervisor default > > MAc Address : > xxxxxxxxxxxxxx > > > > NIC2 ------------------> Virtual Network Interface > > Source Device : > Specify Shared Device Name > > Bridge > name : guest1-lan > > Device Model : virto > > MAc Address : > xxxxxxxxxxxxxx > > The output of "virsh dumpxml $guestname" is much > more useful than a > transcription of the virt-manager screens. > > > > > HOST MACHINE : > > > > brctl show has br0 for bridge > > and virbr0 with 192.168.122.x address (created > by default virtual > > network NAT) > > > > > > /etc/sysconfig/network-scripts/ > > > > 1) Bridge BR0 (cat ifcfg-br0) > > > > DEVICE="br0" > > TYPE="Bridge" > > ONBOOT="yes" > > NM_CONTROLLED="no" > > BOOTPROTO="static" > > IPADDR="xx.xx.xx.xx" > > NETMASK="255.255.254.0" > > GATEWAY="xx.xx.xx.xx" > > DNS1="x.y.z.s" > > DNS2="x.y.q.s" > > > > 2) cat ifcfg-em1 > > NM_CONTROLLED="yes" > > HWADDR="02:12D:E2:B1:32" > > BOOTPROTO="static" > > DEVICE="em1" > > BRIDGE="br0" > > ONBOOT="yes" > > > > 3) ifcfg-em2 > > NM_CONTROLLED="yes" > > HWADDR="02:24:7e:d0:b1:42" > > BOOTPROTO="static" > > DEVICE="em2" > > ONBOOT="yes" > > > > 4) THIS IS GUEST (cat ifcfg-guest1-lan) > > I don't understand what you mean by "this is > guest". It isn't a part of > the guest; it is a bridge on the host that could > be *used* by a guest. > > > > DEVICE=guest1-lan > > TYPE=Bridge > > ONBOOT=yes > > BOOTPROTO=static > > DELAY=1 > > > > 5) GUEST VLAN (cat ifcfg-em2.620) > > > > DEVICE=em2.620 > > VLAN=yes > > ONBOOT=yes > > BRIDGE=guest1-lan > > > > BRCTL Show Command : > > > > br0 8000.00237de0a132 no em1 > > > vnet0 > > guest1-lan 8000.00237de0a133 no em2.620 > > virbr0 8000.5254003e19b3 yes virbr0-nic > > > From the above, it appears that there is only a > single guest running, > and that it is connected via the br0 bridge; > apparently you took this > output when neither of your dual-nic guests were > running, as they should > have each attached tun devices to both guest1-lan > and virbr0. > > > > > > > > VIRSH : > > > > virsh # net-list > > Name State Autostart > > ----------------------------------------- > > guest1-lan active yes > > default active yes > > > > > > virsh # iface-list > > Name State MAC Address > > -------------------------------------------- > > br0 active 00:23:7d:e0:a1:32 > > guest1-lan active 00:23:7d:e0:a1:33 > > > > > > iface-edit : > > > > virsh # iface-edit guest1-lan > > > > <interface type='bridge' name='guest1-lan'> > > <start mode='onboot'/> > > <bridge delay='1'> > > <interface type='vlan' name='em2.620'> > > <vlan tag='620'> > > <interface name='em2'/> > > </vlan> > > </interface> > > </bridge> > > </interface> > > > > > ------------------------------------------------------------------ > > > > /etc/libvirt/qemu/networks > > > (You shouldn't be looking at/modifying the files in > /etc/libvirt/qemu/networks directly. Instead, use > "virsh net-dumpxml > guest1-lan" (for example) to look at the network > config, and "virsh > net-edit guest1-lan" to modify it.) > > > > > > cat guest1-lan.xml > > <network> > > <name>guest1-lan</name> > > <uuid>a12747ec-21c9-0d21-ab06-064ba204bc52</uuid> > > <forward mode='bridge' dev="br0"/> > > <bridge name='guest1-lan' /> > > <ip address='192.168.0.1' netmask='255.255.255.0'> > > <dhcp> > > <range start='192.168.0.2' > end='192.168.0.254' /> > > </dhcp> > > </ip> > > > Any network with <forward mode='bridge'...> is an > "unmanaged" network > from libvirt's POV, and thus the <ip> element and > all its subelements > are ignored. If you use <forward mode='bridge'> > then libvirt assumes > that the bridge device is already configured by > the base OS config. > > As of libvirt-1.0.1, attempts to define an <ip> > element in a network > with <forward mode='bridge'> are flagged as an > error. (It would be > helpful in future reports if you indicate your 1) > libvirt version, 2) > qemu version, 3) distro and version, 4) kernel > version. Although not > always applicable, sometime it can help in framing > the issue. > > > > </network> > > > > > > cat default.xml > > > > <network> > > <name>default</name> > > <uuid>8778244b-1a0c-c15f-c348-26462a07a639</uuid> > > <forward mode='nat'/> > > <bridge name='virbr0' stp='on' delay='0' /> > > <mac address='52:54:00:3E:19:B3'/> > > <ip address='192.168.122.1' > netmask='255.255.255.0'> > > <dhcp> > > <range start='192.168.122.2' > end='192.168.122.254' /> > > </dhcp> > > </ip> > > </network> > > > > any guidance will be appriciated > > Since you're defining a vlan tag, I assume that > the physical network > attached to your host's em2 is actually using vlan > 620? If not, and you > just need a network that's private to your guests > and the host, I would > recommend simply defining a libvirt network with > no <forward> element at > all. This network *will* be managed by libvirt, so > libvirt will create a > bridge and give it an IP address, as well as > running a dnsmasq instance > to serve up IP addresses to guests, but the guests > won't be able to get > traffic anywhere beyond that bridge via their > interface connected to the > bridge. > > If you *are* using vlan 620 on the physical > network, then you'll need to > setup some other dhcp server somewhere on that > network (either run a > system instance of dnsmasq on the host that > listens on em2.620, or run > dnsmasq or dhcpd on some other physical host or > guest that listens on > its own vlan-tagged interface). > > > > > >

1 0

[libvirt] RFC: using a network device as a destination for a disk snapshot
by Eric Blake 30 Oct '13

30 Oct '13

Right now, when creating an external snapshot, the snapshot xml requires that the destination be in the local file system: http://libvirt.org/formatsnapshot.html <domainsnapshot> ... <disks> <disk name='vda' snapshot='external'> <driver type='qcow2'/> <source file='/path/to/new'/> </disk> ... But libvirt already allows for a network device with qcow2 contents, provided that there is no backing chain: # qemu-img info gluster://red/vol1/img2 image: gluster://red/vol1/img2 file format: qcow2 virtual size: 10M (10485760 bytes) disk size: 193K cluster_size: 65536 # virsh dumpxml dom <domain type='kvm'> ... <disk type='network' device='disk'> <driver name='qemu' type='qcow2'/> <source protocol='gluster' name='vol1/img2'> <host name='red'/> </source> <target dev='vdc' bus='virtio'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x09' function='0x0'/> </disk> ... I'm working on patches to the backing chain code to allow a gluster (or other network device) with qcow2 contents to have a backing file, but for the code to be useful, we also need to patch <domainsnapshot> xml to allow the destination file to be a gluster or other network device, rather than forcing it to be a local file name. Here's the XML I think we need to add to domainsnapshot: <domainsnapshot> ... <disks> <disk name='vda' snapshot='external' type='network'> <driver type='qcow2'/> <source protocol='gluster' name='vol1/img2'> <host name='red'/> </source> </disk> that is, add an optional /disk@type attribute (if absent, it defaults to type='file'), and where if present, the <source> subelement then takes on alternate forms in the same manner in which //domain/devices/disk handles alternates (here, allowing a protocol, name, and host specification). [Ultimately, we need to fix //domain/devices/disk to specify a full backing chain, but one step at a time...] -- Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org

3 2

[libvirt] [PATCH 0/6] API documentation improvements
by Claudio Bley 30 Oct '13

30 Oct '13

Hi. It's been a while since I tackled this, but here it goes... This is version 4 of https://www.redhat.com/archives/libvir-list/2013-January/msg02094.html exclusive of the already applied patches, of course. Changes since v3: * skipped the ECMAScript code highlighting patch[1] in this series (postponed for now) * added link generation patch (#6) which I had proposed seperately back in Jan 2013, too. * added a reference to an affected API in patch #1 and #4 as per Eric's comments * changed the code block XSL processing to avoid cutting off characters at the beginning of a line [1] https://www.redhat.com/archives/libvir-list/2013-January/msg02104.html [2] https://www.redhat.com/archives/libvir-list/2013-January/msg00884.html Claudio Bley (6): docs: process code blocks similar to Markdown docs: add class "description" to div's containing descriptions docs: define style of code blocks inside descriptions libvirt.c: add 2 spaces of indentation to example code of virStreamSend libvirt.c: indent code of virDomainGetMemoryParameters's documentation docs: generate links from plain text documentation docs/libvirt.css | 7 +++ docs/newapi.xsl | 121 +++++++++++++++++++++++++++++++++++++++----------- src/libvirt.c | 130 +++++++++++++++++++++++++++--------------------------- 3 files changed, 167 insertions(+), 91 deletions(-) -- 1.7.9.5

3 18

[libvirt] [PATCH 0/2] Properly check the return value of virPortAllocatorAcquire
by Ján Tomko 30 Oct '13

30 Oct '13

Ján Tomko (2): Add exit_monitor label to qemuMigrationStartNBDServer Report an error if port range is exhausted src/qemu/qemu_migration.c | 25 ++++++++++++++++--------- src/qemu/qemu_process.c | 10 ++++++++++ 2 files changed, 26 insertions(+), 9 deletions(-) -- 1.8.1.5

2 5

[libvirt] [PATCH]docs: fix typos in formatnwfilter
by Chen Hanxiao 30 Oct '13

30 Oct '13

From: Chen Hanxiao <chenhanxiao(a)cn.fujitsu.com> s/initated/initiated Signed-off-by: Chen Hanxiao <chenhanxiao(a)cn.fujitsu.com> --- docs/formatnwfilter.html.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/formatnwfilter.html.in b/docs/formatnwfilter.html.in index 5e1c6bb..ec20300 100644 --- a/docs/formatnwfilter.html.in +++ b/docs/formatnwfilter.html.in @@ -2079,9 +2079,9 @@ To enable traffic for TCP ports 22 and 80 we will add 2 rules to enable this type of traffic. To allow the VM to send ping traffic we will add a rule for ICMP traffic. For simplicity reasons - we allow general ICMP traffic to be initated from the VM, not + we allow general ICMP traffic to be initiated from the VM, not just ICMP echo request and response messages. To then - disallow all other traffic to reach or be initated by the + disallow all other traffic to reach or be initiated by the VM we will then need to add a rule that drops all other traffic. Assuming our VM is called <i>test</i> and the interface we want to associate our filter with is called <i>eth0</i>, -- 1.8.2.1

2 1

[libvirt] [PATCH]lxc: improve readability of lxcContainer[Send|Waitfor]Continue
by Chen Hanxiao 30 Oct '13

30 Oct '13

From: Chen Hanxiao <chenhanxiao(a)cn.fujitsu.com> Currently, lxcContainer[Send|Waitfor]Continue only tell us 'fd', but we had to deal with the interaction between lxc_[container|controller|process]. This patch adds parameters to identify the caller. Signed-off-by: Chen Hanxiao <chenhanxiao(a)cn.fujitsu.com> --- src/lxc/lxc_container.c | 16 +++++++++------- src/lxc/lxc_container.h | 4 ++-- src/lxc/lxc_controller.c | 6 +++--- src/lxc/lxc_process.c | 2 +- 4 files changed, 15 insertions(+), 13 deletions(-) diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index ed1fe29..c7371ca 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -351,19 +351,20 @@ cleanup: /** * lxcContainerSendContinue: * @control: control FD to child + * @caller: function invoker * * Sends the continue message via the socket pair stored in the vm * structure. * * Returns 0 on success or -1 in case of error */ -int lxcContainerSendContinue(int control) +int lxcContainerSendContinue(int control, const char *caller) { int rc = -1; lxc_message_t msg = LXC_CONTINUE_MSG; int writeCount = 0; - VIR_DEBUG("Send continue on fd %d", control); + VIR_DEBUG("Send continue on fd %d by %s", control, caller); writeCount = safewrite(control, &msg, sizeof(msg)); if (writeCount != sizeof(msg)) { goto error_out; @@ -377,6 +378,7 @@ error_out: /** * lxcContainerWaitForContinue: * @control: Control FD from parent + * @caller: function invoker * * This function will wait for the container continue message from the * parent process. It will send this message on the socket pair stored in @@ -384,14 +386,14 @@ error_out: * * Returns 0 on success or -1 in case of error */ -int lxcContainerWaitForContinue(int control) +int lxcContainerWaitForContinue(int control, const char *caller) { lxc_message_t msg; int readLen; - VIR_DEBUG("Wait continue on fd %d", control); + VIR_DEBUG("%s wait continue on fd %d", caller, control); readLen = saferead(control, &msg, sizeof(msg)); - VIR_DEBUG("Got continue on fd %d %d", control, readLen); + VIR_DEBUG("%s got continue on fd %d %d", caller, control, readLen); if (readLen != sizeof(msg)) { if (readLen >= 0) errno = EIO; @@ -1813,7 +1815,7 @@ static int lxcContainerChild(void *data) /* Wait for controller to finish setup tasks, including * things like move of network interfaces, uid/gid mapping */ - if (lxcContainerWaitForContinue(argv->monitor) < 0) { + if (lxcContainerWaitForContinue(argv->monitor, __func__) < 0) { virReportSystemError(errno, "%s", _("Failed to read the container continue message")); goto cleanup; @@ -1880,7 +1882,7 @@ static int lxcContainerChild(void *data) if (lxcContainerDropCapabilities(!!hasReboot) < 0) goto cleanup; - if (lxcContainerSendContinue(argv->handshakefd) < 0) { + if (lxcContainerSendContinue(argv->handshakefd, __func__) < 0) { virReportSystemError(errno, "%s", _("Failed to send continue signal to controller")); goto cleanup; diff --git a/src/lxc/lxc_container.h b/src/lxc/lxc_container.h index e74a7d7..77fb2a0 100644 --- a/src/lxc/lxc_container.h +++ b/src/lxc/lxc_container.h @@ -49,8 +49,8 @@ enum { # define LXC_DEV_MAJ_FUSE 10 # define LXC_DEV_MIN_FUSE 229 -int lxcContainerSendContinue(int control); -int lxcContainerWaitForContinue(int control); +int lxcContainerSendContinue(int control, const char *caller); +int lxcContainerWaitForContinue(int control, const char *caller); int lxcContainerStart(virDomainDefPtr def, virSecurityManagerPtr securityDriver, diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c index 851a773..25dbbec 100644 --- a/src/lxc/lxc_controller.c +++ b/src/lxc/lxc_controller.c @@ -319,7 +319,7 @@ static int virLXCControllerConsoleSetNonblocking(virLXCControllerConsolePtr cons static int virLXCControllerDaemonHandshake(virLXCControllerPtr ctrl) { - if (lxcContainerSendContinue(ctrl->handshakeFd) < 0) { + if (lxcContainerSendContinue(ctrl->handshakeFd, __func__) < 0) { virReportSystemError(errno, "%s", _("error sending continue signal to daemon")); return -1; @@ -2176,13 +2176,13 @@ virLXCControllerRun(virLXCControllerPtr ctrl) if (virLXCControllerMoveInterfaces(ctrl) < 0) goto cleanup; - if (lxcContainerSendContinue(control[0]) < 0) { + if (lxcContainerSendContinue(control[0], __func__) < 0) { virReportSystemError(errno, "%s", _("Unable to send container continue message")); goto cleanup; } - if (lxcContainerWaitForContinue(containerhandshake[0]) < 0) { + if (lxcContainerWaitForContinue(containerhandshake[0], __func__) < 0) { virReportSystemError(errno, "%s", _("error receiving signal from container")); goto cleanup; diff --git a/src/lxc/lxc_process.c b/src/lxc/lxc_process.c index f088e8e..de20dd0 100644 --- a/src/lxc/lxc_process.c +++ b/src/lxc/lxc_process.c @@ -1264,7 +1264,7 @@ int virLXCProcessStart(virConnectPtr conn, if (virAtomicIntInc(&driver->nactive) == 1 && driver->inhibitCallback) driver->inhibitCallback(true, driver->inhibitOpaque); - if (lxcContainerWaitForContinue(handshakefds[0]) < 0) { + if (lxcContainerWaitForContinue(handshakefds[0], __func__) < 0) { char out[1024]; if (!(virLXCProcessReadLogOutput(vm, logfile, pos, out, 1024) < 0)) { -- 1.8.2.1

4 7

[libvirt] [PATCH] MacOS: Re-add support for QEMU backend
by Doug Goldstein 30 Oct '13

30 Oct '13

The QEMU backend was disabled on Mac OS X without a reason in the code and due to refactors its difficult to understand when/why it was disabled. With QEMU being supported on Mac OS X there is no reason to disable QEMU on this platform. --- configure.ac | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/configure.ac b/configure.ac index 1c5b168..f519cbe 100644 --- a/configure.ac +++ b/configure.ac @@ -191,10 +191,6 @@ if test $with_freebsd = yes; then with_firewalld=no fi -if test $with_osx = yes; then - with_qemu=no -fi - AM_CONDITIONAL([WITH_LINUX], [test "$with_linux" = "yes"]) AM_CONDITIONAL([WITH_FREEBSD], [test "$with_freebsd" = "yes"]) @@ -2393,7 +2389,7 @@ fi AM_CONDITIONAL([WITH_INTERFACE], [test "$with_interface" = "yes"]) -if test $with_freebsd = yes; then +if test $with_freebsd = yes || test $with_osx = yes; then default_qemu_user=root default_qemu_group=wheel else -- 1.8.1.5

2 2