Bug#600017: marked as done (virtinst: qcow2 disks aren't available in the guest after --import)

Thu, 09 Oct 2014 02:04:20 -0700 

Your message dated Thu, 09 Oct 2014 10:59:44 +0200
with message-id <[email protected]>
and subject line Re: Bug#600017: virtinst: qcow2 disks aren't available in the 
guest after --import
has caused the Debian Bug report #600017,
regarding virtinst: qcow2 disks aren't available in the guest after --import
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact [email protected]
immediately.)


-- 
600017: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=600017
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message --- 
Package: virtinst
Version: 0.500.3-2
Severity: normal
Tags: patch
User: [email protected]
Usertags: origin-ubuntu natty ubuntu-patch


In Ubuntu, we've applied the attached patch to achieve the following:

  * debian/patches/9002-libvirt_disk_format.patch: update to allow setting
    the driver type with --disk format= (LP: #655392)
  * debian/patches/9003-fix-path-to-hvmloader-in-testsuite.patch: adjust
    testsuite for 0001-fix-path-to-hvmloader.patch and
    0002-Fix-path-to-pygrub.patch

libvirt 0.8.3 and later does not probe qemu disks for the image format
and defaults to 'raw' when the format is not specified in the XML.[1]
This breaks virt-install --import because the version in sid and sqeeze
do not allow for specifying a disk format and does not specify a format
in the XML.

The second patch adjusts the testsuite for the changes in the Debian
patches. The testsuite can be run with:

$ fakeroot debian/rules build
$ python setup.py test

It would also be nice if this test was run during the build, but I
didn't submit a patch for that. Others tests (see HACKING in the source)
include:
$ python setup.py check         # doesn't seem to work with our pylint
$ python setup.py test_urls     # fetches install media
$ python setup.py test_cli      # works fine as long as locales is setup

[1] https://bugs.launchpad.net/ubuntu/+source/virtinst/+bug/655392

-- System Information:
Debian Release: squeeze/sid
  APT prefers maverick-updates
  APT policy: (500, 'maverick-updates'), (500, 'maverick-security'), (500, 
'maverick')
Architecture: amd64 (x86_64)

Kernel: Linux 2.6.35-22-generic (SMP w/4 CPU cores)
Locale: LANG=en_US.utf8, LC_CTYPE=en_US.utf8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

diff -Nru virtinst-0.500.3/debian/changelog virtinst-0.500.3/debian/changelog
diff -Nru virtinst-0.500.3/debian/patches/9002-libvirt_disk_format.patch virtinst-0.500.3/debian/patches/9002-libvirt_disk_format.patch
--- virtinst-0.500.3/debian/patches/9002-libvirt_disk_format.patch	1969-12-31 18:00:00.000000000 -0600
+++ virtinst-0.500.3/debian/patches/9002-libvirt_disk_format.patch	2010-10-12 13:07:08.000000000 -0500
@@ -0,0 +1,117 @@
+Origin: based on 1298:e3657405fa18
+Description: virt-install: Set driver type from --disk format=
+ We can't rely on newer libvirt detecting storage format, so take the info
+ directly from the user. This fixes creating qcow2 images with libvirt
+ 0.8.3 and later.
+
+Index: virtinst-0.500.3/man/en/virt-install.pod.in
+===================================================================
+--- virtinst-0.500.3.orig/man/en/virt-install.pod.in	2010-10-12 13:04:16.000000000 -0500
++++ virtinst-0.500.3/man/en/virt-install.pod.in	2010-10-12 13:04:22.000000000 -0500
+@@ -334,7 +334,14 @@
+ 
+ Image format to be used if creating managed storage. For file volumes, this
+ can be 'raw', 'qcow2', 'vmdk', etc. See format types in
+-L<http://libvirt.org/storage.html> for possible values.
++L<http://libvirt.org/storage.html> for possible values. This is often
++mapped to the B<driver_type> value as well.
++
++With libvirt 0.8.3 and later, this option should be specified if reusing
++and existing disk image, since libvirt does not autodetect storage format
++as it is a potential security issue. For example, if reusing and existing
++qcow2 image, you will want to specify format=qcow2, otherwise the hypervisor
++may not be able to read your disk image.
+ 
+ =back
+ 
+Index: virtinst-0.500.3/tests/xmlconfig-xml/misc-qemu-driver-overwrite.xml
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ virtinst-0.500.3/tests/xmlconfig-xml/misc-qemu-driver-overwrite.xml	2010-10-12 13:04:22.000000000 -0500
+@@ -0,0 +1,36 @@
++<domain type='xen'>
++  <name>TestGuest</name>
++  <currentMemory>204800</currentMemory>
++  <memory>409600</memory>
++  <uuid>12345678-1234-1234-1234-123456789012</uuid>
++  <os>
++    <type arch='i686'>hvm</type>
++    <loader>/usr/lib/xen/boot/hvmloader</loader>
++    <boot dev='cdrom'/>
++  </os>
++  <features>
++    <acpi/><apic/>
++  </features>
++  <clock offset="utc"/>
++  <on_poweroff>destroy</on_poweroff>
++  <on_reboot>destroy</on_reboot>
++  <on_crash>destroy</on_crash>
++  <vcpu>5</vcpu>
++  <devices>
++    <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
++    <disk type='file' device='disk'>
++      <driver name='qemu' type='qcow2'/>
++      <source file='/default-pool/iso-vol'/>
++      <target dev='hda' bus='ide'/>
++    </disk>
++    <disk type='block' device='cdrom'>
++      <driver name='qemu'/>
++      <source dev='/dev/loop0'/>
++      <target dev='hdc' bus='ide'/>
++      <readonly/>
++    </disk>
++    <input type='mouse' bus='ps2'/>
++    <graphics type='sdl' display=':3.4' xauth='/tmp/.Xauthority'/>
++    <console type='pty'/>
++  </devices>
++</domain>
+Index: virtinst-0.500.3/tests/xmlconfig.py
+===================================================================
+--- virtinst-0.500.3.orig/tests/xmlconfig.py	2010-10-12 13:04:16.000000000 -0500
++++ virtinst-0.500.3/tests/xmlconfig.py	2010-10-12 13:06:43.000000000 -0500
+@@ -350,6 +350,12 @@
+         self.conn_function_wrappers(g, "misc-qemu-iso-disk", True,
+                                     conn_uri=qemu_uri)
+ 
++        g = get_basic_fullyvirt_guest()
++        g.disks.append(get_filedisk("/default-pool/iso-vol"))
++        g.disks[0].driver_type = "qcow2"
++        self.conn_function_wrappers(g, "misc-qemu-driver-overwrite", True,
++                                    conn_uri=qemu_uri)
++
+     def testXMLEscaping(self):
+         g = get_basic_fullyvirt_guest()
+         g.disks.append(get_filedisk("/tmp/ISO&'&s"))
+Index: virtinst-0.500.3/virtinst/VirtualDisk.py
+===================================================================
+--- virtinst-0.500.3.orig/virtinst/VirtualDisk.py	2010-10-12 13:04:16.000000000 -0500
++++ virtinst-0.500.3/virtinst/VirtualDisk.py	2010-10-12 13:04:22.000000000 -0500
+@@ -713,7 +713,11 @@
+             if driver.lower() == "qemu":
+                 drvname = self.DRIVER_QEMU
+ 
+-        if self.vol_object:
++        if self.format:
++            if drvname == self.DRIVER_QEMU:
++                drvtype = _qemu_sanitize_drvtype(self.type, self.format)
++
++        elif self.vol_object:
+             fmt = _util.get_xml_path(self.vol_object.XMLDesc(0),
+                                      "/volume/target/format/@type")
+             if drvname == self.DRIVER_QEMU:
+@@ -734,11 +738,13 @@
+                 drvname = self.DRIVER_TAP
+                 drvtype = self.DRIVER_TAP_VDISK
+ 
++        # User already set driverName to a different value, respect that
+         if self._driverName and self._driverName != drvname:
+-            # User already set driverName to a different value, respect that
+             return
+-
+         self._driverName = drvname or None
++
++        if self._driverType and self._driverType != drvtype:
++            return
+         self._driverType = drvtype or None
+ 
+     def __lookup_vol_name(self, name_tuple):
diff -Nru virtinst-0.500.3/debian/patches/9003-fix-path-to-hvmloader-in-testsuite.patch virtinst-0.500.3/debian/patches/9003-fix-path-to-hvmloader-in-testsuite.patch
--- virtinst-0.500.3/debian/patches/9003-fix-path-to-hvmloader-in-testsuite.patch	1969-12-31 18:00:00.000000000 -0600
+++ virtinst-0.500.3/debian/patches/9003-fix-path-to-hvmloader-in-testsuite.patch	2010-10-12 12:58:42.000000000 -0500
@@ -0,0 +1,459 @@
+Author: Jamie Strandboge <[email protected]>
+Description: adjust testsuite for xen path
+Forwarded: not-needed
+
+Index: virtinst-0.500.3/tests/testdriver.xml
+===================================================================
+--- virtinst-0.500.3.orig/tests/testdriver.xml	2010-10-12 12:55:21.000000000 -0500
++++ virtinst-0.500.3/tests/testdriver.xml	2010-10-12 12:55:25.000000000 -0500
+@@ -36,7 +36,7 @@
+   <uuid>12345678-1234-1234-1234-12345678FFFF</uuid>
+   <os>
+     <type arch='i686'>hvm</type>
+-    <loader>/usr/lib/xen/boot/hvmloader</loader>
++    <loader>/usr/lib/xen-default/boot/hvmloader</loader>
+     <boot dev='hd'/>
+   </os>
+   <features>
+Index: virtinst-0.500.3/tests/image-xml/image2guest/image-xenpv32.xml
+===================================================================
+--- virtinst-0.500.3.orig/tests/image-xml/image2guest/image-xenpv32.xml	2010-10-12 12:55:22.000000000 -0500
++++ virtinst-0.500.3/tests/image-xml/image2guest/image-xenpv32.xml	2010-10-12 12:55:25.000000000 -0500
+@@ -3,7 +3,7 @@
+   <currentMemory>204800</currentMemory>
+   <memory>409600</memory>
+   <uuid>12345678-1234-1234-1234-123456789012</uuid>
+-  <bootloader>/usr/bin/pygrub</bootloader>
++  <bootloader>/usr/lib/xen-default/bin/pygrub</bootloader>
+   <features>
+     <pae/>
+   </features>
+Index: virtinst-0.500.3/tests/xmlconfig-xml/boot-fullyvirt-disk-block.xml
+===================================================================
+--- virtinst-0.500.3.orig/tests/xmlconfig-xml/boot-fullyvirt-disk-block.xml	2010-10-12 12:55:21.000000000 -0500
++++ virtinst-0.500.3/tests/xmlconfig-xml/boot-fullyvirt-disk-block.xml	2010-10-12 12:55:25.000000000 -0500
+@@ -5,7 +5,7 @@
+   <uuid>12345678-1234-1234-1234-123456789012</uuid>
+   <os>
+     <type arch='i686'>hvm</type>
+-    <loader>/usr/lib/xen/boot/hvmloader</loader>
++    <loader>/usr/lib/xen-default/boot/hvmloader</loader>
+     <boot dev='hd'/>
+   </os>
+   <features>
+Index: virtinst-0.500.3/tests/xmlconfig-xml/boot-fullyvirt-disk-file.xml
+===================================================================
+--- virtinst-0.500.3.orig/tests/xmlconfig-xml/boot-fullyvirt-disk-file.xml	2010-10-12 12:55:22.000000000 -0500
++++ virtinst-0.500.3/tests/xmlconfig-xml/boot-fullyvirt-disk-file.xml	2010-10-12 12:55:25.000000000 -0500
+@@ -5,7 +5,7 @@
+   <uuid>12345678-1234-1234-1234-123456789012</uuid>
+   <os>
+     <type arch='i686'>hvm</type>
+-    <loader>/usr/lib/xen/boot/hvmloader</loader>
++    <loader>/usr/lib/xen-default/boot/hvmloader</loader>
+     <boot dev='hd'/>
+   </os>
+   <features>
+Index: virtinst-0.500.3/tests/xmlconfig-xml/boot-fullyvirt-pxe-nodisks.xml
+===================================================================
+--- virtinst-0.500.3.orig/tests/xmlconfig-xml/boot-fullyvirt-pxe-nodisks.xml	2010-10-12 12:55:22.000000000 -0500
++++ virtinst-0.500.3/tests/xmlconfig-xml/boot-fullyvirt-pxe-nodisks.xml	2010-10-12 12:55:25.000000000 -0500
+@@ -5,7 +5,7 @@
+   <uuid>12345678-1234-1234-1234-123456789012</uuid>
+   <os>
+     <type arch='i686'>hvm</type>
+-    <loader>/usr/lib/xen/boot/hvmloader</loader>
++    <loader>/usr/lib/xen-default/boot/hvmloader</loader>
+     <boot dev='network'/>
+   </os>
+   <features>
+Index: virtinst-0.500.3/tests/xmlconfig-xml/boot-fullyvirt-pxe.xml
+===================================================================
+--- virtinst-0.500.3.orig/tests/xmlconfig-xml/boot-fullyvirt-pxe.xml	2010-10-12 12:55:21.000000000 -0500
++++ virtinst-0.500.3/tests/xmlconfig-xml/boot-fullyvirt-pxe.xml	2010-10-12 12:55:25.000000000 -0500
+@@ -5,7 +5,7 @@
+   <uuid>12345678-1234-1234-1234-123456789012</uuid>
+   <os>
+     <type arch='i686'>hvm</type>
+-    <loader>/usr/lib/xen/boot/hvmloader</loader>
++    <loader>/usr/lib/xen-default/boot/hvmloader</loader>
+     <boot dev='hd'/>
+   </os>
+   <features>
+Index: virtinst-0.500.3/tests/xmlconfig-xml/boot-many-chars.xml
+===================================================================
+--- virtinst-0.500.3.orig/tests/xmlconfig-xml/boot-many-chars.xml	2010-10-12 12:55:22.000000000 -0500
++++ virtinst-0.500.3/tests/xmlconfig-xml/boot-many-chars.xml	2010-10-12 12:55:25.000000000 -0500
+@@ -5,7 +5,7 @@
+   <uuid>12345678-1234-1234-1234-123456789012</uuid>
+   <os>
+     <type arch='i686'>hvm</type>
+-    <loader>/usr/lib/xen/boot/hvmloader</loader>
++    <loader>/usr/lib/xen-default/boot/hvmloader</loader>
+     <boot dev='network'/>
+   </os>
+   <features>
+Index: virtinst-0.500.3/tests/xmlconfig-xml/boot-many-devices.xml
+===================================================================
+--- virtinst-0.500.3.orig/tests/xmlconfig-xml/boot-many-devices.xml	2010-10-12 12:55:22.000000000 -0500
++++ virtinst-0.500.3/tests/xmlconfig-xml/boot-many-devices.xml	2010-10-12 12:55:25.000000000 -0500
+@@ -8,7 +8,7 @@
+ </description>
+   <os>
+     <type arch='i686'>hvm</type>
+-    <loader>/usr/lib/xen/boot/hvmloader</loader>
++    <loader>/usr/lib/xen-default/boot/hvmloader</loader>
+     <boot dev='hd'/>
+   </os>
+   <features>
+Index: virtinst-0.500.3/tests/xmlconfig-xml/boot-many-disks2.xml
+===================================================================
+--- virtinst-0.500.3.orig/tests/xmlconfig-xml/boot-many-disks2.xml	2010-10-12 12:55:21.000000000 -0500
++++ virtinst-0.500.3/tests/xmlconfig-xml/boot-many-disks2.xml	2010-10-12 12:55:25.000000000 -0500
+@@ -5,7 +5,7 @@
+   <uuid>12345678-1234-1234-1234-123456789012</uuid>
+   <os>
+     <type arch='i686'>hvm</type>
+-    <loader>/usr/lib/xen/boot/hvmloader</loader>
++    <loader>/usr/lib/xen-default/boot/hvmloader</loader>
+     <boot dev='hd'/>
+   </os>
+   <features>
+Index: virtinst-0.500.3/tests/xmlconfig-xml/boot-many-hostdevs.xml
+===================================================================
+--- virtinst-0.500.3.orig/tests/xmlconfig-xml/boot-many-hostdevs.xml	2010-10-12 12:55:22.000000000 -0500
++++ virtinst-0.500.3/tests/xmlconfig-xml/boot-many-hostdevs.xml	2010-10-12 12:55:25.000000000 -0500
+@@ -5,7 +5,7 @@
+   <uuid>12345678-1234-1234-1234-123456789012</uuid>
+   <os>
+     <type arch='i686'>hvm</type>
+-    <loader>/usr/lib/xen/boot/hvmloader</loader>
++    <loader>/usr/lib/xen-default/boot/hvmloader</loader>
+     <boot dev='network'/>
+   </os>
+   <features>
+Index: virtinst-0.500.3/tests/xmlconfig-xml/boot-many-nics.xml
+===================================================================
+--- virtinst-0.500.3.orig/tests/xmlconfig-xml/boot-many-nics.xml	2010-10-12 12:55:22.000000000 -0500
++++ virtinst-0.500.3/tests/xmlconfig-xml/boot-many-nics.xml	2010-10-12 12:55:25.000000000 -0500
+@@ -5,7 +5,7 @@
+   <uuid>12345678-1234-1234-1234-123456789012</uuid>
+   <os>
+     <type arch='i686'>hvm</type>
+-    <loader>/usr/lib/xen/boot/hvmloader</loader>
++    <loader>/usr/lib/xen-default/boot/hvmloader</loader>
+     <boot dev='network'/>
+   </os>
+   <features>
+Index: virtinst-0.500.3/tests/xmlconfig-xml/boot-many-sounds.xml
+===================================================================
+--- virtinst-0.500.3.orig/tests/xmlconfig-xml/boot-many-sounds.xml	2010-10-12 12:55:21.000000000 -0500
++++ virtinst-0.500.3/tests/xmlconfig-xml/boot-many-sounds.xml	2010-10-12 12:55:25.000000000 -0500
+@@ -5,7 +5,7 @@
+   <uuid>12345678-1234-1234-1234-123456789012</uuid>
+   <os>
+     <type arch='i686'>hvm</type>
+-    <loader>/usr/lib/xen/boot/hvmloader</loader>
++    <loader>/usr/lib/xen-default/boot/hvmloader</loader>
+     <boot dev='network'/>
+   </os>
+   <features>
+Index: virtinst-0.500.3/tests/xmlconfig-xml/install-f11-xen.xml
+===================================================================
+--- virtinst-0.500.3.orig/tests/xmlconfig-xml/install-f11-xen.xml	2010-10-12 12:55:21.000000000 -0500
++++ virtinst-0.500.3/tests/xmlconfig-xml/install-f11-xen.xml	2010-10-12 12:55:25.000000000 -0500
+@@ -5,7 +5,7 @@
+   <uuid>12345678-1234-1234-1234-123456789012</uuid>
+   <os>
+     <type arch='i686'>hvm</type>
+-    <loader>/usr/lib/xen/boot/hvmloader</loader>
++    <loader>/usr/lib/xen-default/boot/hvmloader</loader>
+     <boot dev='hd'/>
+   </os>
+   <features>
+Index: virtinst-0.500.3/tests/xmlconfig-xml/install-fullyvirt-disk-block.xml
+===================================================================
+--- virtinst-0.500.3.orig/tests/xmlconfig-xml/install-fullyvirt-disk-block.xml	2010-10-12 12:55:21.000000000 -0500
++++ virtinst-0.500.3/tests/xmlconfig-xml/install-fullyvirt-disk-block.xml	2010-10-12 12:55:25.000000000 -0500
+@@ -5,7 +5,7 @@
+   <uuid>12345678-1234-1234-1234-123456789012</uuid>
+   <os>
+     <type arch='i686'>hvm</type>
+-    <loader>/usr/lib/xen/boot/hvmloader</loader>
++    <loader>/usr/lib/xen-default/boot/hvmloader</loader>
+     <boot dev='cdrom'/>
+   </os>
+   <features>
+Index: virtinst-0.500.3/tests/xmlconfig-xml/install-fullyvirt-disk-file.xml
+===================================================================
+--- virtinst-0.500.3.orig/tests/xmlconfig-xml/install-fullyvirt-disk-file.xml	2010-10-12 12:55:22.000000000 -0500
++++ virtinst-0.500.3/tests/xmlconfig-xml/install-fullyvirt-disk-file.xml	2010-10-12 12:55:25.000000000 -0500
+@@ -5,7 +5,7 @@
+   <uuid>12345678-1234-1234-1234-123456789012</uuid>
+   <os>
+     <type arch='i686'>hvm</type>
+-    <loader>/usr/lib/xen/boot/hvmloader</loader>
++    <loader>/usr/lib/xen-default/boot/hvmloader</loader>
+     <boot dev='cdrom'/>
+   </os>
+   <features>
+Index: virtinst-0.500.3/tests/xmlconfig-xml/install-fullyvirt-import.xml
+===================================================================
+--- virtinst-0.500.3.orig/tests/xmlconfig-xml/install-fullyvirt-import.xml	2010-10-12 12:55:21.000000000 -0500
++++ virtinst-0.500.3/tests/xmlconfig-xml/install-fullyvirt-import.xml	2010-10-12 12:55:25.000000000 -0500
+@@ -5,7 +5,7 @@
+   <uuid>12345678-1234-1234-1234-123456789012</uuid>
+   <os>
+     <type arch='i686'>hvm</type>
+-    <loader>/usr/lib/xen/boot/hvmloader</loader>
++    <loader>/usr/lib/xen-default/boot/hvmloader</loader>
+     <boot dev='hd'/>
+   </os>
+   <features>
+Index: virtinst-0.500.3/tests/xmlconfig-xml/install-fullyvirt-livecd.xml
+===================================================================
+--- virtinst-0.500.3.orig/tests/xmlconfig-xml/install-fullyvirt-livecd.xml	2010-10-12 12:55:22.000000000 -0500
++++ virtinst-0.500.3/tests/xmlconfig-xml/install-fullyvirt-livecd.xml	2010-10-12 12:55:25.000000000 -0500
+@@ -5,7 +5,7 @@
+   <uuid>12345678-1234-1234-1234-123456789012</uuid>
+   <os>
+     <type arch='i686'>hvm</type>
+-    <loader>/usr/lib/xen/boot/hvmloader</loader>
++    <loader>/usr/lib/xen-default/boot/hvmloader</loader>
+     <boot dev='cdrom'/>
+   </os>
+   <features>
+Index: virtinst-0.500.3/tests/xmlconfig-xml/install-fullyvirt-pxe-nodisks.xml
+===================================================================
+--- virtinst-0.500.3.orig/tests/xmlconfig-xml/install-fullyvirt-pxe-nodisks.xml	2010-10-12 12:55:22.000000000 -0500
++++ virtinst-0.500.3/tests/xmlconfig-xml/install-fullyvirt-pxe-nodisks.xml	2010-10-12 12:55:25.000000000 -0500
+@@ -5,7 +5,7 @@
+   <uuid>12345678-1234-1234-1234-123456789012</uuid>
+   <os>
+     <type arch='i686'>hvm</type>
+-    <loader>/usr/lib/xen/boot/hvmloader</loader>
++    <loader>/usr/lib/xen-default/boot/hvmloader</loader>
+     <boot dev='network'/>
+   </os>
+   <features>
+Index: virtinst-0.500.3/tests/xmlconfig-xml/install-fullyvirt-pxe.xml
+===================================================================
+--- virtinst-0.500.3.orig/tests/xmlconfig-xml/install-fullyvirt-pxe.xml	2010-10-12 12:55:21.000000000 -0500
++++ virtinst-0.500.3/tests/xmlconfig-xml/install-fullyvirt-pxe.xml	2010-10-12 12:55:25.000000000 -0500
+@@ -5,7 +5,7 @@
+   <uuid>12345678-1234-1234-1234-123456789012</uuid>
+   <os>
+     <type arch='i686'>hvm</type>
+-    <loader>/usr/lib/xen/boot/hvmloader</loader>
++    <loader>/usr/lib/xen-default/boot/hvmloader</loader>
+     <boot dev='network'/>
+   </os>
+   <features>
+Index: virtinst-0.500.3/tests/xmlconfig-xml/install-windowsxp-xennew.xml
+===================================================================
+--- virtinst-0.500.3.orig/tests/xmlconfig-xml/install-windowsxp-xennew.xml	2010-10-12 12:55:21.000000000 -0500
++++ virtinst-0.500.3/tests/xmlconfig-xml/install-windowsxp-xennew.xml	2010-10-12 12:55:25.000000000 -0500
+@@ -5,7 +5,7 @@
+   <uuid>12345678-1234-1234-1234-123456789012</uuid>
+   <os>
+     <type arch='i686'>hvm</type>
+-    <loader>/usr/lib/xen/boot/hvmloader</loader>
++    <loader>/usr/lib/xen-default/boot/hvmloader</loader>
+     <boot dev='cdrom'/>
+   </os>
+   <features>
+Index: virtinst-0.500.3/tests/xmlconfig-xml/install-windowsxp-xenold.xml
+===================================================================
+--- virtinst-0.500.3.orig/tests/xmlconfig-xml/install-windowsxp-xenold.xml	2010-10-12 12:55:22.000000000 -0500
++++ virtinst-0.500.3/tests/xmlconfig-xml/install-windowsxp-xenold.xml	2010-10-12 12:55:25.000000000 -0500
+@@ -5,7 +5,7 @@
+   <uuid>12345678-1234-1234-1234-123456789012</uuid>
+   <os>
+     <type arch='i686'>hvm</type>
+-    <loader>/usr/lib/xen/boot/hvmloader</loader>
++    <loader>/usr/lib/xen-default/boot/hvmloader</loader>
+     <boot dev='cdrom'/>
+   </os>
+   <clock offset="localtime"/>
+Index: virtinst-0.500.3/tests/xmlconfig-xml/misc-qemu-driver-name.xml
+===================================================================
+--- virtinst-0.500.3.orig/tests/xmlconfig-xml/misc-qemu-driver-name.xml	2010-10-12 12:55:22.000000000 -0500
++++ virtinst-0.500.3/tests/xmlconfig-xml/misc-qemu-driver-name.xml	2010-10-12 12:55:25.000000000 -0500
+@@ -5,7 +5,7 @@
+   <uuid>12345678-1234-1234-1234-123456789012</uuid>
+   <os>
+     <type arch='i686'>hvm</type>
+-    <loader>/usr/lib/xen/boot/hvmloader</loader>
++    <loader>/usr/lib/xen-default/boot/hvmloader</loader>
+     <boot dev='cdrom'/>
+   </os>
+   <features>
+Index: virtinst-0.500.3/tests/xmlconfig-xml/misc-qemu-driver-overwrite.xml
+===================================================================
+--- virtinst-0.500.3.orig/tests/xmlconfig-xml/misc-qemu-driver-overwrite.xml	2010-10-12 12:55:25.000000000 -0500
++++ virtinst-0.500.3/tests/xmlconfig-xml/misc-qemu-driver-overwrite.xml	2010-10-12 12:55:25.000000000 -0500
+@@ -5,7 +5,7 @@
+   <uuid>12345678-1234-1234-1234-123456789012</uuid>
+   <os>
+     <type arch='i686'>hvm</type>
+-    <loader>/usr/lib/xen/boot/hvmloader</loader>
++    <loader>/usr/lib/xen-default/boot/hvmloader</loader>
+     <boot dev='cdrom'/>
+   </os>
+   <features>
+Index: virtinst-0.500.3/tests/xmlconfig-xml/misc-qemu-driver-type.xml
+===================================================================
+--- virtinst-0.500.3.orig/tests/xmlconfig-xml/misc-qemu-driver-type.xml	2010-10-12 12:55:22.000000000 -0500
++++ virtinst-0.500.3/tests/xmlconfig-xml/misc-qemu-driver-type.xml	2010-10-12 12:55:25.000000000 -0500
+@@ -5,7 +5,7 @@
+   <uuid>12345678-1234-1234-1234-123456789012</uuid>
+   <os>
+     <type arch='i686'>hvm</type>
+-    <loader>/usr/lib/xen/boot/hvmloader</loader>
++    <loader>/usr/lib/xen-default/boot/hvmloader</loader>
+     <boot dev='cdrom'/>
+   </os>
+   <features>
+Index: virtinst-0.500.3/tests/xmlconfig-xml/misc-qemu-iso-disk.xml
+===================================================================
+--- virtinst-0.500.3.orig/tests/xmlconfig-xml/misc-qemu-iso-disk.xml	2010-10-12 12:55:22.000000000 -0500
++++ virtinst-0.500.3/tests/xmlconfig-xml/misc-qemu-iso-disk.xml	2010-10-12 12:55:25.000000000 -0500
+@@ -5,7 +5,7 @@
+   <uuid>12345678-1234-1234-1234-123456789012</uuid>
+   <os>
+     <type arch='i686'>hvm</type>
+-    <loader>/usr/lib/xen/boot/hvmloader</loader>
++    <loader>/usr/lib/xen-default/boot/hvmloader</loader>
+     <boot dev='cdrom'/>
+   </os>
+   <features>
+Index: virtinst-0.500.3/tests/xmlconfig-xml/misc-xml-escaping.xml
+===================================================================
+--- virtinst-0.500.3.orig/tests/xmlconfig-xml/misc-xml-escaping.xml	2010-10-12 12:55:21.000000000 -0500
++++ virtinst-0.500.3/tests/xmlconfig-xml/misc-xml-escaping.xml	2010-10-12 12:55:25.000000000 -0500
+@@ -5,7 +5,7 @@
+   <uuid>12345678-1234-1234-1234-123456789012</uuid>
+   <os>
+     <type arch='i686'>hvm</type>
+-    <loader>/usr/lib/xen/boot/hvmloader</loader>
++    <loader>/usr/lib/xen-default/boot/hvmloader</loader>
+     <boot dev='cdrom'/>
+   </os>
+   <features>
+Index: virtinst-0.500.3/tests/image-xml/image2guest/image-xenfv32.xml
+===================================================================
+--- virtinst-0.500.3.orig/tests/image-xml/image2guest/image-xenfv32.xml	2010-10-12 12:55:54.000000000 -0500
++++ virtinst-0.500.3/tests/image-xml/image2guest/image-xenfv32.xml	2010-10-12 12:56:10.000000000 -0500
+@@ -5,7 +5,7 @@
+   <uuid>12345678-1234-1234-1234-123456789012</uuid>
+   <os>
+     <type arch='i686'>hvm</type>
+-    <loader>/usr/lib/xen/boot/hvmloader</loader>
++    <loader>/usr/lib/xen-default/boot/hvmloader</loader>
+     <boot dev='hd'/>
+   </os>
+   <features>
+Index: virtinst-0.500.3/tests/xmlconfig-xml/boot-paravirt-disk-block.xml
+===================================================================
+--- virtinst-0.500.3.orig/tests/xmlconfig-xml/boot-paravirt-disk-block.xml	2010-10-12 12:56:31.000000000 -0500
++++ virtinst-0.500.3/tests/xmlconfig-xml/boot-paravirt-disk-block.xml	2010-10-12 12:58:10.000000000 -0500
+@@ -3,7 +3,7 @@
+   <currentMemory>204800</currentMemory>
+   <memory>409600</memory>
+   <uuid>12345678-1234-1234-1234-123456789012</uuid>
+-  <bootloader>/usr/bin/pygrub</bootloader>
++  <bootloader>/usr/lib/xen-default/bin/pygrub</bootloader>
+   <on_poweroff>destroy</on_poweroff>
+   <on_reboot>restart</on_reboot>
+   <on_crash>restart</on_crash>
+Index: virtinst-0.500.3/tests/xmlconfig-xml/boot-paravirt-disk-drv-file.xml
+===================================================================
+--- virtinst-0.500.3.orig/tests/xmlconfig-xml/boot-paravirt-disk-drv-file.xml	2010-10-12 12:56:31.000000000 -0500
++++ virtinst-0.500.3/tests/xmlconfig-xml/boot-paravirt-disk-drv-file.xml	2010-10-12 12:58:10.000000000 -0500
+@@ -3,7 +3,7 @@
+   <currentMemory>204800</currentMemory>
+   <memory>409600</memory>
+   <uuid>12345678-1234-1234-1234-123456789012</uuid>
+-  <bootloader>/usr/bin/pygrub</bootloader>
++  <bootloader>/usr/lib/xen-default/bin/pygrub</bootloader>
+   <on_poweroff>destroy</on_poweroff>
+   <on_reboot>restart</on_reboot>
+   <on_crash>restart</on_crash>
+Index: virtinst-0.500.3/tests/xmlconfig-xml/boot-paravirt-disk-drv-phy.xml
+===================================================================
+--- virtinst-0.500.3.orig/tests/xmlconfig-xml/boot-paravirt-disk-drv-phy.xml	2010-10-12 12:56:31.000000000 -0500
++++ virtinst-0.500.3/tests/xmlconfig-xml/boot-paravirt-disk-drv-phy.xml	2010-10-12 12:58:10.000000000 -0500
+@@ -3,7 +3,7 @@
+   <currentMemory>204800</currentMemory>
+   <memory>409600</memory>
+   <uuid>12345678-1234-1234-1234-123456789012</uuid>
+-  <bootloader>/usr/bin/pygrub</bootloader>
++  <bootloader>/usr/lib/xen-default/bin/pygrub</bootloader>
+   <on_poweroff>destroy</on_poweroff>
+   <on_reboot>restart</on_reboot>
+   <on_crash>restart</on_crash>
+Index: virtinst-0.500.3/tests/xmlconfig-xml/boot-paravirt-disk-drv-tap-qcow.xml
+===================================================================
+--- virtinst-0.500.3.orig/tests/xmlconfig-xml/boot-paravirt-disk-drv-tap-qcow.xml	2010-10-12 12:56:31.000000000 -0500
++++ virtinst-0.500.3/tests/xmlconfig-xml/boot-paravirt-disk-drv-tap-qcow.xml	2010-10-12 12:58:10.000000000 -0500
+@@ -3,7 +3,7 @@
+   <currentMemory>204800</currentMemory>
+   <memory>409600</memory>
+   <uuid>12345678-1234-1234-1234-123456789012</uuid>
+-  <bootloader>/usr/bin/pygrub</bootloader>
++  <bootloader>/usr/lib/xen-default/bin/pygrub</bootloader>
+   <on_poweroff>destroy</on_poweroff>
+   <on_reboot>restart</on_reboot>
+   <on_crash>restart</on_crash>
+Index: virtinst-0.500.3/tests/xmlconfig-xml/boot-paravirt-disk-drv-tap.xml
+===================================================================
+--- virtinst-0.500.3.orig/tests/xmlconfig-xml/boot-paravirt-disk-drv-tap.xml	2010-10-12 12:56:31.000000000 -0500
++++ virtinst-0.500.3/tests/xmlconfig-xml/boot-paravirt-disk-drv-tap.xml	2010-10-12 12:58:10.000000000 -0500
+@@ -3,7 +3,7 @@
+   <currentMemory>204800</currentMemory>
+   <memory>409600</memory>
+   <uuid>12345678-1234-1234-1234-123456789012</uuid>
+-  <bootloader>/usr/bin/pygrub</bootloader>
++  <bootloader>/usr/lib/xen-default/bin/pygrub</bootloader>
+   <on_poweroff>destroy</on_poweroff>
+   <on_reboot>restart</on_reboot>
+   <on_crash>restart</on_crash>
+Index: virtinst-0.500.3/tests/xmlconfig-xml/boot-paravirt-disk-file.xml
+===================================================================
+--- virtinst-0.500.3.orig/tests/xmlconfig-xml/boot-paravirt-disk-file.xml	2010-10-12 12:56:31.000000000 -0500
++++ virtinst-0.500.3/tests/xmlconfig-xml/boot-paravirt-disk-file.xml	2010-10-12 12:58:10.000000000 -0500
+@@ -3,7 +3,7 @@
+   <currentMemory>204800</currentMemory>
+   <memory>409600</memory>
+   <uuid>12345678-1234-1234-1234-123456789012</uuid>
+-  <bootloader>/usr/bin/pygrub</bootloader>
++  <bootloader>/usr/lib/xen-default/bin/pygrub</bootloader>
+   <on_poweroff>destroy</on_poweroff>
+   <on_reboot>restart</on_reboot>
+   <on_crash>restart</on_crash>
+Index: virtinst-0.500.3/tests/xmlconfig-xml/boot-paravirt-many-disks.xml
+===================================================================
+--- virtinst-0.500.3.orig/tests/xmlconfig-xml/boot-paravirt-many-disks.xml	2010-10-12 12:56:31.000000000 -0500
++++ virtinst-0.500.3/tests/xmlconfig-xml/boot-paravirt-many-disks.xml	2010-10-12 12:58:10.000000000 -0500
+@@ -3,7 +3,7 @@
+   <currentMemory>204800</currentMemory>
+   <memory>409600</memory>
+   <uuid>12345678-1234-1234-1234-123456789012</uuid>
+-  <bootloader>/usr/bin/pygrub</bootloader>
++  <bootloader>/usr/lib/xen-default/bin/pygrub</bootloader>
+   <on_poweroff>destroy</on_poweroff>
+   <on_reboot>restart</on_reboot>
+   <on_crash>restart</on_crash>
+Index: virtinst-0.500.3/tests/xmlconfig-xml/install-paravirt-import.xml
+===================================================================
+--- virtinst-0.500.3.orig/tests/xmlconfig-xml/install-paravirt-import.xml	2010-10-12 12:58:31.000000000 -0500
++++ virtinst-0.500.3/tests/xmlconfig-xml/install-paravirt-import.xml	2010-10-12 12:58:39.000000000 -0500
+@@ -3,7 +3,7 @@
+   <currentMemory>204800</currentMemory>
+   <memory>409600</memory>
+   <uuid>12345678-1234-1234-1234-123456789012</uuid>
+-  <bootloader>/usr/bin/pygrub</bootloader>
++  <bootloader>/usr/lib/xen-default/bin/pygrub</bootloader>
+   <on_poweroff>destroy</on_poweroff>
+   <on_reboot>restart</on_reboot>
+   <on_crash>restart</on_crash>
diff -Nru virtinst-0.500.3/debian/patches/series virtinst-0.500.3/debian/patches/series
--- virtinst-0.500.3/debian/patches/series	2010-07-12 16:23:58.000000000 -0500
+++ virtinst-0.500.3/debian/patches/series	2010-10-06 16:57:48.000000000 -0500
@@ -3,3 +3,5 @@
 #0003-Fix-path-to-keyboard-configuration.patch
 0004-virt-install-Fix-CDROM-attach-for-windows-installs.patch
 9001_Ubuntu.patch
+9002-libvirt_disk_format.patch
+9003-fix-path-to-hvmloader-in-testsuite.patch

--- End Message ---
--- Begin Message --- 
Hi,

[Doing some bug triaging on the virt-manager Debian package -- I'm not
the maintainer.]

thanks Jamie for the patches! ... and sorry that we're replying so late.

Jamie Strandboge wrote (12 Oct 2010 20:10:55 GMT) :
> In Ubuntu, we've applied the attached patch to achieve the following:

>   * debian/patches/9002-libvirt_disk_format.patch: update to allow setting
>     the driver type with --disk format= (LP: #655392)

This one was removed from the Ubuntu packaging in 0.500.5-1ubuntu1,
with the following entry in debian/changelog:

  * Removed patches:
    - debian/patches/9002-libvirt_disk_format.patch: Upstream.

>   * debian/patches/9003-fix-path-to-hvmloader-in-testsuite.patch: adjust
>     testsuite for 0001-fix-path-to-hvmloader.patch and
>     0002-Fix-path-to-pygrub.patch

This one was removed in 0.600.4-2ubuntu1:

  * Dropped changes:
    - debian/patches/9003-fix-path-to-hvmloader-in-testsuite.patch,
      debian/patches/0004-Fix-path-to-qemu-dm.patch: xen binaries haven't
      been in /usr/lib/xen-default for a while, so either these patches
      were broken, or unnecessary.

I've confirmed that neither of these patches are in the current Ubuntu
packaging for virt-manager.

=> I'm closing this bug report. If I missed something, feel free to
   reopen, or to ask me to do it myself.

Cheers,
--
intrigeri

--- End Message ---

Reply via email to