WARNING - OLD ARCHIVES

This is an archived copy of the Xen.org mailing list, which we have preserved to ensure that existing links to archives are not broken. The live archive, which contains the latest emails, can be found at http://lists.xen.org/
   
 
 
Xen 
 
Home Products Support Community News
 
   
 

xen-devel

[Xen-devel] [PATCH] fix bugs in c/s 20321

To: xen-devel@xxxxxxxxxxxxxxxxxxx
Subject: [Xen-devel] [PATCH] fix bugs in c/s 20321
From: "James (song wei)" <jsong@xxxxxxxxxx>
Date: Sun, 29 Nov 2009 23:40:38 -0800 (PST)
Delivery-date: Mon, 30 Nov 2009 01:16:03 -0800
Envelope-to: www-data@xxxxxxxxxxxxxxxxxxx
List-help: <mailto:xen-devel-request@lists.xensource.com?subject=help>
List-id: Xen developer discussion <xen-devel.lists.xensource.com>
List-post: <mailto:xen-devel@lists.xensource.com>
List-subscribe: <http://lists.xensource.com/mailman/listinfo/xen-devel>, <mailto:xen-devel-request@lists.xensource.com?subject=subscribe>
List-unsubscribe: <http://lists.xensource.com/mailman/listinfo/xen-devel>, <mailto:xen-devel-request@lists.xensource.com?subject=unsubscribe>
Sender: xen-devel-bounces@xxxxxxxxxxxxxxxxxxx
fix bugs in c/s 20321

Signed-off-by: james song (wei)<jsong@xxxxxxxxxx>

diff -r d0b030008814 tools/python/xen/xend/XendConfig.py
--- a/tools/python/xen/xend/XendConfig.py       Fri Nov 27 08:09:26 2009 +0000
+++ b/tools/python/xen/xend/XendConfig.py       Mon Nov 30 14:15:21 2009 +0800
@@ -127,6 +127,7 @@
     'actions_after_crash': 'on_crash', 
     'PV_bootloader': 'bootloader',
     'PV_bootloader_args': 'bootloader_args',
+    'Description': 'description',
 }
 
 LEGACY_CFG_TO_XENAPI_CFG = reverse_dict(XENAPI_CFG_TO_LEGACY_CFG)
@@ -178,7 +179,6 @@
     'pci_power_mgmt': int,
     'xen_platform_pci': int,
     "gfx_passthru": int,
-    'description': str,
     'oos' : int,
 }
 
@@ -275,6 +275,7 @@
     'rtc/timeoffset': str,
     'bootloader':    str,
     'bootloader_args': str,
+    'description':   str,
 }
 
 # Values that should be stored in xenstore's /vm/<uuid> that is used
@@ -405,6 +406,7 @@
             'platform': {},
             'target': 0,
             'superpages': 0,
+            'description': '',
         }
         
         return defaults
@@ -496,8 +498,6 @@
                 self['platform']['xen_platform_pci'] = 1
             if 'vpt_align' not in self['platform']:
                 self['platform']['vpt_align'] = 1
-            if 'description' not in self['platform']:
-                self['platform']['description'] = ''
             if 'loader' not in self['platform']:
                 # Old configs may have hvmloader set as PV_kernel param
                 if self.has_key('PV_kernel') and self['PV_kernel'] != '':
@@ -876,6 +876,7 @@
 
         update_with('PV_bootloader',      'bootloader')
         update_with('PV_bootloader_args', 'bootloader_args')
+        update_with('Description', 'description')
 
         image_sxp = sxp.child_value(sxp_cfg, 'image', [])
         if image_sxp:
@@ -966,6 +967,7 @@
         _set_cfg_if_exists('on_xend_start')
         _set_cfg_if_exists('vcpu_avail')
         _set_cfg_if_exists('change_home_server')
+        _set_cfg_if_exists('description')
         
         # Parse and store runtime configuration 
         _set_cfg_if_exists('start_time')
diff -r d0b030008814 tools/python/xen/xend/XendDomainInfo.py
--- a/tools/python/xen/xend/XendDomainInfo.py   Fri Nov 27 08:09:26 2009 +0000
+++ b/tools/python/xen/xend/XendDomainInfo.py   Mon Nov 30 14:15:21 2009 +0800
@@ -1667,6 +1667,7 @@
             'name':               self.info['name_label'],
             'console/limit':      str(xoptions.get_console_limit() * 1024),
             'memory/target':      str(self.info['memory_dynamic_max'] /
1024),
+            'description':        str(self.info['description']),
             }
 
         def f(n, v):
diff -r d0b030008814 tools/python/xen/xm/create.py
--- a/tools/python/xen/xm/create.py     Fri Nov 27 08:09:26 2009 +0000
+++ b/tools/python/xen/xm/create.py     Mon Nov 30 14:15:21 2009 +0800
@@ -997,7 +997,7 @@
     args = [ 'acpi', 'apic',
              'boot',
              'cpuid', 'cpuid_check',
-             'description', 'device_model', 'display',
+             'device_model', 'display',
              'fda', 'fdb',
              'gfx_passthru', 'guest_os_type',
              'hap', 'hpet',
@@ -1058,7 +1058,7 @@
                    'restart', 'on_poweroff',  'tsc_mode', 'nomigrate',
                    'on_reboot', 'on_crash', 'features', 'on_xend_start',
                    'on_xend_stop', 'target', 'cpuid', 'cpuid_check',
-                   'machine_address_size',
'suppress_spurious_page_faults'])
+                   'machine_address_size',
'suppress_spurious_page_faults','description'])
 
     vcpu_conf()
     if vals.uuid is not None:



http://old.nabble.com/file/p26570556/add_description.patch
add_description.patch 

-- 
View this message in context: 
http://old.nabble.com/-PATCH--fix-bugs-in-c-s-20321-tp26570556p26570556.html
Sent from the Xen - Dev mailing list archive at Nabble.com.


_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-devel

<Prev in Thread] Current Thread [Next in Thread>
  • [Xen-devel] [PATCH] fix bugs in c/s 20321, James (song wei) <=