- Devel - libvirt List Archives

[libvirt] [PATCH] qemu: avoid dereferencing a NULL pointer
by ajia＠redhat.com 21 Sep '11

21 Sep '11

From: Alex Jia <ajia(a)redhat.com> * src/qemu/qemu_process.c: Taking if (qemuDomainObjEndJob(driver, obj) == 0) true branch then 'obj' is NULL, virDomainObjIsActive(obj) and virDomainObjUnref(obj) will dereference NULL pointer. Signed-off-by: Alex Jia <ajia(a)redhat.com> --- src/qemu/qemu_process.c | 32 +++++++++++++++++--------------- 1 files changed, 17 insertions(+), 15 deletions(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index bd49b21..9fdf846 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -2661,22 +2661,24 @@ error: if (qemuDomainObjEndJob(driver, obj) == 0) obj = NULL; - if (!virDomainObjIsActive(obj)) { - if (virDomainObjUnref(obj) > 0) - virDomainObjUnlock(obj); - qemuDriverUnlock(driver); - return; - } + if (obj) { + if (!virDomainObjIsActive(obj)) { + if (virDomainObjUnref(obj) > 0) + virDomainObjUnlock(obj); + qemuDriverUnlock(driver); + return; + } - if (virDomainObjUnref(obj) > 0) { - /* We can't get the monitor back, so must kill the VM - * to remove danger of it ending up running twice if - * user tries to start it again later */ - qemuProcessStop(driver, obj, 0, VIR_DOMAIN_SHUTOFF_FAILED); - if (!obj->persistent) - virDomainRemoveInactive(&driver->domains, obj); - else - virDomainObjUnlock(obj); + if (virDomainObjUnref(obj) > 0) { + /* We can't get the monitor back, so must kill the VM + * to remove danger of it ending up running twice if + * user tries to start it again later */ + qemuProcessStop(driver, obj, 0, VIR_DOMAIN_SHUTOFF_FAILED); + if (!obj->persistent) + virDomainRemoveInactive(&driver->domains, obj); + else + virDomainObjUnlock(obj); + } } qemuDriverUnlock(driver); -- 1.7.1

1 0

[libvirt] virsh qemu-monitor-command broken with 0.9.5
by Jason Krieg 21 Sep '11

21 Sep '11

Hi, the virsh qemu-monitor-command is not working with libvirt 0.9.5 with git commit 85d2810823a31634b12145d6c196930b40425370 *opts_seen moved into the != VSH_OT_ARGV if statement so now opts_seen is only set if not VSH_OT_ARGV see attached fix Regards Jason

4 5

[libvirt] [PATCH] qemu: Avoid loop of fake reboots
by Jiri Denemark 21 Sep '11

21 Sep '11

Once virDomainReboot is called for a domain, guest OS initiated shutdown would always result in reboot instead of shutdown. Only virDomainShutdown would actually shutd such domain down. That's because we forgot to reset fakeReboot flag once we asked the domain to reboot. --- src/qemu/qemu_process.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 3baaa19..bd49b21 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -445,6 +445,7 @@ qemuProcessHandleShutdown(qemuMonitorPtr mon ATTRIBUTE_UNUSED, priv->gotShutdown = true; if (priv->fakeReboot) { + priv->fakeReboot = false; virDomainObjRef(vm); virThread th; if (virThreadCreate(&th, -- 1.7.6.1

2 2

[libvirt] [PATCH v2] qemu: Fix shutdown regression with buggy qemu
by Jiri Denemark 21 Sep '11

21 Sep '11

The commit that prevents disk corruption on domain shutdown (96fc4784177ecb70357518fa863442455e45ad0e) causes regression with QEMU 0.14.* and 0.15.* because of a regression bug in QEMU that was fixed only recently in QEMU git. The affected versions of QEMU do not quit on SIGTERM if started with -no-shutdown, which we use to implement fake reboot. Since -no-shutdown tells QEMU not to quit automatically on guest shutdown, domains started using the affected QEMU cannot be shutdown properly and stay in a paused state. This patch disables fake reboot feature on such QEMU by not using -no-shutdown, which makes shutdown work as expected. However, virDomainReboot will not work in this case and it will report "Requested operation is not valid: Reboot is not supported with this QEMU binary". --- src/qemu/qemu_capabilities.c | 8 ++++++++ src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 2 +- src/qemu/qemu_driver.c | 6 ++++++ 4 files changed, 16 insertions(+), 1 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 36f47a9..850d46e 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -136,6 +136,7 @@ VIR_ENUM_IMPL(qemuCaps, QEMU_CAPS_LAST, "pci-ohci", "usb-redir", "usb-hub", + "no-shutdown", ); struct qemu_feature_flags { @@ -1008,6 +1009,13 @@ qemuCapsComputeCmdFlags(const char *help, qemuCapsSet(flags, QEMU_CAPS_VHOST_NET); } + /* Do not use -no-shutdown if qemu doesn't support it or SIGTERM handling + * is most likely buggy when used with -no-shutdown (which applies for qemu + * 0.14.* and 0.15.*) + */ + if (strstr(help, "-no-shutdown") && (version < 14000 || version > 15999)) + qemuCapsSet(flags, QEMU_CAPS_NO_SHUTDOWN); + /* * Handling of -incoming arg with varying features * -incoming tcp (kvm >= 79, qemu >= 0.10.0) diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 96b7a3b..74d3ab2 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -110,6 +110,7 @@ enum qemuCapsFlags { QEMU_CAPS_PCI_OHCI = 71, /* -device pci-ohci */ QEMU_CAPS_USB_REDIR = 72, /* -device usb-redir */ QEMU_CAPS_USB_HUB = 73, /* -device usb-hub */ + QEMU_CAPS_NO_SHUTDOWN = 74, /* usable -no-shutdown */ QEMU_CAPS_LAST, /* this must always be the last item */ }; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index ee4b52b..0adc56a 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -3574,7 +3574,7 @@ qemuBuildCommandLine(virConnectPtr conn, * when QEMU stops. If we use no-shutdown, then we can * watch for this event and do a soft/warm reboot. */ - if (monitor_json) + if (monitor_json && qemuCapsGet(qemuCaps, QEMU_CAPS_NO_SHUTDOWN)) virCommandAddArg(cmd, "-no-shutdown"); if (!(def->features & (1 << VIR_DOMAIN_FEATURE_ACPI))) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index f4ee4c3..67c43ab 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -1557,6 +1557,12 @@ static int qemuDomainReboot(virDomainPtr dom, unsigned int flags) { priv = vm->privateData; if (qemuCapsGet(priv->qemuCaps, QEMU_CAPS_MONITOR_JSON)) { + if (!qemuCapsGet(priv->qemuCaps, QEMU_CAPS_NO_SHUTDOWN)) { + qemuReportError(VIR_ERR_OPERATION_INVALID, "%s", + _("Reboot is not supported with this QEMU binary")); + goto cleanup; + } + if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_MODIFY) < 0) goto cleanup; -- 1.7.6.1

2 2

[libvirt] [PATCH] Fix synchronous reading of stream data
by Daniel P. Berrange 21 Sep '11

21 Sep '11

From: "Daniel P. Berrange" <berrange(a)redhat.com> commit 984840a2c292402926ad100aeea33f8859ff31a9 removed the notification of waiting calls when VIR_NET_CONTINUE messages arrive. This was to fix the case of a virStreamAbort() call being prematurely notified of completion. The problem is that sometimes there are dummy calls from a virStreamRecv() call waiting that *do* need to be notified. These dummy calls should have a status VIR_NET_CONTINUE. So re-add the notification upon VIR_NET_CONTINUE, but only if the waiter also has a status of VIR_NET_CONTINUE. * src/rpc/virnetclient.c: Notify waiting call if stream data arrives * src/rpc/virnetclientstream.c: Mark dummy stream read packet with status VIR_NET_CONTINUE --- src/rpc/virnetclient.c | 10 ++++++++++ src/rpc/virnetclientstream.c | 1 + 2 files changed, 11 insertions(+), 0 deletions(-) diff --git a/src/rpc/virnetclient.c b/src/rpc/virnetclient.c index 055361d..b2c528a 100644 --- a/src/rpc/virnetclient.c +++ b/src/rpc/virnetclient.c @@ -627,6 +627,15 @@ static int virNetClientCallDispatchStream(virNetClientPtr client) case VIR_NET_CONTINUE: { if (virNetClientStreamQueuePacket(st, &client->msg) < 0) return -1; + + if (thecall && thecall->expectReply) { + if (thecall->msg->header.status == VIR_NET_CONTINUE) { + VIR_DEBUG("Got a synchronous confirm"); + thecall->mode = VIR_NET_CLIENT_MODE_COMPLETE; + } else { + VIR_DEBUG("Not completing call with status %d", thecall->msg->header.status); + } + } return 0; } @@ -1189,6 +1198,7 @@ int virNetClientSend(virNetClientPtr client, int ret = -1; if (expectReply && + (msg->bufferLength != 0) && (msg->header.status == VIR_NET_CONTINUE)) { virNetError(VIR_ERR_INTERNAL_ERROR, "%s", _("Attempt to send an asynchronous message with a synchronous reply")); diff --git a/src/rpc/virnetclientstream.c b/src/rpc/virnetclientstream.c index 2cc84d4..4cd0295 100644 --- a/src/rpc/virnetclientstream.c +++ b/src/rpc/virnetclientstream.c @@ -400,6 +400,7 @@ int virNetClientStreamRecvPacket(virNetClientStreamPtr st, msg->header.type = VIR_NET_STREAM; msg->header.serial = st->serial; msg->header.proc = st->proc; + msg->header.status = VIR_NET_CONTINUE; VIR_DEBUG("Dummy packet to wait for stream data"); virMutexUnlock(&st->lock); -- 1.7.6.2

3 2

[libvirt] [test-API][PATCH v2] Add test case update_devflag.py for update device flag
by Nan Zhang 21 Sep '11

21 Sep '11

--- repos/domain/update_devflag.py | 163 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 163 insertions(+), 0 deletions(-) create mode 100644 repos/domain/update_devflag.py diff --git a/repos/domain/update_devflag.py b/repos/domain/update_devflag.py new file mode 100644 index 0000000..287f2a5 --- /dev/null +++ b/repos/domain/update_devflag.py @@ -0,0 +1,163 @@ +#!/usr/bin/evn python +"""Update virtual device to guest from an XML file +""" + +__author__ = 'Nan Zhang: nzhang(a)redhat.com' +__date__ = 'Fri Sep 2, 2011' +__version__ = '0.1.0' +__credits__ = 'Copyright (C) 2011 Red Hat, Inc.' +__all__ = ['usage', 'update_devflag'] + +import os +import re +import sys +import commands +from xml.dom import minidom + +def append_path(path): + """Append root path of package""" + if path in sys.path: + pass + else: + sys.path.append(path) + +pwd = os.getcwd() +result = re.search('(.*)libvirt-test-API', pwd) +append_path(result.group(0)) + +from lib import connectAPI +from lib import domainAPI +from utils.Python import utils +from utils.Python import xmlbuilder +from exception import LibvirtAPI + +def usage(): + print '''usage: mandatory arguments: + guestname + devtype + ''' + +def check_params(params): + """Verify inputing parameter dictionary""" + logger = params['logger'] + keys = ['guestname', 'devtype'] + for key in keys: + if key not in params: + logger.error("%s is required" %key) + usage() + return 1 + return 0 + +def create_image(params, img_name, img_size): + """Create an image file""" + logger = params['logger'] + stat, ret = commands.getstatusoutput("dd if=/dev/zero of=%s bs=1 \ + count=1 seek=%s" % (img_name, img_size)) + if stat == 0: + logger.debug("create image result:\n%s" % ret) + return True + else: + return False + +def check_updated_device(params, guestname, domobj, srcfile): + """Check if the device is updated""" + logger = params['logger'] + xmlobj = domobj.get_xml_desc(guestname) + domxml = minidom.parseString(xmlobj) + + for diskTag in domxml.getElementsByTagName("source"): + if diskTag.parentNode.getAttribute("device") == 'cdrom': + upfile = diskTag.getAttribute("file") + elif diskTag.parentNode.getAttribute('device') == 'floppy': + upfile = diskTag.getAttribute("file") + + if upfile == srcfile: + return False, upfile + else: + return True, upfile + +def update_devflag(params): + """Update virtual device to a domain from xml""" + + # Initiate and check parameters + params_check_result = check_params(params) + if params_check_result: + return 1 + logger = params['logger'] + guestname = params['guestname'] + devtype = params['devtype'] + if devtype == 'cdrom': + xmlargs = {} + xmlargs['guestname'] = guestname + xmlargs['guesttype'] = 'kvm' + xmlargs['hdmodel'] = 'ide' + xmlargs['bootcd'] = '/var/lib/libvirt/boot/cdrom.img' + srcfile = xmlargs['bootcd'] + create_image(params, srcfile, '100M') + elif devtype == 'floppy': + xmlargs = {} + xmlargs['guestname'] = guestname + xmlargs['floppysource'] = '/var/lib/libvirt/boot/floppy.img' + srcfile = xmlargs['floppysource'] + create_image(params, srcfile, '2M') + else: + srcfile = None + logger.error("Wrong device type was specified.") + return 1 + + if not params.has_key('flag'): + flag = domainAPI.VIR_DOMAIN_AFFECT_CONFIG + + # Connect to local hypervisor connection URI + util = utils.Utils() + uri = util.get_uri('127.0.0.1') + conn = connectAPI.ConnectAPI() + virconn = conn.open(uri) + + caps = conn.get_caps() + logger.debug(caps) + + # Generate device XML for updating + domobj = domainAPI.DomainAPI(virconn) + newxmlobj = xmlbuilder.XmlBuilder() + + if devtype == 'cdrom': + newdevxml = newxmlobj.build_cdrom(xmlargs) + elif devtype == 'floppy': + newdevxml = newxmlobj.build_floppy(xmlargs) + + logger.debug("block device xml desc:\n%s" %newdevxml) + + try: + try: + domobj.update_device_flag(guestname, newdevxml, flag) + res, upfile = check_updated_device(params, guestname, \ + domobj, srcfile) + if res: + logger.info("success to update '%s' device: %s\n" % \ + (devtype, upfile)) + else: + logger.error("fail to update '%s' device: %s\n" % \ + (devtype, upfile)) + except LibvirtAPI, e: + logger.error("API error message: %s, error code is %s" % + (e.response()['message'], e.response()['code'])) + conn.close() + logger.info("closed hypervisor connection") + return 1 + finally: + conn.close() + logger.info("closed hypervisor connection") + + return 0 + +def update_devflag_clean(params): + """Clean testing environment""" + logger = params['logger'] + + if params['devtype'] == 'cdrom': + os.unlink('/var/lib/libvirt/boot/cdrom.img') + elif params['devtype'] == 'floppy': + os.unlink('/var/lib/libvirt/boot/floppy.img') + else: + logger.debug("image file was not found.") -- 1.7.4.4

2 2

[libvirt] [PATCH] qemu: Fix shutdown regression
by Jiri Denemark 21 Sep '11

21 Sep '11

The commit that prevents disk corruption on domain shutdown (96fc4784177ecb70357518fa863442455e45ad0e) causes regression with QEMU 0.14.* and 0.15.* because of a regression bug in QEMU that was fixed only recently in QEMU git. With affected QEMU binaries, domains cannot be shutdown properly and stay in a paused state. This patch tries to avoid this by sending SIGKILL to 0.1[45].* QEMU processes. Though we wait a bit more between sending SIGTERM and SIGKILL to reduce the possibility of virtual disk corruption. --- src/qemu/qemu_capabilities.c | 7 +++++++ src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_process.c | 19 +++++++++++++------ 3 files changed, 21 insertions(+), 6 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 36f47a9..823c500 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -136,6 +136,7 @@ VIR_ENUM_IMPL(qemuCaps, QEMU_CAPS_LAST, "pci-ohci", "usb-redir", "usb-hub", + "no-shutdown-bug", ); struct qemu_feature_flags { @@ -1049,6 +1050,12 @@ qemuCapsComputeCmdFlags(const char *help, if (version >= 13000) qemuCapsSet(flags, QEMU_CAPS_PCI_MULTIFUNCTION); + + /* QEMU version 0.14.* and 0.15.* are known not to handle SIGTERM + * properly when started with -no-shutdown + */ + if (version >= 14000 && version <= 15999) + qemuCapsSet(flags, QEMU_CAPS_NO_SHUTDOWN_BUG); } /* We parse the output of 'qemu -help' to get the QEMU diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 96b7a3b..53d5ace 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -110,6 +110,7 @@ enum qemuCapsFlags { QEMU_CAPS_PCI_OHCI = 71, /* -device pci-ohci */ QEMU_CAPS_USB_REDIR = 72, /* -device usb-redir */ QEMU_CAPS_USB_HUB = 73, /* -device usb-hub */ + QEMU_CAPS_NO_SHUTDOWN_BUG = 74, /* -no-shutdown doesn't exit on SIGTERM */ QEMU_CAPS_LAST, /* this must always be the last item */ }; diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 3baaa19..3311699 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -434,6 +434,7 @@ qemuProcessHandleShutdown(qemuMonitorPtr mon ATTRIBUTE_UNUSED, virDomainObjPtr vm) { qemuDomainObjPrivatePtr priv = vm->privateData; + bool gracefully = true; VIR_DEBUG("vm=%p", vm); virDomainObjLock(vm); @@ -443,6 +444,12 @@ qemuProcessHandleShutdown(qemuMonitorPtr mon ATTRIBUTE_UNUSED, goto cleanup; } + if (qemuCapsGet(priv->qemuCaps, QEMU_CAPS_NO_SHUTDOWN_BUG)) { + VIR_DEBUG("Emulator is likely affected by -no-shutdown bug;" + " we will not avoid sending SIGKILL to it"); + gracefully = false; + } + priv->gotShutdown = true; if (priv->fakeReboot) { virDomainObjRef(vm); @@ -452,12 +459,12 @@ qemuProcessHandleShutdown(qemuMonitorPtr mon ATTRIBUTE_UNUSED, qemuProcessFakeReboot, vm) < 0) { VIR_ERROR(_("Failed to create reboot thread, killing domain")); - qemuProcessKill(vm, true); + qemuProcessKill(vm, gracefully); if (virDomainObjUnref(vm) == 0) vm = NULL; } } else { - qemuProcessKill(vm, true); + qemuProcessKill(vm, gracefully); } cleanup: @@ -3227,15 +3234,15 @@ void qemuProcessKill(virDomainObjPtr vm, bool gracefully) } /* This loop sends SIGTERM, then waits a few iterations - * (1.6 seconds) to see if it dies. If still alive then + * (3 seconds) to see if it dies. If still alive then * it does SIGKILL, and waits a few more iterations (1.6 * seconds more) to confirm that it has really gone. */ - for (i = 0 ; i < 15 ; i++) { + for (i = 0 ; i < 23 ; i++) { int signum; if (i == 0) signum = SIGTERM; - else if (i == 8) + else if (i == 15) signum = SIGKILL; else signum = 0; /* Just check for existence */ @@ -3249,7 +3256,7 @@ void qemuProcessKill(virDomainObjPtr vm, bool gracefully) break; } - if (i == 0 && gracefully) + if (gracefully) break; usleep(200 * 1000); -- 1.7.6.1

7 18

[libvirt] [PATCH] daemon: Modify init script to check for libvirtd managed with upstart
by Peter Krempa 21 Sep '11

21 Sep '11

On some systems init scripts are installed along with upstart . This may cause trouble if user tries to restart/stop a instance of libvirtd managed with upstart with init script. This patch adds check for a started libvirtd managed by upstart and fails the init script. [root@localhost ~]# initctl status libvirtd libvirtd start/running, process 3001 [root@localhost ~]# service libvirtd restart Stopping libvirtd daemon: error: libvirtd is managed by upstart and started, use initctl instead If libvirtd is not managed by upstart or is stopped, init script works normaly and allows the user to manage the service. https://bugzilla.redhat.com/show_bug.cgi?id=728153 --- daemon/libvirtd.init.in | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/daemon/libvirtd.init.in b/daemon/libvirtd.init.in index 0697a2b..823fa77 100644 --- a/daemon/libvirtd.init.in +++ b/daemon/libvirtd.init.in @@ -43,6 +43,8 @@ LIBVIRTD_CONFIG= LIBVIRTD_ARGS= KRB5_KTNAME=/etc/libvirt/krb5.tab +INITCTL_PATH=/sbin/initctl + test -f @sysconfdir@/sysconfig/libvirtd && . @sysconfdir@/sysconfig/libvirtd export QEMU_AUDIO_DRV @@ -56,8 +58,22 @@ fi RETVAL=0 +# Check if libvirt is managed by upstart and fail if it's the case +initctl_check() { + if [ -x $INITCTL_PATH ]; then + #extract status from upstart + LIBVIRTD_UPSTART_STATUS=`$INITCTL_PATH status libvirtd | tr "/" " " | cut -d " " -f 2` + if [ $LIBVIRTD_UPSTART_STATUS = "start" ]; then + echo "error: libvirtd is managed by upstart and started, use initctl instead" + exit 1 + fi + fi +} + start() { echo -n $"Starting $SERVICE daemon: " + initctl_check + mkdir -p @localstatedir@/cache/libvirt rm -rf @localstatedir@/cache/libvirt/* KRB5_KTNAME=$KRB5_KTNAME daemon --pidfile $PIDFILE --check $SERVICE $PROCESS --daemon $LIBVIRTD_CONFIG_ARGS $LIBVIRTD_ARGS @@ -68,6 +84,7 @@ start() { stop() { echo -n $"Stopping $SERVICE daemon: " + initctl_check killproc -p $PIDFILE $PROCESS RETVAL=$? @@ -88,6 +105,7 @@ restart() { reload() { echo -n $"Reloading $SERVICE configuration: " + initctl_check killproc -p $PIDFILE $PROCESS -HUP RETVAL=$? -- 1.7.3.4

2 2

[libvirt] [PATCH] Revert "Ensure async packets never get marked for sync replies"
by Michal Privoznik 21 Sep '11

21 Sep '11

This partially reverts commit 984840a2c292402926ad100aeea33f8859ff31a9. Without this patch, client don't finish a stream which makes any API involving virStream block indefinitely. --- src/rpc/virnetclient.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/src/rpc/virnetclient.c b/src/rpc/virnetclient.c index 055361d..50f46ea 100644 --- a/src/rpc/virnetclient.c +++ b/src/rpc/virnetclient.c @@ -627,6 +627,11 @@ static int virNetClientCallDispatchStream(virNetClientPtr client) case VIR_NET_CONTINUE: { if (virNetClientStreamQueuePacket(st, &client->msg) < 0) return -1; + + if (thecall && thecall->expectReply) { + VIR_DEBUG("Got sync data packet completion"); + thecall->mode = VIR_NET_CLIENT_MODE_COMPLETE; + } return 0; } -- 1.7.3.4

4 4

[libvirt] [RFC v1] API to invoke S3/S4 on a KVM host and also resume from within libvirt
by Srivatsa S. Bhat 21 Sep '11

21 Sep '11

This patch adds a new API to put a KVM host to a suspended state (either Suspend-to-RAM or Suspend-to-Disk) and also resume the host back from within libvirt. This uses the RTC wakeup mechanism to set up a timer alarm before suspending the host, so that in-band resume is facilitated since the firing of the RTC alarm wakes up the host. The decision to use the RTC Wakeup mechanism to resume the host from sleep was taken in [1]. An initial API was discussed in [2]. Some design ideas for the asynchronous mechanism implementation was discussed in [3]. Todo: 1. During libvirtd init time check if S3/S4 is supported by the host. 2. Add synchronization/locking to ensure that only one suspend operation is active at a time. References: [1]. http://www.redhat.com/archives/libvir-list/2011-August/msg00327.html [2]. http://www.redhat.com/archives/libvir-list/2011-August/msg00248.html [3]. http://www.redhat.com/archives/libvir-list/2011-September/msg00438.html Signed-off-by: Srivatsa S. Bhat <srivatsa.bhat(a)linux.vnet.ibm.com> --- include/libvirt/libvirt.h.in | 9 +++ src/driver.h | 5 ++ src/libvirt.c | 45 ++++++++++++++ src/libvirt_private.syms | 4 + src/libvirt_public.syms | 1 src/nodeinfo.c | 139 ++++++++++++++++++++++++++++++++++++++++++ src/nodeinfo.h | 10 +++ src/qemu/qemu_driver.c | 1 src/remote/remote_driver.c | 1 src/remote/remote_protocol.x | 12 +++- 10 files changed, 224 insertions(+), 3 deletions(-) diff --git a/include/libvirt/libvirt.h.in b/include/libvirt/libvirt.h.in index 39155a6..aca55e6 100644 --- a/include/libvirt/libvirt.h.in +++ b/include/libvirt/libvirt.h.in @@ -988,6 +988,10 @@ unsigned long long virNodeGetFreeMemory (virConnectPtr conn); int virNodeGetSecurityModel (virConnectPtr conn, virSecurityModelPtr secmodel); +int virNodeSuspendForDuration (virConnectPtr conn, + int state, + unsigned long long duration); + /* * Gather list of running domains */ @@ -3210,6 +3214,11 @@ typedef struct _virTypedParameter virMemoryParameter; */ typedef virMemoryParameter *virMemoryParameterPtr; +typedef enum { + VIR_S3, /* Suspend-to-RAM */ + VIR_S4 /* Suspend-to-disk */ +} virSuspendState; + #ifdef __cplusplus } #endif diff --git a/src/driver.h b/src/driver.h index 3792003..658af5f 100644 --- a/src/driver.h +++ b/src/driver.h @@ -718,6 +718,10 @@ typedef int (*virDrvDomainBlockPull)(virDomainPtr dom, const char *path, unsigned long bandwidth, unsigned int flags); +typedef int + (*virDrvNodeSuspendForDuration)(virConnectPtr conn, int state, + unsigned long long duration); + /** * _virDriver: @@ -872,6 +876,7 @@ struct _virDriver { virDrvDomainGetBlockJobInfo domainGetBlockJobInfo; virDrvDomainBlockJobSetSpeed domainBlockJobSetSpeed; virDrvDomainBlockPull domainBlockPull; + virDrvNodeSuspendForDuration nodeSuspendForDuration; }; typedef int diff --git a/src/libvirt.c b/src/libvirt.c index 05c0a87..688c982 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -6103,6 +6103,51 @@ error: } /** + * virNodeSuspendForDuration: + * @conn: pointer to the hypervisor connection + * @state: the state to which the host must be suspended to + * @duration: the time duration in seconds, for which the host + * has to be suspended + * + * Suspend the node (host machine) for the given duration of time + * in the specified state (such as S3 or S4). Resume the node + * after the time duration is complete. + * + * Returns 0 on success (i.e., the node will be suspended after a + * short delay), -1 on failure (the operation is not supported). + */ +int +virNodeSuspendForDuration(virConnectPtr conn, + int state, + unsigned long long duration) +{ + VIR_DEBUG("conn=%p, state=%d, duration=%lld", conn, state, duration); + + virResetLastError(); + + if (!VIR_IS_CONNECT(conn)) { + virLibConnError(VIR_ERR_INVALID_CONN, __FUNCTION__); + virDispatchError(NULL); + return -1; + } + + if (conn->driver->nodeSuspendForDuration) { + int ret; + ret = conn->driver->nodeSuspendForDuration(conn, state, duration); + if (ret < 0) + goto error; + return ret; + } + + virLibConnError(VIR_ERR_NO_SUPPORT, __FUNCTION__); + +error: + virDispatchError(conn); + return -1; +} + + +/** * virDomainGetSchedulerType: * @domain: pointer to domain object * @nparams: pointer to number of scheduler parameters, can be NULL diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 4f33567..3d2870a 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -828,7 +828,9 @@ nodeGetCellsFreeMemory; nodeGetFreeMemory; nodeGetInfo; nodeGetMemoryStats; - +nodeSuspendForDuration; +setNodeWakeup; +nodeSuspend; # nwfilter_conf.h virNWFilterCallbackDriversLock; diff --git a/src/libvirt_public.syms b/src/libvirt_public.syms index 8a6d55a..14466f9 100644 --- a/src/libvirt_public.syms +++ b/src/libvirt_public.syms @@ -478,6 +478,7 @@ LIBVIRT_0.9.4 { virDomainGetBlockJobInfo; virDomainBlockJobSetSpeed; virDomainBlockPull; + virNodeSuspendForDuration; } LIBVIRT_0.9.3; LIBVIRT_0.9.5 { diff --git a/src/nodeinfo.c b/src/nodeinfo.c index 6448b79..34e9ff8 100644 --- a/src/nodeinfo.c +++ b/src/nodeinfo.c @@ -46,7 +46,8 @@ #include "count-one-bits.h" #include "intprops.h" #include "virfile.h" - +#include "command.h" +#include "threads.h" #define VIR_FROM_THIS VIR_FROM_NONE @@ -897,3 +898,139 @@ unsigned long long nodeGetFreeMemory(virConnectPtr conn ATTRIBUTE_UNUSED) return 0; } #endif + + +static bool aboutToSuspend = false; + +/** + * nodeSuspendForDuration: + * @conn: pointer to the hypervisor connection + * @state: the state to which the host must be suspended to - + * VIR_HOST_PM_S3 (Suspend-to-RAM) + * or VIR_HOST_PM_S4 (Suspend-to-disk) + * @duration: the time duration in seconds, for which the host + * must be suspended + * + * Suspend the node (host machine) for the given duration of time + * in the specified state (such as S3 or S4). Resume the node + * after the time duration is complete. + * + * An RTC alarm is set appropriately to wake up the node from + * its sleep state. Then the actual node suspend is carried out + * asynchronously in another thread, after a short time delay + * so as to give enough time for this function to return status + * to its caller through the connection. + * + * Returns 0 in case the node is going to be suspended after a short + * delay, -1 if suspending the node is not supported. + */ + +int nodeSuspendForDuration(virConnectPtr conn ATTRIBUTE_UNUSED, + int state, + unsigned long long duration) +{ + virThread thread; + static char * suspendCmdString; + int ret = -1; + + /* Check if we have already started suspending + * and this is a duplicate request. + */ + if(aboutToSuspend == true) { + /* This is a duplicate request to suspend. + * So we need not do anything. + */ + return 0; + } else { + /* This is not a duplicate request to suspend. */ + aboutToSuspend = true; + } + + /* Just set the RTC alarm. Don't suspend yet. */ + if(setNodeWakeup(duration) < 0) { + nodeReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Failed to set up the RTC alarm for node wakeup\n")); + goto cleanup; + } + + if (state == VIR_S4) { + suspendCmdString = "pm-hibernate"; + } else { + suspendCmdString = "pm-suspend"; + } + + if(virThreadCreate(&thread, false, nodeSuspend, suspendCmdString) < 0) { + nodeReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Failed to create thread to suspend the host\n")); + goto cleanup; + } + + ret = 0; + +cleanup: + return ret; +} + +/** + * setNodeWakeup: + * @alarmTime : time in seconds from now, at which the RTC alarm has to be set. + * + * Set up the RTC alarm to the specified time. + * Return 0 on success, -1 on failure. + */ + +int setNodeWakeup(unsigned long long alarmTime) +{ + virCommandPtr setAlarmCmd; + int ret = -1; + + setAlarmCmd = virCommandNewArgList("rtcwake", "-m", "no", "-s", NULL); + virCommandAddArgFormat(setAlarmCmd, "%lld", alarmTime); + + if (virCommandRun(setAlarmCmd, NULL) < 0) { + nodeReportError(VIR_ERR_INTERNAL_ERROR, + "%s", _("Failed to set up the RTC alarm\n")); + goto cleanup; + } + + ret = 0; + +cleanup: + virCommandFree(setAlarmCmd); + return ret; +} + +/** + * nodeSuspend: + * @cmdString: string containing the command to invoke + * + * Actually perform the suspend operation by invoking the + * command. Give a short delay before executing the command + * so as to give a chance to virNodeSuspendForDuration() to + * return the status to the caller. If we don't give this delay, + * that function will not be able to return the status since the + * suspend operation would have begun and hence no data can be + * sent through the connection to the caller. + */ + +void nodeSuspend(void *cmdString) +{ + virCommandPtr suspendCmd = virCommandNew((char *)cmdString); + + /* Delay for sometime so that the function nodeSuspendForDuration + * can return the status to the caller. + */ + sleep(SUSPEND_DELAY); + if (virCommandRun(suspendCmd, NULL) < 0) { + nodeReportError(VIR_ERR_INTERNAL_ERROR, + "%s", _("Failed to suspend the node\n")); + } + + virCommandFree(suspendCmd); + + /* Now that we have resumed from our sleep state, reset the flag + * that formerly indicated that we were about to suspend the node. + */ + aboutToSuspend = false; +} + diff --git a/src/nodeinfo.h b/src/nodeinfo.h index 4766152..f0c2271 100644 --- a/src/nodeinfo.h +++ b/src/nodeinfo.h @@ -46,4 +46,14 @@ int nodeGetCellsFreeMemory(virConnectPtr conn, int maxCells); unsigned long long nodeGetFreeMemory(virConnectPtr conn); +int nodeSuspendForDuration(virConnectPtr conn, + int state, + unsigned long long duration); + +int setNodeWakeup(unsigned long long alarmTime); + +# define SUSPEND_DELAY 10 /* in seconds */ + +void nodeSuspend(void *cmdString); + #endif /* __VIR_NODEINFO_H__*/ diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index e2f428f..c2c72d2 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -10695,6 +10695,7 @@ static virDriver qemuDriver = { .domainGetBlockJobInfo = qemuDomainGetBlockJobInfo, /* 0.9.4 */ .domainBlockJobSetSpeed = qemuDomainBlockJobSetSpeed, /* 0.9.4 */ .domainBlockPull = qemuDomainBlockPull, /* 0.9.4 */ + .nodeSuspendForDuration = nodeSuspendForDuration, /* 0.9.4 */ }; diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index 9d34b7e..02cd122 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -4429,6 +4429,7 @@ static virDriver remote_driver = { .domainGetBlockJobInfo = remoteDomainGetBlockJobInfo, /* 0.9.4 */ .domainBlockJobSetSpeed = remoteDomainBlockJobSetSpeed, /* 0.9.4 */ .domainBlockPull = remoteDomainBlockPull, /* 0.9.4 */ + .nodeSuspendForDuration = remoteNodeSuspendForDuration, /* 0.9.4 */ }; static virNetworkDriver network_driver = { diff --git a/src/remote/remote_protocol.x b/src/remote/remote_protocol.x index 4ec1c57..c1b1d94 100644 --- a/src/remote/remote_protocol.x +++ b/src/remote/remote_protocol.x @@ -2220,6 +2220,15 @@ struct remote_domain_get_control_info_ret { /* insert@1 */ unsigned hyper stateTime; }; +struct remote_node_suspend_for_duration_args { + int state; + unsigned hyper duration; +}; + +struct remote_node_suspend_for_duration_ret { + int status; +}; + /*----- Protocol. -----*/ /* Define the program number, protocol version and procedure numbers here. */ @@ -2509,7 +2518,8 @@ enum remote_procedure { REMOTE_PROC_DOMAIN_EVENT_BLOCK_JOB = 241, /* skipgen skipgen */ REMOTE_PROC_DOMAIN_MIGRATE_GET_MAX_SPEED = 242, /* autogen autogen */ - REMOTE_PROC_DOMAIN_BLOCK_STATS_FLAGS = 243 /* skipgen skipgen */ + REMOTE_PROC_DOMAIN_BLOCK_STATS_FLAGS = 243, /* skipgen skipgen */ + REMOTE_PROC_NODE_SUSPEND_FOR_DURATION = 244 /* autogen autogen priority:high */ /* * Notice how the entries are grouped in sets of 10 ?

1 0

[libvirt] [PATCH 1/2] qemu: using correct function to reboot guest.
by xuhj＠linux.vnet.ibm.com 21 Sep '11

21 Sep '11

From: Xu He Jie <xuhj(a)linux.vnet.ibm.com> Signed-off-by: Xu He Jie <xuhj(a)linux.vnet.ibm.com> --- src/qemu/qemu_driver.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index f4ee4c3..b0c9c02 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -1567,7 +1567,7 @@ static int qemuDomainReboot(virDomainPtr dom, unsigned int flags) { } qemuDomainObjEnterMonitor(driver, vm); - ret = qemuMonitorSystemPowerdown(priv->mon); + ret = qemuMonitorSystemReset(priv->mon); qemuDomainObjExitMonitor(driver, vm); priv->fakeReboot = true; -- 1.7.4.1

3 3

[libvirt] [PATCH] qemu: Allow domain reboot after core dump
by Michal Privoznik 21 Sep '11

21 Sep '11

This patch introduces possibility to reboot domain after core dump finishes. The new flag VIR_DUMP_REBOOT was added to virDomainCoreDumpFlags. The new functionality is accessible via virsh too: virsh dump --reboot <domain> --- include/libvirt/libvirt.h.in | 1 + src/qemu/qemu_driver.c | 8 +++++++- tools/virsh.c | 3 +++ 3 files changed, 11 insertions(+), 1 deletions(-) diff --git a/include/libvirt/libvirt.h.in b/include/libvirt/libvirt.h.in index 39155a6..8c41f5a 100644 --- a/include/libvirt/libvirt.h.in +++ b/include/libvirt/libvirt.h.in @@ -748,6 +748,7 @@ typedef enum { VIR_DUMP_CRASH = (1 << 0), /* crash after dump */ VIR_DUMP_LIVE = (1 << 1), /* live dump */ VIR_DUMP_BYPASS_CACHE = (1 << 2), /* avoid file system cache pollution */ + VIR_DUMP_REBOOT = (1 << 3), /* reboot domain after dump finishes */ } virDomainCoreDumpFlags; /* Domain migration flags. */ diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index e2f428f..22576a8 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -3104,7 +3104,8 @@ static int qemudDomainCoreDump(virDomainPtr dom, int ret = -1; virDomainEventPtr event = NULL; - virCheckFlags(VIR_DUMP_LIVE | VIR_DUMP_CRASH | VIR_DUMP_BYPASS_CACHE, -1); + virCheckFlags(VIR_DUMP_LIVE | VIR_DUMP_CRASH | + VIR_DUMP_BYPASS_CACHE | VIR_DUMP_REBOOT, -1); qemuDriverLock(driver); vm = virDomainFindByUUID(&driver->domains, dom->uuid); @@ -3189,6 +3190,11 @@ cleanup: if (event) qemuDomainEventQueue(driver, event); qemuDriverUnlock(driver); + + if ((ret == 0) && (flags & VIR_DUMP_REBOOT)) { + qemuDomainReboot(dom, 0); + } + return ret; } diff --git a/tools/virsh.c b/tools/virsh.c index d575425..74f6a79 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -2840,6 +2840,7 @@ static const vshCmdOptDef opts_dump[] = { {"crash", VSH_OT_BOOL, 0, N_("crash the domain after core dump")}, {"bypass-cache", VSH_OT_BOOL, 0, N_("avoid file system cache when saving")}, + {"reboot", VSH_OT_BOOL, 0, N_("reboot the domain after core dump")}, {"domain", VSH_OT_DATA, VSH_OFLAG_REQ, N_("domain name, id or uuid")}, {"file", VSH_OT_DATA, VSH_OFLAG_REQ, N_("where to dump the core")}, {NULL, 0, 0, NULL} @@ -2869,6 +2870,8 @@ cmdDump(vshControl *ctl, const vshCmd *cmd) flags |= VIR_DUMP_CRASH; if (vshCommandOptBool(cmd, "bypass-cache")) flags |= VIR_DUMP_BYPASS_CACHE; + if (vshCommandOptBool(cmd, "reboot")) + flags |= VIR_DUMP_REBOOT; if (virDomainCoreDump(dom, to, flags) < 0) { vshError(ctl, _("Failed to core dump domain %s to %s"), name, to); -- 1.7.3.4

3 3

[libvirt] Start of freeze for libvirt-0.9.5 and availability of rc1
by Daniel Veillard 21 Sep '11

21 Sep '11

With a bit of delay, we are entering the freeze for libvirt-0.9.5 . We may make an exception for the last couple of patches from Hu to add string to typed parameters and the extra associated patch, as well as bug fixes too of course ! I have made a release candidate 1 tarball (and associated rpms) at ftp://libvirt.org/libvirt/libvirt-0.9.5-rc1.tar.gz This seems to pass my minimal tests without problems, but please give it a try too and report problems, I think I will make an rc2 next Monday (or earlier) and then try to make the release around Wednesday next week thanks in advance, Daniel -- Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ daniel(a)veillard.com | Rpmfind RPM search engine http://rpmfind.net/ http://veillard.com/ | virtualization library http://libvirt.org/

8 19

[libvirt] [PATCH] API: prefer to use NULLSTR macro
by Osier Yang 21 Sep '11

21 Sep '11

--- src/libvirt.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/libvirt.c b/src/libvirt.c index 05c0a87..8f94b11 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -10300,7 +10300,7 @@ virConnectFindStoragePoolSources(virConnectPtr conn, unsigned int flags) { VIR_DEBUG("conn=%p, type=%s, src=%s, flags=%x", - conn, type ? type : "", srcSpec ? srcSpec : "", flags); + conn, NULLSTR(type), NULLSTR(srcSpec), flags); virResetLastError(); -- 1.7.6

2 2

[libvirt] [PATCH 1/2] xen: use typical allocations
by Eric Blake 21 Sep '11

21 Sep '11

The next patch will add a syntax check that flags this usage in xen as awkward - while it was valid memory management, it was very hard to maintain. Swapping to a more traditional allocation may be a bit slower, but easier to understand. * src/xen/xend_internal.c (xenDaemonListDomainsOld): Use two-level allocation, rather than abusing allocation function. (xenDaemonLookupByUUID): Update caller. --- src/xen/xend_internal.c | 42 +++++++++++++++++++----------------------- 1 files changed, 19 insertions(+), 23 deletions(-) diff --git a/src/xen/xend_internal.c b/src/xen/xend_internal.c index 81ff325..fa39e8b 100644 --- a/src/xen/xend_internal.c +++ b/src/xen/xend_internal.c @@ -753,12 +753,10 @@ xend_wait_for_devices(virConnectPtr xend, const char *name) char ** xenDaemonListDomainsOld(virConnectPtr xend) { - size_t extra = 0; struct sexpr *root = NULL; char **ret = NULL; int count = 0; int i; - char *ptr; struct sexpr *_for_i, *node; root = sexpr_get(xend, "/xend/domain"); @@ -769,32 +767,22 @@ xenDaemonListDomainsOld(virConnectPtr xend) _for_i = _for_i->u.s.cdr, node = _for_i->u.s.car) { if (node->kind != SEXPR_VALUE) continue; - extra += strlen(node->u.value) + 1; count++; } - /* - * We can'tuse the normal allocation routines as we are mixing - * an array of char * at the beginning followed by an array of char - * ret points to the NULL terminated array of char * - * ptr points to the current string after that array but in the same - * allocated block - */ - if (virAlloc((void *)&ptr, - (count + 1) * sizeof(char *) + extra * sizeof(char)) < 0) + if (VIR_ALLOC_N(ret, count + 1) < 0) { + virReportOOMError(); goto error; - - ret = (char **) ptr; - ptr += sizeof(char *) * (count + 1); + } i = 0; for (_for_i = root, node = root->u.s.car; _for_i->kind == SEXPR_CONS; _for_i = _for_i->u.s.cdr, node = _for_i->u.s.car) { if (node->kind != SEXPR_VALUE) continue; - ret[i] = ptr; - strcpy(ptr, node->u.value); - ptr += strlen(node->u.value) + 1; + ret[i] = strdup(node->u.value); + if (!ret[i]) + goto no_memory; i++; } @@ -803,6 +791,12 @@ xenDaemonListDomainsOld(virConnectPtr xend) error: sexpr_free(root); return ret; + +no_memory: + for (i = 0; i < count; i++) + VIR_FREE(ret[i]); + VIR_FREE(ret); + goto error; } @@ -2493,16 +2487,18 @@ xenDaemonLookupByUUID(virConnectPtr conn, const unsigned char *uuid) id = xenDaemonDomainLookupByName_ids(conn, *tmp, &ident[0]); if (id >= 0) { if (!memcmp(uuid, ident, VIR_UUID_BUFLEN)) { - name = strdup(*tmp); - - if (name == NULL) - virReportOOMError(); - + name = *tmp; break; } } tmp++; } + tmp = names; + while (*tmp) { + if (*tmp != name) + VIR_FREE(*tmp); + tmp++; + } VIR_FREE(names); } else { /* New approach for xen >= 3.0.4 */ char *domname = NULL; -- 1.7.4.4

2 4

[libvirt] [PATCH] storage: Inherit permissions of parent pool if they are not specified
by Osier Yang 21 Sep '11

21 Sep '11

If permissions (mode, uid, gid) are not specified, a new created vol will get the permissions like: mode = 0600 uid = -1 gid = -1 This will be a bit surprised if the user define the pool with a non-root uid/gid, but the new created vol is still defined as root/root. This patch changes the behaviour so that the new created vol will inherit the permissions of parent pool if permission are not specified. --- src/conf/storage_conf.c | 32 ++++++++++++++++++++------------ 1 files changed, 20 insertions(+), 12 deletions(-) diff --git a/src/conf/storage_conf.c b/src/conf/storage_conf.c index e893b2d..18675ad 100644 --- a/src/conf/storage_conf.c +++ b/src/conf/storage_conf.c @@ -539,6 +539,7 @@ static int virStorageDefParsePerms(xmlXPathContextPtr ctxt, virStoragePermsPtr perms, const char *permxpath, + virStoragePermsPtr pool_perms, int defaultmode) { char *mode; long v; @@ -560,9 +561,8 @@ virStorageDefParsePerms(xmlXPathContextPtr ctxt, ctxt->node = node; mode = virXPathString("string(./mode)", ctxt); - if (!mode) { - perms->mode = defaultmode; - } else { + + if (mode) { char *end = NULL; perms->mode = strtol(mode, &end, 8); if (*end || perms->mode < 0 || perms->mode > 0777) { @@ -572,28 +572,32 @@ virStorageDefParsePerms(xmlXPathContextPtr ctxt, goto error; } VIR_FREE(mode); + } else if (pool_perms) { + perms->mode = pool_perms->mode; + } else { + perms->mode = defaultmode; } - if (virXPathNode("./owner", ctxt) == NULL) { - perms->uid = -1; - } else { + if (virXPathNode("./owner", ctxt)) { if (virXPathLong("number(./owner)", ctxt, &v) < 0) { virStorageReportError(VIR_ERR_XML_ERROR, "%s", _("malformed owner element")); goto error; } perms->uid = (int)v; + } else if (pool_perms) { + perms->uid = pool_perms->uid; } - if (virXPathNode("./group", ctxt) == NULL) { - perms->gid = -1; - } else { + if (virXPathNode("./group", ctxt)) { if (virXPathLong("number(./group)", ctxt, &v) < 0) { virStorageReportError(VIR_ERR_XML_ERROR, "%s", _("malformed group element")); goto error; } perms->gid = (int)v; + } else if (pool_perms) { + perms->gid = pool_perms->gid; } /* NB, we're ignoring missing labels here - they'll simply inherit */ @@ -722,7 +726,7 @@ virStoragePoolDefParseXML(xmlXPathContextPtr ctxt) { if (virStorageDefParsePerms(ctxt, &ret->target.perms, - "./target/permissions", 0700) < 0) + "./target/permissions", NULL, 0700) < 0) goto cleanup; return ret; @@ -1069,7 +1073,9 @@ virStorageVolDefParseXML(virStoragePoolDefPtr pool, } if (virStorageDefParsePerms(ctxt, &ret->target.perms, - "./target/permissions", 0600) < 0) + "./target/permissions", + &pool->target.perms, + 0600) < 0) goto cleanup; node = virXPathNode("./target/encryption", ctxt); @@ -1100,7 +1106,9 @@ virStorageVolDefParseXML(virStoragePoolDefPtr pool, } if (virStorageDefParsePerms(ctxt, &ret->backingStore.perms, - "./backingStore/permissions", 0600) < 0) + "./backingStore/permissions", + &pool->target.perms, + 0600) < 0) goto cleanup; return ret; -- 1.7.6

3 3

[libvirt] [PATCH] virsh: Remove useless codes of cmdVolPath
by Osier Yang 21 Sep '11

21 Sep '11

Variable "name" is never used in the codes, it's useless. --- tools/virsh.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index e8258c1..371346a 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -10006,13 +10006,12 @@ static bool cmdVolPath(vshControl *ctl, const vshCmd *cmd) { virStorageVolPtr vol; - const char *name = NULL; char * StorageVolPath; if (!vshConnectionUsability(ctl, ctl->conn)) return false; - if (!(vol = vshCommandOptVol(ctl, cmd, "vol", "pool", &name))) { + if (!(vol = vshCommandOptVol(ctl, cmd, "vol", "pool", NULL))) { return false; } -- 1.7.6

2 2

[libvirt] [PATCH 0/2] Modify generic ethernet interface so it will work when sVirt is enabled with qemu
by Tyler Coumbes 20 Sep '11

20 Sep '11

Currently you cannot use generic ethernet interfaces with qemu when sVirt is enabled. This is because libvirt was having qemu handle the TAP creation and it doesn't have the rights to do so. This patch changes it so that libvirt handles and TAP creation and deletion. Passing the TAP as a file descriptor to qemu instead. Backwards capability has been maintained in the following manner. If a script is defined for the interface in the domain XML then it uses the old method of having qemu create the TAP and running the ifup script. If a script is not defined then the new method is used. When used with a script(old method) you will still be unable to use sVirt. You can use the old method without running a script. To do this define script='no' this will use the old method, but without a script. I have been running this patched version for while now on Fedora 15. I haven't ran into any issues. Hopefully I didn't miss anything. Previous patch proposal https://www.redhat.com/archives/libvir-list/2011-July/msg00407.html Thanks, Tyler

1 0

[libvirt] [PATCH] build: silence warning on 32-bit build
by Eric Blake 20 Sep '11

20 Sep '11

gcc warns when building libvirt 0.9.5 on a 32-bit machine: qemu/qemu_migration.c: In function 'qemuMigrationToFile': qemu/qemu_migration.c:2727:38: error: large integer implicitly truncated to unsigned type [-Woverflow] * src/qemu/qemu_domain.h (QEMU_DOMAIN_FILE_MIG_BANDWIDTH_MAX): Cap to long when building for 32-bit platform. --- Pushing under the build-breaker rule. src/qemu/qemu_domain.h | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h index e44ff8a..cde3ada 100644 --- a/src/qemu/qemu_domain.h +++ b/src/qemu/qemu_domain.h @@ -37,7 +37,13 @@ (1 << VIR_DOMAIN_VIRT_XEN)) # define QEMU_DOMAIN_DEFAULT_MIG_BANDWIDTH_MAX (32 << 20) -# define QEMU_DOMAIN_FILE_MIG_BANDWIDTH_MAX (INT64_MAX / (1024 * 1024)) +# if ULONG_MAX == 4294967295 +/* Qemu has a 64-bit limit, but we are limited by our historical choice of + * representing bandwidth in a long instead of a 64-bit int. */ +# define QEMU_DOMAIN_FILE_MIG_BANDWIDTH_MAX ULONG_MAX +# else +# define QEMU_DOMAIN_FILE_MIG_BANDWIDTH_MAX (INT64_MAX / (1024 * 1024)) +# endif # define JOB_MASK(job) (1 << (job - 1)) # define DEFAULT_JOB_MASK \ -- 1.7.4.4

1 0

[libvirt] Release of libvirt-0.9.5
by Daniel Veillard 20 Sep '11

20 Sep '11

Okay, it is finally out of the box :-) available as usual on ftp://libvirt.org/libvirt/ The snapshot support in that version should have improved a lot, and for the curious there is some early support for Microsoft hypervisor now, updated support for USB should also be a major user improvement. Considering the amount of bug fixes, I would suggest to upgrade to that version even if you don't need any new features ! Features: - many snapshot improvements (Eric Blake) - latency: Define new public API and structure (Osier Yang) - USB2 and various USB improvements (Marc-André Lureau) - storage: Add fs pool formatting (Osier Yang) - Add public API for getting migration speed (Jim Fehlig) - Add basic driver for Microsoft Hyper-V (Matthias Bolte) Documentation: - virsh: tweak previous domblkstat patch (Eric Blake) - virsh: doc: Fix supported driver types for attach-disk command (Peter Krempa) - doc: Add statment about permissions needed to do a core dump (Peter Krempa) - snapshot: tweak snapshot-create-as diskspec docs (Eric Blake) - qemu_api: doc improvements (Eric Blake) - virsh: Fix command name in man page (Peter Krempa) - fix incorrect option in send-key (Alex Jia) - virsh: improve send-key documentation (Eric Blake) - hyperv: Add basic documentation (Matthias Bolte) - schedinfo: update man page about virsh schedinfo command (Taku Izumi) - virsh: Clarify documentation of -d option (Jiri Denemark) - schedinfo: add missing documentation (Taku Izumi) - Improve tokenizing of linkable terms (Philipp Hahn) - Add some docs about the RPC protocol and APIs (Daniel P. Berrange) - Align table cells on top (Philipp Hahn) - use IPv6 addresses in range reserved for documentation (Laine Stump) - describe new virtual switch configuration in network XML docs (Laine Stump) Portability: - Update to require sanlock 1.8 for license compliance (Daniel P. Berrange) - build: work around lack of MacOS fdatasync (Eric Blake) - python: Fix bindings generated in VPATH build (Jiri Denemark) - build: storage: Macro 'MKFS' is undefined on some platforms. (Peter Krempa) - build: storage: Conditionaly compiled structure caused build fail on OSX (Peter Krempa) - Avoid using "devname" as an identifier. (Peter Krempa) - mingw: Don't use interface as an identifier (Matthias Bolte) - esx: Use $(PYTHON) instead of the shebang to run the generator (Matthias Bolte) - build: work around older systemtap header (Eric Blake) - build: fix compilation on mingw64 (Eric Blake) - build: fix virnetsocket on mingw (Eric Blake) - build: fix virpidfile on mingw (Eric Blake) - maint: fix some compilation issues on non-linux platforms (part 2) (Stefan Berger) - maint: fix some compilation issues on non-linux platforms (Stefan Berger) - Fix detection of GnuTLS 1.x.y (Matthias Bolte) Bug Fixes: - Fix crash on events due to allocation errors (Daniel Veillard) - conf: Assign newDef of active domain as persistent conf if it is NULL (Osier Yang) - storage: Ensure the device path exists before refreshing disk pool (Osier Yang) - daemon: Error and exit if specified value for timeout is not valid (Osier Yang) - vmx: avoid memory leak (Alex Jia) - util: avoid memory leak (Alex Jia) - remote: avoid memory leak (Alex Jia) - qemu: avoid memory leak (Alex Jia) - daemon: avoid memory leak (Alex Jia) - Prevent crash from dlclose() of libvirt.so (Daniel P. Berrange) - qemu: add return value check (Alex Jia) - Avoid crash on restart if running guest has filterref (Stefan Berger) - conf: avoid memory leak on virDomainDefParseXML (Alex Jia) - Fix build after commit 829bce17 (Jim Fehlig) - conf: add missing break in virDomainAuditRedirdev (Marc-André Lureau) - snapshot: ABI stability must include memory sizing (Eric Blake) - make: Fix 'make syntax-check' failing. (Peter Krempa) - snapshot: fix double free of qemuImgBinary (Guannan Ren) - virnetsocket: Pass KRB5CCNAME env variable (Michal Privoznik) - Fix URL-escaping for domainDefine (Philipp Hahn) - snapshot: fix regression with system checkpoints (Eric Blake) - Don't treat pci_system_init failure as fatal if no PCI bus is present (Soren Hansen) - rpc: avoid memory leak on virNetTLSContextValidCertificate (Alex Jia) - tests: avoid memory leak on testTLSSessionInit (Alex Jia) - libxl: avoid a dereference of a null pointer (Alex Jia) - blockinfo: fix qemu regression in handling disk name (Eric Blake) - esx: Fix managed object lookup with optional occurrence (Matthias Bolte) - Threadpool: Initialize new dynamic workers (Michal Privoznik) - Default USB device is on slot 1 function 2 (Marc-André Lureau) - Fix localtime handling for Xen-PV domains (Philipp Hahn) - snapshot: fix corner case on OOM during creation (Eric Blake) - API: Init conn in case of it might be used uninitialized (Osier Yang) - qemu: detect incomplete save files (Eric Blake) - reserve slot 1 on pci bus0 (Wen Congyang) - libvirtd: create run dir when running at non-root user (Xu He Jie) - Don't overwrite errors from xend_{get,req} (Jim Fehlig) - virsh: avoid memory leak on cmdVolCreateAs (Alex Jia) - Fix tracking of RPC messages wrt streams (Daniel P. Berrange) - Avoid use-after-free on streams, due to message callbacks (Daniel P. Berrange) - Fix parted sector size assumption (Daniel P. Berrange) - qemu: Fix a regression of domain save (Osier Yang) - lxc: Fix incorrect changes on error codes. (Osier Yang) - Stop libxl driver polluting logs on non-Xen hosts (Daniel P. Berrange) - Fix memory leak parsing 'relabel' attribute in domain security XML (Daniel P. Berrange) - Fix memory leak dispatching domain events (Daniel P. Berrange) - Don't leak memory if a cgroup is mounted multiple times (Daniel P. Berrange) - stream: remove redundant reference to client while sending stream data (Guannan Ren) - Fix sanlock socket security labelling (Daniel P. Berrange) - Fix incorrect path length check in sanlock lockspace setup (Daniel P. Berrange) - snapshot: forbid snapshot on autodestroy domain (Eric Blake) - Fix error detection in device change (Philipp Hahn) - qemu: properly label outgoing pipe for tunneled migration (Eric Blake) - Fix persistent migration config save (KAMEZAWA Hiroyuki) - rpc: Don't close connection if program is unknown (Jiri Denemark) - remote: Refuse connecting to remote socket (Michal Privoznik) - Detect errors from the 'sendkey' command (Daniel P. Berrange) - qemu: Correctly label migration TCP socket (Jiri Denemark) - Do not try to cancel non-existent migration on source (Jiri Denemark) - snapshot: don't leak resources on qemu snapshot failure (Eric Blake) - Fix command test wrt gnutls initialize & fix debugging (Daniel P. Berrange) - daemon: Move TLS initialization to virInitialize (Michal Privoznik) - util: only fchown newly created files in virFileOpenAs (Laine Stump) - qemu: fix off-by-one in pci slot reservation (Shradha Shah) - pci: fix pciDeviceListSteal on multiple devices (Shradha Shah) - qemu: Report error if qemu monitor command not found for BlockJob (Osier Yang) - send-key: fix scan keycode map (KAMEZAWA Hiroyuki) - storage: Flush host cache after write (Michal Privoznik) - daemon: initialize GnuTLS (Michal Privoznik) - Ensure async packets never get marked for sync replies (Daniel P. Berrange) - Don't attempt to read from a stream if it is closed (Daniel P. Berrange) - qemu: Init reattaching related members of pciDevice before reattach (Osier Yang) - Fix race condition in abort of stream (Daniel P. Berrange) - Ensure client streams are closed when marking a client for close (Daniel P. Berrange) - Ensure stream is aborted when exiting console (Daniel P. Berrange) - daemon: Add early libvirtd start verbose errors. (Peter Krempa) - qemu: error message should show uri instead of (null) (Peter Krempa) - libvirtd.init.in: stop/restart() - wrong return value in case of failure (Douglas Schilling Landgraf) - daemon: Fix regression of libvirtd reloading support (Osier Yang) - virsh: fix logic bug (Eric Blake) - storage: Directory shouldn't be listed as type 'file' (Peter Krempa) - network: eliminate potential memory leak on parse failure (Laine Stump) - nwfilter: tolerate disappearing interfaces while instantiating filter (Stefan Berger) - qemu: Fix -chardev udp if parameters are omitted (Cole Robinson) - managedsave: prohibit use on transient domains (Eric Blake) - Check stdoutWatch before removing the handler. (Juerg Haefliger) - Fix memory leak while scanning snapshots (Philipp Hahn) - build: fix regression in large file support (Eric Blake) - Don't mount /dev for application containers (Daniel P. Berrange) - qemu: avoid crash on process attach (Eric Blake) - rpc:fix sasl session relocking intead of unlocking it (Guannan Ren) - daemon: Unlink unix socket paths on shutdown (Osier Yang) Improvements: - Remove devname identifier from autogenerated RPC code (Peter Krempa) - maint: Prefer names over email in 'git shortlog' (Eric Blake) - virsh: Add more human-friendly output of domblkstat command (Peter Krempa) - spec: silence warnings when installing in F16 (Eric Blake) - snapshot: allow disk snapshots of qcow2 disks (Eric Blake) - snapshot: affect persistent xml after disk snapshot (Eric Blake) - qemu: Introduce shutdown reason for paused state (Jiri Denemark) - qemu: Prevent disk corruption on domain shutdown (Jiri Denemark) - qemu: Properly detect crash of a rebooted domain (Jiri Denemark) - qemu: Fix shutoff reason when domain crashes (Jiri Denemark) - rpc: convert unknown procedures to VIR_ERR_NO_SUPPORT (Eric Blake) - python: Fix libvirt.py generation to include virterror info (Cole Robinson) - sanlock: add missing test command in virt-sanlock-cleanup.in (Alex Jia) - spec: Require augeas for sanlock (Michal Privoznik) - Use max bandwidth from qemuDomainObjPrivate struct when migrating (Jim Fehlig) - Set qemu migration speed unlimited when migrating to file (Jim Fehlig) - Save migration speed in qemuDomainMigrateSetMaxSpeed (Jim Fehlig) - Impl virDomainMigrateGetMaxSpeed in qemu driver (Jim Fehlig) - Store max migration bandwidth in qemuDomainObjPrivate struct (Jim Fehlig) - network: add missing exports (Eric Blake) - xml: Clean up rest of virtual XML document names for XML strings (Peter Krempa) - qemu_api: Update libvirt spec file (Osier Yang) - qemu_api: Update Makefile to generate libvirtmod_qemu lib (Osier Yang) - qemu_api: Update Py binding generator to generate files for QEMU APIs (Osier Yang) - qemu_api: Add override XML and C files for QEMU APIs (Osier Yang) - qemu_api: Add comments for API virDomainQemuMonitorCommand (Osier Yang) - qemu_api: Update Makefile for subdir docs (Osier Yang) - qemu_api: Modify apibuild.py to generate docs for QEMU APIs (Osier Yang) - Do not log invalid operations in libvirtd logs (Daniel Veillard) - selinux: Detect virt_use_nfs boolean set (Michal Privoznik) - xml: Change virtual file names of xml documents parsed in memory (Peter Krempa) - maint: update to latest gnulib (Eric Blake) - snapshot: use new API for less work (Eric Blake) - snapshot: new APIs for inspecting snapshot object (Eric Blake) - virsh: fix typo in opts_send_key (Alex Jia) - link-state: virsh: Add wrapper commands for changing link state (Peter Krempa) - link-state: qemu: Add net intf modification to virUpdateDeviceFlags (Peter Krempa) - link-state: qemu: Add monitor handling for link state modification (Peter Krempa) - link-state: conf: Add element to XML for controling link state (Peter Krempa) - link-state: util: Add equality comparison functions for structures (Peter Krempa) - XML: Improve XML parsing error messages (Peter Krempa) - redirdev: allows to specify device address (Marc-André Lureau) - latency: Update virsh command domblkstat to use new API (Osier Yang) - latency: Expose the new API for Python binding (Osier Yang) - latency: Implemente internal API for qemu driver (Osier Yang) - latency: Update monitor functions for new latency fields (Osier Yang) - latency: Wire up the remote protocol (Osier Yang) - latency: Implemente the public API (Osier Yang) - latency: Define the internal driver callback (Osier Yang) - qemu: Deal with stucked qemu on daemon startup (Michal Privoznik) - qemu: Introduce job queue size limit (Michal Privoznik) - daemon: Create priority workers pool (Michal Privoznik) - snapshot: use SELinux and lock manager with external snapshots (Eric Blake) - snapshot: wire up live qemu disk snapshots (Eric Blake) - snapshot: wire up new qemu monitor command (Eric Blake) - snapshot: make it possible to audit external snapshot (Eric Blake) - snapshot: reject unimplemented disk snapshot features (Eric Blake) - snapshot: wire up disk-only flag to snapshot-create (Eric Blake) - snapshot: add flag for requesting disk snapshot (Eric Blake) - snapshot: add virsh domblklist command (Eric Blake) - snapshot: also support disks by path (Eric Blake) - snapshot: add <disks> to snapshot xml (Eric Blake) - snapshot: support extra state in snapshots (Eric Blake) - snapshot: expose halt-after-creation in virsh (Eric Blake) - snapshot: allow halting after snapshot (Eric Blake) - snapshot: expose new delete flag in virsh (Eric Blake) - snapshot: introduce new deletion flag (Eric Blake) - snapshot: reject transient disks where code is not ready (Eric Blake) - snapshot: additions to domain xml for disks (Eric Blake) - Check for source conflicts in storage pools (Lei Li) - Add a usb1 & usb2 qemuxml2argv test (Marc-André Lureau) - PIIX3 USB controller is on function 2 (Marc-André Lureau) - snapshot: store qemu domain details in xml (Eric Blake) - snapshot: update rng to support full domain in xml (Eric Blake) - snapshot: correctly escape generated xml (Eric Blake) - snapshot: allow full domain xml in snapshot (Eric Blake) - snapshot: refactor domain xml output (Eric Blake) - snapshot: prevent migration from stranding snapshot data (Eric Blake) - snapshot: support new undefine flags in qemu (Eric Blake) - snapshot: cache qemu-img location (Eric Blake) - snapshot: refactor some qemu code (Eric Blake) - snapshot: teach virsh about new undefine flags (Eric Blake) - snapshot: prevent stranding snapshot data on domain destruction (Eric Blake) - snapshot: add qemu snapshot redefine support (Eric Blake) - snapshot: add qemu snapshot creation without metadata (Eric Blake) - snapshot: improve virsh snapshot-create, add snapshot-edit (Eric Blake) - snapshot: refactor virsh snapshot creation (Eric Blake) - snapshot: allow recreation of metadata (Eric Blake) - snapshot: identify qemu snapshot roots (Eric Blake) - snapshot: reflect new dumpxml and list options in virsh (Eric Blake) - snapshot: identify which snapshots have metadata (Eric Blake) - snapshot: let qemu discard only snapshot metadata (Eric Blake) - snapshot: allow deletion of just snapshot metadata (Eric Blake) - snapshot: simplify acting on just children (Eric Blake) - snapshot: track current domain across deletion of children (Eric Blake) - snapshot: avoid crash when deleting qemu snapshots (Eric Blake) - snapshot: speed up snapshot location (Eric Blake) - snapshot: add snapshot-list --parent to virsh (Eric Blake) - snapshot: fine-tune qemu snapshot revert states (Eric Blake) - snapshot: properly revert qemu to offline snapshots (Eric Blake) - snapshot: improve reverting to qemu paused snapshots (Eric Blake) - snapshot: fine-tune qemu saved images starting paused (Eric Blake) - snapshot: expose --running and --paused in virsh (Eric Blake) - snapshot: fine-tune ability to start paused (Eric Blake) - snapshot: better events when starting paused (Eric Blake) - Learn to use spicevmc as a redirection type for usb-redir (Marc-André Lureau) - Add "redirdev" redirection device (Marc-André Lureau) - qemu: Don't append 0 at usb id, so that it is compatible with legacy -usb (Marc-André Lureau) - qemu: don't reserve slot 1 if a PIIX3 USB controller is defined there (Marc-André Lureau) - Modify USB port to be defined as a port path (Marc-André Lureau) - Add USB companion controllers support (Marc-André Lureau) - USB devices gain a new USB address child element (Marc-André Lureau) - test: USB controller can have a PCI address child element (Marc-André Lureau) - Add a new controller type 'usb' with optionnal 'model' (Marc-André Lureau) - Add USB controller models (Marc-André Lureau) - Rename virDomainControllerModel to virDomainControllerModelSCSI (Marc-André Lureau) - Add various USB devices QEMU_CAPS (Marc-André Lureau) - tests: add missing files (Eric Blake) - Add directsync cache mode support for disk driver (Osier Yang) - storage: Add virsh support for fs pool formating (Osier Yang) - storage: Add mkfs and libblkid to build system (Osier Yang) - qemu: refactor file opening (Eric Blake) - lxc: do not require 'ifconfig' or 'ipconfig' in container (Scott Moser) - Create ptmx as a device (Serge Hallyn) - BlockPull: Set initial bandwidth limit if specified (Adam Litke) - BlockJob: Bandwidth parameter is in MB when using text monitor (Adam Litke) - Increase size of buffer for xend response (Jim Fehlig) - virsh: support 'virsh start --force-boot' on older servers (Eric Blake) - build: fix 'make check' with pdwtags (Eric Blake) - virsh: Expose virDomainMigrateGetMaxSpeed API (Jim Fehlig) - virsh: prefer unsigned flags (Eric Blake) - storage: Fix incorrect error codes (Osier Yang) - remote: Fix incorrect error codes (Osier Yang) - nodeinfo: Fix incorrect error codes (Osier Yang) - conf: Substitute OPERATION_INVALID with INTERNAL_ERROR (Osier Yang) - start: allow discarding managed save (Eric Blake) - build: simplify use of verify (Eric Blake) - rpc: fix a typo in debugging log in virNetServerProgramSendStreamData (Guannan Ren) - maint: fix spelling errors on lose (Eric Blake) - Fix generator to cope with call-by-ref long types (Jim Fehlig) - hyperv: Add OpenWSMAN based client for the Hyper-V WMI API (Matthias Bolte) - hyperv: Add driver skeleton (Matthias Bolte) - hyperv: Add configure check for OpenWSMAN (Matthias Bolte) - virterror: Fix error message for VIR_ERR_INVALID_ARG (Michal Privoznik) - Fix keymap used to talk with QEMU (Daniel P. Berrange) - security: Introduce SetSocketLabel (Jiri Denemark) - security: Rename SetSocketLabel APIs to SetDaemonSocketLabel (Jiri Denemark) - Ignore unused streams in virStreamAbort (Jiri Denemark) - snapshot: track current snapshot across restarts (Eric Blake) - snapshot: only pass snapshot to qemu command line when reverting (Eric Blake) - libvirt: log all flags parameters (Eric Blake) - virsh: add list --managed-save (Eric Blake) - esx: Refactor a repeated string in the generator (Matthias Bolte) - maint: fix comment typos (Eric Blake) - virsh: Substitute goto label out with cleanup (Osier Yang) - virsh: Do not try to free domain if it is NULL (Osier Yang) - xen: Cleanup improper VIR_ERR_NO_SUPPORT use (Osier Yang) - storage: Cleanup improper VIR_ERR_NO_SUPPORT use (Osier Yang) - remote: Cleanup improper VIR_ERR_NO_SUPPORT use (Osier Yang) - qemu: Cleanup improper VIR_ERR_NO_SUPPORT use (Osier Yang) - nodeinfo: Cleanup improper VIR_ERR_NO_SUPPORT use (Osier Yang) - lxc: Cleanup improper VIR_ERR_NO_SUPPORT use (Osier Yang) - conf: Cleanup improper use of VIR_ERR_NO_SUPPORT in node_device_conf (Osier Yang) - qemu: Substitute VIR_ERR_NO_SUPPORT with VIR_ERR_OPERATION_INVALID (Osier Yang) - virsh: Print error if specified bandwidth is invalid for blockjob (Osier Yang) - virsh: properly interleave shared stdout and stderr (Eric Blake) - maint: simplify lots of libxml2 clients (Eric Blake) - xml: add another convenience function (Eric Blake) - maint: treat more libxml2 functions as free-like (Eric Blake) - test: rewrite test to match change in behavior (Eric Blake) - build: fix typo in recent test patch (Eric Blake) - vmware: Allow to undefine a running domain (Osier Yang) - uml: Allow to undefine a running domain (Osier Yang) - test: Allow to undefine a running domain (Osier Yang) - qemu: Allow to undefine a running domain (Osier Yang) - openvz: Allow to undefine a running domain (Osier Yang) - lxc: Allow to undefine a running domain (Osier Yang) - libxl: Allow to undefine a running domain. (Osier Yang) - qemu: Get memory balloon info correctly for text monitor (Osier Yang) - qemu: disk migration verbose progress (Tom Vijlbrief) - virsh: concatenate qemu-monitor-command arguments (Eric Blake) - virsh: tweak misleading wording (Eric Blake) - Tweak debugging message in RPC client code (Daniel P. Berrange) - maint: add missing symbols (Stefan Berger) - macvtap: Fix getPhysfn to get the PF of a direct attach network interface (Roopa Prabhu) - interface: Add functions to get sriov PF/VF relationship of a net interface (Roopa Prabhu) - pci: Add helper functions for sriov devices (Roopa Prabhu) - pci: Move some pci sriov helper code out of node device driver to util/pci (Roopa Prabhu) - qemu: support event_idx parameter for virtio disk and net devices (Laine Stump) - qemu: Use fd: protocol for migration (Jiri Denemark) - qemu: Use virNetSocket for tunneled migration (Jiri Denemark) - qemu: Refactor do{Tunnel,Native}Migrate functions (Jiri Denemark) - Support changing UNIX socket owner in virNetSocketNewListenUNIX (Jiri Denemark) - Add backlog parameter to virNetSocketListen (Jiri Denemark) - Add API for duplicating a socket/client file descriptor (Daniel P. Berrange) - Swap virDomain / virDomainSnapshot declaration (Philipp Hahn) - build: fix recent build failures (Eric Blake) - Convert libvirtd to use crash-safe pidfile APIs (Daniel P. Berrange) - Add some APIs which use locking for crashsafe pidfile handling (Daniel P. Berrange) - Introduce functions for checking whether a pidfile is valid (Daniel P. Berrange) - Move pidfile functions into util/virpidfile.{c,h} (Daniel P. Berrange) - Add virFileLock and virFileUnlock APIs (Daniel P. Berrange) - vbox, xenapi: add virDomainUndefineFlags (Eric Blake) - virsh: don't reject undefine on active domain (Eric Blake) - virsh: Add dir type for listing volumes with vol-list (Peter Krempa) - virsh: add snapshot-parent (Eric Blake) - virsh: add virsh snapshot-current --name (Eric Blake) - virsh: fix snapshot-create-as to handle arbitrary names (Eric Blake) - qemu: minor formatting cleanup (Eric Blake) - Allow use of file images for LXC container filesystems (Daniel P. Berrange) - Fix typo in LXC cgroups setup error message (Daniel P. Berrange) - Allow use of block devices for guest filesystem (Daniel P. Berrange) - qemu: Avoid overwriting errors from virGetHostname (Jiri Denemark) - network: eliminate lag in updating dnsmasq hosts files (Laine Stump) - build: update to latest gnulib (Eric Blake) Cleanups: - maint: ignore generated files (Eric Blake) - Remove two references to files not generated (Daniel Veillard) - latency: fix make check for remote protocol structs and numbers (Daniel Veillard) - security: fix build (Eric Blake) - Remove bogus virSecurityManagerSetProcessFDLabel method (Daniel P. Berrange) - libvirt: avoid dead store in virDomainMigrateVersion3 (Alex Jia) - qemu: avoid dead store in doPeer2PeerMigrate3 (Alex Jia) - maint: ignore generated file (Eric Blake) - maint: ignore generated file (Eric Blake) - maint: let emacs avoid tabs in rng files (Eric Blake) - virsh: fix dead store (Eric Blake) - qemu: silence clang false positive (Eric Blake) - qemu: avoid dead store in qemuMonitorTextBlockJob (Alex Jia) - qemu: avoid dead store in qemuProcessStart (Alex Jia) Thanks to everybody who contributed to this release, by submitting bug, reports, documentation, patches or just ideas ! Daniel -- Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ daniel(a)veillard.com | Rpmfind RPM search engine http://rpmfind.net/ http://veillard.com/ | virtualization library http://libvirt.org/

1 1

[libvirt] [PATCH] qemu: Prevent disk corruption on domain shutdown
by Jiri Denemark 20 Sep '11

20 Sep '11

Ever since we introduced fake reboot, we call qemuProcessKill as a reaction to SHUTDOWN event. Unfortunately, qemu doesn't guarantee it flushed all internal buffers before sending SHUTDOWN, in which case killing the process forcibly may result in (virtual) disk corruption. By sending just SIGTERM without SIGKILL we give qemu time to to flush all buffers and exit. Once qemu exits, we will see an EOF on monitor connection and tear down the domain. In case qemu ignores SIGTERM or just hangs there, the process stays running but that's not any different from a possible hang anytime during the shutdown process so I think it's just fine. Also qemu (since 0.14 until it's fixed) has a bug in SIGTERM processing which causes it not to exit but instead send new SHUTDOWN event and keep waiting. I think the best we can do is to ignore duplicate SHUTDOWN events to avoid a SHUTDOWN-SIGTERM loop and leave the domain in paused state. --- src/qemu/qemu_driver.c | 2 +- src/qemu/qemu_process.c | 25 ++++++++++++++++++------- src/qemu/qemu_process.h | 2 +- 3 files changed, 20 insertions(+), 9 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index d2626ff..9ff800f 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -1870,7 +1870,7 @@ qemuDomainDestroyFlags(virDomainPtr dom, * can kill the process even if a job is active. Killing * it now means the job will be released */ - qemuProcessKill(vm); + qemuProcessKill(vm, false); if (qemuDomainObjBeginJobWithDriver(driver, vm, QEMU_JOB_DESTROY) < 0) goto cleanup; diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 24d1dc7..dbd697d 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -419,7 +419,7 @@ endjob: cleanup: if (vm) { if (ret == -1) - qemuProcessKill(vm); + qemuProcessKill(vm, false); if (virDomainObjUnref(vm) > 0) virDomainObjUnlock(vm); } @@ -437,6 +437,12 @@ qemuProcessHandleShutdown(qemuMonitorPtr mon ATTRIBUTE_UNUSED, VIR_DEBUG("vm=%p", vm); virDomainObjLock(vm); + if (priv->gotShutdown) { + VIR_DEBUG("Ignoring repeated SHUTDOWN event from domain %s", + vm->def->name); + goto cleanup; + } + priv->gotShutdown = true; if (priv->fakeReboot) { virDomainObjRef(vm); @@ -446,16 +452,17 @@ qemuProcessHandleShutdown(qemuMonitorPtr mon ATTRIBUTE_UNUSED, qemuProcessFakeReboot, vm) < 0) { VIR_ERROR(_("Failed to create reboot thread, killing domain")); - qemuProcessKill(vm); + qemuProcessKill(vm, true); if (virDomainObjUnref(vm) == 0) vm = NULL; } } else { - qemuProcessKill(vm); + qemuProcessKill(vm, true); } + +cleanup: if (vm) virDomainObjUnlock(vm); - return 0; } @@ -3183,10 +3190,11 @@ cleanup: } -void qemuProcessKill(virDomainObjPtr vm) +void qemuProcessKill(virDomainObjPtr vm, bool gracefully) { int i; - VIR_DEBUG("vm=%s pid=%d", vm->def->name, vm->pid); + VIR_DEBUG("vm=%s pid=%d gracefully=%d", + vm->def->name, vm->pid, gracefully); if (!virDomainObjIsActive(vm)) { VIR_DEBUG("VM '%s' not active", vm->def->name); @@ -3216,6 +3224,9 @@ void qemuProcessKill(virDomainObjPtr vm) break; } + if (i == 0 && gracefully) + break; + usleep(200 * 1000); } } @@ -3300,7 +3311,7 @@ void qemuProcessStop(struct qemud_driver *driver, } /* shut it off for sure */ - qemuProcessKill(vm); + qemuProcessKill(vm, false); /* Stop autodestroy in case guest is restarted */ qemuProcessAutoDestroyRemove(driver, vm); diff --git a/src/qemu/qemu_process.h b/src/qemu/qemu_process.h index 96ba3f3..ef422c4 100644 --- a/src/qemu/qemu_process.h +++ b/src/qemu/qemu_process.h @@ -68,7 +68,7 @@ int qemuProcessAttach(virConnectPtr conn, virDomainChrSourceDefPtr monConfig, bool monJSON); -void qemuProcessKill(virDomainObjPtr vm); +void qemuProcessKill(virDomainObjPtr vm, bool gracefully); int qemuProcessAutoDestroyInit(struct qemud_driver *driver); void qemuProcessAutoDestroyRun(struct qemud_driver *driver, -- 1.7.6.1

3 5

[libvirt] specifying rbd images in libvirt
by Sage Weil 20 Sep '11

20 Sep '11

Hi all, Currently, you can specify an rbd (or nbd, sheepdog) image with xml that looks like so: <disk type='network' device='disk'> <driver name='qemu' type='raw' cache='writeback'/> <source protocol='rbd' name='mypool/myimage'> <host name='monhost1.mydomain.com' port='6789'/> <host name='monhost2.mydomain.com' port='6789'/> <host name='monhost3.mydomain.com' port='6789'/> </source> <target dev='vda' bus='virtio'/> </disk> This works okay if you have authentication disabled and all of the default settings are okay. Usually, though, there are other options you need to specify to librbd to make it do what you want. The current schema can be abused by adding options after the image name like so: <disk type='network' device='disk'> <driver name='qemu' type='raw' cache='writeback'/> <source protocol='rbd' name='mypool/myimage:conf=/etc/ceph/ceph.conf:id=admin:this=that:foo=bar'> <host name='monhost1.mydomain.com' port='6789'/> <host name='monhost2.mydomain.com' port='6789'/> <host name='monhost3.mydomain.com' port='6789'/> </source> <target dev='vda' bus='virtio'/> </disk> This works only because that's what the qemu incantation looks like. In general, though, this is ugly. I also doesn't generalize well to the kernel-level rbd driver, which we'd like to also support, as that will work with hypervisors other than qemu. What about something more like this? <disk type='network' device='disk'> <driver name='qemu' type='raw' cache='writeback'/> <source protocol='rbd' name='mypool/myimage'> <option name='conf'>/etc/ceph/ceph.conf</option> <option name='id'>myusername</option> <option name='foo'>bar</option> <host name='monhost1.mydomain.com' port='6789'/> <host name='monhost2.mydomain.com' port='6789'/> <host name='monhost3.mydomain.com' port='6789'/> </source> <target dev='vda' bus='virtio'/> </disk> I'm not married to any particular syntax/schema, as long as there is a generic way to specify name/value pairs to configure the driver. I think the above would generalize well to other network block devices as well, which presumably also want a way to feed in information other than a server address (e.g. for authentication). Does that look reasonable? If there are no objections we can work up some patches and send them along! Thanks- sage

3 5

[libvirt] [PATCH] conf: Assign newDef of active domain as persistent conf if it is NULL
by Osier Yang 20 Sep '11

20 Sep '11

Libvirt loads the domain conf from status XML if it's running when starting up. The problem is there is no record of the original conf. (dom->newDef is NULL here). So libvirt won't be able to restore the domain conf to original one when destroying/shutdown. E.g. 1) attach a device without "--persistent" 2) restart libvirtd 3) destroy domain 4) start domain One will see the the disk still exists. This patch is to fix the peoblem by assigning persistent domain conf to dom->newDef if it's NULL and the domain is running. --- src/conf/domain_conf.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 00212db..cbb99d3 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -10533,9 +10533,15 @@ static virDomainObjPtr virDomainLoadConfig(virCapsPtr caps, if ((dom = virDomainFindByUUID(doms, def->uuid))) { dom->autostart = autostart; + if (virDomainObjIsActive(dom) && + !dom->newDef) { + virDomainObjAssignDef(dom, def, false); + } else { + virDomainDefFree(def); + } + VIR_FREE(configFile); VIR_FREE(autostartLink); - virDomainDefFree(def); return dom; } -- 1.7.6

