- Devel - libvirt List Archives

[libvirt] [PATCH] Add libvirt-daemon-vbox & libvirt-daemon-driver-vbox RPMs
by Daniel P. Berrange 17 May '13

17 May '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> Now the VirtualBox driver is a loadable module, it needs to live in its own sub-RPM Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- libvirt.spec.in | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) diff --git a/libvirt.spec.in b/libvirt.spec.in index bd889f3..298d96b 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -376,6 +376,9 @@ Requires: libvirt-daemon-driver-uml = %{version}-%{release} %if %{with_xen} Requires: libvirt-daemon-driver-xen = %{version}-%{release} %endif + %if %{with_vbox} +Requires: libvirt-daemon-driver-vbox = %{version}-%{release} + %endif Requires: libvirt-daemon-driver-interface = %{version}-%{release} Requires: libvirt-daemon-driver-secret = %{version}-%{release} @@ -880,6 +883,19 @@ Xen %endif + %if %{with_vbox} +%package daemon-driver-vbox +Summary: VirtualBox driver plugin for the libvirtd daemon +Group: Development/Libraries +Requires: libvirt-daemon = %{version}-%{release} + +%description daemon-driver-vbox +The vbox driver plugin for the libvirtd daemon, providing +an implementation of the hypervisor driver APIs using +VirtualBox + %endif + + %if %{with_libxl} %package daemon-driver-libxl Summary: Libxl driver plugin for the libvirtd daemon @@ -1012,6 +1028,30 @@ Requires: xen Server side daemon and driver required to manage the virtualization capabilities of XEN %endif + + %if %{with_vbox} +%package daemon-vbox +Summary: Server side daemon & driver required to run VirtualBoxguests +Group: Development/Libraries + +Requires: libvirt-daemon = %{version}-%{release} + %if %{with_driver_modules} + %if %{with_vbox} +Requires: libvirt-daemon-driver-vbox = %{version}-%{release} + %endif +Requires: libvirt-daemon-driver-interface = %{version}-%{release} +Requires: libvirt-daemon-driver-network = %{version}-%{release} +Requires: libvirt-daemon-driver-nodedev = %{version}-%{release} +Requires: libvirt-daemon-driver-nwfilter = %{version}-%{release} +Requires: libvirt-daemon-driver-secret = %{version}-%{release} +Requires: libvirt-daemon-driver-storage = %{version}-%{release} + %endif +Requires: vbox + +%description daemon-vbox +Server side daemon and driver required to manage the virtualization +capabilities of VirtualBox + %endif %endif # %{with_libvirtd} %package client @@ -1869,6 +1909,12 @@ fi %defattr(-, root, root) %{_libdir}/%{name}/connection-driver/libvirt_driver_libxl.so %endif + + %if %{with_vbox} +%files daemon-driver-vbox +%defattr(-, root, root) +%{_libdir}/%{name}/connection-driver/libvirt_driver_vbox.so + %endif %endif # %{with_driver_modules} %if %{with_qemu_tcg} @@ -1895,6 +1941,11 @@ fi %files daemon-xen %defattr(-, root, root) %endif + + %if %{with_vbox} +%files daemon-vbox +%defattr(-, root, root) + %endif %endif # %{with_libvirtd} %if %{with_sanlock} -- 1.8.1.4

2 2

[libvirt] [PATCH] Define __USE_MINGW_ANSI_STDIO in config.h
by Daniel P. Berrange 17 May '13

17 May '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> Latest mingw64 can provide *printf functions which support GNU format specifiers. It won't do that unless you have defined __USE_MINGW_ANSI_STDIO though. GNULIB's 'asprintf' module detected that mingw had the asprintf function, but didn't define the __USE_MINGW_ANSI_STDIO so we got left with the version offering Win32 format specifiers, instead of GNU formats. It could perhaps be argued that gnulib's 'asprintf' could be defining __USE_MINGW_ANSI_STDIO for us ? Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- configure.ac | 3 +++ 1 file changed, 3 insertions(+) diff --git a/configure.ac b/configure.ac index 3f3f11e..fe916d1 100644 --- a/configure.ac +++ b/configure.ac @@ -2123,6 +2123,9 @@ AC_SUBST([VERSION_SCRIPT_FLAGS]) AC_SUBST([MSCOM_LIBS]) +dnl http://sourceforge.net/apps/trac/mingw-w64/wiki/gnu%20printf +AC_DEFINE_UNQUOTED([__USE_MINGW_ANSI_STDIO], 1, [Enable GNU style printf formatters]) + dnl Look for windres to build a Windows icon resource. case "$host" in *-*-mingw* | *-*-cygwin* | *-*-msvc* ) -- 1.8.2.1

2 1

[libvirt] [PATCH] qemu: report useful error failling to destroy domain gracefully
by Guannan Ren 17 May '13

17 May '13

Resolves:https://bugzilla.redhat.com/show_bug.cgi?id=927620 #kill -STOP `pidof qemu-kvm` #virsh destroy $guest --graceful error: Failed to destroy domain testVM error: An error occurred, but the cause is unknown With --graceful, SIGTERM always is emitted to kill driver process, but it won't success till burning out waiting time in case of process being stopped. But domain destroy without --graceful can work, SIGKILL will be emitted to the stopped process after 10 secs which always kills a process even one that is currently stopped. So report an error after burning out waiting time in this case. --- src/qemu/qemu_process.c | 2 +- src/util/virprocess.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 4a7c612..e5b4679 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -3930,7 +3930,7 @@ qemuProcessKill(virDomainObjPtr vm, unsigned int flags) } } - if ((flags & VIR_QEMU_PROCESS_KILL_NOWAIT)) { + if (flags & VIR_QEMU_PROCESS_KILL_NOWAIT) { virProcessKill(vm->pid, (flags & VIR_QEMU_PROCESS_KILL_FORCE) ? SIGKILL : SIGTERM); diff --git a/src/util/virprocess.c b/src/util/virprocess.c index 99db003..a79ed05 100644 --- a/src/util/virprocess.c +++ b/src/util/virprocess.c @@ -310,8 +310,9 @@ virProcessKillPainfully(pid_t pid, bool force) usleep(200 * 1000); } - VIR_DEBUG("Timed out waiting after SIGKILL to process %lld", - (long long)pid); + virReportError(VIR_ERR_OPERATION_INVALID, + _("Failed to terminate process %lld with SIG%s"), + (long long)pid, signame); cleanup: return ret; -- 1.8.1.4

3 2

[libvirt] [PATCH] Add missing c-ctype.h to virfile.c
by Daniel P. Berrange 17 May '13

17 May '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> The virfile.c file uses c_isalpha on Win32 platforms, so must include c-ctype.h Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- src/util/virfile.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/util/virfile.c b/src/util/virfile.c index eb88c83..4637919 100644 --- a/src/util/virfile.c +++ b/src/util/virfile.c @@ -59,6 +59,8 @@ #include "virstoragefile.h" #include "virutil.h" +#include "c-ctype.h" + #define VIR_FROM_THIS VIR_FROM_NONE int virFileClose(int *fdptr, virFileCloseFlags flags) -- 1.8.1.4

2 1

[libvirt] [PATCH] Include GNULIB mkdtemp module
by Daniel P. Berrange 17 May '13

17 May '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> The mkdtemp function is missing on mingw platforms. It is used in various Linux specific places in libvirt, but recently became used in fdstreamtest.c which is cross platform. Thus the GNULIB mkdtemp module should be used to proide mkdtemp. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- bootstrap.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/bootstrap.conf b/bootstrap.conf index 6e03757..616eee1 100644 --- a/bootstrap.conf +++ b/bootstrap.conf @@ -73,6 +73,7 @@ maintainer-makefile manywarnings mkostemp mkostemps +mkdtemp mktempd net_if netdb -- 1.8.1.4

2 1

[libvirt] [PATCH] Set PKG_CONFIG_LIBDIR in autobuild.sh
by Daniel P. Berrange 17 May '13

