- Devel - libvirt List Archives

[libvirt] [PATCH 0/6] plug memory leaks
by ajia＠redhat.com 01 Dec '11

01 Dec '11

From: Alex Jia <ajia(a)redhat.com> Detected by Coverity. Alex Jia (6): src/conf/domain_conf.c: Plug memory leak on virDomainDefParseXML() error path src/qemu/qemu_process.c: Plug memory leak on qemuProcessWaitForMonitor() error path src/rpc/virnetclient.c: Plug memory leak on virNetClientSendInternal() error path src/uml/uml_driver.c: Plug memory leak on umlStartVMDaemon() error path src/util/virnetdevbridge.c: Plug memory leak on virNetDevBridgeGet() sucessful path src/util/virnetdevmacvlan.c: Plug memory leak on virNetDevMacVLanCreateWithVPortProfile() error path Signed-off-by: Alex Jia <ajia(a)redhat.com> --- src/conf/domain_conf.c | 1 + src/qemu/qemu_process.c | 1 + src/rpc/virnetclient.c | 1 + src/uml/uml_driver.c | 1 + src/util/virnetdevbridge.c | 1 + src/util/virnetdevmacvlan.c | 1 + 6 files changed, 6 insertions(+), 0 deletions(-)

4 20

[libvirt] 'make check' hangs
by Wen Congyang 01 Dec '11

01 Dec '11

When I run 'make check', it hangs sometimes. I use gdb to attach lt-virsh, and the following is the backtrace: (gdb) thread 1 [Switching to thread 1 (Thread 0x7fc6c04d5800 (LWP 24099))]#0 0x0000003bdce0804d in pthread_join () from /lib64/libpthread.so.0 (gdb) bt #0 0x0000003bdce0804d in pthread_join () from /lib64/libpthread.so.0 #1 0x000000000041c0b3 in vshDeinit (ctl=0x7fff015f4570) at virsh.c:17262 #2 0x00000000004248d1 in main (argc=<value optimized out>, argv=0x7fff015f4728) at virsh.c:17608 (gdb) thread 2 [Switching to thread 2 (Thread 0x7fc6c04d4700 (LWP 24138))]#0 0x0000003bdc2dc053 in poll () from /lib64/libc.so.6 (gdb) bt #0 0x0000003bdc2dc053 in poll () from /lib64/libc.so.6 #1 0x00007fc6c075359c in virEventPollRunOnce () at util/event_poll.c:619 #2 0x00007fc6c07527d7 in virEventRunDefaultImpl () at util/event.c:247 #3 0x000000000041bea3 in vshEventLoop (opaque=0x7fff015f4570) at virsh.c:16800 #4 0x00007fc6c0764702 in virThreadHelper (data=<value optimized out>) at util/threads-pthread.c:157 #5 0x0000003bdce077f1 in start_thread () from /lib64/libpthread.so.0 #6 0x0000003bdc2e570d in clone () from /lib64/libc.so.6 (gdb)

6 10

[libvirt] [PATCH] virsh: Fix possible deadlock when virsh is about to exit
by Jiri Denemark 30 Nov '11

30 Nov '11

