Bastian Blank
2010-Jun-17 09:15 UTC
[Pkg-xen-changes] r774 - in trunk/xen/debian: . patches
Author: waldi
Date: Thu Jun 17 09:15:51 2010
New Revision: 774
Log:
* debian/changelog: Update.
* debian/patches/series: Update.
* debian/patches/tools-python-xen-relative-path.diff: Also change xend.
Added:
trunk/xen/debian/patches/tools-python-xen-relative-path.diff
- copied, changed from r769,
trunk/xen/debian/patches/tools-python-xen-xm-relative-path.diff
Deleted:
trunk/xen/debian/patches/tools-python-xen-xm-relative-path.diff
Modified:
trunk/xen/debian/changelog
trunk/xen/debian/patches/series
Modified: trunk/xen/debian/changelog
=============================================================================---
trunk/xen/debian/changelog Thu Jun 17 09:04:03 2010 (r773)
+++ trunk/xen/debian/changelog Thu Jun 17 09:15:51 2010 (r774)
@@ -3,6 +3,7 @@
* Update to unstable.
* Fix spelling in README.
* Remove unnecessary build-depends.
+ * Fixup xend to use different filename lookup.
-- Bastian Blank <waldi at debian.org> Fri, 04 Jun 2010 17:42:31 +0200
Modified: trunk/xen/debian/patches/series
=============================================================================---
trunk/xen/debian/patches/series Thu Jun 17 09:04:03 2010 (r773)
+++ trunk/xen/debian/patches/series Thu Jun 17 09:15:51 2010 (r774)
@@ -35,7 +35,7 @@
tools-libfsimage-abiname.diff
tools-libxc-abiname.diff
-tools-python-xen-xm-relative-path.diff
+tools-python-xen-relative-path.diff
tools-misc-xend-startup.diff
tools-disable.diff
Copied and modified:
trunk/xen/debian/patches/tools-python-xen-relative-path.diff (from r769,
trunk/xen/debian/patches/tools-python-xen-xm-relative-path.diff)
=============================================================================---
trunk/xen/debian/patches/tools-python-xen-xm-relative-path.diff Fri Jun 4
15:33:52 2010 (r769, copy source)
+++ trunk/xen/debian/patches/tools-python-xen-relative-path.diff Thu Jun 17
09:15:51 2010 (r774)
@@ -80,3 +80,77 @@
if vals.bootargs:
config.append([''bootloader_args'',
vals.bootargs])
else:
+--- a/tools/python/xen/xend/XendCheckpoint.py
++++ b/tools/python/xen/xend/XendCheckpoint.py
+@@ -118,7 +118,7 @@
+ # enabled. Passing "0" simply uses the defaults compiled
into
+ # libxenguest; see the comments and/or code in xc_linux_save() for
+ # more information.
+- cmd = [xen.util.auxbin.pathTo(XC_SAVE), str(fd),
++ cmd = [xen.util.auxbin.path_bin(XC_SAVE), str(fd),
+ str(dominfo.getDomid()), "0", "0",
+ str(int(live) | (int(hvm) << 2)) ]
+ log.debug("[xc_save]: %s", string.join(cmd))
+@@ -299,7 +299,7 @@
+
+ superpages = restore_image.superpages
+
+- cmd = map(str, [xen.util.auxbin.pathTo(XC_RESTORE),
++ cmd = map(str, [xen.util.auxbin.path_bin(XC_RESTORE),
+ fd, dominfo.getDomid(),
+ store_port, console_port, int(is_hvm), pae, apic,
superpages])
+ log.debug("[xc_restore]: %s", string.join(cmd))
+--- a/tools/python/xen/xend/XendConfig.py
++++ b/tools/python/xen/xend/XendConfig.py
+@@ -480,11 +480,11 @@
+
+ if self.is_hvm() or self.has_rfb():
+ if ''device_model'' not in
self[''platform'']:
+-
self[''platform''][''device_model''] =
auxbin.pathTo("qemu-dm")
++
self[''platform''][''device_model''] =
auxbin.path_bin("qemu-dm")
+ # device_model may be set to ''qemu-dm'' or
''stubdom-dm'' w/o a path
+ if
os.path.dirname(self[''platform''][''device_model''])
== "":
+
self[''platform''][''device_model''] = \
+-
auxbin.pathTo(self[''platform''][''device_model''])
++
auxbin.path_bin(self[''platform''][''device_model''])
+ if not
os.path.exists(self[''platform''][''device_model'']):
+ raise VmError("device model ''%s'' not
found" %
str(self[''platform''][''device_model'']))
+
+@@ -511,14 +511,14 @@
+ # Old configs may have hvmloader set as PV_kernel param
+ if self.has_key(''PV_kernel'') and
self[''PV_kernel''] != '''':
+ if self[''PV_kernel''] ==
''hvmloader'':
+- self[''PV_kernel''] =
auxbin.pathTo("hvmloader")
++ self[''PV_kernel''] =
auxbin.path_boot("hvmloader")
+
self[''platform''][''loader''] =
self[''PV_kernel'']
+ self[''PV_kernel''] = ''''
+ else:
+-
self[''platform''][''loader''] =
auxbin.pathTo("hvmloader")
++
self[''platform''][''loader''] =
auxbin.path_boot("hvmloader")
+ log.debug("Loader is %s" %
str(self[''platform''][''loader'']))
+ elif
self[''platform''][''loader''] ==
''hvmloader'':
+- self[''platform''][''loader'']
= auxbin.pathTo("hvmloader")
++ self[''platform''][''loader'']
= auxbin.path_boot("hvmloader")
+ if not
os.path.exists(self[''platform''][''loader'']):
+ raise VmError("kernel ''%s'' not
found" %
str(self[''platform''][''loader'']))
+
+@@ -1638,7 +1638,7 @@
+ # is invoked for pvfb services
+ if ''device_model'' not in
target[''platform'']:
+
target[''platform''][''device_model''] = \
+- auxbin.pathTo("qemu-dm")
++ auxbin.path_bin("qemu-dm")
+
+ # Finally, if we are a pvfb, we need to make a vkbd
+ # as well that is not really exposed to Xen API
+--- a/tools/python/xen/xend/XendDomainInfo.py
++++ b/tools/python/xen/xend/XendDomainInfo.py
+@@ -3215,7 +3215,7 @@
+ else:
+ # Boot using bootloader
+ if not blexec or blexec == ''pygrub'':
+- blexec = auxbin.pathTo(''pygrub'')
++ blexec = auxbin.path_bin(''pygrub'')
+
+ blcfg = None
+ disks = [x for x in self.info[''vbd_refs'']