libvirt: uprev to v1.2.0

Upreving libvirt to v1.2.0 released Dec 2, 2013.

As part of this uprev, existing patches that are part of the 1.2 release have
been dropped, and existing functionality checked for regressions.

From the libvirt release notes:

 Features:
    Add support for gluster pool (Eric Blake),
    Separation of python binding (Daniel P. Berrange),
    vbox: add support for 4.3 APIs (Ryota Ozaki)

 Documentation:
    fix typos in libvirt.h.in (Chen Hanxiao),
    Link libvirt-sandbox from apps page (Daniel P. Berrange),
    Add docs about audit subsystem logging (Daniel P. Berrange),
    virsh: fix doc typos (Nehal J Wani),
    Fix typos in various docs (Nehal J Wani),
    LXC: add securetty related note in Device nodes (Gao feng),
    Fix three minor typos (Yuri Chornoivan),
    storage: fix typo in previous patch (Eric Blake),
    storage: document gluster pool (Eric Blake),
    virDomainReboot: Document that migration might be unsafe (Michal Privoznik),
    delete extra character (Wangyufei (A)),
    maint: fix comment typos. (Eric Blake),
    improve job info details (Eric Blake),
    fix a typo in formatnwfilter.html.in (Chen Hanxiao),
    Improve cgroups docs to cover systemd integration (Daniel P. Berrange),
    fix typos in libvirt.h.in (Chen Hanxiao),
    fix virDomainRestoreFlags description bug (Wang Yufei),
    grammar fixes (Eric Blake),
    add SystemTap to apps using libvirt (Jonathan Lebon),
    fix a typo in formatnwfilter (Chen Hanxiao),
    caps: Fix function docs for virCapabilitiesAddHostNUMACell (Peter Krempa)

Portability:
    tests: fix virpcitest with read-only srcdir (Eric Blake),
    tests: guarantee abs_srcdir in all C tests (Eric Blake),
    look for numad in /usr/sbin (Jim Fehlig),
    build: Don't fail on '<' or '>' with old xmllint (Martin Kletzander),
    spec: fix libvirt-docs subpackage on RHEL-6 (Michael Chapman),
    Don't depend on syslog.service (Guido Günther),
    qemuMonitorJSONGetCPUx86Data: Don't fail on ancient qemus (Michal Privoznik),
    build: work around super-old readline.h (Ryota Ozaki),
    Fix migration with QEMU 1.6 (Michael Avdienko),
    nodeinfo: fix build on non-Linux (Eric Blake)

Bug Fixes:
    vbox: handle errors of virDomainHostdevDefAlloc correctly (Ryota Ozaki),
    vbox: fix incorrect loop condition in vboxHostDeviceGetXMLDesc (Ryota Ozaki),
    Fix memory leak in virNWFilterDefParseXML() (Nehal J Wani),
    Fix memory leak in virDomainDefParseXML() (Nehal J Wani),
    LXC: Ensure security context is set when mounting images (Daniel P. Berrange),
    network: properly update iptables rules during net-update (Laine Stump),
    Fix bug in identifying sub-mounts (Daniel P. Berrange),
    storage: skip selinux cleanup when fd not available (Eric Blake),
    qemu: preserve netdev MAC address during 'domxml-to-native' (Bing Bu Cao),
    storage: don't read storage volumes in nonblock mode (Eric Blake),
    LXC: don't unmount mounts for shared root (Gao feng),
    LXC: fix the problem that libvirt lxc fail to start on latest kernel (Gao feng),
    sasl: Fix authentication when using PLAIN mechanism (Christophe Fergeau),
    Fix invalid read in virNetSASLSessionClientStep debug log (Christophe Fergeau),
    Tie SASL callbacks lifecycle to virNetSessionSASLContext (Christophe Fergeau),
    remote: Don't leak priv->tls object on connection failure (Christophe Fergeau),
    spec: Don't save/restore running VMs on libvirt-client update (Jiri Denemark),
    virsh domxml-from-native to treat SCSI as the bus type for pseries by default (Shivaprasad G Bhat),
    Don't start a nested job in qemuMigrationPrepareAny (Ján Tomko),
    spec: Don't save/restore running VMs on libvirt-client update (Cole Robinson),
    spec: Restrict virt-login-shell usage (Jiri Denemark),
    storage: use valid XML for awkward volume names (Eric Blake),
    storage: Returns earlier if source adapter of the scsi pool is a HBA (Osier Yang),
    libvirt-guests: Run only after libvirtd (Cole Robinson),
    Fix off-by-1 in default SELinux MCS range (Daniel P. Berrange),
    vbox: fix segfault on virsh dumpxml with the existence of USB filters (Ryota Ozaki),
    Add missing 'return 0;' in stub lxcStartFuse() method impl. (Daniel P. Berrange),
    Avoid async signal safety problem in glibc's setxid (Daniel P. Berrange),
    Don't release spice port twice when no TLS port is available (Ján Tomko),
    Properly unref a connection with a close callback (Ján Tomko),
    qemu: Call qemuSetupHostdevCGroup later during hotplug (Jiri Denemark),
    qemuMonitorIO: Don't use @mon after it's unrefed (Michal Privoznik),
    qemuProcessReconnectHelper: Don't create joinable thread (Michal Privoznik),
    virDomainEventCallbackListFree: Don't leak @list->callbacks (Michal Privoznik),
    networkBuildDhcpDaemonCommandLine: Don't leak @configstr and @configfile (Michal Privoznik),
    Disable nwfilter driver when running unprivileged (Ján Tomko),
    libxl: Fix Xen 4.4 libxlVmStart logic (Jason Andryuk),
    qemu: Check for presence of device and properities when getting CPUID (Peter Krempa),
    Fix busy wait loop in LXC container I/O handling (Daniel P. Berrange),
    Don't expose 'none' machine type to capabilities (Daniel P. Berrange),
    Fix mem leak in virQEMUCapsProbeQMPMachineTypes on OOM (Daniel P. Berrange),
    virSecurityLabelDefParseXML: Don't parse label on model='none' (Michal Privoznik),
    virsh-domain: Mark --live and --config mutually exclusive in vcpucount (Peter Krempa),
    qemu: Fix SCSI hotplug on pseries guests (Vitor de Lima),
    pci: properly handle out-of-order SRIOV virtual functions (Laine Stump),
    util: use -w flag when calling iptables (Serge Hallyn),
    storage: Fix a vol-clone bug on ppc64 (Li Zhang),
    qemu: Don't access vm->priv on unlocked domain (Michal Privoznik),
    qemu: Avoid double free of VM (Michal Privoznik),
    Allow root directory in filesystem source dir schema (Ján Tomko),
    qemuMigrationBeginPhase: Check for 'drive-mirror' for NBD (Michal Privoznik),
    conf: fix incorrect error log in virCPUDefIsEqual (Chen Hanxiao),
    qemuMonitorDispose: Reset lastError (Michal Privoznik),
    qemu: clean up migration ports when migration cancelled (Zeng Junliang),
    network: fix connections count in case of allocate failure (Laine Stump),
    virpcitest: Fix variable arguments using in pci_driver_new (Michal Privoznik),
    virpci: Don't error on unbinded devices (Michal Privoznik)

