- Devel - libvirt List Archives

[libvirt] [PATCHv5 0/9] smartcard round 5
by Eric Blake 04 Feb '11

04 Feb '11

Next round. The first 5 patches were previously ack'd in round 4: https://www.redhat.com/archives/libvir-list/2011-February/msg00026.html However, I heavily rewrote patch 3 to support later spicevmc patches, as well as tweaked patch 1 and 5 to avoid the need for memory rounding. Patch 6 is mostly a port of a patch that has already seen use in RHEL 6.0 which adds the use of -chardev spicevmc,name=vdagent as a means of communicating with the guest using messages across the main SPICE graphics channel, but tweaked to be a bit more robust. Patch 7 was an experiment to add a new vdagent channel type instead of reusing virtio for the spicevmc channel; I think it failed, but wanted to at least post it in case I was on the right track after all. Patch 8 undoes 7. It won't hurt my feelings if you skip those. Patch 9 therefore immediately follows patch 6, and marries the two concepts to create a smartcard passthrough device that uses a new smartcard channel of the SPICE server. Again, this entire series depends on a feature that has been proposed for upstream qemu, but not accepted yet; while it has probably stabilized to some degree, it may have minor tweaks. Conversely, I feel that the XML representation (the most important part to get right, since it becomes our API contract) is accurate and flexible enough to cover whatever minor modifiations qemu throws at us as followup patches to qemu_command.c. Daniel P. Berrange (1): spicevmc: support new qemu chardev Eric Blake (8): smartcard: add XML support for <smartcard> device smartcard: add domain conf support smartcard: check for qemu capability smartcard: enable SELinux support smartcard: turn on qemu support RFC: spicevmc: call out vdagent as a channel target Revert "RFC: spicevmc: call out vdagent as a channel target" smartcard: add spicevmc support cfg.mk | 1 + docs/formatdomain.html.in | 120 ++++++- docs/schemas/domain.rng | 70 ++++- src/conf/domain_conf.c | 395 +++++++++++++++++++- src/conf/domain_conf.h | 64 +++- src/libvirt_private.syms | 6 + src/qemu/qemu_capabilities.c | 17 +- src/qemu/qemu_capabilities.h | 3 + src/qemu/qemu_command.c | 154 +++++++- src/security/security_selinux.c | 76 ++++ tests/qemuhelpdata/qemu-kvm-0.12.1.2-rhel61 | 229 +++++++++++ tests/qemuhelpdata/qemu-kvm-0.12.1.2-rhel61-device | 74 ++++ tests/qemuhelptest.c | 43 +++ .../qemuxml2argv-channel-spicevmc.args | 9 + .../qemuxml2argv-channel-spicevmc.xml | 34 ++ .../qemuxml2argv-smartcard-controller.args | 7 + .../qemuxml2argv-smartcard-controller.xml | 19 + .../qemuxml2argv-smartcard-host-certificates.args | 8 + .../qemuxml2argv-smartcard-host-certificates.xml | 20 + .../qemuxml2argv-smartcard-host.args | 7 + .../qemuxml2argv-smartcard-host.xml | 16 + ...emuxml2argv-smartcard-passthrough-spicevmc.args | 7 + ...qemuxml2argv-smartcard-passthrough-spicevmc.xml | 16 + .../qemuxml2argv-smartcard-passthrough-tcp.args | 8 + .../qemuxml2argv-smartcard-passthrough-tcp.xml | 19 + tests/qemuxml2argvtest.c | 20 + 26 files changed, 1410 insertions(+), 32 deletions(-) create mode 100644 tests/qemuhelpdata/qemu-kvm-0.12.1.2-rhel61 create mode 100644 tests/qemuhelpdata/qemu-kvm-0.12.1.2-rhel61-device create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-channel-spicevmc.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-channel-spicevmc.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-smartcard-controller.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-smartcard-controller.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-smartcard-host-certificates.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-smartcard-host-certificates.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-smartcard-host.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-smartcard-host.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-smartcard-passthrough-spicevmc.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-smartcard-passthrough-spicevmc.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-smartcard-passthrough-tcp.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-smartcard-passthrough-tcp.xml -- 1.7.4

