- Devel - libvirt List Archives

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

17 Oct '12

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

1 0

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

17 Oct '12

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

2 2

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

17 Oct '12

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

2 2

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

17 Oct '12

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

2 1

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

17 Oct '12

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

2 2

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

17 Oct '12

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

2 2

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

16 Oct '12

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

2 2

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

16 Oct '12

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

2 1

[libvirt] [PATCH] [libvirt-snmp] List inactive domains
by Jorge Boncompte [DTI2] 16 Oct '12

16 Oct '12

From: "Jorge Boncompte [DTI2]" <jorge(a)dti2.net> Monitoring app can't otherwise differentiate between a stopped domain or a nonexistent one. Signed-off-by: Jorge Boncompte [DTI2] <jorge(a)dti2.net> --- src/libvirtSnmp.c | 186 +++++++++++++++++++++++++++++++++++------------------ 1 file changed, 123 insertions(+), 63 deletions(-) diff --git a/src/libvirtSnmp.c b/src/libvirtSnmp.c index a9fa185..2bd8f01 100644 --- a/src/libvirtSnmp.c +++ b/src/libvirtSnmp.c @@ -113,6 +113,82 @@ out: return; } + +static int +insertGuest(netsnmp_container *container, virDomainPtr domain) +{ + int ret = 0; + virDomainInfo info; + libvirtGuestTable_rowreq_ctx *row_ctx = NULL; + const char *name = NULL; + unsigned char uuid[16]; + + if (-1 == virDomainGetInfo(domain, &info)) { + printf("Failed to get domain info\n"); + showError(conn); + ret = -1; + goto out; + } + + /* create new row in the container */ + row_ctx = libvirtGuestTable_allocate_rowreq_ctx(NULL); + if (!row_ctx) { + snmp_log(LOG_ERR, "Error creating row"); + ret = -1; + goto out; + } + + /* set the index of the row */ + ret = virDomainGetUUID(domain, uuid); + if (ret) { + snmp_log(LOG_ERR, "Cannot get UUID"); + libvirtGuestTable_release_rowreq_ctx(row_ctx); + ret = -1; + goto out; + } + if (MFD_SUCCESS != libvirtGuestTable_indexes_set(row_ctx, (char*) uuid, + sizeof(uuid))) { + snmp_log(LOG_ERR, "Error setting row index"); + libvirtGuestTable_release_rowreq_ctx(row_ctx); + ret = -1; + goto out; + } + + /* set the data */ + name = virDomainGetName(domain); + if (name) + row_ctx->data.libvirtGuestName = strdup(name); + else + row_ctx->data.libvirtGuestName = strdup(""); + if (!row_ctx->data.libvirtGuestName) { + snmp_log(LOG_ERR, "Not enough memory for domain name '%s'", name); + libvirtGuestTable_release_rowreq_ctx(row_ctx); + ret = -1; + goto out; + } + + row_ctx->data.libvirtGuestState = info.state; + row_ctx->data.libvirtGuestCpuCount = info.nrVirtCpu; + /* convert the memory to MiB */ + row_ctx->data.libvirtGuestMemoryCurrent = info.memory / 1024; + row_ctx->data.libvirtGuestMemoryLimit = info.maxMem / 1024; + row_ctx->data.libvirtGuestCpuTime.high = info.cpuTime >> 32; + row_ctx->data.libvirtGuestCpuTime.low = info.cpuTime & 0xFFFFFFFF; + + row_ctx->data.libvirtGuestRowStatus = ROWSTATUS_ACTIVE; + + ret = CONTAINER_INSERT(container, row_ctx); + if (ret) { + snmp_log(LOG_ERR, "Cannot insert domain '%s' to container", name); + libvirtGuestTable_release_rowreq_ctx(row_ctx); + ret = -1; + goto out; + } + +out: + return ret; +} + /* * Populate libvirtGuestTable into given container. */ @@ -120,11 +196,10 @@ int libvirtSnmpLoadGuests(netsnmp_container *container) { int ret = 0, i, numIds, numActiveDomains; + int numNames, numDefinedDomains; int *idList = NULL; + char **nameList = NULL; virDomainPtr domain = NULL; - virDomainInfo info; - libvirtGuestTable_rowreq_ctx *row_ctx = NULL; - const char *name = NULL; numActiveDomains = virConnectNumOfDomains(conn); if (-1 == numActiveDomains) { @@ -154,8 +229,6 @@ libvirtSnmpLoadGuests(netsnmp_container *container) } for (i = 0 ; i < numIds ; i++) { - unsigned char uuid[16]; - domain = virDomainLookupByID(conn, *(idList + i)); if (NULL == domain) { printf("Failed to lookup domain\n"); @@ -164,74 +237,61 @@ libvirtSnmpLoadGuests(netsnmp_container *container) goto out; } - if (-1 == virDomainGetInfo(domain, &info)) { - printf("Failed to get domain info\n"); - showError(conn); - virDomainFree(domain); - ret = -1; + ret = insertGuest(container, domain); + + virDomainFree(domain); + + if (-1 == ret) goto out; - } + } - /* create new row in the container */ - row_ctx = libvirtGuestTable_allocate_rowreq_ctx(NULL); - if (!row_ctx) { - virDomainFree(domain); - snmp_log(LOG_ERR, "Error creating row"); - ret = -1; - goto out; - } - /* set the index of the row */ - ret = virDomainGetUUID(domain, uuid); - if (ret) { - virDomainFree(domain); - snmp_log(LOG_ERR, "Cannot get UUID"); - libvirtGuestTable_release_rowreq_ctx(row_ctx); - ret = -1; - goto out; - } - if (MFD_SUCCESS != libvirtGuestTable_indexes_set(row_ctx, (char*) uuid, - sizeof(uuid))) { - virDomainFree(domain); - snmp_log(LOG_ERR, "Error setting row index"); - libvirtGuestTable_release_rowreq_ctx(row_ctx); - ret = -1; - goto out; - } + /* Inactive domains */ + numDefinedDomains = virConnectNumOfDefinedDomains(conn); + if (-1 == numDefinedDomains) { + ret = -1; + printf("Failed to get number of defined domains\n"); + showError(conn); + goto out; + } - /* set the data */ - name = virDomainGetName(domain); - if (name) - row_ctx->data.libvirtGuestName = strdup(name); - else - row_ctx->data.libvirtGuestName = strdup(""); - if (!row_ctx->data.libvirtGuestName) { - snmp_log(LOG_ERR, "Not enough memory for domain name '%s'", name); - libvirtGuestTable_release_rowreq_ctx(row_ctx); - ret = -1; - goto out; + nameList = malloc(sizeof(*nameList) * numDefinedDomains); + + if (NULL == nameList) { + ret = -1; + printf("Could not allocate memory for list of defined domains\n"); + goto out_inact; + } + + numNames = virConnectListDefinedDomains(conn, + nameList, + numDefinedDomains); + + if (-1 == numNames) { + ret = -1; + printf("Could not get list of defined domains from hypervisor\n"); + showError(conn); + goto out_inact; + } + + for (i = 0 ; i < numNames ; i++) { + domain = virDomainLookupByName(conn, *(nameList + i)); + if (NULL == domain) { + printf("Failed to lookup domain\n"); + showError(conn); + ret = -1; + goto out_inact; } - row_ctx->data.libvirtGuestState = info.state; - row_ctx->data.libvirtGuestCpuCount = info.nrVirtCpu; - /* convert the memory to MiB */ - row_ctx->data.libvirtGuestMemoryCurrent = info.memory / 1024; - row_ctx->data.libvirtGuestMemoryLimit = info.maxMem / 1024; - row_ctx->data.libvirtGuestCpuTime.high = info.cpuTime >> 32; - row_ctx->data.libvirtGuestCpuTime.low = info.cpuTime & 0xFFFFFFFF; + ret = insertGuest(container, domain); - row_ctx->data.libvirtGuestRowStatus = ROWSTATUS_ACTIVE; virDomainFree(domain); - ret = CONTAINER_INSERT(container, row_ctx); - if (ret) { - snmp_log(LOG_ERR, "Cannot insert domain '%s' to container", name); - libvirtGuestTable_release_rowreq_ctx(row_ctx); - ret = -1; - goto out; - } - + if (-1 == ret) + goto out_inact; } +out_inact: + free(nameList); out: free(idList); return ret; -- 1.7.10.4

