- Devel - libvirt List Archives

[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

[libvirt] [PATCH 0/3] Introduce QEMUD_CMD_FLAG_PCI_MULTIBUS for -device bus=pci(.0)
by Niels de Vos 03 Feb '11

03 Feb '11

This series introduces a new (fake) flag for the qemu binary. The flag QEMUD_CMD_FLAG_PCI_MULTIBUS is used to mark an architecture to be able to have multiple PCI-busses. When executing qemu, -device should take either a bus-string like "pci" or "pci.0". Where the latter can be used to select the appropriate bus for the PCI-device. Currently libvirt breaks starting qemu-system-$ARCH as the -device option always sets bus=pci.0. On most architectures, there is no PCI-Multibus support in qemu. This series enables libvirt to select the architectures that support PCI-multibus and sets the flag for x86_64 and i686 only. Reference: - https://bugzilla.redhat.com/show_bug.cgi?id=667345 Kind regards, Niels -- Niels de Vos (3): qemuBuildDeviceAddressStr() checks for QEMUD_CMD_FLAG_PCI_MULTIBUS Set QEMUD_CMD_FLAG_PCI_MULTIBUS for x86_64 and i686 architectures Add myself to AUTHORS AUTHORS | 1 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 67 ++++++++++++++++++++++++++--------------- src/qemu/qemu_command.h | 18 +++++++---- src/qemu/qemu_hotplug.c | 5 ++- 5 files changed, 59 insertions(+), 33 deletions(-) -- 1.7.3.5

3 10

[libvirt] [PATCH] 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. --- 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 | 27 ++++++++++++++++++++++++--- src/qemu/qemu_monitor_json.h | 3 ++- tools/virsh.c | 7 ++++++- 8 files changed, 53 insertions(+), 11 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 038b862..dc1d9cb 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 23e0db0..bb50264 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -10226,8 +10226,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); @@ -10253,10 +10254,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..9ac12f8 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -2457,20 +2457,41 @@ 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 (!hmp) { + *reply_str = virJSONValueToString(reply); + } 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; + } + *reply_str = strdup(data); + } + if (!(*reply_str)) goto cleanup; 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 4533d38..59d3de5 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -9932,6 +9932,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} }; @@ -9942,6 +9943,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; @@ -9956,7 +9958,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); -- 1.7.4

2 2

[libvirt] [PATCH] Add check for binary existing in machine type probe
by Daniel P. Berrange 02 Feb '11

02 Feb '11