17 May '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> If PKG_CONFIG_LIBDIR is not set when doing mingw32/64 builds, then pkg-config may silently fallback to native versions of libraries, with predictably bad results. Setting PKG_CONFIG_LIBDIR forces it to only consider the mingw32/64 libraries. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- autobuild.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/autobuild.sh b/autobuild.sh index a8781b0..7da8cb5 100755 --- a/autobuild.sh +++ b/autobuild.sh @@ -69,6 +69,7 @@ fi if test -x /usr/bin/i686-w64-mingw32-gcc ; then make distclean + PKG_CONFIG_LIBDIR="/usr/i686-w64-mingw32/sys-root/mingw/lib/pkgconfig:/usr/i686-w64-mingw32/sys-root/mingw/share/pkgconfig" \ PKG_CONFIG_PATH="$AUTOBUILD_INSTALL_ROOT/i686-w64-mingw32/sys-root/mingw/lib/pkgconfig" \ CC="i686-w64-mingw32-gcc" \ ../configure \ @@ -88,6 +89,7 @@ fi if test -x /usr/bin/x86_64-w64-mingw32-gcc ; then make distclean + PKG_CONFIG_LIBDIR="/usr/x86_64-w64-mingw32/sys-root/mingw/lib/pkgconfig:/usr/x86_64-w64-mingw32/sys-root/mingw/share/pkgconfig" \ PKG_CONFIG_PATH="$AUTOBUILD_INSTALL_ROOT/x86_64-w64-mingw32/sys-root/mingw/lib/pkgconfig" \ CC="x86_64-w64-mingw32-gcc" \ ../configure \ -- 1.8.1.4

2 1

[libvirt] Second pass with cleanups suggested from Dan.
by dwalsh＠redhat.com 17 May '13

17 May '13

[PATCH 2/2] libvirt patch to write a mcs translation file to

3 6

[libvirt] [PATCH 00/25 v4] Support scsi device passthrough via scsi-generic
by Osier Yang 17 May '13

17 May '13

This adds the support for qemu's scsi-generic device, which can be used to passthrough scsi host device. An example of the XML: <hostdev mode='subsystem' type='scsi' managed='no'> <source> <adapter name='scsi_host7'/> <address bus='0' target='0' unit='0'/> </source> <address type='drive' controller='0' bus='0' target='0' unit='1'/> </hostdev> v3 - v4 (details in each patch): * Rebased on top * Support <shareable> * Support <sgio> * Various preparation patches for <shareable> and <sgio> * Split 1/10 in v3 into 2 patches (<readonly> now is a single patch, for easy reviewing, and <readonly> is a sub-element of "hostdev" in rng schema, because it could be used by other type hostdev in future). * Split 4/10 in v3 into 2 patches (bootindex support now is a single patch, for easy reviewing) v2.5 - v3 (details in each patch): * 1/10 and 2/10 of v2.5 are pushed * 8/10 of v2.5 is splitted * A better way to generate the address for scsi host device instead of the rigid one. * Support all scsi controllers when building the qemu command line. * Figure out the limits of the qemu properties, and do checking * Don't forget DAC and apparmor security backends * Orgnize the patches in a better way. * Fix the make check failure Han Cheng (7): conf: Generic XMLs for scsi hostdev qemu: New cap flags for scsi-generic utils: util functions for scsi hostdev qemu: Build qemu command line for scsi host device qemu: Introduce activeScsiHostdevs list for scsi host devices qemu: Add hotplug support for scsi host device qemu: Allow the scsi-generic device in cgroup Osier Yang (18): rng: Interleave hostdev elements Introduce <readonly> for hostdev qemu: Support bootindex for scsi host device security: Manage the security label for scsi host device qemu: Refactor helpers for USB device attachment conf: Generate address for scsi host device automatically conf: Introduce <shareable> for hostdev utils: Rename scsi->path to scsi->sg_path qemu: Rename qemu_driver->sharedDisks to qemu_driver->sharedDevices utils: Add a helper to get the device name that sg device mapped to qemu: Refactor the helpers to track shared scsi host device qemu: Manage shared device entry for scsi host device Rename virDomainDiskSGIO to virDomainDeviceSGIO conf: Introduce sgio for hostdev qemu: Move qemuSetUnprivSGIO into qemu_conf.c qemu: Refactor qemuSetUnprivSGIO to support scsi host device qemu: Set unpriv_sgio for scsi host device qemu: Check conflicts for shared scsi host device docs/formatdomain.html.in | 49 ++- docs/schemas/domaincommon.rng | 86 +++- po/POTFILES.in | 1 + src/Makefile.am | 1 + src/conf/domain_audit.c | 10 + src/conf/domain_conf.c | 353 +++++++++++++++- src/conf/domain_conf.h | 24 +- src/libvirt_private.syms | 23 ++ src/qemu/qemu_capabilities.c | 21 +- src/qemu/qemu_capabilities.h | 2 + src/qemu/qemu_cgroup.c | 46 ++- src/qemu/qemu_command.c | 146 ++++++- src/qemu/qemu_command.h | 6 + src/qemu/qemu_conf.c | 372 ++++++++++++----- src/qemu/qemu_conf.h | 38 +- src/qemu/qemu_driver.c | 25 +- src/qemu/qemu_hostdev.c | 235 +++++++++++ src/qemu/qemu_hostdev.h | 10 + src/qemu/qemu_hotplug.c | 210 ++++++++-- src/qemu/qemu_process.c | 64 +-- src/qemu/qemu_process.h | 1 - src/security/security_apparmor.c | 49 ++- src/security/security_dac.c | 76 +++- src/security/security_selinux.c | 72 +++- src/util/virscsi.c | 455 +++++++++++++++++++++ src/util/virscsi.h | 88 ++++ tests/qemuhelpdata/qemu-1.0-device | 10 + tests/qemuhelpdata/qemu-1.1.0-device | 10 + tests/qemuhelpdata/qemu-1.2.0-device | 5 + tests/qemuhelpdata/qemu-kvm-1.2.0-device | 5 + tests/qemuhelptest.c | 19 +- .../qemuxml2argv-hostdev-scsi-boot.args | 9 + .../qemuxml2argv-hostdev-scsi-boot.xml | 34 ++ .../qemuxml2argv-hostdev-scsi-lsi.args | 9 + .../qemuxml2argv-hostdev-scsi-lsi.xml | 35 ++ .../qemuxml2argv-hostdev-scsi-readonly.args | 9 + .../qemuxml2argv-hostdev-scsi-readonly.xml | 36 ++ .../qemuxml2argv-hostdev-scsi-sgio.xml | 35 ++ .../qemuxml2argv-hostdev-scsi-shareable.xml | 36 ++ .../qemuxml2argv-hostdev-scsi-virtio-scsi.args | 9 + .../qemuxml2argv-hostdev-scsi-virtio-scsi.xml | 35 ++ tests/qemuxml2argvtest.c | 18 + tests/qemuxml2xmltest.c | 6 + 43 files changed, 2469 insertions(+), 314 deletions(-) create mode 100644 src/util/virscsi.c create mode 100644 src/util/virscsi.h create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-boot.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-boot.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-lsi.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-lsi.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-readonly.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-readonly.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-sgio.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-shareable.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-virtio-scsi.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-virtio-scsi.xml -- 1.8.1.4

4 83

[libvirt] [PATCH v3] qemu: Add callback struct for qemuBuildCommandLine
by Osier Yang 17 May '13

17 May '13

