diff -Nru virt-manager-1.3.2/debian/changelog virt-manager-1.3.2/debian/changelog --- virt-manager-1.3.2/debian/changelog 2016-05-18 03:09:48.000000000 -0700 +++ virt-manager-1.3.2/debian/changelog 2016-07-20 16:36:26.000000000 -0700 @@ -1,3 +1,10 @@ +virt-manager (1:1.3.2-3ubuntu3) yakkety; urgency=medium + + * debian/patches/use_virtio_for_pseries_disks.patch: virtinst: Use + virtio bus type for disks on pSeries machines. Closes LP: #1597610. + + -- Nishanth Aravamudan Wed, 20 Jul 2016 16:36:12 -0700 + virt-manager (1:1.3.2-3ubuntu2) yakkety; urgency=medium * debian/patches/0001-details-Fix-screenshot-on-F24-rawhide-bz-1297988.patch: diff -Nru virt-manager-1.3.2/debian/patches/series virt-manager-1.3.2/debian/patches/series --- virt-manager-1.3.2/debian/patches/series 2016-05-18 02:58:27.000000000 -0700 +++ virt-manager-1.3.2/debian/patches/series 2016-07-20 16:34:44.000000000 -0700 @@ -11,3 +11,4 @@ prefer-qemu.patch virtinst/dont_disable_vmport.patch 0001-details-Fix-screenshot-on-F24-rawhide-bz-1297988.patch +use_virtio_for_pseries_disks.patch diff -Nru virt-manager-1.3.2/debian/patches/use_virtio_for_pseries_disks.patch virt-manager-1.3.2/debian/patches/use_virtio_for_pseries_disks.patch --- virt-manager-1.3.2/debian/patches/use_virtio_for_pseries_disks.patch 1969-12-31 16:00:00.000000000 -0800 +++ virt-manager-1.3.2/debian/patches/use_virtio_for_pseries_disks.patch 2016-07-20 16:35:59.000000000 -0700 @@ -0,0 +1,68 @@ +Description: virtinst: Use virtio bus type for disks on pSeries machines +Author: Nishanth Aravamudan +Bug-Ubuntu: https://bugs.launchpad.net/bugs/1597610 +Origin: upstream, https://github.com/virt-manager/virt-manager/commit/f6322c9ed8e6d38083e6365ab9f08e5a09d147be +Origin: upstream, https://github.com/virt-manager/virt-manager/commit/94f610465f45264142ff5def7b5ceaf9ecfe065b + +--- virt-manager-1.3.2.orig/tests/cli-test-xml/compare/virt-install-ppc64-machdefault-f20.xml ++++ virt-manager-1.3.2/tests/cli-test-xml/compare/virt-install-ppc64-machdefault-f20.xml +@@ -17,7 +17,7 @@ + + + +- ++ + + + +--- virt-manager-1.3.2.orig/tests/cli-test-xml/compare/virt-install-ppc64-pseries-f20.xml ++++ virt-manager-1.3.2/tests/cli-test-xml/compare/virt-install-ppc64-pseries-f20.xml +@@ -17,7 +17,11 @@ + + + +- ++ ++ ++ ++ ++ + + + +--- virt-manager-1.3.2.orig/tests/cli-test-xml/compare/virt-install-ppc64le-kvm-import.xml ++++ virt-manager-1.3.2/tests/cli-test-xml/compare/virt-install-ppc64le-kvm-import.xml +@@ -17,7 +17,7 @@ + + + +- ++ + + + +--- virt-manager-1.3.2.orig/tests/clitest.py ++++ virt-manager-1.3.2/tests/clitest.py +@@ -699,7 +699,7 @@ c.add_compare("--arch aarch64 --cdrom %( + c.add_compare("--connect %(URI-KVM-AARCH64)s --disk %(EXISTIMG1)s --import --os-variant fedora21", "aarch64-kvm-import") + + # ppc64 tests +-c.add_compare("--arch ppc64 --machine pseries --boot network --disk %(EXISTIMG1)s --os-variant fedora20 --network none", "ppc64-pseries-f20") ++c.add_compare("--arch ppc64 --machine pseries --boot network --disk %(EXISTIMG1)s --disk device=cdrom --os-variant fedora20 --network none", "ppc64-pseries-f20") + c.add_compare("--arch ppc64 --boot network --disk %(EXISTIMG1)s --os-variant fedora20 --network none", "ppc64-machdefault-f20") + c.add_compare("--connect %(URI-KVM-PPC64LE)s --import --disk %(EXISTIMG1)s --os-variant fedora20", "ppc64le-kvm-import") + +--- virt-manager-1.3.2.orig/virtinst/guest.py ++++ virt-manager-1.3.2/virtinst/guest.py +@@ -1027,7 +1027,10 @@ class Guest(XMLBuilder): + self._os_object.supports_virtiodisk()))): + d.bus = "virtio" + elif self.os.is_pseries(): +- d.bus = "scsi" ++ if d.is_cdrom(): ++ d.bus = "scsi" ++ else: ++ d.bus = "virtio" + elif self.os.is_arm(): + d.bus = "sd" + elif self.os.is_q35():