When probing machine types if the QEMU binary does not exist we get a hard to diagnose error, due to the execve() in the child failing error: internal error Child process exited with status 1. Add an explicit check so that we get error: Cannot find QEMU binary /usr/libexec/qem3u-kvm: No such file or directory * src/qemu/qemu_capabilities.c: Check for QEMU binary --- src/qemu/qemu_capabilities.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 37a97aa..08c46be 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -172,6 +172,15 @@ qemuCapsProbeMachineTypes(const char *binary, int ret = -1; virCommandPtr cmd; + /* Make sure the binary we are about to try exec'ing exists. + * Technically we could catch the exec() failure, but that's + * in a sub-process so it's hard to feed back a useful error. + */ + if (access(binary, X_OK) < 0) { + virReportSystemError(errno, _("Cannot find QEMU binary %s"), binary); + return -1; + } + cmd = virCommandNewArgList(binary, "-M", "?", NULL); virCommandAddEnvPassCommon(cmd); virCommandSetOutputBuffer(cmd, &output); -- 1.7.3.5

2 1

[libvirt] [PATCH] Add a little more debugging for async events
by Daniel P. Berrange 02 Feb '11

02 Feb '11

To make it easier to investigate problems with async event delivery, add two more debugging lines * daemon/remote.c: Debug when an event is queued for dispatch * src/remote/remote_driver.c: Debug when an event is received for processing --- daemon/remote.c | 2 ++ src/remote/remote_driver.c | 1 + 2 files changed, 3 insertions(+), 0 deletions(-) diff --git a/daemon/remote.c b/daemon/remote.c index aa6a1a4..f8f6ffa 100644 --- a/daemon/remote.c +++ b/daemon/remote.c @@ -5670,6 +5670,8 @@ remoteDispatchDomainEventSend (struct qemud_client *client, msg->async = 1; msg->bufferLength = len; msg->bufferOffset = 0; + + VIR_DEBUG("Queue event %d %d", procnr, msg->bufferLength); qemudClientMessageQueuePush(&client->tx, msg); qemudUpdateClientEvent(client); diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index 347b844..64af91c 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -9865,6 +9865,7 @@ processCallDispatch(virConnectPtr conn, struct private_data *priv, break; case REMOTE_MESSAGE: /* Async notifications */ + VIR_DEBUG("Dispatch event %d %d", hdr.proc, priv->bufferLength); rv = processCallDispatchMessage(conn, priv, flags & REMOTE_CALL_IN_OPEN, &hdr, &xdr); break; -- 1.7.3.5

2 1

[libvirt] [PATCH] docs: more on qemu locking patterns
by Eric Blake 02 Feb '11

02 Feb '11

* src/qemu/THREADS.txt: Improve documentation. --- I'm trying to make sure we don't have any qemu locking gotchas, given that I've had a bug report of a qemu monitor callback being able to result in a domaing being unreferenced while in the middle of another command. As a first shot, I found that our documentation needed some help. Also, I have a question. I updated the documentation to match existing code: qemuDomainObjExitMonitor() - - Acquires the virDomainObjPtr lock - Releases the qemuMonitorObjPtr lock + - Acquires the virDomainObjPtr lock But I'm wondering if that was correct, or if the code should instead be swapped to match the original ordering in the documentation. src/qemu/THREADS.txt | 100 ++++++++++++++++++++++++++++++++++++++----------- 1 files changed, 77 insertions(+), 23 deletions(-) diff --git a/src/qemu/THREADS.txt b/src/qemu/THREADS.txt index 1af1b83..1e0b5ab 100644 --- a/src/qemu/THREADS.txt +++ b/src/qemu/THREADS.txt @@ -4,7 +4,7 @@ This document describes how thread safety is ensured throughout the QEMU driver. The criteria for this model are: - - Objects must never be exclusively locked for any pro-longed time + - Objects must never be exclusively locked for any prolonged time - Code which sleeps must be able to time out after suitable period - Must be safe against dispatch asynchronous events from monitor @@ -36,11 +36,11 @@ There are a number of locks on various objects Once the lock is held, you must *NOT* try to lock the driver. You must release all virDomainObjPtr locks before locking the driver, or deadlock - *WILL* occurr. + *WILL* occur. If the lock needs to be dropped & then re-acquired for a short period of time, the reference count must be incremented first using virDomainObjRef(). - If the reference count is incremented in this way, it is not neccessary + If the reference count is incremented in this way, it is not necessary to have the driver locked when re-acquiring the dropped locked, since the reference count prevents it being freed by another thread. @@ -51,15 +51,20 @@ There are a number of locks on various objects * qemuMonitorPrivatePtr: Job condition - Since virDomainObjPtr lock must not be held during sleeps, the job condition - provides additional protection for code making updates. + Since virDomainObjPtr lock must not be held during sleeps, the job + condition provides additional protection for code making updates. - Immediately after acquiring the virDomainObjPtr lock, any method which intends - to update state, must acquire the job condition. The virDomainObjPtr lock - is released while blocking on this condition variable. Once the job condition - is acquired a method can safely release the virDomainObjPtr lock whenever it - hits a piece of code which may sleep/wait, and re-acquire it after the sleep/ - wait. + Immediately after acquiring the virDomainObjPtr lock, any method + which intends to update state must acquire the job condition. The + virDomainObjPtr lock is released while blocking on this condition + variable. Once the job condition is acquired, a method can safely + release the virDomainObjPtr lock whenever it hits a piece of code + which may sleep/wait, and re-acquire it after the sleep/wait. + + Since the virDomainObjPtr lock was dropped while waiting for the + job condition, it is possible that the domain is no longer active + when the condition is finally obtained. The monitor lock is only + safe to grab after verifying that the domain is still active. * qemuMonitorPtr: Mutex @@ -110,13 +115,15 @@ To acquire the job mutex qemuDomainObjBeginJob() (if driver is unlocked) - Increments ref count on virDomainObjPtr - - Wait qemuDomainObjPrivate condition 'jobActive != 0' using virDomainObjPtr mutex + - Wait qemuDomainObjPrivate condition 'jobActive != 0' using + virDomainObjPtr mutex - Sets jobActive to 1 qemuDomainObjBeginJobWithDriver() (if driver needs to be locked) - Unlocks driver - Increments ref count on virDomainObjPtr - - Wait qemuDomainObjPrivate condition 'jobActive != 0' using virDomainObjPtr mutex + - Wait qemuDomainObjPrivate condition 'jobActive != 0' using + virDomainObjPtr mutex - Sets jobActive to 1 - Unlocks virDomainObjPtr - Locks driver @@ -140,10 +147,10 @@ To acquire the QEMU monitor lock - Releases the virDomainObjPtr lock qemuDomainObjExitMonitor() - - Acquires the virDomainObjPtr lock - Releases the qemuMonitorObjPtr lock + - Acquires the virDomainObjPtr lock - NB: caller must take care to drop the driver lock if neccessary + NB: caller must take care to drop the driver lock if necessary To acquire the QEMU monitor lock with the driver lock held @@ -154,11 +161,25 @@ To acquire the QEMU monitor lock with the driver lock held - Releases the driver lock qemuDomainObjExitMonitorWithDriver() + - Releases the qemuMonitorObjPtr lock - Acquires the driver lock - Acquires the virDomainObjPtr lock - - Releases the qemuMonitorObjPtr lock - NB: caller must take care to drop the driver lock if neccessary + NB: caller must take care to drop the driver lock if necessary + + +To keep a domain alive while waiting on a remote command, starting +with the driver lock held + + qemuDomainObjEnterRemoterWithDriver() + - Increments ref count on virDomainObjPtr + - Releases the virDomainObjPtr lock + - Releases the driver lock + + qemuDomainObjExitRemoteWithDriver() + - Acquires the driver lock + - Acquires the virDomainObjPtr lock + - Decrements ref count on virDomainObjPtr Design patterns @@ -236,9 +257,11 @@ Design patterns ...do prep work... - qemuDomainObjEnterMonitor(obj); - qemuMonitorXXXX(priv->mon); - qemuDomainObjExitMonitor(obj); + if (virDomainObjIsActive(vm)) { + qemuDomainObjEnterMonitor(obj); + qemuMonitorXXXX(priv->mon); + qemuDomainObjExitMonitor(obj); + } ...do final work... @@ -261,9 +284,11 @@ Design patterns ...do prep work... - qemuDomainObjEnterMonitorWithDriver(driver, obj); - qemuMonitorXXXX(priv->mon); - qemuDomainObjExitMonitorWithDriver(driver, obj); + if (virDomainObjIsActive(vm)) { + qemuDomainObjEnterMonitorWithDriver(driver, obj); + qemuMonitorXXXX(priv->mon); + qemuDomainObjExitMonitorWithDriver(driver, obj); + } ...do final work... @@ -272,6 +297,35 @@ Design patterns qemuDriverUnlock(driver); + * Coordinating with a remote server for migraion + + virDomainObjPtr obj; + qemuDomainObjPrivatePtr priv; + + qemuDriverLock(driver); + obj = virDomainFindByUUID(driver->domains, dom->uuid); + + qemuDomainObjBeginJobWithDriver(obj); + + ...do prep work... + + if (virDomainObjIsActive(vm)) { + qemuDomainObjEnterRemoteWithDriver(driver, obj); + ...communicate with remote... + qemuDomainObjExitRemoteWithDriver(driver, obj); + /* domain may have been stopped while we were talking to remote */ + if (!virDomainObjIsActive(vm)) { + qemuReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("guest unexpectedly quit")); + } + } + + ...do final work... + + qemuDomainObjEndJob(obj); + virDomainObjUnlock(obj); + qemuDriverUnlock(driver); + Summary ------- -- 1.7.3.5

2 2

[libvirt] Strange nodedev-dumpxml ??
by arnaud.champion＠devatom.fr 02 Feb '11

02 Feb '11

?Hi, I have maybe a strange thing on a nodedev-dumpxml virsh result : virsh # nodedev-dumpxml block_sr0 <device> <name>block_sr0</name> <parent>scsi_0_0_1_0</parent> <capability type='storage'> <block>/dev/sr0</block> <bus>scsi</bus> <drive_type>cdrom</drive_type> <model>DVD RW DRU-190S</model> <vendor>SONY</vendor> <capability type='removable'> <media_available>0</media_available> <media_size>0</media_size> </capability> </capability> </device> I think (note I'm not sure), the capabilty type removable should be in the device element, like this : virsh # nodedev-dumpxml block_sr0 <device> <name>block_sr0</name> <parent>scsi_0_0_1_0</parent> <capability type='storage'> <block>/dev/sr0</block> <bus>scsi</bus> <drive_type>cdrom</drive_type> <model>DVD RW DRU-190S</model> <vendor>SONY</vendor> </capability> <capability type='removable'> <media_available>0</media_available> <media_size>0</media_size> </capability> </device> Let me know if I'm wrong. Regards, Arnaud

1 0

[libvirt] Node devices capability xml
by arnaud.champion＠devatom.fr 02 Feb '11

02 Feb '11

?Hi, I'm looking for informations about node devices capibility xml (not driver capabilities), and there's nothing on libvirt.org, can anyone can point me to find the infos ? regards, Arnaud

1 0

[libvirt] nodedev-list and qemu
by arnaud.champion＠devatom.fr 02 Feb '11

02 Feb '11

?Hi, I've just installed libvirt 0.8.7 on my fedora x86_64 14 test host. It seems that the function virNodeNumOfDevices is no more supported by the qemu driver. Is that true ? or I'm wrong anywhere ? Regards, Arnaud

2 2

[libvirt] Connecting with a remote libvirt
by Marcela Castro León 02 Feb '11

02 Feb '11

Hello i'm trying to connect with a remote libvirt. The option I selected was tcp because it's a development environment and a secure and isolated network, I've configured listen_tcp = 1 tcp_port = "16509" in libvirtd.conf at the destition. I've tried to connect to host "santacruz" from a remote host "aoniken" and locally but pn both cases I've got: REMOTE marcela@aoniken:~$ virsh -c qemu+tcp://santacruz:16509 list error: unable to connect to libvirtd at 'santacruz': Connection refused error: failed to connect to the hypervisor LOCALLY radic@santacruz:/etc/libvirt$ virsh -c qemu+tcp://santacruz:16509 list error: unable to connect to libvirtd at 'santacruz': Connection refused error: failed to connect to the hypervisor I've try to use ssh but i've got an error two on both cases. REMOTE (SSH) marcela@aoniken:~$ virsh -c qemu+ssh://radic@santacruz list radic@santacruz's password: error: internal error no QEMU URI path given, try qemu:///system error: failed to connect to the hypervisor marcela@aoniken:~$ radic@santacruz:/etc/libvirt$ virsh -c qemu+ssh://radic@santacruz list radic@santacruz's password: error: internal error no QEMU URI path given, try qemu:///system error: failed to connect to the hypervisor Can you help me? Thank you

4 4

[libvirt] [PATCH] docs: renamed hudson project link to jenkins, matching project rename
by Justin Clift 02 Feb '11

02 Feb '11

--- docs/apps.html.in | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/apps.html.in b/docs/apps.html.in index 2516844..d8bc265 100644 --- a/docs/apps.html.in +++ b/docs/apps.html.in @@ -132,10 +132,10 @@ </dl> <dl> - <dt><a href="http://wiki.hudson-ci.org/display/HUDSON/Libvirt+Slaves+Plugin">Hudson</a></dt> + <dt><a href="http://wiki.jenkins-ci.org/display/JENKINS/Libvirt+Slaves+Plugin">Jenkins</a></dt> <dd> - This plugin for Hudson adds a way to control guest domains hosted - on Xen or QEMU/KVM. You configure a Hudson Slave, + This plugin for Jenkins adds a way to control guest domains hosted + on Xen or QEMU/KVM. You configure a Jenkins Slave, selecting the guest domain and hypervisor. When you need to build a job on a specific Slave, its guest domain is started, then the job is run. When the build process is finished, the guest domain is shut -- 1.7.3.5

2 3

[libvirt] Logging VM startup and shutdown
by Ed Swierk 01 Feb '11

01 Feb '11

When troubleshooting a libvirt system the most obvious question I face is when a given VM started and stopped. The only way I've been able to obtain this information is by setting log_level = 1 in libvirtd.conf, which turns on the firehose, generating an enormous amount of output. I then have to sift through the logs for magic strings like "virExecWithHook" to see when a VM started, and "Shutting down VM" to see when a VM stopped. Is there no concise message that indicates a VM starting up? "virExecWithHook" doesn't exactly jump out. I'd consider starting up and shutting down a VM to be at least worth an info-level message in the log. I monkeyed with the log_filters setting but I couldn't figure out how to filter those two strings. Any hints? --Ed

3 2

[libvirt] libvirt 0.8.7 LOCALSTATEDIR ubuntu patch
by Philipp Schmid 01 Feb '11

01 Feb '11

Hi, I'm using ubuntu for our libvirt/kvm host server and needed IPv6 connectivity, so I started to update the latest ubuntu libvirt package (0.8.5) to 0.8.7. I got all but one ubuntu specific patch to apply. The patch moves the ebiptables script from /tmp to "LOCALSTATEDIR" /lib/libvirt. I renamed LOCAL_STATE_DIR in the patch below to LOCALSTATEDIR, because this seems to have changed between 0.8.5 and 0.8.7, but I still get the following compile error. Since this is my first contact with the libvirt source or build system, I would be happy for any pointers on how to fix this and make LOCALSTATEDIR visible to nwfilter/nwfilter_ebiptables_driver.c. Best regards, Philipp Schmid PS: if anyone is interested in working (at least for me with kvm) packages (without the mentioned patch), you can grab them here: http://www.schmidp.com/public/libvirt_0.8.7_ubuntu_natty/ -Wall -Wformat -Wformat-security -Wmissing-prototypes -Wnested-externs -Wpointer-arith -Wextra -Wshadow -Wcast-align -Wwrite-strings -Waggregate-return -Wstrict-prototypes -Winline -Wredundant-decls -Wno-sign-compare -Wlogical-op -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fasynchronous-unwind-tables -fdiagnostics-show-option -DIN_LIBVIRT -I../src/conf -g -O2 -g -O2 -c nwfilter/nwfilter_ebiptables_driver.c -fPIC -DPIC -o .libs/libvirt_driver_nwfilter_la-nwfilter_ebiptables_driver.o nwfilter/nwfilter_ebiptables_driver.c: In function 'ebiptablesWriteToTempFile': nwfilter/nwfilter_ebiptables_driver.c:2444:23: error: 'LOCALSTATEDIR' undeclared (first use in this function) nwfilter/nwfilter_ebiptables_driver.c:2444:23: note: each undeclared identifier is reported only once for each function it appears in nwfilter/nwfilter_ebiptables_driver.c:2444:37: error: expected ',' or ';' before string constant make[4]: *** [libvirt_driver_nwfilter_la-nwfilter_ebiptables_driver.lo] Error 1 make[4]: Leaving directory `/tmp/buildd/libvirt-0.8.7/src' make[3]: *** [all] Error 2 make[3]: Leaving directory `/tmp/buildd/libvirt-0.8.7/src' make[2]: *** [all-recursive] Error 1 make[2]: Leaving directory `/tmp/buildd/libvirt-0.8.7' make[1]: *** [all] Error 2 make[1]: Leaving directory `/tmp/buildd/libvirt-0.8.7' make: *** [debian/stamp-makefile-build] Error 2 ######### Author: Jamie Strandboge <jamie(a)canonical.com> Description: move ebiptables script from /tmp to /var/lib/libvirt Forwarded: yes Index: libvirt-0.8.7/src/nwfilter/nwfilter_ebiptables_driver.c =================================================================== --- libvirt-0.8.7.orig/src/nwfilter/nwfilter_ebiptables_driver.c 2011-01-30 20:57:49.132301999 +0000 +++ libvirt-0.8.7/src/nwfilter/nwfilter_ebiptables_driver.c 2011-01-30 20:58:35.762302000 +0000 @@ -2441,7 +2441,7 @@ */ static char * ebiptablesWriteToTempFile(const char *string) { - char filename[] = "/tmp/virtdXXXXXX"; + char filename[] = LOCAL_STATE_DIR "/lib/libvirt/virtdXXXXXX"; int len; char *filnam; virBuffer buf = VIR_BUFFER_INITIALIZER;

3 2

[libvirt] macvtap: fix variable in debugging output
by Stefan Berger 01 Feb '11

01 Feb '11

This patch fixes a variable in the debugging output. Signed-off-by: Stefan Berger <stefanb(a)linux.vnet.ibm.com> --- src/util/macvtap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Index: libvirt-acl/src/util/macvtap.c =================================================================== --- libvirt-acl.orig/src/util/macvtap.c +++ libvirt-acl/src/util/macvtap.c @@ -1349,7 +1349,7 @@ doPortProfileOp8021Qbg(const char *ifnam break; default: macvtapError(VIR_ERR_INTERNAL_ERROR, - _("operation type %d not supported"), op); + _("operation type %d not supported"), virtPortOp); rc = 1; goto err_exit; }

2 2

Re: [libvirt] Rudimentary (basic) s390x architecture functions for libvirt
by Patrick Siegl 01 Feb '11

01 Feb '11

A few more details for s390x: why you can't set param '-S' and need '-chardev vc,id=cons -device virtio-serial-s390 -device virtconsole,chardev=cons' on s390x: 1) qemu-system-s390x -M s390-virtio -vnc :0 -enable-kvm -smp 1 -m 1024 -k de -kernel /boot/image-2.6.34-tue01 -initrd /boot/initrd-2.6.34-tue01_GUEST -drive file=/data/sle11.img -append "root=/dev/vda1 rw" => screenshot 1 2) qemu-system-s390x -S -M s390-virtio -vnc :0 -enable-kvm -smp 1 -m 1024 -k de -kernel /boot/image-2.6.34-tue01 -initrd /boot/initrd-2.6.34-tue01_GUEST -drive file=/data/sle11.img -append "root=/dev/vda1 rw" => screenshot 2 3) qemu-system-s390x -M s390-virtio -vnc :0 -enable-kvm -smp 1 -m 1024 -k de -kernel /boot/image-2.6.34-tue01 -initrd /boot/initrd-2.6.34-tue01_GUEST -drive file=/data/sle11.img -append "root=/dev/vda1 rw" -chardev vc,id=cons -device virtio-serial-s390 -device virtconsole,chardev=cons => RUN 4) qemu-system-s390x -S -M s390-virtio -vnc :0 -enable-kvm -smp 1 -m 1024 -k de -kernel /boot/image-2.6.34-tue01 -initrd /boot/initrd-2.6.34-tue01_GUEST -drive file=/data/sle11.img -append "root=/dev/vda1 rw" -chardev vc,id=cons -device virtio-serial-s390 -device virtconsole,chardev=cons => screenshot 4 Regards, Patrick Siegl Am 25.01.2011 19:37, schrieb Justin Clift: > On 26/01/2011, at 5:11 AM, Patrick Siegl wrote: >> <screenshot_paramS.png> > Interestingly, I'm guessing that's the QEMU "monitor console". > > Apparently it's a key feature of QEMU, but it's not something I've personally had > anything to do with (yet). :) > > Just mentioning, in case it's a useful thought. The guys on the mailing list > have a lot deeper knowledge about this stuff that me. ;) > > Regards and best wishes, > > Justin Clift