Since 0d70656afded, it starts to access the sysfs files to build the qemu command line (by virSCSIDeviceGetSgName, which is to find out the scsi generic device name by adpater:bus:target:unit), there is no way to work around, qemu wants to see the scsi generic device like "/dev/sg6" anyway. And there might be other places which need to access sysfs files when building qemu command line in future. Instead of increasing the arguments of qemuBuildCommandLine, this introduces a new callback for qemuBuildCommandLine, and thus tests can register their own callbacks for sysfs test input files accessing. * src/qemu/qemu_command.h: (New callback struct qemuBuildCommandLineCallbacks; extern buildCommandLineCallbacks) * src/qemu/qemu_command.c: (wire up the callback struct) * src/qemu/qemu_driver.c: (Use the new syntax of qemuBuildCommandLine) * src/qemu/qemu_hotplug.c: Likewise * src/qemu/qemu_process.c: Likewise * tests/qemuxml2argvtest.c: (Helper testSCSIDeviceGetSgName; callback struct testCallbacks; Use the callback struct) * src/tests/qemuxmlnstest.c Use the new syntax of qemuBuildCommandLine) --- src/qemu/qemu_command.c | 28 ++++++++++++++++++++-------- src/qemu/qemu_command.h | 16 ++++++++++++++-- src/qemu/qemu_driver.c | 3 ++- src/qemu/qemu_hotplug.c | 6 ++++-- src/qemu/qemu_process.c | 3 ++- tests/qemuxml2argvtest.c | 21 ++++++++++++++++++++- tests/qemuxmlnstest.c | 3 ++- 7 files changed, 64 insertions(+), 16 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 5b95c07..e775479 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -4757,18 +4757,25 @@ qemuBuildUSBHostdevUsbDevStr(virDomainHostdevDefPtr dev) char * qemuBuildSCSIHostdevDrvStr(virDomainHostdevDefPtr dev, - virQEMUCapsPtr qemuCaps ATTRIBUTE_UNUSED) + virQEMUCapsPtr qemuCaps ATTRIBUTE_UNUSED, + qemuBuildCommandLineCallbacksPtr callbacks) { virBuffer buf = VIR_BUFFER_INITIALIZER; char *sg = NULL; - if (!(sg = virSCSIDeviceGetSgName(dev->source.subsys.u.scsi.adapter, - dev->source.subsys.u.scsi.bus, - dev->source.subsys.u.scsi.target, - dev->source.subsys.u.scsi.unit))) { - goto error; + if (!callbacks) { + virReportError(VIR_ERR_INVALID_ARG, "%s", + _("callbacks cannot be NULL")); + return NULL; } + sg = (callbacks->qemuGetSCSIDeviceSgName)(dev->source.subsys.u.scsi.adapter, + dev->source.subsys.u.scsi.bus, + dev->source.subsys.u.scsi.target, + dev->source.subsys.u.scsi.unit); + if (!sg) + goto error; + virBufferAsprintf(&buf, "file=/dev/%s,if=none", sg); virBufferAsprintf(&buf, ",id=%s-%s", virDomainDeviceAddressTypeToString(dev->info->type), @@ -6405,6 +6412,10 @@ qemuBuildGraphicsCommandLine(virQEMUDriverConfigPtr cfg, return 0; } +qemuBuildCommandLineCallbacks buildCommandLineCallbacks = { + .qemuGetSCSIDeviceSgName = virSCSIDeviceGetSgName, +}; + /* * Constructs a argv suitable for launching qemu with config defined * for a given virtual machine. @@ -6422,7 +6433,8 @@ qemuBuildCommandLine(virConnectPtr conn, const char *migrateFrom, int migrateFd, virDomainSnapshotObjPtr snapshot, - enum virNetDevVPortProfileOp vmop) + enum virNetDevVPortProfileOp vmop, + qemuBuildCommandLineCallbacksPtr callbacks) { virErrorPtr originalError = NULL; int i, j; @@ -8243,7 +8255,7 @@ qemuBuildCommandLine(virConnectPtr conn, char *drvstr; virCommandAddArg(cmd, "-drive"); - if (!(drvstr = qemuBuildSCSIHostdevDrvStr(hostdev, qemuCaps))) + if (!(drvstr = qemuBuildSCSIHostdevDrvStr(hostdev, qemuCaps, callbacks))) goto error; virCommandAddArg(cmd, drvstr); VIR_FREE(drvstr); diff --git a/src/qemu/qemu_command.h b/src/qemu/qemu_command.h index 36dfa6b..23b6af3 100644 --- a/src/qemu/qemu_command.h +++ b/src/qemu/qemu_command.h @@ -51,6 +51,16 @@ # define QEMU_WEBSOCKET_PORT_MIN 5700 # define QEMU_WEBSOCKET_PORT_MAX 65535 +typedef struct _qemuBuildCommandLineCallbacks qemuBuildCommandLineCallbacks; +typedef qemuBuildCommandLineCallbacks *qemuBuildCommandLineCallbacksPtr; +struct _qemuBuildCommandLineCallbacks { + char * (*qemuGetSCSIDeviceSgName) (const char *adapter, + unsigned int bus, + unsigned int target, + unsigned int unit); +}; + +extern qemuBuildCommandLineCallbacks buildCommandLineCallbacks; virCommandPtr qemuBuildCommandLine(virConnectPtr conn, virQEMUDriverPtr driver, @@ -61,7 +71,8 @@ virCommandPtr qemuBuildCommandLine(virConnectPtr conn, const char *migrateFrom, int migrateFd, virDomainSnapshotObjPtr current_snapshot, - enum virNetDevVPortProfileOp vmop) + enum virNetDevVPortProfileOp vmop, + qemuBuildCommandLineCallbacksPtr callbacks) ATTRIBUTE_NONNULL(1); /* Generate string for arch-specific '-device' parameter */ @@ -142,7 +153,8 @@ char * qemuBuildUSBHostdevDevStr(virDomainHostdevDefPtr dev, virQEMUCapsPtr qemuCaps); char * qemuBuildSCSIHostdevDrvStr(virDomainHostdevDefPtr dev, - virQEMUCapsPtr qemuCaps); + virQEMUCapsPtr qemuCaps, + qemuBuildCommandLineCallbacksPtr callbacks); char * qemuBuildSCSIHostdevDevStr(virDomainDefPtr def, virDomainHostdevDefPtr dev, virQEMUCapsPtr qemuCaps); diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index b1630f8..cb46276 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -5362,7 +5362,8 @@ static char *qemuConnectDomainXMLToNative(virConnectPtr conn, if (!(cmd = qemuBuildCommandLine(conn, driver, def, &monConfig, monitor_json, qemuCaps, - NULL, -1, NULL, VIR_NETDEV_VPORT_PROFILE_OP_NO_OP))) + NULL, -1, NULL, VIR_NETDEV_VPORT_PROFILE_OP_NO_OP, + &buildCommandLineCallbacks))) goto cleanup; ret = virCommandToString(cmd); diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index d037c9d..77d9f4f 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -1226,7 +1226,8 @@ qemuDomainAttachHostScsiDevice(virQEMUDriverPtr driver, if (qemuAssignDeviceHostdevAlias(vm->def, hostdev, 0) < 0) goto cleanup; - if (!(drvstr = qemuBuildSCSIHostdevDrvStr(hostdev, priv->qemuCaps))) + if (!(drvstr = qemuBuildSCSIHostdevDrvStr(hostdev, priv->qemuCaps, + &buildCommandLineCallbacks))) goto cleanup; if (!(devstr = qemuBuildSCSIHostdevDevStr(vm->def, hostdev, priv->qemuCaps))) @@ -2543,7 +2544,8 @@ qemuDomainDetachHostScsiDevice(virQEMUDriverPtr driver, return -1; } - if (!(drvstr = qemuBuildSCSIHostdevDrvStr(detach, priv->qemuCaps))) + if (!(drvstr = qemuBuildSCSIHostdevDrvStr(detach, priv->qemuCaps, + &buildCommandLineCallbacks))) goto cleanup; if (!(devstr = qemuBuildSCSIHostdevDevStr(vm->def, detach, priv->qemuCaps))) goto cleanup; diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index dbbb7bf..3b247a5 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -3638,7 +3638,8 @@ int qemuProcessStart(virConnectPtr conn, VIR_DEBUG("Building emulator command line"); if (!(cmd = qemuBuildCommandLine(conn, driver, vm->def, priv->monConfig, priv->monJSON, priv->qemuCaps, - migrateFrom, stdin_fd, snapshot, vmop))) + migrateFrom, stdin_fd, snapshot, vmop, + &buildCommandLineCallbacks))) goto cleanup; /* now that we know it is about to start call the hook if present */ diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index c751440..7d3e521 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -82,6 +82,24 @@ typedef enum { FLAG_JSON = 1 << 3, } virQemuXML2ArgvTestFlags; +static char * +testSCSIDeviceGetSgName(const char *adapter ATTRIBUTE_UNUSED, + unsigned int bus ATTRIBUTE_UNUSED, + unsigned int target ATTRIBUTE_UNUSED, + unsigned int unit ATTRIBUTE_UNUSED) +{ + char *sg = NULL; + + if (VIR_STRDUP(sg, "sg0") < 0) + return NULL; + + return sg; +} + +static qemuBuildCommandLineCallbacks testCallbacks = { + .qemuGetSCSIDeviceSgName = testSCSIDeviceGetSgName, +}; + static int testCompareXMLToArgvFiles(const char *xml, const char *cmdline, virQEMUCapsPtr extraFlags, @@ -157,7 +175,8 @@ static int testCompareXMLToArgvFiles(const char *xml, if (!(cmd = qemuBuildCommandLine(conn, &driver, vmdef, &monitor_chr, (flags & FLAG_JSON), extraFlags, migrateFrom, migrateFd, NULL, - VIR_NETDEV_VPORT_PROFILE_OP_NO_OP))) { + VIR_NETDEV_VPORT_PROFILE_OP_NO_OP, + &testCallbacks))) { if (flags & FLAG_EXPECT_FAILURE) { ret = 0; if (virTestGetDebug() > 1) diff --git a/tests/qemuxmlnstest.c b/tests/qemuxmlnstest.c index 952b8e2..9d3d2a0 100644 --- a/tests/qemuxmlnstest.c +++ b/tests/qemuxmlnstest.c @@ -113,7 +113,8 @@ static int testCompareXMLToArgvFiles(const char *xml, if (!(cmd = qemuBuildCommandLine(conn, &driver, vmdef, &monitor_chr, json, extraFlags, migrateFrom, migrateFd, NULL, - VIR_NETDEV_VPORT_PROFILE_OP_NO_OP))) + VIR_NETDEV_VPORT_PROFILE_OP_NO_OP, + NULL))) goto fail; if (!!virGetLastError() != expectError) { -- 1.8.1.4

2 4

[libvirt] [PATCH] test: fix VPATH fchosttest failure
by Viktor Mihajlovski 17 May '13

17 May '13

Running make check in a VPATH configured build directory fails in fchosttest as the test data files are searched for relative to the current working directory. Signed-off-by: Viktor Mihajlovski <mihajlov(a)linux.vnet.ibm.com> --- This may become obsolete with Osier's pending patches, but it helps to get over the build failures for the moment... tests/fchosttest.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/tests/fchosttest.c b/tests/fchosttest.c index 035f721..ccc2df9 100644 --- a/tests/fchosttest.c +++ b/tests/fchosttest.c @@ -19,10 +19,13 @@ #include <config.h> +#include "virstring.h" #include "virutil.h" #include "testutils.h" -#define TEST_FC_HOST_PREFIX "./fchostdata/fc_host/" +static char * fchost_prefix; + +#define TEST_FC_HOST_PREFIX fchost_prefix #define TEST_FC_HOST_NUM 5 /* Test virIsCapableFCHost */ @@ -158,6 +161,12 @@ mymain(void) { int ret = 0; + if (virAsprintf(&fchost_prefix,"%s/%s", abs_srcdir, + "fchostdata/fc_host/") < 0) { + ret = -1; + goto cleanup; + } + if (virtTestRun("test1", 1, test1, NULL) < 0) ret = -1; if (virtTestRun("test2", 1, test2, NULL) < 0) @@ -169,6 +178,8 @@ mymain(void) if (virtTestRun("test5", 1, test5, NULL) < 0) ret = -1; +cleanup: + VIR_FREE(fchost_prefix); return ret; } -- 1.7.9.5

2 1

[libvirt] [PATCH] Fix build with VirtualBox
by Jiri Denemark 17 May '13

17 May '13

Commit ba5f3c7c moved vbox driver into libvirtd but forgot to adapt daemon's Makefile.am. --- Pushed as a build breaker. daemon/Makefile.am | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/daemon/Makefile.am b/daemon/Makefile.am index f48dc85..d064ebd 100644 --- a/daemon/Makefile.am +++ b/daemon/Makefile.am @@ -155,6 +155,10 @@ if WITH_UML libvirtd_LDADD += ../src/libvirt_driver_uml.la endif +if WITH_VBOX + libvirtd_LDADD += ../src/libvirt_driver_vbox.la +endif + if WITH_STORAGE libvirtd_LDADD += ../src/libvirt_driver_storage.la endif -- 1.8.2.1

3 2

[libvirt] [PATCH] Handle ENOTSUP from setfilecon on FUSE in LXC startup
by Daniel P. Berrange 17 May '13

17 May '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> The setfilecon method can return ENOTSUP when trying to set the context of the /proc/meminfo FUSE filesystem. We must ignore this error and carry on, to prevent container startup failing entirely Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- src/lxc/lxc_container.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index 48ccc09..9295d80 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -782,10 +782,15 @@ static int lxcContainerMountProcFuse(virDomainDefPtr def, ret = setfilecon(meminfo_path, scon); freecon(scon); if (ret < 0) { - virReportSystemError(errno, - _("Failed to set security context of %s for /proc/meminfo mount point"), - meminfo_path); - return ret; + if (errno == ENOTSUP) { + VIR_WARN("Setting security context of %s for /proc/meminfo not supported", + meminfo_path); + } else { + virReportSystemError(errno, + _("Failed to set security context of %s for /proc/meminfo mount point"), + meminfo_path); + return ret; + } } } # endif -- 1.8.2.1

2 2

[libvirt] 2013 Linux Plumbers Virtualization Microconference proposal call for participation
by Alex Williamson 17 May '13

17 May '13

Hey folks, We'd like to hold another virtualization microconference as part of this year's Linux Plumbers Conference. To do so, we need to show that there's enough interest, materials, and people willing to attend. Anthony and Amit have already started a wiki page for the microconference: http://wiki.linuxplumbersconf.org/2013:virtualization Please help to fill it out and add topics you're interested in discussing or presenting, or relevant topics to current development that you'd like others to present. We don't need full abstracts or proposals at this time, just enough to show that we have things to discuss and enough people interested in attending to allocate space in the program. If approved by the program committee we'll give precedence to proposals that address current issues needing attention, help, or resolution. This is also an excellent opportunity for cross-project discussions. We're not sure when the LPC program committee will make a decision, so please don't hesitate to add things to the wiki as soon as possible. There's no commitment at this point though we obviously hope that many of you will follow through with participation if this microconference is approved. Please feel free to forward to anyone I've missed. Thanks, Alex

2 1

[libvirt] [PATCH v2] [TCK] nwfilter: probe for inverted ctdir
by Stefan Berger 17 May '13

17 May '13

Linux netfilter at some point inverted the meaning of the '--ctdir reply' and newer netfilter implementations now expect '--ctdir original' instead and vice-versa. We probe for this netfilter change via an IMCP message over loopback and 3 filtering rules applied to INPUT. If the sent byte arrives, the newer netfilter implementation has been detected and we convert the strings in the iptables output to now match that inversion implemented by libvirt. The downside of this is that probing of libvirt and this test tool are independent and this test tool will only work correctly for all cases if used with libvirt probing for 'ctdir inversion' as well. Signed-off-by: Stefan Berger <stefanb(a)linux.vnet.ibm.com> --- scripts/nwfilter/nwfilter2vmtest.sh | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) Index: libvirt-tck/scripts/nwfilter/nwfilter2vmtest.sh =================================================================== --- libvirt-tck.orig/scripts/nwfilter/nwfilter2vmtest.sh +++ libvirt-tck/scripts/nwfilter/nwfilter2vmtest.sh @@ -28,6 +28,10 @@ FLAG_LIBVIRT_TEST="$((1<<3))" FLAG_TAP_TEST="$((1<<4))" FLAG_FORCE_CLEAN="$((1<<5))" +# --ctdir original vs. --ctdir reply's meaning was inverted in +# netfilter at some point. We probe for it. +IPTABLES_CTRDIR_CORRECTED=0 + failctr=0 passctr=0 attachfailctr=0 @@ -100,6 +104,15 @@ mktmpdir() { return 0 } +probeIptablesCtdir() { + # below gawk works for "2\.6\.39.*"; any non-digit immediately + # after '39' will be ignored + rev=$(uname -r | gawk -F. '{print $1 * 1000000 + $2 * 1000 + $3 }') + # 2.6.39 had the correction + if [ $rev -ge 2006039 ]; then + IPTABLES_CTDIR_CORRECTED=1 + fi +} checkExpectedOutput() { xmlfile="$1" @@ -160,6 +173,14 @@ checkExpectedOutput() { break fi + if [ $IPTABLES_CTDIR_CORRECTED -ne 0 ]; then + #change --ctdir ORIGINAL to --ctdir REPLY + #and --ctdir REPLY to --ctdir ORIGINAL + sed -i "s/ctdir[ ]*ORIGINAL/ctdir _REPLY/" ${tmpfile} + sed -i "s/ctdir[ ]*REPLY/ctdir ORIGINAL/" ${tmpfile} + sed -i "s/ctdir _REPLY/ctdir REPLY/" ${tmpfile} + fi + diff -w ${tmpfile} ${tmpfile2} >/dev/null if [ $? -ne 0 ]; then @@ -551,6 +572,8 @@ main() { echo "This script will only run on Linux." fi exit 1; + else + probeIptablesCtdir fi if [ $(($flags & $FLAG_TAP_TEST)) -ne 0 ]; then

