- Devel - libvirt List Archives

[libvirt] [PATCH] maint: typo fixes
by Eric Blake 02 Dec '11

02 Dec '11

Many of these were mentioned by Yuri Chornoivan in: https://bugzilla.redhat.com/show_bug.cgi?id=669506 * src/esx/esx_vi.c (esxVI_WaitForTaskCompletion): Fix spelling. * src/conf/netdev_vport_profile_conf.c (virNetDevVPortProfileParse): Likewise. * src/xen/xend_internal.c (xenDaemonDomainSetVcpusFlags): Likewise. * src/xen/xm_internal.c (xenXMDomainSetVcpusFlags): Likewise. * src/esx/esx_util.c (esxUtil_ResolveHostname): Likewise. * src/storage/storage_backend_fs.c (virStorageBackendFileSystemBuild): Likewise. * daemon/libvirtd.conf: Likewise. * src/util/logging.c (virLogMessage): Likewise. * src/uml/uml_conf.c (umlBuildCommandLineNet): Likewise. * src/vmx/vmx.c (virVMXFormatEthernet): Likewise. --- Pushing under the trivial rule. daemon/libvirtd.conf | 4 ++-- src/conf/netdev_vport_profile_conf.c | 2 +- src/esx/esx_util.c | 4 ++-- src/esx/esx_vi.c | 2 +- src/storage/storage_backend_fs.c | 2 +- src/uml/uml_conf.c | 4 ++-- src/util/logging.c | 2 +- src/vmx/vmx.c | 2 +- src/xen/xend_internal.c | 2 +- src/xen/xm_internal.c | 2 +- 10 files changed, 13 insertions(+), 13 deletions(-) diff --git a/daemon/libvirtd.conf b/daemon/libvirtd.conf index f218454..3eab2be 100644 --- a/daemon/libvirtd.conf +++ b/daemon/libvirtd.conf @@ -284,7 +284,7 @@ # Logging controls # -# Logging level: 4 errors, 3 warnings, 2 informations, 1 debug +# Logging level: 4 errors, 3 warnings, 2 information, 1 debug # basically 1 will log everything possible #log_level = 3 @@ -309,7 +309,7 @@ # the event layer. # Logging outputs: -# An output is one of the places to save logging informations +# An output is one of the places to save logging information # The format for an output can be: # x:stderr # output goes to stderr diff --git a/src/conf/netdev_vport_profile_conf.c b/src/conf/netdev_vport_profile_conf.c index 861ad34..b48b2cb 100644 --- a/src/conf/netdev_vport_profile_conf.c +++ b/src/conf/netdev_vport_profile_conf.c @@ -167,7 +167,7 @@ virNetDevVPortProfileParse(xmlNodePtr node) } } else { virNetDevError(VIR_ERR_XML_ERROR, "%s", - _("profileid parameter is missing for 802.1Qbh descripion")); + _("profileid parameter is missing for 802.1Qbh description")); goto error; } break; diff --git a/src/esx/esx_util.c b/src/esx/esx_util.c index 1925802..2c5ac1a 100644 --- a/src/esx/esx_util.c +++ b/src/esx/esx_util.c @@ -2,7 +2,7 @@ /* * esx_util.c: utility functions for the VMware ESX driver * - * Copyright (C) 2010 Red Hat, Inc. + * Copyright (C) 2010-2011 Red Hat, Inc. * Copyright (C) 2009-2011 Matthias Bolte <matthias.bolte(a)googlemail.com> * Copyright (C) 2009 Maximilian Wilhelm <max(a)rfc2324.org> * @@ -384,7 +384,7 @@ esxUtil_ResolveHostname(const char *hostname, if (errcode != 0) { ESX_ERROR(VIR_ERR_INTERNAL_ERROR, - _("Formating IP address for host '%s' failed: %s"), hostname, + _("Formatting IP address for host '%s' failed: %s"), hostname, gai_strerror(errcode)); freeaddrinfo(result); return -1; diff --git a/src/esx/esx_vi.c b/src/esx/esx_vi.c index 21892a0..80f337b 100644 --- a/src/esx/esx_vi.c +++ b/src/esx/esx_vi.c @@ -3955,7 +3955,7 @@ esxVI_WaitForTaskCompletion(esxVI_Context *ctx, if (taskInfo->cancelable == esxVI_Boolean_True) { if (esxVI_CancelTask(ctx, task) < 0 && blocked) { VIR_ERROR(_("Cancelable task is blocked by an " - "unanswered question but cancelation " + "unanswered question but cancellation " "failed")); } } else if (blocked) { diff --git a/src/storage/storage_backend_fs.c b/src/storage/storage_backend_fs.c index 3473435..b5acd20 100644 --- a/src/storage/storage_backend_fs.c +++ b/src/storage/storage_backend_fs.c @@ -706,7 +706,7 @@ error: /** * @conn connection to report errors against * @pool storage pool to build - * @flags controls the pool formating behaviour + * @flags controls the pool formatting behaviour * * Build a directory or FS based storage pool. * diff --git a/src/uml/uml_conf.c b/src/uml/uml_conf.c index a576047..b878622 100644 --- a/src/uml/uml_conf.c +++ b/src/uml/uml_conf.c @@ -188,12 +188,12 @@ umlBuildCommandLineNet(virConnectPtr conn, } if (def->data.ethernet.ipaddr) { umlReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("IP address not supported for ethernet inteface")); + _("IP address not supported for ethernet interface")); goto error; } if (def->data.ethernet.script) { umlReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("script execution not supported for ethernet inteface")); + _("script execution not supported for ethernet interface")); goto error; } break; diff --git a/src/util/logging.c b/src/util/logging.c index f550503..8d60280 100644 --- a/src/util/logging.c +++ b/src/util/logging.c @@ -677,7 +677,7 @@ virLogVersionString(char **msg) * @fmt: the string format * @...: the arguments * - * Call the libvirt logger with some informations. Based on the configuration + * Call the libvirt logger with some information. Based on the configuration * the message may be stored, sent to output or just discarded */ void virLogMessage(const char *category, int priority, const char *funcname, diff --git a/src/vmx/vmx.c b/src/vmx/vmx.c index 9ba06e5..c250aee 100644 --- a/src/vmx/vmx.c +++ b/src/vmx/vmx.c @@ -3513,7 +3513,7 @@ virVMXFormatEthernet(virDomainNetDefPtr def, int controller, STRCASENEQ(def->model, "vmxnet3") && STRCASENEQ(def->model, "e1000")) { VMX_ERROR(VIR_ERR_INTERNAL_ERROR, - _("Expecting domain XML entry 'devices/interfase/model' " + _("Expecting domain XML entry 'devices/interface/model' " "to be 'vlance' or 'vmxnet' or 'vmxnet2' or 'vmxnet3' " "or 'e1000' but found '%s'"), def->model); return -1; diff --git a/src/xen/xend_internal.c b/src/xen/xend_internal.c index 2318565..16165fe 100644 --- a/src/xen/xend_internal.c +++ b/src/xen/xend_internal.c @@ -2217,7 +2217,7 @@ xenDaemonDomainSetVcpusFlags(virDomainPtr domain, unsigned int vcpus, flags |= VIR_DOMAIN_VCPU_MAXIMUM; if ((max = xenDaemonDomainGetVcpusFlags(domain, flags)) < 0) { virXendError(VIR_ERR_OPERATION_INVALID, "%s", - _("could not determin max vcpus for the domain")); + _("could not determine max vcpus for the domain")); return -1; } if (vcpus > max) { diff --git a/src/xen/xm_internal.c b/src/xen/xm_internal.c index a250b6f..9c376fb 100644 --- a/src/xen/xm_internal.c +++ b/src/xen/xm_internal.c @@ -728,7 +728,7 @@ xenXMDomainSetVcpusFlags(virDomainPtr domain, unsigned int vcpus, /* Hypervisor maximum. */ if ((max = xenUnifiedGetMaxVcpus(domain->conn, NULL)) < 0) { xenXMError(VIR_ERR_INTERNAL_ERROR, "%s", - _("could not determin max vcpus for the domain")); + _("could not determine max vcpus for the domain")); goto cleanup; } /* Can't specify a current larger than stored maximum; but -- 1.7.7.3