2 3

[libvirt] [PATCH] storage: Ensure the device path exists before refreshing disk pool
by Osier Yang 20 Sep '11

20 Sep '11

Doing libvirt_parthelper on an not existed device path will get an unfriendly error message. This patch is to prohibit it. --- src/storage/storage_backend_disk.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/src/storage/storage_backend_disk.c b/src/storage/storage_backend_disk.c index 80f9dd1..82d6e8a 100644 --- a/src/storage/storage_backend_disk.c +++ b/src/storage/storage_backend_disk.c @@ -262,7 +262,6 @@ static int virStorageBackendDiskReadPartitions(virStoragePoolObjPtr pool, virStorageVolDefPtr vol) { - /* * # libvirt_parthelper DEVICE * /dev/sda1 normal data 32256 106928128 106896384 @@ -320,6 +319,13 @@ virStorageBackendDiskRefreshPool(virConnectPtr conn ATTRIBUTE_UNUSED, virFileWaitForDevices(); + if (!virFileExists(pool->def->source.devices[0].path)) { + virStorageReportError(VIR_ERR_INVALID_ARG, + _("device path '%s' doesn't exist"), + pool->def->source.devices[0].path); + return -1; + } + if (virStorageBackendDiskReadGeometry(pool) != 0) { return -1; } -- 1.7.6

2 2

[libvirt] [PATCH] daemon: Error and exit if specified value for timeout is not valid
by Osier Yang 20 Sep '11

20 Sep '11

Silently setting "timeout" as -1 if the specified value is invalid is a bit confused. --- daemon/libvirtd.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/daemon/libvirtd.c b/daemon/libvirtd.c index c708ff7..4dd68d5 100644 --- a/daemon/libvirtd.c +++ b/daemon/libvirtd.c @@ -1311,8 +1311,10 @@ int main(int argc, char **argv) { if (virStrToLong_i(optarg, &tmp, 10, &timeout) != 0 || timeout <= 0 /* Ensure that we can multiply by 1000 without overflowing. */ - || timeout > INT_MAX / 1000) - timeout = -1; + || timeout > INT_MAX / 1000) { + VIR_ERROR(_("Invalid value for timeout")); + exit(EXIT_FAILURE); + } break; case 'p': -- 1.7.6