2 5

[libvirt] [PATCH] storage: Allow to delete device mapper disk partition
by Osier Yang 01 Feb '11

01 Feb '11

From: root <root(a)amd-1352-8-2.englab.nay.redhat.com> The name convention of device mapper disk is different, and 'parted' can't be used to delete a device mapper disk partition. e.g. [root@amd-1352-8-2 ~]# virsh vol-list --pool osier Name Path ----------------------------------------- 3600a0b80005ad1d7000093604cae912fp1 /dev/mapper/3600a0b80005ad1d7000093604cae912fp1 [root@amd-1352-8-2 ~]# parted /dev/mapper/3600a0b80005adb0b0000ab2d4cae9254 rm p1 Error: Expecting a partition number. This patch introduces 'dmsetup' to fix it. Changes: - New function 'virIsDeviceMapperDevice' in src/utils/utils.c - Delete 'is_dm_device' in src/storage/parthelper.c, use 'virIsDeviceMapperDevice' instead. - Requires device-mapper for 'with-storage-disk' in libvirt.spec.in - Check 'dmsetup' in configure.ac for 'with-storage-disk' - Changes on src/Makefile.am to link against libdevmapper - New entry for 'virIsDeviceMapperDevice' in src/libvirt_private.syms e.g. [root@amd-1352- ~]# virsh vol-list --pool osier Name Path ----------------------------------------- 3600a0b80005ad1d7000093604cae912fp1 /dev/mapper/3600a0b80005ad1d7000093604cae912fp1 [root@amd-1352- ~]# virsh vol-delete /dev/mapper/3600a0b80005ad1d7000093604cae912fp1 Vol /dev/mapper/3600a0b80005ad1d7000093604cae912fp1 deleted [root@amd-1352- ~]# virsh vol-list --pool osier Name Path ----------------------------------------- --- configure.ac | 21 ++++++++++++++ libvirt.spec.in | 1 + src/Makefile.am | 7 ++-- src/libvirt_private.syms | 1 + src/storage/parthelper.c | 14 +-------- src/storage/storage_backend_disk.c | 54 ++++++++++++++++++++++------------- src/util/util.c | 14 +++++++++ src/util/util.h | 1 + 8 files changed, 76 insertions(+), 37 deletions(-) diff --git a/configure.ac b/configure.ac index f310a5e..b101faa 100644 --- a/configure.ac +++ b/configure.ac @@ -1705,6 +1705,8 @@ LIBPARTED_CFLAGS= LIBPARTED_LIBS= if test "$with_storage_disk" = "yes" || test "$with_storage_disk" = "check"; then AC_PATH_PROG([PARTED], [parted], [], [$PATH:/sbin:/usr/sbin]) + AC_PATH_PROG([DMSETUP], [dmsetup], [], [$PATH:/sbin:/usr/sbin]) + if test -z "$PARTED" ; then with_storage_disk=no PARTED_FOUND=no @@ -1712,9 +1714,17 @@ if test "$with_storage_disk" = "yes" || test "$with_storage_disk" = "check"; the PARTED_FOUND=yes fi + if test -z "$DMSETUP" ; then + with_storage_disk=no + DMSETUP_FOUND=no + else + DMSETUP_FOUND=yes + fi + if test "$with_storage_disk" != "no" && test "x$PKG_CONFIG" != "x" ; then PKG_CHECK_MODULES(LIBPARTED, libparted >= $PARTED_REQUIRED, [], [PARTED_FOUND=no]) fi + if test "$PARTED_FOUND" = "no"; then # RHEL-5 vintage parted is missing pkg-config files save_LIBS="$LIBS" @@ -1738,9 +1748,20 @@ if test "$with_storage_disk" = "yes" || test "$with_storage_disk" = "check"; the with_storage_disk=yes fi + if test "$DMSETUP_FOUND" = "no"; then + if test "$with_storage_disk" = "yes" ; then + AC_MSG_ERROR([We need dmsetup for disk storage driver]) + else + with_storage_disk=no + fi + else + with_storage_disk=yes + fi + if test "$with_storage_disk" = "yes"; then AC_DEFINE_UNQUOTED([WITH_STORAGE_DISK], 1, [whether Disk backend for storage driver is enabled]) AC_DEFINE_UNQUOTED([PARTED],["$PARTED"], [Location or name of the parted program]) + AC_DEFINE_UNQUOTED([DMSETUP],["$DMSETUP"], [Location or name of the dmsetup program]) fi fi AM_CONDITIONAL([WITH_STORAGE_DISK], [test "$with_storage_disk" = "yes"]) diff --git a/libvirt.spec.in b/libvirt.spec.in index 0a2d10e..27e6a99 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -279,6 +279,7 @@ Requires: iscsi-initiator-utils %if %{with_storage_disk} # For disk driver Requires: parted +Requires: device-mapper %endif %if %{with_storage_mpath} # For multipath support diff --git a/src/Makefile.am b/src/Makefile.am index f8b8434..3680074 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -437,9 +437,9 @@ libvirt_la_BUILT_LIBADD = libvirt_util.la libvirt_util_la_SOURCES = \ $(UTIL_SOURCES) libvirt_util_la_CFLAGS = $(CAPNG_CFLAGS) $(YAJL_CFLAGS) $(LIBNL_CFLAGS) \ - $(AM_CFLAGS) $(AUDIT_CFLAGS) + $(AM_CFLAGS) $(AUDIT_CFLAGS) $(DEVMAPPER_LIBS) libvirt_util_la_LIBADD = $(CAPNG_LIBS) $(YAJL_LIBS) $(LIBNL_LIBS) \ - $(LIB_PTHREAD) $(AUDIT_LIBS) + $(LIB_PTHREAD) $(AUDIT_LIBS) $(DEVMAPPER_LIBS) noinst_LTLIBRARIES += libvirt_conf.la @@ -1154,7 +1154,6 @@ libvirt_parthelper_SOURCES = $(STORAGE_HELPER_DISK_SOURCES) libvirt_parthelper_LDFLAGS = $(WARN_LDFLAGS) $(AM_LDFLAGS) libvirt_parthelper_LDADD = \ $(LIBPARTED_LIBS) \ - $(DEVMAPPER_LIBS) \ libvirt_util.la \ ../gnulib/lib/libgnu.la @@ -1179,7 +1178,7 @@ libvirt_lxc_SOURCES = \ libvirt_lxc_LDFLAGS = $(WARN_CFLAGS) $(AM_LDFLAGS) libvirt_lxc_LDADD = $(CAPNG_LIBS) $(YAJL_LIBS) \ $(LIBXML_LIBS) $(NUMACTL_LIBS) $(LIB_PTHREAD) \ - $(LIBNL_LIBS) $(AUDIT_LIBS) ../gnulib/lib/libgnu.la + $(LIBNL_LIBS) $(AUDIT_LIBS) $(DEVMAPPER_LIBS) ../gnulib/lib/libgnu.la libvirt_lxc_CFLAGS = \ $(LIBPARTED_CFLAGS) \ $(NUMACTL_CFLAGS) \ diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 3a5aec9..9d974e8 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -900,6 +900,7 @@ virStrcpy; virStrncpy; virTimestamp; virVasprintf; +virIsDeviceMapperDevice; # uuid.h diff --git a/src/storage/parthelper.c b/src/storage/parthelper.c index 6ef413d..1f662fb 100644 --- a/src/storage/parthelper.c +++ b/src/storage/parthelper.c @@ -59,18 +59,6 @@ enum diskCommand { DISK_GEOMETRY }; -static int -is_dm_device(const char *devname) -{ - struct stat buf; - - if (devname && !stat(devname, &buf) && dm_is_dm_major(major(buf.st_rdev))) { - return 1; - } - - return 0; -} - int main(int argc, char **argv) { PedDevice *dev; @@ -96,7 +84,7 @@ int main(int argc, char **argv) } path = argv[1]; - if (is_dm_device(path)) { + if (virIsDeviceMapperDevice(path)) { partsep = "p"; canonical_path = strdup(path); if (canonical_path == NULL) { diff --git a/src/storage/storage_backend_disk.c b/src/storage/storage_backend_disk.c index c7ade6b..45e43c4 100644 --- a/src/storage/storage_backend_disk.c +++ b/src/storage/storage_backend_disk.c @@ -660,34 +660,48 @@ virStorageBackendDiskDeleteVol(virConnectPtr conn ATTRIBUTE_UNUSED, srcname = basename(pool->def->source.devices[0].path); DEBUG("devname=%s, srcname=%s", devname, srcname); - if (!STRPREFIX(devname, srcname)) { + if (!virIsDeviceMapperDevice(devpath) && !STRPREFIX(devname, srcname)) { virStorageReportError(VIR_ERR_INTERNAL_ERROR, _("Volume path '%s' did not start with parent " "pool source device name."), devname); goto cleanup; } - part_num = devname + strlen(srcname); + if (!virIsDeviceMapperDevice(devpath)) { + part_num = devname + strlen(srcname); - if (*part_num == 0) { - virStorageReportError(VIR_ERR_INTERNAL_ERROR, - _("cannot parse partition number from target " - "'%s'"), devname); - goto cleanup; - } - - /* eg parted /dev/sda rm 2 */ - const char *prog[] = { - PARTED, - pool->def->source.devices[0].path, - "rm", - "--script", - part_num, - NULL, - }; + if (*part_num == 0) { + virStorageReportError(VIR_ERR_INTERNAL_ERROR, + _("cannot parse partition number from target " + "'%s'"), devname); + goto cleanup; + } - if (virRun(prog, NULL) < 0) - goto cleanup; + /* eg parted /dev/sda rm 2 */ + const char *prog[] = { + PARTED, + pool->def->source.devices[0].path, + "rm", + "--script", + part_num, + NULL, + }; + + if (virRun(prog, NULL) < 0) + goto cleanup; + } else { + const char *prog[] = { + DMSETUP, + "remove", + "-f", + devpath, + NULL, + NULL, + }; + + if (virRun(prog, NULL) < 0) + goto cleanup; + } rc = 0; cleanup: diff --git a/src/util/util.c b/src/util/util.c index ee04ca9..6e2f966 100644 --- a/src/util/util.c +++ b/src/util/util.c @@ -45,6 +45,7 @@ #include <string.h> #include <signal.h> #include <termios.h> +#include <libdevmapper.h> #include "c-ctype.h" #ifdef HAVE_PATHS_H @@ -3100,3 +3101,16 @@ virTimestamp(void) return timestamp; } + +int +virIsDeviceMapperDevice(const char *devname) +{ + struct stat buf; + + if (devname && !stat(devname, &buf) && dm_is_dm_major(major(buf.st_rdev))) { + return 1; + } + + return 0; +} + diff --git a/src/util/util.h b/src/util/util.h index 8373038..dd683ea 100644 --- a/src/util/util.h +++ b/src/util/util.h @@ -296,4 +296,5 @@ int virBuildPathInternal(char **path, ...) ATTRIBUTE_SENTINEL; char *virTimestamp(void); +int virIsDeviceMapperDevice(const char *devname); #endif /* __VIR_UTIL_H__ */ -- 1.7.1

3 4

[libvirt] NIC model in domain description
by arnaud.champion＠devatom.fr 01 Feb '11

01 Feb '11

?Hi, in domain xml description, for the NIC interfaces, there is a model that specify the model of NIC exposed to the domain. I've understand that the model is driver dependent. Is there a way to know what is the driver default model ? Regards, Arnaud

1 0