2 10

[libvirt] [PATCH] docs/index.html.in: update QEMU url
by Alon Levy 04 Feb '11

04 Feb '11

--- docs/index.html.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/docs/index.html.in b/docs/index.html.in index 501f3e3..30cc9d7 100644 --- a/docs/index.html.in +++ b/docs/index.html.in @@ -38,7 +38,7 @@ on Linux and Solaris hosts. </li> <li> - The <a href="http://bellard.org/qemu/">QEMU</a> emulator + The <a href="http://wiki.qemu.org/Index.html">QEMU</a> emulator </li> <li> The <a href="http://kvm.qumranet.com/kvmwiki">KVM</a> Linux hypervisor -- 1.7.4

2 1

[libvirt] [PATCH 0/2] Support booting from hostdev devices
by Jiri Denemark 03 Feb '11

03 Feb '11

These are a follow-up patches for per-device boot which extend current support for booting from disks and NICs to assigned host devices. Jiri Denemark (2): Support booting from hostdev devices qemu: Support booting from hostdev PCI devices docs/formatdomain.html.in | 14 ++++++++++++-- docs/schemas/domain.rng | 3 +++ src/conf/domain_conf.c | 18 +++++++++++++++--- src/conf/domain_conf.h | 1 + src/qemu/qemu_capabilities.c | 5 ++++- src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 17 +++++++++++++++++ 7 files changed, 53 insertions(+), 6 deletions(-) -- 1.7.4

2 6

[libvirt] [PATCH v2] qemu: Add shortcut for HMP pass through
by Jiri Denemark 03 Feb '11

03 Feb '11

