- Devel - libvirt List Archives

[libvirt] [PATCH] Avoid virGetVersion failure on specific driver support configurations
by Matthias Bolte 07 Jun '11

07 Jun '11

virGetVersion itself doesn't take a virConnectPtr, but in order to obtain the hypervisor version against which libvirt was compiled it is used in combination with virConnectGetType like this: hvType = virConnectGetType(conn) virGetVersion(&libVer, hvType, &typeVer) When virConnectGetType is called on a remote connection then the remote driver returns the type of the underlying driver on the server side, for example QEMU. Then virGetVersion compares hvType to a set of strings that depend on configure options and returns LIBVIR_VERSION_NUMBER in most cases. Now this fails in case libvirt on the client side is just compiled with the remote driver enabled only and the server side has the actual driver such as the QEMU driver. It just happens to work when the actual driver is enabled on client and server side. But that's not always true. I noticed this on FreeBSD: freebsd# virsh -c qemu+tcp://192.168.178.22/system version Compiled against library: libvir 0.9.2 error: failed to get the library version error: this function is not supported by the connection driver: virGetVersion This is not FreeBSD specific, happens on Windows as well due to the similar driver support configuration. The problem is that virConnectGetType returns QEMU, but virGetVersion on the client side only accepts Remote as hvType due to all other drivers being disabled on the client side. Daniel P. Berrange suggested to get rid of all the conditional code in virGetVersion, ignoring the hvType and always setting typeVer to LIBVIR_VERSION_NUMBER. virConnectGetVersion is supposed to be used to obtain the hypervisor version. --- src/libvirt.c | 86 ++++++-------------------------------------------------- 1 files changed, 10 insertions(+), 76 deletions(-) diff --git a/src/libvirt.c b/src/libvirt.c index cbe1926..5a96625 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -894,21 +894,24 @@ int virStateActive(void) { /** * virGetVersion: * @libVer: return value for the library version (OUT) - * @type: the type of connection/driver looked at, if @typeVer is not NULL + * @type: the type of the connection driver, ignored, just pass NULL * @typeVer: optional return value for the version of the hypervisor (OUT) * * Provides information on up to two versions: @libVer is the version of the * library and will always be set unless an error occurs, in which case an - * error code will be returned. If @typeVer is not NULL it will be set to the - * version of the hypervisor @type against which the library was compiled. - * If @type is NULL, "Xen" is assumed, if @type is unknown or not - * available, an error code will be returned and @typeVer will be 0. + * error code will be returned. If @typeVer is not NULL it should have been be + * set to the version of the hypervisor @type against which the library was + * compiled. Due to a design problem this doesn't work as intented. Therefore, + * this function is only usefull to obtain the local library version number via + * @libVer. To get the version of the running hypervisor use the + * virConnectGetVersion function instead. To get the libvirt library version + * used by a connection use the virConnectGetLibVersion instead. * * Returns -1 in case of failure, 0 otherwise, and values for @libVer and * @typeVer have the format major * 1,000,000 + minor * 1,000 + release. */ int -virGetVersion(unsigned long *libVer, const char *type, +virGetVersion(unsigned long *libVer, const char *type ATTRIBUTE_UNUSED, unsigned long *typeVer) { VIR_DEBUG("libVir=%p, type=%s, typeVer=%p", libVer, type, typeVer); @@ -921,78 +924,9 @@ virGetVersion(unsigned long *libVer, const char *type, goto error; *libVer = LIBVIR_VERSION_NUMBER; - if (typeVer != NULL) { - if (type == NULL) - type = "Xen"; - -/* FIXME: Add _proper_ type version handling for loadable driver modules... */ -#ifdef WITH_DRIVER_MODULES + if (typeVer != NULL) *typeVer = LIBVIR_VERSION_NUMBER; -#else - *typeVer = 0; -# if WITH_XEN - if (STRCASEEQ(type, "Xen")) - *typeVer = xenUnifiedVersion(); -# endif -# if WITH_TEST - if (STRCASEEQ(type, "Test")) - *typeVer = LIBVIR_VERSION_NUMBER; -# endif -# if WITH_QEMU - if (STRCASEEQ(type, "QEMU")) - *typeVer = LIBVIR_VERSION_NUMBER; -# endif -# if WITH_LXC - if (STRCASEEQ(type, "LXC")) - *typeVer = LIBVIR_VERSION_NUMBER; -# endif -# if WITH_LIBXL - if (STRCASEEQ(type, "xenlight")) - *typeVer = LIBVIR_VERSION_NUMBER; -# endif -# if WITH_PHYP - if (STRCASEEQ(type, "phyp")) - *typeVer = LIBVIR_VERSION_NUMBER; -# endif -# if WITH_OPENVZ - if (STRCASEEQ(type, "OpenVZ")) - *typeVer = LIBVIR_VERSION_NUMBER; -# endif -# if WITH_VMWARE - if (STRCASEEQ(type, "VMware")) - *typeVer = LIBVIR_VERSION_NUMBER; -# endif -# if WITH_VBOX - if (STRCASEEQ(type, "VBox")) - *typeVer = LIBVIR_VERSION_NUMBER; -# endif -# if WITH_UML - if (STRCASEEQ(type, "UML")) - *typeVer = LIBVIR_VERSION_NUMBER; -# endif -# if WITH_ONE - if (STRCASEEQ(type, "ONE")) - *typeVer = LIBVIR_VERSION_NUMBER; -# endif -# if WITH_ESX - if (STRCASEEQ(type, "ESX")) - *typeVer = LIBVIR_VERSION_NUMBER; -# endif -# if WITH_XENAPI - if (STRCASEEQ(type, "XenAPI")) - *typeVer = LIBVIR_VERSION_NUMBER; -# endif -# if WITH_REMOTE - if (STRCASEEQ(type, "Remote")) - *typeVer = remoteVersion(); -# endif - if (*typeVer == 0) { - virLibConnError(VIR_ERR_NO_SUPPORT, __FUNCTION__); - goto error; - } -#endif /* WITH_DRIVER_MODULES */ - } return 0; error: -- 1.7.0.4

2 2

[libvirt] [PATCH v2 0/3] add support for changing blkio parameters for inactive domains
by Hu Tao 07 Jun '11

07 Jun '11

This series enables user to change blkio parameters for inactive domains from virsh command line. CHANGES: v1-v2: - unify PARAM_CONFIG/PARAM_LIVE/PARAM_CURRENT Hu Tao (3): unify PARAM_CURRENT/PARAM_LIVE/PARAM_CONFIG flags update qemuDomainGetBlkioParameters to use flags Update qemuDomainSetBlkioParameters to use flags include/libvirt/libvirt.h.in | 58 ++---- src/esx/esx_driver.c | 10 +- src/libvirt.c | 4 +- src/openvz/openvz_driver.c | 10 +- src/qemu/qemu_driver.c | 442 ++++++++++++++++++++++++++---------------- src/test/test_driver.c | 42 ++-- src/uml/uml_driver.c | 4 +- src/vbox/vbox_tmpl.c | 22 +- tools/virsh.c | 74 ++++---- 9 files changed, 371 insertions(+), 295 deletions(-) -- 1.7.3.1

3 9

[libvirt] [PATCH v2] graphics: add support for action_if_connected in qemu
by Michal Prívozník 07 Jun '11

07 Jun '11

From: Michal Privoznik <mprivozn(a)redhat.com> This option accepts 3 values: -keep, to keep current client connected (Spice+VNC) -disconnect, to disconnect client (Spice) -fail, to fail setting password if there is a client connected (Spice) --- diff to v1: -Eric's review suggestions included -update 'Since' docs/formatdomain.html.in | 13 +++++++++++-- docs/schemas/domain.rng | 16 ++++++++++++++++ src/conf/domain_conf.c | 44 +++++++++++++++++++++++++++++++++++++++++--- src/conf/domain_conf.h | 11 +++++++++++ src/libvirt_private.syms | 2 ++ src/qemu/qemu_hotplug.c | 15 ++++++++++++--- 6 files changed, 93 insertions(+), 8 deletions(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 225e0c8..5dd54ca 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -1801,7 +1801,11 @@ qemu-kvm -net nic,model=? /dev/null in clear text. The <code>keymap</code> attribute specifies the keymap to use. It is possible to set a limit on the validity of the password be giving an timestamp <code>passwdValidTo='2010-04-09T15:51:00'</code> - assumed to be in UTC. NB, this may not be supported by all hypervisors. + assumed to be in UTC. Since 0.8.5 + The <code>connected</code> attribute allows control of connected client + during password changes. VNC accepts <code>keep</code> value only. + since 0.9.3 + NB, this may not be supported by all hypervisors. Rather than using listen/port, QEMU supports a <code>socket</code> attribute for listening on a unix domain socket path. @@ -1820,7 +1824,12 @@ qemu-kvm -net nic,model=? /dev/null in clear text. The <code>keymap</code> attribute specifies the keymap to use. It is possible to set a limit on the validity of the password be giving an timestamp <code>passwdValidTo='2010-04-09T15:51:00'</code> - assumed to be in UTC. NB, this may not be supported by all hypervisors. + assumed to be in UTC. Since 0.8.5 + The <code>connected</code> attribute allows control of connected client + during password changes. SPICE accepts <code>keep</code> to keep client + connected, <code>disconnect</code> to disconnect client and + <code>fail</code> to fail changing password. Since 0.9.3 + NB, this may not be supported by all hypervisors. "spice" since 0.8.6. diff --git a/docs/schemas/domain.rng b/docs/schemas/domain.rng index 0be0371..e71b683 100644 --- a/docs/schemas/domain.rng +++ b/docs/schemas/domain.rng @@ -1250,6 +1250,13 @@ <data type="dateTime"/> </attribute> </optional> + <optional> + <attribute name="connected"> + <choice> + <value>keep</value> + </choice> + </attribute> + </optional> </group> <group> <attribute name="type"> @@ -1293,6 +1300,15 @@ <data type="dateTime"/> </attribute> </optional> + <optional> + <attribute name="connected"> + <choice> + <value>fail</value> + <value>disconnect</value> + <value>keep</value> + </choice> + </attribute> + </optional> <interleave> <zeroOrMore> <element name="channel"> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 0d9fef4..19f22e0 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -311,6 +311,13 @@ VIR_ENUM_IMPL(virDomainGraphics, VIR_DOMAIN_GRAPHICS_TYPE_LAST, "desktop", "spice") +VIR_ENUM_IMPL(virDomainGraphicsAuthConnected, + VIR_DOMAIN_GRAPHICS_AUTH_CONNECTED_LAST, + "default", + "fail", + "disconnect", + "keep") + VIR_ENUM_IMPL(virDomainGraphicsSpiceChannelName, VIR_DOMAIN_GRAPHICS_SPICE_CHANNEL_LAST, "main", @@ -3892,9 +3899,12 @@ error: static int -virDomainGraphicsAuthDefParseXML(xmlNodePtr node, virDomainGraphicsAuthDefPtr def) +virDomainGraphicsAuthDefParseXML(xmlNodePtr node, + virDomainGraphicsAuthDefPtr def, + int type) { char *validTo = NULL; + char *connected = virXMLPropString(node, "connected"); def->passwd = virXMLPropString(node, "passwd"); @@ -3935,6 +3945,28 @@ virDomainGraphicsAuthDefParseXML(xmlNodePtr node, virDomainGraphicsAuthDefPtr de def->expires = 1; } + if (connected) { + int action = virDomainGraphicsAuthConnectedTypeFromString(connected); + if (action <= 0) { + virDomainReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("unknown connected value %s"), + connected); + VIR_FREE(connected); + return -1; + } + VIR_FREE(connected); + + /* VNC supports connected='keep' only */ + if (type == VIR_DOMAIN_GRAPHICS_TYPE_VNC && + action != VIR_DOMAIN_GRAPHICS_AUTH_CONNECTED_KEEP) { + virDomainReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("VNC supports connected='keep' only")); + return -1; + } + + def->connected = action; + } + return 0; } @@ -4004,7 +4036,8 @@ virDomainGraphicsDefParseXML(xmlNodePtr node, int flags) { !def->data.vnc.listenAddr[0]) VIR_FREE(def->data.vnc.listenAddr); - if (virDomainGraphicsAuthDefParseXML(node, &def->data.vnc.auth) < 0) + if (virDomainGraphicsAuthDefParseXML(node, &def->data.vnc.auth, + def->type) < 0) goto error; } else if (def->type == VIR_DOMAIN_GRAPHICS_TYPE_SDL) { char *fullscreen = virXMLPropString(node, "fullscreen"); @@ -4140,7 +4173,8 @@ virDomainGraphicsDefParseXML(xmlNodePtr node, int flags) { !def->data.spice.listenAddr[0]) VIR_FREE(def->data.spice.listenAddr); - if (virDomainGraphicsAuthDefParseXML(node, &def->data.spice.auth) < 0) + if (virDomainGraphicsAuthDefParseXML(node, &def->data.spice.auth, + def->type) < 0) goto error; cur = node->children; @@ -9075,6 +9109,10 @@ virDomainGraphicsAuthDefFormatAttr(virBufferPtr buf, strftime(strbuf, sizeof(strbuf), "%Y-%m-%dT%H:%M:%S", tm); virBufferAsprintf(buf, " passwdValidTo='%s'", strbuf); } + + if (def->connected) + virBufferEscapeString(buf, " connected='%s'", + virDomainGraphicsAuthConnectedTypeToString(def->connected)); } static int diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 41c8136..6bfc337 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -640,12 +640,22 @@ enum virDomainGraphicsType { VIR_DOMAIN_GRAPHICS_TYPE_LAST, }; +enum virDomainGraphicsAuthConnectedType { + VIR_DOMAIN_GRAPHICS_AUTH_CONNECTED_DEFAULT = 0, + VIR_DOMAIN_GRAPHICS_AUTH_CONNECTED_FAIL, + VIR_DOMAIN_GRAPHICS_AUTH_CONNECTED_DISCONNECT, + VIR_DOMAIN_GRAPHICS_AUTH_CONNECTED_KEEP, + + VIR_DOMAIN_GRAPHICS_AUTH_CONNECTED_LAST +}; + typedef struct _virDomainGraphicsAuthDef virDomainGraphicsAuthDef; typedef virDomainGraphicsAuthDef *virDomainGraphicsAuthDefPtr; struct _virDomainGraphicsAuthDef { char *passwd; unsigned int expires: 1; /* Whether there is an expiry time set */ time_t validTo; /* seconds since epoch */ + int connected; /* action if connected */ }; enum virDomainGraphicsSpiceChannelName { @@ -1546,6 +1556,7 @@ VIR_ENUM_DECL(virDomainHostdevSubsys) VIR_ENUM_DECL(virDomainInput) VIR_ENUM_DECL(virDomainInputBus) VIR_ENUM_DECL(virDomainGraphics) +VIR_ENUM_DECL(virDomainGraphicsAuthConnected) VIR_ENUM_DECL(virDomainGraphicsSpiceChannelName) VIR_ENUM_DECL(virDomainGraphicsSpiceChannelMode) VIR_ENUM_DECL(virDomainGraphicsSpiceImageCompression) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index e6ab870..c3ce412 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -267,6 +267,8 @@ virDomainFindByID; virDomainFindByName; virDomainFindByUUID; virDomainGetRootFilesystem; +virDomainGraphicsAuthConnectedTypeFromString; +virDomainGraphicsAuthConnectedTypeToString; virDomainGraphicsDefFree; virDomainGraphicsSpiceChannelModeTypeFromString; virDomainGraphicsSpiceChannelModeTypeToString; diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index fe47896..ead2cfc 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -1059,10 +1059,12 @@ qemuDomainChangeGraphics(struct qemud_driver *driver, return -1; } - /* If a password lifetime was, or is set, then we must always run, - * even if new password matches old password */ + /* If a password lifetime was, or is set, or action if connected has + * changed, then we must always run, even if new password matches + * old password */ if (olddev->data.vnc.auth.expires || dev->data.vnc.auth.expires || + olddev->data.vnc.auth.connected != dev->data.vnc.auth.connected || STRNEQ_NULLABLE(olddev->data.vnc.auth.passwd, dev->data.vnc.auth.passwd)) { VIR_DEBUG("Updating password on VNC server %p %p", dev->data.vnc.auth.passwd, driver->vncPassword); ret = qemuDomainChangeGraphicsPasswords(driver, vm, VIR_DOMAIN_GRAPHICS_TYPE_VNC, @@ -1074,6 +1076,7 @@ qemuDomainChangeGraphics(struct qemud_driver *driver, dev->data.vnc.auth.passwd = NULL; olddev->data.vnc.auth.validTo = dev->data.vnc.auth.validTo; olddev->data.vnc.auth.expires = dev->data.vnc.auth.expires; + olddev->data.vnc.auth.connected = dev->data.vnc.auth.connected; } else { ret = 0; } @@ -1102,6 +1105,7 @@ qemuDomainChangeGraphics(struct qemud_driver *driver, * even if new password matches old password */ if (olddev->data.spice.auth.expires || dev->data.spice.auth.expires || + olddev->data.spice.auth.connected != dev->data.spice.auth.connected || STRNEQ_NULLABLE(olddev->data.spice.auth.passwd, dev->data.spice.auth.passwd)) { VIR_DEBUG("Updating password on SPICE server %p %p", dev->data.spice.auth.passwd, driver->spicePassword); ret = qemuDomainChangeGraphicsPasswords(driver, vm, VIR_DOMAIN_GRAPHICS_TYPE_SPICE, @@ -1113,6 +1117,7 @@ qemuDomainChangeGraphics(struct qemud_driver *driver, dev->data.spice.auth.passwd = NULL; olddev->data.spice.auth.validTo = dev->data.spice.auth.validTo; olddev->data.spice.auth.expires = dev->data.spice.auth.expires; + olddev->data.spice.auth.connected = dev->data.spice.auth.connected; } else { VIR_DEBUG("Not updating since password didn't change"); ret = 0; @@ -1797,16 +1802,20 @@ qemuDomainChangeGraphicsPasswords(struct qemud_driver *driver, qemuDomainObjPrivatePtr priv = vm->privateData; time_t now = time(NULL); char expire_time [64]; + const char *connected; int ret; if (!auth->passwd && !driver->vncPassword) return 0; + if (auth->connected) + connected = virDomainGraphicsAuthConnectedTypeToString(auth->connected)l + qemuDomainObjEnterMonitorWithDriver(driver, vm); ret = qemuMonitorSetPassword(priv->mon, type, auth->passwd ? auth->passwd : defaultPasswd, - NULL); + connected); if (ret == -2) { if (type != VIR_DOMAIN_GRAPHICS_TYPE_VNC) { -- 1.7.5.rc3

