diff -Nru libvirt-1.2.12/debian/changelog libvirt-1.2.12/debian/changelog
--- libvirt-1.2.12/debian/changelog	2015-02-03 20:18:07.000000000 +0000
+++ libvirt-1.2.12/debian/changelog	2015-02-04 14:24:27.000000000 +0000
@@ -1,4 +1,4 @@
-libvirt (1.2.12-0ubuntu1) vivid; urgency=medium
+libvirt (1.2.12-0ubuntu1.1) vivid; urgency=medium
 
   * New upstream release
   * Rediffed patches:
diff -Nru libvirt-1.2.12/debian/patches/fix-ubuntu-xen-qemu-dm-path.patch libvirt-1.2.12/debian/patches/fix-ubuntu-xen-qemu-dm-path.patch
--- libvirt-1.2.12/debian/patches/fix-ubuntu-xen-qemu-dm-path.patch	2013-11-14 14:39:47.000000000 +0000
+++ libvirt-1.2.12/debian/patches/fix-ubuntu-xen-qemu-dm-path.patch	2015-02-04 15:39:29.000000000 +0000
@@ -3,14 +3,29 @@
  carrying but did just replace absolute paths by other absolute
  ones which broke again.
 Forwarded: not-needed
-Origin: vendor, https://launchpadlibrarian.net/117536009/fix-ubuntu-xen-qemu-dm-path.patch
-Bug-Ubuntu: http://bugs.launchpad.net/bugs/914788
-Author: George Dunlap <george.dunlap@eu.citrix.com>
-Index: libvirt-1.1.4/src/xen/xen_hypervisor.c
-===================================================================
---- libvirt-1.1.4.orig/src/xen/xen_hypervisor.c	2013-11-12 11:48:39.183866993 -0600
-+++ libvirt-1.1.4/src/xen/xen_hypervisor.c	2013-11-12 11:48:39.163866993 -0600
-@@ -2140,10 +2140,10 @@
+diff -Naurp libvirt-1.2.12.orig/docs/schemas/capability.rng libvirt-1.2.12/docs/schemas/capability.rng
+--- libvirt-1.2.12.orig/docs/schemas/capability.rng	2015-01-23 06:46:24.000000000 -0500
++++ libvirt-1.2.12/docs/schemas/capability.rng	2015-02-04 10:20:02.043370380 -0500
+@@ -293,13 +293,13 @@
+ 
+   <define name='emulator'>
+     <element name='emulator'>
+-      <ref name='absFilePath'/>
++      <ref name='filePath'/>
+     </element>
+   </define>
+ 
+   <define name='loader'>
+     <element name='loader'>
+-      <ref name='absFilePath'/>
++      <ref name='filePath'/>
+     </element>
+   </define>
+ 
+diff -Naurp libvirt-1.2.12.orig/src/xen/xen_hypervisor.c libvirt-1.2.12/src/xen/xen_hypervisor.c
+--- libvirt-1.2.12.orig/src/xen/xen_hypervisor.c	2015-01-23 06:46:24.000000000 -0500
++++ libvirt-1.2.12/src/xen/xen_hypervisor.c	2015-02-04 10:20:02.043370380 -0500
+@@ -2145,10 +2145,10 @@ xenHypervisorBuildCapabilities(virConnec
                                               guest_archs[i].hvm ? "hvm" : "xen",
                                               guest_archs[i].arch,
                                               (hostarch == VIR_ARCH_X86_64 ?
@@ -19,50 +34,61 @@
 +                                              "qemu-dm" :
 +                                              "qemu-dm"),
                                               (guest_archs[i].hvm ?
--                                              "/usr/lib/xen-default/boot/hvmloader" :
+-                                              "/usr/lib/xen/boot/hvmloader" :
 +                                              "hvmloader" :
                                                NULL),
                                               1,
                                               machines)) == NULL) {
-Index: libvirt-1.1.4/tests/xencapsdata/xen-x86_64-hvm.xml
-===================================================================
---- libvirt-1.1.4.orig/tests/xencapsdata/xen-x86_64-hvm.xml	2013-11-12 11:48:39.183866993 -0600
-+++ libvirt-1.1.4/tests/xencapsdata/xen-x86_64-hvm.xml	2013-11-12 11:48:39.163866993 -0600
+diff -Naurp libvirt-1.2.12.orig/tests/xencapsdata/xen-i686-pae-hvm.xml libvirt-1.2.12/tests/xencapsdata/xen-i686-pae-hvm.xml
+--- libvirt-1.2.12.orig/tests/xencapsdata/xen-i686-pae-hvm.xml	2015-01-23 06:46:24.000000000 -0500
++++ libvirt-1.2.12/tests/xencapsdata/xen-i686-pae-hvm.xml	2015-02-04 10:20:02.043370380 -0500
 @@ -20,7 +20,7 @@
      <os_type>xen</os_type>
-     <arch name='x86_64'>
-       <wordsize>64</wordsize>
--      <emulator>/usr/lib64/xen/bin/qemu-dm</emulator>
+     <arch name='i686'>
+       <wordsize>32</wordsize>
+-      <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
 +      <emulator>qemu-dm</emulator>
        <machine>xenpv</machine>
-       <domain type='xen'>
-       </domain>
-@@ -31,8 +31,8 @@
+       <domain type='xen'/>
+     </arch>
+@@ -33,8 +33,8 @@
      <os_type>hvm</os_type>
      <arch name='i686'>
        <wordsize>32</wordsize>
--      <emulator>/usr/lib64/xen/bin/qemu-dm</emulator>
--      <loader>/usr/lib/xen-default/boot/hvmloader</loader>
+-      <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
+-      <loader>/usr/lib/xen/boot/hvmloader</loader>
 +      <emulator>qemu-dm</emulator>
 +      <loader>hvmloader</loader>
        <machine>xenfv</machine>
-       <domain type='xen'>
-       </domain>
-@@ -49,8 +49,8 @@
-     <os_type>hvm</os_type>
-     <arch name='x86_64'>
-       <wordsize>64</wordsize>
--      <emulator>/usr/lib64/xen/bin/qemu-dm</emulator>
--      <loader>/usr/lib/xen-default/boot/hvmloader</loader>
+       <domain type='xen'/>
+     </arch>
+diff -Naurp libvirt-1.2.12.orig/tests/xencapsdata/xen-i686-pae.xml libvirt-1.2.12/tests/xencapsdata/xen-i686-pae.xml
+--- libvirt-1.2.12.orig/tests/xencapsdata/xen-i686-pae.xml	2015-01-23 06:46:24.000000000 -0500
++++ libvirt-1.2.12/tests/xencapsdata/xen-i686-pae.xml	2015-02-04 10:20:02.047370380 -0500
+@@ -20,7 +20,7 @@
+     <os_type>xen</os_type>
+     <arch name='i686'>
+       <wordsize>32</wordsize>
+-      <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
 +      <emulator>qemu-dm</emulator>
-+      <loader>hvmloader</loader>
-       <machine>xenfv</machine>
-       <domain type='xen'>
-       </domain>
-Index: libvirt-1.1.4/tests/xencapsdata/xen-ia64-be-hvm.xml
-===================================================================
---- libvirt-1.1.4.orig/tests/xencapsdata/xen-ia64-be-hvm.xml	2013-11-12 11:48:39.183866993 -0600
-+++ libvirt-1.1.4/tests/xencapsdata/xen-ia64-be-hvm.xml	2013-11-12 11:48:39.163866993 -0600
+       <machine>xenpv</machine>
+       <domain type='xen'/>
+     </arch>
+diff -Naurp libvirt-1.2.12.orig/tests/xencapsdata/xen-i686.xml libvirt-1.2.12/tests/xencapsdata/xen-i686.xml
+--- libvirt-1.2.12.orig/tests/xencapsdata/xen-i686.xml	2015-01-23 06:46:24.000000000 -0500
++++ libvirt-1.2.12/tests/xencapsdata/xen-i686.xml	2015-02-04 10:20:29.871369508 -0500
+@@ -17,7 +17,7 @@
+     <os_type>xen</os_type>
+     <arch name='i686'>
+       <wordsize>32</wordsize>
+-      <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
++      <emulator>qemu-dm</emulator>
+       <machine>xenpv</machine>
+       <domain type='xen'/>
+     </arch>
+diff -Naurp libvirt-1.2.12.orig/tests/xencapsdata/xen-ia64-be-hvm.xml libvirt-1.2.12/tests/xencapsdata/xen-ia64-be-hvm.xml
+--- libvirt-1.2.12.orig/tests/xencapsdata/xen-ia64-be-hvm.xml	2015-01-23 06:46:24.000000000 -0500
++++ libvirt-1.2.12/tests/xencapsdata/xen-ia64-be-hvm.xml	2015-02-04 10:20:02.047370380 -0500
 @@ -17,7 +17,7 @@
      <os_type>xen</os_type>
      <arch name='ia64'>
@@ -70,23 +96,22 @@
 -      <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
 +      <emulator>qemu-dm</emulator>
        <machine>xenpv</machine>
-       <domain type='xen'>
-       </domain>
-@@ -31,8 +31,8 @@
+       <domain type='xen'/>
+     </arch>
+@@ -30,8 +30,8 @@
      <os_type>hvm</os_type>
      <arch name='ia64'>
        <wordsize>64</wordsize>
 -      <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
--      <loader>/usr/lib/xen-default/boot/hvmloader</loader>
+-      <loader>/usr/lib/xen/boot/hvmloader</loader>
 +      <emulator>qemu-dm</emulator>
 +      <loader>hvmloader</loader>
        <machine>xenfv</machine>
-       <domain type='xen'>
-       </domain>
-Index: libvirt-1.1.4/tests/xencapsdata/xen-ia64-be.xml
-===================================================================
---- libvirt-1.1.4.orig/tests/xencapsdata/xen-ia64-be.xml	2013-11-12 11:48:39.183866993 -0600
-+++ libvirt-1.1.4/tests/xencapsdata/xen-ia64-be.xml	2013-11-12 11:48:39.163866993 -0600
+       <domain type='xen'/>
+     </arch>
+diff -Naurp libvirt-1.2.12.orig/tests/xencapsdata/xen-ia64-be.xml libvirt-1.2.12/tests/xencapsdata/xen-ia64-be.xml
+--- libvirt-1.2.12.orig/tests/xencapsdata/xen-ia64-be.xml	2015-01-23 06:46:24.000000000 -0500
++++ libvirt-1.2.12/tests/xencapsdata/xen-ia64-be.xml	2015-02-04 10:36:51.123338759 -0500
 @@ -17,7 +17,7 @@
      <os_type>xen</os_type>
      <arch name='ia64'>
@@ -94,12 +119,11 @@
 -      <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
 +      <emulator>qemu-dm</emulator>
        <machine>xenpv</machine>
-       <domain type='xen'>
-       </domain>
-Index: libvirt-1.1.4/tests/xencapsdata/xen-ia64.xml
-===================================================================
---- libvirt-1.1.4.orig/tests/xencapsdata/xen-ia64.xml	2013-11-12 11:48:39.183866993 -0600
-+++ libvirt-1.1.4/tests/xencapsdata/xen-ia64.xml	2013-11-12 11:48:39.163866993 -0600
+       <domain type='xen'/>
+     </arch>
+diff -Naurp libvirt-1.2.12.orig/tests/xencapsdata/xen-ia64-hvm.xml libvirt-1.2.12/tests/xencapsdata/xen-ia64-hvm.xml
+--- libvirt-1.2.12.orig/tests/xencapsdata/xen-ia64-hvm.xml	2015-01-23 06:46:24.000000000 -0500
++++ libvirt-1.2.12/tests/xencapsdata/xen-ia64-hvm.xml	2015-02-04 10:20:02.047370380 -0500
 @@ -17,7 +17,7 @@
      <os_type>xen</os_type>
      <arch name='ia64'>
@@ -107,125 +131,86 @@
 -      <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
 +      <emulator>qemu-dm</emulator>
        <machine>xenpv</machine>
-       <domain type='xen'>
-       </domain>
-Index: libvirt-1.1.4/tests/xencapsdata/xen-ppc64.xml
-===================================================================
---- libvirt-1.1.4.orig/tests/xencapsdata/xen-ppc64.xml	2013-11-12 11:48:39.183866993 -0600
-+++ libvirt-1.1.4/tests/xencapsdata/xen-ppc64.xml	2013-11-12 11:48:39.163866993 -0600
-@@ -17,7 +17,7 @@
-     <os_type>xen</os_type>
-     <arch name='ppc64'>
+       <domain type='xen'/>
+     </arch>
+@@ -27,8 +27,8 @@
+     <os_type>hvm</os_type>
+     <arch name='ia64'>
        <wordsize>64</wordsize>
 -      <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
+-      <loader>/usr/lib/xen/boot/hvmloader</loader>
 +      <emulator>qemu-dm</emulator>
-       <machine>xenpv</machine>
-       <domain type='xen'>
-       </domain>
-Index: libvirt-1.1.4/tests/xencapsdata/xen-x86_64.xml
-===================================================================
---- libvirt-1.1.4.orig/tests/xencapsdata/xen-x86_64.xml	2013-11-12 11:48:39.183866993 -0600
-+++ libvirt-1.1.4/tests/xencapsdata/xen-x86_64.xml	2013-11-12 11:48:39.167866993 -0600
-@@ -20,7 +20,7 @@
++      <loader>hvmloader</loader>
+       <machine>xenfv</machine>
+       <domain type='xen'/>
+     </arch>
+diff -Naurp libvirt-1.2.12.orig/tests/xencapsdata/xen-ia64.xml libvirt-1.2.12/tests/xencapsdata/xen-ia64.xml
+--- libvirt-1.2.12.orig/tests/xencapsdata/xen-ia64.xml	2015-01-23 06:46:24.000000000 -0500
++++ libvirt-1.2.12/tests/xencapsdata/xen-ia64.xml	2015-02-04 10:20:02.047370380 -0500
+@@ -17,7 +17,7 @@
      <os_type>xen</os_type>
-     <arch name='x86_64'>
+     <arch name='ia64'>
        <wordsize>64</wordsize>
--      <emulator>/usr/lib64/xen/bin/qemu-dm</emulator>
+-      <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
 +      <emulator>qemu-dm</emulator>
        <machine>xenpv</machine>
-       <domain type='xen'>
-       </domain>
-Index: libvirt-1.1.4/tests/xencapsdata/xen-i686-pae.xml
-===================================================================
---- libvirt-1.1.4.orig/tests/xencapsdata/xen-i686-pae.xml	2013-11-12 11:48:39.183866993 -0600
-+++ libvirt-1.1.4/tests/xencapsdata/xen-i686-pae.xml	2013-11-12 11:48:39.167866993 -0600
-@@ -20,7 +20,7 @@
+       <domain type='xen'/>
+     </arch>
+diff -Naurp libvirt-1.2.12.orig/tests/xencapsdata/xen-ppc64.xml libvirt-1.2.12/tests/xencapsdata/xen-ppc64.xml
+--- libvirt-1.2.12.orig/tests/xencapsdata/xen-ppc64.xml	2015-01-23 06:46:24.000000000 -0500
++++ libvirt-1.2.12/tests/xencapsdata/xen-ppc64.xml	2015-02-04 10:37:10.067338165 -0500
+@@ -17,7 +17,7 @@
      <os_type>xen</os_type>
-     <arch name='i686'>
-       <wordsize>32</wordsize>
+     <arch name='ppc64'>
+       <wordsize>64</wordsize>
 -      <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
 +      <emulator>qemu-dm</emulator>
        <machine>xenpv</machine>
-       <domain type='xen'>
-       </domain>
-Index: libvirt-1.1.4/tests/xencapsdata/xen-i686-pae-hvm.xml
-===================================================================
---- libvirt-1.1.4.orig/tests/xencapsdata/xen-i686-pae-hvm.xml	2013-11-12 11:48:39.183866993 -0600
-+++ libvirt-1.1.4/tests/xencapsdata/xen-i686-pae-hvm.xml	2013-11-12 11:48:39.167866993 -0600
+       <domain type='xen'/>
+     </arch>
+diff -Naurp libvirt-1.2.12.orig/tests/xencapsdata/xen-x86_64-hvm.xml libvirt-1.2.12/tests/xencapsdata/xen-x86_64-hvm.xml
+--- libvirt-1.2.12.orig/tests/xencapsdata/xen-x86_64-hvm.xml	2015-01-23 06:46:24.000000000 -0500
++++ libvirt-1.2.12/tests/xencapsdata/xen-x86_64-hvm.xml	2015-02-04 10:20:02.047370380 -0500
 @@ -20,7 +20,7 @@
      <os_type>xen</os_type>
-     <arch name='i686'>
-       <wordsize>32</wordsize>
--      <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
+     <arch name='x86_64'>
+       <wordsize>64</wordsize>
+-      <emulator>/usr/lib64/xen/bin/qemu-dm</emulator>
 +      <emulator>qemu-dm</emulator>
        <machine>xenpv</machine>
-       <domain type='xen'>
-       </domain>
-@@ -34,8 +34,8 @@
+       <domain type='xen'/>
+     </arch>
+@@ -30,8 +30,8 @@
      <os_type>hvm</os_type>
      <arch name='i686'>
        <wordsize>32</wordsize>
--      <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
--      <loader>/usr/lib/xen-default/boot/hvmloader</loader>
+-      <emulator>/usr/lib64/xen/bin/qemu-dm</emulator>
+-      <loader>/usr/lib/xen/boot/hvmloader</loader>
 +      <emulator>qemu-dm</emulator>
 +      <loader>hvmloader</loader>
        <machine>xenfv</machine>
-       <domain type='xen'>
-       </domain>
-Index: libvirt-1.1.4/tests/xencapsdata/xen-ia64-hvm.xml
-===================================================================
---- libvirt-1.1.4.orig/tests/xencapsdata/xen-ia64-hvm.xml	2013-11-12 11:48:39.183866993 -0600
-+++ libvirt-1.1.4/tests/xencapsdata/xen-ia64-hvm.xml	2013-11-12 11:48:39.167866993 -0600
-@@ -17,7 +17,7 @@
-     <os_type>xen</os_type>
-     <arch name='ia64'>
-       <wordsize>64</wordsize>
--      <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
-+      <emulator>qemu-dm</emulator>
-       <machine>xenpv</machine>
-       <domain type='xen'>
-       </domain>
-@@ -28,8 +28,8 @@
+       <domain type='xen'/>
+     </arch>
+@@ -47,8 +47,8 @@
      <os_type>hvm</os_type>
-     <arch name='ia64'>
+     <arch name='x86_64'>
        <wordsize>64</wordsize>
--      <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
--      <loader>/usr/lib/xen-default/boot/hvmloader</loader>
+-      <emulator>/usr/lib64/xen/bin/qemu-dm</emulator>
+-      <loader>/usr/lib/xen/boot/hvmloader</loader>
 +      <emulator>qemu-dm</emulator>
 +      <loader>hvmloader</loader>
        <machine>xenfv</machine>
-       <domain type='xen'>
-       </domain>
-Index: libvirt-1.1.4/tests/xencapsdata/xen-i686.xml
-===================================================================
---- libvirt-1.1.4.orig/tests/xencapsdata/xen-i686.xml	2013-11-12 11:48:39.183866993 -0600
-+++ libvirt-1.1.4/tests/xencapsdata/xen-i686.xml	2013-11-12 11:48:39.167866993 -0600
-@@ -17,7 +17,7 @@
+       <domain type='xen'/>
+     </arch>
+diff -Naurp libvirt-1.2.12.orig/tests/xencapsdata/xen-x86_64.xml libvirt-1.2.12/tests/xencapsdata/xen-x86_64.xml
+--- libvirt-1.2.12.orig/tests/xencapsdata/xen-x86_64.xml	2015-01-23 06:46:24.000000000 -0500
++++ libvirt-1.2.12/tests/xencapsdata/xen-x86_64.xml	2015-02-04 10:20:02.047370380 -0500
+@@ -20,7 +20,7 @@
      <os_type>xen</os_type>
-     <arch name='i686'>
-       <wordsize>32</wordsize>
--      <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
+     <arch name='x86_64'>
+       <wordsize>64</wordsize>
+-      <emulator>/usr/lib64/xen/bin/qemu-dm</emulator>
 +      <emulator>qemu-dm</emulator>
        <machine>xenpv</machine>
-       <domain type='xen'>
-       </domain>
-Index: libvirt-1.1.4/docs/schemas/capability.rng
-===================================================================
---- libvirt-1.1.4.orig/docs/schemas/capability.rng	2013-11-12 11:48:39.183866993 -0600
-+++ libvirt-1.1.4/docs/schemas/capability.rng	2013-11-12 11:48:39.167866993 -0600
-@@ -271,13 +271,13 @@
- 
-   <define name='emulator'>
-     <element name='emulator'>
--      <ref name='absFilePath'/>
-+      <ref name='filePath'/>
-     </element>
-   </define>
- 
-   <define name='loader'>
-     <element name='loader'>
--      <ref name='absFilePath'/>
-+      <ref name='filePath'/>
-     </element>
-   </define>
- 
+       <domain type='xen'/>
+     </arch>
diff -Nru libvirt-1.2.12/debian/patches/series libvirt-1.2.12/debian/patches/series
--- libvirt-1.2.12/debian/patches/series	2015-02-03 20:17:49.000000000 +0000
+++ libvirt-1.2.12/debian/patches/series	2015-02-04 14:23:30.000000000 +0000
@@ -2,7 +2,6 @@
 remove-RHism.diff.patch
 Don-t-enable-default-network-on-boot.patch
 Allow-libvirt-group-to-access-the-socket.patch
-#fix-Debian-specific-path-to-hvm-loader.patch
 Disable-failing-virnetsockettest.patch
 Don-t-fail-if-we-can-t-setup-avahi.patch
 9004-libvirtd-group-name.patch
@@ -12,7 +11,7 @@
 dnsmasq-as-priv-user
 storage-default-permission-mode-to-0711
 Reduce-udevadm-settle-timeout-to-10-seconds.patch
-#fix-ubuntu-xen-qemu-dm-path.patch
+fix-ubuntu-xen-qemu-dm-path.patch
 ubuntu-libxl-qemu-nopath.patch
 ubuntu-skip-virstoragetest
 add-cgmanager-support.patch
@@ -21,7 +20,7 @@
 9031-enable-lxc-apparmor
 9032-lxc-allow-no-security-driver
 ubuntu-xend-probe.patch
-#ubuntu_machine_type.patch
+ubuntu_machine_type.patch
 9034-complete-9p-support
 cgmanager-mutex
 skip-vircgrouptest.patch
diff -Nru libvirt-1.2.12/debian/patches/ubuntu_machine_type.patch libvirt-1.2.12/debian/patches/ubuntu_machine_type.patch
--- libvirt-1.2.12/debian/patches/ubuntu_machine_type.patch	2014-10-09 14:03:47.000000000 +0000
+++ libvirt-1.2.12/debian/patches/ubuntu_machine_type.patch	2015-02-04 14:38:19.000000000 +0000
@@ -2,38 +2,33 @@
 Author: Felix Geyer <debfx@ubuntu.com>
 Bug-Ubuntu: https://bugs.launchpad.net/bugs/1379346
 Last-Update: 2014-10-09
-
---- libvirt-1.2.8.orig/src/qemu/qemu_command.c
-+++ libvirt-1.2.8/src/qemu/qemu_command.c
-@@ -1795,7 +1795,8 @@ qemuDomainMachineIsI440FX(virDomainDefPt
+diff -Naurp libvirt-1.2.12.orig/src/qemu/qemu_command.c libvirt-1.2.12/src/qemu/qemu_command.c
+--- libvirt-1.2.12.orig/src/qemu/qemu_command.c	2015-01-23 21:20:37.000000000 -0500
++++ libvirt-1.2.12/src/qemu/qemu_command.c	2015-02-04 09:19:56.107483380 -0500
+@@ -1721,6 +1721,7 @@ qemuDomainMachineIsI440FX(virDomainDefPt
              STRPREFIX(def->os.machine, "pc-0.") ||
              STRPREFIX(def->os.machine, "pc-1.") ||
              STRPREFIX(def->os.machine, "pc-i440") ||
--            STRPREFIX(def->os.machine, "rhel"));
-+            STRPREFIX(def->os.machine, "rhel") ||
-+            STREQ(def->os.machine, "ubuntu"));
++			STREQ(def->os.machine, "ubuntu") ||
+             STRPREFIX(def->os.machine, "rhel"));
  }
  