1 0

[libvirt] [PATCH] conf: Improve incorrect root element error messages
by Michal Privoznik 01 Dec '11

01 Dec '11

When user pass wrong root element, it is not 'internal error' and we can give him hint what we are expecting. --- src/conf/domain_conf.c | 12 ++++++++---- src/conf/interface_conf.c | 6 ++++-- src/conf/network_conf.c | 6 ++++-- src/conf/node_device_conf.c | 6 ++++-- src/conf/secret_conf.c | 6 ++++-- src/security/virt-aa-helper.c | 2 +- 6 files changed, 25 insertions(+), 13 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index f04e477..bb504f9 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -7932,8 +7932,10 @@ virDomainDefPtr virDomainDefParseNode(virCapsPtr caps, virDomainDefPtr def = NULL; if (!xmlStrEqual(root->name, BAD_CAST "domain")) { - virDomainReportError(VIR_ERR_INTERNAL_ERROR, - "%s", _("incorrect root element")); + virDomainReportError(VIR_ERR_XML_ERROR, + _("unexpected root element <%s>, " + "expecting <domain>"), + root->name); goto cleanup; } @@ -7963,8 +7965,10 @@ virDomainObjParseNode(virCapsPtr caps, virDomainObjPtr obj = NULL; if (!xmlStrEqual(root->name, BAD_CAST "domstatus")) { - virDomainReportError(VIR_ERR_INTERNAL_ERROR, - "%s", _("incorrect root element")); + virDomainReportError(VIR_ERR_XML_ERROR, + _("unexpected root element <%s>, " + "expecting <domstatus>"), + root->name); goto cleanup; } diff --git a/src/conf/interface_conf.c b/src/conf/interface_conf.c index fd8d1ae..59f74a1 100644 --- a/src/conf/interface_conf.c +++ b/src/conf/interface_conf.c @@ -838,8 +838,10 @@ virInterfaceDefPtr virInterfaceDefParseNode(xmlDocPtr xml, virInterfaceDefPtr def = NULL; if (!xmlStrEqual(root->name, BAD_CAST "interface")) { - virInterfaceReportError(VIR_ERR_INTERNAL_ERROR, - "%s", _("incorrect root element")); + virInterfaceReportError(VIR_ERR_XML_ERROR, + _("unexpected root element <%s>, " + "expecting <interface>"), + root->name); return NULL; } diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c index 10afcde..1058b07 100644 --- a/src/conf/network_conf.c +++ b/src/conf/network_conf.c @@ -1107,8 +1107,10 @@ virNetworkDefPtr virNetworkDefParseNode(xmlDocPtr xml, virNetworkDefPtr def = NULL; if (!xmlStrEqual(root->name, BAD_CAST "network")) { - virNetworkReportError(VIR_ERR_INTERNAL_ERROR, - "%s", _("incorrect root element")); + virNetworkReportError(VIR_ERR_XML_ERROR, + _("unexpected root element <%s>, " + "expecting <network>"), + root->name); return NULL; } diff --git a/src/conf/node_device_conf.c b/src/conf/node_device_conf.c index fc284e0..084121f 100644 --- a/src/conf/node_device_conf.c +++ b/src/conf/node_device_conf.c @@ -1204,8 +1204,10 @@ virNodeDeviceDefParseNode(xmlDocPtr xml, virNodeDeviceDefPtr def = NULL; if (!xmlStrEqual(root->name, BAD_CAST "device")) { - virNodeDeviceReportError(VIR_ERR_INTERNAL_ERROR, - "%s", _("incorrect root element")); + virNodeDeviceReportError(VIR_ERR_XML_ERROR, + _("unexpected root element <%s> " + "expecting <device>"), + root->name); return NULL; } diff --git a/src/conf/secret_conf.c b/src/conf/secret_conf.c index a51fc69..6e80733 100644 --- a/src/conf/secret_conf.c +++ b/src/conf/secret_conf.c @@ -126,8 +126,10 @@ secretXMLParseNode(xmlDocPtr xml, xmlNodePtr root) char *uuidstr = NULL; if (!xmlStrEqual(root->name, BAD_CAST "secret")) { - virSecretReportError(VIR_ERR_XML_ERROR, "%s", - _("incorrect root element")); + virSecretReportError(VIR_ERR_XML_ERROR, + _("unexpected root element <%s>, " + "expecting <secret>"), + root->name); goto cleanup; } diff --git a/src/security/virt-aa-helper.c b/src/security/virt-aa-helper.c index ad06974..14399cc 100644 --- a/src/security/virt-aa-helper.c +++ b/src/security/virt-aa-helper.c @@ -644,7 +644,7 @@ caps_mockup(vahControl * ctl, const char *xmlStr) } if (!xmlStrEqual(ctxt->node->name, BAD_CAST "domain")) { - vah_error(NULL, 0, _("incorrect root element")); + vah_error(NULL, 0, _("unexpected root element, expecting <domain>")); goto cleanup; } -- 1.7.3.4

3 5

[libvirt] [PATCH 0/2] gnulib update
by Eric Blake 01 Dec '11

01 Dec '11

The latest gnulib update accidentally reintroduced -Wformat-nonliteral (by virtue of adding -Wformat=2, understood only by newer gcc), I almost got sucked into the rathole of fixing all our problems before I realized the real issue, but by then, I had already written patch 1. I'd like to get this in before the freeze, and then (hopefully) not touch .gnulib until after the release (we've been burned too many times by a .gnulib update after rc1). Eric Blake (2): error: drop old-style error reporting build: import latest gnulib, for mingw and syntax-check fixes .gnulib | 2 +- gnulib/local/lib/openpty.c.diff | 26 ------ gnulib/local/lib/pty.in.h.diff | 13 --- m4/virt-compile-warnings.m4 | 8 ++- src/fdstream.c | 2 +- src/libvirt_private.syms | 1 - src/qemu/qemu_monitor.c | 2 +- src/qemu/qemu_monitor_json.c | 2 +- src/util/conf.c | 22 ++--- src/util/virterror.c | 2 +- src/util/virterror_internal.h | 8 -- src/xen/xen_hypervisor.c | 170 ++++++++++++++++----------------------- src/xenapi/xenapi_utils.c | 2 +- tests/testutils.c | 4 +- tools/virsh.c | 12 ++-- 15 files changed, 98 insertions(+), 178 deletions(-) delete mode 100644 gnulib/local/lib/openpty.c.diff delete mode 100644 gnulib/local/lib/pty.in.h.diff -- 1.7.7.3

1 5

[libvirt] [PATCH] Avoid crash in shunloadtest
by Daniel P. Berrange 01 Dec '11

01 Dec '11

From: "Daniel P. Berrange" <berrange(a)redhat.com> For unknown reasons, the shunloadtest will crash on Fedora 16 inside dlopen() (gdb) bt #0 0x00000000000050e6 in ?? () #1 0x00007ff61a77b9d5 in floor () from /lib64/libm.so.6 #2 0x00007ff61e522963 in _dl_relocate_object () from /lib64/ld-linux-x86-64.so.2 #3 0x00007ff61e5297e6 in dl_open_worker () from /lib64/ld-linux-x86-64.so.2 #4 0x00007ff61e525006 in _dl_catch_error () from /lib64/ld-linux-x86-64.so.2 #5 0x00007ff61e52917a in _dl_open () from /lib64/ld-linux-x86-64.so.2 #6 0x00007ff61e0f6f26 in dlopen_doit () from /lib64/libdl.so.2 #7 0x00007ff61e525006 in _dl_catch_error () from /lib64/ld-linux-x86-64.so.2 #8 0x00007ff61e0f752f in _dlerror_run () from /lib64/libdl.so.2 #9 0x00007ff61e0f6fc1 in dlopen@@GLIBC_2.2.5 () from /lib64/libdl.so.2 #10 0x0000000000400a15 in main (argc=<optimized out>, argv=<optimized out>) at shunloadtest.c:105 Changing from RTLD_NOW to RTLD_LAZY avoids this problem, but quite possibly does not fix the root cause. * shunloadtest.c: s/NOW/LAZY/ --- tests/shunloadtest.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tests/shunloadtest.c b/tests/shunloadtest.c index 2cdb8b8..ab6e56f 100644 --- a/tests/shunloadtest.c +++ b/tests/shunloadtest.c @@ -102,7 +102,7 @@ int main(int argc ATTRIBUTE_UNUSED, char **argv) fprintf(stderr, " .%*s 1 ", 39, ""); signal(SIGSEGV, sigHandler); - if (!(lib = dlopen("./.libs/libshunload.so", RTLD_NOW))) { + if (!(lib = dlopen("./.libs/libshunload.so", RTLD_LAZY))) { fprintf(stderr, "Cannot load ./.libs/libshunload.so %s\n", dlerror()); return 1; } -- 1.7.7.3

2 3

[libvirt] [PATCH] build: properly skip tests
by Eric Blake 01 Dec '11

01 Dec '11

I got this failure on FreeBSD: shunloadtest.c: In function 'main': shunloadtest.c:150: error: 'EXIT_AM_SKIP' undeclared (first use in this function) but inspection showed several other problems, all fixed here. * tests/domainsnapshotxml2xmltest.c [!WITH_QEMU]: Ensure EXIT_AM_SKIP is defined. * tests/esxutilstest.c [!WITH_ESX]: Likewise. * tests/openvzutilstest.c [!WITH_OPENVZ]: Likewise. * tests/qemuargv2xmltest.c [!WITH_QEMU]: Likewise. * tests/qemuhelptest.c [!WITH_QEMU]: Likewise. * tests/qemuxml2argvtest.c [!WITH_QEMU]: Likewise. * tests/qemuxml2xmltest.c [!WITH_QEMU]: Likewise. * tests/qemuxmlnstest.c [!WITH_QEMU]: Likewise. * tests/shunloadtest.c [!linux]: Likewise. * tests/vmx2xmltest.c [!WITH_VMX]: Likewise. * tests/xml2vmxtest.c [!WITH_VMX]: Likewise. --- Pushing under the build-breaker rule. tests/domainsnapshotxml2xmltest.c | 1 + tests/esxutilstest.c | 1 + tests/openvzutilstest.c | 1 + tests/qemuargv2xmltest.c | 1 + tests/qemuhelptest.c | 1 + tests/qemuxml2argvtest.c | 1 + tests/qemuxml2xmltest.c | 1 + tests/qemuxmlnstest.c | 1 + tests/shunloadtest.c | 1 + tests/vmx2xmltest.c | 1 + tests/xml2vmxtest.c | 1 + 11 files changed, 11 insertions(+), 0 deletions(-) diff --git a/tests/domainsnapshotxml2xmltest.c b/tests/domainsnapshotxml2xmltest.c index c2266f4..90ff9bb 100644 --- a/tests/domainsnapshotxml2xmltest.c +++ b/tests/domainsnapshotxml2xmltest.c @@ -118,6 +118,7 @@ mymain(void) VIRT_TEST_MAIN(mymain) #else +# include "testutils.h" int main(void) diff --git a/tests/esxutilstest.c b/tests/esxutilstest.c index 8241ecd..201b930 100644 --- a/tests/esxutilstest.c +++ b/tests/esxutilstest.c @@ -279,6 +279,7 @@ mymain(void) VIRT_TEST_MAIN(mymain) #else +# include "testutils.h" int main(void) { diff --git a/tests/openvzutilstest.c b/tests/openvzutilstest.c index f04ddbb..7f5ddc9 100644 --- a/tests/openvzutilstest.c +++ b/tests/openvzutilstest.c @@ -160,6 +160,7 @@ mymain(void) VIRT_TEST_MAIN(mymain) #else +# include "testutils.h" int main(void) { diff --git a/tests/qemuargv2xmltest.c b/tests/qemuargv2xmltest.c index a20df06..cb3cafd 100644 --- a/tests/qemuargv2xmltest.c +++ b/tests/qemuargv2xmltest.c @@ -243,6 +243,7 @@ mymain(void) VIRT_TEST_MAIN(mymain) #else +# include "testutils.h" int main(void) diff --git a/tests/qemuhelptest.c b/tests/qemuhelptest.c index df677cc..cc9f1ad 100644 --- a/tests/qemuhelptest.c +++ b/tests/qemuhelptest.c @@ -578,6 +578,7 @@ mymain(void) VIRT_TEST_MAIN(mymain) #else +# include "testutils.h" int main(void) { diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index e75d55e..228d052 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -669,6 +669,7 @@ mymain(void) VIRT_TEST_MAIN(mymain) #else +# include "testutils.h" int main(void) { diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index 623e72c..35bfdce 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -211,6 +211,7 @@ mymain(void) VIRT_TEST_MAIN(mymain) #else +# include "testutils.h" int main(void) diff --git a/tests/qemuxmlnstest.c b/tests/qemuxmlnstest.c index ee3ad1b..86cf974 100644 --- a/tests/qemuxmlnstest.c +++ b/tests/qemuxmlnstest.c @@ -284,6 +284,7 @@ mymain(void) VIRT_TEST_MAIN(mymain) #else +# include "testutils.h" int main(void) { diff --git a/tests/shunloadtest.c b/tests/shunloadtest.c index ab6e56f..8113ef3 100644 --- a/tests/shunloadtest.c +++ b/tests/shunloadtest.c @@ -144,6 +144,7 @@ int main(int argc ATTRIBUTE_UNUSED, char **argv) } #else +# include "testutils.h" int main(void) { diff --git a/tests/vmx2xmltest.c b/tests/vmx2xmltest.c index 5c0018a..3c566f8 100644 --- a/tests/vmx2xmltest.c +++ b/tests/vmx2xmltest.c @@ -289,6 +289,7 @@ mymain(void) VIRT_TEST_MAIN(mymain) #else +# include "testutils.h" int main(void) { diff --git a/tests/xml2vmxtest.c b/tests/xml2vmxtest.c index 5530b45..f4e4ed6 100644 --- a/tests/xml2vmxtest.c +++ b/tests/xml2vmxtest.c @@ -301,6 +301,7 @@ mymain(void) VIRT_TEST_MAIN(mymain) #else +# include "testutils.h" int main(void) { -- 1.7.7.3

1 0

[libvirt] [PATCH] build: fix 'make dist' without dtrace
by Eric Blake 01 Dec '11

01 Dec '11

probes.h can only be generated on Linux, and then only with dtrace installed. If it is part of the tarball, then either 'make dist' will fail if you don't have that setup, or we would have to start keeping probes.h in libvirt.git. Since we only need it to be generated when dtrace is in use, it's better to avoid shipping it in the first place, and avoid tracking it in git. Meanwhile, there is a build dependency - since the RPC code is generated, it can be built early; but when dtrace is enabled, we must ensure probes.h is built even earlier. Commit 1afcfbdd tried to fix this, but did so in a way that added probes.h into the tarball, and broke VPATH as well. Commit ecbca767 fixed VPATH, but didn't fix the more fundamental problem. This patch solves the issue by adding a dependency instead. Tested with 'make dist' in a clean VPATH builds, for both './configure --without-dtrace' and './configure --with-dtrace'; all configurations were able to correctly build a tarball, and the dtrace configuration no longer sticks probes.h in the tarball. * src/Makefile.am (REMOTE_DRIVER_GENERATED): Don't ship probes.h; rather, make it a dependency. --- Pushing under the build-breaker rule, since I reproduced a failure with './configure --without-dtrace && make dist' without this patch. src/Makefile.am | 9 +++------ 1 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 4c98397..93bf54c 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -202,11 +202,6 @@ REMOTE_DRIVER_GENERATED = \ $(srcdir)/remote/qemu_protocol.h \ $(srcdir)/remote/qemu_client_bodies.h -# The remote RPC driver needs probes.h -if WITH_DTRACE -REMOTE_DRIVER_GENERATED += probes.h -endif - REMOTE_PROTOCOL = $(srcdir)/remote/remote_protocol.x QEMU_PROTOCOL = $(srcdir)/remote/qemu_protocol.x REMOTE_DRIVER_PROTOCOL = $(REMOTE_PROTOCOL) $(QEMU_PROTOCOL) @@ -646,7 +641,6 @@ libvirt_driver_remote_la_LDFLAGS += -module -avoid-version endif libvirt_driver_remote_la_SOURCES = $(REMOTE_DRIVER_SOURCES) - $(srcdir)/remote/remote_driver.c: $(REMOTE_DRIVER_GENERATED) endif WITH_REMOTE @@ -1283,6 +1277,9 @@ if WITH_DTRACE libvirt_la_BUILT_LIBADD += probes.o libvirt_la_DEPENDENCIES += probes.o nodist_libvirt_la_SOURCES = probes.h +if WITH_REMOTE +$(REMOTE_DRIVER_GENERATED): probes.h +endif WITH_REMOTE BUILT_SOURCES += probes.h libvirt_probes.stp libvirt_functions.stp -- 1.7.7.3

2 1

[libvirt] [PATCH] Don't use undocumented __isleap macro
by Daniel P. Berrange 01 Dec '11

01 Dec '11

From: "Daniel P. Berrange" <berrange(a)redhat.com> Pushing under build-breaker (mingw32) rule The glibc time.h header has an undocumented __isleap macro that we are using. Since it is undocumented & does not appear on any other OS, stop using it and just define the macro in libvirt code instead. * src/util/virtime.c: Remove __isleap usage --- src/util/virtime.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/util/virtime.c b/src/util/virtime.c index 25c2317..92b6cdd 100644 --- a/src/util/virtime.c +++ b/src/util/virtime.c @@ -113,6 +113,9 @@ const unsigned short int __mon_yday[2][13] = { { 0, 31, 60, 91, 121, 152, 182, 213, 244, 274, 305, 335, 366 } }; +#define is_leap_year(y) \ + ((y) % 4 == 0 && ((y) % 100 != 0 || (y) % 400 == 0)) + /** * virTimeFieldsThenRaw: * @when: the time to convert in milliseconds @@ -152,7 +155,7 @@ int virTimeFieldsThenRaw(unsigned long long when, struct tm *fields) fields->tm_wday += 7; y = 1970; - while (days < 0 || days >= (__isleap (y) ? 366 : 365)) { + while (days < 0 || days >= (is_leap_year(y) ? 366 : 365)) { /* Guess a corrected year, assuming 365 days per year. */ long int yg = y + days / 365 - (days % 365 < 0); @@ -165,7 +168,7 @@ int virTimeFieldsThenRaw(unsigned long long when, struct tm *fields) fields->tm_year = y - 1900; fields->tm_yday = days; - ip = __mon_yday[__isleap(y)]; + ip = __mon_yday[is_leap_year(y)]; for (y = 11; days < (long int) ip[y]; --y) continue; days -= ip[y]; -- 1.7.6.4

2 1

[libvirt] [PATCH libvirt-glib 00/15] More misc improvements
by Daniel P. Berrange 01 Dec '11

01 Dec '11

This series has three functional improvements - Support for <console> - Support for <memballoon> - Support containers The rest of it is a series of code style cleanups. Finally it adds the 'make syntax-check' capability from gnulib to keep code style clean hereafter

2 33

[libvirt] [PATCH] Fix a logic error for setting block I/O
by Lei Li 01 Dec '11

01 Dec '11

Fix a logic error, the initial value of ret = -1, if just set --config, it will goto endjob directly without doing its really job here. Signed-off-by: Lei Li <lilei(a)linux.vnet.ibm.com> --- src/qemu/qemu_driver.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index ed90c66..8ea6f48 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -11234,8 +11234,6 @@ qemuDomainSetBlockIoTune(virDomainPtr dom, ret = qemuMonitorSetBlockIoThrottle(priv->mon, device, &info); qemuDomainObjExitMonitorWithDriver(driver, vm); } - if (ret < 0) - goto endjob; if (flags & VIR_DOMAIN_AFFECT_CONFIG) { sa_assert(persistentDef && idx >= 0); -- 1.7.1

2 1

[libvirt] libvirt-php 0.4.5 and php 5.4
by Remi Collet 01 Dec '11

01 Dec '11

Hi, I'm working on updating PHP to 5.4.0 (probably a fedora 17 feature). libvirt 0.4.5 doesn't build because function_entry have been removed See http://news.php.net/php.pecl.dev/7123 Fix is trivial : s/function_entry/zend_function_entry/ Attcached patch solves this issue and also fixes a lot of compiler warning (unused variable, unset, ...) There is still a lot of warning... (most are trivial to fix) I Hope this helps. Remi. P.S. Here is the full log (with -Wall) Making all in src make[3]: Entering directory `/dev/shm/libvirt-php-0.4.5/src' gcc -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector --param=ssp-buffer-size=4 -m64 -mtune=generic -fpic -DCOMPILE_DL_LIBVIRT=1 -I/usr/include/php -I/usr/include/php/main -I/usr/include/php/TSRM -I/usr/include/php/Zend -I/usr/include/php/ext -I/usr/include/php/ext/date/lib -c -o libvirt-php.o libvirt-php.c -I/usr/include/libxml2 -DHAVE_CONFIG_H rm -f *.o libvirt-php.c: In function 'zif_libvirt_domain_send_keys': libvirt-php.c:3002:2: warning: pointer targets in passing argument 3 of 'vnc_send_keys' differ in signedness [-Wpointer-sign] libvirt-php.h:200:5: note: expected 'unsigned char *' but argument is of type 'char *' libvirt-php.c: In function 'zif_libvirt_image_create': libvirt-php.c:1674:8: warning: ignoring return value of 'system', declared with attribute warn_unused_result [-Wunused-result] gcc -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector --param=ssp-buffer-size=4 -m64 -mtune=generic -fpic -DCOMPILE_DL_LIBVIRT=1 -c -o vncfunc.o vncfunc.c -I/usr/include/php -I/usr/include/php/main -I/usr/include/php/TSRM -I/usr/include/php/Zend -I/usr/include/php/ext -I/usr/include/php/ext/date/lib -I/usr/include/libxml2 -DHAVE_CONFIG_H vncfunc.c: In function 'vnc_parse_fb_params': vncfunc.c:178:2: warning: pointer targets in passing argument 1 of 'strlen' differ in signedness [-Wpointer-sign] /usr/include/string.h:399:15: note: expected 'const char *' but argument is of type 'unsigned char *' vncfunc.c:178:2: warning: pointer targets in passing argument 1 of '__strdup' differ in signedness [-Wpointer-sign] /usr/include/bits/string2.h:1303:14: note: expected 'const char *' but argument is of type 'unsigned char *' vncfunc.c:178:21: warning: pointer targets in assignment differ in signedness [-Wpointer-sign] vncfunc.c:141:17: warning: unused variable 'name' [-Wunused-variable] vncfunc.c:139:6: warning: unused variable 'i' [-Wunused-variable] vncfunc.c: In function 'vnc_send_key': vncfunc.c:205:6: warning: unused variable 'i' [-Wunused-variable] vncfunc.c: In function 'vnc_connect': vncfunc.c:438:2: warning: implicit declaration of function 'connect_socket' [-Wimplicit-function-declaration] vncfunc.c: In function 'vnc_get_dimensions': vncfunc.c:511:2: warning: pointer targets in passing argument 1 of 'vnc_parse_fb_params' differ in signedness [-Wpointer-sign] vncfunc.c:137:17: note: expected 'unsigned char *' but argument is of type 'char *' vncfunc.c:525:2: warning: implicit declaration of function 'socket_has_data' [-Wimplicit-function-declaration] vncfunc.c:526:3: warning: implicit declaration of function 'socket_read' [-Wimplicit-function-declaration] vncfunc.c:484:20: warning: unused variable 'err' [-Wunused-variable] vncfunc.c:484:9: warning: unused variable 'skip_next' [-Wunused-variable] vncfunc.c:484:6: warning: unused variable 'i' [-Wunused-variable] vncfunc.c: In function 'vnc_send_keys': vncfunc.c:569:2: warning: pointer targets in passing argument 1 of 'vnc_parse_fb_params' differ in signedness [-Wpointer-sign] vncfunc.c:137:17: note: expected 'unsigned char *' but argument is of type 'char *' vncfunc.c:572:2: warning: pointer targets in passing argument 1 of 'strlen' differ in signedness [-Wpointer-sign] /usr/include/string.h:399:15: note: expected 'const char *' but argument is of type 'unsigned char *' vncfunc.c:572:2: warning: format '%d' expects argument of type 'int', but argument 5 has type 'size_t' [-Wformat] vncfunc.c:573:2: warning: pointer targets in passing argument 1 of 'strlen' differ in signedness [-Wpointer-sign] /usr/include/string.h:399:15: note: expected 'const char *' but argument is of type 'unsigned char *' vncfunc.c:580:3: warning: pointer targets in passing argument 1 of 'strlen' differ in signedness [-Wpointer-sign] /usr/include/string.h:399:15: note: expected 'const char *' but argument is of type 'unsigned char *' vncfunc.c:600:2: warning: pointer targets in passing argument 1 of 'strlen' differ in signedness [-Wpointer-sign] /usr/include/string.h:399:15: note: expected 'const char *' but argument is of type 'unsigned char *' vncfunc.c:600:2: warning: format '%d' expects argument of type 'int', but argument 4 has type 'size_t' [-Wformat] vncfunc.c:547:20: warning: unused variable 'err' [-Wunused-variable] vncfunc.c: In function 'vnc_send_pointer_event': vncfunc.c:627:16: warning: unused variable 'end' [-Wunused-variable] vncfunc.c:625:26: warning: unused variable 'err' [-Wunused-variable] vncfunc.c:625:22: warning: unused variable 'ok' [-Wunused-variable] vncfunc.c:625:19: warning: unused variable 'i' [-Wunused-variable] vncfunc.c:625:11: warning: unused variable 'j' [-Wunused-variable] vncfunc.c: In function 'vnc_refresh_screen': vncfunc.c:697:20: warning: unused variable 'err' [-Wunused-variable] vncfunc.c:697:9: warning: unused variable 'skip_next' [-Wunused-variable] vncfunc.c:697:6: warning: unused variable 'i' [-Wunused-variable] In file included from /usr/include/string.h:642:0, from /usr/include/php/main/../main/php_config.h:2440, from /usr/include/php/Zend/zend_config.h:1, from /usr/include/php/Zend/zend.h:51, from /usr/include/php/main/php.h:34, from libvirt-php.h:44, from vncfunc.c:10: In function 'memset', inlined from 'vnc_send_client_pointer' at vncfunc.c:252:8: /usr/include/bits/string3.h:85:3: warning: call to __builtin___memset_chk will always overflow destination buffer [enabled by default] gcc -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector --param=ssp-buffer-size=4 -m64 -mtune=generic -fpic -DCOMPILE_DL_LIBVIRT=1 -c -o sockets.o sockets.c -I/usr/include/php -I/usr/include/php/main -I/usr/include/php/TSRM -I/usr/include/php/Zend -I/usr/include/php/ext -I/usr/include/php/ext/date/lib -I/usr/include/libxml2 -DHAVE_CONFIG_H sockets.c: In function 'socket_has_data': sockets.c:118:10: warning: unused variable 'result' [-Wunused-variable] sockets.c: In function 'socket_read': sockets.c:177:7: warning: ignoring return value of 'read', declared with attribute warn_unused_result [-Wunused-result] gcc -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector --param=ssp-buffer-size=4 -m64 -mtune=generic -shared -lvirt -rdynamic -o libvirt-php.so vncfunc.o sockets.o libvirt-php.o -ldl -lvirt -lxml2 echo "Extension compiled as libvirt-php.so" Extension compiled as libvirt-php.so

2 2

[libvirt] [PATCH libvirt-glib v2 0/8] More APIs in libvirt-gconfig
by Daniel P. Berrange 01 Dec '11

01 Dec '11

An update to: https://www.redhat.com/archives/libvir-list/2011-November/msg01812.html New in v2: - All Christophe's comments included - Cleanup include headers - Fix file descriptions

2 10

[libvirt] [libvirt-glib 1/2] Wrap storage pool info API
by Zeeshan Ali (Khattak) 01 Dec '11

01 Dec '11

From: "Zeeshan Ali (Khattak)" <zeeshanak(a)gnome.org> --- libvirt-gobject/libvirt-gobject-storage-pool.c | 44 ++++++++++++++++++++++++ libvirt-gobject/libvirt-gobject-storage-pool.h | 21 +++++++++++ libvirt-gobject/libvirt-gobject.sym | 2 + 3 files changed, 67 insertions(+), 0 deletions(-) diff --git a/libvirt-gobject/libvirt-gobject-storage-pool.c b/libvirt-gobject/libvirt-gobject-storage-pool.c index da8ada5..3c30a3d 100644 --- a/libvirt-gobject/libvirt-gobject-storage-pool.c +++ b/libvirt-gobject/libvirt-gobject-storage-pool.c @@ -189,6 +189,21 @@ gvir_storage_pool_handle_free(GVirStoragePoolHandle *src) G_DEFINE_BOXED_TYPE(GVirStoragePoolHandle, gvir_storage_pool_handle, gvir_storage_pool_handle_copy, gvir_storage_pool_handle_free) +static GVirStoragePoolInfo * +gvir_storage_pool_info_copy(GVirStoragePoolInfo *info) +{ + return g_slice_dup(GVirStoragePoolInfo, info); +} + +static void +gvir_storage_pool_info_free(GVirStoragePoolInfo *info) +{ + g_slice_free(GVirStoragePoolInfo, info); +} + +G_DEFINE_BOXED_TYPE(GVirStoragePoolInfo, gvir_storage_pool_info, + gvir_storage_pool_info_copy, gvir_storage_pool_info_free) + const gchar *gvir_storage_pool_get_name(GVirStoragePool *pool) { GVirStoragePoolPrivate *priv = pool->priv; @@ -237,6 +252,35 @@ GVirConfigStoragePool *gvir_storage_pool_get_config(GVirStoragePool *pool, return conf; } +/** + * gvir_storage_pool_get_info: + * @pool: the storage_pool + * Returns: (transfer full): the info + */ +GVirStoragePoolInfo *gvir_storage_pool_get_info(GVirStoragePool *pool, + GError **err) +{ + GVirStoragePoolPrivate *priv = pool->priv; + virStoragePoolInfo info; + GVirStoragePoolInfo *ret; + + if (virStoragePoolGetInfo(priv->handle, &info) < 0) { + if (err) + *err = gvir_error_new_literal(GVIR_STORAGE_POOL_ERROR, + 0, + "Unable to get storage pool info"); + return NULL; + } + + ret = g_slice_new(GVirStoragePoolInfo); + ret->state = info.state; + ret->capacity = info.capacity; + ret->allocation = info.allocation; + ret->available = info.available; + + return ret; +} + typedef gint (* CountFunction) (virStoragePoolPtr vpool); typedef gint (* ListFunction) (virStoragePoolPtr vpool, gchar **lst, gint max); diff --git a/libvirt-gobject/libvirt-gobject-storage-pool.h b/libvirt-gobject/libvirt-gobject-storage-pool.h index d95bb19..436238b 100644 --- a/libvirt-gobject/libvirt-gobject-storage-pool.h +++ b/libvirt-gobject/libvirt-gobject-storage-pool.h @@ -36,6 +36,7 @@ G_BEGIN_DECLS #define GVIR_IS_STORAGE_POOL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GVIR_TYPE_STORAGE_POOL)) #define GVIR_STORAGE_POOL_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GVIR_TYPE_STORAGE_POOL, GVirStoragePoolClass)) +#define GVIR_TYPE_STORAGE_POOL_INFO (gvir_storage_pool_info_get_type()) #define GVIR_TYPE_STORAGE_POOL_HANDLE (gvir_storage_pool_handle_get_type()) typedef struct _GVirStoragePool GVirStoragePool; @@ -58,8 +59,25 @@ struct _GVirStoragePoolClass gpointer padding[20]; }; +typedef enum { + GVIR_STORAGE_POOL_STATE_INACTIVE = 0, /* Not running */ + GVIR_STORAGE_POOL_STATE_BUILDING = 1, /* Initializing pool, not available */ + GVIR_STORAGE_POOL_STATE_RUNNING = 2, /* Running normally */ + GVIR_STORAGE_POOL_STATE_DEGRADED = 3, /* Running degraded */ + GVIR_STORAGE_POOL_STATE_INACCESSIBLE = 4, /* Running, but not accessible */ +} GVirStoragePoolState; + +typedef struct _GVirStoragePoolInfo GVirStoragePoolInfo; +struct _GVirStoragePoolInfo +{ + GVirStoragePoolState state; /* the state */ + guint64 capacity; /* Logical size bytes */ + guint64 allocation; /* Current allocation bytes */ + guint16 available; /* Remaining free space bytes */ +}; GType gvir_storage_pool_get_type(void); +GType gvir_storage_pool_info_get_type(void); GType gvir_storage_pool_handle_get_type(void); const gchar *gvir_storage_pool_get_name(GVirStoragePool *pool); @@ -69,6 +87,9 @@ GVirConfigStoragePool *gvir_storage_pool_get_config(GVirStoragePool *pool, guint flags, GError **err); +GVirStoragePoolInfo *gvir_storage_pool_get_info(GVirStoragePool *pool, + GError **err); + gboolean gvir_storage_pool_refresh(GVirStoragePool *pool, GCancellable *cancellable, GError **err); diff --git a/libvirt-gobject/libvirt-gobject.sym b/libvirt-gobject/libvirt-gobject.sym index 61a3a31..55c515b 100644 --- a/libvirt-gobject/libvirt-gobject.sym +++ b/libvirt-gobject/libvirt-gobject.sym @@ -91,10 +91,12 @@ LIBVIRT_GOBJECT_0.0.1 { gvir_secret_get_config; gvir_storage_pool_get_type; + gvir_storage_pool_info_get_type; gvir_storage_pool_handle_get_type; gvir_storage_pool_get_name; gvir_storage_pool_get_uuid; gvir_storage_pool_get_config; + gvir_storage_pool_get_info; gvir_storage_pool_refresh; gvir_storage_pool_refresh_async; gvir_storage_pool_refresh_finish; -- 1.7.7.3

3 4

[libvirt] [PATCH libvirt-glib 0/5] More APIs in libvirt-gconfig
by Daniel P. Berrange 01 Dec '11

01 Dec '11

This adds support for - <filesystem> - <display/> type=vnc|sdl - <os> kernel, ramdisk, cmdline & init child elements - Top level virt type - Fixed a bug with NULL URIs in GVirConnection

2 14

[libvirt] [PATCH] virsh: Allow other escape characters for console
by Michal Privoznik 01 Dec '11

01 Dec '11

Currently virsh supports only ^] as escape character for console. However, some users might want to use something else. This patch creates such ability by specifying '-e' switch on virsh command line. --- Okay, this patch is meant as RFC mainly but if it got enough ACKs I will not hesitate to push it. My biggest concern is the way of telling virsh customized sequence. I am not big fan of new switch, however we lack virsh.conf in $conf_dir. Maybe it is the right time for creating it. Another approach is to pass the sequence as parameter directly to 'console' command. What's your opinion? tools/console.c | 28 +++++++++++++++++++++++----- tools/console.h | 4 +++- tools/virsh.c | 20 ++++++++++++++++---- tools/virsh.pod | 5 +++++ 4 files changed, 47 insertions(+), 10 deletions(-) diff --git a/tools/console.c b/tools/console.c index 0f85bc7..db2e17e 100644 --- a/tools/console.c +++ b/tools/console.c @@ -43,9 +43,13 @@ # include "memory.h" # include "virterror_internal.h" - -/* ie Ctrl-] as per telnet */ -# define CTRL_CLOSE_BRACKET '\35' +/* + * Convert given character to control character. + * Basically, we take lower 5 bits unless given + * character is DEL (represented by '?'). Then + * we return 127 + */ +# define CONTROL(c) ((c) == '?' ? ((c) | 0x40) : ((c) & 0x1f)) # define VIR_FROM_THIS VIR_FROM_NONE @@ -66,6 +70,8 @@ struct virConsole { struct virConsoleBuffer streamToTerminal; struct virConsoleBuffer terminalToStream; + + char escapeChar; }; static int got_signal = 0; @@ -215,7 +221,7 @@ virConsoleEventOnStdin(int watch ATTRIBUTE_UNUSED, virConsoleShutdown(con); return; } - if (con->terminalToStream.data[con->terminalToStream.offset] == CTRL_CLOSE_BRACKET) { + if (con->terminalToStream.data[con->terminalToStream.offset] == con->escapeChar) { virConsoleShutdown(con); return; } @@ -278,7 +284,18 @@ virConsoleEventOnStdout(int watch ATTRIBUTE_UNUSED, } -int vshRunConsole(virDomainPtr dom, const char *dev_name) +static char +vshGetEscapeChar(const char *s) +{ + if (*s == '^') + return CONTROL(s[1]); + + return *s; +} + +int vshRunConsole(virDomainPtr dom, + const char *dev_name, + const char *escape_seq) { int ret = -1; struct termios ttyattr, rawattr; @@ -326,6 +343,7 @@ int vshRunConsole(virDomainPtr dom, const char *dev_name) goto cleanup; } + con->escapeChar = vshGetEscapeChar(escape_seq); con->st = virStreamNew(virDomainGetConnect(dom), VIR_STREAM_NONBLOCK); if (!con->st) diff --git a/tools/console.h b/tools/console.h index 9b05ff1..8cca08f 100644 --- a/tools/console.h +++ b/tools/console.h @@ -25,7 +25,9 @@ # ifndef WIN32 -int vshRunConsole(virDomainPtr dom, const char *dev_name); +int vshRunConsole(virDomainPtr dom, + const char *dev_name, + const char *escape_seq); # endif /* !WIN32 */ diff --git a/tools/virsh.c b/tools/virsh.c index 89fb4e7..1b84980 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -75,6 +75,9 @@ static char *progname; ((((int) ((T)->tv_sec - (U)->tv_sec)) * 1000000.0 + \ ((int) ((T)->tv_usec - (U)->tv_usec))) / 1000.0) +/* Default escape char Ctrl-] as per telnet */ +#define CTRL_CLOSE_BRACKET "^]" + /** * The log configuration */ @@ -249,6 +252,7 @@ typedef struct __vshControl { virDomainGetState is not supported */ bool useSnapshotOld; /* cannot use virDomainSnapshotGetParent or virDomainSnapshotNumChildren */ + const char *escapeChar; /* Escape character for domain console */ } __vshControl; typedef struct vshCmdGrp { @@ -796,8 +800,8 @@ cmdRunConsole(vshControl *ctl, virDomainPtr dom, const char *name) } vshPrintExtra(ctl, _("Connected to domain %s\n"), virDomainGetName(dom)); - vshPrintExtra(ctl, "%s", _("Escape character is ^]\n")); - if (vshRunConsole(dom, name) == 0) + vshPrintExtra(ctl, _("Escape character is %s\n"), ctl->escapeChar); + if (vshRunConsole(dom, name, ctl->escapeChar) == 0) ret = true; cleanup: @@ -16817,6 +16821,7 @@ vshDeinit(vshControl *ctl) vshReadlineDeinit(ctl); vshCloseLogFile(ctl); VIR_FREE(ctl->name); + VIR_FREE(ctl->escapeChar); if (ctl->conn) { int ret; if ((ret = virConnectClose(ctl->conn)) != 0) { @@ -16848,7 +16853,8 @@ vshUsage(void) " -t | --timing print timing information\n" " -l | --log <file> output logging to file\n" " -v | --version[=short] program version\n" - " -V | --version=long version and full options\n\n" + " -V | --version=long version and full options\n" + " -e | --escape <char> set escape sequence for console\n\n" " commands (non interactive mode):\n\n"), progname, progname); for (grp = cmdGroups; grp->name; grp++) { @@ -17009,13 +17015,14 @@ vshParseArgv(vshControl *ctl, int argc, char **argv) {"connect", required_argument, NULL, 'c'}, {"readonly", no_argument, NULL, 'r'}, {"log", required_argument, NULL, 'l'}, + {"escape", required_argument, NULL, 'e'}, {NULL, 0, NULL, 0} }; /* Standard (non-command) options. The leading + ensures that no * argument reordering takes place, so that command options are * not confused with top-level virsh options. */ - while ((arg = getopt_long(argc, argv, "+d:hqtc:vVrl:", opt, NULL)) != -1) { + while ((arg = getopt_long(argc, argv, "+d:hqtc:vVrl:e:", opt, NULL)) != -1) { switch (arg) { case 'd': if (virStrToLong_i(optarg, NULL, 10, &ctl->debug) < 0) { @@ -17050,6 +17057,9 @@ vshParseArgv(vshControl *ctl, int argc, char **argv) case 'l': ctl->logfile = vshStrdup(ctl, optarg); break; + case 'e': + ctl->escapeChar = vshStrdup(ctl, optarg); + break; default: vshError(ctl, _("unsupported option '-%c'. See --help."), arg); exit(EXIT_FAILURE); @@ -17091,6 +17101,8 @@ main(int argc, char **argv) ctl->imode = true; /* default is interactive mode */ ctl->log_fd = -1; /* Initialize log file descriptor */ ctl->debug = VSH_DEBUG_DEFAULT; + ctl->escapeChar = vshStrdup(ctl, CTRL_CLOSE_BRACKET); + if (!setlocale(LC_ALL, "")) { perror("setlocale"); diff --git a/tools/virsh.pod b/tools/virsh.pod index db872dd..08b761d 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -92,6 +92,11 @@ option of the B<connect> command. Output elapsed time information for each command. +=item B<-e>, B<--escape> I<string> + +Set alternative escape sequence for I<console> command. By default, +telnet's ^] is used. + =back =head1 NOTES -- 1.7.3.4

2 5

[libvirt] [PATCH] bridge_driver: Don't define network if XML contains more IPv4 adreses.
by Peter Krempa 01 Dec '11

01 Dec '11

Only one IPv4 DHCP definition is supported. Originaly the code checked for a multiple definition and returned an error, but the new domain definition was already added to networks. This patch moves the check before the newly defined network is added to active networks. *src/network/bridge_driver.c: networkDefine(): - move multiple IPv4 adresses check before definition is used. --- src/network/bridge_driver.c | 29 +++++++++++++++-------------- 1 files changed, 15 insertions(+), 14 deletions(-) diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index c49c25b..0c1563a 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -2261,70 +2261,71 @@ static virNetworkPtr networkDefine(virConnectPtr conn, const char *xml) { if (!(def = virNetworkDefParseString(xml))) goto cleanup; if (virNetworkObjIsDuplicate(&driver->networks, def, 0) < 0) goto cleanup; /* Only the three L3 network types that are configured by libvirt * need to have a bridge device name / mac address provided */ if (def->forwardType == VIR_NETWORK_FORWARD_NONE || def->forwardType == VIR_NETWORK_FORWARD_NAT || def->forwardType == VIR_NETWORK_FORWARD_ROUTE) { if (virNetworkSetBridgeName(&driver->networks, def, 1)) goto cleanup; virNetworkSetBridgeMacAddr(def); } - if (!(network = virNetworkAssignDef(&driver->networks, - def))) - goto cleanup; - freeDef = false; - - network->persistent = 1; - - if (virNetworkSaveConfig(driver->networkConfigDir, def) < 0) { - virNetworkRemoveInactive(&driver->networks, network); - network = NULL; - goto cleanup; - } - /* We only support dhcp on one IPv4 address per defined network */ for (ii = 0; (ipdef = virNetworkDefGetIpByIndex(def, AF_UNSPEC, ii)); ii++) { if (VIR_SOCKET_ADDR_IS_FAMILY(&ipdef->address, AF_INET)) { if (ipdef->nranges || ipdef->nhosts) { if (ipv4def) { networkReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("Multiple dhcp sections found. dhcp is supported only for a single IPv4 address on each network")); goto cleanup; } else { ipv4def = ipdef; } } } } - if (ipv4def) { + + if (!(network = virNetworkAssignDef(&driver->networks, + def))) + goto cleanup; + freeDef = false; + + network->persistent = 1; + + if (virNetworkSaveConfig(driver->networkConfigDir, def) < 0) { + virNetworkRemoveInactive(&driver->networks, network); + network = NULL; + goto cleanup; + } + + if (ipv4def) { dctx = dnsmasqContextNew(def->name, DNSMASQ_STATE_DIR); if (dctx == NULL || networkBuildDnsmasqHostsfile(dctx, ipv4def, def->dns) < 0 || dnsmasqSave(dctx) < 0) goto cleanup; } VIR_INFO("Defining network '%s'", def->name); ret = virGetNetwork(conn, def->name, def->uuid); cleanup: if (freeDef) virNetworkDefFree(def); dnsmasqContextFree(dctx); if (network) virNetworkObjUnlock(network); networkDriverUnlock(driver); return ret; } -- 1.7.3.4

2 2

[libvirt] [PATCHv6 0/7] block io throttle via per-device block IO tuning
by Eric Blake 01 Dec '11

01 Dec '11

Here's the latest state of Lei's patch series with all my comments folded in. I may have a few more tweaks to make now that I'm at the point of testing things with both old qemu (graceful rejection) and new qemu (sensical return values), so it may be a day or two (or even a weekend, since this is a holiday weekend for me) before I actually push this, so it wouldn't hurt if anyone else wants to review in the meantime. Lei Li (7): Add new API virDomain{Set, Get}BlockIoTune Add virDomain{Set, Get}BlockIoTune support to the remote driver Support block I/O throttle in XML Implement virDomain{Set, Get}BlockIoTune for the qemu driver Enable the blkdeviotune command in virsh Support virDomain{Set, Get}BlockIoTune in the python API Add tests for blkdeviotune daemon/remote.c | 64 ++++ docs/formatdomain.html.in | 39 +++ docs/schemas/domaincommon.rng | 122 +++++-- include/libvirt/libvirt.h.in | 63 ++++ python/generator.py | 2 + python/libvirt-override-api.xml | 16 + python/libvirt-override.c | 178 ++++++++++ src/conf/domain_conf.c | 90 +++++- src/conf/domain_conf.h | 14 + src/driver.h | 20 ++ src/libvirt.c | 148 +++++++++ src/libvirt_public.syms | 6 + src/qemu/qemu_command.c | 31 ++ src/qemu/qemu_driver.c | 340 ++++++++++++++++++++ src/qemu/qemu_monitor.c | 33 ++ src/qemu/qemu_monitor.h | 8 + src/qemu/qemu_monitor_json.c | 176 ++++++++++ src/qemu/qemu_monitor_json.h | 8 + src/qemu/qemu_monitor_text.c | 151 +++++++++- src/qemu/qemu_monitor_text.h | 8 + src/remote/remote_driver.c | 57 ++++ src/remote/remote_protocol.x | 27 ++- src/remote_protocol-structs | 24 ++ .../qemuxml2argv-blkdeviotune.args | 7 + .../qemuxml2argvdata/qemuxml2argv-blkdeviotune.xml | 30 ++ tests/qemuxml2argvtest.c | 2 + tests/qemuxml2xmltest.c | 1 + tools/virsh.c | 244 ++++++++++++++ tools/virsh.pod | 30 ++ 29 files changed, 1900 insertions(+), 39 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-blkdeviotune.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-blkdeviotune.xml -- 1.7.7.3

5 24

[libvirt] [PATCH] spec: mark directories in /var/run as ghosts
by Eric Blake 01 Dec '11

01 Dec '11

We have several directories that are created on the fly, and which only contain state relevant to a running libvirtd process (all located in /var/run). Since the directories are created as needed, and make no sense without a running libvirtd, we want them deleted if libvirt is uninstalled. And in F15 and newer, /var/run is on tmpfs (forcing us to recreate on the fly); which means that someone trying to verify a complete rpm will fail if the directory does not currently exist because libvirtd has not been started since boot. The solution, then, is to mark the directories as %ghost, so that rpm knows that we own them and will clean it up if libvirt is uninstalled, but will no longer create the directory for us at install, nor complain at verify time if the directory does not exist. See https://bugzilla.redhat.com/show_bug.cgi?id=656611. * libvirt.spec.in (%files): Add %ghost to temporary directories that we don't install, but want cleaned up on libvirt removal. --- libvirt.spec.in | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index f61a243..06c949b 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -1082,7 +1082,7 @@ rm -f $RPM_BUILD_ROOT%{_sysconfdir}/sysctl.d/libvirtd %{_datadir}/libvirt/networks/default.xml %endif -%dir %{_localstatedir}/run/libvirt/ +%ghost %dir %{_localstatedir}/run/libvirt/ %dir %attr(0711, root, root) %{_localstatedir}/lib/libvirt/images/ %dir %attr(0711, root, root) %{_localstatedir}/lib/libvirt/filesystems/ @@ -1090,24 +1090,24 @@ rm -f $RPM_BUILD_ROOT%{_sysconfdir}/sysctl.d/libvirtd %dir %attr(0711, root, root) %{_localstatedir}/cache/libvirt/ %if %{with_qemu} -%dir %attr(0700, root, root) %{_localstatedir}/run/libvirt/qemu/ +%ghost %dir %attr(0700, root, root) %{_localstatedir}/run/libvirt/qemu/ %dir %attr(0750, %{qemu_user}, %{qemu_group}) %{_localstatedir}/lib/libvirt/qemu/ %dir %attr(0750, %{qemu_user}, %{qemu_group}) %{_localstatedir}/cache/libvirt/qemu/ %endif %if %{with_lxc} -%dir %{_localstatedir}/run/libvirt/lxc/ +%ghost %dir %{_localstatedir}/run/libvirt/lxc/ %dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/lxc/ %endif %if %{with_uml} -%dir %{_localstatedir}/run/libvirt/uml/ +%ghost %dir %{_localstatedir}/run/libvirt/uml/ %dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/uml/ %endif %if %{with_libxl} -%dir %{_localstatedir}/run/libvirt/libxl/ +%ghost %dir %{_localstatedir}/run/libvirt/libxl/ %dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/libxl/ %endif %if %{with_network} -%dir %{_localstatedir}/run/libvirt/network/ +%ghost %dir %{_localstatedir}/run/libvirt/network/ %dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/network/ %dir %attr(0755, root, root) %{_localstatedir}/lib/libvirt/dnsmasq/ %endif -- 1.7.7.3

2 1

[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 01 Dec '11

01 Dec '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