Currently users who want to use virDomainQemuMonitorCommand() API or it's virsh equivalent has to use the same protocol as libvirt uses for communication to qemu. Since the protocol is QMP with current qemu and HMP much more usable for humans, one ends up typing something like the following: virsh qemu-monitor-command DOM \ '{"execute":"human-monitor-command","arguments":{"command-line":"info kvm"}}' which is not a very convenient way of debugging qemu. This patch introduces --hmp option to qemu-monitor-command, which says that the provided command is in HMP. If libvirt uses QMP to talk with qemu, the command will automatically be converted into QMP. So the example above is simplified to just virsh qemu-monitor-command --hmp DOM "info kvm" Also the result is converted from {"return":"kvm support: enabled\r\n"} to just plain HMP: kvm support: enabled If libvirt talks to qemu in HMP, --hmp flag is obviously a noop. --- Notes: Version 2: - document --hmp in virsh man page - add missing virReportOOMError() in qemuMonitorArbitraryCommand() include/libvirt/libvirt-qemu.h | 5 +++++ src/internal.h | 1 + src/qemu/qemu_driver.c | 7 +++++-- src/qemu/qemu_monitor.c | 9 ++++++--- src/qemu/qemu_monitor.h | 5 ++++- src/qemu/qemu_monitor_json.c | 30 ++++++++++++++++++++++++++---- src/qemu/qemu_monitor_json.h | 3 ++- tools/virsh.c | 7 ++++++- tools/virsh.pod | 7 +++++-- 9 files changed, 60 insertions(+), 14 deletions(-) diff --git a/include/libvirt/libvirt-qemu.h b/include/libvirt/libvirt-qemu.h index 9c191c7..9257c2f 100644 --- a/include/libvirt/libvirt-qemu.h +++ b/include/libvirt/libvirt-qemu.h @@ -20,6 +20,11 @@ extern "C" { # endif +enum { + VIR_DOMAIN_QEMU_MONITOR_COMMAND_DEFAULT = 0, + VIR_DOMAIN_QEMU_MONITOR_COMMAND_HMP = (1 << 0), /* cmd is in HMP */ +} virDomainQemuMonitorCommandFlags; + int virDomainQemuMonitorCommand(virDomainPtr domain, const char *cmd, char **result, unsigned int flags); diff --git a/src/internal.h b/src/internal.h index 11ba45f..e263684 100644 --- a/src/internal.h +++ b/src/internal.h @@ -38,6 +38,7 @@ # define N_(str) str # include "libvirt/libvirt.h" +# include "libvirt/libvirt-qemu.h" # include "libvirt/virterror.h" # include "libvirt_internal.h" diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index a3a68b1..cce115a 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -10237,8 +10237,9 @@ static int qemuDomainMonitorCommand(virDomainPtr domain, const char *cmd, virDomainObjPtr vm = NULL; int ret = -1; qemuDomainObjPrivatePtr priv; + bool hmp; - virCheckFlags(0, -1); + virCheckFlags(VIR_DOMAIN_QEMU_MONITOR_COMMAND_HMP, -1); qemuDriverLock(driver); vm = virDomainFindByUUID(&driver->domains, domain->uuid); @@ -10264,10 +10265,12 @@ static int qemuDomainMonitorCommand(virDomainPtr domain, const char *cmd, priv->monitor_warned = 1; } + hmp = !!(flags & VIR_DOMAIN_QEMU_MONITOR_COMMAND_HMP); + if (qemuDomainObjBeginJobWithDriver(driver, vm) < 0) goto cleanup; qemuDomainObjEnterMonitorWithDriver(driver, vm); - ret = qemuMonitorArbitraryCommand(priv->mon, cmd, result); + ret = qemuMonitorArbitraryCommand(priv->mon, cmd, result, hmp); qemuDomainObjExitMonitorWithDriver(driver, vm); if (qemuDomainObjEndJob(vm) == 0) { vm = NULL; diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index 0c14277..fdb6b79 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -2007,14 +2007,17 @@ int qemuMonitorDeleteSnapshot(qemuMonitorPtr mon, const char *name) return ret; } -int qemuMonitorArbitraryCommand(qemuMonitorPtr mon, const char *cmd, char **reply) +int qemuMonitorArbitraryCommand(qemuMonitorPtr mon, + const char *cmd, + char **reply, + bool hmp) { int ret; - DEBUG("mon=%p, cmd=%s, reply=%p", mon, cmd, reply); + DEBUG("mon=%p, cmd=%s, reply=%p, hmp=%d", mon, cmd, reply, hmp); if (mon->json) - ret = qemuMonitorJSONArbitraryCommand(mon, cmd, reply); + ret = qemuMonitorJSONArbitraryCommand(mon, cmd, reply, hmp); else ret = qemuMonitorTextArbitraryCommand(mon, cmd, reply); return ret; diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h index 92c550b..0ea1330 100644 --- a/src/qemu/qemu_monitor.h +++ b/src/qemu/qemu_monitor.h @@ -397,7 +397,10 @@ int qemuMonitorCreateSnapshot(qemuMonitorPtr mon, const char *name); int qemuMonitorLoadSnapshot(qemuMonitorPtr mon, const char *name); int qemuMonitorDeleteSnapshot(qemuMonitorPtr mon, const char *name); -int qemuMonitorArbitraryCommand(qemuMonitorPtr mon, const char *cmd, char **reply); +int qemuMonitorArbitraryCommand(qemuMonitorPtr mon, + const char *cmd, + char **reply, + bool hmp); /** * When running two dd process and using <> redirection, we need a diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index ca06e7e..d5e8d37 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -2457,22 +2457,44 @@ int qemuMonitorJSONDeleteSnapshot(qemuMonitorPtr mon, const char *name) int qemuMonitorJSONArbitraryCommand(qemuMonitorPtr mon, const char *cmd_str, - char **reply_str) + char **reply_str, + bool hmp) { virJSONValuePtr cmd = NULL; virJSONValuePtr reply = NULL; int ret = -1; - cmd = virJSONValueFromString(cmd_str); + if (!hmp) { + cmd = virJSONValueFromString(cmd_str); + } else { + cmd = qemuMonitorJSONMakeCommand("human-monitor-command", + "s:command-line", cmd_str, + NULL); + } + if (!cmd) return -1; if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0) goto cleanup; - *reply_str = virJSONValueToString(reply); - if (!(*reply_str)) + if (!hmp) { + if (!(*reply_str = virJSONValueToString(reply))) + goto cleanup; + } else if (qemuMonitorJSONCheckError(cmd, reply)) { goto cleanup; + } else { + const char *data; + if (!(data = virJSONValueObjectGetString(reply, "return"))) { + qemuReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("human monitor command was missing return data")); + goto cleanup; + } + if (!(*reply_str = strdup(data))) { + virReportOOMError(); + goto cleanup; + } + } ret = 0; diff --git a/src/qemu/qemu_monitor_json.h b/src/qemu/qemu_monitor_json.h index 4c47f10..4ae472a 100644 --- a/src/qemu/qemu_monitor_json.h +++ b/src/qemu/qemu_monitor_json.h @@ -209,6 +209,7 @@ int qemuMonitorJSONDeleteSnapshot(qemuMonitorPtr mon, const char *name); int qemuMonitorJSONArbitraryCommand(qemuMonitorPtr mon, const char *cmd_str, - char **reply_str); + char **reply_str, + bool hmp); #endif /* QEMU_MONITOR_JSON_H */ diff --git a/tools/virsh.c b/tools/virsh.c index 59d099e..1f820e8 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -10176,6 +10176,7 @@ static const vshCmdInfo info_qemu_monitor_command[] = { static const vshCmdOptDef opts_qemu_monitor_command[] = { {"domain", VSH_OT_DATA, VSH_OFLAG_REQ, N_("domain name, id or uuid")}, {"cmd", VSH_OT_DATA, VSH_OFLAG_REQ, N_("command")}, + {"hmp", VSH_OT_BOOL, 0, N_("command is in human monitor protocol")}, {NULL, 0, 0, NULL} }; @@ -10186,6 +10187,7 @@ cmdQemuMonitorCommand(vshControl *ctl, const vshCmd *cmd) int ret = FALSE; char *monitor_cmd; char *result = NULL; + unsigned int flags = 0; if (!vshConnectionUsability(ctl, ctl->conn)) goto cleanup; @@ -10200,7 +10202,10 @@ cmdQemuMonitorCommand(vshControl *ctl, const vshCmd *cmd) goto cleanup; } - if (virDomainQemuMonitorCommand(dom, monitor_cmd, &result, 0) < 0) + if (vshCommandOptBool(cmd, "hmp")) + flags |= VIR_DOMAIN_QEMU_MONITOR_COMMAND_HMP; + + if (virDomainQemuMonitorCommand(dom, monitor_cmd, &result, flags) < 0) goto cleanup; printf("%s\n", result); diff --git a/tools/virsh.pod b/tools/virsh.pod index d6a16f2..bfaa67e 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -1253,10 +1253,13 @@ problems to the libvirt developers; the reports will be ignored. =over 4 -=item B<qemu-monitor-command> I<domain> I<command> +=item B<qemu-monitor-command> I<domain> I<command> optional I<--hmp> Send an arbitrary monitor command I<command> to domain I<domain> through the -qemu monitor. The results of the command will be printed on stdout. +qemu monitor. The results of the command will be printed on stdout. If +I<--hmp> is passed, the command is considered to be a human monitor command +and libvirt will automatically convert it into QMP if needed. In that case +the result will also be converted back from QMP. =back -- 1.7.4

