rpms/xen/FC-6 xen-print-fullpath.patch, NONE, 1.1 xen-uptime-device.patch, NONE, 1.1

[fedora-cvs-commits at redhat.com]

Author: quintela

Update of /cvs/dist/rpms/xen/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv31964

Added Files:
	xen-print-fullpath.patch xen-uptime-device.patch 
Log Message:
included on spec file but not used (yet) patches

xen-print-fullpath.patch:
 opts.py |    6 ++++++
 1 files changed, 6 insertions(+)

--- NEW FILE xen-print-fullpath.patch ---
# HG changeset patch
# User kfraser at localhost.localdomain
# Date 1161603812 -3600
# Node ID 356520dca6df8504a461228ae76d3ecd86626386
# Parent  babae8ac84b95ff4fbc1cfe4ac27c59ceaba7e38
[XM] Print qualified path to config file on domain creation.
From: Glauber de Oliveira Costa <gcosta at redhat.com>
Signed-off-by: Keir Fraser <keir at xensource.com>

diff -r babae8ac84b9 -r 356520dca6df tools/python/xen/xm/opts.py
--- a/tools/python/xen/xm/opts.py	Mon Oct 23 12:28:33 2006 +0100
+++ b/tools/python/xen/xm/opts.py	Mon Oct 23 12:43:32 2006 +0100
@@ -488,6 +488,8 @@ class Opts:
                 p = os.path.join(x, self.vals.defconfig)
             else:
                 p = self.vals.defconfig
+            if not p.startswith('/'):
+                p = os.path.join(os.path.curdir, p)
             if os.path.exists(p):
                 self.info('Using config file "%s".' % p)
                 self.load(p, help)
@@ -518,6 +520,10 @@ class Opts:
         exec cmd in globs, locs
         try:
             execfile(defconfig, globs, locs)
+        except SyntaxError,e:
+                raise SyntaxError, \
+                "Errors were found at line %d while processing %s:\n\t%s"\
+                %(e.lineno,defconfig,e.text)
         except:
             if not help: raise
         if help:

xen-uptime-device.patch:
 XendDomainInfo.py |    2 ++
 server/blkif.py   |    3 +++
 2 files changed, 5 insertions(+)

--- NEW FILE xen-uptime-device.patch ---
# HG changeset patch
# User kfraser at localhost.localdomain
# Date 1161269592 -3600
# Node ID f5321161c649fe4f07027250c4a1f3c4b5fc2ed9
# Parent  a855c7d3a5365e002736435343e5e19f008011e6
[XEND] Two small fixes/improvements from Glauber de Oliveira Costa.
Signed-off-by: Keir Fraser <keir at xensource.com>

diff -r a855c7d3a536 -r f5321161c649 tools/python/xen/xend/XendDomainInfo.py
--- a/tools/python/xen/xend/XendDomainInfo.py	Thu Oct 19 15:49:16 2006 +0100
+++ b/tools/python/xen/xend/XendDomainInfo.py	Thu Oct 19 15:53:12 2006 +0100
@@ -391,6 +391,8 @@ def parseConfig(config):
         else:
             log.warn("Ignoring malformed and deprecated config option "
                      "restart = %s", restart)
+
+    result['start_time'] = get_cfg('start_time', float)
 
     log.debug("parseConfig: result is %s", result)
     return result
diff -r a855c7d3a536 -r f5321161c649 tools/python/xen/xend/server/blkif.py
--- a/tools/python/xen/xend/server/blkif.py	Thu Oct 19 15:49:16 2006 +0100
+++ b/tools/python/xen/xend/server/blkif.py	Thu Oct 19 15:53:12 2006 +0100
@@ -81,6 +81,9 @@ class BlkifController(DevController):
                          'acm_policy' : policy})
 
         devid = blkif.blkdev_name_to_number(dev)
+        if not devid:
+            raise VmError('Unable to find number for device (%s)' % (dev))
+
         front = { 'virtual-device' : "%i" % devid,
                   'device-type' : dev_type
                 }