- Devel - libvirt List Archives

[libvirt] [PATCH] util: recognize SMB filesystems as shared
by Laine Stump 27 Sep '13

27 Sep '13

This should resolve: https://bugzilla.redhat.com/show_bug.cgi?id=1012085 libvirt previously recognized NFS, GFS2, OCFS2, and AFS filesystems as "shared", and thus eligible for exceptions to certain rules/actions about chowning image files before handing them off to a guest. This patch widens the definition of "shared filesystem" to include the SMB filesystem (sometimes called CIFS, or "Windows file sharing"). --- src/util/virstoragefile.c | 9 ++++++++- src/util/virstoragefile.h | 1 + 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c index 0b9cec3..ed43b2b 100644 --- a/src/util/virstoragefile.c +++ b/src/util/virstoragefile.c @@ -1241,6 +1241,9 @@ cleanup: # ifndef AFS_FS_MAGIC # define AFS_FS_MAGIC 0x6B414653 # endif +# ifndef SMB_SUPER_MAGIC +# define SMB_SUPER_MAGIC 0x517B +# endif int virStorageFileIsSharedFSType(const char *path, @@ -1304,6 +1307,9 @@ int virStorageFileIsSharedFSType(const char *path, if ((fstypes & VIR_STORAGE_FILE_SHFS_AFS) && (sb.f_type == AFS_FS_MAGIC)) return 1; + if ((fstypes & VIR_STORAGE_FILE_SHFS_SMB) && + (sb.f_type == SMB_SUPER_MAGIC)) + return 1; return 0; } @@ -1322,7 +1328,8 @@ int virStorageFileIsSharedFS(const char *path) VIR_STORAGE_FILE_SHFS_NFS | VIR_STORAGE_FILE_SHFS_GFS2 | VIR_STORAGE_FILE_SHFS_OCFS | - VIR_STORAGE_FILE_SHFS_AFS); + VIR_STORAGE_FILE_SHFS_AFS | + VIR_STORAGE_FILE_SHFS_SMB); } int virStorageFileIsClusterFS(const char *path) diff --git a/src/util/virstoragefile.h b/src/util/virstoragefile.h index 1f89839..9c07212 100644 --- a/src/util/virstoragefile.h +++ b/src/util/virstoragefile.h @@ -112,6 +112,7 @@ enum { VIR_STORAGE_FILE_SHFS_GFS2 = (1 << 1), VIR_STORAGE_FILE_SHFS_OCFS = (1 << 2), VIR_STORAGE_FILE_SHFS_AFS = (1 << 3), + VIR_STORAGE_FILE_SHFS_SMB = (1 << 4), }; int virStorageFileIsSharedFS(const char *path); -- 1.7.11.7

4 4

[libvirt] [libvirt-glib] Use latest warnings.m4 from gnulib
by Christophe Fergeau 26 Sep '13

26 Sep '13

The one we were using does not work properly with clang, causing the build process to try to use -f/-W options that are not supported by clang. --- m4/warnings.m4 | 82 ++++++++++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 62 insertions(+), 20 deletions(-) diff --git a/m4/warnings.m4 b/m4/warnings.m4 index 69d05a6..e3d239b 100644 --- a/m4/warnings.m4 +++ b/m4/warnings.m4 @@ -1,5 +1,5 @@ -# warnings.m4 serial 5 -dnl Copyright (C) 2008-2012 Free Software Foundation, Inc. +# warnings.m4 serial 11 +dnl Copyright (C) 2008-2013 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -14,24 +14,66 @@ m4_ifdef([AS_VAR_APPEND], [m4_define([gl_AS_VAR_APPEND], [AS_VAR_SET([$1], [AS_VAR_GET([$1])$2])])]) -# gl_WARN_ADD(PARAMETER, [VARIABLE = WARN_CFLAGS]) -# ------------------------------------------------ -# Adds parameter to WARN_CFLAGS if the compiler supports it. For example, -# gl_WARN_ADD([-Wparentheses]). -AC_DEFUN([gl_WARN_ADD], -dnl FIXME: gl_Warn must be used unquoted until we can assume -dnl autoconf 2.64 or newer. -[AS_VAR_PUSHDEF([gl_Warn], [gl_cv_warn_$1])dnl -AC_CACHE_CHECK([whether compiler handles $1], m4_defn([gl_Warn]), [ - gl_save_CPPFLAGS="$CPPFLAGS" - CPPFLAGS="${CPPFLAGS} $1" - AC_PREPROC_IFELSE([AC_LANG_PROGRAM([])], - [AS_VAR_SET(gl_Warn, [yes])], - [AS_VAR_SET(gl_Warn, [no])]) - CPPFLAGS="$gl_save_CPPFLAGS" + +# gl_COMPILER_OPTION_IF(OPTION, [IF-SUPPORTED], [IF-NOT-SUPPORTED], +# [PROGRAM = AC_LANG_PROGRAM()]) +# ----------------------------------------------------------------- +# Check if the compiler supports OPTION when compiling PROGRAM. +# +# FIXME: gl_Warn must be used unquoted until we can assume Autoconf +# 2.64 or newer. +AC_DEFUN([gl_COMPILER_OPTION_IF], +[AS_VAR_PUSHDEF([gl_Warn], [gl_cv_warn_[]_AC_LANG_ABBREV[]_$1])dnl +AS_VAR_PUSHDEF([gl_Flags], [_AC_LANG_PREFIX[]FLAGS])dnl +AS_LITERAL_IF([$1], + [m4_pushdef([gl_Positive], m4_bpatsubst([$1], [^-Wno-], [-W]))], + [gl_positive="$1" +case $gl_positive in + -Wno-*) gl_positive=-W`expr "X$gl_positive" : 'X-Wno-$.*$'` ;; +esac +m4_pushdef([gl_Positive], [$gl_positive])])dnl +AC_CACHE_CHECK([whether _AC_LANG compiler handles $1], m4_defn([gl_Warn]), [ + gl_save_compiler_FLAGS="$gl_Flags" + gl_AS_VAR_APPEND(m4_defn([gl_Flags]), + [" $gl_unknown_warnings_are_errors ]m4_defn([gl_Positive])["]) + AC_LINK_IFELSE([m4_default([$4], [AC_LANG_PROGRAM([])])], + [AS_VAR_SET(gl_Warn, [yes])], + [AS_VAR_SET(gl_Warn, [no])]) + gl_Flags="$gl_save_compiler_FLAGS" ]) -AS_VAR_IF(gl_Warn, [yes], - [gl_AS_VAR_APPEND(m4_if([$2], [], [[WARN_CFLAGS]], [[$2]]), [" $1"])]) +AS_VAR_IF(gl_Warn, [yes], [$2], [$3]) +m4_popdef([gl_Positive])dnl +AS_VAR_POPDEF([gl_Flags])dnl AS_VAR_POPDEF([gl_Warn])dnl -m4_ifval([$2], [AS_LITERAL_IF([$2], [AC_SUBST([$2])], [])])dnl ]) + +# gl_UNKNOWN_WARNINGS_ARE_ERRORS +# ------------------------------ +# Clang doesn't complain about unknown warning options unless one also +# specifies -Wunknown-warning-option -Werror. Detect this. +AC_DEFUN([gl_UNKNOWN_WARNINGS_ARE_ERRORS], +[gl_COMPILER_OPTION_IF([-Werror -Wunknown-warning-option], + [gl_unknown_warnings_are_errors='-Wunknown-warning-option -Werror'], + [gl_unknown_warnings_are_errors=])]) + +# gl_WARN_ADD(OPTION, [VARIABLE = WARN_CFLAGS], +# [PROGRAM = AC_LANG_PROGRAM()]) +# --------------------------------------------- +# Adds parameter to WARN_CFLAGS if the compiler supports it when +# compiling PROGRAM. For example, gl_WARN_ADD([-Wparentheses]). +# +# If VARIABLE is a variable name, AC_SUBST it. +AC_DEFUN([gl_WARN_ADD], +[AC_REQUIRE([gl_UNKNOWN_WARNINGS_ARE_ERRORS]) +gl_COMPILER_OPTION_IF([$1], + [gl_AS_VAR_APPEND(m4_if([$2], [], [[WARN_CFLAGS]], [[$2]]), [" $1"])], + [], + [$3]) +m4_ifval([$2], + [AS_LITERAL_IF([$2], [AC_SUBST([$2])])], + [AC_SUBST([WARN_CFLAGS])])dnl +]) + +# Local Variables: +# mode: autoconf +# End: -- 1.8.3.1

2 2

[libvirt] [PATCH]qemu: virDomainControllerFind may return 0 if controller found
by Chen Hanxiao 26 Sep '13

26 Sep '13

