[Pkg-libvirt-commits] [SCM] Virtinst Debian packaging branch, master, updated. debian/0.500.0-3-3-g370e65b
Laurent Léonard
laurent at open-minds.org
Thu Dec 3 23:21:26 UTC 2009
The following commit has been merged in the master branch:
commit 370e65bbd8213c3294e70dc2aec7ce35dc4e7715
Author: Laurent Léonard <laurent at open-minds.org>
Date: Fri Dec 4 00:10:57 2009 +0100
Drop patches.
0003-Don-t-use-virtio-for-cdrom-floppy-devices.patch - fixed upstream.
0004-Add-error-handling-to-VirtualDisk._clone_local.patch - applied upstream.
diff --git a/debian/patches/0001-fix-path-to-hvmloader.patch b/debian/patches/0001-fix-path-to-hvmloader.patch
index b201354..5a5638b 100644
--- a/debian/patches/0001-fix-path-to-hvmloader.patch
+++ b/debian/patches/0001-fix-path-to-hvmloader.patch
@@ -8,10 +8,10 @@ Closes: #487682
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/virtinst/FullVirtGuest.py b/virtinst/FullVirtGuest.py
-index d88d0dd..556708e 100644
+index 4ae6148..4cfe40e 100644
--- a/virtinst/FullVirtGuest.py
+++ b/virtinst/FullVirtGuest.py
-@@ -65,7 +65,7 @@ class FullVirtGuest(Guest):
+@@ -66,7 +66,7 @@ class FullVirtGuest(Guest):
self.emulator = "/usr/lib/xen/bin/qemu-dm"
if (not self.loader) and self.type == "xen":
diff --git a/debian/patches/0002-Fix-path-to-pygrub.patch b/debian/patches/0002-Fix-path-to-pygrub.patch
index 9a9332d..365fc57 100644
--- a/debian/patches/0002-Fix-path-to-pygrub.patch
+++ b/debian/patches/0002-Fix-path-to-pygrub.patch
@@ -7,10 +7,10 @@ Subject: [PATCH] Fix path to pygrub
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/virtinst/util.py b/virtinst/util.py
-index 808200f..08cf38f 100644
+index 0425334..f31dde9 100644
--- a/virtinst/util.py
+++ b/virtinst/util.py
-@@ -401,11 +401,11 @@ def pygrub_path(conn=None):
+@@ -402,11 +402,11 @@ def pygrub_path(conn=None):
if (cap.host.arch == "i86pc"):
return "/usr/lib/xen/bin/pygrub"
else:
diff --git a/debian/patches/0003-Don-t-use-virtio-for-cdrom-floppy-devices.patch b/debian/patches/0003-Don-t-use-virtio-for-cdrom-floppy-devices.patch
deleted file mode 100644
index f0c1618..0000000
--- a/debian/patches/0003-Don-t-use-virtio-for-cdrom-floppy-devices.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx at sigxcpu.org>
-Date: Wed, 4 Nov 2009 10:34:21 +0100
-Subject: [PATCH] Don't use virtio for cdrom/floppy devices
-
-Patch pulled from upstream HG.
-
-Closes: #553171
-Thanks: Harald Dunkel
----
- tests/xmlconfig-xml/install-f11.xml | 9 +++++++++
- tests/xmlconfig.py | 10 ++++++++--
- virtinst/FullVirtGuest.py | 4 +++-
- 3 files changed, 20 insertions(+), 3 deletions(-)
-
-diff --git a/tests/xmlconfig-xml/install-f11.xml b/tests/xmlconfig-xml/install-f11.xml
-index 9ec5fdd..21354e5 100644
---- a/tests/xmlconfig-xml/install-f11.xml
-+++ b/tests/xmlconfig-xml/install-f11.xml
-@@ -17,6 +17,10 @@
- <vcpu>5</vcpu>
- <devices>
- <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
-+ <disk type='file' device='floppy'>
-+ <source file='/default-pool/testvol1.img'/>
-+ <target dev='fda' bus='fdc'/>
-+ </disk>
- <disk type='file' device='disk'>
- <source file='/tmp/test.img'/>
- <target dev='vda' bus='virtio'/>
-@@ -25,6 +29,11 @@
- <source dev='/dev/loop0'/>
- <target dev='vdb' bus='virtio'/>
- </disk>
-+ <disk type='file' device='cdrom'>
-+ <source file='/default-pool/default-vol'/>
-+ <target dev='hdc' bus='ide'/>
-+ <readonly/>
-+ </disk>
- <interface type='network'>
- <source network='default'/>
- <mac address='11:22:33:44:55:66'/>
-diff --git a/tests/xmlconfig.py b/tests/xmlconfig.py
-index a2a05e0..a6570b1 100644
---- a/tests/xmlconfig.py
-+++ b/tests/xmlconfig.py
-@@ -58,6 +58,9 @@ def get_basic_fullyvirt_guest(typ="xen"):
- g.vcpus = 5
- return g
-
-+def get_floppy(path="/default-pool/testvol1.img"):
-+ return VirtualDisk(path, conn=conn, device=VirtualDisk.DEVICE_FLOPPY)
-+
- def get_filedisk(path="/tmp/test.img"):
- return VirtualDisk(path, size=.0001, conn=conn)
-
-@@ -327,8 +330,11 @@ class TestXMLConfig(unittest.TestCase):
- g = get_basic_fullyvirt_guest("kvm")
- g.os_type = "linux"
- g.os_variant = "fedora11"
-- g.installer = virtinst.PXEInstaller(type="kvm", os_type="hvm",
-- conn=g.conn)
-+ g.installer = virtinst.DistroInstaller(type="kvm", os_type="hvm",
-+ conn=g.conn,
-+ location="/default-pool/default-vol")
-+ g.installer.cdrom = True
-+ g.disks.append(get_floppy())
- g.disks.append(get_filedisk())
- g.disks.append(get_blkdisk())
- g.nics.append(get_virtual_network())
-diff --git a/virtinst/FullVirtGuest.py b/virtinst/FullVirtGuest.py
-index 556708e..4cfe40e 100644
---- a/virtinst/FullVirtGuest.py
-+++ b/virtinst/FullVirtGuest.py
-@@ -24,6 +24,7 @@ import DistroInstaller
-
- from Guest import Guest
- from VirtualDevice import VirtualDevice
-+from VirtualDisk import VirtualDisk
- from VirtualInputDevice import VirtualInputDevice
- from VirtualCharDevice import VirtualCharDevice
-
-@@ -122,7 +123,8 @@ class FullVirtGuest(Guest):
- if net_model and not net.model:
- net.model = net_model
- for disk in self._get_install_devs(VirtualDevice.VIRTUAL_DEV_DISK):
-- if disk_bus and not disk.bus:
-+ if (disk_bus and not disk.bus and
-+ disk.device == VirtualDisk.DEVICE_DISK):
- disk.bus = disk_bus
-
- # If no serial devices were attached to the guest, stick the default
---
diff --git a/debian/patches/0004-Add-error-handling-to-VirtualDisk._clone_local.patch b/debian/patches/0004-Add-error-handling-to-VirtualDisk._clone_local.patch
deleted file mode 100644
index 9a0f398..0000000
--- a/debian/patches/0004-Add-error-handling-to-VirtualDisk._clone_local.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx at sigxcpu.org>
-Date: Sat, 21 Nov 2009 14:06:41 +0100
-Subject: [PATCH] Add error handling to VirtualDisk._clone_local
-
-Closes: #555748
----
- virtinst/VirtualDisk.py | 46 +++++++++++++++++++++++++---------------------
- 1 files changed, 25 insertions(+), 21 deletions(-)
-
-diff --git a/virtinst/VirtualDisk.py b/virtinst/VirtualDisk.py
-index 67e2d03..781b11e 100644
---- a/virtinst/VirtualDisk.py
-+++ b/virtinst/VirtualDisk.py
-@@ -859,29 +859,33 @@ class VirtualDisk(VirtualDevice):
-
- zeros = '\0' * 4096
-
-+ src_fd, dst_fd = None, None
- try:
-- src_fd = os.open(self.clone_path, os.O_RDONLY)
-- dst_fd = os.open(self.path, os.O_WRONLY | os.O_CREAT)
--
-- i=0
-- while 1:
-- l = os.read(src_fd, clone_block_size)
-- s = len(l)
-- if s == 0:
-- meter.end(size_bytes)
-- break
-- # check sequence of zeros
-- if sparse and zeros == l:
-- os.lseek(dst_fd, s, 1)
-- else:
-- b = os.write(dst_fd, l)
-- if s != b:
-- meter.end(i)
-+ try:
-+ src_fd = os.open(self.clone_path, os.O_RDONLY)
-+ dst_fd = os.open(self.path, os.O_WRONLY | os.O_CREAT)
-+
-+ i=0
-+ while 1:
-+ l = os.read(src_fd, clone_block_size)
-+ s = len(l)
-+ if s == 0:
-+ meter.end(size_bytes)
- break
-- i += s
-- if i < size_bytes:
-- meter.update(i)
--
-+ # check sequence of zeros
-+ if sparse and zeros == l:
-+ os.lseek(dst_fd, s, 1)
-+ else:
-+ b = os.write(dst_fd, l)
-+ if s != b:
-+ meter.end(i)
-+ break
-+ i += s
-+ if i < size_bytes:
-+ meter.update(i)
-+ except OSError, e:
-+ raise RuntimeError(_("Error cloning diskimage %s to %s: %s") %
-+ (self.clone_path, self.path, str(e)))
- finally:
- if src_fd is not None:
- os.close(src_fd)
---
diff --git a/debian/patches/series b/debian/patches/series
index f2a1370..c258871 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,2 @@
0001-fix-path-to-hvmloader.patch
0002-Fix-path-to-pygrub.patch
-0003-Don-t-use-virtio-for-cdrom-floppy-devices.patch
-0004-Add-error-handling-to-VirtualDisk._clone_local.patch
--
Virtinst Debian packaging
More information about the Pkg-libvirt-commits
mailing list