Improvements:
    Pull lxcContainerGetSubtree out into shared virfile module (Daniel P. Berrange),
    Introduce standard methods for sorting strings with qsort (Daniel P. Berrange),
    conf: Export virStorageVolType enum helper functions (Peter Krempa),
    sasl: Replace 'restep' label with 'continue' (Christophe Fergeau),
    storage: probe qcow2 volumes in gluster pool (Eric Blake),
    storage: improve handling of symlinks in gluster (Eric Blake),
    storage: improve allocation stats reported on gluster files (Eric Blake),
    storage: improve directory support in gluster pool (Eric Blake),
    storage: add network-dir as new storage volume type (Eric Blake),
    storage: implement rudimentary glusterfs pool refresh (Eric Blake),
    storage: initial support for linking with libgfapi (Eric Blake),
    storage: expose volume meta-type in XML (Eric Blake),
    storage: allow interleave in volume XML (Eric Blake),
    maint: next release is 1.2.0 (Eric Blake),
    vbox: import vbox_CAPI_v4_3.h from SDK (Ryota Ozaki),
    vbox: pull vboxHostDeviceGetXMLDesc out from vboxDomainGetXMLDesc (Ryota Ozaki),
    vbox: cleanup vboxAttachUSB (Ryota Ozaki),
    lxc: don't do duplicate work when getting pagesize (Chen Hanxiao),
    maint: update to latest gnulib (Eric Blake),
    python: remove virConnectGetCPUModelNames from globals (Doug Goldstein),
    python: remove virConnectGetCPUModelNames from globals (Doug Goldstein),
    qemu: Auto-generate controller for hotplugged hostdev (Eric Farman),
    qemu: Separate calls based on controller bus type (Eric Farman),
    qemu: Rename controller hotplug functions to not be PCI-specific (Eric Farman),
    qemu: Add support for virt machine type with virtio-mmio devices on armv7 (Clark Laughlin),
    maint: enforce comma style usage (Eric Blake),
    maint: fix comma style issues: remaining code (Eric Blake),
    maint: fix comma style issues: remaining drivers (Eric Blake),
    maint: fix comma style issues: vbox (Eric Blake),
    maint: fix comma style issues: python (Eric Blake),
    maint: fix comma style issues: util (Eric Blake),
    maint: fix comma style issues: tests, tools (Eric Blake),
    maint: fix comma style issues: qemu (Eric Blake),
    maint: fix comma style issues: xen (Eric Blake),
    maint: fix comma style issues: conf (Eric Blake),
    maint: fix comma style issues: nwfilter (Eric Blake),
    Error out on unterminated arrays and objects in JSON parser (Ján Tomko),
    Test if JSON parser fails on invalid input (Ján Tomko),
    maint: ship .pl scripts as executables (Eric Blake),
    Fix virsh net-info output for consistency (Hao Liu),
    Add missing break to switch-case block (Doug Goldstein),
    qemumonitorjsontest: Introduce GetNonExistingCPUData test (Michal Privoznik),
    Macro for testing the version you are compiling with (Doug Goldstein),
    Return -1 in virPortAllocatorAcquire if all ports are used (Ján Tomko),
    Add a name to virPortAllocator (Ján Tomko),
    storage: fix RNG validation of gluster via netfs (Eric Blake),
    virsh-secret: Unify list column alignment (Peter Krempa),
    virsh-interface: Unify list column alignment (Peter Krempa),
    virsh-nwfilter: Unify list command column alignment (Peter Krempa),
    virsh-pool: Unify spacing of listing function (Peter Krempa),
    qemu: Change return type of qemuMonitorGetGuestCPU() (Peter Krempa),
    virsh-volume: Unify strigification of volume type (Peter Krempa),
    virsh-volume: Unify alignment of vol-list output columns (Peter Krempa),
    conf: Refactor virDomainDiskSourceDefParse (Peter Krempa),
    conf: Rename virDomainDiskHostDefFree to virDomainDiskHostDefClear (Peter Krempa),
    conf: Split out code to parse the source of a disk definition (Peter Krempa),
    qemuDomainObjStart: Warn on corrupted image (Michal Privoznik),
    util: use size_t instead of unsigned int for num_virtual_functions (Laine Stump),
    qemu: assign PCI address to primary video card (Vitor de Lima),
    qemu: process: Validate specific CPUID flags of a guest (Peter Krempa),
    qemu: Add support for paravirtual spinlocks in the guest (Peter Krempa),
    conf: Refactor storing and usage of feature flags (Peter Krempa),
    cpu: x86: Add internal CPUID features support and KVM feature bits (Peter Krempa),
    qemu: Add monitor APIs to fetch CPUID data from QEMU (Jiri Denemark),
    cpu_x86: Refactor storage of CPUID data to add support for KVM features (Peter Krempa),
    tests: Distribute virpcitestdata (Michal Privoznik),
    tests: Fix virtpcitest in VPATH (Jiri Denemark),
    conf: Refactor virDomainDiskSourcePoolDefParse (Peter Krempa),
    storage: always probe type with buffer (Eric Blake),
    storage: refactor backing chain division of labor (Eric Blake),
    storage: reduce number of stat calls (Eric Blake),
    storage: avoid short reads while chasing backing chain (Eric Blake),
    storage: use simpler 'char *' (Eric Blake),
    test driver: add support for .connectBaselineCPU (Giuseppe Scrivano),
    virpcitest: Introduce testVirPCIDeviceReset (Michal Privoznik),
    virt-login-shell: also build virAtomic.h (Guido Günther),
    storage: recognize gluster as networked file (Eric Blake),
    qemu: don't use deprecated -no-kvm-pit-reinjection (Ján Tomko),
    Resolve Coverity issue regarding not checking return value (John Ferlan),
    Skip any files which are not mounted on the host (Daniel P. Berrange),
    Add flag to lxcBasicMounts to control use in user namespaces (Daniel P. Berrange),
    Remove duplicate entries in lxcBasicMounts array (Daniel P. Berrange),
    Remove pointless 'srcpath' variable in lxcContainerMountBasicFS (Daniel P. Berrange),
    Remove unused 'opts' field from LXC basic mounts struct (Daniel P. Berrange),
    Add virFileIsMountPoint function (Daniel P. Berrange),
    virpcitest: Introduce check for unbinded devices (Michal Privoznik),
    virpcitest: Introduce testVirPCIDeviceReattach (Michal Privoznik),
    virpcitest: Test virPCIDeviceDetach (Michal Privoznik),
    tests: Introduce virpcitest (Michal Privoznik),
    cpu: x86: Parse the CPU feature map only once (Peter Krempa),
    cpu: Export few x86-specific APIs (Jiri Denemark),
    nodeinfo: Remove libnuma include (Peter Krempa),
    numa: Add wrapper of numa_node_to_cpus and use it (Peter Krempa),
    numa: Replace NUMA_MAX_N_CPUS macro with virNumaGetMaxCPUs() (Peter Krempa),
    nodeinfo: Get rid of nodeGetCellMemory (Peter Krempa),
    numa: Introduce virNumaGetNodeMemory and use it instead of numa_node_size64 (Peter Krempa),
    numa: Introduce virNumaGetMaxNode and use it instead of numa_max_node (Peter Krempa),
    nodeinfo: Avoid forward declarations of static functions (Peter Krempa),
    numa: Introduce virNumaIsAvailable and use it instead of numa_available (Peter Krempa)

Cleanups:
    Remove obsolete 'tests' makefile target (Daniel P. Berrange),
    Mostly revert "python: remove virConnectGetCPUModelNames from globals" (Daniel P. Berrange),
    Remove redundant braces (Ján Tomko),
    virPCIDeviceBindToStub: Remove unused @oldDriverPath and @oldDriverName (Michal Privoznik)

Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>

12 files changed, 2 insertions, 929 deletions

diff --git a/recipes-extended/libvirt/libvirt-python.inc b/recipes-extended/libvirt/libvirt-python.inc
index 1bf63234..0d3278d2 100644
--- a/recipes-extended/libvirt/libvirt-python.inc
+++ b/recipes-extended/libvirt/libvirt-python.inc
@@ -15,5 +15,3 @@ FILES_${PN}-python-dbg += "${PYTHON_SITEPACKAGES_DIR}/.debug/"
 FILES_${PN}-python += "${PYTHON_SITEPACKAGES_DIR}"
 
 EXTRA_OECONF += "TARGET_PYTHON=${bindir}/python"