From: Chen Hanxiao <chenhanxiao(a)cn.fujitsu.com> The return value of virDomainControllerFind >=0 means that the specific controller was found. But some functions invoke it and treat 0 as not found. This patch fix these incorrect invocation. Signed-off-by: Chen Hanxiao <chenhanxiao(a)cn.fujitsu.com> --- src/qemu/qemu_driver.c | 2 +- src/qemu/qemu_hotplug.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 346a8f9..ccd9cc6 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -6626,7 +6626,7 @@ qemuDomainAttachDeviceConfig(virQEMUCapsPtr qemuCaps, case VIR_DOMAIN_DEVICE_CONTROLLER: controller = dev->data.controller; if (virDomainControllerFind(vmdef, controller->type, - controller->idx) > 0) { + controller->idx) >= 0) { virReportError(VIR_ERR_OPERATION_INVALID, "%s", _("Target already exists")); return -1; diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 6cdee44..f06930e 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -358,7 +358,7 @@ int qemuDomainAttachPciControllerDevice(virQEMUDriverPtr driver, qemuDomainObjPrivatePtr priv = vm->privateData; bool releaseaddr = false; - if (virDomainControllerFind(vm->def, controller->type, controller->idx) > 0) { + if (virDomainControllerFind(vm->def, controller->type, controller->idx) >= 0) { virReportError(VIR_ERR_OPERATION_FAILED, _("target %s:%d already exists"), type, controller->idx); -- 1.8.2.1

2 1

[libvirt] [PATCH 0/2] Fix crash in chardev source parsing
by Peter Krempa 26 Sep '13

26 Sep '13

Peter Krempa (2): conf: Don't crash on invalid chardev source definition of RNGs and other conf: clean up virDomainChrSourceDefParseXML src/conf/domain_conf.c | 68 +++++++++++----------- .../qemuxml2argv-virtio-rng-egd-crash.xml | 27 +++++++++ tests/qemuxml2argvtest.c | 2 + 3 files changed, 64 insertions(+), 33 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-egd-crash.xml -- 1.8.3.2

2 4

[libvirt] [PATCH] LXC start after shutdown didn't work
by Cédric Bosdonnat 26 Sep '13

26 Sep '13

The bug is that after shutting down an lxc full-distro container, start always fails. It turns out that shutdown doesn't clean the machine on the machined side. A workaround is to machinectl terminate the container. A proper fix would be that machinectl tracks the state of the init process and cleans the machine if that one disappears. This fix is the reasonable fix we can have on the libvirt side: really try to start the container manually if starting it with systemd failed. It currently never calls the virCgroupNewMachineManual function. --- src/util/vircgroup.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c index e99caf5..466c170 100644 --- a/src/util/vircgroup.c +++ b/src/util/vircgroup.c @@ -1656,9 +1656,6 @@ virCgroupNewMachine(const char *name, group)) == 0) return 0; - if (rv == -1) - return -1; - return virCgroupNewMachineManual(name, drivername, pidleader, -- 1.8.4

2 1

[libvirt] virDomainGetInfo() returns wrong domain state
by Panday Ritesh Sharma (rpanday) 26 Sep '13

26 Sep '13

Hi Team, I have written below code to get the VM state at run time. I found, though the VM is in shut-off state, when I use the function virDomainGetInfo(); I get state as running. Could you please let me know what wrong I am doing. To know the actual VM state I used 'virsh list' and it clearly shows the VM is in shut-off state. Please find the log and code snippet below. Log from virsh: ================= [host:~]$ virsh list --all Id Name State ---------------------------------------------------- 1 calvados running 2 LCXR running 3 default-sdr--1 running - test--2 shut off Out put: ========= 04.03.06.698923264:INFO: vm_libvirt_state_to_vmm_state: state returned is 1 Note : Here 1 is actually running. Code snippet: =============== enum cidl_vmm_vm_state vm_libvirt_state_to_vmm_state(unsigned char libvirt_state) { enum cidl_vmm_vm_state state; INFO("%s: state returned is %u\n",__FUNCTION__, libvirt_state); <<<<<<<<<<<<<<<<<< if (libvirt_state == VIR_DOMAIN_RUNNING) { state = cidl_vm_state_running; } else if ((libvirt_state == VIR_DOMAIN_PAUSED) || (libvirt_state == VIR_DOMAIN_BLOCKED)) { state = cidl_vm_state_paused; } else if (libvirt_state == VIR_DOMAIN_SHUTOFF) { state = cidl_vm_state_defined; } else { state = cidl_vm_state_not_defined; } return state; } virDomainInfo res_util; virDomainPtr dom = virDomainLookupByName(virt, private_names[vm_idx]); res = virDomainGetInfo(dom, &res_util); vminfo[vm_idx].vm_state = vm_libvirt_state_to_vmm_state(res_util.state); Regards Ritesh Sharma

2 3

[libvirt] [PATCH 1/2] qemu: Add SPAPR_VFIO_BRIDGE capability for PPC platform
by Li Zhang 26 Sep '13

26 Sep '13

From: Li Zhang <zhlcindy(a)linux.vnet.ibm.com> To support VFIO for PPC, it is needed spapr-vfio-pci-host-bridge in QEMU. This patch is to add one capability for it. Signed-off-by: Li Zhang <zhlcindy(a)linux.vnet.ibm.com> --- src/qemu/qemu_capabilities.c | 2 ++ src/qemu/qemu_capabilities.h | 1 + 2 files changed, 3 insertions(+) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index d94188a..7cc02db 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -241,6 +241,7 @@ VIR_ENUM_IMPL(virQEMUCaps, QEMU_CAPS_LAST, "usb-storage", /* 155 */ "usb-storage.removable", "virtio-mmio", + "spapr-pci-vfio-host-bridge", ); struct _virQEMUCaps { @@ -1391,6 +1392,7 @@ struct virQEMUCapsStringFlags virQEMUCapsObjectTypes[] = { { "i82801b11-bridge", QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE }, { "usb-storage", QEMU_CAPS_DEVICE_USB_STORAGE }, { "virtio-mmio", QEMU_CAPS_DEVICE_VIRTIO_MMIO }, + { "spapr-pci-vfio-host-bridge", QEMU_CAPS_SPAPR_VFIO_BRIDGE }, }; static struct virQEMUCapsStringFlags virQEMUCapsObjectPropsVirtioBlk[] = { diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index f3c8fa8..33d303e 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -196,6 +196,7 @@ enum virQEMUCapsFlags { QEMU_CAPS_DEVICE_USB_STORAGE = 155, /* -device usb-storage */ QEMU_CAPS_USB_STORAGE_REMOVABLE = 156, /* usb-storage.removable */ QEMU_CAPS_DEVICE_VIRTIO_MMIO = 157, /* -device virtio-mmio */ + QEMU_CAPS_SPAPR_VFIO_BRIDGE = 158, /* -device spapr-pci-vfio-host-bridge */ QEMU_CAPS_LAST, /* this must always be the last item */ }; -- 1.8.1.4

2 5

[libvirt] [PATCH 00/23] Fix yet more OOM errors
by Daniel P. Berrange 26 Sep '13

26 Sep '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> A nice mix of leaks and crashes and ignoring errors. Daniel P. Berrange (23): Fix crash on OOM in xenParseSxpr Fix handling of OOM when getting Xen dom ID Don't clobber return value in virInterfaceDefParseProtoIPv6 Fix crash on OOM in virDomainSnapshotDefParse Don't clobber 'ret' in LXC XML test case Fix double free of hostdev on OOM in xenParseSxprPCI Fix crash on OOM parsing storage pool XML Add missing check for OOM with virVMXEscapeHexPipe Fix leak of comment string if virConfAddEntry fails on OOM Don't print all test suite errors to stderr in vmx2xmltest Fix leak of iterators in virDBusMessageIterEncode Fix double-free in virJSONParserHandleStartMap on OOM Fix leak of parser state in virJSONValueFromString Fix leak in virLockSpaceResourceFree Don't ignore errors parsing nwfilter rules Fix leak on OOM in qemuMonitorCommonTestNew Avoid double free in qemuMonitorCommonTestInit on OOM Avoid uninitialized data in qemuMonitorTestNew Avoid crash on OOM in virbuftest Avoid crash on OOM in virlockspacetest Avoid crash on OOM in virportallocatortest Avoid crash on OOM in virnetmessagetest Avoid use of uninitialized data in virnetmessagetest src/conf/interface_conf.c | 16 ++++++-------- src/conf/nwfilter_conf.c | 16 +++++++------- src/conf/snapshot_conf.c | 4 ++-- src/conf/storage_conf.c | 6 +++--- src/util/virconf.c | 5 ++++- src/util/virdbus.c | 24 ++++++++++++++++++--- src/util/virjson.c | 2 +- src/util/virlockspace.c | 1 + src/vmx/vmx.c | 3 ++- src/xen/xen_driver.c | 3 ++- src/xen/xend_internal.c | 10 +++++---- src/xenxs/xen_sxpr.c | 23 ++++++++++---------- src/xenxs/xen_sxpr.h | 4 ++-- tests/lxcxml2xmltest.c | 13 +++++++---- tests/nwfilterxml2xmltest.c | 14 ++++++------ tests/qemumonitortestutils.c | 7 +++++- tests/sexpr2xmltest.c | 3 ++- tests/virbuftest.c | 14 ++++++++++++ tests/virlockspacetest.c | 21 ++++++++++++------ tests/virnetmessagetest.c | 9 +++++++- tests/virportallocatortest.c | 6 ++++++ tests/vmx2xmltest.c | 51 +++++++++++++++++--------------------------- 22 files changed, 154 insertions(+), 101 deletions(-) -- 1.8.3.1

3 32

[libvirt] networking restart after redefinition
by Mihamina Rakotomandimby 26 Sep '13

26 Sep '13

Hi all, Running Fedora 18 and the bundled libvirt and virt-tools. Desktop use. As I like to access my guests with a hostname and not a numerical IP address, I fix the IP addressing in the network configuration: http://pastebin.com/rfMKn40j Unfortunately, I cant find a way to add a host without loosing the whole networking, as when I add a ahost, I destroy and redefine the network. Restarting libvirtd is not the solution. How would you recommend to have networking UP after network redefinition? -- RMA.

2 1

[libvirt] [PATCH 0/4] Rewrite the test OOM checking code
by Daniel P. Berrange 26 Sep '13

26 Sep '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> This rewrites the OOM checking code to be much much much more scalable. Instead of looping running 'main' multiple times, we loop running 'virtTestRun' multiple times. Although the overall number of mallocs to be checked is basically the same, checking them in small blocks is a massive efficiency win, because the complexity is 'n * (n + 1) / 1'. Although I've fixed many issues, there are still some big problems remaining - The APIs in virxml.h don't let the caller distinguish between "attribute not found" and other errors. So anywhere we have an attribute that is optional, we are failing to diagnose & report OOM correctly (or indeed other errors we might get from libxml) - It is desirable to validate that we get VIR_ERR_NO_MEMORY for each failure, but there are times where we won't get this. In particular with any of the APIs which have delayed error reporting such as virCommand and virBuffer. You can see an OOM from those APIs, but there's a window between that occurring & being reported, where another error may be reported. - We should not count allocs in virerror.c or virlog.c APIs when doing OOM testing, since they're intentionally non-fatal Daniel P. Berrange (4): Don't clobber 'ret' variable in testCompareXMLToXMLHelper Remove existing OOM test impl Remove test case average timing Introduce new OOM testing support tests/commandtest.c | 2 +- tests/cputest.c | 5 +- tests/domainsnapshotxml2xmltest.c | 2 +- tests/esxutilstest.c | 2 +- tests/fchosttest.c | 10 +- tests/fdstreamtest.c | 8 +- tests/interfacexml2xmltest.c | 6 +- tests/jsontest.c | 2 +- tests/libvirtdconftest.c | 2 +- tests/lxcxml2xmltest.c | 4 +- tests/metadatatest.c | 6 +- tests/networkxml2conftest.c | 2 +- tests/networkxml2xmltest.c | 2 +- tests/networkxml2xmlupdatetest.c | 2 +- tests/nodedevxml2xmltest.c | 6 +- tests/nodeinfotest.c | 2 +- tests/nwfilterxml2xmltest.c | 2 +- tests/openvzutilstest.c | 2 +- tests/qemuagenttest.c | 4 +- tests/qemuargv2xmltest.c | 18 +- tests/qemuhelptest.c | 2 +- tests/qemuhotplugtest.c | 2 +- tests/qemumonitorjsontest.c | 8 +- tests/qemumonitortest.c | 2 +- tests/qemuxml2argvtest.c | 14 +- tests/qemuxml2xmltest.c | 25 +-- tests/qemuxmlnstest.c | 20 +- tests/securityselinuxlabeltest.c | 6 +- tests/securityselinuxtest.c | 2 +- tests/sexpr2xmltest.c | 2 +- tests/sockettest.c | 16 +- tests/statstest.c | 2 +- tests/storagepoolxml2xmltest.c | 6 +- tests/storagevolxml2argvtest.c | 2 +- tests/storagevolxml2xmltest.c | 14 +- tests/sysinfotest.c | 2 +- tests/testutils.c | 386 ++++++++++++++++++++------------------ tests/testutils.h | 3 +- tests/utiltest.c | 4 +- tests/viratomictest.c | 4 +- tests/virauthconfigtest.c | 2 +- tests/virbitmaptest.c | 18 +- tests/virbuftest.c | 2 +- tests/vircgrouptest.c | 22 +-- tests/virdbustest.c | 10 +- tests/virdrivermoduletest.c | 2 +- tests/virendiantest.c | 4 +- tests/virhashtest.c | 2 +- tests/viridentitytest.c | 4 +- tests/virkeycodetest.c | 4 +- tests/virkeyfiletest.c | 2 +- tests/virlockspacetest.c | 14 +- tests/virnetmessagetest.c | 10 +- tests/virnetserverclienttest.c | 2 +- tests/virnetsockettest.c | 30 +-- tests/virnettlscontexttest.c | 2 +- tests/virnettlssessiontest.c | 4 +- tests/virportallocatortest.c | 4 +- tests/virshtest.c | 36 ++-- tests/virstoragetest.c | 2 +- tests/virstringtest.c | 8 +- tests/virsystemdtest.c | 10 +- tests/virtimetest.c | 2 +- tests/viruritest.c | 2 +- tests/vmwarevertest.c | 2 +- tests/vmx2xmltest.c | 2 +- tests/xencapstest.c | 22 +-- tests/xmconfigtest.c | 4 +- tests/xml2sexprtest.c | 2 +- tests/xml2vmxtest.c | 2 +- 70 files changed, 436 insertions(+), 407 deletions(-) -- 1.8.3.1

2 8

[libvirt] [PATCH] spec: Clean up distribution of ChangeLog (and others)
by Cole Robinson 26 Sep '13

26 Sep '13

- Move COPYING* to libvirt-client, so every package pulls them in - Move AUTHORS ChangeLog.gz NEWS README TODO from -daemon to -docs - Drop duplicate distribution of docs in -python --- libvirt.spec.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index f899149..d294aad 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -1723,6 +1723,8 @@ fi %files docs %defattr(-, root, root) +%doc AUTHORS ChangeLog.gz NEWS README TODO + # Website %dir %{_datadir}/doc/libvirt-docs-%{version} %dir %{_datadir}/doc/libvirt-docs-%{version}/html @@ -1739,7 +1741,6 @@ fi %files daemon %defattr(-, root, root) -%doc AUTHORS ChangeLog.gz NEWS README COPYING COPYING.LESSER TODO %dir %attr(0700, root, root) %{_sysconfdir}/libvirt/ %if %{with_network} @@ -2011,7 +2012,7 @@ fi %files client -f %{name}.lang %defattr(-, root, root) -%doc AUTHORS ChangeLog.gz NEWS README COPYING COPYING.LESSER TODO +%doc COPYING COPYING.LESSER %config(noreplace) %{_sysconfdir}/libvirt/libvirt.conf %if %{with_lxc} @@ -2101,7 +2102,6 @@ fi %files python %defattr(-, root, root) -%doc AUTHORS NEWS README COPYING COPYING.LESSER %{_libdir}/python*/site-packages/libvirt.py* %{_libdir}/python*/site-packages/libvirt_qemu.py* %{_libdir}/python*/site-packages/libvirt_lxc.py* -- 1.8.3.1

2 2

[libvirt] [PATCH v2 0/9] test: Mock snapshot APIs and misc improvements
by Cole Robinson 26 Sep '13

26 Sep '13

This series implements snapshot and managed save APIs for the test driver, and adds some misc improvements, like specifying domain state in the passed in driver XML. v2: Use a separate XML namespace for the custom XML additions Add snapshot REDEFINE support, sharing the generic logic with qemu Cole Robinson (9): test: Allow specifying object runstate in driver XML test: Allow specifying object transient state in driver XML test: Wire up managed save APIs test: Implement readonly snapshot APIs test: Implement snapshot create/delete/revert APIs qemu: snapshots: Simplify REDEFINE flag check qemu: snapshot: Break out redefine preparation to shared function test: snapshot: Add REDEFINE support test: Allow specifying domainsnapshot XML src/conf/domain_conf.c | 3 +- src/conf/snapshot_conf.c | 150 ++++++ src/conf/snapshot_conf.h | 7 + src/libvirt_private.syms | 1 + src/qemu/qemu_driver.c | 145 +----- src/test/test_driver.c | 1236 +++++++++++++++++++++++++++++++++++++++++++++- tests/virshtest.c | 2 +- 7 files changed, 1399 insertions(+), 145 deletions(-) -- 1.8.3.1

2 15

[libvirt] [PATCH] spec: Only distribute ChangeLog in -devel package
by Cole Robinson 26 Sep '13

26 Sep '13

Helps save space on the Fedora livecd, as requested here: https://bugzilla.redhat.com/show_bug.cgi?id=977099 --- libvirt.spec.in | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index e94901a..a327eab 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -1739,7 +1739,6 @@ fi %files daemon %defattr(-, root, root) -%doc AUTHORS ChangeLog.gz NEWS README COPYING COPYING.LESSER TODO %dir %attr(0700, root, root) %{_sysconfdir}/libvirt/ %if %{with_network} @@ -2011,7 +2010,6 @@ fi %files client -f %{name}.lang %defattr(-, root, root) -%doc AUTHORS ChangeLog.gz NEWS README COPYING COPYING.LESSER TODO %config(noreplace) %{_sysconfdir}/libvirt/libvirt.conf %config(noreplace) %{_sysconfdir}/libvirt/virt-login-shell.conf @@ -2081,6 +2079,7 @@ fi %{_datadir}/libvirt/api/libvirt-qemu-api.xml %{_datadir}/libvirt/api/libvirt-lxc-api.xml +%doc AUTHORS ChangeLog.gz NEWS README COPYING COPYING.LESSER TODO %doc docs/*.html docs/html docs/*.gif %doc docs/libvirt-api.xml %doc examples/hellolibvirt -- 1.8.3.1

3 6

[libvirt] [PATCH 0/3] Refactor feature handling and add support for pvticketlocks
by Peter Krempa 26 Sep '13

26 Sep '13

The kernel recently added support for paravirtual spinlocks and qemu will be following up soon. This series adds the support to libvirt. Peter Krempa (3): schema: Rename option to make it reusable conf: Refactor storing and usage of feature flags qemu: Add support for paravirtual spinlocks in the guest docs/formatdomain.html.in | 7 + docs/schemas/domaincommon.rng | 18 +- src/conf/domain_conf.c | 186 ++++++++++++++------- src/conf/domain_conf.h | 3 +- src/libxl/libxl_conf.c | 9 +- src/lxc/lxc_container.c | 6 +- src/qemu/qemu_command.c | 30 +++- src/vbox/vbox_tmpl.c | 45 +++-- src/xenapi/xenapi_driver.c | 10 +- src/xenapi/xenapi_utils.c | 22 ++- src/xenxs/xen_sxpr.c | 20 +-- src/xenxs/xen_xm.c | 30 ++-- .../qemuxml2argv-pv-spinlock-disabled.args | 5 + .../qemuxml2argv-pv-spinlock-disabled.xml | 26 +++ .../qemuxml2argv-pv-spinlock-enabled.args | 5 + .../qemuxml2argv-pv-spinlock-enabled.xml | 26 +++ tests/qemuxml2argvtest.c | 2 + tests/qemuxml2xmltest.c | 2 + 18 files changed, 311 insertions(+), 141 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pv-spinlock-disabled.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pv-spinlock-disabled.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pv-spinlock-enabled.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pv-spinlock-enabled.xml -- 1.8.3.2

3 7

[libvirt] [PATCH] virsh: Fix domdisplay when domain only uses TLS
by Christophe Fergeau 25 Sep '13

25 Sep '13

It's possible to create a domain which will only use a TLS port and will not have a non-TLS port set by using: <graphics type='spice' autoport='yes' defaultMode='secure'/> In such a setup, the 'graphics' node for the running domain will be: <graphics type='spice' tlsPort='5900' autoport='yes' listen='127.0.0.1' defaultMode='secure'> However, cmdDomDisplay loops over all the 'graphics' node, and it ignores nodes which don't have a 'port' attribute. This means 'virsh domdisplay' will only return an empty string for domains as the one above. This commit looks for both 'port' and 'tlsPort' before deciding to ignore a graphics node. It also makes sure 'port' is not printed when it's not set. This makes 'virsh domdisplay' return 'spice://127.0.0.1?tls-port=5900' for domains using only a TLS port. Signed-off-by: Christophe Fergeau <cfergeau(a)redhat.com> --- tools/virsh-domain.c | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 856e888..5e9d784 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -9073,6 +9073,20 @@ cmdDomDisplay(vshControl *ctl, const vshCmd *cmd) /* If there is no port number for this type, then jump to the next * scheme */ if (tmp) + port = 0; + + /* Create our XPATH lookup for TLS Port (automatically skipped + * for unsupported schemes */ + if (virAsprintf(&xpath, xpath_fmt, scheme[iter], "tlsPort") < 0) + goto cleanup; + + /* Attempt to get the TLS port number */ + tmp = virXPathInt(xpath, ctxt, &tls_port); + VIR_FREE(xpath); + if (tmp) + tls_port = 0; + + if (!port && !tls_port) continue; /* Create our XPATH lookup for the current display's address */ @@ -9103,17 +9117,6 @@ cmdDomDisplay(vshControl *ctl, const vshCmd *cmd) port -= 5900; } - /* Create our XPATH lookup for TLS Port (automatically skipped - * for unsupported schemes */ - if (virAsprintf(&xpath, xpath_fmt, scheme[iter], "tlsPort") < 0) - goto cleanup; - - /* Attempt to get the TLS port number */ - tmp = virXPathInt(xpath, ctxt, &tls_port); - VIR_FREE(xpath); - if (tmp) - tls_port = 0; - /* Build up the full URI, starting with the scheme */ virBufferAsprintf(&buf, "%s://", scheme[iter]); @@ -9128,7 +9131,8 @@ cmdDomDisplay(vshControl *ctl, const vshCmd *cmd) virBufferAsprintf(&buf, "%s", listen_addr); /* Add the port */ - virBufferAsprintf(&buf, ":%d", port); + if (port) + virBufferAsprintf(&buf, ":%d", port); /* TLS Port */ if (tls_port) { -- 1.8.3.1

1 0

[libvirt] [PATCH] virsh-domain: Add a missing check and fix leak in cmdScreenshot
by Hongwei Bi 25 Sep '13

25 Sep '13

--- tools/virsh-domain.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 856e888..7fe42df 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -4610,7 +4610,8 @@ cmdScreenshot(vshControl *ctl, const vshCmd *cmd) if (!(dom = vshCommandOptDomain(ctl, cmd, &name))) return false; - st = virStreamNew(ctl->conn, 0); + if (!(st = virStreamNew(ctl->conn, 0))) + goto cleanup; mime = virDomainScreenshot(dom, st, screen, flags); if (!mime) { @@ -4620,7 +4621,7 @@ cmdScreenshot(vshControl *ctl, const vshCmd *cmd) if (!file) { if (!(file=vshGenFileName(ctl, dom, mime))) - return false; + goto cleanup; generated = true; } -- 1.7.1

2 1

[libvirt] [PATCH 0/6] Several Q35 related tweaks
by Laine Stump 25 Sep '13

25 Sep '13

These patches are all in response to the issues that Gerd Hoffman raised in https://bugzilla.redhat.com/show_bug.cgi?id=1003983 Three of the six are simple refactoring of existing code, done separately so that the patches that change functionality would be simpler to review. None of them is very long. Laine Stump (6): qemu: eliminate redundant if clauses in qemuCollectPCIAddress qemu: allow some PCI devices to be attached to PCIe slots qemu: replace multiple strcmps with a switch on an enum qemu: support ich9-intel-hda audio device qemu: turn if into switch in qemuDomainValidateDevicePCISlotsQ35 qemu: prefer to put a Q35 machine's dmi-to-pci-bridge at 00:1E.0 docs/schemas/domaincommon.rng | 1 + src/conf/domain_conf.c | 6 +- src/conf/domain_conf.h | 1 + src/qemu/qemu_capabilities.c | 2 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 197 +++++++++++++++------ src/qemu/qemu_command.h | 4 + tests/qemuxml2argvdata/qemuxml2argv-pcie-root.args | 2 +- .../qemuxml2argv-pcihole64-q35.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-q35.args | 2 +- .../qemuxml2argv-sound-device.args | 7 +- .../qemuxml2argvdata/qemuxml2argv-sound-device.xml | 5 + tests/qemuxml2argvtest.c | 3 +- 13 files changed, 175 insertions(+), 58 deletions(-) -- 1.8.3.1

2 13

[libvirt] regarding libvirt development.
by cooldharma06 25 Sep '13

25 Sep '13

hi, i wish to give my contribution for the libvirt development. Any guide or documentation available for libvirt development. Or Any suggestions you have about the development means, please guide me. Regards cooldharma06

2 1

[libvirt] [PATCH] virsh-domain: Free dom before return false in cmdDump
by Hongwei Bi 25 Sep '13

25 Sep '13

--- tools/virsh-domain.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 856e888..f6d4edd 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -4487,8 +4487,10 @@ cmdDump(vshControl *ctl, const vshCmd *cmd) if (!(dom = vshCommandOptDomain(ctl, cmd, &name))) return false; - if (vshCommandOptStringReq(ctl, cmd, "file", &to) < 0) + if (vshCommandOptStringReq(ctl, cmd, "file", &to) < 0) { + virDomainFree(dom); return false; + } if (vshCommandOptBool(cmd, "verbose")) verbose = true; -- 1.7.1

3 2

Re: [libvirt] [PATCH] virsh-domain: Free dom before return false in cmdDump
by Hongwei Bi 25 Sep '13

25 Sep '13

Yes, 'goto cleanup' would be better. 2013/9/25 Hongwei Bi <hwbi2008(a)gmail.com> > Yes, 'goto cleanup' would be better. > > > 2013/9/25 Ján Tomko <jtomko(a)redhat.com> > >> On 09/25/2013 07:49 AM, Hongwei Bi wrote: >> > >> > >> > --- >> > tools/virsh-domain.c | 4 +++- >> > 1 files changed, 3 insertions(+), 1 deletions(-) >> > >> > diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c >> > index 856e888..f6d4edd 100644 >> > --- a/tools/virsh-domain.c >> > +++ b/tools/virsh-domain.c >> > @@ -4487,8 +4487,10 @@ cmdDump(vshControl *ctl, const vshCmd *cmd) >> > if (!(dom = vshCommandOptDomain(ctl, cmd, &name))) >> > return false; >> > >> > - if (vshCommandOptStringReq(ctl, cmd, "file", &to) < 0) >> > + if (vshCommandOptStringReq(ctl, cmd, "file", &to) < 0) { >> > + virDomainFree(dom); >> > return false; >> > + } >> >> 'goto cleanup' would do the same and it's easier to read. >> >> Alternatively, if we moved vshCommandOptStringReq before >> vshCommandOptDomain, >> 'return false' would be enough. >> >> Jan >> > >

1 0

[libvirt] [PATCH v4 0/2] don't masquerade local broadcast/multicast packets
by Laszlo Ersek 25 Sep '13

25 Sep '13

v2->v4 changes (v3 went in a different direction): - Rename iptables(Add|Remove)ForwardDontMasquerade to iptables(Add|Remove)DontMasquerade [Laine]. Masquerading local broadcast breaks DHCP replies for some clients. There has been a report about broken local multicast too. (See references in the patches.) Testing: Chain POSTROUTING (policy ACCEPT 2 packets, 134 bytes) pkts bytes target prot opt in out source destination 0 0 RETURN all -- * * 192.168.122.0/24 224.0.0.0/24 0 0 RETURN all -- * * 192.168.122.0/24 255.255.255.255 0 0 MASQUERADE tcp -- * * 192.168.122.0/24 !192.168.122.0/24 masq ports: 1024-65535 0 0 MASQUERADE udp -- * * 192.168.122.0/24 !192.168.122.0/24 masq ports: 1024-65535 0 0 MASQUERADE all -- * * 192.168.122.0/24 !192.168.122.0/24 + make check, make syntax-check, virsh net-start / net-destroy. Laszlo Ersek (2): util/viriptables: add/remove rules that short-circuit masquerading bridge driver: don't masquerade local subnet broadcast/multicast packets src/util/viriptables.h | 8 ++++ src/network/bridge_driver_linux.c | 70 +++++++++++++++++++++++++++++-- src/util/viriptables.c | 88 +++++++++++++++++++++++++++++++++++++++ src/libvirt_private.syms | 2 + 4 files changed, 164 insertions(+), 4 deletions(-) -- 1.8.3.1

2 5

[libvirt] [PATCH]util: Helper function for checking existence of hook files for specific driver
by Chen Hanxiao 25 Sep '13

25 Sep '13

From: Chen Hanxiao <chenhanxiao(a)cn.fujitsu.com> We refresh the status of hook scripts only when start/restart libvirt or reloads its configuration. But hooks scripts may be changed. This function will help to check its existence. And we do not need to start/restart libvirt if we add/remove hook files. Signed-off-by: Chen Hanxiao <chenhanxiao(a)cn.fujitsu.com> --- src/util/virhook.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/src/util/virhook.c b/src/util/virhook.c index 159efdb..c4a1a15 100644 --- a/src/util/virhook.c +++ b/src/util/virhook.c @@ -129,6 +129,12 @@ virHookCheck(int no, const char *driver) { return ret; } +static int +virHookDriverCheck(int driver) { + return virHookCheck(driver, + virHookDriverTypeToString(driver)); +} + /* * virHookInitialize: * @@ -170,11 +176,12 @@ virHookPresent(int driver) { if ((driver < VIR_HOOK_DRIVER_DAEMON) || (driver >= VIR_HOOK_DRIVER_LAST)) return 0; - if (virHooksFound == -1) + if (virHookDriverCheck(driver) != 1) { + VIR_DEBUG("Driver %s hooks files not found", + virHookDriverTypeToString(driver)); return 0; + } - if ((virHooksFound & (1 << driver)) == 0) - return 0; return 1; } -- 1.8.2.1

2 1

[libvirt] [PATCH v3 0/4] don't masquerade local broadcast/multicast packets
by Laszlo Ersek 25 Sep '13

25 Sep '13

Masquerading local broadcast breaks DHCP replies for some clients. There has been a report about broken local multicast too. (See references in the patches.) Regarding multicast, right now the series disables masquerading for the most restrictive local multicast range only. v2->v3 changes: - Rename iptables(Add|Remove)ForwardDontMasquerade to iptables(Add|Remove)DontMasquerade [Laine]. - Pass (address, prefix) pairs as both source and destination parameters to these functions. - Introduce virPfxSocketAddr structure for simpler handling of said (address, prefix) pairs. - Also prevent masquerading of directed broadcast [Laine]. - Start to get serious about pointers-to-const. Testing: - "make check" and "make syntax-check" pass, - thanks to the great docs on libvirt.org (compiling & deployment) I even managed to test this on my RHEL-6 laptop, with repeated net-start / net-destroy commands. Chain POSTROUTING (policy ACCEPT 0 packets, 0 bytes) pkts bytes target prot opt in out source destination 0 0 RETURN all -- * * 192.168.122.0/24 224.0.0.0/24 0 0 RETURN all -- * * 192.168.122.0/24 192.168.122.255 0 0 RETURN all -- * * 192.168.122.0/24 255.255.255.255 0 0 MASQUERADE tcp -- * * 192.168.122.0/24 !192.168.122.0/24 masq ports: 1024-65535 0 0 MASQUERADE udp -- * * 192.168.122.0/24 !192.168.122.0/24 masq ports: 1024-65535 0 0 MASQUERADE all -- * * 192.168.122.0/24 !192.168.122.0/24 Laszlo Ersek (4): iptablesFormatNetwork(): constify target of "netaddr" parameter util/viriptables: add/remove rules that short-circuit masquerading virSocketAddrBroadcastByPrefix(): constify target of "addr" parameter bridge driver: don't masquerade local subnet broadcast/multicast packets src/util/viriptables.h | 11 +++ src/util/virsocketaddr.h | 8 +- src/network/bridge_driver_linux.c | 151 +++++++++++++++++++++++++++++++++++++- src/util/viriptables.c | 84 ++++++++++++++++++++- src/util/virsocketaddr.c | 8 +- src/libvirt_private.syms | 2 + 6 files changed, 251 insertions(+), 13 deletions(-) -- 1.8.3.1

5 20

[libvirt] [PATCH]util: Refresh virHook before checking its existence
by Chen Hanxiao 25 Sep '13

25 Sep '13

From: Chen Hanxiao <chenhanxiao(a)cn.fujitsu.com> We refresh the status of hook scripts only when start/stop libvirt, or reload its configuration. But the status of hooks scripts may be changed. We need to refresh its status before checking its existence. Signed-off-by: Chen Hanxiao <chenhanxiao(a)cn.fujitsu.com> --- src/util/virhook.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/util/virhook.c b/src/util/virhook.c index 159efdb..5500f62 100644 --- a/src/util/virhook.c +++ b/src/util/virhook.c @@ -170,11 +170,15 @@ virHookPresent(int driver) { if ((driver < VIR_HOOK_DRIVER_DAEMON) || (driver >= VIR_HOOK_DRIVER_LAST)) return 0; - if (virHooksFound == -1) - return 0; + if (virHookInitialize() > 0) { + if (virHooksFound == -1) + return 0; - if ((virHooksFound & (1 << driver)) == 0) + if ((virHooksFound & (1 << driver)) == 0) + return 0; + } else { return 0; + } return 1; } -- 1.8.2.1

2 1

Re: [libvirt] virDomainGetInfo() returns wrong domain state
by Panday Ritesh Sharma (rpanday) 25 Sep '13

25 Sep '13

Hi Libvirt support team, Could you please help me with below query. Regards Ritesh Sharma From: Panday Ritesh Sharma (rpanday) Sent: Tuesday, September 24, 2013 8:22 PM To: 'libvir-list(a)redhat.com'; 'libvirt-users(a)redhat.com'; Vinay Shankarkumar (vinays) Cc: Basavaraj Bendigeri (bbendige); q-se-dev(mailer list) Subject: virDomainGetInfo() returns wrong domain state Hi Team, I have written below code to get the VM state at run time. I found, though the VM is in shut-off state, when I use the function virDomainGetInfo(); I get state as running. Could you please let me know what wrong I am doing. To know the actual VM state I used 'virsh list' and it clearly shows the VM is in shut-off state. Please find the log and code snippet below. Log from virsh: ================= [host:~]$ virsh list --all Id Name State ---------------------------------------------------- 1 calvados running 2 LCXR running 3 default-sdr--1 running - test--2 shut off Out put: ========= 04.03.06.698923264:INFO: vm_libvirt_state_to_vmm_state: state returned is 1 Note : Here 1 is actually running. Code snippet: =============== enum cidl_vmm_vm_state vm_libvirt_state_to_vmm_state(unsigned char libvirt_state) { enum cidl_vmm_vm_state state; INFO("%s: state returned is %u\n",__FUNCTION__, libvirt_state); <<<<<<<<<<<<<<<<<< if (libvirt_state == VIR_DOMAIN_RUNNING) { state = cidl_vm_state_running; } else if ((libvirt_state == VIR_DOMAIN_PAUSED) || (libvirt_state == VIR_DOMAIN_BLOCKED)) { state = cidl_vm_state_paused; } else if (libvirt_state == VIR_DOMAIN_SHUTOFF) { state = cidl_vm_state_defined; } else { state = cidl_vm_state_not_defined; } return state; } virDomainInfo res_util; virDomainPtr dom = virDomainLookupByName(virt, private_names[vm_idx]); res = virDomainGetInfo(dom, &res_util); vminfo[vm_idx].vm_state = vm_libvirt_state_to_vmm_state(res_util.state); Regards Ritesh Sharma

1 0

[libvirt] bug. libvirt related to selinux.
by yue 25 Sep '13

25 Sep '13

hi,all when 'virsh start testname-1' failed, but i can start it throught commandline which is copy from libvirtd.log. selinux is disabled now. ---------------- libvirtError: internal error Process exited while reading console log output: char device redirected to /dev/pts/3 qemu-kvm: -drive file=/rhev/data-center/7828f2ae-955e-4e4b-a4bb-43807629dc52/d028d521-d4a9-4dd7-a0fe-3e9b60e7c4e4/images/ac025dc1-4e25-4b71-8c56-88dcb61b9f09/c1bfddb4-3562-4893-9df8-3f3239b277a9,if=none,id=drive-ide0-0-0,format=qcow2,serial=ac025dc1-4e25-4b71-8c56-88dcb61b9f09,cache=none,werror=stop,rerror=stop,aio=native: could not open disk image /rhev/data-center/7828f2ae-955e-4e4b-a4bb-43807629dc52/d028d521-d4a9-4dd7-a0fe-3e9b60e7c4e4/images/ac025dc1-4e25-4b71-8c56-88dcb61b9f09/c1bfddb4-3562-4893-9df8-3f3239b277a9: Operation not permitted audit.log type=VIRT_CONTROL msg=audit(1379810795.213:41569): user pid=1637 uid=0 auid=4294967295 ses=4294967295 subj=system_u:system_r:virtd_t:s0-s0:c0.c1023 msg='virt=kvm op=start reason=booted vm="testname-1" uuid=24f7e975-9aa5-4a14-b0f0-590add14c8b5 vm-pid=-1 exe="/usr/sbin/libvirtd" hostname=? addr=? terminal=? res=failed'

2 2

[libvirt] [PATCH v2 0/2] don't masquerade local broadcast/multicast packets
by Laszlo Ersek 25 Sep '13

25 Sep '13

Masquerading local broadcast breaks DHCP replies for some clients. There has been a report about broken local multicast too. (See references in the patches.) Testing: build tested the upstream series. Tested the RHEL-6.4.z and RHEL-7.0 backports with OVMF netboot on virbr0. Changes between v1 (at http://www.redhat.com/archives/libvir-list/2013-May/msg01872.html ) and v2: - forward-ported to current upstream master (commit 49a5262d). This includes conflict resolution for: commit 477a619e1b37694e3c59c0d6c84ede6d2e28b878 Author: Roman Bogorodskiy <bogorodskiy(a)gmail.com> Date: Fri Jun 28 00:52:30 2013 -0400 Drop iptablesContext in both patches #1 and #2, and for commit 4ac708f250867f65091a20b153c204862d389cb9 Author: Roman Bogorodskiy <bogorodskiy(a)gmail.com> Date: Wed Jul 24 16:22:54 2013 +0400 bridge driver: extract platform specifics in patch #2. Laszlo Ersek (2): util/viriptables: add/remove rules that short-circuit masquerading bridge driver: don't masquerade local subnet broadcast/multicast packets src/util/viriptables.h | 8 ++++ src/network/bridge_driver_linux.c | 70 +++++++++++++++++++++++++++++-- src/util/viriptables.c | 88 +++++++++++++++++++++++++++++++++++++++ src/libvirt_private.syms | 2 + 4 files changed, 164 insertions(+), 4 deletions(-) -- 1.8.3.1

3 11

[libvirt] [PATCH] Fix format specifier for OOM test fprintfs
by Daniel P. Berrange 24 Sep '13

24 Sep '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> The testutils.c file had some fprintfs which had not been converted from %d to %zu, when 'testCounter' change to be a size_t. This was a build breaker if --enable-test-oom was enabled Pushed as a build fix Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- tests/testutils.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/testutils.c b/tests/testutils.c index a215f3f..45882c5 100644 --- a/tests/testutils.c +++ b/tests/testutils.c @@ -717,9 +717,9 @@ int virtTestMain(int argc, approxAlloc = virAllocTestCount(); testCounter++; if (virTestGetDebug()) - fprintf(stderr, "%d) OOM...\n", testCounter); + fprintf(stderr, "%zu) OOM...\n", testCounter); else - fprintf(stderr, "%d) OOM of %d allocs ", testCounter, approxAlloc); + fprintf(stderr, "%zu) OOM of %d allocs ", testCounter, approxAlloc); if (mp) { size_t i; -- 1.8.3.1

1 0

[libvirt] [PATCH 0/4] Improve passthrough of early errors from qemu log
by Peter Krempa 24 Sep '13

24 Sep '13

Upgrade error messages in some cases of early failure. See 4/4 for better explanation. Peter Krempa (4): qemu_process: Make qemuProcessReadLog() more versatile and reusable qemu: monitor: Add infrastructure to access VM logs for better err msgs qemu: monitor: Produce better errors on monitor hangup qemu: Wire up better early error reporting src/qemu/qemu_monitor.c | 97 ++++++++++++++++++++++++++++++++++++++++++++++--- src/qemu/qemu_monitor.h | 2 + src/qemu/qemu_process.c | 54 +++++++++++++++++++-------- src/qemu/qemu_process.h | 2 + 4 files changed, 133 insertions(+), 22 deletions(-) -- 1.8.3.2

2 10

[libvirt] [PATCHv2 0/3] Change preference of default PCI passthrough type to VFIO
by Peter Krempa 24 Sep '13

24 Sep '13

Peter Krempa (3): qemu: hostdev: Refactor PCI passhrough handling qemu: hostdev: Add checks if PCI passthrough is availabe in the host qemu: Prefer VFIO for PCI device passthrough docs/formatdomain.html.in | 9 ++- src/conf/domain_conf.h | 2 +- src/qemu/qemu_command.c | 28 ++++++--- src/qemu/qemu_hostdev.c | 143 ++++++++++++++++++++++++++++++++++++++++++++++ src/qemu/qemu_hostdev.h | 5 ++ src/qemu/qemu_hotplug.c | 29 ++++++---- src/qemu/qemu_process.c | 6 ++ tests/qemuxml2argvtest.c | 11 ++++ 8 files changed, 208 insertions(+), 25 deletions(-) -- 1.8.3.2

1 3

[libvirt] [PATCH] maint: update to latest gnulib
by Eric Blake 24 Sep '13

24 Sep '13

Since we're about to freeze, it's time to pick up the latest upstream gnulib. Among other changes, gnulib now guarantees the use of some -f flags that we were previously manually adding. * .gnulib: Update to latest, in part for warning improvements. * m4/virt-compile-warnings.m4 (LIBVIRT_COMPILE_WARNINGS): Drop flags that are now guaranteed by gnulib. * bootstrap: Resync to gnulib. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- Pushing under my gnulib maintenance rule. * .gnulib 0ba0877...4a5ee89 (31): > manywarnings: enable nicer gcc warning messages > timespec: use the new TIMESPEC_RESOLUTION in a few more places > warnings: port --enable-gcc-warnings to Solaris Studio 12.3 > configmake: support new --runstatedir option > ctype, string: depend on extern-inline > userspec: support optional parameters to parse_user_spec() > timespec: new function make_timespec, and new constants > stdio: OS X port of putc_unlocked + extern inline > signal: OS X port of sigaddset etc. + extern inline > extern-inline: do not always suppress extern inline on OS X > extern-inline: document fixes for ctype and wctype macros > fflush, freadahead, fseeko: Fix for Android > pmccabe2html: fix portability issues > getgroups: statement without effect > autoupdate > update from texinfo > update from texinfo > glob: fix compilation > glob: fix build for platforms without __THROW > autoupdate > regex-quote: fix buffer access out of bounds > glob: avoid -Wattribute warnings on glibc > headers: check that _GL_INLINE_HEADER_BEGIN is defined > bootstrap: remove the --version requirement from ancillary tools > gc: support HMAC-SHA256 and HMAC-SHA512. > gettext: update to version 0.18.3.1 > selinux-at: omit unnecessary include > autoupdate > d-ino: avoid false negative on symlink > update from texinfo > autoupdate .gnulib | 2 +- bootstrap | 19 +++++++++++-------- m4/virt-compile-warnings.m4 | 2 -- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/.gnulib b/.gnulib index 0ba0877..4a5ee89 160000 --- a/.gnulib +++ b/.gnulib @@ -1 +1 @@ -Subproject commit 0ba087759d2797c8f7d3c34bef6268ba3fd212cb +Subproject commit 4a5ee89c8a8be7350a8fd8ca1bacb196a190e492 diff --git a/bootstrap b/bootstrap index cc7fc1b..e31d17d 100755 --- a/bootstrap +++ b/bootstrap @@ -209,12 +209,16 @@ bootstrap_sync=false # Use git to update gnulib sources use_git=true +check_exists() { + ($1 --version </dev/null) >/dev/null 2>&1 + test $? -lt 126 +} + # find_tool ENVVAR NAMES... # ------------------------- # Search for a required program. Use the value of ENVVAR, if set, -# otherwise find the first of the NAMES that can be run (i.e., -# supports --version). If found, set ENVVAR to the program name, -# die otherwise. +# otherwise find the first of the NAMES that can be run. +# If found, set ENVVAR to the program name, die otherwise. # # FIXME: code duplication, see also gnu-web-doc-update. find_tool () @@ -225,7 +229,7 @@ find_tool () eval "find_tool_res=\$$find_tool_envvar" if test x"$find_tool_res" = x; then for i; do - if ($i --version </dev/null) >/dev/null 2>&1; then + if check_exists $i; then find_tool_res=$i break fi @@ -463,8 +467,7 @@ check_versions() { if [ "$req_ver" = "-" ]; then # Merely require app to exist; not all prereq apps are well-behaved # so we have to rely on $? rather than get_version. - $app --version >/dev/null 2>&1 </dev/null - if [ 126 -le $? ]; then + if ! check_exists $app; then warn_ "Error: '$app' not found" ret=1 fi @@ -551,10 +554,10 @@ fi echo "$0: Bootstrapping from checked-out $package sources..." # See if we can use gnulib's git-merge-changelog merge driver. -if $use_git && test -d .git && (git --version) >/dev/null 2>/dev/null ; then +if $use_git && test -d .git && check_exists git; then if git config merge.merge-changelog.driver >/dev/null ; then : - elif (git-merge-changelog --version) >/dev/null 2>/dev/null ; then + elif check_exists git-merge-changelog; then echo "$0: initializing git-merge-changelog driver" git config merge.merge-changelog.name 'GNU-style ChangeLog merge driver' git config merge.merge-changelog.driver 'git-merge-changelog %O %A %B' diff --git a/m4/virt-compile-warnings.m4 b/m4/virt-compile-warnings.m4 index 938c8bb..8f905cc 100644 --- a/m4/virt-compile-warnings.m4 +++ b/m4/virt-compile-warnings.m4 @@ -187,8 +187,6 @@ AC_DEFUN([LIBVIRT_COMPILE_WARNINGS],[ esac wantwarn="$wantwarn -fexceptions" wantwarn="$wantwarn -fasynchronous-unwind-tables" - wantwarn="$wantwarn -fdiagnostics-show-option" - wantwarn="$wantwarn -funit-at-a-time" # Need -fipa-pure-const in order to make -Wsuggest-attribute=pure # fire even without -O. -- 1.8.3.1

1 0

[libvirt] [PATCH 0/2]
by Claudio Bley 24 Sep '13

24 Sep '13

Hi. I used the rawhide RPMs to take out the DLLs for a test drive on Windows 64bit the other day. While trying to read the "screenshot" from the test domain using the test:///default connection, I only received 5 Bytes of the libvirtLogo.png file. Looking at the test driver, the condition piqued my interest, but wasn't the cause of the short read, only a bit odd. See patch #1. The actual cause was that the file was opened in text mode and the seventh byte was a 0x1A which triggered EOF on the FD. See patch #2. Claudio Bley (2): test: fix call to virFDStreamOpenFile in testDomainScreenshot Always open files in binary mode in virFDStreamOpenFileInternal src/fdstream.c | 2 +- src/test/test_driver.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -- 1.8.3.1

3 7

[libvirt] [PATCH] conf: Fix virNetworkAssignDef's comment.
by lawrancejing 24 Sep '13

24 Sep '13

--- src/conf/network_conf.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c index 6968e25..c877a6d 100644 --- a/src/conf/network_conf.c +++ b/src/conf/network_conf.c @@ -333,7 +333,7 @@ virNetworkObjAssignDef(virNetworkObjPtr network, * def. For an existing network, use "live" and current state of the * network to determine which to replace. * - * Returns -1 on failure, 0 on success. + * Returns NULL on error, virNetworkObjPtr on success. */ virNetworkObjPtr virNetworkAssignDef(virNetworkObjListPtr nets, -- 1.7.1

4 4

[libvirt] [PATCH 0/3] More OOM check fixes
by Daniel P. Berrange 24 Sep '13

24 Sep '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> More OOM fixes. These didn't cause crashes, rather invalid XML / cli arg generation. Daniel P. Berrange (3): Add missing check for OOM when building boot menu args Honour error returned by virBitmapFormat Check return value of virDomainControllerInsert when parsing QEMU args src/conf/domain_conf.h | 9 ++++++--- src/qemu/qemu_command.c | 38 ++++++++++++++++++++++---------------- 2 files changed, 28 insertions(+), 19 deletions(-) -- 1.8.3.1

2 4

[libvirt] [PATCH] Add --disable-securityfs configure option
by Bogdan Purcareata 24 Sep '13

24 Sep '13

Securityfs is not enabled on all kernels running libvirt containers. This patch introduces a configure option that can specify whether containers should mount securityfs in their rootfs. Signed-off-by: Bogdan Purcareata <bogdan.purcareata(a)freescale.com> --- configure.ac | 8 ++++++++ src/lxc/lxc_container.c | 4 ++++ 2 files changed, 12 insertions(+) diff --git a/configure.ac b/configure.ac index 553015a..b4351dd 100644 --- a/configure.ac +++ b/configure.ac @@ -111,6 +111,14 @@ then [Extra package version]) fi +dnl Enable securityfs mounts if necessary +AC_ARG_ENABLE([securityfs], + AS_HELP_STRING([--disable-securityfs], [Disable mounting securityfs from container domains])) + +AS_IF([test "x$enable_securityfs" != "xno"],[ + AC_DEFINE_UNQUOTED([WITH_SECURITYFS],[],[Securityfs present]) + ]) + dnl Required minimum versions of all libs we depend on LIBXML_REQUIRED="2.6.0" GNUTLS_REQUIRED="1.0.25" diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index c60f5d8..72f1e81 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -768,8 +768,10 @@ static const virLXCBasicMountInfo lxcBasicMounts[] = { { "/proc/sys", "/proc/sys", NULL, NULL, MS_BIND|MS_REMOUNT|MS_RDONLY }, { "sysfs", "/sys", "sysfs", NULL, MS_NOSUID|MS_NOEXEC|MS_NODEV }, { "sysfs", "/sys", "sysfs", NULL, MS_BIND|MS_REMOUNT|MS_RDONLY }, +#if WITH_SECURITYFS { "securityfs", "/sys/kernel/security", "securityfs", NULL, MS_NOSUID|MS_NOEXEC|MS_NODEV }, { "securityfs", "/sys/kernel/security", "securityfs", NULL, MS_BIND|MS_REMOUNT|MS_RDONLY }, +#endif #if WITH_SELINUX { SELINUX_MOUNT, SELINUX_MOUNT, "selinuxfs", NULL, MS_NOSUID|MS_NOEXEC|MS_NODEV }, { SELINUX_MOUNT, SELINUX_MOUNT, NULL, NULL, MS_BIND|MS_REMOUNT|MS_RDONLY }, @@ -872,8 +874,10 @@ static int lxcContainerMountBasicFS(bool userns_enabled) continue; #endif +#if WITH_SECURITYFS if (STREQ(mnt->src, "securityfs") && userns_enabled) continue; +#endif if (virFileMakePath(mnt->dst) < 0) { virReportSystemError(errno, -- 1.7.11.7

3 3

[libvirt] [Patch]LXC: Add support for attach/detach/update controller in config for LXC
by Chen Hanxiao 24 Sep '13

24 Sep '13

From: Chen Hanxiao <chenhanxiao(a)cn.fujitsu.com> Add support for attach/detach/update controller in config for LXC. Signed-off-by: Chen Hanxiao <chenhanxiao(a)cn.fujitsu.com> --- src/lxc/lxc_driver.c | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index 4cf0b50..9c58f67 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -2750,6 +2750,7 @@ lxcDomainAttachDeviceConfig(virDomainDefPtr vmdef, virDomainDiskDefPtr disk; virDomainNetDefPtr net; virDomainHostdevDefPtr hostdev; + virDomainControllerDefPtr controller; switch (dev->type) { case VIR_DOMAIN_DEVICE_DISK: @@ -2787,6 +2788,21 @@ lxcDomainAttachDeviceConfig(virDomainDefPtr vmdef, ret = 0; break; + case VIR_DOMAIN_DEVICE_CONTROLLER: + controller = dev->data.controller; + if (virDomainControllerFind(vmdef, controller->type, + controller->idx) >= 0) { + virReportError(VIR_ERR_OPERATION_INVALID, "%s", + _("Target already exists")); + return -1; + } + + if (virDomainControllerInsert(vmdef, controller) < 0) + return -1; + dev->data.controller = NULL; + ret = 0; + break; + default: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("persistent attach of device is not supported")); @@ -2849,6 +2865,7 @@ lxcDomainDetachDeviceConfig(virDomainDefPtr vmdef, virDomainDiskDefPtr disk, det_disk; virDomainNetDefPtr net; virDomainHostdevDefPtr hostdev, det_hostdev; + virDomainControllerDefPtr controller, det_cont; int idx; char mac[VIR_MAC_STRING_BUFLEN]; @@ -2895,6 +2912,19 @@ lxcDomainDetachDeviceConfig(virDomainDefPtr vmdef, break; } + case VIR_DOMAIN_DEVICE_CONTROLLER: + controller = dev->data.controller; + if ((idx = virDomainControllerFind(vmdef, controller->type, + controller->idx)) < 0) { + virReportError(VIR_ERR_INVALID_ARG, "%s", + _("device not present in domain configuration")); + return -1; + } + det_cont = virDomainControllerRemove(vmdef, idx); + virDomainControllerDefFree(det_cont); + ret = 0; + break; + default: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("persistent detach of device is not supported")); -- 1.8.2.1

2 2

Re: [libvirt] [PATCH] conf: Fix virNetworkAssignDef's comment.
by lawrance jing 24 Sep '13

24 Sep '13

OK. 2013/9/24 lawrance jing <lawrancejing(a)gmail.com>: > OK, thanks. > > 2013/9/24 Osier Yang <jyang(a)redhat.com>: >> On 24/09/13 15:57, lawrance jing wrote: >>> >>> I changed virNetworkAssignDef's comment,however what the patch show is >>> "-333,7 +333,7 @@ virNetworkObjAssignDef". Please give me a hint, thank you. >> >> >> Oh, it was confused, ACK and pushed. By the way, it's nicer if your reply >> mails with text format. >> >> Osier

1 0

[libvirt] How to intercept the VM start event and run the identity check
by Исаев Виталий Анатольевич 24 Sep '13

24 Sep '13

Dear developers! We are working on the project based on Red Hat Enterprise Virtualisation and Red Hat Identity Management. RHEV environment will be deployed in protected internal enterprise network. Now we are developing special admin tools in order to extend functionality of RHEL IdM and we faced with a rather difficult problem... The system should meet the increased demands of informational security, so what we are trying to implement is: 1. Intercept the event of user's VM start on the RHEL Hypervisor; 2. Suspend the VM; 3. Mount VM's disk to Hypervisor (or some other VM, for instance, admin's VM); 4. Check the integrity of the VM's system files (count md5sum etc.) 5. Unmount disk; 6. If verification is passed, start the VM, else - power off and disable VM till the decision of administrator. Is there any opportunity to implement this within the libvirt API? Thank you, Vitaly Isaev, "Fintech" JSC, Moscow, Russia www.fintech.ru<http://www.fintech.ru>

2 1

[libvirt] [PATCH 00/10] Fix multiple OOM problems
by Daniel P. Berrange 24 Sep '13

24 Sep '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> Running out long ignored OOM injection tests identified a number of problems. This series fixes those that I have found so far, but more are to follow. I'm also rewriting the OOM injection code to make it much, much, much faster to run. Daniel P. Berrange (10): Fix crash on OOM when parsing disk security label Fix crash on OOM in parsing CPU mask in domain XML Fix crash if OOM occurs when creating virConnectPtr Fix crash on OOM in qemuDomainCCWAddressSetCreate() Fix crash on OOM in qemuAddRBDHost Fix allocation of arglist in qemuStringToArgvEnv Fix error checking of qemuParseKeywords return status Fix missing OOM check in qemuParseCommandLine when splitting strings Fix reporting of errors in OOM injection code Don't ignore allocation failure in virCommandAddEnvPassCommon src/conf/domain_conf.c | 5 ++-- src/datatypes.c | 10 +++++--- src/qemu/qemu_command.c | 59 ++++++++++++++++++++++++-------------------- src/qemu/qemu_command.h | 1 + src/qemu/qemu_monitor_json.c | 4 +-- src/util/viralloc.c | 18 ++++++++++++-- src/util/vircommand.c | 5 +++- 7 files changed, 63 insertions(+), 39 deletions(-) -- 1.8.3.1

2 20

[libvirt] [PATCH v4 0/7] cpu: add function to get the models for an arch
by Giuseppe Scrivano 24 Sep '13

24 Sep '13

This series adds a new API "virConnectGetCPUModelNames" that allows to retrieve the list of CPU models known by the hypervisor for a specific architecture. This new function is mainly needed by virt-manager to not read directly the cpu_map.xml file (it could also be different when accessing a remote daemon). *v4 main changes - cpuGetModels translates the arch name to the driver name. - virConnectGetCPUModelNames handles models==NULL, and - amended all the changes reported for v3 *v3 main changes - virConnectGetCPUModelNames returns the number of models instead of 0 on success. - Use VIR_INSERT_ELEMENT instead of VIR_EXPAND_N. - Fix a potential memory leak in the python bindings. - Move virsh changes to a separate commit. - Remove API documentation from libvirt.h. *v2 main changes - set a hard limit for the number of CPU models that is possible to fetch from a remote server. - Use VIR_EXPAND_N instead of VIR_REALLOC_N. - s|1.1.2|1.1.3| Giuseppe Scrivano (7): libvirt: add new public API virConnectGetCPUModelNames cpu: add function to get the models for an arch virConnectGetCPUModelNames: implement the remote protocol virConnectGetCPUModelNames: add the support for qemu virConnectGetCPUModelNames: add the support for the test protocol virsh: add function to get the CPU models for an arch python: add bindings for virConnectGetCPUModelNames daemon/remote.c | 52 ++++++++++++++++++++++++++ include/libvirt/libvirt.h.in | 4 ++ python/generator.py | 1 + python/libvirt-override-api.xml | 7 ++++ python/libvirt-override.c | 52 ++++++++++++++++++++++++++ python/libvirt-override.py | 11 ++++++ src/cpu/cpu.c | 82 ++++++++++++++++++++++++++++++++++++++++- src/cpu/cpu.h | 5 ++- src/driver.h | 7 ++++ src/libvirt.c | 51 +++++++++++++++++++++++++ src/libvirt_private.syms | 1 + src/libvirt_public.syms | 5 +++ src/qemu/qemu_driver.c | 14 +++++++ src/remote/remote_driver.c | 63 +++++++++++++++++++++++++++++++ src/remote/remote_protocol.x | 22 ++++++++++- src/remote_protocol-structs | 13 +++++++ src/test/test_driver.c | 11 ++++++ tools/virsh-host.c | 54 +++++++++++++++++++++++++++ tools/virsh.pod | 5 +++ 19 files changed, 457 insertions(+), 3 deletions(-) -- 1.8.3.1

2 14

[libvirt] [PATCHv2 1/2] VMware: Support more than 2 driver backends
by Doug Goldstein 24 Sep '13

24 Sep '13

Currently the VMware version check code only supports two types of VMware backends, Workstation and Player. But in the near future we will have an additional one so we need to support more. Additionally, we discover and cache the path to the vmrun binary so we should use that path when using the cooresponding binary from the VMware VIX SDK. --- change from v1: * Added default case so we don't potentially pass NULL to virCommand --- src/vmware/vmware_conf.c | 28 +++++++++++++++++++++++++--- src/vmware/vmware_driver.c | 20 ++++++++++++++++++-- 2 files changed, 43 insertions(+), 5 deletions(-) diff --git a/src/vmware/vmware_conf.c b/src/vmware/vmware_conf.c index 261a4f6..c11c92d 100644 --- a/src/vmware/vmware_conf.c +++ b/src/vmware/vmware_conf.c @@ -257,10 +257,30 @@ vmwareExtractVersion(struct vmware_driver *driver) { unsigned long version = 0; int ret = -1; - virCommandPtr cmd; + virCommandPtr cmd = NULL; char * outbuf = NULL; - const char * bin = (driver->type == VMWARE_DRIVER_PLAYER) ? - "vmplayer" : "vmware"; + char *bin = NULL; + char *vmwarePath = NULL; + + if ((vmwarePath = mdir_name(driver->vmrun)) == NULL) + goto cleanup; + + switch (driver->type) { + case VMWARE_DRIVER_PLAYER: + if (virAsprintf(&bin, "%s/%s", vmwarePath, "vmplayer")) + goto cleanup; + break; + + case VMWARE_DRIVER_WORKSTATION: + if (virAsprintf(&bin, "%s/%s", vmwarePath, "vmware")) + goto cleanup; + break; + + default: + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("invalid driver type for version detection")); + goto cleanup; + } cmd = virCommandNewArgList(bin, "-v", NULL); virCommandSetOutputBuffer(cmd, &outbuf); @@ -276,6 +296,8 @@ vmwareExtractVersion(struct vmware_driver *driver) cleanup: virCommandFree(cmd); VIR_FREE(outbuf); + VIR_FREE(bin); + VIR_FREE(vmwarePath); return ret; } diff --git a/src/vmware/vmware_driver.c b/src/vmware/vmware_driver.c index 4e56971..01d65ed 100644 --- a/src/vmware/vmware_driver.c +++ b/src/vmware/vmware_driver.c @@ -93,6 +93,7 @@ vmwareConnectOpen(virConnectPtr conn, { struct vmware_driver *driver; size_t i; + char *tmp; virCheckFlags(VIR_CONNECT_RO, VIR_DRV_OPEN_ERROR); @@ -144,8 +145,23 @@ vmwareConnectOpen(virConnectPtr conn, if (virMutexInit(&driver->lock) < 0) goto cleanup; - driver->type = STRNEQ(conn->uri->scheme, "vmwareplayer") ? - VMWARE_DRIVER_WORKSTATION : VMWARE_DRIVER_PLAYER; + if ((tmp = STRSKIP(conn->uri->scheme, "vmware")) == NULL) { + virReportError(VIR_ERR_INTERNAL_ERROR, _("unable to parse URI " + "scheme '%s'"), conn->uri->scheme); + goto cleanup; + } + + driver->type = -1; + for (i = 0; i < VMWARE_DRIVER_LAST; i++) { + if (STREQ(tmp, vmwareDriverTypeToString(i))) + driver->type = i; + } + + if (driver->type == -1) { + virReportError(VIR_ERR_INTERNAL_ERROR, _("unable to find valid " + "requested VMware backend '%s'"), tmp); + goto cleanup; + } if (!(driver->domains = virDomainObjListNew())) goto cleanup; -- 1.8.1.5

1 1

[libvirt] [PATCH 0/3] Followup fix for CVE-2013-4311
by Daniel P. Berrange 24 Sep '13

24 Sep '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> The initial fix for CVE-2013-4311 had a flaw which affected the ACL code only. The first patch fixes that flaw, the next two add a test suite for the code in question. Daniel P. Berrange (3): Fix typo in identity code which is pre-requisite for CVE-2013-4311 Add a virNetSocketNewConnectSockFD method Add test case for virNetServerClient object identity code cfg.mk | 2 +- src/libvirt_private.syms | 1 + src/rpc/virnetserverclient.c | 2 +- src/rpc/virnetsocket.c | 18 +++++ src/rpc/virnetsocket.h | 2 + tests/Makefile.am | 14 +++- tests/virnetserverclientmock.c | 64 +++++++++++++++++ tests/virnetserverclienttest.c | 159 +++++++++++++++++++++++++++++++++++++++++ 8 files changed, 259 insertions(+), 3 deletions(-) create mode 100644 tests/virnetserverclientmock.c create mode 100644 tests/virnetserverclienttest.c -- 1.8.3.1

2 7

[libvirt] [PATCH] build: ensure 'make check' sees up-to-date config.h
by Eric Blake 24 Sep '13

24 Sep '13

Nehal J. Wani reported on IRC a rather interesting build failure: In file included from util/virnetdevbridge.c:53:0: /usr/include/linux/in6.h:30:8: error: redefinition of 'struct in6_addr' struct in6_addr { ^ I traced it to the fact that he ran 'git pull; make check' across commit e62e0094. What happened is that the configure changes result in a new variable that was set to be defined on his system, but config.h was not regenerated to contain the value of that variable. Running 'make' instead of 'make check' cleaned up the problem. A bit more investigation, and I see that in Makefile.am, automake sticks rules that rebuild config.h as part of 'make all', and that we also had a dependency 'check-local: all'; BUT the rule for check-local is run only at the point when the top-level directory is visited. Automake documents that SUBDIRS should contain an explicit '.' at the point the top-level should be visited (defaulting to last, if it doesn't appear). Sure enough, with this patch, 'make check' now does the top-level 'all' rules, which regenerates 'config.h' BEFORE compiling any code that might depend on changed content of that file. * Makefile.am (SUBDIRS): Put '.' first, not last. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- Tough to argue the build-breaker rule on this one, since a fresh checkout doesn't hit it (only a 'make check' without a 'make', across an incremental build that happened to need new configure substitutions). So I'll wait for a review for my one-liner. Makefile.am | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Makefile.am b/Makefile.am index 4e24ecf..66cb677 100644 --- a/Makefile.am +++ b/Makefile.am @@ -19,7 +19,7 @@ LCOV = lcov GENHTML = genhtml -SUBDIRS = gnulib/lib include src daemon tools docs gnulib/tests \ +SUBDIRS = . gnulib/lib include src daemon tools docs gnulib/tests \ python tests po examples/domain-events/events-c examples/hellolibvirt \ examples/dominfo examples/domsuspend examples/python examples/apparmor \ examples/xml/nwfilter examples/openauth examples/systemtap -- 1.7.1

2 4

Re: [libvirt] [PATCH 6/6] qemu: Add support for emulated CPU features
by Eduardo Habkost 24 Sep '13

24 Sep '13

(CCing qemu-devel and libvir-list) On Sun, Sep 22, 2013 at 04:44:55PM +0200, Borislav Petkov wrote: > From: Borislav Petkov <bp(a)suse.de> > > Add support for the KVM_GET_EMULATED_CPUID ioctl and leave feature bits > enabled, when requested by userspace, if kvm emulates them. > > Signed-off-by: Borislav Petkov <bp(a)suse.de> This will break some assumptions about the semantics of "-cpu host", that today means "enable every single feature that can be enabled in the host". This, in turn, breaks the assumption that "-cpu host" can be used by libvirt to get information about all CPU features supported by the host. So, I have two questions: 1) Should "-cpu host" enable GET_EMULATED_CPUID features? (I believe the answer is "no"); 2) If not, we need a new mechanism to let libvirt know which features can be enabled on a host (in a way that would allow libvirt to easily calculate the set of possible destination hosts to which a VM can be migrated, before deciding to migrate it). This interface is getting complex enough for me to consider simply asking libvirt developers to call GET_EMULATED_CPUID and GET_SUPPORTED_CPUID directly, instead of asking QEMU for information. But if libvirt does that, it needs a way to know if it's running a QEMU version that supports GET_EMULATED_CPUID, or an old version that supports only GET_SUPPORTED_CPUID. Another alternative is to simply let libvirt ignore GET_EMULATED_CPUID by now, and treat GET_EMULATED_CPUID features as not supported by the host. But then it will break the use cases that prompted the creation of GET_EMULATED_CPUID in the first place. > --- > include/sysemu/kvm.h | 4 ++++ > linux-headers/linux/kvm.h | 4 ++++ > target-i386/cpu.c | 7 +++++++ > target-i386/kvm.c | 38 ++++++++++++++++++++++++++++++++++---- > 4 files changed, 49 insertions(+), 4 deletions(-) > > diff --git a/include/sysemu/kvm.h b/include/sysemu/kvm.h > index 9bbe3db1464e..8eda1ada848a 100644 > --- a/include/sysemu/kvm.h > +++ b/include/sysemu/kvm.h > @@ -265,6 +265,10 @@ int kvm_check_extension(KVMState *s, unsigned int extension); > > uint32_t kvm_arch_get_supported_cpuid(KVMState *env, uint32_t function, > uint32_t index, int reg); > + > +uint32_t kvm_arch_get_emulated_cpuid(KVMState *env, uint32_t function, > + uint32_t index, int reg); > + > void kvm_cpu_synchronize_state(CPUState *cpu); > > /* generic hooks - to be moved/refactored once there are more users */ > diff --git a/linux-headers/linux/kvm.h b/linux-headers/linux/kvm.h > index c614070662e1..edc8f2db1f8d 100644 > --- a/linux-headers/linux/kvm.h > +++ b/linux-headers/linux/kvm.h > @@ -541,6 +541,7 @@ struct kvm_ppc_smmu_info { > #define KVM_TRACE_ENABLE __KVM_DEPRECATED_MAIN_W_0x06 > #define KVM_TRACE_PAUSE __KVM_DEPRECATED_MAIN_0x07 > #define KVM_TRACE_DISABLE __KVM_DEPRECATED_MAIN_0x08 > +#define KVM_GET_EMULATED_CPUID _IOWR(KVMIO, 0x09, struct kvm_cpuid2) > > /* > * Extension capability list. > @@ -666,6 +667,9 @@ struct kvm_ppc_smmu_info { > #define KVM_CAP_IRQ_MPIC 90 > #define KVM_CAP_PPC_RTAS 91 > #define KVM_CAP_IRQ_XICS 92 > +#define KVM_CAP_ARM_EL1_32BIT 93 > +#define KVM_CAP_SPAPR_MULTITCE 94 > +#define KVM_CAP_EXT_EMUL_CPUID 95 > > #ifdef KVM_CAP_IRQ_ROUTING > > diff --git a/target-i386/cpu.c b/target-i386/cpu.c > index c36345e426d7..5406348ceb4a 100644 > --- a/target-i386/cpu.c > +++ b/target-i386/cpu.c > @@ -1850,7 +1850,14 @@ static void filter_features_for_kvm(X86CPU *cpu) > wi->cpuid_ecx, > wi->cpuid_reg); > uint32_t requested_features = env->features[w]; > + > + uint32_t emul_features = kvm_arch_get_emulated_cpuid(s, wi->cpuid_eax, > + wi->cpuid_ecx, > + wi->cpuid_reg); > + > env->features[w] &= host_feat; > + env->features[w] |= (requested_features & emul_features); > + I find the above logic confusing: you remove a few bits just to re-add them later. Isn't easier and simpler to simply do: env->features[w] &= (host_feat | emul_features); ? > cpu->filtered_features[w] = requested_features & ~env->features[w]; > } > } > diff --git a/target-i386/kvm.c b/target-i386/kvm.c > index 749aa09a21a6..7f598f01bda5 100644 > --- a/target-i386/kvm.c > +++ b/target-i386/kvm.c > @@ -80,7 +80,7 @@ bool kvm_allows_irq0_override(void) > return !kvm_irqchip_in_kernel() || kvm_has_gsi_routing(); > } > > -static struct kvm_cpuid2 *try_get_cpuid(KVMState *s, int max) > +static struct kvm_cpuid2 *try_get_cpuid(KVMState *s, int ioctl, int max) > { > struct kvm_cpuid2 *cpuid; > int r, size; > @@ -88,7 +88,7 @@ static struct kvm_cpuid2 *try_get_cpuid(KVMState *s, int max) > size = sizeof(*cpuid) + max * sizeof(*cpuid->entries); > cpuid = (struct kvm_cpuid2 *)g_malloc0(size); > cpuid->nent = max; > - r = kvm_ioctl(s, KVM_GET_SUPPORTED_CPUID, cpuid); > + r = kvm_ioctl(s, ioctl, cpuid); > if (r == 0 && cpuid->nent >= max) { > r = -E2BIG; > } > @@ -97,7 +97,10 @@ static struct kvm_cpuid2 *try_get_cpuid(KVMState *s, int max) > g_free(cpuid); > return NULL; > } else { > - fprintf(stderr, "KVM_GET_SUPPORTED_CPUID failed: %s\n", > + fprintf(stderr, "%s failed: %s\n", > + (ioctl == (int)KVM_GET_SUPPORTED_CPUID > + ? "KVM_GET_SUPPORTED_CPUID" > + : "KVM_GET_EMULATED_CPUID"), > strerror(-r)); > exit(1); > } > @@ -112,7 +115,17 @@ static struct kvm_cpuid2 *get_supported_cpuid(KVMState *s) > { > struct kvm_cpuid2 *cpuid; > int max = 1; > - while ((cpuid = try_get_cpuid(s, max)) == NULL) { > + while ((cpuid = try_get_cpuid(s, KVM_GET_SUPPORTED_CPUID, max)) == NULL) { > + max *= 2; > + } > + return cpuid; > +} > + > +static struct kvm_cpuid2 *get_emulated_cpuid(KVMState *s) > +{ > + struct kvm_cpuid2 *cpuid; > + int max = 1; > + while ((cpuid = try_get_cpuid(s, KVM_GET_EMULATED_CPUID, max)) == NULL) { > max *= 2; > } > return cpuid; > @@ -241,6 +254,23 @@ uint32_t kvm_arch_get_supported_cpuid(KVMState *s, uint32_t function, > return ret; > } > > +uint32_t kvm_arch_get_emulated_cpuid(KVMState *s, uint32_t function, > + uint32_t index, int reg) > +{ > + struct kvm_cpuid2 *cpuid __attribute__((unused)); > + > + if (!kvm_check_extension(s, KVM_CAP_EXT_EMUL_CPUID)) > + return 0; > + > + cpuid = get_emulated_cpuid(s); > + > + struct kvm_cpuid_entry2 *entry = cpuid_find_entry(cpuid, function, index); > + if (entry) > + return cpuid_entry_get_reg(entry, reg); > + > + return 0; > +} > + > typedef struct HWPoisonPage { > ram_addr_t ram_addr; > QLIST_ENTRY(HWPoisonPage) list; > -- > 1.8.4 > > -- > To unsubscribe from this list: send the line "unsubscribe kvm" in > the body of a message to majordomo(a)vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html -- Eduardo

1 0

[libvirt] [PATCH 1/2] VMware: Support more than 2 driver backends
by Doug Goldstein 24 Sep '13

24 Sep '13

Currently the VMware version check code only supports two types of VMware backends, Workstation and Player. But in the near future we will have an additional one so we need to support more. Additionally, we discover and cache the path to the vmrun binary so we should use that path when using the cooresponding binary from the VMware VIX SDK. --- src/vmware/vmware_conf.c | 23 ++++++++++++++++++++--- src/vmware/vmware_driver.c | 20 ++++++++++++++++++-- 2 files changed, 38 insertions(+), 5 deletions(-) diff --git a/src/vmware/vmware_conf.c b/src/vmware/vmware_conf.c index 261a4f6..d7ea8c4 100644 --- a/src/vmware/vmware_conf.c +++ b/src/vmware/vmware_conf.c @@ -257,10 +257,25 @@ vmwareExtractVersion(struct vmware_driver *driver) { unsigned long version = 0; int ret = -1; - virCommandPtr cmd; + virCommandPtr cmd = NULL; char * outbuf = NULL; - const char * bin = (driver->type == VMWARE_DRIVER_PLAYER) ? - "vmplayer" : "vmware"; + char *bin = NULL; + char *vmwarePath = NULL; + + if ((vmwarePath = mdir_name(driver->vmrun)) == NULL) + goto cleanup; + + switch (driver->type) { + case VMWARE_DRIVER_PLAYER: + if (virAsprintf(&bin, "%s/%s", vmwarePath, "vmplayer")) + goto cleanup; + break; + + case VMWARE_DRIVER_WORKSTATION: + if (virAsprintf(&bin, "%s/%s", vmwarePath, "vmware")) + goto cleanup; + break; + } cmd = virCommandNewArgList(bin, "-v", NULL); virCommandSetOutputBuffer(cmd, &outbuf); @@ -276,6 +291,8 @@ vmwareExtractVersion(struct vmware_driver *driver) cleanup: virCommandFree(cmd); VIR_FREE(outbuf); + VIR_FREE(bin); + VIR_FREE(vmwarePath); return ret; } diff --git a/src/vmware/vmware_driver.c b/src/vmware/vmware_driver.c index 4e56971..01d65ed 100644 --- a/src/vmware/vmware_driver.c +++ b/src/vmware/vmware_driver.c @@ -93,6 +93,7 @@ vmwareConnectOpen(virConnectPtr conn, { struct vmware_driver *driver; size_t i; + char *tmp; virCheckFlags(VIR_CONNECT_RO, VIR_DRV_OPEN_ERROR); @@ -144,8 +145,23 @@ vmwareConnectOpen(virConnectPtr conn, if (virMutexInit(&driver->lock) < 0) goto cleanup; - driver->type = STRNEQ(conn->uri->scheme, "vmwareplayer") ? - VMWARE_DRIVER_WORKSTATION : VMWARE_DRIVER_PLAYER; + if ((tmp = STRSKIP(conn->uri->scheme, "vmware")) == NULL) { + virReportError(VIR_ERR_INTERNAL_ERROR, _("unable to parse URI " + "scheme '%s'"), conn->uri->scheme); + goto cleanup; + } + + driver->type = -1; + for (i = 0; i < VMWARE_DRIVER_LAST; i++) { + if (STREQ(tmp, vmwareDriverTypeToString(i))) + driver->type = i; + } + + if (driver->type == -1) { + virReportError(VIR_ERR_INTERNAL_ERROR, _("unable to find valid " + "requested VMware backend '%s'"), tmp); + goto cleanup; + } if (!(driver->domains = virDomainObjListNew())) goto cleanup; -- 1.8.1.5

2 4

[libvirt] Libvirt ESX: Image file not getting copied to ESX server
by varun bhatnagar 23 Sep '13

23 Sep '13

Hi, I am trying to start a node using libvirt on ESX hypervisor. Before starting I am performing the following steps: 1) vol-create datastore1 /local/new_volume.xml (Creating a volume in pool) 2) define /local/esxdomain.xml (Defining a node) 3) start MyNode (Starting a node) I tried to get the status of my node and it is showing *running *but I am not able to ping my node (as it is in network). I later got the console of my node and found out that my node is not even getting started. It says "Operating System Not Found". I guess this is because my vmdk image file is not getting copied and the first command is just placing two files .vmdk and *-flat.vmdk (these are dummy files I guess). But it is not placing my original .vmdk files. How to place the original vmdk file in datastore. If I place it using scp command then libvirt pops out a message saying "Could not start domain: GenericVmConfigFault". How to resolve this error. I am pasting my xml files below. Any help is appreciated... :) *new_volume.xml:* *<volume> <name>test/MyNode.vmdk</name> <allocation>0</allocation> <capacity unit='G'>3</capacity> <target> <path>/local/vmdk/MyNode.vmdk</path> <format type='vmdk'/> </target> </volume>* *esxdomain.xml: * *<domain type='vmware'> <name>test</name> <memory>1048576</memory> <currentMemory>1048576</currentMemory> <vcpu>1</vcpu> <console>/dev/console</console> <os> <type arch='x86_64'>hvm</type> </os> <devices> <disk type='file' device='disk'> <source file='[datastore1] test/MyNode.vmdk'/> <target dev='sda' bus='scsi'/> <address type='drive' controller='0' bus='0' unit='0'/> </disk> <controller type='scsi' index='0' model='lsilogic'/>  <interface type='bridge'> <mac address='00:50:56:0f:01:01'/> <source bridge='VM Network'/> </interface> <interface type='bridge'> <mac address='00:50:56:0f:01:02'/> <source bridge='dummyPortGroup1'/> </interface> <interface type='bridge'> <mac address='00:50:56:0f:01:03'/> <source bridge='dummyPortGroup2'/> </interface> </devices> </domain>* Regards, Varun

1 0

[libvirt] [PATCH] docs: Load libvirt_access*.xml from build dir
by Jiri Denemark 23 Sep '13

23 Sep '13

The xml files are generated in build directory and thus docs/newapi.xsl was not able to find them in a VPATH build. Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- docs/Makefile.am | 1 + docs/newapi.xsl | 8 +++++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/docs/Makefile.am b/docs/Makefile.am index c6a3ead..faf2a32 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -242,6 +242,7 @@ internals/%.html.tmp: internals/%.html.in subsite.xsl page.xsl sitemap.html.in html/index.html: libvirt-api.xml newapi.xsl page.xsl sitemap.html.in $(AM_V_GEN)if [ -x $(XSLTPROC) ] ; then \ $(XSLTPROC) --nonet -o $(srcdir)/ \ + --stringparam builddir $(abs_top_builddir) \ $(srcdir)/newapi.xsl $(srcdir)/libvirt-api.xml ; fi && \ if test -x $(XMLLINT) && test -x $(XMLCATALOG) ; then \ if $(XMLCATALOG) '$(XML_CATALOG_FILE)' "-//W3C//DTD XHTML 1.0 Strict//EN" \ diff --git a/docs/newapi.xsl b/docs/newapi.xsl index 606d244..b1728ee 100644 --- a/docs/newapi.xsl +++ b/docs/newapi.xsl @@ -25,18 +25,20 @@  <xsl:key name="symbols" match="/api/symbols/*" use="@name"/> + <xsl:param name="builddir" select=".."/> +  <xsl:variable name="htmldir">html</xsl:variable> <xsl:variable name="href_base">../</xsl:variable> <xsl:variable name="acls"> - <xsl:copy-of select="document('../src/libvirt_access.xml')/aclinfo/api"/> + <xsl:copy-of select="document('{$builddir}/src/libvirt_access.xml')/aclinfo/api"/> </xsl:variable> <xsl:variable name="qemuacls"> - <xsl:copy-of select="document('../src/libvirt_access_qemu.xml')/aclinfo/api"/> + <xsl:copy-of select="document('{$builddir}/src/libvirt_access_qemu.xml')/aclinfo/api"/> </xsl:variable> <xsl:variable name="lxcacls"> - <xsl:copy-of select="document('../src/libvirt_access_lxc.xml')/aclinfo/api"/> + <xsl:copy-of select="document('{$builddir}/src/libvirt_access_lxc.xml')/aclinfo/api"/> </xsl:variable> <xsl:template name="aclinfo"> -- 1.8.3.2

3 6

[libvirt] Libvirt not able to attach console to VM on ESX hypervisor
by varun bhatnagar 23 Sep '13

23 Sep '13

Hi, I have started a virtual machine on my ESXi server. I was trying to attach a console to it but when I executed the command I got a message saying that *"Attaching a console is not supported in the current hypervisor." *Is there any way (patch or something) through which I can attach a console to my VM. The ESX version is 5.1 and I am using latest version of libvirt. Regards, Varun

4 4

[libvirt] [PATCH]LXC: Check the existence of dir before resolving symlinks
by Chen Hanxiao 23 Sep '13

23 Sep '13

From: Chen Hanxiao <chenhanxiao(a)cn.fujitsu.com> If dir does not exist, raise a proper error in logs and don't let virFileResolveAllLinks throw itself's exceptions in logs, which may be misleading. Signed-off-by: Chen Hanxiao <chenhanxiao(a)cn.fujitsu.com> --- src/lxc/lxc_container.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index a979452..c60f5d8 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -1696,6 +1696,7 @@ static int lxcContainerResolveSymlinks(virDomainDefPtr vmDef) { char *newroot; size_t i; + char ebuf[1024]; VIR_DEBUG("Resolving symlinks"); @@ -1703,6 +1704,13 @@ static int lxcContainerResolveSymlinks(virDomainDefPtr vmDef) virDomainFSDefPtr fs = vmDef->fss[i]; if (!fs->src) continue; + + if (access(fs->src, F_OK)) { + VIR_DEBUG("Failed to access '%s': %s", fs->src, + virStrerror(errno, ebuf, sizeof(ebuf))); + return -1; + } + VIR_DEBUG("Resolving '%s'", fs->src); if (virFileResolveAllLinks(fs->src, &newroot) < 0) { VIR_DEBUG("Failed to resolve symlink at %s", fs->src); -- 1.8.2.1

2 1

[libvirt] [PATCH]LXC: follow the unit style of /proc/meminfo
by Chen Hanxiao 23 Sep '13

23 Sep '13

From: Chen Hanxiao <chenhanxiao(a)cn.fujitsu.com> If we start libvirt_lxc with fuse complied, we could see an isolate /proc/meminfo based on fuse. Part of this were modified based on container's mem cgroup, with the unit style of "KB"; rest of them were copied from /proc/meminfo, with another unit style of "kB". It looks a little strange. We should keep pace with the style of kernel function meminfo_proc_show, and change all "KB" to "kB". Signed-off-by: Chen Hanxiao <chenhanxiao(a)cn.fujitsu.com> --- src/lxc/lxc_fuse.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/src/lxc/lxc_fuse.c b/src/lxc/lxc_fuse.c index e672b0f..9d12832 100644 --- a/src/lxc/lxc_fuse.c +++ b/src/lxc/lxc_fuse.c @@ -165,43 +165,43 @@ static int lxcProcReadMeminfo(char *hostpath, virDomainDefPtr def, if (STREQ(line, "MemTotal") && (def->mem.hard_limit || def->mem.max_balloon)) - virBufferAsprintf(new_meminfo, "MemTotal: %8llu KB\n", + virBufferAsprintf(new_meminfo, "MemTotal: %8llu kB\n", meminfo.memtotal); else if (STREQ(line, "MemFree") && (def->mem.hard_limit || def->mem.max_balloon)) - virBufferAsprintf(new_meminfo, "MemFree: %8llu KB\n", + virBufferAsprintf(new_meminfo, "MemFree: %8llu kB\n", (meminfo.memtotal - meminfo.memusage)); else if (STREQ(line, "Buffers")) - virBufferAsprintf(new_meminfo, "Buffers: %8d KB\n", 0); + virBufferAsprintf(new_meminfo, "Buffers: %8d kB\n", 0); else if (STREQ(line, "Cached")) - virBufferAsprintf(new_meminfo, "Cached: %8llu KB\n", + virBufferAsprintf(new_meminfo, "Cached: %8llu kB\n", meminfo.cached); else if (STREQ(line, "Active")) - virBufferAsprintf(new_meminfo, "Active: %8llu KB\n", + virBufferAsprintf(new_meminfo, "Active: %8llu kB\n", (meminfo.active_anon + meminfo.active_file)); else if (STREQ(line, "Inactive")) - virBufferAsprintf(new_meminfo, "Inactive: %8llu KB\n", + virBufferAsprintf(new_meminfo, "Inactive: %8llu kB\n", (meminfo.inactive_anon + meminfo.inactive_file)); else if (STREQ(line, "Active(anon)")) - virBufferAsprintf(new_meminfo, "Active(anon): %8llu KB\n", + virBufferAsprintf(new_meminfo, "Active(anon): %8llu kB\n", meminfo.active_anon); else if (STREQ(line, "Inactive(anon)")) - virBufferAsprintf(new_meminfo, "Inactive(anon): %8llu KB\n", + virBufferAsprintf(new_meminfo, "Inactive(anon): %8llu kB\n", meminfo.inactive_anon); else if (STREQ(line, "Active(file)")) - virBufferAsprintf(new_meminfo, "Active(file): %8llu KB\n", + virBufferAsprintf(new_meminfo, "Active(file): %8llu kB\n", meminfo.active_file); else if (STREQ(line, "Inactive(file)")) - virBufferAsprintf(new_meminfo, "Inactive(file): %8llu KB\n", + virBufferAsprintf(new_meminfo, "Inactive(file): %8llu kB\n", meminfo.inactive_file); else if (STREQ(line, "Unevictable")) - virBufferAsprintf(new_meminfo, "Unevictable: %8llu KB\n", + virBufferAsprintf(new_meminfo, "Unevictable: %8llu kB\n", meminfo.unevictable); else if (STREQ(line, "SwapTotal") && def->mem.swap_hard_limit) - virBufferAsprintf(new_meminfo, "SwapTotal: %8llu KB\n", + virBufferAsprintf(new_meminfo, "SwapTotal: %8llu kB\n", (meminfo.swaptotal - meminfo.memtotal)); else if (STREQ(line, "SwapFree") && def->mem.swap_hard_limit) - virBufferAsprintf(new_meminfo, "SwapFree: %8llu KB\n", + virBufferAsprintf(new_meminfo, "SwapFree: %8llu kB\n", (meminfo.swaptotal - meminfo.memtotal - meminfo.swapusage + meminfo.memusage)); else { -- 1.8.2.1

3 2