2 2

[libvirt] [PATCH] macvtap.c: add parenthesis for similar expressions
by Davidlohr Bueso 03 Feb '11

03 Feb '11

It wouldn't hurt to add some parenthesis in the following two similar expression for better readability. --- src/util/macvtap.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/util/macvtap.c b/src/util/macvtap.c index 09d7b78..92147ab 100644 --- a/src/util/macvtap.c +++ b/src/util/macvtap.c @@ -1048,8 +1048,8 @@ doPortProfileOpSetLink(bool nltarget_kernel, memcpy(ifla_vf_mac.mac, macaddr, 6); - if (!nla_put(nl_msg, IFLA_VF_MAC, sizeof(ifla_vf_mac), - &ifla_vf_mac) < 0) + if ((!nla_put(nl_msg, IFLA_VF_MAC, sizeof(ifla_vf_mac), + &ifla_vf_mac)) < 0) goto buffer_too_small; } @@ -1060,8 +1060,8 @@ doPortProfileOpSetLink(bool nltarget_kernel, .qos = 0, }; - if (!nla_put(nl_msg, IFLA_VF_VLAN, sizeof(ifla_vf_vlan), - &ifla_vf_vlan) < 0) + if ((!nla_put(nl_msg, IFLA_VF_VLAN, sizeof(ifla_vf_vlan), + &ifla_vf_vlan)) < 0) goto buffer_too_small; } -- 1.7.1

