- Devel - libvirt List Archives

[libvirt] Reminder: KVM Forum 2012 Call For Participation
by KVM Forum 2012 Program Committee 28 Aug '12

28 Aug '12

Just a reminder, the CFP ends this Friday. -- ================================================================= KVM Forum 2012: Call For Participation November 7-9, 2012 - Hotel Fira Palace - Barcelona, Spain (All submissions must be received before midnight Aug 31st, 2012) ================================================================= KVM is an industry leading open source hypervisor that provides an ideal platform for datacenter virtualization, virtual desktop infrastructure, and cloud computing. Once again, it's time to bring together the community of developers and users that define the KVM ecosystem for our annual technical conference. We will discuss the current state of affairs and plan for the future of KVM, its surrounding infrastructure, and management tools. We are also excited to announce the oVirt Workshop will run in parallel with the KVM Forum, bringing in a community focused on enterprise datacenter virtualization management built on KVM. For topics which overlap we will have shared sessions. So mark your calendar and join us in advancing KVM. http://events.linuxfoundation.org/events/kvm-forum/ Once again we are colocated with The Linux Foundation's LinuxCon, Based on feedback from last year, this time it's LinuxCon Europe! KVM Forum attendees will be able to attend oVirt Workshop sessions and are eligible to attend LinuxCon Europe for a discounted rate. http://events.linuxfoundation.org/events/kvm-forum/register We invite you to lead part of the discussion by submitting a speaking proposal for KVM Forum 2012. http://events.linuxfoundation.org/cfp Suggested topics: KVM - Scaling and performance - Nested virtualization - I/O improvements - PCI device assignment - Driver domains - Time keeping - Resource management (cpu, memory, i/o) - Memory management (page sharing, swapping, huge pages, etc) - VEPA, VN-Link, vswitch - Security - Architecture ports QEMU - Device model improvements - New devices and chipsets - Scaling and performance - Desktop virtualization - Spice - Increasing robustness and hardening - Security model - Management interfaces - QMP protocol and implementation - Image formats - Firmware (SeaBIOS, OVMF, UEFI, etc) - Live migration - Live snapshots and merging - Fault tolerance, high availability, continuous backup - Real-time guest support Virtio - Speeding up existing devices - Alternatives - Virtio on non-Linux or non-virtualized Management infrastructure - oVirt (shared track w/ oVirt Workshop) - Libvirt - KVM autotest - OpenStack - Network virtualization management - Enterprise storage management Cloud computing - Scalable storage - Virtual networking - Security - Provisioning SUBMISSION REQUIREMENTS Abstracts due: Aug 31st, 2012 Notification: Sep 14th, 2012 Please submit a short abstract (~150 words) describing your presentation proposal. In your submission please note how long your talk will take. Slots vary in length up to 45 minutes. Also include in your proposal the proposal type -- one of: - technical talk - end-user talk - birds of a feather (BOF) session Submit your proposal here: http://events.linuxfoundation.org/cfp You will receive a notification whether or not your presentation proposal was accepted by Sep 14th. END-USER COLLABORATION One of the big challenges as developers is to know what, where and how people actually use our software. We will reserve a few slots for end users talking about their deployment challenges and achievements. If you are using KVM in production you are encouraged submit a speaking proposal. Simply mark it as an end-user collaboration proposal. As an end user, this is a unique opportunity to get your input to developers. BOF SESSION We will reserve some slots in the evening after the main conference tracks, for birds of a feather (BOF) sessions. These sessions will be less formal than presentation tracks and targetted for people who would like to discuss specific issues with other developers and/or users. If you are interested in getting developers and/or uses together to discuss a specific problem, please submit a BOF proposal. LIGHTNING TALKS In addition to submitted talks we will also have some room for lightning talks. These are short (5 minute) discussions to highlight new work or ideas that aren't complete enough to warrant a full presentation slot. Lightning talk submissions and scheduling will be handled on-site at KVM Forum. HOTEL / TRAVEL The KVM Forum 2012 will be held in Barcelona, Spain at the Hotel Fira Palace. http://events.linuxfoundation.org/events/kvm-forum/hotel Thank you for your interest in KVM. We're looking forward to your submissions and seeing you at the KVM Forum 2012 in November! Thanks, your KVM Forum 2012 Program Commitee Please contact us with any questions or comments. KVM-Forum-2012-PC(a)redhat.com

1 0

[libvirt] [PATCH] qemu: Fix define logic
by Michal Privoznik 28 Aug '12

28 Aug '12

With current flow in qemudDomainDefine we might loose data when updating an existing domain. We parse given XML and overwrite the configuration. Then we try to save the new config. However, this step may fail and we don't perform any roll back. In fact, we remove the domain from the list of domains held up by qemu driver. This is okay as long as the domain was brand new one. --- The easiest steps to reproduce: https://bugzilla.redhat.com/show_bug.cgi?id=851963 src/qemu/qemu_driver.c | 43 ++++++++++++++++++++++++++++++++++++------- 1 files changed, 36 insertions(+), 7 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 3fcca0e..e760ed9 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -5538,6 +5538,7 @@ out: static virDomainPtr qemudDomainDefine(virConnectPtr conn, const char *xml) { struct qemud_driver *driver = conn->privateData; virDomainDefPtr def; + virDomainDefPtr def_backup = NULL; virDomainObjPtr vm = NULL; virDomainPtr dom = NULL; virDomainEventPtr event = NULL; @@ -5561,20 +5562,48 @@ static virDomainPtr qemudDomainDefine(virConnectPtr conn, const char *xml) { if (qemuDomainAssignAddresses(def, NULL, NULL) < 0) goto cleanup; - if (!(vm = virDomainAssignDef(driver->caps, - &driver->domains, - def, false))) { - goto cleanup; + /* We need to differentiate two cases: + * a) updating an existing domain - must preserve previous definition + * so we can roll back if something fails + * b) defining a brand new domain - virDomainAssignDef is just sufficient + */ + if ((vm = virDomainFindByUUID(&driver->domains, def->uuid))) { + if (virDomainObjIsActive(vm)) { + def_backup = vm->newDef; + vm->newDef = def; + } else { + def_backup = vm->def; + vm->def = def; + } + } else { + if (!(vm = virDomainAssignDef(driver->caps, + &driver->domains, + def, false))) { + goto cleanup; + } } def = NULL; vm->persistent = 1; if (virDomainSaveConfig(driver->configDir, vm->newDef ? vm->newDef : vm->def) < 0) { - VIR_INFO("Defining domain '%s'", vm->def->name); - qemuDomainRemoveInactive(driver, vm); - vm = NULL; + if (def_backup) { + /* There is backup so this VM was defined before. + * Just restore the backup. */ + VIR_INFO("Restoring domain '%s' definition", vm->def->name); + if (virDomainObjIsActive(vm)) + vm->newDef = def_backup; + else + vm->def = def_backup; + } else { + /* Brand new domain. Remove it */ + VIR_INFO("Deleting domain '%s'", vm->def->name); + qemuDomainRemoveInactive(driver, vm); + vm = NULL; + } goto cleanup; + } else { + virDomainDefFree(def_backup); } event = virDomainEventNewFromObj(vm, -- 1.7.8.6

2 2

[libvirt] [PATCH 1/2] Introduce new VIR_ERR_AGENT_UNRESPONSIVE error code
by Michal Privoznik 28 Aug '12

28 Aug '12

Currently, when guest agent is configure but not responsive (e.g. due to appropriate service not running in the guest) we return VIR_ERR_INTERNAL_ERROR or VIR_ERR_ARGUMENT_UNSUPPORTED. Both are wrong. Therefore we need to introduce new error code to reflect this case. --- include/libvirt/virterror.h | 2 ++ src/qemu/qemu_agent.c | 2 +- src/qemu/qemu_driver.c | 24 ++++++++++++++---------- src/util/virterror.c | 7 +++++++ 4 files changed, 24 insertions(+), 11 deletions(-) diff --git a/include/libvirt/virterror.h b/include/libvirt/virterror.h index 69c64aa..5140c38 100644 --- a/include/libvirt/virterror.h +++ b/include/libvirt/virterror.h @@ -283,6 +283,8 @@ typedef enum { VIR_ERR_OPERATION_UNSUPPORTED = 84, /* The requested operation is not supported */ VIR_ERR_SSH = 85, /* error in ssh transport driver */ + VIR_ERR_AGENT_UNRESPONSIVE = 86, /* guest agent is unresponsive, + not running or not usable */ } virErrorNumber; /** diff --git a/src/qemu/qemu_agent.c b/src/qemu/qemu_agent.c index c658bf8..ba29783 100644 --- a/src/qemu/qemu_agent.c +++ b/src/qemu/qemu_agent.c @@ -880,7 +880,7 @@ static int qemuAgentSend(qemuAgentPtr mon, if ((timeout && virCondWaitUntil(&mon->notify, &mon->lock, then) < 0) || (!timeout && virCondWait(&mon->notify, &mon->lock) < 0)) { if (errno == ETIMEDOUT) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + virReportError(VIR_ERR_AGENT_UNRESPONSIVE, "%s", _("Guest agent not available for now")); ret = -2; } else { diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 3fcca0e..f64d9ec 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -1734,8 +1734,9 @@ static int qemuDomainShutdownFlags(virDomainPtr dom, unsigned int flags) { if (useAgent) { if (priv->agentError) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("QEMU guest agent is not available due to an error")); + virReportError(VIR_ERR_AGENT_UNRESPONSIVE, "%s", + _("QEMU guest agent is not " + "available due to an error")); goto cleanup; } if (!priv->agent) { @@ -1815,8 +1816,9 @@ qemuDomainReboot(virDomainPtr dom, unsigned int flags) if (useAgent) { if (priv->agentError) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("QEMU guest agent is not available due to an error")); + virReportError(VIR_ERR_AGENT_UNRESPONSIVE, "%s", + _("QEMU guest agent is not " + "available due to an error")); goto cleanup; } if (!priv->agent) { @@ -10391,7 +10393,7 @@ qemuDomainSnapshotFSFreeze(struct qemud_driver *driver, int freezed; if (priv->agentError) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + virReportError(VIR_ERR_AGENT_UNRESPONSIVE, "%s", _("QEMU guest agent is not " "available due to an error")); return -1; @@ -10419,7 +10421,7 @@ qemuDomainSnapshotFSThaw(struct qemud_driver *driver, if (priv->agentError) { if (report) - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + virReportError(VIR_ERR_AGENT_UNRESPONSIVE, "%s", _("QEMU guest agent is not " "available due to an error")); return -1; @@ -13708,8 +13710,9 @@ qemuDomainPMSuspendForDuration(virDomainPtr dom, } if (priv->agentError) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("QEMU guest agent is not available due to an error")); + virReportError(VIR_ERR_AGENT_UNRESPONSIVE, "%s", + _("QEMU guest agent is not " + "available due to an error")); goto cleanup; } @@ -13849,8 +13852,9 @@ qemuDomainAgentCommand(virDomainPtr domain, } if (priv->agentError) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("QEMU guest agent is not available due to an error")); + virReportError(VIR_ERR_AGENT_UNRESPONSIVE, "%s", + _("QEMU guest agent is not " + "available due to an error")); goto cleanup; } diff --git a/src/util/virterror.c b/src/util/virterror.c index 3ee2ae0..7caa69e 100644 --- a/src/util/virterror.c +++ b/src/util/virterror.c @@ -1199,6 +1199,13 @@ virErrorMsg(virErrorNumber error, const char *info) errmsg = _("SSH transport error"); else errmsg = _("SSH transport error: %s"); + break; + case VIR_ERR_AGENT_UNRESPONSIVE: + if (info == NULL) + errmsg = _("Guest agent is not responding"); + else + errmsg = _("Guest agent is not responding: %s"); + break; } return errmsg; } -- 1.7.8.6

2 4

[libvirt] [PATCH libvirt-glib] Don't hold events lock when dispatching free callbacks
by Daniel P. Berrange 27 Aug '12

27 Aug '12

From: "Daniel P. Berrange" <berrange(a)redhat.com> The _event_timeout_remove and _event_handle_remove methods were holding onto the global lock when invoking the free callback. This is a violation of the libvirt events API contract which requires free callbacks to be invoked in a re-entrant safe context. --- libvirt-glib/libvirt-glib-event.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/libvirt-glib/libvirt-glib-event.c b/libvirt-glib/libvirt-glib-event.c index 657c1bf..2a9ee23 100644 --- a/libvirt-glib/libvirt-glib-event.c +++ b/libvirt-glib/libvirt-glib-event.c @@ -256,13 +256,11 @@ _event_handle_remove(gpointer data) { struct gvir_event_handle *h = data; - g_mutex_lock(eventlock); - if (h->ff) (h->ff)(h->opaque); + g_mutex_lock(eventlock); g_ptr_array_remove_fast(handles, h); - g_mutex_unlock(eventlock); return FALSE; @@ -414,13 +412,11 @@ _event_timeout_remove(gpointer data) { struct gvir_event_timeout *t = data; - g_mutex_lock(eventlock); - if (t->ff) (t->ff)(t->opaque); + g_mutex_lock(eventlock); g_ptr_array_remove_fast(timeouts, t); - g_mutex_unlock(eventlock); return FALSE; -- 1.7.11.2

2 1

[libvirt] [PATCH] conf: prevent NULL pointer access in virSecurityLabelDefsParseXML
by Ján Tomko 27 Aug '12

27 Aug '12

When checking for seclabels without security models, def->nseclabels is already set to n. In the case of an error def->seclabels is freed but nseclabels is left untouched. This leads to a segmentation fault when def is freed in virDomainDefParseXML. --- src/conf/domain_conf.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 82ccf4d..c02d6f8 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -3179,6 +3179,7 @@ error: virSecurityLabelDefFree(def->seclabels[i - 1]); } VIR_FREE(def->seclabels); + def->nseclabels = 0; VIR_FREE(list); return -1; } -- 1.7.8.6

2 1

[libvirt] [PATCH] qemu: Switch to unified func name
by Michal Privoznik 27 Aug '12

27 Aug '12

With the latest patches libvirt supports qemu agent monitor passthrough. However, function in qemu driver is called qemuDrvDomainAgentCommand. s/Drv// as used in all other names. --- src/qemu/qemu_driver.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 64c407d..3fcca0e 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -13815,7 +13815,7 @@ qemuListAllDomains(virConnectPtr conn, } static char * -qemuDrvDomainAgentCommand(virDomainPtr domain, +qemuDomainAgentCommand(virDomainPtr domain, const char *cmd, int timeout, unsigned int flags) @@ -14028,7 +14028,7 @@ static virDriver qemuDriver = { .domainSnapshotDelete = qemuDomainSnapshotDelete, /* 0.8.0 */ .qemuDomainMonitorCommand = qemuDomainMonitorCommand, /* 0.8.3 */ .qemuDomainAttach = qemuDomainAttach, /* 0.9.4 */ - .qemuDomainArbitraryAgentCommand = qemuDrvDomainAgentCommand, /* 0.10.0 */ + .qemuDomainArbitraryAgentCommand = qemuDomainAgentCommand, /* 0.10.0 */ .domainOpenConsole = qemuDomainOpenConsole, /* 0.8.6 */ .domainOpenGraphics = qemuDomainOpenGraphics, /* 0.9.7 */ .domainInjectNMI = qemuDomainInjectNMI, /* 0.9.2 */ -- 1.7.8.6

2 2

[libvirt] [PATCH] rpc: fix segmentation fault caused by null client-sock
by Guannan Ren 27 Aug '12

27 Aug '12

BZ:https://bugzilla.redhat.com/show_bug.cgi?id=851423 The client-sock could have been set to NULL by eventloop thread after async event fired. --- src/rpc/virnetclient.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/rpc/virnetclient.c b/src/rpc/virnetclient.c index 4ecc703..43a9814 100644 --- a/src/rpc/virnetclient.c +++ b/src/rpc/virnetclient.c @@ -644,7 +644,8 @@ virNetClientMarkClose(virNetClientPtr client, int reason) { VIR_DEBUG("client=%p, reason=%d", client, reason); - virNetSocketRemoveIOCallback(client->sock); + if (client->sock) + virNetSocketRemoveIOCallback(client->sock); client->wantClose = true; client->closeReason = reason; } -- 1.7.11.4

2 2