2 1

[libvirt] [PATCH] tests: Fix domain-events python test
by Martin Kletzander 16 Oct '12

16 Oct '12

There was a missing method in python implementation of domain-events test and this patch adds that. --- examples/domain-events/events-python/event-test.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/examples/domain-events/events-python/event-test.py b/examples/domain-events/events-python/event-test.py index 813b1c2..2bb5195 100644 --- a/examples/domain-events/events-python/event-test.py +++ b/examples/domain-events/events-python/event-test.py @@ -492,6 +492,9 @@ def myDomainEventPMSuspendCallback(conn, dom, reason, opaque): dom.name(), dom.ID()) def myDomainEventBalloonChangeCallback(conn, dom, utcoffset, actual): print "myDomainEventBalloonChangeCallback: Domain %s(%s) %d" % (dom.name(), dom.ID(), actual) +def myDomainEventPMSuspendDiskCallback(conn, dom, reason, opaque): + print "myDomainEventPMSuspendDiskCallback: Domain %s(%s) system pmsuspend_disk" % ( + dom.name(), dom.ID()) def usage(out=sys.stderr): print >>out, "usage: "+os.path.basename(sys.argv[0])+" [-hdl] [uri]" print >>out, " uri will default to qemu:///system" -- 1.7.12.3

2 2