2 2

[libvirt] [PATCH 0/5] avoid memory leaks
by ajia＠redhat.com 20 Sep '11

20 Sep '11

Detected by Coverity. * daemon/remote.c: Calling allocation function 'get_nonnull_domain' to allocate memory to 'dom', but haven't released it in 'cleanup' section. * src/qemu/qemu_command.c: Taking 'if (!port)' true branch then 'def = NULL', the codes jump into 'error' section, the function 'virDomainDefFree(def)' willn't release it. * src/remote/remote_driver.c: Calling allocation function 'get_nonnull_domain' to allocate memory to 'dom', but haven't released it in 'no_memory' section. * src/util/pci.c: Calling allocation function 'pciGetVirtualFunctions' on 'virt_fns', but haven't released it in 'out' section. * src/vmx/vmx.c: Calling allocation function 'virConfReadMem' to allocate memory to 'conf' and then taking 'if (VIR_ALLOC(def) < 0)' true branch, the codes haven't released it before 'return NULL'. Signed-off-by: Alex Jia <ajia(a)redhat.com> --- daemon/remote.c | 2 ++ src/qemu/qemu_command.c | 1 - src/remote/remote_driver.c | 2 ++ src/util/pci.c | 1 + src/vmx/vmx.c | 1 + 5 files changed, 6 insertions(+), 1 deletions(-)