3 3

[libvirt] [PATCH 0/2] Fix storage schema issues
by Ján Tomko 17 May '13

17 May '13

Fix https://bugzilla.redhat.com/show_bug.cgi?id=893273 Ján Tomko (2): schema: require target path in storage pool xml schema: make source optional in volume XML docs/schemas/storagepool.rng | 8 +++--- docs/schemas/storagevol.rng | 4 ++- tests/Makefile.am | 2 ++ .../dir-missing-target-path-invalid.xml | 12 +++++++++ tests/storagepoolschematest | 2 +- tests/storagevolschemadata/qcow2-no-source.xml | 29 ++++++++++++++++++++++ tests/storagevolschematest | 2 +- 7 files changed, 51 insertions(+), 8 deletions(-) create mode 100644 tests/storagepoolschemadata/dir-missing-target-path-invalid.xml create mode 100644 tests/storagevolschemadata/qcow2-no-source.xml -- 1.8.1.5

2 5

[libvirt] [PATCH] qemu: Change values of disk discard
by Osier Yang 17 May '13

17 May '13

QEMU might support more values for "-drive discard", so using Bi-state values (on/off) for it doesn't make sense. "on" maps to "unmap", "off" maps to "ignore": <...> @var{discard} is one of "ignore" (or "off") or "unmap" (or "on") and controls whether @dfn{discard} (also known as @dfn{trim} or @dfn{unmap}) requests are ignored or passed to the filesystem. Some machine types may not support discard requests. </...> --- docs/formatdomain.html.in | 4 ++-- docs/schemas/domaincommon.rng | 4 ++-- src/conf/domain_conf.c | 4 ++-- src/conf/domain_conf.h | 4 ++-- tests/qemuxml2argvdata/qemuxml2argv-disk-drive-discard.args | 4 ++-- tests/qemuxml2argvdata/qemuxml2argv-disk-drive-discard.xml | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index a71c484..26a3d0d 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -1745,8 +1745,8 @@ The optional <code>discard</code> attribute controls whether to discard (also known as "trim" or "unmap") requests are ignored or passed to the filesystem. The value can be either - "on" (allow the discard request to be passed) or "off" (ingore - the discard request). + "unmap" (allow the discard request to be passed) or "ignore" + (gnore the discard request). Since 1.0.6 (QEMU and KVM only) </li> </ul> diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index 018ca0b..b53099b 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -1418,8 +1418,8 @@ <define name="discard"> <attribute name='discard'> <choice> - <value>on</value> - <value>off</value> + <value>unmap</value> + <value>ignore</value> </choice> </attribute> </define> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index b5e5d4d..e7a0381 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -745,8 +745,8 @@ VIR_ENUM_IMPL(virDomainTPMBackend, VIR_DOMAIN_TPM_TYPE_LAST, VIR_ENUM_IMPL(virDomainDiskDiscard, VIR_DOMAIN_DISK_DISCARD_LAST, "default", - "on", - "off") + "unmap", + "ignore") #define VIR_DOMAIN_XML_WRITE_FLAGS VIR_DOMAIN_XML_SECURE #define VIR_DOMAIN_XML_READ_FLAGS VIR_DOMAIN_XML_INACTIVE diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index a10b2ab..e74da1c 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -629,8 +629,8 @@ enum virDomainDeviceSGIO { enum virDomainDiskDiscard { VIR_DOMAIN_DISK_DISCARD_DEFAULT = 0, - VIR_DOMAIN_DISK_DISCARD_ON, - VIR_DOMAIN_DISK_DISCARD_OFF, + VIR_DOMAIN_DISK_DISCARD_UNMAP, + VIR_DOMAIN_DISK_DISCARD_IGNORE, VIR_DOMAIN_DISK_DISCARD_LAST }; diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-discard.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-discard.args index 02e2ddb..3c4687e 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-discard.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-discard.args @@ -1,8 +1,8 @@ LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test \ /usr/bin/qemu -S -M pc-0.13 -m 1024 -smp 1 -nographic -nodefaults \ -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot dc -usb \ --drive file=/var/lib/libvirt/images/f14.img,if=none,id=drive-virtio-disk0,discard=on \ +-drive file=/var/lib/libvirt/images/f14.img,if=none,id=drive-virtio-disk0,discard=unmap \ -device virtio-blk-pci,bus=pci.0,addr=0x4,drive=drive-virtio-disk0,id=virtio-disk0 \ --drive file=/var/lib/libvirt/Fedora-14-x86_64-Live-KDE.iso,if=none,media=cdrom,id=drive-ide0-1-0,discard=off \ +-drive file=/var/lib/libvirt/Fedora-14-x86_64-Live-KDE.iso,if=none,media=cdrom,id=drive-ide0-1-0,discard=ignore \ -device ide-drive,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-discard.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-discard.xml index a6a8135..f01312f 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-discard.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-discard.xml @@ -17,13 +17,13 @@ <devices> <emulator>/usr/bin/qemu</emulator> <disk type='file' device='disk'> - <driver name='qemu' type='qcow2' discard='on'/> + <driver name='qemu' type='qcow2' discard='unmap'/> <source file='/var/lib/libvirt/images/f14.img'/> <target dev='vda' bus='virtio'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/> </disk> <disk type='file' device='cdrom'> - <driver name='qemu' type='raw' discard='off'/> + <driver name='qemu' type='raw' discard='ignore'/> <source file='/var/lib/libvirt/Fedora-14-x86_64-Live-KDE.iso'/> <target dev='hdc' bus='ide'/> <readonly/> -- 1.8.1.4