[libvirt] [PATCH] qemu: fix regression with pinning
by Martin Kletzander 27 Aug '12

27 Aug '12

Commit 4b03d59167f4a4c6ec57def315a61d977466e75b changed the pinning behavior in a way that makes some machine non-startable. The comment mentioning that we cannot control each vcpu when there is no VCPU<->PID mapping available is true, however, this isn't necessarily an error, because this can be caused by old QEMU without support for "query-cpus" command as well as a software emulated machines that don't create more than one process. --- src/qemu/qemu_cgroup.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_cgroup.c b/src/qemu/qemu_cgroup.c index 2237d11..b45bb49 100644 --- a/src/qemu/qemu_cgroup.c +++ b/src/qemu/qemu_cgroup.c @@ -567,9 +567,9 @@ int qemuSetupCgroupForVcpu(struct qemud_driver *driver, virDomainObjPtr vm) /* If we don't know VCPU<->PID mapping or all vcpu runs in the same * thread, we cannot control each vcpu. */ - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Unable to get vcpus' pids.")); - goto cleanup; + VIR_DEBUG("%s", _("Unable to get vcpus' pids.")); + virCgroupFree(&cgroup); + return 0; } for (i = 0; i < priv->nvcpupids; i++) { -- 1.7.12

2 2

[libvirt] [PATCH] qemu: fix regression with spice tls port allocation
by Martin Kletzander 27 Aug '12

27 Aug '12

In my quest for reusing variables I failed to edit one variable when fixing details between two patch versions. That results in a failure to start qemu with autoport and spice tls, because qemu is trying to bind two sockets to the same port. --- src/qemu/qemu_process.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index abe6e74..7f85aea 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -3500,7 +3500,7 @@ int qemuProcessStart(virConnectPtr conn, goto cleanup; } - vm->def->graphics[0]->data.spice.tlsPort = port; + vm->def->graphics[0]->data.spice.tlsPort = tlsPort; } } -- 1.7.12

2 2

[libvirt] [PATCH] virsh: fix missing return value
by Alex Jia 27 Aug '12

27 Aug '12

Although virsh command raises a correct error information, the command status returns 0(true), this patch is used for fixing this issue. Signed-off-by: Alex Jia <ajia(a)redhat.com> --- tools/virsh-host.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/tools/virsh-host.c b/tools/virsh-host.c index da60895..2f3b413 100644 --- a/tools/virsh-host.c +++ b/tools/virsh-host.c @@ -701,11 +701,13 @@ cmdQemuAgentCommand(vshControl *ctl, const vshCmd *cmd) judge = vshCommandOptInt(cmd, "timeout", &timeout); if (judge < 0) { vshError(ctl, "%s", _("timeout number has to be a number")); + goto cleanup; } else if (judge > 0) { judge = 1; } if (judge && timeout < 1) { vshError(ctl, "%s", _("timeout must be positive")); + goto cleanup; } if (vshCommandOptBool(cmd, "async")) { @@ -719,6 +721,7 @@ cmdQemuAgentCommand(vshControl *ctl, const vshCmd *cmd) if (judge > 1) { vshError(ctl, "%s", _("timeout, async and block options are exclusive")); + goto cleanup; } result = virDomainQemuAgentCommand(dom, guest_agent_cmd, timeout, flags); -- 1.7.1

2 2

[libvirt] [PATCH] specfile: require libnl3 for Fedora >= 18 and RHEL >= 7
by Laine Stump 27 Aug '12

27 Aug '12

Everything is ready in both netcf and libvirt to switch over to libnl3 in future releases of both Fedora and RHEL. This needs to be done more or less simultaneously in both packages, though, because you can't mix libnl1.1 and libnl3 in the same process (e.g. libvirtd using libnl-3.so and libnetcf.so, while libnetcf.so uses libnl.so) This patch does two things when fedora >= 18 || rhel >= 7): 1) requires libnl3-devel 2) requires netcf-devel-0.2.2 or greater (the idea is that a similar patch is going into netcf's specfile, so that when a build of netcf is done on F18 or later (or RHEL7 or later) netcf will be guaranteed to be built with libnl3 rather than libnl-1.1) --- libvirt.spec.in | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/libvirt.spec.in b/libvirt.spec.in index 18a7fb8..4b4d1d0 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -409,8 +409,12 @@ BuildRequires: sanlock-devel >= 1.8 BuildRequires: libpcap-devel %endif %if %{with_libnl} +%if 0%{?fedora} >= 18 || 0%{?rhel} >= 7 +BuildRequires: libnl3-devel +%else BuildRequires: libnl-devel %endif +%endif %if %{with_avahi} BuildRequires: avahi-devel %endif @@ -489,13 +493,18 @@ BuildRequires: libcap-ng-devel >= 0.5.0 %if %{with_phyp} BuildRequires: libssh2-devel %endif + %if %{with_netcf} +%if 0%{?fedora} >= 18 || 0%{?rhel} >= 7 +BuildRequires: netcf-devel >= 0.2.2 +%else %if 0%{?fedora} >= 16 || 0%{?rhel} >= 6 BuildRequires: netcf-devel >= 0.1.8 %else BuildRequires: netcf-devel >= 0.1.4 %endif %endif +%endif %if %{with_esx} %if 0%{?fedora} >= 9 || 0%{?rhel} >= 6 BuildRequires: libcurl-devel -- 1.7.11.4

4 7

[libvirt] [PATCH v2] esx: Support VLAN tags in virtual network port groups
by Matthias Bolte 27 Aug '12

27 Aug '12