4 12

[libvirt] [PATCH] Remove devname identifier from autogenerated RPC code
by Peter Krempa 20 Sep '11

20 Sep '11

Patch 79cf07a missed one instance of "devname" in source for RPC code generator. --- src/remote/remote_protocol.x | 2 +- src/remote_protocol-structs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/remote/remote_protocol.x b/src/remote/remote_protocol.x index 4ec1c57..455e324 100644 --- a/src/remote/remote_protocol.x +++ b/src/remote/remote_protocol.x @@ -2102,7 +2102,7 @@ struct remote_domain_snapshot_delete_args { struct remote_domain_open_console_args { remote_nonnull_domain dom; - remote_string devname; + remote_string dev_name; unsigned int flags; }; diff --git a/src/remote_protocol-structs b/src/remote_protocol-structs index 27178da..810b19c 100644 --- a/src/remote_protocol-structs +++ b/src/remote_protocol-structs @@ -1585,7 +1585,7 @@ struct remote_domain_snapshot_delete_args { }; struct remote_domain_open_console_args { remote_nonnull_domain dom; - remote_string devname; + remote_string dev_name; u_int flags; }; struct remote_storage_vol_upload_args { -- 1.7.3.4

2 1

[libvirt] [PATCH] virsh: doc: Fix supported driver types for attach-disk command
by Peter Krempa 19 Sep '11

19 Sep '11

Virsh man page lists driver types to be used with attach-device command, but does not specify that those are usable only with the XEN Hypervisor. This patch adds statement, that those options specified are applicable only on the Xen hypervisor and adds option usable with qemu emulator. This patch also changes type of error returned by QEMU driver if the user specifies incompatible driver type from VIR_ERR_INTERNAL_ERROR to VIR_ERR_NO_SUPPORT. --- src/qemu/qemu_command.c | 2 +- src/qemu/qemu_driver.c | 2 +- tools/virsh.pod | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index e8b1157..9ca8c1b 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -3657,7 +3657,7 @@ qemuBuildCommandLine(virConnectPtr conn, if (disk->driverName != NULL && !STREQ(disk->driverName, "qemu")) { - qemuReportError(VIR_ERR_INTERNAL_ERROR, + qemuReportError(VIR_ERR_NO_SUPPORT, _("unsupported driver name '%s' for disk '%s'"), disk->driverName, disk->src); goto error; diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index e2f428f..602f3e6 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -5208,7 +5208,7 @@ qemuDomainAttachDeviceDiskLive(struct qemud_driver *driver, int ret = -1; if (disk->driverName != NULL && !STREQ(disk->driverName, "qemu")) { - qemuReportError(VIR_ERR_INTERNAL_ERROR, + qemuReportError(VIR_ERR_NO_SUPPORT, _("unsupported driver name '%s' for disk '%s'"), disk->driverName, disk->src); goto end; diff --git a/tools/virsh.pod b/tools/virsh.pod index 02726f3..6b6e7f6 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -1166,7 +1166,8 @@ the single existing device; consider using B<update-device> for this usage. Attach a new disk device to the domain. I<source> and I<target> are paths for the files and devices. -I<driver> can be I<file>, I<tap> or I<phy> depending on the kind of access. +I<driver> can be I<file>, I<tap> or I<phy> for the Xen hypervisor depending on +the kind of access or I<qemu> for the QEMU emulator. I<type> can indicate I<cdrom> or I<floppy> as alternative to the disk default, although this use only replaces the media within the existing virtual cdrom or floppy device; consider using B<update-device> for this usage instead. -- 1.7.3.4

2 1

[libvirt] [PATCH v7] virsh: Add more human-friendly output of domblkstat command
by Peter Krempa 19 Sep '11

19 Sep '11

Users of virsh complain that output of the domblkstat command is not intuitive enough. This patch adds explanation of fields returned by this command to the help section for domblkstat and the man page of virsh. Also a switch --human is added for domblkstat that prints the fields with more descriptive texts. This patch also changes sequence of the output fields and their names back to the order and spelling established by previous versions of virsh to mantain compatibility with scripts. Example of ordered and "translated" output: PRE-patch: virsh # domblkstat 1 vda vda wr_bytes 5170176 vda wr_operations 511 vda rd_bytes 82815488 vda rd_operations 3726 POST-patch: virsh # domblkstat 1 vda vda rd_req 3726 vda rd_bytes 82815488 vda wr_req 478 vda wr_bytes 4965376 Example of human readable output: virsh # domblkstat 1 vda --human Device: vda number of read operations: 3726 number of read bytes: 82815488 number of write operations: 478 number of bytes written: 4965376 https://bugzilla.redhat.com/show_bug.cgi?id=731656 Changes to v6: - post correct version - add examples of output Changes to v5: - Do not fix VIR_ERR_RPC failure of this function (unknown procedure 243) ( will be fixed in a separate patch adressing more similar errors) - Clean up legacy printout using a macro - Remove newlines from "desc" in vshCmdInfo - use calloc() instead of malloc() + memset(..., 0, ...) Changes to v4: - Fields are printed in order established by previous versions - Fix translation macros - Run old api unconditionaly (while comunicating with old libvirtd "error: unknown procedure: 243" occured) - Remove redundant field description from command help and add reference to man page. - Fix formating (unnecessary space after function name) - Fix man page, mentioning that fields may be missig. Changes to v3: - Add units to duration values - Add missing write doc/stranslation - Add translation from new api names to legacy names used in previous versions in virsh Changes to v2: - Modify for new fields in virDomainBlockStatsFlags Changes to v1: - Rebase to current head --- IMHO this patch is worth getting into 0.9.5 as it fixes the changed output order since addition of the new api, and translates field names into those that have been used in previous versions. ( sorry for the mess with v6 :/ ) tools/virsh.c | 236 +++++++++++++++++++++++++++++++++++++++++------------- tools/virsh.pod | 20 +++++- 2 files changed, 198 insertions(+), 58 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index d575425..f2bb2db 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -369,6 +369,8 @@ static const char *vshDomainStateReasonToString(int state, int reason); static const char *vshDomainControlStateToString(int state); static const char *vshDomainVcpuStateToString(int state); static bool vshConnectionUsability(vshControl *ctl, virConnectPtr conn); +static virTypedParameterPtr vshFindTypedParamByName(const char *name, virTypedParameterPtr list, int count); +static char *vshGetTypedParamValue(vshControl *ctl, virTypedParameterPtr item); static char *editWriteToTempFile (vshControl *ctl, const char *doc); static int editFile (vshControl *ctl, const char *filename); @@ -1054,16 +1056,43 @@ cleanup: */ static const vshCmdInfo info_domblkstat[] = { {"help", N_("get device block stats for a domain")}, - {"desc", N_("Get device block stats for a running domain.")}, + {"desc", N_("Get device block stats for a running domain. See man page or use --human for explanation of fields")}, {NULL,NULL} }; static const vshCmdOptDef opts_domblkstat[] = { {"domain", VSH_OT_DATA, VSH_OFLAG_REQ, N_("domain name, id or uuid")}, {"device", VSH_OT_DATA, VSH_OFLAG_REQ, N_("block device")}, + {"human", VSH_OT_BOOL, 0, N_("print a more human readable output")}, {NULL, 0, 0, NULL} }; +struct _domblkstat_sequence { + const char *field; /* field name */ + const char *legacy; /* legacy name from previous releases */ + const char *human; /* human-friendly explanation */ +}; + +/* sequence of values for output to honor legacy format from previous versions */ +static const struct _domblkstat_sequence domblkstat_output[] = { + { VIR_DOMAIN_BLOCK_STATS_READ_REQ, "rd_req", N_("number of read operations: ") }, /* 0 */ + { VIR_DOMAIN_BLOCK_STATS_READ_BYTES, "rd_bytes", N_("number of read bytes: ") }, /* 1 */ + { VIR_DOMAIN_BLOCK_STATS_WRITE_REQ, "wr_req", N_("number of write operations: ") }, /* 2 */ + { VIR_DOMAIN_BLOCK_STATS_WRITE_BYTES, "wr_bytes", N_("number of bytes written: ") }, /* 3 */ + { VIR_DOMAIN_BLOCK_STATS_ERRS, "errs", N_("error count: ") }, /* 4 */ + { VIR_DOMAIN_BLOCK_STATS_FLUSH_REQ, NULL, N_("number of flush operations: ") }, /* 5 */ + { VIR_DOMAIN_BLOCK_STATS_READ_TOTAL_TIMES, NULL, N_("total duration of reads (ns): ") }, /* 6 */ + { VIR_DOMAIN_BLOCK_STATS_WRITE_TOTAL_TIMES, NULL, N_("total duration of writes (ns): ") }, /* 7 */ + { VIR_DOMAIN_BLOCK_STATS_FLUSH_TOTAL_TIMES, NULL, N_("total duration of flushes (ns):") }, /* 8 */ + { NULL, NULL, NULL } +}; + +#define DOMBLKSTAT_LEGACY_PRINT(ID, VALUE) \ + if (VALUE >= 0) \ + vshPrint(ctl, "%s %s %lld\n", device, \ + human?_(domblkstat_output[ID].human):domblkstat_output[ID].legacy, \ + VALUE); + static bool cmdDomblkstat (vshControl *ctl, const vshCmd *cmd) { @@ -1071,8 +1100,13 @@ cmdDomblkstat (vshControl *ctl, const vshCmd *cmd) const char *name = NULL, *device = NULL; struct _virDomainBlockStats stats; virTypedParameterPtr params = NULL; + virTypedParameterPtr par = NULL; + char *value = NULL; + const char *field = NULL; int rc, nparams = 0; + int i = 0; bool ret = false; + bool human = vshCommandOptBool(cmd, "human"); /* enable human readable output */ if (!vshConnectionUsability (ctl, ctl->conn)) return false; @@ -1090,76 +1124,84 @@ cmdDomblkstat (vshControl *ctl, const vshCmd *cmd) * then. */ if (rc < 0) { - if (last_error->code != VIR_ERR_NO_SUPPORT) { - virshReportError(ctl); + /* try older API if newer is not supported */ + if (last_error->code != VIR_ERR_NO_SUPPORT) goto cleanup; - } else { - virFreeError(last_error); - last_error = NULL; - - if (virDomainBlockStats (dom, device, &stats, - sizeof stats) == -1) { - vshError(ctl, _("Failed to get block stats %s %s"), - name, device); - goto cleanup; - } - - if (stats.rd_req >= 0) - vshPrint (ctl, "%s rd_req %lld\n", device, stats.rd_req); - if (stats.rd_bytes >= 0) - vshPrint (ctl, "%s rd_bytes %lld\n", device, stats.rd_bytes); - - if (stats.wr_req >= 0) - vshPrint (ctl, "%s wr_req %lld\n", device, stats.wr_req); + virFreeError(last_error); + last_error = NULL; - if (stats.wr_bytes >= 0) - vshPrint (ctl, "%s wr_bytes %lld\n", device, stats.wr_bytes); + if (virDomainBlockStats (dom, device, &stats, + sizeof stats) == -1) { + vshError(ctl, _("Failed to get block stats %s %s"), + name, device); + goto cleanup; + } - if (stats.errs >= 0) - vshPrint (ctl, "%s errs %lld\n", device, stats.errs); + /* human friendly output */ + if (human) { + vshPrint(ctl, N_("Device: %s\n"), device); + device = ""; } + + DOMBLKSTAT_LEGACY_PRINT(0, stats.rd_req); + DOMBLKSTAT_LEGACY_PRINT(1, stats.rd_bytes); + DOMBLKSTAT_LEGACY_PRINT(2, stats.wr_req); + DOMBLKSTAT_LEGACY_PRINT(3, stats.wr_bytes); + DOMBLKSTAT_LEGACY_PRINT(4, stats.errs); } else { - params = vshMalloc(ctl, sizeof(*params) * nparams); - memset(params, 0, sizeof(*params) * nparams); + params = vshCalloc(ctl, nparams, sizeof(*params)); if (virDomainBlockStatsFlags (dom, device, params, &nparams, 0) < 0) { vshError(ctl, _("Failed to get block stats %s %s"), name, device); goto cleanup; } - int i; - /* XXX: The output sequence will be different. */ + /* set for prettier output */ + if (human) { + vshPrint(ctl, N_("Device: %s\n"), device); + device = ""; + } + + /* at first print all known values in desired order */ + for (i = 0; domblkstat_output[i].field != NULL; i++) { + if (!(par = vshFindTypedParamByName(domblkstat_output[i].field, + params, + nparams))) + continue; + + if (!(value = vshGetTypedParamValue(ctl, par))) + continue; + + /* to print other not supported fields, mark the already printed */ + par->field[0] = '\0'; /* set the name to empty string */ + + /* translate into human readable or legacy spelling */ + field = NULL; + if (human) + field = _(domblkstat_output[i].human); + else + field = domblkstat_output[i].legacy; + + /* use the provided spelling if no translation is available */ + if (!field) + field = domblkstat_output[i].field; + + vshPrint(ctl, "%s %s %s\n", device, field, value); + + VIR_FREE(value); + } + + /* go through the fields again, looking for fields that were not printed*/ for (i = 0; i < nparams; i++) { - switch(params[i].type) { - case VIR_TYPED_PARAM_INT: - vshPrint (ctl, "%s %s %d\n", device, - params[i].field, params[i].value.i); - break; - case VIR_TYPED_PARAM_UINT: - vshPrint (ctl, "%s %s %u\n", device, - params[i].field, params[i].value.ui); - break; - case VIR_TYPED_PARAM_LLONG: - vshPrint (ctl, "%s %s %lld\n", device, - params[i].field, params[i].value.l); - break; - case VIR_TYPED_PARAM_ULLONG: - vshPrint (ctl, "%s %s %llu\n", device, - params[i].field, params[i].value.ul); - break; - case VIR_TYPED_PARAM_DOUBLE: - vshPrint (ctl, "%s %s %f\n", device, - params[i].field, params[i].value.d); - break; - case VIR_TYPED_PARAM_BOOLEAN: - vshPrint (ctl, "%s %s %s\n", device, - params[i].field, params[i].value.b ? _("yes") : _("no")); - break; - default: - vshError(ctl, _("unimplemented block statistics parameter type")); - } + if (strlen(params[i].field) == 0) + continue; + if (!(value = vshGetTypedParamValue(ctl, params+i))) + continue; + + vshPrint(ctl, "%s %s %s\n", device, params[i].field, value); + VIR_FREE(value); } } @@ -1170,6 +1212,7 @@ cleanup: virDomainFree(dom); return ret; } +#undef DOMBLKSTAT_LEGACY_PRINT /* "domifstat" command */ @@ -15202,6 +15245,85 @@ vshDomainStateReasonToString(int state, int reason) return N_("unknown"); } +static char * +vshGetTypedParamValue(vshControl *ctl, virTypedParameterPtr item) +{ + int size = 0; + char *str = NULL; + + if (!ctl || !item) + return NULL; + + switch(item->type) { + case VIR_TYPED_PARAM_INT: + size = snprintf(NULL, 0, "%d", item->value.i); + str = vshMalloc(ctl, size+1); + snprintf(str, size+1, "%d", item->value.i); + return str; + break; + + case VIR_TYPED_PARAM_UINT: + size = snprintf(NULL, 0, "%u", item->value.ui); + str = vshMalloc(ctl, size+1); + snprintf(str, size+1, "%u", item->value.ui); + return str; + break; + + case VIR_TYPED_PARAM_LLONG: + size = snprintf(NULL, 0, "%lld", item->value.l); + str = vshMalloc(ctl, size+1); + snprintf(str, size+1, "%lld", item->value.l); + return str; + break; + + case VIR_TYPED_PARAM_ULLONG: + size = snprintf(NULL, 0, "%llu", item->value.ul); + str = vshMalloc(ctl, size+1); + snprintf(str, size+1, "%llu", item->value.ul); + return str; + break; + + case VIR_TYPED_PARAM_DOUBLE: + size = snprintf(NULL, 0, "%f", item->value.d); + str = vshMalloc(ctl, size+1); + snprintf(str, size+1, "%f", item->value.d); + return str; + break; + + case VIR_TYPED_PARAM_BOOLEAN: + size = snprintf(NULL, 0, "%s", item->value.b ? _("yes") : _("no")); + str = vshMalloc(ctl, size+1); + snprintf(str, size+1, "%s", item->value.b ? _("yes") : _("no")); + return str; + break; + + default: + vshError(ctl, _("unimplemented block statistics parameter type")); + } + + return NULL; +} + +static virTypedParameterPtr +vshFindTypedParamByName(const char *name, virTypedParameterPtr list, int count) +{ + int i = count; + virTypedParameterPtr found = list; + + if (!list || !name) + return NULL; + + while (i-- > 0) { + if (STREQ(name, found->field)) + return found; + + found++; /* go to next struct in array */ + } + + /* not found */ + return NULL; +} + static const char * vshDomainControlStateToString(int state) { diff --git a/tools/virsh.pod b/tools/virsh.pod index 02726f3..edf451f 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -501,13 +501,31 @@ be lost once the guest stops running, but the snapshot contents still exist, and a new domain with the same name and UUID can restore the snapshot metadata with B<snapshot-create>. -=item B<domblkstat> I<domain> I<block-device> +=item B<domblkstat> I<domain> I<block-device> [I<--human>] Get device block stats for a running domain. A I<block-device> corresponds to a unique target name (<target dev='name'/>) or source file (<source file='name'/>) for one of the disk devices attached to I<domain> (see also B<domblklist> for listing these names). +Use I<--human> for a more human readable output. + +Availabilty of these fields depends on hypervisor. Unsupported fields are +missing from the output. Other fields may appear if comunicating with a newer +version of libvirtd. + +B<Explanation of fields> (fields appear in the folowing order): + rd_req - count of read operations + rd_bytes - count of read bytes + wr_req - count of write operations + wr_bytes - count of written bytes + errs - error count + flush_operations - count of flush operations + rd_total_times - total time read operations took (ns) + wr_total_times - total time write operations took (ns) + flush_total_times - total time flush operations took (ns) + <-- other fields provided by hypervisor --> + =item B<domifstat> I<domain> I<interface-device> Get network interface stats for a running domain. -- 1.7.3.4

2 5

[libvirt] [PATCH v2 5/5] vmx: avoid memory leak
by ajia＠redhat.com 19 Sep '11

19 Sep '11

* src/vmx/vmx.c: fix memory leak, 'def' has a initial value 'NULL', so 'goto cleanup' is perfected instead of adding a virConfFree before 'return NULL'. Signed-off-by: Alex Jia <ajia(a)redhat.com> --- src/vmx/vmx.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/vmx/vmx.c b/src/vmx/vmx.c index dff3599..be91c13 100644 --- a/src/vmx/vmx.c +++ b/src/vmx/vmx.c @@ -1253,7 +1253,7 @@ virVMXParseConfig(virVMXContext *ctx, virCapsPtr caps, const char *vmx) /* Allocate domain def */ if (VIR_ALLOC(def) < 0) { virReportOOMError(); - return NULL; + goto cleanup; } def->virtType = VIR_DOMAIN_VIRT_VMWARE; -- 1.7.1

2 1

[libvirt] [PATCH] Update to require sanlock 1.8 for license compliance
by Daniel P. Berrange 19 Sep '11

19 Sep '11

From: "Daniel P. Berrange" <berrange(a)redhat.com> Inexpicably the sanlock code all got placed under the GPLv2-only, so libvirt's use of sanlock introduces a license incompatibility. The sanlock developers have now rearranged the code such that there is a 'sanlock_client.so' which is LGPLv2+ while their daemon remains GPLv2-only. To use the new client library we need to call the new sanlock_init and sanlock_align APIs instead of sanlock_direct_init and sanlock_direct_align. These APIs calls are now routed via the sanlock daemon, instead of doing direct I/O calls to disk. For all this we require sanlock >= 1.8 * configure.ac: Check for sanlock_client.so instead of sanlock.so and fix various comments * libvirt.spec.in: Mandate sanlock >= 1.8 * src/Makefile.am: Link to -lsanlock_client * src/locking/lock_driver_sanlock.c: Use sanlock_init and sanlock_align --- configure.ac | 10 +++++----- libvirt.spec.in | 4 ++-- src/Makefile.am | 2 +- src/locking/lock_driver_sanlock.c | 9 ++++----- 4 files changed, 12 insertions(+), 13 deletions(-) diff --git a/configure.ac b/configure.ac index ad9d754..4208cfa 100644 --- a/configure.ac +++ b/configure.ac @@ -966,7 +966,7 @@ AC_SUBST([YAJL_LIBS]) dnl SANLOCK https://fedorahosted.org/sanlock/ AC_ARG_WITH([sanlock], - AC_HELP_STRING([--with-sanlock], [use SANLOCK for lock management @<:@default=check@:>@]), + AC_HELP_STRING([--with-sanlock], [build Sanlock plugin for lock management @<:@default=check@:>@]), [], [with_sanlock=check]) @@ -989,8 +989,8 @@ if test "x$with_sanlock" != "xno"; then fail=1 fi]) if test "x$with_sanlock" != "xno" ; then - AC_CHECK_LIB([sanlock], [sanlock_restrict],[ - SANLOCK_LIBS="$SANLOCK_LIBS -lsanlock" + AC_CHECK_LIB([sanlock_client], [sanlock_init],[ + SANLOCK_LIBS="$SANLOCK_LIBS -lsanlock_client" with_sanlock=yes ],[ if test "x$with_sanlock" = "xcheck" ; then @@ -1001,12 +1001,12 @@ if test "x$with_sanlock" != "xno"; then ]) fi test $fail = 1 && - AC_MSG_ERROR([You must install the SANLOCK development package in order to compile libvirt]) + AC_MSG_ERROR([You must install the Sanlock development package in order to compile libvirt]) CPPFLAGS="$old_cppflags" LIBS="$old_libs" if test "x$with_sanlock" = "xyes" ; then AC_DEFINE_UNQUOTED([HAVE_SANLOCK], 1, - [whether SANLOCK is available for JSON parsing/formatting]) + [whether Sanlock plugin for lock management is available]) fi fi AM_CONDITIONAL([HAVE_SANLOCK], [test "x$with_sanlock" = "xyes"]) diff --git a/libvirt.spec.in b/libvirt.spec.in index 25e521c..f3f6722 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -354,7 +354,7 @@ BuildRequires: libpciaccess-devel >= 0.10.9 BuildRequires: yajl-devel %endif %if %{with_sanlock} -BuildRequires: sanlock-devel +BuildRequires: sanlock-devel >= 1.8 %endif %if %{with_libpcap} BuildRequires: libpcap-devel @@ -518,7 +518,7 @@ the virtualization capabilities of recent versions of Linux (and other OSes). %package lock-sanlock Summary: Sanlock lock manager plugin for QEMU driver Group: Development/Libraries -Requires: sanlock +Requires: sanlock >= 1.8 #for virt-sanlock-cleanup require augeas Requires: augeas Requires: %{name} = %{version}-%{release} diff --git a/src/Makefile.am b/src/Makefile.am index 9a903ea..738ee91 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1279,7 +1279,7 @@ lockdriver_LTLIBRARIES = sanlock.la sanlock_la_SOURCES = $(LOCK_DRIVER_SANLOCK_SOURCES) sanlock_la_CFLAGS = $(AM_CLFAGS) sanlock_la_LDFLAGS = -module -avoid-version -sanlock_la_LIBADD = -lsanlock \ +sanlock_la_LIBADD = -lsanlock_client \ ../gnulib/lib/libgnu.la augeas_DATA += locking/libvirt_sanlock.aug diff --git a/src/locking/lock_driver_sanlock.c b/src/locking/lock_driver_sanlock.c index b93fe01..2d72510 100644 --- a/src/locking/lock_driver_sanlock.c +++ b/src/locking/lock_driver_sanlock.c @@ -33,7 +33,6 @@ #include <sanlock.h> #include <sanlock_resource.h> -#include <sanlock_direct.h> #include <sanlock_admin.h> #include "lock_driver.h" @@ -181,7 +180,7 @@ static int virLockManagerSanlockSetupLockspace(void) } VIR_DEBUG("Someone else just created lockspace %s", path); } else { - if ((rv = sanlock_direct_align(&ls.host_id_disk)) < 0) { + if ((rv = sanlock_align(&ls.host_id_disk)) < 0) { if (rv <= -200) virLockError(VIR_ERR_INTERNAL_ERROR, _("Unable to query sector size %s: error %d"), @@ -210,7 +209,7 @@ static int virLockManagerSanlockSetupLockspace(void) goto error_unlink; } - if ((rv = sanlock_direct_init(&ls, NULL, 0, 0, 0)) < 0) { + if ((rv = sanlock_init(&ls, NULL, 0, 0)) < 0) { if (rv <= -200) virLockError(VIR_ERR_INTERNAL_ERROR, _("Unable to initialize lockspace %s: error %d"), @@ -555,7 +554,7 @@ static int virLockManagerSanlockCreateLease(struct sanlk_resource *res) } VIR_DEBUG("Someone else just created lockspace %s", res->disks[0].path); } else { - if ((rv = sanlock_direct_align(&res->disks[0])) < 0) { + if ((rv = sanlock_align(&res->disks[0])) < 0) { if (rv <= -200) virLockError(VIR_ERR_INTERNAL_ERROR, _("Unable to query sector size %s: error %d"), @@ -584,7 +583,7 @@ static int virLockManagerSanlockCreateLease(struct sanlk_resource *res) goto error_unlink; } - if ((rv = sanlock_direct_init(NULL, res, 0, 0, 0)) < 0) { + if ((rv = sanlock_init(NULL, res, 0, 0)) < 0) { if (rv <= -200) virLockError(VIR_ERR_INTERNAL_ERROR, _("Unable to initialize lease %s: error %d"), -- 1.7.6

2 1

[libvirt] [PATCH] spec: Require augeas for sanlock
by Michal Privoznik 19 Sep '11

19 Sep '11

Even though we BuildRequire augeas in some cases, we need to require it even after if we build with sanlock. virt-sanlock-cleanup use it. --- libvirt.spec.in | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 648b50f..4d69c77 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -354,6 +354,8 @@ BuildRequires: libpciaccess-devel >= 0.10.9 BuildRequires: yajl-devel %endif %if %{with_sanlock} +#for virt-sanlock-cleanup +Requires: augeas BuildRequires: sanlock-devel %endif %if %{with_libpcap} -- 1.7.3.4

3 7

[libvirt] [PATCH v6] virsh: Add more human-friendly output of domblkstat command
by Peter Krempa 19 Sep '11

19 Sep '11

Users of virsh complain that output of the domblkstat command is not intuitive enough. This patch adds explanation of fields returned by this command to the help section for domblkstat and the man page of virsh. Also a switch --human is added for domblkstat that prints the fields with more descriptive texts. This patch also changes sequence of the output fields and their names back to the order and spelling established by previous versions of virsh to mantain compatibility with scripts. https://bugzilla.redhat.com/show_bug.cgi?id=731656 Changes to v5: - Do not fix VIR_ERR_RPC failure of this function (unknown procedure 243) ( will be fixed in a separate patch adressing more similar errors) - Clean up legacy printout using a macro - Remove newlines from "desc" in vshCmdInfo - use calloc() instead of malloc() + memset(..., 0, ...) Changes to v4: - Fields are printed in order established by previous versions - Fix translation macros - Run old api unconditionaly (while comunicating with old libvirtd "error: unknown procedure: 243" occured) - Remove redundant field description from command help and add reference to man page. - Fix formating (unnecessary space after function name) - Fix man page, mentioning that fields may be missig. Changes to v3: - Add units to duration values - Add missing write doc/stranslation - Add translation from new api names to legacy names used in previous versions in virsh Changes to v2: - Modify for new fields in virDomainBlockStatsFlags Changes to v1: - Rebase to current head --- IMHO this patch is worth getting into 0.9.5 as it fixes the changed output order since addition of the new api, and translates field names into those that have been used in previous versions. tools/virsh.c | 236 +++++++++++++++++++++++++++++++++++++++++------------- tools/virsh.pod | 20 +++++- 2 files changed, 198 insertions(+), 58 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index d575425..6f190b0 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -369,6 +369,8 @@ static const char *vshDomainStateReasonToString(int state, int reason); static const char *vshDomainControlStateToString(int state); static const char *vshDomainVcpuStateToString(int state); static bool vshConnectionUsability(vshControl *ctl, virConnectPtr conn); +static virTypedParameterPtr vshFindTypedParamByName(const char *name, virTypedParameterPtr list, int count); +static char *vshGetTypedParamValue(vshControl *ctl, virTypedParameterPtr item); static char *editWriteToTempFile (vshControl *ctl, const char *doc); static int editFile (vshControl *ctl, const char *filename); @@ -1054,16 +1056,43 @@ cleanup: */ static const vshCmdInfo info_domblkstat[] = { {"help", N_("get device block stats for a domain")}, - {"desc", N_("Get device block stats for a running domain.")}, + {"desc", N_("Get device block stats for a running domain. See man page or use --human for explanation of fields")}, {NULL,NULL} }; static const vshCmdOptDef opts_domblkstat[] = { {"domain", VSH_OT_DATA, VSH_OFLAG_REQ, N_("domain name, id or uuid")}, {"device", VSH_OT_DATA, VSH_OFLAG_REQ, N_("block device")}, + {"human", VSH_OT_BOOL, 0, N_("print a more human readable output")}, {NULL, 0, 0, NULL} }; +struct _domblkstat_sequence { + const char *field; /* field name */ + const char *legacy; /* legacy name from previous releases */ + const char *human; /* human-friendly explanation */ +}; + +/* sequence of values for output to honor legacy format from previous versions */ +static const struct _domblkstat_sequence domblkstat_output[] = { + { VIR_DOMAIN_BLOCK_STATS_READ_REQ, "rd_req", N_("number of read operations: ") }, /* 0 */ + { VIR_DOMAIN_BLOCK_STATS_READ_BYTES, "rd_bytes", N_("number of read bytes: ") }, /* 1 */ + { VIR_DOMAIN_BLOCK_STATS_WRITE_REQ, "wr_req", N_("number of write operations: ") }, /* 2 */ + { VIR_DOMAIN_BLOCK_STATS_WRITE_BYTES, "wr_bytes", N_("number of bytes written: ") }, /* 3 */ + { VIR_DOMAIN_BLOCK_STATS_ERRS, "errs", N_("error count: ") }, /* 4 */ + { VIR_DOMAIN_BLOCK_STATS_FLUSH_REQ, NULL, N_("number of flush operations: ") }, /* 5 */ + { VIR_DOMAIN_BLOCK_STATS_READ_TOTAL_TIMES, NULL, N_("total duration of reads (ns): ") }, /* 6 */ + { VIR_DOMAIN_BLOCK_STATS_WRITE_TOTAL_TIMES, NULL, N_("total duration of writes (ns): ") }, /* 7 */ + { VIR_DOMAIN_BLOCK_STATS_FLUSH_TOTAL_TIMES, NULL, N_("total duration of flushes (ns):") }, /* 8 */ + { NULL, NULL, NULL } +}; + +#define DOMBLKSTAT_LEGACY_PRINT(ID, VALUE) \ + if (VALUE >= 0) \ + vshPrint(ctl, "%s %s %lld\n", device, \ + human?_(domblkstat_output[ID].human):domblkstat_output[ID].legacy\ + VALUE); + static bool cmdDomblkstat (vshControl *ctl, const vshCmd *cmd) { @@ -1071,8 +1100,13 @@ cmdDomblkstat (vshControl *ctl, const vshCmd *cmd) const char *name = NULL, *device = NULL; struct _virDomainBlockStats stats; virTypedParameterPtr params = NULL; + virTypedParameterPtr par = NULL; + char *value = NULL; + const char *field = NULL; int rc, nparams = 0; + int i = 0; bool ret = false; + bool human = vshCommandOptBool(cmd, "human"); /* enable human readable output */ if (!vshConnectionUsability (ctl, ctl->conn)) return false; @@ -1090,76 +1124,84 @@ cmdDomblkstat (vshControl *ctl, const vshCmd *cmd) * then. */ if (rc < 0) { - if (last_error->code != VIR_ERR_NO_SUPPORT) { - virshReportError(ctl); + /* try older API if newer is not supported */ + if (last_error->code != VIR_ERR_NO_SUPPORT) goto cleanup; - } else { - virFreeError(last_error); - last_error = NULL; - - if (virDomainBlockStats (dom, device, &stats, - sizeof stats) == -1) { - vshError(ctl, _("Failed to get block stats %s %s"), - name, device); - goto cleanup; - } - - if (stats.rd_req >= 0) - vshPrint (ctl, "%s rd_req %lld\n", device, stats.rd_req); - if (stats.rd_bytes >= 0) - vshPrint (ctl, "%s rd_bytes %lld\n", device, stats.rd_bytes); - - if (stats.wr_req >= 0) - vshPrint (ctl, "%s wr_req %lld\n", device, stats.wr_req); + virFreeError(last_error); + last_error = NULL; - if (stats.wr_bytes >= 0) - vshPrint (ctl, "%s wr_bytes %lld\n", device, stats.wr_bytes); + if (virDomainBlockStats (dom, device, &stats, + sizeof stats) == -1) { + vshError(ctl, _("Failed to get block stats %s %s"), + name, device); + goto cleanup; + } - if (stats.errs >= 0) - vshPrint (ctl, "%s errs %lld\n", device, stats.errs); + /* human friendly output */ + if (human) { + vshPrint(ctl, N_("Device: %s\n"), device); + device = ""; } + + DOMBLKSTAT_LEGACY_PRINT(0, stats.rd_req); + DOMBLKSTAT_LEGACY_PRINT(1, stats.rd_bytes); + DOMBLKSTAT_LEGACY_PRINT(2, stats.wr_req); + DOMBLKSTAT_LEGACY_PRINT(3, stats.wr_bytes); + DOMBLKSTAT_LEGACY_PRINT(4, stats.errs); } else { - params = vshMalloc(ctl, sizeof(*params) * nparams); - memset(params, 0, sizeof(*params) * nparams); + params = vshCalloc(ctl, nparams, sizeof(*params)); if (virDomainBlockStatsFlags (dom, device, params, &nparams, 0) < 0) { vshError(ctl, _("Failed to get block stats %s %s"), name, device); goto cleanup; } - int i; - /* XXX: The output sequence will be different. */ + /* set for prettier output */ + if (human) { + vshPrint(ctl, N_("Device: %s\n"), device); + device = ""; + } + + /* at first print all known values in desired order */ + for (i = 0; domblkstat_output[i].field != NULL; i++) { + if (!(par = vshFindTypedParamByName(domblkstat_output[i].field, + params, + nparams))) + continue; + + if (!(value = vshGetTypedParamValue(ctl, par))) + continue; + + /* to print other not supported fields, mark the already printed */ + par->field[0] = '\0'; /* set the name to empty string */ + + /* translate into human readable or legacy spelling */ + field = NULL; + if (human) + field = _(domblkstat_output[i].human); + else + field = domblkstat_output[i].legacy; + + /* use the provided spelling if no translation is available */ + if (!field) + field = domblkstat_output[i].field; + + vshPrint(ctl, "%s %s %s\n", device, field, value); + + VIR_FREE(value); + } + + /* go through the fields again, looking for fields that were not printed*/ for (i = 0; i < nparams; i++) { - switch(params[i].type) { - case VIR_TYPED_PARAM_INT: - vshPrint (ctl, "%s %s %d\n", device, - params[i].field, params[i].value.i); - break; - case VIR_TYPED_PARAM_UINT: - vshPrint (ctl, "%s %s %u\n", device, - params[i].field, params[i].value.ui); - break; - case VIR_TYPED_PARAM_LLONG: - vshPrint (ctl, "%s %s %lld\n", device, - params[i].field, params[i].value.l); - break; - case VIR_TYPED_PARAM_ULLONG: - vshPrint (ctl, "%s %s %llu\n", device, - params[i].field, params[i].value.ul); - break; - case VIR_TYPED_PARAM_DOUBLE: - vshPrint (ctl, "%s %s %f\n", device, - params[i].field, params[i].value.d); - break; - case VIR_TYPED_PARAM_BOOLEAN: - vshPrint (ctl, "%s %s %s\n", device, - params[i].field, params[i].value.b ? _("yes") : _("no")); - break; - default: - vshError(ctl, _("unimplemented block statistics parameter type")); - } + if (strlen(params[i].field) == 0) + continue; + if (!(value = vshGetTypedParamValue(ctl, params+i))) + continue; + + vshPrint(ctl, "%s %s %s\n", device, params[i].field, value); + VIR_FREE(value); } } @@ -1170,6 +1212,7 @@ cleanup: virDomainFree(dom); return ret; } +#undef DOMBLKSTAT_LEGACY_PRINT /* "domifstat" command */ @@ -15202,6 +15245,85 @@ vshDomainStateReasonToString(int state, int reason) return N_("unknown"); } +static char * +vshGetTypedParamValue(vshControl *ctl, virTypedParameterPtr item) +{ + int size = 0; + char *str = NULL; + + if (!ctl || !item) + return NULL; + + switch(item->type) { + case VIR_TYPED_PARAM_INT: + size = snprintf(NULL, 0, "%d", item->value.i); + str = vshMalloc(ctl, size+1); + snprintf(str, size+1, "%d", item->value.i); + return str; + break; + + case VIR_TYPED_PARAM_UINT: + size = snprintf(NULL, 0, "%u", item->value.ui); + str = vshMalloc(ctl, size+1); + snprintf(str, size+1, "%u", item->value.ui); + return str; + break; + + case VIR_TYPED_PARAM_LLONG: + size = snprintf(NULL, 0, "%lld", item->value.l); + str = vshMalloc(ctl, size+1); + snprintf(str, size+1, "%lld", item->value.l); + return str; + break; + + case VIR_TYPED_PARAM_ULLONG: + size = snprintf(NULL, 0, "%llu", item->value.ul); + str = vshMalloc(ctl, size+1); + snprintf(str, size+1, "%llu", item->value.ul); + return str; + break; + + case VIR_TYPED_PARAM_DOUBLE: + size = snprintf(NULL, 0, "%f", item->value.d); + str = vshMalloc(ctl, size+1); + snprintf(str, size+1, "%f", item->value.d); + return str; + break; + + case VIR_TYPED_PARAM_BOOLEAN: + size = snprintf(NULL, 0, "%s", item->value.b ? _("yes") : _("no")); + str = vshMalloc(ctl, size+1); + snprintf(str, size+1, "%s", item->value.b ? _("yes") : _("no")); + return str; + break; + + default: + vshError(ctl, _("unimplemented block statistics parameter type")); + } + + return NULL; +} + +static virTypedParameterPtr +vshFindTypedParamByName(const char *name, virTypedParameterPtr list, int count) +{ + int i = count; + virTypedParameterPtr found = list; + + if (!list || !name) + return NULL; + + while (i-- > 0) { + if (STREQ(name, found->field)) + return found; + + found++; /* go to next struct in array */ + } + + /* not found */ + return NULL; +} + static const char * vshDomainControlStateToString(int state) { diff --git a/tools/virsh.pod b/tools/virsh.pod index 02726f3..edf451f 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -501,13 +501,31 @@ be lost once the guest stops running, but the snapshot contents still exist, and a new domain with the same name and UUID can restore the snapshot metadata with B<snapshot-create>. -=item B<domblkstat> I<domain> I<block-device> +=item B<domblkstat> I<domain> I<block-device> [I<--human>] Get device block stats for a running domain. A I<block-device> corresponds to a unique target name (<target dev='name'/>) or source file (<source file='name'/>) for one of the disk devices attached to I<domain> (see also B<domblklist> for listing these names). +Use I<--human> for a more human readable output. + +Availabilty of these fields depends on hypervisor. Unsupported fields are +missing from the output. Other fields may appear if comunicating with a newer +version of libvirtd. + +B<Explanation of fields> (fields appear in the folowing order): + rd_req - count of read operations + rd_bytes - count of read bytes + wr_req - count of write operations + wr_bytes - count of written bytes + errs - error count + flush_operations - count of flush operations + rd_total_times - total time read operations took (ns) + wr_total_times - total time write operations took (ns) + flush_total_times - total time flush operations took (ns) + <-- other fields provided by hypervisor --> + =item B<domifstat> I<domain> I<interface-device> Get network interface stats for a running domain. -- 1.7.3.4

1 1

[libvirt] [RFC] API to invoke S3/S4 on a KVM host and also resume from within libvirt
by Srivatsa S. Bhat 19 Sep '11

19 Sep '11

Hi, In order to exploit the host power management capabilities like S3/S4, it was proposed to add additional tags in the libvirt capabilities XML to export the power management features supported by the host. The v5 of the RFC patch is here: http://www.redhat.com/archives/libvir-list/2011-August/msg00324.html. It was also decided that it would be better to invoke S3/S4 and resume the host, from within libvirt, instead of doing it out-of-band. And it was agreed upon that an RTC wake up mechanism to resume the host from sleep would be best suited for doing the resume in-band. The discussion can be found here: http://www.redhat.com/archives/libvir-list/2011-August/msg00327.html An API for this was initially discussed here: http://www.redhat.com/archives/libvir-list/2011-August/msg00248.html One of the key challenges in implementing the API is that it has to return success to the caller before the host gets suspended, otherwise the connection will get terminated and hence the status cannot be sent across to the caller. So to achieve this, we would need some kind of asynchronous mechanism. Here are some ideas on how to go about doing this: 1. Using the virCommandRunAsync() API to run the rtcwake command. For example, int virNodeSuspendForDuration(virConnectPtr conn, unsigned flags, long duration) { virCommandPtr cmd; //Build up the rtcwake command with appropriate arguments, in 'cmd' virCommandRunAsync(cmd, NULL); return 0; //Success } Issues with this approach: We cannot be sure that the node will not get suspended before returning the status to the caller. 2. Using a timeout to delay the invocation of suspend. We can use a pre-exec-hook to cause that delay. For example, int delay = 5; //in seconds int virNodeSuspendForDuration(virConnectPtr conn, unsigned flags, long duration) { virCommandPtr cmd; //Build up the rtcwake command with appropriate arguments, in 'cmd' virCommandSetPreExecHook(cmd, virNodeSuspendHook, &delay); virCommandRunAsync(cmd, NULL); return 0; //Success } int virNodeSuspendHook(void *data) { int *delay = data; /* Just delay for some time */ sleep(*delay); return 0; } Issues with this approach: We may have to choose the delay value based on heuristics. But I don't see any serious downsides to this as long as the delay is a suitably large value. Please let me know your suggestions. -- Regards, Srivatsa S. Bhat <srivatsa.bhat(a)linux.vnet.ibm.com> Linux Technology Center, IBM India Systems and Technology Lab

2 1

[libvirt] [PATCH] virsh: Use old API if remote libvirtd does not support new
by Peter Krempa 18 Sep '11

18 Sep '11

Commit ffe28ab74b821c916ec4ba8efb5c992454e4bd24 introduced regression while comunicating with older libvirtd command 'domblkstat' used the new API and did not check for VIR_ERR_RPC error code signalling the remote server does not support this API and did not fall back to older API. Thereafter 'domblkstat' ended with "error: unknown procedure: 243". --- footnote: Will not apply along with: [libvirt] [PATCH v5] virsh: Add more human-friendly output of domblkstat command as that path does fix this bug. tools/virsh.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index 3b060bf..430168c 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -1090,7 +1090,8 @@ cmdDomblkstat (vshControl *ctl, const vshCmd *cmd) * then. */ if (rc < 0) { - if (last_error->code != VIR_ERR_NO_SUPPORT) { + if (last_error->code != VIR_ERR_NO_SUPPORT && + last_error->code != VIR_ERR_RPC) { virshReportError(ctl); goto cleanup; } else { -- 1.7.3.4

3 8

[libvirt] [PATCH] Fix buzzilla 738778
by Stefan Berger 17 Sep '11

17 Sep '11

This patch fixes the bug shown in bugzilla 738778. It's not an nwfilter problem but a connection sharing / closure issue. https://bugzilla.redhat.com/show_bug.cgi?id=738778 Depending on the speed / #CPUs of the machine you are using you may not see this bug all the time. Signed-off-by: Stefan Berger <stefanb(a)linux.vnet.ibm.com> diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index f8a8475..1991777 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -2539,6 +2539,10 @@ struct qemuProcessReconnectData { /* * Open an existing VM's monitor, re-detect VCPU threads * and re-reserve the security labels in use + * + * We own the virConnectPtr we are passed here - whoever started + * this thread function has increased the reference counter to it + * so that we now have to close it. */ static void qemuProcessReconnect(void *opaque) @@ -2632,6 +2636,8 @@ qemuProcessReconnect(void *opaque) qemuDriverUnlock(driver); + virConnectClose(conn); + return; error: @@ -2656,6 +2662,8 @@ error: virDomainObjUnlock(obj); } qemuDriverUnlock(driver); + + virConnectClose(conn); } static void @@ -2706,7 +2714,16 @@ qemuProcessReconnectHelper(void *payload, if (qemuDomainObjBeginJobWithDriver(src->driver, obj, QEMU_JOB_MODIFY) < 0) goto error; + /* Since we close the connection later on, we have to make sure + * that the threads we start see a valid connection throughout their + * lifetime. We simply increase the reference counter here. + */ + virConnectRef(data->conn); + if (virThreadCreate(&thread, true, qemuProcessReconnect, data) < 0) { + + virConnectClose(data->conn); + qemuReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Could not create thread. QEMU initialization " "might be incomplete"));

3 3

[libvirt] [PATCH] qemu: add return value check
by ajia＠redhat.com 17 Sep '11

17 Sep '11

From: Alex Jia <ajia(a)redhat.com> * src/qemu/qemu_command.c: missing return value check. Signed-off-by: Alex Jia <ajia(a)redhat.com> --- src/qemu/qemu_command.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 5f0de40..e8b1157 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -1702,7 +1702,8 @@ qemuBuildDriveDevStr(virDomainDiskDefPtr disk, virBufferAsprintf(&opt, ",event_idx=%s", virDomainVirtioEventIdxTypeToString(disk->event_idx)); } - qemuBuildDeviceAddressStr(&opt, &disk->info, qemuCaps); + if (qemuBuildDeviceAddressStr(&opt, &disk->info, qemuCaps) < 0) + goto error; break; case VIR_DOMAIN_DISK_BUS_USB: virBufferAddLit(&opt, "usb-storage"); @@ -1781,7 +1782,9 @@ qemuBuildFSDevStr(virDomainFSDefPtr fs, virBufferAsprintf(&opt, ",id=%s", fs->info.alias); virBufferAsprintf(&opt, ",fsdev=%s%s", QEMU_FSDEV_HOST_PREFIX, fs->info.alias); virBufferAsprintf(&opt, ",mount_tag=%s", fs->dst); - qemuBuildDeviceAddressStr(&opt, &fs->info, qemuCaps); + + if (qemuBuildDeviceAddressStr(&opt, &fs->info, qemuCaps) < 0) + goto error; if (virBufferError(&opt)) { virReportOOMError(); -- 1.7.1

3 2

[libvirt] [PATCH] snapshot: affect persistent xml after disk snapshot
by Eric Blake 17 Sep '11

17 Sep '11

For external snapshots to be useful on persistent domains, we must alter the persistent definition alongside the running definition. Thanks to the possibility of disk hotplug as well as of edits that only affect the persistent xml, we can't assume that vm->def and vm->newDef have the same disk at the same index, so we can only update the persistent copy if the device destination matches up. * src/qemu/qemu_driver.c (qemuDomainSnapshotCreateDiskActive) (qemuDomainSnapshotCreateSingleDiskActive): Also affect newDef, if present. --- This is worth including in 0.9.5 - without it, the new feature of disk snapshots on a persistent domain are lost the moment the domain stops running, which is likely to cause data corruption for guests. I'm still trying to reproduce another reported snapshot failure: https://bugzilla.redhat.com/show_bug.cgi?id=738676 although I don't think this patch will help that issue. src/qemu/qemu_driver.c | 38 ++++++++++++++++++++++++++++++++------ 1 files changed, 32 insertions(+), 6 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 32f376ec..cbe28d8 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -9107,12 +9107,15 @@ static int qemuDomainSnapshotCreateSingleDiskActive(struct qemud_driver *driver, virDomainObjPtr vm, virDomainSnapshotDiskDefPtr snap, - virDomainDiskDefPtr disk) + virDomainDiskDefPtr disk, + virDomainDiskDefPtr persistDisk) { qemuDomainObjPrivatePtr priv = vm->privateData; char *device = NULL; char *source = NULL; char *driverType = NULL; + char *persistSource = NULL; + char *persistDriverType = NULL; int ret = -1; int fd = -1; char *origsrc = NULL; @@ -9128,7 +9131,11 @@ qemuDomainSnapshotCreateSingleDiskActive(struct qemud_driver *driver, if (virAsprintf(&device, "drive-%s", disk->info.alias) < 0 || !(source = strdup(snap->file)) || (STRNEQ_NULLABLE(disk->driverType, "qcow2") && - !(driverType = strdup("qcow2")))) { + !(driverType = strdup("qcow2"))) || + (persistDisk && + (!(persistSource = strdup(source)) || + (STRNEQ_NULLABLE(persistDisk->driverType, "qcow2") && + !(persistDriverType = strdup("qcow2")))))) { virReportOOMError(); goto cleanup; } @@ -9176,9 +9183,16 @@ qemuDomainSnapshotCreateSingleDiskActive(struct qemud_driver *driver, disk->driverType = driverType; driverType = NULL; } - - /* XXX Do we also need to update vm->newDef if there are pending - * configuration changes awaiting the next boot? */ + if (persistDisk) { + VIR_FREE(persistDisk->src); + persistDisk->src = persistSource; + persistSource = NULL; + if (persistDriverType) { + VIR_FREE(persistDisk->driverType); + persistDisk->driverType = persistDriverType; + persistDriverType = NULL; + } + } cleanup: if (origsrc) { @@ -9190,6 +9204,8 @@ cleanup: VIR_FREE(device); VIR_FREE(source); VIR_FREE(driverType); + VIR_FREE(persistSource); + VIR_FREE(persistDriverType); return ret; } @@ -9235,12 +9251,22 @@ qemuDomainSnapshotCreateDiskActive(virConnectPtr conn, * SNAPSHOT_EXTERNAL with a valid file name and qcow2 format. */ qemuDomainObjEnterMonitorWithDriver(driver, vm); for (i = 0; i < snap->def->ndisks; i++) { + virDomainDiskDefPtr persistDisk = NULL; + if (snap->def->disks[i].snapshot == VIR_DOMAIN_DISK_SNAPSHOT_NO) continue; + if (vm->newDef) { + int indx = virDomainDiskIndexByName(vm->newDef, + vm->def->disks[i]->dst, + false); + if (indx >= 0) + persistDisk = vm->newDef->disks[indx]; + } ret = qemuDomainSnapshotCreateSingleDiskActive(driver, vm, &snap->def->disks[i], - vm->def->disks[i]); + vm->def->disks[i], + persistDisk); if (ret < 0) break; } -- 1.7.4.4

2 3

[libvirt] [PATCH] snapshot: allow disk snapshots of qcow2 disks
by Eric Blake 17 Sep '11

17 Sep '11

For all types of disks other than qcow2, we were requesting that SELinux labeling visit the new file as if it were qcow2, which means labeling would try to find the backing files of an empty file. And for a pre-existing qcow2 disk, we were passing NULL, which meant that labelling tried to probe the file type (and if probing is disabled, per the default qemu.conf, this made snapshots fail). What we really want is to make SELinux labeling visit the new file as raw; it will later be converted to qcow2 if qemu successfully made the snapshot. * src/qemu/qemu_driver.c (qemuDomainSnapshotCreateSingleDiskActive): Force SELinux labeling to avoid probe of new file. --- Fixes https://bugzilla.redhat.com/show_bug.cgi?id=738676 I wonder why we are passing disk types as strings, instead of encoding them as an enum. Use of an enum would avoid my ugly hack of having to cast away const of my temporary assignment of a string. src/qemu/qemu_driver.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 2a1e5ea..e2f428f 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -9151,7 +9151,7 @@ qemuDomainSnapshotCreateSingleDiskActive(struct qemud_driver *driver, origsrc = disk->src; disk->src = source; origdriver = disk->driverType; - disk->driverType = driverType; + disk->driverType = (char *) "raw"; /* Don't want to probe backing files */ if (virDomainLockDiskAttach(driver->lockManager, vm, disk) < 0) goto cleanup; -- 1.7.4.4

2 2

[libvirt] [PATCH] spec: silence warnings when installing in F16
by Eric Blake 17 Sep '11

17 Sep '11

https://bugzilla.redhat.com/show_bug.cgi?id=738725 documents that 'yum install libvirt' in Fedora 16 is rather noisy. This fixes the problems. * libvirt.spec.in (%post client): Silence chkconfig warning about SysV services. (%post) [with_cgconfig]: Drop for Fedora 15 and newer, where systemd does this automatically. --- We should get this in before 0.9.5, but I'm just fuzzy enough with spec files that I'd prefer an ACK instead of invoking the trivial rule. libvirt.spec.in | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 19f91d7..25e521c 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -894,10 +894,14 @@ done %endif %if %{with_cgconfig} +# Starting with Fedora 15, systemd automounts all cgroups, and cgconfig is +# no longer a necessary service. +%if 0%{?fedora} <= 14 || 0%{?rhel} <= 6 if [ "$1" -eq "1" ]; then /sbin/chkconfig cgconfig on fi %endif +%endif /sbin/chkconfig --add libvirtd if [ "$1" -ge "1" ]; then @@ -926,7 +930,8 @@ fi /sbin/chkconfig --add libvirt-guests if [ $1 -ge 1 ]; then level=$(/sbin/runlevel | /bin/cut -d ' ' -f 2) - if /sbin/chkconfig --list libvirt-guests | /bin/grep -q $level:on ; then + if /sbin/chkconfig --list libvirt-guests 2>/dev/null \ + | /bin/grep -q $level:on ; then # this doesn't do anything but allowing for libvirt-guests to be # stopped on the first shutdown /sbin/service libvirt-guests start > /dev/null 2>&1 || true -- 1.7.4.4

2 2

[libvirt] [PATCH 0/3] Fix Mac OS X build issues (and probably also BSD)
by Peter Krempa 16 Sep '11

16 Sep '11

While compiling libvirt on a Mac OS X machine, the build failed tue to several reasons. This patchset fixes these issues and along with another patch that removes shadowed declarations of "devname" from stdlib.h on BSD based systems causes libvirt to compile cleanly. These patches were tested on v0.9.5-rc2 as I don't have the complete toolchain to do ./autogen.sh on a gitcheckout. Problems found: - fdatasync() is not supported on OS X. - Conditionaly compiled structure was left out but function using it was not. - OS X does not provide a 'mkfs' command, so the MKFS macro was not set. - /usr/include/stdlib.h exports 'devname' wildly used through libvirt Peter Krempa (3): build: storage: fdatasync() is not supported in Mac OS X. build: storage: Conditionaly compiled structure caused build fail on OSX build: storage: Macro 'MKFS' is undefined on some platforms. src/storage/storage_backend.c | 2 +- src/storage/storage_backend_fs.c | 15 +++++++++++++++ src/storage/storage_backend_fs.h | 3 ++- src/storage/storage_driver.c | 2 +- 4 files changed, 19 insertions(+), 3 deletions(-) -- 1.7.3.4

3 10

[libvirt] [PATCH] Prevent crash from dlclose() of libvirt.so
by Daniel P. Berrange 16 Sep '11

16 Sep '11

From: "Daniel P. Berrange" <berrange(a)redhat.com> When libvirt calls virInitialize it creates a thread local for the virErrorPtr storage, and registers a callback to cleanup memory when a thread exits. When libvirt is dlclose()d or otherwise made non-resident, the callback function is removed from memory, but the thread local may still exist and if a thread later exists, it will invoke the callback and SEGV. There may also be other thread locals with callbacks pointing to libvirt code, so it is in general never safe to unload libvirt.so from memory once initialized. To allow dlclose() to succeed, but keep libvirt.so resident in memory, link with '-z nodelete'. This issue was first found with the libvirt CIM provider, but can potentially hit many of the dynamic language bindings which all ultimately involve dlopen() in some way, either on libvirt.so itself, or on the glue code for the binding which in turns links to libvirt * configure.ac, src/Makefile.am: Ensure libvirt.so is linked with -z nodelete * tests/.gitignore, tests/Makefile.am, tests/shunloadhelper.c, tests/shunloadtest.c: A test case to unload libvirt while a thread is still running. --- configure.ac | 9 +++ src/Makefile.am | 2 +- tests/.gitignore | 3 + tests/Makefile.am | 14 ++++- tests/shunloadhelper.c | 51 ++++++++++++++++ tests/shunloadtest.c | 151 ++++++++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 228 insertions(+), 2 deletions(-) create mode 100644 tests/shunloadhelper.c create mode 100644 tests/shunloadtest.c diff --git a/configure.ac b/configure.ac index 3c08a19..148c1da 100644 --- a/configure.ac +++ b/configure.ac @@ -96,9 +96,18 @@ AM_PROG_LIBTOOL AM_PROG_CC_C_O AM_PROG_LD +AC_MSG_CHECKING([for how to mark DSO non-deletable at runtime]) +LIBVIRT_NODELETE= +`$LD --help 2>&1 | grep -- "-z nodelete" >/dev/null` && \ + LIBVIRT_NODELETE="-Wl,-z -Wl,nodelete" +AC_MSG_RESULT([$LIBVIRT_NODELETE]) +AC_SUBST([LIBVIRT_NODELETE]) + +AC_MSG_CHECKING([for how to set DSO symbol versions]) VERSION_SCRIPT_FLAGS=-Wl,--version-script= `$LD --help 2>&1 | grep -- --version-script >/dev/null` || \ VERSION_SCRIPT_FLAGS="-Wl,-M -Wl," +AC_MSG_RESULT([$VERSION_SCRIPT_FLAGS]) LIBVIRT_COMPILE_WARNINGS([maximum]) diff --git a/src/Makefile.am b/src/Makefile.am index 322c900..ae1b9e0 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1228,7 +1228,7 @@ libvirt_qemu.def: $(srcdir)/libvirt_qemu.syms libvirt_la_SOURCES = libvirt_la_LDFLAGS = $(VERSION_SCRIPT_FLAGS)$(LIBVIRT_SYMBOL_FILE) \ -version-info $(LIBVIRT_VERSION_INFO) \ - $(AM_LDFLAGS) \ + $(AM_LDFLAGS) $(LIBVIRT_NODELETE) \ $(CYGWIN_EXTRA_LDFLAGS) $(MINGW_EXTRA_LDFLAGS) libvirt_la_BUILT_LIBADD += ../gnulib/lib/libgnu.la libvirt_la_LIBADD += $(LIBXML_LIBS) \ diff --git a/tests/.gitignore b/tests/.gitignore index 7159c37..37ca034 100644 --- a/tests/.gitignore +++ b/tests/.gitignore @@ -1,6 +1,7 @@ *.exe .deps .libs +*.lo ssh commandhelper commandhelper.log @@ -41,3 +42,5 @@ xencapstest xmconfigtest xml2sexprtest xml2vmxtest +libshunload.la +shunloadtest diff --git a/tests/Makefile.am b/tests/Makefile.am index f4afcb9..cbbbc6f 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -89,7 +89,9 @@ check_PROGRAMS = virshtest conftest sockettest \ nodeinfotest qparamtest virbuftest \ commandtest commandhelper seclabeltest \ hashtest virnetmessagetest virnetsockettest ssh \ - utiltest virnettlscontexttest + utiltest virnettlscontexttest shunloadtest + +check_LTLIBRARIES = libshunload.la # This is a fake SSH we use from virnetsockettest ssh_SOURCES = ssh.c @@ -207,6 +209,7 @@ TESTS = virshtest \ virnetmessagetest \ virnetsockettest \ virnettlscontexttest \ + shunloadtest \ utiltest \ $(test_scripts) @@ -503,6 +506,15 @@ eventtest_SOURCES = \ eventtest_LDADD = -lrt $(LDADDS) endif +libshunload_la_SOURCES = shunloadhelper.c +libshunload_la_LIBADD = ../src/libvirt.la +libshunload_la_LDFLAGS = -module -avoid-version -rpath /evil/libtool/hack/to/force/shared/lib/creation + +shunloadtest_SOURCES = \ + shunloadtest.c +shunloadtest_LDADD = -lpthread +shunloadtest_DEPENDENCIES = libshunload.la + if WITH_CIL CILOPTFLAGS = CILOPTINCS = diff --git a/tests/shunloadhelper.c b/tests/shunloadhelper.c new file mode 100644 index 0000000..6cbf5f4 --- /dev/null +++ b/tests/shunloadhelper.c @@ -0,0 +1,51 @@ +/* + * Copyright (C) 2011 Red Hat, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + */ + +/* + * This is a helper for shunloadtest.c. This function is built into + * a shared library and linked with libvirto.so + * + * The function initializes libvirt and primes the thread local with + * an error which needs to be freed at thread exit + */ + +#include "internal.h" + +#include <libvirt/libvirt.h> +#include <libvirt/virterror.h> +#include <stdlib.h> + +static void shunloadError(void *userData ATTRIBUTE_UNUSED, + virErrorPtr error ATTRIBUTE_UNUSED) +{ +} + +void shunloadStart(void); + +void shunloadStart(void) { + virConnectPtr conn; + + virSetErrorFunc(NULL, shunloadError); + virInitialize(); + + conn = virConnectOpen("test:///default"); + virDomainDestroy(NULL); + if (conn) + virConnectClose(conn); +} diff --git a/tests/shunloadtest.c b/tests/shunloadtest.c new file mode 100644 index 0000000..cbcbf45 --- /dev/null +++ b/tests/shunloadtest.c @@ -0,0 +1,151 @@ +/* + * Copyright (C) 2011 Red Hat, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + */ + +/* + * When libvirt initializes, it creates a thread local for storing + * the last virErrorPtr instance. It also registers a cleanup + * callback for the thread local that will be invoked whenever + * a thread exits. + * + * If the libvirt.so library was dlopen()'d and is dlclose()'d + * while there is still a thread present, then when that thread + * later exits, the libvirt cleanup callback will be invoked. + * Unfortunately libvirt.so will no longer be in memory so the + * callback SEGVs (if you're lucky), or invokes unlreated + * code at the same address as the old callback (in you're + * unlucky). + * + * To fix the problem libvirt is linked '-z nodelete' which + * prevents the code being removed from memory at dlclose(). + * + * This test case demonstrates this SEGV scenario. If this + * test does not SEGV, then the '-z nodelete' fix is working + */ + +#ifdef linux + +#include <dlfcn.h> +#include <pthread.h> +#include <stdbool.h> +#include <stdio.h> +#include <unistd.h> +#include <signal.h> + +#include "internal.h" +#include "ignore-value.h" +#include "testutils.h" + +pthread_cond_t cond = PTHREAD_COND_INITIALIZER; +pthread_mutex_t lock = PTHREAD_MUTEX_INITIALIZER; +bool running = false; +bool quit = false; + +static void *threadMain(void *arg) +{ + void (*startup)(void) = arg; + + startup(); + + pthread_mutex_lock(&lock); + running = true; + pthread_cond_signal(&cond); + + while (!quit) { + pthread_cond_wait(&cond, &lock); + } + pthread_mutex_unlock(&lock); + + return NULL; +} + +static void sigHandler(int sig) +{ + ignore_value(write(STDERR_FILENO, "FAIL\n", 5)); + signal(sig, SIG_DFL); + raise(sig); +} + +/* We're not using the testutils.c main() wrapper because + * we don't want 'shunloadtest' itself to link against + * libvirt.so. We need to test dlopen()'ing of libvirt.so + */ +int main(int argc ATTRIBUTE_UNUSED, char **argv) +{ + void (*startup)(void); + pthread_t t; + void *lib; + char *theprogname; + + theprogname = argv[0]; + if (STRPREFIX(theprogname, "./")) + theprogname += 2; + + fprintf(stderr, "TEST: %s\n", theprogname); + fprintf(stderr, " .%*s 1 ", 39, ""); + signal(SIGSEGV, sigHandler); + + if (!(lib = dlopen("./.libs/libshunload.so", RTLD_NOW))) { + fprintf(stderr, "Cannot load ./.libs/libshunload.so %s\n", dlerror()); + return 1; + } + if (!(startup = dlsym(lib, "shunloadStart"))) { + fprintf(stderr, "Cannot find shunloadStart %s\n", dlerror()); + return 1; + } + + /* + * Create a thread which is going to initialize libvirt + * and raise an error + */ + pthread_create(&t, NULL, threadMain, startup); + + /* Wait for the thread to start and call libvirt */ + pthread_mutex_lock(&lock); + while (!running) { + pthread_cond_wait(&cond, &lock); + } + + /* Close the shared library (and thus make libvirt.so + * non-resident */ + dlclose(lib); + + /* Tell the thread to quit */ + quit = true; + pthread_cond_signal(&cond); + pthread_mutex_unlock(&lock); + + pthread_join(t, NULL); + + /* If we got to hear the thread succesfully exited without + * causing a SEGV ! + */ + + fprintf(stderr, "OK\n"); + + return 0; +} + +#else + +int main(void) +{ + return EXIT_AM_SKIP; +} + +#endif -- 1.7.6

2 2

[libvirt] [PATCH] qemu: avoid dereferencing a NULL pointer
by ajia＠redhat.com 16 Sep '11

16 Sep '11

From: Alex Jia <ajia(a)redhat.com> * src/qemu/qemu_migration.c: avoid dereferencing a pointer that might be null "vmdef" when calling virDomainSaveConfig. Signed-off-by: Alex Jia <ajia(a)redhat.com> --- src/qemu/qemu_migration.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index d9f8d93..69ced88 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -2510,7 +2510,8 @@ qemuMigrationFinish(struct qemud_driver *driver, if (vm->persistent) newVM = 0; vm->persistent = 1; - vmdef = virDomainObjGetPersistentDef(driver->caps, vm); + if (!(vmdef = virDomainObjGetPersistentDef(driver->caps, vm))) + goto endjob; if (virDomainSaveConfig(driver->configDir, vmdef) < 0) { /* Hmpf. Migration was successful, but making it persistent * was not. If we report successful, then when this domain -- 1.7.1

2 1

[libvirt] [PATCH 0/5] Improve Ceph Qemu+RBD support
by Sage Weil 16 Sep '11

16 Sep '11

The current support for qemu and Ceph RBD (rados block device) has two main deficiencies: authentication doesn't work, and it relies on environment variables (which don't work with latest upstream). This patch set addresses both those problems, while trying to integrate as cleanly as possible with the rest of libvirt. The first few patches make some changes to libvirt itself: adding a CEPH secret type (for Ceph/RBD authentication), adding authentication fields to the XML schema, passing the virConnectPtr into the Domain{Attach,Detach} methods (needed to access secrets while building the qemu command), a helper that will escape arbitrary characters, and finally a patch that replaces the current RBD qemu code. Comments on this approach? Thanks! sage Sage Weil (5): secret: add Ceph secret type storage: add authId, authDomain to virDomainDiskDef qemu: pass virConnectPtr into Domain{Attach,Detach}* buf: implement generic virBufferEscape qemu/rbd: improve rbd device specification include/libvirt/libvirt.h.in | 3 + src/conf/domain_conf.c | 43 +++- src/conf/domain_conf.h | 2 + src/conf/secret_conf.c | 45 ++++- src/conf/secret_conf.h | 1 + src/libvirt_private.syms | 1 + src/qemu/qemu_command.c | 273 +++++++++++--------- src/qemu/qemu_command.h | 3 +- src/qemu/qemu_driver.c | 17 +- src/qemu/qemu_hotplug.c | 15 +- src/qemu/qemu_hotplug.h | 9 +- src/secret/secret_driver.c | 8 + src/util/buf.c | 33 ++- src/util/buf.h | 1 + .../qemuxml2argv-disk-drive-network-rbd.args | 6 +- .../qemuxml2argv-disk-drive-network-rbd.xml | 1 + 16 files changed, 305 insertions(+), 156 deletions(-) -- 1.7.4.1

3 9

[libvirt] [PATCH] qemu: Introduce shutdown reason for paused state
by Jiri Denemark 16 Sep '11

16 Sep '11

Qemu sends STOP event as part of the shutdown process. Detect such STOP event and consider shutdown to be reason of emitting such event. That's the best we can do until qemu provides us the reason directly in STOP event. This allows us to report shutdown reason for paused state so that apps can detect domains that failed to finish the shutdown process (e.g., because qemu is buggy and doesn't exit on SIGTERM or it is blocked in flushing disk buffers). --- include/libvirt/libvirt.h.in | 1 + src/conf/domain_conf.c | 5 +++-- src/libvirt_private.syms | 12 ++++++++++++ src/qemu/qemu_process.c | 14 +++++++++++--- tools/virsh.c | 2 ++ 5 files changed, 29 insertions(+), 5 deletions(-) diff --git a/include/libvirt/libvirt.h.in b/include/libvirt/libvirt.h.in index ea7b3fc..39155a6 100644 --- a/include/libvirt/libvirt.h.in +++ b/include/libvirt/libvirt.h.in @@ -124,6 +124,7 @@ typedef enum { VIR_DOMAIN_PAUSED_IOERROR = 5, /* paused due to a disk I/O error */ VIR_DOMAIN_PAUSED_WATCHDOG = 6, /* paused due to a watchdog event */ VIR_DOMAIN_PAUSED_FROM_SNAPSHOT = 7, /* paused after restoring from snapshot */ + VIR_DOMAIN_PAUSED_SHUTTING_DOWN = 8, /* paused during shutdown process */ } virDomainPausedReason; typedef enum { diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index ea6b581..ad2a730 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -487,7 +487,7 @@ VIR_ENUM_IMPL(virDomainRunningReason, VIR_DOMAIN_RUNNING_LAST, VIR_ENUM_IMPL(virDomainBlockedReason, VIR_DOMAIN_BLOCKED_LAST, "unknown") -#define VIR_DOMAIN_PAUSED_LAST (VIR_DOMAIN_PAUSED_FROM_SNAPSHOT + 1) +#define VIR_DOMAIN_PAUSED_LAST (VIR_DOMAIN_PAUSED_SHUTTING_DOWN + 1) VIR_ENUM_IMPL(virDomainPausedReason, VIR_DOMAIN_PAUSED_LAST, "unknown", "user", @@ -496,7 +496,8 @@ VIR_ENUM_IMPL(virDomainPausedReason, VIR_DOMAIN_PAUSED_LAST, "dump", "ioerror", "watchdog", - "from snapshot") + "from snapshot", + "shutdown") #define VIR_DOMAIN_SHUTDOWN_LAST (VIR_DOMAIN_SHUTDOWN_USER + 1) VIR_ENUM_IMPL(virDomainShutdownReason, VIR_DOMAIN_SHUTDOWN_LAST, diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index e45965e..8235ea1 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -231,6 +231,8 @@ virDiskNameToBusDeviceIndex; virDiskNameToIndex; virDomainActualNetDefFree; virDomainAssignDef; +virDomainBlockedReasonTypeFromString; +virDomainBlockedReasonTypeToString; virDomainChrConsoleTargetTypeFromString; virDomainChrConsoleTargetTypeToString; virDomainChrDefForeach; @@ -360,6 +362,8 @@ virDomainNetIndexByMac; virDomainNetInsert; virDomainNetRemoveByMac; virDomainNetTypeToString; +virDomainNostateReasonTypeFromString; +virDomainNostateReasonTypeToString; virDomainNumatuneMemModeTypeFromString; virDomainNumatuneMemModeTypeToString; virDomainObjAssignDef; @@ -379,12 +383,20 @@ virDomainObjSetState; virDomainObjTaint; virDomainObjUnlock; virDomainObjUnref; +virDomainPausedReasonTypeFromString; +virDomainPausedReasonTypeToString; virDomainRedirdevBusTypeFromString; virDomainRedirdevBusTypeToString; virDomainRemoveInactive; +virDomainRunningReasonTypeFromString; +virDomainRunningReasonTypeToString; virDomainSaveConfig; virDomainSaveStatus; virDomainSaveXML; +virDomainShutdownReasonTypeFromString; +virDomainShutdownReasonTypeToString; +virDomainShutoffReasonTypeFromString; +virDomainShutoffReasonTypeToString; virDomainSmartcardDefForeach; virDomainSmartcardDefFree; virDomainSmartcardTypeFromString; diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index dbd697d..4de7ab5 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -473,14 +473,22 @@ qemuProcessHandleStop(qemuMonitorPtr mon ATTRIBUTE_UNUSED, { struct qemud_driver *driver = qemu_driver; virDomainEventPtr event = NULL; + virDomainPausedReason reason = VIR_DOMAIN_PAUSED_UNKNOWN; virDomainObjLock(vm); if (virDomainObjGetState(vm, NULL) == VIR_DOMAIN_RUNNING) { qemuDomainObjPrivatePtr priv = vm->privateData; - VIR_DEBUG("Transitioned guest %s to paused state due to unknown event", - vm->def->name); - virDomainObjSetState(vm, VIR_DOMAIN_PAUSED, VIR_DOMAIN_PAUSED_UNKNOWN); + if (priv->gotShutdown) { + VIR_DEBUG("Got STOP event after SHUTDOWN, assuming we are stopping" + " for shutdown"); + reason = VIR_DOMAIN_PAUSED_SHUTTING_DOWN; + } + + VIR_DEBUG("Transitioned guest %s to paused state, reason=%s", + vm->def->name, virDomainPausedReasonTypeToString(reason)); + + virDomainObjSetState(vm, VIR_DOMAIN_PAUSED, reason); event = virDomainEventNewFromObj(vm, VIR_DOMAIN_EVENT_SUSPENDED, VIR_DOMAIN_EVENT_SUSPENDED_PAUSED); diff --git a/tools/virsh.c b/tools/virsh.c index 3c6e65a..8d257bc 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -15137,6 +15137,8 @@ vshDomainStateReasonToString(int state, int reason) return N_("watchdog"); case VIR_DOMAIN_PAUSED_FROM_SNAPSHOT: return N_("from snapshot"); + case VIR_DOMAIN_PAUSED_SHUTTING_DOWN: + return N_("shutting down"); case VIR_DOMAIN_PAUSED_UNKNOWN: ; } -- 1.7.6.1

2 2

[libvirt] [PATCH] qemu: Properly detect crash of a rebooted domain
by Jiri Denemark 16 Sep '11

16 Sep '11

When a domain is rebooted using libvirt API, we use fake reboot consisting of shutting down and resetting the domain. Thus we see a SHUTDOWN event and set gotShutdown flag. But we never reset it back and if the domain crashes after it was rebooted this way, we consider it was a normal shutdown and not a crash. --- src/qemu/qemu_process.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index ca4f21f..1332e04 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -405,6 +405,7 @@ qemuProcessFakeReboot(void *opaque) "%s", _("resume operation failed")); goto endjob; } + priv->gotShutdown = false; event = virDomainEventNewFromObj(vm, VIR_DOMAIN_EVENT_RESUMED, VIR_DOMAIN_EVENT_RESUMED_UNPAUSED); -- 1.7.6.1

2 2

[libvirt] [PATCH] qemu: Fix shutoff reason when domain crashes
by Jiri Denemark 16 Sep '11

16 Sep '11

Commit 4454a9efc728b91e791b1f14c26ea23a19d57f48 changed shutoff reason from VIR_DOMAIN_SHUTOFF_CRASHED to VIR_DOMAIN_SHUTOFF_FAILED in case we see an unexpected EOF on monitor connection. But FAILED reason is dedicated for domains that fail to start. CRASHED reason is the right one to use in this situation. --- src/qemu/qemu_process.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 8a12e2a..ca4f21f 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -139,7 +139,7 @@ qemuProcessHandleMonitorEOF(qemuMonitorPtr mon ATTRIBUTE_UNUSED, VIR_DEBUG("Monitor connection to '%s' closed without SHUTDOWN event; " "assuming the domain crashed", vm->def->name); eventReason = VIR_DOMAIN_EVENT_STOPPED_FAILED; - stopReason = VIR_DOMAIN_SHUTOFF_FAILED; + stopReason = VIR_DOMAIN_SHUTOFF_CRASHED; auditReason = "failed"; } -- 1.7.6.1

2 2

[libvirt] [PATCH] python: Fix bindings generated in VPATH build
by Jiri Denemark 16 Sep '11

16 Sep '11

--- python/generator.py | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/python/generator.py b/python/generator.py index d855d6b..79558dd 100755 --- a/python/generator.py +++ b/python/generator.py @@ -1168,13 +1168,13 @@ def buildWrappers(module): function_classes['None'].append(info) classes_file = "%s.py" % module - extra_file = "%s-override.py" % module + extra_file = os.path.join(srcPref, "%s-override.py" % module) extra = None classes = open(classes_file, "w") if os.path.exists(extra_file): - extra = open(os.path.join(srcPref,extra_file), "r") + extra = open(extra_file, "r") classes.write("#! " + python + " -i\n") classes.write("#\n") classes.write("# WARNING WARNING WARNING WARNING\n") @@ -1620,13 +1620,13 @@ def qemuBuildWrappers(module): print "ERROR: only libvirt-qemu is supported" return None - extra_file = "%s-override.py" % module + extra_file = os.path.join(srcPref, "%s-override.py" % module) extra = None fd = open("libvirt_qemu.py", "w") if os.path.exists(extra_file): - extra = open(os.path.join(srcPref,extra_file), "r") + extra = open(extra_file, "r") fd.write("#! " + python + " -i\n") fd.write("#\n") fd.write("# WARNING WARNING WARNING WARNING\n") -- 1.7.6.1

2 2

[libvirt] Dependency between <vcpu> and <topology>
by Bharata B Rao 16 Sep '11

16 Sep '11

Hi, Is there a dependency b/n <vcpu> and <topology> ? Is specifying <vcpu> mandatory for a SMP guest ? Can't I skip <vcpu> but have <topology sockets= cores= threads=> to define a SMP guest ? I see that if I skip <vcpu>, libvirt generates -smp 1 on qemu command line which results in qemu booting a VM with single CPU irrespective of the topology specified. Shouldn't libvirt arrive at correct CPU count (vcpus=sockets*cores*threads ?) even if vcpu isn't specified rather than defaulting to 1 ? Regards, Bharata. -- http://bharata.sulekha.com/blog/posts.htm, http://raobharata.wordpress.com/

2 1

[libvirt] [PATCH] conf: avoid memory leak on virDomainDefParseXML
by ajia＠redhat.com 16 Sep '11

16 Sep '11

From: Alex Jia <ajia(a)redhat.com> * conf/domain_conf.c: allocate memory to def->redirdevs in virDomainDefParseXML such as VIR_ALLOC_N(def->redirdevs, n), however, virDomainDefFree(def) hasn't released these memory. * Detected in valgrind run: ==19820== 209 (16 direct, 193 indirect) bytes in 1 blocks are definitely lost in loss record 25 of 26 ==19820== at 0x4A04A28: calloc (vg_replace_malloc.c:467) ==19820== by 0x4A13AF: virAllocN (memory.c:129) ==19820== by 0x4D4A0E: virDomainDefParseXML (domain_conf.c:7258) ==19820== by 0x4D4C93: virDomainDefParseNode (domain_conf.c:7512) ==19820== by 0x4D562F: virDomainDefParse (domain_conf.c:7465) ==19820== by 0x415863: testCompareXMLToXMLFiles (qemuxml2xmltest.c:35) ==19820== by 0x415982: testCompareXMLToXMLHelper (qemuxml2xmltest.c:80) ==19820== by 0x416D31: virtTestRun (testutils.c:140) ==19820== by 0x415604: mymain (qemuxml2xmltest.c:192) ==19820== by 0x416437: virtTestMain (testutils.c:689) ==19820== by 0x3CA7A1ECDC: (below main) (in /lib64/libc-2.12.so) ==19820== ==19820== LEAK SUMMARY: ==19820== definitely lost: 16 bytes in 1 blocks ==19820== indirectly lost: 193 bytes in 5 blocks ==19820== possibly lost: 0 bytes in 0 blocks ==19820== still reachable: 1,054 bytes in 21 blocks * How to reproduce? % valgrind -v --leak-check=full ./tests/qemuxml2xmltest Signed-off-by: Alex Jia <ajia(a)redhat.com> --- src/conf/domain_conf.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index ea6b581..03ab447 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -1206,6 +1206,10 @@ void virDomainDefFree(virDomainDefPtr def) virDomainHubDefFree(def->hubs[i]); VIR_FREE(def->hubs); + for (i = 0 ; i < def->nredirdevs ; i++) + virDomainRedirdevDefFree(def->redirdevs[i]); + VIR_FREE(def->redirdevs); + VIR_FREE(def->os.type); VIR_FREE(def->os.arch); VIR_FREE(def->os.machine); -- 1.7.1

2 1