2 2

[libvirt] [PATCH v2 0/2] Add support for locking domain's memory pages
by Jiri Denemark 17 May '13

17 May '13

Jiri Denemark (2): Add support for locking domain's memory pages qemu: Implement support for locking domain's memory pages docs/formatdomain.html.in | 26 +++++++++++++--------- docs/schemas/domaincommon.rng | 5 +++++ src/conf/domain_conf.c | 20 +++++++++-------- src/conf/domain_conf.h | 1 + src/qemu/qemu_capabilities.c | 2 ++ src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 11 +++++++++ tests/qemuxml2argvdata/qemuxml2argv-mlock-off.args | 4 ++++ tests/qemuxml2argvdata/qemuxml2argv-mlock-off.xml | 15 +++++++++++++ tests/qemuxml2argvdata/qemuxml2argv-mlock-on.args | 4 ++++ tests/qemuxml2argvdata/qemuxml2argv-mlock-on.xml | 18 +++++++++++++++ .../qemuxml2argv-mlock-unsupported.args | 4 ++++ .../qemuxml2argv-mlock-unsupported.xml | 15 +++++++++++++ tests/qemuxml2argvtest.c | 5 +++++ 14 files changed, 112 insertions(+), 19 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-mlock-off.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-mlock-off.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-mlock-on.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-mlock-on.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-mlock-unsupported.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-mlock-unsupported.xml -- 1.8.2.1

3 5

[libvirt] Resend with corrected error handling
by dwalsh＠redhat.com 16 May '13

16 May '13

[PATCH] Change label of fusefs mounted at /proc/meminfo in lxc

4 6

[libvirt] [PATCH] qemu: Fix cgroup handling when setting VCPU BW
by Martin Kletzander 16 May '13

16 May '13

