- Devel - libvirt List Archives

[libvirt] Release of libvirt-java-0.4.9
by Daniel Veillard 13 Sep '12

13 Sep '12

New version of the Java bindings are available, I know that there is bugs being chased ATM but I push this release to provide the change of licence from LGPLv2+ to MIT needed by the CloudStack folks (that was done after getting positive feedback from previous contributors). Release available as libvirt-java-0.4.9.tar.gz and rpms at ftp://libvirt.org/libvirt/java it's also tagged in git. Content is slim: - Change Licence to MIT and release 0.4.9 (Daniel Veillard) - Update the maven jar coordinates (Daniel Veillard) (but it is broken one month later no mirror seems to export jars) - Fix IndexOutOfBoundsException for unknown error codes (Claudio Bley) - Add debian packaging for the Java bindings (Wido den Hollander) - Fix javadoc warnings. (Claudio Bley) - Fix typo in Domain.java (Claudio Bley) thanks everybody for the patches, we may push a new release (0.5.0 ?) if the leaks detected by Benjamin Wang get fixed. Daniel -- Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ daniel(a)veillard.com | Rpmfind RPM search engine http://rpmfind.net/ http://veillard.com/ | virtualization library http://libvirt.org/

1 0

[libvirt] [PATCHv2 0/4]add support usb redirection filter
by Guannan Ren 13 Sep '12

13 Sep '12

v2 fixed: (1) type int->size_t (2) Don't output filter attributes with default -1 value in XML. (3) Treat 0x0(0 decimal) as valid value for USB vendorID and productID as well as USB classID and bcdDevice code. (4) doc fixed. BZ RFE https://bugzilla.redhat.com/show_bug.cgi?id=795929 qemu support: http://git.qemu.org/?p=qemu.git;a=commitdiff;h=6af165892cf900291046f1d25f95… Since qemu has have the code to support USB redirection filter. This set of patches try to support it from libvirt. The input XML format is like this: <devices> ... <redirdev bus='usb' type='spicevmc'> <address type='usb' bus='0' port='4'/> </redirdev> <redirfilter> <usbdev class='0x08' vendor='0x1234' product='0xbeef' \ version='2.00' allow='yes'/> <usbdev allow='no'/> </redirfilter> ... </devices> Multiple <usbdev> element as one of filter rule could be added into parent element <redirfilter>, only no more than <redirfilter> element could exists. There is no 1:1 mapping between ports and redirected devices and qemu and spicy client couldn't decide into which usbredir ports the client can 'plug' redirected devices. So it make sense to apply all of filter rules global to all existing usb redirection devices. class attribute is USB Class codes. version is bcdDevice value of USB device. vendor and product is USB vendorId and productId. -1 can be used to allow any value for a field. Except allow attribute the other four are optional, default value is -1. The above XML will be converted to the following qemu command line: If there are multiple usb-redir device, all of them have the same filter rules. -device usb-redir,chardev=charredir0,id=redir0,\ filter=0x08:0x1234:0xBEEF:0x2000:1|-1:-1:-1:-1:0,bus=usb.0,port=4 Guannan Ren(0/4) qemu: define and parse USB redirection filter XML qemu: build USB redirection filter qemu command line test: add xml2argvtest for usb-redir filter and update doc: update usb redirection filter infomation on docs/formatdomain.html.in | 38 +++++++++++------ docs/schemas/domaincommon.rng | 66 +++++++++++++++++++++++++++++ src/conf/domain_conf.c | 339 +++++++++++++++++++++++++++++.. src/conf/domain_conf.h | 21 +++++++++ src/qemu/qemu_command.c | 45 +++++++++++++++++++- src/qemu/qemu_command.h | 5 ++- src/qemu/qemu_hotplug.c | 3 +- tests/qemuxml2argvdata/qemuxml2argv-usb-redir-filter.args | 10 +++++ tests/qemuxml2argvdata/qemuxml2argv-usb-redir-filter.xml | 45 ++++++++++++++++++++ tests/qemuxml2argvtest.c | 6 +++ 10 files changed, 559 insertions(+), 19 deletions(-)

2 6

[libvirt] [libvirt-glib][PATCH v4 1/2] gobject: Introduce gvir_connection_get_hypervisor_name
by Michal Privoznik 13 Sep '12

13 Sep '12

