ia64/xen-unstable

changeset 5759:f23750d7c214

pdb: execution_domain -> vcpu
author ach61@arcadians.cl.cam.ac.uk
date Tue Jul 12 17:00:33 2005 +0000 (2005-07-12)
parents d80e38e4b31d
children 3b48277a9dd0
files tools/debugger/pdb/Domain.ml tools/debugger/pdb/Domain.mli tools/debugger/pdb/PDB.ml
line diff
     1.1 --- a/tools/debugger/pdb/Domain.ml	Tue Jul 12 16:50:38 2005 +0000
     1.2 +++ b/tools/debugger/pdb/Domain.ml	Tue Jul 12 17:00:33 2005 +0000
     1.3 @@ -13,28 +13,28 @@ open Intel
     1.4  type context_t =
     1.5  {
     1.6    mutable domain : int;
     1.7 -  mutable execution_domain : int
     1.8 +  mutable vcpu : int
     1.9  }
    1.10  
    1.11 -let default_context = { domain = 0; execution_domain = 0 }
    1.12 +let default_context = { domain = 0; vcpu = 0 }
    1.13  
    1.14 -let new_context dom exec_dom = {domain = dom; execution_domain = exec_dom}
    1.15 +let new_context new_dom new_vcpu = {domain = new_dom; vcpu = new_vcpu}
    1.16  
    1.17  let set_domain ctx value =
    1.18    ctx.domain <- value
    1.19  
    1.20 -let set_execution_domain ctx value =
    1.21 -  ctx.execution_domain <- value
    1.22 +let set_vcpu ctx value =
    1.23 +  ctx.vcpu <- value
    1.24  
    1.25  let get_domain ctx =
    1.26    ctx.domain
    1.27  
    1.28 -let get_execution_domain ctx =
    1.29 -  ctx.execution_domain
    1.30 +let get_vcpu ctx =
    1.31 +  ctx.vcpu
    1.32  
    1.33  let string_of_context ctx =
    1.34 -      Printf.sprintf "{domain} domain: %d, execution_domain: %d"
    1.35 -                      ctx.domain  ctx.execution_domain
    1.36 +      Printf.sprintf "{domain} domain: %d, vcpu: %d"
    1.37 +                      ctx.domain  ctx.vcpu
    1.38  
    1.39  external read_registers : context_t -> registers = "dom_read_registers"
    1.40  external write_register : context_t -> register -> int32 -> unit =
     2.1 --- a/tools/debugger/pdb/Domain.mli	Tue Jul 12 16:50:38 2005 +0000
     2.2 +++ b/tools/debugger/pdb/Domain.mli	Tue Jul 12 17:00:33 2005 +0000
     2.3 @@ -17,8 +17,8 @@ val new_context : int -> int -> context_
     2.4  
     2.5  val set_domain : context_t -> int -> unit
     2.6  val get_domain : context_t -> int
     2.7 -val set_execution_domain : context_t -> int -> unit
     2.8 -val get_execution_domain : context_t -> int
     2.9 +val set_vcpu : context_t -> int -> unit
    2.10 +val get_vcpu : context_t -> int
    2.11  
    2.12  val string_of_context : context_t -> string
    2.13  
     3.1 --- a/tools/debugger/pdb/PDB.ml	Tue Jul 12 16:50:38 2005 +0000
     3.2 +++ b/tools/debugger/pdb/PDB.ml	Tue Jul 12 17:00:33 2005 +0000
     3.3 @@ -56,7 +56,7 @@ let find_domain dom vcpu =
     3.4        match ctx with
     3.5        |	Domain d ->
     3.6  	  if (((Domain.get_domain d) = dom) &&
     3.7 -	      ((Domain.get_execution_domain d) = vcpu))
     3.8 +	      ((Domain.get_vcpu d) = vcpu))
     3.9  	  then
    3.10  	    key :: list
    3.11  	  else
    3.12 @@ -93,7 +93,7 @@ let find_xen_domain_context domain =
    3.13  let attach_debugger ctx =
    3.14    match ctx with
    3.15    | Domain d  -> Domain.attach_debugger (Domain.get_domain d) 
    3.16 -	                                (Domain.get_execution_domain d)
    3.17 +	                                (Domain.get_vcpu d)
    3.18    | Process p ->
    3.19        begin
    3.20  	let xdom_sock = find_xen_domain_context (Process.get_domain p) in
    3.21 @@ -108,7 +108,7 @@ let attach_debugger ctx =
    3.22  let detach_debugger ctx =
    3.23    match ctx with
    3.24    | Domain d  -> Domain.detach_debugger (Domain.get_domain d) 
    3.25 -	                                (Domain.get_execution_domain d)
    3.26 +	                                (Domain.get_vcpu d)
    3.27    | Process p  -> Process.detach_debugger p
    3.28    | _ -> raise (Unimplemented "detach debugger")
    3.29