ia64/xen-unstable

changeset 14511:4e874484f4da

Merge with xenppc-unstable-merge.hg
author kfraser@localhost.localdomain
date Wed Mar 21 23:59:03 2007 +0000 (2007-03-21)
parents 49ec3725d0c0 e9a5ba552808
children 6519867be0fe
files
line diff
     1.1 --- a/linux-2.6-xen-sparse/arch/x86_64/kernel/head64-xen.c	Wed Mar 21 18:08:31 2007 -0500
     1.2 +++ b/linux-2.6-xen-sparse/arch/x86_64/kernel/head64-xen.c	Wed Mar 21 23:59:03 2007 +0000
     1.3 @@ -105,13 +105,11 @@ void __init x86_64_start_kernel(char * r
     1.4  	int i;
     1.5  
     1.6  	xen_start_info = (struct start_info *)real_mode_data;
     1.7 -	if (!xen_feature(XENFEAT_auto_translated_physmap)) {
     1.8 +	if (!xen_feature(XENFEAT_auto_translated_physmap))
     1.9  		phys_to_machine_mapping =
    1.10  			(unsigned long *)xen_start_info->mfn_list;
    1.11 -		start_pfn = (__pa(xen_start_info->pt_base) >> PAGE_SHIFT) +
    1.12 -			xen_start_info->nr_pt_frames;
    1.13 -	}
    1.14 -
    1.15 +	start_pfn = (__pa(xen_start_info->pt_base) >> PAGE_SHIFT) +
    1.16 +		xen_start_info->nr_pt_frames;
    1.17  
    1.18  	machine_to_phys_mapping = (unsigned long *)MACH2PHYS_VIRT_START;
    1.19  	machine_to_phys_nr_ents = MACH2PHYS_NR_ENTRIES;
     2.1 --- a/tools/python/xen/xend/XendAPI.py	Wed Mar 21 18:08:31 2007 -0500
     2.2 +++ b/tools/python/xen/xend/XendAPI.py	Wed Mar 21 23:59:03 2007 +0000
     2.3 @@ -665,6 +665,7 @@ class XendAPI(object):
     2.4                      ('add_to_other_config', None),
     2.5                      ('remove_from_other_config', None),
     2.6                      ('dmesg', 'String'),
     2.7 +                    ('dmesg_clear', 'String'),
     2.8                      ('get_log', 'String'),
     2.9                      ('send_debug_keys', None)]
    2.10      
    2.11 @@ -742,11 +743,11 @@ class XendAPI(object):
    2.12              return xen_api_error(XEND_ERROR_HOST_RUNNING)
    2.13          return xen_api_error(XEND_ERROR_UNSUPPORTED)        
    2.14  
    2.15 -    def host_dmesg(self, session, host_ref, clear):
    2.16 -        if clear:
    2.17 -            return xen_api_success(XendDmesg.instance().clear())
    2.18 -        else:
    2.19 -            return xen_api_success(XendDmesg.instance().info())
    2.20 +    def host_dmesg(self, session, host_ref):
    2.21 +        return xen_api_success(XendDmesg.instance().info())
    2.22 +
    2.23 +    def host_dmesg_clear(self, session, host_ref):
    2.24 +        return xen_api_success(XendDmesg.instance().clear())
    2.25  
    2.26      def host_get_log(self, session, host_ref):
    2.27          log_file = open(XendLogging.getLogFilename())
     3.1 --- a/tools/python/xen/xend/XendDmesg.py	Wed Mar 21 18:08:31 2007 -0500
     3.2 +++ b/tools/python/xen/xend/XendDmesg.py	Wed Mar 21 23:59:03 2007 +0000
     3.3 @@ -13,6 +13,7 @@
     3.4  # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
     3.5  #============================================================================
     3.6  # Copyright (C) 2004, 2005 Mike Wray <mike.wray@hp.com>
     3.7 +# Copyright (C) 2007       XenSource Inc.
     3.8  #============================================================================
     3.9  
    3.10  """Get dmesg output for this node.
    3.11 @@ -28,7 +29,7 @@ class XendDmesg:
    3.12          return self.xc.readconsolering()
    3.13  
    3.14      def clear(self):
    3.15 -        self.xc.readconsolering(True)
    3.16 +        return self.xc.readconsolering(True)
    3.17  
    3.18  def instance():
    3.19      global inst
     4.1 --- a/tools/python/xen/xm/main.py	Wed Mar 21 18:08:31 2007 -0500
     4.2 +++ b/tools/python/xen/xm/main.py	Wed Mar 21 23:59:03 2007 +0000
     4.3 @@ -217,7 +217,7 @@ SUBCOMMAND_OPTIONS = {
     4.4         ('-q', '--quiet', 'Do not print an error message if the domain does not exist'),
     4.5      ),
     4.6      'dmesg': (
     4.7 -       ('-c', '--clear', 'Clear dmesg buffer'),
     4.8 +       ('-c', '--clear', 'Clear dmesg buffer as well as printing it'),
     4.9      ),
    4.10      'vnet-list': (
    4.11         ('-l', '--long', 'List Vnets as SXP'),
    4.12 @@ -1587,17 +1587,16 @@ def xm_dmesg(args):
    4.13          usage('dmesg')
    4.14  
    4.15      if serverType == SERVER_XEN_API:
    4.16 -        if not use_clear:
    4.17 -            print server.xenapi.host.dmesg(
    4.18 -                server.xenapi.session.get_this_host(),0)
    4.19 +        host = server.xenapi.session.get_this_host()
    4.20 +        if use_clear:
    4.21 +            print server.xenapi.host.dmesg_clear(host),
    4.22          else:
    4.23 -            server.xenapi.host.dmesg(
    4.24 -                server.xenapi.session.get_this_host(),1)
    4.25 +            print server.xenapi.host.dmesg(host),
    4.26      else:
    4.27          if not use_clear:
    4.28 -            print server.xend.node.dmesg.info()
    4.29 +            print server.xend.node.dmesg.info(),
    4.30          else:
    4.31 -            server.xend.node.dmesg.clear()
    4.32 +            print server.xend.node.dmesg.clear(),
    4.33  
    4.34  def xm_log(args):
    4.35      arg_check(args, "log", 0)
     5.1 --- a/xen/arch/x86/mm/shadow/types.h	Wed Mar 21 18:08:31 2007 -0500
     5.2 +++ b/xen/arch/x86/mm/shadow/types.h	Wed Mar 21 23:59:03 2007 +0000
     5.3 @@ -597,7 +597,7 @@ accumulate_guest_flags(struct vcpu *v, w
     5.4   * have reserved bits that we can use for this.
     5.5   */
     5.6  
     5.7 -#define SH_L1E_MAGIC 0xffffffff00000000ULL
     5.8 +#define SH_L1E_MAGIC 0xffffffff00000001ULL
     5.9  static inline int sh_l1e_is_magic(shadow_l1e_t sl1e)
    5.10  {
    5.11      return ((sl1e.l1 & SH_L1E_MAGIC) == SH_L1E_MAGIC);