which is basically a wrapper for virConnectGetType(). --- examples/conn-test.c | 9 ++++++ libvirt-gobject/libvirt-gobject-connection.c | 41 ++++++++++++++++++++++++++ libvirt-gobject/libvirt-gobject-connection.h | 2 + libvirt-gobject/libvirt-gobject.sym | 5 +++ 4 files changed, 57 insertions(+), 0 deletions(-) diff --git a/examples/conn-test.c b/examples/conn-test.c index 8c70997..b9cb417 100644 --- a/examples/conn-test.c +++ b/examples/conn-test.c @@ -31,11 +31,20 @@ do_connection_open(GObject *source, { GVirConnection *conn = GVIR_CONNECTION(source); GError *err = NULL; + gchar *hv_name = NULL; if (!gvir_connection_open_finish(conn, res, &err)) { g_error("%s", err->message); } g_print("Connected to libvirt\n"); + + if (!(hv_name = gvir_connection_get_hypervisor_name(conn, &err))) { + g_error("%s", err->message); + } + + g_print("Hypervisor name: %s\n", hv_name); + + g_free(hv_name); g_object_unref(conn); } diff --git a/libvirt-gobject/libvirt-gobject-connection.c b/libvirt-gobject/libvirt-gobject-connection.c index d826905..3dff564 100644 --- a/libvirt-gobject/libvirt-gobject-connection.c +++ b/libvirt-gobject/libvirt-gobject-connection.c @@ -1025,6 +1025,47 @@ const gchar *gvir_connection_get_uri(GVirConnection *conn) return conn->priv->uri; } +/** + * gvir_connection_get_hypervisor_name: + * @conn: a #GVirConnection + * @err: return location for any #GError + * + * Get name of current hypervisor used. + * + * Return value: new string that should be freed when no longer needed, + * or NULL upon error. + */ +gchar * +gvir_connection_get_hypervisor_name(GVirConnection *conn, + GError **err) +{ + GVirConnectionPrivate *priv; + gchar *ret = NULL; + const char *type; + + g_return_val_if_fail(GVIR_IS_CONNECTION(conn), NULL); + g_return_val_if_fail(err == NULL || *err == NULL, NULL); + + priv = conn->priv; + if (!priv->conn) { + g_set_error_literal(err, GVIR_CONNECTION_ERROR, 0, + "Connection is not opened"); + goto cleanup; + } + + type = virConnectGetType(priv->conn); + if (!type) { + gvir_set_error_literal(err, GVIR_CONNECTION_ERROR, 0, + "Unable to get hypervisor name"); + goto cleanup; + } + + ret = g_strdup(type); + +cleanup: + return ret; +} + static void gvir_domain_ref(gpointer obj, gpointer ignore G_GNUC_UNUSED) { g_object_ref(obj); diff --git a/libvirt-gobject/libvirt-gobject-connection.h b/libvirt-gobject/libvirt-gobject-connection.h index d658b01..1bdac54 100644 --- a/libvirt-gobject/libvirt-gobject-connection.h +++ b/libvirt-gobject/libvirt-gobject-connection.h @@ -112,6 +112,8 @@ gboolean gvir_connection_fetch_domains_finish(GVirConnection *conn, const gchar *gvir_connection_get_uri(GVirConnection *conn); +gchar *gvir_connection_get_hypervisor_name(GVirConnection *conn, + GError **err); GList *gvir_connection_get_domains(GVirConnection *conn); GVirDomain *gvir_connection_get_domain(GVirConnection *conn, diff --git a/libvirt-gobject/libvirt-gobject.sym b/libvirt-gobject/libvirt-gobject.sym index 67e5a4f..2c2f1f4 100644 --- a/libvirt-gobject/libvirt-gobject.sym +++ b/libvirt-gobject/libvirt-gobject.sym @@ -194,4 +194,9 @@ LIBVIRT_GOBJECT_0.1.2 { gvir_domain_resume_finish; } LIBVIRT_GOBJECT_0.1.1; +LIBVIRT_GOBJECT_0.1.3 { + global: + gvir_connection_get_hypervisor_name; +} LIBVIRT_GOBJECT_0.1.2; + # .... define new API here using predicted next version number .... -- 1.7.8.6

2 3

[libvirt] [PATCH] virsh: Fix version numbers in comments
by Osier Yang 13 Sep '12

13 Sep '12

And redundant error resetting. Pushed under trivial rule. --- tools/virsh-network.c | 8 +++----- tools/virsh-pool.c | 8 +++----- tools/virsh-volume.c | 8 +++----- 3 files changed, 9 insertions(+), 15 deletions(-) diff --git a/tools/virsh-network.c b/tools/virsh-network.c index 5c3daa3..2c32a78 100644 --- a/tools/virsh-network.c +++ b/tools/virsh-network.c @@ -397,7 +397,7 @@ vshNetworkListCollect(vshControl *ctl, int nInactiveNets = 0; int nAllNets = 0; - /* try the list with flags support (0.10.0 and later) */ + /* try the list with flags support (0.10.2 and later) */ if ((ret = virConnectListAllNetworks(ctl->conn, &list->nets, flags)) >= 0) { @@ -406,10 +406,8 @@ vshNetworkListCollect(vshControl *ctl, } /* check if the command is actually supported */ - if (last_error && last_error->code == VIR_ERR_NO_SUPPORT) { - vshResetLibvirtError(); + if (last_error && last_error->code == VIR_ERR_NO_SUPPORT) goto fallback; - } if (last_error && last_error->code == VIR_ERR_INVALID_ARG) { /* try the new API again but mask non-guaranteed flags */ @@ -430,7 +428,7 @@ vshNetworkListCollect(vshControl *ctl, fallback: - /* fall back to old method (0.9.13 and older) */ + /* fall back to old method (0.10.1 and older) */ vshResetLibvirtError(); /* Get the number of active networks */ diff --git a/tools/virsh-pool.c b/tools/virsh-pool.c index 15d1883..bc10f76 100644 --- a/tools/virsh-pool.c +++ b/tools/virsh-pool.c @@ -606,7 +606,7 @@ vshStoragePoolListCollect(vshControl *ctl, int nInactivePools = 0; int nAllPools = 0; - /* try the list with flags support (0.10.0 and later) */ + /* try the list with flags support (0.10.2 and later) */ if ((ret = virConnectListAllStoragePools(ctl->conn, &list->pools, flags)) >= 0) { @@ -615,10 +615,8 @@ vshStoragePoolListCollect(vshControl *ctl, } /* check if the command is actually supported */ - if (last_error && last_error->code == VIR_ERR_NO_SUPPORT) { - vshResetLibvirtError(); + if (last_error && last_error->code == VIR_ERR_NO_SUPPORT) goto fallback; - } if (last_error && last_error->code == VIR_ERR_INVALID_ARG) { /* try the new API again but mask non-guaranteed flags */ @@ -638,7 +636,7 @@ vshStoragePoolListCollect(vshControl *ctl, fallback: - /* fall back to old method (0.9.13 and older) */ + /* fall back to old method (0.10.1 and older) */ vshResetLibvirtError(); /* There is no way to get the pool type */ diff --git a/tools/virsh-volume.c b/tools/virsh-volume.c index ec0b5b0..c5bd4af 100644 --- a/tools/virsh-volume.c +++ b/tools/virsh-volume.c @@ -1017,7 +1017,7 @@ vshStorageVolListCollect(vshControl *ctl, int nvols = 0; int ret = -1; - /* try the list with flags support (0.10.0 and later) */ + /* try the list with flags support (0.10.2 and later) */ if ((ret = virStoragePoolListAllVolumes(pool, &list->vols, flags)) >= 0) { @@ -1026,17 +1026,15 @@ vshStorageVolListCollect(vshControl *ctl, } /* check if the command is actually supported */ - if (last_error && last_error->code == VIR_ERR_NO_SUPPORT) { - vshResetLibvirtError(); + if (last_error && last_error->code == VIR_ERR_NO_SUPPORT) goto fallback; - } /* there was an error during the call */ vshError(ctl, "%s", _("Failed to list volumes")); goto cleanup; fallback: - /* fall back to old method (0.9.13 and older) */ + /* fall back to old method (0.10.1 and older) */ vshResetLibvirtError(); /* Determine the number of volumes in the pool */ -- 1.7.7.3

1 0

[libvirt] [PATCH 0/5] add support usb redirection filter
by Guannan Ren 13 Sep '12

13 Sep '12

(This is not a new set of patches, it's rebased version) BZ RFE https://bugzilla.redhat.com/show_bug.cgi?id=795929 qemu support: http://git.qemu.org/?p=qemu.git;a=commitdiff;h=6af165892cf900291046f1d25f95… Since qemu has have the code to support USB redirection filter. This set of patches try to support it from libvirt. The XML format is like this: <devices> ... <redirdev bus='usb' type='spicevmc'> <address type='usb' bus='0' port='4'/> </redirdev> <redirfilter> <usbdev class='0x08' vendor='0x1234' product='0xbeef' \ version='2.00' allow='yes'/> <usbdev class='-1' vendor='-1' product='-1' version='-1' allow='no'/> </redirfilter> ... </devices> Multiple <usbdev> element as one of filter rule could be added into parent element <redirfilter>, only no more than <redirfilter> element could exists. There is no 1:1 mapping between ports and redirected devices and qemu and spicy client couldn't decide into which usbredir ports the client can 'plug' redirected devices. So it make sense to apply all of filter rules global to all existing usb redirection devices. class attribute is USB Class codes. version is bcdDevice value of USB device. vendor and product is USB vendorId and productId. -1 can be used to allow any value for a field. Except allow attribute the other four are optional, default value is -1. The above XML will be converted to the following qemu command line: If there are multiple usb-redir device, all of them have the same filter rules. -device usb-redir,chardev=charredir0,id=redir0,\ filter=0x08:0x1234:0xBEEF:0x2000:1|-1:-1:-1:-1:0,bus=usb.0,port=4 Guannan Ren(0/5) qemu: add usb-redir.filter qemu capability flag qemu: define and parse USB redirection filter XML qemu: build USB redirection filter qemu command line test: add xml2argvtest for usb-redir filter and update doc: update usb redirection filter infomation on docs/formatdomain.html.in | 38 ++++++++++------ docs/schemas/domaincommon.rng | 66 ++++++++++++++++++++++++++++ src/conf/domain_conf.c | 346 +++++++++++++++++++++++++++++++++++++++++ src/conf/domain_conf.h | 21 +++++++++ src/qemu/qemu_capabilities.c | 4 ++ src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 45 ++++++++++++++++++- src/qemu/qemu_command.h | 5 ++- src/qemu/qemu_hotplug.c | 3 +- tests/qemuxml2argvdata/qemuxml2argv-usb-redir-filter.args | 10 +++++ tests/qemuxml2argvdata/qemuxml2argv-usb-redir-filter.xml | 45 +++++++++++++++++++ tests/qemuxml2argvtest.c | 6 +++ 12 files changed, 571 insertions(+), 19 deletions(-)

2 11

[libvirt] [PATCH] Fix libvirtd crash possibility
by Martin Kletzander 13 Sep '12

13 Sep '12

When generating RPC protocol messages, it's strictly needed to have continuousline of numbers or RPC messages. However in case anyone tries backporting some functionality and will skip a number, there is a possibility to make the daemon segfault with newer virsh (version of the library, rpc call, etc.) even unintentionally. The problem is that the skipped numbers will get func filled with NULLs, but there is no check whether these are set before the daemon tries to run them. This patch very simply enhances one check and fixes that. I haven't investigated into such a deepness to say if the possibility comes as well with hacked RPC call (calling event instead of function), but this patch gets rid of both these problems. --- src/rpc/virnetserverprogram.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/rpc/virnetserverprogram.c b/src/rpc/virnetserverprogram.c index d13b621..bc85df0 100644 --- a/src/rpc/virnetserverprogram.c +++ b/src/rpc/virnetserverprogram.c @@ -1,7 +1,7 @@ /* * virnetserverprogram.c: generic network RPC server program * - * Copyright (C) 2006-2011 Red Hat, Inc. + * Copyright (C) 2006-2012 Red Hat, Inc. * Copyright (C) 2006 Daniel P. Berrange * * This library is free software; you can redistribute it and/or @@ -379,7 +379,7 @@ virNetServerProgramDispatchCall(virNetServerProgramPtr prog, dispatcher = virNetServerProgramGetProc(prog, msg->header.proc); - if (!dispatcher) { + if (!dispatcher || !dispatcher->func) { virReportError(VIR_ERR_RPC, _("unknown procedure: %d"), msg->header.proc); -- 1.7.12

2 2

[libvirt] [PATCH] conf: fix missing spaces in message
by Eric Blake 13 Sep '12

13 Sep '12

I got an off-list report about a bad diagnostic: Target network card mac 52:54:00:49:07:ccdoes not match source 52:54:00:49:07:b8 True to form, I've added a syntax check rule to prevent it from recurring, and found several other offenders. * cfg.mk (sc_require_whitespace_in_translation): New rule. * src/conf/domain_conf.c (virDomainNetDefCheckABIStability): Add space. * src/esx/esx_util.c (esxUtil_ParseUri): Likewise. * src/qemu/qemu_command.c (qemuCollectPCIAddress): Likewise. * src/qemu/qemu_driver.c (qemuDomainSetMetadata) (qemuDomainGetMetadata): Likewise. * src/qemu/qemu_hotplug.c (qemuDomainChangeNetBridge): Likewise. * src/rpc/virnettlscontext.c (virNetTLSContextCheckCertDNWhitelist): Likewise. * src/vmware/vmware_driver.c (vmwareDomainResume): Likewise. * src/vbox/vbox_tmpl.c (vboxDomainGetXMLDesc, vboxAttachDrives): Avoid false negatives. * tools/virsh-domain.c (info_save_image_dumpxml): Reword. Based on a report by Luwen Su. --- Too big to use the trivial rule, so I'll wait for a review. cfg.mk | 9 +++++++++ src/conf/domain_conf.c | 5 +++-- src/esx/esx_util.c | 7 ++++--- src/qemu/qemu_command.c | 5 +++-- src/qemu/qemu_driver.c | 6 +++--- src/qemu/qemu_hotplug.c | 2 +- src/rpc/virnettlscontext.c | 6 +++--- src/vbox/vbox_tmpl.c | 14 ++++++++------ src/vmware/vmware_driver.c | 4 ++-- tools/virsh-domain.c | 4 ++-- 10 files changed, 38 insertions(+), 24 deletions(-) diff --git a/cfg.mk b/cfg.mk index bca363c..0dd58df 100644 --- a/cfg.mk +++ b/cfg.mk @@ -597,6 +597,15 @@ sc_prohibit_useless_translation: halt='no translations in tests or examples' \ $(_sc_search_regexp) +# When splitting a diagnostic across lines, ensure that there is a space +# or \n on one side of the split. +sc_require_whitespace_in_translation: + @grep -n -A1 '"$$' $$($(VC_LIST_EXCEPT)) \ + | sed -ne ':l; /"$$/ {N;b l;}; s/"\n[^"]*"/""/g; s/\\n/ /g' \ + -e '/_(.*[^\ ]""[^\ ]/p' | grep . && \ + { echo '$(ME): missing whitespace at line split' 1>&2; \ + exit 1; } || : + # Enforce recommended preprocessor indentation style. sc_preprocessor_indentation: @if cppi --version >/dev/null 2>&1; then \ diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 0e71b06..292cc9a 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -9846,7 +9846,8 @@ static bool virDomainDeviceInfoCheckABIStability(virDomainDeviceInfoPtr src, src->addr.pci.slot != dst->addr.pci.slot || src->addr.pci.function != dst->addr.pci.function) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Target device PCI address %04x:%02x:%02x.%02x does not match source %04x:%02x:%02x.%02x"), + _("Target device PCI address %04x:%02x:%02x.%02x " + "does not match source %04x:%02x:%02x.%02x"), dst->addr.pci.domain, dst->addr.pci.bus, dst->addr.pci.slot, dst->addr.pci.function, src->addr.pci.domain, src->addr.pci.bus, @@ -10044,7 +10045,7 @@ static bool virDomainNetDefCheckABIStability(virDomainNetDefPtr src, if (virMacAddrCmp(&src->mac, &dst->mac) != 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Target network card mac %02x:%02x:%02x:%02x:%02x:%02x" - "does not match source %02x:%02x:%02x:%02x:%02x:%02x"), + " does not match source %02x:%02x:%02x:%02x:%02x:%02x"), dst->mac.addr[0], dst->mac.addr[1], dst->mac.addr[2], dst->mac.addr[3], dst->mac.addr[4], dst->mac.addr[5], src->mac.addr[0], src->mac.addr[1], src->mac.addr[2], diff --git a/src/esx/esx_util.c b/src/esx/esx_util.c index 9288218..9d84a6a 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-2011 Red Hat, Inc. + * Copyright (C) 2010-2012 Red Hat, Inc. * Copyright (C) 2009-2011 Matthias Bolte <matthias.bolte(a)googlemail.com> * Copyright (C) 2009 Maximilian Wilhelm <max(a)rfc2324.org> * @@ -159,8 +159,9 @@ esxUtil_ParseUri(esxUtil_ParsedUri **parsedUri, virURIPtr uri) (*parsedUri)->proxy_port < 1 || (*parsedUri)->proxy_port > 65535) { virReportError(VIR_ERR_INVALID_ARG, - _("Query parameter 'proxy' has unexpected port" - "value '%s' (should be [1..65535])"), tmp); + _("Query parameter 'proxy' has unexpected " + "port value '%s' (should be [1..65535])"), + tmp); goto cleanup; } } diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index a83d6de..cd4ee93 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -1044,8 +1044,9 @@ static int qemuCollectPCIAddress(virDomainDefPtr def ATTRIBUTE_UNUSED, if (virHashLookup(addrs->used, addr)) { virReportError(VIR_ERR_XML_ERROR, - _("Attempted double use of PCI Address '%s'" - "(need \"multifunction='off'\" for device on function 0)"), + _("Attempted double use of PCI Address '%s' " + "(need \"multifunction='off'\" for device " + "on function 0)"), addr); goto cleanup; } diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 8e8e00c..a410521 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -13271,7 +13271,7 @@ qemuDomainSetMetadata(virDomainPtr dom, break; case VIR_DOMAIN_METADATA_ELEMENT: virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, "%s", - _("QEmu driver does not support modifying" + _("QEmu driver does not support modifying " "<metadata> element")); goto cleanup; break; @@ -13299,7 +13299,7 @@ qemuDomainSetMetadata(virDomainPtr dom, break; case VIR_DOMAIN_METADATA_ELEMENT: virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, "%s", - _("QEMU driver does not support" + _("QEMU driver does not support " "<metadata> element")); goto cleanup; default: @@ -13367,7 +13367,7 @@ qemuDomainGetMetadata(virDomainPtr dom, break; case VIR_DOMAIN_METADATA_ELEMENT: virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, "%s", - _("QEMU driver does not support" + _("QEMU driver does not support " "<metadata> element")); goto cleanup; break; diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index a8a904c..d4d08ac 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -1278,7 +1278,7 @@ int qemuDomainChangeNetBridge(virDomainObjPtr vm, virDomainAuditNet(vm, NULL, olddev, "attach", ret == 0); if (ret < 0) { virReportError(VIR_ERR_OPERATION_FAILED, - _("unable to recover former state by adding port" + _("unable to recover former state by adding port " "to bridge %s"), oldbridge); } return -1; diff --git a/src/rpc/virnettlscontext.c b/src/rpc/virnettlscontext.c index 9fe6eb1..dee4334 100644 --- a/src/rpc/virnettlscontext.c +++ b/src/rpc/virnettlscontext.c @@ -1,7 +1,7 @@ /* * virnettlscontext.c: TLS encryption/x509 handling * - * Copyright (C) 2010-2011 Red Hat, Inc. + * Copyright (C) 2010-2012 Red Hat, Inc. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -393,8 +393,8 @@ virNetTLSContextCheckCertDNWhitelist(const char *dname, virReportError(VIR_ERR_SYSTEM_ERROR, "%s", _("Client's Distinguished Name is not on the list " "of allowed clients (tls_allowed_dn_list). Use " - "'certtool -i --infile clientcert.pem' to view the" - "Distinguished Name field in the client certificate," + "'certtool -i --infile clientcert.pem' to view the " + "Distinguished Name field in the client certificate, " "or run this daemon with --verbose option.")); return 0; } diff --git a/src/vbox/vbox_tmpl.c b/src/vbox/vbox_tmpl.c index 48f371f..4f2d025 100644 --- a/src/vbox/vbox_tmpl.c +++ b/src/vbox/vbox_tmpl.c @@ -3752,8 +3752,9 @@ static int vboxDomainCreateWithFlags(virDomainPtr dom, unsigned int flags) { ret = vboxStartMachine(dom, i, machine, &iid); } else { virReportError(VIR_ERR_OPERATION_FAILED, "%s", - _("machine is not in poweroff|saved|" - "aborted state, so couldn't start it")); + _("machine is not in " + "poweroff|saved|aborted state, so " + "couldn't start it")); ret = -1; } } @@ -4280,8 +4281,9 @@ vboxAttachDrives(virDomainDefPtr def, vboxGlobalData *data, IMachine *machine) &devicePort, &deviceSlot)) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("can't get the port/slot number of harddisk/" - "dvd/floppy to be attached: %s, rc=%08x"), + _("can't get the port/slot number of " + "harddisk/dvd/floppy to be attached: " + "%s, rc=%08x"), def->disks[i]->src, (unsigned)rc); VBOX_RELEASE(medium); VBOX_UTF16_FREE(mediumUUID); @@ -4303,8 +4305,8 @@ vboxAttachDrives(virDomainDefPtr def, vboxGlobalData *data, IMachine *machine) if (NS_FAILED(rc)) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("could not attach the file as harddisk/" - "dvd/floppy: %s, rc=%08x"), + _("could not attach the file as " + "harddisk/dvd/floppy: %s, rc=%08x"), def->disks[i]->src, (unsigned)rc); } else { DEBUGIID("Attached HDD/DVD/Floppy with UUID", mediumUUID); diff --git a/src/vmware/vmware_driver.c b/src/vmware/vmware_driver.c index 1607018..557b917 100644 --- a/src/vmware/vmware_driver.c +++ b/src/vmware/vmware_driver.c @@ -1,6 +1,6 @@ /*---------------------------------------------------------------------------*/ /* - * Copyright (C) 2011 Red Hat, Inc. + * Copyright (C) 2011-2012 Red Hat, Inc. * Copyright 2010, diateam (www.diateam.net) * * This library is free software; you can redistribute it and/or @@ -484,7 +484,7 @@ vmwareDomainResume(virDomainPtr dom) if (driver->type == TYPE_PLAYER) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("vmplayer does not support libvirt suspend/resume" + _("vmplayer does not support libvirt suspend/resume " "(vmware pause/unpause) operation ")); return ret; } diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 409eb24..c6695b3 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -2945,8 +2945,8 @@ cleanup: */ static const vshCmdInfo info_save_image_dumpxml[] = { {"help", N_("saved state domain information in XML")}, - {"desc", N_("Output the domain information for a saved state file,\n" - "as an XML dump to stdout.")}, + {"desc", + N_("Dump XML of domain information for a saved state file to stdout.")}, {NULL, NULL} }; -- 1.7.11.4

2 2

[libvirt] libvirt build failure w/GNU make and automake.git (automake regression?)
by Jim Meyering 13 Sep '12

13 Sep '12

When I run ./autogen.sh && make, I see this: (this arose because I had the latest automake.git/master tools -- commit c1b83e1af60b866cf5cdeebf77d0275019bad8b2 from today -- early in my path) Generated 3 wrapper functions CC libvirtmod_la-libvirt-override.lo CC libvirtmod_la-typewrappers.lo CC libvirtmod_la-libvirt.lo CC libvirtmod_qemu_la-libvirt-qemu-override.lo CC libvirtmod_qemu_la-typewrappers.lo CC libvirtmod_qemu_la-libvirt-qemu.lo CCLD libvirtmod_qemu.la CCLD libvirtmod.la make[3]: Leaving directory `/h/j/w/co/libvirt/python' Making all in tests make[3]: Entering directory `/h/j/w/co/libvirt/python/tests' make[3]: Nothing to be done for `all'. make[3]: Leaving directory `/h/j/w/co/libvirt/python/tests' make[2]: Leaving directory `/h/j/w/co/libvirt/python' Making all in tests make[2]: Entering directory `/h/j/w/co/libvirt/tests' Makefile:4355: *** Malformed target-specific variable definition. Stop. make[2]: Leaving directory `/h/j/w/co/libvirt/tests' make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory `/h/j/w/co/libvirt' make: *** [all] Error 2 That is because of this automake-generated rule: undefine.log: undefine @p='undefine'; \ b='undefine'; \ $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ --log-file $$b.log --trs-file $$b.trs \ $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ "$$tst" $(AM_TESTS_FD_REDIRECT) The trouble is that "undefine" is an operator in GNU make. Here's that part of GNU make's documentation: 6.9 Undefining Variables ======================== If you want to clear a variable, setting its value to empty is usually sufficient. Expanding such a variable will yield the same result (empty string) regardless of whether it was set or not. However, if you are using the `flavor' (*note Flavor Function::) and `origin' (*note Origin Function::) functions, there is a difference between a variable that was never set and a variable with an empty value. In such situations you may want to use the `undefine' directive to make a variable appear as if it was never set. For example: foo := foo bar = bar undefine foo undefine bar $(info $(origin foo)) $(info $(flavor bar)) This example will print "undefined" for both variables. If you want to undefine a command-line variable definition, you can use the `override' directive together with `undefine', similar to how this is done for variable definitions: override undefine CFLAGS The most pragmatic work-around is to rename the "undefine" test script. However, Stephano, as automake maintainer, I think you will want to fix automake not to prohibit the use of such test names.

3 2

[libvirt] [libvirt-glib][PATCH v3 1/2] gobject: Introduce gvir_connection_get_hypervisor_name
by Michal Privoznik 13 Sep '12

13 Sep '12

which is basically a wrapper for virConnectGetType(). --- The list is sad as it hasn't delivered previous version. examples/conn-test.c | 12 +++++++ libvirt-gobject/libvirt-gobject-connection.c | 45 ++++++++++++++++++++++++++ libvirt-gobject/libvirt-gobject-connection.h | 3 ++ libvirt-gobject/libvirt-gobject.sym | 5 +++ 4 files changed, 65 insertions(+), 0 deletions(-) diff --git a/examples/conn-test.c b/examples/conn-test.c index 8c70997..b90d2b0 100644 --- a/examples/conn-test.c +++ b/examples/conn-test.c @@ -31,11 +31,23 @@ do_connection_open(GObject *source, { GVirConnection *conn = GVIR_CONNECTION(source); GError *err = NULL; + gchar *hv_name = NULL; if (!gvir_connection_open_finish(conn, res, &err)) { g_error("%s", err->message); + goto cleanup; } g_print("Connected to libvirt\n"); + + if (!(hv_name = gvir_connection_get_hypervisor_name(conn, &err))) { + g_error("%s", err->message); + goto cleanup; + } + + g_print("Hypervisor name: %s\n", hv_name); + +cleanup: + g_free(hv_name); g_object_unref(conn); } diff --git a/libvirt-gobject/libvirt-gobject-connection.c b/libvirt-gobject/libvirt-gobject-connection.c index d826905..75bf041 100644 --- a/libvirt-gobject/libvirt-gobject-connection.c +++ b/libvirt-gobject/libvirt-gobject-connection.c @@ -1025,6 +1025,51 @@ const gchar *gvir_connection_get_uri(GVirConnection *conn) return conn->priv->uri; } +/** + * gvir_connection_get_hypervisor_name: + * @conn: a #GVirConnection + * @err: return location for any #GError + * + * Get name of current hypervisor used. + * + * Return value: new string that should be freed when no longer needed, + * or NULL upon error. + */ +gchar * +gvir_connection_get_hypervisor_name(GVirConnection *conn, + GError **err) +{ + GVirConnectionPrivate *priv; + gchar *ret = NULL; + const char *type; + + g_return_val_if_fail(GVIR_IS_CONNECTION(conn), NULL); + g_return_val_if_fail(err == NULL || *err == NULL, NULL); + + priv = conn->priv; + /* Stop another thread closing the connection just at the minute */ + virConnectRef(priv->conn); + if (!priv->conn) { + g_set_error_literal(err, GVIR_CONNECTION_ERROR, 0, + "Connection is not open"); + goto cleanup; + } + + type = virConnectGetType(priv->conn); + if (!type) { + gvir_set_error_literal(err, GVIR_CONNECTION_ERROR, 0, + "Unable to get hypervisor name"); + goto cleanup; + } + + ret = g_strdup(type); + +cleanup: + if (priv->conn) + virConnectClose(priv->conn); + return ret; +} + static void gvir_domain_ref(gpointer obj, gpointer ignore G_GNUC_UNUSED) { g_object_ref(obj); diff --git a/libvirt-gobject/libvirt-gobject-connection.h b/libvirt-gobject/libvirt-gobject-connection.h index d658b01..62eb024 100644 --- a/libvirt-gobject/libvirt-gobject-connection.h +++ b/libvirt-gobject/libvirt-gobject-connection.h @@ -112,6 +112,9 @@ gboolean gvir_connection_fetch_domains_finish(GVirConnection *conn, const gchar *gvir_connection_get_uri(GVirConnection *conn); +gchar *gvir_connection_get_hypervisor_name(GVirConnection *conn, + GError **err); + GList *gvir_connection_get_domains(GVirConnection *conn); GVirDomain *gvir_connection_get_domain(GVirConnection *conn, diff --git a/libvirt-gobject/libvirt-gobject.sym b/libvirt-gobject/libvirt-gobject.sym index 67e5a4f..2c2f1f4 100644 --- a/libvirt-gobject/libvirt-gobject.sym +++ b/libvirt-gobject/libvirt-gobject.sym @@ -194,4 +194,9 @@ LIBVIRT_GOBJECT_0.1.2 { gvir_domain_resume_finish; } LIBVIRT_GOBJECT_0.1.1; +LIBVIRT_GOBJECT_0.1.3 { + global: + gvir_connection_get_hypervisor_name; +} LIBVIRT_GOBJECT_0.1.2; + # .... define new API here using predicted next version number .... -- 1.7.8.6

2 3

[libvirt] 'virsh snapshot-list' throws a segfault [with libvirt-0.9.13-3]
by Kashyap Chamarthy 13 Sep '12

13 Sep '12

Hi, After creating a couple of external snapshots, running 'virsh snapshot-list $name' fails with a segfault. I wonder what's going on here: Host: Fedora-17 Guest: F18/rawhide Version Info: #--------------------------------------------------------# [root@moon ~]# rpm -q libvirt qemu-kvm ; uname -r ; cat /etc/fedora-release libvirt-0.9.13-3.fc17.x86_64 qemu-kvm-1.2-0.1.20120806git3e430569.fc17.x86_64 3.5.2-3.fc17.x86_64 Fedora release 17 (Beefy Miracle) [root@moon ~]# #--------------------------------------------------------# #--------------------------------------------------------# [root@moon ~]# virsh list Id Name State ---------------------------------------------------- 3 daisy running [root@moon ~]# #--------------------------------------------------------# [root@moon ~]# virsh snapshot-create-as daisy snap1-daisy "snap1 description" --diskspec vda,file=/export/vmimgs/snap1-daisy.qcow2 --disk-only --atomic Domain snapshot snap1-daisy created [root@moon ~]# #--------------------------------------------------------# [root@moon ~]# virsh snapshot-create-as daisy snap2-daisy "snap2 description" --diskspec vda,file=/export/vmimgs/snap2-daisy.qcow2 --disk-only --atomic Domain snapshot snap2-daisy created [root@moon ~]# #--------------------------------------------------------# [root@moon ~]# virsh snapshot-list daisy Segmentation fault [root@moon ~]# #--------------------------------------------------------# [root@moon ~]# virsh snapshot-list --tree daisy Segmentation fault [root@moon ~]# #--------------------------------------------------------# >From /var/log/messages: #--------------------------------------------------------# Sep 12 15:01:49 moon kernel: [847381.051241] virsh[23174]: segfault at 67 ip 00007fbaa6e66751 sp 00007fff2e07e048 error 4 in libc-2.15.so[7fbaa6de1000+1ac000] Sep 12 15:01:49 moon libvirtd[2276]: 2012-09-12 09:31:49.553+0000: 2276: error : virNetSocketReadWire:1006 : End of file while reading data: Input/output error Sep 12 15:06:09 moon kernel: [847640.758497] virsh[23364]: segfault at 35 ip 00007f11f1944751 sp 00007fff59beea58 error 4 in libc-2.15.so[7f11f18bf000+1ac000] Sep 12 15:06:09 moon libvirtd[2276]: 2012-09-12 09:36:09.260+0000: 2276: error : virNetSocketReadWire:1006 : End of file while reading data: Input/output error #--------------------------------------------------------# Any hints here? -- /kashyap

3 4

[libvirt] libvirt & git send-email
by Gene Czarcinski 13 Sep '12

13 Sep '12

I have (hopefully) figured out how to use git and have submitted three emails: a cover, updates for IPv4 and updates for IPv6 ... in fact, I have done this twice ... once yesterday around noon and again a few minutes ago. I submitted them today because the emails had not appeared on libvir-lst. So, after sending them today my CC appeared and a minute or so later the patches appeared on the mailing list. BUT, these emails were the ones I sent yesterday, are dated such, have yesterday's subject line (today's was very slightly different), and had the Message-id from yesterday. Yes, both yesterday and today, I tested doing the "git send-email" by specifying some different email addresses I have and I, indeed, received two copies (TO and CC). If anyone knows what happened, please tell me. If I screwed something up, I would like to not do it again. The from email address matches the email address that is subscribed to this list so that should not be the problem. If this remains a mystery, so be it. Gene

2 1

[libvirt] [PATCH 0/2] tell dnsmasq not to forward PTR queries
by gene＠czarc.net 12 Sep '12

12 Sep '12

From: Gene Czarcinski <gene(a)czarc.net> For networks which dnsmasq has "--listen-address" specified, add the command line parameter so that any dns PTR queries for those networks are not forwarded. There are separate patches for IPv4 and IPv6. Gene Czarcinski (2): IPV4 local=/....in-addr.arpa/ IPv6 local=/...ip6.arpa/ src/network/bridge_driver.c | 32 ++++++++++++++++++++++ tests/networkxml2argvdata/isolated-network.argv | 1 + .../networkxml2argvdata/nat-network-dns-hosts.argv | 1 + .../nat-network-dns-srv-record-minimal.argv | 5 ++++ .../nat-network-dns-srv-record.argv | 5 ++++ .../nat-network-dns-txt-record.argv | 11 ++++++-- tests/networkxml2argvdata/nat-network.argv | 18 ++++++++++-- tests/networkxml2argvdata/nat-network.xml | 4 +++ tests/networkxml2argvdata/netboot-network.argv | 1 + .../networkxml2argvdata/netboot-proxy-network.argv | 1 + tests/networkxml2argvdata/routed-network.argv | 3 +- 11 files changed, 76 insertions(+), 6 deletions(-) -- 1.7.11.4

2 4

[libvirt] [libvirt-glib 1/2] Use 1 GB of RAM in Python example (instead of 1 TB)
by Timo Juhani Lindfors 12 Sep '12

12 Sep '12

--- examples/config-demo.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/config-demo.py b/examples/config-demo.py index 92e8a89..016f9bb 100644 --- a/examples/config-demo.py +++ b/examples/config-demo.py @@ -4,7 +4,7 @@ from gi.repository import LibvirtGConfig; domain = LibvirtGConfig.Domain.new() domain.set_name("foo") -domain.set_memory(1024*1024*1024) +domain.set_memory(1024*1024) domain.set_vcpus(2) domain.set_lifecycle(LibvirtGConfig.DomainLifecycleEvent.ON_POWEROFF, LibvirtGConfig.DomainLifecycleAction.DESTROY) -- 1.7.10.4

2 7

[libvirt] [PATCH 0/5 v4] Atomic API to list host interfaces
by Osier Yang 12 Sep '12

12 Sep '12

v3 - v4: - Just rebase on the top, split the API from v3's big set. Osier Yang (5): list: Define new API virConnectListAllInterfaces list: Implemente RPC calls for virConnectListAllInterfaces list: Implement listAllInterfaces list: Use virConnectListAllInterfaces in virsh list: Expose virConnectListAllInterfaces to Python binding daemon/remote.c | 54 +++++++ include/libvirt/libvirt.h.in | 13 ++ python/generator.py | 1 + python/libvirt-override-api.xml | 6 + python/libvirt-override-virConnect.py | 12 ++ python/libvirt-override.c | 48 ++++++ src/driver.h | 5 + src/interface/netcf_driver.c | 135 +++++++++++++++++ src/libvirt.c | 77 ++++++++++- src/libvirt_public.syms | 1 + src/remote/remote_driver.c | 64 ++++++++ src/remote/remote_protocol.x | 13 ++- src/remote_protocol-structs | 12 ++ tools/virsh-interface.c | 257 +++++++++++++++++++++++---------- 14 files changed, 621 insertions(+), 77 deletions(-) -- 1.7.7.3

3 18

[libvirt] [libvirt-glib][PATCH 1/2] gobject: Introduce gvir_connection_get_hypervisor_name
by Michal Privoznik 12 Sep '12

12 Sep '12

which is basically a wrapper for virConnectGetType(). --- examples/conn-test.c | 12 ++++++ libvirt-gobject/libvirt-gobject-connection.c | 53 ++++++++++++++++++++++++++ libvirt-gobject/libvirt-gobject-connection.h | 3 + libvirt-gobject/libvirt-gobject.sym | 5 ++ 4 files changed, 73 insertions(+), 0 deletions(-) diff --git a/examples/conn-test.c b/examples/conn-test.c index 8c70997..b90d2b0 100644 --- a/examples/conn-test.c +++ b/examples/conn-test.c @@ -31,11 +31,23 @@ do_connection_open(GObject *source, { GVirConnection *conn = GVIR_CONNECTION(source); GError *err = NULL; + gchar *hv_name = NULL; if (!gvir_connection_open_finish(conn, res, &err)) { g_error("%s", err->message); + goto cleanup; } g_print("Connected to libvirt\n"); + + if (!(hv_name = gvir_connection_get_hypervisor_name(conn, &err))) { + g_error("%s", err->message); + goto cleanup; + } + + g_print("Hypervisor name: %s\n", hv_name); + +cleanup: + g_free(hv_name); g_object_unref(conn); } diff --git a/libvirt-gobject/libvirt-gobject-connection.c b/libvirt-gobject/libvirt-gobject-connection.c index d826905..f0be875 100644 --- a/libvirt-gobject/libvirt-gobject-connection.c +++ b/libvirt-gobject/libvirt-gobject-connection.c @@ -1025,6 +1025,59 @@ const gchar *gvir_connection_get_uri(GVirConnection *conn) return conn->priv->uri; } +/** + * gvir_connection_get_hypervisor_name: + * @conn: a #GVirConnection + * @err: return location for any #GError + * + * Get name of current hypervisor used. + * + * Return value: new string that should be freed when no longer needed, + * or NULL upon error. + */ +gchar * +gvir_connection_get_hypervisor_name(GVirConnection *conn, + GError **err) +{ + GVirConnectionPrivate *priv; + virConnectPtr vconn = NULL; + gchar *ret = NULL; + const char *type; + + g_return_val_if_fail(GVIR_IS_CONNECTION(conn), NULL); + + priv = conn->priv; + g_mutex_lock(priv->lock); + if (!priv->conn) { + g_set_error_literal(err, GVIR_CONNECTION_ERROR, 0, + "Connection is not open"); + g_mutex_unlock(priv->lock); + goto cleanup; + } + + vconn = priv->conn; + /* Stop another thread closing the connection just at the minute */ + virConnectRef(vconn); + g_mutex_unlock(priv->lock); + + type = virConnectGetType(priv->conn); + if (!type) { + gvir_set_error_literal(err, GVIR_CONNECTION_ERROR, 0, + "Unable to get hypervisor name"); + goto cleanup; + } + + ret = g_strdup(type); + +cleanup: + if (vconn) { + g_mutex_lock(priv->lock); + virConnectClose(vconn); + g_mutex_unlock(priv->lock); + } + return ret; +} + static void gvir_domain_ref(gpointer obj, gpointer ignore G_GNUC_UNUSED) { g_object_ref(obj); diff --git a/libvirt-gobject/libvirt-gobject-connection.h b/libvirt-gobject/libvirt-gobject-connection.h index d658b01..62eb024 100644 --- a/libvirt-gobject/libvirt-gobject-connection.h +++ b/libvirt-gobject/libvirt-gobject-connection.h @@ -112,6 +112,9 @@ gboolean gvir_connection_fetch_domains_finish(GVirConnection *conn, const gchar *gvir_connection_get_uri(GVirConnection *conn); +gchar *gvir_connection_get_hypervisor_name(GVirConnection *conn, + GError **err); + GList *gvir_connection_get_domains(GVirConnection *conn); GVirDomain *gvir_connection_get_domain(GVirConnection *conn, diff --git a/libvirt-gobject/libvirt-gobject.sym b/libvirt-gobject/libvirt-gobject.sym index 67e5a4f..2c2f1f4 100644 --- a/libvirt-gobject/libvirt-gobject.sym +++ b/libvirt-gobject/libvirt-gobject.sym @@ -194,4 +194,9 @@ LIBVIRT_GOBJECT_0.1.2 { gvir_domain_resume_finish; } LIBVIRT_GOBJECT_0.1.1; +LIBVIRT_GOBJECT_0.1.3 { + global: + gvir_connection_get_hypervisor_name; +} LIBVIRT_GOBJECT_0.1.2; + # .... define new API here using predicted next version number .... -- 1.7.8.6

3 5

[libvirt] [PATCH 0/4] parallels: add support of containers
by Dmitry Guryanov 12 Sep '12

12 Sep '12

Parallels Cloud Server supports containers together with fully virtualized VMs. Both types of virtual environments managed by prlctl utility using the same commands and options, where possible. This patch series adds new domain type to the driver and handles differences between containers and VMs where it's needed. Dmitry Guryanov (4): parallels: add support of containers to the driver parallels: handle unlimited cpus on containers parallels: fix parallelsDomainDefineXML for existing containers parallels: implement containers creation .gnulib | 2 +- src/parallels/parallels_driver.c | 92 ++++++++++++++++---- .../domain-parallels-ct-simple.xml | 28 ++++++ 3 files changed, 105 insertions(+), 17 deletions(-) create mode 100644 tests/domainschemadata/domain-parallels-ct-simple.xml

2 12

[libvirt] [PATCH] docs: mention another iaas app built on libvirt
by Eric Blake 12 Sep '12

12 Sep '12

Reported on the libvirt-users list. * docs/apps.html.in: Add Eucalyptus. Reported by Eric Choi. --- Any objections to this patch, turning your email into the needed doc markup? docs/apps.html.in | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/docs/apps.html.in b/docs/apps.html.in index 10ea6bf..903b099 100644 --- a/docs/apps.html.in +++ b/docs/apps.html.in @@ -212,6 +212,14 @@ modular Web Services architecture. </dd> + <dt><a href="http://www.eucalyptus.com">Eucalyptus</a></dt> + <dd> + Eucalyptus is an on-premise Infrastructure as a Service cloud + software platform that is open source and + AWS-compatible. Eucalyptus uses libivrt virtualization API to + directly interact with Xen and KVM hypervisors. + </dd> + <dt><a href="http://www.nimbusproject.org">Nimbus</a></dt> <dd> Nimbus is an open-source toolkit focused on providing -- 1.7.11.4

3 2

[libvirt] Reminder about proposed schedule for next release
by Daniel Veillard 12 Sep '12

12 Sep '12

As proposed end of August, I plan to enter the freeze for 0.10.2 beginning of next week, possibly Tuesday 18th, so if you want to push an update for that release, please make sure your patches are posted and reviewed quickly ! Then after a week of freeze, I would probably push 0.10.2 on the 24 or 25, Daniel -- Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ daniel(a)veillard.com | Rpmfind RPM search engine http://rpmfind.net/ http://veillard.com/ | virtualization library http://libvirt.org/

1 0

[libvirt] [libvirt-glib][PATCH v2 1/2] gobject: Introduce gvir_connection_get_hypervisor_name
by Michal Privoznik 12 Sep '12

12 Sep '12

which is basically a wrapper for virConnectGetType(). --- examples/conn-test.c | 12 +++++++ libvirt-gobject/libvirt-gobject-connection.c | 44 ++++++++++++++++++++++++++ libvirt-gobject/libvirt-gobject-connection.h | 3 ++ libvirt-gobject/libvirt-gobject.sym | 5 +++ 4 files changed, 64 insertions(+), 0 deletions(-) diff --git a/examples/conn-test.c b/examples/conn-test.c index 8c70997..b90d2b0 100644 --- a/examples/conn-test.c +++ b/examples/conn-test.c @@ -31,11 +31,23 @@ do_connection_open(GObject *source, { GVirConnection *conn = GVIR_CONNECTION(source); GError *err = NULL; + gchar *hv_name = NULL; if (!gvir_connection_open_finish(conn, res, &err)) { g_error("%s", err->message); + goto cleanup; } g_print("Connected to libvirt\n"); + + if (!(hv_name = gvir_connection_get_hypervisor_name(conn, &err))) { + g_error("%s", err->message); + goto cleanup; + } + + g_print("Hypervisor name: %s\n", hv_name); + +cleanup: + g_free(hv_name); g_object_unref(conn); } diff --git a/libvirt-gobject/libvirt-gobject-connection.c b/libvirt-gobject/libvirt-gobject-connection.c index d826905..f317861 100644 --- a/libvirt-gobject/libvirt-gobject-connection.c +++ b/libvirt-gobject/libvirt-gobject-connection.c @@ -1025,6 +1025,50 @@ const gchar *gvir_connection_get_uri(GVirConnection *conn) return conn->priv->uri; } +/** + * gvir_connection_get_hypervisor_name: + * @conn: a #GVirConnection + * @err: return location for any #GError + * + * Get name of current hypervisor used. + * + * Return value: new string that should be freed when no longer needed, + * or NULL upon error. + */ +gchar * +gvir_connection_get_hypervisor_name(GVirConnection *conn, + GError **err) +{ + GVirConnectionPrivate *priv; + gchar *ret = NULL; + const char *type; + + g_return_val_if_fail(GVIR_IS_CONNECTION(conn), NULL); + + priv = conn->priv; + /* Stop another thread closing the connection just at the minute */ + virConnectRef(priv->conn); + if (!priv->conn) { + g_set_error_literal(err, GVIR_CONNECTION_ERROR, 0, + "Connection is not open"); + goto cleanup; + } + + type = virConnectGetType(priv->conn); + if (!type) { + gvir_set_error_literal(err, GVIR_CONNECTION_ERROR, 0, + "Unable to get hypervisor name"); + goto cleanup; + } + + ret = g_strdup(type); + +cleanup: + if (priv->conn) + virConnectClose(priv->conn); + return ret; +} + static void gvir_domain_ref(gpointer obj, gpointer ignore G_GNUC_UNUSED) { g_object_ref(obj); diff --git a/libvirt-gobject/libvirt-gobject-connection.h b/libvirt-gobject/libvirt-gobject-connection.h index d658b01..62eb024 100644 --- a/libvirt-gobject/libvirt-gobject-connection.h +++ b/libvirt-gobject/libvirt-gobject-connection.h @@ -112,6 +112,9 @@ gboolean gvir_connection_fetch_domains_finish(GVirConnection *conn, const gchar *gvir_connection_get_uri(GVirConnection *conn); +gchar *gvir_connection_get_hypervisor_name(GVirConnection *conn, + GError **err); + GList *gvir_connection_get_domains(GVirConnection *conn); GVirDomain *gvir_connection_get_domain(GVirConnection *conn, diff --git a/libvirt-gobject/libvirt-gobject.sym b/libvirt-gobject/libvirt-gobject.sym index 67e5a4f..2c2f1f4 100644 --- a/libvirt-gobject/libvirt-gobject.sym +++ b/libvirt-gobject/libvirt-gobject.sym @@ -194,4 +194,9 @@ LIBVIRT_GOBJECT_0.1.2 { gvir_domain_resume_finish; } LIBVIRT_GOBJECT_0.1.1; +LIBVIRT_GOBJECT_0.1.3 { + global: + gvir_connection_get_hypervisor_name; +} LIBVIRT_GOBJECT_0.1.2; + # .... define new API here using predicted next version number .... -- 1.7.8.6

1 1

[libvirt] A question about radvd
by Gene Czarcinski 12 Sep '12

12 Sep '12

Just curious but ... I have on virtual network defined with one IPv6 definition on the virtual interface. When that network is started, two radvd processes are started with exactly the same command lines. When that network is destroyed, the two radvd processes disappear. Why two ? especially if identical. Gene

2 2

[libvirt] Can't successfully start libvirtd service
by Alex Jia 12 Sep '12

12 Sep '12

Hi all, I compiled and installed libvirt from upstream, but I can't successfully start libvirtd service recently, for details, please see the following steps: # ./bootstrap && ./configure --prefix=/usr && make && make install Notes, everything is okay. # service libvirtd restart Stopping libvirtd daemon: [FAILED] Starting libvirtd daemon: libvirtd: /usr/lib64/libvirt.so.0: version `LIBVIRT_0.10.2' not found (required by libvirtd) [FAILED] # ll /usr/lib64/libvirt.so.0 lrwxrwxrwx. 1 root root 17 Sep 3 19:26 /usr/lib64/libvirt.so.0 -> libvirt.so.0.10.1 # ll src/.libs/libvirt.so.0 lrwxrwxrwx. 1 root root 17 Sep 12 17:58 src/.libs/libvirt.so.0 -> libvirt.so.0.10.1 Notes, I can't find a libvirt.so.0.10.2 under the /usr/lib64/ or src/.libs/. Is 'LIBVIRT_0.10.2' a error version? thanks. -- Regards, Alex

1 1

[libvirt] [libvirt-designer][PATCH v2 0/4] Basic disk & interface support
by Michal Privoznik 12 Sep '12

12 Sep '12

with small example called virtxml. The first patch has been ACKed. I am sending it for completeness sake. diff to v1: -Martin's and Chritophe's review notes worked in. Michal Privoznik (4): Load osinfo DB on init domain: Introduce disk support examples: Create an example of usage program domain: Introduce interface support .gitignore | 1 + Makefile.am | 2 +- configure.ac | 12 +- examples/Makefile.am | 21 ++ examples/virtxml.c | 395 ++++++++++++++++++++++++++ libvirt-designer/Makefile.am | 1 + libvirt-designer/libvirt-designer-domain.c | 347 ++++++++++++++++++++++- libvirt-designer/libvirt-designer-domain.h | 12 +- libvirt-designer/libvirt-designer-internal.h | 30 ++ libvirt-designer/libvirt-designer-main.c | 17 +- libvirt-designer/libvirt-designer.sym | 4 + 11 files changed, 837 insertions(+), 5 deletions(-) create mode 100644 examples/Makefile.am create mode 100644 examples/virtxml.c create mode 100644 libvirt-designer/libvirt-designer-internal.h -- 1.7.8.6

4 15

[libvirt] [PATCH 1/2] parallels: fix parallelsDoCmdRun in case of command failure
by Dmitry Guryanov 12 Sep '12

12 Sep '12

Don't try to dereferece NULL pointer. --- src/parallels/parallels_utils.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/parallels/parallels_utils.c b/src/parallels/parallels_utils.c index 35766b7..89a0d89 100644 --- a/src/parallels/parallels_utils.c +++ b/src/parallels/parallels_utils.c @@ -55,7 +55,7 @@ parallelsDoCmdRun(char **outbuf, const char *binary, va_list list) cleanup: VIR_FREE(scmd); virCommandFree(cmd); - if (ret) + if (ret && outbuf) VIR_FREE(*outbuf); return ret; } -- 1.7.1

2 2

[libvirt] [PATCH v2 1/1] Backcompt for console devices in virDomainDeviceInfoIterate
by Li Zhang 12 Sep '12

12 Sep '12

Histrically, the first <console> element is treated as the alias of a <serial> device. In the virDomainDeviceInfoIterate, This situation is not considered. It still handles the first <console> element as another devices, which means that for console[0] with serial targetType, it calls callback function another time. It will cause the problem of address conflicts when assigning spapr-vio address for serial device on pSeries guest. For pSeries guest, the serial configuration in the xml file is as the following: <serial type='pty'> <target port='0'/> <address type='spapr-vio'/> </serial> Console configuration is default, the dumped xml file is as the following: <serial type='pty'> <source path='/dev/pts/5'/> <target port='0'/> <alias name='serial0'/> <address type='spapr-vio' reg='0x30000000'/> </serial> <console type='pty' tty='/dev/pts/5'> <source path='/dev/pts/5'/> <target type='serial' port='0'/> <alias name='serial0'/> <address type='spapr-vio' reg='0x30000000'/> </console> It shows that the <console> device is the alias of serial device. So its address is the same as the serial device. When dectecting the conflicts in the qemuAssignSpaprVIOAddress the first console and the serial device conflicts because virDomainDeviceInfoIterate() still handle these as two different devices, and in the qemuAssignSpaprVIOAddress(), it will compare these two devices' addressed. If they have same address, it will report address confilict error. So this patch is to handle the first console which targetType is serial as the alias of serial device to avoid address conflicts error reported. Signed-off-by: Li Zhang <zhlcindy(a)linux.vnet.ibm.com> --- * v1 -> v2: Rebase v1 on latest version of libvirt. src/conf/domain_conf.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 8952b69..0e71b06 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -2054,6 +2054,9 @@ int virDomainDeviceInfoIterate(virDomainDefPtr def, return -1; } for (i = 0; i < def->nconsoles ; i++) { + if ((STREQ(def->os.type, "hvm")) && i == 0 && + def->consoles[i]->targetType == VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_SERIAL) + continue; device.data.chr = def->consoles[i]; if (cb(def, &device, &def->consoles[i]->info, opaque) < 0) return -1; -- 1.7.5.4

3 7

[libvirt] [PATCH] build: avoid dirty docs on fresh bootstrap
by Eric Blake 12 Sep '12

12 Sep '12

* HACKING: Regenerate. --- Pushing under the trivial rule. HACKING | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/HACKING b/HACKING index ab1a329..da5e771 100644 --- a/HACKING +++ b/HACKING @@ -36,11 +36,12 @@ Then, when you want to post your patches: git send-email --cover-letter --no-chain-reply-to --annotate \ --to=libvir-list(a)redhat.com master -(Note that the "git send-email" subcommand is usually not in the main git -package, but part of a sub-package called "git-email".) For a single patch you -can omit "--cover-letter", but series of a two or more patches needs a cover -letter. If you get tired of typing "--to=libvir-list(a)redhat.com" designation -you can set it in git config: +(Note that the "git send-email" subcommand may not be in the main git package +and using it may require installion of a separate package, for example the +"git-email" package in Fedora.) For a single patch you can omit +"--cover-letter", but a series of two or more patches needs a cover letter. If +you get tired of typing "--to=libvir-list(a)redhat.com" designation you can set +it in git config: git config sendemail.to libvir-list(a)redhat.com -- 1.7.11.4

2 1

[libvirt] [PATCH v7] support offline migration
by liguang 12 Sep '12

12 Sep '12

original migration did not aware of offline case so, add code to support offline migration quietly (did not disturb original migration) by pass VIR_MIGRATE_OFFLINE flag to migration APIs if only the domain is really inactive, and migration process will not puzzled by domain offline and exit unexpectedly. these changes did not take care of disk images the domain required, for them could be transferred by other APIs as suggested, then VIR_MIGRATE_OFFLINE should not combined with VIR_MIGRATE_NON_SHARED_*. so, this migration result is just make domain definition alive at target side. Signed-off-by: liguang <lig.fnst(a)cn.fujitsu.com> --- include/libvirt/libvirt.h.in | 1 + src/qemu/qemu_driver.c | 15 +++++++++++ src/qemu/qemu_migration.c | 54 ++++++++++++++++++++++++++++++++++++----- src/qemu/qemu_migration.h | 3 +- tools/virsh-domain.c | 6 ++++ 5 files changed, 71 insertions(+), 8 deletions(-) diff --git a/include/libvirt/libvirt.h.in b/include/libvirt/libvirt.h.in index cfe5047..77df2ab 100644 --- a/include/libvirt/libvirt.h.in +++ b/include/libvirt/libvirt.h.in @@ -995,6 +995,7 @@ typedef enum { * whole migration process; this will be used automatically * when supported */ VIR_MIGRATE_UNSAFE = (1 << 9), /* force migration even if it is considered unsafe */ + VIR_MIGRATE_OFFLINE = (1 << 10), /* offline migrate */ } virDomainMigrateFlags; /* Domain migration. */ diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index b12d9bc..2380ccc 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -9641,6 +9641,15 @@ qemuDomainMigrateBegin3(virDomainPtr domain, } if (!virDomainObjIsActive(vm)) { + if (flags & VIR_MIGRATE_OFFLINE) { + if (flags & (VIR_MIGRATE_NON_SHARED_DISK| + VIR_MIGRATE_NON_SHARED_INC)) { + virReportError(VIR_ERR_OPERATION_INVALID, + "%s", _("migrating storage handled by volume APIs")); + goto endjob; + } + goto offline; + } virReportError(VIR_ERR_OPERATION_INVALID, "%s", _("domain is not running")); goto endjob; @@ -9653,6 +9662,7 @@ qemuDomainMigrateBegin3(virDomainPtr domain, if (qemuDomainCheckEjectableMedia(driver, vm, asyncJob) < 0) goto endjob; +offline: if (!(xml = qemuMigrationBegin(driver, vm, xmlin, dname, cookieout, cookieoutlen, flags))) @@ -9888,6 +9898,11 @@ qemuDomainMigrateConfirm3(virDomainPtr domain, goto cleanup; } + if (flags & VIR_MIGRATE_OFFLINE) { + ret = 0; + goto cleanup; + } + if (!qemuMigrationJobIsActive(vm, QEMU_ASYNC_JOB_MIGRATION_OUT)) goto cleanup; diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 1b21ef6..4dd06c2 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -70,6 +70,7 @@ enum qemuMigrationCookieFlags { QEMU_MIGRATION_COOKIE_FLAG_GRAPHICS, QEMU_MIGRATION_COOKIE_FLAG_LOCKSTATE, QEMU_MIGRATION_COOKIE_FLAG_PERSISTENT, + QEMU_MIGRATION_COOKIE_FLAG_OFFLINE, QEMU_MIGRATION_COOKIE_FLAG_LAST }; @@ -77,12 +78,13 @@ enum qemuMigrationCookieFlags { VIR_ENUM_DECL(qemuMigrationCookieFlag); VIR_ENUM_IMPL(qemuMigrationCookieFlag, QEMU_MIGRATION_COOKIE_FLAG_LAST, - "graphics", "lockstate", "persistent"); + "graphics", "lockstate", "persistent", "offline"); enum qemuMigrationCookieFeatures { QEMU_MIGRATION_COOKIE_GRAPHICS = (1 << QEMU_MIGRATION_COOKIE_FLAG_GRAPHICS), QEMU_MIGRATION_COOKIE_LOCKSTATE = (1 << QEMU_MIGRATION_COOKIE_FLAG_LOCKSTATE), QEMU_MIGRATION_COOKIE_PERSISTENT = (1 << QEMU_MIGRATION_COOKIE_FLAG_PERSISTENT), + QEMU_MIGRATION_COOKIE_OFFLINE = (1 << QEMU_MIGRATION_COOKIE_FLAG_OFFLINE), }; typedef struct _qemuMigrationCookieGraphics qemuMigrationCookieGraphics; @@ -439,6 +441,10 @@ qemuMigrationCookieXMLFormat(struct qemud_driver *driver, virBufferAdjustIndent(buf, -2); } + if (mig->flags & QEMU_MIGRATION_COOKIE_OFFLINE) { + virBufferAsprintf(buf, " <offline/>\n"); + } + virBufferAddLit(buf, "</qemu-migration>\n"); return 0; } @@ -662,6 +668,12 @@ qemuMigrationCookieXMLParse(qemuMigrationCookiePtr mig, VIR_FREE(nodes); } + if ((flags & QEMU_MIGRATION_COOKIE_OFFLINE)) { + if (virXPathBoolean("count(./offline) > 0", ctxt)) { + mig->flags |= QEMU_MIGRATION_COOKIE_OFFLINE; + } + } + return 0; error: @@ -721,6 +733,10 @@ qemuMigrationBakeCookie(qemuMigrationCookiePtr mig, qemuMigrationCookieAddPersistent(mig, dom) < 0) return -1; + if (flags & QEMU_MIGRATION_COOKIE_OFFLINE) { + mig->flags |= QEMU_MIGRATION_COOKIE_OFFLINE; + } + if (!(*cookieout = qemuMigrationCookieXMLFormatStr(driver, mig))) return -1; @@ -1151,6 +1167,13 @@ char *qemuMigrationBegin(struct qemud_driver *driver, QEMU_MIGRATION_COOKIE_LOCKSTATE) < 0) goto cleanup; + if (flags & VIR_MIGRATE_OFFLINE) { + if (qemuMigrationBakeCookie(mig, driver, vm, + cookieout, cookieoutlen, + QEMU_MIGRATION_COOKIE_OFFLINE) < 0) + goto cleanup; + } + if (xmlin) { if (!(def = virDomainDefParseString(driver->caps, xmlin, QEMU_EXPECTED_VIRT_TYPES, @@ -1314,6 +1337,15 @@ qemuMigrationPrepareAny(struct qemud_driver *driver, goto endjob; } + if (!(mig = qemuMigrationEatCookie(driver, vm, cookiein, cookieinlen, + QEMU_MIGRATION_COOKIE_OFFLINE))) + return ret; + + if (mig->flags & QEMU_MIGRATION_COOKIE_OFFLINE) { + ret = 0; + goto cleanup; + } + /* Start the QEMU daemon, with the same command-line arguments plus * -incoming $migrateFrom */ @@ -1856,7 +1888,8 @@ qemuMigrationRun(struct qemud_driver *driver, virLockManagerPluginGetName(driver->lockManager)); return -1; } - + if (flags & VIR_MIGRATE_OFFLINE) + return 0; if (!(mig = qemuMigrationEatCookie(driver, vm, cookiein, cookieinlen, QEMU_MIGRATION_COOKIE_GRAPHICS))) goto cleanup; @@ -2372,6 +2405,8 @@ static int doPeer2PeerMigrate3(struct qemud_driver *driver, qemuDomainObjExitRemoteWithDriver(driver, vm); } VIR_FREE(dom_xml); + if (flags & VIR_MIGRATE_OFFLINE) + goto cleanup; if (ret == -1) goto cleanup; @@ -2477,7 +2512,7 @@ finish: vm->def->name); cleanup: - if (ddomain) { + if (ddomain || (flags & VIR_MIGRATE_OFFLINE)) { virObjectUnref(ddomain); ret = 0; } else { @@ -2554,7 +2589,7 @@ static int doPeer2PeerMigrate(struct qemud_driver *driver, } /* domain may have been stopped while we were talking to remote daemon */ - if (!virDomainObjIsActive(vm)) { + if (!virDomainObjIsActive(vm) && !(flags & VIR_MIGRATE_OFFLINE)) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("guest unexpectedly quit")); goto cleanup; @@ -2617,7 +2652,7 @@ qemuMigrationPerformJob(struct qemud_driver *driver, if (qemuMigrationJobStart(driver, vm, QEMU_ASYNC_JOB_MIGRATION_OUT) < 0) goto cleanup; - if (!virDomainObjIsActive(vm)) { + if (!virDomainObjIsActive(vm) && !(flags & VIR_MIGRATE_OFFLINE)) { virReportError(VIR_ERR_OPERATION_INVALID, "%s", _("domain is not running")); goto endjob; @@ -2941,6 +2976,8 @@ qemuMigrationFinish(struct qemud_driver *driver, */ if (retcode == 0) { if (!virDomainObjIsActive(vm)) { + if (flags & VIR_MIGRATE_OFFLINE) + goto offline; virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("guest unexpectedly quit")); goto endjob; @@ -3038,7 +3075,7 @@ qemuMigrationFinish(struct qemud_driver *driver, goto endjob; } } - + offline: dom = virGetDomain (dconn, vm->def->name, vm->def->uuid); event = virDomainEventNewFromObj(vm, @@ -3120,7 +3157,10 @@ int qemuMigrationConfirm(struct qemud_driver *driver, if (!(mig = qemuMigrationEatCookie(driver, vm, cookiein, cookieinlen, 0))) return -1; - + if (flags & VIR_MIGRATE_OFFLINE) { + rv = 0; + goto cleanup; + } /* Did the migration go as planned? If yes, kill off the * domain object, but if no, resume CPUs */ diff --git a/src/qemu/qemu_migration.h b/src/qemu/qemu_migration.h index 1740204..2bcaea0 100644 --- a/src/qemu/qemu_migration.h +++ b/src/qemu/qemu_migration.h @@ -36,7 +36,8 @@ VIR_MIGRATE_NON_SHARED_DISK | \ VIR_MIGRATE_NON_SHARED_INC | \ VIR_MIGRATE_CHANGE_PROTECTION | \ - VIR_MIGRATE_UNSAFE) + VIR_MIGRATE_UNSAFE | \ + VIR_MIGRATE_OFFLINE) enum qemuMigrationJobPhase { QEMU_MIGRATION_PHASE_NONE = 0, diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 4684466..ec25043 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -6525,6 +6525,7 @@ static const vshCmdOptDef opts_migrate[] = { {"dname", VSH_OT_DATA, 0, N_("rename to new name during migration (if supported)")}, {"timeout", VSH_OT_INT, 0, N_("force guest to suspend if live migration exceeds timeout (in seconds)")}, {"xml", VSH_OT_STRING, 0, N_("filename containing updated XML for the target")}, + {"offline", VSH_OT_BOOL, 0, N_("for offline migration")}, {NULL, 0, 0, NULL} }; @@ -6591,6 +6592,11 @@ doMigrate(void *opaque) if (vshCommandOptBool(cmd, "unsafe")) flags |= VIR_MIGRATE_UNSAFE; + if (vshCommandOptBool(cmd, "offline")) { + if (!virDomainIsActive(dom)) + flags |= VIR_MIGRATE_OFFLINE; + } + if (xmlfile && virFileReadAll(xmlfile, 8192, &xml) < 0) { vshError(ctl, _("file '%s' doesn't exist"), xmlfile); -- 1.7.2.5

1 0

[libvirt] [PATCH] support offline migration
by liguang 12 Sep '12

12 Sep '12

original migration did not aware of offline case so, add code to support offline migration quietly (did not disturb original migration) by pass VIR_MIGRATE_OFFLINE flag to migration APIs if only the domain is really inactive, and migration process will not puzzled by domain offline and exit unexpectedly. these changes did not take care of disk images the domain required, for them could be transferred by other APIs as suggested, then VIR_MIGRATE_OFFLINE should not combined with VIR_MIGRATE_NON_SHARED_*. so, this migration result is just make domain definition alive at target side. Signed-off-by: liguang <lig.fnst(a)cn.fujitsu.com> --- include/libvirt/libvirt.h.in | 1 + src/qemu/qemu_driver.c | 15 +++++++++++ src/qemu/qemu_migration.c | 54 ++++++++++++++++++++++++++++++++++++----- src/qemu/qemu_migration.h | 3 +- tools/virsh-domain.c | 6 ++++ 5 files changed, 71 insertions(+), 8 deletions(-) diff --git a/include/libvirt/libvirt.h.in b/include/libvirt/libvirt.h.in index cfe5047..77df2ab 100644 --- a/include/libvirt/libvirt.h.in +++ b/include/libvirt/libvirt.h.in @@ -995,6 +995,7 @@ typedef enum { * whole migration process; this will be used automatically * when supported */ VIR_MIGRATE_UNSAFE = (1 << 9), /* force migration even if it is considered unsafe */ + VIR_MIGRATE_OFFLINE = (1 << 10), /* offline migrate */ } virDomainMigrateFlags; /* Domain migration. */ diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index b12d9bc..2380ccc 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -9641,6 +9641,15 @@ qemuDomainMigrateBegin3(virDomainPtr domain, } if (!virDomainObjIsActive(vm)) { + if (flags & VIR_MIGRATE_OFFLINE) { + if (flags & (VIR_MIGRATE_NON_SHARED_DISK| + VIR_MIGRATE_NON_SHARED_INC)) { + virReportError(VIR_ERR_OPERATION_INVALID, + "%s", _("migrating storage handled by volume APIs")); + goto endjob; + } + goto offline; + } virReportError(VIR_ERR_OPERATION_INVALID, "%s", _("domain is not running")); goto endjob; @@ -9653,6 +9662,7 @@ qemuDomainMigrateBegin3(virDomainPtr domain, if (qemuDomainCheckEjectableMedia(driver, vm, asyncJob) < 0) goto endjob; +offline: if (!(xml = qemuMigrationBegin(driver, vm, xmlin, dname, cookieout, cookieoutlen, flags))) @@ -9888,6 +9898,11 @@ qemuDomainMigrateConfirm3(virDomainPtr domain, goto cleanup; } + if (flags & VIR_MIGRATE_OFFLINE) { + ret = 0; + goto cleanup; + } + if (!qemuMigrationJobIsActive(vm, QEMU_ASYNC_JOB_MIGRATION_OUT)) goto cleanup; diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 1b21ef6..4dd06c2 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -70,6 +70,7 @@ enum qemuMigrationCookieFlags { QEMU_MIGRATION_COOKIE_FLAG_GRAPHICS, QEMU_MIGRATION_COOKIE_FLAG_LOCKSTATE, QEMU_MIGRATION_COOKIE_FLAG_PERSISTENT, + QEMU_MIGRATION_COOKIE_FLAG_OFFLINE, QEMU_MIGRATION_COOKIE_FLAG_LAST }; @@ -77,12 +78,13 @@ enum qemuMigrationCookieFlags { VIR_ENUM_DECL(qemuMigrationCookieFlag); VIR_ENUM_IMPL(qemuMigrationCookieFlag, QEMU_MIGRATION_COOKIE_FLAG_LAST, - "graphics", "lockstate", "persistent"); + "graphics", "lockstate", "persistent", "offline"); enum qemuMigrationCookieFeatures { QEMU_MIGRATION_COOKIE_GRAPHICS = (1 << QEMU_MIGRATION_COOKIE_FLAG_GRAPHICS), QEMU_MIGRATION_COOKIE_LOCKSTATE = (1 << QEMU_MIGRATION_COOKIE_FLAG_LOCKSTATE), QEMU_MIGRATION_COOKIE_PERSISTENT = (1 << QEMU_MIGRATION_COOKIE_FLAG_PERSISTENT), + QEMU_MIGRATION_COOKIE_OFFLINE = (1 << QEMU_MIGRATION_COOKIE_FLAG_OFFLINE), }; typedef struct _qemuMigrationCookieGraphics qemuMigrationCookieGraphics; @@ -439,6 +441,10 @@ qemuMigrationCookieXMLFormat(struct qemud_driver *driver, virBufferAdjustIndent(buf, -2); } + if (mig->flags & QEMU_MIGRATION_COOKIE_OFFLINE) { + virBufferAsprintf(buf, " <offline/>\n"); + } + virBufferAddLit(buf, "</qemu-migration>\n"); return 0; } @@ -662,6 +668,12 @@ qemuMigrationCookieXMLParse(qemuMigrationCookiePtr mig, VIR_FREE(nodes); } + if ((flags & QEMU_MIGRATION_COOKIE_OFFLINE)) { + if (virXPathBoolean("count(./offline) > 0", ctxt)) { + mig->flags |= QEMU_MIGRATION_COOKIE_OFFLINE; + } + } + return 0; error: @@ -721,6 +733,10 @@ qemuMigrationBakeCookie(qemuMigrationCookiePtr mig, qemuMigrationCookieAddPersistent(mig, dom) < 0) return -1; + if (flags & QEMU_MIGRATION_COOKIE_OFFLINE) { + mig->flags |= QEMU_MIGRATION_COOKIE_OFFLINE; + } + if (!(*cookieout = qemuMigrationCookieXMLFormatStr(driver, mig))) return -1; @@ -1151,6 +1167,13 @@ char *qemuMigrationBegin(struct qemud_driver *driver, QEMU_MIGRATION_COOKIE_LOCKSTATE) < 0) goto cleanup; + if (flags & VIR_MIGRATE_OFFLINE) { + if (qemuMigrationBakeCookie(mig, driver, vm, + cookieout, cookieoutlen, + QEMU_MIGRATION_COOKIE_OFFLINE) < 0) + goto cleanup; + } + if (xmlin) { if (!(def = virDomainDefParseString(driver->caps, xmlin, QEMU_EXPECTED_VIRT_TYPES, @@ -1314,6 +1337,15 @@ qemuMigrationPrepareAny(struct qemud_driver *driver, goto endjob; } + if (!(mig = qemuMigrationEatCookie(driver, vm, cookiein, cookieinlen, + QEMU_MIGRATION_COOKIE_OFFLINE))) + return ret; + + if (mig->flags & QEMU_MIGRATION_COOKIE_OFFLINE) { + ret = 0; + goto cleanup; + } + /* Start the QEMU daemon, with the same command-line arguments plus * -incoming $migrateFrom */ @@ -1856,7 +1888,8 @@ qemuMigrationRun(struct qemud_driver *driver, virLockManagerPluginGetName(driver->lockManager)); return -1; } - + if (flags & VIR_MIGRATE_OFFLINE) + return 0; if (!(mig = qemuMigrationEatCookie(driver, vm, cookiein, cookieinlen, QEMU_MIGRATION_COOKIE_GRAPHICS))) goto cleanup; @@ -2372,6 +2405,8 @@ static int doPeer2PeerMigrate3(struct qemud_driver *driver, qemuDomainObjExitRemoteWithDriver(driver, vm); } VIR_FREE(dom_xml); + if (flags & VIR_MIGRATE_OFFLINE) + goto cleanup; if (ret == -1) goto cleanup; @@ -2477,7 +2512,7 @@ finish: vm->def->name); cleanup: - if (ddomain) { + if (ddomain || (flags & VIR_MIGRATE_OFFLINE)) { virObjectUnref(ddomain); ret = 0; } else { @@ -2554,7 +2589,7 @@ static int doPeer2PeerMigrate(struct qemud_driver *driver, } /* domain may have been stopped while we were talking to remote daemon */ - if (!virDomainObjIsActive(vm)) { + if (!virDomainObjIsActive(vm) && !(flags & VIR_MIGRATE_OFFLINE)) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("guest unexpectedly quit")); goto cleanup; @@ -2617,7 +2652,7 @@ qemuMigrationPerformJob(struct qemud_driver *driver, if (qemuMigrationJobStart(driver, vm, QEMU_ASYNC_JOB_MIGRATION_OUT) < 0) goto cleanup; - if (!virDomainObjIsActive(vm)) { + if (!virDomainObjIsActive(vm) && !(flags & VIR_MIGRATE_OFFLINE)) { virReportError(VIR_ERR_OPERATION_INVALID, "%s", _("domain is not running")); goto endjob; @@ -2941,6 +2976,8 @@ qemuMigrationFinish(struct qemud_driver *driver, */ if (retcode == 0) { if (!virDomainObjIsActive(vm)) { + if (flags & VIR_MIGRATE_OFFLINE) + goto offline; virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("guest unexpectedly quit")); goto endjob; @@ -3038,7 +3075,7 @@ qemuMigrationFinish(struct qemud_driver *driver, goto endjob; } } - + offline: dom = virGetDomain (dconn, vm->def->name, vm->def->uuid); event = virDomainEventNewFromObj(vm, @@ -3120,7 +3157,10 @@ int qemuMigrationConfirm(struct qemud_driver *driver, if (!(mig = qemuMigrationEatCookie(driver, vm, cookiein, cookieinlen, 0))) return -1; - + if (flags & VIR_MIGRATE_OFFLINE) { + rv = 0; + goto cleanup; + } /* Did the migration go as planned? If yes, kill off the * domain object, but if no, resume CPUs */ diff --git a/src/qemu/qemu_migration.h b/src/qemu/qemu_migration.h index 1740204..2bcaea0 100644 --- a/src/qemu/qemu_migration.h +++ b/src/qemu/qemu_migration.h @@ -36,7 +36,8 @@ VIR_MIGRATE_NON_SHARED_DISK | \ VIR_MIGRATE_NON_SHARED_INC | \ VIR_MIGRATE_CHANGE_PROTECTION | \ - VIR_MIGRATE_UNSAFE) + VIR_MIGRATE_UNSAFE | \ + VIR_MIGRATE_OFFLINE) enum qemuMigrationJobPhase { QEMU_MIGRATION_PHASE_NONE = 0, diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 4684466..ec25043 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -6525,6 +6525,7 @@ static const vshCmdOptDef opts_migrate[] = { {"dname", VSH_OT_DATA, 0, N_("rename to new name during migration (if supported)")}, {"timeout", VSH_OT_INT, 0, N_("force guest to suspend if live migration exceeds timeout (in seconds)")}, {"xml", VSH_OT_STRING, 0, N_("filename containing updated XML for the target")}, + {"offline", VSH_OT_BOOL, 0, N_("for offline migration")}, {NULL, 0, 0, NULL} }; @@ -6591,6 +6592,11 @@ doMigrate(void *opaque) if (vshCommandOptBool(cmd, "unsafe")) flags |= VIR_MIGRATE_UNSAFE; + if (vshCommandOptBool(cmd, "offline")) { + if (!virDomainIsActive(dom)) + flags |= VIR_MIGRATE_OFFLINE; + } + if (xmlfile && virFileReadAll(xmlfile, 8192, &xml) < 0) { vshError(ctl, _("file '%s' doesn't exist"), xmlfile); -- 1.7.2.5

1 0

[libvirt] [PATCH V6] support offline migration
by liguang 12 Sep '12

12 Sep '12

original migration did not aware of offline case so, add code to support offline migration quietly (did not disturb original migration) by pass VIR_MIGRATE_OFFLINE flag to migration APIs if the domain is really inactive, and migration process will not puzzeled by domain offline and exit unexpectly. these changes did not take care of disk images the domain required, for disk images could be transfered by other APIs as suggested. so, the migration result is just make domain definition alive at target side. Signed-off-by: liguang <lig.fnst(a)cn.fujitsu.com> --- include/libvirt/libvirt.h.in | 1 + src/qemu/qemu_driver.c | 8 ++++++ src/qemu/qemu_migration.c | 55 ++++++++++++++++++++++++++++++++++++----- src/qemu/qemu_migration.h | 3 +- tools/virsh-domain.c | 6 ++++ 5 files changed, 65 insertions(+), 8 deletions(-) diff --git a/include/libvirt/libvirt.h.in b/include/libvirt/libvirt.h.in index cfe5047..77df2ab 100644 --- a/include/libvirt/libvirt.h.in +++ b/include/libvirt/libvirt.h.in @@ -995,6 +995,7 @@ typedef enum { * whole migration process; this will be used automatically * when supported */ VIR_MIGRATE_UNSAFE = (1 << 9), /* force migration even if it is considered unsafe */ + VIR_MIGRATE_OFFLINE = (1 << 10), /* offline migrate */ } virDomainMigrateFlags; /* Domain migration. */ diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index b12d9bc..e70a5cc 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -9641,6 +9641,8 @@ qemuDomainMigrateBegin3(virDomainPtr domain, } if (!virDomainObjIsActive(vm)) { + if (flags & VIR_MIGRATE_OFFLINE) + goto offline; virReportError(VIR_ERR_OPERATION_INVALID, "%s", _("domain is not running")); goto endjob; @@ -9653,6 +9655,7 @@ qemuDomainMigrateBegin3(virDomainPtr domain, if (qemuDomainCheckEjectableMedia(driver, vm, asyncJob) < 0) goto endjob; +offline: if (!(xml = qemuMigrationBegin(driver, vm, xmlin, dname, cookieout, cookieoutlen, flags))) @@ -9888,6 +9891,11 @@ qemuDomainMigrateConfirm3(virDomainPtr domain, goto cleanup; } + if (flags & VIR_MIGRATE_OFFLINE) { + ret = 0; + goto cleanup; + } + if (!qemuMigrationJobIsActive(vm, QEMU_ASYNC_JOB_MIGRATION_OUT)) goto cleanup; diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 1b21ef6..a54a26e 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -70,6 +70,7 @@ enum qemuMigrationCookieFlags { QEMU_MIGRATION_COOKIE_FLAG_GRAPHICS, QEMU_MIGRATION_COOKIE_FLAG_LOCKSTATE, QEMU_MIGRATION_COOKIE_FLAG_PERSISTENT, + QEMU_MIGRATION_COOKIE_FLAG_OFFLINE, QEMU_MIGRATION_COOKIE_FLAG_LAST }; @@ -77,12 +78,13 @@ enum qemuMigrationCookieFlags { VIR_ENUM_DECL(qemuMigrationCookieFlag); VIR_ENUM_IMPL(qemuMigrationCookieFlag, QEMU_MIGRATION_COOKIE_FLAG_LAST, - "graphics", "lockstate", "persistent"); + "graphics", "lockstate", "persistent", "offline"); enum qemuMigrationCookieFeatures { QEMU_MIGRATION_COOKIE_GRAPHICS = (1 << QEMU_MIGRATION_COOKIE_FLAG_GRAPHICS), QEMU_MIGRATION_COOKIE_LOCKSTATE = (1 << QEMU_MIGRATION_COOKIE_FLAG_LOCKSTATE), QEMU_MIGRATION_COOKIE_PERSISTENT = (1 << QEMU_MIGRATION_COOKIE_FLAG_PERSISTENT), + QEMU_MIGRATION_COOKIE_OFFLINE = (1 << QEMU_MIGRATION_COOKIE_FLAG_OFFLINE), }; typedef struct _qemuMigrationCookieGraphics qemuMigrationCookieGraphics; @@ -439,6 +441,11 @@ qemuMigrationCookieXMLFormat(struct qemud_driver *driver, virBufferAdjustIndent(buf, -2); } + if (mig->flags & QEMU_MIGRATION_COOKIE_OFFLINE) { + virBufferAsprintf(buf, " <offline>\n"); + virBufferAddLit(buf, " </offline>\n"); + } + virBufferAddLit(buf, "</qemu-migration>\n"); return 0; } @@ -662,6 +669,12 @@ qemuMigrationCookieXMLParse(qemuMigrationCookiePtr mig, VIR_FREE(nodes); } + if ((flags & QEMU_MIGRATION_COOKIE_OFFLINE)) { + if (virXPathBoolean("count(./offline) > 0", ctxt)) { + mig->flags |= QEMU_MIGRATION_COOKIE_OFFLINE; + } + } + return 0; error: @@ -721,6 +734,10 @@ qemuMigrationBakeCookie(qemuMigrationCookiePtr mig, qemuMigrationCookieAddPersistent(mig, dom) < 0) return -1; + if (flags & QEMU_MIGRATION_COOKIE_OFFLINE) { + mig->flags |= QEMU_MIGRATION_COOKIE_OFFLINE; + } + if (!(*cookieout = qemuMigrationCookieXMLFormatStr(driver, mig))) return -1; @@ -1151,6 +1168,13 @@ char *qemuMigrationBegin(struct qemud_driver *driver, QEMU_MIGRATION_COOKIE_LOCKSTATE) < 0) goto cleanup; + if (flags & VIR_MIGRATE_OFFLINE) { + if (qemuMigrationBakeCookie(mig, driver, vm, + cookieout, cookieoutlen, + QEMU_MIGRATION_COOKIE_OFFLINE) < 0) + goto cleanup; + } + if (xmlin) { if (!(def = virDomainDefParseString(driver->caps, xmlin, QEMU_EXPECTED_VIRT_TYPES, @@ -1314,6 +1338,15 @@ qemuMigrationPrepareAny(struct qemud_driver *driver, goto endjob; } + if (!(mig = qemuMigrationEatCookie(driver, vm, cookiein, cookieinlen, + QEMU_MIGRATION_COOKIE_OFFLINE))) + return ret; + + if (mig->flags & QEMU_MIGRATION_COOKIE_OFFLINE) { + ret = 0; + goto cleanup; + } + /* Start the QEMU daemon, with the same command-line arguments plus * -incoming $migrateFrom */ @@ -1856,7 +1889,8 @@ qemuMigrationRun(struct qemud_driver *driver, virLockManagerPluginGetName(driver->lockManager)); return -1; } - + if (flags & VIR_MIGRATE_OFFLINE) + return 0; if (!(mig = qemuMigrationEatCookie(driver, vm, cookiein, cookieinlen, QEMU_MIGRATION_COOKIE_GRAPHICS))) goto cleanup; @@ -2372,6 +2406,8 @@ static int doPeer2PeerMigrate3(struct qemud_driver *driver, qemuDomainObjExitRemoteWithDriver(driver, vm); } VIR_FREE(dom_xml); + if (flags & VIR_MIGRATE_OFFLINE) + goto cleanup; if (ret == -1) goto cleanup; @@ -2477,7 +2513,7 @@ finish: vm->def->name); cleanup: - if (ddomain) { + if (ddomain || (flags & VIR_MIGRATE_OFFLINE)) { virObjectUnref(ddomain); ret = 0; } else { @@ -2554,7 +2590,7 @@ static int doPeer2PeerMigrate(struct qemud_driver *driver, } /* domain may have been stopped while we were talking to remote daemon */ - if (!virDomainObjIsActive(vm)) { + if (!virDomainObjIsActive(vm) && !(flags & VIR_MIGRATE_OFFLINE)) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("guest unexpectedly quit")); goto cleanup; @@ -2617,7 +2653,7 @@ qemuMigrationPerformJob(struct qemud_driver *driver, if (qemuMigrationJobStart(driver, vm, QEMU_ASYNC_JOB_MIGRATION_OUT) < 0) goto cleanup; - if (!virDomainObjIsActive(vm)) { + if (!virDomainObjIsActive(vm) && !(flags & VIR_MIGRATE_OFFLINE)) { virReportError(VIR_ERR_OPERATION_INVALID, "%s", _("domain is not running")); goto endjob; @@ -2941,6 +2977,8 @@ qemuMigrationFinish(struct qemud_driver *driver, */ if (retcode == 0) { if (!virDomainObjIsActive(vm)) { + if (flags & VIR_MIGRATE_OFFLINE) + goto offline; virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("guest unexpectedly quit")); goto endjob; @@ -3038,7 +3076,7 @@ qemuMigrationFinish(struct qemud_driver *driver, goto endjob; } } - + offline: dom = virGetDomain (dconn, vm->def->name, vm->def->uuid); event = virDomainEventNewFromObj(vm, @@ -3120,7 +3158,10 @@ int qemuMigrationConfirm(struct qemud_driver *driver, if (!(mig = qemuMigrationEatCookie(driver, vm, cookiein, cookieinlen, 0))) return -1; - + if (flags & VIR_MIGRATE_OFFLINE) { + rv = 0; + goto cleanup; + } /* Did the migration go as planned? If yes, kill off the * domain object, but if no, resume CPUs */ diff --git a/src/qemu/qemu_migration.h b/src/qemu/qemu_migration.h index 1740204..2bcaea0 100644 --- a/src/qemu/qemu_migration.h +++ b/src/qemu/qemu_migration.h @@ -36,7 +36,8 @@ VIR_MIGRATE_NON_SHARED_DISK | \ VIR_MIGRATE_NON_SHARED_INC | \ VIR_MIGRATE_CHANGE_PROTECTION | \ - VIR_MIGRATE_UNSAFE) + VIR_MIGRATE_UNSAFE | \ + VIR_MIGRATE_OFFLINE) enum qemuMigrationJobPhase { QEMU_MIGRATION_PHASE_NONE = 0, diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 4684466..ec25043 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -6525,6 +6525,7 @@ static const vshCmdOptDef opts_migrate[] = { {"dname", VSH_OT_DATA, 0, N_("rename to new name during migration (if supported)")}, {"timeout", VSH_OT_INT, 0, N_("force guest to suspend if live migration exceeds timeout (in seconds)")}, {"xml", VSH_OT_STRING, 0, N_("filename containing updated XML for the target")}, + {"offline", VSH_OT_BOOL, 0, N_("for offline migration")}, {NULL, 0, 0, NULL} }; @@ -6591,6 +6592,11 @@ doMigrate(void *opaque) if (vshCommandOptBool(cmd, "unsafe")) flags |= VIR_MIGRATE_UNSAFE; + if (vshCommandOptBool(cmd, "offline")) { + if (!virDomainIsActive(dom)) + flags |= VIR_MIGRATE_OFFLINE; + } + if (xmlfile && virFileReadAll(xmlfile, 8192, &xml) < 0) { vshError(ctl, _("file '%s' doesn't exist"), xmlfile); -- 1.7.2.5

3 7

[libvirt] [PATCH v2 0/9] improve virBitmap
by Hu Tao 12 Sep '12

12 Sep '12

In many places we store bitmap info in a chunk of data (pointed to by a char *), and have redundant codes to set/unset bits. This series extends virBitmap, and convert those codes to use virBitmap. changes: v2: - fix bug in qemuSetupCgroupForEmulator - new function virBitmapNextSetBit - virBitmapcmp -> virBitmapEqual - virBitmap: store bits in little endian format - some improvements of virBitmap - fix some memory leaks Hu Tao (9): fix bug in qemuSetupCgroupForEmulator New functions for virBitmap use virBitmap to store cpupin info use virBitmap to store cpu affinity info use virBitmap to store numa nodemask info. use virBitmap to store cpumask info. use virBitmap to store cells' cpumask info. use virBitmap to store nodeinfo. remove virDomainCpuSetFormat and virDomainCpuSetParse .gitignore | 1 + src/conf/cpu_conf.c | 17 +- src/conf/cpu_conf.h | 3 +- src/conf/domain_conf.c | 392 ++++++--------------------------- src/conf/domain_conf.h | 18 +- src/libvirt_private.syms | 14 +- src/lxc/lxc_controller.c | 56 ++--- src/nodeinfo.c | 26 +-- src/nodeinfo.h | 6 +- src/parallels/parallels_driver.c | 5 +- src/qemu/qemu_cgroup.c | 18 +- src/qemu/qemu_cgroup.h | 2 +- src/qemu/qemu_command.c | 43 +--- src/qemu/qemu_driver.c | 168 +++++++------- src/qemu/qemu_process.c | 141 ++++-------- src/test/test_driver.c | 5 +- src/util/bitmap.c | 451 +++++++++++++++++++++++++++++++++++++- src/util/bitmap.h | 34 +++ src/util/processinfo.c | 36 +-- src/util/processinfo.h | 9 +- src/vmx/vmx.c | 36 +-- tests/Makefile.am | 7 +- tests/cpuset | 2 +- tests/virbitmaptest.c | 233 ++++++++++++++++++++ 24 files changed, 1034 insertions(+), 689 deletions(-) create mode 100644 tests/virbitmaptest.c -- 1.7.10.2

2 15

[libvirt] [PATCH] python: Initialize new_params in virDomainSetSchedulerParameters
by Federico Simoncelli 12 Sep '12

12 Sep '12

The new_params variable must be initialized in case the virDomainGetSchedulerParameters call fails and we hit the cleanup section before actually allocating the new parameters. Signed-off-by: Federico Simoncelli <fsimonce(a)redhat.com> --- python/libvirt-override.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/python/libvirt-override.c b/python/libvirt-override.c index bb1d881..485ed28 100644 --- a/python/libvirt-override.c +++ b/python/libvirt-override.c @@ -700,7 +700,7 @@ libvirt_virDomainSetSchedulerParameters(PyObject *self ATTRIBUTE_UNUSED, int i_retval; int nparams = 0; Py_ssize_t size = 0; - virTypedParameterPtr params, new_params; + virTypedParameterPtr params, new_params = NULL; if (!PyArg_ParseTuple(args, (char *)"OO:virDomainSetScedulerParameters", &pyobj_domain, &info)) -- 1.7.1

3 2

[libvirt] 1 of 56 tests failed
by fugui_li 12 Sep '12

12 Sep '12

======================================= make[2]: *** [check-TESTS] Error 1 make[2]: Leaving directory `/home/work/libvirt/91021/libvirt-0.9.10/build/tests' make[1]: *** [check-am] Error 2 make[1]: Leaving directory `/home/work/libvirt/91021/libvirt-0.9.10/build/tests' make: *** [check-recursive] Error 1 exec 3>&- test "$st" = 0 fugui_li

2 1

[libvirt] [PATCH] docs: page.xsl: fix FAQ link in subdirectories
by Ján Tomko 11 Sep '12

11 Sep '12

Links to the FAQ didn't work on pages in subdirectories, like devhelp/libvirt-virterror.html or internals/command.html, because they have had href_base prepended to them. --- docs/page.xsl | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/docs/page.xsl b/docs/page.xsl index fc782a2..bc8ea2a 100644 --- a/docs/page.xsl +++ b/docs/page.xsl @@ -54,7 +54,7 @@ <xsl:when test="$pagename = a/@href"> <span class="{$class}"><xsl:value-of select="a"/></span> </xsl:when> - <xsl:when test="a/@href = 'http://wiki.libvirt.org'"> + <xsl:when test="starts-with(a/@href, 'http://wiki.libvirt.org')"> <a title="{./span}" class="{$class}" href="{a/@href}"><xsl:value-of select="a"/></a> </xsl:when> <xsl:otherwise> -- 1.7.8.6

2 1

[libvirt] [PATCHv1 0/4] Subject: [PATCHv1 0/4] qemu: Add sandbox support
by Ján Tomko 11 Sep '12

11 Sep '12

This series adds support to run QEMU with sandbox enabled, a syscall filter using seccomp. It can be configured in qemu.conf to on, off, or the QEMU default, which is off in 1.2. Default value is the QEMU default. V1 of the patches supports tri-state configuration and includes a test for detecting the capability. Ján Tomko (4): qemu: add capability flag for sandbox qemu: conf: add sandbox option qemu: add -sandbox to command line if requested tests: add qemu-1.2.0 data src/qemu/qemu.conf | 8 + src/qemu/qemu_capabilities.c | 3 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 7 + src/qemu/qemu_conf.c | 5 + src/qemu/qemu_conf.h | 1 + tests/qemuhelpdata/qemu-1.2.0 | 270 ++++++++++++++++++++++++++++++++++ tests/qemuhelpdata/qemu-1.2.0-device | 181 +++++++++++++++++++++++ tests/qemuhelptest.c | 82 ++++++++++ 9 files changed, 558 insertions(+), 0 deletions(-) create mode 100644 tests/qemuhelpdata/qemu-1.2.0 create mode 100644 tests/qemuhelpdata/qemu-1.2.0-device -- 1.7.8.6

2 10

Re: [libvirt] problems using virt-manager
by 王金浦 11 Sep '12

11 Sep '12

2012/9/11 Lentes, Bernd <bernd.lentes(a)helmholtz-muenchen.de> > > Hi, > > i try to run virt-manager on a SLES 11 SP1 box. I'm using kernel 2.6.32.12 > and virt-manager 0.9.4-106.1.x86_64 . > The system is a 64bit box. > > Here is the output: > ========================= > > pc56846:/media/idg2/SysAdmin_AG_Wurst/software_und_treiber/virt_manager/sles_11_sp1 > # virt-manager & > [1] 9659 > > pc56846:/media/idg2/SysAdmin_AG_Wurst/software_und_treiber/virt_manager/sles_11_sp1 > # Traceback (most recent call last): > File "/usr/share/virt-manager/virt-manager.py", line 386, in <module> > main() > File "/usr/share/virt-manager/virt-manager.py", line 247, in main > from virtManager import cli > File "/usr/share/virt-manager/virtManager/cli.py", line 29, in <module> > import libvirt > File "/usr/lib64/python2.6/site-packages/libvirt.py", line 25, in > <module> > raise lib_e > ImportError: /usr/lib64/libvirt.so.0: undefined symbol: > selinux_virtual_domain_context_path > > [1]+ Exit 1 virt-manager > ========================= > Seems libvirt popup a importError, so libvir list may be a good place to ask, add into cc. Jack

2 1

[libvirt] [PATCH] docs: hacking.html.in: fix table of contents
by Ján Tomko 11 Sep '12

11 Sep '12

Two sections didn't have a working link in the TOC. --- docs/hacking.html.in | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/hacking.html.in b/docs/hacking.html.in index eb79953..a97dc22 100644 --- a/docs/hacking.html.in +++ b/docs/hacking.html.in @@ -350,7 +350,7 @@ } </pre> - <h2><a href="types">Preprocessor</a></h2> + <h2><a name="preprocessor">Preprocessor</a></h2> <p> For variadic macros, stick with C99 syntax: @@ -368,7 +368,7 @@ #endif </pre> - <h2><a href="types">C types</a></h2> + <h2><a name="types">C types</a></h2> <p> Use the right type. -- 1.7.8.6

2 1

[libvirt] [libvirt-designer][PATCH 0/3] Cleanup
by Michal Privoznik 11 Sep '12

11 Sep '12

The first two patches are trivial, the third would require some review. Michal Privoznik (3): disk_add: Don't hardcode 'qemu' driver style: Use two blank lines between functions virtxml: Drop direct libvirt usage configure.ac | 24 +++++++++++++++++++-- examples/Makefile.am | 6 +++- examples/virtxml.c | 24 ++++++++-------------- libvirt-designer/libvirt-designer-domain.c | 30 +++++++++++++++++++++++++++- 4 files changed, 63 insertions(+), 21 deletions(-) -- 1.7.8.6

2 5

[libvirt] [PATCH 0/7 v4] Atomic API to list networks
by Osier Yang 11 Sep '12

11 Sep '12

v3 - v4: - Just rebase on top, and split the API from the big set Osier Yang (7): list: Define new API virConnectListAllNetworks list: Implement RPC calls for virConnectListAllNetworks list: Add helpers to list network objects list: Implement listAllNetworks for network driver list: Implement listAllNetworks for test driver list: Use virConnectListAllNetworks in virsh list: Expose virConnectListAllNetworks to Python binding daemon/remote.c | 55 +++++ include/libvirt/libvirt.h.in | 20 ++ python/generator.py | 1 + python/libvirt-override-api.xml | 6 + python/libvirt-override-virConnect.py | 12 ++ python/libvirt-override.c | 48 +++++ src/conf/network_conf.c | 91 +++++++++ src/conf/network_conf.h | 22 ++ src/driver.h | 5 + src/libvirt.c | 86 ++++++++- src/libvirt_private.syms | 1 + src/libvirt_public.syms | 1 + src/network/bridge_driver.c | 17 ++ src/remote/remote_driver.c | 64 ++++++ src/remote/remote_protocol.x | 13 ++- src/remote_protocol-structs | 12 ++ src/test/test_driver.c | 17 ++ tools/virsh-network.c | 352 ++++++++++++++++++++++++-------- tools/virsh.pod | 12 +- 19 files changed, 743 insertions(+), 92 deletions(-) -- 1.7.7.3

3 20

[libvirt] libvirt use of dnsmasq to provide dhcp-ipv6 service
by Gene Czarcinski 11 Sep '12

11 Sep '12

Since around the 2.61 dnsmasq supports providing dhcp-ipv6 services. Yes, I am aware that F17, F18, and rawhide all currently have dnsmasq 2.59 ... I am currently running dnsmasq-2.63. What are the plans for supporting dhcp-ipv6 from dnsmasq? I noticed that if you plug in a dhcp range specification under an ipv6 definition in the xml configuration file that virsh net-edit does not complain about it ... it just makes it disappear! Is the code there but not enabled because you need to support earlier versions of dnsmasq? If the code is there, what is the "magic switch" to turn it on? I understand that if I do that I may well be on my own. Gene

3 3

[libvirt] RFC: take two on live update of network configuration
by Laine Stump 11 Sep '12

11 Sep '12

We need a way to update the elements of a <network> without being required to restart the network before the changes take effect. I had previously thought I could just use a new virNetworkDefineXMLFlags with an optional flag set to mean "take effect immediately", but have been discouraged from that approach. Instead, I'm considering something similar to virDomain(Attach|Update|Detach)DeviceFlags, but this could be more complicated because I would like to be able to update *anything* within the network definition hierarchy, not just the direct subelements of one level in the hierarchy (as is the case for those existing functions). Here's an example of an existing network (note that this isn't a legal network - you can't have an <ip> element and an interface pool (or a bridge name and an interface pool) in the same network; this is just so I can use a single example), and some of the things we might want to do with it: <network> <name>test1</name> <uuid>2d39a0ba-ac4b-6097-114c-50f8bccc277c</uuid> <forward mode='bridge'/> <bridge name='virbr5' stp='on' delay='0' /> <mac address='52:54:00:38:81:4D'/> <domain name='example.com'/> <forward mode='private'/> <interface dev="eth20"/> <interface dev="eth21"/> <interface dev="eth22"/> <interface dev="eth23"/> <interface dev="eth24"/> </forward> <portgroup name='engineering' default='yes'> <virtualport type='802.1Qbh'> <parameters profileid='test'/> </virtualport> <bandwidth> <inbound average='1000' peak='5000' burst='5120'/> <outbound average='1000' peak='5000' burst='5120'/> </bandwidth> </portgroup></b> <portgroup name='sales'> <virtualport type='802.1Qbh'> <parameters profileid='salestest'/> </virtualport> <bandwidth> <inbound average='500' peak='2000' burst='2560'/> <outbound average='128' peak='256' burst='256'/> </bandwidth> </portgroup></b> <dns> <txt name="example" value="example value" /> <srv service='name' protocol='tcp' domain='test-domain-name' target='.' port='1024' priority='10' weight='10'/> <host ip='192.168.122.2'> <hostname>myhost</hostname> <hostname>myhostalias</hostname> </host> </dns> <ip address='10.24.75.1' netmask='255.255.255.0'> <dhcp> <range start='10.24.75.128' end='10.24.75.254' /> <host mac='52:54:3e:77:e2:ed' name='X.example.com' ip='10.24.75.10' /> <host mac='52:54:3e:77:e2:ef' name='Y.example.com' ip='10.24.75.11' /> <host mac='52:54:34:77:e2:f0' name='Z.example.com' ip='10.24.75.12' /> <host mac='52:54:3e:77:e2:f1' name='A.example.com' ip='10.24.75.13' /> </dhcp> </ip> <ip address='192.168.4.1' netmask='255.255.255.0'/> </network> Some things we might want to do to this (the first three have already been requested): 1) add or remove an interface from the interface pool, i.e. a particular <interface> sub-element of the (one and only) <forward> element. 2) add/remove/modify a portgroup entry (i.e. a specific sub-element of <network>) 3) add/remove/modify a static host entry from the <dhcp> section of a particular <ip> (so, a particular <host> sub-element of a particular <ip> element) Some others: 4) add/modify/remove a <host> (or a <txt> or an <srv> in the <dns> section 4) add/modify/remove the <domain> 5) add/modify/remove an entire <ip> element 6) turn stp on/off in the <bridge> element I can see three possible methods of providing this functionality: =========== OPTION 1) Have a single API: virNetworkUpdate(virNetworkPtr network, const char *xml, unsigned, int flags) This function would take an entire <network> specification as an arg, and replace the entire existing config. This would allow changing anything, but would also require reading the entire config beforehand. =========== OPTION 2) have a separate API for each different type of element we may want to change, e.g.: virNetworkUpdateForwardInterface(virNetworkPtr network, const char *xml, unsigned int flags); virNetworkUpdatePortgroup(virNetworkPtr network, const char *xml, unsigned int flags); virNetworkUpdateIpDhcpHost(virNetworkPtr network, const char *xml, unsigned int flags); virNetworkUpdateDnsEntry(virNetworkPtr network, const char *xml, unsigned int flags); /* The name of this one may confuse... */ virNetworkUpdateDomain(virNetworkPtr network, const char *xml, unsigned int flags); virNetworkUpdateBridge(virNetworkPtr network, const char *xml, unsigned int flags); virNetworkUpdateIpDnsHost(virNetworkPtr network, const char *xml, unsigned int flags); etc. (etc. etc.) "flags" would include: /* force add if object with matching key doesn't exist */ VIR_NETWORK_UPDATE_ADD /* delete existing object(s) that matches the xml */ VIR_NETWORK_UPDATE_DELETE /* take effect immediately */ VIR_NETWORK_UPDATE_LIVE /* persistent change */ VIR_NETWORK_UPDATE_CONFIG This method could be problematic, e.g., for something like virNetworkUpdateIpDhcpHost() - although currently only a single <ip> element can have a <dhcp> entries, in the future we could allow any/all of them to have dhcp entries. Another downside is that we would need to add an new function for each new element we decide we want to be able to update. =========== OPTION 3) Again, a single API, but with an added "nodespec" arg which would be used to describe the parent node you of the node you want added/updated to: int virNetworkUpdate(virNetworkPtr network, const char *nodeSpec, const char *xml, unsigned int flags); For example, if you wanted to add a new <host> entry to <ip address='10.24.75.1' ...>'s dhcp element, you would do this: /* nodespec obviously uses an XPath expression */ virNetworkUpdate("/ip[address='10.24.75.1']/dhcp", /* full text of <host> element to add */ "<host mac='00:16:3e:77:e2:ed' " "name='X.example.com' ip='10.24.75.10'/>" VIR_NETWORK_UPDATE_ADD | VIR_NETWORK_UPDATE_LIVE | VIR_NETWORK_UPDATE_CONFIG); Or, to change the contents of the exiting portgroup "engineering" you would use: virNetworkUpdate("/", /* full text of portgroup */, "<portgroup name='engineering'> ..... </portgroup>" VIR_NETWORK_UPDATE_LIVE|VIR_NETWORK_UPDATE_CONFIG); To delete a static dhcp host entry, you would use this: virNetworkUpdate("/ip[address='10.24.75.1']/dhcp", /* just enough to match existing entry */ "<host mac='00:16:3e:77:e2:ed'/>", VIR_NETWORK_UPDATE_DELETE | VIR_NETWORK_UPDATE_LIVE | VIR_NETWORK_UPDATE_CONFIG); or if you preferred: virNetworkUpdate("/ip[address='10.24.75.1']/dhcp", /* again, just enough to match */ "<host ip='10.24.75.10'/>", VIR_NETWORK_UPDATE_DELETE |VIR_NETWORK_UPDATE_LIVE | VIR_NETWORK_UPDATE_CONFIG); To remove an interface from the interface pool: virNetworkUpdate("/forward", "<interface dev='eth20'/>", VIR_NETWORK_UPDATE_DELETE | VIR_NETWORK_UPDATE_LIVE | VIR_NETWORK_UPDATE_CONFIG) (adding an interface would be identical, except the flag). (An alternate implementation would be to have nodeSpec specify the node that is being updated/removed rather than its parent. This may make more logical sense, (although not for ADD) and would even make the rest of the code simpler for update/remove (we wouldn't have to do a manual search within the node). The positive side of this is that the one API function allows you to modify *anything* (even stuff not yet invented, so it's future-proof). The negative side is that the code that implements it would need to go to quite a bit of extra trouble to determine what has been changed (basically, it would a) generate XML for the current state of the network, b) parse that into an xmlNode, c) perform the operation on xmlNode using nodeset to figure out where, and adding in the new xml (or removing any nodes matching it), d) convert modified xmlNode back to xml text, e) parse the xml text into a virNetworkDef, f) compare it to the original virNetworkDef to determine what to do. ========== Which OPTION? 1, 2, or 3? ========================= I'm discounting option (1) for now. Here's the scorecard for (2) vs. (3): 2) Pros: easier to understand, more exactly defined. Cons: requires a new API each time we find a different node we want to be able to update 3) Pros: one API covers everything, should never need any new API Cons: more complex for user to understand, me to implement. Possibly more trouble to do fine grained access control (e.g. if you want to allow adding dhcp static hosts, but not allow changing the domain name or interface pool) (actually, in practice, I guess it shouldn't be any more trouble to do fine grained access control, as long as you can make the decision of whether or not to allow later on in the function that implements the API (at step (6) above), rather than at the top level when the API is first called). I'm leaning towards (3). If it raises a technical boundary, or people don't like the idea of having an arg in the public API that takes an XPath expression, then maybe I could switch to (2). Any opinions on which direction I should take? Some way different from what I'm suggesting? Specific questions: 1) Does having a single public API that is used to update many different parts of the object raise any hurdles wrt. fine grained access control? (knowing that there will be "some point" in that code that we know exactly what the user is attempting to change). 2) any problems / reservations about accepting XPatch expressions in the args of a public API? 3) Can you think of a situation where this wouldn't work?

4 8

[libvirt] A bug or a "feature"
by Gene Czarcinski 11 Sep '12

11 Sep '12

I recently updated libvirt* on my test system and found out something interesting. Although libvirtd is restarted , the dnsmasq instantiations it has are not restarted. In fact, if you remove virtualization from the system, the dnsmasq instantiations are still running. In fact, you have to manually kill them or reboot the system to remove them. If you are updated libvirt*, then you can do a "virsh net-destroy <whatever>" AND THEN A "virsh net-start <whatever>" OK, is this a bug (which I will report) or simply a "feature" that I do not like? Gene

3 3

[libvirt] [PATCHv2 0/2] interface driver build cleanup and udev backend addition
by Doug Goldstein 11 Sep '12

11 Sep '12

Refactored the cross use of netcf and interface for the interface driver into only interface driver references. Made netcf the primary backend provider for the interface driver. Added a udev based read-only interface driver backend to be used when netcf support is not built in. Change from v1: * rebased against master * Fixed copyright header * Added libvirt.spec.in modification * Changed virsh -V output Untested: * udev: Devices that are part of a bond. * libvirt.spec: Need some feedback from DV and the RH guys on how they want it packaged Unknown: * Should virInterfaceGetXMLDesc() be implemented for the udev backend? It will as a result contain a lot less info than the netcf based backend would for the same device (e.g. does the device start on boot). Doug Goldstein (2): build: define WITH_INTERFACE for the driver interface: add udev based backend for virInterface .gnulib | 2 +- configure.ac | 37 ++- daemon/Makefile.am | 2 +- daemon/libvirtd.c | 8 +- libvirt.spec.in | 13 +- src/Makefile.am | 34 ++- .../{netcf_driver.c => interface_backend_netcf.c} | 2 +- src/interface/interface_backend_udev.c | 395 ++++++++++++++++++++ .../{netcf_driver.h => interface_driver.h} | 0 tests/virdrivermoduletest.c | 2 +- tools/virsh.c | 8 +- 11 files changed, 480 insertions(+), 23 deletions(-) rename src/interface/{netcf_driver.c => interface_backend_netcf.c} (99%) create mode 100644 src/interface/interface_backend_udev.c rename src/interface/{netcf_driver.h => interface_driver.h} (100%) -- 1.7.8.6

3 5

[libvirt] [PATCH 0/5] Fix multiple issues related to authentication
by Daniel P. Berrange 11 Sep '12

11 Sep '12

This series fixes a load of minor bugs related to authentication of libvirt connections

2 10

[libvirt] [PATCH] docs: point out git send-email location, be more stern about make check
by Laine Stump 10 Sep '12

10 Sep '12

An email came to libvir-list wondering why the git send-email command was missing in spite of having git installed; this is due to the send-email command being in a sub-package of the main git package. While touching the hacking file, I thought it would be useful to 1) indicate the location of the source (docs/hacking.html.in) in the message at the top of HACKING, and also to make the note about running "make check" and "make syntax-check" a bit more stern. --- HACKING | 22 ++++++++++++++-------- docs/hacking.html.in | 29 ++++++++++++++++++----------- docs/hacking2.xsl | 3 ++- 3 files changed, 34 insertions(+), 20 deletions(-) diff --git a/HACKING b/HACKING index 804d54c..ab1a329 100644 --- a/HACKING +++ b/HACKING @@ -1,5 +1,6 @@ -*- buffer-read-only: t -*- vi: set ro: -DO NOT EDIT THIS FILE! IT IS GENERATED AUTOMATICALLY! +DO NOT EDIT THIS FILE! IT IS GENERATED AUTOMATICALLY +from docs/hacking.html.in! @@ -32,11 +33,14 @@ Then, when you want to post your patches: git pull --rebase (fix any conflicts) - git send-email --cover-letter --no-chain-reply-to --annotate --to=libvir-list(a)redhat.com master + git send-email --cover-letter --no-chain-reply-to --annotate \ + --to=libvir-list(a)redhat.com master -For a single patch you can omit "--cover-letter", but series of a two or more -patches needs a cover letter. If you get tired of typing -"--to=libvir-list(a)redhat.com" designation you can set it in git config: +(Note that the "git send-email" subcommand is usually not in the main git +package, but part of a sub-package called "git-email".) For a single patch you +can omit "--cover-letter", but series of a two or more patches needs a cover +letter. If you get tired of typing "--to=libvir-list(a)redhat.com" designation +you can set it in git config: git config sendemail.to libvir-list(a)redhat.com @@ -56,9 +60,11 @@ though). (3) Split large changes into a series of smaller patches, self-contained if possible, with an explanation of each patch and an explanation of how the sequence of patches fits together. Moreover, please keep in mind that it's -required to be able to compile cleanly after each patch. A feature does not -have to work until the end of a series, as long as intermediate patches don't -cause test-suite failures. +required to be able to compile cleanly (*including* "make check" and "make +syntax-check") after each patch. A feature does not have to work until the end +of a series, but intermediate patches must compile and not cause test-suite +failures (this is to preserve the usefulness of "git bisect", among other +things). diff --git a/docs/hacking.html.in b/docs/hacking.html.in index ca02669..1917b78 100644 --- a/docs/hacking.html.in +++ b/docs/hacking.html.in @@ -31,11 +31,15 @@ <pre> git pull --rebase (fix any conflicts) - git send-email --cover-letter --no-chain-reply-to --annotate --to=libvir-list(a)redhat.com master -</pre> - <p>For a single patch you can omit <code>--cover-letter</code>, but - series of a two or more patches needs a cover letter. If you get tired - of typing <code>--to=libvir-list(a)redhat.com</code> designation you can + git send-email --cover-letter --no-chain-reply-to --annotate \ + --to=libvir-list(a)redhat.com master +</pre> + <p>(Note that the "git send-email" subcommand is usually not + in the main git package, but part of a sub-package called + "git-email".) For a single patch you can omit + <code>--cover-letter</code>, but series of a two or more + patches needs a cover letter. If you get tired of typing + <code>--to=libvir-list(a)redhat.com</code> designation you can set it in git config:</p> <pre> git config sendemail.to libvir-list(a)redhat.com @@ -55,12 +59,15 @@ </li> <li><p>Split large changes into a series of smaller patches, - self-contained if possible, with an explanation of each patch and an - explanation of how the sequence of patches fits together. Moreover, - please keep in mind that it's required to be able to compile cleanly - after each patch. A feature does not have to work until the end of a - series, as long as intermediate patches don't cause test-suite - failures.</p> + self-contained if possible, with an explanation of each patch + and an explanation of how the sequence of patches fits + together. Moreover, please keep in mind that it's required to + be able to compile cleanly (<b>including</b> <code>make + check</code> and <code>make syntax-check</code>) after each + patch. A feature does not have to work until the end of a + series, but intermediate patches must compile and not cause + test-suite failures (this is to preserve the usefulness + of <code>git bisect</code>, among other things).</p> </li> <li>Make sure your patches apply against libvirt GIT. Developers diff --git a/docs/hacking2.xsl b/docs/hacking2.xsl index 89e777b..cd1712c 100644 --- a/docs/hacking2.xsl +++ b/docs/hacking2.xsl @@ -18,7 +18,8 @@ <xsl:template match="/"> <xsl:text>-*- buffer-read-only: t -*- vi: set ro: -DO NOT EDIT THIS FILE! IT IS GENERATED AUTOMATICALLY! +DO NOT EDIT THIS FILE! IT IS GENERATED AUTOMATICALLY +from docs/hacking.html.in! -- 1.7.11.4

2 2

[libvirt] [PATCH] Fix unwanted closing of libvirt client connection
by Christophe Fergeau 10 Sep '12

10 Sep '12

e5a1bee07 introduced a regression in Boxes: when Boxes is left idle (it's still doing some libvirt calls in the background), the libvirt connection gets closed after a few minutes. What happens is that this code in virNetClientIOHandleOutput gets triggered: if (!thecall) return -1; /* Shouldn't happen, but you never know... */ and after the changes in e5a1bee07, this causes the libvirt connection to be closed. Upon further investigation, what happens is that virNetClientIOHandleOutput is called from gvir_event_handle_dispatch in libvirt-glib, which is triggered because the client fd became writable. However, between the times gvir_event_handle_dispatch is called, and the time the client lock is grabbed and virNetClientIOHandleOutput is called, another thread runs and completes the current call. 'thecall' is then NULL when the first thread gets to run virNetClientIOHandleOutput. After describing this situation on IRC, danpb suggested this: 11:37 < danpb> In that case I think the correct thing would be to change 'return -1' above to 'return 0' since that's not actually an error - its a rare, but expected event which is what this patch is doing. I've tested it against master libvirt, and I didn't get disconnected in ~10 minutes while this happens in less than 5 minutes without this patch. --- src/rpc/virnetclient.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/rpc/virnetclient.c b/src/rpc/virnetclient.c index 43a9814..727ed67 100644 --- a/src/rpc/virnetclient.c +++ b/src/rpc/virnetclient.c @@ -1205,7 +1205,10 @@ virNetClientIOHandleOutput(virNetClientPtr client) thecall = thecall->next; if (!thecall) - return -1; /* Shouldn't happen, but you never know... */ + return 0; /* This can happen if another thread raced with us and + * completed the call between the time this thread woke + * up from poll()ing and the time we locked the client + */ while (thecall) { ssize_t ret = virNetClientIOWriteMessage(client, thecall); -- 1.7.11.4

2 2

[libvirt] [libvirt-glib 1/4] config: Allow NULL node name to gvir_config_object_set_content
by Christophe Fergeau 10 Sep '12

10 Sep '12

This is useful when you want to set the content of the current node. --- libvirt-gconfig/libvirt-gconfig-object.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/libvirt-gconfig/libvirt-gconfig-object.c b/libvirt-gconfig/libvirt-gconfig-object.c index a7352a5..ac0545c 100644 --- a/libvirt-gconfig/libvirt-gconfig-object.c +++ b/libvirt-gconfig/libvirt-gconfig-object.c @@ -534,7 +534,6 @@ gvir_config_object_set_node_content(GVirConfigObject *object, GVirConfigObject *node; g_return_if_fail(GVIR_CONFIG_IS_OBJECT(object)); - g_return_if_fail(node_name != NULL); if (value == NULL) { gvir_config_object_delete_child(object, node_name, NULL); @@ -542,8 +541,12 @@ gvir_config_object_set_node_content(GVirConfigObject *object, return; } - node = gvir_config_object_replace_child(object, node_name); - g_return_if_fail(node != NULL); + if (node_name != NULL) { + node = gvir_config_object_replace_child(object, node_name); + g_return_if_fail(node != NULL); + } else { + node = g_object_ref(G_OBJECT(object)); + } encoded_data = xmlEncodeEntitiesReentrant(node->priv->node->doc, (xmlChar *)value); xmlNodeSetContent(node->priv->node, encoded_data); @@ -559,7 +562,6 @@ gvir_config_object_set_node_content_uint64(GVirConfigObject *object, char *str; g_return_if_fail(GVIR_CONFIG_IS_OBJECT(object)); - g_return_if_fail(node_name != NULL); str = g_strdup_printf("%"G_GUINT64_FORMAT, value); gvir_config_object_set_node_content(object, node_name, str); -- 1.7.11.4

2 8

[libvirt] [PATCH] qemu: Remove limit enforcing when setting processor count
by Peter Krempa 10 Sep '12

10 Sep '12

When setting processor count for a domain using the API libvirt enforced a maximum processor count that was determined using an IOCTL on /dev/kvm. Unfortunately this value isn't representative enough and qemu happily accepts and starts with values greater than the reported value. This patch removes the check so that users are able to use full potential of their big boxes also when setting processor counts with the API not just in XML. --- src/qemu/qemu_driver.c | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 8e8e00c..6be3e5f 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -3595,7 +3595,6 @@ qemuDomainSetVcpusFlags(virDomainPtr dom, unsigned int nvcpus, virDomainObjPtr vm; virDomainDefPtr persistentDef; const char * type; - int max; int ret = -1; bool maximum; @@ -3645,20 +3644,11 @@ qemuDomainSetVcpusFlags(virDomainPtr dom, unsigned int nvcpus, goto endjob; } - if ((max = qemudGetMaxVCPUs(NULL, type)) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("could not determine max vcpus for the domain")); - goto endjob; - } - - if (!maximum && vm->def->maxvcpus < max) { - max = vm->def->maxvcpus; - } - - if (nvcpus > max) { + if (!maximum && nvcpus > vm->def->maxvcpus) { virReportError(VIR_ERR_INVALID_ARG, _("requested vcpus is greater than max allowable" - " vcpus for the domain: %d > %d"), nvcpus, max); + " vcpus for the domain: %d > %d"), + nvcpus, vm->def->maxvcpus); goto endjob; } -- 1.7.12

4 7

[libvirt] [libvirt-designer][PATCH 0/4] Basic disk & interface support
by Michal Privoznik 10 Sep '12

10 Sep '12

with small example called virtxml Michal Privoznik (4): Load osinfo DB on init domain: Introduce disk support examples: Create an example of usage program domain: Introduce interface support .gitignore | 1 + Makefile.am | 2 +- configure.ac | 6 +- examples/Makefile.am | 23 ++ examples/virtxml.c | 406 ++++++++++++++++++++++++++ libvirt-designer/Makefile.am | 1 + libvirt-designer/libvirt-designer-domain.c | 302 +++++++++++++++++++- libvirt-designer/libvirt-designer-domain.h | 12 +- libvirt-designer/libvirt-designer-internal.h | 30 ++ libvirt-designer/libvirt-designer-main.c | 17 +- libvirt-designer/libvirt-designer.sym | 4 + 11 files changed, 799 insertions(+), 5 deletions(-) create mode 100644 examples/Makefile.am create mode 100644 examples/virtxml.c create mode 100644 libvirt-designer/libvirt-designer-internal.h -- 1.7.8.6

3 13

Re: [libvirt] [User question] Huge buffer size on KVM host
by Avi Kivity 10 Sep '12

10 Sep '12

On 08/16/2012 05:54 PM, Martin Wawro wrote: > > On Aug 15, 2012, at 2:57 PM, Avi Kivity wrote: > >>> >>> We are using logical volumes and the cache is set to 'none'. >> >> Strange, that should work without any buffering. >> >> What the contents of >> >> /sys/block/sda/queue/hw_sector_size >> >> and >> >> /sys/block/sda/queue/logical_block_size >> >> ? >> > > Hi Avi, > > It seems that the kernel on that particular machine is too old, those entries are > not featured. We checked on a comparable setup with a newer kernel and both entries > were set to 512. > > We also did have a third more thorough look on the caching. It turns out that the > virt-manager does not seem to honor the caching adjusted in the GUI correctly. > We disabled caching on all virtual devices for this particular VM and checking > with "ps -fxal" revealed, that only one of those devices (and a rather small one too) > had this set. We corrected this in the XML file directly and the buffer size > currently resides at around 1.8 GB after rebooting the VM (the only virtio device > not having the cache=none option set is now the (non-mounted) cdrom). > cc += libvirt-list Is there a reason that cdroms don't get cache=none? -- error compiling committee.c: too many arguments to function

2 1

[libvirt] Libvir JNA report SIGSEGV
by Benjamin Wang (gendwang) 10 Sep '12

10 Sep '12

Hi, I try to verify the JNA with concurrent situation but meet some problems. The following is my example code: public static void testcase1() throws LibvirtException { Connect conn=null; Connect conn1=null; //connect to the hypervisor conn = new Connect("esx://10.74.125.68:443/?no_verify=1&transport=https", new ConnectAuthDefault(), 0); System.out.println(conn.getVersion()); //connect to the hypervisor conn1 = new Connect("esx://10.74.125.90:443/?no_verify=1&transport=https", new ConnectAuthDefault(), 0); System.out.println(conn1.getVersion()); while(true) { int[] array = new int[100000000]; Long version = conn.getVersion(); Long version1 = conn1.getVersion(); try { Thread.sleep(1000); } catch(Exception e) { } } } When I add line "int[] array = new int[100000000]", then the following error will be generated very quickly: # An unexpected error has been detected by Java Runtime Environment: # # SIGSEGV (0xb) at pc=0x0000003f9b07046e, pid=30049, tid=1109510464 # # Java VM: OpenJDK 64-Bit Server VM (1.6.0-b09 mixed mode linux-amd64) # Problematic frame: # C [libc.so.6+0x7046e] # # An error report file with more information is saved as: I have tried to write the similar code as following. It works well. static void virXenBasic_TC001(void) { virConnectPtr conn = NULL; virConnectPtr conn1 = NULL; unsigned long version = 0; unsigned long version1 = 0; char *hostname = NULL; conn = virConnectOpenAuth("esx://10.74.125.21/?no_verify=1", virConnectAuthPtrDefault, 0); if (conn == NULL) { fprintf(stderr, "Failed to open connection to qemu:///system\n"); return; } conn1 = virConnectOpenAuth("esx://192.168.119.40/?no_verify=1", virConnectAuthPtrDefault, 0); if (conn1 == NULL) { fprintf(stderr, "Failed to open connection to qemu:///system\n"); return; } while(true) { hostname = malloc(sizeof(char) * 100000000); virConnectGetVersion(conn, &version); virConnectGetVersion(conn, &version1); free(hostname); sleep(1); } return; } B.R. Benjamin Wang

2 7

[libvirt] [PATCH 0/6 v4] Atomic API to list storage volumes
by Osier Yang 10 Sep '12

10 Sep '12

v3 - v4: * Just rebase on the top, and split each API from the big set. Osier Yang (6): list: Define new API virStoragePoolListAllVolumes list: Implemente RPC calls for virStoragePoolListAllVolumes list: Implement virStoragePoolListAllVolumes for storage driver list: Implement virStoragePoolListAllVolumes for test driver list: Use virStoragePoolListAllVolumes in virsh list: Expose virStoragePoolListAllVolumes to Python binding daemon/remote.c | 58 +++++++++ include/libvirt/libvirt.h.in | 3 + python/generator.py | 1 + python/libvirt-override-api.xml | 8 +- python/libvirt-override-virStoragePool.py | 11 ++ python/libvirt-override.c | 50 ++++++++ src/driver.h | 6 +- src/libvirt.c | 50 ++++++++ src/libvirt_public.syms | 1 + src/remote/remote_driver.c | 66 ++++++++++ src/remote/remote_protocol.x | 14 ++- src/remote_protocol-structs | 13 ++ src/storage/storage_driver.c | 67 ++++++++++ src/test/test_driver.c | 67 ++++++++++ tools/virsh-volume.c | 197 ++++++++++++++++++++++------- 15 files changed, 562 insertions(+), 50 deletions(-) create mode 100644 python/libvirt-override-virStoragePool.py -- 1.7.7.3

3 14