--- v2: Use network level VLAN config if there is no portgroup specific VLAN config given. src/esx/esx_network_driver.c | 65 ++++++++++++++++++++++++++++++++++++++--- 1 files changed, 60 insertions(+), 5 deletions(-) diff --git a/src/esx/esx_network_driver.c b/src/esx/esx_network_driver.c index 09d46d3..7b529ee 100644 --- a/src/esx/esx_network_driver.c +++ b/src/esx/esx_network_driver.c @@ -489,7 +489,40 @@ esxNetworkDefineXML(virConnectPtr conn, const char *xml) goto cleanup; } - hostPortGroupSpec->vlanId->value = 0; + if (def->portGroups[i].vlan.trunk) { + /* FIXME: Change this once tag-less trunk-mode is supported */ + if (def->portGroups[i].vlan.nTags != 1 || + *def->portGroups[i].vlan.tag != 4095) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("VLAN tag has to be 4095 in trunk mode")); + goto cleanup; + } + + hostPortGroupSpec->vlanId->value = 4095; + } else if (def->portGroups[i].vlan.nTags == 1) { + hostPortGroupSpec->vlanId->value = *def->portGroups[i].vlan.tag; + } else if (def->portGroups[i].vlan.nTags > 1) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("Can apply one VLAN tag per port group only")); + goto cleanup; + } else if (def->vlan.trunk) { + /* FIXME: Change this once tag-less trunk-mode is supported */ + if (def->vlan.nTags != 1 || *def->vlan.tag != 4095) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("VLAN tag has to be 4095 in trunk mode")); + goto cleanup; + } + + hostPortGroupSpec->vlanId->value = 4095; + } else if (def->vlan.nTags == 1) { + hostPortGroupSpec->vlanId->value = *def->vlan.tag; + } else if (def->vlan.nTags > 1) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("Can apply one VLAN tag per port group only")); + goto cleanup; + } else { + hostPortGroupSpec->vlanId->value = 0; + } if (def->portGroups[i].bandwidth != NULL) { if (esxBandwidthToShapingPolicy @@ -519,6 +552,8 @@ esxNetworkDefineXML(virConnectPtr conn, const char *xml) network = virGetNetwork(conn, hostVirtualSwitch->name, md5); cleanup: + /* FIXME: need to remove virtual switch if adding port groups failed */ + virNetworkDefFree(def); esxVI_HostVirtualSwitch_Free(&hostVirtualSwitch); esxVI_HostPortGroup_Free(&hostPortGroupList); @@ -695,6 +730,7 @@ esxNetworkGetXMLDesc(virNetworkPtr network_, unsigned int flags) esxVI_String *hostPortGroupKey = NULL; esxVI_String *networkName = NULL; virNetworkDefPtr def; + virPortGroupDefPtr portGroup; if (esxVI_EnsureSession(priv->primary) < 0) { return NULL; @@ -824,9 +860,12 @@ esxNetworkGetXMLDesc(virNetworkPtr network_, unsigned int flags) for (networkName = networkNameList; networkName != NULL; networkName = networkName->_next) { if (STREQ(networkName->value, hostPortGroup->spec->name)) { - def->portGroups[def->nPortGroups].name = strdup(networkName->value); + portGroup = &def->portGroups[def->nPortGroups]; + ++def->nPortGroups; - if (def->portGroups[def->nPortGroups].name == NULL) { + portGroup->name = strdup(networkName->value); + + if (portGroup->name == NULL) { virReportOOMError(); goto cleanup; } @@ -834,13 +873,29 @@ esxNetworkGetXMLDesc(virNetworkPtr network_, unsigned int flags) if (hostPortGroup->spec->policy != NULL) { if (esxShapingPolicyToBandwidth (hostPortGroup->spec->policy->shapingPolicy, - &def->portGroups[def->nPortGroups].bandwidth) < 0) { + &portGroup->bandwidth) < 0) { ++def->nPortGroups; goto cleanup; } } - ++def->nPortGroups; + if (hostPortGroup->spec->vlanId->value > 0) { + if (hostPortGroup->spec->vlanId->value == 4095) { + portGroup->vlan.trunk = true; + } + + /* FIXME: Remove this once tag-less trunk-mode is supported */ + portGroup->vlan.nTags = 1; + + if (VIR_ALLOC_N(portGroup->vlan.tag, 1) < 0) { + virReportOOMError(); + goto cleanup; + } + + *portGroup->vlan.tag = + hostPortGroup->spec->vlanId->value; + } + break; } } -- 1.7.4.1

2 1

[libvirt] [PATCH] esx: Support VLAN tags in virtual network port groups
by Matthias Bolte 26 Aug '12

26 Aug '12

--- src/esx/esx_network_driver.c | 38 +++++++++++++++++++++++++++++++++----- 1 files changed, 33 insertions(+), 5 deletions(-) diff --git a/src/esx/esx_network_driver.c b/src/esx/esx_network_driver.c index 09d46d3..2f5f1ab 100644 --- a/src/esx/esx_network_driver.c +++ b/src/esx/esx_network_driver.c @@ -489,7 +489,16 @@ esxNetworkDefineXML(virConnectPtr conn, const char *xml) goto cleanup; } - hostPortGroupSpec->vlanId->value = 0; + if (def->portGroups[i].vlan.trunk) { + hostPortGroupSpec->vlanId->value = 4095; + } else if (def->portGroups[i].vlan.nTags == 1) { + hostPortGroupSpec->vlanId->value = *def->portGroups[i].vlan.tag; + } else if (def->portGroups[i].vlan.nTags > 1) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("Can apply one VLAN tag per port group only")); + } else { + hostPortGroupSpec->vlanId->value = 0; + } if (def->portGroups[i].bandwidth != NULL) { if (esxBandwidthToShapingPolicy @@ -695,6 +704,7 @@ esxNetworkGetXMLDesc(virNetworkPtr network_, unsigned int flags) esxVI_String *hostPortGroupKey = NULL; esxVI_String *networkName = NULL; virNetworkDefPtr def; + virPortGroupDefPtr portGroup = NULL; if (esxVI_EnsureSession(priv->primary) < 0) { return NULL; @@ -824,9 +834,12 @@ esxNetworkGetXMLDesc(virNetworkPtr network_, unsigned int flags) for (networkName = networkNameList; networkName != NULL; networkName = networkName->_next) { if (STREQ(networkName->value, hostPortGroup->spec->name)) { - def->portGroups[def->nPortGroups].name = strdup(networkName->value); + portGroup = &def->portGroups[def->nPortGroups]; + ++def->nPortGroups; + + portGroup->name = strdup(networkName->value); - if (def->portGroups[def->nPortGroups].name == NULL) { + if (portGroup->name == NULL) { virReportOOMError(); goto cleanup; } @@ -834,13 +847,28 @@ esxNetworkGetXMLDesc(virNetworkPtr network_, unsigned int flags) if (hostPortGroup->spec->policy != NULL) { if (esxShapingPolicyToBandwidth (hostPortGroup->spec->policy->shapingPolicy, - &def->portGroups[def->nPortGroups].bandwidth) < 0) { + &portGroup->bandwidth) < 0) { ++def->nPortGroups; goto cleanup; } } - ++def->nPortGroups; + if (hostPortGroup->spec->vlanId->value > 0) { + if (hostPortGroup->spec->vlanId->value == 4095) { + portGroup->vlan.trunk = true; + } + + portGroup->vlan.nTags = 1; + + if (VIR_ALLOC_N(portGroup->vlan.tag, 1) < 0) { + virReportOOMError(); + goto cleanup; + } + + *portGroup->vlan.tag = + hostPortGroup->spec->vlanId->value; + } + break; } } -- 1.7.4.1

3 3

[libvirt] switching both libvirt and netcf packages to use libnl3 instead of libnl-1.1
by Laine Stump 25 Aug '12

25 Aug '12

Both libvirt and the netcf library it links to use libnl for doing things with netlink sockets. libnl comes in a couple of different and API-incompatible flavors, namely libnl-1.1 and libnl-3. For a long time Fedora had just libnl-1.1, and libvirt only supported libnl-1.1 Awhile back Fedora gained support for using libnl-3 instead of libnl-1.1, and did so in a way that allows both libraries (both runtime and -devel) to still exist on the system at the same time, and programs can pick which one they want to use. Even more recently libvirt and netcf got patches to support building with libnl-3 rather than libnl-1.1 (preferring libnl-3 if both are available). Since development (and even bugfixes) of libnl-1.1 is basically dead, I want to switch over the F18 and later builds of libvirt to use libnl-3, but this will take careful timing (and some restrictions in the libvirt specfile) because attempting to run a libnl3-linked libvirt with a netcf.so that was linked with libnl-1.1 (or vice versa) results in a segv. Other than the basic use of a Requires: line in the libvirt specfile to make the newly-libnl3-enabled build of libvirt require a similarly-enabled build of netcf, does anyone have any recommendations on making this transition as painless as possible (and as soon as possible - I obviously want to do this before F18 is released).

1 0

[libvirt] [PATCHv2 0/3] split snapshot conf out of domain conf
by Eric Blake 25 Aug '12

25 Aug '12

Rebased version from v1 [1], only changes are catering to other changes in domain_conf in the meantime, and (temporarily) dropping the XML changes of the original patch 4 until I have code that can actually use the XML in 0.10.1. I'm hoping these three patches still qualify for 0.10.0. [1] https://www.redhat.com/archives/libvir-list/2012-August/msg01250.html Eric Blake (3): snapshot: make virDomainSnapshotObjList opaque snapshot: split snapshot conf code into own file snapshot: rename an enum po/POTFILES.in | 1 + src/Makefile.am | 3 +- src/conf/domain_conf.c | 933 +------------------------------------------- src/conf/domain_conf.h | 143 +------ src/conf/snapshot_conf.c | 972 ++++++++++++++++++++++++++++++++++++++++++++++ src/conf/snapshot_conf.h | 157 ++++++++ src/esx/esx_driver.c | 1 + src/libvirt_private.syms | 5 +- src/qemu/qemu_command.c | 1 + src/qemu/qemu_domain.c | 7 +- src/qemu/qemu_domain.h | 3 +- src/qemu/qemu_driver.c | 69 ++-- src/qemu/qemu_migration.c | 2 +- src/vbox/vbox_tmpl.c | 1 + 14 files changed, 1209 insertions(+), 1089 deletions(-) create mode 100644 src/conf/snapshot_conf.c create mode 100644 src/conf/snapshot_conf.h -- 1.7.11.4

2 10

[libvirt] [PATCH] xen-xs: fix uuid of renamed domain
by Philipp Hahn 24 Aug '12

24 Aug '12

When the XenStore tdb lives persistently and is not cleared between host reboots, Xend (version 3.4 and 4.1) re-creates the domain information located in XenStore below /vm/$UUID. (According to the xen-3.2-commit hg265950e3df69 to fix a problem when locally migrating a domain to the host itself.) When doing so a version number is added to the UUID separated by one dash, which confuses xenStoreDomainIntroduced(): It iterates over all domains and tries to lookup all inactive domains using xenStoreDomainGetUUID(), which fails if the running domain is renamed: virUUIDParse() fails to parse the versioned UUID and the domain is flagged as missing. When this happens the function delays .2s and re-tries 20 times again, multiplied by the number of renamed VMs. 14:48:38.878: 4285: debug : xenStoreDomainIntroduced:1354 : Some domains were missing, trying again This adds a significant delay: # time virsh list >/dev/null real 0m6.529s # xenstore-list /vm 00000000-0000-0000-0000-000000000000 00000000-0000-0000-0000-000000000000-1 00000000-0000-0000-0000-000000000000-2 00000000-0000-0000-0000-000000000000-3 00000000-0000-0000-0000-000000000000-4 00000000-0000-0000-0000-000000000000-5 7c06121e-90c3-93d4-0126-50481d485cca 00000000-0000-0000-0000-000000000000-6 00000000-0000-0000-0000-000000000000-7 144ad19d-dfb4-2f80-8045-09196bb8784f 00000000-0000-0000-0000-000000000000-8 144ad19d-dfb4-2f80-8045-09196bb8784f-1 00000000-0000-0000-0000-000000000000-9 00000000-0000-0000-0000-000000000000-10 00000000-0000-0000-0000-000000000000-11 00000000-0000-0000-0000-000000000000-12 00000000-0000-0000-0000-000000000000-13 00000000-0000-0000-0000-000000000000-14 144ad19d-dfb4-2f80-8045-09196bb8784f-2 00000000-0000-0000-0000-000000000000-15 144ad19d-dfb4-2f80-8045-09196bb8784f-3 00000000-0000-0000-0000-000000000000-16 The patch adds truncation of the UUID as read from the XenStore path before passing it to virUUIDParse(). The same issue is reported at <http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=666135> Signed-off-by: Philipp Hahn <hahn(a)univention.de> --- src/xen/xs_internal.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/src/xen/xs_internal.c b/src/xen/xs_internal.c index e56d1a4..cdaef17 100644 --- a/src/xen/xs_internal.c +++ b/src/xen/xs_internal.c @@ -1115,8 +1115,11 @@ int xenStoreDomainGetUUID(virConnectPtr conn, snprintf(prop, 199, "/local/domain/%d/vm", id); prop[199] = 0; /* This will return something like - * /vm/00000000-0000-0000-0000-000000000000 */ + * /vm/00000000-0000-0000-0000-000000000000[-*] */ uuidstr = xs_read(priv->xshandle, 0, prop, &len); + /* Strip optional version suffix when VM was renamed */ + if (len > 40) /* strlen('/vm/') + VIR_UUID_STRING_BUFLEN - sizeof('\0') */ + uuidstr[40] = '\0'; /* remove "/vm/" */ ret = virUUIDParse(uuidstr + 4, uuid); -- 1.7.1

2 1

[libvirt] [PATCH 1/2] security: Add DAC to security_drivers
by Michal Privoznik 24 Aug '12

24 Aug '12

Currently, if users set 'security_driver="dac"' in qemu.conf libvirtd fails to initialize as DAC driver is not found because it is missing in our security drivers array. --- src/security/security_driver.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/src/security/security_driver.c b/src/security/security_driver.c index f450a94..e6da220 100644 --- a/src/security/security_driver.c +++ b/src/security/security_driver.c @@ -35,6 +35,7 @@ # include "security_apparmor.h" #endif +#include "security_dac.h" #include "security_nop.h" #define VIR_FROM_THIS VIR_FROM_SECURITY @@ -46,6 +47,7 @@ static virSecurityDriverPtr security_drivers[] = { #ifdef WITH_SECDRIVER_APPARMOR &virAppArmorSecurityDriver, #endif + &virSecurityDriverDAC, &virSecurityDriverNop, /* Must always be last, since it will always probe */ }; -- 1.7.8.6

2 4

[libvirt] [PATCH] libssh2_transport: Add docs to remote.html
by Peter Krempa 24 Aug '12

24 Aug '12

Describe the existence of the transport driver and document the configurable options. --- docs/remote.html.in | 52 +++++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 47 insertions(+), 5 deletions(-) diff --git a/docs/remote.html.in b/docs/remote.html.in index e6af4c2..40696b9 100644 --- a/docs/remote.html.in +++ b/docs/remote.html.in @@ -136,8 +136,14 @@ Remote libvirt supports a range of transports: <dd> Unencrypted TCP/IP socket. Not recommended for production use, this is normally disabled, but an administrator can enable it for testing or use over a trusted network. - The standard port is 16509. - </dd> + The standard port is 16509. </dd> + <dt> libssh2 </dt> + <dd> Transport over the SSH protocol using + <a href="http://libssh2.org/" title="libssh2 homepage">libssh2</a> instead +of the OpenSSH binary. This transport uses the libvirt authentication callback for +all ssh authentication calls and therefore supports keyboard-interactive authentication +even with graphical management applications. As with the classic ssh transport +netcat is required on the remote side.</dd> </dl> <p> The default transport, if no other is specified, is <code>tls</code>. @@ -182,6 +188,9 @@ Connect to a libvirtd daemon offering unencrypted TCP/IP connections on localhost port 5000 and use the test driver with default settings. </li> +<li><code>qemu+libssh2://user@host/system?known_hosts=/home/user/.ssh/known_hosts</code><br/> — +Connect to a remote host using a ssh connection with the libssh2 driver +and use a different known_hosts file.</li> </ul> <h4> <a name="Remote_URI_parameters">Extra parameters</a> @@ -237,7 +246,7 @@ Note that parameter values must be <td> <code>socket</code> </td> - <td> unix, ssh </td> + <td> unix, ssh, libssh2 </td> <td> The path to the Unix domain socket, which overrides the compiled-in default. For ssh transport, this is passed to @@ -252,7 +261,7 @@ Note that parameter values must be <td> <code>netcat</code> </td> - <td> ssh </td> + <td> ssh, libssh2 </td> <td> The name of the netcat command on the remote machine. The default is <code>nc</code>. For ssh transport, libvirt @@ -277,7 +286,7 @@ Note that parameter values must be <td> <code>keyfile</code> </td> - <td> ssh </td> + <td> ssh, libssh2 </td> <td> The name of the private key file to use to authentication to the remote machine. If this option is not used the default keys are used. @@ -341,6 +350,39 @@ Note that parameter values must be <td colspan="2"/> <td> Example: <code>pkipath=/tmp/pki/client</code> </td> </tr> + <tr> + <td> + <code>known_hosts</code> + </td> + <td> libssh2 </td> + <td> + Path to the known_hosts file to verify the host key agains. LibSSH2 + supports OpenSSH-style known_hosts files, although it does not support + all key types, so using files created by the OpenSSH binary may result + into truncating the known_hosts file. It's recommended to use the default + known_hosts file is located in libvirt's client local configuration + directory e.g.: ~/.config/libvirt/known_hosts. Note: Use absolute paths. +</td> + </tr> + <tr> + <td colspan="2"/> + <td> Example: <code>known_hosts=/root/.ssh/known_hosts</code> </td> + </tr> + <tr> + <td> + <code>sshauth</code> + </td> + <td> libssh2 </td> + <td> + A comma separated list of authentication methods to use. Default (is + "agent,privkey,keyboard-interactive". The order of the methods is perserved. + Some methods may require additional parameters. +</td> + </tr> + <tr> + <td colspan="2"/> + <td> Example: <code>sshauth=privkey,agent</code> </td> + </tr> </table> <h3> <a name="Remote_certificates">Generating TLS certificates</a> -- 1.7.12

2 2

[libvirt] How to solve this problem---libvirtError: this function is not supported by the connection driver: virNWFilterDefineXML
by Zhihong Wang 24 Aug '12

24 Aug '12

Dear all: I am trying to deploy openstack on xen hypervisor.Since XenSever or XCP is not available on our customized virtulization platform. We decide to use libvirt on xen as a middleware operating the xen hypervisor. But when I try to boot a instance , xen failed to response and I find the error in my nova.log as follows: 2012-08-24 09:17:25 ERROR nova.compute.manager [req-4b60e9a9-680c-457b-bf93-b71fb6230245 562096602c5e41748dd568d5db0f7553 6bd4a2580bcd4bef890d7ba4da82e925] [instance: 3645be21-9b5b-4718-9c9f-f6ba3588f7b4] Instance failed to spawn 2012-08-24 09:17:25 TRACE nova.compute.manager [instance: 3645be21-9b5b-4718-9c9f-f6ba3588f7b4] Traceback (most recent call last): 2012-08-24 09:17:25 TRACE nova.compute.manager [instance: 3645be21-9b5b-4718-9c9f-f6ba3588f7b4] File "/usr/lib/python2.6/site-packages/nova-2012.1-py2.6.egg/nova/compute/manager.py", line 592, in _spawn 2012-08-24 09:17:25 TRACE nova.compute.manager [instance: 3645be21-9b5b-4718-9c9f-f6ba3588f7b4] self._legacy_nw_info(network_info), block_device_info) 2012-08-24 09:17:25 TRACE nova.compute.manager [instance: 3645be21-9b5b-4718-9c9f-f6ba3588f7b4] File "/usr/lib/python2.6/site-packages/nova-2012.1-py2.6.egg/nova/exception.py", line 114, in wrapped 2012-08-24 09:17:25 TRACE nova.compute.manager [instance: 3645be21-9b5b-4718-9c9f-f6ba3588f7b4] return f(*args, **kw) 2012-08-24 09:17:25 TRACE nova.compute.manager [instance: 3645be21-9b5b-4718-9c9f-f6ba3588f7b4] File "/usr/lib/python2.6/site-packages/nova-2012.1-py2.6.egg/nova/virt/libvirt/connection.py", line 899, in spawn 2012-08-24 09:17:25 TRACE nova.compute.manager [instance: 3645be21-9b5b-4718-9c9f-f6ba3588f7b4] self.firewall_driver.setup_basic_filtering(instance, network_info) 2012-08-24 09:17:25 TRACE nova.compute.manager [instance: 3645be21-9b5b-4718-9c9f-f6ba3588f7b4] File "/usr/lib/python2.6/site-packages/nova-2012.1-py2.6.egg/nova/virt/libvirt/firewall.py", line 231, in setup_basic_filtering 2012-08-24 09:17:25 TRACE nova.compute.manager [instance: 3645be21-9b5b-4718-9c9f-f6ba3588f7b4] self.nwfilter.setup_basic_filtering(instance, network_info) 2012-08-24 09:17:25 TRACE nova.compute.manager [instance: 3645be21-9b5b-4718-9c9f-f6ba3588f7b4] File "/usr/lib/python2.6/site-packages/nova-2012.1-py2.6.egg/nova/virt/libvirt/firewall.py", line 102, in setup_basic_filtering 2012-08-24 09:17:25 TRACE nova.compute.manager [instance: 3645be21-9b5b-4718-9c9f-f6ba3588f7b4] self._ensure_static_filters() 2012-08-24 09:17:25 TRACE nova.compute.manager [instance: 3645be21-9b5b-4718-9c9f-f6ba3588f7b4] File "/usr/lib/python2.6/site-packages/nova-2012.1-py2.6.egg/nova/virt/libvirt/firewall.py", line 130, in _ensure_static_filters 2012-08-24 09:17:25 TRACE nova.compute.manager [instance: 3645be21-9b5b-4718-9c9f-f6ba3588f7b4] 'allow-dhcp-server'])) 2012-08-24 09:17:25 TRACE nova.compute.manager [instance: 3645be21-9b5b-4718-9c9f-f6ba3588f7b4] File "/usr/lib/python2.6/site-packages/nova-2012.1-py2.6.egg/nova/virt/libvirt/firewall.py", line 150, in _define_filter 2012-08-24 09:17:25 TRACE nova.compute.manager [instance: 3645be21-9b5b-4718-9c9f-f6ba3588f7b4] tpool.execute(self._conn.nwfilterDefineXML, xml) 2012-08-24 09:17:25 TRACE nova.compute.manager [instance: 3645be21-9b5b-4718-9c9f-f6ba3588f7b4] File "/usr/lib/python2.6/site-packages/eventlet/tpool.py", line 76, in tworker 2012-08-24 09:17:25 TRACE nova.compute.manager [instance: 3645be21-9b5b-4718-9c9f-f6ba3588f7b4] rv = meth(*args,**kwargs) 2012-08-24 09:17:25 TRACE nova.compute.manager [instance: 3645be21-9b5b-4718-9c9f-f6ba3588f7b4] File "/usr/lib64/python2.6/site-packages/libvirt.py", line 2628, in nwfilterDefineXML 2012-08-24 09:17:25 TRACE nova.compute.manager [instance: 3645be21-9b5b-4718-9c9f-f6ba3588f7b4] if ret is None:raise libvirtError('virNWFilterDefineXML() failed', conn=self) 2012-08-24 09:17:25 TRACE nova.compute.manager [instance: 3645be21-9b5b-4718-9c9f-f6ba3588f7b4] libvirtError: this function is not supported by the connection driver: virNWFilterDefineXML 2012-08-24 09:17:25 TRACE nova.compute.manager [instance: 3645be21-9b5b-4718-9c9f-f6ba3588f7b4] It seems that libvirt doesn't support virNWFilterDefineXML on xen,Is there any good solutions? Or how much work should be done to add this function to libvirt? I would take it into consideration seriously if I could fix this problem

2 1

[libvirt] [PATCH] openvz: check the exitstatus of vzlist
by Laine Stump 24 Aug '12

24 Aug '12