3 4

[libvirt] [PATCHv4 0/5] smartcard, round 4
by Eric Blake 03 Feb '11

03 Feb '11

This should address all of the comment from round 3: https://www.redhat.com/archives/libvir-list/2011-January/msg01034.html In particular, there is no longer a device tied to host mode (qemu uses NSS, which connects to the nss daemon rather than to a physical device); the certificate entries for host-certificates mode are no longer treated as paths, but as opaque names used within the database; the database defaults to /etc/pki/nssdb/ if not otherwise specified (hmm, I guess I haven't added support for $HOME/.pki/nssdb for non-root users yet, but wanted to get this out for review now due to a request from Alon). More notes on each patch. Eric Blake (5): smartcard: add XML support for <smartcard> device smartcard: add domain conf support smartcard: check for qemu capability smartcard: enable SELinux support smartcard: turn on qemu support cfg.mk | 1 + docs/formatdomain.html.in | 95 +++++- docs/schemas/domain.rng | 66 ++++ src/conf/domain_conf.c | 366 +++++++++++++++++++- src/conf/domain_conf.h | 52 +++- src/libvirt_private.syms | 4 + src/qemu/qemu_capabilities.c | 2 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 95 +++++- src/security/security_selinux.c | 76 ++++ .../qemuxml2argv-smartcard-controller.args | 7 + .../qemuxml2argv-smartcard-controller.xml | 19 + .../qemuxml2argv-smartcard-host-certificates.args | 8 + .../qemuxml2argv-smartcard-host-certificates.xml | 20 + .../qemuxml2argv-smartcard-host.args | 7 + .../qemuxml2argv-smartcard-host.xml | 16 + .../qemuxml2argv-smartcard-passthrough-tcp.args | 7 + .../qemuxml2argv-smartcard-passthrough-tcp.xml | 19 + tests/qemuxml2argvtest.c | 13 + 19 files changed, 859 insertions(+), 15 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-smartcard-controller.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-smartcard-controller.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-smartcard-host-certificates.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-smartcard-host-certificates.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-smartcard-host.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-smartcard-host.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-smartcard-passthrough-tcp.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-smartcard-passthrough-tcp.xml -- 1.7.3.5

2 11

[libvirt] [PATCH 0/2] fix some bugs in libvirtd
by Wen Congyang 03 Feb '11

03 Feb '11

Steps to reproduce this bug: 1. service libvirtd start 2. virsh start <domain> 3. kill -STOP $(cat /var/run/libvirt/qemu/<domain>.pid) 4. service libvirtd restart 5. kill -9 $(cat /var/run/libvirt/qemu/<domain>.pid) Then libvirtd will core dump or be in deadlock state. Make sure that json is built into libvirt and the version of qemu is newer than 0.13.0. Wen Congyang (2): avoid vm to be deleted if qemuConnectMonitor failed avoid closing monitor twice src/qemu/qemu_driver.c | 31 ++++++++++++++++++++++--------- src/qemu/qemu_monitor.c | 10 ++++++++++ 2 files changed, 32 insertions(+), 9 deletions(-)