- 
-@@ -1995,7 +1996,8 @@ qemuAssignDevicePCISlots(virDomainDefPtr
+@@ -1884,6 +1885,7 @@ qemuValidateDevicePCISlotsChipsets(virDo
          STRPREFIX(def->os.machine, "pc-1.") ||
          STRPREFIX(def->os.machine, "pc-i440") ||
          STREQ(def->os.machine, "pc") ||
--        STRPREFIX(def->os.machine, "rhel")) &&
-+        STRPREFIX(def->os.machine, "rhel") ||
-+        STREQ(def->os.machine, "ubuntu")) &&
++        STREQ(def->os.machine, "ubuntu") ||
+         STRPREFIX(def->os.machine, "rhel")) &&
          qemuValidateDevicePCISlotsPIIX3(def, qemuCaps, addrs) < 0) {
-         goto error;
-     }
---- libvirt-1.2.8.orig/src/qemu/qemu_domain.c
-+++ libvirt-1.2.8/src/qemu/qemu_domain.c
-@@ -739,7 +739,8 @@ qemuDomainDefPostParse(virDomainDefPtr d
+         return -1;
+diff -Naurp libvirt-1.2.12.orig/src/qemu/qemu_domain.c libvirt-1.2.12/src/qemu/qemu_domain.c
+--- libvirt-1.2.12.orig/src/qemu/qemu_domain.c	2015-01-23 06:46:24.000000000 -0500
++++ libvirt-1.2.12/src/qemu/qemu_domain.c	2015-02-04 09:20:18.043482693 -0500
+@@ -951,6 +951,7 @@ qemuDomainDefPostParse(virDomainDefPtr d
              !STRPREFIX(def->os.machine, "pc-1.") &&
              !STRPREFIX(def->os.machine, "pc-i440") &&
              !STREQ(def->os.machine, "pc") &&
--            !STRPREFIX(def->os.machine, "rhel"))
-+            !STRPREFIX(def->os.machine, "rhel") &&
-+            !STREQ(def->os.machine, "ubuntu"))
++            !STREQ(def->os.machine, "ubuntu") &&
+             !STRPREFIX(def->os.machine, "rhel"))
              break;
          addPCIRoot = true;
-         break;