- Devel - libvirt List Archives

[libvirt] [HELP] QEMU guest agent via ISA serial port, or shutdown hooks?
by Thorsten Glaser 18 Oct '12

18 Oct '12

Hi, http://www.redhat.com/archives/libvir-list/2012-January/msg00629.html added support only for when using the virtio channel to the guest. However, QEMU Guest Agent support is most useful to guests that do not implement ACPI shutdown support; these usually don’t have virtio (especially since I was unable to find a how-to-implement-virtio-in- a-kernel document, otherwise MirBSD might do virtio-rng at least ☺), so the serial transport would be best. The problem is of course the two lines: + if (channel->targetType != VIR_DOMAIN_CHR_CHANNEL_TARGET_TYPE_VIRTIO) + continue; I’ve done a bit of hacking to allow the name attribute in the domain XML for any character device (probably half wrong, but this was just a quick test for me) and commented out these two lines, to see whether qga support on ISA ports is doable. (You probably would want to allow the attribute only on virtio and ISA serial ports, then.) Patch follows, NOT FOR APPLYING AS-IS: --- libvirt-0.9.12.orig/src/conf/domain_conf.c +++ libvirt-0.9.12/src/conf/domain_conf.c @@ -1266,6 +1266,7 @@ void virDomainChrDefFree(virDomainChrDef break; default: + VIR_FREE(def->target.name); break; } @@ -4954,6 +4955,7 @@ virDomainChrDefParseTargetXML(virCapsPtr break; default: + def->target.name = virXMLPropString(cur, "name"); portStr = virXMLPropString(cur, "port"); if (portStr == NULL) { /* Set to negative value to indicate we should set it later */ @@ -11685,11 +11687,16 @@ virDomainChrDefFormat(virBufferPtr buf, virDomainChrTargetTypeToString(def->deviceType, def->targetType), def->target.port); + //XXX def->target.name is lost break; default: - virBufferAsprintf(buf, " <target port='%d'/>\n", + virBufferAsprintf(buf, " <target port='%d'", def->target.port); + if (def->target.name) { + virBufferEscapeString(buf, " name='%s'", def->target.name); + } + virBufferAddLit(buf, "/>\n"); break; } --- libvirt-0.9.12.orig/src/qemu/qemu_process.c +++ libvirt-0.9.12/src/qemu/qemu_process.c @@ -191,8 +191,8 @@ qemuFindAgentConfig(virDomainDefPtr def) for (i = 0 ; i < def->nchannels ; i++) { virDomainChrDefPtr channel = def->channels[i]; - if (channel->targetType != VIR_DOMAIN_CHR_CHANNEL_TARGET_TYPE_VIRTIO) - continue; +// if (channel->targetType != VIR_DOMAIN_CHR_CHANNEL_TARGET_TYPE_VIRTIO) +// continue; if (STREQ_NULLABLE(channel->target.name, "org.qemu.guest_agent.0")) { config = &channel->source; Unfortunately, that seems to not be enough: trying to build the resulting libvirt package segfaults in the testsuite, so I must have some mistakes in the XML part. I’m really not familiar with all this, I’d “just” like to have my BSD VMs shut down cleanly when the host is shut down, so please advice. Does libvirt (the dæmon, probably) offer a shutdown hook, e.g. I could tell it to run a shellscript that ssh(1)s to the VM with a passwordless key to shut it down, instead? (Same for when the Shutdown or Restart functions in virt-manager are used, or virsh.) Thanks in advance, //mirabilos -- > Hi, does anyone sell openbsd stickers by themselves and not packaged > with other products? No, the only way I've seen them sold is for $40 with a free OpenBSD CD. -- Haroon Khalid and Steve Shockley in gmane.os.openbsd.misc

2 2

[libvirt] error of libvirt live-migrate using spice: Unable to read from monitor
by yangzhenyu 18 Oct '12

18 Oct '12

hi all: I have a problem when I live-migrate a instance to other node. I use the spice protocol in a instance. when I use the command: virsh migrate --live instance-00000001 qemu+tcp://node1/system. The 'node1' is the hostname of the dest compute. The error is: error: Unable to read from monitor: Connection reset by peer I can migrate successful When I remove the spice protocol. But I must use the spice. I think I need install something. My environmental is: Centos 6.2 libvirt 0.10.1 qemu-kvm 0.15.0 spice 0.11-11 Who can help me. 2012-10-18 yangzhenyu

1 0

[libvirt] [PATCH] spec: Fix dependency for lock-sanlock subpackage
by Jiri Denemark 18 Oct '12

18 Oct '12

This should not make a big difference in real world since libvirt-daemon, which is already required by libvirt-lock-sanlock, requires libvirt-client and thus libvirt-lock-sanlock gets this dependency transitively. However, since libvirt-lock-sanlock contains sanlock_helper binary linked to libvirt.so, we should start requiring libvirt-client directly. --- libvirt.spec.in | 1 + 1 file changed, 1 insertion(+) diff --git a/libvirt.spec.in b/libvirt.spec.in index 2f3e829..511949e 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -1029,24 +1029,25 @@ Include header files & development libraries for the libvirt C library. %if %{with_sanlock} %package lock-sanlock Summary: Sanlock lock manager plugin for QEMU driver Group: Development/Libraries %if 0%{?fedora} >= 17 || 0%{?rhel} >= 6 Requires: sanlock >= 2.4 %else Requires: sanlock >= 1.8 %endif #for virt-sanlock-cleanup require augeas Requires: augeas Requires: %{name}-daemon = %{version}-%{release} +Requires: %{name}-client = %{version}-%{release} %description lock-sanlock Includes the Sanlock lock manager plugin for the QEMU driver %endif %if %{with_python} %package python Summary: Python bindings for the libvirt library Group: Development/Libraries Requires: %{name}-client = %{version}-%{release} -- 1.7.12.3

2 2

[libvirt] [PATCH 0/3] Add support for HyperV Enlightenment features
by Peter Krempa 18 Oct '12

18 Oct '12

This series adds framework to deal with various HyperV Enlightenment features that improve behavior of Microsoft Windows guests. First of the features implemented is "relaxed" that changes the behavior of timers. The series is designed to ease addition of other hyperv features in the future. Peter Krempa (3): conf: Make tri-state feature options more universal conf: Add support for HyperV Enlightenment features qemu: Add support for HyperV Enlightenment feature "relaxed" docs/formatdomain.html.in | 21 +++++++ docs/schemas/domaincommon.rng | 28 ++++++++- src/conf/domain_conf.c | 80 +++++++++++++++++++++++-- src/conf/domain_conf.h | 24 +++++--- src/libvirt_private.syms | 6 +- src/qemu/qemu_command.c | 44 +++++++++++++- tests/qemuxml2argvdata/qemuxml2argv-hyperv.args | 4 ++ tests/qemuxml2argvdata/qemuxml2argv-hyperv.xml | 28 +++++++++ tests/qemuxml2argvtest.c | 2 + tests/qemuxml2xmltest.c | 2 + 10 files changed, 221 insertions(+), 18 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-hyperv.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-hyperv.xml -- 1.7.12.3

3 12

[libvirt] [PATCH] qemu: Correctly wait for spice to migrate
by Michal Privoznik 18 Oct '12

18 Oct '12