Not only was ctl->quit accessed without a mutex but unfortunately, virEventAddTimeout only interrupts the poll when event loop is running so the hack needs to add a timeout that will make next poll return immediately without blocking. --- tools/virsh.c | 39 +++++++++++++++++++++++++++++++++------ 1 files changed, 33 insertions(+), 6 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index 618b0c1..723ec65 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -251,6 +251,7 @@ typedef struct __vshControl { bool useSnapshotOld; /* cannot use virDomainSnapshotGetParent or virDomainSnapshotNumChildren */ virThread eventLoop; + virMutex lock; bool eventLoopStarted; bool quit; } __vshControl; @@ -16796,10 +16797,17 @@ vshEventLoop(void *opaque) { vshControl *ctl = opaque; - while (!ctl->quit) { - if (virEventRunDefaultImpl() < 0) { + while (1) { + bool quit; + virMutexLock(&ctl->lock); + quit = ctl->quit; + virMutexUnlock(&ctl->lock); + + if (quit) + break; + + if (virEventRunDefaultImpl() < 0) virshReportError(ctl); - } } } @@ -17235,13 +17243,18 @@ vshReadline (vshControl *ctl, const char *prompt) #endif /* !USE_READLINE */ +static void +vshDeinitTimer(int timer ATTRIBUTE_UNUSED, void *opaque ATTRIBUTE_UNUSED) +{ + /* nothing to be done here */ +} + /* * Deinitialize virsh */ static bool vshDeinit(vshControl *ctl) { - ctl->quit = true; vshReadlineDeinit(ctl); vshCloseLogFile(ctl); VIR_FREE(ctl->name); @@ -17254,15 +17267,24 @@ vshDeinit(vshControl *ctl) virResetLastError(); if (ctl->eventLoopStarted) { + int timer; + + virMutexLock(&ctl->lock); + ctl->quit = true; /* HACK: Add a dummy timeout to break event loop */ - int timer = virEventAddTimeout(-1, NULL, NULL, NULL); + timer = virEventAddTimeout(0, vshDeinitTimer, NULL, NULL); + virMutexUnlock(&ctl->lock); + + virThreadJoin(&ctl->eventLoop); + if (timer != -1) virEventRemoveTimeout(timer); - virThreadJoin(&ctl->eventLoop); ctl->eventLoopStarted = false; } + virMutexDestroy(&ctl->lock); + return true; } @@ -17543,6 +17565,11 @@ main(int argc, char **argv) return EXIT_FAILURE; } + if (virMutexInit(&ctl->lock) < 0) { + vshError(ctl, "%s", _("Failed to initialize mutex")); + return EXIT_FAILURE; + } + if (virInitialize() < 0) { vshError(ctl, "%s", _("Failed to initialize libvirt")); return EXIT_FAILURE; -- 1.7.8.rc4

4 3

[libvirt] [PATCHv2 2/6] qemu: Plug memory leak onqemuProcessWaitForMonitor() error path
by ajia＠redhat.com 30 Nov '11

30 Nov '11

From: Alex Jia <ajia(a)redhat.com> Detected by Coverity. Leak introduced in commit 109efd7. Signed-off-by: Alex Jia <ajia(a)redhat.com> --- src/qemu/qemu_process.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 2563f97..b05c280 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -1224,7 +1224,7 @@ qemuProcessWaitForMonitor(struct qemud_driver* driver, if (VIR_ALLOC_N(buf, buf_size) < 0) { virReportOOMError(); - return -1; + goto closelog; } if (qemuProcessReadLogOutput(vm, logfd, buf, buf_size, -- 1.7.1

2 1

[libvirt] [PATCHv4 0/4] implement per-device cgroup blkio weight in qemu
by Eric Blake 30 Nov '11

30 Nov '11

v8: two new bug cleanup commits, move major()/minor() handling out of domain_conf.c into cgroup.c, and fix behavior when more than one device is listed, add a test for xml parsing. v7 was here (1-3 are already applied, 4-5 of that series are now 3-4): https://www.redhat.com/archives/libvir-list/2011-November/msg00317.html Eric Blake (2): API: prevent query of --live and --config at once qemu: fix blkiotune --live --config Hu Tao (2): blkiotune: add interface for blkiotune.device_weight blkiotune: add qemu support for blkiotune.device_weight docs/formatdomain.html.in | 29 +++- docs/schemas/domaincommon.rng | 26 ++- include/libvirt/libvirt.h.in | 10 + src/conf/domain_conf.c | 99 +++++++++- src/conf/domain_conf.h | 14 ++ src/libvirt.c | 36 +++- src/libvirt_private.syms | 2 + src/qemu/qemu_cgroup.c | 20 ++ src/qemu/qemu_driver.c | 223 +++++++++++++++++++- src/util/cgroup.c | 51 +++++ src/util/cgroup.h | 4 + .../qemuxml2argv-blkiotune-device.args | 4 + .../qemuxml2argv-blkiotune-device.xml | 36 +++ tests/qemuxml2argvtest.c | 1 + tests/qemuxml2xmltest.c | 1 + tools/virsh.c | 43 +++- tools/virsh.pod | 8 +- 17 files changed, 576 insertions(+), 31 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-blkiotune-device.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-blkiotune-device.xml -- 1.7.7.1

3 23

[libvirt] [PATCH 0/2] blkiotune tweaks
by Eric Blake 30 Nov '11

30 Nov '11

As mentioned here: https://www.redhat.com/archives/libvir-list/2011-November/msg01720.html Eric Blake (2): conf: reject duplicate paths in device weights qemu: amend existing table of device weights src/conf/domain_conf.c | 10 ++++++ src/qemu/qemu_driver.c | 80 +++++++++++++++++++++++++++++++++++------------ tools/virsh.pod | 4 ++- 3 files changed, 72 insertions(+), 22 deletions(-) -- 1.7.7.3

2 5

[libvirt] [PATCH] Fix bug on setting both weight and device-weights at the same time
by Hu Tao 30 Nov '11

30 Nov '11

When setting both blkio weight and device-weights at the same time, the weight is lost. Fix it. --- tools/virsh.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index 01da8e5..af9f538 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -4788,14 +4788,14 @@ cmdBlkiotune(vshControl * ctl, const vshCmd * cmd) if (!virStrcpy(temp->field, VIR_DOMAIN_BLKIO_WEIGHT, sizeof(temp->field))) goto cleanup; - } - - if (device_weight) { + weight = 0; + } else if (device_weight) { temp->value.s = vshStrdup(ctl, device_weight); temp->type = VIR_TYPED_PARAM_STRING; if (!virStrcpy(temp->field, VIR_DOMAIN_BLKIO_DEVICE_WEIGHT, sizeof(temp->field))) goto cleanup; + device_weight = NULL; } } -- 1.7.3.1

2 1

[libvirt] [libvirt-glib] Fix potential race in GVirObjectConnection::domain_event_cb
by Christophe Fergeau 30 Nov '11

30 Nov '11

This method starts by looking up a domain in priv->domains, and later, depending on the kind of event that occurred, it may remove this domain from priv->domains. While the individual operations (lookup, removal) are protected by priv->lock, there is no guarantee that the looked up domain and even priv->domains will stay unchanged when priv->lock isn't held. In particular, gvir_connection_close will destroy priv->domains which will unreference all the domains it contains (potentially destroying them too), and gvir_connection_fetch_domains will change priv->domains value. To avoid these issues, this commit takes a reference on priv->domains so that it doesn't get away behind our back, and it takes a reference on the looked up domain too to ensure it stays alive for the duration of domain_event_cb run. --- libvirt-gobject/libvirt-gobject-connection.c | 17 +++++++++++------ 1 files changed, 11 insertions(+), 6 deletions(-) diff --git a/libvirt-gobject/libvirt-gobject-connection.c b/libvirt-gobject/libvirt-gobject-connection.c index 59b828d..786a026 100644 --- a/libvirt-gobject/libvirt-gobject-connection.c +++ b/libvirt-gobject/libvirt-gobject-connection.c @@ -257,6 +257,7 @@ static int domain_event_cb(virConnectPtr conn G_GNUC_UNUSED, void *opaque) { gchar uuid[VIR_UUID_STRING_BUFLEN]; + GHashTable *doms; GVirConnection *gconn = opaque; GVirDomain *gdom; GVirConnectionPrivate *priv = gconn->priv; @@ -269,14 +270,18 @@ static int domain_event_cb(virConnectPtr conn G_GNUC_UNUSED, g_debug("%s: %s event:%d, detail:%d", G_STRFUNC, uuid, event, detail); g_mutex_lock(priv->lock); - gdom = g_hash_table_lookup(priv->domains, uuid); + doms = g_hash_table_ref(priv->domains); + gdom = g_hash_table_lookup(doms, uuid); + if (gdom != NULL) + g_object_ref(G_OBJECT(gdom)); g_mutex_unlock(priv->lock); if (gdom == NULL) { gdom = GVIR_DOMAIN(g_object_new(GVIR_TYPE_DOMAIN, "handle", dom, NULL)); g_mutex_lock(priv->lock); - g_hash_table_insert(priv->domains, (gpointer)gvir_domain_get_uuid(gdom), gdom); + g_hash_table_insert(doms, (gpointer)gvir_domain_get_uuid(gdom), + g_object_ref(G_OBJECT(gdom))); g_mutex_unlock(priv->lock); } @@ -293,11 +298,10 @@ static int domain_event_cb(virConnectPtr conn G_GNUC_UNUSED, case VIR_DOMAIN_EVENT_UNDEFINED: if (detail == VIR_DOMAIN_EVENT_UNDEFINED_REMOVED) { g_mutex_lock(priv->lock); - g_hash_table_steal(priv->domains, uuid); + g_hash_table_remove(doms, uuid); g_mutex_unlock(priv->lock); g_signal_emit(gconn, signals[VIR_DOMAIN_REMOVED], 0, gdom); - g_object_unref(gdom); } else g_warn_if_reached(); break; @@ -365,11 +369,10 @@ static int domain_event_cb(virConnectPtr conn G_GNUC_UNUSED, if (virDomainIsPersistent(dom) != 1) { g_mutex_lock(priv->lock); - g_hash_table_steal(priv->domains, uuid); + g_hash_table_remove(doms, uuid); g_mutex_unlock(priv->lock); g_signal_emit(gconn, signals[VIR_DOMAIN_REMOVED], 0, gdom); - g_object_unref(gdom); } break; @@ -377,6 +380,8 @@ static int domain_event_cb(virConnectPtr conn G_GNUC_UNUSED, g_warn_if_reached(); } + g_object_unref(G_OBJECT(gdom)); + g_hash_table_unref(doms); return 0; } -- 1.7.7.3

2 1

[libvirt] [libvirt-glib] Fix gvir_config_domain_clock_set_variable_offset
by Christophe Fergeau 30 Nov '11

30 Nov '11

It was creating an extra <clock> node as a child of the "main" one which is not what was intended --- libvirt-gconfig/libvirt-gconfig-domain-clock.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/libvirt-gconfig/libvirt-gconfig-domain-clock.c b/libvirt-gconfig/libvirt-gconfig-domain-clock.c index 27d1e67..b28856c 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-clock.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-clock.c @@ -121,7 +121,7 @@ void gvir_config_domain_clock_set_variable_offset(GVirConfigDomainClock *klock, g_return_if_fail(GVIR_IS_CONFIG_DOMAIN_CLOCK(klock)); - node = gvir_config_object_replace_child(GVIR_CONFIG_OBJECT(klock), "clock"); + node = gvir_config_object_get_xml_node(GVIR_CONFIG_OBJECT(klock)); if (node == NULL) return; -- 1.7.7.3

2 1

[libvirt] [libvirt-glib 1/2] Rely on libvirt API to detect transient domains
by Zeeshan Ali (Khattak) 30 Nov '11

30 Nov '11

From: "Zeeshan Ali (Khattak)" <zeeshanak(a)gnome.org> --- libvirt-gobject/libvirt-gobject-connection.c | 6 +----- 1 files changed, 1 insertions(+), 5 deletions(-) diff --git a/libvirt-gobject/libvirt-gobject-connection.c b/libvirt-gobject/libvirt-gobject-connection.c index c9985b2..b647bfa 100644 --- a/libvirt-gobject/libvirt-gobject-connection.c +++ b/libvirt-gobject/libvirt-gobject-connection.c @@ -260,7 +260,6 @@ static int domain_event_cb(virConnectPtr conn G_GNUC_UNUSED, GVirConnection *gconn = opaque; GVirDomain *gdom; GVirConnectionPrivate *priv = gconn->priv; - gboolean was_unknown = FALSE; if (virDomainGetUUIDString(dom, uuid) < 0) { g_warning("Failed to get domain UUID on %p", dom); @@ -279,8 +278,6 @@ static int domain_event_cb(virConnectPtr conn G_GNUC_UNUSED, g_mutex_lock(priv->lock); g_hash_table_insert(priv->domains, (gpointer)gvir_domain_get_uuid(gdom), gdom); g_mutex_unlock(priv->lock); - - was_unknown = TRUE; } switch (event) { @@ -307,8 +304,7 @@ static int domain_event_cb(virConnectPtr conn G_GNUC_UNUSED, case VIR_DOMAIN_EVENT_STARTED: if (detail == VIR_DOMAIN_EVENT_STARTED_BOOTED) { - if (was_unknown) - /* Most probably a transient domain */ + if (!virDomainIsPersistent(dom)) g_signal_emit(gconn, signals[VIR_DOMAIN_ADDED], 0, gdom); g_signal_emit_by_name(gdom, "started::booted"); } else if (detail == VIR_DOMAIN_EVENT_STARTED_MIGRATED) -- 1.7.7.3

3 5

[libvirt] [libvirt-glib 01/13] Add GVirConfigXmlDoc type
by Christophe Fergeau 30 Nov '11

30 Nov '11

This class derives from GObject and wraps an xmlDocPtr. It will be useful to refcount xmlDoc so that it can be shared between multiple GVirConfigObject instances. --- libvirt-gconfig/Makefile.am | 4 +- libvirt-gconfig/libvirt-gconfig-xml-doc.c | 137 +++++++++++++++++++++++++++++ libvirt-gconfig/libvirt-gconfig-xml-doc.h | 66 ++++++++++++++ 3 files changed, 206 insertions(+), 1 deletions(-) create mode 100644 libvirt-gconfig/libvirt-gconfig-xml-doc.c create mode 100644 libvirt-gconfig/libvirt-gconfig-xml-doc.h diff --git a/libvirt-gconfig/Makefile.am b/libvirt-gconfig/Makefile.am index e91c601..8276d07 100644 --- a/libvirt-gconfig/Makefile.am +++ b/libvirt-gconfig/Makefile.am @@ -35,6 +35,7 @@ GCONFIG_HEADER_FILES = \ noinst_HEADERS = \ libvirt-gconfig-helpers-private.h \ libvirt-gconfig-object-private.h + libvirt-gconfig-xml-doc.h GCONFIG_SOURCE_FILES = \ libvirt-gconfig-object.c \ libvirt-gconfig-capabilities.c \ @@ -59,7 +60,8 @@ GCONFIG_SOURCE_FILES = \ libvirt-gconfig-node-device.c \ libvirt-gconfig-secret.c \ libvirt-gconfig-storage-pool.c \ - libvirt-gconfig-storage-vol.c + libvirt-gconfig-storage-vol.c \ + libvirt-gconfig-xml-doc.c libvirt_gconfig_1_0_ladir = $(includedir)/libvirt-gconfig-1.0/libvirt-gconfig libvirt_gconfig_1_0_la_HEADERS = \ diff --git a/libvirt-gconfig/libvirt-gconfig-xml-doc.c b/libvirt-gconfig/libvirt-gconfig-xml-doc.c new file mode 100644 index 0000000..7906158 --- /dev/null +++ b/libvirt-gconfig/libvirt-gconfig-xml-doc.c @@ -0,0 +1,137 @@ +/* + * libvirt-gobject-config-xml-node.c: libvirt glib integration + * + * Copyright (C) 2011 Red Hat + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * Author: Christophe Fergeau <cfergeau(a)gmail.com> + */ + +#include <config.h> + +#include <string.h> + +#include <libxml/tree.h> + +#include "libvirt-gconfig/libvirt-gconfig.h" +#include "libvirt-gconfig/libvirt-gconfig-xml-doc.h" + +extern gboolean debugFlag; + +#define DEBUG(fmt, ...) do { if (G_UNLIKELY(debugFlag)) g_debug(fmt, ## __VA_ARGS__); } while (0) + +#define GVIR_CONFIG_XML_DOC_GET_PRIVATE(obj) \ + (G_TYPE_INSTANCE_GET_PRIVATE((obj), GVIR_TYPE_CONFIG_XML_DOC, GVirConfigXmlDocPrivate)) + +struct _GVirConfigXmlDocPrivate +{ + xmlDocPtr doc; +}; + +G_DEFINE_TYPE(GVirConfigXmlDoc, gvir_config_xml_doc, G_TYPE_OBJECT); + +enum { + PROP_0, + PROP_DOC +}; + +static void gvir_config_xml_doc_get_property(GObject *object, + guint prop_id, + GValue *value, + GParamSpec *pspec) +{ + GVirConfigXmlDoc *xml_doc = GVIR_CONFIG_XML_DOC(object); + + switch (prop_id) { + case PROP_DOC: + g_value_set_pointer(value, xml_doc->priv->doc); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec); + } +} + +static void gvir_config_xml_doc_set_property(GObject *object, + guint prop_id, + const GValue *value, + GParamSpec *pspec) +{ + GVirConfigXmlDoc *doc = GVIR_CONFIG_XML_DOC(object); + + switch (prop_id) { + case PROP_DOC: + doc->priv->doc = g_value_get_pointer(value); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec); + } +} + +static void gvir_config_xml_doc_finalize(GObject *object) +{ + GVirConfigXmlDoc *doc = GVIR_CONFIG_XML_DOC(object); + GVirConfigXmlDocPrivate *priv = doc->priv; + + DEBUG("Finalize GVirConfigXmlDoc=%p", doc); + + if (priv->doc) + xmlFreeDoc(priv->doc); + + G_OBJECT_CLASS(gvir_config_xml_doc_parent_class)->finalize(object); +} + +static void gvir_config_xml_doc_class_init(GVirConfigXmlDocClass *klass) +{ + GObjectClass *object_class = G_OBJECT_CLASS(klass); + + g_type_class_add_private(klass, sizeof(GVirConfigXmlDocPrivate)); + + object_class->finalize = gvir_config_xml_doc_finalize; + object_class->get_property = gvir_config_xml_doc_get_property; + object_class->set_property = gvir_config_xml_doc_set_property; + + g_object_class_install_property(object_class, + PROP_DOC, + g_param_spec_pointer("doc", + "XML Doc", + "The XML doc this config object corresponds to", + G_PARAM_READWRITE | + G_PARAM_CONSTRUCT_ONLY | + G_PARAM_STATIC_STRINGS)); +} + + +static void gvir_config_xml_doc_init(GVirConfigXmlDoc *xml_doc) +{ + GVirConfigXmlDocPrivate *priv; + + DEBUG("Init GVirConfigXmlDoc=%p", xml_doc); + + priv = xml_doc->priv = GVIR_CONFIG_XML_DOC_GET_PRIVATE(xml_doc); + + memset(priv, 0, sizeof(*priv)); +} + + +GVirConfigXmlDoc *gvir_config_xml_doc_new(xmlDocPtr doc) +{ + if (doc == NULL) { + doc = xmlNewDoc((xmlChar *)"1.0"); + } + return GVIR_CONFIG_XML_DOC(g_object_new(GVIR_TYPE_CONFIG_XML_DOC, + "doc", doc, + NULL)); +} diff --git a/libvirt-gconfig/libvirt-gconfig-xml-doc.h b/libvirt-gconfig/libvirt-gconfig-xml-doc.h new file mode 100644 index 0000000..079de1e --- /dev/null +++ b/libvirt-gconfig/libvirt-gconfig-xml-doc.h @@ -0,0 +1,66 @@ +/* + * libvirt-gobject-xml-doc.h: libvirt gobject integration + * + * Copyright (C) 2011 Red Hat + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * Author: Christophe Fergeau <cfergeau(a)gmail.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_XML_DOC_H__ +#define __LIBVIRT_GCONFIG_XML_DOC_H__ + +G_BEGIN_DECLS + +#define GVIR_TYPE_CONFIG_XML_DOC (gvir_config_xml_doc_get_type ()) +#define GVIR_CONFIG_XML_DOC(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GVIR_TYPE_CONFIG_XML_DOC, GVirConfigXmlDoc)) +#define GVIR_CONFIG_XML_DOC_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GVIR_TYPE_CONFIG_XML_DOC, GVirConfigXmlDocClass)) +#define GVIR_IS_CONFIG_XML_DOC(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GVIR_TYPE_CONFIG_XML_DOC)) +#define GVIR_IS_CONFIG_XML_DOC_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GVIR_TYPE_CONFIG_XML_DOC)) +#define GVIR_CONFIG_XML_DOC_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GVIR_TYPE_CONFIG_XML_DOC, GVirConfigXmlDocClass)) + +typedef struct _GVirConfigXmlDoc GVirConfigXmlDoc; +typedef struct _GVirConfigXmlDocPrivate GVirConfigXmlDocPrivate; +typedef struct _GVirConfigXmlDocClass GVirConfigXmlDocClass; + +struct _GVirConfigXmlDoc +{ + GObject parent; + + GVirConfigXmlDocPrivate *priv; + + /* Do not add fields to this struct */ +}; + +struct _GVirConfigXmlDocClass +{ + GObjectClass parent_class; + + gpointer padding[20]; +}; + + +GType gvir_config_xml_doc_get_type(void); + +GVirConfigXmlDoc *gvir_config_xml_doc_new(xmlDocPtr doc); + +G_END_DECLS + +#endif /* __LIBVIRT_GCONFIG_XML_DOC_H__ */ -- 1.7.7.3

2 25

[libvirt] [libvirt-glib] Remove transient domain reference on shutdown
by Zeeshan Ali (Khattak) 30 Nov '11

30 Nov '11

From: "Zeeshan Ali (Khattak)" <zeeshanak(a)gnome.org> --- libvirt-gobject/libvirt-gobject-connection.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/libvirt-gobject/libvirt-gobject-connection.c b/libvirt-gobject/libvirt-gobject-connection.c index b647bfa..59b828d 100644 --- a/libvirt-gobject/libvirt-gobject-connection.c +++ b/libvirt-gobject/libvirt-gobject-connection.c @@ -362,6 +362,15 @@ static int domain_event_cb(virConnectPtr conn G_GNUC_UNUSED, g_signal_emit_by_name(gdom, "stopped::from-snapshot"); else g_warn_if_reached(); + + if (virDomainIsPersistent(dom) != 1) { + g_mutex_lock(priv->lock); + g_hash_table_steal(priv->domains, uuid); + g_mutex_unlock(priv->lock); + + g_signal_emit(gconn, signals[VIR_DOMAIN_REMOVED], 0, gdom); + g_object_unref(gdom); + } break; default: -- 1.7.7.3

2 1

[libvirt] Associate a LUN as disk with WWNN/WWPN
by Osier Yang 30 Nov '11

30 Nov '11

Hi, all This is a rough thought about how to allow the user to associate a LUN as disk with WWNN/WWPN. Never mind if some thought is complete wrong, I'm complete new to this area. :-) The initial idea was to introduce new XML for the vHBA which the LUN which be assisned to in a domain XML, just like comment #2 of RHBZ# 543037: <quote> AFAIU libvirt needs a way to: - Associate a virtual adapter WWN with a VM (in the VM xml) - Learn to start a virtual adapter when the VM is started, and destroy the adapter when the VM is stopped. - Possibly a way to associate a WWN with a scsi pool, to start / stop a virtual adapter with the pool. </quote> But afer thinking more, I'd think it might be not good idea: As far as I could understand, the requirement of the BZ wants a way to create/migrate a guest with NPIV. I'm goint to talk create first,and migration then. === Creation If we try to support this all inside libvirt, it means we need to new XML for indicates the WWNN/WWPN of the vHBA or Physical HBA, this is fine we can do it, though it's a bit annoyed where to add it. The biggest problem is there is a race here, we can't known the path of the LUN unless the storage admin assigned (zone / mask, will already use assign for brevity) a LUN to the (v)HBA, and it appears on host successfully. However, domain define/create doesn't allow the disk source path be empty, except it's CDROM, or Floppy. The works which need to be done before domain define should be: - If the user wants to create new vHBA. 1) auto-generate /or specify WWNN/WWPN (with Qumranet's OUI: 00-1A-4A) 2) allows to select fabric WWN, (to guide the choice of which FC adapter to select for the Vport creation, assuming different adapters connect to different fabrics) 3) create the vHBA with virNodeDeviceCreateXML API 4) Ask / prompt the user to ask the storage admin assigns the LUN to the vHBA. 5) Waits for the LUN shows up on host (perhaps via storage pool API) 6) Use the LUN's path (e.g. /dev/disk/by-id/scsi-3600c0ff000d7a2a5d163ff4490100000000-part1) as the disk source path. - If the user wants to select a existed (v)HBA. 1), 2) and 3) are ommited 3) and 4) might be also ommited if there is a LUN already assigned to the selected (v)HBA. As we can see, there are lots of interaction. If we simply wants to do all these work inside libvirt, we lose the user friendly interaction, and just makes our life harder. So, I would these work should be done in external / upper apps, e.g. virt-manager, or Boxes in future. What libvirt needs to do (as far as I could get): 1) support the fabric WWN in node device XML 2) may be we can do auto-generating the WWNN/WWPN inside libvirt if they are not specified. But from a user's p.o.v, I'd see it is in UI, but not in codes silently. 3) perhaps provides methods to get the (v)HBA's fabric's WWN? === Migration If we do things as explained above for domain's creation, the disk XML will be like: <disk type='disk' device='disk'> <driver name='qemu' type='raw'/> <source file='/dev/disk/by-id/scsi-3600c0ff000d7a2a5d163ff4490100000000-part1/'> <target dev='vda' bus='virtio'/> <alias name='virtio-disk0'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x03 function='0x0'/> </disk> It's just similiar with disk which uses a normal disk image. So we needs to something to indentify it's special, it's a LUN assigned to a (v)HBA. Ways to do that in my mind are: 1) If we could find the WWNN/WWPN/fabricwwn by the LUN's path, (I'm not sure if there is a good way yet), things will be much simpler, what we need might be just a simple flag to tell the disk source path is LUN assigned to (v)HBA. e.g. <source file='$path_of_lun' type='fc_hba'/> 2) if there is no way to get the WWNN/WWPN/fabricwwn by LUN's path, we might need the whole config of (v)HBA. e.g. <souce protocol='fc' file='$path_of_lun'> <hba> <wwnn>$wwnn</wwnn> <wwpn>$wwpn</wwpn> <fabricwwn>$fabricwwn</fabricwwn> </hba> </source> And then in virt-manager or Boxes, it needs to detect if there is disk use FC LUN, if it's it should teach dest libvirt to create another vHBA, and assign the same LUN to it. Then migration could do just as normal. But problem of doing like so is the migration won't work anyway with virsh. Hmmm, /me thinking if it will be disireable to introduce hook support for migration. Things will be much simpler if we support hooks? Thoughts and Opinions? Regards, Osier

4 9

[libvirt] [PATCH] virsh: correct return value error
by ajia＠redhat.com 30 Nov '11

30 Nov '11

From: Alex Jia <ajia(a)redhat.com> The 'true' bool value should be 1, and false is 0. https://bugzilla.redhat.com/show_bug.cgi?id=758590 Signed-off-by: Alex Jia <ajia(a)redhat.com> --- tools/virsh.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index 01da8e5..618b0c1 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -1745,7 +1745,7 @@ cmdDomblklist(vshControl *ctl, const vshCmd *cmd) VIR_FREE(source); } - ret = 0; + ret = true; cleanup: VIR_FREE(disks); -- 1.7.1

3 3

[libvirt] [PATCH] util: avoid null deref on qcowXGetBackingStore
by ajia＠redhat.com 30 Nov '11

30 Nov '11

From: Alex Jia <ajia(a)redhat.com> Detected by Coverity. the only case is caller passes a NULL to 'format' variable, then taking 'if (format)' false branch, the function qcow2GetBackingStoreFormat will directly dereferences the NULL 'format' pointer variable. Signed-off-by: Alex Jia <ajia(a)redhat.com> --- src/util/storage_file.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/util/storage_file.c b/src/util/storage_file.c index f33ea74..ba9cfc5 100644 --- a/src/util/storage_file.c +++ b/src/util/storage_file.c @@ -333,7 +333,7 @@ qcowXGetBackingStore(char **res, * between the end of the header (QCOW2_HDR_TOTAL_SIZE) * and the start of the backingStoreName (offset) */ - if (isQCow2) + if (isQCow2 && format) qcow2GetBackingStoreFormat(format, buf, buf_size, QCOW2_HDR_TOTAL_SIZE, offset); return BACKING_STORE_OK; -- 1.7.1

2 1

[libvirt] [PATCH 00/14] Cleanup node suspend code
by Daniel P. Berrange 30 Nov '11

30 Nov '11

This patch series does a large number of pretty small / trivial cleanups of the recently committed node suspend code. There are a few important changes though - Patch 1 changes public API enum values - Patch 3 changes the capabilities XML schema - Patch 11 ensures we don't probe suspend info unles we need it - Patch 14 fixes a bug Obviously due to 1 & 3 we need to do this before the next release

4 44

[libvirt] [libvirt-glib] gir: use libraries from build tree, not installed ones
by Christophe Fergeau 30 Nov '11

30 Nov '11

If we don't explicitly mention path to our uninstalled libraries to g-ir-scanner, it will use installed libvirt-* libraries instead of the ones we just built to run a binary during the generation of the gir file. However this binary will have been compiled with the uninstalled ones, This is an issue if the installed libraries are not ABI compatible with the uninstalled one, and will cause a compile failure because the binary will fail to run. This fix has been suggested by Colin Walters (gobject-introspection maintainer). --- libvirt-gobject/Makefile.am | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/libvirt-gobject/Makefile.am b/libvirt-gobject/Makefile.am index 1e0f851..c4405f0 100644 --- a/libvirt-gobject/Makefile.am +++ b/libvirt-gobject/Makefile.am @@ -130,6 +130,8 @@ LibvirtGObject-1.0.gir: libvirt-gobject-1.0.la $(G_IR_SCANNER) Makefile.am --include-uninstalled $(top_builddir)/libvirt-gconfig/LibvirtGConfig-1.0.gir \ --identifier-prefix=GVir \ --symbol-prefix=gvir \ + --library=$(top_builddir)/libvirt-glib/libvirt-glib-1.0.la \ + --library=$(top_builddir)/libvirt-gconfig/libvirt-gconfig-1.0.la \ --library=$(builddir)/libvirt-gobject-1.0.la \ --output $@ \ -I$(top_builddir) \ -- 1.7.7.3

2 1

[libvirt] [PATCH 0/3 v2] Improve async signal safety of timestamp APIs
by Daniel P. Berrange 30 Nov '11

30 Nov '11

An update of https://www.redhat.com/archives/libvir-list/2011-November/msg01609.html In v2: - Rename all APIs which return with errno set to have a Raw postfix ( async signal safe) - Add variants of all APIs which raise errors (async signal dangerous)

2 6

[libvirt] [PATCH] virsh: Update docs for block related commands
by Osier Yang 30 Nov '11

30 Nov '11

commit 3ac26e26 allows to lookup the disk via both target name and source path. But virsh documents were not updated. --- tools/virsh.c | 15 ++++++++++----- tools/virsh.pod | 14 +++++++++----- 2 files changed, 19 insertions(+), 10 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index 27ecaf3..94b5478 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -1059,7 +1059,8 @@ static const vshCmdInfo info_domblkstat[] = { static const vshCmdOptDef opts_domblkstat[] = { {"domain", VSH_OT_DATA, VSH_OFLAG_REQ, N_("domain name, id or uuid")}, - {"device", VSH_OT_DATA, VSH_OFLAG_REQ, N_("block device")}, + {"device", VSH_OT_DATA, VSH_OFLAG_REQ, N_("Fully-qualified source path or unique " + "target name of the block device")}, {"human", VSH_OT_BOOL, 0, N_("print a more human readable output")}, {NULL, 0, 0, NULL} }; @@ -1637,7 +1638,8 @@ static const vshCmdInfo info_domblkinfo[] = { static const vshCmdOptDef opts_domblkinfo[] = { {"domain", VSH_OT_DATA, VSH_OFLAG_REQ, N_("domain name, id or uuid")}, - {"device", VSH_OT_DATA, VSH_OFLAG_REQ, N_("block device")}, + {"device", VSH_OT_DATA, VSH_OFLAG_REQ, N_("Fully-qualified source path or unique target" + "name of the block device")}, {NULL, 0, 0, NULL} }; @@ -5959,7 +5961,8 @@ static const vshCmdInfo info_block_pull[] = { static const vshCmdOptDef opts_block_pull[] = { {"domain", VSH_OT_DATA, VSH_OFLAG_REQ, N_("domain name, id or uuid")}, - {"path", VSH_OT_DATA, VSH_OFLAG_REQ, N_("Fully-qualified path of disk")}, + {"path", VSH_OT_DATA, VSH_OFLAG_REQ, N_("Fully-qualified source path or unique " + "target name of the disk")}, {"bandwidth", VSH_OT_DATA, VSH_OFLAG_NONE, N_("Bandwidth limit in MB/s")}, {NULL, 0, 0, NULL} }; @@ -5983,7 +5986,8 @@ static const vshCmdInfo info_block_job[] = { static const vshCmdOptDef opts_block_job[] = { {"domain", VSH_OT_DATA, VSH_OFLAG_REQ, N_("domain name, id or uuid")}, - {"path", VSH_OT_DATA, VSH_OFLAG_REQ, N_("Fully-qualified path of disk")}, + {"path", VSH_OT_DATA, VSH_OFLAG_REQ, N_("Fully-qualified source path or unique" + "target name of the disk")}, {"abort", VSH_OT_BOOL, VSH_OFLAG_NONE, N_("Abort the active job on the speficied disk")}, {"info", VSH_OT_BOOL, VSH_OFLAG_NONE, N_("Get active job information for the specified disk")}, {"bandwidth", VSH_OT_DATA, VSH_OFLAG_NONE, N_("Set the Bandwidth limit in MB/s")}, @@ -6039,7 +6043,8 @@ static const vshCmdInfo info_block_resize[] = { static const vshCmdOptDef opts_block_resize[] = { {"domain", VSH_OT_DATA, VSH_OFLAG_REQ, N_("domain name, id or uuid")}, - {"path", VSH_OT_DATA, VSH_OFLAG_REQ, N_("Fully-qualified path of block device")}, + {"path", VSH_OT_DATA, VSH_OFLAG_REQ, N_("Fully-qualified source path or unique " + "target name of the block device")}, {"size", VSH_OT_INT, VSH_OFLAG_REQ, N_("New size of the block device in kilobytes, " "the size must be integer")}, {NULL, 0, 0, NULL} diff --git a/tools/virsh.pod b/tools/virsh.pod index a5758f4..61951e6 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -569,14 +569,16 @@ image has been pulled, the disk no longer depends on the backing image. It pulls data for the entire disk in the background, the process of the operation can be checked with B<blockjob>. -I<path> specifies fully-qualified path of the disk. +I<path> specifies fully-qualified source path (<source file='name'/>) or +unique target name (<target dev='name'/>) of the disk. I<bandwidth> specifies copying bandwidth limit in Mbps. =item B<blockjob> I<domain> I<path> [I<--abort>] [I<--info>] [I<bandwidth>] Manage active block operations. -I<path> specifies fully-qualified path of the disk. +I<path> specifies fully-qualified source path (<source file='name'/>) or +unique target name (<target dev='name'/>) of the disk. If I<--abort> is specified, the active job on the specified disk will be aborted. If I<--info> is specified, the active job information on the specified @@ -585,9 +587,11 @@ I<bandwidth> can be used to set bandwidth limit for the active job. =item B<blockresize> I<domain> I<--path> I<--size> -Resize a block device of domain while the domain is running, I<--path> -specifies the absolute path of the block device, I<--size> specifies the -new size in kilobytes +Resize a block device of domain while the domain is running. + +I<path> specifies fully-qualified source path (<source file='name'/>) or +unique target name (<target dev='name'/>) of the disk. +I<--size> specifies the new size in kilobytes. =item B<dominfo> I<domain-id> -- 1.7.7.3

2 1

[libvirt] gdb works abnormally when debug the libvirt.
by ShaoHe Feng 30 Nov '11

30 Nov '11

When I to use gdb to check whether qemuMonitorJSONIOProcessEvent processes the Event that I expect. but the gdb works abnormally. I list the the position of the source file by gdb. It is the correct functionqemuMonitorJSONIOProcessEvent. However I set break point on this position. then "info b", it is the wrong function qemuMonitorJSONIOProcess. I debug my libvirt on Ubuntu 11.10 this time.But I have set a break point at this function on redhat 6.0 before, it can work well. My gcc version is: gcc (Ubuntu/Linaro 4.6.1-9ubuntu3) 4.6.1 My gdb version is: GNU gdb (Ubuntu/Linaro 7.3-0ubuntu2) 7.3-2011.08 here is the info: (gdb) list qemu/qemu_monitor_json.c:88 83 qemuMonitorJSONIOProcessEvent(qemuMonitorPtr mon, 84 virJSONValuePtr obj) 85 { 86 const char *type; 87 int i; 88 int findEventFlag = -1; 89 VIR_DEBUG("mon=%p obj=%p", mon, obj); 90 91 type = virJSONValueObjectGetString(obj, "event"); 92 if (!type) { (gdb) b qemu/qemu_monitor_json.c:88 Breakpoint 5 at 0x4a18d4: file qemu/qemu_monitor_json.c, line 88. (gdb) info b Num Type Disp Enb Address What 5 breakpoint keep y 0x00000000004a18d4 in qemuMonitorJSONIOProcess at qemu/qemu_monitor_json.c:88 (gdb)

3 3

[libvirt] [PATCH] build: fix typo in last patch
by Eric Blake 29 Nov '11

29 Nov '11

* src/remote_protocol-structs: Use correct RPC name. --- Pushing under the build-breaker rule. Osier attempted to fix this already, but added a typo. src/remote_protocol-structs | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/remote_protocol-structs b/src/remote_protocol-structs index 62c0248..927b6c6 100644 --- a/src/remote_protocol-structs +++ b/src/remote_protocol-structs @@ -2019,5 +2019,5 @@ enum remote_procedure { REMOTE_PROC_DOMAIN_EVENT_DISK_CHANGE = 248, REMOTE_PROC_DOMAIN_OPEN_GRAPHICS = 249, REMOTE_PROC_NODE_SUSPEND_FOR_DURATION = 250, - REMOTE_PROC_NODE_SUSPEND_FOR_DURATION = 251, + REMOTE_PROC_DOMAIN_BLOCK_RESIZE = 251, }; -- 1.7.7.3

1 0

[libvirt] [PATCH] Fix leak build config file path
by Daniel P. Berrange 29 Nov '11

29 Nov '11

From: "Daniel P. Berrange" <berrange(a)redhat.com> * src/libvirt.c: Free user directory path --- src/libvirt.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/src/libvirt.c b/src/libvirt.c index cdd111c..55ef743 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -974,8 +974,11 @@ virConnectConfigFile(void) goto error; if (virAsprintf(&path, "%s/.libvirt/libvirt.conf", - userdir) < 0) + userdir) < 0) { + VIR_FREE(userdir); goto no_memory; + } + VIR_FREE(userdir); } return path; -- 1.7.6.4

2 1

[libvirt] [PATCH 0/5] Interface pools and passthrough mode
by Shradha Shah 29 Nov '11

29 Nov '11

Interface Pools and Passthrough mode: Current Method: The passthrough mode uses a macvtap âdirectâ connection to connect each guest to the network. The physical interface to be used is picked from among those listed in <interface> sub elements of the <forward> element. The current specification for <forward> extends to allow 0 or more <interface> sub-elements: Example: <forward mode='passthrough' dev='eth10'/> <interface dev='eth10'/> <interface dev='eth12'/> <interface dev='eth18'/> <interface dev='eth20'/> </forward> However with an ethernet card with 64 VF's or more, the above method gets tedious on the system. On the other hand, just parameterizing a string (eth%d) is inadequate, eg, when there are multiple non-contiguous ranges. Proposed Method: The 5 patches provided along with this introductory e-mail i) Introduce a structure to store the state of all the virtual functions attached to each physical function ii) Find a free virtual function given the physical function. The forward specification will hence only mention the physical function as the interface sub element: Example: <forward mode='passthrough' dev='eth2'/> <interface dev='eth2'/> </forward> Shradha Shah (5): Moving the declaration of _pciDevice and _pciDeviceList to pci.h Added function pciSysfsFile to enable access to the PCI SYSFS files. Adding functions virNetDevGetVirtualFunctions and virNetDevGetNetName virNetDevGetVirtualFunctions: Gets the BDF of all the Virtual Functions given a physical function virNetDevGetNetName: Gets the interface name of the PCI Device. Addition of a new device structure to store the state of a Virtual Function Modifications to the Physical Device Structure to store state of its Virtual Functions If a system has 64 or more VF's, it is quite tedious to mention each VF in the interface pool. The following modification find a Free VF given a Physical Function when mode=passthrough. We also save the state of each VF. Hence modifications to networkAllocateActualDevice, networkNotifyActualDevice and networkReleaseActualDevice were required. The following patch does just that. src/conf/network_conf.c | 19 ++++- src/conf/network_conf.h | 10 ++ src/network/bridge_driver.c | 208 +++++++++++++++++++++++++++++++++++++------ src/util/pci.c | 52 ++++------- src/util/pci.h | 36 ++++++++ src/util/virnetdev.c | 89 ++++++++++++++++++ src/util/virnetdev.h | 10 ++ 7 files changed, 359 insertions(+), 65 deletions(-) -- 1.7.4.4

1 0

[libvirt] [libvirt-glib] gir: Use --pkg=libxml-2.0 instead of LIBXML2_CFLAGS
by Christophe Fergeau 29 Nov '11

29 Nov '11

g-ir-scanner has a standard way of getting the flags for libraries providing .pc files, this commit uses this --pkg flag for libxml instead of using LIBXML2_CFLAGS we computed ourselves. --- libvirt-gconfig/Makefile.am | 2 +- libvirt-gobject/Makefile.am | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libvirt-gconfig/Makefile.am b/libvirt-gconfig/Makefile.am index b14bd92..fe5b1a5 100644 --- a/libvirt-gconfig/Makefile.am +++ b/libvirt-gconfig/Makefile.am @@ -119,9 +119,9 @@ LibvirtGConfig-1.0.gir: libvirt-gconfig-1.0.la $(G_IR_SCANNER) Makefile.am --output $@ \ -I$(top_builddir) \ -I$(top_srcdir) \ - $(LIBXML2_CFLAGS) \ --verbose \ --c-include="libvirt-gconfig/libvirt-gconfig.h" \ + --pkg=libxml-2.0 \ --pkg-export=libvirt-gconfig-1.0 \ $(srcdir)/libvirt-gconfig.h \ $(GCONFIG_SOURCE_FILES:%=$(srcdir)/%) \ diff --git a/libvirt-gobject/Makefile.am b/libvirt-gobject/Makefile.am index 5aa1080..ad746bb 100644 --- a/libvirt-gobject/Makefile.am +++ b/libvirt-gobject/Makefile.am @@ -133,10 +133,10 @@ LibvirtGObject-1.0.gir: libvirt-gobject-1.0.la $(G_IR_SCANNER) Makefile.am --output $@ \ -I$(top_builddir) \ -I$(top_srcdir) \ - $(LIBXML2_CFLAGS) \ --verbose \ - --pkg=gthread-2.0 \ --c-include="libvirt-gobject/libvirt-gobject.h" \ + --pkg=gthread-2.0 \ + --pkg=libxml-2.0 \ --pkg-export=libvirt-gobject-1.0 \ $(srcdir)/libvirt-gobject.h \ $(GOBJECT_SOURCE_FILES:%=$(srcdir)/%) \ -- 1.7.7.3

2 1

[libvirt] [PATCH 0/5 v2] Support block device online resizing
by Osier Yang 29 Nov '11

29 Nov '11

This patch series introduce new API "virDomainBlockResize" to expose qemu monitor command "block_size", which is for resizing the a block device while the domain is running. The prototype for the new API is: int virDomainBlockResize (virDomainPtr dom, const char *disk, unsigned long long size, unsigned int flags) * "@disk" is the absolute source path or device target shorthand of the block device. * The units for "@size" is kilobytes. * "@flags" is unused currently. [PATCH 1/5] block_resize: Define the new API [PATCH 2/5] block_resize: Wire up the remote protocol [PATCH 3/5] block_resize: Implement qemu monitor functions [PATCH 4/5] block_resize: Implement qemu driver method [PATCH 5/5] block_resize: Expose the new API to virsh v1: http://www.redhat.com/archives/libvir-list/2011-July/msg01788.html v1 ~ v2: * Nearly just rebasing, with small improvements, nothing new except updating the API definitions to be consistent with commit 3ac26e26. Regards, Osier

2 11

[libvirt] All virsh commands testing failed with git head
by Osier Yang 29 Nov '11

29 Nov '11

Part of the error log is pasted, looks like it's caused by the calling of virNodeSuspendInit in virInitialize. ================================ cd tests; LIBVIRT_DEBUG=1 VIR_TEST_DEBUG=1 ./virshtest; cd - TEST: virshtest 1) virsh list (default) ... Offset 0 Expect [ ] Actual [2011-11-29 18:44:38.153: 24448: info : libvirt version: 0.9.7 2011-11-29 18:44:38.153: 24448: error : virNodeSuspendInit:86 : Failed to get host power management features ] ... FAILED 2) virsh list (custom) ... Offset 0 Expect [ ] Actual [2011-11-29 18:44:38.180: 24463: info : libvirt version: 0.9.7 2011-11-29 18:44:38.180: 24463: error : virNodeSuspendInit:86 : Failed to get host power management features ] ... FAILED 3) virsh nodeinfo (default) ... Offset 0 Expect [C] Actual [2011-11-29 18:44:38.212: 24478: info : libvirt version: 0.9.7 2011-11-29 18:44:38.212: 24478: error : virNodeSuspendInit:86 : Failed to get host power management features C] ... FAILED Regards, Osier

3 4

[libvirt] [libvirt-glib 1/5] Add various missing packages to libvirt-gobject-1.0.pc
by Christophe Fergeau 29 Nov '11

29 Nov '11

--- libvirt-gobject-1.0.pc.in | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libvirt-gobject-1.0.pc.in b/libvirt-gobject-1.0.pc.in index 5442ba4..3141e87 100644 --- a/libvirt-gobject-1.0.pc.in +++ b/libvirt-gobject-1.0.pc.in @@ -6,7 +6,7 @@ includedir=@includedir@ Name: libvirt-gobject Version: @VERSION@ Description: libvirt GObject library -Requires: gobject-2.0 libvirt-gconfig-1.0 +Requires: gio-2.0 gobject-2.0 libvirt-gconfig-1.0 Libs: -L${libdir} -lvirt-gobject-1.0 -Libs.private: @LIBVIRT_LIBS@ +Requires.private: gthread-2.0 libvirt Cflags: -I${includedir}/libvirt-gobject-1.0 -- 1.7.7.3

2 12

[libvirt] [PATCH 0/3] Improve async signal safety of timestamp APIs
by Daniel P. Berrange 29 Nov '11

29 Nov '11

There are rare reports of libvirt deadlocking itself which show a fork'd, but not exec'd, child process stuck in localtime_r(). This is because localtime_r() is not an async signal, so if we happened to fork() at the exact time another thread was calling localtime_r() we could get stuck with a stale lock in the child. Although we go to pains to protect the libvirt logging code by acquiring the mutex before forking, this is not sufficient, because some non-logging related code could invoke virTimestamp() which calls localtime_r() too. The only sane approach to fix this is to make our timestamp generation APIs thread safe, by doing a clean impl of gmtime() and strftime() inside libvirt using static buffers and only async safe POSIX apis.

2 5

[libvirt] [libvirt-glib] Ensure 'domain-added' signal on transient domain creation
by Zeeshan Ali (Khattak) 29 Nov '11

29 Nov '11

From: "Zeeshan Ali (Khattak)" <zeeshanak(a)gnome.org> --- libvirt-gobject/libvirt-gobject-connection.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/libvirt-gobject/libvirt-gobject-connection.c b/libvirt-gobject/libvirt-gobject-connection.c index a258847..02b54a1 100644 --- a/libvirt-gobject/libvirt-gobject-connection.c +++ b/libvirt-gobject/libvirt-gobject-connection.c @@ -264,6 +264,7 @@ static int domain_event_cb(virConnectPtr conn G_GNUC_UNUSED, GVirConnection *gconn = opaque; GVirDomain *gdom; GVirConnectionPrivate *priv = gconn->priv; + gboolean was_unknown = FALSE; if (virDomainGetUUIDString(dom, uuid) < 0) { g_warning("Failed to get domain UUID on %p", dom); @@ -282,6 +283,8 @@ static int domain_event_cb(virConnectPtr conn G_GNUC_UNUSED, g_mutex_lock(priv->lock); g_hash_table_insert(priv->domains, (gpointer)gvir_domain_get_uuid(gdom), gdom); g_mutex_unlock(priv->lock); + + was_unknown = TRUE; } switch (event) { @@ -307,9 +310,12 @@ static int domain_event_cb(virConnectPtr conn G_GNUC_UNUSED, break; case VIR_DOMAIN_EVENT_STARTED: - if (detail == VIR_DOMAIN_EVENT_STARTED_BOOTED) + if (detail == VIR_DOMAIN_EVENT_STARTED_BOOTED) { + if (was_unknown) + /* Most probably a transient domain */ + g_signal_emit(gconn, signals[VIR_DOMAIN_ADDED], 0, gdom); g_signal_emit_by_name(gdom, "started::booted"); - else if (detail == VIR_DOMAIN_EVENT_STARTED_MIGRATED) + } else if (detail == VIR_DOMAIN_EVENT_STARTED_MIGRATED) g_signal_emit_by_name(gdom, "started::migrated"); else if (detail == VIR_DOMAIN_EVENT_STARTED_RESTORED) g_signal_emit_by_name(gdom, "started::restored"); -- 1.7.7.3

2 1

[libvirt] [libvirt-glib] Remove now redundant debug system
by Zeeshan Ali (Khattak) 29 Nov '11

29 Nov '11

From: "Zeeshan Ali (Khattak)" <zeeshanak(a)gnome.org> GLib >= 2.31 filters debug messages by default now[1] and provides ways to output debug log from selected domains only. This patch won't be any good without defining proper fine-grained log domains though. http://blogs.gnome.org/mclasen/2011/11/09/better-logging/ --- examples/event-test.c | 4 +-- libvirt-gconfig/libvirt-gconfig-capabilities.c | 6 +---- libvirt-gconfig/libvirt-gconfig-domain-clock.c | 6 +---- libvirt-gconfig/libvirt-gconfig-domain-device.c | 6 +---- libvirt-gconfig/libvirt-gconfig-domain-disk.c | 6 +---- .../libvirt-gconfig-domain-graphics-spice.c | 6 +---- libvirt-gconfig/libvirt-gconfig-domain-graphics.c | 6 +---- libvirt-gconfig/libvirt-gconfig-domain-input.c | 6 +---- .../libvirt-gconfig-domain-interface-network.c | 6 +---- libvirt-gconfig/libvirt-gconfig-domain-interface.c | 6 +---- libvirt-gconfig/libvirt-gconfig-domain-os.c | 6 +---- libvirt-gconfig/libvirt-gconfig-domain-snapshot.c | 6 +---- libvirt-gconfig/libvirt-gconfig-domain-timer.c | 6 +---- libvirt-gconfig/libvirt-gconfig-domain-video.c | 6 +---- libvirt-gconfig/libvirt-gconfig-domain.c | 6 +---- libvirt-gconfig/libvirt-gconfig-interface.c | 6 +---- libvirt-gconfig/libvirt-gconfig-network-filter.c | 6 +---- libvirt-gconfig/libvirt-gconfig-network.c | 6 +---- libvirt-gconfig/libvirt-gconfig-node-device.c | 6 +---- libvirt-gconfig/libvirt-gconfig-object.c | 10 +------ libvirt-gconfig/libvirt-gconfig-secret.c | 6 +---- libvirt-gconfig/libvirt-gconfig-storage-pool.c | 6 +---- libvirt-gconfig/libvirt-gconfig-storage-vol.c | 6 +---- libvirt-glib/libvirt-glib-event.c | 26 ++++++++----------- libvirt-glib/libvirt-glib-main.c | 10 +------- libvirt-gobject/libvirt-gobject-connection.c | 12 +++------ libvirt-gobject/libvirt-gobject-domain-device.c | 8 +---- libvirt-gobject/libvirt-gobject-domain-disk.c | 8 +---- libvirt-gobject/libvirt-gobject-domain-interface.c | 8 +---- libvirt-gobject/libvirt-gobject-domain-snapshot.c | 8 +---- libvirt-gobject/libvirt-gobject-domain.c | 8 +---- libvirt-gobject/libvirt-gobject-input-stream.c | 6 +---- libvirt-gobject/libvirt-gobject-interface.c | 8 +---- libvirt-gobject/libvirt-gobject-main.c | 8 ------ libvirt-gobject/libvirt-gobject-manager.c | 8 +---- libvirt-gobject/libvirt-gobject-network-filter.c | 8 +---- libvirt-gobject/libvirt-gobject-network.c | 8 +---- libvirt-gobject/libvirt-gobject-node-device.c | 8 +---- libvirt-gobject/libvirt-gobject-output-stream.c | 6 +---- libvirt-gobject/libvirt-gobject-secret.c | 8 +---- libvirt-gobject/libvirt-gobject-storage-pool.c | 8 +---- libvirt-gobject/libvirt-gobject-storage-vol.c | 8 +---- libvirt-gobject/libvirt-gobject-stream.c | 6 +---- 43 files changed, 69 insertions(+), 249 deletions(-) diff --git a/examples/event-test.c b/examples/event-test.c index fdd70bf..4fb000e 100644 --- a/examples/event-test.c +++ b/examples/event-test.c @@ -6,8 +6,6 @@ #include <libvirt/libvirt.h> #include <libvirt-glib/libvirt-glib.h> -#define DEBUG0(fmt) printf("%s:%d :: " fmt "\n", __FUNCTION__, __LINE__) -#define DEBUG(fmt, ...) printf("%s:%d: " fmt "\n", __FUNCTION__, __LINE__, __VA_ARGS__) #define STREQ(a,b) (strcmp((a),(b)) == 0) #ifndef ATTRIBUTE_UNUSED @@ -171,7 +169,7 @@ int main(int argc, char **argv) return -1; } - DEBUG0("Registering domain event cbs"); + g_debug("Registering domain event cbs"); /* Add 2 callbacks to prove this works with more than just one */ virConnectDomainEventRegister(dconn, myDomainEventCallback1, NULL, NULL); diff --git a/libvirt-gconfig/libvirt-gconfig-capabilities.c b/libvirt-gconfig/libvirt-gconfig-capabilities.c index 70bd33d..b517944 100644 --- a/libvirt-gconfig/libvirt-gconfig-capabilities.c +++ b/libvirt-gconfig/libvirt-gconfig-capabilities.c @@ -27,10 +27,6 @@ #include "libvirt-gconfig/libvirt-gconfig.h" -extern gboolean debugFlag; - -#define DEBUG(fmt, ...) do { if (G_UNLIKELY(debugFlag)) g_debug(fmt, ## __VA_ARGS__); } while (0) - #define GVIR_CONFIG_CAPABILITIES_GET_PRIVATE(obj) \ (G_TYPE_INSTANCE_GET_PRIVATE((obj), GVIR_TYPE_CONFIG_CAPABILITIES, GVirConfigCapabilitiesPrivate)) @@ -50,7 +46,7 @@ static void gvir_config_capabilities_class_init(GVirConfigCapabilitiesClass *kla static void gvir_config_capabilities_init(GVirConfigCapabilities *conn) { - DEBUG("Init GVirConfigCapabilities=%p", conn); + g_debug("Init GVirConfigCapabilities=%p", conn); conn->priv = GVIR_CONFIG_CAPABILITIES_GET_PRIVATE(conn); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain-clock.c b/libvirt-gconfig/libvirt-gconfig-domain-clock.c index 27d1e67..d092b64 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-clock.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-clock.c @@ -30,10 +30,6 @@ #include "libvirt-gconfig/libvirt-gconfig-helpers-private.h" #include "libvirt-gconfig/libvirt-gconfig-object-private.h" -extern gboolean debugFlag; - -#define DEBUG(fmt, ...) do { if (G_UNLIKELY(debugFlag)) g_debug(fmt, ## __VA_ARGS__); } while (0) - #define GVIR_CONFIG_DOMAIN_CLOCK_GET_PRIVATE(obj) \ (G_TYPE_INSTANCE_GET_PRIVATE((obj), GVIR_TYPE_CONFIG_DOMAIN_CLOCK, GVirConfigDomainClockPrivate)) @@ -53,7 +49,7 @@ static void gvir_config_domain_clock_class_init(GVirConfigDomainClockClass *klas static void gvir_config_domain_clock_init(GVirConfigDomainClock *klock) { - DEBUG("Init GVirConfigDomainClock=%p", klock); + g_debug("Init GVirConfigDomainClock=%p", klock); klock->priv = GVIR_CONFIG_DOMAIN_CLOCK_GET_PRIVATE(klock); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain-device.c b/libvirt-gconfig/libvirt-gconfig-domain-device.c index 6dd0df1..1c4e465 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-device.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-device.c @@ -28,10 +28,6 @@ #include "libvirt-gconfig/libvirt-gconfig.h" -extern gboolean debugFlag; - -#define DEBUG(fmt, ...) do { if (G_UNLIKELY(debugFlag)) g_debug(fmt, ## __VA_ARGS__); } while (0) - #define GVIR_CONFIG_DOMAIN_DEVICE_GET_PRIVATE(obj) \ (G_TYPE_INSTANCE_GET_PRIVATE((obj), GVIR_TYPE_CONFIG_DOMAIN_DEVICE, GVirConfigDomainDevicePrivate)) @@ -51,7 +47,7 @@ static void gvir_config_domain_device_class_init(GVirConfigDomainDeviceClass *kl static void gvir_config_domain_device_init(GVirConfigDomainDevice *device) { - DEBUG("Init GVirConfigDomainDevice=%p", device); + g_debug("Init GVirConfigDomainDevice=%p", device); device->priv = GVIR_CONFIG_DOMAIN_DEVICE_GET_PRIVATE(device); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain-disk.c b/libvirt-gconfig/libvirt-gconfig-domain-disk.c index 8a9d6e6..879afc7 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-disk.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-disk.c @@ -30,10 +30,6 @@ #include "libvirt-gconfig/libvirt-gconfig-helpers-private.h" #include "libvirt-gconfig/libvirt-gconfig-object-private.h" -extern gboolean debugFlag; - -#define DEBUG(fmt, ...) do { if (G_UNLIKELY(debugFlag)) g_debug(fmt, ## __VA_ARGS__); } while (0) - #define GVIR_CONFIG_DOMAIN_DISK_GET_PRIVATE(obj) \ (G_TYPE_INSTANCE_GET_PRIVATE((obj), GVIR_TYPE_CONFIG_DOMAIN_DISK, GVirConfigDomainDiskPrivate)) @@ -53,7 +49,7 @@ static void gvir_config_domain_disk_class_init(GVirConfigDomainDiskClass *klass) static void gvir_config_domain_disk_init(GVirConfigDomainDisk *disk) { - DEBUG("Init GVirConfigDomainDisk=%p", disk); + g_debug("Init GVirConfigDomainDisk=%p", disk); disk->priv = GVIR_CONFIG_DOMAIN_DISK_GET_PRIVATE(disk); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain-graphics-spice.c b/libvirt-gconfig/libvirt-gconfig-domain-graphics-spice.c index e5c2ff8..1539009 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-graphics-spice.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-graphics-spice.c @@ -30,10 +30,6 @@ #include "libvirt-gconfig/libvirt-gconfig-helpers-private.h" #include "libvirt-gconfig/libvirt-gconfig-object-private.h" -extern gboolean debugFlag; - -#define DEBUG(fmt, ...) do { if (G_UNLIKELY(debugFlag)) g_debug(fmt, ## __VA_ARGS__); } while (0) - #define GVIR_CONFIG_DOMAIN_GRAPHICS_SPICE_GET_PRIVATE(obj) \ (G_TYPE_INSTANCE_GET_PRIVATE((obj), GVIR_TYPE_CONFIG_DOMAIN_GRAPHICS_SPICE, GVirConfigDomainGraphicsSpicePrivate)) @@ -53,7 +49,7 @@ static void gvir_config_domain_graphics_spice_class_init(GVirConfigDomainGraphic static void gvir_config_domain_graphics_spice_init(GVirConfigDomainGraphicsSpice *graphics_spice) { - DEBUG("Init GVirConfigDomainGraphicsSpice=%p", graphics_spice); + g_debug("Init GVirConfigDomainGraphicsSpice=%p", graphics_spice); graphics_spice->priv = GVIR_CONFIG_DOMAIN_GRAPHICS_SPICE_GET_PRIVATE(graphics_spice); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain-graphics.c b/libvirt-gconfig/libvirt-gconfig-domain-graphics.c index 1c2a2ad..833f693 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-graphics.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-graphics.c @@ -28,10 +28,6 @@ #include "libvirt-gconfig/libvirt-gconfig.h" -extern gboolean debugFlag; - -#define DEBUG(fmt, ...) do { if (G_UNLIKELY(debugFlag)) g_debug(fmt, ## __VA_ARGS__); } while (0) - #define GVIR_CONFIG_DOMAIN_GRAPHICS_GET_PRIVATE(obj) \ (G_TYPE_INSTANCE_GET_PRIVATE((obj), GVIR_TYPE_CONFIG_DOMAIN_GRAPHICS, GVirConfigDomainGraphicsPrivate)) @@ -51,7 +47,7 @@ static void gvir_config_domain_graphics_class_init(GVirConfigDomainGraphicsClass static void gvir_config_domain_graphics_init(GVirConfigDomainGraphics *graphics) { - DEBUG("Init GVirConfigDomainGraphics=%p", graphics); + g_debug("Init GVirConfigDomainGraphics=%p", graphics); graphics->priv = GVIR_CONFIG_DOMAIN_GRAPHICS_GET_PRIVATE(graphics); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain-input.c b/libvirt-gconfig/libvirt-gconfig-domain-input.c index ad11472..5c9b4ef 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-input.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-input.c @@ -30,10 +30,6 @@ #include "libvirt-gconfig/libvirt-gconfig-helpers-private.h" #include "libvirt-gconfig/libvirt-gconfig-object-private.h" -extern gboolean debugFlag; - -#define DEBUG(fmt, ...) do { if (G_UNLIKELY(debugFlag)) g_debug(fmt, ## __VA_ARGS__); } while (0) - #define GVIR_CONFIG_DOMAIN_INPUT_GET_PRIVATE(obj) \ (G_TYPE_INSTANCE_GET_PRIVATE((obj), GVIR_TYPE_CONFIG_DOMAIN_INPUT, GVirConfigDomainInputPrivate)) @@ -53,7 +49,7 @@ static void gvir_config_domain_input_class_init(GVirConfigDomainInputClass *klas static void gvir_config_domain_input_init(GVirConfigDomainInput *device_input) { - DEBUG("Init GVirConfigDomainInput=%p", device_input); + g_debug("Init GVirConfigDomainInput=%p", device_input); device_input->priv = GVIR_CONFIG_DOMAIN_INPUT_GET_PRIVATE(device_input); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain-interface-network.c b/libvirt-gconfig/libvirt-gconfig-domain-interface-network.c index e559df4..02fc2eb 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-interface-network.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-interface-network.c @@ -30,10 +30,6 @@ #include "libvirt-gconfig/libvirt-gconfig-helpers-private.h" #include "libvirt-gconfig/libvirt-gconfig-object-private.h" -extern gboolean debugFlag; - -#define DEBUG(fmt, ...) do { if (G_UNLIKELY(debugFlag)) g_debug(fmt, ## __VA_ARGS__); } while (0) - #define GVIR_CONFIG_DOMAIN_INTERFACE_NETWORK_GET_PRIVATE(obj) \ (G_TYPE_INSTANCE_GET_PRIVATE((obj), GVIR_TYPE_CONFIG_DOMAIN_INTERFACE_NETWORK, GVirConfigDomainInterfaceNetworkPrivate)) @@ -53,7 +49,7 @@ static void gvir_config_domain_interface_network_class_init(GVirConfigDomainInte static void gvir_config_domain_interface_network_init(GVirConfigDomainInterfaceNetwork *conn) { - DEBUG("Init GVirConfigDomainInterfaceNetwork=%p", conn); + g_debug("Init GVirConfigDomainInterfaceNetwork=%p", conn); conn->priv = GVIR_CONFIG_DOMAIN_INTERFACE_NETWORK_GET_PRIVATE(conn); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain-interface.c b/libvirt-gconfig/libvirt-gconfig-domain-interface.c index 3af98ee..c825fee 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-interface.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-interface.c @@ -27,10 +27,6 @@ #include "libvirt-gconfig/libvirt-gconfig.h" -extern gboolean debugFlag; - -#define DEBUG(fmt, ...) do { if (G_UNLIKELY(debugFlag)) g_debug(fmt, ## __VA_ARGS__); } while (0) - #define GVIR_CONFIG_DOMAIN_INTERFACE_GET_PRIVATE(obj) \ (G_TYPE_INSTANCE_GET_PRIVATE((obj), GVIR_TYPE_CONFIG_DOMAIN_INTERFACE, GVirConfigDomainInterfacePrivate)) @@ -50,7 +46,7 @@ static void gvir_config_domain_interface_class_init(GVirConfigDomainInterfaceCla static void gvir_config_domain_interface_init(GVirConfigDomainInterface *interface) { - DEBUG("Init GVirConfigDomainInterface=%p", interface); + g_debug("Init GVirConfigDomainInterface=%p", interface); interface->priv = GVIR_CONFIG_DOMAIN_INTERFACE_GET_PRIVATE(interface); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain-os.c b/libvirt-gconfig/libvirt-gconfig-domain-os.c index f1802ae..f5939d8 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-os.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-os.c @@ -30,10 +30,6 @@ #include "libvirt-gconfig/libvirt-gconfig-helpers-private.h" #include "libvirt-gconfig/libvirt-gconfig-object-private.h" -extern gboolean debugFlag; - -#define DEBUG(fmt, ...) do { if (G_UNLIKELY(debugFlag)) g_debug(fmt, ## __VA_ARGS__); } while (0) - #define GVIR_CONFIG_DOMAIN_OS_GET_PRIVATE(obj) \ (G_TYPE_INSTANCE_GET_PRIVATE((obj), GVIR_TYPE_CONFIG_DOMAIN_OS, GVirConfigDomainOsPrivate)) @@ -53,7 +49,7 @@ static void gvir_config_domain_os_class_init(GVirConfigDomainOsClass *klass) static void gvir_config_domain_os_init(GVirConfigDomainOs *os) { - DEBUG("Init GVirConfigDomainOs=%p", os); + g_debug("Init GVirConfigDomainOs=%p", os); os->priv = GVIR_CONFIG_DOMAIN_OS_GET_PRIVATE(os); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain-snapshot.c b/libvirt-gconfig/libvirt-gconfig-domain-snapshot.c index 5835e69..421269d 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-snapshot.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-snapshot.c @@ -27,10 +27,6 @@ #include "libvirt-gconfig/libvirt-gconfig.h" -extern gboolean debugFlag; - -#define DEBUG(fmt, ...) do { if (G_UNLIKELY(debugFlag)) g_debug(fmt, ## __VA_ARGS__); } while (0) - #define GVIR_CONFIG_DOMAIN_SNAPSHOT_GET_PRIVATE(obj) \ (G_TYPE_INSTANCE_GET_PRIVATE((obj), GVIR_TYPE_CONFIG_DOMAIN_SNAPSHOT, GVirConfigDomainSnapshotPrivate)) @@ -50,7 +46,7 @@ static void gvir_config_domain_snapshot_class_init(GVirConfigDomainSnapshotClass static void gvir_config_domain_snapshot_init(GVirConfigDomainSnapshot *conn) { - DEBUG("Init GVirConfigDomainSnapshot=%p", conn); + g_debug("Init GVirConfigDomainSnapshot=%p", conn); conn->priv = GVIR_CONFIG_DOMAIN_SNAPSHOT_GET_PRIVATE(conn); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain-timer.c b/libvirt-gconfig/libvirt-gconfig-domain-timer.c index e03a2a2..c1610fa 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-timer.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-timer.c @@ -28,10 +28,6 @@ #include "libvirt-gconfig/libvirt-gconfig.h" -extern gboolean debugFlag; - -#define DEBUG(fmt, ...) do { if (G_UNLIKELY(debugFlag)) g_debug(fmt, ## __VA_ARGS__); } while (0) - #define GVIR_CONFIG_DOMAIN_TIMER_GET_PRIVATE(obj) \ (G_TYPE_INSTANCE_GET_PRIVATE((obj), GVIR_TYPE_CONFIG_DOMAIN_TIMER, GVirConfigDomainTimerPrivate)) @@ -51,7 +47,7 @@ static void gvir_config_domain_timer_class_init(GVirConfigDomainTimerClass *klas static void gvir_config_domain_timer_init(GVirConfigDomainTimer *timer) { - DEBUG("Init GVirConfigDomainTimer=%p", timer); + g_debug("Init GVirConfigDomainTimer=%p", timer); timer->priv = GVIR_CONFIG_DOMAIN_TIMER_GET_PRIVATE(timer); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain-video.c b/libvirt-gconfig/libvirt-gconfig-domain-video.c index 8c6c9fb..7c62985 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-video.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-video.c @@ -30,10 +30,6 @@ #include "libvirt-gconfig/libvirt-gconfig-helpers-private.h" #include "libvirt-gconfig/libvirt-gconfig-object-private.h" -extern gboolean debugFlag; - -#define DEBUG(fmt, ...) do { if (G_UNLIKELY(debugFlag)) g_debug(fmt, ## __VA_ARGS__); } while (0) - #define GVIR_CONFIG_DOMAIN_VIDEO_GET_PRIVATE(obj) \ (G_TYPE_INSTANCE_GET_PRIVATE((obj), GVIR_TYPE_CONFIG_DOMAIN_VIDEO, GVirConfigDomainVideoPrivate)) @@ -53,7 +49,7 @@ static void gvir_config_domain_video_class_init(GVirConfigDomainVideoClass *klas static void gvir_config_domain_video_init(GVirConfigDomainVideo *video) { - DEBUG("Init GVirConfigDomainVideo=%p", video); + g_debug("Init GVirConfigDomainVideo=%p", video); video->priv = GVIR_CONFIG_DOMAIN_VIDEO_GET_PRIVATE(video); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain.c b/libvirt-gconfig/libvirt-gconfig-domain.c index 2c21219..8f59dc4 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain.c +++ b/libvirt-gconfig/libvirt-gconfig-domain.c @@ -29,10 +29,6 @@ #include "libvirt-gconfig/libvirt-gconfig-helpers-private.h" #include "libvirt-gconfig/libvirt-gconfig-object-private.h" -extern gboolean debugFlag; - -#define DEBUG(fmt, ...) do { if (G_UNLIKELY(debugFlag)) g_debug(fmt, ## __VA_ARGS__); } while (0) - #define GVIR_CONFIG_DOMAIN_GET_PRIVATE(obj) \ (G_TYPE_INSTANCE_GET_PRIVATE((obj), GVIR_TYPE_CONFIG_DOMAIN, GVirConfigDomainPrivate)) @@ -151,7 +147,7 @@ static void gvir_config_domain_class_init(GVirConfigDomainClass *klass) static void gvir_config_domain_init(GVirConfigDomain *conn) { - DEBUG("Init GVirConfigDomain=%p", conn); + g_debug("Init GVirConfigDomain=%p", conn); conn->priv = GVIR_CONFIG_DOMAIN_GET_PRIVATE(conn); } diff --git a/libvirt-gconfig/libvirt-gconfig-interface.c b/libvirt-gconfig/libvirt-gconfig-interface.c index cffd840..6152c35 100644 --- a/libvirt-gconfig/libvirt-gconfig-interface.c +++ b/libvirt-gconfig/libvirt-gconfig-interface.c @@ -27,10 +27,6 @@ #include "libvirt-gconfig/libvirt-gconfig.h" -extern gboolean debugFlag; - -#define DEBUG(fmt, ...) do { if (G_UNLIKELY(debugFlag)) g_debug(fmt, ## __VA_ARGS__); } while (0) - #define GVIR_CONFIG_INTERFACE_GET_PRIVATE(obj) \ (G_TYPE_INSTANCE_GET_PRIVATE((obj), GVIR_TYPE_CONFIG_INTERFACE, GVirConfigInterfacePrivate)) @@ -50,7 +46,7 @@ static void gvir_config_interface_class_init(GVirConfigInterfaceClass *klass) static void gvir_config_interface_init(GVirConfigInterface *conn) { - DEBUG("Init GVirConfigInterface=%p", conn); + g_debug("Init GVirConfigInterface=%p", conn); conn->priv = GVIR_CONFIG_INTERFACE_GET_PRIVATE(conn); } diff --git a/libvirt-gconfig/libvirt-gconfig-network-filter.c b/libvirt-gconfig/libvirt-gconfig-network-filter.c index dcf9e56..47469ed 100644 --- a/libvirt-gconfig/libvirt-gconfig-network-filter.c +++ b/libvirt-gconfig/libvirt-gconfig-network-filter.c @@ -27,10 +27,6 @@ #include "libvirt-gconfig/libvirt-gconfig.h" -extern gboolean debugFlag; - -#define DEBUG(fmt, ...) do { if (G_UNLIKELY(debugFlag)) g_debug(fmt, ## __VA_ARGS__); } while (0) - #define GVIR_CONFIG_NETWORK_FILTER_GET_PRIVATE(obj) \ (G_TYPE_INSTANCE_GET_PRIVATE((obj), GVIR_TYPE_CONFIG_NETWORK_FILTER, GVirConfigNetworkFilterPrivate)) @@ -50,7 +46,7 @@ static void gvir_config_network_filter_class_init(GVirConfigNetworkFilterClass * static void gvir_config_network_filter_init(GVirConfigNetworkFilter *conn) { - DEBUG("Init GVirConfigNetworkFilter=%p", conn); + g_debug("Init GVirConfigNetworkFilter=%p", conn); conn->priv = GVIR_CONFIG_NETWORK_FILTER_GET_PRIVATE(conn); } diff --git a/libvirt-gconfig/libvirt-gconfig-network.c b/libvirt-gconfig/libvirt-gconfig-network.c index 73092de..9fe4181 100644 --- a/libvirt-gconfig/libvirt-gconfig-network.c +++ b/libvirt-gconfig/libvirt-gconfig-network.c @@ -27,10 +27,6 @@ #include "libvirt-gconfig/libvirt-gconfig.h" -extern gboolean debugFlag; - -#define DEBUG(fmt, ...) do { if (G_UNLIKELY(debugFlag)) g_debug(fmt, ## __VA_ARGS__); } while (0) - #define GVIR_CONFIG_NETWORK_GET_PRIVATE(obj) \ (G_TYPE_INSTANCE_GET_PRIVATE((obj), GVIR_TYPE_CONFIG_NETWORK, GVirConfigNetworkPrivate)) @@ -50,7 +46,7 @@ static void gvir_config_network_class_init(GVirConfigNetworkClass *klass) static void gvir_config_network_init(GVirConfigNetwork *conn) { - DEBUG("Init GVirConfigNetwork=%p", conn); + g_debug("Init GVirConfigNetwork=%p", conn); conn->priv = GVIR_CONFIG_NETWORK_GET_PRIVATE(conn); } diff --git a/libvirt-gconfig/libvirt-gconfig-node-device.c b/libvirt-gconfig/libvirt-gconfig-node-device.c index fa679b1..f89aeb1 100644 --- a/libvirt-gconfig/libvirt-gconfig-node-device.c +++ b/libvirt-gconfig/libvirt-gconfig-node-device.c @@ -27,10 +27,6 @@ #include "libvirt-gconfig/libvirt-gconfig.h" -extern gboolean debugFlag; - -#define DEBUG(fmt, ...) do { if (G_UNLIKELY(debugFlag)) g_debug(fmt, ## __VA_ARGS__); } while (0) - #define GVIR_CONFIG_NODE_DEVICE_GET_PRIVATE(obj) \ (G_TYPE_INSTANCE_GET_PRIVATE((obj), GVIR_TYPE_CONFIG_NODE_DEVICE, GVirConfigNodeDevicePrivate)) @@ -50,7 +46,7 @@ static void gvir_config_node_device_class_init(GVirConfigNodeDeviceClass *klass) static void gvir_config_node_device_init(GVirConfigNodeDevice *conn) { - DEBUG("Init GVirConfigNodeDevice=%p", conn); + g_debug("Init GVirConfigNodeDevice=%p", conn); conn->priv = GVIR_CONFIG_NODE_DEVICE_GET_PRIVATE(conn); } diff --git a/libvirt-gconfig/libvirt-gconfig-object.c b/libvirt-gconfig/libvirt-gconfig-object.c index edbaf57..714a68a 100644 --- a/libvirt-gconfig/libvirt-gconfig-object.c +++ b/libvirt-gconfig/libvirt-gconfig-object.c @@ -31,12 +31,6 @@ #include "libvirt-gconfig/libvirt-gconfig-helpers-private.h" #include "libvirt-gconfig/libvirt-gconfig-object-private.h" - -//extern gboolean debugFlag; -gboolean debugFlag; - -#define DEBUG(fmt, ...) do { if (G_UNLIKELY(debugFlag)) g_debug(fmt, ## __VA_ARGS__); } while (0) - #define GVIR_CONFIG_OBJECT_GET_PRIVATE(obj) \ (G_TYPE_INSTANCE_GET_PRIVATE((obj), GVIR_TYPE_CONFIG_OBJECT, GVirConfigObjectPrivate)) @@ -127,7 +121,7 @@ static void gvir_config_object_finalize(GObject *object) GVirConfigObject *conn = GVIR_CONFIG_OBJECT(object); GVirConfigObjectPrivate *priv = conn->priv; - DEBUG("Finalize GVirConfigObject=%p", conn); + g_debug("Finalize GVirConfigObject=%p", conn); g_free(priv->schema); @@ -178,7 +172,7 @@ static void gvir_config_object_class_init(GVirConfigObjectClass *klass) static void gvir_config_object_init(GVirConfigObject *conn) { - DEBUG("Init GVirConfigObject=%p", conn); + g_debug("Init GVirConfigObject=%p", conn); conn->priv = GVIR_CONFIG_OBJECT_GET_PRIVATE(conn); } diff --git a/libvirt-gconfig/libvirt-gconfig-secret.c b/libvirt-gconfig/libvirt-gconfig-secret.c index 0c5de85..6f57aaa 100644 --- a/libvirt-gconfig/libvirt-gconfig-secret.c +++ b/libvirt-gconfig/libvirt-gconfig-secret.c @@ -27,10 +27,6 @@ #include "libvirt-gconfig/libvirt-gconfig.h" -extern gboolean debugFlag; - -#define DEBUG(fmt, ...) do { if (G_UNLIKELY(debugFlag)) g_debug(fmt, ## __VA_ARGS__); } while (0) - #define GVIR_CONFIG_SECRET_GET_PRIVATE(obj) \ (G_TYPE_INSTANCE_GET_PRIVATE((obj), GVIR_TYPE_CONFIG_SECRET, GVirConfigSecretPrivate)) @@ -50,7 +46,7 @@ static void gvir_config_secret_class_init(GVirConfigSecretClass *klass) static void gvir_config_secret_init(GVirConfigSecret *conn) { - DEBUG("Init GVirConfigSecret=%p", conn); + g_debug("Init GVirConfigSecret=%p", conn); conn->priv = GVIR_CONFIG_SECRET_GET_PRIVATE(conn); } diff --git a/libvirt-gconfig/libvirt-gconfig-storage-pool.c b/libvirt-gconfig/libvirt-gconfig-storage-pool.c index aad60ed..c95cf59 100644 --- a/libvirt-gconfig/libvirt-gconfig-storage-pool.c +++ b/libvirt-gconfig/libvirt-gconfig-storage-pool.c @@ -27,10 +27,6 @@ #include "libvirt-gconfig/libvirt-gconfig.h" -extern gboolean debugFlag; - -#define DEBUG(fmt, ...) do { if (G_UNLIKELY(debugFlag)) g_debug(fmt, ## __VA_ARGS__); } while (0) - #define GVIR_CONFIG_STORAGE_POOL_GET_PRIVATE(obj) \ (G_TYPE_INSTANCE_GET_PRIVATE((obj), GVIR_TYPE_CONFIG_STORAGE_POOL, GVirConfigStoragePoolPrivate)) @@ -50,7 +46,7 @@ static void gvir_config_storage_pool_class_init(GVirConfigStoragePoolClass *klas static void gvir_config_storage_pool_init(GVirConfigStoragePool *conn) { - DEBUG("Init GVirConfigStoragePool=%p", conn); + g_debug("Init GVirConfigStoragePool=%p", conn); conn->priv = GVIR_CONFIG_STORAGE_POOL_GET_PRIVATE(conn); } diff --git a/libvirt-gconfig/libvirt-gconfig-storage-vol.c b/libvirt-gconfig/libvirt-gconfig-storage-vol.c index 4a59b72..5a31c80 100644 --- a/libvirt-gconfig/libvirt-gconfig-storage-vol.c +++ b/libvirt-gconfig/libvirt-gconfig-storage-vol.c @@ -27,10 +27,6 @@ #include "libvirt-gconfig/libvirt-gconfig.h" -extern gboolean debugFlag; - -#define DEBUG(fmt, ...) do { if (G_UNLIKELY(debugFlag)) g_debug(fmt, ## __VA_ARGS__); } while (0) - #define GVIR_CONFIG_STORAGE_VOL_GET_PRIVATE(obj) \ (G_TYPE_INSTANCE_GET_PRIVATE((obj), GVIR_TYPE_CONFIG_STORAGE_VOL, GVirConfigStorageVolPrivate)) @@ -50,7 +46,7 @@ static void gvir_config_storage_vol_class_init(GVirConfigStorageVolClass *klass) static void gvir_config_storage_vol_init(GVirConfigStorageVol *conn) { - DEBUG("Init GVirConfigStorageVol=%p", conn); + g_debug("Init GVirConfigStorageVol=%p", conn); conn->priv = GVIR_CONFIG_STORAGE_VOL_GET_PRIVATE(conn); } diff --git a/libvirt-glib/libvirt-glib-event.c b/libvirt-glib/libvirt-glib-event.c index 0775632..ac14354 100644 --- a/libvirt-glib/libvirt-glib-event.c +++ b/libvirt-glib/libvirt-glib-event.c @@ -31,10 +31,6 @@ #include "libvirt-glib/libvirt-glib.h" -extern gboolean debugFlag; - -#define DEBUG(fmt, ...) do { if (G_UNLIKELY(debugFlag)) g_debug(fmt, ## __VA_ARGS__); } while (0) - struct gvir_event_handle { int watch; @@ -83,7 +79,7 @@ gvir_event_handle_dispatch(GIOChannel *source G_GNUC_UNUSED, if (condition & G_IO_ERR) events |= VIR_EVENT_HANDLE_ERROR; - DEBUG("Dispatch handler %d %d %p\n", data->fd, events, data->opaque); + g_debug("Dispatch handler %d %d %p\n", data->fd, events, data->opaque); (data->cb)(data->watch, data->fd, events, data->opaque); @@ -119,7 +115,7 @@ gvir_event_handle_add(int fd, data->channel = g_io_channel_unix_new(fd); data->ff = ff; - DEBUG("Add handle %d %d %p\n", data->fd, events, data->opaque); + g_debug("Add handle %d %d %p\n", data->fd, events, data->opaque); data->source = g_io_add_watch(data->channel, cond, @@ -168,7 +164,7 @@ gvir_event_handle_update(int watch, data = gvir_event_handle_find(watch, NULL); if (!data) { - DEBUG("Update for missing handle watch %d", watch); + g_debug("Update for missing handle watch %d", watch); goto cleanup; } @@ -227,11 +223,11 @@ gvir_event_handle_remove(int watch) data = gvir_event_handle_find(watch, &idx); if (!data) { - DEBUG("Remove of missing watch %d", watch); + g_debug("Remove of missing watch %d", watch); goto cleanup; } - DEBUG("Remove handle %d %d\n", watch, data->fd); + g_debug("Remove handle %d %d\n", watch, data->fd); if (!data->source) goto cleanup; @@ -253,7 +249,7 @@ static gboolean gvir_event_timeout_dispatch(void *opaque) { struct gvir_event_timeout *data = opaque; - DEBUG("Dispatch timeout %p %p %d %p\n", data, data->cb, data->timer, data->opaque); + g_debug("Dispatch timeout %p %p %d %p\n", data, data->cb, data->timer, data->opaque); (data->cb)(data->timer, data->opaque); return TRUE; @@ -283,7 +279,7 @@ gvir_event_timeout_add(int interval, g_ptr_array_add(timeouts, data); - DEBUG("Add timeout %p %d %p %p %d\n", data, interval, cb, opaque, data->timer); + g_debug("Add timeout %p %d %p %p %d\n", data, interval, cb, opaque, data->timer); ret = data->timer; @@ -329,11 +325,11 @@ gvir_event_timeout_update(int timer, data = gvir_event_timeout_find(timer, NULL); if (!data) { - DEBUG("Update of missing timer %d", timer); + g_debug("Update of missing timer %d", timer); goto cleanup; } - DEBUG("Update timeout %p %d %d\n", data, timer, interval); + g_debug("Update timeout %p %d %d\n", data, timer, interval); if (interval >= 0) { if (data->source) @@ -379,11 +375,11 @@ gvir_event_timeout_remove(int timer) data = gvir_event_timeout_find(timer, &idx); if (!data) { - DEBUG("Remove of missing timer %d", timer); + g_debug("Remove of missing timer %d", timer); goto cleanup; } - DEBUG("Remove timeout %p %d\n", data, timer); + g_debug("Remove timeout %p %d\n", data, timer); if (!data->source) goto cleanup; diff --git a/libvirt-glib/libvirt-glib-main.c b/libvirt-glib/libvirt-glib-main.c index 4dc7d58..8d2f216 100644 --- a/libvirt-glib/libvirt-glib-main.c +++ b/libvirt-glib/libvirt-glib-main.c @@ -28,15 +28,11 @@ #include "libvirt-glib-main.h" -gboolean debugFlag = FALSE; - -#define DEBUG(fmt, ...) do { if (G_UNLIKELY(debugFlag)) g_debug(fmt, ## __VA_ARGS__); } while (0) - static void gvir_error_func(gpointer opaque G_GNUC_UNUSED, virErrorPtr err) { - DEBUG("Error: %s", err->message); + g_debug("Error: %s", err->message); } @@ -55,10 +51,6 @@ gboolean gvir_init_check(int *argc G_GNUC_UNUSED, char ***argv G_GNUC_UNUSED, GError **err G_GNUC_UNUSED) { - char *debugEnv = getenv("LIBVIRT_GLIB_DEBUG"); - if (debugEnv && *debugEnv && *debugEnv != '0') - debugFlag = 1; - virSetErrorFunc(NULL, gvir_error_func); if (!g_thread_supported()) g_thread_init(NULL); diff --git a/libvirt-gobject/libvirt-gobject-connection.c b/libvirt-gobject/libvirt-gobject-connection.c index a258847..ee0fb1b 100644 --- a/libvirt-gobject/libvirt-gobject-connection.c +++ b/libvirt-gobject/libvirt-gobject-connection.c @@ -30,10 +30,6 @@ #include "libvirt-gobject/libvirt-gobject.h" #include "libvirt-gobject-compat.h" -extern gboolean debugFlag; - -#define DEBUG(fmt, ...) do { if (G_UNLIKELY(debugFlag)) g_debug(fmt, ## __VA_ARGS__); } while (0) - #define GVIR_CONNECTION_GET_PRIVATE(obj) \ (G_TYPE_INSTANCE_GET_PRIVATE((obj), GVIR_TYPE_CONNECTION, GVirConnectionPrivate)) @@ -128,7 +124,7 @@ static void gvir_connection_finalize(GObject *object) GVirConnection *conn = GVIR_CONNECTION(object); GVirConnectionPrivate *priv = conn->priv; - DEBUG("Finalize GVirConnection=%p", conn); + g_debug("Finalize GVirConnection=%p", conn); if (gvir_connection_is_open(conn)) gvir_connection_close(conn); @@ -230,7 +226,7 @@ static void gvir_connection_init(GVirConnection *conn) { GVirConnectionPrivate *priv; - DEBUG("Init GVirConnection=%p", conn); + g_debug("Init GVirConnection=%p", conn); priv = conn->priv = GVIR_CONNECTION_GET_PRIVATE(conn); @@ -270,7 +266,7 @@ static int domain_event_cb(virConnectPtr conn G_GNUC_UNUSED, return 0; } - DEBUG("%s: %s event:%d, detail:%d", G_STRFUNC, uuid, event, detail); + g_debug("%s: %s event:%d, detail:%d", G_STRFUNC, uuid, event, detail); g_mutex_lock(priv->lock); gdom = g_hash_table_lookup(priv->domains, uuid); @@ -499,7 +495,7 @@ gboolean gvir_connection_is_open(GVirConnection *conn) void gvir_connection_close(GVirConnection *conn) { GVirConnectionPrivate *priv = conn->priv; - DEBUG("Close GVirConnection=%p", conn); + g_debug("Close GVirConnection=%p", conn); g_mutex_lock(priv->lock); diff --git a/libvirt-gobject/libvirt-gobject-domain-device.c b/libvirt-gobject/libvirt-gobject-domain-device.c index ae03489..4264c65 100644 --- a/libvirt-gobject/libvirt-gobject-domain-device.c +++ b/libvirt-gobject/libvirt-gobject-domain-device.c @@ -30,10 +30,6 @@ #include "libvirt-gobject/libvirt-gobject-domain-device-private.h" -extern gboolean debugFlag; - -#define DEBUG(fmt, ...) do { if (G_UNLIKELY(debugFlag)) g_debug(fmt, ## __VA_ARGS__); } while (0) - #define GVIR_DOMAIN_DEVICE_GET_PRIVATE(obj) \ (G_TYPE_INSTANCE_GET_PRIVATE((obj), GVIR_TYPE_DOMAIN_DEVICE, GVirDomainDevicePrivate)) @@ -93,7 +89,7 @@ static void gvir_domain_device_finalize(GObject *object) GVirDomainDevice *self = GVIR_DOMAIN_DEVICE(object); GVirDomainDevicePrivate *priv = self->priv; - DEBUG("Finalize GVirDomainDevice=%p", self); + g_debug("Finalize GVirDomainDevice=%p", self); g_clear_object(&priv->domain); @@ -123,7 +119,7 @@ static void gvir_domain_device_class_init(GVirDomainDeviceClass *klass) static void gvir_domain_device_init(GVirDomainDevice *self) { - DEBUG("Init GVirDomainDevice=%p", self); + g_debug("Init GVirDomainDevice=%p", self); self->priv = GVIR_DOMAIN_DEVICE_GET_PRIVATE(self); } diff --git a/libvirt-gobject/libvirt-gobject-domain-disk.c b/libvirt-gobject/libvirt-gobject-domain-disk.c index b8f9dbb..3659758 100644 --- a/libvirt-gobject/libvirt-gobject-domain-disk.c +++ b/libvirt-gobject/libvirt-gobject-domain-disk.c @@ -31,10 +31,6 @@ #include "libvirt-gobject/libvirt-gobject-domain-device-private.h" -extern gboolean debugFlag; - -#define DEBUG(fmt, ...) do { if (G_UNLIKELY(debugFlag)) g_debug(fmt, ## __VA_ARGS__); } while (0) - #define GVIR_DOMAIN_DISK_GET_PRIVATE(obj) \ (G_TYPE_INSTANCE_GET_PRIVATE((obj), GVIR_TYPE_DOMAIN_DISK, GVirDomainDiskPrivate)) @@ -103,7 +99,7 @@ static void gvir_domain_disk_finalize(GObject *object) GVirDomainDisk *self = GVIR_DOMAIN_DISK(object); GVirDomainDiskPrivate *priv = self->priv; - DEBUG("Finalize GVirDomainDisk=%p", self); + g_debug("Finalize GVirDomainDisk=%p", self); g_free(priv->path); @@ -133,7 +129,7 @@ static void gvir_domain_disk_class_init(GVirDomainDiskClass *klass) static void gvir_domain_disk_init(GVirDomainDisk *self) { - DEBUG("Init GVirDomainDisk=%p", self); + g_debug("Init GVirDomainDisk=%p", self); self->priv = GVIR_DOMAIN_DISK_GET_PRIVATE(self); } diff --git a/libvirt-gobject/libvirt-gobject-domain-interface.c b/libvirt-gobject/libvirt-gobject-domain-interface.c index a6720c8..9f6ce8d 100644 --- a/libvirt-gobject/libvirt-gobject-domain-interface.c +++ b/libvirt-gobject/libvirt-gobject-domain-interface.c @@ -31,10 +31,6 @@ #include "libvirt-gobject/libvirt-gobject-domain-device-private.h" -extern gboolean debugFlag; - -#define DEBUG(fmt, ...) do { if (G_UNLIKELY(debugFlag)) g_debug(fmt, ## __VA_ARGS__); } while (0) - #define GVIR_DOMAIN_INTERFACE_GET_PRIVATE(obj) \ (G_TYPE_INSTANCE_GET_PRIVATE((obj), GVIR_TYPE_DOMAIN_INTERFACE, GVirDomainInterfacePrivate)) @@ -103,7 +99,7 @@ static void gvir_domain_interface_finalize(GObject *object) GVirDomainInterface *self = GVIR_DOMAIN_INTERFACE(object); GVirDomainInterfacePrivate *priv = self->priv; - DEBUG("Finalize GVirDomainInterface=%p", self); + g_debug("Finalize GVirDomainInterface=%p", self); g_free(priv->path); @@ -133,7 +129,7 @@ static void gvir_domain_interface_class_init(GVirDomainInterfaceClass *klass) static void gvir_domain_interface_init(GVirDomainInterface *self) { - DEBUG("Init GVirDomainInterface=%p", self); + g_debug("Init GVirDomainInterface=%p", self); self->priv = GVIR_DOMAIN_INTERFACE_GET_PRIVATE(self); } diff --git a/libvirt-gobject/libvirt-gobject-domain-snapshot.c b/libvirt-gobject/libvirt-gobject-domain-snapshot.c index afd1e96..578e348 100644 --- a/libvirt-gobject/libvirt-gobject-domain-snapshot.c +++ b/libvirt-gobject/libvirt-gobject-domain-snapshot.c @@ -30,10 +30,6 @@ #include "libvirt-gobject/libvirt-gobject.h" #include "libvirt-gobject-compat.h" -extern gboolean debugFlag; - -#define DEBUG(fmt, ...) do { if (G_UNLIKELY(debugFlag)) g_debug(fmt, ## __VA_ARGS__); } while (0) - #define GVIR_DOMAIN_SNAPSHOT_GET_PRIVATE(obj) \ (G_TYPE_INSTANCE_GET_PRIVATE((obj), GVIR_TYPE_DOMAIN_SNAPSHOT, GVirDomainSnapshotPrivate)) @@ -105,7 +101,7 @@ static void gvir_domain_snapshot_finalize(GObject *object) GVirDomainSnapshot *conn = GVIR_DOMAIN_SNAPSHOT(object); GVirDomainSnapshotPrivate *priv = conn->priv; - DEBUG("Finalize GVirDomainSnapshot=%p", conn); + g_debug("Finalize GVirDomainSnapshot=%p", conn); virDomainSnapshotFree(priv->handle); @@ -140,7 +136,7 @@ static void gvir_domain_snapshot_class_init(GVirDomainSnapshotClass *klass) static void gvir_domain_snapshot_init(GVirDomainSnapshot *conn) { - DEBUG("Init GVirDomainSnapshot=%p", conn); + g_debug("Init GVirDomainSnapshot=%p", conn); conn->priv = GVIR_DOMAIN_SNAPSHOT_GET_PRIVATE(conn); } diff --git a/libvirt-gobject/libvirt-gobject-domain.c b/libvirt-gobject/libvirt-gobject-domain.c index 464d287..506f5fd 100644 --- a/libvirt-gobject/libvirt-gobject-domain.c +++ b/libvirt-gobject/libvirt-gobject-domain.c @@ -30,10 +30,6 @@ #include "libvirt-gobject/libvirt-gobject.h" #include "libvirt-gobject-compat.h" -extern gboolean debugFlag; - -#define DEBUG(fmt, ...) do { if (G_UNLIKELY(debugFlag)) g_debug(fmt, ## __VA_ARGS__); } while (0) - #define GVIR_DOMAIN_GET_PRIVATE(obj) \ (G_TYPE_INSTANCE_GET_PRIVATE((obj), GVIR_TYPE_DOMAIN, GVirDomainPrivate)) @@ -116,7 +112,7 @@ static void gvir_domain_finalize(GObject *object) GVirDomain *conn = GVIR_DOMAIN(object); GVirDomainPrivate *priv = conn->priv; - DEBUG("Finalize GVirDomain=%p", conn); + g_debug("Finalize GVirDomain=%p", conn); virDomainFree(priv->handle); @@ -215,7 +211,7 @@ static void gvir_domain_class_init(GVirDomainClass *klass) static void gvir_domain_init(GVirDomain *conn) { - DEBUG("Init GVirDomain=%p", conn); + g_debug("Init GVirDomain=%p", conn); conn->priv = GVIR_DOMAIN_GET_PRIVATE(conn); } diff --git a/libvirt-gobject/libvirt-gobject-input-stream.c b/libvirt-gobject/libvirt-gobject-input-stream.c index 39459c4..3519aaf 100644 --- a/libvirt-gobject/libvirt-gobject-input-stream.c +++ b/libvirt-gobject/libvirt-gobject-input-stream.c @@ -30,10 +30,6 @@ #include "libvirt-gobject/libvirt-gobject.h" #include "libvirt-gobject-input-stream.h" -extern gboolean debugFlag; - -#define DEBUG(fmt, ...) do { if (G_UNLIKELY(debugFlag)) g_debug(fmt, ## __VA_ARGS__); } while (0) - #define gvir_input_stream_get_type _gvir_input_stream_get_type G_DEFINE_TYPE(GVirInputStream, gvir_input_stream, G_TYPE_INPUT_STREAM); @@ -92,7 +88,7 @@ static void gvir_input_stream_finalize(GObject *object) { GVirInputStream *stream = GVIR_INPUT_STREAM(object); - DEBUG("Finalize input stream GVirStream=%p", stream->priv->stream); + g_debug("Finalize input stream GVirStream=%p", stream->priv->stream); stream->priv->stream = NULL; // unowned if (G_OBJECT_CLASS(gvir_input_stream_parent_class)->finalize) diff --git a/libvirt-gobject/libvirt-gobject-interface.c b/libvirt-gobject/libvirt-gobject-interface.c index 3be633c..07f857c 100644 --- a/libvirt-gobject/libvirt-gobject-interface.c +++ b/libvirt-gobject/libvirt-gobject-interface.c @@ -29,10 +29,6 @@ #include "libvirt-glib/libvirt-glib.h" #include "libvirt-gobject/libvirt-gobject.h" -extern gboolean debugFlag; - -#define DEBUG(fmt, ...) do { if (G_UNLIKELY(debugFlag)) g_debug(fmt, ## __VA_ARGS__); } while (0) - #define GVIR_INTERFACE_GET_PRIVATE(obj) \ (G_TYPE_INSTANCE_GET_PRIVATE((obj), GVIR_TYPE_INTERFACE, GVirInterfacePrivate)) @@ -104,7 +100,7 @@ static void gvir_interface_finalize(GObject *object) GVirInterface *conn = GVIR_INTERFACE(object); GVirInterfacePrivate *priv = conn->priv; - DEBUG("Finalize GVirInterface=%p", conn); + g_debug("Finalize GVirInterface=%p", conn); virInterfaceFree(priv->handle); @@ -139,7 +135,7 @@ static void gvir_interface_class_init(GVirInterfaceClass *klass) static void gvir_interface_init(GVirInterface *conn) { - DEBUG("Init GVirInterface=%p", conn); + g_debug("Init GVirInterface=%p", conn); conn->priv = GVIR_INTERFACE_GET_PRIVATE(conn); } diff --git a/libvirt-gobject/libvirt-gobject-main.c b/libvirt-gobject/libvirt-gobject-main.c index b29552c..0b90b2a 100644 --- a/libvirt-gobject/libvirt-gobject-main.c +++ b/libvirt-gobject/libvirt-gobject-main.c @@ -28,10 +28,6 @@ #include "libvirt-glib/libvirt-glib.h" #include "libvirt-gobject/libvirt-gobject.h" -gboolean debugFlag = FALSE; - -#define DEBUG(fmt, ...) do { if (G_UNLIKELY(debugFlag)) g_debug(fmt, ## __VA_ARGS__); } while (0) - /** * gvir_init_object: * @argc: (inout): pointer to application's argc @@ -58,10 +54,6 @@ gboolean gvir_init_object_check(int *argc, char ***argv, GError **err) { - char *debugEnv = getenv("LIBVIRT_GOBJECT_DEBUG"); - if (debugEnv && *debugEnv && *debugEnv != '0') - debugFlag = 1; - g_type_init(); gvir_event_register(); diff --git a/libvirt-gobject/libvirt-gobject-manager.c b/libvirt-gobject/libvirt-gobject-manager.c index 5f3a11a..35308ca 100644 --- a/libvirt-gobject/libvirt-gobject-manager.c +++ b/libvirt-gobject/libvirt-gobject-manager.c @@ -29,10 +29,6 @@ #include "libvirt-glib/libvirt-glib.h" #include "libvirt-gobject/libvirt-gobject.h" -extern gboolean debugFlag; - -#define DEBUG(fmt, ...) do { if (G_UNLIKELY(debugFlag)) g_debug(fmt, ## __VA_ARGS__); } while (0) - #define GVIR_MANAGER_GET_PRIVATE(obj) \ (G_TYPE_INSTANCE_GET_PRIVATE((obj), GVIR_TYPE_MANAGER, GVirManagerPrivate)) @@ -66,7 +62,7 @@ static void gvir_manager_finalize(GObject *object) GVirManager *man = GVIR_MANAGER(object); GVirManagerPrivate *priv = man->priv; - DEBUG("Finalize GVirManager=%p", man); + g_debug("Finalize GVirManager=%p", man); GList *tmp = priv->connections; while (tmp) { @@ -115,7 +111,7 @@ static void gvir_manager_init(GVirManager *conn) { GVirManagerPrivate *priv; - DEBUG("Init GVirManager=%p", conn); + g_debug("Init GVirManager=%p", conn); priv = conn->priv = GVIR_MANAGER_GET_PRIVATE(conn); diff --git a/libvirt-gobject/libvirt-gobject-network-filter.c b/libvirt-gobject/libvirt-gobject-network-filter.c index 01e9636..3a66590 100644 --- a/libvirt-gobject/libvirt-gobject-network-filter.c +++ b/libvirt-gobject/libvirt-gobject-network-filter.c @@ -30,10 +30,6 @@ #include "libvirt-gobject/libvirt-gobject.h" #include "libvirt-gobject-compat.h" -extern gboolean debugFlag; - -#define DEBUG(fmt, ...) do { if (G_UNLIKELY(debugFlag)) g_debug(fmt, ## __VA_ARGS__); } while (0) - #define GVIR_NETWORK_FILTER_GET_PRIVATE(obj) \ (G_TYPE_INSTANCE_GET_PRIVATE((obj), GVIR_TYPE_NETWORK_FILTER, GVirNetworkFilterPrivate)) @@ -106,7 +102,7 @@ static void gvir_network_filter_finalize(GObject *object) GVirNetworkFilter *nf = GVIR_NETWORK_FILTER(object); GVirNetworkFilterPrivate *priv = nf->priv; - DEBUG("Finalize GVirNetworkFilter=%p", nf); + g_debug("Finalize GVirNetworkFilter=%p", nf); virNWFilterFree(priv->handle); @@ -156,7 +152,7 @@ static void gvir_network_filter_class_init(GVirNetworkFilterClass *klass) static void gvir_network_filter_init(GVirNetworkFilter *conn) { - DEBUG("Init GVirNetworkFilter=%p", conn); + g_debug("Init GVirNetworkFilter=%p", conn); conn->priv = GVIR_NETWORK_FILTER_GET_PRIVATE(conn); } diff --git a/libvirt-gobject/libvirt-gobject-network.c b/libvirt-gobject/libvirt-gobject-network.c index 3c49117..662fc2f 100644 --- a/libvirt-gobject/libvirt-gobject-network.c +++ b/libvirt-gobject/libvirt-gobject-network.c @@ -30,10 +30,6 @@ #include "libvirt-gobject/libvirt-gobject.h" #include "libvirt-gobject-compat.h" -extern gboolean debugFlag; - -#define DEBUG(fmt, ...) do { if (G_UNLIKELY(debugFlag)) g_debug(fmt, ## __VA_ARGS__); } while (0) - #define GVIR_NETWORK_GET_PRIVATE(obj) \ (G_TYPE_INSTANCE_GET_PRIVATE((obj), GVIR_TYPE_NETWORK, GVirNetworkPrivate)) @@ -106,7 +102,7 @@ static void gvir_network_finalize(GObject *object) GVirNetwork *conn = GVIR_NETWORK(object); GVirNetworkPrivate *priv = conn->priv; - DEBUG("Finalize GVirNetwork=%p", conn); + g_debug("Finalize GVirNetwork=%p", conn); virNetworkFree(priv->handle); @@ -154,7 +150,7 @@ static void gvir_network_class_init(GVirNetworkClass *klass) static void gvir_network_init(GVirNetwork *conn) { - DEBUG("Init GVirNetwork=%p", conn); + g_debug("Init GVirNetwork=%p", conn); conn->priv = GVIR_NETWORK_GET_PRIVATE(conn); } diff --git a/libvirt-gobject/libvirt-gobject-node-device.c b/libvirt-gobject/libvirt-gobject-node-device.c index 04d7d04..3d1809c 100644 --- a/libvirt-gobject/libvirt-gobject-node-device.c +++ b/libvirt-gobject/libvirt-gobject-node-device.c @@ -30,10 +30,6 @@ #include "libvirt-gobject/libvirt-gobject.h" #include "libvirt-gobject-compat.h" -extern gboolean debugFlag; - -#define DEBUG(fmt, ...) do { if (G_UNLIKELY(debugFlag)) g_debug(fmt, ## __VA_ARGS__); } while (0) - #define GVIR_NODE_DEVICE_GET_PRIVATE(obj) \ (G_TYPE_INSTANCE_GET_PRIVATE((obj), GVIR_TYPE_NODE_DEVICE, GVirNodeDevicePrivate)) @@ -105,7 +101,7 @@ static void gvir_node_device_finalize(GObject *object) GVirNodeDevice *conn = GVIR_NODE_DEVICE(object); GVirNodeDevicePrivate *priv = conn->priv; - DEBUG("Finalize GVirNodeDevice=%p", conn); + g_debug("Finalize GVirNodeDevice=%p", conn); virNodeDeviceFree(priv->handle); @@ -140,7 +136,7 @@ static void gvir_node_device_class_init(GVirNodeDeviceClass *klass) static void gvir_node_device_init(GVirNodeDevice *conn) { - DEBUG("Init GVirNodeDevice=%p", conn); + g_debug("Init GVirNodeDevice=%p", conn); conn->priv = GVIR_NODE_DEVICE_GET_PRIVATE(conn); } diff --git a/libvirt-gobject/libvirt-gobject-output-stream.c b/libvirt-gobject/libvirt-gobject-output-stream.c index 30ee519..78d08a5 100644 --- a/libvirt-gobject/libvirt-gobject-output-stream.c +++ b/libvirt-gobject/libvirt-gobject-output-stream.c @@ -30,10 +30,6 @@ #include "libvirt-gobject/libvirt-gobject.h" #include "libvirt-gobject-output-stream.h" -extern gboolean debugFlag; - -#define DEBUG(fmt, ...) do { if (G_UNLIKELY(debugFlag)) g_debug(fmt, ## __VA_ARGS__); } while (0) - #define gvir_output_stream_get_type _gvir_output_stream_get_type G_DEFINE_TYPE(GVirOutputStream, gvir_output_stream, G_TYPE_OUTPUT_STREAM); @@ -92,7 +88,7 @@ static void gvir_output_stream_finalize(GObject *object) { GVirOutputStream *stream = GVIR_OUTPUT_STREAM(object); - DEBUG("Finalize output stream GVirStream=%p", stream->priv->stream); + g_debug("Finalize output stream GVirStream=%p", stream->priv->stream); stream->priv->stream = NULL; // unowned if (G_OBJECT_CLASS(gvir_output_stream_parent_class)->finalize) diff --git a/libvirt-gobject/libvirt-gobject-secret.c b/libvirt-gobject/libvirt-gobject-secret.c index f2fd9a8..f2bb611 100644 --- a/libvirt-gobject/libvirt-gobject-secret.c +++ b/libvirt-gobject/libvirt-gobject-secret.c @@ -30,10 +30,6 @@ #include "libvirt-gobject/libvirt-gobject.h" #include "libvirt-gobject-compat.h" -extern gboolean debugFlag; - -#define DEBUG(fmt, ...) do { if (G_UNLIKELY(debugFlag)) g_debug(fmt, ## __VA_ARGS__); } while (0) - #define GVIR_SECRET_GET_PRIVATE(obj) \ (G_TYPE_INSTANCE_GET_PRIVATE((obj), GVIR_TYPE_SECRET, GVirSecretPrivate)) @@ -106,7 +102,7 @@ static void gvir_secret_finalize(GObject *object) GVirSecret *conn = GVIR_SECRET(object); GVirSecretPrivate *priv = conn->priv; - DEBUG("Finalize GVirSecret=%p", conn); + g_debug("Finalize GVirSecret=%p", conn); virSecretFree(priv->handle); @@ -156,7 +152,7 @@ static void gvir_secret_class_init(GVirSecretClass *klass) static void gvir_secret_init(GVirSecret *conn) { - DEBUG("Init GVirSecret=%p", conn); + g_debug("Init GVirSecret=%p", conn); conn->priv = GVIR_SECRET_GET_PRIVATE(conn); } diff --git a/libvirt-gobject/libvirt-gobject-storage-pool.c b/libvirt-gobject/libvirt-gobject-storage-pool.c index cb69e7e..da8ada5 100644 --- a/libvirt-gobject/libvirt-gobject-storage-pool.c +++ b/libvirt-gobject/libvirt-gobject-storage-pool.c @@ -30,10 +30,6 @@ #include "libvirt-gobject/libvirt-gobject.h" #include "libvirt-gobject-compat.h" -extern gboolean debugFlag; - -#define DEBUG(fmt, ...) do { if (G_UNLIKELY(debugFlag)) g_debug(fmt, ## __VA_ARGS__); } while (0) - #define GVIR_STORAGE_POOL_GET_PRIVATE(obj) \ (G_TYPE_INSTANCE_GET_PRIVATE((obj), GVIR_TYPE_STORAGE_POOL, GVirStoragePoolPrivate)) @@ -109,7 +105,7 @@ static void gvir_storage_pool_finalize(GObject *object) GVirStoragePool *pool = GVIR_STORAGE_POOL(object); GVirStoragePoolPrivate *priv = pool->priv; - DEBUG("Finalize GVirStoragePool=%p", pool); + g_debug("Finalize GVirStoragePool=%p", pool); if (priv->volumes) { g_hash_table_unref(priv->volumes); @@ -168,7 +164,7 @@ static void gvir_storage_pool_init(GVirStoragePool *pool) { GVirStoragePoolPrivate *priv; - DEBUG("Init GVirStoragePool=%p", pool); + g_debug("Init GVirStoragePool=%p", pool); priv = pool->priv = GVIR_STORAGE_POOL_GET_PRIVATE(pool); diff --git a/libvirt-gobject/libvirt-gobject-storage-vol.c b/libvirt-gobject/libvirt-gobject-storage-vol.c index 0c8cb09..6340ad7 100644 --- a/libvirt-gobject/libvirt-gobject-storage-vol.c +++ b/libvirt-gobject/libvirt-gobject-storage-vol.c @@ -30,10 +30,6 @@ #include "libvirt-gobject/libvirt-gobject.h" #include "libvirt-gobject-compat.h" -extern gboolean debugFlag; - -#define DEBUG(fmt, ...) do { if (G_UNLIKELY(debugFlag)) g_debug(fmt, ## __VA_ARGS__); } while (0) - #define GVIR_STORAGE_VOL_GET_PRIVATE(obj) \ (G_TYPE_INSTANCE_GET_PRIVATE((obj), GVIR_TYPE_STORAGE_VOL, GVirStorageVolPrivate)) @@ -105,7 +101,7 @@ static void gvir_storage_vol_finalize(GObject *object) GVirStorageVol *conn = GVIR_STORAGE_VOL(object); GVirStorageVolPrivate *priv = conn->priv; - DEBUG("Finalize GVirStorageVol=%p", conn); + g_debug("Finalize GVirStorageVol=%p", conn); virStorageVolFree(priv->handle); @@ -140,7 +136,7 @@ static void gvir_storage_vol_class_init(GVirStorageVolClass *klass) static void gvir_storage_vol_init(GVirStorageVol *conn) { - DEBUG("Init GVirStorageVol=%p", conn); + g_debug("Init GVirStorageVol=%p", conn); conn->priv = GVIR_STORAGE_VOL_GET_PRIVATE(conn); } diff --git a/libvirt-gobject/libvirt-gobject-stream.c b/libvirt-gobject/libvirt-gobject-stream.c index 0d1c2d1..080a697 100644 --- a/libvirt-gobject/libvirt-gobject-stream.c +++ b/libvirt-gobject/libvirt-gobject-stream.c @@ -34,10 +34,6 @@ #include "libvirt-gobject/libvirt-gobject-input-stream.h" #include "libvirt-gobject/libvirt-gobject-output-stream.h" -extern gboolean debugFlag; - -#define DEBUG(fmt, ...) do { if (G_UNLIKELY(debugFlag)) g_debug(fmt, ## __VA_ARGS__); } while (0) - #define GVIR_STREAM_GET_PRIVATE(obj) \ (G_TYPE_INSTANCE_GET_PRIVATE((obj), GVIR_TYPE_STREAM, GVirStreamPrivate)) @@ -187,7 +183,7 @@ static void gvir_stream_finalize(GObject *object) GVirStream *self = GVIR_STREAM(object); GVirStreamPrivate *priv = self->priv; - DEBUG("Finalize GVirStream=%p", self); + g_debug("Finalize GVirStream=%p", self); if (self->priv->input_stream) g_object_unref(self->priv->input_stream); -- 1.7.7.3

2 2

[libvirt] [PATCH] bandwidth: Fix funky identation
by Michal Privoznik 29 Nov '11

29 Nov '11

--- Pushed under trivial rule src/util/virnetdevbandwidth.c | 40 ++++++++++++++++++++-------------------- 1 files changed, 20 insertions(+), 20 deletions(-) diff --git a/src/util/virnetdevbandwidth.c b/src/util/virnetdevbandwidth.c index 10db1ff..b9bd2e3 100644 --- a/src/util/virnetdevbandwidth.c +++ b/src/util/virnetdevbandwidth.c @@ -90,8 +90,8 @@ virNetDevBandwidthSet(const char *ifname, virCommandFree(cmd); cmd = virCommandNew(TC); - virCommandAddArgList(cmd,"class", "add", "dev", ifname, "parent", - "1:", "classid", "1:1", "htb", NULL); + virCommandAddArgList(cmd,"class", "add", "dev", ifname, "parent", + "1:", "classid", "1:1", "htb", NULL); virCommandAddArgList(cmd, "rate", average, NULL); if (peak) @@ -104,9 +104,9 @@ virNetDevBandwidthSet(const char *ifname, virCommandFree(cmd); cmd = virCommandNew(TC); - virCommandAddArgList(cmd,"filter", "add", "dev", ifname, "parent", - "1:0", "protocol", "ip", "handle", "1", "fw", - "flowid", "1", NULL); + virCommandAddArgList(cmd,"filter", "add", "dev", ifname, "parent", + "1:0", "protocol", "ip", "handle", "1", "fw", + "flowid", "1", NULL); if (virCommandRun(cmd, NULL) < 0) goto cleanup; @@ -243,23 +243,23 @@ bool virNetDevBandwidthEqual(virNetDevBandwidthPtr a, virNetDevBandwidthPtr b) { - if (!a && !b) - return true; + if (!a && !b) + return true; - if (!a || !b) - return false; + if (!a || !b) + return false; - /* in */ - if (a->in->average != b->in->average || - a->in->peak != b->in->peak || - a->in->burst != b->in->burst) - return false; + /* in */ + if (a->in->average != b->in->average || + a->in->peak != b->in->peak || + a->in->burst != b->in->burst) + return false; - /*out*/ - if (a->out->average != b->out->average || - a->out->peak != b->out->peak || - a->out->burst != b->out->burst) - return false; + /*out*/ + if (a->out->average != b->out->average || + a->out->peak != b->out->peak || + a->out->burst != b->out->burst) + return false; - return true; + return true; } -- 1.7.3.4

1 0

[libvirt] [PATCH] virsh: Fix typos in man page
by Jiri Denemark 29 Nov '11

29 Nov '11

--- tools/virsh.pod | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/virsh.pod b/tools/virsh.pod index f5183b4..d94e599 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -977,7 +977,7 @@ Change the maximum memory allocation limit for a guest domain. If I<--live> is specified, affect a running guest. If I<--config> is specified, affect the next boot of a persistent guest. If I<--current> is specified, affect the current guest state. -Both I<--live> and I<--current> flags may be given, but I<--current> is +Both I<--live> and I<--config> flags may be given, but I<--current> is exclusive. If no flag is specified, behavior is different depending on hypervisor. @@ -1003,7 +1003,7 @@ I<--min-guarantee> is supported only by ESX hypervisor. If I<--live> is specified, affect a running guest. If I<--config> is specified, affect the next boot of a persistent guest. If I<--current> is specified, affect the current guest state. -Both I<--live> and I<--current> flags may be given, but I<--current> is +Both I<--live> and I<--config> flags may be given, but I<--current> is exclusive. If no flag is specified, behavior is different depending on hypervisor. @@ -1048,7 +1048,7 @@ I<--weight> is in range [100, 1000]. If I<--live> is specified, affect a running guest. If I<--config> is specified, affect the next boot of a persistent guest. If I<--current> is specified, affect the current guest state. -Both I<--live> and I<--current> flags may be given, but I<--current> is +Both I<--live> and I<--config> flags may be given, but I<--current> is exclusive. If no flag is specified, behavior is different depending on hypervisor. -- 1.7.8.rc4

2 2

[libvirt] [PATCH] lxc: Fix suspend/resume with freezer cgroup
by Jiri Denemark 29 Nov '11

29 Nov '11

--- src/util/cgroup.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/util/cgroup.c b/src/util/cgroup.c index c8d1f33..71dedeb 100644 --- a/src/util/cgroup.c +++ b/src/util/cgroup.c @@ -1474,14 +1474,14 @@ int virCgroupGetCpuacctUsage(virCgroupPtr group, unsigned long long *usage) int virCgroupSetFreezerState(virCgroupPtr group, const char *state) { return virCgroupSetValueStr(group, - VIR_CGROUP_CONTROLLER_CPU, + VIR_CGROUP_CONTROLLER_FREEZER, "freezer.state", state); } int virCgroupGetFreezerState(virCgroupPtr group, char **state) { return virCgroupGetValueStr(group, - VIR_CGROUP_CONTROLLER_CPU, + VIR_CGROUP_CONTROLLER_FREEZER, "freezer.state", state); } -- 1.7.8.rc4

2 2

[libvirt] [PATCH] examples: Correct the example command to use testnode.xml
by Osier Yang 29 Nov '11

29 Nov '11

* s/-connection/-c/ * Removes the redundant '/'. * Add "absolute" so that it's more clear. Pushed under trivial rule. --- examples/xml/test/testnode.xml | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/examples/xml/test/testnode.xml b/examples/xml/test/testnode.xml index adc5440..001e353 100644 --- a/examples/xml/test/testnode.xml +++ b/examples/xml/test/testnode.xml @@ -4,7 +4,7 @@ of applications using libvirt. To use this with virsh, run something like: - virsh -connect test:////path/to/this/dir/testnode.xml nodeinfo + virsh -c test://absolute/path/to/this/dir/testnode.xml nodeinfo --> <domain file="testdomfv0.xml"/> -- 1.7.7.3

2 1

[libvirt] [ PATCH v5 0/4] API to invoke S3/S4 on a host and also resume from within libvirt
by Srivatsa S. Bhat 29 Nov '11

29 Nov '11

This patchset adds a new API to put a host to a suspended state (Suspend-to-RAM, Suspend-to-Disk or Hybrid-Suspend) and setup a timed resume to get the host back online, from within libvirt. This uses the RTC wakeup mechanism to set up a timer alarm before suspending the host, so that in-band resume is facilitated by the firing of the RTC alarm, which wakes up the host. This patch applies on top of the Hybrid-Suspend patch posted in [1]. v5: * Added MIN_TIME_REQ_FOR_SUSPEND. * Incorporated the review comments in [3]. v4: * Applies on top of the Hybrid-Suspend patch posted in [1]. * Incorporated the review comments in [2]. v3: * Rebased to libvirt 0.9.7 * Added a check to see if alarmTime (suspend duration) is within an acceptable range. v2: * Added an init function which finds out if S3/S4 is supported by the host, upon the first request to suspend/hibernate. * Added synchronization/locking to ensure that only one suspend operation is active at a time. v1: http://www.redhat.com/archives/libvir-list/2011-September/msg00830.html v2: http://comments.gmane.org/gmane.comp.emulators.libvirt/46729 References: [1]. http://www.redhat.com/archives/libvir-list/2011-November/msg01407.html [2]. http://thread.gmane.org/gmane.comp.emulators.libvirt/47950 [3]. http://thread.gmane.org/gmane.comp.emulators.libvirt/49054 Srivatsa S. Bhat (4): Add a public API to invoke suspend/resume on the host Add the remote protocol implementation for virNodeSuspendForDuration Implement the core API to suspend/resume the host Add virsh command to initiate suspend on the host include/libvirt/libvirt.h.in | 16 ++ src/Makefile.am | 1 src/driver.h | 6 + src/libvirt.c | 65 ++++++++++ src/libvirt_private.syms | 5 + src/libvirt_public.syms | 5 + src/lxc/lxc_driver.c | 2 src/qemu/qemu_driver.c | 2 src/remote/remote_driver.c | 1 src/remote/remote_protocol.x | 10 +- src/uml/uml_driver.c | 2 src/util/virnodesuspend.c | 269 ++++++++++++++++++++++++++++++++++++++++++ src/util/virnodesuspend.h | 36 ++++++ src/xen/xen_driver.c | 2 tools/virsh.c | 64 ++++++++++ tools/virsh.pod | 7 + 16 files changed, 491 insertions(+), 2 deletions(-) create mode 100644 src/util/virnodesuspend.c create mode 100644 src/util/virnodesuspend.h

3 10

[libvirt] [PATCH] Add 'Hybrid-Suspend' power management discovery for the host
by Srivatsa S. Bhat 29 Nov '11

29 Nov '11

Some systems support a feature known as 'Hybrid-Suspend', apart from the usual system-wide sleep states such as Suspend-to-RAM (S3) or Suspend-to-Disk (S4). Add the functionality to discover this power management feature and export it in the capabilities XML under the <power_management> tag. This addition was suggested in [1]. References: 1. http://www.redhat.com/archives/libvir-list/2011-November/msg01298.html Signed-off-by: Srivatsa S. Bhat <srivatsa.bhat(a)linux.vnet.ibm.com> --- docs/formatcaps.html.in | 12 +++-- docs/schemas/capability.rng | 5 ++ src/conf/capabilities.c | 2 - src/util/util.c | 99 ++++++++++++++++++++++++++++++------------- src/util/util.h | 8 ++- 5 files changed, 88 insertions(+), 38 deletions(-) diff --git a/docs/formatcaps.html.in b/docs/formatcaps.html.in index ce6f9a6..c5fb925 100644 --- a/docs/formatcaps.html.in +++ b/docs/formatcaps.html.in @@ -31,6 +31,7 @@ BIOS you will see <power_management> <S3/> <S4/> + <Hybrid-Suspend/> <power_management/> </host> @@ -70,11 +71,12 @@ the host platform, but other information may be available, it shows the CPU arch topology, model name, and additional features which are not included in the model but the CPU provides them. Features of the chip are shown within the feature block (the block is similar to what you will find in a Xen fully virtualized domain description). Further, -the power management features supported by the host are shown, such as Suspend-to-RAM (S3) -and Suspend-to-Disk (S4). In case the query for power management features succeeded but the -host does not support any such feature, then an empty <power_management/> -tag will be shown. Otherwise, if the query itself failed, no such tag will -be displayed (i.e., there will not be any power_management block or empty tag in the XML). +the power management features supported by the host are shown, such as Suspend-to-RAM (S3), +Suspend-to-Disk (S4) and Hybrid-Suspend (a combination of S3 and S4). +In case the query for power management features succeeded but the host does not support +any such feature, then an empty <power_management/> tag will be shown. Otherwise, +if the query itself failed, no such tag will be displayed (i.e., there will not be any +power_management block or empty tag in the XML). The second block (in blue) indicates the paravirtualization support of the Xen support, you will see the os_type of xen to indicate a paravirtual kernel, then architecture information and potential features. diff --git a/docs/schemas/capability.rng b/docs/schemas/capability.rng index 645769e..6cf2188 100644 --- a/docs/schemas/capability.rng +++ b/docs/schemas/capability.rng @@ -121,6 +121,11 @@ <empty/> </element> </optional> + <optional> + <element name='Hybrid-Suspend'> + <empty/> + </element> + </optional> </interleave> </element> </define> diff --git a/src/conf/capabilities.c b/src/conf/capabilities.c index 87b60b0..8468861 100644 --- a/src/conf/capabilities.c +++ b/src/conf/capabilities.c @@ -35,7 +35,7 @@ #define VIR_FROM_THIS VIR_FROM_CAPABILITIES VIR_ENUM_IMPL(virHostPMCapability, VIR_HOST_PM_LAST, - "S3", "S4") + "S3", "S4", "Hybrid-Suspend") /** * virCapabilitiesNew: diff --git a/src/util/util.c b/src/util/util.c index ce697fb..ccd1a0e 100644 --- a/src/util/util.c +++ b/src/util/util.c @@ -2623,47 +2623,50 @@ virTypedParameterArrayClear(virTypedParameterPtr params, int nparams) } /** - * Get the Power Management Capabilities of the host system. - * The script 'pm-is-supported' (from the pm-utils package) is run - * to find out all the power management features supported by the host, - * such as Suspend-to-RAM (S3) and Suspend-to-Disk (S4). + * virDiscoverHostPMFeature: + * @bitmask: The bitmask which should be populated with the result of + * the query + * @feature: The power management feature to check whether it is supported + * by the host. Values could be: + * VIR_HOST_PM_S3 for Suspend-to-RAM + * VIR_HOST_PM_S4 for Suspend-to-Disk + * VIR_HOST_PM_HYBRID_SUSPEND for Hybrid-Suspend * - * @bitmask: Pointer to the bitmask which will be set appropriately to - * indicate all the supported host power management features. + * Run the script 'pm-is-supported' (from the pm-utils package) + * to find out if @feature is supported by the host. * - * Returns 0 if the query was successful, -1 upon failure. + * Returns 0 if the query was successful, -1 on failure. */ int -virGetPMCapabilities(unsigned int *bitmask) +virDiscoverHostPMFeature(unsigned int *bitmask, unsigned int feature) { - int ret = -1; - int status; virCommandPtr cmd; + int status; + int ret = -1; - *bitmask = 0; - - /* Check support for Suspend-to-RAM (S3) */ - cmd = virCommandNewArgList("pm-is-supported", "--suspend", NULL); - if (virCommandRun(cmd, &status) < 0) - goto cleanup; - - /* Check return code of command == 0 for success - * (i.e., the PM capability is supported) - */ - if (status == 0) - *bitmask |= 1U << VIR_HOST_PM_S3; - virCommandFree(cmd); + switch (feature) { + case VIR_HOST_PM_S3: + cmd = virCommandNewArgList("pm-is-supported", "--suspend", NULL); + break; + case VIR_HOST_PM_S4: + cmd = virCommandNewArgList("pm-is-supported", "--hibernate", NULL); + break; + case VIR_HOST_PM_HYBRID_SUSPEND: + cmd = virCommandNewArgList("pm-is-supported", "--suspend-hybrid", NULL); + break; + default: + return ret; + } - /* Check support for Suspend-to-Disk (S4) */ - cmd = virCommandNewArgList("pm-is-supported", "--hibernate", NULL); if (virCommandRun(cmd, &status) < 0) goto cleanup; - /* Check return code of command == 0 for success - * (i.e., the PM capability is supported) - */ + /* + * Check return code of command == 0 for success + * (i.e., the PM capability is supported) + */ if (status == 0) - *bitmask |= 1U << VIR_HOST_PM_S4; + *bitmask |= 1U << feature; ret = 0; @@ -2671,3 +2674,41 @@ cleanup: virCommandFree(cmd); return ret; } + +/** + * virGetPMCapabilities: + * + * Get the Power Management Capabilities that the host system supports, + * such as Suspend-to-RAM (S3), Suspend-to-Disk (S4) and Hybrid-Suspend + * (a combination of S3 and S4). + * + * @bitmask: Pointer to the bitmask which will be set appropriately to + * indicate all the supported host power management features. + * + * Returns 0 if the query was successful, -1 on failure. + */ +int +virGetPMCapabilities(unsigned int *bitmask) +{ + int ret; + + *bitmask = 0; + + /* Check support for Suspend-to-RAM (S3) */ + ret = virDiscoverHostPMFeature(bitmask, VIR_HOST_PM_S3); + if (ret < 0) + return -1; + + /* Check support for Suspend-to-Disk (S4) */ + ret = virDiscoverHostPMFeature(bitmask, VIR_HOST_PM_S4); + if (ret < 0) + return -1; + + /* Check support for Hybrid-Suspend */ + ret = virDiscoverHostPMFeature(bitmask, VIR_HOST_PM_HYBRID_SUSPEND); + if (ret < 0) + return -1; + + return 0; +} + diff --git a/src/util/util.h b/src/util/util.h index 5afcf58..eda60d2 100644 --- a/src/util/util.h +++ b/src/util/util.h @@ -264,14 +264,16 @@ void virTypedParameterArrayClear(virTypedParameterPtr params, int nparams); /* Power Management Capabilities of the host system */ enum virHostPMCapability { - VIR_HOST_PM_S3, /* Suspend-to-RAM */ - VIR_HOST_PM_S4, /* Suspend-to-Disk */ + VIR_HOST_PM_S3, /* Suspend-to-RAM */ + VIR_HOST_PM_S4, /* Suspend-to-Disk */ + VIR_HOST_PM_HYBRID_SUSPEND, /* Hybrid-Suspend */ VIR_HOST_PM_LAST }; VIR_ENUM_DECL(virHostPMCapability) -int virGetPMCapabilities(unsigned int *); +int virDiscoverHostPMFeature(unsigned int *bitmask, unsigned int feature); +int virGetPMCapabilities(unsigned int *bitmask); #endif /* __VIR_UTIL_H__ */

3 4

[libvirt] [PATCH] rpc: Really send non-blocking calls while waiting for another call
by Jiri Denemark 29 Nov '11

29 Nov '11

When another thread was dispatching while we wanted to send a non-blocking call, we correctly queued the call and woke up the thread but the thread just threw the call away since it forgot to recheck if its socket was writable. --- src/rpc/virnetclient.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/src/rpc/virnetclient.c b/src/rpc/virnetclient.c index aad7f5d..a738129 100644 --- a/src/rpc/virnetclient.c +++ b/src/rpc/virnetclient.c @@ -1381,6 +1381,16 @@ static int virNetClientIOEventLoop(virNetClientPtr client, _("read on wakeup fd failed")); goto error; } + + /* If we were woken up because a new non-blocking call was queued, + * we need to re-poll to check if we can send it. + */ + if (virNetClientCallMatchPredicate(client->waitDispatch, + virNetClientIOEventLoopWantNonBlock, + NULL)) { + VIR_DEBUG("New non-blocking call arrived; repolling"); + continue; + } } if (ret < 0) { -- 1.7.8.rc3

2 2

[libvirt] [PATCH 3/8] Implement virDomain{Set, Get}BlockIoTune for the qemu driver
by Lei Li 29 Nov '11

29 Nov '11

Implement the block I/O throttle setting and getting support to qemu driver. Signed-off-by: Lei Li <lilei(a)linux.vnet.ibm.com> Signed-off-by: Zhi Yong Wu <wuzhy(a)linux.vnet.ibm.com> --- src/qemu/qemu_driver.c | 342 ++++++++++++++++++++++++++++++++++++++++++ src/qemu/qemu_monitor.c | 37 +++++ src/qemu/qemu_monitor.h | 22 +++ src/qemu/qemu_monitor_json.c | 186 +++++++++++++++++++++++ src/qemu/qemu_monitor_json.h | 10 ++ src/qemu/qemu_monitor_text.c | 165 ++++++++++++++++++++ src/qemu/qemu_monitor_text.h | 10 ++ 7 files changed, 772 insertions(+), 0 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 5f4a18d..0a4eaa9 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -94,6 +94,8 @@ #define QEMU_NB_MEM_PARAM 3 +#define QEMU_NB_BLKIOTHROTTLE_PARAM 6 + #if HAVE_LINUX_KVM_H # include <linux/kvm.h> #endif @@ -10775,6 +10777,344 @@ cleanup: return ret; } +static int +qemuDomainSetBlockIoTune(virDomainPtr dom, + const char *disk, + virTypedParameterPtr params, + int nparams, + unsigned int flags) +{ + struct qemud_driver *driver = dom->conn->privateData; + virDomainObjPtr vm = NULL; + qemuDomainObjPrivatePtr priv; + virDomainDefPtr persistentDef = NULL; + virDomainBlockIoTuneInfo info; + char uuidstr[VIR_UUID_STRING_BUFLEN]; + const char *device = NULL; + int ret = -1; + int i; + bool isActive; + + virCheckFlags(VIR_DOMAIN_AFFECT_LIVE | + VIR_DOMAIN_AFFECT_CONFIG, -1); + + memset(&info, 0, sizeof(info)); + + qemuDriverLock(driver); + virUUIDFormat(dom->uuid, uuidstr); + vm = virDomainFindByUUID(&driver->domains, dom->uuid); + if (!vm) { + qemuReportError(VIR_ERR_NO_DOMAIN, + _("no domain with matching uuid '%s'"), uuidstr); + goto cleanup; + } + + device = qemuDiskPathToAlias(vm, disk); + if (!device) { + goto cleanup; + } + + if (qemuDomainObjBeginJobWithDriver(driver, vm, QEMU_JOB_MODIFY) < 0) + goto cleanup; + + isActive = virDomainObjIsActive(vm); + + if (flags == VIR_DOMAIN_AFFECT_CURRENT) { + if (isActive) + flags = VIR_DOMAIN_AFFECT_LIVE; + else + flags = VIR_DOMAIN_AFFECT_CONFIG; + } + + if (!isActive && (flags & VIR_DOMAIN_AFFECT_LIVE)) { + qemuReportError(VIR_ERR_OPERATION_INVALID, "%s", + _("domain is not running")); + goto endjob; + } + + if (flags & VIR_DOMAIN_AFFECT_CONFIG) { + if (!vm->persistent) { + qemuReportError(VIR_ERR_OPERATION_INVALID, "%s", + _("cannot change persistent config of a transient domain")); + goto endjob; + } + if (!(persistentDef = virDomainObjGetPersistentDef(driver->caps, vm))) + goto endjob; + } + + for (i = 0; i < nparams; i++) { + virTypedParameterPtr param = &params[i]; + + if (STREQ(param->field, VIR_DOMAIN_BLOCK_IOTUNE_TOTAL_BYTES_SEC)) { + + info.total_bytes_sec = params[i].value.ul; + } else if (STREQ(param->field, VIR_DOMAIN_BLOCK_IOTUNE_READ_BYTES_SEC)) { + info.read_bytes_sec = params[i].value.ul; + } else if (STREQ(param->field, VIR_DOMAIN_BLOCK_IOTUNE_WRITE_BYTES_SEC)) { + info.write_bytes_sec = params[i].value.ul; + } else if (STREQ(param->field, VIR_DOMAIN_BLOCK_IOTUNE_TOTAL_IOPS_SEC)) { + info.total_iops_sec = params[i].value.ul; + } else if (STREQ(param->field, VIR_DOMAIN_BLOCK_IOTUNE_READ_IOPS_SEC)) { + info.read_iops_sec = params[i].value.ul; + } else if (STREQ(param->field, VIR_DOMAIN_BLOCK_IOTUNE_WRITE_IOPS_SEC)) { + info.write_iops_sec = params[i].value.ul; + } else { + qemuReportError(VIR_ERR_OPERATION_INVALID, "%s", + _("Unrecognized parameter")); + goto endjob; + } + } + + if ((info.total_bytes_sec && info.read_bytes_sec) || + (info.total_bytes_sec && info.write_bytes_sec)) { + qemuReportError(VIR_ERR_INVALID_ARG, "%s", + _("total and read/write of bytes_sec cannot be set at the same time")); + goto endjob; + } + + if ((info.total_iops_sec && info.read_iops_sec) || + (info.total_iops_sec && info.write_iops_sec)) { + qemuReportError(VIR_ERR_INVALID_ARG, "%s", + _("total and read/write of iops_sec cannot be set at the same time")); + goto endjob; + } + + if (flags & VIR_DOMAIN_AFFECT_LIVE) { + priv = vm->privateData; + qemuDomainObjEnterMonitorWithDriver(driver, vm); + ret = qemuMonitorSetBlockIoThrottle(priv->mon, device, &info, 1); + qemuDomainObjExitMonitorWithDriver(driver, vm); + } + + if (flags & VIR_DOMAIN_AFFECT_CONFIG) { + sa_assert(persistentDef); + int idx = virDomainDiskIndexByName(vm->def, disk, true); + if (i < 0) + goto endjob; + persistentDef->disks[idx]->blkdeviotune.total_bytes_sec = info.total_bytes_sec; + persistentDef->disks[idx]->blkdeviotune.read_bytes_sec = info.read_bytes_sec; + persistentDef->disks[idx]->blkdeviotune.write_bytes_sec = info.write_bytes_sec; + persistentDef->disks[idx]->blkdeviotune.total_iops_sec = info.total_iops_sec; + persistentDef->disks[idx]->blkdeviotune.read_iops_sec = info.read_iops_sec; + persistentDef->disks[idx]->blkdeviotune.write_iops_sec = info.write_iops_sec; + persistentDef->disks[idx]->blkdeviotune.mark = 1; + } + + if (flags & VIR_DOMAIN_AFFECT_CONFIG) { + ret = virDomainSaveConfig(driver->configDir, persistentDef); + if (ret < 0) { + qemuReportError(VIR_ERR_OPERATION_INVALID, "%s", + _("Write to config file failed")); + goto endjob; + } + } + +endjob: + if (qemuDomainObjEndJob(driver, vm) == 0) + vm = NULL; + +cleanup: + VIR_FREE(device); + if (vm) + virDomainObjUnlock(vm); + qemuDriverUnlock(driver); + return ret; +} + +static int +qemuDomainGetBlockIoTune(virDomainPtr dom, + const char *disk, + virTypedParameterPtr params, + int *nparams, + unsigned int flags) +{ + struct qemud_driver *driver = dom->conn->privateData; + virDomainObjPtr vm = NULL; + qemuDomainObjPrivatePtr priv; + virDomainDefPtr persistentDef = NULL; + virDomainBlockIoTuneInfo reply; + char uuidstr[VIR_UUID_STRING_BUFLEN]; + const char *device = NULL; + int ret = -1; + int i; + bool isActive; + + virCheckFlags(VIR_DOMAIN_AFFECT_LIVE | + VIR_DOMAIN_AFFECT_CONFIG | + VIR_TYPED_PARAM_STRING_OKAY, -1); + + /* We don't return strings, and thus trivially support this flag. */ + flags &= ~VIR_TYPED_PARAM_STRING_OKAY; + + qemuDriverLock(driver); + virUUIDFormat(dom->uuid, uuidstr); + vm = virDomainFindByUUID(&driver->domains, dom->uuid); + if (!vm) { + qemuReportError(VIR_ERR_NO_DOMAIN, + _("no domain with matching uuid '%s'"), uuidstr); + goto cleanup; + } + + device = qemuDiskPathToAlias(vm, disk); + + if (!device) { + goto cleanup; + } + + if (qemuDomainObjBeginJobWithDriver(driver, vm, QEMU_JOB_MODIFY) < 0) + goto cleanup; + + isActive = virDomainObjIsActive(vm); + + if (flags == VIR_DOMAIN_AFFECT_CURRENT) { + if (isActive) + flags = VIR_DOMAIN_AFFECT_LIVE; + else + flags = VIR_DOMAIN_AFFECT_CONFIG; + } + + if ((flags & VIR_DOMAIN_AFFECT_LIVE) && (flags & VIR_DOMAIN_AFFECT_CONFIG)) { + qemuReportError(VIR_ERR_INVALID_ARG, "%s", + _("Cannot query with --live and --config together")); + goto endjob; + } + + if (!isActive && (flags & VIR_DOMAIN_AFFECT_LIVE)) { + qemuReportError(VIR_ERR_OPERATION_INVALID, "%s", + _("domain is not running")); + goto endjob; + } + + if ((*nparams) == 0) { + /* Current number of parameters supported by QEMU Block I/O Throttling */ + *nparams = QEMU_NB_BLKIOTHROTTLE_PARAM; + ret = 0; + goto endjob; + } + + if (flags & VIR_DOMAIN_AFFECT_LIVE) { + priv = vm->privateData; + qemuDomainObjEnterMonitorWithDriver(driver, vm); + ret = qemuMonitorGetBlockIoThrottle(priv->mon, device, &reply, 0); + qemuDomainObjExitMonitorWithDriver(driver, vm); + } + + if (flags & VIR_DOMAIN_AFFECT_CONFIG) { + if (!vm->persistent) { + qemuReportError(VIR_ERR_OPERATION_INVALID, "%s", + _("domain is transient")); + goto endjob; + } + if (!(persistentDef = virDomainObjGetPersistentDef(driver->caps, vm))) + goto endjob; + + sa_assert(persistentDef); + int idx = virDomainDiskIndexByName(vm->def, disk, true); + if (idx < 0) + goto endjob; + reply.total_bytes_sec = persistentDef->disks[idx]->blkdeviotune.total_bytes_sec; + reply.read_bytes_sec = persistentDef->disks[idx]->blkdeviotune.read_bytes_sec; + reply.write_bytes_sec = persistentDef->disks[idx]->blkdeviotune.write_bytes_sec; + reply.total_iops_sec = persistentDef->disks[idx]->blkdeviotune.total_iops_sec; + reply.read_iops_sec = persistentDef->disks[idx]->blkdeviotune.read_iops_sec; + reply.write_iops_sec = persistentDef->disks[idx]->blkdeviotune.write_iops_sec; + ret = 0; + } + + if ((ret != 0) && ((*nparams) < QEMU_NB_BLKIOTHROTTLE_PARAM)) { + qemuReportError(VIR_ERR_OPERATION_INVALID, "%s", + _("Cannot get block I/O parameters")); + goto endjob; + } + + for (i = 0; i < QEMU_NB_BLKIOTHROTTLE_PARAM; i++) { + virTypedParameterPtr param = &params[i]; + param->value.ul = 0; + param->type = VIR_TYPED_PARAM_ULLONG; + + switch(i) { + case 0: + if (virStrcpyStatic(param->field, + VIR_DOMAIN_BLOCK_IOTUNE_TOTAL_BYTES_SEC) == NULL) { + qemuReportError(VIR_ERR_INTERNAL_ERROR, + _("Field name '%s' too long"), + VIR_DOMAIN_BLOCK_IOTUNE_TOTAL_BYTES_SEC); + goto endjob; + } + param->value.ul = reply.total_bytes_sec; + break; + + case 1: + if (virStrcpyStatic(param->field, + VIR_DOMAIN_BLOCK_IOTUNE_READ_BYTES_SEC) == NULL) { + qemuReportError(VIR_ERR_INTERNAL_ERROR, + _("Field name '%s' too long"), + VIR_DOMAIN_BLOCK_IOTUNE_READ_BYTES_SEC); + goto endjob; + } + param->value.ul = reply.read_bytes_sec; + break; + + case 2: + if (virStrcpyStatic(param->field, + VIR_DOMAIN_BLOCK_IOTUNE_WRITE_BYTES_SEC) == NULL) { + qemuReportError(VIR_ERR_INTERNAL_ERROR, + _("Field name '%s' too long"), + VIR_DOMAIN_BLOCK_IOTUNE_WRITE_BYTES_SEC); + goto endjob; + } + param->value.ul = reply.write_bytes_sec; + break; + + case 3: + if (virStrcpyStatic(param->field, + VIR_DOMAIN_BLOCK_IOTUNE_TOTAL_IOPS_SEC) == NULL) { + qemuReportError(VIR_ERR_INTERNAL_ERROR, + _("Field name '%s' too long"), + VIR_DOMAIN_BLOCK_IOTUNE_TOTAL_IOPS_SEC); + goto endjob; + } + param->value.ul = reply.total_iops_sec; + break; + + case 4: + if (virStrcpyStatic(param->field, + VIR_DOMAIN_BLOCK_IOTUNE_READ_IOPS_SEC) == NULL) { + qemuReportError(VIR_ERR_INTERNAL_ERROR, + _("Field name '%s' too long"), + VIR_DOMAIN_BLOCK_IOTUNE_READ_IOPS_SEC); + goto endjob; + } + param->value.ul = reply.read_iops_sec; + break; + + case 5: + if (virStrcpyStatic(param->field, + VIR_DOMAIN_BLOCK_IOTUNE_WRITE_IOPS_SEC) == NULL) { + qemuReportError(VIR_ERR_INTERNAL_ERROR, + _("Field name '%s' too long"), + VIR_DOMAIN_BLOCK_IOTUNE_WRITE_IOPS_SEC); + goto endjob; + } + param->value.ul = reply.write_iops_sec; + break; + default: + break; + } + } + ret = 0; + +endjob: + if (qemuDomainObjEndJob(driver, vm) == 0) + vm = NULL; + +cleanup: + VIR_FREE(device); + if (vm) + virDomainObjUnlock(vm); + qemuDriverUnlock(driver); + return ret; +} static virDriver qemuDriver = { .no = VIR_DRV_QEMU, @@ -10919,6 +11259,8 @@ static virDriver qemuDriver = { .domainGetBlockJobInfo = qemuDomainGetBlockJobInfo, /* 0.9.4 */ .domainBlockJobSetSpeed = qemuDomainBlockJobSetSpeed, /* 0.9.4 */ .domainBlockPull = qemuDomainBlockPull, /* 0.9.4 */ + .domainSetBlockIoTune = qemuDomainSetBlockIoTune, /* 0.9.8 */ + .domainGetBlockIoTune = qemuDomainGetBlockIoTune, /* 0.9.8 */ }; diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index 73e5ea9..c0b711f 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -2567,6 +2567,43 @@ int qemuMonitorBlockJob(qemuMonitorPtr mon, return ret; } +int qemuMonitorSetBlockIoThrottle(qemuMonitorPtr mon, + const char *device, + virDomainBlockIoTuneInfoPtr info, + unsigned int flags) +{ + int ret; + + VIR_DEBUG("mon=%p, device=%p, info=%p, flags=%x", + mon, device, info, flags); + + if (mon->json) { + ret = qemuMonitorJSONSetBlockIoThrottle(mon, device, info, flags); + } else { + ret = qemuMonitorTextSetBlockIoThrottle(mon, device, info, flags); + } + return ret; +} + +int qemuMonitorGetBlockIoThrottle(qemuMonitorPtr mon, + const char *device, + virDomainBlockIoTuneInfoPtr reply, + unsigned int flags) +{ + int ret; + + VIR_DEBUG("mon=%p, device=%p, reply=%p, flags=%x", + mon, device, reply, flags); + + if (mon->json) { + ret = qemuMonitorJSONGetBlockIoThrottle(mon, device, reply, flags); + } else { + ret = qemuMonitorTextGetBlockIoThrottle(mon, device, reply, flags); + } + return ret; +} + + int qemuMonitorVMStatusToPausedReason(const char *status) { int st; diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h index 883e0aa..48c6db0 100644 --- a/src/qemu/qemu_monitor.h +++ b/src/qemu/qemu_monitor.h @@ -521,6 +521,28 @@ int qemuMonitorOpenGraphics(qemuMonitorPtr mon, const char *fdname, bool skipauth); + +typedef struct _virDomainBlockIoTuneInfo virDomainBlockIoTuneInfo; +struct _virDomainBlockIoTuneInfo { + unsigned long long total_bytes_sec; + unsigned long long read_bytes_sec; + unsigned long long write_bytes_sec; + unsigned long long total_iops_sec; + unsigned long long read_iops_sec; + unsigned long long write_iops_sec; +}; +typedef virDomainBlockIoTuneInfo *virDomainBlockIoTuneInfoPtr; + +int qemuMonitorSetBlockIoThrottle(qemuMonitorPtr mon, + const char *device, + virDomainBlockIoTuneInfoPtr info, + unsigned int flags); + +int qemuMonitorGetBlockIoThrottle(qemuMonitorPtr mon, + const char *device, + virDomainBlockIoTuneInfoPtr reply, + unsigned int flags); + /** * When running two dd process and using <> redirection, we need a * shell that will not truncate files. These two strings serve that diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index 56a62db..925031e 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -3276,3 +3276,189 @@ int qemuMonitorJSONOpenGraphics(qemuMonitorPtr mon, virJSONValueFree(reply); return ret; } + + +static int +qemuMonitorJSONBlockIoThrottleInfo(virJSONValuePtr result, + const char *device, + virDomainBlockIoTuneInfoPtr reply) +{ + virJSONValuePtr io_throttle; + int ret = -1; + int i; + int found = 0; + + io_throttle = virJSONValueObjectGet(result, "return"); + + if (!io_throttle || io_throttle->type != VIR_JSON_TYPE_ARRAY) { + qemuReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _(" block_io_throttle reply was missing device list ")); + goto cleanup; + } + + for (i = 0; i < virJSONValueArraySize(io_throttle); i++) { + virJSONValuePtr temp_dev = virJSONValueArrayGet(io_throttle, i); + virJSONValuePtr inserted; + const char *current_dev; + + if (!temp_dev || temp_dev->type != VIR_JSON_TYPE_OBJECT) { + qemuReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("block io throttle device entry was not in expected format")); + goto cleanup; + } + + if ((current_dev = virJSONValueObjectGetString(temp_dev, "device")) == NULL) { + qemuReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("block io throttle device entry was not in expected format")); + goto cleanup; + } + + if(STRPREFIX(current_dev, QEMU_DRIVE_HOST_PREFIX)) + current_dev += strlen(QEMU_DRIVE_HOST_PREFIX); + + if (STREQ(current_dev, device)) + continue; + + found = 1; + if ((inserted = virJSONValueObjectGet(temp_dev, "inserted")) == NULL || + inserted->type != VIR_JSON_TYPE_OBJECT) { + qemuReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("block io throttle inserted entry was not in expected format")); + goto cleanup; + } + + if (virJSONValueObjectGetNumberUlong(inserted, "bps", &reply->total_bytes_sec) < 0) { + qemuReportError(VIR_ERR_INTERNAL_ERROR, + _("cannot read %s"), "total_bytes_sec"); + goto cleanup; + } + + if (virJSONValueObjectGetNumberUlong(inserted, "bps_rd", &reply->read_bytes_sec) < 0) { + qemuReportError(VIR_ERR_INTERNAL_ERROR, + _("cannot read %s"), "read_bytes_sec"); + goto cleanup; + } + + if (virJSONValueObjectGetNumberUlong(inserted, "bps_wr", &reply->write_bytes_sec) < 0) { + qemuReportError(VIR_ERR_INTERNAL_ERROR, + _("cannot read %s"), "write_bytes_sec"); + goto cleanup; + } + + if (virJSONValueObjectGetNumberUlong(inserted, "iops", &reply->total_iops_sec) < 0) { + qemuReportError(VIR_ERR_INTERNAL_ERROR, + _("cannot read %s"), "total_iops_sec"); + goto cleanup; + } + + if (virJSONValueObjectGetNumberUlong(inserted, "iops_rd", &reply->read_iops_sec) < 0) { + qemuReportError(VIR_ERR_INTERNAL_ERROR, + _("cannot read %s"), "read_iops_sec"); + goto cleanup; + } + + if (virJSONValueObjectGetNumberUlong(inserted, "iops_wr", &reply->write_iops_sec) < 0) { + qemuReportError(VIR_ERR_INTERNAL_ERROR, + _("cannot read %s"), "write_iops_sec"); + goto cleanup; + } + break; + } + + if (!found) { + qemuReportError(VIR_ERR_INTERNAL_ERROR, + _("cannot found info for device '%s'"), + device); + goto cleanup; + } + ret = 0; + +cleanup: + return ret; +} + +int qemuMonitorJSONSetBlockIoThrottle(qemuMonitorPtr mon, + const char *device, + virDomainBlockIoTuneInfoPtr info, + unsigned int flags) +{ + int ret = -1; + virJSONValuePtr cmd = NULL; + virJSONValuePtr result = NULL; + + if (flags) { + cmd = qemuMonitorJSONMakeCommand("block_set_io_throttle", + "s:device", device, + "U:bps", info->total_bytes_sec, + "U:bps_rd", info->read_bytes_sec, + "U:bps_wr", info->write_bytes_sec, + "U:iops", info->total_iops_sec, + "U:iops_rd", info->read_iops_sec, + "U:iops_wr", info->write_iops_sec, + NULL); + } + + if (!cmd) + return -1; + + ret = qemuMonitorJSONCommand(mon, cmd, &result); + + if (ret == 0 && virJSONValueObjectHasKey(result, "error")) { + if (qemuMonitorJSONHasError(result, "DeviceNotActive")) + qemuReportError(VIR_ERR_OPERATION_INVALID, + _("No active operation on device: %s"), device); + else if (qemuMonitorJSONHasError(result, "NotSupported")) + qemuReportError(VIR_ERR_OPERATION_INVALID, + _("Operation is not supported for device: %s"), device); + else + qemuReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Unexpected error")); + ret = -1; + } + + virJSONValueFree(cmd); + virJSONValueFree(result); + return ret; +} + +int qemuMonitorJSONGetBlockIoThrottle(qemuMonitorPtr mon, + const char *device, + virDomainBlockIoTuneInfoPtr reply, + unsigned int flags) +{ + int ret = -1; + virJSONValuePtr cmd = NULL; + virJSONValuePtr result = NULL; + + if (!flags) { + cmd = qemuMonitorJSONMakeCommand("query-block", + NULL); + } + + if (!cmd) { + return -1; + } + + ret = qemuMonitorJSONCommand(mon, cmd, &result); + + if (ret == 0 && virJSONValueObjectHasKey(result, "error")) { + if (qemuMonitorJSONHasError(result, "DeviceNotActive")) + qemuReportError(VIR_ERR_OPERATION_INVALID, + _("No active operation on device: %s"), device); + else if (qemuMonitorJSONHasError(result, "NotSupported")) + qemuReportError(VIR_ERR_OPERATION_INVALID, + _("Operation is not supported for device: %s"), device); + else + qemuReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Unexpected error")); + ret = -1; + } + + if (ret == 0 && !flags) + ret = qemuMonitorJSONBlockIoThrottleInfo(result, device, reply); + + virJSONValueFree(cmd); + virJSONValueFree(result); + return ret; +} + diff --git a/src/qemu/qemu_monitor_json.h b/src/qemu/qemu_monitor_json.h index f10d7d2..bf12dc5 100644 --- a/src/qemu/qemu_monitor_json.h +++ b/src/qemu/qemu_monitor_json.h @@ -255,4 +255,14 @@ int qemuMonitorJSONOpenGraphics(qemuMonitorPtr mon, const char *fdname, bool skipauth); +int qemuMonitorJSONSetBlockIoThrottle(qemuMonitorPtr mon, + const char *device, + virDomainBlockIoTuneInfoPtr info, + unsigned int flags); + +int qemuMonitorJSONGetBlockIoThrottle(qemuMonitorPtr mon, + const char *device, + virDomainBlockIoTuneInfoPtr reply, + unsigned int flags); + #endif /* QEMU_MONITOR_JSON_H */ diff --git a/src/qemu/qemu_monitor_text.c b/src/qemu/qemu_monitor_text.c index 5de4d24..0ccc111 100644 --- a/src/qemu/qemu_monitor_text.c +++ b/src/qemu/qemu_monitor_text.c @@ -3429,3 +3429,168 @@ cleanup: VIR_FREE(cmd); return ret; } + + +int qemuMonitorTextSetBlockIoThrottle(qemuMonitorPtr mon, + const char *device, + virDomainBlockIoTuneInfoPtr info, + unsigned int flags) +{ + char *cmd = NULL; + char *result = NULL; + int ret = 0; + const char *cmd_name = NULL; + + /* For the not specified fields, 0 by default */ + if (flags) { + cmd_name = "block_set_io_throttle"; + ret = virAsprintf(&cmd, "%s %s %llu %llu %llu %llu %llu %llu", cmd_name, + device, info->total_bytes_sec, info->read_bytes_sec, + info->write_bytes_sec, info->total_iops_sec, + info->read_iops_sec, info->write_iops_sec); + } + + if (ret < 0) { + virReportOOMError(); + return -1; + } + + if (qemuMonitorHMPCommand(mon, cmd, &result) < 0) { + qemuReportError(VIR_ERR_INTERNAL_ERROR, + "%s", _("cannot run monitor command")); + ret = -1; + goto cleanup; + } + + if (qemuMonitorTextCommandNotFound(cmd_name, result)) { + qemuReportError(VIR_ERR_OPERATION_INVALID, + _("Command '%s' is not found"), cmd_name); + ret = -1; + goto cleanup; + } + +cleanup: + VIR_FREE(cmd); + VIR_FREE(result); + return ret; +} + +static int qemuMonitorTextParseBlockIoThrottle(const char *result, + const char *device, + virDomainBlockIoTuneInfoPtr reply) +{ + char *dummy = NULL; + int ret = -1; + const char *p, *eol; + int devnamelen = strlen(device); + + p = result; + + while (*p) { + if (STRPREFIX(p, QEMU_DRIVE_HOST_PREFIX)) + p += strlen(QEMU_DRIVE_HOST_PREFIX); + + if (STREQLEN(p, device, devnamelen) && + p[devnamelen] == ':' && p[devnamelen+1] == ' ') { + + eol = strchr(p, '\n'); + if (!eol) + eol = p + strlen(p); + + p += devnamelen + 2; /*Skip to first label. */ + + while (*p) { + if (STRPREFIX(p, "bps=")) { + p += strlen("bps="); + if (virStrToLong_ull(p, &dummy, 10, &reply->total_bytes_sec) == -1) + VIR_DEBUG("error reading total_bytes_sec: %s", p); + } else if (STRPREFIX(p, "bps_rd=")) { + p += strlen("bps_rd="); + if (virStrToLong_ull(p, &dummy, 10, &reply->read_bytes_sec) == -1) + VIR_DEBUG("error reading read_bytes_sec: %s", p); + } else if (STRPREFIX(p, "bps_wr=")) { + p += strlen("bps_wr="); + if (virStrToLong_ull(p, &dummy, 10, &reply->write_bytes_sec) == -1) + VIR_DEBUG("error reading write_bytes_sec: %s", p); + } else if (STRPREFIX(p, "iops=")) { + p += strlen("iops="); + if (virStrToLong_ull(p, &dummy, 10, &reply->total_iops_sec) == -1) + VIR_DEBUG("error reading total_iops_sec: %s", p); + } else if (STRPREFIX(p, "iops_rd=")) { + p += strlen("iops_rd="); + if (virStrToLong_ull(p, &dummy, 10, &reply->read_iops_sec) == -1) + VIR_DEBUG("error reading read_iops_sec: %s", p); + } else if (STRPREFIX(p, "iops_wr=")) { + p += strlen("iops_wr="); + if (virStrToLong_ull(p, &dummy, 10, &reply->write_iops_sec) == -1) + VIR_DEBUG("error reading write_iops_sec: %s", p); + } else { + VIR_DEBUG(" unknown block info %s", p); + } + + /* Skip to next label. */ + p = strchr (p, ' '); + if (!p || p >= eol) + break; + p++; + } + ret = 0; + goto cleanup; + } + + /* Skip to next line. */ + p = strchr (p, '\n'); + if (!p) + break; + p++; + } + + qemuReportError(VIR_ERR_INVALID_ARG, + _("No info for device '%s'"), device); + +cleanup: + return ret; +} + +int qemuMonitorTextGetBlockIoThrottle(qemuMonitorPtr mon, + const char *device, + virDomainBlockIoTuneInfoPtr reply, + unsigned int flags) +{ + char *cmd = NULL; + char *result = NULL; + int ret = 0; + const char *cmd_name = NULL; + + if (flags) { + cmd_name = "info block"; + ret = virAsprintf(&cmd, "%s", cmd_name); + } + + if (ret < 0) { + virReportOOMError(); + return -1; + } + + if (qemuMonitorHMPCommand(mon, cmd, &result) < 0) { + qemuReportError(VIR_ERR_INTERNAL_ERROR, + "%s", _("cannot run monitor command")); + ret = -1; + goto cleanup; + } + + if (qemuMonitorTextCommandNotFound(cmd_name, result)) { + qemuReportError(VIR_ERR_OPERATION_INVALID, + _("Command '%s' is not found"), cmd_name); + ret = -1; + goto cleanup; + } + + ret = qemuMonitorTextParseBlockIoThrottle(result, device, reply); + +cleanup: + VIR_FREE(cmd); + VIR_FREE(result); + return ret; +} + diff --git a/src/qemu/qemu_monitor_text.h b/src/qemu/qemu_monitor_text.h index f32fce0..1c47d39 100644 --- a/src/qemu/qemu_monitor_text.h +++ b/src/qemu/qemu_monitor_text.h @@ -248,4 +248,14 @@ int qemuMonitorTextOpenGraphics(qemuMonitorPtr mon, const char *fdname, bool skipauth); +int qemuMonitorTextSetBlockIoThrottle(qemuMonitorPtr mon, + const char *device, + virDomainBlockIoTuneInfoPtr info, + unsigned int flags); + +int qemuMonitorTextGetBlockIoThrottle(qemuMonitorPtr mon, + const char *device, + virDomainBlockIoTuneInfoPtr reply, + unsigned int flags); + #endif /* QEMU_MONITOR_TEXT_H */ -- 1.7.1

3 4

[libvirt] [RFC PATCH 0/5] Support online resizing of block devices.
by Osier Yang 28 Nov '11

28 Nov '11

This patch series introduce new API "virDomainBlockResize" to expose qemu monitor command "block_size", which is for resizing the a block device while the domain is running. The prototype for the new API is: int virDomainBlockResize (virDomainPtr dom, const char *path, unsigned long long size, unsigned int flags) * "@path" is the absolute path of the block device, which can be extraced from domain xml. * The units for "@size" is kilobytes, which might be not quite properly. (qemu HMP uses Megabytes as the default units, QMP uses Bytes as the default units, so it means we need to divice "@size" by 1024 for HMP, and multiply "@size" by 1024 for QMP. On the other hand, we need to check the overflowing). Any ideas on this is welcomed. * "@flags" is unused currently. [PATCH 1/5] block_resize: Define the new API [PATCH 2/5] block_resize: Wire up the remote protocol [PATCH 3/5] block_resize: Implement qemu monitor functions [PATCH 4/5] block_resize: Implement qemu driver method [PATCH 5/5] block_resize: Expose the new API to virsh

3 8

[libvirt] [libvirt-glib 1/2] Add some information about Apple OSs
by Zeeshan Ali (Khattak) 28 Nov '11

28 Nov '11

From: "Zeeshan Ali (Khattak)" <zeeshanak(a)gnome.org> Based on a patch from Mateusz Kaplon <mateusz.kaplon(a)gmail.com>. --- data/oses/macos.xml | 94 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 94 insertions(+), 0 deletions(-) create mode 100644 data/oses/macos.xml diff --git a/data/oses/macos.xml b/data/oses/macos.xml new file mode 100644 index 0000000..84aaa58 --- /dev/null +++ b/data/oses/macos.xml @@ -0,0 +1,94 @@ +<libosinfo version="0.0.1"> + + <os id="http://apple.com/macosx/10.0"> + <short-id>macosx100</short-id> + <name>MacOS X Cheetah</name> + <version>10.0</version> + <vendor>Apple Inc.</vendor> + <family>MacOS</family> + </os> + + <os id="http://apple.com/macosx/10.1"> + <short-id>macosx101</short-id> + <name>MacOS X Puma</name> + <version>10.1</version> + <vendor>Apple Inc.</vendor> + <family>MacOS</family> + <upgrades id="http://apple.com/macosx/10.0" /> + </os> + + <os id="http://apple.com/macosx/10.2"> + <short-id>macosx102</short-id> + <name>MacOS X Jaghuar</name> + <version>10.2</version> + <vendor>Apple Inc.</vendor> + <family>MacOS</family> + <upgrades id="http://apple.com/macosx/10.1" /> + </os> + + <os id="http://apple.com/macosx/10.3"> + <short-id>macosx103</short-id> + <name>MacOS X Panther</name> + <version>10.3</version> + <vendor>Apple Inc.</vendor> + <family>MacOS</family> + <upgrades id="http://apple.com/macosx/10.2" /> + </os> + + <os id="http://apple.com/macosx/10.4"> + <short-id>macosx104</short-id> + <name>MacOS X Tiger</name> + <version>10.4</version> + <vendor>Apple Inc.</vendor> + <family>MacOS</family> + <upgrades id="http://apple.com/macosx/10.3" /> + </os> + + <os id="http://apple.com/macosx/10.5"> + <short-id>macosx105</short-id> + <name>MacOS X Leopard</name> + <version>10.5</version> + <vendor>Apple Inc.</vendor> + <family>MacOS</family> + <upgrades id="http://apple.com/macosx/10.4" /> + </os> + + <os id="http://apple.com/macosx/10.6"> + <short-id>macosx106</short-id> + <name>MacOS X Snow Leopard</name> + <version>10.6</version> + <vendor>Apple Inc.</vendor> + <family>MacOS</family> + <upgrades id="http://apple.com/macosx/10.5" /> + + <resources arch="all"> + <minimal> + <n-cpus>2</n-cpus> + <cpu>1600000000</cpu> + <ram>2147483648</ram> + <storage>7516192768</storage> + </minimal> + </resources> + + </os> + + <os id="http://apple.com/macosx/10.7"> + <short-id>macosx107</short-id> + <name>MacOS X Lion</name> + <version>10.7</version> + <vendor>Apple Inc.</vendor> + <family>MacOS</family> + <upgrades id="http://apple.com/macosx/10.6" /> + + <resources arch="all"> + <minimal> + <n-cpus>2</n-cpus> + <cpu>1600000000</cpu> + <ram>2147483648</ram> + <storage>7516192768</storage> + </minimal> + </resources> + + </os> + +</libosinfo> -- 1.7.7.3

1 2

[libvirt] [PATCH libvirt-glib 0/5] Updates to streams APIs
by Daniel P. Berrange 28 Nov '11

28 Nov '11

This patch series expands the streams APIs to allow practical use of non-blocking bi-directional streams. It also formally documents the required coding style conventions for libvirt-glib before we get too much more code that is out of the ordinary.

2 12

[libvirt] [ PATCH v4 0/4] API to invoke S3/S4 on a host and also resume from within libvirt
by Srivatsa S. Bhat 28 Nov '11

28 Nov '11

This patchset adds a new API to put a host to a suspended state (Suspend-to-RAM, Suspend-to-Disk or Hybrid-Suspend) and setup a timed resume to get the host back online, from within libvirt. This uses the RTC wakeup mechanism to set up a timer alarm before suspending the host, so that in-band resume is facilitated by the firing of the RTC alarm, which wakes up the host. The decision to use the RTC Wakeup mechanism to resume the host from sleep was taken in [1]. An initial API was discussed in [2]. Some design ideas for the asynchronous mechanism implementation was discussed in [3]. v4: * Applies on top of the Hybrid-Suspend patch posted in [4]. * Incorporated the review comments in [5]. v3: * Rebased to libvirt 0.9.7 * Added a check to see if alarmTime (suspend duration) is within an acceptable range. v2: * Added an init function which finds out if S3/S4 is supported by the host, upon the first request to suspend/hibernate. * Added synchronization/locking to ensure that only one suspend operation is active at a time. v1: http://www.redhat.com/archives/libvir-list/2011-September/msg00830.html v2: http://comments.gmane.org/gmane.comp.emulators.libvirt/46729 References: [1]. http://www.redhat.com/archives/libvir-list/2011-August/msg00327.html [2]. http://www.redhat.com/archives/libvir-list/2011-August/msg00248.html [3]. http://www.redhat.com/archives/libvir-list/2011-September/msg00438.html [4]. http://www.redhat.com/archives/libvir-list/2011-November/msg01407.html [5]. http://thread.gmane.org/gmane.comp.emulators.libvirt/47950 Srivatsa S. Bhat (4): Add a public API to invoke suspend/resume on the host Add the remote protocol implementation for virNodeSuspendForDuration Implement the core API to suspend/resume the host Add virsh command to initiate suspend on the host include/libvirt/libvirt.h.in | 17 +++ src/driver.h | 6 + src/libvirt.c | 61 ++++++++++ src/libvirt_private.syms | 7 + src/libvirt_public.syms | 5 + src/nodeinfo.c | 245 ++++++++++++++++++++++++++++++++++++++++++ src/nodeinfo.h | 9 ++ src/qemu/qemu_driver.c | 4 + src/remote/remote_driver.c | 1 src/remote/remote_protocol.x | 10 ++ tools/virsh.c | 64 +++++++++++ tools/virsh.pod | 7 + 12 files changed, 434 insertions(+), 2 deletions(-)

3 12

[libvirt] [PATCH] Make virt-xml-validate work with xbox domains
by Lorin Hochstein 28 Nov '11

28 Nov '11

virt-xml-validate fails when run on a domain XML file of type 'vbox'. For failing test case, see https://bugzilla.redhat.com/show_bug.cgi?id=757097 This patch updates the XML schema so it accepts type 'vbox'. --- diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index 8968ee6..444592c 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -85,6 +85,7 @@ <value>qemu</value> <value>lxc</value> <value>openvz</value> + <value>vbox</value> <value>test</value> </choice> </attribute>

2 2

[libvirt] [PATCH] virsh: Don't traverse childless nodes in vshNodeIsSuperset
by Michal Privoznik 28 Nov '11

28 Nov '11

If both nodes do not have any children, we pass zero to virBitmapAlloc which returns NULL. In turn we report OOM error and return false (meaning nodes are different). This is not true. --- tools/virsh.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index 16d815c..6ed249b 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -11556,6 +11556,9 @@ vshNodeIsSuperset(xmlNodePtr n1, xmlNodePtr n2) if (n1_child_size < n2_child_size) return false; + if (n1_child_size == 0 && n2_child_size == 0) + return true; + if (!(bitmap = virBitmapAlloc(n1_child_size))) { virReportOOMError(); return false; -- 1.7.3.4

2 2

[libvirt] [PATCH] virnetsocket: pass XAUTORITY for ssh connection
by Christian Franke 28 Nov '11

28 Nov '11

When spawning an ssh connection, the environment variables DISPLAY, SSH_ASKPASS, ... are passed. However XAUTHORITY, which is neccessary if the .Xauthority is in a non default place, was not passed. Signed-off-by: Christian Franke <nobody(a)nowhere.ws> --- src/rpc/virnetsocket.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/src/rpc/virnetsocket.c b/src/rpc/virnetsocket.c index b733095..2747f66 100644 --- a/src/rpc/virnetsocket.c +++ b/src/rpc/virnetsocket.c @@ -628,6 +628,7 @@ int virNetSocketNewConnectSSH(const char *nodename, virCommandAddEnvPass(cmd, "SSH_AUTH_SOCK"); virCommandAddEnvPass(cmd, "SSH_ASKPASS"); virCommandAddEnvPass(cmd, "DISPLAY"); + virCommandAddEnvPass(cmd, "XAUTHORITY"); virCommandClearCaps(cmd); if (service) -- 1.7.6.1

3 2

[libvirt] [PATCH] Change security driver APIs to use virDomainDefPtr instead of virDomainObjPtr
by Daniel P. Berrange 28 Nov '11

28 Nov '11

From: "Daniel P. Berrange" <berrange(a)redhat.com> When sVirt is integrated with the LXC driver, it will be neccessary to invoke the security driver APIs using only a virDomainDefPtr since the lxc_container.c code has no virDomainObjPtr available. Aside from two functions which want obj->pid, every bit of the security driver code only touches obj->def. So we don't need to pass a virDomainObjPtr into the security drivers, a virDomainDefPtr is sufficient. Two functions also gain a 'pid_t pid' argument. * src/qemu/qemu_driver.c, src/qemu/qemu_hotplug.c, src/qemu/qemu_migration.c, src/qemu/qemu_process.c, src/security/security_apparmor.c, src/security/security_dac.c, src/security/security_driver.h, src/security/security_manager.c, src/security/security_manager.h, src/security/security_nop.c, src/security/security_selinux.c, src/security/security_stack.c: Change all security APIs to use a virDomainDefPtr instead of virDomainObjPtr --- src/qemu/qemu_driver.c | 10 +- src/qemu/qemu_hotplug.c | 28 ++-- src/qemu/qemu_migration.c | 12 +- src/qemu/qemu_process.c | 24 ++-- src/security/security_apparmor.c | 136 ++++++++++---------- src/security/security_dac.c | 91 +++++++------- src/security/security_driver.h | 36 +++--- src/security/security_manager.c | 40 +++--- src/security/security_manager.h | 36 +++--- src/security/security_nop.c | 36 +++--- src/security/security_selinux.c | 258 +++++++++++++++++++------------------- src/security/security_stack.c | 44 ++++--- 12 files changed, 384 insertions(+), 367 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 6cfdd1d..6e001ce 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -3096,7 +3096,7 @@ qemuDomainScreenshot(virDomainPtr dom, } unlink_tmp = true; - virSecurityManagerSetSavedStateLabel(qemu_driver->securityManager, vm, tmp); + virSecurityManagerSetSavedStateLabel(qemu_driver->securityManager, vm->def, tmp); qemuDomainObjEnterMonitor(driver, vm); if (qemuMonitorScreendump(priv->mon, tmp) < 0) { @@ -3868,7 +3868,7 @@ static int qemudDomainGetSecurityLabel(virDomainPtr dom, virSecurityLabelPtr sec */ if (virDomainObjIsActive(vm)) { if (virSecurityManagerGetProcessLabel(driver->securityManager, - vm, seclabel) < 0) { + vm->def, vm->pid, seclabel) < 0) { qemuReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Failed to get security label")); goto cleanup; @@ -4167,7 +4167,7 @@ qemuDomainSaveImageStartVM(virConnectPtr conn, out: virCommandFree(cmd); if (virSecurityManagerRestoreSavedStateLabel(driver->securityManager, - vm, path) < 0) + vm->def, path) < 0) VIR_WARN("failed to restore save state label on %s", path); return ret; @@ -7584,7 +7584,7 @@ qemudDomainMemoryPeek (virDomainPtr dom, goto endjob; } - virSecurityManagerSetSavedStateLabel(qemu_driver->securityManager, vm, tmp); + virSecurityManagerSetSavedStateLabel(qemu_driver->securityManager, vm->def, tmp); priv = vm->privateData; qemuDomainObjEnterMonitor(driver, vm); @@ -9064,7 +9064,7 @@ qemuDomainSnapshotCreateSingleDiskActive(struct qemud_driver *driver, if (virDomainLockDiskAttach(driver->lockManager, vm, disk) < 0) goto cleanup; - if (virSecurityManagerSetImageLabel(driver->securityManager, vm, + if (virSecurityManagerSetImageLabel(driver->securityManager, vm->def, disk) < 0) { if (virDomainLockDiskDetach(driver->lockManager, vm, disk) < 0) VIR_WARN("Unable to release lock on %s", source); diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 96c0070..684fede 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -88,7 +88,7 @@ int qemuDomainChangeEjectableMedia(struct qemud_driver *driver, return -1; if (virSecurityManagerSetImageLabel(driver->securityManager, - vm, disk) < 0) { + vm->def, disk) < 0) { if (virDomainLockDiskDetach(driver->lockManager, vm, disk) < 0) VIR_WARN("Unable to release lock on %s", disk->src); return -1; @@ -120,7 +120,7 @@ int qemuDomainChangeEjectableMedia(struct qemud_driver *driver, goto error; if (virSecurityManagerRestoreImageLabel(driver->securityManager, - vm, origdisk) < 0) + vm->def, origdisk) < 0) VIR_WARN("Unable to restore security label on ejected image %s", origdisk->src); if (virDomainLockDiskDetach(driver->lockManager, vm, origdisk) < 0) @@ -141,7 +141,7 @@ error: VIR_FREE(driveAlias); if (virSecurityManagerRestoreImageLabel(driver->securityManager, - vm, disk) < 0) + vm->def, disk) < 0) VIR_WARN("Unable to restore security label on new media %s", disk->src); if (virDomainLockDiskDetach(driver->lockManager, vm, disk) < 0) @@ -209,7 +209,7 @@ int qemuDomainAttachPciDiskDevice(virConnectPtr conn, return -1; if (virSecurityManagerSetImageLabel(driver->securityManager, - vm, disk) < 0) { + vm->def, disk) < 0) { if (virDomainLockDiskDetach(driver->lockManager, vm, disk) < 0) VIR_WARN("Unable to release lock on %s", disk->src); return -1; @@ -283,7 +283,7 @@ error: VIR_WARN("Unable to release PCI address on %s", disk->src); if (virSecurityManagerRestoreImageLabel(driver->securityManager, - vm, disk) < 0) + vm->def, disk) < 0) VIR_WARN("Unable to restore security label on %s", disk->src); if (virDomainLockDiskDetach(driver->lockManager, vm, disk) < 0) @@ -439,7 +439,7 @@ int qemuDomainAttachSCSIDisk(virConnectPtr conn, return -1; if (virSecurityManagerSetImageLabel(driver->securityManager, - vm, disk) < 0) { + vm->def, disk) < 0) { if (virDomainLockDiskDetach(driver->lockManager, vm, disk) < 0) VIR_WARN("Unable to release lock on %s", disk->src); return -1; @@ -530,7 +530,7 @@ error: VIR_FREE(drivestr); if (virSecurityManagerRestoreImageLabel(driver->securityManager, - vm, disk) < 0) + vm->def, disk) < 0) VIR_WARN("Unable to restore security label on %s", disk->src); if (virDomainLockDiskDetach(driver->lockManager, vm, disk) < 0) @@ -562,7 +562,7 @@ int qemuDomainAttachUsbMassstorageDevice(virConnectPtr conn, return -1; if (virSecurityManagerSetImageLabel(driver->securityManager, - vm, disk) < 0) { + vm->def, disk) < 0) { if (virDomainLockDiskDetach(driver->lockManager, vm, disk) < 0) VIR_WARN("Unable to release lock on %s", disk->src); return -1; @@ -623,7 +623,7 @@ error: VIR_FREE(drivestr); if (virSecurityManagerRestoreImageLabel(driver->securityManager, - vm, disk) < 0) + vm->def, disk) < 0) VIR_WARN("Unable to restore security label on %s", disk->src); if (virDomainLockDiskDetach(driver->lockManager, vm, disk) < 0) @@ -1112,7 +1112,7 @@ int qemuDomainAttachHostDevice(struct qemud_driver *driver, if (virSecurityManagerSetHostdevLabel(driver->securityManager, - vm, hostdev) < 0) + vm->def, hostdev) < 0) return -1; switch (hostdev->source.subsys.type) { @@ -1139,7 +1139,7 @@ int qemuDomainAttachHostDevice(struct qemud_driver *driver, error: if (virSecurityManagerRestoreHostdevLabel(driver->securityManager, - vm, hostdev) < 0) + vm->def, hostdev) < 0) VIR_WARN("Unable to restore host device labelling on hotplug fail"); return -1; @@ -1572,7 +1572,7 @@ int qemuDomainDetachPciDiskDevice(struct qemud_driver *driver, virDomainDiskDefFree(detach); if (virSecurityManagerRestoreImageLabel(driver->securityManager, - vm, dev->data.disk) < 0) + vm->def, dev->data.disk) < 0) VIR_WARN("Unable to restore security label on %s", dev->data.disk->src); if (cgroup != NULL) { @@ -1654,7 +1654,7 @@ int qemuDomainDetachDiskDevice(struct qemud_driver *driver, virDomainDiskDefFree(detach); if (virSecurityManagerRestoreImageLabel(driver->securityManager, - vm, dev->data.disk) < 0) + vm->def, dev->data.disk) < 0) VIR_WARN("Unable to restore security label on %s", dev->data.disk->src); if (cgroup != NULL) { @@ -2162,7 +2162,7 @@ int qemuDomainDetachHostDevice(struct qemud_driver *driver, } if (virSecurityManagerRestoreHostdevLabel(driver->securityManager, - vm, dev->data.hostdev) < 0) + vm->def, dev->data.hostdev) < 0) VIR_WARN("Failed to restore host device labelling"); return ret; diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 8ae989a..b3ef894 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -1749,13 +1749,13 @@ static int doNativeMigrate(struct qemud_driver *driver, virReportOOMError(); goto cleanup; } - if (virSecurityManagerSetSocketLabel(driver->securityManager, vm) < 0) + if (virSecurityManagerSetSocketLabel(driver->securityManager, vm->def) < 0) goto cleanup; if (virNetSocketNewConnectTCP(uribits->server, tmp, &sock) == 0) { spec.dest.fd.qemu = virNetSocketDupFD(sock, true); virNetSocketFree(sock); } - if (virSecurityManagerClearSocketLabel(driver->securityManager, vm) < 0 || + if (virSecurityManagerClearSocketLabel(driver->securityManager, vm->def) < 0 || spec.dest.fd.qemu == -1) goto cleanup; } else { @@ -1822,7 +1822,7 @@ static int doTunnelMigrate(struct qemud_driver *driver, spec.dest.fd.local = fds[0]; } if (spec.dest.fd.qemu == -1 || - virSecurityManagerSetImageFDLabel(driver->securityManager, vm, + virSecurityManagerSetImageFDLabel(driver->securityManager, vm->def, spec.dest.fd.qemu) < 0) { virReportSystemError(errno, "%s", _("cannot create pipe for tunnelled migration")); @@ -2842,7 +2842,7 @@ qemuMigrationToFile(struct qemud_driver *driver, virDomainObjPtr vm, * doesn't have to open() the file, so while we still have to * grant SELinux access, we can do it on fd and avoid cleanup * later, as well as skip futzing with cgroup. */ - if (virSecurityManagerSetImageFDLabel(driver->securityManager, vm, + if (virSecurityManagerSetImageFDLabel(driver->securityManager, vm->def, compressor ? pipeFD[1] : fd) < 0) goto cleanup; bypassSecurityDriver = true; @@ -2876,7 +2876,7 @@ qemuMigrationToFile(struct qemud_driver *driver, virDomainObjPtr vm, } if ((!bypassSecurityDriver) && virSecurityManagerSetSavedStateLabel(driver->securityManager, - vm, path) < 0) + vm->def, path) < 0) goto cleanup; restoreLabel = true; } @@ -2951,7 +2951,7 @@ cleanup: virCommandFree(cmd); if (restoreLabel && (!bypassSecurityDriver) && virSecurityManagerRestoreSavedStateLabel(driver->securityManager, - vm, path) < 0) + vm->def, path) < 0) VIR_WARN("failed to restore save state label on %s", path); if (cgroup != NULL) { diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 2563f97..58ce333 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -839,7 +839,7 @@ qemuConnectMonitor(struct qemud_driver *driver, virDomainObjPtr vm) qemuMonitorPtr mon = NULL; if (virSecurityManagerSetDaemonSocketLabel(driver->securityManager, - vm) < 0) { + vm->def) < 0) { VIR_ERROR(_("Failed to set security context for monitor for %s"), vm->def->name); goto error; @@ -872,7 +872,7 @@ qemuConnectMonitor(struct qemud_driver *driver, virDomainObjPtr vm) } priv->mon = mon; - if (virSecurityManagerClearSocketLabel(driver->securityManager, vm) < 0) { + if (virSecurityManagerClearSocketLabel(driver->securityManager, vm->def) < 0) { VIR_ERROR(_("Failed to clear security context for monitor for %s"), vm->def->name); goto error; @@ -2163,7 +2163,7 @@ static int qemuProcessHook(void *data) * sockets the lock driver opens that we don't want * labelled. So far we're ok though. */ - if (virSecurityManagerSetSocketLabel(h->driver->securityManager, h->vm) < 0) + if (virSecurityManagerSetSocketLabel(h->driver->securityManager, h->vm->def) < 0) goto cleanup; if (virDomainLockProcessStart(h->driver->lockManager, h->vm, @@ -2171,7 +2171,7 @@ static int qemuProcessHook(void *data) true, &fd) < 0) goto cleanup; - if (virSecurityManagerClearSocketLabel(h->driver->securityManager, h->vm) < 0) + if (virSecurityManagerClearSocketLabel(h->driver->securityManager, h->vm->def) < 0) goto cleanup; if (qemuProcessLimits(h->driver) < 0) @@ -2194,7 +2194,7 @@ static int qemuProcessHook(void *data) return -1; VIR_DEBUG("Setting up security labelling"); - if (virSecurityManagerSetProcessLabel(h->driver->securityManager, h->vm) < 0) + if (virSecurityManagerSetProcessLabel(h->driver->securityManager, h->vm->def) < 0) goto cleanup; ret = 0; @@ -2656,7 +2656,7 @@ qemuProcessReconnect(void *opaque) goto error; } - if (virSecurityManagerReserveLabel(driver->securityManager, obj) < 0) + if (virSecurityManagerReserveLabel(driver->securityManager, obj->def, obj->pid) < 0) goto error; if (qemuProcessNotifyNets(obj->def) < 0) @@ -2894,7 +2894,7 @@ int qemuProcessStart(virConnectPtr conn, /* If you are using a SecurityDriver with dynamic labelling, then generate a security label for isolation */ VIR_DEBUG("Generating domain security label (if required)"); - if (virSecurityManagerGenLabel(driver->securityManager, vm) < 0) { + if (virSecurityManagerGenLabel(driver->securityManager, vm->def) < 0) { virDomainAuditSecurityLabel(vm, false); goto cleanup; } @@ -3128,7 +3128,7 @@ int qemuProcessStart(virConnectPtr conn, VIR_DEBUG("Setting domain security labels"); if (virSecurityManagerSetAllLabel(driver->securityManager, - vm, stdin_path) < 0) + vm->def, stdin_path) < 0) goto cleanup; if (stdin_fd != -1) { @@ -3145,7 +3145,7 @@ int qemuProcessStart(virConnectPtr conn, goto cleanup; } if (S_ISFIFO(stdin_sb.st_mode) && - virSecurityManagerSetImageFDLabel(driver->securityManager, vm, stdin_fd) < 0) + virSecurityManagerSetImageFDLabel(driver->securityManager, vm->def, stdin_fd) < 0) goto cleanup; } @@ -3398,8 +3398,8 @@ void qemuProcessStop(struct qemud_driver *driver, /* Reset Security Labels */ virSecurityManagerRestoreAllLabel(driver->securityManager, - vm, migrated); - virSecurityManagerReleaseLabel(driver->securityManager, vm); + vm->def, migrated); + virSecurityManagerReleaseLabel(driver->securityManager, vm->def); /* Clear out dynamically assigned labels */ if (vm->def->seclabel.type == VIR_DOMAIN_SECLABEL_DYNAMIC) { @@ -3548,7 +3548,7 @@ int qemuProcessAttach(virConnectPtr conn ATTRIBUTE_UNUSED, if (VIR_ALLOC(seclabel) < 0) goto no_memory; if (virSecurityManagerGetProcessLabel(driver->securityManager, - vm, seclabel) < 0) + vm->def, vm->pid, seclabel) < 0) goto cleanup; if (!(vm->def->seclabel.model = strdup(driver->caps->host.secModel.model))) goto no_memory; diff --git a/src/security/security_apparmor.c b/src/security/security_apparmor.c index 299dcc6..4848d85 100644 --- a/src/security/security_apparmor.c +++ b/src/security/security_apparmor.c @@ -47,7 +47,7 @@ /* Data structure to pass to *FileIterate so we have everything we need */ struct SDPDOP { virSecurityManagerPtr mgr; - virDomainObjPtr vm; + virDomainDefPtr def; }; /* @@ -159,7 +159,7 @@ profile_status_file(const char *str) static int load_profile(virSecurityManagerPtr mgr, const char *profile, - virDomainObjPtr vm, + virDomainDefPtr def, const char *fn, bool append) { @@ -170,7 +170,7 @@ load_profile(virSecurityManagerPtr mgr, const char *probe = virSecurityManagerGetAllowDiskFormatProbing(mgr) ? "1" : "0"; - xml = virDomainDefFormat(vm->def, VIR_DOMAIN_XML_SECURE); + xml = virDomainDefFormat(def, VIR_DOMAIN_XML_SECURE); if (!xml) goto clean; @@ -212,12 +212,12 @@ remove_profile(const char *profile) } static char * -get_profile_name(virDomainObjPtr vm) +get_profile_name(virDomainDefPtr def) { char uuidstr[VIR_UUID_STRING_BUFLEN]; char *name = NULL; - virUUIDFormat(vm->def->uuid, uuidstr); + virUUIDFormat(def->uuid, uuidstr); if (virAsprintf(&name, "%s%s", AA_PREFIX, uuidstr) < 0) { virReportOOMError(); return NULL; @@ -257,23 +257,23 @@ cleanup: */ static int reload_profile(virSecurityManagerPtr mgr, - virDomainObjPtr vm, + virDomainDefPtr def, const char *fn, bool append) { - const virSecurityLabelDefPtr secdef = &vm->def->seclabel; + const virSecurityLabelDefPtr secdef = &def->seclabel; int rc = -1; char *profile_name = NULL; if (secdef->norelabel) return 0; - if ((profile_name = get_profile_name(vm)) == NULL) + if ((profile_name = get_profile_name(def)) == NULL) return rc; /* Update the profile only if it is loaded */ if (profile_loaded(secdef->imagelabel) >= 0) { - if (load_profile(mgr, secdef->imagelabel, vm, fn, append) < 0) { + if (load_profile(mgr, secdef->imagelabel, def, fn, append) < 0) { virSecurityReportError(VIR_ERR_INTERNAL_ERROR, _("cannot update AppArmor profile " "\'%s\'"), @@ -294,10 +294,10 @@ AppArmorSetSecurityUSBLabel(usbDevice *dev ATTRIBUTE_UNUSED, const char *file, void *opaque) { struct SDPDOP *ptr = opaque; - virDomainObjPtr vm = ptr->vm; + virDomainDefPtr def = ptr->def; - if (reload_profile(ptr->mgr, vm, file, true) < 0) { - const virSecurityLabelDefPtr secdef = &vm->def->seclabel; + if (reload_profile(ptr->mgr, def, file, true) < 0) { + const virSecurityLabelDefPtr secdef = &def->seclabel; virSecurityReportError(VIR_ERR_INTERNAL_ERROR, _("cannot update AppArmor profile " "\'%s\'"), @@ -312,10 +312,10 @@ AppArmorSetSecurityPCILabel(pciDevice *dev ATTRIBUTE_UNUSED, const char *file, void *opaque) { struct SDPDOP *ptr = opaque; - virDomainObjPtr vm = ptr->vm; + virDomainDefPtr def = ptr->def; - if (reload_profile(ptr->mgr, vm, file, true) < 0) { - const virSecurityLabelDefPtr secdef = &vm->def->seclabel; + if (reload_profile(ptr->mgr, def, file, true) < 0) { + const virSecurityLabelDefPtr secdef = &def->seclabel; virSecurityReportError(VIR_ERR_INTERNAL_ERROR, _("cannot update AppArmor profile " "\'%s\'"), @@ -390,56 +390,56 @@ AppArmorSecurityManagerGetDOI(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED) */ static int AppArmorGenSecurityLabel(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, - virDomainObjPtr vm) + virDomainDefPtr def) { int rc = -1; char *profile_name = NULL; - if (vm->def->seclabel.type == VIR_DOMAIN_SECLABEL_STATIC) + if (def->seclabel.type == VIR_DOMAIN_SECLABEL_STATIC) return 0; - if (vm->def->seclabel.baselabel) { + if (def->seclabel.baselabel) { virSecurityReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("Cannot set a base label with AppArmour")); return rc; } - if ((vm->def->seclabel.label) || - (vm->def->seclabel.model) || (vm->def->seclabel.imagelabel)) { + if ((def->seclabel.label) || + (def->seclabel.model) || (def->seclabel.imagelabel)) { virSecurityReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("security label already defined for VM")); return rc; } - if ((profile_name = get_profile_name(vm)) == NULL) + if ((profile_name = get_profile_name(def)) == NULL) return rc; - vm->def->seclabel.label = strndup(profile_name, strlen(profile_name)); - if (!vm->def->seclabel.label) { + def->seclabel.label = strndup(profile_name, strlen(profile_name)); + if (!def->seclabel.label) { virReportOOMError(); goto clean; } /* set imagelabel the same as label (but we won't use it) */ - vm->def->seclabel.imagelabel = strndup(profile_name, + def->seclabel.imagelabel = strndup(profile_name, strlen(profile_name)); - if (!vm->def->seclabel.imagelabel) { + if (!def->seclabel.imagelabel) { virReportOOMError(); goto err; } - vm->def->seclabel.model = strdup(SECURITY_APPARMOR_NAME); - if (!vm->def->seclabel.model) { + def->seclabel.model = strdup(SECURITY_APPARMOR_NAME); + if (!def->seclabel.model) { virReportOOMError(); goto err; } /* Now that we have a label, load the profile into the kernel. */ - if (load_profile(mgr, vm->def->seclabel.label, vm, NULL, false) < 0) { + if (load_profile(mgr, def->seclabel.label, def, NULL, false) < 0) { virSecurityReportError(VIR_ERR_INTERNAL_ERROR, _("cannot load AppArmor profile " - "\'%s\'"), vm->def->seclabel.label); + "\'%s\'"), def->seclabel.label); goto err; } @@ -447,9 +447,9 @@ AppArmorGenSecurityLabel(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, goto clean; err: - VIR_FREE(vm->def->seclabel.label); - VIR_FREE(vm->def->seclabel.imagelabel); - VIR_FREE(vm->def->seclabel.model); + VIR_FREE(def->seclabel.label); + VIR_FREE(def->seclabel.imagelabel); + VIR_FREE(def->seclabel.model); clean: VIR_FREE(profile_name); @@ -459,15 +459,15 @@ AppArmorGenSecurityLabel(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, static int AppArmorSetSecurityAllLabel(virSecurityManagerPtr mgr, - virDomainObjPtr vm, const char *stdin_path) + virDomainDefPtr def, const char *stdin_path) { - if (vm->def->seclabel.norelabel) + if (def->seclabel.norelabel) return 0; /* Reload the profile if stdin_path is specified. Note that GenSecurityLabel() will have already been run. */ if (stdin_path) - return reload_profile(mgr, vm, stdin_path, true); + return reload_profile(mgr, def, stdin_path, true); return 0; } @@ -477,13 +477,14 @@ AppArmorSetSecurityAllLabel(virSecurityManagerPtr mgr, */ static int AppArmorGetSecurityProcessLabel(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, - virDomainObjPtr vm, + virDomainDefPtr def, + pid_t pid, virSecurityLabelPtr sec) { int rc = -1; char *profile_name = NULL; - if ((profile_name = get_profile_name(vm)) == NULL) + if ((profile_name = get_profile_name(def)) == NULL) return rc; if (virStrcpy(sec->label, profile_name, @@ -511,9 +512,9 @@ AppArmorGetSecurityProcessLabel(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, */ static int AppArmorReleaseSecurityLabel(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, - virDomainObjPtr vm) + virDomainDefPtr def) { - const virSecurityLabelDefPtr secdef = &vm->def->seclabel; + const virSecurityLabelDefPtr secdef = &def->seclabel; VIR_FREE(secdef->model); VIR_FREE(secdef->label); @@ -525,10 +526,10 @@ AppArmorReleaseSecurityLabel(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, static int AppArmorRestoreSecurityAllLabel(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, - virDomainObjPtr vm, + virDomainDefPtr def, int migrated ATTRIBUTE_UNUSED) { - const virSecurityLabelDefPtr secdef = &vm->def->seclabel; + const virSecurityLabelDefPtr secdef = &def->seclabel; int rc = 0; if (secdef->type == VIR_DOMAIN_SECLABEL_DYNAMIC) { @@ -545,13 +546,13 @@ AppArmorRestoreSecurityAllLabel(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, * LOCALSTATEDIR/log/libvirt/qemu/<vm name>.log */ static int -AppArmorSetSecurityProcessLabel(virSecurityManagerPtr mgr, virDomainObjPtr vm) +AppArmorSetSecurityProcessLabel(virSecurityManagerPtr mgr, virDomainDefPtr def) { - const virSecurityLabelDefPtr secdef = &vm->def->seclabel; + const virSecurityLabelDefPtr secdef = &def->seclabel; int rc = -1; char *profile_name = NULL; - if ((profile_name = get_profile_name(vm)) == NULL) + if ((profile_name = get_profile_name(def)) == NULL) return rc; if (STRNEQ(virSecurityManagerGetModel(mgr), secdef->model)) { @@ -579,21 +580,21 @@ AppArmorSetSecurityProcessLabel(virSecurityManagerPtr mgr, virDomainObjPtr vm) static int AppArmorSetSecurityDaemonSocketLabel(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, - virDomainObjPtr vm ATTRIBUTE_UNUSED) + virDomainDefPtr vm ATTRIBUTE_UNUSED) { return 0; } static int AppArmorSetSecuritySocketLabel(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, - virDomainObjPtr vm ATTRIBUTE_UNUSED) + virDomainDefPtr def ATTRIBUTE_UNUSED) { return 0; } static int AppArmorClearSecuritySocketLabel(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, - virDomainObjPtr vm ATTRIBUTE_UNUSED) + virDomainDefPtr def ATTRIBUTE_UNUSED) { return 0; } @@ -602,18 +603,18 @@ AppArmorClearSecuritySocketLabel(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, /* Called when hotplugging */ static int AppArmorRestoreSecurityImageLabel(virSecurityManagerPtr mgr, - virDomainObjPtr vm, + virDomainDefPtr def, virDomainDiskDefPtr disk ATTRIBUTE_UNUSED) { - return reload_profile(mgr, vm, NULL, false); + return reload_profile(mgr, def, NULL, false); } /* Called when hotplugging */ static int AppArmorSetSecurityImageLabel(virSecurityManagerPtr mgr, - virDomainObjPtr vm, virDomainDiskDefPtr disk) + virDomainDefPtr def, virDomainDiskDefPtr disk) { - const virSecurityLabelDefPtr secdef = &vm->def->seclabel; + const virSecurityLabelDefPtr secdef = &def->seclabel; int rc = -1; char *profile_name; @@ -631,12 +632,12 @@ AppArmorSetSecurityImageLabel(virSecurityManagerPtr mgr, return rc; } - if ((profile_name = get_profile_name(vm)) == NULL) + if ((profile_name = get_profile_name(def)) == NULL) return rc; /* update the profile only if it is loaded */ if (profile_loaded(secdef->imagelabel) >= 0) { - if (load_profile(mgr, secdef->imagelabel, vm, disk->src, + if (load_profile(mgr, secdef->imagelabel, def, disk->src, false) < 0) { virSecurityReportError(VIR_ERR_INTERNAL_ERROR, _("cannot update AppArmor profile " @@ -673,7 +674,8 @@ AppArmorSecurityVerify(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, static int AppArmorReserveSecurityLabel(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, - virDomainObjPtr vm ATTRIBUTE_UNUSED) + virDomainDefPtr def ATTRIBUTE_UNUSED, + pid_t pid ATTRIBUTE_UNUSED) { /* NOOP. Nothing to reserve with AppArmor */ return 0; @@ -681,11 +683,11 @@ AppArmorReserveSecurityLabel(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, static int AppArmorSetSecurityHostdevLabel(virSecurityManagerPtr mgr, - virDomainObjPtr vm, + virDomainDefPtr def, virDomainHostdevDefPtr dev) { - const virSecurityLabelDefPtr secdef = &vm->def->seclabel; + const virSecurityLabelDefPtr secdef = &def->seclabel; struct SDPDOP *ptr; int ret = -1; @@ -701,7 +703,7 @@ AppArmorSetSecurityHostdevLabel(virSecurityManagerPtr mgr, if (VIR_ALLOC(ptr) < 0) return -1; ptr->mgr = mgr; - ptr->vm = vm; + ptr->def = def; switch (dev->source.subsys.type) { case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_USB: { @@ -743,44 +745,44 @@ done: static int AppArmorRestoreSecurityHostdevLabel(virSecurityManagerPtr mgr, - virDomainObjPtr vm, + virDomainDefPtr def, virDomainHostdevDefPtr dev ATTRIBUTE_UNUSED) { - const virSecurityLabelDefPtr secdef = &vm->def->seclabel; + const virSecurityLabelDefPtr secdef = &def->seclabel; if (secdef->norelabel) return 0; - return reload_profile(mgr, vm, NULL, false); + return reload_profile(mgr, def, NULL, false); } static int AppArmorSetSavedStateLabel(virSecurityManagerPtr mgr, - virDomainObjPtr vm, + virDomainDefPtr def, const char *savefile) { - return reload_profile(mgr, vm, savefile, true); + return reload_profile(mgr, def, savefile, true); } static int AppArmorRestoreSavedStateLabel(virSecurityManagerPtr mgr, - virDomainObjPtr vm, + virDomainDefPtr def, const char *savefile ATTRIBUTE_UNUSED) { - return reload_profile(mgr, vm, NULL, false); + return reload_profile(mgr, def, NULL, false); } static int AppArmorSetImageFDLabel(virSecurityManagerPtr mgr, - virDomainObjPtr vm, + virDomainDefPtr def, int fd) { int rc = -1; char *proc = NULL; char *fd_path = NULL; - const virSecurityLabelDefPtr secdef = &vm->def->seclabel; + const virSecurityLabelDefPtr secdef = &def->seclabel; if (secdef->imagelabel == NULL) return 0; @@ -796,7 +798,7 @@ AppArmorSetImageFDLabel(virSecurityManagerPtr mgr, return rc; } - return reload_profile(mgr, vm, fd_path, true); + return reload_profile(mgr, def, fd_path, true); } virSecurityDriver virAppArmorSecurityDriver = { diff --git a/src/security/security_dac.c b/src/security/security_dac.c index 0e75319..9c0017b 100644 --- a/src/security/security_dac.c +++ b/src/security/security_dac.c @@ -171,7 +171,7 @@ virSecurityDACSetSecurityFileLabel(virDomainDiskDefPtr disk ATTRIBUTE_UNUSED, static int virSecurityDACSetSecurityImageLabel(virSecurityManagerPtr mgr, - virDomainObjPtr vm ATTRIBUTE_UNUSED, + virDomainDefPtr def ATTRIBUTE_UNUSED, virDomainDiskDefPtr disk) { @@ -190,7 +190,7 @@ virSecurityDACSetSecurityImageLabel(virSecurityManagerPtr mgr, static int virSecurityDACRestoreSecurityImageLabelInt(virSecurityManagerPtr mgr, - virDomainObjPtr vm ATTRIBUTE_UNUSED, + virDomainDefPtr def ATTRIBUTE_UNUSED, virDomainDiskDefPtr disk, int migrated) { @@ -235,10 +235,10 @@ virSecurityDACRestoreSecurityImageLabelInt(virSecurityManagerPtr mgr, static int virSecurityDACRestoreSecurityImageLabel(virSecurityManagerPtr mgr, - virDomainObjPtr vm, + virDomainDefPtr def, virDomainDiskDefPtr disk) { - return virSecurityDACRestoreSecurityImageLabelInt(mgr, vm, disk, 0); + return virSecurityDACRestoreSecurityImageLabelInt(mgr, def, disk, 0); } @@ -268,7 +268,7 @@ virSecurityDACSetSecurityUSBLabel(usbDevice *dev ATTRIBUTE_UNUSED, static int virSecurityDACSetSecurityHostdevLabel(virSecurityManagerPtr mgr, - virDomainObjPtr vm ATTRIBUTE_UNUSED, + virDomainDefPtr def ATTRIBUTE_UNUSED, virDomainHostdevDefPtr dev) { virSecurityDACDataPtr priv = virSecurityManagerGetPrivateData(mgr); @@ -338,7 +338,7 @@ virSecurityDACRestoreSecurityUSBLabel(usbDevice *dev ATTRIBUTE_UNUSED, static int virSecurityDACRestoreSecurityHostdevLabel(virSecurityManagerPtr mgr, - virDomainObjPtr vm ATTRIBUTE_UNUSED, + virDomainDefPtr def ATTRIBUTE_UNUSED, virDomainHostdevDefPtr dev) { @@ -489,7 +489,7 @@ virSecurityDACRestoreChardevCallback(virDomainDefPtr def ATTRIBUTE_UNUSED, static int virSecurityDACRestoreSecurityAllLabel(virSecurityManagerPtr mgr, - virDomainObjPtr vm, + virDomainDefPtr def, int migrated) { virSecurityDACDataPtr priv = virSecurityManagerGetPrivateData(mgr); @@ -501,34 +501,34 @@ virSecurityDACRestoreSecurityAllLabel(virSecurityManagerPtr mgr, VIR_DEBUG("Restoring security label on %s migrated=%d", - vm->def->name, migrated); + def->name, migrated); - for (i = 0 ; i < vm->def->nhostdevs ; i++) { + for (i = 0 ; i < def->nhostdevs ; i++) { if (virSecurityDACRestoreSecurityHostdevLabel(mgr, - vm, - vm->def->hostdevs[i]) < 0) + def, + def->hostdevs[i]) < 0) rc = -1; } - for (i = 0 ; i < vm->def->ndisks ; i++) { + for (i = 0 ; i < def->ndisks ; i++) { if (virSecurityDACRestoreSecurityImageLabelInt(mgr, - vm, - vm->def->disks[i], + def, + def->disks[i], migrated) < 0) rc = -1; } - if (virDomainChrDefForeach(vm->def, + if (virDomainChrDefForeach(def, false, virSecurityDACRestoreChardevCallback, mgr) < 0) rc = -1; - if (vm->def->os.kernel && - virSecurityDACRestoreSecurityFileLabel(vm->def->os.kernel) < 0) + if (def->os.kernel && + virSecurityDACRestoreSecurityFileLabel(def->os.kernel) < 0) rc = -1; - if (vm->def->os.initrd && - virSecurityDACRestoreSecurityFileLabel(vm->def->os.initrd) < 0) + if (def->os.initrd && + virSecurityDACRestoreSecurityFileLabel(def->os.initrd) < 0) rc = -1; return rc; @@ -548,7 +548,7 @@ virSecurityDACSetChardevCallback(virDomainDefPtr def ATTRIBUTE_UNUSED, static int virSecurityDACSetSecurityAllLabel(virSecurityManagerPtr mgr, - virDomainObjPtr vm, + virDomainDefPtr def, const char *stdin_path ATTRIBUTE_UNUSED) { virSecurityDACDataPtr priv = virSecurityManagerGetPrivateData(mgr); @@ -557,36 +557,36 @@ virSecurityDACSetSecurityAllLabel(virSecurityManagerPtr mgr, if (!priv->dynamicOwnership) return 0; - for (i = 0 ; i < vm->def->ndisks ; i++) { + for (i = 0 ; i < def->ndisks ; i++) { /* XXX fixme - we need to recursively label the entire tree :-( */ - if (vm->def->disks[i]->type == VIR_DOMAIN_DISK_TYPE_DIR) + if (def->disks[i]->type == VIR_DOMAIN_DISK_TYPE_DIR) continue; if (virSecurityDACSetSecurityImageLabel(mgr, - vm, - vm->def->disks[i]) < 0) + def, + def->disks[i]) < 0) return -1; } - for (i = 0 ; i < vm->def->nhostdevs ; i++) { + for (i = 0 ; i < def->nhostdevs ; i++) { if (virSecurityDACSetSecurityHostdevLabel(mgr, - vm, - vm->def->hostdevs[i]) < 0) + def, + def->hostdevs[i]) < 0) return -1; } - if (virDomainChrDefForeach(vm->def, + if (virDomainChrDefForeach(def, true, virSecurityDACSetChardevCallback, mgr) < 0) return -1; - if (vm->def->os.kernel && - virSecurityDACSetOwnership(vm->def->os.kernel, + if (def->os.kernel && + virSecurityDACSetOwnership(def->os.kernel, priv->user, priv->group) < 0) return -1; - if (vm->def->os.initrd && - virSecurityDACSetOwnership(vm->def->os.initrd, + if (def->os.initrd && + virSecurityDACSetOwnership(def->os.initrd, priv->user, priv->group) < 0) return -1; @@ -597,7 +597,7 @@ virSecurityDACSetSecurityAllLabel(virSecurityManagerPtr mgr, static int virSecurityDACSetSavedStateLabel(virSecurityManagerPtr mgr, - virDomainObjPtr vm ATTRIBUTE_UNUSED, + virDomainDefPtr def ATTRIBUTE_UNUSED, const char *savefile) { virSecurityDACDataPtr priv = virSecurityManagerGetPrivateData(mgr); @@ -608,7 +608,7 @@ virSecurityDACSetSavedStateLabel(virSecurityManagerPtr mgr, static int virSecurityDACRestoreSavedStateLabel(virSecurityManagerPtr mgr, - virDomainObjPtr vm ATTRIBUTE_UNUSED, + virDomainDefPtr def ATTRIBUTE_UNUSED, const char *savefile) { virSecurityDACDataPtr priv = virSecurityManagerGetPrivateData(mgr); @@ -622,11 +622,11 @@ virSecurityDACRestoreSavedStateLabel(virSecurityManagerPtr mgr, static int virSecurityDACSetProcessLabel(virSecurityManagerPtr mgr, - virDomainObjPtr vm ATTRIBUTE_UNUSED) + virDomainDefPtr def ATTRIBUTE_UNUSED) { virSecurityDACDataPtr priv = virSecurityManagerGetPrivateData(mgr); - VIR_DEBUG("Dropping privileges of VM to %u:%u", + VIR_DEBUG("Dropping privileges of DEF to %u:%u", (unsigned int) priv->user, (unsigned int) priv->group); if (virSetUIDGID(priv->user, priv->group) < 0) @@ -645,28 +645,30 @@ virSecurityDACVerify(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, static int virSecurityDACGenLabel(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, - virDomainObjPtr vm ATTRIBUTE_UNUSED) + virDomainDefPtr def ATTRIBUTE_UNUSED) { return 0; } static int virSecurityDACReleaseLabel(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, - virDomainObjPtr vm ATTRIBUTE_UNUSED) + virDomainDefPtr def ATTRIBUTE_UNUSED) { return 0; } static int virSecurityDACReserveLabel(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, - virDomainObjPtr vm ATTRIBUTE_UNUSED) + virDomainDefPtr def ATTRIBUTE_UNUSED, + pid_t pid ATTRIBUTE_UNUSED) { return 0; } static int virSecurityDACGetProcessLabel(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, - virDomainObjPtr vm ATTRIBUTE_UNUSED, + virDomainDefPtr def ATTRIBUTE_UNUSED, + pid_t pid ATTRIBUTE_UNUSED, virSecurityLabelPtr seclabel ATTRIBUTE_UNUSED) { return 0; @@ -674,7 +676,7 @@ virSecurityDACGetProcessLabel(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, static int virSecurityDACSetDaemonSocketLabel(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, - virDomainObjPtr vm ATTRIBUTE_UNUSED) + virDomainDefPtr vm ATTRIBUTE_UNUSED) { return 0; } @@ -682,7 +684,7 @@ virSecurityDACSetDaemonSocketLabel(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, static int virSecurityDACSetSocketLabel(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, - virDomainObjPtr vm ATTRIBUTE_UNUSED) + virDomainDefPtr def ATTRIBUTE_UNUSED) { return 0; } @@ -690,20 +692,19 @@ virSecurityDACSetSocketLabel(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, static int virSecurityDACClearSocketLabel(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, - virDomainObjPtr vm ATTRIBUTE_UNUSED) + virDomainDefPtr def ATTRIBUTE_UNUSED) { return 0; } static int virSecurityDACSetImageFDLabel(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, - virDomainObjPtr vm ATTRIBUTE_UNUSED, + virDomainDefPtr def ATTRIBUTE_UNUSED, int fd ATTRIBUTE_UNUSED) { return 0; } - virSecurityDriver virSecurityDriverDAC = { sizeof(virSecurityDACData), "virDAC", diff --git a/src/security/security_driver.h b/src/security/security_driver.h index aea90b0..f0ace1c 100644 --- a/src/security/security_driver.h +++ b/src/security/security_driver.h @@ -39,50 +39,52 @@ typedef const char *(*virSecurityDriverGetModel) (virSecurityManagerPtr mgr); typedef const char *(*virSecurityDriverGetDOI) (virSecurityManagerPtr mgr); typedef int (*virSecurityDomainRestoreImageLabel) (virSecurityManagerPtr mgr, - virDomainObjPtr vm, + virDomainDefPtr def, virDomainDiskDefPtr disk); typedef int (*virSecurityDomainSetDaemonSocketLabel)(virSecurityManagerPtr mgr, - virDomainObjPtr vm); + virDomainDefPtr vm); typedef int (*virSecurityDomainSetSocketLabel) (virSecurityManagerPtr mgr, - virDomainObjPtr vm); + virDomainDefPtr def); typedef int (*virSecurityDomainClearSocketLabel)(virSecurityManagerPtr mgr, - virDomainObjPtr vm); + virDomainDefPtr def); typedef int (*virSecurityDomainSetImageLabel) (virSecurityManagerPtr mgr, - virDomainObjPtr vm, + virDomainDefPtr def, virDomainDiskDefPtr disk); typedef int (*virSecurityDomainRestoreHostdevLabel) (virSecurityManagerPtr mgr, - virDomainObjPtr vm, + virDomainDefPtr def, virDomainHostdevDefPtr dev); typedef int (*virSecurityDomainSetHostdevLabel) (virSecurityManagerPtr mgr, - virDomainObjPtr vm, + virDomainDefPtr def, virDomainHostdevDefPtr dev); typedef int (*virSecurityDomainSetSavedStateLabel) (virSecurityManagerPtr mgr, - virDomainObjPtr vm, + virDomainDefPtr def, const char *savefile); typedef int (*virSecurityDomainRestoreSavedStateLabel) (virSecurityManagerPtr mgr, - virDomainObjPtr vm, + virDomainDefPtr def, const char *savefile); typedef int (*virSecurityDomainGenLabel) (virSecurityManagerPtr mgr, - virDomainObjPtr sec); + virDomainDefPtr sec); typedef int (*virSecurityDomainReserveLabel) (virSecurityManagerPtr mgr, - virDomainObjPtr sec); + virDomainDefPtr sec, + pid_t pid); typedef int (*virSecurityDomainReleaseLabel) (virSecurityManagerPtr mgr, - virDomainObjPtr sec); + virDomainDefPtr sec); typedef int (*virSecurityDomainSetAllLabel) (virSecurityManagerPtr mgr, - virDomainObjPtr sec, + virDomainDefPtr sec, const char *stdin_path); typedef int (*virSecurityDomainRestoreAllLabel) (virSecurityManagerPtr mgr, - virDomainObjPtr vm, + virDomainDefPtr def, int migrated); typedef int (*virSecurityDomainGetProcessLabel) (virSecurityManagerPtr mgr, - virDomainObjPtr vm, + virDomainDefPtr def, + pid_t pid, virSecurityLabelPtr sec); typedef int (*virSecurityDomainSetProcessLabel) (virSecurityManagerPtr mgr, - virDomainObjPtr vm); + virDomainDefPtr def); typedef int (*virSecurityDomainSecurityVerify) (virSecurityManagerPtr mgr, virDomainDefPtr def); typedef int (*virSecurityDomainSetImageFDLabel) (virSecurityManagerPtr mgr, - virDomainObjPtr vm, + virDomainDefPtr def, int fd); struct _virSecurityDriver { diff --git a/src/security/security_manager.c b/src/security/security_manager.c index cae9b83..2e4956a 100644 --- a/src/security/security_manager.c +++ b/src/security/security_manager.c @@ -150,7 +150,7 @@ bool virSecurityManagerGetAllowDiskFormatProbing(virSecurityManagerPtr mgr) } int virSecurityManagerRestoreImageLabel(virSecurityManagerPtr mgr, - virDomainObjPtr vm, + virDomainDefPtr vm, virDomainDiskDefPtr disk) { if (mgr->drv->domainRestoreSecurityImageLabel) @@ -161,7 +161,7 @@ int virSecurityManagerRestoreImageLabel(virSecurityManagerPtr mgr, } int virSecurityManagerSetDaemonSocketLabel(virSecurityManagerPtr mgr, - virDomainObjPtr vm) + virDomainDefPtr vm) { if (mgr->drv->domainSetSecurityDaemonSocketLabel) return mgr->drv->domainSetSecurityDaemonSocketLabel(mgr, vm); @@ -171,7 +171,7 @@ int virSecurityManagerSetDaemonSocketLabel(virSecurityManagerPtr mgr, } int virSecurityManagerSetSocketLabel(virSecurityManagerPtr mgr, - virDomainObjPtr vm) + virDomainDefPtr vm) { if (mgr->drv->domainSetSecuritySocketLabel) return mgr->drv->domainSetSecuritySocketLabel(mgr, vm); @@ -181,7 +181,7 @@ int virSecurityManagerSetSocketLabel(virSecurityManagerPtr mgr, } int virSecurityManagerClearSocketLabel(virSecurityManagerPtr mgr, - virDomainObjPtr vm) + virDomainDefPtr vm) { if (mgr->drv->domainClearSecuritySocketLabel) return mgr->drv->domainClearSecuritySocketLabel(mgr, vm); @@ -191,7 +191,7 @@ int virSecurityManagerClearSocketLabel(virSecurityManagerPtr mgr, } int virSecurityManagerSetImageLabel(virSecurityManagerPtr mgr, - virDomainObjPtr vm, + virDomainDefPtr vm, virDomainDiskDefPtr disk) { if (mgr->drv->domainSetSecurityImageLabel) @@ -202,7 +202,7 @@ int virSecurityManagerSetImageLabel(virSecurityManagerPtr mgr, } int virSecurityManagerRestoreHostdevLabel(virSecurityManagerPtr mgr, - virDomainObjPtr vm, + virDomainDefPtr vm, virDomainHostdevDefPtr dev) { if (mgr->drv->domainRestoreSecurityHostdevLabel) @@ -213,7 +213,7 @@ int virSecurityManagerRestoreHostdevLabel(virSecurityManagerPtr mgr, } int virSecurityManagerSetHostdevLabel(virSecurityManagerPtr mgr, - virDomainObjPtr vm, + virDomainDefPtr vm, virDomainHostdevDefPtr dev) { if (mgr->drv->domainSetSecurityHostdevLabel) @@ -224,7 +224,7 @@ int virSecurityManagerSetHostdevLabel(virSecurityManagerPtr mgr, } int virSecurityManagerSetSavedStateLabel(virSecurityManagerPtr mgr, - virDomainObjPtr vm, + virDomainDefPtr vm, const char *savefile) { if (mgr->drv->domainSetSavedStateLabel) @@ -235,7 +235,7 @@ int virSecurityManagerSetSavedStateLabel(virSecurityManagerPtr mgr, } int virSecurityManagerRestoreSavedStateLabel(virSecurityManagerPtr mgr, - virDomainObjPtr vm, + virDomainDefPtr vm, const char *savefile) { if (mgr->drv->domainRestoreSavedStateLabel) @@ -246,7 +246,7 @@ int virSecurityManagerRestoreSavedStateLabel(virSecurityManagerPtr mgr, } int virSecurityManagerGenLabel(virSecurityManagerPtr mgr, - virDomainObjPtr vm) + virDomainDefPtr vm) { if (mgr->drv->domainGenSecurityLabel) return mgr->drv->domainGenSecurityLabel(mgr, vm); @@ -256,17 +256,18 @@ int virSecurityManagerGenLabel(virSecurityManagerPtr mgr, } int virSecurityManagerReserveLabel(virSecurityManagerPtr mgr, - virDomainObjPtr vm) + virDomainDefPtr vm, + pid_t pid) { if (mgr->drv->domainReserveSecurityLabel) - return mgr->drv->domainReserveSecurityLabel(mgr, vm); + return mgr->drv->domainReserveSecurityLabel(mgr, vm, pid); virSecurityReportError(VIR_ERR_NO_SUPPORT, __FUNCTION__); return -1; } int virSecurityManagerReleaseLabel(virSecurityManagerPtr mgr, - virDomainObjPtr vm) + virDomainDefPtr vm) { if (mgr->drv->domainReleaseSecurityLabel) return mgr->drv->domainReleaseSecurityLabel(mgr, vm); @@ -276,7 +277,7 @@ int virSecurityManagerReleaseLabel(virSecurityManagerPtr mgr, } int virSecurityManagerSetAllLabel(virSecurityManagerPtr mgr, - virDomainObjPtr vm, + virDomainDefPtr vm, const char *stdin_path) { if (mgr->drv->domainSetSecurityAllLabel) @@ -287,7 +288,7 @@ int virSecurityManagerSetAllLabel(virSecurityManagerPtr mgr, } int virSecurityManagerRestoreAllLabel(virSecurityManagerPtr mgr, - virDomainObjPtr vm, + virDomainDefPtr vm, int migrated) { if (mgr->drv->domainRestoreSecurityAllLabel) @@ -298,18 +299,19 @@ int virSecurityManagerRestoreAllLabel(virSecurityManagerPtr mgr, } int virSecurityManagerGetProcessLabel(virSecurityManagerPtr mgr, - virDomainObjPtr vm, + virDomainDefPtr vm, + pid_t pid, virSecurityLabelPtr sec) { if (mgr->drv->domainGetSecurityProcessLabel) - return mgr->drv->domainGetSecurityProcessLabel(mgr, vm, sec); + return mgr->drv->domainGetSecurityProcessLabel(mgr, vm, pid, sec); virSecurityReportError(VIR_ERR_NO_SUPPORT, __FUNCTION__); return -1; } int virSecurityManagerSetProcessLabel(virSecurityManagerPtr mgr, - virDomainObjPtr vm) + virDomainDefPtr vm) { if (mgr->drv->domainSetSecurityProcessLabel) return mgr->drv->domainSetSecurityProcessLabel(mgr, vm); @@ -337,7 +339,7 @@ int virSecurityManagerVerify(virSecurityManagerPtr mgr, } int virSecurityManagerSetImageFDLabel(virSecurityManagerPtr mgr, - virDomainObjPtr vm, + virDomainDefPtr vm, int fd) { if (mgr->drv->domainSetSecurityImageFDLabel) diff --git a/src/security/security_manager.h b/src/security/security_manager.h index 12cd498..6731d59 100644 --- a/src/security/security_manager.h +++ b/src/security/security_manager.h @@ -51,50 +51,52 @@ const char *virSecurityManagerGetModel(virSecurityManagerPtr mgr); bool virSecurityManagerGetAllowDiskFormatProbing(virSecurityManagerPtr mgr); int virSecurityManagerRestoreImageLabel(virSecurityManagerPtr mgr, - virDomainObjPtr vm, + virDomainDefPtr def, virDomainDiskDefPtr disk); int virSecurityManagerSetDaemonSocketLabel(virSecurityManagerPtr mgr, - virDomainObjPtr vm); + virDomainDefPtr vm); int virSecurityManagerSetSocketLabel(virSecurityManagerPtr mgr, - virDomainObjPtr vm); + virDomainDefPtr def); int virSecurityManagerClearSocketLabel(virSecurityManagerPtr mgr, - virDomainObjPtr vm); + virDomainDefPtr def); int virSecurityManagerSetImageLabel(virSecurityManagerPtr mgr, - virDomainObjPtr vm, + virDomainDefPtr def, virDomainDiskDefPtr disk); int virSecurityManagerRestoreHostdevLabel(virSecurityManagerPtr mgr, - virDomainObjPtr vm, + virDomainDefPtr def, virDomainHostdevDefPtr dev); int virSecurityManagerSetHostdevLabel(virSecurityManagerPtr mgr, - virDomainObjPtr vm, + virDomainDefPtr def, virDomainHostdevDefPtr dev); int virSecurityManagerSetSavedStateLabel(virSecurityManagerPtr mgr, - virDomainObjPtr vm, + virDomainDefPtr def, const char *savefile); int virSecurityManagerRestoreSavedStateLabel(virSecurityManagerPtr mgr, - virDomainObjPtr vm, + virDomainDefPtr def, const char *savefile); int virSecurityManagerGenLabel(virSecurityManagerPtr mgr, - virDomainObjPtr sec); + virDomainDefPtr sec); int virSecurityManagerReserveLabel(virSecurityManagerPtr mgr, - virDomainObjPtr sec); + virDomainDefPtr sec, + pid_t pid); int virSecurityManagerReleaseLabel(virSecurityManagerPtr mgr, - virDomainObjPtr sec); + virDomainDefPtr sec); int virSecurityManagerSetAllLabel(virSecurityManagerPtr mgr, - virDomainObjPtr sec, + virDomainDefPtr sec, const char *stdin_path); int virSecurityManagerRestoreAllLabel(virSecurityManagerPtr mgr, - virDomainObjPtr vm, + virDomainDefPtr def, int migrated); int virSecurityManagerGetProcessLabel(virSecurityManagerPtr mgr, - virDomainObjPtr vm, + virDomainDefPtr def, + pid_t pid, virSecurityLabelPtr sec); int virSecurityManagerSetProcessLabel(virSecurityManagerPtr mgr, - virDomainObjPtr vm); + virDomainDefPtr def); int virSecurityManagerVerify(virSecurityManagerPtr mgr, virDomainDefPtr def); int virSecurityManagerSetImageFDLabel(virSecurityManagerPtr mgr, - virDomainObjPtr vm, + virDomainDefPtr def, int fd); #endif /* VIR_SECURITY_MANAGER_H__ */ diff --git a/src/security/security_nop.c b/src/security/security_nop.c index a68a6c0..c3bd426 100644 --- a/src/security/security_nop.c +++ b/src/security/security_nop.c @@ -47,104 +47,106 @@ static const char * virSecurityDriverGetDOINop(virSecurityManagerPtr mgr ATTRIBU } static int virSecurityDomainRestoreImageLabelNop(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, - virDomainObjPtr vm ATTRIBUTE_UNUSED, + virDomainDefPtr vm ATTRIBUTE_UNUSED, virDomainDiskDefPtr disk ATTRIBUTE_UNUSED) { return 0; } static int virSecurityDomainSetDaemonSocketLabelNop(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, - virDomainObjPtr vm ATTRIBUTE_UNUSED) + virDomainDefPtr vm ATTRIBUTE_UNUSED) { return 0; } static int virSecurityDomainSetSocketLabelNop(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, - virDomainObjPtr vm ATTRIBUTE_UNUSED) + virDomainDefPtr vm ATTRIBUTE_UNUSED) { return 0; } static int virSecurityDomainClearSocketLabelNop(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, - virDomainObjPtr vm ATTRIBUTE_UNUSED) + virDomainDefPtr vm ATTRIBUTE_UNUSED) { return 0; } static int virSecurityDomainSetImageLabelNop(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, - virDomainObjPtr vm ATTRIBUTE_UNUSED, + virDomainDefPtr vm ATTRIBUTE_UNUSED, virDomainDiskDefPtr disk ATTRIBUTE_UNUSED) { return 0; } static int virSecurityDomainRestoreHostdevLabelNop(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, - virDomainObjPtr vm ATTRIBUTE_UNUSED, + virDomainDefPtr vm ATTRIBUTE_UNUSED, virDomainHostdevDefPtr dev ATTRIBUTE_UNUSED) { return 0; } static int virSecurityDomainSetHostdevLabelNop(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, - virDomainObjPtr vm ATTRIBUTE_UNUSED, + virDomainDefPtr vm ATTRIBUTE_UNUSED, virDomainHostdevDefPtr dev ATTRIBUTE_UNUSED) { return 0; } static int virSecurityDomainSetSavedStateLabelNop(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, - virDomainObjPtr vm ATTRIBUTE_UNUSED, + virDomainDefPtr vm ATTRIBUTE_UNUSED, const char *savefile ATTRIBUTE_UNUSED) { return 0; } static int virSecurityDomainRestoreSavedStateLabelNop(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, - virDomainObjPtr vm ATTRIBUTE_UNUSED, + virDomainDefPtr vm ATTRIBUTE_UNUSED, const char *savefile ATTRIBUTE_UNUSED) { return 0; } static int virSecurityDomainGenLabelNop(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, - virDomainObjPtr sec ATTRIBUTE_UNUSED) + virDomainDefPtr sec ATTRIBUTE_UNUSED) { return 0; } static int virSecurityDomainReserveLabelNop(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, - virDomainObjPtr sec ATTRIBUTE_UNUSED) + virDomainDefPtr sec ATTRIBUTE_UNUSED, + pid_t pid ATTRIBUTE_UNUSED) { return 0; } static int virSecurityDomainReleaseLabelNop(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, - virDomainObjPtr sec ATTRIBUTE_UNUSED) + virDomainDefPtr sec ATTRIBUTE_UNUSED) { return 0; } static int virSecurityDomainSetAllLabelNop(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, - virDomainObjPtr sec ATTRIBUTE_UNUSED, + virDomainDefPtr sec ATTRIBUTE_UNUSED, const char *stdin_path ATTRIBUTE_UNUSED) { return 0; } static int virSecurityDomainRestoreAllLabelNop(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, - virDomainObjPtr vm ATTRIBUTE_UNUSED, + virDomainDefPtr vm ATTRIBUTE_UNUSED, int migrated ATTRIBUTE_UNUSED) { return 0; } static int virSecurityDomainGetProcessLabelNop(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, - virDomainObjPtr vm ATTRIBUTE_UNUSED, + virDomainDefPtr vm ATTRIBUTE_UNUSED, + pid_t pid ATTRIBUTE_UNUSED, virSecurityLabelPtr sec ATTRIBUTE_UNUSED) { return 0; } static int virSecurityDomainSetProcessLabelNop(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, - virDomainObjPtr vm ATTRIBUTE_UNUSED) + virDomainDefPtr vm ATTRIBUTE_UNUSED) { return 0; } @@ -156,7 +158,7 @@ static int virSecurityDomainVerifyNop(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED } static int virSecurityDomainSetFDLabelNop(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, - virDomainObjPtr sec ATTRIBUTE_UNUSED, + virDomainDefPtr sec ATTRIBUTE_UNUSED, int fd ATTRIBUTE_UNUSED) { return 0; diff --git a/src/security/security_selinux.c b/src/security/security_selinux.c index 78c0d45..c3c06a4 100644 --- a/src/security/security_selinux.c +++ b/src/security/security_selinux.c @@ -162,7 +162,7 @@ SELinuxInitialize(void) static int SELinuxGenSecurityLabel(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, - virDomainObjPtr vm) + virDomainDefPtr def) { int rc = -1; char *mcs = NULL; @@ -171,40 +171,40 @@ SELinuxGenSecurityLabel(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, int c2 = 0; context_t ctx = NULL; - if ((vm->def->seclabel.type == VIR_DOMAIN_SECLABEL_DYNAMIC) && - !vm->def->seclabel.baselabel && - vm->def->seclabel.model) { + if ((def->seclabel.type == VIR_DOMAIN_SECLABEL_DYNAMIC) && + !def->seclabel.baselabel && + def->seclabel.model) { virSecurityReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("security model already defined for VM")); return rc; } - if (vm->def->seclabel.type == VIR_DOMAIN_SECLABEL_DYNAMIC && - vm->def->seclabel.label) { + if (def->seclabel.type == VIR_DOMAIN_SECLABEL_DYNAMIC && + def->seclabel.label) { virSecurityReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("security label already defined for VM")); return rc; } - if (vm->def->seclabel.imagelabel) { + if (def->seclabel.imagelabel) { virSecurityReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("security image label already defined for VM")); return rc; } - if (vm->def->seclabel.model && - STRNEQ(vm->def->seclabel.model, SECURITY_SELINUX_NAME)) { + if (def->seclabel.model && + STRNEQ(def->seclabel.model, SECURITY_SELINUX_NAME)) { virSecurityReportError(VIR_ERR_INTERNAL_ERROR, _("security label model %s is not supported with selinux"), - vm->def->seclabel.model); + def->seclabel.model); return rc; } - if (vm->def->seclabel.type == VIR_DOMAIN_SECLABEL_STATIC) { - if (!(ctx = context_new(vm->def->seclabel.label)) ) { + if (def->seclabel.type == VIR_DOMAIN_SECLABEL_STATIC) { + if (!(ctx = context_new(def->seclabel.label)) ) { virReportSystemError(errno, _("unable to allocate socket security context '%s'"), - vm->def->seclabel.label); + def->seclabel.label); return rc; } @@ -237,25 +237,25 @@ SELinuxGenSecurityLabel(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, } } while (mcsAdd(mcs) == -1); - vm->def->seclabel.label = - SELinuxGenNewContext(vm->def->seclabel.baselabel ? - vm->def->seclabel.baselabel : + def->seclabel.label = + SELinuxGenNewContext(def->seclabel.baselabel ? + def->seclabel.baselabel : default_domain_context, mcs); - if (! vm->def->seclabel.label) { + if (! def->seclabel.label) { virSecurityReportError(VIR_ERR_INTERNAL_ERROR, _("cannot generate selinux context for %s"), mcs); goto cleanup; } } - vm->def->seclabel.imagelabel = SELinuxGenNewContext(default_image_context, mcs); - if (!vm->def->seclabel.imagelabel) { + def->seclabel.imagelabel = SELinuxGenNewContext(default_image_context, mcs); + if (!def->seclabel.imagelabel) { virSecurityReportError(VIR_ERR_INTERNAL_ERROR, _("cannot generate selinux context for %s"), mcs); goto cleanup; } - if (!vm->def->seclabel.model && - !(vm->def->seclabel.model = strdup(SECURITY_SELINUX_NAME))) { + if (!def->seclabel.model && + !(def->seclabel.model = strdup(SECURITY_SELINUX_NAME))) { virReportOOMError(); goto cleanup; } @@ -264,12 +264,12 @@ SELinuxGenSecurityLabel(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, cleanup: if (rc != 0) { - if (vm->def->seclabel.type == VIR_DOMAIN_SECLABEL_DYNAMIC) - VIR_FREE(vm->def->seclabel.label); - VIR_FREE(vm->def->seclabel.imagelabel); - if (vm->def->seclabel.type == VIR_DOMAIN_SECLABEL_DYNAMIC && - !vm->def->seclabel.baselabel) - VIR_FREE(vm->def->seclabel.model); + if (def->seclabel.type == VIR_DOMAIN_SECLABEL_DYNAMIC) + VIR_FREE(def->seclabel.label); + VIR_FREE(def->seclabel.imagelabel); + if (def->seclabel.type == VIR_DOMAIN_SECLABEL_DYNAMIC && + !def->seclabel.baselabel) + VIR_FREE(def->seclabel.model); } if (ctx) @@ -278,28 +278,29 @@ cleanup: VIR_FREE(mcs); VIR_DEBUG("model=%s label=%s imagelabel=%s baselabel=%s", - NULLSTR(vm->def->seclabel.model), - NULLSTR(vm->def->seclabel.label), - NULLSTR(vm->def->seclabel.imagelabel), - NULLSTR(vm->def->seclabel.baselabel)); + NULLSTR(def->seclabel.model), + NULLSTR(def->seclabel.label), + NULLSTR(def->seclabel.imagelabel), + NULLSTR(def->seclabel.baselabel)); return rc; } static int SELinuxReserveSecurityLabel(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, - virDomainObjPtr vm) + virDomainDefPtr def, + pid_t pid) { security_context_t pctx; context_t ctx = NULL; const char *mcs; - if (vm->def->seclabel.type == VIR_DOMAIN_SECLABEL_STATIC) + if (def->seclabel.type == VIR_DOMAIN_SECLABEL_STATIC) return 0; - if (getpidcon(vm->pid, &pctx) == -1) { + if (getpidcon(pid, &pctx) == -1) { virReportSystemError(errno, - _("unable to get PID %d security context"), vm->pid); + _("unable to get PID %d security context"), pid); return -1; } @@ -360,15 +361,16 @@ static const char *SELinuxSecurityGetDOI(virSecurityManagerPtr mgr ATTRIBUTE_UNU static int SELinuxGetSecurityProcessLabel(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, - virDomainObjPtr vm, + virDomainDefPtr def ATTRIBUTE_UNUSED, + pid_t pid, virSecurityLabelPtr sec) { security_context_t ctx; - if (getpidcon(vm->pid, &ctx) == -1) { + if (getpidcon(pid, &ctx) == -1) { virReportSystemError(errno, _("unable to get PID %d security context"), - vm->pid); + pid); return -1; } @@ -543,11 +545,11 @@ err: static int SELinuxRestoreSecurityImageLabelInt(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, - virDomainObjPtr vm, + virDomainDefPtr def, virDomainDiskDefPtr disk, int migrated) { - const virSecurityLabelDefPtr secdef = &vm->def->seclabel; + const virSecurityLabelDefPtr secdef = &def->seclabel; if (secdef->norelabel) return 0; @@ -588,10 +590,10 @@ SELinuxRestoreSecurityImageLabelInt(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, static int SELinuxRestoreSecurityImageLabel(virSecurityManagerPtr mgr, - virDomainObjPtr vm, + virDomainDefPtr def, virDomainDiskDefPtr disk) { - return SELinuxRestoreSecurityImageLabelInt(mgr, vm, disk, 0); + return SELinuxRestoreSecurityImageLabelInt(mgr, def, disk, 0); } @@ -626,11 +628,11 @@ SELinuxSetSecurityFileLabel(virDomainDiskDefPtr disk, static int SELinuxSetSecurityImageLabel(virSecurityManagerPtr mgr, - virDomainObjPtr vm, + virDomainDefPtr def, virDomainDiskDefPtr disk) { - const virSecurityLabelDefPtr secdef = &vm->def->seclabel; + const virSecurityLabelDefPtr secdef = &def->seclabel; bool allowDiskFormatProbing = virSecurityManagerGetAllowDiskFormatProbing(mgr); if (secdef->norelabel) @@ -648,8 +650,8 @@ static int SELinuxSetSecurityPCILabel(pciDevice *dev ATTRIBUTE_UNUSED, const char *file, void *opaque) { - virDomainObjPtr vm = opaque; - const virSecurityLabelDefPtr secdef = &vm->def->seclabel; + virDomainDefPtr def = opaque; + const virSecurityLabelDefPtr secdef = &def->seclabel; return SELinuxSetFilecon(file, secdef->imagelabel); } @@ -658,19 +660,19 @@ static int SELinuxSetSecurityUSBLabel(usbDevice *dev ATTRIBUTE_UNUSED, const char *file, void *opaque) { - virDomainObjPtr vm = opaque; - const virSecurityLabelDefPtr secdef = &vm->def->seclabel; + virDomainDefPtr def = opaque; + const virSecurityLabelDefPtr secdef = &def->seclabel; return SELinuxSetFilecon(file, secdef->imagelabel); } static int SELinuxSetSecurityHostdevLabel(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, - virDomainObjPtr vm, + virDomainDefPtr def, virDomainHostdevDefPtr dev) { - const virSecurityLabelDefPtr secdef = &vm->def->seclabel; + const virSecurityLabelDefPtr secdef = &def->seclabel; int ret = -1; if (secdef->norelabel) @@ -687,7 +689,7 @@ SELinuxSetSecurityHostdevLabel(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, if (!usb) goto done; - ret = usbDeviceFileIterate(usb, SELinuxSetSecurityUSBLabel, vm); + ret = usbDeviceFileIterate(usb, SELinuxSetSecurityUSBLabel, def); usbFreeDevice(usb); break; } @@ -701,7 +703,7 @@ SELinuxSetSecurityHostdevLabel(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, if (!pci) goto done; - ret = pciDeviceFileIterate(pci, SELinuxSetSecurityPCILabel, vm); + ret = pciDeviceFileIterate(pci, SELinuxSetSecurityPCILabel, def); pciFreeDevice(pci); break; @@ -735,11 +737,11 @@ SELinuxRestoreSecurityUSBLabel(usbDevice *dev ATTRIBUTE_UNUSED, static int SELinuxRestoreSecurityHostdevLabel(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, - virDomainObjPtr vm, + virDomainDefPtr def, virDomainHostdevDefPtr dev) { - const virSecurityLabelDefPtr secdef = &vm->def->seclabel; + const virSecurityLabelDefPtr secdef = &def->seclabel; int ret = -1; if (secdef->norelabel) @@ -788,11 +790,11 @@ done: static int -SELinuxSetSecurityChardevLabel(virDomainObjPtr vm, +SELinuxSetSecurityChardevLabel(virDomainDefPtr def, virDomainChrSourceDefPtr dev) { - const virSecurityLabelDefPtr secdef = &vm->def->seclabel; + const virSecurityLabelDefPtr secdef = &def->seclabel; char *in = NULL, *out = NULL; int ret = -1; @@ -834,11 +836,11 @@ done: } static int -SELinuxRestoreSecurityChardevLabel(virDomainObjPtr vm, +SELinuxRestoreSecurityChardevLabel(virDomainDefPtr def, virDomainChrSourceDefPtr dev) { - const virSecurityLabelDefPtr secdef = &vm->def->seclabel; + const virSecurityLabelDefPtr secdef = &def->seclabel; char *in = NULL, *out = NULL; int ret = -1; @@ -882,9 +884,9 @@ done: static int -SELinuxRestoreSecurityChardevCallback(virDomainDefPtr def ATTRIBUTE_UNUSED, +SELinuxRestoreSecurityChardevCallback(virDomainDefPtr def, virDomainChrDefPtr dev, - void *opaque) + void *opaque ATTRIBUTE_UNUSED) { virDomainObjPtr vm = opaque; @@ -893,16 +895,15 @@ SELinuxRestoreSecurityChardevCallback(virDomainDefPtr def ATTRIBUTE_UNUSED, dev->targetType == VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_SERIAL) return 0; - return SELinuxRestoreSecurityChardevLabel(vm, &dev->source); + return SELinuxRestoreSecurityChardevLabel(def, &dev->source); } static int -SELinuxRestoreSecuritySmartcardCallback(virDomainDefPtr def ATTRIBUTE_UNUSED, +SELinuxRestoreSecuritySmartcardCallback(virDomainDefPtr def, virDomainSmartcardDefPtr dev, - void *opaque) + void *opaque ATTRIBUTE_UNUSED) { - virDomainObjPtr vm = opaque; const char *database; switch (dev->type) { @@ -916,7 +917,7 @@ SELinuxRestoreSecuritySmartcardCallback(virDomainDefPtr def ATTRIBUTE_UNUSED, return SELinuxRestoreSecurityFileLabel(database); case VIR_DOMAIN_SMARTCARD_TYPE_PASSTHROUGH: - return SELinuxRestoreSecurityChardevLabel(vm, &dev->data.passthru); + return SELinuxRestoreSecurityChardevLabel(def, &dev->data.passthru); default: virSecurityReportError(VIR_ERR_INTERNAL_ERROR, @@ -931,50 +932,50 @@ SELinuxRestoreSecuritySmartcardCallback(virDomainDefPtr def ATTRIBUTE_UNUSED, static int SELinuxRestoreSecurityAllLabel(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, - virDomainObjPtr vm, + virDomainDefPtr def, int migrated ATTRIBUTE_UNUSED) { - const virSecurityLabelDefPtr secdef = &vm->def->seclabel; + const virSecurityLabelDefPtr secdef = &def->seclabel; int i; int rc = 0; - VIR_DEBUG("Restoring security label on %s", vm->def->name); + VIR_DEBUG("Restoring security label on %s", def->name); if (secdef->norelabel) return 0; - for (i = 0 ; i < vm->def->nhostdevs ; i++) { + for (i = 0 ; i < def->nhostdevs ; i++) { if (SELinuxRestoreSecurityHostdevLabel(mgr, - vm, - vm->def->hostdevs[i]) < 0) + def, + def->hostdevs[i]) < 0) rc = -1; } - for (i = 0 ; i < vm->def->ndisks ; i++) { + for (i = 0 ; i < def->ndisks ; i++) { if (SELinuxRestoreSecurityImageLabelInt(mgr, - vm, - vm->def->disks[i], + def, + def->disks[i], migrated) < 0) rc = -1; } - if (virDomainChrDefForeach(vm->def, + if (virDomainChrDefForeach(def, false, SELinuxRestoreSecurityChardevCallback, - vm) < 0) + NULL) < 0) rc = -1; - if (virDomainSmartcardDefForeach(vm->def, + if (virDomainSmartcardDefForeach(def, false, SELinuxRestoreSecuritySmartcardCallback, - vm) < 0) + NULL) < 0) rc = -1; - if (vm->def->os.kernel && - SELinuxRestoreSecurityFileLabel(vm->def->os.kernel) < 0) + if (def->os.kernel && + SELinuxRestoreSecurityFileLabel(def->os.kernel) < 0) rc = -1; - if (vm->def->os.initrd && - SELinuxRestoreSecurityFileLabel(vm->def->os.initrd) < 0) + if (def->os.initrd && + SELinuxRestoreSecurityFileLabel(def->os.initrd) < 0) rc = -1; return rc; @@ -982,9 +983,9 @@ SELinuxRestoreSecurityAllLabel(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, static int SELinuxReleaseSecurityLabel(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, - virDomainObjPtr vm) + virDomainDefPtr def) { - const virSecurityLabelDefPtr secdef = &vm->def->seclabel; + const virSecurityLabelDefPtr secdef = &def->seclabel; if (secdef->type == VIR_DOMAIN_SECLABEL_DYNAMIC) { if (secdef->label != NULL) { @@ -1006,10 +1007,10 @@ SELinuxReleaseSecurityLabel(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, static int SELinuxSetSavedStateLabel(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, - virDomainObjPtr vm, + virDomainDefPtr def, const char *savefile) { - const virSecurityLabelDefPtr secdef = &vm->def->seclabel; + const virSecurityLabelDefPtr secdef = &def->seclabel; if (secdef->norelabel) return 0; @@ -1020,10 +1021,10 @@ SELinuxSetSavedStateLabel(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, static int SELinuxRestoreSavedStateLabel(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, - virDomainObjPtr vm, + virDomainDefPtr def, const char *savefile) { - const virSecurityLabelDefPtr secdef = &vm->def->seclabel; + const virSecurityLabelDefPtr secdef = &def->seclabel; if (secdef->norelabel) return 0; @@ -1058,12 +1059,12 @@ SELinuxSecurityVerify(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, static int SELinuxSetSecurityProcessLabel(virSecurityManagerPtr mgr, - virDomainObjPtr vm) + virDomainDefPtr def) { /* TODO: verify DOI */ - const virSecurityLabelDefPtr secdef = &vm->def->seclabel; + const virSecurityLabelDefPtr secdef = &def->seclabel; - if (vm->def->seclabel.label == NULL) + if (def->seclabel.label == NULL) return 0; if (!STREQ(virSecurityManagerGetModel(mgr), secdef->model)) { @@ -1089,16 +1090,16 @@ SELinuxSetSecurityProcessLabel(virSecurityManagerPtr mgr, static int SELinuxSetSecurityDaemonSocketLabel(virSecurityManagerPtr mgr, - virDomainObjPtr vm) + virDomainDefPtr def) { /* TODO: verify DOI */ - const virSecurityLabelDefPtr secdef = &vm->def->seclabel; + const virSecurityLabelDefPtr secdef = &def->seclabel; context_t execcon = NULL; context_t proccon = NULL; security_context_t scon = NULL; int rc = -1; - if (vm->def->seclabel.label == NULL) + if (def->seclabel.label == NULL) return 0; if (!STREQ(virSecurityManagerGetModel(mgr), secdef->model)) { @@ -1139,7 +1140,7 @@ SELinuxSetSecurityDaemonSocketLabel(virSecurityManagerPtr mgr, } VIR_DEBUG("Setting VM %s socket context %s", - vm->def->name, context_str(proccon)); + def->name, context_str(proccon)); if (setsockcreatecon(context_str(proccon)) == -1) { virReportSystemError(errno, _("unable to set socket security context '%s'"), @@ -1160,9 +1161,9 @@ done: static int SELinuxSetSecuritySocketLabel(virSecurityManagerPtr mgr, - virDomainObjPtr vm) + virDomainDefPtr vm) { - const virSecurityLabelDefPtr secdef = &vm->def->seclabel; + const virSecurityLabelDefPtr secdef = &vm->seclabel; int rc = -1; if (secdef->label == NULL) @@ -1178,7 +1179,7 @@ SELinuxSetSecuritySocketLabel(virSecurityManagerPtr mgr, } VIR_DEBUG("Setting VM %s socket context %s", - vm->def->name, secdef->label); + vm->name, secdef->label); if (setsockcreatecon(secdef->label) == -1) { virReportSystemError(errno, _("unable to set socket security context '%s'"), @@ -1197,12 +1198,12 @@ done: static int SELinuxClearSecuritySocketLabel(virSecurityManagerPtr mgr, - virDomainObjPtr vm) + virDomainDefPtr def) { /* TODO: verify DOI */ - const virSecurityLabelDefPtr secdef = &vm->def->seclabel; + const virSecurityLabelDefPtr secdef = &def->seclabel; - if (vm->def->seclabel.label == NULL) + if (def->seclabel.label == NULL) return 0; if (!STREQ(virSecurityManagerGetModel(mgr), secdef->model)) { @@ -1227,10 +1228,11 @@ SELinuxClearSecuritySocketLabel(virSecurityManagerPtr mgr, static int -SELinuxSetSecurityChardevCallback(virDomainDefPtr def ATTRIBUTE_UNUSED, +SELinuxSetSecurityChardevCallback(virDomainDefPtr def, virDomainChrDefPtr dev, - void *opaque) + void *opaque ATTRIBUTE_UNUSED) { +<<<<<<< HEAD virDomainObjPtr vm = opaque; /* This is taken care of by processing of def->serials */ @@ -1239,15 +1241,17 @@ SELinuxSetSecurityChardevCallback(virDomainDefPtr def ATTRIBUTE_UNUSED, return 0; return SELinuxSetSecurityChardevLabel(vm, &dev->source); +======= + return SELinuxSetSecurityChardevLabel(def, &dev->source); +>>>>>>> Change security driver APIs to use virDomainDefPtr instead of virDomainObjPtr } static int -SELinuxSetSecuritySmartcardCallback(virDomainDefPtr def ATTRIBUTE_UNUSED, +SELinuxSetSecuritySmartcardCallback(virDomainDefPtr def, virDomainSmartcardDefPtr dev, - void *opaque) + void *opaque ATTRIBUTE_UNUSED) { - virDomainObjPtr vm = opaque; const char *database; switch (dev->type) { @@ -1261,7 +1265,7 @@ SELinuxSetSecuritySmartcardCallback(virDomainDefPtr def ATTRIBUTE_UNUSED, return SELinuxSetFilecon(database, default_content_context); case VIR_DOMAIN_SMARTCARD_TYPE_PASSTHROUGH: - return SELinuxSetSecurityChardevLabel(vm, &dev->data.passthru); + return SELinuxSetSecurityChardevLabel(def, &dev->data.passthru); default: virSecurityReportError(VIR_ERR_INTERNAL_ERROR, @@ -1276,53 +1280,53 @@ SELinuxSetSecuritySmartcardCallback(virDomainDefPtr def ATTRIBUTE_UNUSED, static int SELinuxSetSecurityAllLabel(virSecurityManagerPtr mgr, - virDomainObjPtr vm, + virDomainDefPtr def, const char *stdin_path) { - const virSecurityLabelDefPtr secdef = &vm->def->seclabel; + const virSecurityLabelDefPtr secdef = &def->seclabel; int i; if (secdef->norelabel) return 0; - for (i = 0 ; i < vm->def->ndisks ; i++) { + for (i = 0 ; i < def->ndisks ; i++) { /* XXX fixme - we need to recursively label the entire tree :-( */ - if (vm->def->disks[i]->type == VIR_DOMAIN_DISK_TYPE_DIR) { + if (def->disks[i]->type == VIR_DOMAIN_DISK_TYPE_DIR) { VIR_WARN("Unable to relabel directory tree %s for disk %s", - vm->def->disks[i]->src, vm->def->disks[i]->dst); + def->disks[i]->src, def->disks[i]->dst); continue; } if (SELinuxSetSecurityImageLabel(mgr, - vm, vm->def->disks[i]) < 0) + def, def->disks[i]) < 0) return -1; } - /* XXX fixme process vm->def->fss if relabel == true */ + /* XXX fixme process def->fss if relabel == true */ - for (i = 0 ; i < vm->def->nhostdevs ; i++) { + for (i = 0 ; i < def->nhostdevs ; i++) { if (SELinuxSetSecurityHostdevLabel(mgr, - vm, - vm->def->hostdevs[i]) < 0) + def, + def->hostdevs[i]) < 0) return -1; } - if (virDomainChrDefForeach(vm->def, + if (virDomainChrDefForeach(def, true, SELinuxSetSecurityChardevCallback, - vm) < 0) + NULL) < 0) return -1; - if (virDomainSmartcardDefForeach(vm->def, + if (virDomainSmartcardDefForeach(def, true, SELinuxSetSecuritySmartcardCallback, - vm) < 0) + NULL) < 0) return -1; - if (vm->def->os.kernel && - SELinuxSetFilecon(vm->def->os.kernel, default_content_context) < 0) + if (def->os.kernel && + SELinuxSetFilecon(def->os.kernel, default_content_context) < 0) return -1; - if (vm->def->os.initrd && - SELinuxSetFilecon(vm->def->os.initrd, default_content_context) < 0) + if (def->os.initrd && + SELinuxSetFilecon(def->os.initrd, default_content_context) < 0) return -1; if (stdin_path) { @@ -1337,10 +1341,10 @@ SELinuxSetSecurityAllLabel(virSecurityManagerPtr mgr, static int SELinuxSetImageFDLabel(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, - virDomainObjPtr vm, + virDomainDefPtr def, int fd) { - const virSecurityLabelDefPtr secdef = &vm->def->seclabel; + const virSecurityLabelDefPtr secdef = &def->seclabel; if (secdef->imagelabel == NULL) return 0; diff --git a/src/security/security_stack.c b/src/security/security_stack.c index 3f601c1..c82865f 100644 --- a/src/security/security_stack.c +++ b/src/security/security_stack.c @@ -106,7 +106,7 @@ virSecurityStackVerify(virSecurityManagerPtr mgr, static int virSecurityStackGenLabel(virSecurityManagerPtr mgr, - virDomainObjPtr vm) + virDomainDefPtr vm) { virSecurityStackDataPtr priv = virSecurityManagerGetPrivateData(mgr); int rc = 0; @@ -131,7 +131,7 @@ virSecurityStackGenLabel(virSecurityManagerPtr mgr, static int virSecurityStackReleaseLabel(virSecurityManagerPtr mgr, - virDomainObjPtr vm) + virDomainDefPtr vm) { virSecurityStackDataPtr priv = virSecurityManagerGetPrivateData(mgr); int rc = 0; @@ -150,16 +150,17 @@ virSecurityStackReleaseLabel(virSecurityManagerPtr mgr, static int virSecurityStackReserveLabel(virSecurityManagerPtr mgr, - virDomainObjPtr vm) + virDomainDefPtr vm, + pid_t pid) { virSecurityStackDataPtr priv = virSecurityManagerGetPrivateData(mgr); int rc = 0; - if (virSecurityManagerReserveLabel(priv->primary, vm) < 0) + if (virSecurityManagerReserveLabel(priv->primary, vm, pid) < 0) rc = -1; #if 0 /* XXX See note in GenLabel */ - if (virSecurityManagerReserveLabel(priv->secondary, vm) < 0) + if (virSecurityManagerReserveLabel(priv->secondary, vm, pid) < 0) rc = -1; #endif @@ -169,7 +170,7 @@ virSecurityStackReserveLabel(virSecurityManagerPtr mgr, static int virSecurityStackSetSecurityImageLabel(virSecurityManagerPtr mgr, - virDomainObjPtr vm, + virDomainDefPtr vm, virDomainDiskDefPtr disk) { virSecurityStackDataPtr priv = virSecurityManagerGetPrivateData(mgr); @@ -186,7 +187,7 @@ virSecurityStackSetSecurityImageLabel(virSecurityManagerPtr mgr, static int virSecurityStackRestoreSecurityImageLabel(virSecurityManagerPtr mgr, - virDomainObjPtr vm, + virDomainDefPtr vm, virDomainDiskDefPtr disk) { virSecurityStackDataPtr priv = virSecurityManagerGetPrivateData(mgr); @@ -203,7 +204,7 @@ virSecurityStackRestoreSecurityImageLabel(virSecurityManagerPtr mgr, static int virSecurityStackSetSecurityHostdevLabel(virSecurityManagerPtr mgr, - virDomainObjPtr vm, + virDomainDefPtr vm, virDomainHostdevDefPtr dev) { @@ -221,7 +222,7 @@ virSecurityStackSetSecurityHostdevLabel(virSecurityManagerPtr mgr, static int virSecurityStackRestoreSecurityHostdevLabel(virSecurityManagerPtr mgr, - virDomainObjPtr vm, + virDomainDefPtr vm, virDomainHostdevDefPtr dev) { virSecurityStackDataPtr priv = virSecurityManagerGetPrivateData(mgr); @@ -238,7 +239,7 @@ virSecurityStackRestoreSecurityHostdevLabel(virSecurityManagerPtr mgr, static int virSecurityStackSetSecurityAllLabel(virSecurityManagerPtr mgr, - virDomainObjPtr vm, + virDomainDefPtr vm, const char *stdin_path) { virSecurityStackDataPtr priv = virSecurityManagerGetPrivateData(mgr); @@ -255,7 +256,7 @@ virSecurityStackSetSecurityAllLabel(virSecurityManagerPtr mgr, static int virSecurityStackRestoreSecurityAllLabel(virSecurityManagerPtr mgr, - virDomainObjPtr vm, + virDomainDefPtr vm, int migrated) { virSecurityStackDataPtr priv = virSecurityManagerGetPrivateData(mgr); @@ -272,7 +273,7 @@ virSecurityStackRestoreSecurityAllLabel(virSecurityManagerPtr mgr, static int virSecurityStackSetSavedStateLabel(virSecurityManagerPtr mgr, - virDomainObjPtr vm, + virDomainDefPtr vm, const char *savefile) { virSecurityStackDataPtr priv = virSecurityManagerGetPrivateData(mgr); @@ -289,7 +290,7 @@ virSecurityStackSetSavedStateLabel(virSecurityManagerPtr mgr, static int virSecurityStackRestoreSavedStateLabel(virSecurityManagerPtr mgr, - virDomainObjPtr vm, + virDomainDefPtr vm, const char *savefile) { virSecurityStackDataPtr priv = virSecurityManagerGetPrivateData(mgr); @@ -306,7 +307,7 @@ virSecurityStackRestoreSavedStateLabel(virSecurityManagerPtr mgr, static int virSecurityStackSetProcessLabel(virSecurityManagerPtr mgr, - virDomainObjPtr vm) + virDomainDefPtr vm) { virSecurityStackDataPtr priv = virSecurityManagerGetPrivateData(mgr); int rc = 0; @@ -321,17 +322,18 @@ virSecurityStackSetProcessLabel(virSecurityManagerPtr mgr, static int virSecurityStackGetProcessLabel(virSecurityManagerPtr mgr, - virDomainObjPtr vm, + virDomainDefPtr vm, + pid_t pid, virSecurityLabelPtr seclabel) { virSecurityStackDataPtr priv = virSecurityManagerGetPrivateData(mgr); int rc = 0; #if 0 - if (virSecurityManagerGetProcessLabel(priv->secondary, vm, seclabel) < 0) + if (virSecurityManagerGetProcessLabel(priv->secondary, vm, pid, seclabel) < 0) rc = -1; #endif - if (virSecurityManagerGetProcessLabel(priv->primary, vm, seclabel) < 0) + if (virSecurityManagerGetProcessLabel(priv->primary, vm, pid, seclabel) < 0) rc = -1; return rc; @@ -340,7 +342,7 @@ virSecurityStackGetProcessLabel(virSecurityManagerPtr mgr, static int virSecurityStackSetDaemonSocketLabel(virSecurityManagerPtr mgr, - virDomainObjPtr vm) + virDomainDefPtr vm) { virSecurityStackDataPtr priv = virSecurityManagerGetPrivateData(mgr); int rc = 0; @@ -356,7 +358,7 @@ virSecurityStackSetDaemonSocketLabel(virSecurityManagerPtr mgr, static int virSecurityStackSetSocketLabel(virSecurityManagerPtr mgr, - virDomainObjPtr vm) + virDomainDefPtr vm) { virSecurityStackDataPtr priv = virSecurityManagerGetPrivateData(mgr); int rc = 0; @@ -372,7 +374,7 @@ virSecurityStackSetSocketLabel(virSecurityManagerPtr mgr, static int virSecurityStackClearSocketLabel(virSecurityManagerPtr mgr, - virDomainObjPtr vm) + virDomainDefPtr vm) { virSecurityStackDataPtr priv = virSecurityManagerGetPrivateData(mgr); int rc = 0; @@ -387,7 +389,7 @@ virSecurityStackClearSocketLabel(virSecurityManagerPtr mgr, static int virSecurityStackSetImageFDLabel(virSecurityManagerPtr mgr, - virDomainObjPtr vm, + virDomainDefPtr vm, int fd) { virSecurityStackDataPtr priv = virSecurityManagerGetPrivateData(mgr); -- 1.7.6.4

2 1

[libvirt] [PATCH] storage: Refetch file status after open
by Michal Privoznik 28 Nov '11

28 Nov '11

This partly reverts my previous patch f88de3eb. We need to get file status after open, as given path could have been symlink, so fstat() will operate on different file than lstat(). --- src/storage/storage_backend.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/src/storage/storage_backend.c b/src/storage/storage_backend.c index d30829d..d7394e0 100644 --- a/src/storage/storage_backend.c +++ b/src/storage/storage_backend.c @@ -1041,6 +1041,14 @@ virStorageBackendVolOpenCheckMode(const char *path, unsigned int flags) return -1; } + if (fstat(fd, &sb) < 0) { + virReportSystemError(errno, + _("cannot stat file '%s'"), + path); + VIR_FORCE_CLOSE(fd); + return -1; + } + if (S_ISREG(sb.st_mode)) mode = VIR_STORAGE_VOL_OPEN_REG; else if (S_ISCHR(sb.st_mode)) -- 1.7.3.4

3 3

[libvirt] [PATCH 0/5 (repost)] Support Blkio tune, CPU tune, NUMA, CPU affinity in LXC
by Daniel P. Berrange 28 Nov '11

28 Nov '11

Re-post of https://www.redhat.com/archives/libvir-list/2011-November/msg00464.html rebased to latest GIT

2 12

[libvirt] VBOX driver : "An error occurred, but the cause is unknown" when trying to start a Virtualbox domain
by Jean-Christophe Guillain 28 Nov '11

28 Nov '11

Hello, I opened a bug (http://bugzilla.redhat.com/show_bug.cgi?id=757138) about this issue, but I was told to mention it to this list too. Here is my problem : when I try to start a virtualbox domain with virsh, an error occurs. (But when the domain is started using Virtualbox GUI it works, and I have no problem to stop it with virsh...) Example : virsh # start freenas1 error: Failed to start domain freenas1 error: An error occurred, but the cause is unknown I use libvirt 0.9.2-7 and virtualbox 4.0.10 on a Debian with 2.6.32-5-amd64 kernel. The XML config file of the domain : <domain type='vbox' id='1'> <name>freenas1</name> <uuid>07aadf11-2090-4690-9518-52766722c544</uuid> <memory>524288</memory> <currentMemory>524288</currentMemory> <vcpu>1</vcpu> <os> <type arch='x86_64'>hvm</type> <boot dev='hd'/> </os> <features> <acpi/> <apic/> </features> <clock offset='localtime'/> <on_poweroff>destroy</on_poweroff> <on_reboot>destroy</on_reboot> <on_crash>destroy</on_crash> <devices> <disk type='file' device='disk'> <source file='/data/Freenas1Disk1.vdi'/> <target dev='hda' bus='ide'/> </disk> <input type='mouse' bus='ps2'/> <graphics type='desktop' display='localhost:10.0'/> <video> <model type='vbox' vram='8192' heads='1'> <acceleration accel3d='no' accel2d='no'/> </model> </video> </devices> </domain> virsh debug output : virsh # start freenas1 15:51:31.043: 5796: debug : virConnectOpenAuth:1328 : name=(null), auth=0x7f19ee32d320, flags=0 15:51:31.043: 5796: debug : do_open:1065 : no name, allowing driver auto-select 15:51:31.043: 5796: debug : do_open:1102 : trying driver 0 (Test) ... 15:51:31.043: 5796: debug : do_open:1108 : driver 0 Test returned DECLINED 15:51:31.043: 5796: debug : do_open:1102 : trying driver 1 (Xen) ... 15:51:31.043: 5796: debug : do_open:1108 : driver 1 Xen returned DECLINED 15:51:31.043: 5796: debug : do_open:1102 : trying driver 2 (OPENVZ) ... 15:51:31.043: 5796: debug : do_open:1108 : driver 2 OPENVZ returned DECLINED 15:51:31.043: 5796: debug : do_open:1102 : trying driver 3 (VMWARE) ... 15:51:31.043: 5796: debug : do_open:1108 : driver 3 VMWARE returned DECLINED 15:51:31.043: 5796: debug : do_open:1102 : trying driver 4 (VBOX) ... 15:51:31.050: 5796: debug : vboxOpen:1035 : in vboxOpen 15:51:31.050: 5796: debug : do_open:1108 : driver 4 VBOX returned SUCCESS 15:51:31.050: 5796: debug : do_open:1130 : network driver 0 Test returned DECLINED 15:51:31.050: 5796: debug : vboxNetworkOpen:6953 : network initialized 15:51:31.050: 5796: debug : do_open:1130 : network driver 1 VBOX returned SUCCESS 15:51:31.050: 5796: debug : do_open:1145 : interface driver 0 Test returned DECLINED 15:51:31.051: 5796: debug : doRemoteOpen:596 : proceeding with name = vbox:///system 15:51:31.051: 5796: debug : remoteIO:5824 : Do proc=66 serial=0 length=28 wait=(nil) 15:51:31.051: 5796: debug : remoteIO:5896 : We have the buck 66 0x7f19e6c37010 0x7f19e6c37010 15:51:31.051: 5796: debug : remoteIODecodeMessageLength:5214 : Got length, now need 64 total (60 more) 15:51:31.051: 5796: debug : remoteIOEventLoop:5750 : Giving up the buck 66 0x7f19e6c37010 (nil) 15:51:31.051: 5796: debug : remoteIO:5924 : All done with our call 66 (nil) 0x7f19e6c37010 15:51:31.051: 5796: debug : remoteIO:5824 : Do proc=1 serial=1 length=56 wait=(nil) 15:51:31.051: 5796: debug : remoteIO:5896 : We have the buck 1 0x7f19e003fec0 0x7f19e003fec0 15:51:31.052: 5796: debug : remoteIODecodeMessageLength:5214 : Got length, now need 176 total (172 more) 15:51:31.052: 5796: debug : remoteIOEventLoop:5750 : Giving up the buck 1 0x7f19e003fec0 (nil) 15:51:31.052: 5796: debug : remoteIO:5924 : All done with our call 1 (nil) 0x7f19e003fec0 15:51:31.052: 5796: debug : do_open:1145 : interface driver 1 remote returned ERROR 15:51:31.052: 5796: debug : do_open:1161 : storage driver 0 Test returned DECLINED 15:51:31.052: 5796: debug : vboxStorageOpen:7764 : vbox storage initialized 15:51:31.052: 5796: debug : do_open:1161 : storage driver 1 VBOX returned SUCCESS 15:51:31.052: 5796: debug : do_open:1177 : node driver 0 Test returned DECLINED 15:51:31.053: 5796: debug : doRemoteOpen:596 : proceeding with name = vbox:///system 15:51:31.053: 5796: debug : remoteIO:5824 : Do proc=66 serial=0 length=28 wait=(nil) 15:51:31.053: 5796: debug : remoteIO:5896 : We have the buck 66 0x7f19e0081f90 0x7f19e0081f90 15:51:31.054: 5796: debug : remoteIODecodeMessageLength:5214 : Got length, now need 64 total (60 more) 15:51:31.054: 5796: debug : remoteIOEventLoop:5750 : Giving up the buck 66 0x7f19e0081f90 (nil) 15:51:31.054: 5796: debug : remoteIO:5924 : All done with our call 66 (nil) 0x7f19e0081f90 15:51:31.054: 5796: debug : remoteIO:5824 : Do proc=1 serial=1 length=56 wait=(nil) 15:51:31.054: 5796: debug : remoteIO:5896 : We have the buck 1 0x7f19e0081f90 0x7f19e0081f90 15:51:31.055: 5796: debug : remoteIODecodeMessageLength:5214 : Got length, now need 176 total (172 more) 15:51:31.055: 5796: debug : remoteIOEventLoop:5750 : Giving up the buck 1 0x7f19e0081f90 (nil) 15:51:31.055: 5796: debug : remoteIO:5924 : All done with our call 1 (nil) 0x7f19e0081f90 15:51:31.055: 5796: debug : do_open:1177 : node driver 1 remote returned ERROR 15:51:31.055: 5796: debug : do_open:1193 : secret driver 0 Test returned DECLINED 15:51:31.055: 5796: debug : doRemoteOpen:596 : proceeding with name = vbox:///system 15:51:31.055: 5796: debug : remoteIO:5824 : Do proc=66 serial=0 length=28 wait=(nil) 15:51:31.055: 5796: debug : remoteIO:5896 : We have the buck 66 0x7f19e0081f90 0x7f19e0081f90 15:51:31.056: 5796: debug : remoteIODecodeMessageLength:5214 : Got length, now need 64 total (60 more) 15:51:31.056: 5796: debug : remoteIOEventLoop:5750 : Giving up the buck 66 0x7f19e0081f90 (nil) 15:51:31.056: 5796: debug : remoteIO:5924 : All done with our call 66 (nil) 0x7f19e0081f90 15:51:31.056: 5796: debug : remoteIO:5824 : Do proc=1 serial=1 length=56 wait=(nil) 15:51:31.056: 5796: debug : remoteIO:5896 : We have the buck 1 0x7f19e0081f90 0x7f19e0081f90 15:51:31.057: 5796: debug : remoteIODecodeMessageLength:5214 : Got length, now need 176 total (172 more) 15:51:31.057: 5796: debug : remoteIOEventLoop:5750 : Giving up the buck 1 0x7f19e0081f90 (nil) 15:51:31.057: 5796: debug : remoteIO:5924 : All done with our call 1 (nil) 0x7f19e0081f90 15:51:31.057: 5796: debug : do_open:1193 : secret driver 1 remote returned ERROR 15:51:31.057: 5796: debug : do_open:1209 : nwfilter driver 0 Test returned DECLINED 15:51:31.057: 5796: debug : doRemoteOpen:596 : proceeding with name = vbox:///system 15:51:31.057: 5796: debug : remoteIO:5824 : Do proc=66 serial=0 length=28 wait=(nil) 15:51:31.057: 5796: debug : remoteIO:5896 : We have the buck 66 0x7f19e0081f90 0x7f19e0081f90 15:51:31.058: 5796: debug : remoteIODecodeMessageLength:5214 : Got length, now need 64 total (60 more) 15:51:31.058: 5796: debug : remoteIOEventLoop:5750 : Giving up the buck 66 0x7f19e0081f90 (nil) 15:51:31.058: 5796: debug : remoteIO:5924 : All done with our call 66 (nil) 0x7f19e0081f90 15:51:31.058: 5796: debug : remoteIO:5824 : Do proc=1 serial=1 length=56 wait=(nil) 15:51:31.058: 5796: debug : remoteIO:5896 : We have the buck 1 0x7f19e0081f90 0x7f19e0081f90 15:51:31.059: 5796: debug : remoteIODecodeMessageLength:5214 : Got length, now need 176 total (172 more) 15:51:31.059: 5796: debug : remoteIOEventLoop:5750 : Giving up the buck 1 0x7f19e0081f90 (nil) 15:51:31.059: 5796: debug : remoteIO:5924 : All done with our call 1 (nil) 0x7f19e0081f90 15:51:31.059: 5796: debug : do_open:1209 : nwfilter driver 1 remote returned ERROR 15:51:31.060: 5796: debug : virDomainLookupByName:2030 : conn=0x6f6350, name=freenas1 15:51:31.061: 5796: debug : virDomainGetID:2718 : dom=0x7f19e002db00, (VM: name=freenas1, uuid=07aadf11-2090-4690-9518-52766722c544), 15:51:31.061: 5796: debug : virDomainCreate:6300 : dom=0x7f19e002db00, (VM: name=freenas1, uuid=07aadf11-2090-4690-9518-52766722c544), 15:51:31.566: 5796: debug : virDomainGetName:2623 : domain=0x7f19e002db00 error: Failed to start domain freenas1 15:51:31.566: 5796: debug : virDomainFree:2118 : dom=0x7f19e002db00, (VM: name=freenas1, uuid=07aadf11-2090-4690-9518-52766722c544), 15:51:31.566: 5796: debug : virUnrefDomain:276 : unref domain 0x7f19e002db00 freenas1 1 15:51:31.566: 5796: debug : virReleaseDomain:238 : release domain 0x7f19e002db00 freenas1 07aadf11-2090-4690-9518-52766722c544 15:51:31.566: 5796: debug : virReleaseDomain:246 : unref connection 0x6f6350 2 error: An error occurred, but the cause is unknown ##### I f you have an idea of what the problem is... Thank you, jC

1 0

[libvirt] RE : Re: [PATCH] util: fix thinko in runIO
by Bastien ROUCARIES 28 Nov '11

28 Nov '11

Malloc page than realloc to smaller does not work ? Bastien Le 25 nov. 2011 14:38, "Eric Blake" <eblake(a)redhat.com> a écrit : [adding bug-gnulib; replies can drop libvirt] On 11/25/2011 05:51 AM, Paolo Bonzini wrote: >> Indeed; Linux has posix_memalign, and mingw never runs the io helper >> (although it does compile it, hence the #if). If gnulib would give >> us posix_memalign on mingw, we could nuke this #if altogether. > > That's pretty difficult (unless you also add a posix_memalign_free) > because at the time posix_memalign returns you have lost the base > pointer for free(). Providing a posix_memalign_free defeats the purpose - POSIX requires that plain free() will cover the memory returned by posix_memalign. The list of platforms missing posix_memalign is a bit daunting: MacOS X 10.5, FreeBSD 6.0, NetBSD 3.0, OpenBSD 3.8, Minix 3.1.8, AIX 5.1, HP-UX 11, IRIX 6.5, OSF/1 5.1, Solaris 10, Cygwin 1.5.x, mingw, MSVC 9, Interix 3.5, BeOS. but what would be interesting to know is how many of those platforms return page-aligned pointers for any malloc() request of a page or more of memory. That is, we may be able to coerce malloc into aligned results by over-allocating and over-aligning the user's request, if the system malloc() has at least one mode of returning page-aligned memory. Another alternative is to override free() at the same time as providing posix_memalign(). The gnulib malloca module provides a freea() function that can distinguish whether it is paired with an alloca() (nop) or mmalloca() (call the real free()), by over-allocating and probing for a magic header. Similar concepts could be used in writing an rpl_free() that determines whether it was allocated by posix_memalign(): if we guarantee that posix_memalign always returns something aligned to at least a page, then rpl_free() can make a quick check for whether the pointer passed in is page-aligned; if so, do a hash lookup to see if it was a page reserved by our posix_memalign (if so, we know the real address to free); if not or the hash lookup fails, it came from malloc (in which case, regular free should work). Of course, unlike freea() that probes for a magic header, we can't safely probe a header by crossing page boundaries, since that would fault if we didn't allocate the previous page at the same time. -- Eric Blake eblake(a)redhat.com +1-919-301-3266 Libvirt virtualization library http://libvirt.org

2 1