Commit 632f78c introduced a regression which causes schedinfo being unable to set some parameters. When migrating to priv->cgroup there was missing variable left out and due to passed NULL to underlying function, the setting failed. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=963592 --- As 632f78c describes as v1.0.4-161-g632f78c, I'll push this into v1.0.5-maint as well once ACK'd. src/qemu/qemu_driver.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index b1630f8..9e77fd6 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -8009,7 +8009,6 @@ qemuDomainSetSchedulerParametersFlags(virDomainPtr dom, { virQEMUDriverPtr driver = dom->conn->privateData; int i; - virCgroupPtr group = NULL; virDomainObjPtr vm = NULL; virDomainDefPtr vmdef = NULL; unsigned long long value_ul; @@ -8087,7 +8086,7 @@ qemuDomainSetSchedulerParametersFlags(virDomainPtr dom, QEMU_SCHED_MIN_PERIOD, QEMU_SCHED_MAX_PERIOD); if (flags & VIR_DOMAIN_AFFECT_LIVE && value_ul) { - if ((rc = qemuSetVcpusBWLive(vm, group, value_ul, 0))) + if ((rc = qemuSetVcpusBWLive(vm, priv->cgroup, value_ul, 0))) goto cleanup; vm->def->cputune.period = value_ul; @@ -8101,7 +8100,7 @@ qemuDomainSetSchedulerParametersFlags(virDomainPtr dom, QEMU_SCHED_MIN_QUOTA, QEMU_SCHED_MAX_QUOTA); if (flags & VIR_DOMAIN_AFFECT_LIVE && value_l) { - if ((rc = qemuSetVcpusBWLive(vm, group, 0, value_l))) + if ((rc = qemuSetVcpusBWLive(vm, priv->cgroup, 0, value_l))) goto cleanup; vm->def->cputune.quota = value_l; @@ -8115,7 +8114,8 @@ qemuDomainSetSchedulerParametersFlags(virDomainPtr dom, QEMU_SCHED_MIN_PERIOD, QEMU_SCHED_MAX_PERIOD); if (flags & VIR_DOMAIN_AFFECT_LIVE && value_ul) { - if ((rc = qemuSetEmulatorBandwidthLive(vm, group, value_ul, 0))) + if ((rc = qemuSetEmulatorBandwidthLive(vm, priv->cgroup, + value_ul, 0))) goto cleanup; vm->def->cputune.emulator_period = value_ul; @@ -8129,7 +8129,8 @@ qemuDomainSetSchedulerParametersFlags(virDomainPtr dom, QEMU_SCHED_MIN_QUOTA, QEMU_SCHED_MAX_QUOTA); if (flags & VIR_DOMAIN_AFFECT_LIVE && value_l) { - if ((rc = qemuSetEmulatorBandwidthLive(vm, group, 0, value_l))) + if ((rc = qemuSetEmulatorBandwidthLive(vm, priv->cgroup, + 0, value_l))) goto cleanup; vm->def->cputune.emulator_quota = value_l; -- 1.8.2.1

2 2

[libvirt] [PATCH] Fix failure to detect missing cgroup partitions
by Daniel P. Berrange 16 May '13

16 May '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> Change bbe97ae968eba60b71e0066d49f9fc909966d9d6 caused the QEMU driver to ignore ENOENT errors from cgroups, in order to cope with missing /proc/cgroups. This is not good though because many other things can cause ENOENT and should not be ignored. The callers expect to see ENXIO when cgroups are not present, so adjust the code to report that errno when /proc/cgroups is missing Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- src/qemu/qemu_cgroup.c | 3 +-- src/util/vircgroup.c | 7 ++++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_cgroup.c b/src/qemu/qemu_cgroup.c index aaf94cf..9784f31 100644 --- a/src/qemu/qemu_cgroup.c +++ b/src/qemu/qemu_cgroup.c @@ -456,8 +456,7 @@ int qemuInitCgroup(virQEMUDriverPtr driver, if (rc != 0) { if (rc == -ENXIO || rc == -EPERM || - rc == -EACCES || - rc == -ENOENT) { /* No cgroups mounts == success */ + rc == -EACCES) { /* No cgroups mounts == success */ VIR_DEBUG("No cgroups present/configured/accessible, ignoring error"); goto done; } diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c index 5780785..07ea2c3 100644 --- a/src/util/vircgroup.c +++ b/src/util/vircgroup.c @@ -1110,8 +1110,13 @@ static int virCgroupPartitionNeedsEscaping(const char *path) path[0] == '.') return 1; - if (!(fp = fopen("/proc/cgroups", "r"))) + if (!(fp = fopen("/proc/cgroups", "r"))) { + /* The API contract is that we return ENXIO + * if cgroups are not available on a host */ + if (errno == ENOENT) + errno = ENXIO; return -errno; + } /* * Data looks like this: -- 1.8.2.1

2 1

[libvirt] [PATCH] qemu: Add support for locking domain's memory pages
by Jiri Denemark 16 May '13

16 May '13

--- docs/formatdomain.html.in | 26 +++++++++++++--------- docs/schemas/domaincommon.rng | 5 +++++ src/conf/domain_conf.c | 20 +++++++++-------- src/conf/domain_conf.h | 1 + src/qemu/qemu_capabilities.c | 2 ++ src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 11 +++++++++ tests/qemuxml2argvdata/qemuxml2argv-mlock-off.args | 4 ++++ tests/qemuxml2argvdata/qemuxml2argv-mlock-off.xml | 15 +++++++++++++ tests/qemuxml2argvdata/qemuxml2argv-mlock-on.args | 4 ++++ tests/qemuxml2argvdata/qemuxml2argv-mlock-on.xml | 18 +++++++++++++++ .../qemuxml2argv-mlock-unsupported.args | 4 ++++ .../qemuxml2argv-mlock-unsupported.xml | 15 +++++++++++++ tests/qemuxml2argvtest.c | 5 +++++ 14 files changed, 112 insertions(+), 19 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-mlock-off.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-mlock-off.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-mlock-on.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-mlock-on.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-mlock-unsupported.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-mlock-unsupported.xml diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 5e89a92..da35d48 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -595,22 +595,28 @@ <memoryBacking> <hugepages/> <nosharepages/> + <locked/> </memoryBacking> ... </domain> </pre> + The optional <code>memoryBacking</code> element may contain several + elements that influence how virtual memory pages are backed by host + pages. + <dl> - <dt><code>memoryBacking</code></dt> - <dd>The optional <code>memoryBacking</code> element has two - optional elements. The element <code>hugepages</code> tells - the hypervisor that the guest should have its memory allocated - using hugepages instead of the normal native page size. And the - optional element <code>nosharepages</code> - (since 1.0.6) tells the hypervisor - that share pages (memory merge, KSM) should be disabled on guest - startup. - </dd> + <dt><code>hugepages</code></dt> + <dd>This tells the hypervisor that the guest should have its memory + allocated using hugepages instead of the normal native page size.</dd> + <dt><code>nosharepages</code></dt> + <dd>Instructs hypervisor to disable shared pages (memory merge, KSM) for + this domain. Since 1.0.6</dd> + <dt><code>locked</code></dt> + <dd>When set and supported by the hypervisor, memory pages belonging + to the domain will be locked in host's memory and the host will not + be allowed to swap them out. + Since 1.0.6</dd> </dl> diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index 361794e..f3d3560 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -501,6 +501,11 @@ <empty/> </element> </optional> + <optional> + <element name="locked"> + <empty/> + </element> + </optional> </interleave> </element> </optional> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index f0ca9d5..6d8e580 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -10389,6 +10389,9 @@ virDomainDefParseXML(xmlDocPtr xml, if ((node = virXPathNode("./memoryBacking/nosharepages", ctxt))) def->mem.nosharepages = true; + if (virXPathBoolean("boolean(./memoryBacking/locked)", ctxt)) + def->mem.locked = true; + /* Extract blkio cgroup tunables */ if (virXPathUInt("string(./blkiotune/weight)", ctxt, &def->blkio.weight) < 0) @@ -15736,17 +15739,16 @@ virDomainDefFormatInternal(virDomainDefPtr def, def->mem.swap_hard_limit) virBufferAddLit(buf, " </memtune>\n"); - if (def->mem.hugepage_backed || def->mem.nosharepages) + if (def->mem.hugepage_backed || def->mem.nosharepages || def->mem.locked) { virBufferAddLit(buf, " <memoryBacking>\n"); - - if (def->mem.hugepage_backed) - virBufferAddLit(buf, " <hugepages/>\n"); - - if (def->mem.nosharepages) - virBufferAddLit(buf, " <nosharepages/>\n"); - - if (def->mem.hugepage_backed || def->mem.nosharepages) + if (def->mem.hugepage_backed) + virBufferAddLit(buf, " <hugepages/>\n"); + if (def->mem.nosharepages) + virBufferAddLit(buf, " <nosharepages/>\n"); + if (def->mem.locked) + virBufferAddLit(buf, " <locked/>\n"); virBufferAddLit(buf, " </memoryBacking>\n"); + } virBufferAddLit(buf, " <vcpu"); virBufferAsprintf(buf, " placement='%s'", diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index c176a4c..16eb8b6 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -1861,6 +1861,7 @@ struct _virDomainDef { unsigned long long cur_balloon; /* in kibibytes */ bool hugepage_backed; bool nosharepages; + bool locked; int dump_core; /* enum virDomainMemDump */ unsigned long long hard_limit; /* in kibibytes */ unsigned long long soft_limit; /* in kibibytes */ diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 488cbfe..82129a2 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -230,6 +230,7 @@ VIR_ENUM_IMPL(virQEMUCaps, QEMU_CAPS_LAST, "mem-merge", "vnc-websocket", "drive-discard", + "mlock", ); struct _virQEMUCaps { @@ -2246,6 +2247,7 @@ struct virQEMUCapsCommandLineProps { static struct virQEMUCapsCommandLineProps virQEMUCapsCommandLine[] = { { "machine", "mem-merge", QEMU_CAPS_MEM_MERGE }, { "drive", "discard", QEMU_CAPS_DRIVE_DISCARD }, + { "realtime", "mlock", QEMU_CAPS_MLOCK }, }; static int diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 173ca77..117bf8a 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -187,6 +187,7 @@ enum virQEMUCapsFlags { QEMU_CAPS_MEM_MERGE = 146, /* -machine mem-merge */ QEMU_CAPS_VNC_WEBSOCKET = 147, /* -vnc x:y,websocket */ QEMU_CAPS_DRIVE_DISCARD = 148, /* -drive discard=off(ignore)|on(unmap) */ + QEMU_CAPS_MLOCK = 149, /* -realtime mlock=on|off */ 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 5b95c07..c268a3a 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -6541,6 +6541,17 @@ qemuBuildCommandLine(virConnectPtr conn, cfg->hugepagePath, NULL); } + if (def->mem.locked && !virQEMUCapsGet(qemuCaps, QEMU_CAPS_MLOCK)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("memory locking not supported by QEMU binary")); + goto error; + } + if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_MLOCK)) { + virCommandAddArg(cmd, "-realtime"); + virCommandAddArgFormat(cmd, "mlock=%s", + def->mem.locked ? "on" : "off"); + } + virCommandAddArg(cmd, "-smp"); if (!(smp = qemuBuildSmpArgStr(def, qemuCaps))) goto error; diff --git a/tests/qemuxml2argvdata/qemuxml2argv-mlock-off.args b/tests/qemuxml2argvdata/qemuxml2argv-mlock-off.args new file mode 100644 index 0000000..2a5d94c --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-mlock-off.args @@ -0,0 +1,4 @@ +LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test \ +/usr/bin/qemu -S -M pc -m 214 -realtime mlock=off \ +-smp 1 -nographic -monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi -boot c -usb -net none -serial none -parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-mlock-off.xml b/tests/qemuxml2argvdata/qemuxml2argv-mlock-off.xml new file mode 100644 index 0000000..4125ca5 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-mlock-off.xml @@ -0,0 +1,15 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <devices> + <emulator>/usr/bin/qemu</emulator> + <memballoon model='none'/> + </devices> +</domain> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-mlock-on.args b/tests/qemuxml2argvdata/qemuxml2argv-mlock-on.args new file mode 100644 index 0000000..bb6de13 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-mlock-on.args @@ -0,0 +1,4 @@ +LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test \ +/usr/bin/qemu -S -M pc -m 214 -realtime mlock=on \ +-smp 1 -nographic -monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi -boot c -usb -net none -serial none -parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-mlock-on.xml b/tests/qemuxml2argvdata/qemuxml2argv-mlock-on.xml new file mode 100644 index 0000000..20a5eaa --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-mlock-on.xml @@ -0,0 +1,18 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> + <memoryBacking> + <locked/> + </memoryBacking> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <devices> + <emulator>/usr/bin/qemu</emulator> + <memballoon model='none'/> + </devices> +</domain> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-mlock-unsupported.args b/tests/qemuxml2argvdata/qemuxml2argv-mlock-unsupported.args new file mode 100644 index 0000000..54dd3b9 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-mlock-unsupported.args @@ -0,0 +1,4 @@ +LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test \ +/usr/bin/qemu -S -M pc -m 214 \ +-smp 1 -nographic -monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi -boot c -usb -net none -serial none -parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-mlock-unsupported.xml b/tests/qemuxml2argvdata/qemuxml2argv-mlock-unsupported.xml new file mode 100644 index 0000000..4125ca5 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-mlock-unsupported.xml @@ -0,0 +1,15 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <devices> + <emulator>/usr/bin/qemu</emulator> + <memballoon model='none'/> + </devices> +</domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index c751440..d853308 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1007,6 +1007,11 @@ mymain(void) QEMU_CAPS_DEVICE_SCSI_GENERIC, QEMU_CAPS_DEVICE_SCSI_GENERIC_BOOTINDEX); + DO_TEST("mlock-on", QEMU_CAPS_MLOCK); + DO_TEST_FAILURE("mlock-on", NONE); + DO_TEST("mlock-off", QEMU_CAPS_MLOCK); + DO_TEST("mlock-unsupported", NONE); + virObjectUnref(driver.config); virObjectUnref(driver.caps); virObjectUnref(driver.xmlopt); -- 1.8.2.1

2 1

[libvirt] [PATCH 0/2 v2] Fix the build failure
by Osier Yang 16 May '13

16 May '13

As exposed by [1], qemuxml2argvtest fails because of it tries to access non-existing sysfs files when building qemu command for scsi-generic device. This creates "tests/sysfsroot", uses it as the fake sysfs root, any future sysfs test input files should be put into it. [1] https://www.redhat.com/archives/libvir-list/2013-May/msg00923.html v1 - v2: * Use callbacks instead of increasing the arguments Osier Yang (2): qemu: Add callback struct for qemuBuildCommandLine tests: Move fchostdata into sysfsroot src/qemu/qemu_command.c | 31 ++++++++++++++----- src/qemu/qemu_command.h | 16 ++++++++-- src/qemu/qemu_driver.c | 3 +- src/qemu/qemu_hotplug.c | 6 ++-- src/qemu/qemu_process.c | 3 +- src/util/virscsi.c | 35 ++++++++++++++++++---- src/util/virscsi.h | 3 +- tests/Makefile.am | 2 +- tests/fchostdata/fc_host/host4/fabric_name | 1 - tests/fchostdata/fc_host/host4/max_npiv_vports | 1 - tests/fchostdata/fc_host/host4/node_name | 1 - tests/fchostdata/fc_host/host4/npiv_vports_inuse | 1 - tests/fchostdata/fc_host/host4/port_name | 1 - tests/fchostdata/fc_host/host4/port_state | 1 - tests/fchostdata/fc_host/host4/vport_create | 0 tests/fchostdata/fc_host/host4/vport_delete | 0 tests/fchostdata/fc_host/host5/fabric_name | 1 - tests/fchostdata/fc_host/host5/max_npiv_vports | 1 - tests/fchostdata/fc_host/host5/node_name | 1 - tests/fchostdata/fc_host/host5/npiv_vports_inuse | 1 - tests/fchostdata/fc_host/host5/port_name | 1 - tests/fchostdata/fc_host/host5/port_state | 1 - tests/fchostdata/fc_host/host5/vport_create | 0 tests/fchostdata/fc_host/host5/vport_delete | 0 tests/fchosttest.c | 2 +- tests/qemuxml2argvtest.c | 18 ++++++++++- tests/qemuxmlnstest.c | 3 +- .../bus/scsi/devices/0:0:0:0/scsi_generic/sg0/dev | 1 + .../class/fchostdata/fc_host/host4/fabric_name | 1 + .../class/fchostdata/fc_host/host4/max_npiv_vports | 1 + .../class/fchostdata/fc_host/host4/node_name | 1 + .../fchostdata/fc_host/host4/npiv_vports_inuse | 1 + .../class/fchostdata/fc_host/host4/port_name | 1 + .../class/fchostdata/fc_host/host4/port_state | 1 + .../class/fchostdata/fc_host/host4/vport_create | 0 .../class/fchostdata/fc_host/host4/vport_delete | 0 .../class/fchostdata/fc_host/host5/fabric_name | 1 + .../class/fchostdata/fc_host/host5/max_npiv_vports | 1 + .../class/fchostdata/fc_host/host5/node_name | 1 + .../fchostdata/fc_host/host5/npiv_vports_inuse | 1 + .../class/fchostdata/fc_host/host5/port_name | 1 + .../class/fchostdata/fc_host/host5/port_state | 1 + .../class/fchostdata/fc_host/host5/vport_create | 0 .../class/fchostdata/fc_host/host5/vport_delete | 0 44 files changed, 110 insertions(+), 37 deletions(-) delete mode 100644 tests/fchostdata/fc_host/host4/fabric_name delete mode 100644 tests/fchostdata/fc_host/host4/max_npiv_vports delete mode 100644 tests/fchostdata/fc_host/host4/node_name delete mode 100644 tests/fchostdata/fc_host/host4/npiv_vports_inuse delete mode 100644 tests/fchostdata/fc_host/host4/port_name delete mode 100644 tests/fchostdata/fc_host/host4/port_state delete mode 100644 tests/fchostdata/fc_host/host4/vport_create delete mode 100644 tests/fchostdata/fc_host/host4/vport_delete delete mode 100644 tests/fchostdata/fc_host/host5/fabric_name delete mode 100644 tests/fchostdata/fc_host/host5/max_npiv_vports delete mode 100644 tests/fchostdata/fc_host/host5/node_name delete mode 100644 tests/fchostdata/fc_host/host5/npiv_vports_inuse delete mode 100644 tests/fchostdata/fc_host/host5/port_name delete mode 100644 tests/fchostdata/fc_host/host5/port_state delete mode 100644 tests/fchostdata/fc_host/host5/vport_create delete mode 100644 tests/fchostdata/fc_host/host5/vport_delete create mode 100644 tests/sysfsroot/bus/scsi/devices/0:0:0:0/scsi_generic/sg0/dev create mode 100644 tests/sysfsroot/class/fchostdata/fc_host/host4/fabric_name create mode 100644 tests/sysfsroot/class/fchostdata/fc_host/host4/max_npiv_vports create mode 100644 tests/sysfsroot/class/fchostdata/fc_host/host4/node_name create mode 100644 tests/sysfsroot/class/fchostdata/fc_host/host4/npiv_vports_inuse create mode 100644 tests/sysfsroot/class/fchostdata/fc_host/host4/port_name create mode 100644 tests/sysfsroot/class/fchostdata/fc_host/host4/port_state create mode 100644 tests/sysfsroot/class/fchostdata/fc_host/host4/vport_create create mode 100644 tests/sysfsroot/class/fchostdata/fc_host/host4/vport_delete create mode 100644 tests/sysfsroot/class/fchostdata/fc_host/host5/fabric_name create mode 100644 tests/sysfsroot/class/fchostdata/fc_host/host5/max_npiv_vports create mode 100644 tests/sysfsroot/class/fchostdata/fc_host/host5/node_name create mode 100644 tests/sysfsroot/class/fchostdata/fc_host/host5/npiv_vports_inuse create mode 100644 tests/sysfsroot/class/fchostdata/fc_host/host5/port_name create mode 100644 tests/sysfsroot/class/fchostdata/fc_host/host5/port_state create mode 100644 tests/sysfsroot/class/fchostdata/fc_host/host5/vport_create create mode 100644 tests/sysfsroot/class/fchostdata/fc_host/host5/vport_delete -- 1.8.1.4

4 11

[libvirt] [libvirt PATCH] conf: Fix the bug of disk->copy_on_read formating
by Osier Yang 16 May '13

16 May '13

The reason for it's not exposed for such long time is that there is no xml2xml test for it. This fixes the bug and adds test. --- src/conf/domain_conf.c | 2 +- tests/qemuxml2argvdata/qemuxml2argv-disk-copy_on_read.xml | 15 ++++++++++----- tests/qemuxml2xmltest.c | 2 ++ 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 862b997..be22429 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -13640,7 +13640,7 @@ virDomainDiskDefFormat(virBufferPtr buf, const char *iomode = virDomainDiskIoTypeToString(def->iomode); const char *ioeventfd = virDomainIoEventFdTypeToString(def->ioeventfd); const char *event_idx = virDomainVirtioEventIdxTypeToString(def->event_idx); - const char *copy_on_read = virDomainVirtioEventIdxTypeToString(def->copy_on_read); + const char *copy_on_read = virDomainDiskCopyOnReadTypeToString(def->copy_on_read); const char *sgio = virDomainDiskSGIOTypeToString(def->sgio); char uuidstr[VIR_UUID_STRING_BUFLEN]; diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-copy_on_read.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-copy_on_read.xml index 0834cf2..076095e 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-copy_on_read.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-copy_on_read.xml @@ -1,6 +1,8 @@ <domain type='qemu'> <name>test</name> + <uuid>468404ad-d49c-40f2-9e14-02294f9c1be3</uuid> <memory unit='KiB'>1048576</memory> + <currentMemory unit='KiB'>1048576</currentMemory> <vcpu placement='static'>1</vcpu> <os> <type arch='x86_64' machine='pc-0.13'>hvm</type> @@ -20,27 +22,30 @@ <target dev='vda' bus='virtio'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/> </disk> - <disk type='file' device='cdrom'> + <disk type='file' device='cdrom'> <driver name='qemu' type='raw'/> <source file='/var/lib/libvirt/Fedora-14-x86_64-Live-KDE.iso'/> <target dev='hdc' bus='ide'/> <readonly/> <address type='drive' controller='0' bus='1' target='0' unit='0'/> </disk> + <controller type='usb' index='0'/> + <controller type='virtio-serial' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x06' function='0x0'/> + </controller> + <controller type='ide' index='0'/> + <controller type='pci' index='0' model='pci-root'/> <interface type='user'> <mac address='52:54:00:e5:48:58'/> <model type='virtio'/> <driver name='vhost' txmode='iothread'/> </interface> - <controller type='usb' index='0'/> - <controller type='virtio-serial' index='0'> - <address type='pci' domain='0x0000' bus='0x00' slot='0x06' function='0x0'/> - </controller> <serial type='pty'> <target port='0'/> </serial> <console type='pty'> <target type='serial' port='0'/> </console> + <memballoon model='virtio'/> </devices> </domain> diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index 492ac60..d24cec9 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -289,6 +289,8 @@ mymain(void) DO_TEST("hostdev-scsi-virtio-scsi"); DO_TEST("hostdev-scsi-readonly"); + DO_TEST("disk-copy_on_read"); + virObjectUnref(driver.caps); virObjectUnref(driver.xmlopt); -- 1.8.1.4

2 4

[libvirt] [PATCH] datatypes: fix virGetStoragePool's comment
by Ján Tomko 16 May '13

16 May '13

--- Pushed under the trivial rule. src/datatypes.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/datatypes.c b/src/datatypes.c index 884eb3e..940d968 100644 --- a/src/datatypes.c +++ b/src/datatypes.c @@ -421,7 +421,7 @@ virInterfaceDispose(void *obj) * and register it in the table. In any case a corresponding call to * virObjectUnref() is needed to not leak data. * - * Returns a pointer to the network, or NULL in case of failure + * Returns a pointer to the storage pool, or NULL in case of failure */ virStoragePoolPtr virGetStoragePool(virConnectPtr conn, const char *name, -- 1.8.1.5

1 0

[libvirt] [PATCH] daemon: fix leak after listing all volumes
by Ján Tomko 16 May '13

16 May '13

CVE-2013-1962 remoteDispatchStoragePoolListAllVolumes wasn't freeing the pool. The pool also held a reference to the connection, preventing it from getting freed and closing the netcf interface driver, which held two sockets open. --- daemon/remote.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/daemon/remote.c b/daemon/remote.c index 1d21478..af89e60 100644 --- a/daemon/remote.c +++ b/daemon/remote.c @@ -4202,6 +4202,8 @@ cleanup: virStorageVolFree(vols[i]); VIR_FREE(vols); } + if (pool) + virStoragePoolFree(pool); return rv; } -- 1.8.1.5

2 2