4 21

[libvirt] [PATCH] Fix conflicts with glibc globals
by Davidlohr Bueso 03 Feb '11

03 Feb '11

When compiling libvirt with GCC 3.4.6 the following warning is being triggered quite a lot: util/memory.h:60: warning: declaration of 'remove' shadows a global declaration /usr/include/stdio.h:175: warning: shadowed declaration is here Fix this by renaming the parameter to 'toremove'. --- src/util/memory.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/util/memory.h b/src/util/memory.h index 750a6b0..66b4c42 100644 --- a/src/util/memory.h +++ b/src/util/memory.h @@ -57,7 +57,7 @@ int virExpandN(void *ptrptr, size_t size, size_t *count, size_t add) int virResizeN(void *ptrptr, size_t size, size_t *alloc, size_t count, size_t desired) ATTRIBUTE_RETURN_CHECK ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(3); -void virShrinkN(void *ptrptr, size_t size, size_t *count, size_t remove) +void virShrinkN(void *ptrptr, size_t size, size_t *count, size_t toremove) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(3); int virAllocVar(void *ptrptr, size_t struct_size, -- 1.7.1

2 1

[libvirt] [PATCH] Don't sleep in poll() if there is existing SASL decoded data
by Daniel P. Berrange 03 Feb '11

03 Feb '11

In the SASL codepath we typically read far more data off the wire than we immediately need. When using a connection from a single thread this isn't a problem, since only our reply will be pending (or an event we can handle directly). When using a connection from multiple threads though, we may read the data from replies from other threads. If those replies occur after our own reply, they'll not be processed. The other thread will then go into poll() and wait for its reply which has already been received and decoded. The solution is to set poll() timeout to 0 if there is pending SASL data. * src/remote/remote_driver.c: Don't sleep in poll() if SASL data exists --- src/remote/remote_driver.c | 16 +++++++++++++++- 1 files changed, 15 insertions(+), 1 deletions(-) diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index b52b780..452ab38 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -10222,6 +10222,14 @@ remoteIOEventLoop(virConnectPtr conn, #ifdef HAVE_PTHREAD_SIGMASK sigset_t oldmask, blockedsigs; #endif + int timeout = -1; + + /* If we have existing SASL decoded data we + * don't want to sleep in the poll(), just + * check if any other FDs are also ready + */ + if (priv->saslDecoded) + timeout = 0; fds[0].events = fds[0].revents = 0; fds[1].events = fds[1].revents = 0; @@ -10257,7 +10265,7 @@ remoteIOEventLoop(virConnectPtr conn, #endif repoll: - ret = poll(fds, ARRAY_CARDINALITY(fds), -1); + ret = poll(fds, ARRAY_CARDINALITY(fds), timeout); if (ret < 0 && errno == EAGAIN) goto repoll; @@ -10267,6 +10275,12 @@ remoteIOEventLoop(virConnectPtr conn, remoteDriverLock(priv); + /* If we have existing SASL decoded data, pretend + * the socket became readable so we consume it + */ + if (priv->saslDecoded) + fds[0].revents |= POLLIN; + if (fds[1].revents) { ssize_t s; DEBUG0("Woken up from poll by other thread"); -- 1.7.3.5

3 3

[libvirt] New sub-project libvirt-snmp
by Michal Prívozník 03 Feb '11

03 Feb '11

Hi, I'd like to let you know and review the new project libvirt-snmp. It's aim is to provide snmp functionality to libvirt. Right now it supports only VM lifecycle stuff (start, suspend, destroy, ...) and gathering info. The sources are available here: git clone git://libvirt.org/libvirt-snmp.git to install please see INSTALL file, some examples are in src/README.txt We can also create an .rpm (see libvirt-snmp.spec.in) but thing is in order to run libvirt-snmp subagent, snmpd.conf needs to be edited first. Is there a way I can solve this? I mean overwriting it is ugly. Or should i leave it just in the installation docs? Any suggestions appreciated. Michal Privoznik

2 1