I noticed this while auditing all calls to virCommandRun that request an exit status from virCommandRun. Two functions in the openvz driver openvzDomainGetBarrierLimit openvzDomainSetBarrierLimit request an exit status from virCommandRun (thus assuring that virCommandRun won't log any errors just due to a non-0 exit status), but then fail to examine that exit status. This could result in the functions believing that the call to "vzlist" was successful, even though it may have encountered an error. --- src/openvz/openvz_driver.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/openvz/openvz_driver.c b/src/openvz/openvz_driver.c index 8257ed5..a1d3b42 100644 --- a/src/openvz/openvz_driver.c +++ b/src/openvz/openvz_driver.c @@ -1707,7 +1707,7 @@ openvzDomainGetBarrierLimit(virDomainPtr domain, virCommandSetOutputBuffer(cmd, &output); virCommandAddArgFormat(cmd, "-o%s.b,%s.l", param, param); virCommandAddArg(cmd, domain->name); - if (virCommandRun(cmd, &status)) { + if (virCommandRun(cmd, &status) < 0 || status != 0) { virReportError(VIR_ERR_OPERATION_FAILED, _("Failed to get %s for %s: %d"), param, domain->name, status); @@ -1758,7 +1758,7 @@ openvzDomainSetBarrierLimit(virDomainPtr domain, virCommandAddArgFormat(cmd, "--%s", param); virCommandAddArgFormat(cmd, "%llu:%llu", barrier, limit); virCommandAddArg(cmd, "--save"); - if (virCommandRun(cmd, &status)) { + if (virCommandRun(cmd, &status) < 0 || status != 0) { virReportError(VIR_ERR_OPERATION_FAILED, _("Failed to set %s for %s: %d"), param, domain->name, status); -- 1.7.11.4

2 2

[libvirt] [PATCH] nwfilter: don't log error if firewalld is disabled
by Laine Stump 24 Aug '12

24 Aug '12

The original patch to support firewalld in nwfilter wasn't personally checking the exit status of firewall-cmd, but was instead sending NULL in the *exitstatus arg, which meant that virCommandWait would log an error just for the exit status being non-0 (and a "more scary than useful" error at that). We don't want to treat this as an error, though, just as a reason to use standard (ip|eb)tables commands instead of firewall-cmd. This patch modifies the virCommandRun in the nwfilter code to request status back from the caller. This avoids virCommandWait logging an error message, and allows the caller to do as it likes after examining the status. --- src/nwfilter/nwfilter_ebiptables_driver.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/nwfilter/nwfilter_ebiptables_driver.c b/src/nwfilter/nwfilter_ebiptables_driver.c index b008879..8f7a453 100644 --- a/src/nwfilter/nwfilter_ebiptables_driver.c +++ b/src/nwfilter/nwfilter_ebiptables_driver.c @@ -4140,6 +4140,7 @@ ebiptablesDriverInitWithFirewallD(void) virBuffer buf = VIR_BUFFER_INITIALIZER; char *firewall_cmd_path; char *output = NULL; + int status; int ret = -1; if (!virNWFilterDriverIsWatchingFirewallD()) @@ -4155,8 +4156,8 @@ ebiptablesDriverInitWithFirewallD(void) "%s", CMD_STOPONERR(1)); - if (ebiptablesExecCLI(&buf, NULL, &output) == 0 && - strlen(output) == 0) { + if (ebiptablesExecCLI(&buf, &status, &output) == 0 && + status == 0) { VIR_DEBUG("Using firewall-cmd in nwfilter_ebiptables_driver."); ignore_value(virAsprintf(&ebtables_cmd_path, -- 1.7.11.4

2 3

[libvirt] Guest log getting written in cache directory rather /var/log/libvirt/qemu
by Richa Marwaha 24 Aug '12

24 Aug '12

Hi Everyone I am running libvirt with selinux driver under unprivileged user and the Guest.log file is not written into /var/log/libvirt/qemu/Guest.log but remains in Home Directory/.cache/libvirt/qemu/log/Guest.log. Does anyone know why its not writing to the required log location. Thanks Regards, Richa Marwaha LTC Security Email address:rmarwah@us.ibm.com

2 4

[libvirt] [PATCH] network: fix virtual network bridge delay setting
by Laine Stump 24 Aug '12

24 Aug '12

libvirt's network config documents that a bridge's STP "forward delay" (called "delay" in the XML) should be specified in seconds, but virNetDevBridgeSetSTPDelay() assumes that it is given a delay in milliseconds (although the comment at the top of the function incorrectly says "seconds". This fixes the comment, and converts the delay to milliseconds before calling virNetDevBridgeSetSTPDelay(). --- (Fortunately the default delay (and what most people set) is 0) src/network/bridge_driver.c | 6 +++++- src/util/virnetdevbridge.c | 4 ++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index 59b2c10..53eebed 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -1826,8 +1826,12 @@ networkStartNetworkVirtual(struct network_driver *driver, } /* Set bridge options */ + + /* delay is configured in seconds, but virNetDevBridgeSetSTPDelay + * expects milliseconds + */ if (virNetDevBridgeSetSTPDelay(network->def->bridge, - network->def->delay) < 0) + network->def->delay * 1000) < 0) goto err1; if (virNetDevBridgeSetSTP(network->def->bridge, diff --git a/src/util/virnetdevbridge.c b/src/util/virnetdevbridge.c index a616d8e..7b11bee 100644 --- a/src/util/virnetdevbridge.c +++ b/src/util/virnetdevbridge.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2011 Red Hat, Inc. + * Copyright (C) 2007-2012 Red Hat, Inc. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -378,7 +378,7 @@ int virNetDevBridgeRemovePort(const char *brname, /** * virNetDevBridgeSetSTPDelay: * @brname: the bridge name - * @delay: delay in seconds + * @delay: delay in milliseconds * * Set the bridge forward delay * -- 1.7.11.4

2 2

[libvirt] [PATCH v4 0/3] Per-guest S3/S4 configuration
by Martin Kletzander 24 Aug '12

24 Aug '12

There is a way to tell qemu how (not) to advertise S3/S4 ACPI sleep state capability to the guest OS. This series includes the capability to set this in the XML and also covers all the handling from qemu point of view including checking for the support, parameter parsing, command building, checking before sending the signals through guest agent and also tests and documentation. -- v4: - Changed attributes to elements - Merged documentation with XML extension - Fixed error reporting and other tweaks Michal pointed out v3: - Option names are change according to Eric and Doug - Added docs (formatdomain) v2: - Modified the patch to reflect danpb's notes (according to qemu people the setting the disable_s[34] parameter to 0/1 ensures that the states will be enabled/disabled respectively) *** BLURB HERE *** Martin Kletzander (3): Add per-guest S3/S4 state configuration qemu: Add support for S3/S4 state configuration tests: Add tests for qemu S3/S4 state configuration docs/formatdomain.html.in | 24 +++++++++ docs/schemas/domaincommon.rng | 39 ++++++++++++++ src/conf/domain_conf.c | 52 +++++++++++++++++- src/conf/domain_conf.h | 15 ++++++ src/libvirt_private.syms | 2 + src/qemu/qemu_capabilities.c | 7 +++ src/qemu/qemu_capabilities.h | 2 + src/qemu/qemu_command.c | 62 ++++++++++++++++++++++ src/qemu/qemu_driver.c | 17 ++++++ tests/qemuargv2xmltest.c | 3 ++ .../qemuxml2argv-misc-disable-s3.args | 4 ++ .../qemuxml2argv-misc-disable-s3.xml | 29 ++++++++++ .../qemuxml2argv-misc-disable-suspends.args | 4 ++ .../qemuxml2argv-misc-disable-suspends.xml | 30 +++++++++++ .../qemuxml2argv-misc-enable-s4.args | 4 ++ .../qemuxml2argv-misc-enable-s4.xml | 29 ++++++++++ tests/qemuxml2argvtest.c | 4 ++ tests/qemuxml2xmltest.c | 3 ++ 18 files changed, 329 insertions(+), 1 deletion(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-misc-disable-s3.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-misc-disable-s3.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-misc-disable-suspends.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-misc-disable-suspends.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-misc-enable-s4.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-misc-enable-s4.xml -- 1.7.12

3 9

[libvirt] [PATCH] qemu: forbid suspend if already pmsuspended
by Michal Privoznik 24 Aug '12

24 Aug '12

If a domain is pmsuspended then virsh suspend will succeed. Beside obvious flaw, virsh resume will report success and change domain state to running which is another mistake. Therefore we must forbid any attempts for suspend and resume when pmsuspended. --- src/libvirt.c | 4 ++++ src/qemu/qemu_driver.c | 18 ++++++++++++++++-- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/src/libvirt.c b/src/libvirt.c index e0ac391..b034ed6 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -2329,6 +2329,8 @@ virDomainRef(virDomainPtr domain) * hypervisor level will stay allocated. Use virDomainResume() to reactivate * the domain. * This function may require privileged access. + * Moreover, suspend may not be supported if domain is in some + * special state like VIR_DOMAIN_PMSUSPENDED. * * Returns 0 in case of success and -1 in case of failure. */ @@ -2375,6 +2377,8 @@ error: * Resume a suspended domain, the process is restarted from the state where * it was frozen by calling virDomainSuspend(). * This function may require privileged access + * Moreover, resume may not be supported if domain is in some + * special state like VIR_DOMAIN_PMSUSPENDED. * * Returns 0 in case of success and -1 in case of failure. */ diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 8c7b34d..256fa71 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -1572,6 +1572,7 @@ static int qemudDomainSuspend(virDomainPtr dom) { qemuDomainObjPrivatePtr priv; virDomainPausedReason reason; int eventDetail; + int state; qemuDriverLock(driver); vm = virDomainFindByUUID(&driver->domains, dom->uuid); @@ -1607,7 +1608,13 @@ static int qemudDomainSuspend(virDomainPtr dom) { "%s", _("domain is not running")); goto endjob; } - if (virDomainObjGetState(vm, NULL) != VIR_DOMAIN_PAUSED) { + + state = virDomainObjGetState(vm, NULL); + if (state == VIR_DOMAIN_PMSUSPENDED) { + virReportError(VIR_ERR_OPERATION_INVALID, + "%s", _("domain is pmsuspended")); + goto endjob; + } else if (state != VIR_DOMAIN_PAUSED) { if (qemuProcessStopCPUs(driver, vm, reason, QEMU_ASYNC_JOB_NONE) < 0) { goto endjob; } @@ -1639,6 +1646,7 @@ static int qemudDomainResume(virDomainPtr dom) { virDomainObjPtr vm; int ret = -1; virDomainEventPtr event = NULL; + int state; qemuDriverLock(driver); vm = virDomainFindByUUID(&driver->domains, dom->uuid); @@ -1659,7 +1667,13 @@ static int qemudDomainResume(virDomainPtr dom) { "%s", _("domain is not running")); goto endjob; } - if (virDomainObjGetState(vm, NULL) == VIR_DOMAIN_PAUSED) { + + state = virDomainObjGetState(vm, NULL); + if (state == VIR_DOMAIN_PMSUSPENDED) { + virReportError(VIR_ERR_OPERATION_INVALID, + "%s", _("domain is pmsuspended")); + goto endjob; + } else if (state == VIR_DOMAIN_PAUSED) { if (qemuProcessStartCPUs(driver, vm, dom->conn, VIR_DOMAIN_RUNNING_UNPAUSED, QEMU_ASYNC_JOB_NONE) < 0) { -- 1.7.8.6

2 2

[libvirt] [PATCH] qemu-agent: available in 0.10.0
by Eric Blake 23 Aug '12

23 Aug '12

The recent virDomainQemuAgentCommand addition is part of 0.10.0; also, grouping all libvirt-qemu.so callbacks together makes them easier to identify. * src/libvirt_qemu.syms: Fix release symbol. * src/qemu/qemu_driver.c (qemuDriver): Likewise. * src/remote/remote_driver.c (remote_driver): Likewise. * src/driver.h (_virDriver): Group qemu-specific callbacks. --- Pushing under the trivial rule. src/driver.h | 2 +- src/libvirt_qemu.syms | 2 +- src/qemu/qemu_driver.c | 2 +- src/remote/remote_driver.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/driver.h b/src/driver.h index ccb01dc..e88ab28 100644 --- a/src/driver.h +++ b/src/driver.h @@ -1043,6 +1043,7 @@ struct _virDriver { virDrvDomainSnapshotDelete domainSnapshotDelete; virDrvDomainQemuMonitorCommand qemuDomainMonitorCommand; virDrvDomainQemuAttach qemuDomainAttach; + virDrvDomainQemuAgentCommand qemuDomainArbitraryAgentCommand; virDrvDomainOpenConsole domainOpenConsole; virDrvDomainOpenGraphics domainOpenGraphics; virDrvDomainInjectNMI domainInjectNMI; @@ -1067,7 +1068,6 @@ struct _virDriver { virDrvDomainGetDiskErrors domainGetDiskErrors; virDrvDomainSetMetadata domainSetMetadata; virDrvDomainGetMetadata domainGetMetadata; - virDrvDomainQemuAgentCommand qemuDomainArbitraryAgentCommand; }; typedef int diff --git a/src/libvirt_qemu.syms b/src/libvirt_qemu.syms index 6e11509..f968d91 100644 --- a/src/libvirt_qemu.syms +++ b/src/libvirt_qemu.syms @@ -20,7 +20,7 @@ LIBVIRT_QEMU_0.9.4 { virDomainQemuAttach; } LIBVIRT_QEMU_0.8.3; -LIBVIRT_QEMU_0.10.1 { +LIBVIRT_QEMU_0.10.0 { global: virDomainQemuAgentCommand; } LIBVIRT_QEMU_0.9.4; diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 3948bef..baeb03b 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -14013,6 +14013,7 @@ static virDriver qemuDriver = { .domainSnapshotDelete = qemuDomainSnapshotDelete, /* 0.8.0 */ .qemuDomainMonitorCommand = qemuDomainMonitorCommand, /* 0.8.3 */ .qemuDomainAttach = qemuDomainAttach, /* 0.9.4 */ + .qemuDomainArbitraryAgentCommand = qemuDrvDomainAgentCommand, /* 0.10.0 */ .domainOpenConsole = qemuDomainOpenConsole, /* 0.8.6 */ .domainOpenGraphics = qemuDomainOpenGraphics, /* 0.9.7 */ .domainInjectNMI = qemuDomainInjectNMI, /* 0.9.2 */ @@ -14042,7 +14043,6 @@ static virDriver qemuDriver = { .domainPMSuspendForDuration = qemuDomainPMSuspendForDuration, /* 0.9.11 */ .domainPMWakeup = qemuDomainPMWakeup, /* 0.9.11 */ .domainGetCPUStats = qemuDomainGetCPUStats, /* 0.9.11 */ - .qemuDomainArbitraryAgentCommand = qemuDrvDomainAgentCommand, /* 0.10.1 */ }; diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index f0484a7..cf1f079 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -5530,6 +5530,7 @@ static virDriver remote_driver = { .domainSnapshotDelete = remoteDomainSnapshotDelete, /* 0.8.0 */ .qemuDomainMonitorCommand = remoteQemuDomainMonitorCommand, /* 0.8.3 */ .qemuDomainAttach = qemuDomainAttach, /* 0.9.4 */ + .qemuDomainArbitraryAgentCommand = qemuDomainAgentCommand, /* 0.10.0 */ .domainOpenConsole = remoteDomainOpenConsole, /* 0.8.6 */ .domainOpenGraphics = remoteDomainOpenGraphics, /* 0.9.7 */ .domainInjectNMI = remoteDomainInjectNMI, /* 0.9.2 */ @@ -5557,7 +5558,6 @@ static virDriver remote_driver = { .domainSetMetadata = remoteDomainSetMetadata, /* 0.9.10 */ .domainGetMetadata = remoteDomainGetMetadata, /* 0.9.10 */ .domainGetHostname = remoteDomainGetHostname, /* 0.10.0 */ - .qemuDomainArbitraryAgentCommand = qemuDomainAgentCommand, /* 0.10.1 */ }; static virNetworkDriver network_driver = { -- 1.7.11.4

1 0

[libvirt] [PATCH v4 0/7] support guest agent general command
by MATSUDA, Daiki 23 Aug '12

23 Aug '12

Hi. All. I rewrote the patched for git head tree, adding some code. And @timeout must be following VIR_DOMAIN_QEMU_AGENT_COMMAND_BLOCK(-2) : does not block and wait forever. VIR_DOMAIN_QEMU_AGENT_COMMAND_DEFAULT(-1) : use default time for waiting VIR_DOMAIN_QEMU_AGENT_COMMAND_NOWIAT(0) : does not wait and out soon positive value : wait for pointed seconds. And I also add VIR_DOMAIN_QEMU_AGENT_COMMAND_MIN for not writing static value. In addition, I added the some options for virsh command qemu-agent-command --block : it means taht @timeout is VIR_DOMAIN_QEMU_AGENT_COMMAND_BLOCK. --async : it means taht @timeout is VIR_DOMAIN_QEMU_AGENT_COMMAND_NOWIAT. --timeout @seconds : @seconds must be positive value and it means that @timeout is positive value case. These upper options are exclusive. If no options are given, it means taht @timeout is IR_DOMAIN_QEMU_AGENT_COMMAND_DEFAULT. virsh # help qemu-agent-command NAME qemu-agent-command - QEMU Guest Agent Command SYNOPSIS qemu-agent-command <domain> [--timeout <number>] [--async] [--block] {[--cmd] <string>}... DESCRIPTION Run an arbitrary qemu guest agent command; use at your own risk OPTIONS [--domain] <string> domain name, id or uuid --timeout <number> timeout seconds. must be positive. --async execute command without waiting for timeout --block execute command without timeout [--cmd] <string> command virsh # qemu-agent-command RHEL58_64 '{"execute":"guest-info"}' {"return":{"version":"1.1.50","supported_commands":[{"enabled":true,"name":"guest-network-get-interfaces"},{"enabled":true,"name":"guest-suspend-hybrid"},{"enabled":true,"name":"guest-suspend-ram"},{"enabled":true,"name":"guest-suspend-disk"},{"enabled":true,"name":"guest-fsfreeze-thaw"},{"enabled":true,"name":"guest-fsfreeze-freeze"},{"enabled":true,"name":"guest-fsfreeze-status"},{"enabled":true,"name":"guest-file-flush"},{"enabled":true,"name":"guest-file-seek"},{"enabled":true,"name":"guest-file-write"},{"enabled":true,"name":"guest-file-read"},{"enabled":true,"name":"guest-file-close"},{"enabled":true,"name":"guest-file-open"},{"enabled":true,"name":"guest-shutdown"},{"enabled":true,"name":"guest-info"},{"enabled":true,"name":"guest-ping"},{"enabled":true,"name":"guest-sync"},{"enabled":true,"name":"guest-sync-delimited"}]}} virsh # qemu-agent-command --block RHEL58_64 '{"execute":"guest-sync","arguments":{"id":123}}' {"return":123}

4 11

[libvirt] [PATCH v2 libvirt-virshcmdref] Add blockpull and blockjob commands
by Stefan Hajnoczi 23 Aug '12

23 Aug '12

The blockpull and blockjob commands have been present since 0.9.4. This patch adds basic usage examples and command syntax. Signed-off-by: Stefan Hajnoczi <stefanha(a)linux.vnet.ibm.com> --- v2: * Linewrap to 80 chars except pre-formatted <terminal> tag [Eric] * 'path' argument can be <target dev='name'> or <source file='name'> [Eric] * s/cancelation/cancellation/ [Eric] * Use blockpull --base option to avoid bandwidth 0 positional argument [Eric] * Drop blockjob --pivot argument, it doesn't work yet and I didn't document it common.sh | 8 ++-- source/blockjob.xml | 81 ++++++++++++++++++++++++++++++++++++ source/blockpull.xml | 111 ++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 196 insertions(+), 4 deletions(-) create mode 100644 source/blockjob.xml create mode 100644 source/blockpull.xml diff --git a/common.sh b/common.sh index 9da1b13..7e3a3a0 100755 --- a/common.sh +++ b/common.sh @@ -1,9 +1,9 @@ # List of source files DOMAIN_COMMANDS="attach-device attach-disk attach-interface autostart - blkiotune console cpu-baseline cpu-compare create define destroy - detach-device detach-disk detach-interface domid domjobabort domjobinfo - domname domuuid domxml-from-native domxml-to-native dump dumpxml echo - edit freecell hostname inject-nmi managedsave managedsave-remove + blkiotune blockjob blockpull console cpu-baseline cpu-compare create define + destroy detach-device detach-disk detach-interface domid domjobabort + domjobinfo domname domuuid domxml-from-native domxml-to-native dump dumpxml + echo edit freecell hostname inject-nmi managedsave managedsave-remove maxvcpus memtune migrate migrate-setmaxdowntime migrate-getspeed migrate-setspeed reboot restore resume save schedinfo send-key setmaxmem setmem setvcpus shutdown start suspend ttyconsole undefine diff --git a/source/blockjob.xml b/source/blockjob.xml new file mode 100644 index 0000000..1763c3c --- /dev/null +++ b/source/blockjob.xml @@ -0,0 +1,81 @@ +<?xml version='1.0' encoding='utf-8' ?> + +<command> + <name>blockjob</name> + + <description> + <text> + Manage active block operations + </text> + </description> + + <options> + <parameter requirement="required"> + <value type="string" requirement="required">domain</value> + <description> + The name of the domain on which to act. + </description> + </parameter> + <parameter requirement="required"> + <value type="string" requirement="required">path</value> + <description> + Either the <italic><source file='path'></italic> filename or the + <italic><target dev='path'></italic> device name. See + "domblklist" for listing these names. + </description> + </parameter> + <parameter requirement="optional"> + <keyword requirement="required">--abort</keyword> + <description> + Abort the active job on the specified disk. + </description> + </parameter> + <parameter requirement="optional"> + <keyword requirement="required">--async</keyword> + <description> + Return immediately instead of waiting for cancellation to complete, + when specified together with "--abort". + </description> + </parameter> + <parameter requirement="optional"> + <keyword requirement="required">--info</keyword> + <description> + Print information about any active block operation. + </description> + </parameter> + </options> + + <availability from="0.9.4" /> + + <notes /> + + <examples type="usage"> + <example> + <terminal>virsh # <bold>blockjob</bold> <value>example-domain</value> <value>vda</value> <italic>--info</italic></terminal> + <text> + Prints information about any active block operation on + <value>vda</value> from <value>example-domain</value>. + </text> + </example> + <example> + <terminal>virsh # <bold>blockjob</bold> <value>example-domain</value> <value>vda</value> <italic>--abort</italic></terminal> + <text> + Cancels the active block operation on <value>vda</value> from + <value>example-domain</value>. + </text> + </example> + </examples> + + <examples type="fullcontext" /> + + <reference type="seealso"> + <item> + <link type="internal" href="blockpull" /> + <name>blockpull</name> + <description> + populate a disk from its backing image chain + </description> + </item> + </reference> + +</command> diff --git a/source/blockpull.xml b/source/blockpull.xml new file mode 100644 index 0000000..15014a6 --- /dev/null +++ b/source/blockpull.xml @@ -0,0 +1,111 @@ +<?xml version='1.0' encoding='utf-8' ?> + +<command> + <name>blockpull</name> + + <description> + <text> + Populate a disk from its backing image chain + </text> + </description> + + <options> + <parameter requirement="required"> + <value type="string" requirement="required">domain</value> + <description> + The name of the domain on which to act. + </description> + </parameter> + <parameter requirement="required"> + <value type="string" requirement="required">path</value> + <description> + Either the <italic><source file='path'></italic> filename or the + <italic><target dev='path'></italic> device name. See + "domblklist" for listing these names. + </description> + </parameter> + <parameter requirement="optional"> + <value type="number" requirement="required">bandwidth</value> + <description> + Copying bandwidth limit in MiB/s. + </description> + </parameter> + <parameter requirement="optional"> + <value type="string" requirement="required">base</value> + <description> + Stop at a specific backing image instead of flattening the entire + chain. + </description> + </parameter> + <parameter requirement="optional"> + <keyword requirement="required">--wait</keyword> + <description> + Block until the operation completes instead of returning as soon as + possible while the operation runs in the background. + </description> + </parameter> + <parameter requirement="optional"> + <keyword requirement="required">--verbose</keyword> + <description> + Print periodic status updates when used together with "--wait". + </description> + </parameter> + <parameter requirement="optional"> + <keyword requirement="required">--timeout</keyword> + <value type="number" requirement="required">seconds</value> + <description> + Cancel the operation if the timeout elapses. Use together with + "--wait". + </description> + </parameter> + <parameter requirement="optional"> + <keyword requirement="required">--async</keyword> + <description> + Return as soon as possible. + </description> + </parameter> + </options> + + <availability from="0.9.4" /> + + <notes /> + + <examples type="usage"> + <example> + <terminal>virsh # <bold>blockpull</bold> <value>example-domain</value> <value>vda</value></terminal> + <text> + Start populating <value>vda</value> from its backing image chain and + return immediately. + </text> + </example> + <example> + <terminal>virsh # <bold>blockpull</bold> <value>example-domain</value> <value>vda</value> <italic>--wait</italic></terminal> + <text> + Populate <value>vda</value> from its backing image chain and wait for + the operation to complete. + </text> + </example> + <example> + <terminal>virsh # <bold>blockpull</bold> <value>example-domain</value> <value>vda</value> <italic>--base</italic> <value>/path/to/backing.img</value></terminal> + <text> + Start populating <value>vda</value> from its backing image chain up to + <value>/path/to/backing.img</value> and return immediately. + <value>/path/to/backing.img</value> and its backing images will not be + flattened. + </text> + </example> + </examples> + + <examples type="fullcontext" /> + + <reference type="seealso"> + <item> + <link type="internal" href="blockjob" /> + <name>blockjob</name> + <description> + manage active block operations + </description> + </item> + </reference> + +</command> -- 1.7.10.4

1 0

[libvirt] [PATCH] Fix a missing build requirement on dbus-devel
by Daniel Veillard 23 Aug '12

23 Aug '12

Communication with the firewall daemon uses DBus so if we compile with firewalld support, the dbus-devel is required for building pushed under build breaker rules diff --git a/libvirt.spec.in b/libvirt.spec.in index ea2fd88..18a7fb8 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -521,6 +521,11 @@ BuildRequires: util-linux BuildRequires: nfs-utils %endif +%if %{with_firewalld} +# Communication with the firewall daemon uses DBus +BuildRequires: dbus-devel +%endif + # Fedora build root suckage BuildRequires: gawk -- 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] docs: fix blockpull/blockcopy bandwidth Mbps -> MiB/s
by Stefan Hajnoczi 23 Aug '12

23 Aug '12

The bandwidth units for blockpull and blockcopy are in Megabytes per Second, not Megabits per Second. Signed-off-by: Stefan Hajnoczi <stefanha(a)linux.vnet.ibm.com> --- src/libvirt.c | 10 +++++----- tools/virsh.pod | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/libvirt.c b/src/libvirt.c index 60ce6d1..e0ac391 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -18344,7 +18344,7 @@ error: * virDomainBlockJobSetSpeed: * @dom: pointer to domain object * @disk: path to the block device, or device shorthand - * @bandwidth: specify bandwidth limit in Mbps + * @bandwidth: specify bandwidth limit in MiB/s * @flags: extra flags; not used yet, so callers should always pass 0 * * Set the maximimum allowable bandwidth that a block job may consume. If @@ -18402,7 +18402,7 @@ error: * virDomainBlockPull: * @dom: pointer to domain object * @disk: path to the block device, or device shorthand - * @bandwidth: (optional) specify copy bandwidth limit in Mbps + * @bandwidth: (optional) specify copy bandwidth limit in MiB/s * @flags: extra flags; not used yet, so callers should always pass 0 * * Populate a disk image with data from its backing image. Once all data from @@ -18419,7 +18419,7 @@ error: * can be found by calling virDomainGetXMLDesc() and inspecting * elements within //domain/devices/disk. * - * The maximum bandwidth (in Mbps) that will be used to do the copy can be + * The maximum bandwidth (in MiB/s) that will be used to do the copy can be * specified with the bandwidth parameter. If set to 0, libvirt will choose a * suitable default. Some hypervisors do not support this feature and will * return an error if bandwidth is not 0; in this case, it might still be @@ -18475,7 +18475,7 @@ error: * @dom: pointer to domain object * @disk: path to the block device, or device shorthand * @base: path to backing file to keep, or NULL for no backing file - * @bandwidth: (optional) specify copy bandwidth limit in Mbps + * @bandwidth: (optional) specify copy bandwidth limit in MiB/s * @flags: bitwise-OR of virDomainBlockRebaseFlags * * Populate a disk image with data from its backing image chain, and @@ -18535,7 +18535,7 @@ error: * can be found by calling virDomainGetXMLDesc() and inspecting * elements within //domain/devices/disk. * - * The maximum bandwidth (in Mbps) that will be used to do the copy can be + * The maximum bandwidth (in MiB/s) that will be used to do the copy can be * specified with the bandwidth parameter. If set to 0, libvirt will choose a * suitable default. Some hypervisors do not support this feature and will * return an error if bandwidth is not 0; in this case, it might still be diff --git a/tools/virsh.pod b/tools/virsh.pod index e932d7c..424f1d9 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -723,7 +723,7 @@ the command may continue to block a little while longer until the job is done cleaning up. I<path> specifies fully-qualified path of the disk. -I<bandwidth> specifies copying bandwidth limit in Mbps. +I<bandwidth> specifies copying bandwidth limit in MiB/s. =item B<blockpull> I<domain> I<path> [I<bandwidth>] [I<base>] [I<--wait> [I<--verbose>] [I<--timeout> B<seconds>] [I<--async]] @@ -750,7 +750,7 @@ I<path> specifies fully-qualified path of the disk; it corresponds to a unique target name (<target dev='name'/>) or source file (<source file='name'/>) for one of the disk devices attached to I<domain> (see also B<domblklist> for listing these names). -I<bandwidth> specifies copying bandwidth limit in Mbps. +I<bandwidth> specifies copying bandwidth limit in MiB/s. =item B<blkdeviotune> I<domain> I<device> [[I<--config>] [I<--live>] | [I<--current>]] -- 1.7.10.4

3 3

[libvirt] [PATCH libvirt-virshcmdref] Add blockpull and blockjob commands
by Stefan Hajnoczi 23 Aug '12

23 Aug '12

The blockpull and blockjob commands have been present since 0.9.4. This patch adds basic usage examples and command syntax. Signed-off-by: Stefan Hajnoczi <stefanha(a)linux.vnet.ibm.com> --- common.sh | 8 ++-- source/blockjob.xml | 79 +++++++++++++++++++++++++++++++++++++++ source/blockpull.xml | 101 ++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 184 insertions(+), 4 deletions(-) create mode 100644 source/blockjob.xml create mode 100644 source/blockpull.xml diff --git a/common.sh b/common.sh index 9da1b13..7e3a3a0 100755 --- a/common.sh +++ b/common.sh @@ -1,9 +1,9 @@ # List of source files DOMAIN_COMMANDS="attach-device attach-disk attach-interface autostart - blkiotune console cpu-baseline cpu-compare create define destroy - detach-device detach-disk detach-interface domid domjobabort domjobinfo - domname domuuid domxml-from-native domxml-to-native dump dumpxml echo - edit freecell hostname inject-nmi managedsave managedsave-remove + blkiotune blockjob blockpull console cpu-baseline cpu-compare create define + destroy detach-device detach-disk detach-interface domid domjobabort + domjobinfo domname domuuid domxml-from-native domxml-to-native dump dumpxml + echo edit freecell hostname inject-nmi managedsave managedsave-remove maxvcpus memtune migrate migrate-setmaxdowntime migrate-getspeed migrate-setspeed reboot restore resume save schedinfo send-key setmaxmem setmem setvcpus shutdown start suspend ttyconsole undefine diff --git a/source/blockjob.xml b/source/blockjob.xml new file mode 100644 index 0000000..0c34bae --- /dev/null +++ b/source/blockjob.xml @@ -0,0 +1,79 @@ +<?xml version='1.0' encoding='utf-8' ?> + +<command> + <name>blockjob</name> + + <description> + <text> + Manage active block operations + </text> + </description> + + <options> + <parameter requirement="required"> + <value type="string" requirement="required">domain</value> + <description> + The name of the domain on which to act. + </description> + </parameter> + <parameter requirement="required"> + <value type="string" requirement="required">path</value> + <description> + The fully-qualified path of the disk. See "domblklist" for listing these names. + </description> + </parameter> + <parameter requirement="optional"> + <keyword requirement="required">--abort</keyword> + <description> + Abort the active job on the specified disk. + </description> + </parameter> + <parameter requirement="optional"> + <keyword requirement="required">--async</keyword> + <description> + Return immediately instead of waiting for cancelation to complete, when specified together with "--abort". + </description> + </parameter> + <parameter requirement="optional"> + <keyword requirement="required">--pivot</keyword> + </parameter> + <parameter requirement="optional"> + <keyword requirement="required">--info</keyword> + <description> + Print information about any active block operation. + </description> + </parameter> + </options> + + <availability from="0.9.4" /> + + <notes /> + + <examples type="usage"> + <example> + <terminal>virsh # <bold>blockjob</bold> <value>example-domain</value> <value>vda</value> <italic>--info</italic></terminal> + <text> + Prints information about any active block operation on <value>vda</value> from <value>example-domain</value>. + </text> + </example> + <example> + <terminal>virsh # <bold>blockjob</bold> <value>example-domain</value> <value>vda</value> <italic>--abort</italic></terminal> + <text> + Cancels the active block operation on <value>vda</value> from <value>example-domain</value>. + </text> + </example> + </examples> + + <examples type="fullcontext" /> + + <reference type="seealso"> + <item> + <link type="internal" href="blockpull" /> + <name>blockpull</name> + <description> + populate a disk from its backing image chain + </description> + </item> + </reference> + +</command> diff --git a/source/blockpull.xml b/source/blockpull.xml new file mode 100644 index 0000000..81b58da --- /dev/null +++ b/source/blockpull.xml @@ -0,0 +1,101 @@ +<?xml version='1.0' encoding='utf-8' ?> + +<command> + <name>blockpull</name> + + <description> + <text> + Populate a disk from its backing image chain + </text> + </description> + + <options> + <parameter requirement="required"> + <value type="string" requirement="required">domain</value> + <description> + The name of the domain on which to act. + </description> + </parameter> + <parameter requirement="required"> + <value type="string" requirement="required">path</value> + <description> + The fully-qualified path of the disk. See "domblklist" for listing these names. + </description> + </parameter> + <parameter requirement="optional"> + <value type="number" requirement="required">bandwidth</value> + <description> + Copying bandwidth limit in MiB/s. + </description> + </parameter> + <parameter requirement="optional"> + <value type="string" requirement="required">base</value> + <description> + Stop at a specific backing image instead of flattening the entire chain. + </description> + </parameter> + <parameter requirement="optional"> + <keyword requirement="required">--wait</keyword> + <description> + Block until the operation completes instead of returning as soon as possible while the operation runs in the background. + </description> + </parameter> + <parameter requirement="optional"> + <keyword requirement="required">--verbose</keyword> + <description> + Print periodic status updates when used together with "--wait". + </description> + </parameter> + <parameter requirement="optional"> + <keyword requirement="required">--timeout</keyword> + <value type="number" requirement="required">seconds</value> + <description> + Cancel the operation if the timeout elapses. Use together with "--wait". + </description> + </parameter> + <parameter requirement="optional"> + <keyword requirement="required">--async</keyword> + <description> + Return as soon as possible. + </description> + </parameter> + </options> + + <availability from="0.9.4" /> + + <notes /> + + <examples type="usage"> + <example> + <terminal>virsh # <bold>blockpull</bold> <value>example-domain</value> <value>vda</value></terminal> + <text> + Start populating <value>vda</value> from its backing image chain and return immediately. + </text> + </example> + <example> + <terminal>virsh # <bold>blockpull</bold> <value>example-domain</value> <value>vda</value> <value>--wait</value></terminal> + <text> + Populate <value>vda</value> from its backing image chain and wait for the operation to complete. + </text> + </example> + <example> + <terminal>virsh # <bold>blockpull</bold> <value>example-domain</value> <value>vda</value> <value>0</value> <value>/path/to/backing.img</value></terminal> + <text> + Start populating <value>vda</value> from its backing image chain up to <value>/path/to/backing.img</value> and return immediately. <value>/path/to/backing.img</value> and its backing images will not be flattened. Note that the <value>0</value> means unlimited bandwidth and is necessary because <value>bandwidth</value> and <value>base</value> are positional arguments. + </text> + </example> + </examples> + + <examples type="fullcontext" /> + + <reference type="seealso"> + <item> + <link type="internal" href="blockjob" /> + <name>blockjob</name> + <description> + manage active block operations + </description> + </item> + </reference> + +</command> -- 1.7.10.4

2 3

[libvirt] [test-API][PATCH 1/2] New get_conn function in utils
by Wayne Sun 23 Aug '12

23 Aug '12

The get_conn function return connection object from libvirt module. This function could be used by both framework and testcases. The patch includes: * get_conn in utils/utils.py * sync env_inspect.py using the new function Signed-off-by: Wayne Sun <gsun(a)redhat.com> --- src/env_inspect.py | 22 ++-------------------- utils/utils.py | 27 +++++++++++++++++++++++++++ 2 files changed, 29 insertions(+), 20 deletions(-) diff --git a/src/env_inspect.py b/src/env_inspect.py index b260ff8..2c1a701 100644 --- a/src/env_inspect.py +++ b/src/env_inspect.py @@ -20,6 +20,7 @@ import commands import libvirt import sharedmod +from utils import utils def check_libvirt(logger): virsh = 'virsh -v' @@ -68,20 +69,6 @@ def hostinfo(logger): return 1 return 0 -def request_credentials(credentials, user_data): - for credential in credentials: - if credential[0] == libvirt.VIR_CRED_AUTHNAME: - credential[4] = user_data[0] - - if len(credential[4]) == 0: - credential[4] = credential[3] - elif credential[0] == libvirt.VIR_CRED_PASSPHRASE: - credential[4] = user_data[1] - else: - return -1 - - return 0 - def sharemod_init(env_parser, logger): """ get connection object from libvirt module initialize sharemod for use by testcases @@ -89,12 +76,7 @@ def sharemod_init(env_parser, logger): uri = env_parser.get_value('variables', 'defaulturi') username = env_parser.get_value('variables', 'username') password = env_parser.get_value('variables', 'password') - user_data = [username, password] - auth = [[libvirt.VIR_CRED_AUTHNAME, libvirt.VIR_CRED_PASSPHRASE], request_credentials, user_data] - conn = libvirt.openAuth(uri, auth, 0) - if not conn: - logger.error("Failed to setup libvirt connection"); - return 1 + conn = utils.get_conn(uri, username, password) # initialize conn object in sharedmod sharedmod.libvirtobj.clear() diff --git a/utils/utils.py b/utils/utils.py index be87cdc..eade10d 100644 --- a/utils/utils.py +++ b/utils/utils.py @@ -29,6 +29,7 @@ import struct import pexpect import string import subprocess +import libvirt from xml.dom import minidom from urlparse import urlparse @@ -57,6 +58,32 @@ def get_uri(ip): uri = "qemu+ssh://%s/system" % ip return uri +def request_credentials(credentials, user_data): + for credential in credentials: + if credential[0] == libvirt.VIR_CRED_AUTHNAME: + credential[4] = user_data[0] + + if len(credential[4]) == 0: + credential[4] = credential[3] + elif credential[0] == libvirt.VIR_CRED_PASSPHRASE: + credential[4] = user_data[1] + else: + return -1 + + return 0 + +def get_conn(uri='', username='', password=''): + """ get connection object from libvirt module + """ + user_data = [username, password] + auth = [[libvirt.VIR_CRED_AUTHNAME, libvirt.VIR_CRED_PASSPHRASE], request_credentials, user_data] + conn = libvirt.openAuth(uri, auth, 0) + if not conn: + logger.error("Failed to setup libvirt connection"); + sys.exit(1) + else: + return conn + def parse_uri(uri): # This is a simple parser for uri return urlparse(uri) -- 1.7.1

3 5

[libvirt] [PATCHv4] add-vcpu-usage
by Hu Tao 23 Aug '12

23 Aug '12

show `vcpu usages' by `virt-top -1' Before this patch, `virt-top -1' shows total cpu usages which euqal to `vcpu usages' + `hypervisor usages'. This patch adds another column for domains showing `vcpu usages'. An example is: PHYCPU %CPU example_domain 0 10.4 10.4 0.8 1 1.6 1.6 1.4 2 2.6 2.6 2.6 3 0.0 0.0 0.1 --- virt-top/virt_top.ml | 72 ++++++++++++++++++++++++++++++++++++------------- 1 files changed, 53 insertions(+), 19 deletions(-) diff --git a/virt-top/virt_top.ml b/virt-top/virt_top.ml index e2fe554..0dcb170 100644 --- a/virt-top/virt_top.ml +++ b/virt-top/virt_top.ml @@ -448,6 +448,7 @@ let collect, clear_pcpu_display_data = (* Save pcpu_usages structures across redraws too (only for pCPU display). *) let last_pcpu_usages = Hashtbl.create 13 in + let last_vcpu_usages = Hashtbl.create 13 in let clear_pcpu_display_data () = (* Clear out pcpu_usages used by PCPUDisplay display_mode @@ -652,12 +653,17 @@ let collect, clear_pcpu_display_data = (try let domid = rd.rd_domid in let maplen = C.cpumaplen nr_pcpus in - let cpu_stats = D.get_cpu_stats rd.rd_dom nr_pcpus in - let rec find_usages_from_stats = function + let cpu_stats = D.get_cpu_stats rd.rd_dom false in + let rec find_cpu_usages = function | ("cpu_time", D.TypedFieldUInt64 usages) :: _ -> usages - | _ :: params -> find_usages_from_stats params + | _ :: params -> find_cpu_usages params | [] -> 0L in - let pcpu_usages = Array.map find_usages_from_stats cpu_stats in + let rec find_vcpu_usages = function + | ("vcpu_time", D.TypedFieldUInt64 usages) :: _ -> usages + | _ :: params -> find_vcpu_usages params + | [] -> 0L in + + let pcpu_usages = Array.map find_cpu_usages cpu_stats in let maxinfo = rd.rd_info.D.nr_virt_cpu in let nr_vcpus, vcpu_infos, cpumaps = D.get_vcpus rd.rd_dom maxinfo maplen in @@ -669,11 +675,19 @@ let collect, clear_pcpu_display_data = (* Update last_pcpu_usages. *) Hashtbl.replace last_pcpu_usages domid pcpu_usages; - (match prev_pcpu_usages with - | Some prev_pcpu_usages + (* vcpu usages *) + let vcpu_usages = Array.map find_vcpu_usages cpu_stats in + let prev_vcpu_usages = + try Some (Hashtbl.find last_vcpu_usages domid) + with Not_found -> None in + Hashtbl.replace last_vcpu_usages domid vcpu_usages; + + (match prev_pcpu_usages, prev_vcpu_usages with + | Some prev_pcpu_usages, Some prev_vcpu_usages when Array.length prev_pcpu_usages = Array.length pcpu_usages -> - Some (domid, name, nr_vcpus, vcpu_infos, pcpu_usages, - prev_pcpu_usages, cpumaps, maplen) + Some (domid, name, nr_vcpus, vcpu_infos, pcpu_usages, + prev_pcpu_usages, vcpu_usages, prev_vcpu_usages, + cpumaps, maplen) | _ -> None (* ignore missing / unequal length prev_vcpu_infos *) ); with @@ -691,13 +705,24 @@ let collect, clear_pcpu_display_data = List.iteri ( fun di (domid, name, nr_vcpus, vcpu_infos, pcpu_usages, - prev_pcpu_usages, cpumaps, maplen) -> + prev_pcpu_usages, vcpu_usages, prev_vcpu_usages, + cpumaps, maplen) -> (* Which pCPUs can this dom run on? *) for p = 0 to Array.length pcpu_usages - 1 do pcpus.(p).(di) <- pcpu_usages.(p) -^ prev_pcpu_usages.(p) - done + done ) doms; + let vcpus = Array.make_matrix nr_pcpus nr_doms 0L in + List.iteri ( + fun di (domid, name, nr_vcpus, vcpu_infos, pcpu_usages, + prev_pcpu_usages, vcpu_usages, prev_vcpu_usages, + cpumaps, maplen) -> + for p = 0 to Array.length vcpu_usages - 1 do + vcpus.(p).(di) <- vcpu_usages.(p) -^ prev_vcpu_usages.(p) + done + ) doms; + (* Sum the CPU time used by each pCPU, for the %CPU column. *) let pcpus_cpu_time = Array.map ( fun row -> @@ -709,7 +734,7 @@ let collect, clear_pcpu_display_data = Int64.to_float !cpu_time ) pcpus in - Some (doms, pcpus, pcpus_cpu_time) + Some (doms, pcpus, vcpus, pcpus_cpu_time) ) else None in @@ -913,7 +938,7 @@ let redraw = loop domains_lineno doms | PCPUDisplay -> (*---------- Showing physical CPUs ----------*) - let doms, pcpus, pcpus_cpu_time = + let doms, pcpus, vcpus, pcpus_cpu_time = match pcpu_display with | Some p -> p | None -> failwith "internal error: no pcpu_display data" in @@ -922,9 +947,9 @@ let redraw = let dom_names = String.concat "" ( List.map ( - fun (_, name, _, _, _, _, _, _) -> + fun (_, name, _, _, _, _, _, _, _, _) -> let len = String.length name in - let width = max (len+1) 7 in + let width = max (len+1) 12 in pad width name ) doms ) in @@ -941,18 +966,27 @@ let redraw = addch ' '; List.iteri ( - fun di (domid, name, _, _, _, _, _, _) -> + fun di (domid, name, _, _, _, _, _, _, _, _) -> let t = pcpus.(p).(di) in + let tv = vcpus.(p).(di) in let len = String.length name in - let width = max (len+1) 7 in - let str = + let width = max (len+1) 12 in + let str_pcpu = if t <= 0L then "" else ( let t = Int64.to_float t in let percent = 100. *. t /. total_cpu_per_pcpu in - sprintf "%s " (Show.percent percent) + sprintf "%s" (Show.percent percent) ) in - addstr (pad width str); + let str_vcpu = + if tv <= 0L then "" + else ( + let tv = Int64.to_float tv in + let percent = 100. *. tv /. total_cpu_per_pcpu in + sprintf "%s" (Show.percent percent) + ) in + let str = sprintf "%s %s" str_pcpu str_vcpu in + addstr (pad width str); () ) doms ) pcpus; -- 1.7.1

2 6

[libvirt] [PATCH] fix check of vcpuid in virDomainVcpuPinDefParseXML
by Hu Tao 23 Aug '12

23 Aug '12

For emulator, the vcpuid field is always set to -1, instead of parsing XML for the value of it. --- src/conf/domain_conf.c | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 7242205..419088c 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -7923,7 +7923,7 @@ virDomainVcpuPinDefParseXML(const xmlNodePtr node, { virDomainVcpuPinDefPtr def; xmlNodePtr oldnode = ctxt->node; - int vcpuid; + int vcpuid = -1; char *tmp = NULL; int ret; @@ -7934,15 +7934,17 @@ virDomainVcpuPinDefParseXML(const xmlNodePtr node, ctxt->node = node; - ret = virXPathInt("string(./@vcpu)", ctxt, &vcpuid); - if ((ret == -2) || (vcpuid < -1)) { - virReportError(VIR_ERR_INTERNAL_ERROR, - "%s", _("vcpu id must be an unsigned integer or -1")); - goto error; - } else if ((vcpuid == -1) && (emulator == 0)) { - virReportError(VIR_ERR_INTERNAL_ERROR, - "%s", _("vcpu id value -1 is not allowed for vcpupin")); - goto error; + if (emulator == 0) { + ret = virXPathInt("string(./@vcpu)", ctxt, &vcpuid); + if ((ret == -2) || (vcpuid < -1)) { + virReportError(VIR_ERR_INTERNAL_ERROR, + "%s", _("vcpu id must be an unsigned integer or -1")); + goto error; + } else if (vcpuid == -1) { + virReportError(VIR_ERR_INTERNAL_ERROR, + "%s", _("vcpu id value -1 is not allowed for vcpupin")); + goto error; + } } if (vcpuid >= maxvcpus) { -- 1.7.10.2

2 2

[libvirt] [PATCH] util: eliminate erroneous VIR_WARNs in (eb|ip)tables.c
by Laine Stump 23 Aug '12

23 Aug '12

Several VIR_DEBUG()'s were changed to VIR_WARN() while I was testing the firewalld support patch, and I neglected to change them back before I pushed. In the meantime I've decided that it would be useful to have them be VIR_INFO(), just so there will be logged evidence of which method is being used (firewall-cmd vs. (eb|ip)tables) without needing to crank logging to 11. (at most this adds 2 lines to libvirtd's logs per libvirtd start). --- src/util/ebtables.c | 8 ++++---- src/util/iptables.c | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/util/ebtables.c b/src/util/ebtables.c index 1a78f89..3170ab0 100644 --- a/src/util/ebtables.c +++ b/src/util/ebtables.c @@ -55,19 +55,19 @@ virEbTablesOnceInit(void) { firewall_cmd_path = virFindFileInPath("firewall-cmd"); if (!firewall_cmd_path) { - VIR_WARN("firewall-cmd not found on system. " - "firewalld support disabled for ebtables."); + VIR_INFO("firewall-cmd not found on system. " + "firewalld support disabled for ebtables."); } else { virCommandPtr cmd = virCommandNew(firewall_cmd_path); int status; virCommandAddArgList(cmd, "--state", NULL); if (virCommandRun(cmd, &status) < 0 || status != 0) { - VIR_WARN("firewall-cmd found but disabled for ebtables"); + VIR_INFO("firewall-cmd found but disabled for ebtables"); VIR_FREE(firewall_cmd_path); firewall_cmd_path = NULL; } else { - VIR_WARN("using firewalld for ebtables commands"); + VIR_INFO("using firewalld for ebtables commands"); } virCommandFree(cmd); } diff --git a/src/util/iptables.c b/src/util/iptables.c index d8fdd3b..8a575c2 100644 --- a/src/util/iptables.c +++ b/src/util/iptables.c @@ -53,19 +53,19 @@ virIpTablesOnceInit(void) { firewall_cmd_path = virFindFileInPath("firewall-cmd"); if (!firewall_cmd_path) { - VIR_WARN("firewall-cmd not found on system. " - "firewalld support disabled for iptables."); + VIR_INFO("firewall-cmd not found on system. " + "firewalld support disabled for iptables."); } else { virCommandPtr cmd = virCommandNew(firewall_cmd_path); int status; virCommandAddArgList(cmd, "--state", NULL); if (virCommandRun(cmd, &status) < 0 || status != 0) { - VIR_WARN("firewall-cmd found but disabled for iptables"); + VIR_INFO("firewall-cmd found but disabled for iptables"); VIR_FREE(firewall_cmd_path); firewall_cmd_path = NULL; } else { - VIR_WARN("using firewalld for iptables commands"); + VIR_INFO("using firewalld for iptables commands"); } virCommandFree(cmd); } -- 1.7.11.4

2 2

[libvirt] [PATCH] Fix some typos in messages, docs and comments
by Yuri Chornoivan 23 Aug '12

23 Aug '12

2 1

[libvirt] [gluster]try to add gluster protocol in libvirt, but has qemuMonitorIO error
by Yin Yin 23 Aug '12

23 Aug '12

Hi, all: after test the qemu gluster V5 patch: http://lists.nongnu.org/archive/html/qemu-devel/2012-08/msg01023.html I had write a patch in libvirt to support gluster protocol, but has qemuMonitorIO error: 2012-08-22 17:17:47.600+0000: 29121: error : qemuMonitorIORead:490 : Unable to read from monitor: Connection reset by peer 2012-08-22 17:17:47.600+0000: 29121: error : qemuMonitorIO:546 : 内部错误 event from unexpected fd -1!=27 / watch 15!=15 the vm libvirt config file like this: <domain type='kvm'> <name>gluster-vm</name> <vcpu>1</vcpu> <cpu> <topology sockets='1' cores='1' threads='1'/> </cpu> <on_poweroff>destroy</on_poweroff> <on_reboot>restart</on_reboot> <on_crash>restart</on_crash> <memory>524288</memory> <devices> <emulator>/usr/libexec/qemu-kvm</emulator> <disk type='network' device='disk'> <source protocol='gluster' name='volname/windowsxp.img'> <host name='10.1.0.1' port='24007'/> </source> <target dev='vda' bus='virtio'/> <driver name='qemu' type='qcow2' io='native' cache='none'/> </disk> <controller type='virtio-serial' index='0'/> </devices> <features> <pae/> <acpi/> <apic/> </features> </domain> my questions: 1. what's the function of qemuMonitorIO? 2. why the qemu-gluster patch caused qemuMonitorIO error? I could boot vm in qemu command without monitor, like this: /usr/libexec/qemu-kvm -drive file=gluster:// 10.1.0.1/volname/windowsxp.img,format=qcow2 Best Regards, Yin Yin

1 0

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

23 Aug '12

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

3 13

[libvirt] [PATCH] additional parameter needed for dnsmasq
by Gene Czarcinski 23 Aug '12

23 Aug '12

RHBZ: https://bugzilla.redhat.com/show_bug.cgi?id=849787 As currently configured, dnsmasq for a virtual network will pass some queries upstream toward the Internet. This includes AAAA and MX queries as well a A queries when dnsmasq cannot answer for that name. This is occurring whether a domain name is specified or not. The problem is that dnsmasq will, by default, forward all queries unless "local=" is specified. I cannot envision a situation where such queries should be forwarded. See the bugzilla report for more info. While I did a lot of testing to figure out the problem and what needed to be done to fix it, I am unable to actually rebuild the libvirt rpm in my environment. The solution is the following patch: diff -uNr libvirt-0.9.11.4.orig/src/network/bridge_driver.c libvirt-0.9.11.4/src/network/bridge_driver.c --- libvirt-0.9.11.4.orig/src/network/bridge_driver.c 2012-06-15 14:23:21.000000000 -0400 +++ libvirt-0.9.11.4/src/network/bridge_driver.c 2012-08-21 09:03:17.387602485 -0400 @@ -491,7 +491,13 @@ virCommandAddArgList(cmd, "--strict-order", "--bind-interfaces", NULL); if (network->def->domain) - virCommandAddArgList(cmd, "--domain", network->def->domain, NULL); +// virCommandAddArgList(cmd, "--domain", network->def->domain, NULL); + virCommandAddArgFormat(cmd, + "--domain %s --local=/%s/", + network->def->domain, + network->def->domain); + else + virCommandAddArg(cmd, "--local="); if (pidfile) virCommandAddArgPair(cmd, "--pid-file", pidfile);

3 5

[libvirt] [PATCH v3 0/4] Per-guest S3/S4 configuration
by Martin Kletzander 22 Aug '12

22 Aug '12

There is a way to tell qemu how (not) to advertise S3/S4 ACPI sleep state capability to the guest OS. This series includes the capability to set this in the XML and also covers all the handling from qemu point of view including checking for the support, parameter parsing, command building, checking before sending the signals through guest agent and also tests and documentation. -- v3: - Option names are change according to Eric and Doug - Added docs (formatdomain) v2: - Modified the patch to reflect danpb's notes (according to qemu people the setting the disable_s[34] parameter to 0/1 ensures that the states will be enabled/disabled respectively) Martin Kletzander (4): Add per-guest S3/S4 state configuration qemu: Add support for S3/S4 state configuration tests: Add tests for qemu S3/S4 state configuration docs: Add pm element into documentation docs/formatdomain.html.in | 21 ++++ docs/schemas/domaincommon.rng | 33 ++++++ src/conf/domain_conf.c | 44 +++++++++ src/conf/domain_conf.h | 15 +++ src/libvirt_private.syms | 2 + src/qemu/qemu_capabilities.c | 7 ++ src/qemu/qemu_capabilities.h | 2 + src/qemu/qemu_command.c | 103 ++++++++++++++++++++ src/qemu/qemu_driver.c | 17 +++ tests/qemuargv2xmltest.c | 3 + .../qemuxml2argv-misc-disable-s3.args | 4 + .../qemuxml2argv-misc-disable-s3.xml | 27 +++++ .../qemuxml2argv-misc-disable-suspends.args | 4 + .../qemuxml2argv-misc-disable-suspends.xml | 27 +++++ .../qemuxml2argv-misc-enable-s4.args | 4 + .../qemuxml2argv-misc-enable-s4.xml | 27 +++++ tests/qemuxml2argvtest.c | 4 + tests/qemuxml2xmltest.c | 3 + 18 files changed, 347 insertions(+), 0 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-misc-disable-s3.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-misc-disable-s3.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-misc-disable-suspends.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-misc-disable-suspends.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-misc-enable-s4.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-misc-enable-s4.xml -- 1.7.8.6

3 10

[libvirt] [PATCH 0/4] Preparation for external live snapshot
by Eric Blake 22 Aug '12

22 Aug '12

I've determined that it is possible to mix migration to file with disk snapshots on existing qemu 1.1 in such a way to take a live system checkpoint snapshot of a system without the downtime of either 'virsh snapshot-create' or 'virsh save'; without the loss in disk state of 'virsh save'; and without the fsck penalties of 'virsh snapshot-create --disk-only'; basically by combining the best of those three approaches. I'm also quite tired of 'virsh snapshot-create --disk-only' failing for an offline domain, and have upcoming patches to drive qemu-img to do that for an offline image. Unfortunately, qemu 1.2 missed out on adding the 'drive-mirror' or 'block-commit' commands, so I still can't do quite everything I want with snapshots (in particular, I can't preserve the original filename; although you can do a snapshot/blockpull/snapshot to get back to the original filename with twice the work). But I think this series still leaves room for future enhancements as future qemu provides the means. Although I'm still in the middle of polishing the src/qemu patches, I'd at least like to post this series of prep-work to document how I plan to expose it all, and to make sure my design decisions are on track. The first three can be applied now, the fourth should probably not be applied until I actually have later patches using the new XML, hopefully still in time for 0.10.0. Eric Blake (4): snapshot: make virDomainSnapshotObjList opaque snapshot: split snapshot conf code into own file snapshot: rename an enum snapshot: new XML for external system checkpoint docs/formatsnapshot.html.in | 11 + docs/schemas/domainsnapshot.rng | 23 + po/POTFILES.in | 1 + src/Makefile.am | 3 +- src/conf/domain_conf.c | 933 +----------------- src/conf/domain_conf.h | 143 +-- src/conf/snapshot_conf.c | 1021 ++++++++++++++++++++ src/conf/snapshot_conf.h | 160 +++ src/esx/esx_driver.c | 1 + src/libvirt_private.syms | 5 +- src/qemu/qemu_command.c | 1 + src/qemu/qemu_domain.c | 7 +- src/qemu/qemu_domain.h | 3 +- src/qemu/qemu_driver.c | 69 +- src/qemu/qemu_migration.c | 2 +- src/vbox/vbox_tmpl.c | 1 + tests/domainsnapshotxml2xmlin/external_vm.xml | 10 + tests/domainsnapshotxml2xmlin/noparent.xml | 9 + tests/domainsnapshotxml2xmlout/all_parameters.xml | 1 + tests/domainsnapshotxml2xmlout/disk_snapshot.xml | 1 + tests/domainsnapshotxml2xmlout/external_vm.xml | 43 + tests/domainsnapshotxml2xmlout/full_domain.xml | 1 + tests/domainsnapshotxml2xmlout/metadata.xml | 1 + tests/domainsnapshotxml2xmlout/noparent.xml | 1 + .../noparent_nodescription.xml | 1 + .../noparent_nodescription_noactive.xml | 1 + tests/domainsnapshotxml2xmltest.c | 1 + 27 files changed, 1365 insertions(+), 1089 deletions(-) create mode 100644 src/conf/snapshot_conf.c create mode 100644 src/conf/snapshot_conf.h create mode 100644 tests/domainsnapshotxml2xmlin/external_vm.xml create mode 100644 tests/domainsnapshotxml2xmlin/noparent.xml create mode 100644 tests/domainsnapshotxml2xmlout/external_vm.xml -- 1.7.11.2

2 6

[libvirt] [PATCH] output status information during guest shutdown again
by Gerd v. Egidy 22 Aug '12

22 Aug '12

With SysV-init libvirt-guests wrote status information to the console during shutdown of the guests. Since the move to systemd libvirt-guests doesn't output this progress information anymore. This patch brings back this feature. It is helpful to show the admin what the system is waiting for and what is left of the timeout (e.g. for calibrating the shutdown timing of a ups). Rewriting the current line with \r doesn't work anymore in the context of systemd. So always write new lines, but move to 5 second intervals to avoid flooding the console. --- tools/libvirt-guests.init.sh | 65 +++++++++++++++++++++++++++++++---------- tools/libvirt-guests.service.in | 1 + 2 files changed, 51 insertions(+), 15 deletions(-) mode change 100644 => 100755 tools/libvirt-guests.init.sh diff --git a/tools/libvirt-guests.init.sh b/tools/libvirt-guests.init.sh old mode 100644 new mode 100755 index d5d42d6..0ffbb41 --- a/tools/libvirt-guests.init.sh +++ b/tools/libvirt-guests.init.sh @@ -225,22 +225,27 @@ suspend_guest() name=$(guest_name "$uri" "$guest") label=$(eval_gettext "Suspending \$name: ") bypass= + slept=0 test "x$BYPASS_CACHE" = x0 || bypass=--bypass-cache - printf %s "$label" + printf '%s%-12s\n' "$label" "..." run_virsh "$uri" managedsave $bypass "$guest" >/dev/null & virsh_pid=$! while true; do sleep 1 kill -0 "$virsh_pid" >/dev/null 2>&1 || break - progress=$(run_virsh_c "$uri" domjobinfo "$guest" 2>/dev/null | \ - awk '/^Data processed:/{print $3, $4}') - if [ -n "$progress" ]; then - printf '\r%s%12s ' "$label" "$progress" - else - printf '\r%s%-12s ' "$label" "..." + + slept=$(($slept + 1)) + if [ $(($slept%5)) -eq 0 ]; then + progress=$(run_virsh_c "$uri" domjobinfo "$guest" 2>/dev/null | \ + awk '/^Data processed:/{print $3, $4}') + if [ -n "$progress" ]; then + printf '%s%12s\n' "$label" "$progress" + else + printf '%s%-12s\n' "$label" "..." + fi fi done - retval wait "$virsh_pid" && printf '\r%s%-12s\n' "$label" "$(gettext "done")" + retval wait "$virsh_pid" && printf '%s%-12s\n' "$label" "$(gettext "done")" } # shutdown_guest URI GUEST @@ -252,30 +257,41 @@ shutdown_guest() guest=$2 name=$(guest_name "$uri" "$guest") - label=$(eval_gettext "Shutting down \$name: ") - printf %s "$label" + eval_gettext "Starting shutdown on guest: \$name" + echo retval run_virsh "$uri" shutdown "$guest" >/dev/null || return timeout=$SHUTDOWN_TIMEOUT check_timeout=false if [ $timeout -gt 0 ]; then check_timeout=true + format=$(eval_gettext "Waiting for guest %s to shut down, %4d seconds left\n") + else + slept=0 + format=$(eval_gettext "Waiting for guest %s to shut down\n") fi while ! $check_timeout || [ "$timeout" -gt 0 ]; do sleep 1 guest_is_on "$uri" "$guest" || return "$guest_running" || break + if $check_timeout; then - timeout=$((timeout - 1)) - printf '\r%s%-12d ' "$label" "$timeout" + if [ $(($timeout%5)) -eq 0 ]; then + printf "$format" "$name" "$timeout" + fi + timeout=$(($timeout - 1)) + else + slept=$(($slept + 1)) + if [ $(($slept%5)) -eq 0 ]; then + printf "$format" "$name" + fi fi done if guest_is_on "$uri" "$guest"; then if "$guest_running"; then - printf '\r%s%-12s\n' "$label" \ - "$(gettext "failed to shutdown in time")" + eval_gettext "Shutdown of guest \$name failed to complete in time." else - printf '\r%s%-12s\n' "$label" "$(gettext "done")" + eval_gettext "Shutdown of guest \$name complete." fi fi } @@ -356,6 +372,10 @@ shutdown_guests_parallel() timeout=$SHUTDOWN_TIMEOUT if [ $timeout -gt 0 ]; then check_timeout=true + format=$(eval_gettext "Waiting for %d guests to shut down, %4d seconds left\n") + else + slept=0 + format=$(eval_gettext "Waiting for %d guests to shut down\n") fi while [ -n "$on_shutdown" ] || [ -n "$guests" ]; do while [ -n "$guests" ] && @@ -368,14 +388,29 @@ shutdown_guests_parallel() on_shutdown="$on_shutdown $guest" done sleep 1 + + set -- $guests + guestcount=$# + set -- $on_shutdown + shutdowncount=$# + if $check_timeout; then + if [ $(($timeout%5)) -eq 0 ]; then + printf "$format" $(($guestcount+$shutdowncount)) "$timeout" + fi timeout=$(($timeout - 1)) if [ $timeout -le 0 ]; then eval_gettext "Timeout expired while shutting down domains"; echo RETVAL=1 return fi + else + slept=$(($slept + 1)) + if [ $(($slept%5)) -eq 0 ]; then + printf "$format" $(($guestcount+$shutdowncount)) + fi fi + on_shutdown_prev=$on_shutdown on_shutdown=$(check_guests_shutdown "$uri" "$on_shutdown") print_guests_shutdown "$uri" "$on_shutdown_prev" "$on_shutdown" diff --git a/tools/libvirt-guests.service.in b/tools/libvirt-guests.service.in index db28f3f..0f0c41c 100644 --- a/tools/libvirt-guests.service.in +++ b/tools/libvirt-guests.service.in @@ -10,6 +10,7 @@ ExecStart=/etc/init.d/libvirt-guests start ExecStop=/etc/init.d/libvirt-guests stop Type=oneshot RemainAfterExit=yes +StandardOutput=journal+console [Install] WantedBy=multi-user.target -- 1.7.11.2

2 6

[libvirt] [PATCH v2.1 00/21] Supports for emulator-pin and emulator-bandwidth
by Hu Tao 22 Aug '12

22 Aug '12

This series adds support of emulator-pin to pin emulator threads on specified physical CPUs, and emulator-bandwidth to control physical CPU bandwidth for emulator threads. changes: v2.1: - rebase - include emulator-bandwidth patches - minor fix of virCgroupAddTaskStrController v2: - rename hypervisor to emulator all through the series - no Flags-suffix for new APIs - reduce code duplication - rollback to old vcpupin def if error Hu Tao (12): Introduce the function virCgroupMoveTask add function bitmapFromBytemap() to convert bytemap to bitmap refactor virDomainVcpuPinAdd() updates of some vcpupin related functions Enable cpuset cgroup and synchronous vcpupin info to cgroup. Change virDomainVcpuPinDefParseXML to support parsing emulatorpin qemu: support emulator pinning Add a new function vshPrintPinInfo. new command emulatorpin limit cpu bandwidth only for vcpus qemu: introduce period/quota tuning for emulator new interface to control emulator_period/emulator_quota Tang Chen (6): Support emulatorpin xml parse. qemu: synchronize emulatorpin info to cgroup Add qemuProcessSetEmulatorAffinites and set emulator threads affinities Introduce virDomainPinEmulator and virDomainGetEmulatorPinInfo functions. Introduce virDomainEmulatorPinAdd and virDomainEmulatorPinDel functions remote: introduce emulator pinning RPCs Wen Congyang (3): Introduce the function virCgroupForEmulator create a new cgroup and move all emulator threads to the new cgroup qemu: support of emulator_period and emulator_quota's modification daemon/remote.c | 91 ++++ docs/formatdomain.html.in | 33 ++ docs/schemas/domaincommon.rng | 17 + include/libvirt/libvirt.h.in | 34 +- src/conf/domain_conf.c | 300 ++++++++++--- src/conf/domain_conf.h | 17 +- src/driver.h | 12 + src/libvirt.c | 147 +++++++ src/libvirt_private.syms | 9 + src/libvirt_public.syms | 2 + src/libxl/libxl_driver.c | 13 +- src/qemu/qemu_cgroup.c | 173 ++++++-- src/qemu/qemu_cgroup.h | 7 + src/qemu/qemu_driver.c | 523 +++++++++++++++++++---- src/qemu/qemu_process.c | 60 ++- src/remote/remote_driver.c | 99 +++++ src/remote/remote_protocol.x | 21 +- src/remote_protocol-structs | 22 + src/util/cgroup.c | 187 +++++++- src/util/cgroup.h | 15 + src/xen/xend_internal.c | 13 +- tests/qemuxml2argvdata/qemuxml2argv-cputune.xml | 1 + tools/virsh-domain.c | 253 ++++++++++- tools/virsh.pod | 27 +- 24 files changed, 1868 insertions(+), 208 deletions(-) -- 1.7.10.2

3 49

[libvirt] [PATCH V3 0/3] Improve netlink to support all protocols.
by Tang Chen 22 Aug '12

22 Aug '12

These patches improved libvirt to support all netlink protocols, and also introduced a new netlink service to listen to hotplug events. Tang Chen (3): Improve netlink to support all protocol. Introduce virNetlinkEventServiceStopAll() to stop all netlink services. Add uevent netlink service. daemon/libvirtd.c | 12 ++- src/libvirt_private.syms | 1 + src/util/virnetdev.c | 6 +- src/util/virnetdevmacvlan.c | 12 ++- src/util/virnetdevvportprofile.c | 7 +- src/util/virnetlink.c | 220 ++++++++++++++++++++++++++++++-------- src/util/virnetlink.h | 22 ++-- 7 files changed, 218 insertions(+), 62 deletions(-) -- 1.7.10.1

2 6

[libvirt] [PATCH 0/2] Fix thrashing of user's known_hosts file.
by Peter Krempa 22 Aug '12

22 Aug '12

Libvirt tried to use the user's default known_hosts file in .ssh/known_hosts for it's purposes, but libssh2 thrashes it if it contains unsupported keys. Whith this patchset, libvirt will maintain it's own known_hosts file in it's config directory. Peter Krempa (2): libssh2_session: Add support for creating known_hosts file client: Change default location of known_hosts file for libssh2 layer src/rpc/virnetclient.c | 17 ++++++++++------- src/rpc/virnetsocket.c | 4 ++-- src/rpc/virnetsshsession.c | 26 ++++++++++++++++---------- src/rpc/virnetsshsession.h | 9 +++++++-- 4 files changed, 35 insertions(+), 21 deletions(-) -- 1.7.8.6

2 5

[libvirt] [PATCH] virsh: don't print error info when snapshot xml is not changed
by Guannan Ren 22 Aug '12

22 Aug '12

If xml is not changed, error message is printed. So check ret value instead of edit variable for error message. --- tools/virsh-snapshot.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/virsh-snapshot.c b/tools/virsh-snapshot.c index aff91d3..5d84f7a 100644 --- a/tools/virsh-snapshot.c +++ b/tools/virsh-snapshot.c @@ -449,7 +449,7 @@ cmdSnapshotEdit(vshControl *ctl, const vshCmd *cmd) _("Snapshot %s XML configuration not changed.\n"), \ name); \ ret = true; \ - goto cleanup; \ + goto edit_cleanup; \ } #define EDIT_DEFINE \ (strstr(doc, "<state>disk-snapshot</state>") ? \ @@ -487,10 +487,10 @@ cmdSnapshotEdit(vshControl *ctl, const vshCmd *cmd) ret = true; cleanup: + if (!ret) + vshError(ctl, _("Failed to update %s"), name); if (edited) virDomainSnapshotFree(edited); - else - vshError(ctl, _("Failed to update %s"), name); if (snapshot) virDomainSnapshotFree(snapshot); if (dom) -- 1.7.10.1

2 2

[libvirt] [PATCHv6 0/2] Rework of Disk Geometry Support
by Viktor Mihajlovski 22 Aug '12

22 Aug '12

With qemu it is possible to override the geometry (cylinders, heads, sectors) of disks. This series adds a new XML tag for geometry and the related support in the qemu driver. V2 Changes: Refactor into the generic domain configuration/XML support for disk geometry and a qemu specific part with the testcase V3 Changes: 1. Use virReportError instead of custom xxxReportError. 2. Moved the geometry element to diskspec, so it applies to all kind of disks. V4 Changes: Rebase for libvirt 0.10.0 freeze. V5 Changes: Corrected qemuxml2argvtest invocation. Oversight after rebase. V6 Changes: The geometry info was incorrectly processed only for block and file based disks. Fixed. J.B. Joret (2): Support for Disk Geometry Override qemu: Disk Geometry Override Support docs/formatdomain.html.in | 25 +++++++ docs/schemas/domaincommon.rng | 25 +++++++ src/conf/domain_conf.c | 71 ++++++++++++++++++++ src/conf/domain_conf.h | 17 +++++ src/libvirt_private.syms | 2 + src/qemu/qemu_command.c | 56 +++++++++++++++ .../qemuxml2argv-disk-geometry.args | 4 + .../qemuxml2argv-disk-geometry.xml | 26 +++++++ tests/qemuxml2argvtest.c | 2 + 9 files changed, 228 insertions(+), 0 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-geometry.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-geometry.xml

3 7

[libvirt] [PATCH] atomic: mark header functions static
by Eric Blake 22 Aug '12

22 Aug '12

When gcc atomic intrinsics are not available (such as on RHEL 5 with gcc 4.1.2), we were getting link errors due to multiple definitions: ./.libs/libvirt_util.a(libvirt_util_la-virobject.o): In function `virAtomicIntXor': /home/dummy/l,ibvirt/src/util/viratomoic.h:404: multiple definition of `virAtomicIntXor' ./.libs/libvirt_util.a(libvirt_util_la-viratomic.o):/home/dummy/libvirt/src/util/viratomic.h:404: first defined here Solve this by conditionally marking the functions static (the condition avoids falling foul of gcc warnings about unused static function declarations). * src/util/viratomic.h: When not using gcc intrinsics, use static functions to avoid linker errors on duplicate functions. --- Pushing under the build-breaker rule. Tested on both RHEL 5 and modern gcc of F17. Oh, and I just noticed my indentation is off, while preparing this email; I'll squash in the whitespace fix before pushing. src/util/viratomic.h | 75 ++++++++++++++++++++++++++++------------------------ 1 file changed, 41 insertions(+), 34 deletions(-) diff --git a/src/util/viratomic.h b/src/util/viratomic.h index fa0a89a..95c7f5c 100644 --- a/src/util/viratomic.h +++ b/src/util/viratomic.h @@ -28,6 +28,12 @@ # include "internal.h" +# ifdef VIR_ATOMIC_OPS_GCC +# define VIR_STATIC /* Nothing; we just never define the functions */ +# else +# define VIR_STATIC static +# endif + /** * virAtomicIntGet: * Gets the current value of atomic. @@ -35,7 +41,7 @@ * This call acts as a full compiler and hardware memory barrier * (before the get) */ -int virAtomicIntGet(volatile int *atomic) +VIR_STATIC int virAtomicIntGet(volatile int *atomic) ATTRIBUTE_NONNULL(1); /** @@ -45,8 +51,8 @@ int virAtomicIntGet(volatile int *atomic) * This call acts as a full compiler and hardware memory barrier * (after the set) */ -void virAtomicIntSet(volatile int *atomic, - int newval) +VIR_STATIC void virAtomicIntSet(volatile int *atomic, + int newval) ATTRIBUTE_NONNULL(1); /** @@ -58,7 +64,7 @@ void virAtomicIntSet(volatile int *atomic, * * This call acts as a full compiler and hardware memory barrier. */ -int virAtomicIntInc(volatile int *atomic) +VIR_STATIC int virAtomicIntInc(volatile int *atomic) ATTRIBUTE_NONNULL(1); /** @@ -70,7 +76,7 @@ int virAtomicIntInc(volatile int *atomic) * * This call acts as a full compiler and hardware memory barrier. */ -bool virAtomicIntDecAndTest(volatile int *atomic) +VIR_STATIC bool virAtomicIntDecAndTest(volatile int *atomic) ATTRIBUTE_NONNULL(1); /** @@ -86,9 +92,9 @@ bool virAtomicIntDecAndTest(volatile int *atomic) * * This call acts as a full compiler and hardware memory barrier. */ -bool virAtomicIntCompareExchange(volatile int *atomic, - int oldval, - int newval) +VIR_STATIC bool virAtomicIntCompareExchange(volatile int *atomic, + int oldval, + int newval) ATTRIBUTE_NONNULL(1); /** @@ -100,8 +106,8 @@ bool virAtomicIntCompareExchange(volatile int *atomic, * * This call acts as a full compiler and hardware memory barrier. */ -int virAtomicIntAdd(volatile int *atomic, - int val) +VIR_STATIC int virAtomicIntAdd(volatile int *atomic, + int val) ATTRIBUTE_NONNULL(1); /** @@ -114,8 +120,8 @@ int virAtomicIntAdd(volatile int *atomic, * Think of this operation as an atomic version of * { tmp = *atomic; *atomic &= val; return tmp; } */ -unsigned int virAtomicIntAnd(volatile unsigned int *atomic, - unsigned int val) +VIR_STATIC unsigned int virAtomicIntAnd(volatile unsigned int *atomic, + unsigned int val) ATTRIBUTE_NONNULL(1); /** @@ -128,8 +134,8 @@ unsigned int virAtomicIntAnd(volatile unsigned int *atomic, * * This call acts as a full compiler and hardware memory barrier. */ -unsigned int virAtomicIntOr(volatile unsigned int *atomic, - unsigned int val) +VIR_STATIC unsigned int virAtomicIntOr(volatile unsigned int *atomic, + unsigned int val) ATTRIBUTE_NONNULL(1); /** @@ -142,10 +148,11 @@ unsigned int virAtomicIntOr(volatile unsigned int *atomic, * * This call acts as a full compiler and hardware memory barrier. */ -unsigned int virAtomicIntXor(volatile unsigned int *atomic, - unsigned int val) +VIR_STATIC unsigned int virAtomicIntXor(volatile unsigned int *atomic, + unsigned int val) ATTRIBUTE_NONNULL(1); +# undef VIR_STATIC # ifdef VIR_ATOMIC_OPS_GCC @@ -224,14 +231,14 @@ unsigned int virAtomicIntXor(volatile unsigned int *atomic, /* * http://msdn.microsoft.com/en-us/library/ms684122(v=vs.85).aspx */ -inline int +static inline int virAtomicIntGet(volatile int *atomic) { MemoryBarrier(); return *atomic; } -inline void +static inline void virAtomicIntSet(volatile int *atomic, int newval) { @@ -239,19 +246,19 @@ virAtomicIntSet(volatile int *atomic, MemoryBarrier(); } -inline int +static inline int virAtomicIntInc(volatile int *atomic) { return InterlockedIncrement((volatile LONG *)atomic); } -inline bool +static inline bool virAtomicIntDecAndTest(volatile int *atomic) { return InterlockedDecrement((volatile LONG *)atomic) == 0; } -inline bool +static inline bool virAtomicIntCompareExchange(volatile int *atomic, int oldval, int newval) @@ -259,28 +266,28 @@ virAtomicIntCompareExchange(volatile int *atomic, return InterlockedCompareExchange((volatile LONG *)atomic, newval, oldval) == oldval; } -inline int +static inline int virAtomicIntAdd(volatile int *atomic, int val) { return InterlockedExchangeAdd((volatile LONG *)atomic, val); } -inline unsigned int +static inline unsigned int virAtomicIntAnd(volatile unsigned int *atomic, unsigned int val) { return InterlockedAnd((volatile LONG *)atomic, val); } -inline unsigned int +static inline unsigned int virAtomicIntOr(volatile unsigned int *atomic, unsigned int val) { return InterlockedOr((volatile LONG *)atomic, val); } -inline unsigned int +static inline unsigned int virAtomicIntXor(volatile unsigned int *atomic, unsigned int val) { @@ -294,7 +301,7 @@ virAtomicIntXor(volatile unsigned int *atomic, extern pthread_mutex_t virAtomicLock; -inline int +static inline int virAtomicIntGet(volatile int *atomic) { int value; @@ -306,7 +313,7 @@ virAtomicIntGet(volatile int *atomic) return value; } -inline void +static inline void virAtomicIntSet(volatile int *atomic, int value) { @@ -315,7 +322,7 @@ virAtomicIntSet(volatile int *atomic, pthread_mutex_unlock(&virAtomicLock); } -inline int +static inline int virAtomicIntInc(volatile int *atomic) { int value; @@ -327,7 +334,7 @@ virAtomicIntInc(volatile int *atomic) return value; } -inline bool +static inline bool virAtomicIntDecAndTest(volatile int *atomic) { bool is_zero; @@ -339,7 +346,7 @@ virAtomicIntDecAndTest(volatile int *atomic) return is_zero; } -inline bool +static inline bool virAtomicIntCompareExchange(volatile int *atomic, int oldval, int newval) @@ -356,7 +363,7 @@ virAtomicIntCompareExchange(volatile int *atomic, return success; } -inline int +static inline int virAtomicIntAdd(volatile int *atomic, int val) { @@ -370,7 +377,7 @@ virAtomicIntAdd(volatile int *atomic, return oldval; } -inline unsigned int +static inline unsigned int virAtomicIntAnd(volatile unsigned int *atomic, unsigned int val) { @@ -384,7 +391,7 @@ virAtomicIntAnd(volatile unsigned int *atomic, return oldval; } -inline unsigned int +static inline unsigned int virAtomicIntOr(volatile unsigned int *atomic, unsigned int val) { @@ -398,7 +405,7 @@ virAtomicIntOr(volatile unsigned int *atomic, return oldval; } -inline unsigned int +static inline unsigned int virAtomicIntXor(volatile unsigned int *atomic, unsigned int val) { -- 1.7.11.4

2 2

[libvirt] [PATCH 0/4] Improve netlink to support all protocols.
by Tang Chen 22 Aug '12

22 Aug '12

These patches improved libvirt to support all netlink protocols, and also introduced a new netlink service to listen to hotplug events. Tang Chen (4): Improve netlink to support all protocol. Introduce virNetlinkEventServiceStopAll() to stop all netlink services in libvirt. Add uevent netlink service. DEBUG: print out netlink message. daemon/libvirtd.c | 12 +- src/libvirt_private.syms | 1 + src/util/virnetdev.c | 6 +- src/util/virnetdevmacvlan.c | 12 +- src/util/virnetdevvportprofile.c | 7 +- src/util/virnetlink.c | 230 +++++++++++++++++++++++++++++++------- src/util/virnetlink.h | 22 ++-- 7 files changed, 229 insertions(+), 61 deletions(-) -- 1.7.10.1

2 9

[libvirt] building on RHEL 5 currently broken
by Eric Blake 22 Aug '12

22 Aug '12

Just a quick heads-up (I'll fix it later, when I have more time): I just learned commit 350583c85 broke builds on RHEL 5, because of the use of AS_VERSION_COMPARE in configure.ac which was not available in older autoconf 2.59. -- Eric Blake eblake(a)redhat.com +1-919-301-3266 Libvirt virtualization library http://libvirt.org

3 9