2 1

[libvirt] (how much) support for kqemu domain
by John Lumby 06 Jun '11

06 Jun '11

I am wondering about the extent to which "old" qemu-0.11.1 and kqemu-1.4.0 are supported by virt-manager. I see I can specify --virt-type=kqemu on virt-install and it remembers domain type='kqemu', and does things such as refusing to start the vm if the kqemu kernel mod not loaded, but it seems it does not tack on the -enable-kqemu -kernel-kqemu options on to the qemu command line. There is really not much point in trying to start a qemu-based vm with neither hardware kvm nor kqemu ... I can work around it with an override script to intercept the qemu command, but does anyone think virt-manager ought to do this for me? John Lumby _________________________________________________________________

3 6

[libvirt] [PATCH] virsh: Add daemon version reporting
by Michal Prívozník 06 Jun '11

06 Jun '11

From: Michal Privoznik <mprivozn(a)redhat.com> 'virsh version' might report against which version of libvirtd is running. --- tools/virsh.c | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index d98be1c..d3c3ce3 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -8620,6 +8620,7 @@ cmdVersion(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) unsigned long libVersion; unsigned long includeVersion; unsigned long apiVersion; + unsigned long daemonVersion; int ret; unsigned int major; unsigned int minor; @@ -8678,6 +8679,19 @@ cmdVersion(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) vshPrint(ctl, _("Running hypervisor: %s %d.%d.%d\n"), hvType, major, minor, rel); } + + ret = virConnectGetLibVersion(ctl->conn, &daemonVersion); + if (ret < 0) { + vshError(ctl, "%s", _("failed to get the daemon version")); + return false; + } + major = daemonVersion / 1000000; + daemonVersion %= 1000000; + minor = daemonVersion / 1000; + rel = daemonVersion % 1000; + vshPrint(ctl, _("Running against daemon: %d.%d.%d\n"), + major, minor, rel); + return true; } -- 1.7.5.rc3

3 2

[libvirt] [PATCH] docs: Make hvsupport.pl pick up the host device drivers
by Matthias Bolte 06 Jun '11

06 Jun '11