-
-SRC_URI += "file://libvirt-allow-location-of-python-on-the-target-to-be.patch"
\ No newline at end of file
diff --git a/recipes-extended/libvirt/libvirt/0001-Add-virFileIsMountPoint-function.patch b/recipes-extended/libvirt/libvirt/0001-Add-virFileIsMountPoint-function.patch
deleted file mode 100644
index 0affcbef..00000000
--- a/recipes-extended/libvirt/libvirt/0001-Add-virFileIsMountPoint-function.patch
+++ /dev/null
@@ -1,135 +0,0 @@
-From: "Daniel P. Berrange" <berrange@redhat.com>
-To: libvir-list@redhat.com
-Date: Mon,  7 Oct 2013 14:06:46 +0100
-Message-Id: <1381151211-27111-2-git-send-email-berrange@redhat.com>
-In-Reply-To: <1381151211-27111-1-git-send-email-berrange@redhat.com>
-References: <1381151211-27111-1-git-send-email-berrange@redhat.com>
-X-Scanned-By: MIMEDefang 2.68 on 10.5.11.25
-X-loop: libvir-list@redhat.com
-Subject: [libvirt] [PATCH 1/6] Add virFileIsMountPoint function
-X-BeenThere: libvir-list@redhat.com
-X-Mailman-Version: 2.1.12
-Precedence: junk
-List-Id: Development discussions about the libvirt library & tools
-        <libvir-list.redhat.com>
-List-Unsubscribe: <https://www.redhat.com/mailman/options/libvir-list>,
-        <mailto:libvir-list-request@redhat.com?subject=unsubscribe>
-List-Archive: <https://www.redhat.com/archives/libvir-list>
-List-Post: <mailto:libvir-list@redhat.com>
-List-Help: <mailto:libvir-list-request@redhat.com?subject=help>
-List-Subscribe: <https://www.redhat.com/mailman/listinfo/libvir-list>,
-        <mailto:libvir-list-request@redhat.com?subject=subscribe>
-X-List-Received-Date: Mon, 07 Oct 2013 13:06:56 -0000
-
-From: "Daniel P. Berrange" <berrange@redhat.com>
-
-Add a function for efficiently checking if a path is a filesystem
-mount point.
-
-NB will not work for bind mounts, only true filesystem mounts.
-
-Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
----
- src/libvirt_private.syms |  1 +
- src/util/virfile.c       | 58 ++++++++++++++++++++++++++++++++++++++++++++++++
- src/util/virfile.h       |  2 ++
- 3 files changed, 61 insertions(+)
-
-diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
-index fe40834..31fa604 100644
---- a/src/libvirt_private.syms
-+++ b/src/libvirt_private.syms
-@@ -1182,6 +1182,7 @@ virFileIsAbsPath;
- virFileIsDir;
- virFileIsExecutable;
- virFileIsLink;
-+virFileIsMountPoint;
- virFileLinkPointsTo;
- virFileLock;
- virFileLoopDeviceAssociate;
-diff --git a/src/util/virfile.c b/src/util/virfile.c
-index e10de5a..fa21aeb 100644
---- a/src/util/virfile.c
-+++ b/src/util/virfile.c
-@@ -1513,6 +1513,64 @@ virFileIsExecutable(const char *file)
-     return false;
- }
- 
-+
-+/*
-+ * Check that a file refers to a mount point. Trick is that for
-+ * a mount point, the st_dev field will differ from the parent
-+ * directory.
-+ *
-+ * Note that this will not detect bind mounts of dirs/files,
-+ * only true filesystem mounts.
-+ */
-+int virFileIsMountPoint(const char *file)
-+{
-+    char *parent = NULL;
-+    char *tmp;
-+    int ret = -1;
-+    struct stat sb1, sb2;
-+
-+    if (VIR_STRDUP_QUIET(parent, file) < 0)
-+        goto cleanup;
-+
-+    if (!(tmp = strrchr(parent, '/'))) {
-+        virReportError(VIR_ERR_INTERNAL_ERROR,
-+                       _("Could not find '/' in '%s'"),
-+                       file);
-+        goto cleanup;
-+    }
-+
-+    *tmp = '\0';
-+
-+    VIR_DEBUG("Comparing '%s' to '%s'", file, parent);
-+
-+    if (stat(file, &sb1) < 0) {
-+        if (errno == ENOENT)
-+            ret = 0;
-+        else
-+            virReportSystemError(errno,
-+                                 _("Cannot stat '%s'"),
-+                                 file);
-+        goto cleanup;
-+    }
-+
-+    if (stat(parent, &sb2) < 0) {
-+        virReportSystemError(errno,
-+                             _("Cannot stat '%s'"),
-+                             parent);
-+        goto cleanup;
-+    }
-+
-+    if (!S_ISDIR(sb1.st_mode))
-+        return false;
-+
-+    ret = sb1.st_dev != sb2.st_dev;
-+    VIR_DEBUG("Is mount %d", ret);
-+
-+ cleanup:
-+    VIR_FREE(parent);
-+    return ret;
-+}
-+
- #ifndef WIN32
- /* Check that a file is accessible under certain
-  * user & gid.
-diff --git a/src/util/virfile.h b/src/util/virfile.h
-index 72d35ce..ff84719 100644
---- a/src/util/virfile.h
-+++ b/src/util/virfile.h
-@@ -156,6 +156,8 @@ bool virFileIsDir (const char *file) ATTRIBUTE_NONNULL(1);
- bool virFileExists(const char *file) ATTRIBUTE_NONNULL(1);
- bool virFileIsExecutable(const char *file) ATTRIBUTE_NONNULL(1);
- 
-+int virFileIsMountPoint(const char *file) ATTRIBUTE_NONNULL(1);
-+
- char *virFileSanitizePath(const char *path);
- 
- enum {
--- 
-1.8.3.1
-
-
diff --git a/recipes-extended/libvirt/libvirt/0002-Remove-unused-opts-field-from-LXC-basic.patch b/recipes-extended/libvirt/libvirt/0002-Remove-unused-opts-field-from-LXC-basic.patch
deleted file mode 100644
index 2a3d3ef4..00000000
--- a/recipes-extended/libvirt/libvirt/0002-Remove-unused-opts-field-from-LXC-basic.patch
+++ /dev/null
@@ -1,97 +0,0 @@
-From: "Daniel P. Berrange" <berrange@redhat.com>
-To: libvir-list@redhat.com
-Date: Mon,  7 Oct 2013 14:06:47 +0100
-Message-Id: <1381151211-27111-3-git-send-email-berrange@redhat.com>
-In-Reply-To: <1381151211-27111-1-git-send-email-berrange@redhat.com>
-References: <1381151211-27111-1-git-send-email-berrange@redhat.com>
-X-Scanned-By: MIMEDefang 2.68 on 10.5.11.25
-X-loop: libvir-list@redhat.com
-Subject: [libvirt] [PATCH 2/6] Remove unused 'opts' field from LXC basic
-        mounts struct
-X-BeenThere: libvir-list@redhat.com
-X-Mailman-Version: 2.1.12
-Precedence: junk
-List-Id: Development discussions about the libvirt library & tools
-        <libvir-list.redhat.com>
-List-Unsubscribe: <https://www.redhat.com/mailman/options/libvir-list>,
-        <mailto:libvir-list-request@redhat.com?subject=unsubscribe>
-List-Archive: <https://www.redhat.com/archives/libvir-list>
-List-Post: <mailto:libvir-list@redhat.com>
-List-Help: <mailto:libvir-list-request@redhat.com?subject=help>
-List-Subscribe: <https://www.redhat.com/mailman/listinfo/libvir-list>,
-        <mailto:libvir-list-request@redhat.com?subject=subscribe>
-X-List-Received-Date: Mon, 07 Oct 2013 13:06:57 -0000
-
-From: "Daniel P. Berrange" <berrange@redhat.com>
-
-The virLXCBasicMountInfo struct contains a 'char *opts'
-field passed onto the mount() syscall. Every entry in the
-list sets this to NULL though, so it can be removed to
-simplify life.
-
-Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
----
- src/lxc/lxc_container.c | 29 ++++++++++++++---------------
- 1 file changed, 14 insertions(+), 15 deletions(-)
-
-diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c
-index b1f429c..3c89ed7 100644
---- a/src/lxc/lxc_container.c
-+++ b/src/lxc/lxc_container.c
-@@ -752,7 +752,6 @@ typedef struct {
-     const char *src;
-     const char *dst;
-     const char *type;
--    const char *opts;
-     int mflags;
- } virLXCBasicMountInfo;
- 
-@@ -763,16 +762,16 @@ static const virLXCBasicMountInfo lxcBasicMounts[] = {
-      * mount point in the main OS becomes readonly too which is not what
-      * we want. Hence some things have two entries here.
-      */
--    { "proc", "/proc", "proc", NULL, MS_NOSUID|MS_NOEXEC|MS_NODEV },
--    { "/proc/sys", "/proc/sys", NULL, NULL, MS_BIND },
--    { "/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 },
--    { "securityfs", "/sys/kernel/security", "securityfs", NULL, MS_NOSUID|MS_NOEXEC|MS_NODEV },
--    { "securityfs", "/sys/kernel/security", "securityfs", NULL, MS_BIND|MS_REMOUNT|MS_RDONLY },
-+    { "proc", "/proc", "proc", MS_NOSUID|MS_NOEXEC|MS_NODEV },
-+    { "/proc/sys", "/proc/sys", NULL, MS_BIND },
-+    { "/proc/sys", "/proc/sys", NULL, MS_BIND|MS_REMOUNT|MS_RDONLY },
-+    { "sysfs", "/sys", "sysfs", MS_NOSUID|MS_NOEXEC|MS_NODEV },
-+    { "sysfs", "/sys", "sysfs", MS_BIND|MS_REMOUNT|MS_RDONLY },
-+    { "securityfs", "/sys/kernel/security", "securityfs", MS_NOSUID|MS_NOEXEC|MS_NODEV },
-+    { "securityfs", "/sys/kernel/security", "securityfs", MS_BIND|MS_REMOUNT|MS_RDONLY },
- #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 },
-+    { SELINUX_MOUNT, SELINUX_MOUNT, "selinuxfs", MS_NOSUID|MS_NOEXEC|MS_NODEV },
-+    { SELINUX_MOUNT, SELINUX_MOUNT, NULL, MS_BIND|MS_REMOUNT|MS_RDONLY },
- #endif
- };
- 
-@@ -882,13 +881,13 @@ static int lxcContainerMountBasicFS(bool userns_enabled)
-             goto cleanup;
-         }
- 
--        VIR_DEBUG("Mount %s on %s type=%s flags=%x, opts=%s",
--                  srcpath, mnt->dst, mnt->type, mnt->mflags, mnt->opts);
--        if (mount(srcpath, mnt->dst, mnt->type, mnt->mflags, mnt->opts) < 0) {
-+        VIR_DEBUG("Mount %s on %s type=%s flags=%x",
-+                  srcpath, mnt->dst, mnt->type, mnt->mflags);
-+        if (mount(srcpath, mnt->dst, mnt->type, mnt->mflags, NULL) < 0) {
-             virReportSystemError(errno,
--                                 _("Failed to mount %s on %s type %s flags=%x opts=%s"),
-+                                 _("Failed to mount %s on %s type %s flags=%x"),
-                                  srcpath, mnt->dst, NULLSTR(mnt->type),
--                                 mnt->mflags, NULLSTR(mnt->opts));
-+                                 mnt->mflags);
-             goto cleanup;
-         }
-     }
--- 
-1.8.3.1
-
-
diff --git a/recipes-extended/libvirt/libvirt/0003-Remove-pointless-srcpath-variable-in-lxcContainerMountBasicFS.patch b/recipes-extended/libvirt/libvirt/0003-Remove-pointless-srcpath-variable-in-lxcContainerMountBasicFS.patch
deleted file mode 100644
index 5135fb01..00000000
--- a/recipes-extended/libvirt/libvirt/0003-Remove-pointless-srcpath-variable-in-lxcContainerMountBasicFS.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-From: "Daniel P. Berrange" <berrange@redhat.com>
-To: libvir-list@redhat.com
-Date: Mon,  7 Oct 2013 14:06:48 +0100
-Message-Id: <1381151211-27111-4-git-send-email-berrange@redhat.com>
-In-Reply-To: <1381151211-27111-1-git-send-email-berrange@redhat.com>
-References: <1381151211-27111-1-git-send-email-berrange@redhat.com>
-X-Scanned-By: MIMEDefang 2.68 on 10.5.11.25
-X-loop: libvir-list@redhat.com
-Subject: [libvirt] [PATCH 3/6] Remove pointless 'srcpath' variable in
-        lxcContainerMountBasicFS
-X-BeenThere: libvir-list@redhat.com
-X-Mailman-Version: 2.1.12
-Precedence: junk
-List-Id: Development discussions about the libvirt library & tools
-        <libvir-list.redhat.com>
-List-Unsubscribe: <https://www.redhat.com/mailman/options/libvir-list>,
-        <mailto:libvir-list-request@redhat.com?subject=unsubscribe>
-List-Archive: <https://www.redhat.com/archives/libvir-list>
-List-Post: <mailto:libvir-list@redhat.com>
-List-Help: <mailto:libvir-list-request@redhat.com?subject=help>
-List-Subscribe: <https://www.redhat.com/mailman/listinfo/libvir-list>,
-        <mailto:libvir-list-request@redhat.com?subject=subscribe>
-X-List-Received-Date: Mon, 07 Oct 2013 13:06:59 -0000
-
-From: "Daniel P. Berrange" <berrange@redhat.com>
-
-The 'srcpath' variable is initialized from 'mnt->src' and never
-changed thereafter. Some places continue to use 'mnt->src' and
-others use 'srcpath'. Remove the pointless 'srcpath' variable
-and use 'mnt->src' everywhere.
-
-Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
----
- src/lxc/lxc_container.c | 13 +++++--------
- 1 file changed, 5 insertions(+), 8 deletions(-)
-
-diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c
-index 3c89ed7..1b1c93b 100644
---- a/src/lxc/lxc_container.c
-+++ b/src/lxc/lxc_container.c
-@@ -853,16 +853,13 @@ static int lxcContainerMountBasicFS(bool userns_enabled)
- 
-     for (i = 0; i < ARRAY_CARDINALITY(lxcBasicMounts); i++) {
-         virLXCBasicMountInfo const *mnt = &lxcBasicMounts[i];
--        const char *srcpath = NULL;
- 
-         VIR_DEBUG("Processing %s -> %s",
-                   mnt->src, mnt->dst);
- 
--        srcpath = mnt->src;
--
-         /* Skip if mount doesn't exist in source */
--        if ((srcpath[0] == '/') &&
--            (access(srcpath, R_OK) < 0))
-+        if ((mnt->src[0] == '/') &&
-+            (access(mnt->src, R_OK) < 0))
-             continue;
- 
- #if WITH_SELINUX
-@@ -882,11 +879,11 @@ static int lxcContainerMountBasicFS(bool userns_enabled)
-         }
- 
-         VIR_DEBUG("Mount %s on %s type=%s flags=%x",
--                  srcpath, mnt->dst, mnt->type, mnt->mflags);
--        if (mount(srcpath, mnt->dst, mnt->type, mnt->mflags, NULL) < 0) {
-+                  mnt->src, mnt->dst, mnt->type, mnt->mflags);
-+        if (mount(mnt->src, mnt->dst, mnt->type, mnt->mflags, NULL) < 0) {
-             virReportSystemError(errno,
-                                  _("Failed to mount %s on %s type %s flags=%x"),
--                                 srcpath, mnt->dst, NULLSTR(mnt->type),
-+                                 mnt->src, mnt->dst, NULLSTR(mnt->type),
-                                  mnt->mflags);
-             goto cleanup;
-         }
--- 
-1.8.3.1
-
-
diff --git a/recipes-extended/libvirt/libvirt/0004-Remove-duplicate-entries-in-lxcBasicMounts-array.patch b/recipes-extended/libvirt/libvirt/0004-Remove-duplicate-entries-in-lxcBasicMounts-array.patch
deleted file mode 100644
index c02295e1..00000000
--- a/recipes-extended/libvirt/libvirt/0004-Remove-duplicate-entries-in-lxcBasicMounts-array.patch
+++ /dev/null
@@ -1,117 +0,0 @@
-From: "Daniel P. Berrange" <berrange@redhat.com>
-To: libvir-list@redhat.com
-Date: Mon,  7 Oct 2013 14:06:49 +0100
-Message-Id: <1381151211-27111-5-git-send-email-berrange@redhat.com>
-In-Reply-To: <1381151211-27111-1-git-send-email-berrange@redhat.com>
-References: <1381151211-27111-1-git-send-email-berrange@redhat.com>
-X-Scanned-By: MIMEDefang 2.68 on 10.5.11.25
-X-loop: libvir-list@redhat.com
-Subject: [libvirt] [PATCH 4/6] Remove duplicate entries in lxcBasicMounts
-        array
-X-BeenThere: libvir-list@redhat.com
-X-Mailman-Version: 2.1.12
-Precedence: junk
-List-Id: Development discussions about the libvirt library & tools
-        <libvir-list.redhat.com>
-List-Unsubscribe: <https://www.redhat.com/mailman/options/libvir-list>,
-        <mailto:libvir-list-request@redhat.com?subject=unsubscribe>
-List-Archive: <https://www.redhat.com/archives/libvir-list>
-List-Post: <mailto:libvir-list@redhat.com>
-List-Help: <mailto:libvir-list-request@redhat.com?subject=help>
-List-Subscribe: <https://www.redhat.com/mailman/listinfo/libvir-list>,
-        <mailto:libvir-list-request@redhat.com?subject=subscribe>
-X-List-Received-Date: Mon, 07 Oct 2013 13:07:00 -0000
-
-From: "Daniel P. Berrange" <berrange@redhat.com>
-
-Currently the lxcBasicMounts array has separate entries for
-most mounts, to reflect that we must do a separate mount
-operation to make mounts read-only. Remove the duplicate
-entries and instead set the MS_RDONLY flag against the main
-entry. Then change lxcContainerMountBasicFS to look for the
-MS_RDONLY flag, mask it out & do a separate bind mount.
-
-Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
----
- src/lxc/lxc_container.c | 44 +++++++++++++++++++++++++++-----------------
- 1 file changed, 27 insertions(+), 17 deletions(-)
-
-diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c
-index 1b1c93b..a7f71ef 100644
---- a/src/lxc/lxc_container.c
-+++ b/src/lxc/lxc_container.c
-@@ -756,22 +756,12 @@ typedef struct {
- } virLXCBasicMountInfo;
- 
- static const virLXCBasicMountInfo lxcBasicMounts[] = {
--    /* When we want to make a bind mount readonly, for unknown reasons,
--     * it is currently necessary to bind it once, and then remount the
--     * bind with the readonly flag. If this is not done, then the original
--     * mount point in the main OS becomes readonly too which is not what
--     * we want. Hence some things have two entries here.
--     */
-     { "proc", "/proc", "proc", MS_NOSUID|MS_NOEXEC|MS_NODEV },
--    { "/proc/sys", "/proc/sys", NULL, MS_BIND },
--    { "/proc/sys", "/proc/sys", NULL, MS_BIND|MS_REMOUNT|MS_RDONLY },
--    { "sysfs", "/sys", "sysfs", MS_NOSUID|MS_NOEXEC|MS_NODEV },
--    { "sysfs", "/sys", "sysfs", MS_BIND|MS_REMOUNT|MS_RDONLY },
--    { "securityfs", "/sys/kernel/security", "securityfs", MS_NOSUID|MS_NOEXEC|MS_NODEV },
--    { "securityfs", "/sys/kernel/security", "securityfs", MS_BIND|MS_REMOUNT|MS_RDONLY },
-+    { "/proc/sys", "/proc/sys", NULL, MS_BIND|MS_RDONLY },
-+    { "sysfs", "/sys", "sysfs", MS_NOSUID|MS_NOEXEC|MS_NODEV|MS_RDONLY },
-+    { "securityfs", "/sys/kernel/security", "securityfs", MS_NOSUID|MS_NOEXEC|MS_NODEV|MS_RDONLY },
- #if WITH_SELINUX
--    { SELINUX_MOUNT, SELINUX_MOUNT, "selinuxfs", MS_NOSUID|MS_NOEXEC|MS_NODEV },
--    { SELINUX_MOUNT, SELINUX_MOUNT, NULL, MS_BIND|MS_REMOUNT|MS_RDONLY },
-+    { SELINUX_MOUNT, SELINUX_MOUNT, "selinuxfs", MS_NOSUID|MS_NOEXEC|MS_NODEV|MS_RDONLY },
- #endif
- };
- 
-@@ -852,6 +842,7 @@ static int lxcContainerMountBasicFS(bool userns_enabled)
-     VIR_DEBUG("Mounting basic filesystems");
- 
-     for (i = 0; i < ARRAY_CARDINALITY(lxcBasicMounts); i++) {
-+        bool bindOverReadonly;
-         virLXCBasicMountInfo const *mnt = &lxcBasicMounts[i];
- 
-         VIR_DEBUG("Processing %s -> %s",
-@@ -878,13 +869,32 @@ static int lxcContainerMountBasicFS(bool userns_enabled)
-             goto cleanup;
-         }
- 
-+        /*
-+         * We can't immediately set the MS_RDONLY flag when mounting filesystems
-+         * because (in at least some kernel versions) this will propagate back
-+         * to the original mount in the host OS, turning it readonly too. This
-+         * We mount the filesystem in read-write mode initially, and then do a
-+         * separate read-only bind mount on top of that.
-+         */
-+        bindOverReadonly = !!(mnt->mflags & MS_RDONLY);
-+
-         VIR_DEBUG("Mount %s on %s type=%s flags=%x",
--                  mnt->src, mnt->dst, mnt->type, mnt->mflags);
--        if (mount(mnt->src, mnt->dst, mnt->type, mnt->mflags, NULL) < 0) {
-+                  mnt->src, mnt->dst, mnt->type, mnt->mflags & ~MS_RDONLY);
-+        if (mount(mnt->src, mnt->dst, mnt->type, mnt->mflags & ~MS_RDONLY, NULL) < 0) {
-             virReportSystemError(errno,
-                                  _("Failed to mount %s on %s type %s flags=%x"),
-                                  mnt->src, mnt->dst, NULLSTR(mnt->type),
--                                 mnt->mflags);
-+                                 mnt->mflags & ~MS_RDONLY);
-+            goto cleanup;
-+        }
-+
-+        if (bindOverReadonly &&
-+            mount(mnt->src, mnt->dst, NULL,
-+                  MS_BIND|MS_REMOUNT|MS_RDONLY, NULL) < 0) {
-+            virReportSystemError(errno,
-+                                 _("Failed to re-mount %s on %s flags=%x"),
-+                                 mnt->src, mnt->dst,
-+                                 MS_BIND|MS_REMOUNT|MS_RDONLY);
-             goto cleanup;
-         }
-     }
--- 
-1.8.3.1
-
-
diff --git a/recipes-extended/libvirt/libvirt/0005-Add-flag-to-lxcBasicMounts-to-control-use-in-user-namespaces.patch b/recipes-extended/libvirt/libvirt/0005-Add-flag-to-lxcBasicMounts-to-control-use-in-user-namespaces.patch
deleted file mode 100644
index c9e0afc7..00000000
--- a/recipes-extended/libvirt/libvirt/0005-Add-flag-to-lxcBasicMounts-to-control-use-in-user-namespaces.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-From: "Daniel P. Berrange" <berrange@redhat.com>
-To: libvir-list@redhat.com
-Date: Mon,  7 Oct 2013 14:06:50 +0100
-Message-Id: <1381151211-27111-6-git-send-email-berrange@redhat.com>
-In-Reply-To: <1381151211-27111-1-git-send-email-berrange@redhat.com>
-References: <1381151211-27111-1-git-send-email-berrange@redhat.com>
-X-Scanned-By: MIMEDefang 2.68 on 10.5.11.25
-X-loop: libvir-list@redhat.com
-Subject: [libvirt] [PATCH 5/6] Add flag to lxcBasicMounts to control use in
-        user namespaces
-X-BeenThere: libvir-list@redhat.com
-X-Mailman-Version: 2.1.12
-Precedence: junk
-List-Id: Development discussions about the libvirt library & tools
-        <libvir-list.redhat.com>
-List-Unsubscribe: <https://www.redhat.com/mailman/options/libvir-list>,
-        <mailto:libvir-list-request@redhat.com?subject=unsubscribe>
-List-Archive: <https://www.redhat.com/archives/libvir-list>
-List-Post: <mailto:libvir-list@redhat.com>
-List-Help: <mailto:libvir-list-request@redhat.com?subject=help>
-List-Subscribe: <https://www.redhat.com/mailman/listinfo/libvir-list>,
-        <mailto:libvir-list-request@redhat.com?subject=subscribe>
-X-List-Received-Date: Mon, 07 Oct 2013 13:07:02 -0000
-
-From: "Daniel P. Berrange" <berrange@redhat.com>
-
-Some mounts must be skipped if running inside a user namespace,
-since the kernel forbids their use. Instead of strcmp'ing the
-filesystem type in the body of the loop, set an explicit flag
-in the lxcBasicMounts table.
-
-Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
----
- src/lxc/lxc_container.c | 17 ++++++++++-------
- 1 file changed, 10 insertions(+), 7 deletions(-)
-
-diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c
-index a7f71ef..05190bf 100644
---- a/src/lxc/lxc_container.c
-+++ b/src/lxc/lxc_container.c
-@@ -753,15 +753,16 @@ typedef struct {
-     const char *dst;
-     const char *type;
-     int mflags;
-+    bool skipUserNS;
- } virLXCBasicMountInfo;
- 
- static const virLXCBasicMountInfo lxcBasicMounts[] = {
--    { "proc", "/proc", "proc", MS_NOSUID|MS_NOEXEC|MS_NODEV },
--    { "/proc/sys", "/proc/sys", NULL, MS_BIND|MS_RDONLY },
--    { "sysfs", "/sys", "sysfs", MS_NOSUID|MS_NOEXEC|MS_NODEV|MS_RDONLY },
--    { "securityfs", "/sys/kernel/security", "securityfs", MS_NOSUID|MS_NOEXEC|MS_NODEV|MS_RDONLY },
-+    { "proc", "/proc", "proc", MS_NOSUID|MS_NOEXEC|MS_NODEV, false },
-+    { "/proc/sys", "/proc/sys", NULL, MS_BIND|MS_RDONLY, false },
-+    { "sysfs", "/sys", "sysfs", MS_NOSUID|MS_NOEXEC|MS_NODEV|MS_RDONLY, false },
-+    { "securityfs", "/sys/kernel/security", "securityfs", MS_NOSUID|MS_NOEXEC|MS_NODEV|MS_RDONLY, true },
- #if WITH_SELINUX
--    { SELINUX_MOUNT, SELINUX_MOUNT, "selinuxfs", MS_NOSUID|MS_NOEXEC|MS_NODEV|MS_RDONLY },
-+    { SELINUX_MOUNT, SELINUX_MOUNT, "selinuxfs", MS_NOSUID|MS_NOEXEC|MS_NODEV|MS_RDONLY, true },
- #endif
- };
- 
-@@ -855,12 +856,14 @@ static int lxcContainerMountBasicFS(bool userns_enabled)
- 
- #if WITH_SELINUX
-         if (STREQ(mnt->src, SELINUX_MOUNT) &&
--            (!is_selinux_enabled() || userns_enabled))
-+            !is_selinux_enabled())
-             continue;
- #endif
- 
--        if (STREQ(mnt->src, "securityfs") && userns_enabled)
-+        if (mnt->skipUserNS && userns_enabled) {
-+            VIR_DEBUG("Skipping due to user ns enablement");
-             continue;
-+        }
- 
-         if (virFileMakePath(mnt->dst) < 0) {
-             virReportSystemError(errno,
--- 
-1.8.3.1
-
-
diff --git a/recipes-extended/libvirt/libvirt/0006-Skip-any-files-which-are-not-mounted-on-the-host.patch b/recipes-extended/libvirt/libvirt/0006-Skip-any-files-which-are-not-mounted-on-the-host.patch
deleted file mode 100644
index a0ac4146..00000000
--- a/recipes-extended/libvirt/libvirt/0006-Skip-any-files-which-are-not-mounted-on-the-host.patch
+++ /dev/null
@@ -1,106 +0,0 @@
-From: "Daniel P. Berrange" <berrange@redhat.com>
-To: libvir-list@redhat.com
-Date: Mon,  7 Oct 2013 14:06:51 +0100
-Message-Id: <1381151211-27111-7-git-send-email-berrange@redhat.com>
-In-Reply-To: <1381151211-27111-1-git-send-email-berrange@redhat.com>
-References: <1381151211-27111-1-git-send-email-berrange@redhat.com>
-X-Scanned-By: MIMEDefang 2.68 on 10.5.11.25
-X-loop: libvir-list@redhat.com
-Subject: [libvirt] [PATCH 6/6] Skip any files which are not mounted on the
-        host
-X-BeenThere: libvir-list@redhat.com
-X-Mailman-Version: 2.1.12
-Precedence: junk
-List-Id: Development discussions about the libvirt library & tools
-        <libvir-list.redhat.com>
-List-Unsubscribe: <https://www.redhat.com/mailman/options/libvir-list>,
-        <mailto:libvir-list-request@redhat.com?subject=unsubscribe>
-List-Archive: <https://www.redhat.com/archives/libvir-list>
-List-Post: <mailto:libvir-list@redhat.com>
-List-Help: <mailto:libvir-list-request@redhat.com?subject=help>
-List-Subscribe: <https://www.redhat.com/mailman/listinfo/libvir-list>,
-        <mailto:libvir-list-request@redhat.com?subject=subscribe>
-X-List-Received-Date: Mon, 07 Oct 2013 13:07:03 -0000
-
-From: "Daniel P. Berrange" <berrange@redhat.com>
-
-Currently the LXC container tries to skip selinux/securityfs
-mounts if the directory does not exist in the filesystem,
-or if SELinux is disabled.
-
-The former check is flawed because the /sys/fs/selinux
-or /sys/kernel/securityfs directories may exist in sysfs
-even if the mount type is disabled. Instead of just doing
-an access() check, use an virFileIsMounted() to see if
-the FS is actually present in the host OS. This also
-avoids the need to check is_selinux_enabled().
-
-Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
----
- src/lxc/lxc_container.c | 37 +++++++++++++++++++++++--------------
- 1 file changed, 23 insertions(+), 14 deletions(-)
-
-diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c
-index 05190bf..4ec7b67 100644
---- a/src/lxc/lxc_container.c
-+++ b/src/lxc/lxc_container.c
-@@ -754,15 +754,16 @@ typedef struct {
-     const char *type;
-     int mflags;
-     bool skipUserNS;
-+    bool skipUnmounted;
- } virLXCBasicMountInfo;
- 
- static const virLXCBasicMountInfo lxcBasicMounts[] = {
--    { "proc", "/proc", "proc", MS_NOSUID|MS_NOEXEC|MS_NODEV, false },
--    { "/proc/sys", "/proc/sys", NULL, MS_BIND|MS_RDONLY, false },
--    { "sysfs", "/sys", "sysfs", MS_NOSUID|MS_NOEXEC|MS_NODEV|MS_RDONLY, false },
--    { "securityfs", "/sys/kernel/security", "securityfs", MS_NOSUID|MS_NOEXEC|MS_NODEV|MS_RDONLY, true },
-+    { "proc", "/proc", "proc", MS_NOSUID|MS_NOEXEC|MS_NODEV, false, false },
-+    { "/proc/sys", "/proc/sys", NULL, MS_BIND|MS_RDONLY, false, false },
-+    { "sysfs", "/sys", "sysfs", MS_NOSUID|MS_NOEXEC|MS_NODEV|MS_RDONLY, false, false },
-+    { "securityfs", "/sys/kernel/security", "securityfs", MS_NOSUID|MS_NOEXEC|MS_NODEV|MS_RDONLY, true, true },
- #if WITH_SELINUX
--    { SELINUX_MOUNT, SELINUX_MOUNT, "selinuxfs", MS_NOSUID|MS_NOEXEC|MS_NODEV|MS_RDONLY, true },
-+    { SELINUX_MOUNT, SELINUX_MOUNT, "selinuxfs", MS_NOSUID|MS_NOEXEC|MS_NODEV|MS_RDONLY, true, true },
- #endif
- };
- 
-@@ -849,16 +850,24 @@ static int lxcContainerMountBasicFS(bool userns_enabled)
-         VIR_DEBUG("Processing %s -> %s",
-                   mnt->src, mnt->dst);
- 
--        /* Skip if mount doesn't exist in source */
--        if ((mnt->src[0] == '/') &&
--            (access(mnt->src, R_OK) < 0))
--            continue;
-+        if (mnt->skipUnmounted) {
-+            char *hostdir;
-+            int ret;
- 
--#if WITH_SELINUX
--        if (STREQ(mnt->src, SELINUX_MOUNT) &&
--            !is_selinux_enabled())
--            continue;
--#endif
-+            if (virAsprintf(&hostdir, "/.oldroot%s", mnt->dst) < 0)
-+                goto cleanup;
-+
-+            ret = virFileIsMountPoint(hostdir);
-+            VIR_FREE(hostdir);
-+            if (ret < 0)
-+                goto cleanup;
-+
-+            if (ret == 0) {
-+                VIR_DEBUG("Skipping '%s' which isn't mounted in host",
-+                          mnt->dst);
-+                continue;
-+            }
-+        }
- 
-         if (mnt->skipUserNS && userns_enabled) {
-             VIR_DEBUG("Skipping due to user ns enablement");
--- 
-1.8.3.1
-
-
diff --git a/recipes-extended/libvirt/libvirt/LXC-Don-t-mount-securityfs-when-user-namespace-enabl.patch b/recipes-extended/libvirt/libvirt/LXC-Don-t-mount-securityfs-when-user-namespace-enabl.patch
deleted file mode 100644
index 40f8dd9b..00000000
--- a/recipes-extended/libvirt/libvirt/LXC-Don-t-mount-securityfs-when-user-namespace-enabl.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From 1583dfda7c4e5ad71efe0615c06e5676528d8203 Mon Sep 17 00:00:00 2001
-From: Gao feng <gaofeng@cn.fujitsu.com>
-Date: Thu, 5 Sep 2013 11:50:40 +0100
-Subject: [PATCH] LXC: Don't mount securityfs when user namespace enabled
-
-commit 1583dfda7c4e5ad71efe0615c06e5676528d8203 from
-git://libvirt.org/libvirt.git
-
-Right now, securityfs is disallowed to be mounted in non-initial
-user namespace, so we must avoid trying to mount securityfs in
-a container which has user namespace enabled.
-
-Signed-off-by: Gao feng <gaofeng@cn.fujitsu.com>
----
- src/lxc/lxc_container.c | 7 +++++--
- 1 file changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c
-index 8abaea0..c41ab40 100644
---- a/src/lxc/lxc_container.c
-+++ b/src/lxc/lxc_container.c
-@@ -750,7 +750,7 @@ err:
- }
- 
- 
--static int lxcContainerMountBasicFS(void)
-+static int lxcContainerMountBasicFS(bool userns_enabled)
- {
-     const struct {
-         const char *src;
-@@ -801,6 +801,9 @@ static int lxcContainerMountBasicFS(void)
-             continue;
- #endif
- 
-+        if (STREQ(mnts[i].src, "securityfs") && userns_enabled)
-+            continue;
-+
-         if (virFileMakePath(mnts[i].dst) < 0) {
-             virReportSystemError(errno,
-                                  _("Failed to mkdir %s"),
-@@ -1530,7 +1533,7 @@ static int lxcContainerSetupPivotRoot(virDomainDefPtr vmDef,
-         goto cleanup;
- 
-     /* Mounts the core /proc, /sys, etc filesystems */
--    if (lxcContainerMountBasicFS() < 0)
-+    if (lxcContainerMountBasicFS(vmDef->idmap.nuidmap) < 0)
-         goto cleanup;
- 
-     /* Mounts /proc/meminfo etc sysinfo */
--- 
-1.8.1.2
-
diff --git a/recipes-extended/libvirt/libvirt/LXC-don-t-try-to-mount-selinux-filesystem-when-user-.patch b/recipes-extended/libvirt/libvirt/LXC-don-t-try-to-mount-selinux-filesystem-when-user-.patch
deleted file mode 100644
index f0582931..00000000
--- a/recipes-extended/libvirt/libvirt/LXC-don-t-try-to-mount-selinux-filesystem-when-user-.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 1c7037cff42dde35913dde533b31ee1da8c2d6e0 Mon Sep 17 00:00:00 2001
-From: Gao feng <gaofeng@cn.fujitsu.com>
-Date: Thu, 12 Sep 2013 11:51:31 +0800
-Subject: [PATCH] LXC: don't try to mount selinux filesystem when user namespace enabled
-
-commit 1c7037cff42dde35913dde533b31ee1da8c2d6e0 from
-git://libvirt.org/libvirt.git
-                                
-Right now we mount selinuxfs even user namespace is enabled and
-ignore the error. But we shouldn't ignore these errors when user
-namespace is not enabled.
-
-This patch skips mounting selinuxfs when user namespace enabled.
-
-Signed-off-by: Gao feng <gaofeng@cn.fujitsu.com>
----
- src/lxc/lxc_container.c | 8 +-------
- 1 file changed, 1 insertion(+), 7 deletions(-)
-
-diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c
-index ddc6e3d..a979452 100644
---- a/src/lxc/lxc_container.c
-+++ b/src/lxc/lxc_container.c
-@@ -868,7 +868,7 @@ static int lxcContainerMountBasicFS(bool userns_enabled)
- 
- #if WITH_SELINUX
-         if (STREQ(mnt->src, SELINUX_MOUNT) &&
--            !is_selinux_enabled())
-+            (!is_selinux_enabled() || userns_enabled))
-             continue;
- #endif
- 
-@@ -885,12 +885,6 @@ static int lxcContainerMountBasicFS(bool userns_enabled)
-         VIR_DEBUG("Mount %s on %s type=%s flags=%x, opts=%s",
-                   srcpath, mnt->dst, mnt->type, mnt->mflags, mnt->opts);
-         if (mount(srcpath, mnt->dst, mnt->type, mnt->mflags, mnt->opts) < 0) {
--#if WITH_SELINUX
--            if (STREQ(mnt->src, SELINUX_MOUNT) &&
--                (errno == EINVAL || errno == EPERM))
--                continue;
--#endif
--
-             virReportSystemError(errno,
-                                  _("Failed to mount %s on %s type %s flags=%x opts=%s"),
-                                  srcpath, mnt->dst, NULLSTR(mnt->type),
--- 
-1.8.1.2
-
diff --git a/recipes-extended/libvirt/libvirt/Move-array-of-mounts-out-of-lxcContainerMountBasicFS.patch b/recipes-extended/libvirt/libvirt/Move-array-of-mounts-out-of-lxcContainerMountBasicFS.patch
deleted file mode 100644
index 2c7b0eed..00000000
--- a/recipes-extended/libvirt/libvirt/Move-array-of-mounts-out-of-lxcContainerMountBasicFS.patch
+++ /dev/null
@@ -1,147 +0,0 @@
-From f27f5f7eddf531159d791a2b5ac438ca011b5f26 Mon Sep 17 00:00:00 2001
-From: "Daniel P. Berrange" <berrange@redhat.com>
-Date: Tue, 10 Sep 2013 13:35:12 +0100
-Subject: [PATCH] Move array of mounts out of lxcContainerMountBasicFS
-
-commit f27f5f7eddf531159d791a2b5ac438ca011b5f26 from
-git://libvirt.org/libvirt.git
-
-Move the array of basic mounts out of the lxcContainerMountBasicFS
-function, to a global variable. This is to allow it to be referenced
-by other methods wanting to know what the basic mount paths are.
-
-Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
----
- src/lxc/lxc_container.c | 79 ++++++++++++++++++++++++++-----------------------
- 1 file changed, 42 insertions(+), 37 deletions(-)
-
-diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c
-index 661ac52..6f241d3 100644
---- a/src/lxc/lxc_container.c
-+++ b/src/lxc/lxc_container.c
-@@ -750,45 +750,50 @@ err:
- }
- 
- 
--static int lxcContainerMountBasicFS(bool userns_enabled)
--{
--    const struct {
--        const char *src;
--        const char *dst;
--        const char *type;
--        const char *opts;
--        int mflags;
--    } mnts[] = {
--        /* When we want to make a bind mount readonly, for unknown reasons,
--         * it is currently necessary to bind it once, and then remount the
--         * bind with the readonly flag. If this is not done, then the original
--         * mount point in the main OS becomes readonly too which is not what
--         * we want. Hence some things have two entries here.
--         */
--        { "proc", "/proc", "proc", NULL, MS_NOSUID|MS_NOEXEC|MS_NODEV },
--        { "/proc/sys", "/proc/sys", NULL, NULL, MS_BIND },
--        { "/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 },
--        { "securityfs", "/sys/kernel/security", "securityfs", NULL, MS_NOSUID|MS_NOEXEC|MS_NODEV },
--        { "securityfs", "/sys/kernel/security", "securityfs", NULL, MS_BIND|MS_REMOUNT|MS_RDONLY },
-+typedef struct {
-+    const char *src;
-+    const char *dst;
-+    const char *type;
-+    const char *opts;
-+    int mflags;
-+} virLXCBasicMountInfo;
-+
-+static const virLXCBasicMountInfo lxcBasicMounts[] = {
-+    /* When we want to make a bind mount readonly, for unknown reasons,
-+     * it is currently necessary to bind it once, and then remount the
-+     * bind with the readonly flag. If this is not done, then the original
-+     * mount point in the main OS becomes readonly too which is not what
-+     * we want. Hence some things have two entries here.
-+     */
-+    { "proc", "/proc", "proc", NULL, MS_NOSUID|MS_NOEXEC|MS_NODEV },
-+    { "/proc/sys", "/proc/sys", NULL, NULL, MS_BIND },
-+    { "/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 },
-+    { "securityfs", "/sys/kernel/security", "securityfs", NULL, MS_NOSUID|MS_NOEXEC|MS_NODEV },
-+    { "securityfs", "/sys/kernel/security", "securityfs", NULL, MS_BIND|MS_REMOUNT|MS_RDONLY },
- #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 },
-+    { SELINUX_MOUNT, SELINUX_MOUNT, "selinuxfs", NULL, MS_NOSUID|MS_NOEXEC|MS_NODEV },
-+    { SELINUX_MOUNT, SELINUX_MOUNT, NULL, NULL, MS_BIND|MS_REMOUNT|MS_RDONLY },
- #endif
--    };
-+};
-+
-+
-+static int lxcContainerMountBasicFS(bool userns_enabled)
-+{
-     size_t i;
-     int rc = -1;
- 
-     VIR_DEBUG("Mounting basic filesystems");
- 
--    for (i = 0; i < ARRAY_CARDINALITY(mnts); i++) {
-+    for (i = 0; i < ARRAY_CARDINALITY(lxcBasicMounts); i++) {
-+        virLXCBasicMountInfo const *mnt = &lxcBasicMounts[i];
-         const char *srcpath = NULL;
- 
-         VIR_DEBUG("Processing %s -> %s",
--                  mnts[i].src, mnts[i].dst);
-+                  mnt->src, mnt->dst);
- 
--        srcpath = mnts[i].src;
-+        srcpath = mnt->src;
- 
-         /* Skip if mount doesn't exist in source */
-         if ((srcpath[0] == '/') &&
-@@ -796,34 +801,34 @@ static int lxcContainerMountBasicFS(bool userns_enabled)
-             continue;
- 
- #if WITH_SELINUX
--        if (STREQ(mnts[i].src, SELINUX_MOUNT) &&
-+        if (STREQ(mnt->src, SELINUX_MOUNT) &&
-             !is_selinux_enabled())
-             continue;
- #endif
- 
--        if (STREQ(mnts[i].src, "securityfs") && userns_enabled)
-+        if (STREQ(mnt->src, "securityfs") && userns_enabled)
-             continue;
- 
--        if (virFileMakePath(mnts[i].dst) < 0) {
-+        if (virFileMakePath(mnt->dst) < 0) {
-             virReportSystemError(errno,
-                                  _("Failed to mkdir %s"),
--                                 mnts[i].src);
-+                                 mnt->src);
-             goto cleanup;
-         }
- 
-         VIR_DEBUG("Mount %s on %s type=%s flags=%x, opts=%s",
--                  srcpath, mnts[i].dst, mnts[i].type, mnts[i].mflags, mnts[i].opts);
--        if (mount(srcpath, mnts[i].dst, mnts[i].type, mnts[i].mflags, mnts[i].opts) < 0) {
-+                  srcpath, mnt->dst, mnt->type, mnt->mflags, mnt->opts);
-+        if (mount(srcpath, mnt->dst, mnt->type, mnt->mflags, mnt->opts) < 0) {
- #if WITH_SELINUX
--            if (STREQ(mnts[i].src, SELINUX_MOUNT) &&
-+            if (STREQ(mnt->src, SELINUX_MOUNT) &&
-                 (errno == EINVAL || errno == EPERM))
-                 continue;
- #endif
- 
-             virReportSystemError(errno,
-                                  _("Failed to mount %s on %s type %s flags=%x opts=%s"),
--                                 srcpath, mnts[i].dst, NULLSTR(mnts[i].type),
--                                 mnts[i].mflags, NULLSTR(mnts[i].opts));
-+                                 srcpath, mnt->dst, NULLSTR(mnt->type),
-+                                 mnt->mflags, NULLSTR(mnt->opts));
-             goto cleanup;
-         }
-     }
--- 
-1.8.1.2
-
diff --git a/recipes-extended/libvirt/libvirt/libvirt-allow-location-of-python-on-the-target-to-be.patch b/recipes-extended/libvirt/libvirt/libvirt-allow-location-of-python-on-the-target-to-be.patch
deleted file mode 100644
index 6fff8ea0..00000000
--- a/recipes-extended/libvirt/libvirt/libvirt-allow-location-of-python-on-the-target-to-be.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 44e1046619457c709a0bb4efaa4ad983d9b81cbc Mon Sep 17 00:00:00 2001
-From: Mark Asselstine <mark.asselstine@windriver.com>
-Date: Mon, 12 Aug 2013 16:22:56 -0400
-Subject: [PATCH] libvirt: allow location of python on the target to be
- specified
-
-Allow TARGET_PYTHON to be passed to configure. TARGET_PYTHON will be
-passed to generator.py where it is used to create the sh.bang line at
-the top of various generated scripts. This allows separation between
-what is used to build vs. install. The default behavior is to leave
-TARGET_PYTHON == PYTHON unless TARGET_PYTHON is passed to configure.
-
-Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com>
----
- configure.ac       | 8 ++++++++
- python/Makefile.am | 2 +-
- 2 files changed, 9 insertions(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 35a5d76..c1a27f8 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1965,6 +1965,14 @@ AM_CONDITIONAL([WITH_PYTHON], [test "$with_python" = "yes"])
- AC_SUBST([PYTHON_VERSION])
- AC_SUBST([PYTHON_INCLUDES])
- 
-+if test "$TARGET_PYTHON"; then
-+    TARGET_PYTHON=$TARGET_PYTHON
-+else
-+    TARGET_PYTHON=$PYTHON
-+fi
-+AC_SUBST(TARGET_PYTHON)
-+
-+
- dnl Allow perl overrides
- AC_PATH_PROG([PERL], [perl])
- 
-diff --git a/python/Makefile.am b/python/Makefile.am
-index 7eb42c6..8b9b480 100644
---- a/python/Makefile.am
-+++ b/python/Makefile.am
-@@ -131,7 +131,7 @@ $(GENERATE).stamp: $(srcdir)/$(GENERATE) \
-                    $(QEMU_API_DESC) \
-                    $(LXC_API_DESC) \
-                    $(CLASSES_EXTRA)
--       $(AM_V_GEN)$(PYTHON) $(srcdir)/$(GENERATE) $(PYTHON) && \
-+       $(AM_V_GEN)$(PYTHON) $(srcdir)/$(GENERATE) $(TARGET_PYTHON) && \
-        touch $@
- 
- $(GENERATED) $(QEMU_GENERATED) $(LXC_GENERATED): $(GENERATE).stamp
--- 
-1.8.1.2
-
diff --git a/recipes-extended/libvirt/libvirt_1.1.2.bb b/recipes-extended/libvirt/libvirt_1.2.0.bb
index 598d7ef2..80f06a23 100644
--- a/recipes-extended/libvirt/libvirt_1.1.2.bb
+++ b/recipes-extended/libvirt/libvirt_1.2.0.bb
@@ -21,20 +21,11 @@ RCONFLICTS_${PN}_libvirtd = "connman"
 
 SRC_URI = "http://libvirt.org/sources/libvirt-${PV}.tar.gz \
            file://tools-add-libvirt-net-rpc-to-virt-host-validate-when.patch \
-           file://LXC-Don-t-mount-securityfs-when-user-namespace-enabl.patch \
-           file://Move-array-of-mounts-out-of-lxcContainerMountBasicFS.patch \
-           file://LXC-don-t-try-to-mount-selinux-filesystem-when-user-.patch \
-           file://0001-Add-virFileIsMountPoint-function.patch \
-           file://0002-Remove-unused-opts-field-from-LXC-basic.patch \
-           file://0003-Remove-pointless-srcpath-variable-in-lxcContainerMountBasicFS.patch \
-           file://0004-Remove-duplicate-entries-in-lxcBasicMounts-array.patch \
-           file://0005-Add-flag-to-lxcBasicMounts-to-control-use-in-user-namespaces.patch \
-           file://0006-Skip-any-files-which-are-not-mounted-on-the-host.patch \
            file://libvirtd.sh \
            file://libvirtd.conf"
 
-SRC_URI[md5sum] = "1835bbfa492099bce12e2934870e5611"
-SRC_URI[sha256sum] = "16648af54d3e162f5cc5445d970ec29a0bd55b1dbcb568a05533c4c2f25965e3"
+SRC_URI[md5sum] = "f74f78059def4e68d69b975ad6e6c3e2"
+SRC_URI[sha256sum] = "a8e578ae7861db2ac5f454073293d2ef3229fd3f6c4f9029101763244db22ddd"
 
 inherit autotools gettext update-rc.d