Currently we query-spice after the main migration has completed before moving to next state. Qemu reports this as boolean (not enclosed within quotes). Therefore it is not correct to use virJSONValueObjectGetString but virJSONValueObjectGetBoolean instead. --- Meanwhile, this is does no harm for now, since we fail to set QEMU_CAPS_SEAMLESS_MIGRATION as we use querying capabilities on the QMP monitor where 'seamless-migration=[on|off]' cmd line option is not advertised. However, on some distros where we still compute capabilities by parsing '-help' output we fail. src/qemu/qemu_monitor_json.c | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index 2daf8ea..8087e4f 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -2399,7 +2399,6 @@ qemuMonitorJSONSpiceGetMigrationStatusReply(virJSONValuePtr reply, bool *spice_migrated) { virJSONValuePtr ret; - const char *migrated_str; if (!(ret = virJSONValueObjectGet(reply, "return"))) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", @@ -2407,13 +2406,11 @@ qemuMonitorJSONSpiceGetMigrationStatusReply(virJSONValuePtr reply, return -1; } - if (!(migrated_str = virJSONValueObjectGetString(ret, "migrated"))) { + if (virJSONValueObjectGetBoolean(ret, "migrated", spice_migrated) < 0) { /* Deliberately don't report error here as we are * probably dealing with older qemu which doesn't * report this yet. Pretend spice is migrated. */ *spice_migrated = true; - } else { - *spice_migrated = STREQ(migrated_str, "true"); } return 0; -- 1.7.8.6

2 2

[libvirt] [PATCH] qemu: Fixed default machine detection in qemuCapsParseMachineTypesStr
by Viktor Mihajlovski 18 Oct '12

18 Oct '12

The machine in the last output line of <qemu-binary> -M ? was always reported as default machine even if this wasn't the actual default. Trivial fix. Signed-off-by: Viktor Mihajlovski <mihajlov(a)linux.vnet.ibm.com> --- src/qemu/qemu_capabilities.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index fb0fe54..985d4de 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -284,7 +284,7 @@ qemuCapsParseMachineTypesStr(const char *output, goto no_memory; p = t; - if (!(t = strstr(p, "(default)")) && (!next || t < next)) + if ((t = strstr(p, "(default)")) && (!next || t < next)) defIdx = caps->nmachineTypes; if ((t = strstr(p, "(alias of ")) && (!next || t < next)) { -- 1.7.0.4

2 1

[libvirt] [PATCH 1/2] selinux: fix wrong tapfd relablling
by Guannan Ren 18 Oct '12

18 Oct '12

It should relabel tapfd of virtual network of type VIR_DOMAIN_NET_TYPE_DIRECT rather than VIR_DOMAIN_NET_TYPE_NETWORK and VIR_DOMAIN_NET_TYPE_BRIDGE (commit ae368ebfcc4923d0b32e83d4ca96a6f599625785 introduced this bug) --- src/qemu/qemu_command.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 239592c..0c0c400 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -5412,10 +5412,6 @@ qemuBuildCommandLine(virConnectPtr conn, if (tapfd < 0) goto error; - if (virSecurityManagerSetTapFDLabel(driver->securityManager, - def, tapfd) < 0) - goto error; - last_good_net = i; virCommandTransferFD(cmd, tapfd); @@ -5429,6 +5425,10 @@ qemuBuildCommandLine(virConnectPtr conn, if (tapfd < 0) goto error; + if (virSecurityManagerSetTapFDLabel(driver->securityManager, + def, tapfd) < 0) + goto error; + last_good_net = i; virCommandTransferFD(cmd, tapfd); -- 1.7.11.2

4 9

[libvirt] [PATCH 2/3] Add a "forward family" option
by Benjamin Cama 17 Oct '12

17 Oct '12

It allows to specify forwarding only for IPv4 or IPv6. Not specifying it enables forwarding for both protocols. --- src/conf/network_conf.c | 58 ++++++++++++++++++++++++++++++++++++++++++++++- src/conf/network_conf.h | 1 + 2 files changed, 58 insertions(+), 1 deletions(-) diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c index 891d48c..8c2ae9b 100644 --- a/src/conf/network_conf.c +++ b/src/conf/network_conf.c @@ -1204,6 +1204,7 @@ virNetworkDefParseXML(xmlXPathContextPtr ctxt) xmlNodePtr virtPortNode = NULL; xmlNodePtr forwardNode = NULL; int nIps, nPortGroups, nForwardIfs, nForwardPfs, nForwardAddrs; + char *forwardFamily = NULL; char *forwardDev = NULL; char *forwardManaged = NULL; char *type = NULL; @@ -1358,6 +1359,23 @@ virNetworkDefParseXML(xmlXPathContextPtr ctxt) def->forwardType = VIR_NETWORK_FORWARD_NAT; } + forwardFamily = virXPathString("string(./@family)", ctxt); + if (forwardFamily) { + if (STREQ(forwardFamily, "ipv4")) { + def->forwardFamily = AF_INET; + } else if (STREQ(forwardFamily, "ipv6")) { + def->forwardFamily = AF_INET6; + } else { + virNetworkReportError(VIR_ERR_XML_ERROR, + _("Unknown forward family '%s'"), forwardFamily); + VIR_FREE(forwardFamily); + goto error; + } + VIR_FREE(forwardFamily); + } else { + def->forwardFamily = AF_UNSPEC; + } + forwardDev = virXPathString("string(./@dev)", ctxt); forwardManaged = virXPathString("string(./@managed)", ctxt); if(forwardManaged != NULL) { @@ -1515,8 +1533,16 @@ virNetworkDefParseXML(xmlXPathContextPtr ctxt) VIR_FREE(forwardIfNodes); VIR_FREE(forwardAddrNodes); switch (def->forwardType) { - case VIR_NETWORK_FORWARD_ROUTE: case VIR_NETWORK_FORWARD_NAT: + if (def->forwardFamily == AF_INET6) { + virNetworkReportError(VIR_ERR_XML_ERROR, + _("%s forwarding is not allowed in IPv6 (network '%s')"), + virNetworkForwardTypeToString(def->forwardType), + def->name); + goto error; + } + /* fall through to next case */ + case VIR_NETWORK_FORWARD_ROUTE: /* It's pointless to specify L3 forwarding without specifying * the network we're on. */ @@ -1527,6 +1553,25 @@ virNetworkDefParseXML(xmlXPathContextPtr ctxt) def->name); goto error; } + /* If forwarding for one family only, an address from this family + * must be present + */ + if (def->forwardFamily) { + int ii; + for (ii = 0; ii < def->nips; ii++) { + if (VIR_SOCKET_ADDR_IS_FAMILY(&def->ips[ii].address, def->forwardFamily)) + break; + } + if (ii == def->nips) { + char ipVersion = def->forwardFamily == AF_INET6 ? '6' : '4'; + virNetworkReportError(VIR_ERR_XML_ERROR, + _("%s IPv%c forwarding requested, but no IPv%c address provided for network '%s'"), + virNetworkForwardTypeToString(def->forwardType), + ipVersion, ipVersion, + def->name); + goto error; + } + } if (def->nForwardIfs > 1) { virReportError(VIR_ERR_XML_ERROR, _("multiple forwarding interfaces specified for network '%s', only one is supported"), @@ -1555,6 +1600,13 @@ virNetworkDefParseXML(xmlXPathContextPtr ctxt) def->name); goto error; } + if (def->forwardFamily) { + virNetworkReportError(VIR_ERR_XML_ERROR, + _("bridge forward family option only allowed in route and nat mode, not in %s (network '%s')"), + virNetworkForwardTypeToString(def->forwardType), + def->name); + goto error; + } break; } } @@ -1830,6 +1882,8 @@ char *virNetworkDefFormat(const virNetworkDefPtr def, unsigned int flags) if (!def->nForwardPfs) dev = virNetworkDefForwardIf(def, 0); const char *mode = virNetworkForwardTypeToString(def->forwardType); + const char *family = (def->forwardFamily == AF_INET ? "ipv4" : + def->forwardFamily == AF_INET6 ? "ipv6" : NULL); if (!mode) { virReportError(VIR_ERR_INTERNAL_ERROR, @@ -1846,6 +1900,8 @@ char *virNetworkDefFormat(const virNetworkDefPtr def, unsigned int flags) else virBufferAddLit(&buf, " managed='no'"); } + if (family) + virBufferEscapeString(&buf, " family='%s'", family); virBufferAsprintf(&buf, "%s>\n", (def->nForwardIfs || def->nForwardPfs) ? "" : "/"); virBufferAdjustIndent(&buf, 2); diff --git a/src/conf/network_conf.h b/src/conf/network_conf.h index 55502fb..61ecbc1 100644 --- a/src/conf/network_conf.h +++ b/src/conf/network_conf.h @@ -186,6 +186,7 @@ struct _virNetworkDef { int forwardType; /* One of virNetworkForwardType constants */ int managed; /* managed attribute for hostdev mode */ + int forwardFamily; /* AF_INET or AF_INET6 - AF_UNSPEC for both */ /* If there are multiple forward devices (i.e. a pool of * interfaces), they will be listed here. -- 1.7.2.5

3 3

[libvirt] [PATCH 1/3] Only check for IP forwarding, do not enable it
by Benjamin Cama 17 Oct '12

17 Oct '12

Enabling IP forwarding without the administrator's consent is bad. Only check for forwarding, do not enable it. --- src/network/bridge_driver.c | 56 +++++++++++++++++++++++++++++++++---------- 1 files changed, 43 insertions(+), 13 deletions(-) diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index e1846ee..e3e8dc2 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -1853,19 +1853,51 @@ networkReloadIptablesRules(struct network_driver *driver) } } -/* Enable IP Forwarding. Return 0 for success, -1 for failure. */ +#define SYSCTL_PATH "/proc/sys" + +/* Check for IP Forwarding. Return 0 if required family is enabled, -1 for failure. */ static int -networkEnableIpForwarding(bool enableIPv4, bool enableIPv6) +networkCheckIpForwarding(bool checkIPv4, bool checkIPv6) { int ret = 0; - if (enableIPv4) - ret = virFileWriteStr("/proc/sys/net/ipv4/ip_forward", "1\n", 0); - if (enableIPv6 && ret == 0) - ret = virFileWriteStr("/proc/sys/net/ipv6/conf/all/forwarding", "1\n", 0); - return ret; -} + char *buf = NULL; -#define SYSCTL_PATH "/proc/sys" + if (checkIPv4) { + ret = virFileReadAll(SYSCTL_PATH "/net/ipv4/ip_forward", 2, &buf); + if (ret != 2) + goto error; + if (STRNEQ(buf, "1\n")) { + networkReportError(VIR_ERR_SYSTEM_ERROR, + _("IP forwarding is not enabled on your system")); + goto cleanup; + } + } + if (checkIPv6) { + if (ret > 0) + VIR_FREE(buf); + ret = virFileReadAll(SYSCTL_PATH "/net/ipv6/conf/all/forwarding", 2, &buf); + if (ret != 2) + goto error; + if (STRNEQ(buf, "1\n")) { + networkReportError(VIR_ERR_SYSTEM_ERROR, + _("IPv6 forwarding is not enabled on your system")); + goto cleanup; + } + } + + VIR_FREE(buf); + return 0; + +error: + virReportSystemError(errno, "%s", _("cannot check for IP forwarding")); +cleanup: + if (ret > 0) { + VIR_FREE(buf); + return -1; + } else { + return ret; + } +} static int networkSetIPv6Sysctls(virNetworkObjPtr network) @@ -2140,11 +2172,9 @@ networkStartNetworkVirtual(struct network_driver *driver, if (virNetDevSetOnline(network->def->bridge, 1) < 0) goto err2; - /* If forwardType != NONE, turn on global IP forwarding */ + /* If forwardType != NONE, check for IP forwarding */ if (network->def->forwardType != VIR_NETWORK_FORWARD_NONE && - networkEnableIpForwarding(v4present, v6present) < 0) { - virReportSystemError(errno, "%s", - _("failed to enable IP forwarding")); + networkCheckIpForwarding(v4present, v6present) < 0) { goto err3; } -- 1.7.2.5

4 4

[libvirt] [PATCH] qemu: Clear async job when p2p migration fails early
by Jiri Denemark 17 Oct '12

17 Oct '12

When p2p migration fails early because qemuMigrationIsAllowed or qemuMigrationIsSafe say migration should be cancelled, we fail to clear the migration-out async job. As a result of that, further APIs called for the same domain may fail with Timed out during operation: cannot acquire state change lock. Reported by Guido Winkelmann. --- src/qemu/qemu_migration.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 68d614d..65cd6ec 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -2641,10 +2641,10 @@ qemuMigrationPerformJob(struct qemud_driver *driver, } if (!qemuMigrationIsAllowed(driver, vm, NULL)) - goto cleanup; + goto endjob; if (!(flags & VIR_MIGRATE_UNSAFE) && !qemuMigrationIsSafe(vm->def)) - goto cleanup; + goto endjob; resume = virDomainObjGetState(vm, NULL) == VIR_DOMAIN_RUNNING; -- 1.7.12.3

2 3

[libvirt] [PATCH] interface: add virInterfaceGetXMLDesc() in udev
by Doug Goldstein 17 Oct '12

17 Oct '12

Added support for retrieving the XML defining a specific interface via the udev based backend to virInterface. Implement the following APIs for the udev based backend: * virInterfaceGetXMLDesc() Note: Does not support bond devices. --- src/interface/interface_backend_udev.c | 251 ++++++++++++++++++++++++++++++++ 1 files changed, 251 insertions(+), 0 deletions(-) diff --git a/src/interface/interface_backend_udev.c b/src/interface/interface_backend_udev.c index 1cb6dfe..370f64a 100644 --- a/src/interface/interface_backend_udev.c +++ b/src/interface/interface_backend_udev.c @@ -19,6 +19,8 @@ */ #include <config.h> +#include <errno.h> +#include <dirent.h> #include <libudev.h> #include "virterror_internal.h" @@ -489,6 +491,254 @@ err: return ret; } +/** + * Helper function for our use of scandir() + * + * @param entry - directory entry passed by scandir() + * + * @return 1 if we want to add it to scandir's list, 0 if not. + */ +static int +udevIfaceScanDirFilter(const struct dirent *entry) +{ + if (STREQ(entry->d_name, ".") || STREQ(entry->d_name, "..")) + return 0; + + return 1; +} + +/** + * Frees any memory allocated by udevIfaceGetIfaceDef() + * + * @param ifacedef - interface to free and cleanup + */ +static void +udevIfaceFreeIfaceDef(virInterfaceDef *ifacedef) +{ + if (!ifacedef) + return; + + if (ifacedef->type == VIR_INTERFACE_TYPE_BRIDGE) { + VIR_FREE(ifacedef->data.bridge.delay); + for (int i = 0; i < ifacedef->data.bridge.nbItf; i++) { + VIR_FREE(ifacedef->data.bridge.itf[i]); + } + VIR_FREE(ifacedef->data.bridge.itf); + } + + if (ifacedef->type == VIR_INTERFACE_TYPE_VLAN) { + VIR_FREE(ifacedef->data.vlan.devname); + } + + VIR_FREE(ifacedef->mac); + VIR_FREE(ifacedef->name); + + VIR_FREE(ifacedef); +} + + +static virInterfaceDef * ATTRIBUTE_NONNULL(1) +udevIfaceGetIfaceDef(struct udev *udev, char *name) +{ + struct udev_device *dev; + virInterfaceDef *ifacedef; + unsigned int mtu; + const char *mtu_str; + char *vlan_parent_dev = NULL; + struct dirent **member_list = NULL; + int member_count = 0; + + /* Allocate our interface definition structure */ + if (VIR_ALLOC(ifacedef) < 0) { + virReportOOMError(); + return NULL; + } + + /* Clear our structure and set safe defaults */ + memset(ifacedef, 0, sizeof(ifacedef)); + ifacedef->startmode = VIR_INTERFACE_START_UNSPECIFIED; + ifacedef->type = VIR_INTERFACE_TYPE_ETHERNET; + ifacedef->name = strdup(name); + + if (!ifacedef->name) { + virReportOOMError(); + goto cleanup; + } + + /* Lookup the device we've been asked about */ + dev = udev_device_new_from_subsystem_sysname(udev, "net", name); + if (!dev) { + virReportError(VIR_ERR_NO_INTERFACE, + _("couldn't find interface named '%s'"), name); + goto cleanup; + } + + /* MAC address */ + ifacedef->mac = strdup(udev_device_get_sysattr_value(dev, "address")); + if (!ifacedef) { + virReportOOMError(); + goto cleanup; + } + + /* MTU */ + mtu_str = udev_device_get_sysattr_value(dev, "mtu"); + if (virStrToLong_ui(mtu_str, NULL, 10, &mtu) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Could not parse MTU value '%s'"), mtu_str); + goto cleanup; + } + ifacedef->mtu = mtu; + + /* Number of IP protocols this interface has assigned */ + /* XXX: Do we want a netlink query or a call out to ip or leave it? */ + ifacedef->nprotos = 0; + ifacedef->protos = NULL; + + /* Check if its a VLAN since we can have a VLAN of any of the + * other devices */ + vlan_parent_dev = strrchr(name, '.'); + if (vlan_parent_dev) { + /* Found the VLAN dot */ + char *vid; + + vlan_parent_dev = strdup(name); + if (!vlan_parent_dev) { + virReportOOMError(); + goto cleanup; + } + + /* Find the DEVICE.VID separator again */ + vid = strrchr(vlan_parent_dev, '.'); + if (!vid) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("failed to find the VID for the VLAN device '%s'"), + name); + goto cleanup; + } + + /* Replace the dot with a NULL so we can have the device and VID */ + vid[0] = '\0'; + vid++; + + /* Set our type to VLAN */ + ifacedef->type = VIR_INTERFACE_TYPE_VLAN; + + /* Set the VLAN specifics */ + ifacedef->data.vlan.tag = vid; + ifacedef->data.vlan.devname = vlan_parent_dev; + } else if (STREQ_NULLABLE(udev_device_get_devtype(dev), "bridge")) { + /* Check if its a bridge device */ + char *member_path; + const char *stp_str; + int stp; + + /* Set our type to Bridge */ + ifacedef->type = VIR_INTERFACE_TYPE_BRIDGE; + + /* Bridge specifics */ + ifacedef->data.bridge.delay = + strdup(udev_device_get_sysattr_value(dev, "bridge/forward_delay")); + if (!ifacedef->data.bridge.delay) { + virReportOOMError(); + goto cleanup; + } + + stp_str = udev_device_get_sysattr_value(dev, "bridge/stp_state"); + if (virStrToLong_i(stp_str, NULL, 10, &stp) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Could not parse STP state '%s'"), stp_str); + goto cleanup; + } + ifacedef->data.bridge.stp = stp; + + /* Members of the bridge */ + virAsprintf(&member_path, "%s/%s", + udev_device_get_syspath(dev), "brif"); + if (!member_path) { + virReportOOMError(); + goto cleanup; + } + + /* Get each member of the bridge */ + member_count = scandir(member_path, &member_list, + udevIfaceScanDirFilter, alphasort); + + /* Don't need the path anymore */ + VIR_FREE(member_path); + + if (member_count < 0) { + virReportSystemError(errno, + _("Could not get members of bridge '%s'"), + name); + goto cleanup; + } + + /* Allocate our list of member devices */ + if (VIR_ALLOC_N(ifacedef->data.bridge.itf, member_count) < 0) { + virReportOOMError(); + goto cleanup; + } + ifacedef->data.bridge.nbItf = member_count; + + for (int i= 0; i < member_count; i++) { + ifacedef->data.bridge.itf[i] = + udevIfaceGetIfaceDef(udev, member_list[i]->d_name); + VIR_FREE(member_list[i]); + } + + VIR_FREE(member_list); + + } else { + /* Set our type to ethernet */ + ifacedef->type = VIR_INTERFACE_TYPE_ETHERNET; + } + + return ifacedef; + +cleanup: + for (int i = 0; i < member_count; i++) { + VIR_FREE(member_list[i]); + } + VIR_FREE(member_list); + + udevIfaceFreeIfaceDef(ifacedef); + + return NULL; +} + +static char * +udevIfaceGetXMLDesc(virInterfacePtr ifinfo, + unsigned int flags) +{ + struct udev_iface_driver *driverState = ifinfo->conn->interfacePrivateData; + struct udev *udev = udev_ref(driverState->udev); + virInterfaceDef *ifacedef; + char *xmlstr = NULL; + + virCheckFlags(VIR_INTERFACE_XML_INACTIVE, NULL); + + /* Recursively build up the interface XML based on the requested + * interface name + */ + ifacedef = udevIfaceGetIfaceDef(udev, ifinfo->name); + + /* We've already printed by it happened */ + if (!ifacedef) + goto err; + + /* Convert our interface to XML */ + xmlstr = virInterfaceDefFormat(ifacedef); + + /* Recursively free our interface structures and free the children too */ + udevIfaceFreeIfaceDef(ifacedef); + +err: + /* decrement our udev ptr */ + udev_unref(udev); + + return xmlstr; +} + static int udevIfaceIsActive(virInterfacePtr ifinfo) { @@ -529,6 +779,7 @@ static virInterfaceDriver udevIfaceDriver = { .listAllInterfaces = udevIfaceListAllInterfaces, /* 0.10.3 */ .interfaceLookupByName = udevIfaceLookupByName, /* 0.10.3 */ .interfaceLookupByMACString = udevIfaceLookupByMACString, /* 0.10.3 */ + .interfaceGetXMLDesc = udevIfaceGetXMLDesc, /* 0.10.3 */ .interfaceIsActive = udevIfaceIsActive, /* 0.10.3 */ }; -- 1.7.8.6

2 1

[libvirt] [PATCH 0/2] Kill off 'function (...args...)' whitespace
by Daniel P. Berrange 17 Oct '12

17 Oct '12

Libvirt normally omits whitespace between the function name and its args, but there are still approx 1000 places where whitespace is included. Since people can't follow the style, clean this up and then enforce it with syntax-check.

2 4

[libvirt] [PATCH] AUTHORS: Remove double entry
by Michal Privoznik 17 Oct '12

17 Oct '12

I've accidentally added Li Zhang <zhlcindy(a)linux.vnet.ibm.com> to AUTHORS, even if he already was there. --- Pushing under trivial rule. AUTHORS | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/AUTHORS b/AUTHORS index 221912d..27c4eda 100644 --- a/AUTHORS +++ b/AUTHORS @@ -268,7 +268,6 @@ Patches have also been contributed by: liguang <lig.fnst(a)cn.fujitsu.com> Chuck Short <zulcss(a)gmail.com> Alexander Larsson <alexl(a)redhat.com> - Li Zhang <zhlcindy(a)linux.vnet.ibm.com> [....send patches to get your name here....] -- 1.7.8.6

1 0

[libvirt] [PATCH v2 0/3] Implement CPU model driver for PowerPC
by Li Zhang 17 Oct '12

17 Oct '12

CPU model driver is to get host's CPU information and it also provides one mechanism to expose host's CPU information to guests during migration. When migrating one guest from one machine to another machine, it will compare the CPU information. If it is incomptible, it won't start the guest. On x86, it uses CPUID instruction to get information. When migrating the guest, if the CPU defined in guest XML file is incompatible with host CPU, cpu-baseline will find out best features to expose to guest. Refer to [http://berrange.com/posts/2010/02/15 /guest-cpu-model-configuration-in-libvirt-with-qemukvm/]. On PowerPC, it can get CPU version by mfpvr instruction. So, if PVR is different from definition in guest XML file by cpu-compare, it will fail to start guest. The CPU infromation can be got by cpu-baseline. But only CPU vendor and model can be shown, there are no features as x86. So on PowrePC, it assumes that migration only occurs between the machines with the same type CPUs on PowerPC. In this driver, there are definitions of models and PVRs for CPUs supported on PowerPC. The relationship between models and PVRs are as the following: For one specific CPU model, its PVR is unique. And also for one PVR code, the PVR code is also unique. So from the PVR code of CPU data, it's easy to get model and vendor information. It is tested on my Power machine which CPU PVR is Power7_v2.3. * cap.xml has the same definition as the host. [root@ltckvmopal2 kvm-test]# /bin/virsh cpu-compare cap.xml CPU described in cap.xml is identical to host CPU [root@ltckvmopal2 kvm-test]# /bin/virsh cpu-baseline cap.xml <cpu mode='custom' match='exact'> <model fallback='allow'>POWER7_v2.3</model> <vendor>IBM</vendor> </cpu> * cap.xml has differnt model as the host. [root@ltckvmopal2 kvm-test]# /bin/virsh cpu-compare cap.xml CPU described in cap.xml is incompatible with host CPU [root@ltckvmopal2 kvm-test]# /bin/virsh cpu-baseline cap.xml <cpu mode='custom' match='exact'> <model fallback='allow'>POWER7_v2.1</model> <vendor>IBM</vendor> </cpu> *v1 -> v2: * Fix coding style's problems in several places. * Replace while with for loop in 2 places according to Michal Privoznik's suggestion. * Add powerpc.c to po/PORTFILES.in Li Zhang (3): libvirt: Add one file cpu_ppc_data.h to define CPU data for PPC libvirt: Implement CPU model driver for PowerPC Doc-fix for PowerPC CPU model driver po/POTFILES.in | 1 + src/cpu/cpu.h | 3 + src/cpu/cpu_map.xml | 14 ++ src/cpu/cpu_powerpc.c | 591 ++++++++++++++++++++++++++++++++++++++++++++++-- src/cpu/cpu_ppc_data.h | 33 +++ 5 files changed, 624 insertions(+), 18 deletions(-) create mode 100644 src/cpu/cpu_ppc_data.h -- 1.7.7.6

2 11

[libvirt] [PATCH 1/2] selinux: load and free selinux active file contexts configuration database
by Guannan Ren 17 Oct '12

17 Oct '12

If we use matchpathcon() to look up selinux context for specific pathname, it'd better actively load file contexts database by matchpathcon_init() and free memory when finished using matchpathcon by matchpathcon_fini(). --- src/security/security_selinux.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/security/security_selinux.c b/src/security/security_selinux.c index 10135ed..b278e2c 100644 --- a/src/security/security_selinux.c +++ b/src/security/security_selinux.c @@ -667,6 +667,10 @@ virSecuritySELinuxSecurityDriverProbe(const char *virtDriver) static int virSecuritySELinuxSecurityDriverOpen(virSecurityManagerPtr mgr) { +#ifndef HAVE_SELINUX_LABEL_H + if (matchpathcon_init(NULL) < 0) + VIR_WARN("cannot load selinux active file contexts configuration"); +#endif return virSecuritySELinuxInitialize(mgr); } @@ -685,6 +689,10 @@ virSecuritySELinuxSecurityDriverClose(virSecurityManagerPtr mgr) VIR_FREE(data->file_context); VIR_FREE(data->content_context); +#ifndef HAVE_SELINUX_LABEL_H + if (matchpathcon_fini() < 0) + VIR_WARN("cannot free allocated memory for selinux"); +#endif return 0; } -- 1.7.11.2

4 13

[libvirt] [PATCH 1/2] storage: lvm: Don't overwrite lvcreate errors
by Cole Robinson 17 Oct '12

17 Oct '12

Before: $ sudo virsh vol-create-as --pool vgvirt sparsetest --capacity 16M --allocation 0 error: Failed to create vol sparsetest error: internal error Child process (/usr/sbin/lvchange -aln vgvirt/sparsetest) unexpected exit status 5: One or more specified logical volume(s) not found. After: $ sudo virsh vol-create-as --pool vgvirt sparsetest --capacity 16M --allocation 0 error: Failed to create vol sparsetest error: internal error Child process (/usr/sbin/lvcreate --name sparsetest -L 0K --virtualsize 16384K vgvirt) unexpected exit status 5: Unable to create new logical volume with no extents --- src/storage/storage_backend_logical.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/storage/storage_backend_logical.c b/src/storage/storage_backend_logical.c index a9d785c..eebeec1 100644 --- a/src/storage/storage_backend_logical.c +++ b/src/storage/storage_backend_logical.c @@ -699,6 +699,7 @@ virStorageBackendLogicalCreateVol(virConnectPtr conn, { int fdret, fd = -1; virCommandPtr cmd = NULL; + virErrorPtr err; if (vol->target.encryption != NULL) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, @@ -775,9 +776,11 @@ virStorageBackendLogicalCreateVol(virConnectPtr conn, return 0; cleanup: + err = virSaveLastError(); VIR_FORCE_CLOSE(fd); virStorageBackendLogicalDeleteVol(conn, pool, vol, 0); virCommandFree(cmd); + virSetError(err); return -1; } -- 1.7.11.7

2 4

[libvirt] [PATCH v10] support offline migration
by liguang 17 Oct '12

17 Oct '12

original migration did not aware of offline case, so, try to support offline migration quietly (did not disturb original migration) by pass VIR_MIGRATE_OFFLINE flag to migration APIs if only the domain is really inactive, and migration process will not puzzled by domain offline and exit unexpectedly. these changes did not take care of disk images the domain required, for them could be transferred by other APIs as suggested, then VIR_MIGRATE_OFFLINE should not combined with VIR_MIGRATE_NON_SHARED_*. if you want a persistent migration, you should do "virsh migrate --persistent" youself. Signed-off-by: liguang <lig.fnst(a)cn.fujitsu.com> --- include/libvirt/libvirt.h.in | 1 + src/qemu/qemu_driver.c | 10 ++++++++ src/qemu/qemu_migration.c | 52 +++++++++++++++++++++++++++++++++++++----- src/qemu/qemu_migration.h | 3 +- tools/virsh-domain.c | 6 +++++ 5 files changed, 65 insertions(+), 7 deletions(-) diff --git a/include/libvirt/libvirt.h.in b/include/libvirt/libvirt.h.in index 81f12a4..1cebc21 100644 --- a/include/libvirt/libvirt.h.in +++ b/include/libvirt/libvirt.h.in @@ -995,6 +995,7 @@ typedef enum { * whole migration process; this will be used automatically * when supported */ VIR_MIGRATE_UNSAFE = (1 << 9), /* force migration even if it is considered unsafe */ + VIR_MIGRATE_OFFLINE = (1 << 10), /* offline migrate */ } virDomainMigrateFlags; /* Domain migration. */ diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 97ad23e..6189bbe 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -9622,6 +9622,15 @@ qemuDomainMigrateBegin3(virDomainPtr domain, } if (!virDomainObjIsActive(vm)) { + if (flags & VIR_MIGRATE_OFFLINE) { + if (flags & (VIR_MIGRATE_NON_SHARED_DISK| + VIR_MIGRATE_NON_SHARED_INC)) { + virReportError(VIR_ERR_OPERATION_INVALID, + "%s", _("migrating storage handled by volume APIs")); + goto endjob; + } + goto offline; + } virReportError(VIR_ERR_OPERATION_INVALID, "%s", _("domain is not running")); goto endjob; @@ -9634,6 +9643,7 @@ qemuDomainMigrateBegin3(virDomainPtr domain, if (qemuDomainCheckEjectableMedia(driver, vm, asyncJob) < 0) goto endjob; +offline: if (!(xml = qemuMigrationBegin(driver, vm, xmlin, dname, cookieout, cookieoutlen, flags))) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index db69a0a..6845a97 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -70,6 +70,7 @@ enum qemuMigrationCookieFlags { QEMU_MIGRATION_COOKIE_FLAG_GRAPHICS, QEMU_MIGRATION_COOKIE_FLAG_LOCKSTATE, QEMU_MIGRATION_COOKIE_FLAG_PERSISTENT, + QEMU_MIGRATION_COOKIE_FLAG_OFFLINE, QEMU_MIGRATION_COOKIE_FLAG_LAST }; @@ -77,12 +78,13 @@ enum qemuMigrationCookieFlags { VIR_ENUM_DECL(qemuMigrationCookieFlag); VIR_ENUM_IMPL(qemuMigrationCookieFlag, QEMU_MIGRATION_COOKIE_FLAG_LAST, - "graphics", "lockstate", "persistent"); + "graphics", "lockstate", "persistent", "offline"); enum qemuMigrationCookieFeatures { QEMU_MIGRATION_COOKIE_GRAPHICS = (1 << QEMU_MIGRATION_COOKIE_FLAG_GRAPHICS), QEMU_MIGRATION_COOKIE_LOCKSTATE = (1 << QEMU_MIGRATION_COOKIE_FLAG_LOCKSTATE), QEMU_MIGRATION_COOKIE_PERSISTENT = (1 << QEMU_MIGRATION_COOKIE_FLAG_PERSISTENT), + QEMU_MIGRATION_COOKIE_OFFLINE = (1 << QEMU_MIGRATION_COOKIE_FLAG_OFFLINE), }; typedef struct _qemuMigrationCookieGraphics qemuMigrationCookieGraphics; @@ -439,6 +441,9 @@ qemuMigrationCookieXMLFormat(struct qemud_driver *driver, virBufferAdjustIndent(buf, -2); } + if (mig->flags & QEMU_MIGRATION_COOKIE_OFFLINE) + virBufferAsprintf(buf, " <offline/>\n"); + virBufferAddLit(buf, "</qemu-migration>\n"); return 0; } @@ -662,6 +667,11 @@ qemuMigrationCookieXMLParse(qemuMigrationCookiePtr mig, VIR_FREE(nodes); } + if ((flags & QEMU_MIGRATION_COOKIE_OFFLINE)) { + if (virXPathBoolean("count(./offline) > 0", ctxt)) + mig->flags |= QEMU_MIGRATION_COOKIE_OFFLINE; + } + return 0; error: @@ -721,6 +731,10 @@ qemuMigrationBakeCookie(qemuMigrationCookiePtr mig, qemuMigrationCookieAddPersistent(mig, dom) < 0) return -1; + if (flags & QEMU_MIGRATION_COOKIE_OFFLINE) { + mig->flags |= QEMU_MIGRATION_COOKIE_OFFLINE; + } + if (!(*cookieout = qemuMigrationCookieXMLFormatStr(driver, mig))) return -1; @@ -1168,6 +1182,13 @@ char *qemuMigrationBegin(struct qemud_driver *driver, QEMU_MIGRATION_COOKIE_LOCKSTATE) < 0) goto cleanup; + if (flags & VIR_MIGRATE_OFFLINE) { + if (qemuMigrationBakeCookie(mig, driver, vm, + cookieout, cookieoutlen, + QEMU_MIGRATION_COOKIE_OFFLINE) < 0) + goto cleanup; + } + if (xmlin) { if (!(def = virDomainDefParseString(driver->caps, xmlin, QEMU_EXPECTED_VIRT_TYPES, @@ -1331,6 +1352,15 @@ qemuMigrationPrepareAny(struct qemud_driver *driver, goto endjob; } + if (!(mig = qemuMigrationEatCookie(driver, vm, cookiein, cookieinlen, + QEMU_MIGRATION_COOKIE_OFFLINE))) + return ret; + + if (mig->flags & QEMU_MIGRATION_COOKIE_OFFLINE) { + ret = 0; + goto cleanup; + } + /* Start the QEMU daemon, with the same command-line arguments plus * -incoming $migrateFrom */ @@ -1873,7 +1903,8 @@ qemuMigrationRun(struct qemud_driver *driver, virLockManagerPluginGetName(driver->lockManager)); return -1; } - + if (flags & VIR_MIGRATE_OFFLINE) + return 0; if (!(mig = qemuMigrationEatCookie(driver, vm, cookiein, cookieinlen, QEMU_MIGRATION_COOKIE_GRAPHICS))) goto cleanup; @@ -2389,6 +2420,8 @@ static int doPeer2PeerMigrate3(struct qemud_driver *driver, qemuDomainObjExitRemoteWithDriver(driver, vm); } VIR_FREE(dom_xml); + if (flags & VIR_MIGRATE_OFFLINE) + goto cleanup; if (ret == -1) goto cleanup; @@ -2494,7 +2527,7 @@ finish: vm->def->name); cleanup: - if (ddomain) { + if (ddomain || (flags & VIR_MIGRATE_OFFLINE)) { virObjectUnref(ddomain); ret = 0; } else { @@ -2571,7 +2604,7 @@ static int doPeer2PeerMigrate(struct qemud_driver *driver, } /* domain may have been stopped while we were talking to remote daemon */ - if (!virDomainObjIsActive(vm)) { + if (!virDomainObjIsActive(vm) && !(flags & VIR_MIGRATE_OFFLINE)) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("guest unexpectedly quit")); goto cleanup; @@ -2634,7 +2667,7 @@ qemuMigrationPerformJob(struct qemud_driver *driver, if (qemuMigrationJobStart(driver, vm, QEMU_ASYNC_JOB_MIGRATION_OUT) < 0) goto cleanup; - if (!virDomainObjIsActive(vm)) { + if (!virDomainObjIsActive(vm) && !(flags & VIR_MIGRATE_OFFLINE)) { virReportError(VIR_ERR_OPERATION_INVALID, "%s", _("domain is not running")); goto endjob; @@ -2958,6 +2991,8 @@ qemuMigrationFinish(struct qemud_driver *driver, */ if (retcode == 0) { if (!virDomainObjIsActive(vm)) { + if (flags & VIR_MIGRATE_OFFLINE) + goto offline; virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("guest unexpectedly quit")); goto endjob; @@ -2973,6 +3008,7 @@ qemuMigrationFinish(struct qemud_driver *driver, goto endjob; } + offline: if (flags & VIR_MIGRATE_PERSIST_DEST) { virDomainDefPtr vmdef; if (vm->persistent) @@ -3020,7 +3056,7 @@ qemuMigrationFinish(struct qemud_driver *driver, event = NULL; } - if (!(flags & VIR_MIGRATE_PAUSED)) { + if (!(flags & VIR_MIGRATE_PAUSED) && !(flags & VIR_MIGRATE_OFFLINE)) { /* run 'cont' on the destination, which allows migration on qemu * >= 0.10.6 to work properly. This isn't strictly necessary on * older qemu's, but it also doesn't hurt anything there @@ -3091,6 +3127,7 @@ qemuMigrationFinish(struct qemud_driver *driver, endjob: if (qemuMigrationJobFinish(driver, vm) == 0) { vm = NULL; + } else if (flags & VIR_MIGRATE_OFFLINE) { } else if (!vm->persistent && !virDomainObjIsActive(vm)) { qemuDomainRemoveInactive(driver, vm); vm = NULL; @@ -3137,6 +3174,8 @@ int qemuMigrationConfirm(struct qemud_driver *driver, if (!(mig = qemuMigrationEatCookie(driver, vm, cookiein, cookieinlen, 0))) return -1; + if (flags & VIR_MIGRATE_OFFLINE) + goto offline; /* Did the migration go as planned? If yes, kill off the * domain object, but if no, resume CPUs @@ -3173,6 +3212,7 @@ int qemuMigrationConfirm(struct qemud_driver *driver, } } +offline: qemuMigrationCookieFree(mig); rv = 0; diff --git a/src/qemu/qemu_migration.h b/src/qemu/qemu_migration.h index 7a2269a..b4f6a77 100644 --- a/src/qemu/qemu_migration.h +++ b/src/qemu/qemu_migration.h @@ -36,7 +36,8 @@ VIR_MIGRATE_NON_SHARED_DISK | \ VIR_MIGRATE_NON_SHARED_INC | \ VIR_MIGRATE_CHANGE_PROTECTION | \ - VIR_MIGRATE_UNSAFE) + VIR_MIGRATE_UNSAFE | \ + VIR_MIGRATE_OFFLINE) enum qemuMigrationJobPhase { QEMU_MIGRATION_PHASE_NONE = 0, diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 505169b..2218379 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -6647,6 +6647,7 @@ static const vshCmdOptDef opts_migrate[] = { {"dname", VSH_OT_DATA, 0, N_("rename to new name during migration (if supported)")}, {"timeout", VSH_OT_INT, 0, N_("force guest to suspend if live migration exceeds timeout (in seconds)")}, {"xml", VSH_OT_STRING, 0, N_("filename containing updated XML for the target")}, + {"offline", VSH_OT_BOOL, 0, N_("for offline migration")}, {NULL, 0, 0, NULL} }; @@ -6713,6 +6714,11 @@ doMigrate(void *opaque) if (vshCommandOptBool(cmd, "unsafe")) flags |= VIR_MIGRATE_UNSAFE; + if (vshCommandOptBool(cmd, "offline")) { + if (!virDomainIsActive(dom)) + flags |= VIR_MIGRATE_OFFLINE; + } + if (xmlfile && virFileReadAll(xmlfile, 8192, &xml) < 0) { vshError(ctl, _("file '%s' doesn't exist"), xmlfile); -- 1.7.2.5

3 5

[libvirt] LIBVIRT_DEBUG=1 libvirtd regression
by Cole Robinson 17 Oct '12

17 Oct '12

Hey Dan, This commit changes the behavior of LIBVIRT_DEBUG=1 libvirtd: $ git show 7022b09111d4322d21396a70d58320a9ad773962 commit 7022b09111d4322d21396a70d58320a9ad773962 Author: Daniel P. Berrange <berrange(a)redhat.com> Date: Thu Sep 27 13:13:09 2012 +0100 Automatically enable systemd journal logging Probe to see if the systemd journal is accessible, and if so enable logging to the journal by default, rather than stderr (current default under systemd). It still prints some output to stderr but it's extremely limited compared to before. Surprised me at least, but I didn't dig too deeply for a solution. Thanks, Cole

1 0

[libvirt] [PATCH] spec: Require newer sanlock on recent distros 2
by Jiri Denemark 17 Oct '12

17 Oct '12

The previous commit was incomplete. We need to also add explicit Requires for the newer version since RPM's automatic dependencies won't work with sanlock. --- libvirt.spec.in | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libvirt.spec.in b/libvirt.spec.in index 15c6b39..a0dc560 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -1027,7 +1027,11 @@ Include header files & development libraries for the libvirt C library. %package lock-sanlock Summary: Sanlock lock manager plugin for QEMU driver Group: Development/Libraries +%if 0%{?fedora} >= 17 || 0%{?rhel} >= 6 +Requires: sanlock >= 2.4 +%else Requires: sanlock >= 1.8 +%endif #for virt-sanlock-cleanup require augeas Requires: augeas Requires: %{name}-daemon = %{version}-%{release} -- 1.7.12.3

2 2

[libvirt] [PATCHv2] spec: Add runtime requirement for libssh2
by Peter Krempa 17 Oct '12

17 Oct '12

libssh2 unfortunately doesn't support symbol versioning so RPM can't figure out what version is needed for the currently installed libvirt package. This patch adds a runtime requirement, so that the correct version of libssh2 can be installed along with libvirt. --- Diff to v1: - be more specific with the requirement libvirt.spec.in | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libvirt.spec.in b/libvirt.spec.in index 75623eb..a651394 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -1002,6 +1002,9 @@ Requires: cyrus-sasl # work correctly & doesn't have onerous dependencies Requires: cyrus-sasl-md5 %endif +%if %{with_libssh2_transport} +Requires: libssh2 >= 1.3.0 +%endif %description client Shared libraries and client binaries needed to access to the -- 1.7.12.3

2 2

[libvirt] [PATCH v3 1/4] monitor: Allow add-fd to any specified fd set
by Corey Bryant 17 Oct '12

17 Oct '12

The first call to add an fd to an fd set was previously not allowed to choose the fd set ID. The ID was generated as the first available and ensuing calls could add more fds by specifying the fd set ID. This change allows users to choose the fd set ID on the first call. Signed-off-by: Corey Bryant <coreyb(a)linux.vnet.ibm.com> --- v2: -This patch is new in v2 v3: -Added fdset-id bounds checking (eblake(a)redhat.com) -Move 'if (!mon_fdset_cur)' change to this patch (kwolf(a)redhat.com) -Add break from for loop if fdset_id is less than mon_fdset->id (eblake(a)redhat.com) monitor.c | 54 +++++++++++++++++++++++++++++++++++++----------------- qapi-schema.json | 2 +- 2 files changed, 38 insertions(+), 18 deletions(-) diff --git a/monitor.c b/monitor.c index 131b325..2e3248f 100644 --- a/monitor.c +++ b/monitor.c @@ -2135,7 +2135,7 @@ AddfdInfo *qmp_add_fd(bool has_fdset_id, int64_t fdset_id, bool has_opaque, { int fd; Monitor *mon = cur_mon; - MonFdset *mon_fdset; + MonFdset *mon_fdset = NULL; MonFdsetFd *mon_fdset_fd; AddfdInfo *fdinfo; @@ -2147,34 +2147,54 @@ AddfdInfo *qmp_add_fd(bool has_fdset_id, int64_t fdset_id, bool has_opaque, if (has_fdset_id) { QLIST_FOREACH(mon_fdset, &mon_fdsets, next) { - if (mon_fdset->id == fdset_id) { + /* Break if match found or match impossible due to ordering by ID */ + if (fdset_id <= mon_fdset->id) { + if (fdset_id < mon_fdset->id) { + mon_fdset = NULL; + } break; } } - if (mon_fdset == NULL) { - error_set(errp, QERR_INVALID_PARAMETER_VALUE, "fdset-id", - "an existing fdset-id"); - goto error; - } - } else { + } + + if (mon_fdset == NULL) { int64_t fdset_id_prev = -1; MonFdset *mon_fdset_cur = QLIST_FIRST(&mon_fdsets); - /* Use first available fdset ID */ - QLIST_FOREACH(mon_fdset, &mon_fdsets, next) { - mon_fdset_cur = mon_fdset; - if (fdset_id_prev == mon_fdset_cur->id - 1) { - fdset_id_prev = mon_fdset_cur->id; - continue; + if (has_fdset_id) { + if (fdset_id < 0) { + error_set(errp, QERR_INVALID_PARAMETER_VALUE, "fdset-id", + "a non-negative value"); + goto error; + } + /* Use specified fdset ID */ + QLIST_FOREACH(mon_fdset, &mon_fdsets, next) { + mon_fdset_cur = mon_fdset; + if (fdset_id < mon_fdset_cur->id) { + break; + } + } + } else { + /* Use first available fdset ID */ + QLIST_FOREACH(mon_fdset, &mon_fdsets, next) { + mon_fdset_cur = mon_fdset; + if (fdset_id_prev == mon_fdset_cur->id - 1) { + fdset_id_prev = mon_fdset_cur->id; + continue; + } + break; } - break; } mon_fdset = g_malloc0(sizeof(*mon_fdset)); - mon_fdset->id = fdset_id_prev + 1; + if (has_fdset_id) { + mon_fdset->id = fdset_id; + } else { + mon_fdset->id = fdset_id_prev + 1; + } /* The fdset list is ordered by fdset ID */ - if (mon_fdset->id == 0) { + if (!mon_fdset_cur) { QLIST_INSERT_HEAD(&mon_fdsets, mon_fdset, next); } else if (mon_fdset->id < mon_fdset_cur->id) { QLIST_INSERT_BEFORE(mon_fdset_cur, mon_fdset, next); diff --git a/qapi-schema.json b/qapi-schema.json index f9dbdae..12cdb74 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -2611,7 +2611,7 @@ # # Returns: @AddfdInfo on success # If file descriptor was not received, FdNotSupplied -# If @fdset-id does not exist, InvalidParameterValue +# If @fdset-id is a negative value, InvalidParameterValue # # Notes: The list of fd sets is shared by all monitor connections. # -- 1.7.11.4

2 1

[libvirt] [PATCH] spec: Require newer sanlock on recent distros
by Jiri Denemark 17 Oct '12

17 Oct '12

Make sure libvirt is build with sanlock >= 2.4 on distros that are new enough to provide it. --- libvirt.spec.in | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/libvirt.spec.in b/libvirt.spec.in index 75623eb..15c6b39 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -410,8 +410,14 @@ BuildRequires: libpciaccess-devel >= 0.10.9 BuildRequires: yajl-devel %endif %if %{with_sanlock} +# make sure libvirt is built with new enough sanlock on +# distros that have it; required for on_lockfailure +%if 0%{?fedora} >= 17 || 0%{?rhel} >= 6 +BuildRequires: sanlock-devel >= 2.4 +%else BuildRequires: sanlock-devel >= 1.8 %endif +%endif %if %{with_libpcap} BuildRequires: libpcap-devel %endif -- 1.7.12.3

2 2

[libvirt] [PATCH] locking: Fix build with sanlock < 2.4
by Jiri Denemark 17 Oct '12

17 Oct '12

libvirt started using sanlock_killpath to implement on_lockfailure action. Since sanlock_killpath was introduced in sanlock 2.4, libvirt fails to build with older sanlock. --- configure.ac | 7 +++++++ src/locking/lock_driver_sanlock.c | 13 +++++++++++++ 2 files changed, 20 insertions(+) diff --git a/configure.ac b/configure.ac index 08dc63d..8810efd 100644 --- a/configure.ac +++ b/configure.ac @@ -1216,6 +1216,13 @@ if test "x$with_sanlock" != "xno"; then if test "x$with_sanlock" = "xyes" ; then AC_DEFINE_UNQUOTED([HAVE_SANLOCK], 1, [whether Sanlock plugin for lock management is available]) + + AC_CHECK_LIB([sanlock_client], [sanlock_killpath], + [sanlock_killpath=yes], [sanlock_killpath=no]) + if test "x$sanlock_killpath" = "xyes" ; then + AC_DEFINE_UNQUOTED([HAVE_SANLOCK_KILLPATH], 1, + [whether Sanlock supports sanlock_killpath]) + fi fi fi AM_CONDITIONAL([HAVE_SANLOCK], [test "x$with_sanlock" = "xyes"]) diff --git a/src/locking/lock_driver_sanlock.c b/src/locking/lock_driver_sanlock.c index a218432..4682701 100644 --- a/src/locking/lock_driver_sanlock.c +++ b/src/locking/lock_driver_sanlock.c @@ -687,6 +687,7 @@ static int virLockManagerSanlockAddResource(virLockManagerPtr lock, return 0; } +#if HAVE_SANLOCK_KILLPATH static int virLockManagerSanlockRegisterKillscript(int sock, const char *vmuri, @@ -762,6 +763,18 @@ cleanup: VIR_FREE(args); return ret; } +#else +static int +virLockManagerSanlockRegisterKillscript(int sock ATTRIBUTE_UNUSED, + const char *vmuri ATTRIBUTE_UNUSED, + const char *uuidstr ATTRIBUTE_UNUSED, + virDomainLockFailureAction action ATTRIBUTE_UNUSED) +{ + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("sanlock is too old to support lock failure action")); + return -1; +} +#endif static int virLockManagerSanlockAcquire(virLockManagerPtr lock, const char *state, -- 1.7.12.3

2 2

[libvirt] [PATCH v3 0/4] command line fd passing using fd sets
by Corey Bryant 17 Oct '12

17 Oct '12

This series adds command line file descriptor passing support via a new -add-fd option. This is a follow-on to the existing QMP fd passing support provided in the following patch series: comments.gmane.org/gmane.comp.emulators.qemu/165463 The new -add-fd option is designed to mirror the add-fd QMP option as much as possible. Corey Bryant (4): monitor: Allow add-fd to any specified fd set monitor: Enable adding an inherited fd to an fd set monitor: Prevent removing fd from set during init qemu-config: Add new -add-fd command line option monitor.c | 142 +++++++++++++++++++++++++++++++++---------------------- monitor.h | 3 ++ qapi-schema.json | 2 +- qemu-config.c | 22 +++++++++ qemu-options.hx | 36 ++++++++++++++ vl.c | 72 ++++++++++++++++++++++++++++ 6 files changed, 220 insertions(+), 57 deletions(-) -- 1.7.11.4

2 2

[libvirt] [PATCH] Fix virProcessKillPainfully on Win32
by Daniel P. Berrange 16 Oct '12

16 Oct '12

From: "Daniel P. Berrange" <berrange(a)redhat.com> Win32 platforms don't have SIGKILL defined, but they do have SIGABRT. Since our virProcess wrapper treats anything which isn't SIGTERM/SIGINT as equivalent to SIGKILL, just use SIGABRT on Win32. Pushed as a Win32 build break fix Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- src/util/virprocess.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/util/virprocess.c b/src/util/virprocess.c index c70aa58..fee333f 100644 --- a/src/util/virprocess.c +++ b/src/util/virprocess.c @@ -267,8 +267,15 @@ virProcessKillPainfully(pid_t pid, bool force) } else if ((i == 50) & force) { VIR_DEBUG("Timed out waiting after SIGTERM to process %d, " "sending SIGKILL", pid); + /* No SIGKILL kill on Win32 ! Use SIGABRT instead which our + * virProcessKill proc will handle more or less lik SIGKILL */ +#ifdef WIN32 + signum = SIGABRT; /* kill it after a grace period */ + signame = "ABRT"; +#else signum = SIGKILL; /* kill it after a grace period */ signame = "KILL"; +#endif } else { signum = 0; /* Just check for existence */ } -- 1.7.11.2

2 1