Annotate the ESX device driver dummy. Refactor the udev and hal device driver strcuts to match the common annotation pattern. --- This is post-0.9.2. docs/hvsupport.pl | 22 +++++++++++++---- src/esx/esx_device_monitor.c | 15 ++--------- src/node_device/node_device_driver.c | 45 +++++++++++++--------------------- src/node_device/node_device_driver.h | 14 +++++++++- src/node_device/node_device_hal.c | 22 +++++++++++----- src/node_device/node_device_udev.c | 22 +++++++++++----- 6 files changed, 79 insertions(+), 61 deletions(-) diff --git a/docs/hvsupport.pl b/docs/hvsupport.pl index 8a0fa7a..b0d1f0f 100755 --- a/docs/hvsupport.pl +++ b/docs/hvsupport.pl @@ -27,7 +27,7 @@ my %groupheaders = ( my @srcs; find({ wanted => sub { - if (m!$srcdir/.*/\w+_(driver|tmpl)\.c$!) { + if (m!$srcdir/.*/\w+_(driver|tmpl|monitor|hal|udev)\.c$!) { push @srcs, $_ if $_ !~ /vbox_driver\.c/; } }, no_chdir => 1}, $srcdir); @@ -142,7 +142,7 @@ open FILE, "<$drivertable" my %groups; my $ingrp; while (defined($line = <FILE>)) { - if ($line =~ /struct _(vir\w*Driver)/) { + if ($line =~ /struct _(vir\w*(?:Driver|Monitor))/) { my $grp = $1; if ($grp ne "virStateDriver" && $grp ne "virStreamDriver") { @@ -150,7 +150,7 @@ while (defined($line = <FILE>)) { $groups{$ingrp} = { apis => {}, drivers => {} }; } } elsif ($ingrp) { - if ($line =~ /^\s*virDrv(\w+)\s+(\w+);\s*$/) { + if ($line =~ /^\s*vir(?:Drv|DevMon)(\w+)\s+(\w+);\s*$/) { my $field = $2; my $name = $1; @@ -159,6 +159,8 @@ while (defined($line = <FILE>)) { $api = "vir$name"; } elsif (exists $apis{"virConnect$name"}) { $api = "virConnect$name"; + } elsif (exists $apis{"virNode$name"}) { + $api = "virNode$name"; } else { die "driver $name does not have a public API"; } @@ -188,7 +190,17 @@ foreach my $src (@srcs) { $line =~ /^\s*(?:static\s+)?$grp\s+NAME$\w+$\s*=\s*{/) { $ingrp = $grp; $impl = $src; - $impl =~ s,.*/(\w+?)_((\w+)_)?(\w+)\.c,$1,; + + if ($impl =~ m,.*/node_device_(\w+)\.c,) { + $impl = $1; + } else { + $impl =~ s,.*/(\w+?)_((\w+)_)?(\w+)\.c,$1,; + } + + if ($groups{$ingrp}->{drivers}->{$impl}) { + die "Group $ingrp already contains $impl"; + } + $groups{$ingrp}->{drivers}->{$impl} = {}; } } @@ -206,7 +218,7 @@ foreach my $src (@srcs) { die "Driver method for $api is NULL in $src" if $meth eq "NULL"; if (!exists($groups{$ingrp}->{apis}->{$api})) { - die "Found unexpected driver $api in $ingrp\n"; + die "Found unexpected method $api in $ingrp\n"; } $groups{$ingrp}->{drivers}->{$impl}->{$api} = $vers; diff --git a/src/esx/esx_device_monitor.c b/src/esx/esx_device_monitor.c index 3fa63d5..4bc8e7f 100644 --- a/src/esx/esx_device_monitor.c +++ b/src/esx/esx_device_monitor.c @@ -66,18 +66,9 @@ esxDeviceClose(virConnectPtr conn) static virDeviceMonitor esxDeviceMonitor = { - "ESX", /* name */ - esxDeviceOpen, /* open */ - esxDeviceClose, /* close */ - NULL, /* numOfDevices */ - NULL, /* listDevices */ - NULL, /* deviceLookupByName */ - NULL, /* deviceGetXMLDesc */ - NULL, /* deviceGetParent */ - NULL, /* deviceNumOfCaps */ - NULL, /* deviceListCaps */ - NULL, /* deviceCreateXML */ - NULL, /* deviceDestroy */ + .name = "ESX", + .open = esxDeviceOpen, /* 0.7.6 */ + .close = esxDeviceClose, /* 0.7.6 */ }; diff --git a/src/node_device/node_device_driver.c b/src/node_device/node_device_driver.c index 8ec3e44..842f903 100644 --- a/src/node_device/node_device_driver.c +++ b/src/node_device/node_device_driver.c @@ -122,9 +122,10 @@ void nodeDeviceUnlock(virDeviceMonitorStatePtr driver) virMutexUnlock(&driver->lock); } -static int nodeNumOfDevices(virConnectPtr conn, - const char *cap, - unsigned int flags ATTRIBUTE_UNUSED) +int +nodeNumOfDevices(virConnectPtr conn, + const char *cap, + unsigned int flags ATTRIBUTE_UNUSED) { virDeviceMonitorStatePtr driver = conn->devMonPrivateData; int ndevs = 0; @@ -143,7 +144,7 @@ static int nodeNumOfDevices(virConnectPtr conn, return ndevs; } -static int +int nodeListDevices(virConnectPtr conn, const char *cap, char **const names, int maxnames, @@ -179,8 +180,8 @@ nodeListDevices(virConnectPtr conn, } -static virNodeDevicePtr nodeDeviceLookupByName(virConnectPtr conn, - const char *name) +virNodeDevicePtr +nodeDeviceLookupByName(virConnectPtr conn, const char *name) { virDeviceMonitorStatePtr driver = conn->devMonPrivateData; virNodeDeviceObjPtr obj; @@ -251,8 +252,9 @@ out: } -static char *nodeDeviceGetXMLDesc(virNodeDevicePtr dev, - unsigned int flags ATTRIBUTE_UNUSED) +char * +nodeDeviceGetXMLDesc(virNodeDevicePtr dev, + unsigned int flags ATTRIBUTE_UNUSED) { virDeviceMonitorStatePtr driver = dev->conn->devMonPrivateData; virNodeDeviceObjPtr obj; @@ -281,7 +283,8 @@ cleanup: } -static char *nodeDeviceGetParent(virNodeDevicePtr dev) +char * +nodeDeviceGetParent(virNodeDevicePtr dev) { virDeviceMonitorStatePtr driver = dev->conn->devMonPrivateData; virNodeDeviceObjPtr obj; @@ -314,7 +317,8 @@ cleanup: } -static int nodeDeviceNumOfCaps(virNodeDevicePtr dev) +int +nodeDeviceNumOfCaps(virNodeDevicePtr dev) { virDeviceMonitorStatePtr driver = dev->conn->devMonPrivateData; virNodeDeviceObjPtr obj; @@ -344,7 +348,7 @@ cleanup: } -static int +int nodeDeviceListCaps(virNodeDevicePtr dev, char **const names, int maxnames) { virDeviceMonitorStatePtr driver = dev->conn->devMonPrivateData; @@ -538,7 +542,7 @@ find_new_device(virConnectPtr conn, const char *wwnn, const char *wwpn) return dev; } -static virNodeDevicePtr +virNodeDevicePtr nodeDeviceCreateXML(virConnectPtr conn, const char *xmlDesc, unsigned int flags ATTRIBUTE_UNUSED) @@ -591,7 +595,7 @@ cleanup: } -static int +int nodeDeviceDestroy(virNodeDevicePtr dev) { int ret = -1; @@ -651,21 +655,6 @@ out: return ret; } - -void registerCommonNodeFuncs(virDeviceMonitorPtr driver) -{ - driver->numOfDevices = nodeNumOfDevices; - driver->listDevices = nodeListDevices; - driver->deviceLookupByName = nodeDeviceLookupByName; - driver->deviceGetXMLDesc = nodeDeviceGetXMLDesc; - driver->deviceGetParent = nodeDeviceGetParent; - driver->deviceNumOfCaps = nodeDeviceNumOfCaps; - driver->deviceListCaps = nodeDeviceListCaps; - driver->deviceCreateXML = nodeDeviceCreateXML; - driver->deviceDestroy = nodeDeviceDestroy; -} - - int nodedevRegister(void) { #if defined(HAVE_HAL) && defined(HAVE_UDEV) /* Register only one of these two - they conflict */ diff --git a/src/node_device/node_device_driver.h b/src/node_device/node_device_driver.h index e583c2b..08779b1 100644 --- a/src/node_device/node_device_driver.h +++ b/src/node_device/node_device_driver.h @@ -53,8 +53,6 @@ int udevNodeRegister(void); void nodeDeviceLock(virDeviceMonitorStatePtr driver); void nodeDeviceUnlock(virDeviceMonitorStatePtr driver); -void registerCommonNodeFuncs(virDeviceMonitorPtr mon); - int nodedevRegister(void); # ifdef __linux__ @@ -86,4 +84,16 @@ int read_wwn_linux(int host, const char *file, char **wwn); # endif /* __linux__ */ +int nodeNumOfDevices(virConnectPtr conn, const char *cap, unsigned int flags); +int nodeListDevices(virConnectPtr conn, const char *cap, char **const names, + int maxnames, unsigned int flags); +virNodeDevicePtr nodeDeviceLookupByName(virConnectPtr conn, const char *name); +char *nodeDeviceGetXMLDesc(virNodeDevicePtr dev, unsigned int flags); +char *nodeDeviceGetParent(virNodeDevicePtr dev); +int nodeDeviceNumOfCaps(virNodeDevicePtr dev); +int nodeDeviceListCaps(virNodeDevicePtr dev, char **const names, int maxnames); +virNodeDevicePtr nodeDeviceCreateXML(virConnectPtr conn, + const char *xmlDesc, unsigned int flags); +int nodeDeviceDestroy(virNodeDevicePtr dev); + #endif /* __VIR_NODE_DEVICE_H__ */ diff --git a/src/node_device/node_device_hal.c b/src/node_device/node_device_hal.c index 8df2875..a90e777 100644 --- a/src/node_device/node_device_hal.c +++ b/src/node_device/node_device_hal.c @@ -881,22 +881,30 @@ static int halNodeDrvClose(virConnectPtr conn ATTRIBUTE_UNUSED) static virDeviceMonitor halDeviceMonitor = { .name = "halDeviceMonitor", - .open = halNodeDrvOpen, - .close = halNodeDrvClose, + .open = halNodeDrvOpen, /* 0.5.0 */ + .close = halNodeDrvClose, /* 0.5.0 */ + .numOfDevices = nodeNumOfDevices, /* 0.5.0 */ + .listDevices = nodeListDevices, /* 0.5.0 */ + .deviceLookupByName = nodeDeviceLookupByName, /* 0.5.0 */ + .deviceGetXMLDesc = nodeDeviceGetXMLDesc, /* 0.5.0 */ + .deviceGetParent = nodeDeviceGetParent, /* 0.5.0 */ + .deviceNumOfCaps = nodeDeviceNumOfCaps, /* 0.5.0 */ + .deviceListCaps = nodeDeviceListCaps, /* 0.5.0 */ + .deviceCreateXML = nodeDeviceCreateXML, /* 0.6.5 */ + .deviceDestroy = nodeDeviceDestroy, /* 0.6.5 */ }; static virStateDriver halStateDriver = { .name = "HAL", - .initialize = halDeviceMonitorStartup, - .cleanup = halDeviceMonitorShutdown, - .reload = halDeviceMonitorReload, - .active = halDeviceMonitorActive, + .initialize = halDeviceMonitorStartup, /* 0.5.0 */ + .cleanup = halDeviceMonitorShutdown, /* 0.5.0 */ + .reload = halDeviceMonitorReload, /* 0.5.0 */ + .active = halDeviceMonitorActive, /* 0.5.0 */ }; int halNodeRegister(void) { - registerCommonNodeFuncs(&halDeviceMonitor); if (virRegisterDeviceMonitor(&halDeviceMonitor) < 0) return -1; return virRegisterStateDriver(&halStateDriver); diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_device_udev.c index 29e4bac..8b9694e 100644 --- a/src/node_device/node_device_udev.c +++ b/src/node_device/node_device_udev.c @@ -1741,23 +1741,31 @@ static int udevNodeDrvClose(virConnectPtr conn) static virDeviceMonitor udevDeviceMonitor = { .name = "udevDeviceMonitor", - .open = udevNodeDrvOpen, - .close = udevNodeDrvClose, + .open = udevNodeDrvOpen, /* 0.7.3 */ + .close = udevNodeDrvClose, /* 0.7.3 */ + .numOfDevices = nodeNumOfDevices, /* 0.7.3 */ + .listDevices = nodeListDevices, /* 0.7.3 */ + .deviceLookupByName = nodeDeviceLookupByName, /* 0.7.3 */ + .deviceGetXMLDesc = nodeDeviceGetXMLDesc, /* 0.7.3 */ + .deviceGetParent = nodeDeviceGetParent, /* 0.7.3 */ + .deviceNumOfCaps = nodeDeviceNumOfCaps, /* 0.7.3 */ + .deviceListCaps = nodeDeviceListCaps, /* 0.7.3 */ + .deviceCreateXML = nodeDeviceCreateXML, /* 0.7.3 */ + .deviceDestroy = nodeDeviceDestroy, /* 0.7.3 */ }; static virStateDriver udevStateDriver = { .name = "udev", - .initialize = udevDeviceMonitorStartup, - .cleanup = udevDeviceMonitorShutdown, - .reload = udevDeviceMonitorReload, - .active = udevDeviceMonitorActive, + .initialize = udevDeviceMonitorStartup, /* 0.7.3 */ + .cleanup = udevDeviceMonitorShutdown, /* 0.7.3 */ + .reload = udevDeviceMonitorReload, /* 0.7.3 */ + .active = udevDeviceMonitorActive, /* 0.7.3 */ }; int udevNodeRegister(void) { VIR_DEBUG("Registering udev node device backend"); - registerCommonNodeFuncs(&udevDeviceMonitor); if (virRegisterDeviceMonitor(&udevDeviceMonitor) < 0) { return -1; } -- 1.7.0.4

3 3

Re: [libvirt] Operation forbidden for read only access
by Daniel Veillard 06 Jun '11

06 Jun '11

On Mon, Jun 06, 2011 at 01:27:47PM +0530, PREETHI RAMESH wrote: > Sorry for my ignorance, but how do you do that? > > On Mon, Jun 6, 2011 at 11:12 AM, Daniel Veillard <veillard(a)redhat.com>wrote: > > > On Mon, Jun 06, 2011 at 08:41:51AM +0530, PREETHI RAMESH wrote: > > > I'm using libvirt's Java API bindingsa and i've opened a connection : > > [...] > > > BUILD SUCCESSFUL (total time: 23 minutes 38 seconds) > > > > > > I've used qemu:///system but why is my operation being denied? > > > > On a read-only connection any operation which may modify the state of > > the system will get denied. You need a read-write connection for > > destroying a domain. You do that by not asking for a read-only connection ! /** * Constructs a Connect object from the supplied URI. * * @param uri * The connection URI * @param readOnly * Whether the connection is read-only * @throws LibvirtException * @see <a href="http://libvirt.org/uri.html">The URI * documentation</a> */ public Connect(String uri, boolean readOnly) throws LibvirtException since your code does conn = new Connect("qemu:///system", true); you asked for it. Please read the docs/code ! 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] Operation forbidden for read only access
by PREETHI RAMESH 06 Jun '11

06 Jun '11

I'm using libvirt's Java API bindingsa and i've opened a connection : Connect conn=null; Connect conn1=null; Connect conn2=null; Domain testDomain1 = null; //connect to host vm try{ conn = new Connect("qemu:///system", true); System.out.println("exception ONE:"); } catch (LibvirtException e){ System.out.println("exception ONE caught:"+e); System.out.println(e.getError()); } //get the domain in host vm try { testDomain1 = conn.domainLookupByName("hda1"); System.out.println("exception TWO:"); } catch (LibvirtException ex) { System.out.println("exception TWO CAUGHT"); //Logger.getLogger(Migrate.class.getName()).log(Level.SEVERE, null, ex); } //check if domain is running try{ System.out.println("Domain:" + testDomain1.getName() + " id " + testDomain1.getID() + " running " + testDomain1.getOSType()); System.out.println("exception THREE:"); } catch (LibvirtException e1){ System.out.println("exception THREE caught: "+e1); System.out.println(e1.getError()); } /*try{ conn1 = new Connect("qemu+ssh://root@10.129.54.254/system", true); //conn2 = new Connect("qemu+ssh://root@10.129.54.254/system", true); Domain migrate1; System.out.println("done with ssh"); String uri="tcp://root@10.129.54.254:49166"; migrate1 = testDomain1.migrate(conn1,1,null,"tcp:// root(a)10.129.54.254",0); //int ret=testDomain1.migrateToURI("tcp:// root@10.129.54.254:49155",1,null,0); System.out.println("exception FOUR:"); }catch (LibvirtException e2){ System.out.println("exception FOUR caught:"+e2); System.out.println(e2.getError()); }*/ try{ testDomain1.destroy(); System.out.println("Destroyed"+testDomain1); } catch(LibvirtException e4){ System.out.println("exception FOUR caught: "+e4); System.out.println(e4.getError()); } The output I'm getting is: exception ONE: exception TWO: Domain:test id 1 running linux exception THREE: libvir: Domain error : operation virDomainDestroy forbidden for read only access exception FOUR caught: org.libvirt.LibvirtException: operation virDomainDestroy forbidden for read only access level:VIR_ERR_ERROR code:VIR_ERR_OPERATION_DENIED domain:VIR_FROM_DOM hasConn:false hasDom:false hasNet:false message:operation virDomainDestroy forbidden for read only access str1:operation %s forbidden for read only access str2:virDomainDestroy str3:null int1:-1 int2:-1 BUILD SUCCESSFUL (total time: 23 minutes 38 seconds) I've used qemu:///system but why is my operation being denied? Thanks!

2 1

[libvirt] [libvirt-users] Release of libvirt-0.9.2
by Daniel Veillard 06 Jun '11

06 Jun '11

As planned the new release is available at: ftp://libvirt.org/libvirt/ It is a rather large release with near 400 commits included. From an user point of view the main improvement is likely to be when using migration as various work has been done to extend the protocol and to avoid having the migration command stop other concurrent operations (like virsh list). See below for a number of new features, improvement and bug fixes: Features: - Framework for lock manager plugins (Daniel P. Berrange) - API for network config change transactions (Michal Privoznik) - flags for setting memory parameters (Hu Tao) - virDomainGetState public API (Jiri Denemark) - qemu: allow blkstat/blkinfo calls during migration (Federico Simoncelli) - Introduce migration v3 API (Daniel P. Berrange) - Defining the Screenshot public API (Michal Privoznik) - public API for NMI injection (Lai Jiangshan) Documentation: - esx: Fix driver method version annotations (Matthias Bolte) - vbox: Fix typo in error message (Matthias Bolte) - virsh: Document nodeinfo output (Jiri Denemark) - Correct 'cputune' documentation example. (Neil Wilson) - document iface-* commands (Eric Blake) - Add initial docs about the lock managers (Daniel P. Berrange) - maint: use consistent file name for threading notes (Eric Blake) - Fix virTypedParameter alias comments (Matthias Bolte) - Fix error syntax of vcpupin example XML (Osier Yang) - Automatically generate the hvsupport.html.in file from source files (Daniel P. Berrange) - Fix documentation for cputune parameters (Osier Yang) - avoid double 'the' (Eric Blake) - Add documentation about test suites (Daniel Veillard) - updates to CA cert and client cert/key info (Doug Goldstein) - node filesystem attr is 'accessmode', not 'mode' (Cole Robinson) Portability: - vbox: Fix version extraction on Windows for newer VirtualBox versions (Matthias Bolte) - Make dlopen usage in lock manager conditional (Matthias Bolte) - build: fix VPATH build break from previous patch (Eric Blake) - Remove call to deprecated gnutls_certificate_type_set_priority (Daniel P. Berrange) - Fix sysinfo/virsh build problems on Win32 (Daniel P. Berrange) - Fix build with --with-driver-modules enabled (Matthias Bolte) - build: fix 'make dist' for ./configure --without-remote (Eric Blake) - virsh: time_t is not a long on FreeBSD (Matthias Bolte) - time_t is not a long on FreeBSD, switch internal type to long long (Matthias Bolte) - build: avoid strerror_r pitfalls (Eric Blake) - build: fix VIR_DEBUG on mingw (Eric Blake) - build: generate files when building without libvirtd (Wen Congyang) - build: drop unused sys/syslimits.h header (Eric Blake) - Fix prototype of virRun for Win32 targets (Daniel P. Berrange) - build: tolerate unlimited group size (Eric Blake) - Disable virCommandExec on Win32 (Daniel P. Berrange) - command: Fix compilation on FreeBSD (Matthias Bolte) - apparmor: Fix compilation by removing remains from virCommand conversion (Matthias Bolte) - configure: Fix mpath check on non-Linux systems (Matthias Bolte) - fix xdr detection and use with recent glibc (Christophe Fergeau) - build: avoid gcc preprocessor extensions (Eric Blake) - build: fix VPATH build with distributed generated files (Eric Blake) - build: fix VPATH builds (Eric Blake) Bug fixes: - Fix QEMU p2p v2 migration when run from a v3 client (Daniel P. Berrange) - Don't raise an error if the migration cookie is NULL (Daniel P. Berrange) - Fix check of virKillProcess return status (Daniel P. Berrange) - qemu: Avoid use after free in qemuCaps parsing (Jiri Denemark) - security driver: ignore EINVAL when chowning an image file (Laine Stump) - migrate: detect xml incompatibility (Eric Blake) - event: avoid memory leak on cleanup (Eric Blake) - qemu: avoid memory leak on vcpupin (Eric Blake) - remote: avoid leak on failure (Eric Blake) - lock: avoid leak on failure (Eric Blake) - storage: avoid memory leak on stat failure (Eric Blake) - storage: avoid memory leak (Eric Blake) - libvirtd: avoid leak on failure (Eric Blake) - command: avoid leak on failure (Eric Blake) - Explicitly set VM state to paused after migration completes (Daniel P. Berrange) - Fix regressions BlockStats/Info APIs in QEMU driver (Daniel P. Berrange) - Fix minor issues in libxenlight managed save (Jim Fehlig) - Fix auditing of disk hotunplug operations (Daniel P. Berrange) - Avoid crash on NULL pointer in lock driver impls during hotplug (Daniel P. Berrange) - Fix return value in lock manager hotplug methods (Daniel P. Berrange) - Make sure virDomainSave/virDomainManagedSave reset id to -1 (Daniel P. Berrange) - Fix handling of VIR_EVENT_HANDLE_ERROR in QEMU monitor (Daniel P. Berrange) - security: plug regression introduced in disk probe logic (Eric Blake) - Fix order of disks and controllers (Jiri Denemark) - util: Fix incorrect error in PCI functions (Osier Yang) - openvz: Restore original EOF handling in openvzGetProcessInfo (Matthias Bolte) - openvz: Handle getline failures in openvzReadConfigParam properly (Matthias Bolte) - conf: Fix incorrect spice graphic XML format on compression options (Michal Privoznik) - nwfilter: reorder locks (Stefan Berger) - openvz: Fix regression in openvzGetVPSUUID (Matthias Bolte) - esx: Fix regression in absolute file name handling (Matthias Bolte) - openvz: Fix regression in config file parsing (Taisuke Yamada) - audit: fix minor off-by-one (Eric Blake) - Fix libxl vm def handling on domU cleanup (Markus Groß) - Fix modifying disk devices in qemu driver (Markus Groß) - json: Avoid passing large positive 64 bit integers to QMP. (Richard W.M. Jones) - Fix initialization of current vcpus in libxl driver (Jim Fehlig) - qemu: Don't change ownership of file when appending to it (Michal Privoznik) - qemu: fix typo in name - should be VHOST_NET, not VNET_HOST (Laine Stump) - Fix QEMU -vnc arg generation with raw IPv6 addresses (Daniel P. Berrange) - Fix peer2peer migration with transient VMs (Daniel P. Berrange) - python: Don't free must-not-free variables (Michal Privoznik) - python: Fix typo in bindings (Michal Privoznik) - libvirt.spec: /var/cache/libvirt should be 0711. (Richard W.M. Jones) - remote: remove bogus virDomainFree. (Richard W.M. Jones) - qemudDomainMemoryPeek: change ownership/selinux label on temporary file. (Richard W.M. Jones) - Fix QEMU migration cookie crash for guests with no graphics (Daniel P. Berrange) - Blank out the 'listenAddr' parameter if empty string (Daniel P. Berrange) - Improve invalid argument checks for the public API (Matthias Bolte) - qemu: fix typo in spice migration code (Michal Privoznik) - openvz: fix logic bug in previous patch (Eric Blake) - Fix error reporting in stream creation code (Matthias Bolte) - virsh: Correctly initialize libvirt (Jiri Denemark) - Fix leak of mime type string in screenshot dispatcher (Daniel P. Berrange) - Fix remote dispatcher for screenshot command (Daniel P. Berrange) - Add missing initialization to 'ret' in qemu migration (Daniel P. Berrange) - Close all sockets before cancelling QEMU migration (Daniel P. Berrange) - Ensure we always read a full buffer in tunnelled migration (Daniel P. Berrange) - phyp: avoid a crash (Eric Blake) - stream: avoid use-after-free (Eric Blake) - virsh: Fix uninitialized variable warning (Matthias Bolte) - libxl: fix typos in previous patch (Eric Blake) - node_device: avoid null dereference on error (Eric Blake) - tests: avoid crash when run under gcov (Eric Blake) - Fix two uninitialized variable warnings (Matthias Bolte) - apparmor: Fix uninitalized variable warning in virt-aa-helper (Matthias Bolte) - Fix qemuMigrationToFile nonull annotation (Daniel P. Berrange) Improvements: - API: consolidate common unreleased enums (Eric Blake) - uml: correct command line networking parameters (Heath Petersen) - Add call to sanlock_restrict() in QEMU lock driver (Daniel P. Berrange) - screenshot: Expose the new API in virsh (Michal Privoznik) - libxl: adds managed save and restore support (Markus Groß) - libxl: get maximum memory of running domain (Markus Groß) - Add a plugin for the 'sanlock' project (Daniel P. Berrange) - Allow leases to be hotpluged with QEMU guests (Daniel P. Berrange) - Support passing QEMU lock state to dest during migration (Daniel P. Berrange) - Integrate the QEMU driver with the lock manager infrastructure (Daniel P. Berrange) - Add higher level lock API for domain objects (Daniel P. Berrange) - Add a 'nop' lock driver implementation. (Daniel P. Berrange) - Support leases in guest XML and lock manager (Daniel P. Berrange) - Allow handshake with child process during startup (Daniel P. Berrange) - tests: really fix QEMU XML-2-ARGV graphics-spice-timeout test (Eric Blake) - build: avoid corrupting / in RHEL 5 (Eric Blake) - tests: Add a test for correct disk device ordering (Jiri Denemark) - Fix QEMU XML-2-ARGV graphics-spice-timeout test (Matthias Bolte) - remote generator: Handle some virTypedParameterPtr using functions (Matthias Bolte) - apibuild: Restrict long usage to existing functions and structs (Matthias Bolte) - remote generator: Legacy support for hyper to long mappings (Matthias Bolte) - Use common parameter order for remote(De)SerializeTypedParameters (Matthias Bolte) - openvz: Add simple test for openvzReadNetworkConf (Matthias Bolte) - openvz: Set virtType to openvz in openvzLoadDomains (Matthias Bolte) - storage: List directory volumes for dir/fs/netfs pools (Cole Robinson) - tests: Add more complex domain scheme test data (Michal Privoznik) - tests: Test for SPICE compression options (Michal Privoznik) - Ignore backward compatibility macros in apibuild.py (Matthias Bolte) - openvz: fix bridge devices parsing in openvzReadNetworkConf() (Jean-Baptiste Rouault) - Allow custom XML to be passed in during migration (Daniel P. Berrange) - Allow virsh to pass in a custom XML document for migration (Daniel P. Berrange) - Add an API for comparing the ABI of two guest configurations (Daniel P. Berrange) - Remove unused 'target' field in virDomainHostdevDef (Daniel P. Berrange) - lxc: Seperate domain config loading (Osier Yang) - openvz: Automatically disable on non-Linux systems (Matthias Bolte) - Support maximum and current memory flags in libxl driver (Markus Groß) - Add domainSave/Restore to libxl driver (Markus Groß) - Add domainCoreDump to libxl driver (Markus Groß) - Populate domid field of devices for libxenlight (Markus Groß) - Issue full error messages when processing QEMU monitor I/O (Daniel P. Berrange) - Don't kill QEMU process when a monitor I/O parsing error occurs (Daniel P. Berrange) - Introduce a new event emitted when a virtualization failure occurs (Daniel P. Berrange) - sched: provide new API shims for remaining drivers (Eric Blake) - virsh: improve schedinfo querying ability (Eric Blake) - remote: introduce remoteGetSchedulerParametersFlags (Eric Blake) - qemu: introduce qemuGetSchedulerParametersFlags (Eric Blake) - sched: introduce virDomainGetSchedulerParametersFlags (Eric Blake) - remote: consolidate typed parameter handling (Eric Blake) - maint: prefer newer API names internally (Eric Blake) - libvirt.h: avoid regression, and document preferred name (Eric Blake) - Fix virExecWithHook Prototype (Richard Laager) - interface: reformat error logs (Laine Stump) - interface: implement a test driver for network config transaction API. (Michal Privoznik) - interface: Implement driver methods for network config transaction API (Michal Privoznik) - interface: expose network config transaction API to virsh (Michal Privoznik) - interface: implement remote protocol for network config transaction API (Michal Privoznik) - interface: implement public APIs for libvirt transactional network changes (Michal Privoznik) - interface: define internal driver API for network config transactions (Michal Privoznik) - sexpr: Improve serialization error reporting (Matthias Bolte) - qemu: implement the new flags for setting memory parameters (Hu Tao) - qemu: implement the new flags for getting memory parameters (Hu Tao) - qemu : support persistent add/delete network interface (KAMEZAWA Hiroyuki) - openvz: Add simple testcase for config file parsing function (Matthias Bolte) - Add disk attach/detach support to libxl driver (Markus Groß) - Refactored libxl datastructure instantiation (Markus Groß) - schema: Add graphics element passwdValidTo attribute to schema (Michal Privoznik) - Fix sign mismatches between public API, driver API and XDR protocol (Matthias Bolte) - remote generator: Fix XDR sign mismatch for virNodeGet(Cells)FreeMemory (Matthias Bolte) - remote generator: Handle stream-using functions (Matthias Bolte) - remote generator: Make call-by-reference handling stricter (Matthias Bolte) - remote generator: Rename virNodeGetCellsFreeMemory parameters to common pattern (Matthias Bolte) - remote generator: Handle virDomainCreateWithFlags (Matthias Bolte) - Allow to explicitly disable the secrets a directory storage driver (Matthias Bolte) - Fix the signature of virDomainMigrateFinish3 for error reporting (Daniel P. Berrange) - Fix preservation of errors across migration steps (Daniel P. Berrange) - Improve debug logging of migration APIs (Daniel P. Berrange) - Fix error propagation in finish method for v3 migration (Daniel P. Berrange) - Fix SPICE seamless migration hostname (Daniel P. Berrange) - Fix resume on destination when doing non-live tunnelled migration (Daniel P. Berrange) - Introduce two method migration APIs (Daniel P. Berrange) - Add a second URI parameter to virDomainMigratePerform3 method (Daniel P. Berrange) - Extend v3 migration protocol to allow app supplied XML for target (Daniel P. Berrange) - esx: Report an error when auth pointer is missing instead of declining (Matthias Bolte) - Perform feature flag compat checking in QEMU migration cookies (Daniel P. Berrange) - Replace all remaining setgid/setuid calls with virSetUIDGID (Jiri Denemark) - util: Keep errno set to the root error after when returning from virSetUIDGID (Jiri Denemark) - storage: Add comment to picking return value of qemu-img (Michal Privoznik) - spice: support streaming-video parameter (Alon Levy) - nwfilter: enable filtering of gratuitous ARP packets (Stefan Berger) - qemu: don't require is_kvm for vhost-net support (Laine Stump) - Use per-user TLS certificates when possible (Doug Goldstein) - storage: pick return value of qemu-img (Michal Privoznik) - remote generator: Add special case for virConnectGetType (Matthias Bolte) - remote generator: Don't rely on $_ being stable over a large function (Matthias Bolte) - build: require newer gettext (Eric Blake) - virsh: Use Env variables for debug level and logfile (Supriya Kannery) - Don't generate cookies with v2 migration protocol. (Daniel P. Berrange) - Ensure p2p and direct migration use the new v3 protocol if available (Daniel P. Berrange) - remote: remove special case for getting version (Eric Blake) - virsh: optimize creation of default connection (Eric Blake) - Clarify that virDomainGet(Memory|Blkio)Parameters doesn't support subsets (Matthias Bolte) - Clarify that virDomainSet(Memory|Blkio)Parameters can take parameter subsets (Matthias Bolte) - Clarify that virDomainSetSchedulerParameters(Flags) can take subsets (Matthias Bolte) - Clarify the semantic of virDomainGetSchedulerParameters arguments (Matthias Bolte) - Clarify semantic of nparams argument of virDomainGetSchedulerType (Matthias Bolte) - Fix messages using VIR_ERR_XML_ERROR (Cole Robinson) - libvirt.h: consolidate typed parameter handling (Eric Blake) - build: update to latest gnulib (Eric Blake) - Add support for 'passthru' mode for direct network interfaces (Dirk Herrendorefer) - virsh: add parameters --live, --config and --current to cmd schedinfo (Hu Tao) - remote: introduce remoteSetSchedulerParametersFlags (Hu Tao) - qemu: introduce qemuSetSchedulerParametersFlags (Hu Tao) - sched: adjust parameter values to make current = 0 (Eric Blake) - introduce virDomainSetSchedulerParametersFlags (Hu Tao) - storage_backend: Convert virRunWithHook usage to virCommand (Cole Robinson) - storage_backend: Fix error reporting with regex helper (Cole Robinson) - storage: Covert regex helpers to virCommand (Cole Robinson) - openvz: Convert virExec usage to virCommand (Cole Robinson) - storage: iscsi: Convert virExec to virCommand (Cole Robinson) - remote generator, client: Add more special case handling (Matthias Bolte) - remote generator, client: Handle functions that return an optional string (Matthias Bolte) - esx: Simplify some esxVI_Boolean to bool (Matthias Bolte) - esx: Convert autoAnswer from esxVI_Boolean to a simple bool (Matthias Bolte) - esx: Fix race condition in esxVI_EnsureSession (Matthias Bolte) - esx: Whitespace cleanup in the generator (Matthias Bolte) - esx: Change some alignments in the input file (Matthias Bolte) - esx: Change generated method parameter autobinding (Matthias Bolte) - virsh: Report an error when virGetUserDirectory fails (Matthias Bolte) - maint: mark more perl scripts executable (Eric Blake) - maint: mark perl script executable (Eric Blake) - maint: ignore generated file (Eric Blake) - Improve error message when XDR marshalling fails (Daniel P. Berrange) - Run tunnelled migration IO in separate thread (Daniel P. Berrange) - Don't overwrite error when stream send fails (Daniel P. Berrange) - Make tunnelled migration honour resource restriction (Daniel P. Berrange) - Refactor migration completion loop to allow code reuse (Daniel P. Berrange) - Implement migration v3 protocol in QEMU driver (Daniel P. Berrange) - Merge tunnel and non-tunnel migration impl into one (Daniel P. Berrange) - Fix VM teardown if prepare returns invalid URI in v2 migration (Daniel P. Berrange) - Refactor tunnelled migration methods (Daniel P. Berrange) - Wire up SPICE client relocation with QEMU migration (Daniel P. Berrange) - Pass graphics setup from dst back to src via migration cookies (Daniel P. Berrange) - Introduce migration cookies to QEMU driver (Daniel P. Berrange) - Fix locking with qemuMigrationPrepareTunnel method (Daniel P. Berrange) - Remote driver implementation of new migration API (Daniel P. Berrange) - Add many version number annotations to drivers (Daniel P. Berrange) - Convert all driver struct intializers to C99 style (Daniel P. Berrange) - Tweak driver naming for consistency with public API (Daniel P. Berrange) - qemu: Update domain state when reconnecting monitor (Jiri Denemark) - Implement domain state reason (Jiri Denemark) - Implement basic virDomainGetState in all drivers (Jiri Denemark) - virsh: Prefer virDomainGetState over virDomainGetInfo (Jiri Denemark) - Wire protocol format and remote driver for virDomainGetState (Jiri Denemark) - virDomainGetState public API implementation (Jiri Denemark) - Internal driver API for virDomainGetState (Jiri Denemark) - esx: Refactor common code in the generator (Matthias Bolte) - esx: Improve dynamic cast detection in the generator (Matthias Bolte) - esx: Improve list usage detection in the generator (Matthias Bolte) - esx: Remove 1000 lines of generated but unused code (Matthias Bolte) - esx: Generate implicit _this macros (Matthias Bolte) - esx: Move the Event type from the VI generator to manually written code (Matthias Bolte) - test: all test_scripts should be part of tarball when building without libvirtd (Wen Congyang) - build: probes.d and libvirtd.stp should be part of tarball (Wen Congyang) - remote: Convert SSH tunnel to virCommand (Cole Robinson) - storage: Convert qemu-img -help parsing to virCommand (Cole Robinson) - apparmor: Convert virExec usage to virCommand (Cole Robinson) - util: Combine __virExec and virExecWithHook (Cole Robinson) - remote_driver: Convert virExecDaemonize usage to virCommand (Cole Robinson) - remote: Use virDomainEventState helpers (Cole Robinson) - libxl: Convert to virDomainEventState (Cole Robinson) - test: Use virDomainEventState helpers (Cole Robinson) - lxc: Use virDomainEventState helpers (Cole Robinson) - qemu: Use virDomainEventState helpers (Cole Robinson) - domain_event: Add common domain event queue/flush helpers (Cole Robinson) - domain_event: Add virDomainEventState structure (Cole Robinson) - xml: Use virXMLParse* helpers everywhere (Cole Robinson) - domain: Require init node for container guests (Cole Robinson) - xml: Make sure virXpathNodeSet always sets an error (Cole Robinson) - vbox: Implement the Screenshot driver methods (Michal Privoznik) - qemu: Implement the Screenshot driver methods (Michal Privoznik) - virFDStream: Add option for delete file after it's opening (Michal Privoznik) - Implementing the Screenshot remote protocol (Michal Privoznik) - Implementing the Screenshot public API (Michal Privoznik) - Defining the Screenshot internal API (Michal Privoznik) - remote generator: Add skipgen/autogen flags to .x files (Matthias Bolte) - nwfilter: drop unused flag argument (Eric Blake) - maint: omit translation for all VIR_INFO (Eric Blake) - build: wrap macro body in one-shot do-while loop (Eric Blake) - build: drop need for VIR_DOMAIN_DEBUG0() (Eric Blake) - libvirt,logging: cleanup VIR_XXX0() (Lai Jiangshan) - maint: avoid a couple of gnulib regressions (Eric Blake) - build: remove some dead assignments (Eric Blake) - Allow destroying QEMU VM even if a job is active (Daniel P. Berrange) - Add support for YAJL version 2 API/ABI (Daniel P. Berrange) - libxl: support enabling the HPET (Paolo Bonzini) - libxl: support enabling the HPET (Paolo Bonzini) - xen: parse and generate hpet item in sxpr (Paolo Bonzini) - virsh: flexibility in CA cert and user cert/key (Doug Goldstein) - remote generator: Make parsing stricter (Matthias Bolte) - remote generator: Unify unsigned int notation in .x files (Matthias Bolte) - remote generator: Fix comment ignoring regex (Matthias Bolte) - Rename internal DumpXML functions to GetXMLDesc (Matthias Bolte) - qemu,inject-nmi: Implement the driver methods (Lai Jiangshan) - inject-nmi: Expose the new API in virsh (Lai Jiangshan) - inject-nmi: Implementing the remote protocol (Lai Jiangshan) - inject-nmi: Implementing the public API (Lai Jiangshan) - inject-nmi: Defining the internal API (Lai Jiangshan) - lxc: container: Build init cmd before we close stdout (Cole Robinson) - lxc: container: Convert init node exec to virCommand (Cole Robinson) - command: Add virCommandExec helper (Cole Robinson) - lxc: driver: Improve logging when launching emulator (Cole Robinson) - lxc: driver: Convert emulator launching to virCommand (Cole Robinson) - command: Add virCommandEnvAddFormat (Cole Robinson) - build: translate generated strings (Eric Blake) - Pull in gnulib fnmatch module (Daniel P. Berrange) - json: Fix *GetBoolean functions (Jiri Denemark) - build: rebuild generated files after rpcgen_fix.pl tweak (Eric Blake) - Re-add libvirt.spec to tarball to allwo "make rpm" (Daniel Veillard) - build: Remove all generated RPC files from GIT (Daniel P. Berrange) - build: refactor generated RPC files (Daniel P. Berrange) - build: rename generated files to .h, for automake's sake (Eric Blake) - remote generator, client: Handle arguments with limited length (Matthias Bolte) - remote generator, client: Handle functions that return lists (Matthias Bolte) - remote: Refactor remote*Open and remote*Close functions (Matthias Bolte) - remote generator, client: Handle functions with optional return values (Matthias Bolte) - remote generator, client: Handle functions with multiple return values (Matthias Bolte) - remote generator, client: Handle functions with wrapped return values (Matthias Bolte) - remote generator, client: Handle functions with simple return values (Matthias Bolte) - remote generator, client: Handle simple remote driver functions (Matthias Bolte) - remote generator: Reorder into prepare and print section (Matthias Bolte) - remote generator, daemon: Handle functions with multiple return values (Matthias Bolte) - remote generator, daemon: Combine multiple ifs in the generated code (Matthias Bolte) - remote generator, daemon: Handle the CPU functions (Matthias Bolte) - remote generator: Refactor duplicate code (Matthias Bolte) - remote generator, daemon: Handle functions that return lists (Matthias Bolte) - remote: Rename 'nameslen' to the common 'maxnames' (Matthias Bolte) - remote generator, daemon: Handle functions with optional arguments (Matthias Bolte) - remote generator, daemon: Handle more functions (Matthias Bolte) - remote generator, daemon: Handle simple-return-value functions (Matthias Bolte) - remote generator, daemon: Change capitalization of some words (Matthias Bolte) - remote: Replace 'domain' with 'dom' in the XDR protocol (Matthias Bolte) - remote generator, daemon: Output function bodies too (Matthias Bolte) - remote generator: Replace tabs with spaces and rename file (Matthias Bolte) - Balloon dom0 in libxl driver (Markus Groß) - remote: check actual access to the cert (Doug Goldstein) - maint: avoid comparisons to bool constants (Eric Blake) - Add warning message to XML definition files stored on disk (Michal Privoznik) - Fix security driver handling of FIFOs with QEMU (Daniel P. Berrange) - Make taint warnings also go into the domain logfile (Daniel P. Berrange) - Add a qemuDomainAppendLog method for writing to the domain logfile (Daniel P. Berrange) - Move qemuProcessLogReadFD and qemuProcessLogFD methods (Daniel P. Berrange) - Log taint warnings in QEMU driver (Daniel P. Berrange) - Add field to virDomainObjPtr to track "tainting" (Daniel P. Berrange) - virsh: improve TLS certificate error messages (Doug Goldstein) - virsh: use new method for easier log to file (Eric Blake) - buf: add virBufferVasprintf (Eric Blake) - maint: rename virBufferVSprintf to virBufferAsprintf (Eric Blake) - Make QEMU migration use cached qemu capabilities data (Daniel P. Berrange) - Make QEMU hotplug use cached qemu capabilities data (Daniel P. Berrange) - Persist qemu capabilities in the domain status file (Daniel P. Berrange) Cleanups: - build: silence coverity false positive (Eric Blake) - build: silence coverity false positive (Eric Blake) - .gitignore: Exempt a new test binary. (Eric Blake) - Ensure hvsupport.html.in is built before HTML validation (Daniel P. Berrange) - Fix a make check error (Daniel Veillard) - Add sexpr.c to the list of file with translatable messages (Matthias Bolte) - don't check flags in virDomainSetSchedulerParametersFlags (Hu Tao) - build: silence clang false positive (Eric Blake) - Remove obsolete remoteDispatchOOMError method (Daniel P. Berrange) - remote: keep 'make check' happy (Eric Blake) - build: avoid compiler warning during configure (Wen Congyang) - Remove bogus assert() from migration code (Daniel P. Berrange) - build: drop files generated by config.status from tarball (Eric Blake) Thanks everybody for contributing to the release, with documentation, ideas, feedback or patches ! 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] [PATCH] esx: Fix driver method version annotations
by Matthias Bolte 06 Jun '11

06 Jun '11

--- src/esx/esx_interface_driver.c | 6 +++--- src/esx/esx_network_driver.c | 6 +++--- src/esx/esx_nwfilter_driver.c | 6 +++--- src/esx/esx_secret_driver.c | 6 +++--- src/esx/esx_storage_driver.c | 2 +- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/esx/esx_interface_driver.c b/src/esx/esx_interface_driver.c index 3f9c175..a468976 100644 --- a/src/esx/esx_interface_driver.c +++ b/src/esx/esx_interface_driver.c @@ -66,9 +66,9 @@ esxInterfaceClose(virConnectPtr conn) static virInterfaceDriver esxInterfaceDriver = { - "ESX", /* name */ - .open = esxInterfaceOpen, /* 0.7.0 */ - .close = esxInterfaceClose, /* 0.7.0 */ + .name = "ESX", + .open = esxInterfaceOpen, /* 0.7.6 */ + .close = esxInterfaceClose, /* 0.7.6 */ }; diff --git a/src/esx/esx_network_driver.c b/src/esx/esx_network_driver.c index 9385a26..3c76fae 100644 --- a/src/esx/esx_network_driver.c +++ b/src/esx/esx_network_driver.c @@ -66,9 +66,9 @@ esxNetworkClose(virConnectPtr conn) static virNetworkDriver esxNetworkDriver = { - "ESX", /* name */ - .open = esxNetworkOpen, /* 0.7.0 */ - .close = esxNetworkClose, /* 0.7.0 */ + .name = "ESX", + .open = esxNetworkOpen, /* 0.7.6 */ + .close = esxNetworkClose, /* 0.7.6 */ }; diff --git a/src/esx/esx_nwfilter_driver.c b/src/esx/esx_nwfilter_driver.c index ee85abc..13cacd4 100644 --- a/src/esx/esx_nwfilter_driver.c +++ b/src/esx/esx_nwfilter_driver.c @@ -65,9 +65,9 @@ esxNWFilterClose(virConnectPtr conn) static virNWFilterDriver esxNWFilterDriver = { - "ESX", /* name */ - .open = esxNWFilterOpen, /* 0.8.0 */ - .close = esxNWFilterClose, /* 0.8.0 */ + .name = "ESX", + .open = esxNWFilterOpen, /* 0.8.1 */ + .close = esxNWFilterClose, /* 0.8.1 */ }; diff --git a/src/esx/esx_secret_driver.c b/src/esx/esx_secret_driver.c index dff2290..656224e 100644 --- a/src/esx/esx_secret_driver.c +++ b/src/esx/esx_secret_driver.c @@ -64,9 +64,9 @@ esxSecretClose(virConnectPtr conn) static virSecretDriver esxSecretDriver = { - "ESX", /* name */ - .open = esxSecretOpen, /* 0.7.1 */ - .close = esxSecretClose, /* 0.7.1 */ + .name = "ESX", + .open = esxSecretOpen, /* 0.7.6 */ + .close = esxSecretClose, /* 0.7.6 */ }; diff --git a/src/esx/esx_storage_driver.c b/src/esx/esx_storage_driver.c index 5ee0cf4..6461917 100644 --- a/src/esx/esx_storage_driver.c +++ b/src/esx/esx_storage_driver.c @@ -1645,7 +1645,7 @@ esxStoragePoolIsPersistent(virStoragePoolPtr pool ATTRIBUTE_UNUSED) static virStorageDriver esxStorageDriver = { - "ESX", /* name */ + .name = "ESX", .open = esxStorageOpen, /* 0.7.6 */ .close = esxStorageClose, /* 0.7.6 */ .numOfPools = esxNumberOfStoragePools, /* 0.8.2 */ -- 1.7.0.4

2 2

[libvirt] [PATCH] Fix QEMU p2p v2 migration when run from a v3 client
by Daniel P. Berrange 06 Jun '11

06 Jun '11

When peer-2-peer migration was invoked by a client supporting v3, but where the target server only supported v2, we'd not correctly shutdown the guest. * src/qemu/qemu_migration.c: Ensure guest is shutdown in v2 peer 2 peer migration --- src/qemu/qemu_migration.c | 17 +++++++++++------ 1 files changed, 11 insertions(+), 6 deletions(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index fa506e2..f7eaa1c 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -2199,12 +2199,12 @@ static int doPeer2PeerMigrate(struct qemud_driver *driver, const char *uri, unsigned long flags, const char *dname, - unsigned long resource) + unsigned long resource, + bool *v3proto) { int ret = -1; virConnectPtr dconn = NULL; bool p2p; - bool v3; VIR_DEBUG("driver=%p, sconn=%p, vm=%p, xmlin=%s, dconnuri=%s, " "uri=%s, flags=%lu, dname=%s, resource=%lu", driver, sconn, vm, NULLSTR(xmlin), NULLSTR(dconnuri), @@ -2226,8 +2226,12 @@ static int doPeer2PeerMigrate(struct qemud_driver *driver, qemuDomainObjEnterRemoteWithDriver(driver, vm); p2p = VIR_DRV_SUPPORTS_FEATURE(dconn->driver, dconn, VIR_DRV_FEATURE_MIGRATION_P2P); - v3 = VIR_DRV_SUPPORTS_FEATURE(dconn->driver, dconn, - VIR_DRV_FEATURE_MIGRATION_V3); + /* v3proto reflects whether the caller used Perform3, but with + * p2p migrate, regardless of whether Perform3 or Perform3 + * were used, we decide protocol based on what target supports + */ + *v3proto = VIR_DRV_SUPPORTS_FEATURE(dconn->driver, dconn, + VIR_DRV_FEATURE_MIGRATION_V3); qemuDomainObjExitRemoteWithDriver(driver, vm); if (!p2p) { @@ -2243,7 +2247,7 @@ static int doPeer2PeerMigrate(struct qemud_driver *driver, goto cleanup; } - if (v3) + if (*v3proto) ret = doPeer2PeerMigrate3(driver, sconn, dconn, vm, xmlin, dconnuri, uri, flags, dname, resource); else @@ -2310,7 +2314,8 @@ int qemuMigrationPerform(struct qemud_driver *driver, } if (doPeer2PeerMigrate(driver, conn, vm, xmlin, - dconnuri, uri, flags, dname, resource) < 0) + dconnuri, uri, flags, dname, + resource, &v3proto) < 0) /* doPeer2PeerMigrate already set the error, so just get out */ goto endjob; } else { -- 1.7.4.4

2 2

[libvirt] [PATCH] qemu: Parse current balloon value returned by query_balloon.
by Osier Yang 06 Jun '11

06 Jun '11

Qemu once supported following memory stats which will returned by "query_balloon": stat_put(dict, "actual", actual); stat_put(dict, "mem_swapped_in", dev->stats[VIRTIO_BALLOON_S_SWAP_IN]); stat_put(dict, "mem_swapped_out", dev->stats[VIRTIO_BALLOON_S_SWAP_OUT]); stat_put(dict, "major_page_faults", dev->stats[VIRTIO_BALLOON_S_MAJFLT]); stat_put(dict, "minor_page_faults", dev->stats[VIRTIO_BALLOON_S_MINFLT]); stat_put(dict, "free_mem", dev->stats[VIRTIO_BALLOON_S_MEMFREE]); stat_put(dict, "total_mem", dev->stats[VIRTIO_BALLOON_S_MEMTOT]); But it later disabled all the stats except "actual" by commit 07b0403dfc2b2ac179ae5b48105096cc2d03375a. libvirt doesn't parse "actual", so user will always see a empty result with "virsh dommemstat $domain". Even qemu haven't disabled the stats, we should support parsing "actual". --- include/libvirt/libvirt.h.in | 4 +++- src/libvirt.c | 2 ++ src/qemu/qemu_monitor_json.c | 12 ++++++++++++ tools/virsh.c | 2 ++ 4 files changed, 19 insertions(+), 1 deletions(-) diff --git a/include/libvirt/libvirt.h.in b/include/libvirt/libvirt.h.in index 8058229..864852b 100644 --- a/include/libvirt/libvirt.h.in +++ b/include/libvirt/libvirt.h.in @@ -456,11 +456,13 @@ typedef enum { */ VIR_DOMAIN_MEMORY_STAT_AVAILABLE = 5, + /* Current balloon value (in KB). */ + VIR_DOMAIN_MEMORY_STAT_ACTUAL = 6, /* * The number of statistics supported by this version of the interface. * To add new statistics, add them to the enum and increase this value. */ - VIR_DOMAIN_MEMORY_STAT_NR = 6, + VIR_DOMAIN_MEMORY_STAT_NR = 7, } virDomainMemoryStatTags; typedef struct _virDomainMemoryStat virDomainMemoryStatStruct; diff --git a/src/libvirt.c b/src/libvirt.c index eaae0ec..c635ff5 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -5802,6 +5802,8 @@ error: * The amount of memory which is not being used for any purpose (in kb). * VIR_DOMAIN_MEMORY_STAT_AVAILABLE: * The total amount of memory available to the domain's OS (in kb). + * VIR_DOMAIN_MEMORY_STAT_ACTUAL: + * Current balloon value (in kb). * * Returns: The number of stats provided or -1 in case of failure. */ diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index 75adf66..9f16403 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -1119,6 +1119,18 @@ int qemuMonitorJSONGetMemoryStats(qemuMonitorPtr mon, goto cleanup; } + if (virJSONValueObjectHasKey(data, "actual") && (got < nr_stats)) { + if (virJSONValueObjectGetNumberUlong(data, "actual", &mem) < 0) { + qemuReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("info balloon reply was missing balloon actual")); + ret = -1; + goto cleanup; + } + stats[got].tag = VIR_DOMAIN_MEMORY_STAT_ACTUAL; + stats[got].val = (mem/1024); + got++; + } + if (virJSONValueObjectHasKey(data, "mem_swapped_in") && (got < nr_stats)) { if (virJSONValueObjectGetNumberUlong(data, "mem_swapped_in", &mem) < 0) { qemuReportError(VIR_ERR_INTERNAL_ERROR, "%s", diff --git a/tools/virsh.c b/tools/virsh.c index 5679a2d..a358b73 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -1147,6 +1147,8 @@ cmdDomMemStat(vshControl *ctl, const vshCmd *cmd) vshPrint (ctl, "unused %llu\n", stats[i].val); if (stats[i].tag == VIR_DOMAIN_MEMORY_STAT_AVAILABLE) vshPrint (ctl, "available %llu\n", stats[i].val); + if (stats[i].tag == VIR_DOMAIN_MEMORY_STAT_ACTUAL) + vshPrint (ctl, "actual %llu\n", stats[i].val); } virDomainFree(dom); -- 1.7.4

3 3

[libvirt] Building on Solaris 11 Express
by Richard Laager 05 Jun '11

05 Jun '11

I would really like to use ZFS's zvols as storage for my guests. I really like ZFS's snapshots, send/receive, and checksumming features. (Compression and deduplication might be useful as well.) I'm roughly about half-way done writing a ZFS storage backend for libvirt. It behaves like the LVM backend. I've been writing it on Linux. However, ZFS on Linux is not yet production-ready. So I tried building libvirt on Solaris 11 Express. The following outlines the trouble (and successes) I've had so far. First, I had to prune down the features being built: I added --without-xen to deal with the following. I wasn't intending on using Xen, so this doesn't bother me personally. configure: error: You must install the Xen development package to compile Xen driver with -lxenstore I added --without-openvz to deal with the following. Likewise, I'm not using it. CC libvirt_driver_openvz_la-openvz_driver.lo openvz/openvz_driver.c:45:19: paths.h: No such file or directory In file included from ../src/conf/domain_conf.h:40, from openvz/openvz_conf.h:33, from openvz/openvz_driver.c:56: ../src/conf/nwfilter_conf.h:521: warning: parameter has incomplete type I added --without-network to deal with the following. I may need to actually fix this at some point. CC libvirt_util_la-bridge.lo util/bridge.c:39:20: paths.h: No such file or directory util/bridge.c:42:55: linux/param.h: No such file or directory util/bridge.c:43:55: linux/sockios.h: No such file or directory util/bridge.c:44:55: linux/if_bridge.h: No such file or directory util/bridge.c:45:55: linux/if_tun.h: No such file or directory util/bridge.c: In function `ifSetInterfaceMac': util/bridge.c:313: error: `SIOCGIFHWADDR' undeclared (first use in this function) util/bridge.c:313: error: (Each undeclared identifier is reported only once util/bridge.c:313: error: for each function it appears in.) util/bridge.c:316: error: structure has no member named `ifr_hwaddr' util/bridge.c:318: error: `SIOCSIFHWADDR' undeclared (first use in this function) util/bridge.c: In function `ifGetMtu': util/bridge.c:347: error: `SIOCGIFMTU' undeclared (first use in this function) util/bridge.c: In function `ifSetMtu': util/bridge.c:378: error: `SIOCSIFMTU' undeclared (first use in this function) util/bridge.c: In function `brAddTap': util/bridge.c:501: error: `IFF_TAP' undeclared (first use in this function) util/bridge.c:501: error: `IFF_NO_PI' undeclared (first use in this function) util/bridge.c:515: error: `TUNSETIFF' undeclared (first use in this function) util/bridge.c:537: error: `TUNSETPERSIST' undeclared (first use in this function) util/bridge.c: In function `brDeleteTap': util/bridge.c:567: error: `IFF_TAP' undeclared (first use in this function) util/bridge.c:567: error: `IFF_NO_PI' undeclared (first use in this function) util/bridge.c:574: error: `TUNSETIFF' undeclared (first use in this function) util/bridge.c:575: error: `TUNSETPERSIST' undeclared (first use in this function) util/bridge.c: In function `brSetInterfaceUp': util/bridge.c:612: error: `SIOCGIFFLAGS' undeclared (first use in this function) util/bridge.c:620: error: `SIOCSIFFLAGS' undeclared (first use in this function) util/bridge.c: In function `brGetInterfaceUp': util/bridge.c:652: error: `SIOCGIFFLAGS' undeclared (first use in this function) Then, I had to fix a trivial code error. I've mailed the patch to this list with a subject of "[PATCH] Fix virExecWithHook Prototype". I also had linker trouble. Solaris 11's gcc package uses Solaris ld, not GNU ld. I had to change the following: VERSION_SCRIPT_FLAGS=-Wl,--version-script= `$LD --help 2>&1 | grep -- --version-script >/dev/null` || \ - VERSION_SCRIPT_FLAGS="-Wl,-M -Wl," + VERSION_SCRIPT_FLAGS="" Interestingly, this code seems to have been added to support Solaris ld according to git blame; see git log c2fb8bfe. I'm not sure what is correct here. At this point, libvirt builds and installs. I tested virsh against a remote system using: virsh -c qemu+ssh://REMOTE/system This worked except for the fact that it was trying to attach to /usr/local/var/run/libvirt-sock on the remote system due to /usr/local being the --prefix used with the *local* virsh was built. I'm not sure how that architectural issue should be addressed. For testing, I just made a /usr/local/var -> /var symlink on the remote system. However, libvirtd will not start locally (on Solaris) which has pretty much stopped my progress. I'm sure this must be something trivial. Is it getting a bad prefix? Is something other than libvirtd supposed to make the socket file? I did try making a /.libvirt directory for testing. # rm /usr/local/var/run/libvirtd.pid ; /usr/local/sbin/libvirtd -v 20:13:33.663: 1: info : libvirt version: 0.9.1 20:13:33.663: 1: error : qemudListenUnix:605 : Failed to bind socket to '@//.libvirt/libvirt-sock': No such file or directory Thanks, Richard

4 25

[libvirt] [PATCH] vbox: Fix typo in error message
by Matthias Bolte 04 Jun '11

04 Jun '11

--- I'm pushing this under the trivial rule. src/vbox/vbox_XPCOMCGlue.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/vbox/vbox_XPCOMCGlue.c b/src/vbox/vbox_XPCOMCGlue.c index 0caeef9..e7e9c37 100644 --- a/src/vbox/vbox_XPCOMCGlue.c +++ b/src/vbox/vbox_XPCOMCGlue.c @@ -97,7 +97,7 @@ tryLoadOne(const char *dir, bool setAppHome, bool ignoreMissing, if (!virFileExists(name)) { if (!ignoreMissing) { - VIR_ERROR(_("Libaray '%s' doesn't exist"), name); + VIR_ERROR(_("Library '%s' doesn't exist"), name); } VIR_FREE(name); -- 1.7.0.4

1 0

[libvirt] [PATCH] Don't raise an error if the migration cookie is NULL
by Daniel P. Berrange 04 Jun '11

04 Jun '11

The v2 migration protocol doesn't use cookies, so we should not be raising an error if the cookie parameters are NULL. * src/qemu/qemu_migration.c: Don't raise error if cookie is NULL --- src/qemu/qemu_migration.c | 7 ++----- 1 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index aa74d86..fa506e2 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -618,11 +618,8 @@ qemuMigrationBakeCookie(qemuMigrationCookiePtr mig, int *cookieoutlen, int flags) { - if (!cookieout || !cookieoutlen) { - qemuReportError(VIR_ERR_INVALID_ARG, "%s", - _("missing migration cookie data")); - return -1; - } + if (!cookieout || !cookieoutlen) + return 0; *cookieoutlen = 0; -- 1.7.4.4

2 1

[libvirt] [PATCH] Fix check of virKillProcess return status
by Daniel P. Berrange 04 Jun '11

04 Jun '11

The error code for virKillProcess is returned in the errno variable not the return value. THis mistake caused the logs to be filled with errors when shutting down QEMU processes * src/qemu/qemu_process.c: Fix process kill check. --- src/qemu/qemu_process.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 116253e..ce05133 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -2513,7 +2513,6 @@ cleanup: void qemuProcessKill(virDomainObjPtr vm) { int i; - int rc; VIR_DEBUG("vm=%s pid=%d", vm->def->name, vm->pid); if (!virDomainObjIsActive(vm)) { @@ -2535,9 +2534,8 @@ void qemuProcessKill(virDomainObjPtr vm) else signum = 0; /* Just check for existence */ - rc = virKillProcess(vm->pid, signum); - if (rc < 0) { - if (rc != -ESRCH) { + if (virKillProcess(vm->pid, signum) < 0) { + if (errno != -ESRCH) { char ebuf[1024]; VIR_WARN("Failed to kill process %d %s", vm->pid, virStrerror(errno, ebuf, sizeof ebuf)); -- 1.7.4.4

2 1

[libvirt] [PATCH] vbox: Fix version extraction on Windows for newer VirtualBox versions
by Matthias Bolte 04 Jun '11

04 Jun '11

VirtualBox 4.0.8 changed the registry key layout. Before the version number was in a Version key. Now the Version key contains %VER% and the actual version number is in VersionExt now. Move value lookup code into its own function: vboxLookupRegistryValue. --- src/vbox/vbox_MSCOMGlue.c | 87 +++++++++++++++++++++++++++++++-------------- 1 files changed, 60 insertions(+), 27 deletions(-) diff --git a/src/vbox/vbox_MSCOMGlue.c b/src/vbox/vbox_MSCOMGlue.c index e31a763..8aef266 100644 --- a/src/vbox/vbox_MSCOMGlue.c +++ b/src/vbox/vbox_MSCOMGlue.c @@ -2,7 +2,7 @@ /* * vbox_MSCOMGlue.c: glue to the MSCOM based VirtualBox API * - * Copyright (C) 2010 Matthias Bolte <matthias.bolte(a)googlemail.com> + * Copyright (C) 2010-2011 Matthias Bolte <matthias.bolte(a)googlemail.com> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -338,45 +338,31 @@ static nsIEventQueue vboxEventQueue = { -static int -vboxLookupVersionInRegistry(void) +static char * +vboxLookupRegistryValue(HKEY key, const char *keyName, const char *valueName) { - int result = -1; - const char *keyName = VBOX_REGKEY_ORACLE; LONG status; - HKEY key; DWORD type; DWORD length; char *value = NULL; - status = RegOpenKeyEx(HKEY_LOCAL_MACHINE, keyName, 0, KEY_READ, &key); + status = RegQueryValueEx(key, valueName, NULL, &type, NULL, &length); if (status != ERROR_SUCCESS) { - keyName = VBOX_REGKEY_SUN; - status = RegOpenKeyEx(HKEY_LOCAL_MACHINE, keyName, 0, KEY_READ, &key); - - if (status != ERROR_SUCCESS) { - /* Both keys aren't there, or we cannot open them. In general this - * indicates that VirtualBox is not installed, so we just silently - * fail here making vboxRegister() register the dummy driver. */ - return -1; - } - } - - status = RegQueryValueEx(key, "Version", NULL, &type, NULL, &length); - - if (status != ERROR_SUCCESS) { - VIR_ERROR(_("Could not query registry value '%s\\Version'"), keyName); + VIR_ERROR(_("Could not query registry value '%s\\%s'"), + keyName, valueName); goto cleanup; } if (type != REG_SZ) { - VIR_ERROR(_("Registry value '%s\\Version' has unexpected type"), keyName); + VIR_ERROR(_("Registry value '%s\\%s' has unexpected type"), + keyName, valueName); goto cleanup; } if (length < 2) { - VIR_ERROR(_("Registry value '%s\\Version' is too short"), keyName); + VIR_ERROR(_("Registry value '%s\\%s' is too short"), + keyName, valueName); goto cleanup; } @@ -386,10 +372,12 @@ vboxLookupVersionInRegistry(void) goto cleanup; } - status = RegQueryValueEx(key, "Version", NULL, NULL, (LPBYTE)value, &length); + status = RegQueryValueEx(key, valueName, NULL, NULL, (LPBYTE)value, &length); if (status != ERROR_SUCCESS) { - VIR_ERROR(_("Could not query registry value '%s\\Version'"), keyName); + VIR_FREE(value); + VIR_ERROR(_("Could not query registry value '%s\\%s'"), + keyName, valueName); goto cleanup; } @@ -397,7 +385,52 @@ vboxLookupVersionInRegistry(void) value[length] = '\0'; } - if (virParseVersionString(value, &vboxVersion)) { + cleanup: + return value; +} + +static int +vboxLookupVersionInRegistry(void) +{ + int result = -1; + const char *keyName = VBOX_REGKEY_ORACLE; + LONG status; + HKEY key; + char *value = NULL; + + status = RegOpenKeyEx(HKEY_LOCAL_MACHINE, keyName, 0, KEY_READ, &key); + + if (status != ERROR_SUCCESS) { + keyName = VBOX_REGKEY_SUN; + status = RegOpenKeyEx(HKEY_LOCAL_MACHINE, keyName, 0, KEY_READ, &key); + + if (status != ERROR_SUCCESS) { + /* Both keys aren't there, or we cannot open them. In general this + * indicates that VirtualBox is not installed, so we just silently + * fail here making vboxRegister() register the dummy driver. */ + return -1; + } + } + + /* The registry key layout changed around version 4.0.8. Before the version + * number was in the Version key, now the Version key can contain %VER% and + * the actual version number is in the VersionExt key then. */ + value = vboxLookupRegistryValue(key, keyName, "Version"); + + if (value == NULL) { + goto cleanup; + } + + if (STREQ(value, "%VER%")) { + VIR_FREE(value); + value = vboxLookupRegistryValue(key, keyName, "VersionExt"); + + if (value == NULL) { + goto cleanup; + } + } + + if (virParseVersionString(value, &vboxVersion) < 0) { VIR_ERROR(_("Could not parse version number from '%s'"), value); goto cleanup; } -- 1.7.0.4

2 2

[libvirt] [PATCH] API: consolidate common unreleased enums
by Eric Blake 04 Jun '11

04 Jun '11

This commit is safe precisely because there has been no release for any of the enum values being deleted (they were added post-0.9.1). After the 0.9.2 release, we can then take advantage of virDomainModificationImpact in more places. * include/libvirt/libvirt.h.in (virDomainModificationImpact): New enum. (virDomainSchedParameterFlags, virMemoryParamFlags): Delete, since these were never released, and the new enum works fine here. * src/libvirt.c (virDomainGetMemoryParameters) (virDomainSetMemoryParameters) (virDomainGetSchedulerParametersFlags) (virDomainSetSchedulerParametersFlags): Update documentation. * src/qemu/qemu_driver.c (qemuDomainSetMemoryParameters) (qemuDomainGetMemoryParameters, qemuSetSchedulerParametersFlags) (qemuSetSchedulerParameters, qemuGetSchedulerParametersFlags) (qemuGetSchedulerParameters): Adjust clients. * tools/virsh.c (cmdSchedinfo, cmdMemtune): Likewise. Based on ideas by Daniel Veillard and Hu Tao. --- This has to be applied before 0.9.2 if we like the idea. See https://www.redhat.com/archives/libvir-list/2011-June/msg00177.html for more details about why this is safe. I am intentionally not touching any enums that existed in 0.9.1 at this point in the release cycle. include/libvirt/libvirt.h.in | 30 ++++++++------ src/libvirt.c | 18 ++++---- src/qemu/qemu_driver.c | 84 +++++++++++++++++++++--------------------- tools/virsh.c | 12 +++--- 4 files changed, 74 insertions(+), 70 deletions(-) diff --git a/include/libvirt/libvirt.h.in b/include/libvirt/libvirt.h.in index 8058229..df213f1 100644 --- a/include/libvirt/libvirt.h.in +++ b/include/libvirt/libvirt.h.in @@ -142,6 +142,23 @@ typedef enum { } virDomainCrashedReason; /** + * virDomainModificationImpact: + * + * Several APIs take flags to determine whether a change to the domain + * affects just the running instance, just the persistent definition, + * or both. The use of VIR_DOMAIN_AFFECT_CURRENT will resolve to + * either VIR_DOMAIN_AFFECT_LIVE or VIR_DOMAIN_AFFECT_CONFIG according + * to current domain state. VIR_DOMAIN_AFFECT_LIVE requires a running + * domain, and VIR_DOMAIN_AFFECT_CONFIG requires a persistent domain + * (whether or not it is running). + */ +typedef enum { + VIR_DOMAIN_AFFECT_CURRENT = 0, /* Affect current domain state. */ + VIR_DOMAIN_AFFECT_LIVE = 1 << 0, /* Affect running domain state. */ + VIR_DOMAIN_AFFECT_CONFIG = 1 << 1, /* Affect persistent domain state. */ +} virDomainModificationImpact; + +/** * virDomainInfoPtr: * * a virDomainInfo is a structure filled by virDomainGetInfo() and extracting @@ -338,12 +355,6 @@ typedef virTypedParameter *virTypedParameterPtr; /* Management of scheduler parameters */ -typedef enum { - VIR_DOMAIN_SCHEDPARAM_CURRENT = 0, /* affect current domain state */ - VIR_DOMAIN_SCHEDPARAM_LIVE = (1 << 0), /* Affect active domain */ - VIR_DOMAIN_SCHEDPARAM_CONFIG = (1 << 1), /* Affect next boot */ -} virDomainSchedParameterFlags; - /* * Fetch scheduler parameters, caller allocates 'params' field of size 'nparams' */ @@ -799,13 +810,6 @@ int virDomainGetBlkioParameters(virDomainPtr domain, /* Manage memory parameters. */ -/* flags for setting memory parameters */ -typedef enum { - VIR_DOMAIN_MEMORY_PARAM_CURRENT = 0, /* affect current domain state */ - VIR_DOMAIN_MEMORY_PARAM_LIVE = (1 << 0), /* affect active domain */ - VIR_DOMAIN_MEMORY_PARAM_CONFIG = (1 << 1) /* affect next boot */ -} virMemoryParamFlags; - /** * VIR_DOMAIN_MEMORY_PARAM_UNLIMITED: * diff --git a/src/libvirt.c b/src/libvirt.c index eaae0ec..cbe1926 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -2994,7 +2994,7 @@ error: * @params: pointer to memory parameter objects * @nparams: number of memory parameter (this value can be the same or * less than the number of parameters supported) - * @flags: currently unused, for future extension + * @flags: bitwise-OR of virDomainModificationImpact * * Change all or a subset of the memory tunables. * This function requires privileged access to the hypervisor. @@ -3049,7 +3049,7 @@ error: * @params: pointer to memory parameter object * (return value, allocated by the caller) * @nparams: pointer to number of memory parameters - * @flags: currently unused, for future extension + * @flags: one of virDomainModificationImpact * * Get all memory parameters, the @params array will be filled with the values * equal to the number of parameters suggested by @nparams @@ -5480,13 +5480,13 @@ error: * @nparams: pointer to number of scheduler parameter * (this value should be same than the returned value * nparams of virDomainGetSchedulerType) - * @flags: virDomainSchedParameterFlags + * @flags: one of virDomainModificationImpact * * Get the scheduler parameters, the @params array will be filled with the * values. * - * The value of @flags can be exactly VIR_DOMAIN_SCHEDPARAM_CURRENT, - * VIR_DOMAIN_SCHEDPARAM_LIVE, or VIR_DOMAIN_SCHEDPARAM_CONFIG. + * The value of @flags can be exactly VIR_DOMAIN_AFFECT_CURRENT, + * VIR_DOMAIN_AFFECT_LIVE, or VIR_DOMAIN_AFFECT_CONFIG. * * Returns -1 in case of error, 0 in case of success. */ @@ -5596,12 +5596,12 @@ error: * @nparams: number of scheduler parameter objects * (this value can be the same or less than the returned value * nparams of virDomainGetSchedulerType) - * @flags: virDomainSchedParameterFlags + * @flags: bitwise-OR of virDomainModificationImpact * * Change a subset or all scheduler parameters. The value of @flags - * should be either VIR_DOMAIN_SCHEDPARAM_CURRENT, or a bitwise-or of - * values from VIR_DOMAIN_SCHEDPARAM_LIVE and - * VIR_DOMAIN_SCHEDPARAM_CURRENT, although hypervisors vary in which + * should be either VIR_DOMAIN_AFFECT_CURRENT, or a bitwise-or of + * values from VIR_DOMAIN_AFFECT_LIVE and + * VIR_DOMAIN_AFFECT_CURRENT, although hypervisors vary in which * flags are supported. * * Returns -1 in case of error, 0 in case of success. diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index ec23bb3..2957467 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -4921,8 +4921,8 @@ static int qemuDomainSetMemoryParameters(virDomainPtr dom, int ret = -1; bool isActive; - virCheckFlags(VIR_DOMAIN_MEMORY_PARAM_LIVE | - VIR_DOMAIN_MEMORY_PARAM_CONFIG, -1); + virCheckFlags(VIR_DOMAIN_AFFECT_LIVE | + VIR_DOMAIN_AFFECT_CONFIG, -1); qemuDriverLock(driver); @@ -4936,14 +4936,14 @@ static int qemuDomainSetMemoryParameters(virDomainPtr dom, isActive = virDomainObjIsActive(vm); - if (flags == VIR_DOMAIN_MEMORY_PARAM_CURRENT) { + if (flags == VIR_DOMAIN_AFFECT_CURRENT) { if (isActive) - flags = VIR_DOMAIN_MEMORY_PARAM_LIVE; + flags = VIR_DOMAIN_AFFECT_LIVE; else - flags = VIR_DOMAIN_MEMORY_PARAM_CONFIG; + flags = VIR_DOMAIN_AFFECT_CONFIG; } - if (flags & VIR_DOMAIN_MEMORY_PARAM_LIVE) { + if (flags & VIR_DOMAIN_AFFECT_LIVE) { if (!isActive) { qemuReportError(VIR_ERR_OPERATION_INVALID, "%s", _("domain is not running")); @@ -4963,7 +4963,7 @@ static int qemuDomainSetMemoryParameters(virDomainPtr dom, } } - if (flags & VIR_DOMAIN_MEMORY_PARAM_CONFIG) { + if (flags & VIR_DOMAIN_AFFECT_CONFIG) { if (!vm->persistent) { qemuReportError(VIR_ERR_OPERATION_INVALID, "%s", _("cannot change persistent config of a transient domain")); @@ -4986,7 +4986,7 @@ static int qemuDomainSetMemoryParameters(virDomainPtr dom, continue; } - if (flags & VIR_DOMAIN_MEMORY_PARAM_LIVE) { + if (flags & VIR_DOMAIN_AFFECT_LIVE) { rc = virCgroupSetMemoryHardLimit(group, params[i].value.ul); if (rc != 0) { virReportSystemError(-rc, "%s", @@ -4995,7 +4995,7 @@ static int qemuDomainSetMemoryParameters(virDomainPtr dom, } } - if (flags & VIR_DOMAIN_MEMORY_PARAM_CONFIG) { + if (flags & VIR_DOMAIN_AFFECT_CONFIG) { persistentDef->mem.hard_limit = params[i].value.ul; } } else if (STREQ(param->field, VIR_DOMAIN_MEMORY_SOFT_LIMIT)) { @@ -5007,7 +5007,7 @@ static int qemuDomainSetMemoryParameters(virDomainPtr dom, continue; } - if (flags & VIR_DOMAIN_MEMORY_PARAM_LIVE) { + if (flags & VIR_DOMAIN_AFFECT_LIVE) { rc = virCgroupSetMemorySoftLimit(group, params[i].value.ul); if (rc != 0) { virReportSystemError(-rc, "%s", @@ -5016,7 +5016,7 @@ static int qemuDomainSetMemoryParameters(virDomainPtr dom, } } - if (flags & VIR_DOMAIN_MEMORY_PARAM_CONFIG) { + if (flags & VIR_DOMAIN_AFFECT_CONFIG) { persistentDef->mem.soft_limit = params[i].value.ul; } } else if (STREQ(param->field, VIR_DOMAIN_MEMORY_SWAP_HARD_LIMIT)) { @@ -5028,7 +5028,7 @@ static int qemuDomainSetMemoryParameters(virDomainPtr dom, continue; } - if (flags & VIR_DOMAIN_MEMORY_PARAM_LIVE) { + if (flags & VIR_DOMAIN_AFFECT_LIVE) { rc = virCgroupSetMemSwapHardLimit(group, params[i].value.ul); if (rc != 0) { virReportSystemError(-rc, "%s", @@ -5036,7 +5036,7 @@ static int qemuDomainSetMemoryParameters(virDomainPtr dom, ret = -1; } } - if (flags & VIR_DOMAIN_MEMORY_PARAM_CONFIG) { + if (flags & VIR_DOMAIN_AFFECT_CONFIG) { persistentDef->mem.swap_hard_limit = params[i].value.ul; } } else if (STREQ(param->field, VIR_DOMAIN_MEMORY_MIN_GUARANTEE)) { @@ -5050,7 +5050,7 @@ static int qemuDomainSetMemoryParameters(virDomainPtr dom, } } - if (flags & VIR_DOMAIN_MEMORY_PARAM_CONFIG) { + if (flags & VIR_DOMAIN_AFFECT_CONFIG) { ret = virDomainSaveConfig(driver->configDir, persistentDef); } @@ -5077,8 +5077,8 @@ static int qemuDomainGetMemoryParameters(virDomainPtr dom, int rc; bool isActive; - virCheckFlags(VIR_DOMAIN_MEMORY_PARAM_LIVE | - VIR_DOMAIN_MEMORY_PARAM_CONFIG, -1); + virCheckFlags(VIR_DOMAIN_AFFECT_LIVE | + VIR_DOMAIN_AFFECT_CONFIG, -1); qemuDriverLock(driver); @@ -5092,14 +5092,14 @@ static int qemuDomainGetMemoryParameters(virDomainPtr dom, isActive = virDomainObjIsActive(vm); - if (flags == VIR_DOMAIN_MEMORY_PARAM_CURRENT) { + if (flags == VIR_DOMAIN_AFFECT_CURRENT) { if (isActive) - flags = VIR_DOMAIN_MEMORY_PARAM_LIVE; + flags = VIR_DOMAIN_AFFECT_LIVE; else - flags = VIR_DOMAIN_MEMORY_PARAM_CONFIG; + flags = VIR_DOMAIN_AFFECT_CONFIG; } - if (flags & VIR_DOMAIN_MEMORY_PARAM_LIVE) { + if (flags & VIR_DOMAIN_AFFECT_LIVE) { if (!isActive) { qemuReportError(VIR_ERR_OPERATION_INVALID, "%s", _("domain is not running")); @@ -5119,7 +5119,7 @@ static int qemuDomainGetMemoryParameters(virDomainPtr dom, } } - if (flags & VIR_DOMAIN_MEMORY_PARAM_CONFIG) { + if (flags & VIR_DOMAIN_AFFECT_CONFIG) { if (!vm->persistent) { qemuReportError(VIR_ERR_OPERATION_INVALID, "%s", _("cannot change persistent config of a transient domain")); @@ -5142,12 +5142,12 @@ static int qemuDomainGetMemoryParameters(virDomainPtr dom, goto cleanup; } - if (flags & VIR_DOMAIN_MEMORY_PARAM_CONFIG) { + if (flags & VIR_DOMAIN_AFFECT_CONFIG) { for (i = 0; i < *nparams; i++) { virMemoryParameterPtr param = &params[i]; val = 0; param->value.ul = 0; - param->type = VIR_DOMAIN_MEMORY_PARAM_ULLONG; + param->type = VIR_TYPED_PARAM_ULLONG; switch (i) { case 0: /* fill memory hard limit here */ @@ -5269,8 +5269,8 @@ static int qemuSetSchedulerParametersFlags(virDomainPtr dom, int ret = -1; bool isActive; - virCheckFlags(VIR_DOMAIN_SCHEDPARAM_LIVE | - VIR_DOMAIN_SCHEDPARAM_CONFIG, -1); + virCheckFlags(VIR_DOMAIN_AFFECT_LIVE | + VIR_DOMAIN_AFFECT_CONFIG, -1); qemuDriverLock(driver); @@ -5284,20 +5284,20 @@ static int qemuSetSchedulerParametersFlags(virDomainPtr dom, isActive = virDomainObjIsActive(vm); - if (flags == VIR_DOMAIN_SCHEDPARAM_CURRENT) { + if (flags == VIR_DOMAIN_AFFECT_CURRENT) { if (isActive) - flags = VIR_DOMAIN_SCHEDPARAM_LIVE; + flags = VIR_DOMAIN_AFFECT_LIVE; else - flags = VIR_DOMAIN_SCHEDPARAM_CONFIG; + flags = VIR_DOMAIN_AFFECT_CONFIG; } - if ((flags & VIR_DOMAIN_SCHEDPARAM_CONFIG) && !vm->persistent) { + if ((flags & VIR_DOMAIN_AFFECT_CONFIG) && !vm->persistent) { qemuReportError(VIR_ERR_OPERATION_INVALID, "%s", _("cannot change persistent config of a transient domain")); goto cleanup; } - if (flags & VIR_DOMAIN_SCHEDPARAM_LIVE) { + if (flags & VIR_DOMAIN_AFFECT_LIVE) { if (!isActive) { qemuReportError(VIR_ERR_OPERATION_INVALID, "%s", _("domain is not running")); @@ -5328,7 +5328,7 @@ static int qemuSetSchedulerParametersFlags(virDomainPtr dom, goto cleanup; } - if (flags & VIR_DOMAIN_SCHEDPARAM_LIVE) { + if (flags & VIR_DOMAIN_AFFECT_LIVE) { rc = virCgroupSetCpuShares(group, params[i].value.ul); if (rc != 0) { virReportSystemError(-rc, "%s", @@ -5339,7 +5339,7 @@ static int qemuSetSchedulerParametersFlags(virDomainPtr dom, vm->def->cputune.shares = params[i].value.ul; } - if (flags & VIR_DOMAIN_SCHEDPARAM_CONFIG) { + if (flags & VIR_DOMAIN_AFFECT_CONFIG) { persistentDef = virDomainObjGetPersistentDef(driver->caps, vm); if (!persistentDef) { qemuReportError(VIR_ERR_INTERNAL_ERROR, "%s", @@ -5378,7 +5378,7 @@ static int qemuSetSchedulerParameters(virDomainPtr dom, return qemuSetSchedulerParametersFlags(dom, params, nparams, - VIR_DOMAIN_SCHEDPARAM_LIVE); + VIR_DOMAIN_AFFECT_LIVE); } static int @@ -5395,11 +5395,11 @@ qemuGetSchedulerParametersFlags(virDomainPtr dom, int rc; bool isActive; - virCheckFlags(VIR_DOMAIN_SCHEDPARAM_LIVE | - VIR_DOMAIN_SCHEDPARAM_CONFIG, -1); + virCheckFlags(VIR_DOMAIN_AFFECT_LIVE | + VIR_DOMAIN_AFFECT_CONFIG, -1); - if ((flags & (VIR_DOMAIN_SCHEDPARAM_LIVE | VIR_DOMAIN_SCHEDPARAM_CONFIG)) == - (VIR_DOMAIN_SCHEDPARAM_LIVE | VIR_DOMAIN_SCHEDPARAM_CONFIG)) { + if ((flags & (VIR_DOMAIN_AFFECT_LIVE | VIR_DOMAIN_AFFECT_CONFIG)) == + (VIR_DOMAIN_AFFECT_LIVE | VIR_DOMAIN_AFFECT_CONFIG)) { qemuReportError(VIR_ERR_INVALID_ARG, "%s", _("cannot query live and config together")); goto cleanup; @@ -5422,14 +5422,14 @@ qemuGetSchedulerParametersFlags(virDomainPtr dom, isActive = virDomainObjIsActive(vm); - if (flags == VIR_DOMAIN_SCHEDPARAM_CURRENT) { + if (flags == VIR_DOMAIN_AFFECT_CURRENT) { if (isActive) - flags = VIR_DOMAIN_SCHEDPARAM_LIVE; + flags = VIR_DOMAIN_AFFECT_LIVE; else - flags = VIR_DOMAIN_SCHEDPARAM_CONFIG; + flags = VIR_DOMAIN_AFFECT_CONFIG; } - if (flags & VIR_DOMAIN_SCHEDPARAM_CONFIG) { + if (flags & VIR_DOMAIN_AFFECT_CONFIG) { if (!vm->persistent) { qemuReportError(VIR_ERR_OPERATION_INVALID, "%s", _("cannot query persistent config of a transient domain")); @@ -5502,7 +5502,7 @@ qemuGetSchedulerParameters(virDomainPtr dom, int *nparams) { return qemuGetSchedulerParametersFlags(dom, params, nparams, - VIR_DOMAIN_SCHEDPARAM_CURRENT); + VIR_DOMAIN_AFFECT_CURRENT); } /* This uses the 'info blockstats' monitor command which was diff --git a/tools/virsh.c b/tools/virsh.c index 5679a2d..d98be1c 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -1732,12 +1732,12 @@ cmdSchedinfo(vshControl *ctl, const vshCmd *cmd) vshError(ctl, "%s", _("--current must be specified exclusively")); return false; } - flags = VIR_DOMAIN_SCHEDPARAM_CURRENT; + flags = VIR_DOMAIN_AFFECT_CURRENT; } else { if (config) - flags |= VIR_DOMAIN_SCHEDPARAM_CONFIG; + flags |= VIR_DOMAIN_AFFECT_CONFIG; if (live) - flags |= VIR_DOMAIN_SCHEDPARAM_LIVE; + flags |= VIR_DOMAIN_AFFECT_LIVE; } if (!vshConnectionUsability(ctl, ctl->conn)) @@ -3505,12 +3505,12 @@ cmdMemtune(vshControl * ctl, const vshCmd * cmd) vshError(ctl, "%s", _("--current must be specified exclusively")); return false; } - flags = VIR_DOMAIN_MEMORY_PARAM_CURRENT; + flags = VIR_DOMAIN_AFFECT_CURRENT; } else { if (config) - flags |= VIR_DOMAIN_MEMORY_PARAM_CONFIG; + flags |= VIR_DOMAIN_AFFECT_CONFIG; if (live) - flags |= VIR_DOMAIN_MEMORY_PARAM_LIVE; + flags |= VIR_DOMAIN_AFFECT_LIVE; } if (!vshConnectionUsability(ctl, ctl->conn)) -- 1.7.4.4

3 3

[libvirt] [PATCH 00/10 v5] Integration of lock managers in QEMU
by Daniel P. Berrange 03 Jun '11

03 Jun '11

Another update to http://www.redhat.com/archives/libvir-list/2011-May/msg01272.html New in this series - Return values < -200 are not errnos, they are sanlock specific error codes. - Fix state handling after migration This is also available at http://gitorious.org/~berrange/libvirt/staging/commits/qemu-locking where it is combined with the migration series i just sent

2 11

[libvirt] [PATCH] security driver: ignore EINVAL when chowning an image file
by Laine Stump 03 Jun '11

03 Jun '11

This fixes: https://bugzilla.redhat.com/show_bug.cgi?id=702044 https://bugzilla.redhat.com/show_bug.cgi?id=709454 Both of these complain of a failure to use an image file that resides on a read-only NFS volume. The function in the DAC security driver that chowns image files to the qemu user:group before using them already has special cases to ignore failure of chown on read-only file systems, and in a few other cases, but it hadn't been checking for EINVAL, which is what is returned if the qemu user doesn't even exist on the NFS server. Since the explanation of EINVAL in the chown man page almost exactly matches the log message already present for the case of EOPNOTSUPP, I've just added EINVAL to that same conditional. --- src/security/security_dac.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/security/security_dac.c b/src/security/security_dac.c index b8642d2..24b50e6 100644 --- a/src/security/security_dac.c +++ b/src/security/security_dac.c @@ -110,7 +110,7 @@ virSecurityDACSetOwnership(const char *path, int uid, int gid) } } - if (chown_errno == EOPNOTSUPP) { + if (chown_errno == EOPNOTSUPP || chown_errno == EINVAL) { VIR_INFO("Setting user and group to '%d:%d' on '%s' not supported by filesystem", uid, gid, path); } else if (chown_errno == EPERM) { -- 1.7.3.4

2 2

[libvirt] [PATCH] qemu: Avoid use after free in qemuCaps parsing
by Jiri Denemark 03 Jun '11

03 Jun '11

--- src/qemu/qemu_domain.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 46414cd..332c09e 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -264,12 +264,13 @@ static int qemuDomainObjPrivateXMLParse(xmlXPathContextPtr ctxt, void *data) char *str = virXMLPropString(nodes[i], "name"); if (str) { int flag = qemuCapsTypeFromString(str); - VIR_FREE(str); if (flag < 0) { qemuReportError(VIR_ERR_INTERNAL_ERROR, _("Unknown qemu capabilities flag %s"), str); + VIR_FREE(str); goto error; } + VIR_FREE(str); qemuCapsSet(qemuCaps, flag); } } -- 1.7.5.3

3 3

[libvirt] [PATCH] virsh: Document nodeinfo output
by Jiri Denemark 03 Jun '11

03 Jun '11

--- tools/virsh.pod | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/tools/virsh.pod b/tools/virsh.pod index 9251db6..1f41652 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -235,7 +235,9 @@ Print the XML representation of the hypervisor sysinfo, if available. =item B<nodeinfo> Returns basic information about the node, like number and type of CPU, -and size of the physical memory. +and size of the physical memory. The output corresponds to virNodeInfo +structure. Specifically, the "CPU socket(s)" field means number of CPU +sockets per NUMA cell. =item B<capabilities> -- 1.7.5.3

2 2

[libvirt] Libvirt 0.9.2 week freeze, RC1 version to test
by Daniel Veillard 03 Jun '11

03 Jun '11

So we are entering the week freeze for the new version. I have made an rc1 tarball available at: ftp://libvirt.org/libvirt/libvirt-0.9.2-rc1.tar.gz I also made rpms too for those interested. I didn't included the locking patches from Dan Berrange, though I had given a review and ACK on the previous version. Maybe we can push this soon and then I will made an rc2. It would be nice to try to identify the OpenSolaris portability issues,a dn if someone could give it a try on Win32 that would be great (along other linux builds of course !) I have tried it locally and basic operations seems to work fine, please give it a try too. thanks ! 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/

5 10

[libvirt] [PATCH] Correct 'cputune' documentation example.
by Neil Wilson 03 Jun '11

03 Jun '11

Signed-off-by: Neil Wilson <neil(a)aldur.co.uk> --- docs/formatdomain.html.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 0517119..225e0c8 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -293,7 +293,7 @@ <vcpupin vcpu="1" cpuset="0,1"/> <vcpupin vcpu="2" cpuset="2,3"/> <vcpupin vcpu="3" cpuset="0,4"/> - <cpushares>2048</cpushares> + <shares>2048</shares> </cputune> ...</pre> -- 1.7.4.1

2 1

[libvirt] [PATCH 00/10] coverity cleanups, round 1
by Eric Blake 03 Jun '11

03 Jun '11

Coverity reported a number of bugs against libvirt. I ran out of time to get through them all today, but there are certainly some real doozies in here. I've blamed commits where non-trivial bugs were introduced, to help distros decide if things need back-porting (I think that leaks on OOM situations and coverity false positives are not serious enough to warrant a back-port). These patches are pretty much independent (can be applied in any order); I suppose I could have rebased it to order the series by severity, oh well. Eric Blake (10): command: avoid leak on failure libvirtd: avoid leak on failure storage: avoid memory leak storage: avoid memory leak on stat failure lock: avoid leak on failure remote: avoid leak on failure qemu: avoid memory leak on vcpupin event: avoid memory leak on cleanup build: silence coverity false positive build: silence coverity false positive daemon/libvirtd.c | 4 +++- daemon/remote.c | 1 + src/conf/domain_event.c | 3 ++- src/locking/lock_manager.c | 3 ++- src/qemu/qemu_process.c | 21 +++++++++++++-------- src/remote/remote_driver.c | 7 ++++++- src/storage/storage_backend_fs.c | 15 +-------------- src/util/command.c | 5 ++++- src/util/storage_file.c | 15 +++++++-------- 9 files changed, 39 insertions(+), 35 deletions(-) -- 1.7.4.4

2 24