1.1 --- a/tools/debugger/gdb/gdb-6.2.1-xen-sparse/gdb/gdbserver/linux-xen-low.c	Fri Aug 25 10:39:24 2006 +0100
     1.2 +++ b/tools/debugger/gdb/gdb-6.2.1-xen-sparse/gdb/gdbserver/linux-xen-low.c	Fri Aug 25 18:39:10 2006 +0100
     1.3 @@ -54,15 +54,6 @@ curvcpuid()
     1.4  
     1.5  }
     1.6  
     1.7 -
     1.8 -#define DOMFLAGS_DYING     (1<<0) /* Domain is scheduled to die.             */
     1.9 -#define DOMFLAGS_SHUTDOWN  (1<<2) /* The guest OS has shut down.             */
    1.10 -#define DOMFLAGS_PAUSED    (1<<3) /* Currently paused by control software.   */
    1.11 -#define DOMFLAGS_BLOCKED   (1<<4) /* Currently blocked pending an event.     */
    1.12 -#define DOMFLAGS_RUNNING   (1<<5) /* Domain is currently running.            */
    1.13 -
    1.14 -
    1.15 -
    1.16  struct inferior_list all_processes;
    1.17  static int current_domid;
    1.18  static int expect_signal = 0;

     2.1 --- a/tools/debugger/libxendebug/Makefile	Fri Aug 25 10:39:24 2006 +0100
     2.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.3 @@ -1,75 +0,0 @@
     2.4 -
     2.5 -INSTALL		= install
     2.6 -INSTALL_PROG	= $(INSTALL) -m0755
     2.7 -INSTALL_DATA	= $(INSTALL) -m0644
     2.8 -INSTALL_DIR	= $(INSTALL) -d -m0755
     2.9 -
    2.10 -MAJOR    = 3.0
    2.11 -MINOR    = 0
    2.12 -
    2.13 -XEN_ROOT = ../../..
    2.14 -include $(XEN_ROOT)/tools/Rules.mk
    2.15 -
    2.16 -SRCS     := xendebug.c
    2.17 -
    2.18 -CFLAGS   += -Werror -fno-strict-aliasing
    2.19 -CFLAGS   += $(INCLUDES) -I. -I$(XEN_ROOT)/tools/libxc
    2.20 -# Get gcc to generate the dependencies for us.
    2.21 -CFLAGS   += -Wp,-MD,.$(@F).d
    2.22 -DEPS     = .*.d
    2.23 -
    2.24 -LDFLAGS  += -L$(XEN_ROOT)/tools/libxc -lxenctrl
    2.25 -
    2.26 -LIB_OBJS := $(patsubst %.c,%.o,$(SRCS))
    2.27 -PIC_OBJS := $(patsubst %.c,%.opic,$(SRCS))
    2.28 -
    2.29 -LIB      := libxendebug.a libxendebug.so
    2.30 -LIB      += libxendebug.so.$(MAJOR) libxendebug.so.$(MAJOR).$(MINOR)
    2.31 -
    2.32 -.PHONY: all
    2.33 -all: build
    2.34 -
    2.35 -.PHONY: build
    2.36 -build:
    2.37 -	$(MAKE) $(LIB)
    2.38 -
    2.39 -.PHONY: install
    2.40 -install: build
    2.41 -	[ -d $(DESTDIR)/usr/$(LIBDIR) ] || $(INSTALL_DIR) $(DESTDIR)/usr/$(LIBDIR)
    2.42 -	[ -d $(DESTDIR)/usr/include ] || $(INSTALL_DIR) $(DESTDIR)/usr/include
    2.43 -	$(INSTALL_PROG) libxendebug.so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/$(LIBDIR)
    2.44 -	$(INSTALL_DATA) libxendebug.a $(DESTDIR)/usr/$(LIBDIR)
    2.45 -	ln -sf libxendebug.so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/$(LIBDIR)/libxendebug.so.$(MAJOR)
    2.46 -	ln -sf libxendebug.so.$(MAJOR) $(DESTDIR)/usr/$(LIBDIR)/libxendebug.so
    2.47 -	$(INSTALL_DATA) xendebug.h $(DESTDIR)/usr/include
    2.48 -
    2.49 -.PHONY: TAGS
    2.50 -TAGS:
    2.51 -	etags -t $(SRCS) *.h
    2.52 -
    2.53 -.PHONY: clean
    2.54 -clean:
    2.55 -	rm -rf *.a *.so* *.o *.opic *.rpm $(LIB) *~ $(DEPS) xen
    2.56 -
    2.57 -.PHONY: rpm
    2.58 -rpm: build
    2.59 -	rm -rf staging
    2.60 -	mkdir staging
    2.61 -	mkdir staging/i386
    2.62 -	rpmbuild --define "staging$$PWD/staging" --define '_builddir.' \
    2.63 -		--define "_rpmdir$$PWD/staging" -bb rpm.spec
    2.64 -	mv staging/i386/*.rpm .
    2.65 -	rm -rf staging
    2.66 -
    2.67 -libxendebug.a: $(LIB_OBJS)
    2.68 -	$(AR) rc $@ $^
    2.69 -
    2.70 -libxendebug.so: libxendebug.so.$(MAJOR)
    2.71 -	ln -sf $< $@
    2.72 -libxendebug.so.$(MAJOR): libxendebug.so.$(MAJOR).$(MINOR)
    2.73 -	ln -sf $< $@
    2.74 -
    2.75 -libxendebug.so.$(MAJOR).$(MINOR): $(PIC_OBJS)
    2.76 -	$(CC) $(CFLAGS) $(LDFLAGS) -Wl,-soname -Wl,libxendebug.so.$(MAJOR) -shared -o $@ $^
    2.77 -
    2.78 --include $(DEPS)

     3.1 --- a/tools/debugger/libxendebug/list.h	Fri Aug 25 10:39:24 2006 +0100
     3.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     3.3 @@ -1,186 +0,0 @@
     3.4 -#ifndef _LINUX_LIST_H
     3.5 -#define _LINUX_LIST_H
     3.6 -
     3.7 -/*
     3.8 - * Simple doubly linked list implementation.
     3.9 - *
    3.10 - * Some of the internal functions ("__xxx") are useful when
    3.11 - * manipulating whole lists rather than single entries, as
    3.12 - * sometimes we already know the next/prev entries and we can
    3.13 - * generate better code by using them directly rather than
    3.14 - * using the generic single-entry routines.
    3.15 - */
    3.16 -
    3.17 -struct list_head {
    3.18 -	struct list_head *next, *prev;
    3.19 -};
    3.20 -
    3.21 -#define LIST_HEAD_INIT(name) { &(name), &(name) }
    3.22 -
    3.23 -#define LIST_HEAD(name) \
    3.24 -	struct list_head name = LIST_HEAD_INIT(name)
    3.25 -
    3.26 -#define INIT_LIST_HEAD(ptr) do { \
    3.27 -	(ptr)->next = (ptr); (ptr)->prev = (ptr); \
    3.28 -} while (0)
    3.29 -
    3.30 -/*
    3.31 - * Insert a new entry between two known consecutive entries. 
    3.32 - *
    3.33 - * This is only for internal list manipulation where we know
    3.34 - * the prev/next entries already!
    3.35 - */
    3.36 -static __inline__ void __list_add(struct list_head * new,
    3.37 -	struct list_head * prev,
    3.38 -	struct list_head * next)
    3.39 -{
    3.40 -	next->prev = new;
    3.41 -	new->next = next;
    3.42 -	new->prev = prev;
    3.43 -	prev->next = new;
    3.44 -}
    3.45 -
    3.46 -/**
    3.47 - * list_add - add a new entry
    3.48 - * @new: new entry to be added
    3.49 - * @head: list head to add it after
    3.50 - *
    3.51 - * Insert a new entry after the specified head.
    3.52 - * This is good for implementing stacks.
    3.53 - */
    3.54 -static __inline__ void list_add(struct list_head *new, struct list_head *head)
    3.55 -{
    3.56 -	__list_add(new, head, head->next);
    3.57 -}
    3.58 -
    3.59 -/**
    3.60 - * list_add_tail - add a new entry
    3.61 - * @new: new entry to be added
    3.62 - * @head: list head to add it before
    3.63 - *
    3.64 - * Insert a new entry before the specified head.
    3.65 - * This is useful for implementing queues.
    3.66 - */
    3.67 -static __inline__ void list_add_tail(struct list_head *new, struct list_head *head)
    3.68 -{
    3.69 -	__list_add(new, head->prev, head);
    3.70 -}
    3.71 -
    3.72 -/*
    3.73 - * Delete a list entry by making the prev/next entries
    3.74 - * point to each other.
    3.75 - *
    3.76 - * This is only for internal list manipulation where we know
    3.77 - * the prev/next entries already!
    3.78 - */
    3.79 -static __inline__ void __list_del(struct list_head * prev,
    3.80 -				  struct list_head * next)
    3.81 -{
    3.82 -	next->prev = prev;
    3.83 -	prev->next = next;
    3.84 -}
    3.85 -
    3.86 -/**
    3.87 - * list_del - deletes entry from list.
    3.88 - * @entry: the element to delete from the list.
    3.89 - * Note: list_empty on entry does not return true after this, the entry is in an undefined state.
    3.90 - */
    3.91 -static __inline__ void list_del(struct list_head *entry)
    3.92 -{
    3.93 -	__list_del(entry->prev, entry->next);
    3.94 -}
    3.95 -
    3.96 -/**
    3.97 - * list_del_init - deletes entry from list and reinitialize it.
    3.98 - * @entry: the element to delete from the list.
    3.99 - */
   3.100 -static __inline__ void list_del_init(struct list_head *entry)
   3.101 -{
   3.102 -	__list_del(entry->prev, entry->next);
   3.103 -	INIT_LIST_HEAD(entry); 
   3.104 -}
   3.105 -
   3.106 -/**
   3.107 - * list_empty - tests whether a list is empty
   3.108 - * @head: the list to test.
   3.109 - */
   3.110 -static __inline__ int list_empty(struct list_head *head)
   3.111 -{
   3.112 -	return head->next == head;
   3.113 -}
   3.114 -
   3.115 -/**
   3.116 - * list_splice - join two lists
   3.117 - * @list: the new list to add.
   3.118 - * @head: the place to add it in the first list.
   3.119 - */
   3.120 -static __inline__ void list_splice(struct list_head *list, struct list_head *head)
   3.121 -{
   3.122 -	struct list_head *first = list->next;
   3.123 -
   3.124 -	if (first != list) {
   3.125 -		struct list_head *last = list->prev;
   3.126 -		struct list_head *at = head->next;
   3.127 -
   3.128 -		first->prev = head;
   3.129 -		head->next = first;
   3.130 -
   3.131 -		last->next = at;
   3.132 -		at->prev = last;
   3.133 -	}
   3.134 -}
   3.135 -
   3.136 -/**
   3.137 - * list_entry - get the struct for this entry
   3.138 - * @ptr:	the &struct list_head pointer.
   3.139 - * @type:	the type of the struct this is embedded in.
   3.140 - * @member:	the name of the list_struct within the struct.
   3.141 - */
   3.142 -#define list_entry(ptr, type, member) \
   3.143 -	((type *)((char *)(ptr)-(unsigned long)(&((type *)0)->member)))
   3.144 -
   3.145 -/**
   3.146 - * list_for_each	-	iterate over a list
   3.147 - * @pos:	the &struct list_head to use as a loop counter.
   3.148 - * @head:	the head for your list.
   3.149 - */
   3.150 -#define list_for_each(pos, head) \
   3.151 -	for (pos = (head)->next; pos != (head); pos = pos->next)
   3.152 -        	
   3.153 -/**
   3.154 - * list_for_each_safe	-	iterate over a list safe against removal of list entry
   3.155 - * @pos:	the &struct list_head to use as a loop counter.
   3.156 - * @n:		another &struct list_head to use as temporary storage
   3.157 - * @head:	the head for your list.
   3.158 - */
   3.159 -#define list_for_each_safe(pos, n, head) \
   3.160 -	for (pos = (head)->next, n = pos->next; pos != (head); \
   3.161 -		pos = n, n = pos->next)
   3.162 -
   3.163 -/**
   3.164 - * list_for_each_entry	-	iterate over list of given type
   3.165 - * @pos:	the type * to use as a loop counter.
   3.166 - * @head:	the head for your list.
   3.167 - * @member:	the name of the list_struct within the struct.
   3.168 - */
   3.169 -#define list_for_each_entry(pos, head, member)				\
   3.170 -	for (pos = list_entry((head)->next, typeof(*pos), member),	\
   3.171 -		     prefetch(pos->member.next);			\
   3.172 -	     &pos->member != (head); 					\
   3.173 -	     pos = list_entry(pos->member.next, typeof(*pos), member),	\
   3.174 -		     prefetch(pos->member.next))
   3.175 -
   3.176 -/**
   3.177 - * list_for_each_entry_safe - iterate over list of given type safe against removal of list entry
   3.178 - * @pos:	the type * to use as a loop counter.
   3.179 - * @n:		another type * to use as temporary storage
   3.180 - * @head:	the head for your list.
   3.181 - * @member:	the name of the list_struct within the struct.
   3.182 - */
   3.183 -#define list_for_each_entry_safe(pos, n, head, member)			\
   3.184 -	for (pos = list_entry((head)->next, typeof(*pos), member),	\
   3.185 -		n = list_entry(pos->member.next, typeof(*pos), member);	\
   3.186 -	     &pos->member != (head); 					\
   3.187 -	     pos = n, n = list_entry(n->member.next, typeof(*n), member))
   3.188 -#endif /* _LINUX_LIST_H */
   3.189 -

     4.1 --- a/tools/debugger/libxendebug/xendebug.c	Fri Aug 25 10:39:24 2006 +0100
     4.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     4.3 @@ -1,599 +0,0 @@
     4.4 -/*
     4.5 - * xendebug.c
     4.6 - *
     4.7 - * alex ho
     4.8 - * http://www.cl.cam.ac.uk/netos/pdb
     4.9 - *
    4.10 - * xendebug_memory_page adapted from xc_ptrace.c
    4.11 - */
    4.12 -
    4.13 -#include <stdio.h>
    4.14 -#include <stdlib.h>
    4.15 -#include <string.h>
    4.16 -#include <errno.h>
    4.17 -#include <sys/mman.h>
    4.18 -#include <xenctrl.h>
    4.19 -#include "list.h"
    4.20 -
    4.21 -#if defined(__i386__)
    4.22 -#define L1_PAGETABLE_SHIFT       12
    4.23 -#define L2_PAGETABLE_SHIFT       22
    4.24 -#elif defined(__x86_64__)
    4.25 -#define L1_PAGETABLE_SHIFT      12
    4.26 -#define L2_PAGETABLE_SHIFT      21
    4.27 -#define L3_PAGETABLE_SHIFT      30
    4.28 -#define L4_PAGETABLE_SHIFT      39
    4.29 -#endif
    4.30 -
    4.31 -#define PAGE_SHIFT L1_PAGETABLE_SHIFT
    4.32 -#define PAGE_SIZE  (1UL<<PAGE_SHIFT)
    4.33 -#define PAGE_MASK  (~(PAGE_SIZE - 1))
    4.34 -
    4.35 -/* from xen/include/asm-x86/processor.h */
    4.36 -#define X86_EFLAGS_TF	0x00000100 /* Trap Flag */
    4.37 -
    4.38 -typedef int boolean;
    4.39 -#define true 1
    4.40 -#define false 0
    4.41 -
    4.42 -
    4.43 -typedef struct bwcpoint                           /* break/watch/catch point */
    4.44 -{
    4.45 -    struct list_head list;
    4.46 -    unsigned long address;
    4.47 -    uint32_t domain;
    4.48 -    uint8_t old_value;                             /* old value for software bkpt */
    4.49 -} bwcpoint_t, *bwcpoint_p;
    4.50 -
    4.51 -static bwcpoint_t bwcpoint_list;
    4.52 -
    4.53 -
    4.54 -
    4.55 -typedef struct domain_context                 /* local cache of domain state */
    4.56 -{
    4.57 -    struct list_head     list;
    4.58 -    uint32_t                  domid;
    4.59 -    boolean              valid[MAX_VIRT_CPUS];
    4.60 -    vcpu_guest_context_t context[MAX_VIRT_CPUS];
    4.61 -
    4.62 -    long            total_pages;
    4.63 -    xen_pfn_t      *page_array;
    4.64 -
    4.65 -    unsigned long   cr3_phys[MAX_VIRT_CPUS];
    4.66 -    unsigned long  *cr3_virt[MAX_VIRT_CPUS];
    4.67 -    unsigned long   pde_phys[MAX_VIRT_CPUS];     
    4.68 -    unsigned long  *pde_virt[MAX_VIRT_CPUS];
    4.69 -    unsigned long   page_phys[MAX_VIRT_CPUS];     
    4.70 -    unsigned long  *page_virt[MAX_VIRT_CPUS];
    4.71 -    int             page_perm[MAX_VIRT_CPUS];
    4.72 -} domain_context_t, *domain_context_p;
    4.73 -
    4.74 -static domain_context_t domain_context_list;
    4.75 -
    4.76 -/* initialization */
    4.77 -
    4.78 -static boolean xendebug_initialized = false;
    4.79 -
    4.80 -static __inline__ void
    4.81 -xendebug_initialize()
    4.82 -{
    4.83 -    if ( !xendebug_initialized )
    4.84 -    {
    4.85 -        memset((void *) &domain_context_list, 0, sizeof(domain_context_t));
    4.86 -        INIT_LIST_HEAD(&domain_context_list.list);
    4.87 -
    4.88 -        memset((void *) &bwcpoint_list, 0, sizeof(bwcpoint_t));
    4.89 -        INIT_LIST_HEAD(&bwcpoint_list.list);
    4.90 -
    4.91 -        xendebug_initialized = true;
    4.92 -    }
    4.93 -}
    4.94 -
    4.95 -/**************/
    4.96 -
    4.97 -static domain_context_p
    4.98 -xendebug_domain_context_search (uint32_t domid)
    4.99 -{
   4.100 -    struct list_head *entry;
   4.101 -    domain_context_p  ctxt;
   4.102 -
   4.103 -    list_for_each(entry, &domain_context_list.list)
   4.104 -    {
   4.105 -        ctxt = list_entry(entry, domain_context_t, list);
   4.106 -        if ( domid == ctxt->domid )
   4.107 -            return ctxt;
   4.108 -    }
   4.109 -    return (domain_context_p)NULL;
   4.110 -}
   4.111 -
   4.112 -static __inline__ domain_context_p
   4.113 -xendebug_get_context (int xc_handle, uint32_t domid, uint32_t vcpu)
   4.114 -{
   4.115 -    int rc;
   4.116 -    domain_context_p ctxt;
   4.117 -
   4.118 -    xendebug_initialize();
   4.119 -
   4.120 -    if ( (ctxt = xendebug_domain_context_search(domid)) == NULL)
   4.121 -        return NULL;
   4.122 -
   4.123 -    if ( !ctxt->valid[vcpu] )
   4.124 -    {
   4.125 -        if ( (rc = xc_vcpu_getcontext(xc_handle, domid, vcpu, 
   4.126 -                                      &ctxt->context[vcpu])) )
   4.127 -            return NULL;
   4.128 -
   4.129 -        ctxt->valid[vcpu] = true;
   4.130 -    }
   4.131 -
   4.132 -    return ctxt;
   4.133 -}
   4.134 -
   4.135 -static __inline__ int
   4.136 -xendebug_set_context (int xc_handle, domain_context_p ctxt, uint32_t vcpu)
   4.137 -{
   4.138 -    dom0_op_t op;
   4.139 -    int rc;
   4.140 -
   4.141 -    if ( !ctxt->valid[vcpu] )
   4.142 -        return -EINVAL;
   4.143 -
   4.144 -    op.interface_version = DOM0_INTERFACE_VERSION;
   4.145 -    op.cmd = DOM0_SETVCPUCONTEXT;
   4.146 -    op.u.setvcpucontext.domain = ctxt->domid;
   4.147 -    op.u.setvcpucontext.vcpu = vcpu;
   4.148 -    op.u.setvcpucontext.ctxt = &ctxt->context[vcpu];
   4.149 -
   4.150 -    if ( (rc = mlock(&ctxt->context[vcpu], sizeof(vcpu_guest_context_t))) )
   4.151 -        return rc;
   4.152 -
   4.153 -    rc = xc_dom0_op(xc_handle, &op);
   4.154 -    (void) munlock(&ctxt->context[vcpu], sizeof(vcpu_guest_context_t));
   4.155 -
   4.156 -    return rc;
   4.157 -}
   4.158 -
   4.159 -/**************/
   4.160 -
   4.161 -int
   4.162 -xendebug_attach(int xc_handle,
   4.163 -                uint32_t domid,
   4.164 -                uint32_t vcpu)
   4.165 -{
   4.166 -    domain_context_p ctxt;
   4.167 -
   4.168 -    xendebug_initialize();
   4.169 -
   4.170 -    if ( (ctxt = malloc(sizeof(domain_context_t))) == NULL )
   4.171 -        return -1;
   4.172 -    memset(ctxt, 0, sizeof(domain_context_t));
   4.173 -    
   4.174 -    ctxt->domid = domid;
   4.175 -    list_add(&ctxt->list, &domain_context_list.list);
   4.176 -
   4.177 -    return xc_domain_pause(xc_handle, domid);
   4.178 -}
   4.179 -
   4.180 -int
   4.181 -xendebug_detach(int xc_handle,
   4.182 -                uint32_t domid,
   4.183 -                uint32_t vcpu)
   4.184 -{
   4.185 -    domain_context_p ctxt;
   4.186 -    
   4.187 -    xendebug_initialize();
   4.188 -
   4.189 -    if ( (ctxt = xendebug_domain_context_search (domid)) == NULL)
   4.190 -        return -EINVAL;
   4.191 -
   4.192 -    list_del(&ctxt->list);
   4.193 -
   4.194 -    if ( ctxt->page_array ) free(ctxt->page_array);
   4.195 -
   4.196 -    free(ctxt);
   4.197 -
   4.198 -    return xc_domain_unpause(xc_handle, domid);
   4.199 -}
   4.200 -
   4.201 -int
   4.202 -xendebug_read_registers(int xc_handle,
   4.203 -                        uint32_t domid,
   4.204 -                        uint32_t vcpu,
   4.205 -                        cpu_user_regs_t **regs)
   4.206 -{
   4.207 -    domain_context_p ctxt;
   4.208 -    int rc = -1;
   4.209 -
   4.210 -    xendebug_initialize();
   4.211 -
   4.212 -    ctxt = xendebug_get_context(xc_handle, domid, vcpu);
   4.213 -    if (ctxt)
   4.214 -    {
   4.215 -        *regs = &ctxt->context[vcpu].user_regs;
   4.216 -        rc = 0;
   4.217 -    }
   4.218 -
   4.219 -    return rc;
   4.220 -}
   4.221 -
   4.222 -int
   4.223 -xendebug_read_fpregisters (int xc_handle,
   4.224 -                           uint32_t domid,
   4.225 -                           uint32_t vcpu,
   4.226 -                           char **regs)
   4.227 -{
   4.228 -    domain_context_p ctxt;
   4.229 -    int rc = -1;
   4.230 -
   4.231 -    xendebug_initialize();
   4.232 -
   4.233 -    ctxt = xendebug_get_context(xc_handle, domid, vcpu);
   4.234 -    if (ctxt)
   4.235 -    {
   4.236 -        *regs = ctxt->context[vcpu].fpu_ctxt.x;
   4.237 -        rc = 0;
   4.238 -    }
   4.239 -
   4.240 -    return rc;
   4.241 -}
   4.242 -
   4.243 -int
   4.244 -xendebug_write_registers(int xc_handle,
   4.245 -                         uint32_t domid,
   4.246 -                         uint32_t vcpu,
   4.247 -                         cpu_user_regs_t *regs)
   4.248 -{
   4.249 -    domain_context_p ctxt;
   4.250 -    int rc = -1;
   4.251 -
   4.252 -    xendebug_initialize();
   4.253 -
   4.254 -    ctxt = xendebug_get_context(xc_handle, domid, vcpu);
   4.255 -    if (ctxt)
   4.256 -    {
   4.257 -        memcpy(&ctxt->context[vcpu].user_regs, regs, sizeof(cpu_user_regs_t));
   4.258 -        rc = xendebug_set_context(xc_handle, ctxt, vcpu);
   4.259 -    }
   4.260 -    
   4.261 -    return rc;
   4.262 -}
   4.263 -
   4.264 -int
   4.265 -xendebug_step(int xc_handle,
   4.266 -              uint32_t domid,
   4.267 -              uint32_t vcpu)
   4.268 -{
   4.269 -    domain_context_p ctxt;
   4.270 -    int rc;
   4.271 -
   4.272 -    xendebug_initialize();
   4.273 -
   4.274 -    ctxt = xendebug_get_context(xc_handle, domid, vcpu);
   4.275 -    if (!ctxt) return -EINVAL;
   4.276 -
   4.277 -    ctxt->context[vcpu].user_regs.eflags |= X86_EFLAGS_TF;
   4.278 -
   4.279 -    if ( (rc = xendebug_set_context(xc_handle, ctxt, vcpu)) )
   4.280 -        return rc;
   4.281 -
   4.282 -    ctxt->valid[vcpu] = false;
   4.283 -    return xc_domain_unpause(xc_handle, domid);
   4.284 -}
   4.285 -
   4.286 -int
   4.287 -xendebug_continue(int xc_handle,
   4.288 -                  uint32_t domid,
   4.289 -                  uint32_t vcpu)
   4.290 -{
   4.291 -    domain_context_p ctxt;
   4.292 -    int rc;
   4.293 -
   4.294 -    xendebug_initialize();
   4.295 -
   4.296 -    ctxt = xendebug_get_context(xc_handle, domid, vcpu);
   4.297 -    if (!ctxt) return -EINVAL;
   4.298 -
   4.299 -    if ( ctxt->context[vcpu].user_regs.eflags & X86_EFLAGS_TF )
   4.300 -    {
   4.301 -        ctxt->context[vcpu].user_regs.eflags &= ~X86_EFLAGS_TF;
   4.302 -        if ( (rc = xendebug_set_context(xc_handle, ctxt, vcpu)) )
   4.303 -            return rc;
   4.304 -    }
   4.305 -    ctxt->valid[vcpu] = false;
   4.306 -    return xc_domain_unpause(xc_handle, domid);
   4.307 -}
   4.308 -
   4.309 -/*************************************************/
   4.310 -
   4.311 -#define vtopdi(va) ((va) >> L2_PAGETABLE_SHIFT)
   4.312 -#define vtopti(va) (((va) >> PAGE_SHIFT) & 0x3ff)
   4.313 -
   4.314 -/* access to one page */
   4.315 -static int
   4.316 -xendebug_memory_page (domain_context_p ctxt, int xc_handle, uint32_t vcpu,
   4.317 -                      int protection, unsigned long address, int length, uint8_t *buffer)
   4.318 -{
   4.319 -    vcpu_guest_context_t *vcpu_ctxt = &ctxt->context[vcpu];
   4.320 -    unsigned long pde, page;
   4.321 -    unsigned long va = (unsigned long)address;
   4.322 -    void *ptr;
   4.323 -    long pages;
   4.324 -
   4.325 -    pages = xc_get_tot_pages(xc_handle, ctxt->domid);
   4.326 -
   4.327 -    if ( ctxt->total_pages != pages )
   4.328 -    {
   4.329 -        if ( ctxt->total_pages > 0 ) free( ctxt->page_array );
   4.330 -        ctxt->total_pages = pages;
   4.331 -
   4.332 -        ctxt->page_array = malloc(pages * sizeof(unsigned long));
   4.333 -        if ( ctxt->page_array == NULL )
   4.334 -        {
   4.335 -            printf("Could not allocate memory\n");
   4.336 -            return 0;
   4.337 -        }
   4.338 -
   4.339 -        if ( xc_get_pfn_list(xc_handle, ctxt->domid, ctxt->page_array,pages) !=
   4.340 -                pages )
   4.341 -        {
   4.342 -            printf("Could not get the page frame list\n");
   4.343 -            return 0;
   4.344 -        }
   4.345 -    }
   4.346 -
   4.347 -    if ( vcpu_ctxt->ctrlreg[3] != ctxt->cr3_phys[vcpu]) 
   4.348 -    {
   4.349 -        ctxt->cr3_phys[vcpu] = vcpu_ctxt->ctrlreg[3];
   4.350 -        if ( ctxt->cr3_virt[vcpu] )
   4.351 -            munmap(ctxt->cr3_virt[vcpu], PAGE_SIZE);
   4.352 -        ctxt->cr3_virt[vcpu] = xc_map_foreign_range(
   4.353 -            xc_handle, ctxt->domid, PAGE_SIZE, PROT_READ,
   4.354 -            xen_cr3_to_pfn(ctxt->cr3_phys[vcpu]));
   4.355 -        if ( ctxt->cr3_virt[vcpu] == NULL )
   4.356 -            return 0;
   4.357 -    } 
   4.358 -
   4.359 -
   4.360 -    if ( (pde = ctxt->cr3_virt[vcpu][vtopdi(va)]) == 0) /* logical address */
   4.361 -        return 0;
   4.362 -    if (ctxt->context[vcpu].flags & VGCF_HVM_GUEST)
   4.363 -        pde = ctxt->page_array[pde >> PAGE_SHIFT] << PAGE_SHIFT;
   4.364 -    if (pde != ctxt->pde_phys[vcpu]) 
   4.365 -    {
   4.366 -        ctxt->pde_phys[vcpu] = pde;
   4.367 -        if ( ctxt->pde_virt[vcpu])
   4.368 -            munmap(ctxt->pde_virt[vcpu], PAGE_SIZE);
   4.369 -        ctxt->pde_virt[vcpu] = xc_map_foreign_range(xc_handle, ctxt->domid,
   4.370 -                    PAGE_SIZE, PROT_READ, ctxt->pde_phys[vcpu] >> PAGE_SHIFT);
   4.371 -        if ( ctxt->pde_virt[vcpu] == NULL )
   4.372 -            return 0;
   4.373 -    }
   4.374 -
   4.375 -    if ((page = ctxt->pde_virt[vcpu][vtopti(va)]) == 0) /* logical address */
   4.376 -        return 0;
   4.377 -    if (ctxt->context[vcpu].flags & VGCF_HVM_GUEST)
   4.378 -        page = ctxt->page_array[page >> PAGE_SHIFT] << PAGE_SHIFT;
   4.379 -    if (page != ctxt->page_phys[vcpu] || protection != ctxt->page_perm[vcpu]) 
   4.380 -    {
   4.381 -        ctxt->page_phys[vcpu] = page;
   4.382 -        if (ctxt->page_virt[vcpu])
   4.383 -            munmap(ctxt->page_virt[vcpu], PAGE_SIZE);
   4.384 -        ctxt->page_virt[vcpu] = xc_map_foreign_range(xc_handle, ctxt->domid, 
   4.385 -                  PAGE_SIZE, protection, ctxt->page_phys[vcpu] >> PAGE_SHIFT);
   4.386 -        if ( ctxt->page_virt[vcpu] == NULL )
   4.387 -        {
   4.388 -            printf("cr3 %lx pde %lx page %lx pti %lx\n", 
   4.389 -                   vcpu_ctxt->ctrlreg[3], pde, page, vtopti(va));
   4.390 -            ctxt->page_phys[vcpu] = 0;
   4.391 -            return 0;
   4.392 -        }
   4.393 -        ctxt->page_perm[vcpu] = protection;
   4.394 -    }	
   4.395 -
   4.396 -    ptr = (void *)( (unsigned long)ctxt->page_virt[vcpu] |
   4.397 -                    (va & ~PAGE_MASK) );
   4.398 -
   4.399 -    if ( protection & PROT_WRITE )
   4.400 -    {
   4.401 -        memcpy(ptr, buffer, length);
   4.402 -    }
   4.403 -    else
   4.404 -    {
   4.405 -        memcpy(buffer, ptr, length);
   4.406 -    }
   4.407 -
   4.408 -    return length;
   4.409 -}
   4.410 -
   4.411 -/* divide a memory operation into accesses to individual pages */
   4.412 -static int
   4.413 -xendebug_memory_op (domain_context_p ctxt, int xc_handle, uint32_t vcpu,
   4.414 -                    int protection, unsigned long address, int length, uint8_t *buffer)
   4.415 -{
   4.416 -    int      remain;              /* number of bytes to touch past this page */
   4.417 -    int      bytes   = 0;
   4.418 -
   4.419 -    while ( (remain = (address + length - 1) - (address | (PAGE_SIZE-1))) > 0)
   4.420 -    {
   4.421 -        bytes += xendebug_memory_page(ctxt, xc_handle, vcpu, protection,
   4.422 -                                      address, length - remain, buffer);
   4.423 -        buffer += (length - remain);
   4.424 -        length = remain;
   4.425 -        address = (address | (PAGE_SIZE - 1)) + 1;
   4.426 -    }
   4.427 -
   4.428 -    bytes += xendebug_memory_page(ctxt, xc_handle, vcpu, protection,
   4.429 -                                  address, length, buffer);
   4.430 -
   4.431 -    return bytes;
   4.432 -}
   4.433 -
   4.434 -int
   4.435 -xendebug_read_memory(int xc_handle,
   4.436 -                     uint32_t domid,
   4.437 -                     uint32_t vcpu,
   4.438 -                     unsigned long address,
   4.439 -                     uint32_t length,
   4.440 -                     uint8_t *data)
   4.441 -{
   4.442 -    domain_context_p ctxt;
   4.443 -
   4.444 -    xendebug_initialize();
   4.445 -
   4.446 -    ctxt = xendebug_get_context(xc_handle, domid, vcpu);
   4.447 -
   4.448 -    xendebug_memory_op(ctxt, xc_handle, vcpu, PROT_READ, 
   4.449 -                       address, length, data);
   4.450 -
   4.451 -    return 0;
   4.452 -}
   4.453 -
   4.454 -int
   4.455 -xendebug_write_memory(int xc_handle,
   4.456 -                      uint32_t domid,
   4.457 -                      uint32_t vcpu,
   4.458 -                      unsigned long address,
   4.459 -                      uint32_t length,
   4.460 -                      uint8_t *data)
   4.461 -{
   4.462 -    domain_context_p ctxt;
   4.463 -
   4.464 -    xendebug_initialize();
   4.465 -
   4.466 -    ctxt = xendebug_get_context(xc_handle, domid, vcpu);
   4.467 -    xendebug_memory_op(ctxt, xc_handle, vcpu, PROT_READ | PROT_WRITE,
   4.468 -
   4.469 -                       address, length, data);
   4.470 -
   4.471 -    return 0;
   4.472 -}
   4.473 -
   4.474 -int
   4.475 -xendebug_insert_memory_breakpoint(int xc_handle,
   4.476 -                                  uint32_t domid,
   4.477 -                                  uint32_t vcpu,
   4.478 -                                  unsigned long address,
   4.479 -                                  uint32_t length)
   4.480 -{
   4.481 -    bwcpoint_p bkpt;
   4.482 -    uint8_t breakpoint_opcode = 0xcc;
   4.483 -
   4.484 -    printf("insert breakpoint %d:%lx %d\n",
   4.485 -            domid, address, length);
   4.486 -
   4.487 -    xendebug_initialize();
   4.488 -
   4.489 -    bkpt = malloc(sizeof(bwcpoint_t));
   4.490 -    if ( bkpt == NULL )
   4.491 -    {
   4.492 -        printf("error: breakpoint length should be 1\n");
   4.493 -        return -1;
   4.494 -    }
   4.495 -
   4.496 -    if ( length != 1 )
   4.497 -    {
   4.498 -        printf("error: breakpoint length should be 1\n");
   4.499 -        free(bkpt);
   4.500 -        return -1;
   4.501 -    }
   4.502 -
   4.503 -    bkpt->address = address;
   4.504 -    bkpt->domain  = domid;
   4.505 -
   4.506 -    xendebug_read_memory(xc_handle, domid, vcpu, address, 1,
   4.507 -                         &bkpt->old_value);
   4.508 -
   4.509 -    xendebug_write_memory(xc_handle, domid, vcpu, address, 1, 
   4.510 -                          &breakpoint_opcode);
   4.511 -    
   4.512 -    list_add(&bkpt->list, &bwcpoint_list.list);
   4.513 -
   4.514 -    printf("breakpoint_set %d:%lx 0x%x\n",
   4.515 -           domid, address, bkpt->old_value);
   4.516 -
   4.517 -    return 0;
   4.518 -}
   4.519 -
   4.520 -int
   4.521 -xendebug_remove_memory_breakpoint(int xc_handle,
   4.522 -                                  uint32_t domid,
   4.523 -                                  uint32_t vcpu,
   4.524 -                                  unsigned long address,
   4.525 -                                  uint32_t length)
   4.526 -{
   4.527 -    bwcpoint_p bkpt = NULL;
   4.528 -
   4.529 -    printf ("remove breakpoint %d:%lx\n",
   4.530 -            domid, address);
   4.531 -
   4.532 -    struct list_head *entry;
   4.533 -    list_for_each(entry, &bwcpoint_list.list)
   4.534 -    {
   4.535 -        bkpt = list_entry(entry, bwcpoint_t, list);
   4.536 -        if ( domid == bkpt->domain && address == bkpt->address )
   4.537 -            break;
   4.538 -    }
   4.539 -    
   4.540 -    if (bkpt == &bwcpoint_list || bkpt == NULL)
   4.541 -    {
   4.542 -        printf ("error: no breakpoint found\n");
   4.543 -        return -1;
   4.544 -    }
   4.545 -
   4.546 -    list_del(&bkpt->list);
   4.547 -
   4.548 -    xendebug_write_memory(xc_handle, domid, vcpu, address, 1, 
   4.549 -                          &bkpt->old_value);
   4.550 -
   4.551 -    free(bkpt);
   4.552 -    return 0;
   4.553 -}
   4.554 -
   4.555 -int
   4.556 -xendebug_query_domain_stop(int xc_handle, int *dom_list, int dom_list_size)
   4.557 -{
   4.558 -    xc_dominfo_t *info;
   4.559 -    uint32_t first_dom = 0;
   4.560 -    int max_doms = 1024;
   4.561 -    int nr_doms, loop;
   4.562 -    int count = 0;
   4.563 -
   4.564 -    if ( (info = malloc(max_doms * sizeof(xc_dominfo_t))) == NULL )
   4.565 -        return -ENOMEM;
   4.566 -
   4.567 -    nr_doms = xc_domain_getinfo(xc_handle, first_dom, max_doms, info);
   4.568 -
   4.569 -    for (loop = 0; loop < nr_doms; loop++)
   4.570 -    {
   4.571 -        printf ("domid: %d", info[loop].domid);
   4.572 -        printf (" %c%c%c%c%c%c",
   4.573 -                info[loop].dying ? 'D' : '-',
   4.574 -                info[loop].crashed ? 'C' : '-',
   4.575 -                info[loop].shutdown ? 'S' : '-',
   4.576 -                info[loop].paused ? 'P' : '-',
   4.577 -                info[loop].blocked ? 'B' : '-',
   4.578 -                info[loop].running ? 'R' : '-');
   4.579 -        printf (" pages: %ld, vcpus %d", 
   4.580 -                info[loop].nr_pages, info[loop].vcpus);
   4.581 -        printf ("\n");
   4.582 -
   4.583 -        if ( info[loop].paused && count < dom_list_size)
   4.584 -        {
   4.585 -            dom_list[count++] = info[loop].domid;
   4.586 -        }
   4.587 -    }
   4.588 -
   4.589 -    free(info);
   4.590 -
   4.591 -    return count;
   4.592 -}
   4.593 -
   4.594 -/*
   4.595 - * Local variables:
   4.596 - * mode: C
   4.597 - * c-set-style: "BSD"
   4.598 - * c-basic-offset: 4
   4.599 - * tab-width: 4
   4.600 - * indent-tabs-mode: nil
   4.601 - * End:
   4.602 - */

     5.1 --- a/tools/debugger/libxendebug/xendebug.h	Fri Aug 25 10:39:24 2006 +0100
     5.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     5.3 @@ -1,78 +0,0 @@
     5.4 -/*
     5.5 - * xendebug.h
     5.6 - *
     5.7 - * alex ho
     5.8 - * http://www.cl.cam.ac.uk/netos/pdb
     5.9 - *
    5.10 - */
    5.11 -
    5.12 -#ifndef _XENDEBUG_H_DEFINED
    5.13 -#define _XENDEBUG_H_DEFINED
    5.14 -
    5.15 -#include <xenctrl.h>
    5.16 -
    5.17 -int xendebug_attach(int xc_handle,
    5.18 -		    uint32_t domid,
    5.19 -		    uint32_t vcpu);
    5.20 -
    5.21 -int xendebug_detach(int xc_handle,
    5.22 -		    uint32_t domid,
    5.23 -		    uint32_t vcpu);
    5.24 -
    5.25 -int xendebug_read_registers(int xc_handle,
    5.26 -			    uint32_t domid,
    5.27 -			    uint32_t vcpu,
    5.28 -			    cpu_user_regs_t **regs);
    5.29 -
    5.30 -int xendebug_read_fpregisters (int xc_handle,
    5.31 -			       uint32_t domid,
    5.32 -			       uint32_t vcpu,
    5.33 -			       char **regs);
    5.34 -
    5.35 -int xendebug_write_registers(int xc_handle,
    5.36 -			     uint32_t domid,
    5.37 -			     uint32_t vcpu,
    5.38 -			     cpu_user_regs_t *regs);
    5.39 -
    5.40 -int xendebug_step(int xc_handle,
    5.41 -		  uint32_t domid,
    5.42 -		  uint32_t vcpu);
    5.43 -
    5.44 -int xendebug_continue(int xc_handle,
    5.45 -		      uint32_t domid,
    5.46 -		      uint32_t vcpu);
    5.47 -
    5.48 -int xendebug_read_memory(int xc_handle,
    5.49 -			 uint32_t domid,
    5.50 -			 uint32_t vcpu,
    5.51 -			 unsigned long address,
    5.52 -			 uint32_t length,
    5.53 -			 uint8_t *data);
    5.54 -
    5.55 -
    5.56 -int xendebug_write_memory(int xc_handle,
    5.57 -			  uint32_t domid,
    5.58 -			  uint32_t vcpu,
    5.59 -			  unsigned long address,
    5.60 -			  uint32_t length,
    5.61 -			  uint8_t *data);
    5.62 -
    5.63 -
    5.64 -int xendebug_insert_memory_breakpoint(int xc_handle,
    5.65 -				      uint32_t domid,
    5.66 -				      uint32_t vcpu,
    5.67 -				      unsigned long address,
    5.68 -				      uint32_t length);
    5.69 -
    5.70 -int xendebug_remove_memory_breakpoint(int xc_handle,
    5.71 -				      uint32_t domid,
    5.72 -				      uint32_t vcpu,
    5.73 -				      unsigned long address,
    5.74 -				      uint32_t length);
    5.75 -
    5.76 -int xendebug_query_domain_stop(int xc_handle,
    5.77 -			       int *dom_list, 
    5.78 -			       int dom_list_size);
    5.79 -
    5.80 -
    5.81 -#endif /* _XENDEBUG_H_DEFINED */

     6.1 --- a/tools/libxc/ia64/xc_ia64_hvm_build.c	Fri Aug 25 10:39:24 2006 +0100
     6.2 +++ b/tools/libxc/ia64/xc_ia64_hvm_build.c	Fri Aug 25 18:39:10 2006 +0100
     6.3 @@ -555,7 +555,7 @@ setup_guest(int xc_handle, uint32_t dom,
     6.4      shared_iopage_t *sp;
     6.5      int i;
     6.6      unsigned long dom_memsize = (memsize << 20);
     6.7 -    DECLARE_DOM0_OP;
     6.8 +    DECLARE_DOMCTL;
     6.9  
    6.10      if ((image_size > 12 * MEM_M) || (image_size & (PAGE_SIZE - 1))) {
    6.11          PERROR("Guest firmware size is incorrect [%ld]?", image_size);
    6.12 @@ -563,13 +563,12 @@ setup_guest(int xc_handle, uint32_t dom,
    6.13      }
    6.14  
    6.15      /* This will creates the physmap.  */
    6.16 -    op.u.domain_setup.flags = XEN_DOMAINSETUP_hvm_guest;
    6.17 -    op.u.domain_setup.domain = (domid_t)dom;
    6.18 -    op.u.domain_setup.bp = 0;
    6.19 -    op.u.domain_setup.maxmem = 0;
    6.20 -    
    6.21 -    op.cmd = DOM0_DOMAIN_SETUP;
    6.22 -    if (xc_dom0_op(xc_handle, &op))
    6.23 +    domctl.u.arch_setup.flags = XEN_DOMAINSETUP_hvm_guest;
    6.24 +    domctl.u.arch_setup.bp = 0;
    6.25 +    domctl.u.arch_setup.maxmem = 0;
    6.26 +    domctl.cmd = XEN_DOMCTL_arch_setup;
    6.27 +    domctl.domain = (domid_t)dom;
    6.28 +    if (xc_domctl(xc_handle, &domctl))
    6.29          goto error_out;
    6.30  
    6.31      /* Load guest firmware */
    6.32 @@ -631,7 +630,7 @@ xc_hvm_build(int xc_handle, uint32_t dom
    6.33               unsigned int acpi, unsigned int apic, unsigned int store_evtchn,
    6.34               unsigned long *store_mfn)
    6.35  {
    6.36 -    dom0_op_t launch_op, op;
    6.37 +    struct xen_domctl launch_domctl, domctl;
    6.38      int rc;
    6.39      vcpu_guest_context_t st_ctxt, *ctxt = &st_ctxt;
    6.40      char *image = NULL;
    6.41 @@ -657,10 +656,10 @@ xc_hvm_build(int xc_handle, uint32_t dom
    6.42          return 1;
    6.43      }
    6.44  
    6.45 -    op.cmd = DOM0_GETDOMAININFO;
    6.46 -    op.u.getdomaininfo.domain = (domid_t)domid;
    6.47 -    if (do_dom0_op(xc_handle, &op) < 0 ||
    6.48 -        (uint16_t)op.u.getdomaininfo.domain != domid) {
    6.49 +    domctl.cmd = XEN_DOMCTL_getdomaininfo;
    6.50 +    domctl.domain = (domid_t)domid;
    6.51 +    if (do_domctl(xc_handle, &domctl) < 0 ||
    6.52 +        (uint16_t)domctl.domain != domid) {
    6.53          PERROR("Could not get info on domain");
    6.54          goto error_out;
    6.55      }
    6.56 @@ -677,14 +676,14 @@ xc_hvm_build(int xc_handle, uint32_t dom
    6.57  
    6.58      ctxt->user_regs.cr_iip = 0x80000000ffffffb0UL;
    6.59  
    6.60 -    memset(&launch_op, 0, sizeof(launch_op));
    6.61 +    memset(&launch_domctl, 0, sizeof(launch_domctl));
    6.62  
    6.63 -    launch_op.u.setvcpucontext.domain = (domid_t)domid;
    6.64 -    launch_op.u.setvcpucontext.vcpu = 0;
    6.65 -    set_xen_guest_handle(launch_op.u.setvcpucontext.ctxt, ctxt);
    6.66 +    launch_domctl.domain = (domid_t)domid;
    6.67 +    launch_domctl.u.vcpucontext.vcpu = 0;
    6.68 +    set_xen_guest_handle(launch_domctl.u.vcpucontext.ctxt, ctxt);
    6.69  
    6.70 -    launch_op.cmd = DOM0_SETVCPUCONTEXT;
    6.71 -    rc = do_dom0_op(xc_handle, &launch_op);
    6.72 +    launch_domctl.cmd = XEN_DOMCTL_setvcpucontext;
    6.73 +    rc = do_domctl(xc_handle, &launch_domctl);
    6.74      return rc;
    6.75  
    6.76  error_out:

     7.1 --- a/tools/libxc/ia64/xc_ia64_linux_restore.c	Fri Aug 25 10:39:24 2006 +0100
     7.2 +++ b/tools/libxc/ia64/xc_ia64_linux_restore.c	Fri Aug 25 18:39:10 2006 +0100
     7.3 @@ -61,7 +61,7 @@ xc_linux_restore(int xc_handle, int io_f
     7.4                   unsigned long *store_mfn, unsigned int console_evtchn,
     7.5                   unsigned long *console_mfn)
     7.6  {
     7.7 -    DECLARE_DOM0_OP;
     7.8 +    DECLARE_DOMCTL;
     7.9      int rc = 1, i;
    7.10      unsigned long mfn, pfn;
    7.11      unsigned long ver;
    7.12 @@ -94,19 +94,19 @@ xc_linux_restore(int xc_handle, int io_f
    7.13      }
    7.14  
    7.15      if (mlock(&ctxt, sizeof(ctxt))) {
    7.16 -        /* needed for build dom0 op, but might as well do early */
    7.17 +        /* needed for build domctl, but might as well do early */
    7.18          ERR("Unable to mlock ctxt");
    7.19          return 1;
    7.20      }
    7.21  
    7.22      /* Get the domain's shared-info frame. */
    7.23 -    op.cmd = DOM0_GETDOMAININFO;
    7.24 -    op.u.getdomaininfo.domain = (domid_t)dom;
    7.25 -    if (xc_dom0_op(xc_handle, &op) < 0) {
    7.26 +    domctl.cmd = XEN_DOMCTL_getdomaininfo;
    7.27 +    domctl.domain = (domid_t)dom;
    7.28 +    if (xc_domctl(xc_handle, &domctl) < 0) {
    7.29          ERR("Could not get information on new domain");
    7.30          goto out;
    7.31      }
    7.32 -    shared_info_frame = op.u.getdomaininfo.shared_info_frame;
    7.33 +    shared_info_frame = domctl.u.getdomaininfo.shared_info_frame;
    7.34  
    7.35      if (xc_domain_setmaxmem(xc_handle, dom, PFN_TO_KB(max_pfn)) != 0) {
    7.36          errno = ENOMEM;
    7.37 @@ -122,20 +122,20 @@ xc_linux_restore(int xc_handle, int io_f
    7.38  
    7.39      DPRINTF("Increased domain reservation by %ld KB\n", PFN_TO_KB(max_pfn));
    7.40  
    7.41 -    if (!read_exact(io_fd, &op.u.domain_setup, sizeof(op.u.domain_setup))) {
    7.42 +    if (!read_exact(io_fd, &domctl.u.arch_setup, sizeof(domctl.u.arch_setup))) {
    7.43          ERR("read: domain setup");
    7.44          goto out;
    7.45      }
    7.46  
    7.47      /* Build firmware (will be overwritten).  */
    7.48 -    op.u.domain_setup.domain = (domid_t)dom;
    7.49 -    op.u.domain_setup.flags &= ~XEN_DOMAINSETUP_query;
    7.50 -    op.u.domain_setup.bp = ((nr_pfns - 3) << PAGE_SHIFT)
    7.51 +    domctl.domain = (domid_t)dom;
    7.52 +    domctl.u.arch_setup.flags &= ~XEN_DOMAINSETUP_query;
    7.53 +    domctl.u.arch_setup.bp = ((nr_pfns - 3) << PAGE_SHIFT)
    7.54                             + sizeof (start_info_t);
    7.55 -    op.u.domain_setup.maxmem = (nr_pfns - 3) << PAGE_SHIFT;
    7.56 +    domctl.u.arch_setup.maxmem = (nr_pfns - 3) << PAGE_SHIFT;
    7.57      
    7.58 -    op.cmd = DOM0_DOMAIN_SETUP;
    7.59 -    if (xc_dom0_op(xc_handle, &op))
    7.60 +    domctl.cmd = XEN_DOMCTL_arch_setup;
    7.61 +    if (xc_domctl(xc_handle, &domctl))
    7.62          goto out;
    7.63  
    7.64      /* Get pages.  */
    7.65 @@ -226,22 +226,22 @@ xc_linux_restore(int xc_handle, int io_f
    7.66      }
    7.67  
    7.68      /* First to initialize.  */
    7.69 -    op.cmd = DOM0_SETVCPUCONTEXT;
    7.70 -    op.u.setvcpucontext.domain = (domid_t)dom;
    7.71 -    op.u.setvcpucontext.vcpu   = 0;
    7.72 -    set_xen_guest_handle(op.u.setvcpucontext.ctxt, &ctxt);
    7.73 -    if (xc_dom0_op(xc_handle, &op) != 0) {
    7.74 +    domctl.cmd = XEN_DOMCTL_setvcpucontext;
    7.75 +    domctl.domain = (domid_t)dom;
    7.76 +    domctl.u.vcpucontext.vcpu   = 0;
    7.77 +    set_xen_guest_handle(domctl.u.vcpucontext.ctxt, &ctxt);
    7.78 +    if (xc_domctl(xc_handle, &domctl) != 0) {
    7.79  	    ERR("Couldn't set vcpu context");
    7.80  	    goto out;
    7.81      }
    7.82  
    7.83      /* Second to set registers...  */
    7.84      ctxt.flags = VGCF_EXTRA_REGS;
    7.85 -    op.cmd = DOM0_SETVCPUCONTEXT;
    7.86 -    op.u.setvcpucontext.domain = (domid_t)dom;
    7.87 -    op.u.setvcpucontext.vcpu   = 0;
    7.88 -    set_xen_guest_handle(op.u.setvcpucontext.ctxt, &ctxt);
    7.89 -    if (xc_dom0_op(xc_handle, &op) != 0) {
    7.90 +    domctl.cmd = XEN_DOMCTL_setvcpucontext;
    7.91 +    domctl.domain = (domid_t)dom;
    7.92 +    domctl.u.vcpucontext.vcpu   = 0;
    7.93 +    set_xen_guest_handle(domctl.u.vcpucontext.ctxt, &ctxt);
    7.94 +    if (xc_domctl(xc_handle, &domctl) != 0) {
    7.95  	    ERR("Couldn't set vcpu context");
    7.96  	    goto out;
    7.97      }

     8.1 --- a/tools/libxc/ia64/xc_ia64_linux_save.c	Fri Aug 25 10:39:24 2006 +0100
     8.2 +++ b/tools/libxc/ia64/xc_ia64_linux_save.c	Fri Aug 25 18:39:10 2006 +0100
     8.3 @@ -60,7 +60,7 @@ static int xc_ia64_shadow_control(int xc
     8.4                                    unsigned int sop,
     8.5                                    unsigned long *dirty_bitmap,
     8.6                                    unsigned long pages,
     8.7 -                                  xc_shadow_control_stats_t *stats)
     8.8 +                                  xc_shadow_op_stats_t *stats)
     8.9  {
    8.10      if (dirty_bitmap != NULL && pages > 0) {
    8.11          int i;
    8.12 @@ -137,7 +137,7 @@ int
    8.13  xc_linux_save(int xc_handle, int io_fd, uint32_t dom, uint32_t max_iters,
    8.14                uint32_t max_factor, uint32_t flags, int (*suspend)(int))
    8.15  {
    8.16 -    DECLARE_DOM0_OP;
    8.17 +    DECLARE_DOMCTL;
    8.18      xc_dominfo_t info;
    8.19  
    8.20      int rc = 1;
    8.21 @@ -242,15 +242,15 @@ xc_linux_save(int xc_handle, int io_fd, 
    8.22          }
    8.23      }
    8.24  
    8.25 -    op.cmd = DOM0_DOMAIN_SETUP;
    8.26 -    op.u.domain_setup.domain = (domid_t)dom;
    8.27 -    op.u.domain_setup.flags = XEN_DOMAINSETUP_query;
    8.28 -    if (xc_dom0_op(xc_handle, &op) < 0) {
    8.29 +    domctl.cmd = XEN_DOMCTL_arch_setup;
    8.30 +    domctl.domain = (domid_t)dom;
    8.31 +    domctl.u.arch_setup.flags = XEN_DOMAINSETUP_query;
    8.32 +    if (xc_domctl(xc_handle, &domctl) < 0) {
    8.33          ERR("Could not get domain setup");
    8.34          goto out;
    8.35      }
    8.36 -    op.u.domain_setup.domain = 0;
    8.37 -    if (!write_exact(io_fd, &op.u.domain_setup, sizeof(op.u.domain_setup))) {
    8.38 +    if (!write_exact(io_fd, &domctl.u.arch_setup,
    8.39 +                     sizeof(domctl.u.arch_setup))) {
    8.40          ERR("write: domain setup");
    8.41          goto out;
    8.42      }
    8.43 @@ -259,7 +259,7 @@ xc_linux_save(int xc_handle, int io_fd, 
    8.44      if (live) {
    8.45  
    8.46          if (xc_ia64_shadow_control(xc_handle, dom,
    8.47 -                                   DOM0_SHADOW_CONTROL_OP_ENABLE_LOGDIRTY,
    8.48 +                                   XEN_DOMCTL_SHADOW_OP_ENABLE_LOGDIRTY,
    8.49                                     NULL, 0, NULL ) < 0) {
    8.50              ERR("Couldn't enable shadow mode");
    8.51              goto out;
    8.52 @@ -324,7 +324,7 @@ xc_linux_save(int xc_handle, int io_fd, 
    8.53             but this is fast enough for the moment. */
    8.54          if (!last_iter) {
    8.55              if (xc_ia64_shadow_control(xc_handle, dom,
    8.56 -                                       DOM0_SHADOW_CONTROL_OP_PEEK,
    8.57 +                                       XEN_DOMCTL_SHADOW_OP_PEEK,
    8.58                                         to_skip, max_pfn, NULL) != max_pfn) {
    8.59                  ERR("Error peeking shadow bitmap");
    8.60                  goto out;
    8.61 @@ -392,7 +392,7 @@ xc_linux_save(int xc_handle, int io_fd, 
    8.62  
    8.63              /* Pages to be sent are pages which were dirty.  */
    8.64              if (xc_ia64_shadow_control(xc_handle, dom,
    8.65 -                                       DOM0_SHADOW_CONTROL_OP_CLEAN,
    8.66 +                                       XEN_DOMCTL_SHADOW_OP_CLEAN,
    8.67                                         to_send, max_pfn, NULL ) != max_pfn) {
    8.68                  ERR("Error flushing shadow PT");
    8.69                  goto out;
    8.70 @@ -481,7 +481,7 @@ xc_linux_save(int xc_handle, int io_fd, 
    8.71   out:
    8.72  
    8.73      if (live) {
    8.74 -        if (xc_ia64_shadow_control(xc_handle, dom, DOM0_SHADOW_CONTROL_OP_OFF,
    8.75 +        if (xc_ia64_shadow_control(xc_handle, dom, XEN_DOMCTL_SHADOW_OP_OFF,
    8.76                                     NULL, 0, NULL ) < 0) {
    8.77              DPRINTF("Warning - couldn't disable shadow mode");
    8.78          }

     9.1 --- a/tools/libxc/ia64/xc_ia64_stubs.c	Fri Aug 25 10:39:24 2006 +0100
     9.2 +++ b/tools/libxc/ia64/xc_ia64_stubs.c	Fri Aug 25 18:39:10 2006 +0100
     9.3 @@ -33,7 +33,7 @@ int
     9.4  xc_ia64_get_pfn_list(int xc_handle, uint32_t domid, xen_pfn_t *pfn_buf,
     9.5                       unsigned int start_page, unsigned int nr_pages)
     9.6  {
     9.7 -    dom0_op_t op;
     9.8 +    struct xen_domctl domctl;
     9.9      int num_pfns,ret;
    9.10      unsigned int __start_page, __nr_pages;
    9.11      unsigned long max_pfns;
    9.12 @@ -45,11 +45,11 @@ xc_ia64_get_pfn_list(int xc_handle, uint
    9.13    
    9.14      while (__nr_pages) {
    9.15          max_pfns = ((unsigned long)__start_page << 32) | __nr_pages;
    9.16 -        op.cmd = DOM0_GETMEMLIST;
    9.17 -        op.u.getmemlist.domain   = (domid_t)domid;
    9.18 -        op.u.getmemlist.max_pfns = max_pfns;
    9.19 -        op.u.getmemlist.num_pfns = 0;
    9.20 -        set_xen_guest_handle(op.u.getmemlist.buffer, __pfn_buf);
    9.21 +        domctl.cmd = XEN_DOMCTL_getmemlist;
    9.22 +        domctl.domain   = (domid_t)domid;
    9.23 +        domctl.u.getmemlist.max_pfns = max_pfns;
    9.24 +        domctl.u.getmemlist.num_pfns = 0;
    9.25 +        set_xen_guest_handle(domctl.u.getmemlist.buffer, __pfn_buf);
    9.26  
    9.27          if ((max_pfns != -1UL)
    9.28              && mlock(__pfn_buf, __nr_pages * sizeof(xen_pfn_t)) != 0) {
    9.29 @@ -57,7 +57,7 @@ xc_ia64_get_pfn_list(int xc_handle, uint
    9.30              return -1;
    9.31          }
    9.32  
    9.33 -        ret = do_dom0_op(xc_handle, &op);
    9.34 +        ret = do_domctl(xc_handle, &domctl);
    9.35  
    9.36          if (max_pfns != -1UL)
    9.37              (void)munlock(__pfn_buf, __nr_pages * sizeof(xen_pfn_t));
    9.38 @@ -65,7 +65,7 @@ xc_ia64_get_pfn_list(int xc_handle, uint
    9.39          if (max_pfns == -1UL)
    9.40              return 0;
    9.41          
    9.42 -        num_pfns = op.u.getmemlist.num_pfns;
    9.43 +        num_pfns = domctl.u.getmemlist.num_pfns;
    9.44          __start_page += num_pfns;
    9.45          __nr_pages -= num_pfns;
    9.46          __pfn_buf += num_pfns;
    9.47 @@ -89,10 +89,10 @@ xc_get_pfn_list(int xc_handle, uint32_t 
    9.48  long
    9.49  xc_get_max_pages(int xc_handle, uint32_t domid)
    9.50  {
    9.51 -    dom0_op_t op;
    9.52 -    op.cmd = DOM0_GETDOMAININFO;
    9.53 -    op.u.getdomaininfo.domain = (domid_t)domid;
    9.54 -    return (do_dom0_op(xc_handle, &op) < 0) ? -1 : op.u.getdomaininfo.max_pages;
    9.55 +    struct xen_domctl domctl;
    9.56 +    domctl.cmd = XEN_DOMCTL_getdomaininfo;
    9.57 +    domctl.domain = (domid_t)domid;
    9.58 +    return (do_domctl(xc_handle, &domctl) < 0) ? -1 : domctl.u.getdomaininfo.max_pages;
    9.59  }
    9.60  
    9.61  /*

    10.1 --- a/tools/libxc/powerpc64/xc_linux_build.c	Fri Aug 25 10:39:24 2006 +0100
    10.2 +++ b/tools/libxc/powerpc64/xc_linux_build.c	Fri Aug 25 18:39:10 2006 +0100
    10.3 @@ -27,7 +27,6 @@
    10.4  #include <sys/types.h>
    10.5  #include <inttypes.h>
    10.6  
    10.7 -#include <xen/dom0_ops.h>
    10.8  #include <xen/memory.h>
    10.9  #include <xc_private.h>
   10.10  #include <xg_private.h>

    11.1 --- a/tools/libxc/xc_csched.c	Fri Aug 25 10:39:24 2006 +0100
    11.2 +++ b/tools/libxc/xc_csched.c	Fri Aug 25 18:39:10 2006 +0100
    11.3 @@ -15,36 +15,36 @@ int
    11.4  xc_sched_credit_domain_set(
    11.5      int xc_handle,
    11.6      uint32_t domid,
    11.7 -    struct sched_credit_adjdom *sdom)
    11.8 +    struct xen_domctl_sched_credit *sdom)
    11.9  {
   11.10 -    DECLARE_DOM0_OP;
   11.11 +    DECLARE_DOMCTL;
   11.12  
   11.13 -    op.cmd = DOM0_ADJUSTDOM;    
   11.14 -    op.u.adjustdom.domain = (domid_t) domid;
   11.15 -    op.u.adjustdom.sched_id = SCHED_CREDIT;
   11.16 -    op.u.adjustdom.direction = SCHED_INFO_PUT;
   11.17 -    op.u.adjustdom.u.credit = *sdom;
   11.18 +    domctl.cmd = XEN_DOMCTL_scheduler_op;
   11.19 +    domctl.domain = (domid_t) domid;
   11.20 +    domctl.u.scheduler_op.sched_id = XEN_SCHEDULER_CREDIT;
   11.21 +    domctl.u.scheduler_op.cmd = XEN_DOMCTL_SCHEDOP_putinfo;
   11.22 +    domctl.u.scheduler_op.u.credit = *sdom;
   11.23  
   11.24 -    return do_dom0_op(xc_handle, &op);
   11.25 +    return do_domctl(xc_handle, &domctl);
   11.26  }
   11.27  
   11.28  int
   11.29  xc_sched_credit_domain_get(
   11.30      int xc_handle,
   11.31      uint32_t domid,
   11.32 -    struct sched_credit_adjdom *sdom)
   11.33 +    struct xen_domctl_sched_credit *sdom)
   11.34  {
   11.35 -    DECLARE_DOM0_OP;
   11.36 +    DECLARE_DOMCTL;
   11.37      int err;
   11.38  
   11.39 -    op.cmd = DOM0_ADJUSTDOM;    
   11.40 -    op.u.adjustdom.domain = (domid_t) domid;
   11.41 -    op.u.adjustdom.sched_id = SCHED_CREDIT;
   11.42 -    op.u.adjustdom.direction = SCHED_INFO_GET;
   11.43 +    domctl.cmd = XEN_DOMCTL_scheduler_op;
   11.44 +    domctl.domain = (domid_t) domid;
   11.45 +    domctl.u.scheduler_op.sched_id = XEN_SCHEDULER_CREDIT;
   11.46 +    domctl.u.scheduler_op.cmd = XEN_DOMCTL_SCHEDOP_getinfo;
   11.47  
   11.48 -    err = do_dom0_op(xc_handle, &op);
   11.49 +    err = do_domctl(xc_handle, &domctl);
   11.50      if ( err == 0 )
   11.51 -        *sdom = op.u.adjustdom.u.credit;
   11.52 +        *sdom = domctl.u.scheduler_op.u.credit;
   11.53  
   11.54      return err;
   11.55  }

    12.1 --- a/tools/libxc/xc_domain.c	Fri Aug 25 10:39:24 2006 +0100
    12.2 +++ b/tools/libxc/xc_domain.c	Fri Aug 25 18:39:10 2006 +0100
    12.3 @@ -15,16 +15,16 @@ int xc_domain_create(int xc_handle,
    12.4                       uint32_t *pdomid)
    12.5  {
    12.6      int err;
    12.7 -    DECLARE_DOM0_OP;
    12.8 +    DECLARE_DOMCTL;
    12.9  
   12.10 -    op.cmd = DOM0_CREATEDOMAIN;
   12.11 -    op.u.createdomain.domain = (domid_t)*pdomid;
   12.12 -    op.u.createdomain.ssidref = ssidref;
   12.13 -    memcpy(op.u.createdomain.handle, handle, sizeof(xen_domain_handle_t));
   12.14 -    if ( (err = do_dom0_op(xc_handle, &op)) != 0 )
   12.15 +    domctl.cmd = XEN_DOMCTL_createdomain;
   12.16 +    domctl.domain = (domid_t)*pdomid;
   12.17 +    domctl.u.createdomain.ssidref = ssidref;
   12.18 +    memcpy(domctl.u.createdomain.handle, handle, sizeof(xen_domain_handle_t));
   12.19 +    if ( (err = do_domctl(xc_handle, &domctl)) != 0 )
   12.20          return err;
   12.21  
   12.22 -    *pdomid = (uint16_t)op.u.createdomain.domain;
   12.23 +    *pdomid = (uint16_t)domctl.domain;
   12.24      return 0;
   12.25  }
   12.26  
   12.27 @@ -32,30 +32,30 @@ int xc_domain_create(int xc_handle,
   12.28  int xc_domain_pause(int xc_handle,
   12.29                      uint32_t domid)
   12.30  {
   12.31 -    DECLARE_DOM0_OP;
   12.32 -    op.cmd = DOM0_PAUSEDOMAIN;
   12.33 -    op.u.pausedomain.domain = (domid_t)domid;
   12.34 -    return do_dom0_op(xc_handle, &op);
   12.35 +    DECLARE_DOMCTL;
   12.36 +    domctl.cmd = XEN_DOMCTL_pausedomain;
   12.37 +    domctl.domain = (domid_t)domid;
   12.38 +    return do_domctl(xc_handle, &domctl);
   12.39  }
   12.40  
   12.41  
   12.42  int xc_domain_unpause(int xc_handle,
   12.43                        uint32_t domid)
   12.44  {
   12.45 -    DECLARE_DOM0_OP;
   12.46 -    op.cmd = DOM0_UNPAUSEDOMAIN;
   12.47 -    op.u.unpausedomain.domain = (domid_t)domid;
   12.48 -    return do_dom0_op(xc_handle, &op);
   12.49 +    DECLARE_DOMCTL;
   12.50 +    domctl.cmd = XEN_DOMCTL_unpausedomain;
   12.51 +    domctl.domain = (domid_t)domid;
   12.52 +    return do_domctl(xc_handle, &domctl);
   12.53  }
   12.54  
   12.55  
   12.56  int xc_domain_destroy(int xc_handle,
   12.57                        uint32_t domid)
   12.58  {
   12.59 -    DECLARE_DOM0_OP;
   12.60 -    op.cmd = DOM0_DESTROYDOMAIN;
   12.61 -    op.u.destroydomain.domain = (domid_t)domid;
   12.62 -    return do_dom0_op(xc_handle, &op);
   12.63 +    DECLARE_DOMCTL;
   12.64 +    domctl.cmd = XEN_DOMCTL_destroydomain;
   12.65 +    domctl.domain = (domid_t)domid;
   12.66 +    return do_domctl(xc_handle, &domctl);
   12.67  }
   12.68  
   12.69  int xc_domain_shutdown(int xc_handle,
   12.70 @@ -90,14 +90,62 @@ int xc_domain_shutdown(int xc_handle,
   12.71  int xc_vcpu_setaffinity(int xc_handle,
   12.72                          uint32_t domid,
   12.73                          int vcpu,
   12.74 -                        cpumap_t cpumap)
   12.75 +                        uint64_t cpumap)
   12.76  {
   12.77 -    DECLARE_DOM0_OP;
   12.78 -    op.cmd = DOM0_SETVCPUAFFINITY;
   12.79 -    op.u.setvcpuaffinity.domain  = (domid_t)domid;
   12.80 -    op.u.setvcpuaffinity.vcpu    = vcpu;
   12.81 -    op.u.setvcpuaffinity.cpumap  = cpumap;
   12.82 -    return do_dom0_op(xc_handle, &op);
   12.83 +    DECLARE_DOMCTL;
   12.84 +    int ret = -1;
   12.85 +
   12.86 +    domctl.cmd = XEN_DOMCTL_setvcpuaffinity;
   12.87 +    domctl.domain = (domid_t)domid;
   12.88 +    domctl.u.vcpuaffinity.vcpu    = vcpu;
   12.89 +
   12.90 +    set_xen_guest_handle(domctl.u.vcpuaffinity.cpumap.bitmap,
   12.91 +                         (uint8_t *)&cpumap);
   12.92 +    domctl.u.vcpuaffinity.cpumap.nr_cpus = sizeof(cpumap) * 8;
   12.93 +    
   12.94 +    if ( mlock(&cpumap, sizeof(cpumap)) != 0 )
   12.95 +    {
   12.96 +        PERROR("Could not lock memory for Xen hypercall");
   12.97 +        goto out;
   12.98 +    }
   12.99 +
  12.100 +    ret = do_domctl(xc_handle, &domctl);
  12.101 +
  12.102 +    safe_munlock(&cpumap, sizeof(cpumap));
  12.103 +
  12.104 + out:
  12.105 +    return ret;
  12.106 +}
  12.107 +
  12.108 +
  12.109 +int xc_vcpu_getaffinity(int xc_handle,
  12.110 +                        uint32_t domid,
  12.111 +                        int vcpu,
  12.112 +                        uint64_t *cpumap)
  12.113 +{
  12.114 +    DECLARE_DOMCTL;
  12.115 +    int ret = -1;
  12.116 +
  12.117 +    domctl.cmd = XEN_DOMCTL_getvcpuaffinity;
  12.118 +    domctl.domain = (domid_t)domid;
  12.119 +    domctl.u.vcpuaffinity.vcpu = vcpu;
  12.120 +
  12.121 +    set_xen_guest_handle(domctl.u.vcpuaffinity.cpumap.bitmap,
  12.122 +                         (uint8_t *)cpumap);
  12.123 +    domctl.u.vcpuaffinity.cpumap.nr_cpus = sizeof(*cpumap) * 8;
  12.124 +    
  12.125 +    if ( mlock(cpumap, sizeof(*cpumap)) != 0 )
  12.126 +    {
  12.127 +        PERROR("Could not lock memory for Xen hypercall");
  12.128 +        goto out;
  12.129 +    }
  12.130 +
  12.131 +    ret = do_domctl(xc_handle, &domctl);
  12.132 +
  12.133 +    safe_munlock(cpumap, sizeof(*cpumap));
  12.134 +
  12.135 + out:
  12.136 +    return ret;
  12.137  }
  12.138  
  12.139  
  12.140 @@ -108,27 +156,27 @@ int xc_domain_getinfo(int xc_handle,
  12.141  {
  12.142      unsigned int nr_doms;
  12.143      uint32_t next_domid = first_domid;
  12.144 -    DECLARE_DOM0_OP;
  12.145 +    DECLARE_DOMCTL;
  12.146      int rc = 0;
  12.147  
  12.148      memset(info, 0, max_doms*sizeof(xc_dominfo_t));
  12.149  
  12.150      for ( nr_doms = 0; nr_doms < max_doms; nr_doms++ )
  12.151      {
  12.152 -        op.cmd = DOM0_GETDOMAININFO;
  12.153 -        op.u.getdomaininfo.domain = (domid_t)next_domid;
  12.154 -        if ( (rc = do_dom0_op(xc_handle, &op)) < 0 )
  12.155 +        domctl.cmd = XEN_DOMCTL_getdomaininfo;
  12.156 +        domctl.domain = (domid_t)next_domid;
  12.157 +        if ( (rc = do_domctl(xc_handle, &domctl)) < 0 )
  12.158              break;
  12.159 -        info->domid      = (uint16_t)op.u.getdomaininfo.domain;
  12.160 +        info->domid      = (uint16_t)domctl.domain;
  12.161  
  12.162 -        info->dying    = !!(op.u.getdomaininfo.flags & DOMFLAGS_DYING);
  12.163 -        info->shutdown = !!(op.u.getdomaininfo.flags & DOMFLAGS_SHUTDOWN);
  12.164 -        info->paused   = !!(op.u.getdomaininfo.flags & DOMFLAGS_PAUSED);
  12.165 -        info->blocked  = !!(op.u.getdomaininfo.flags & DOMFLAGS_BLOCKED);
  12.166 -        info->running  = !!(op.u.getdomaininfo.flags & DOMFLAGS_RUNNING);
  12.167 +        info->dying    = !!(domctl.u.getdomaininfo.flags & DOMFLAGS_DYING);
  12.168 +        info->shutdown = !!(domctl.u.getdomaininfo.flags & DOMFLAGS_SHUTDOWN);
  12.169 +        info->paused   = !!(domctl.u.getdomaininfo.flags & DOMFLAGS_PAUSED);
  12.170 +        info->blocked  = !!(domctl.u.getdomaininfo.flags & DOMFLAGS_BLOCKED);
  12.171 +        info->running  = !!(domctl.u.getdomaininfo.flags & DOMFLAGS_RUNNING);
  12.172  
  12.173          info->shutdown_reason =
  12.174 -            (op.u.getdomaininfo.flags>>DOMFLAGS_SHUTDOWNSHIFT) &
  12.175 +            (domctl.u.getdomaininfo.flags>>DOMFLAGS_SHUTDOWNSHIFT) &
  12.176              DOMFLAGS_SHUTDOWNMASK;
  12.177  
  12.178          if ( info->shutdown && (info->shutdown_reason == SHUTDOWN_crash) )
  12.179 @@ -137,18 +185,18 @@ int xc_domain_getinfo(int xc_handle,
  12.180              info->crashed  = 1;
  12.181          }
  12.182  
  12.183 -        info->ssidref  = op.u.getdomaininfo.ssidref;
  12.184 -        info->nr_pages = op.u.getdomaininfo.tot_pages;
  12.185 -        info->max_memkb = op.u.getdomaininfo.max_pages << (PAGE_SHIFT - 10);
  12.186 -        info->shared_info_frame = op.u.getdomaininfo.shared_info_frame;
  12.187 -        info->cpu_time = op.u.getdomaininfo.cpu_time;
  12.188 -        info->nr_online_vcpus = op.u.getdomaininfo.nr_online_vcpus;
  12.189 -        info->max_vcpu_id = op.u.getdomaininfo.max_vcpu_id;
  12.190 +        info->ssidref  = domctl.u.getdomaininfo.ssidref;
  12.191 +        info->nr_pages = domctl.u.getdomaininfo.tot_pages;
  12.192 +        info->max_memkb = domctl.u.getdomaininfo.max_pages << (PAGE_SHIFT-10);
  12.193 +        info->shared_info_frame = domctl.u.getdomaininfo.shared_info_frame;
  12.194 +        info->cpu_time = domctl.u.getdomaininfo.cpu_time;
  12.195 +        info->nr_online_vcpus = domctl.u.getdomaininfo.nr_online_vcpus;
  12.196 +        info->max_vcpu_id = domctl.u.getdomaininfo.max_vcpu_id;
  12.197  
  12.198 -        memcpy(info->handle, op.u.getdomaininfo.handle,
  12.199 +        memcpy(info->handle, domctl.u.getdomaininfo.handle,
  12.200                 sizeof(xen_domain_handle_t));
  12.201  
  12.202 -        next_domid = (uint16_t)op.u.getdomaininfo.domain + 1;
  12.203 +        next_domid = (uint16_t)domctl.domain + 1;
  12.204          info++;
  12.205      }
  12.206  
  12.207 @@ -163,20 +211,20 @@ int xc_domain_getinfolist(int xc_handle,
  12.208                            xc_domaininfo_t *info)
  12.209  {
  12.210      int ret = 0;
  12.211 -    DECLARE_DOM0_OP;
  12.212 +    DECLARE_SYSCTL;
  12.213  
  12.214      if ( mlock(info, max_domains*sizeof(xc_domaininfo_t)) != 0 )
  12.215          return -1;
  12.216  
  12.217 -    op.cmd = DOM0_GETDOMAININFOLIST;
  12.218 -    op.u.getdomaininfolist.first_domain = first_domain;
  12.219 -    op.u.getdomaininfolist.max_domains  = max_domains;
  12.220 -    set_xen_guest_handle(op.u.getdomaininfolist.buffer, info);
  12.221 +    sysctl.cmd = XEN_SYSCTL_getdomaininfolist;
  12.222 +    sysctl.u.getdomaininfolist.first_domain = first_domain;
  12.223 +    sysctl.u.getdomaininfolist.max_domains  = max_domains;
  12.224 +    set_xen_guest_handle(sysctl.u.getdomaininfolist.buffer, info);
  12.225  
  12.226 -    if ( xc_dom0_op(xc_handle, &op) < 0 )
  12.227 +    if ( xc_sysctl(xc_handle, &sysctl) < 0 )
  12.228          ret = -1;
  12.229      else
  12.230 -        ret = op.u.getdomaininfolist.num_domains;
  12.231 +        ret = sysctl.u.getdomaininfolist.num_domains;
  12.232  
  12.233      if ( munlock(info, max_domains*sizeof(xc_domaininfo_t)) != 0 )
  12.234          ret = -1;
  12.235 @@ -190,17 +238,17 @@ int xc_vcpu_getcontext(int xc_handle,
  12.236                                 vcpu_guest_context_t *ctxt)
  12.237  {
  12.238      int rc;
  12.239 -    DECLARE_DOM0_OP;
  12.240 +    DECLARE_DOMCTL;
  12.241  
  12.242 -    op.cmd = DOM0_GETVCPUCONTEXT;
  12.243 -    op.u.getvcpucontext.domain = (domid_t)domid;
  12.244 -    op.u.getvcpucontext.vcpu   = (uint16_t)vcpu;
  12.245 -    set_xen_guest_handle(op.u.getvcpucontext.ctxt, ctxt);
  12.246 +    domctl.cmd = XEN_DOMCTL_getvcpucontext;
  12.247 +    domctl.domain = (domid_t)domid;
  12.248 +    domctl.u.vcpucontext.vcpu   = (uint16_t)vcpu;
  12.249 +    set_xen_guest_handle(domctl.u.vcpucontext.ctxt, ctxt);
  12.250  
  12.251      if ( (rc = mlock(ctxt, sizeof(*ctxt))) != 0 )
  12.252          return rc;
  12.253  
  12.254 -    rc = do_dom0_op(xc_handle, &op);
  12.255 +    rc = do_domctl(xc_handle, &domctl);
  12.256  
  12.257      safe_munlock(ctxt, sizeof(*ctxt));
  12.258  
  12.259 @@ -215,28 +263,28 @@ int xc_shadow_control(int xc_handle,
  12.260                        unsigned long pages,
  12.261                        unsigned long *mb,
  12.262                        uint32_t mode,
  12.263 -                      xc_shadow_control_stats_t *stats)
  12.264 +                      xc_shadow_op_stats_t *stats)
  12.265  {
  12.266      int rc;
  12.267 -    DECLARE_DOM0_OP;
  12.268 -    op.cmd = DOM0_SHADOW_CONTROL;
  12.269 -    op.u.shadow_control.domain = (domid_t)domid;
  12.270 -    op.u.shadow_control.op     = sop;
  12.271 -    op.u.shadow_control.pages  = pages;
  12.272 -    op.u.shadow_control.mb     = mb ? *mb : 0;
  12.273 -    op.u.shadow_control.mode   = mode;
  12.274 -    set_xen_guest_handle(op.u.shadow_control.dirty_bitmap, dirty_bitmap);
  12.275 +    DECLARE_DOMCTL;
  12.276 +    domctl.cmd = XEN_DOMCTL_shadow_op;
  12.277 +    domctl.domain = (domid_t)domid;
  12.278 +    domctl.u.shadow_op.op     = sop;
  12.279 +    domctl.u.shadow_op.pages  = pages;
  12.280 +    domctl.u.shadow_op.mb     = mb ? *mb : 0;
  12.281 +    domctl.u.shadow_op.mode   = mode;
  12.282 +    set_xen_guest_handle(domctl.u.shadow_op.dirty_bitmap, dirty_bitmap);
  12.283  
  12.284 -    rc = do_dom0_op(xc_handle, &op);
  12.285 +    rc = do_domctl(xc_handle, &domctl);
  12.286  
  12.287      if ( stats )
  12.288 -        memcpy(stats, &op.u.shadow_control.stats,
  12.289 -               sizeof(xc_shadow_control_stats_t));
  12.290 +        memcpy(stats, &domctl.u.shadow_op.stats,
  12.291 +               sizeof(xc_shadow_op_stats_t));
  12.292      
  12.293      if ( mb ) 
  12.294 -        *mb = op.u.shadow_control.mb;
  12.295 +        *mb = domctl.u.shadow_op.mb;
  12.296  
  12.297 -    return (rc == 0) ? op.u.shadow_control.pages : rc;
  12.298 +    return (rc == 0) ? domctl.u.shadow_op.pages : rc;
  12.299  }
  12.300  
  12.301  int xc_domain_setcpuweight(int xc_handle,
  12.302 @@ -258,22 +306,22 @@ int xc_domain_setmaxmem(int xc_handle,
  12.303                          uint32_t domid,
  12.304                          unsigned int max_memkb)
  12.305  {
  12.306 -    DECLARE_DOM0_OP;
  12.307 -    op.cmd = DOM0_SETDOMAINMAXMEM;
  12.308 -    op.u.setdomainmaxmem.domain = (domid_t)domid;
  12.309 -    op.u.setdomainmaxmem.max_memkb = max_memkb;
  12.310 -    return do_dom0_op(xc_handle, &op);
  12.311 +    DECLARE_DOMCTL;
  12.312 +    domctl.cmd = XEN_DOMCTL_max_mem;
  12.313 +    domctl.domain = (domid_t)domid;
  12.314 +    domctl.u.max_mem.max_memkb = max_memkb;
  12.315 +    return do_domctl(xc_handle, &domctl);
  12.316  }
  12.317  
  12.318  int xc_domain_set_time_offset(int xc_handle,
  12.319                                uint32_t domid,
  12.320                                int32_t time_offset_seconds)
  12.321  {
  12.322 -    DECLARE_DOM0_OP;
  12.323 -    op.cmd = DOM0_SETTIMEOFFSET;
  12.324 -    op.u.settimeoffset.domain = (domid_t)domid;
  12.325 -    op.u.settimeoffset.time_offset_seconds = time_offset_seconds;
  12.326 -    return do_dom0_op(xc_handle, &op);
  12.327 +    DECLARE_DOMCTL;
  12.328 +    domctl.cmd = XEN_DOMCTL_settimeoffset;
  12.329 +    domctl.domain = (domid_t)domid;
  12.330 +    domctl.u.settimeoffset.time_offset_seconds = time_offset_seconds;
  12.331 +    return do_domctl(xc_handle, &domctl);
  12.332  }
  12.333  
  12.334  int xc_domain_memory_increase_reservation(int xc_handle,
  12.335 @@ -397,21 +445,22 @@ int xc_domain_translate_gpfn_list(int xc
  12.336  
  12.337  int xc_domain_max_vcpus(int xc_handle, uint32_t domid, unsigned int max)
  12.338  {
  12.339 -    DECLARE_DOM0_OP;
  12.340 -    op.cmd = DOM0_MAX_VCPUS;
  12.341 -    op.u.max_vcpus.domain = (domid_t)domid;
  12.342 -    op.u.max_vcpus.max    = max;
  12.343 -    return do_dom0_op(xc_handle, &op);
  12.344 +    DECLARE_DOMCTL;
  12.345 +    domctl.cmd = XEN_DOMCTL_max_vcpus;
  12.346 +    domctl.domain = (domid_t)domid;
  12.347 +    domctl.u.max_vcpus.max    = max;
  12.348 +    return do_domctl(xc_handle, &domctl);
  12.349  }
  12.350  
  12.351  int xc_domain_sethandle(int xc_handle, uint32_t domid,
  12.352                          xen_domain_handle_t handle)
  12.353  {
  12.354 -    DECLARE_DOM0_OP;
  12.355 -    op.cmd = DOM0_SETDOMAINHANDLE;
  12.356 -    op.u.setdomainhandle.domain = (domid_t)domid;
  12.357 -    memcpy(op.u.setdomainhandle.handle, handle, sizeof(xen_domain_handle_t));
  12.358 -    return do_dom0_op(xc_handle, &op);
  12.359 +    DECLARE_DOMCTL;
  12.360 +    domctl.cmd = XEN_DOMCTL_setdomainhandle;
  12.361 +    domctl.domain = (domid_t)domid;
  12.362 +    memcpy(domctl.u.setdomainhandle.handle, handle,
  12.363 +           sizeof(xen_domain_handle_t));
  12.364 +    return do_domctl(xc_handle, &domctl);
  12.365  }
  12.366  
  12.367  int xc_vcpu_getinfo(int xc_handle,
  12.368 @@ -420,14 +469,15 @@ int xc_vcpu_getinfo(int xc_handle,
  12.369                      xc_vcpuinfo_t *info)
  12.370  {
  12.371      int rc;
  12.372 -    DECLARE_DOM0_OP;
  12.373 -    op.cmd = DOM0_GETVCPUINFO;
  12.374 -    op.u.getvcpuinfo.domain = (domid_t)domid;
  12.375 -    op.u.getvcpuinfo.vcpu   = (uint16_t)vcpu;
  12.376 +    DECLARE_DOMCTL;
  12.377  
  12.378 -    rc = do_dom0_op(xc_handle, &op);
  12.379 +    domctl.cmd = XEN_DOMCTL_getvcpuinfo;
  12.380 +    domctl.domain = (domid_t)domid;
  12.381 +    domctl.u.getvcpuinfo.vcpu   = (uint16_t)vcpu;
  12.382  
  12.383 -    memcpy(info, &op.u.getvcpuinfo, sizeof(*info));
  12.384 +    rc = do_domctl(xc_handle, &domctl);
  12.385 +
  12.386 +    memcpy(info, &domctl.u.getvcpuinfo, sizeof(*info));
  12.387  
  12.388      return rc;
  12.389  }
  12.390 @@ -438,15 +488,15 @@ int xc_domain_ioport_permission(int xc_h
  12.391                                  uint32_t nr_ports,
  12.392                                  uint32_t allow_access)
  12.393  {
  12.394 -    DECLARE_DOM0_OP;
  12.395 +    DECLARE_DOMCTL;
  12.396  
  12.397 -    op.cmd = DOM0_IOPORT_PERMISSION;
  12.398 -    op.u.ioport_permission.domain = (domid_t)domid;
  12.399 -    op.u.ioport_permission.first_port = first_port;
  12.400 -    op.u.ioport_permission.nr_ports = nr_ports;
  12.401 -    op.u.ioport_permission.allow_access = allow_access;
  12.402 +    domctl.cmd = XEN_DOMCTL_ioport_permission;
  12.403 +    domctl.domain = (domid_t)domid;
  12.404 +    domctl.u.ioport_permission.first_port = first_port;
  12.405 +    domctl.u.ioport_permission.nr_ports = nr_ports;
  12.406 +    domctl.u.ioport_permission.allow_access = allow_access;
  12.407  
  12.408 -    return do_dom0_op(xc_handle, &op);
  12.409 +    return do_domctl(xc_handle, &domctl);
  12.410  }
  12.411  
  12.412  int xc_vcpu_setcontext(int xc_handle,
  12.413 @@ -454,18 +504,18 @@ int xc_vcpu_setcontext(int xc_handle,
  12.414                         uint32_t vcpu,
  12.415                         vcpu_guest_context_t *ctxt)
  12.416  {
  12.417 -    dom0_op_t op;
  12.418 +    DECLARE_DOMCTL;
  12.419      int rc;
  12.420  
  12.421 -    op.cmd = DOM0_SETVCPUCONTEXT;
  12.422 -    op.u.setvcpucontext.domain = domid;
  12.423 -    op.u.setvcpucontext.vcpu = vcpu;
  12.424 -    set_xen_guest_handle(op.u.setvcpucontext.ctxt, ctxt);
  12.425 +    domctl.cmd = XEN_DOMCTL_setvcpucontext;
  12.426 +    domctl.domain = domid;
  12.427 +    domctl.u.vcpucontext.vcpu = vcpu;
  12.428 +    set_xen_guest_handle(domctl.u.vcpucontext.ctxt, ctxt);
  12.429  
  12.430      if ( (rc = mlock(ctxt, sizeof(*ctxt))) != 0 )
  12.431          return rc;
  12.432  
  12.433 -    rc = do_dom0_op(xc_handle, &op);
  12.434 +    rc = do_domctl(xc_handle, &domctl);
  12.435  
  12.436      safe_munlock(ctxt, sizeof(*ctxt));
  12.437  
  12.438 @@ -478,14 +528,14 @@ int xc_domain_irq_permission(int xc_hand
  12.439                               uint8_t pirq,
  12.440                               uint8_t allow_access)
  12.441  {
  12.442 -    dom0_op_t op;
  12.443 +    DECLARE_DOMCTL;
  12.444  
  12.445 -    op.cmd = DOM0_IRQ_PERMISSION;
  12.446 -    op.u.irq_permission.domain = domid;
  12.447 -    op.u.irq_permission.pirq = pirq;
  12.448 -    op.u.irq_permission.allow_access = allow_access;
  12.449 +    domctl.cmd = XEN_DOMCTL_irq_permission;
  12.450 +    domctl.domain = domid;
  12.451 +    domctl.u.irq_permission.pirq = pirq;
  12.452 +    domctl.u.irq_permission.allow_access = allow_access;
  12.453  
  12.454 -    return do_dom0_op(xc_handle, &op);
  12.455 +    return do_domctl(xc_handle, &domctl);
  12.456  }
  12.457  
  12.458  int xc_domain_iomem_permission(int xc_handle,
  12.459 @@ -494,15 +544,15 @@ int xc_domain_iomem_permission(int xc_ha
  12.460                                 unsigned long nr_mfns,
  12.461                                 uint8_t allow_access)
  12.462  {
  12.463 -    dom0_op_t op;
  12.464 +    DECLARE_DOMCTL;
  12.465  
  12.466 -    op.cmd = DOM0_IOMEM_PERMISSION;
  12.467 -    op.u.iomem_permission.domain = domid;
  12.468 -    op.u.iomem_permission.first_mfn = first_mfn;
  12.469 -    op.u.iomem_permission.nr_mfns = nr_mfns;
  12.470 -    op.u.iomem_permission.allow_access = allow_access;
  12.471 +    domctl.cmd = XEN_DOMCTL_iomem_permission;
  12.472 +    domctl.domain = domid;
  12.473 +    domctl.u.iomem_permission.first_mfn = first_mfn;
  12.474 +    domctl.u.iomem_permission.nr_mfns = nr_mfns;
  12.475 +    domctl.u.iomem_permission.allow_access = allow_access;
  12.476  
  12.477 -    return do_dom0_op(xc_handle, &op);
  12.478 +    return do_domctl(xc_handle, &domctl);
  12.479  }
  12.480  
  12.481  /*

    13.1 --- a/tools/libxc/xc_hvm_build.c	Fri Aug 25 10:39:24 2006 +0100
    13.2 +++ b/tools/libxc/xc_hvm_build.c	Fri Aug 25 18:39:10 2006 +0100
    13.3 @@ -395,7 +395,7 @@ static int xc_hvm_build_internal(int xc_
    13.4                                   unsigned int store_evtchn,
    13.5                                   unsigned long *store_mfn)
    13.6  {
    13.7 -    dom0_op_t launch_op, op;
    13.8 +    struct xen_domctl launch_domctl, domctl;
    13.9      int rc, i;
   13.10      vcpu_guest_context_t st_ctxt, *ctxt = &st_ctxt;
   13.11      unsigned long nr_pages;
   13.12 @@ -432,21 +432,21 @@ static int xc_hvm_build_internal(int xc_
   13.13          return 1;
   13.14      }
   13.15  
   13.16 -    op.cmd = DOM0_GETDOMAININFO;
   13.17 -    op.u.getdomaininfo.domain = (domid_t)domid;
   13.18 -    if ( (xc_dom0_op(xc_handle, &op) < 0) ||
   13.19 -         ((uint16_t)op.u.getdomaininfo.domain != domid) )
   13.20 +    domctl.cmd = XEN_DOMCTL_getdomaininfo;
   13.21 +    domctl.domain = (domid_t)domid;
   13.22 +    if ( (xc_domctl(xc_handle, &domctl) < 0) ||
   13.23 +         ((uint16_t)domctl.domain != domid) )
   13.24      {
   13.25          PERROR("Could not get info on domain");
   13.26          goto error_out;
   13.27      }
   13.28  
   13.29      /* HVM domains must be put into shadow2 mode at the start of day */
   13.30 -    if ( xc_shadow_control(xc_handle, domid, DOM0_SHADOW_CONTROL_OP_ENABLE,
   13.31 +    if ( xc_shadow_control(xc_handle, domid, XEN_DOMCTL_SHADOW_OP_ENABLE,
   13.32                             NULL, 0, NULL, 
   13.33 -                           DOM0_SHADOW_ENABLE_REFCOUNT  |
   13.34 -                           DOM0_SHADOW_ENABLE_TRANSLATE |
   13.35 -                           DOM0_SHADOW_ENABLE_EXTERNAL, 
   13.36 +                           XEN_DOMCTL_SHADOW_ENABLE_REFCOUNT  |
   13.37 +                           XEN_DOMCTL_SHADOW_ENABLE_TRANSLATE |
   13.38 +                           XEN_DOMCTL_SHADOW_ENABLE_EXTERNAL, 
   13.39                             NULL) )
   13.40      {
   13.41          PERROR("Could not enable shadow paging for domain.\n");
   13.42 @@ -457,7 +457,7 @@ static int xc_hvm_build_internal(int xc_
   13.43  
   13.44      ctxt->flags = VGCF_HVM_GUEST;
   13.45      if ( setup_guest(xc_handle, domid, memsize, image, image_size, nr_pages,
   13.46 -                     ctxt, op.u.getdomaininfo.shared_info_frame,
   13.47 +                     ctxt, domctl.u.getdomaininfo.shared_info_frame,
   13.48                       vcpus, pae, acpi, apic, store_evtchn, store_mfn) < 0)
   13.49      {
   13.50          ERROR("Error constructing guest OS");
   13.51 @@ -495,14 +495,14 @@ static int xc_hvm_build_internal(int xc_
   13.52      ctxt->syscall_callback_eip  = 0;
   13.53  #endif
   13.54  
   13.55 -    memset( &launch_op, 0, sizeof(launch_op) );
   13.56 +    memset(&launch_domctl, 0, sizeof(launch_domctl));
   13.57  
   13.58 -    launch_op.u.setvcpucontext.domain = (domid_t)domid;
   13.59 -    launch_op.u.setvcpucontext.vcpu   = 0;
   13.60 -    set_xen_guest_handle(launch_op.u.setvcpucontext.ctxt, ctxt);
   13.61 +    launch_domctl.domain = (domid_t)domid;
   13.62 +    launch_domctl.u.vcpucontext.vcpu   = 0;
   13.63 +    set_xen_guest_handle(launch_domctl.u.vcpucontext.ctxt, ctxt);
   13.64  
   13.65 -    launch_op.cmd = DOM0_SETVCPUCONTEXT;
   13.66 -    rc = xc_dom0_op(xc_handle, &launch_op);
   13.67 +    launch_domctl.cmd = XEN_DOMCTL_setvcpucontext;
   13.68 +    rc = xc_domctl(xc_handle, &launch_domctl);
   13.69  
   13.70      return rc;
   13.71  

    14.1 --- a/tools/libxc/xc_linux_build.c	Fri Aug 25 10:39:24 2006 +0100
    14.2 +++ b/tools/libxc/xc_linux_build.c	Fri Aug 25 18:39:10 2006 +0100
    14.3 @@ -474,7 +474,7 @@ static int setup_guest(int xc_handle,
    14.4      struct xen_ia64_boot_param *bp;
    14.5      shared_info_t *shared_info;
    14.6      int i;
    14.7 -    DECLARE_DOM0_OP;
    14.8 +    DECLARE_DOMCTL;
    14.9      int rc;
   14.10  
   14.11      rc = probeimageformat(image, image_size, &load_funcs);
   14.12 @@ -494,14 +494,13 @@ static int setup_guest(int xc_handle,
   14.13      start_info_mpa = (nr_pages - 3) << PAGE_SHIFT;
   14.14  
   14.15      /* Build firmware.  */
   14.16 -    memset(&op.u.domain_setup, 0, sizeof(op.u.domain_setup));
   14.17 -    op.u.domain_setup.flags = 0;
   14.18 -    op.u.domain_setup.domain = (domid_t)dom;
   14.19 -    op.u.domain_setup.bp = start_info_mpa + sizeof (start_info_t);
   14.20 -    op.u.domain_setup.maxmem = (nr_pages - 3) << PAGE_SHIFT;
   14.21 -    
   14.22 -    op.cmd = DOM0_DOMAIN_SETUP;
   14.23 -    if ( xc_dom0_op(xc_handle, &op) )
   14.24 +    memset(&domctl.u.arch_setup, 0, sizeof(domctl.u.arch_setup));
   14.25 +    domctl.u.arch_setup.flags = 0;
   14.26 +    domctl.u.arch_setup.bp = start_info_mpa + sizeof (start_info_t);
   14.27 +    domctl.u.arch_setup.maxmem = (nr_pages - 3) << PAGE_SHIFT;
   14.28 +    domctl.cmd = XEN_DOMCTL_arch_setup;
   14.29 +    domctl.domain = (domid_t)dom;
   14.30 +    if ( xc_domctl(xc_handle, &domctl) )
   14.31          goto error_out;
   14.32  
   14.33      start_page = dsi.v_start >> PAGE_SHIFT;
   14.34 @@ -662,7 +661,7 @@ static int setup_guest(int xc_handle,
   14.35      shared_info_t *shared_info;
   14.36      xc_mmu_t *mmu = NULL;
   14.37      const char *p;
   14.38 -    DECLARE_DOM0_OP;
   14.39 +    DECLARE_DOMCTL;
   14.40      int rc;
   14.41  
   14.42      unsigned long nr_pt_pages;
   14.43 @@ -966,7 +965,7 @@ static int setup_guest(int xc_handle,
   14.44  
   14.45          /* Enable shadow translate mode */
   14.46          if ( xc_shadow_control(xc_handle, dom,
   14.47 -                               DOM0_SHADOW_CONTROL_OP_ENABLE_TRANSLATE,
   14.48 +                               XEN_DOMCTL_SHADOW_OP_ENABLE_TRANSLATE,
   14.49                                 NULL, 0, NULL, 0, NULL) < 0 )
   14.50          {
   14.51              PERROR("Could not enable translation mode");
   14.52 @@ -1077,11 +1076,11 @@ static int setup_guest(int xc_handle,
   14.53          unsigned long long pfn = (hypercall_page - dsi.v_start) >> PAGE_SHIFT;
   14.54          if ( pfn >= nr_pages )
   14.55              goto error_out;
   14.56 -        op.u.hypercall_init.domain = (domid_t)dom;
   14.57 -        op.u.hypercall_init.gmfn   = shadow_mode_enabled ?
   14.58 +        domctl.domain = (domid_t)dom;
   14.59 +        domctl.u.hypercall_init.gmfn   = shadow_mode_enabled ?
   14.60              pfn : page_array[pfn];
   14.61 -        op.cmd = DOM0_HYPERCALL_INIT;
   14.62 -        if ( xc_dom0_op(xc_handle, &op) )
   14.63 +        domctl.cmd = XEN_DOMCTL_hypercall_init;
   14.64 +        if ( xc_domctl(xc_handle, &domctl) )
   14.65              goto error_out;
   14.66      }
   14.67  
   14.68 @@ -1114,8 +1113,8 @@ static int xc_linux_build_internal(int x
   14.69                                     unsigned int console_evtchn,
   14.70                                     unsigned long *console_mfn)
   14.71  {
   14.72 -    dom0_op_t launch_op;
   14.73 -    DECLARE_DOM0_OP;
   14.74 +    struct xen_domctl launch_domctl;
   14.75 +    DECLARE_DOMCTL;
   14.76      int rc, i;
   14.77      vcpu_guest_context_t st_ctxt, *ctxt = &st_ctxt;
   14.78      unsigned long nr_pages;
   14.79 @@ -1147,10 +1146,10 @@ static int xc_linux_build_internal(int x
   14.80          return 1;
   14.81      }
   14.82  
   14.83 -    op.cmd = DOM0_GETDOMAININFO;
   14.84 -    op.u.getdomaininfo.domain = (domid_t)domid;
   14.85 -    if ( (xc_dom0_op(xc_handle, &op) < 0) ||
   14.86 -         ((uint16_t)op.u.getdomaininfo.domain != domid) )
   14.87 +    domctl.cmd = XEN_DOMCTL_getdomaininfo;
   14.88 +    domctl.domain = (domid_t)domid;
   14.89 +    if ( (xc_domctl(xc_handle, &domctl) < 0) ||
   14.90 +         ((uint16_t)domctl.domain != domid) )
   14.91      {
   14.92          PERROR("Could not get info on domain");
   14.93          goto error_out;
   14.94 @@ -1163,7 +1162,7 @@ static int xc_linux_build_internal(int x
   14.95                       nr_pages,
   14.96                       &vstartinfo_start, &vkern_entry,
   14.97                       &vstack_start, ctxt, cmdline,
   14.98 -                     op.u.getdomaininfo.shared_info_frame,
   14.99 +                     domctl.u.getdomaininfo.shared_info_frame,
  14.100                       flags, store_evtchn, store_mfn,
  14.101                       console_evtchn, console_mfn,
  14.102                       features_bitmap) < 0 )
  14.103 @@ -1239,14 +1238,14 @@ static int xc_linux_build_internal(int x
  14.104  #endif
  14.105  #endif /* x86 */
  14.106  
  14.107 -    memset( &launch_op, 0, sizeof(launch_op) );
  14.108 +    memset( &launch_domctl, 0, sizeof(launch_domctl) );
  14.109  
  14.110 -    launch_op.u.setvcpucontext.domain = (domid_t)domid;
  14.111 -    launch_op.u.setvcpucontext.vcpu   = 0;
  14.112 -    set_xen_guest_handle(launch_op.u.setvcpucontext.ctxt, ctxt);
  14.113 +    launch_domctl.domain = (domid_t)domid;
  14.114 +    launch_domctl.u.vcpucontext.vcpu   = 0;
  14.115 +    set_xen_guest_handle(launch_domctl.u.vcpucontext.ctxt, ctxt);
  14.116  
  14.117 -    launch_op.cmd = DOM0_SETVCPUCONTEXT;
  14.118 -    rc = xc_dom0_op(xc_handle, &launch_op);
  14.119 +    launch_domctl.cmd = XEN_DOMCTL_setvcpucontext;
  14.120 +    rc = xc_domctl(xc_handle, &launch_domctl);
  14.121  
  14.122      return rc;
  14.123  

    15.1 --- a/tools/libxc/xc_linux_restore.c	Fri Aug 25 10:39:24 2006 +0100
    15.2 +++ b/tools/libxc/xc_linux_restore.c	Fri Aug 25 18:39:10 2006 +0100
    15.3 @@ -107,7 +107,7 @@ int xc_linux_restore(int xc_handle, int 
    15.4                       unsigned int store_evtchn, unsigned long *store_mfn,
    15.5                       unsigned int console_evtchn, unsigned long *console_mfn)
    15.6  {
    15.7 -    DECLARE_DOM0_OP;
    15.8 +    DECLARE_DOMCTL;
    15.9      int rc = 1, i, n, pae_extended_cr3 = 0;
   15.10      unsigned long mfn, pfn;
   15.11      unsigned int prev_pc, this_pc;
   15.12 @@ -163,7 +163,7 @@ int xc_linux_restore(int xc_handle, int 
   15.13      }
   15.14  
   15.15      if (mlock(&ctxt, sizeof(ctxt))) {
   15.16 -        /* needed for build dom0 op, but might as well do early */
   15.17 +        /* needed for build domctl, but might as well do early */
   15.18          ERR("Unable to mlock ctxt");
   15.19          return 1;
   15.20      }
   15.21 @@ -257,13 +257,13 @@ int xc_linux_restore(int xc_handle, int 
   15.22      }
   15.23  
   15.24      /* Get the domain's shared-info frame. */
   15.25 -    op.cmd = DOM0_GETDOMAININFO;
   15.26 -    op.u.getdomaininfo.domain = (domid_t)dom;
   15.27 -    if (xc_dom0_op(xc_handle, &op) < 0) {
   15.28 +    domctl.cmd = XEN_DOMCTL_getdomaininfo;
   15.29 +    domctl.domain = (domid_t)dom;
   15.30 +    if (xc_domctl(xc_handle, &domctl) < 0) {
   15.31          ERR("Could not get information on new domain");
   15.32          goto out;
   15.33      }
   15.34 -    shared_info_frame = op.u.getdomaininfo.shared_info_frame;
   15.35 +    shared_info_frame = domctl.u.getdomaininfo.shared_info_frame;
   15.36  
   15.37      if(xc_domain_setmaxmem(xc_handle, dom, PFN_TO_KB(max_pfn)) != 0) {
   15.38          errno = ENOMEM;
   15.39 @@ -337,17 +337,22 @@ int xc_linux_restore(int xc_handle, int 
   15.40              goto out;
   15.41          }
   15.42  
   15.43 -        for (i = 0; i < j; i++) {
   15.44 +        for ( i = 0; i < j; i++ )
   15.45 +        {
   15.46 +            unsigned long pfn, pagetype;
   15.47 +            pfn      = region_pfn_type[i] & ~XEN_DOMCTL_PFINFO_LTAB_MASK;
   15.48 +            pagetype = region_pfn_type[i] &  XEN_DOMCTL_PFINFO_LTAB_MASK;
   15.49  
   15.50 -            if ((region_pfn_type[i] & LTAB_MASK) == XTAB)
   15.51 +            if ( pagetype == XEN_DOMCTL_PFINFO_XTAB)
   15.52                  region_mfn[i] = 0; /* we know map will fail, but don't care */
   15.53              else
   15.54 -                region_mfn[i] = p2m[region_pfn_type[i] & ~LTAB_MASK];
   15.55 -
   15.56 +                region_mfn[i] = p2m[pfn];
   15.57          }
   15.58  
   15.59 -        if (!(region_base = xc_map_foreign_batch(
   15.60 -                  xc_handle, dom, PROT_WRITE, region_mfn, j))) {
   15.61 +        region_base = xc_map_foreign_batch(
   15.62 +            xc_handle, dom, PROT_WRITE, region_mfn, j);
   15.63 +        if ( region_base == NULL )
   15.64 +        {
   15.65              ERR("map batch failed");
   15.66              goto out;
   15.67          }
   15.68 @@ -357,14 +362,15 @@ int xc_linux_restore(int xc_handle, int 
   15.69              void *page;
   15.70              unsigned long pagetype;
   15.71  
   15.72 -            pfn      = region_pfn_type[i] & ~LTAB_MASK;
   15.73 -            pagetype = region_pfn_type[i] & LTAB_MASK;
   15.74 +            pfn      = region_pfn_type[i] & ~XEN_DOMCTL_PFINFO_LTAB_MASK;
   15.75 +            pagetype = region_pfn_type[i] &  XEN_DOMCTL_PFINFO_LTAB_MASK;
   15.76  
   15.77 -            if (pagetype == XTAB)
   15.78 +            if ( pagetype == XEN_DOMCTL_PFINFO_XTAB )
   15.79                  /* a bogus/unmapped page: skip it */
   15.80                  continue;
   15.81  
   15.82 -            if (pfn > max_pfn) {
   15.83 +            if ( pfn > max_pfn )
   15.84 +            {
   15.85                  ERR("pfn out of range");
   15.86                  goto out;
   15.87              }
   15.88 @@ -381,10 +387,11 @@ int xc_linux_restore(int xc_handle, int 
   15.89                  goto out;
   15.90              }
   15.91  
   15.92 -            pagetype &= LTABTYPE_MASK;
   15.93 +            pagetype &= XEN_DOMCTL_PFINFO_LTABTYPE_MASK;
   15.94  
   15.95 -            if(pagetype >= L1TAB && pagetype <= L4TAB) {
   15.96 -
   15.97 +            if ( (pagetype >= XEN_DOMCTL_PFINFO_L1TAB) && 
   15.98 +                 (pagetype <= XEN_DOMCTL_PFINFO_L4TAB) )
   15.99 +            {
  15.100                  /*
  15.101                  ** A page table page - need to 'uncanonicalize' it, i.e.
  15.102                  ** replace all the references to pfns with the corresponding
  15.103 @@ -396,7 +403,7 @@ int xc_linux_restore(int xc_handle, int 
  15.104                  */
  15.105                  if ((pt_levels != 3) ||
  15.106                      pae_extended_cr3 ||
  15.107 -                    (pagetype != L1TAB)) {
  15.108 +                    (pagetype != XEN_DOMCTL_PFINFO_L1TAB)) {
  15.109  
  15.110                      if (!uncanonicalize_pagetable(pagetype, page)) {
  15.111                          /*
  15.112 @@ -412,8 +419,9 @@ int xc_linux_restore(int xc_handle, int 
  15.113  
  15.114                  }
  15.115  
  15.116 -            } else if(pagetype != NOTAB) {
  15.117 -
  15.118 +            }
  15.119 +            else if ( pagetype != XEN_DOMCTL_PFINFO_NOTAB )
  15.120 +            {
  15.121                  ERR("Bogus page type %lx page table is out of range: "
  15.122                      "i=%d max_pfn=%lu", pagetype, i, max_pfn);
  15.123                  goto out;
  15.124 @@ -484,10 +492,12 @@ int xc_linux_restore(int xc_handle, int 
  15.125          int j, k;
  15.126  
  15.127          /* First pass: find all L3TABs current in > 4G mfns and get new mfns */
  15.128 -        for (i = 0; i < max_pfn; i++) {
  15.129 -
  15.130 -            if (((pfn_type[i] & LTABTYPE_MASK)==L3TAB) && (p2m[i]>0xfffffUL)) {
  15.131 -
  15.132 +        for ( i = 0; i < max_pfn; i++ )
  15.133 +        {
  15.134 +            if ( ((pfn_type[i] & XEN_DOMCTL_PFINFO_LTABTYPE_MASK) ==
  15.135 +                  XEN_DOMCTL_PFINFO_L3TAB) &&
  15.136 +                 (p2m[i] > 0xfffffUL) )
  15.137 +            {
  15.138                  unsigned long new_mfn;
  15.139                  uint64_t l3ptes[4];
  15.140                  uint64_t *l3tab;
  15.141 @@ -530,9 +540,11 @@ int xc_linux_restore(int xc_handle, int 
  15.142          /* Second pass: find all L1TABs and uncanonicalize them */
  15.143          j = 0;
  15.144  
  15.145 -        for(i = 0; i < max_pfn; i++) {
  15.146 -
  15.147 -            if (((pfn_type[i] & LTABTYPE_MASK)==L1TAB)) {
  15.148 +        for ( i = 0; i < max_pfn; i++ )
  15.149 +        {
  15.150 +            if ( ((pfn_type[i] & XEN_DOMCTL_PFINFO_LTABTYPE_MASK) ==
  15.151 +                  XEN_DOMCTL_PFINFO_L1TAB) )
  15.152 +            {
  15.153                  region_mfn[j] = p2m[i];
  15.154                  j++;
  15.155              }
  15.156 @@ -547,7 +559,7 @@ int xc_linux_restore(int xc_handle, int 
  15.157                  }
  15.158  
  15.159                  for(k = 0; k < j; k++) {
  15.160 -                    if(!uncanonicalize_pagetable(L1TAB,
  15.161 +                    if(!uncanonicalize_pagetable(XEN_DOMCTL_PFINFO_L1TAB,
  15.162                                                   region_base + k*PAGE_SIZE)) {
  15.163                          ERR("failed uncanonicalize pt!");
  15.164                          goto out;
  15.165 @@ -570,26 +582,26 @@ int xc_linux_restore(int xc_handle, int 
  15.166       * will barf when doing the type-checking.
  15.167       */
  15.168      nr_pins = 0;
  15.169 -    for (i = 0; i < max_pfn; i++) {
  15.170 -
  15.171 -        if ( (pfn_type[i] & LPINTAB) == 0 )
  15.172 +    for ( i = 0; i < max_pfn; i++ )
  15.173 +    {
  15.174 +        if ( (pfn_type[i] & XEN_DOMCTL_PFINFO_LPINTAB) == 0 )
  15.175              continue;
  15.176  
  15.177 -        switch (pfn_type[i]) {
  15.178 -
  15.179 -        case (L1TAB|LPINTAB):
  15.180 +        switch ( pfn_type[i] & XEN_DOMCTL_PFINFO_LTABTYPE_MASK )
  15.181 +        {
  15.182 +        case XEN_DOMCTL_PFINFO_L1TAB:
  15.183              pin[nr_pins].cmd = MMUEXT_PIN_L1_TABLE;
  15.184              break;
  15.185  
  15.186 -        case (L2TAB|LPINTAB):
  15.187 +        case XEN_DOMCTL_PFINFO_L2TAB:
  15.188              pin[nr_pins].cmd = MMUEXT_PIN_L2_TABLE;
  15.189              break;
  15.190  
  15.191 -        case (L3TAB|LPINTAB):
  15.192 +        case XEN_DOMCTL_PFINFO_L3TAB:
  15.193              pin[nr_pins].cmd = MMUEXT_PIN_L3_TABLE;
  15.194              break;
  15.195  
  15.196 -        case (L4TAB|LPINTAB):
  15.197 +        case XEN_DOMCTL_PFINFO_L4TAB:
  15.198              pin[nr_pins].cmd = MMUEXT_PIN_L4_TABLE;
  15.199              break;
  15.200  
  15.201 @@ -678,7 +690,7 @@ int xc_linux_restore(int xc_handle, int 
  15.202  
  15.203      /* Uncanonicalise the suspend-record frame number and poke resume rec. */
  15.204      pfn = ctxt.user_regs.edx;
  15.205 -    if ((pfn >= max_pfn) || (pfn_type[pfn] != NOTAB)) {
  15.206 +    if ((pfn >= max_pfn) || (pfn_type[pfn] != XEN_DOMCTL_PFINFO_NOTAB)) {
  15.207          ERR("Suspend record frame number is bad");
  15.208          goto out;
  15.209      }
  15.210 @@ -703,7 +715,7 @@ int xc_linux_restore(int xc_handle, int 
  15.211  
  15.212      for (i = 0; i < ctxt.gdt_ents; i += 512) {
  15.213          pfn = ctxt.gdt_frames[i];
  15.214 -        if ((pfn >= max_pfn) || (pfn_type[pfn] != NOTAB)) {
  15.215 +        if ((pfn >= max_pfn) || (pfn_type[pfn] != XEN_DOMCTL_PFINFO_NOTAB)) {
  15.216              ERR("GDT frame number is bad");
  15.217              goto out;
  15.218          }
  15.219 @@ -719,11 +731,11 @@ int xc_linux_restore(int xc_handle, int 
  15.220          goto out;
  15.221      }
  15.222  
  15.223 -    if ( (pfn_type[pfn] & LTABTYPE_MASK) !=
  15.224 -         ((unsigned long)pt_levels<<LTAB_SHIFT) ) {
  15.225 +    if ( (pfn_type[pfn] & XEN_DOMCTL_PFINFO_LTABTYPE_MASK) !=
  15.226 +         ((unsigned long)pt_levels<<XEN_DOMCTL_PFINFO_LTAB_SHIFT) ) {
  15.227          ERR("PT base is bad. pfn=%lu nr=%lu type=%08lx %08lx",
  15.228              pfn, max_pfn, pfn_type[pfn],
  15.229 -            (unsigned long)pt_levels<<LTAB_SHIFT);
  15.230 +            (unsigned long)pt_levels<<XEN_DOMCTL_PFINFO_LTAB_SHIFT);
  15.231          goto out;
  15.232      }
  15.233  
  15.234 @@ -744,7 +756,7 @@ int xc_linux_restore(int xc_handle, int 
  15.235      /* Uncanonicalise the pfn-to-mfn table frame-number list. */
  15.236      for (i = 0; i < P2M_FL_ENTRIES; i++) {
  15.237          pfn = p2m_frame_list[i];
  15.238 -        if ((pfn >= max_pfn) || (pfn_type[pfn] != NOTAB)) {
  15.239 +        if ((pfn >= max_pfn) || (pfn_type[pfn] != XEN_DOMCTL_PFINFO_NOTAB)) {
  15.240              ERR("PFN-to-MFN frame number is bad");
  15.241              goto out;
  15.242          }
  15.243 @@ -797,11 +809,11 @@ int xc_linux_restore(int xc_handle, int 
  15.244  
  15.245      DPRINTF("Domain ready to be built.\n");
  15.246  
  15.247 -    op.cmd = DOM0_SETVCPUCONTEXT;
  15.248 -    op.u.setvcpucontext.domain = (domid_t)dom;
  15.249 -    op.u.setvcpucontext.vcpu   = 0;
  15.250 -    set_xen_guest_handle(op.u.setvcpucontext.ctxt, &ctxt);
  15.251 -    rc = xc_dom0_op(xc_handle, &op);
  15.252 +    domctl.cmd = XEN_DOMCTL_setvcpucontext;
  15.253 +    domctl.domain = (domid_t)dom;
  15.254 +    domctl.u.vcpucontext.vcpu   = 0;
  15.255 +    set_xen_guest_handle(domctl.u.vcpucontext.ctxt, &ctxt);
  15.256 +    rc = xc_domctl(xc_handle, &domctl);
  15.257  
  15.258      if (rc != 0) {
  15.259          ERR("Couldn't build the domain");

    16.1 --- a/tools/libxc/xc_linux_save.c	Fri Aug 25 10:39:24 2006 +0100
    16.2 +++ b/tools/libxc/xc_linux_save.c	Fri Aug 25 18:39:10 2006 +0100
    16.3 @@ -271,7 +271,7 @@ static inline ssize_t write_exact(int fd
    16.4  
    16.5  
    16.6  static int print_stats(int xc_handle, uint32_t domid, int pages_sent,
    16.7 -                       xc_shadow_control_stats_t *stats, int print)
    16.8 +                       xc_shadow_op_stats_t *stats, int print)
    16.9  {
   16.10      static struct timeval wall_last;
   16.11      static long long      d0_cpu_last;
   16.12 @@ -329,7 +329,7 @@ static int analysis_phase(int xc_handle,
   16.13                            unsigned long *arr, int runs)
   16.14  {
   16.15      long long start, now;
   16.16 -    xc_shadow_control_stats_t stats;
   16.17 +    xc_shadow_op_stats_t stats;
   16.18      int j;
   16.19  
   16.20      start = llgettimeofday();
   16.21 @@ -337,13 +337,13 @@ static int analysis_phase(int xc_handle,
   16.22      for (j = 0; j < runs; j++) {
   16.23          int i;
   16.24  
   16.25 -        xc_shadow_control(xc_handle, domid, DOM0_SHADOW_CONTROL_OP_CLEAN,
   16.26 +        xc_shadow_control(xc_handle, domid, XEN_DOMCTL_SHADOW_OP_CLEAN,
   16.27                            arr, max_pfn, NULL, 0, NULL);
   16.28          DPRINTF("#Flush\n");
   16.29          for ( i = 0; i < 40; i++ ) {
   16.30              usleep(50000);
   16.31              now = llgettimeofday();
   16.32 -            xc_shadow_control(xc_handle, domid, DOM0_SHADOW_CONTROL_OP_PEEK,
   16.33 +            xc_shadow_control(xc_handle, domid, XEN_DOMCTL_SHADOW_OP_PEEK,
   16.34                                NULL, 0, NULL, 0, &stats);
   16.35  
   16.36              DPRINTF("now= %lld faults= %"PRId32" dirty= %"PRId32"\n",
   16.37 @@ -427,10 +427,10 @@ int canonicalize_pagetable(unsigned long
   16.38      */
   16.39      xen_start = xen_end = pte_last = PAGE_SIZE / ((pt_levels == 2)? 4 : 8);
   16.40  
   16.41 -    if (pt_levels == 2 && type == L2TAB)
   16.42 +    if (pt_levels == 2 && type == XEN_DOMCTL_PFINFO_L2TAB)
   16.43          xen_start = (hvirt_start >> L2_PAGETABLE_SHIFT);
   16.44  
   16.45 -    if (pt_levels == 3 && type == L3TAB)
   16.46 +    if (pt_levels == 3 && type == XEN_DOMCTL_PFINFO_L3TAB)
   16.47          xen_start = L3_PAGETABLE_ENTRIES_PAE;
   16.48  
   16.49      /*
   16.50 @@ -439,7 +439,7 @@ int canonicalize_pagetable(unsigned long
   16.51      ** Xen always ensures is present in that L2. Guests must ensure
   16.52      ** that this check will fail for other L2s.
   16.53      */
   16.54 -    if (pt_levels == 3 && type == L2TAB) {
   16.55 +    if (pt_levels == 3 && type == XEN_DOMCTL_PFINFO_L2TAB) {
   16.56  
   16.57  /* XXX index of the L2 entry in PAE mode which holds the guest LPT */
   16.58  #define PAE_GLPT_L2ENTRY (495)
   16.59 @@ -449,7 +449,7 @@ int canonicalize_pagetable(unsigned long
   16.60              xen_start = (hvirt_start >> L2_PAGETABLE_SHIFT_PAE) & 0x1ff;
   16.61      }
   16.62  
   16.63 -    if (pt_levels == 4 && type == L4TAB) {
   16.64 +    if (pt_levels == 4 && type == XEN_DOMCTL_PFINFO_L4TAB) {
   16.65          /*
   16.66          ** XXX SMH: should compute these from hvirt_start (which we have)
   16.67          ** and hvirt_end (which we don't)
   16.68 @@ -603,7 +603,7 @@ int xc_linux_save(int xc_handle, int io_
   16.69         - to fixup by sending at the end if not already resent; */
   16.70      unsigned long *to_send = NULL, *to_skip = NULL, *to_fix = NULL;
   16.71  
   16.72 -    xc_shadow_control_stats_t stats;
   16.73 +    xc_shadow_op_stats_t stats;
   16.74  
   16.75      unsigned long needed_to_fix = 0;
   16.76      unsigned long total_sent    = 0;
   16.77 @@ -724,7 +724,7 @@ int xc_linux_save(int xc_handle, int io_
   16.78      if (live) {
   16.79  
   16.80          if (xc_shadow_control(xc_handle, dom,
   16.81 -                              DOM0_SHADOW_CONTROL_OP_ENABLE_LOGDIRTY,
   16.82 +                              XEN_DOMCTL_SHADOW_OP_ENABLE_LOGDIRTY,
   16.83                                NULL, 0, NULL, 0, NULL) < 0) {
   16.84              ERR("Couldn't enable shadow mode");
   16.85              goto out;
   16.86 @@ -781,8 +781,8 @@ int xc_linux_save(int xc_handle, int io_
   16.87      analysis_phase(xc_handle, dom, max_pfn, to_skip, 0);
   16.88  
   16.89      /* We want zeroed memory so use calloc rather than malloc. */
   16.90 -    pfn_type  = calloc(MAX_BATCH_SIZE, sizeof(unsigned long));
   16.91 -    pfn_batch = calloc(MAX_BATCH_SIZE, sizeof(unsigned long));
   16.92 +    pfn_type  = calloc(MAX_BATCH_SIZE, sizeof(*pfn_type));
   16.93 +    pfn_batch = calloc(MAX_BATCH_SIZE, sizeof(*pfn_batch));
   16.94  
   16.95      if ((pfn_type == NULL) || (pfn_batch == NULL)) {
   16.96          ERR("failed to alloc memory for pfn_type and/or pfn_batch arrays");
   16.97 @@ -790,12 +790,11 @@ int xc_linux_save(int xc_handle, int io_
   16.98          goto out;
   16.99      }
  16.100  
  16.101 -    if (mlock(pfn_type, MAX_BATCH_SIZE * sizeof(unsigned long))) {
  16.102 +    if (mlock(pfn_type, MAX_BATCH_SIZE * sizeof(*pfn_type))) {
  16.103          ERR("Unable to mlock");
  16.104          goto out;
  16.105      }
  16.106  
  16.107 -
  16.108      /*
  16.109       * Quick belt and braces sanity check.
  16.110       */
  16.111 @@ -876,7 +875,7 @@ int xc_linux_save(int xc_handle, int io_
  16.112              /* slightly wasteful to peek the whole array evey time,
  16.113                 but this is fast enough for the moment. */
  16.114              if (!last_iter && xc_shadow_control(
  16.115 -                    xc_handle, dom, DOM0_SHADOW_CONTROL_OP_PEEK,
  16.116 +                    xc_handle, dom, XEN_DOMCTL_SHADOW_OP_PEEK,
  16.117                      to_skip, max_pfn, NULL, 0, NULL) != max_pfn) {
  16.118                  ERR("Error peeking shadow bitmap");
  16.119                  goto out;
  16.120 @@ -930,7 +929,7 @@ int xc_linux_save(int xc_handle, int io_
  16.121                  if(last_iter && test_bit(n, to_fix) && !test_bit(n, to_send)) {
  16.122                      needed_to_fix++;
  16.123                      DPRINTF("Fix! iter %d, pfn %x. mfn %lx\n",
  16.124 -                            iter,n,pfn_type[batch]);
  16.125 +                            iter, n, pfn_type[batch]);
  16.126                  }
  16.127  
  16.128                  clear_bit(n, to_fix);
  16.129 @@ -952,9 +951,12 @@ int xc_linux_save(int xc_handle, int io_
  16.130                  goto out;
  16.131              }
  16.132  
  16.133 -            for (j = 0; j < batch; j++) {
  16.134 +            for ( j = 0; j < batch; j++ )
  16.135 +            {
  16.136  
  16.137 -                if ((pfn_type[j] & LTAB_MASK) == XTAB) {
  16.138 +                if ( (pfn_type[j] & XEN_DOMCTL_PFINFO_LTAB_MASK) ==
  16.139 +                     XEN_DOMCTL_PFINFO_XTAB )
  16.140 +                {
  16.141                      DPRINTF("type fail: page %i mfn %08lx\n", j, pfn_type[j]);
  16.142                      continue;
  16.143                  }
  16.144 @@ -963,13 +965,16 @@ int xc_linux_save(int xc_handle, int io_
  16.145                      DPRINTF("%d pfn= %08lx mfn= %08lx [mfn]= %08lx"
  16.146                              " sum= %08lx\n",
  16.147                              iter,
  16.148 -                            (pfn_type[j] & LTAB_MASK) | pfn_batch[j],
  16.149 +                            (pfn_type[j] & XEN_DOMCTL_PFINFO_LTAB_MASK) |
  16.150 +                            pfn_batch[j],
  16.151                              pfn_type[j],
  16.152 -                            mfn_to_pfn(pfn_type[j]&(~LTAB_MASK)),
  16.153 +                            mfn_to_pfn(pfn_type[j] &
  16.154 +                                       ~XEN_DOMCTL_PFINFO_LTAB_MASK),
  16.155                              csum_page(region_base + (PAGE_SIZE*j)));
  16.156  
  16.157                  /* canonicalise mfn->pfn */
  16.158 -                pfn_type[j] = (pfn_type[j] & LTAB_MASK) | pfn_batch[j];
  16.159 +                pfn_type[j] = (pfn_type[j] & XEN_DOMCTL_PFINFO_LTAB_MASK) |
  16.160 +                    pfn_batch[j];
  16.161              }
  16.162  
  16.163              if(!write_exact(io_fd, &batch, sizeof(unsigned int))) {
  16.164 @@ -983,21 +988,23 @@ int xc_linux_save(int xc_handle, int io_
  16.165              }
  16.166  
  16.167              /* entering this loop, pfn_type is now in pfns (Not mfns) */
  16.168 -            for (j = 0; j < batch; j++) {
  16.169 +            for ( j = 0; j < batch; j++ )
  16.170 +            {
  16.171 +                unsigned long pfn, pagetype;
  16.172 +                void *spage = (char *)region_base + (PAGE_SIZE*j);
  16.173  
  16.174 -                unsigned long pfn      = pfn_type[j] & ~LTAB_MASK;
  16.175 -                unsigned long pagetype = pfn_type[j] & LTAB_MASK;
  16.176 -                void *spage            = (void *) region_base + (PAGE_SIZE*j);
  16.177 -
  16.178 +                pfn      = pfn_type[j] & ~XEN_DOMCTL_PFINFO_LTAB_MASK;
  16.179 +                pagetype = pfn_type[j] &  XEN_DOMCTL_PFINFO_LTAB_MASK;
  16.180  
  16.181                  /* write out pages in batch */
  16.182 -                if (pagetype == XTAB)
  16.183 +                if ( pagetype == XEN_DOMCTL_PFINFO_XTAB )
  16.184                      continue;
  16.185  
  16.186 -                pagetype &= LTABTYPE_MASK;
  16.187 +                pagetype &= XEN_DOMCTL_PFINFO_LTABTYPE_MASK;
  16.188  
  16.189 -                if (pagetype >= L1TAB && pagetype <= L4TAB) {
  16.190 -
  16.191 +                if ( (pagetype >= XEN_DOMCTL_PFINFO_L1TAB) &&
  16.192 +                     (pagetype <= XEN_DOMCTL_PFINFO_L4TAB) )
  16.193 +                {
  16.194                      /* We have a pagetable page: need to rewrite it. */
  16.195                      race = 
  16.196                          canonicalize_pagetable(pagetype, pfn, spage, page); 
  16.197 @@ -1083,7 +1090,7 @@ int xc_linux_save(int xc_handle, int io_
  16.198              }
  16.199  
  16.200              if (xc_shadow_control(xc_handle, dom, 
  16.201 -                                  DOM0_SHADOW_CONTROL_OP_CLEAN, to_send, 
  16.202 +                                  XEN_DOMCTL_SHADOW_OP_CLEAN, to_send, 
  16.203                                    max_pfn, NULL, 0, &stats) != max_pfn) {
  16.204                  ERR("Error flushing shadow PT");
  16.205                  goto out;
  16.206 @@ -1174,7 +1181,7 @@ int xc_linux_save(int xc_handle, int io_
  16.207  
  16.208      if (live) {
  16.209          if(xc_shadow_control(xc_handle, dom, 
  16.210 -                             DOM0_SHADOW_CONTROL_OP_OFF,
  16.211 +                             XEN_DOMCTL_SHADOW_OP_OFF,
  16.212                               NULL, 0, NULL, 0, NULL) < 0) {
  16.213              DPRINTF("Warning - couldn't disable shadow mode");
  16.214          }

    17.1 --- a/tools/libxc/xc_misc.c	Fri Aug 25 10:39:24 2006 +0100
    17.2 +++ b/tools/libxc/xc_misc.c	Fri Aug 25 18:39:10 2006 +0100
    17.3 @@ -12,20 +12,20 @@ int xc_readconsolering(int xc_handle,
    17.4                         int clear)
    17.5  {
    17.6      int ret;
    17.7 -    DECLARE_DOM0_OP;
    17.8 +    DECLARE_SYSCTL;
    17.9      char *buffer = *pbuffer;
   17.10      unsigned int nr_chars = *pnr_chars;
   17.11  
   17.12 -    op.cmd = DOM0_READCONSOLE;
   17.13 -    set_xen_guest_handle(op.u.readconsole.buffer, buffer);
   17.14 -    op.u.readconsole.count  = nr_chars;
   17.15 -    op.u.readconsole.clear  = clear;
   17.16 +    sysctl.cmd = XEN_SYSCTL_readconsole;
   17.17 +    set_xen_guest_handle(sysctl.u.readconsole.buffer, buffer);
   17.18 +    sysctl.u.readconsole.count  = nr_chars;
   17.19 +    sysctl.u.readconsole.clear  = clear;
   17.20  
   17.21      if ( (ret = mlock(buffer, nr_chars)) != 0 )
   17.22          return ret;
   17.23  
   17.24 -    if ( (ret = do_dom0_op(xc_handle, &op)) == 0 )
   17.25 -        *pnr_chars = op.u.readconsole.count;
   17.26 +    if ( (ret = do_sysctl(xc_handle, &sysctl)) == 0 )
   17.27 +        *pnr_chars = sysctl.u.readconsole.count;
   17.28  
   17.29      safe_munlock(buffer, nr_chars);
   17.30  
   17.31 @@ -36,15 +36,14 @@ int xc_physinfo(int xc_handle,
   17.32                  xc_physinfo_t *put_info)
   17.33  {
   17.34      int ret;
   17.35 -    DECLARE_DOM0_OP;
   17.36 +    DECLARE_SYSCTL;
   17.37  
   17.38 -    op.cmd = DOM0_PHYSINFO;
   17.39 -    op.interface_version = DOM0_INTERFACE_VERSION;
   17.40 +    sysctl.cmd = XEN_SYSCTL_physinfo;
   17.41  
   17.42 -    if ( (ret = do_dom0_op(xc_handle, &op)) != 0 )
   17.43 +    if ( (ret = do_sysctl(xc_handle, &sysctl)) != 0 )
   17.44          return ret;
   17.45  
   17.46 -    memcpy(put_info, &op.u.physinfo, sizeof(*put_info));
   17.47 +    memcpy(put_info, &sysctl.u.physinfo, sizeof(*put_info));
   17.48  
   17.49      return 0;
   17.50  }
   17.51 @@ -53,15 +52,14 @@ int xc_sched_id(int xc_handle,
   17.52                  int *sched_id)
   17.53  {
   17.54      int ret;
   17.55 -    DECLARE_DOM0_OP;
   17.56 +    DECLARE_SYSCTL;
   17.57  
   17.58 -    op.cmd = DOM0_SCHED_ID;
   17.59 -    op.interface_version = DOM0_INTERFACE_VERSION;
   17.60 +    sysctl.cmd = XEN_SYSCTL_sched_id;
   17.61  
   17.62 -    if ( (ret = do_dom0_op(xc_handle, &op)) != 0 )
   17.63 +    if ( (ret = do_sysctl(xc_handle, &sysctl)) != 0 )
   17.64          return ret;
   17.65  
   17.66 -    *sched_id = op.u.sched_id.sched_id;
   17.67 +    *sched_id = sysctl.u.sched_id.sched_id;
   17.68  
   17.69      return 0;
   17.70  }
   17.71 @@ -74,19 +72,19 @@ int xc_perfc_control(int xc_handle,
   17.72                       int *nbr_val)
   17.73  {
   17.74      int rc;
   17.75 -    DECLARE_DOM0_OP;
   17.76 +    DECLARE_SYSCTL;
   17.77  
   17.78 -    op.cmd = DOM0_PERFCCONTROL;
   17.79 -    op.u.perfccontrol.op   = opcode;
   17.80 -    set_xen_guest_handle(op.u.perfccontrol.desc, desc);
   17.81 -    set_xen_guest_handle(op.u.perfccontrol.val, val);
   17.82 +    sysctl.cmd = XEN_SYSCTL_perfc_op;
   17.83 +    sysctl.u.perfc_op.cmd = opcode;
   17.84 +    set_xen_guest_handle(sysctl.u.perfc_op.desc, desc);
   17.85 +    set_xen_guest_handle(sysctl.u.perfc_op.val, val);
   17.86  
   17.87 -    rc = do_dom0_op(xc_handle, &op);
   17.88 +    rc = do_sysctl(xc_handle, &sysctl);
   17.89  
   17.90      if (nbr_desc)
   17.91 -        *nbr_desc = op.u.perfccontrol.nr_counters;
   17.92 +        *nbr_desc = sysctl.u.perfc_op.nr_counters;
   17.93      if (nbr_val)
   17.94 -        *nbr_val = op.u.perfccontrol.nr_vals;
   17.95 +        *nbr_val = sysctl.u.perfc_op.nr_vals;
   17.96  
   17.97      return rc;
   17.98  }

    18.1 --- a/tools/libxc/xc_private.c	Fri Aug 25 10:39:24 2006 +0100
    18.2 +++ b/tools/libxc/xc_private.c	Fri Aug 25 18:39:10 2006 +0100
    18.3 @@ -11,12 +11,12 @@
    18.4  int xc_get_pfn_type_batch(int xc_handle,
    18.5                            uint32_t dom, int num, unsigned long *arr)
    18.6  {
    18.7 -    DECLARE_DOM0_OP;
    18.8 -    op.cmd = DOM0_GETPAGEFRAMEINFO2;
    18.9 -    op.u.getpageframeinfo2.domain = (domid_t)dom;
   18.10 -    op.u.getpageframeinfo2.num    = num;
   18.11 -    set_xen_guest_handle(op.u.getpageframeinfo2.array, arr);
   18.12 -    return do_dom0_op(xc_handle, &op);
   18.13 +    DECLARE_DOMCTL;
   18.14 +    domctl.cmd = XEN_DOMCTL_getpageframeinfo2;
   18.15 +    domctl.domain = (domid_t)dom;
   18.16 +    domctl.u.getpageframeinfo2.num    = num;
   18.17 +    set_xen_guest_handle(domctl.u.getpageframeinfo2.array, arr);
   18.18 +    return do_domctl(xc_handle, &domctl);
   18.19  }
   18.20  
   18.21  #define GETPFN_ERR (~0U)
   18.22 @@ -24,16 +24,16 @@ unsigned int get_pfn_type(int xc_handle,
   18.23                            unsigned long mfn,
   18.24                            uint32_t dom)
   18.25  {
   18.26 -    DECLARE_DOM0_OP;
   18.27 -    op.cmd = DOM0_GETPAGEFRAMEINFO;
   18.28 -    op.u.getpageframeinfo.gmfn   = mfn;
   18.29 -    op.u.getpageframeinfo.domain = (domid_t)dom;
   18.30 -    if ( do_dom0_op(xc_handle, &op) < 0 )
   18.31 +    DECLARE_DOMCTL;
   18.32 +    domctl.cmd = XEN_DOMCTL_getpageframeinfo;
   18.33 +    domctl.u.getpageframeinfo.gmfn   = mfn;
   18.34 +    domctl.domain = (domid_t)dom;
   18.35 +    if ( do_domctl(xc_handle, &domctl) < 0 )
   18.36      {
   18.37          PERROR("Unexpected failure when getting page frame info!");
   18.38          return GETPFN_ERR;
   18.39      }
   18.40 -    return op.u.getpageframeinfo.type;
   18.41 +    return domctl.u.getpageframeinfo.type;
   18.42  }
   18.43  
   18.44  int xc_mmuext_op(
   18.45 @@ -248,17 +248,17 @@ int xc_memory_op(int xc_handle,
   18.46  
   18.47  long long xc_domain_get_cpu_usage( int xc_handle, domid_t domid, int vcpu )
   18.48  {
   18.49 -    DECLARE_DOM0_OP;
   18.50 +    DECLARE_DOMCTL;
   18.51  
   18.52 -    op.cmd = DOM0_GETVCPUINFO;
   18.53 -    op.u.getvcpuinfo.domain = (domid_t)domid;
   18.54 -    op.u.getvcpuinfo.vcpu   = (uint16_t)vcpu;
   18.55 -    if ( (do_dom0_op(xc_handle, &op) < 0) )
   18.56 +    domctl.cmd = XEN_DOMCTL_getvcpuinfo;
   18.57 +    domctl.domain = (domid_t)domid;
   18.58 +    domctl.u.getvcpuinfo.vcpu   = (uint16_t)vcpu;
   18.59 +    if ( (do_domctl(xc_handle, &domctl) < 0) )
   18.60      {
   18.61          PERROR("Could not get info on domain");
   18.62          return -1;
   18.63      }
   18.64 -    return op.u.getvcpuinfo.cpu_time;
   18.65 +    return domctl.u.getvcpuinfo.cpu_time;
   18.66  }
   18.67  
   18.68  
   18.69 @@ -268,12 +268,12 @@ int xc_get_pfn_list(int xc_handle,
   18.70                      xen_pfn_t *pfn_buf,
   18.71                      unsigned long max_pfns)
   18.72  {
   18.73 -    DECLARE_DOM0_OP;
   18.74 +    DECLARE_DOMCTL;
   18.75      int ret;
   18.76 -    op.cmd = DOM0_GETMEMLIST;
   18.77 -    op.u.getmemlist.domain   = (domid_t)domid;
   18.78 -    op.u.getmemlist.max_pfns = max_pfns;
   18.79 -    set_xen_guest_handle(op.u.getmemlist.buffer, pfn_buf);
   18.80 +    domctl.cmd = XEN_DOMCTL_getmemlist;
   18.81 +    domctl.domain   = (domid_t)domid;
   18.82 +    domctl.u.getmemlist.max_pfns = max_pfns;
   18.83 +    set_xen_guest_handle(domctl.u.getmemlist.buffer, pfn_buf);
   18.84  
   18.85  #ifdef VALGRIND
   18.86      memset(pfn_buf, 0, max_pfns * sizeof(xen_pfn_t));
   18.87 @@ -285,7 +285,7 @@ int xc_get_pfn_list(int xc_handle,
   18.88          return -1;
   18.89      }
   18.90  
   18.91 -    ret = do_dom0_op(xc_handle, &op);
   18.92 +    ret = do_domctl(xc_handle, &domctl);
   18.93  
   18.94      safe_munlock(pfn_buf, max_pfns * sizeof(xen_pfn_t));
   18.95  
   18.96 @@ -294,7 +294,7 @@ int xc_get_pfn_list(int xc_handle,
   18.97      DPRINTF(("Ret for xc_get_pfn_list is %d\n", ret));
   18.98      if (ret >= 0) {
   18.99          int i, j;
  18.100 -        for (i = 0; i < op.u.getmemlist.num_pfns; i += 16) {
  18.101 +        for (i = 0; i < domctl.u.getmemlist.num_pfns; i += 16) {
  18.102              DPRINTF("0x%x: ", i);
  18.103              for (j = 0; j < 16; j++)
  18.104                  DPRINTF("0x%lx ", pfn_buf[i + j]);
  18.105 @@ -304,17 +304,17 @@ int xc_get_pfn_list(int xc_handle,
  18.106  #endif
  18.107  #endif
  18.108  
  18.109 -    return (ret < 0) ? -1 : op.u.getmemlist.num_pfns;
  18.110 +    return (ret < 0) ? -1 : domctl.u.getmemlist.num_pfns;
  18.111  }
  18.112  #endif
  18.113  
  18.114  long xc_get_tot_pages(int xc_handle, uint32_t domid)
  18.115  {
  18.116 -    DECLARE_DOM0_OP;
  18.117 -    op.cmd = DOM0_GETDOMAININFO;
  18.118 -    op.u.getdomaininfo.domain = (domid_t)domid;
  18.119 -    return (do_dom0_op(xc_handle, &op) < 0) ?
  18.120 -        -1 : op.u.getdomaininfo.tot_pages;
  18.121 +    DECLARE_DOMCTL;
  18.122 +    domctl.cmd = XEN_DOMCTL_getdomaininfo;
  18.123 +    domctl.domain = (domid_t)domid;
  18.124 +    return (do_domctl(xc_handle, &domctl) < 0) ?
  18.125 +        -1 : domctl.u.getdomaininfo.tot_pages;
  18.126  }
  18.127  
  18.128  int xc_copy_to_domain_page(int xc_handle,
  18.129 @@ -386,9 +386,14 @@ void xc_map_memcpy(unsigned long dst, co
  18.130      }
  18.131  }
  18.132  
  18.133 -int xc_dom0_op(int xc_handle, dom0_op_t *op)
  18.134 +int xc_domctl(int xc_handle, struct xen_domctl *domctl)
  18.135  {
  18.136 -    return do_dom0_op(xc_handle, op);
  18.137 +    return do_domctl(xc_handle, domctl);
  18.138 +}
  18.139 +
  18.140 +int xc_sysctl(int xc_handle, struct xen_sysctl *sysctl)
  18.141 +{
  18.142 +    return do_sysctl(xc_handle, sysctl);
  18.143  }
  18.144  
  18.145  int xc_version(int xc_handle, int cmd, void *arg)

    19.1 --- a/tools/libxc/xc_private.h	Fri Aug 25 10:39:24 2006 +0100
    19.2 +++ b/tools/libxc/xc_private.h	Fri Aug 25 18:39:10 2006 +0100
    19.3 @@ -18,14 +18,16 @@
    19.4  #include <xen/sys/privcmd.h>
    19.5  
    19.6  /* valgrind cannot see when a hypercall has filled in some values.  For this
    19.7 -   reason, we must zero the privcmd_hypercall_t or dom0_op_t instance before a
    19.8 -   call, if using valgrind.  */
    19.9 +   reason, we must zero the privcmd_hypercall_t or domctl/sysctl instance
   19.10 +   before a call, if using valgrind.  */
   19.11  #ifdef VALGRIND
   19.12  #define DECLARE_HYPERCALL privcmd_hypercall_t hypercall = { 0 }
   19.13 -#define DECLARE_DOM0_OP dom0_op_t op = { 0 }
   19.14 +#define DECLARE_DOMCTL struct xen_domctl domctl = { 0 }
   19.15 +#define DECLARE_SYSCTL struct xen_sysctl sysctl = { 0 }
   19.16  #else
   19.17  #define DECLARE_HYPERCALL privcmd_hypercall_t hypercall
   19.18 -#define DECLARE_DOM0_OP dom0_op_t op
   19.19 +#define DECLARE_DOMCTL struct xen_domctl domctl
   19.20 +#define DECLARE_SYSCTL struct xen_sysctl sysctl
   19.21  #endif
   19.22  
   19.23  #define PAGE_SHIFT              XC_PAGE_SHIFT
   19.24 @@ -94,17 +96,17 @@ static inline int do_xen_version(int xc_
   19.25      return do_xen_hypercall(xc_handle, &hypercall);
   19.26  }
   19.27  
   19.28 -static inline int do_dom0_op(int xc_handle, dom0_op_t *op)
   19.29 +static inline int do_domctl(int xc_handle, struct xen_domctl *domctl)
   19.30  {
   19.31      int ret = -1;
   19.32      DECLARE_HYPERCALL;
   19.33  
   19.34 -    op->interface_version = DOM0_INTERFACE_VERSION;
   19.35 +    domctl->interface_version = XEN_DOMCTL_INTERFACE_VERSION;
   19.36  
   19.37 -    hypercall.op     = __HYPERVISOR_dom0_op;
   19.38 -    hypercall.arg[0] = (unsigned long)op;
   19.39 +    hypercall.op     = __HYPERVISOR_domctl;
   19.40 +    hypercall.arg[0] = (unsigned long)domctl;
   19.41  
   19.42 -    if ( mlock(op, sizeof(*op)) != 0 )
   19.43 +    if ( mlock(domctl, sizeof(*domctl)) != 0 )
   19.44      {
   19.45          PERROR("Could not lock memory for Xen hypercall");
   19.46          goto out1;
   19.47 @@ -113,11 +115,40 @@ static inline int do_dom0_op(int xc_hand
   19.48      if ( (ret = do_xen_hypercall(xc_handle, &hypercall)) < 0 )
   19.49      {
   19.50          if ( errno == EACCES )
   19.51 -            DPRINTF("Dom0 operation failed -- need to"
   19.52 +            DPRINTF("domctl operation failed -- need to"
   19.53                      " rebuild the user-space tool set?\n");
   19.54      }
   19.55  
   19.56 -    safe_munlock(op, sizeof(*op));
   19.57 +    safe_munlock(domctl, sizeof(*domctl));
   19.58 +
   19.59 + out1:
   19.60 +    return ret;
   19.61 +}
   19.62 +
   19.63 +static inline int do_sysctl(int xc_handle, struct xen_sysctl *sysctl)
   19.64 +{
   19.65 +    int ret = -1;
   19.66 +    DECLARE_HYPERCALL;
   19.67 +
   19.68 +    sysctl->interface_version = XEN_SYSCTL_INTERFACE_VERSION;
   19.69 +
   19.70 +    hypercall.op     = __HYPERVISOR_sysctl;
   19.71 +    hypercall.arg[0] = (unsigned long)sysctl;
   19.72 +
   19.73 +    if ( mlock(sysctl, sizeof(*sysctl)) != 0 )
   19.74 +    {
   19.75 +        PERROR("Could not lock memory for Xen hypercall");
   19.76 +        goto out1;
   19.77 +    }
   19.78 +
   19.79 +    if ( (ret = do_xen_hypercall(xc_handle, &hypercall)) < 0 )
   19.80 +    {
   19.81 +        if ( errno == EACCES )
   19.82 +            DPRINTF("sysctl operation failed -- need to"
   19.83 +                    " rebuild the user-space tool set?\n");
   19.84 +    }
   19.85 +
   19.86 +    safe_munlock(sysctl, sizeof(*sysctl));
   19.87  
   19.88   out1:
   19.89      return ret;

    20.1 --- a/tools/libxc/xc_ptrace.c	Fri Aug 25 10:39:24 2006 +0100
    20.2 +++ b/tools/libxc/xc_ptrace.c	Fri Aug 25 18:39:10 2006 +0100
    20.3 @@ -41,8 +41,8 @@ static char *ptrace_names[] = {
    20.4  static int                      current_domid = -1;
    20.5  static int                      current_isfile;
    20.6  
    20.7 -static cpumap_t                 online_cpumap;
    20.8 -static cpumap_t                 regs_valid;
    20.9 +static uint64_t                 online_cpumap;
   20.10 +static uint64_t                 regs_valid;
   20.11  static vcpu_guest_context_t     ctxt[MAX_VIRT_CPUS];
   20.12  
   20.13  extern int ffsll(long long int);
   20.14 @@ -111,7 +111,8 @@ paging_enabled(vcpu_guest_context_t *v)
   20.15   */
   20.16  
   20.17  static int
   20.18 -get_online_cpumap(int xc_handle, dom0_getdomaininfo_t *d, cpumap_t *cpumap)
   20.19 +get_online_cpumap(int xc_handle, struct xen_domctl_getdomaininfo *d,
   20.20 +                  uint64_t *cpumap)
   20.21  {
   20.22      int i, online, retval;
   20.23  
   20.24 @@ -133,9 +134,9 @@ get_online_cpumap(int xc_handle, dom0_ge
   20.25   */
   20.26  
   20.27  static void
   20.28 -online_vcpus_changed(cpumap_t cpumap)
   20.29 +online_vcpus_changed(uint64_t cpumap)
   20.30  {
   20.31 -    cpumap_t changed_cpumap = cpumap ^ online_cpumap;
   20.32 +    uint64_t changed_cpumap = cpumap ^ online_cpumap;
   20.33      int index;
   20.34  
   20.35      while ( (index = ffsll(changed_cpumap)) ) {
   20.36 @@ -418,25 +419,25 @@ static int
   20.37      int *status,
   20.38      int options)
   20.39  {
   20.40 -    DECLARE_DOM0_OP;
   20.41 +    DECLARE_DOMCTL;
   20.42      int retval;
   20.43      struct timespec ts;
   20.44 -    cpumap_t cpumap;
   20.45 +    uint64_t cpumap;
   20.46  
   20.47      ts.tv_sec = 0;
   20.48      ts.tv_nsec = 10*1000*1000;
   20.49  
   20.50 -    op.cmd = DOM0_GETDOMAININFO;
   20.51 -    op.u.getdomaininfo.domain = domain;
   20.52 +    domctl.cmd = XEN_DOMCTL_getdomaininfo;
   20.53 +    domctl.domain = domain;
   20.54  
   20.55   retry:
   20.56 -    retval = do_dom0_op(xc_handle, &op);
   20.57 -    if ( retval || (op.u.getdomaininfo.domain != domain) )
   20.58 +    retval = do_domctl(xc_handle, &domctl);
   20.59 +    if ( retval || (domctl.domain != domain) )
   20.60      {
   20.61          IPRINTF("getdomaininfo failed\n");
   20.62          goto done;
   20.63      }
   20.64 -    *status = op.u.getdomaininfo.flags;
   20.65 +    *status = domctl.u.getdomaininfo.flags;
   20.66  
   20.67      if ( options & WNOHANG )
   20.68          goto done;
   20.69 @@ -447,13 +448,13 @@ static int
   20.70          goto done;
   20.71      }
   20.72  
   20.73 -    if ( !(op.u.getdomaininfo.flags & DOMFLAGS_PAUSED) )
   20.74 +    if ( !(domctl.u.getdomaininfo.flags & DOMFLAGS_PAUSED) )
   20.75      {
   20.76          nanosleep(&ts,NULL);
   20.77          goto retry;
   20.78      }
   20.79   done:
   20.80 -    if (get_online_cpumap(xc_handle, &op.u.getdomaininfo, &cpumap))
   20.81 +    if (get_online_cpumap(xc_handle, &domctl.u.getdomaininfo, &cpumap))
   20.82          IPRINTF("get_online_cpumap failed\n");
   20.83      if (online_cpumap != cpumap)
   20.84          online_vcpus_changed(cpumap);
   20.85 @@ -470,11 +471,11 @@ xc_ptrace(
   20.86      long eaddr,
   20.87      long edata)
   20.88  {
   20.89 -    DECLARE_DOM0_OP;
   20.90 +    DECLARE_DOMCTL;
   20.91      struct gdb_regs pt;
   20.92      long            retval = 0;
   20.93      unsigned long  *guest_va;
   20.94 -    cpumap_t        cpumap;
   20.95 +    uint64_t        cpumap;
   20.96      int             cpu, index;
   20.97      void           *addr = (char *)eaddr;
   20.98      void           *data = (char *)edata;
   20.99 @@ -535,7 +536,7 @@ xc_ptrace(
  20.100          SET_XC_REGS(((struct gdb_regs *)data), ctxt[cpu].user_regs);
  20.101          if ((retval = xc_vcpu_setcontext(xc_handle, current_domid, cpu,
  20.102                                  &ctxt[cpu])))
  20.103 -            goto out_error_dom0;
  20.104 +            goto out_error_domctl;
  20.105          break;
  20.106  
  20.107      case PTRACE_SINGLESTEP:
  20.108 @@ -547,7 +548,7 @@ xc_ptrace(
  20.109          ctxt[cpu].user_regs.eflags |= PSL_T;
  20.110          if ((retval = xc_vcpu_setcontext(xc_handle, current_domid, cpu,
  20.111                                  &ctxt[cpu])))
  20.112 -            goto out_error_dom0;
  20.113 +            goto out_error_domctl;
  20.114          /* FALLTHROUGH */
  20.115  
  20.116      case PTRACE_CONT:
  20.117 @@ -566,22 +567,22 @@ xc_ptrace(
  20.118                      ctxt[cpu].user_regs.eflags &= ~PSL_T;
  20.119                      if ((retval = xc_vcpu_setcontext(xc_handle, current_domid,
  20.120                                                  cpu, &ctxt[cpu])))
  20.121 -                        goto out_error_dom0;
  20.122 +                        goto out_error_domctl;
  20.123                  }
  20.124              }
  20.125          }
  20.126          if ( request == PTRACE_DETACH )
  20.127          {
  20.128 -            op.cmd = DOM0_SETDEBUGGING;
  20.129 -            op.u.setdebugging.domain = current_domid;
  20.130 -            op.u.setdebugging.enable = 0;
  20.131 -            if ((retval = do_dom0_op(xc_handle, &op)))
  20.132 -                goto out_error_dom0;
  20.133 +            domctl.cmd = XEN_DOMCTL_setdebugging;
  20.134 +            domctl.domain = current_domid;
  20.135 +            domctl.u.setdebugging.enable = 0;
  20.136 +            if ((retval = do_domctl(xc_handle, &domctl)))
  20.137 +                goto out_error_domctl;
  20.138          }
  20.139          regs_valid = 0;
  20.140          if ((retval = xc_domain_unpause(xc_handle, current_domid > 0 ?
  20.141                                  current_domid : -current_domid)))
  20.142 -            goto out_error_dom0;
  20.143 +            goto out_error_domctl;
  20.144          break;
  20.145  
  20.146      case PTRACE_ATTACH:
  20.147 @@ -589,22 +590,22 @@ xc_ptrace(
  20.148          current_isfile = (int)edata;
  20.149          if (current_isfile)
  20.150              break;
  20.151 -        op.cmd = DOM0_GETDOMAININFO;
  20.152 -        op.u.getdomaininfo.domain = current_domid;
  20.153 -        retval = do_dom0_op(xc_handle, &op);
  20.154 -        if ( retval || (op.u.getdomaininfo.domain != current_domid) )
  20.155 -            goto out_error_dom0;
  20.156 -        if ( op.u.getdomaininfo.flags & DOMFLAGS_PAUSED )
  20.157 +        domctl.cmd = XEN_DOMCTL_getdomaininfo;
  20.158 +        domctl.domain = current_domid;
  20.159 +        retval = do_domctl(xc_handle, &domctl);
  20.160 +        if ( retval || (domctl.domain != current_domid) )
  20.161 +            goto out_error_domctl;
  20.162 +        if ( domctl.u.getdomaininfo.flags & DOMFLAGS_PAUSED )
  20.163              IPRINTF("domain currently paused\n");
  20.164          else if ((retval = xc_domain_pause(xc_handle, current_domid)))
  20.165 -            goto out_error_dom0;
  20.166 -        op.cmd = DOM0_SETDEBUGGING;
  20.167 -        op.u.setdebugging.domain = current_domid;
  20.168 -        op.u.setdebugging.enable = 1;
  20.169 -        if ((retval = do_dom0_op(xc_handle, &op)))
  20.170 -            goto out_error_dom0;
  20.171 +            goto out_error_domctl;
  20.172 +        domctl.cmd = XEN_DOMCTL_setdebugging;
  20.173 +        domctl.domain = current_domid;
  20.174 +        domctl.u.setdebugging.enable = 1;
  20.175 +        if ((retval = do_domctl(xc_handle, &domctl)))
  20.176 +            goto out_error_domctl;
  20.177  
  20.178 -        if (get_online_cpumap(xc_handle, &op.u.getdomaininfo, &cpumap))
  20.179 +        if (get_online_cpumap(xc_handle, &domctl.u.getdomaininfo, &cpumap))
  20.180              IPRINTF("get_online_cpumap failed\n");
  20.181          if (online_cpumap != cpumap)
  20.182              online_vcpus_changed(cpumap);
  20.183 @@ -625,8 +626,8 @@ xc_ptrace(
  20.184  
  20.185      return retval;
  20.186  
  20.187 - out_error_dom0:
  20.188 -    perror("dom0 op failed");
  20.189 + out_error_domctl:
  20.190 +    perror("domctl failed");
  20.191   out_error:
  20.192      errno = EINVAL;
  20.193      return retval;

    21.1 --- a/tools/libxc/xc_sedf.c	Fri Aug 25 10:39:24 2006 +0100
    21.2 +++ b/tools/libxc/xc_sedf.c	Fri Aug 25 18:39:10 2006 +0100
    21.3 @@ -10,37 +10,50 @@
    21.4  
    21.5  #include "xc_private.h"
    21.6  
    21.7 -int xc_sedf_domain_set(int xc_handle,
    21.8 -                          uint32_t domid, uint64_t period, uint64_t slice,uint64_t latency, uint16_t extratime,uint16_t weight)
    21.9 +int xc_sedf_domain_set(
   21.10 +    int xc_handle,
   21.11 +    uint32_t domid,
   21.12 +    uint64_t period,
   21.13 +    uint64_t slice,
   21.14 +    uint64_t latency,
   21.15 +    uint16_t extratime,
   21.16 +    uint16_t weight)
   21.17  {
   21.18 -    DECLARE_DOM0_OP;
   21.19 -    struct sedf_adjdom *p = &op.u.adjustdom.u.sedf;
   21.20 +    DECLARE_DOMCTL;
   21.21 +    struct xen_domctl_sched_sedf *p = &domctl.u.scheduler_op.u.sedf;
   21.22  
   21.23 -    op.cmd = DOM0_ADJUSTDOM;
   21.24 -    op.u.adjustdom.domain  = (domid_t)domid;
   21.25 -    op.u.adjustdom.sched_id = SCHED_SEDF;
   21.26 -    op.u.adjustdom.direction = SCHED_INFO_PUT;
   21.27 +    domctl.cmd = XEN_DOMCTL_scheduler_op;
   21.28 +    domctl.domain  = (domid_t)domid;
   21.29 +    domctl.u.scheduler_op.sched_id = XEN_SCHEDULER_SEDF;
   21.30 +    domctl.u.scheduler_op.cmd = XEN_DOMCTL_SCHEDOP_putinfo;
   21.31  
   21.32      p->period    = period;
   21.33      p->slice     = slice;
   21.34      p->latency   = latency;
   21.35      p->extratime = extratime;
   21.36      p->weight    = weight;
   21.37 -    return do_dom0_op(xc_handle, &op);
   21.38 +    return do_domctl(xc_handle, &domctl);
   21.39  }
   21.40  
   21.41 -int xc_sedf_domain_get(int xc_handle, uint32_t domid, uint64_t *period, uint64_t *slice, uint64_t* latency, uint16_t* extratime, uint16_t* weight)
   21.42 +int xc_sedf_domain_get(
   21.43 +    int xc_handle,
   21.44 +    uint32_t domid,
   21.45 +    uint64_t *period,
   21.46 +    uint64_t *slice,
   21.47 +    uint64_t *latency,
   21.48 +    uint16_t *extratime,
   21.49 +    uint16_t *weight)
   21.50  {
   21.51 -    DECLARE_DOM0_OP;
   21.52 +    DECLARE_DOMCTL;
   21.53      int ret;
   21.54 -    struct sedf_adjdom *p = &op.u.adjustdom.u.sedf;
   21.55 +    struct xen_domctl_sched_sedf *p = &domctl.u.scheduler_op.u.sedf;
   21.56  
   21.57 -    op.cmd = DOM0_ADJUSTDOM;
   21.58 -    op.u.adjustdom.domain = (domid_t)domid;
   21.59 -    op.u.adjustdom.sched_id = SCHED_SEDF;
   21.60 -    op.u.adjustdom.direction = SCHED_INFO_GET;
   21.61 +    domctl.cmd = XEN_DOMCTL_scheduler_op;
   21.62 +    domctl.domain = (domid_t)domid;
   21.63 +    domctl.u.scheduler_op.sched_id = XEN_SCHEDULER_SEDF;
   21.64 +    domctl.u.scheduler_op.cmd = XEN_DOMCTL_SCHEDOP_getinfo;
   21.65  
   21.66 -    ret = do_dom0_op(xc_handle, &op);
   21.67 +    ret = do_domctl(xc_handle, &domctl);
   21.68  
   21.69      *period    = p->period;
   21.70      *slice     = p->slice;

    22.1 --- a/tools/libxc/xc_tbuf.c	Fri Aug 25 10:39:24 2006 +0100
    22.2 +++ b/tools/libxc/xc_tbuf.c	Fri Aug 25 18:39:10 2006 +0100
    22.3 @@ -18,49 +18,49 @@
    22.4  
    22.5  static int tbuf_enable(int xc_handle, int enable)
    22.6  {
    22.7 -    DECLARE_DOM0_OP;
    22.8 +    DECLARE_SYSCTL;
    22.9  
   22.10 -    op.cmd = DOM0_TBUFCONTROL;
   22.11 -    op.interface_version = DOM0_INTERFACE_VERSION;
   22.12 +    sysctl.cmd = XEN_SYSCTL_tbuf_op;
   22.13 +    sysctl.interface_version = XEN_SYSCTL_INTERFACE_VERSION;
   22.14      if (enable)
   22.15 -        op.u.tbufcontrol.op  = DOM0_TBUF_ENABLE;
   22.16 +        sysctl.u.tbuf_op.cmd  = XEN_SYSCTL_TBUFOP_enable;
   22.17      else
   22.18 -        op.u.tbufcontrol.op  = DOM0_TBUF_DISABLE;
   22.19 +        sysctl.u.tbuf_op.cmd  = XEN_SYSCTL_TBUFOP_disable;
   22.20  
   22.21 -    return xc_dom0_op(xc_handle, &op);
   22.22 +    return xc_sysctl(xc_handle, &sysctl);
   22.23  }
   22.24  
   22.25  int xc_tbuf_set_size(int xc_handle, unsigned long size)
   22.26  {
   22.27 -    DECLARE_DOM0_OP;
   22.28 +    DECLARE_SYSCTL;
   22.29  
   22.30 -    op.cmd = DOM0_TBUFCONTROL;
   22.31 -    op.interface_version = DOM0_INTERFACE_VERSION;
   22.32 -    op.u.tbufcontrol.op  = DOM0_TBUF_SET_SIZE;
   22.33 -    op.u.tbufcontrol.size = size;
   22.34 +    sysctl.cmd = XEN_SYSCTL_tbuf_op;
   22.35 +    sysctl.interface_version = XEN_SYSCTL_INTERFACE_VERSION;
   22.36 +    sysctl.u.tbuf_op.cmd  = XEN_SYSCTL_TBUFOP_set_size;
   22.37 +    sysctl.u.tbuf_op.size = size;
   22.38  
   22.39 -    return xc_dom0_op(xc_handle, &op);
   22.40 +    return xc_sysctl(xc_handle, &sysctl);
   22.41  }
   22.42  
   22.43  int xc_tbuf_get_size(int xc_handle, unsigned long *size)
   22.44  {
   22.45      int rc;
   22.46 -    DECLARE_DOM0_OP;
   22.47 +    DECLARE_SYSCTL;
   22.48  
   22.49 -    op.cmd = DOM0_TBUFCONTROL;
   22.50 -    op.interface_version = DOM0_INTERFACE_VERSION;
   22.51 -    op.u.tbufcontrol.op  = DOM0_TBUF_GET_INFO;
   22.52 +    sysctl.cmd = XEN_SYSCTL_tbuf_op;
   22.53 +    sysctl.interface_version = XEN_SYSCTL_INTERFACE_VERSION;
   22.54 +    sysctl.u.tbuf_op.cmd  = XEN_SYSCTL_TBUFOP_get_info;
   22.55  
   22.56 -    rc = xc_dom0_op(xc_handle, &op);
   22.57 +    rc = xc_sysctl(xc_handle, &sysctl);
   22.58      if (rc == 0)
   22.59 -        *size = op.u.tbufcontrol.size;
   22.60 +        *size = sysctl.u.tbuf_op.size;
   22.61      return rc;
   22.62  }
   22.63  
   22.64  int xc_tbuf_enable(int xc_handle, size_t cnt, unsigned long *mfn,
   22.65                     unsigned long *size)
   22.66  {
   22.67 -    DECLARE_DOM0_OP;
   22.68 +    DECLARE_SYSCTL;
   22.69      int rc;
   22.70  
   22.71      /*
   22.72 @@ -73,15 +73,15 @@ int xc_tbuf_enable(int xc_handle, size_t
   22.73      if ( tbuf_enable(xc_handle, 1) != 0 )
   22.74          return -1;
   22.75  
   22.76 -    op.cmd = DOM0_TBUFCONTROL;
   22.77 -    op.interface_version = DOM0_INTERFACE_VERSION;
   22.78 -    op.u.tbufcontrol.op  = DOM0_TBUF_GET_INFO;
   22.79 +    sysctl.cmd = XEN_SYSCTL_tbuf_op;
   22.80 +    sysctl.interface_version = XEN_SYSCTL_INTERFACE_VERSION;
   22.81 +    sysctl.u.tbuf_op.cmd  = XEN_SYSCTL_TBUFOP_get_info;
   22.82  
   22.83 -    rc = xc_dom0_op(xc_handle, &op);
   22.84 +    rc = xc_sysctl(xc_handle, &sysctl);
   22.85      if ( rc == 0 )
   22.86      {
   22.87 -        *size = op.u.tbufcontrol.size;
   22.88 -        *mfn = op.u.tbufcontrol.buffer_mfn;
   22.89 +        *size = sysctl.u.tbuf_op.size;
   22.90 +        *mfn = sysctl.u.tbuf_op.buffer_mfn;
   22.91      }
   22.92  
   22.93      return 0;
   22.94 @@ -94,25 +94,39 @@ int xc_tbuf_disable(int xc_handle)
   22.95  
   22.96  int xc_tbuf_set_cpu_mask(int xc_handle, uint32_t mask)
   22.97  {
   22.98 -    DECLARE_DOM0_OP;
   22.99 +    DECLARE_SYSCTL;
  22.100 +    int ret = -1;
  22.101 +
  22.102 +    sysctl.cmd = XEN_SYSCTL_tbuf_op;
  22.103 +    sysctl.interface_version = XEN_SYSCTL_INTERFACE_VERSION;
  22.104 +    sysctl.u.tbuf_op.cmd  = XEN_SYSCTL_TBUFOP_set_cpu_mask;
  22.105 +
  22.106 +    set_xen_guest_handle(sysctl.u.tbuf_op.cpu_mask.bitmap, (uint8_t *)&mask);
  22.107 +    sysctl.u.tbuf_op.cpu_mask.nr_cpus = sizeof(mask) * 8;
  22.108  
  22.109 -    op.cmd = DOM0_TBUFCONTROL;
  22.110 -    op.interface_version = DOM0_INTERFACE_VERSION;
  22.111 -    op.u.tbufcontrol.op  = DOM0_TBUF_SET_CPU_MASK;
  22.112 -    op.u.tbufcontrol.cpu_mask = mask;
  22.113 +    if ( mlock(&mask, sizeof(mask)) != 0 )
  22.114 +    {
  22.115 +        PERROR("Could not lock memory for Xen hypercall");
  22.116 +        goto out;
  22.117 +    }
  22.118  
  22.119 -    return do_dom0_op(xc_handle, &op);
  22.120 +    ret = do_sysctl(xc_handle, &sysctl);
  22.121 +
  22.122 +    safe_munlock(&mask, sizeof(mask));
  22.123 +
  22.124 + out:
  22.125 +    return ret;
  22.126  }
  22.127  
  22.128  int xc_tbuf_set_evt_mask(int xc_handle, uint32_t mask)
  22.129  {
  22.130 -    DECLARE_DOM0_OP;
  22.131 +    DECLARE_SYSCTL;
  22.132  
  22.133 -    op.cmd = DOM0_TBUFCONTROL;
  22.134 -    op.interface_version = DOM0_INTERFACE_VERSION;
  22.135 -    op.u.tbufcontrol.op  = DOM0_TBUF_SET_EVT_MASK;
  22.136 -    op.u.tbufcontrol.evt_mask = mask;
  22.137 +    sysctl.cmd = XEN_SYSCTL_tbuf_op;
  22.138 +    sysctl.interface_version = XEN_SYSCTL_INTERFACE_VERSION;
  22.139 +    sysctl.u.tbuf_op.cmd  = XEN_SYSCTL_TBUFOP_set_evt_mask;
  22.140 +    sysctl.u.tbuf_op.evt_mask = mask;
  22.141  
  22.142 -    return do_dom0_op(xc_handle, &op);
  22.143 +    return do_sysctl(xc_handle, &sysctl);
  22.144  }
  22.145  

    23.1 --- a/tools/libxc/xenctrl.h	Fri Aug 25 10:39:24 2006 +0100
    23.2 +++ b/tools/libxc/xenctrl.h	Fri Aug 25 18:39:10 2006 +0100
    23.3 @@ -13,11 +13,11 @@
    23.4  #include <stdint.h>
    23.5  #include <sys/ptrace.h>
    23.6  #include <xen/xen.h>
    23.7 -#include <xen/dom0_ops.h>
    23.8 +#include <xen/domctl.h>
    23.9 +#include <xen/sysctl.h>
   23.10  #include <xen/version.h>
   23.11  #include <xen/event_channel.h>
   23.12  #include <xen/sched.h>
   23.13 -#include <xen/sched_ctl.h>
   23.14  #include <xen/memory.h>
   23.15  #include <xen/acm.h>
   23.16  #include <xen/acm_ops.h>
   23.17 @@ -139,7 +139,7 @@ typedef struct {
   23.18      xen_domain_handle_t handle;
   23.19  } xc_dominfo_t;
   23.20  
   23.21 -typedef dom0_getdomaininfo_t xc_domaininfo_t;
   23.22 +typedef xen_domctl_getdomaininfo_t xc_domaininfo_t;
   23.23  int xc_domain_create(int xc_handle,
   23.24                       uint32_t ssidref,
   23.25                       xen_domain_handle_t handle,
   23.26 @@ -231,7 +231,11 @@ int xc_domain_shutdown(int xc_handle,
   23.27  int xc_vcpu_setaffinity(int xc_handle,
   23.28                          uint32_t domid,
   23.29                          int vcpu,
   23.30 -                        cpumap_t cpumap);
   23.31 +                        uint64_t cpumap);
   23.32 +int xc_vcpu_getaffinity(int xc_handle,
   23.33 +                        uint32_t domid,
   23.34 +                        int vcpu,
   23.35 +                        uint64_t *cpumap);
   23.36  
   23.37  /**
   23.38   * This function will return information about one or more domains. It is
   23.39 @@ -301,7 +305,7 @@ int xc_vcpu_getcontext(int xc_handle,
   23.40                                 uint32_t vcpu,
   23.41                                 vcpu_guest_context_t *ctxt);
   23.42  
   23.43 -typedef dom0_getvcpuinfo_t xc_vcpuinfo_t;
   23.44 +typedef xen_domctl_getvcpuinfo_t xc_vcpuinfo_t;
   23.45  int xc_vcpu_getinfo(int xc_handle,
   23.46                      uint32_t domid,
   23.47                      uint32_t vcpu,
   23.48 @@ -317,7 +321,7 @@ long long xc_domain_get_cpu_usage(int xc
   23.49  int xc_domain_sethandle(int xc_handle, uint32_t domid,
   23.50                          xen_domain_handle_t handle);
   23.51  
   23.52 -typedef dom0_shadow_control_stats_t xc_shadow_control_stats_t;
   23.53 +typedef xen_domctl_shadow_op_stats_t xc_shadow_op_stats_t;
   23.54  int xc_shadow_control(int xc_handle,
   23.55                        uint32_t domid,
   23.56                        unsigned int sop,
   23.57 @@ -325,7 +329,7 @@ int xc_shadow_control(int xc_handle,
   23.58                        unsigned long pages,
   23.59                        unsigned long *mb,
   23.60                        uint32_t mode,
   23.61 -                      xc_shadow_control_stats_t *stats);
   23.62 +                      xc_shadow_op_stats_t *stats);
   23.63  
   23.64  int xc_sedf_domain_set(int xc_handle,
   23.65                         uint32_t domid,
   23.66 @@ -341,11 +345,11 @@ int xc_sedf_domain_get(int xc_handle,
   23.67  
   23.68  int xc_sched_credit_domain_set(int xc_handle,
   23.69                                 uint32_t domid,
   23.70 -                               struct sched_credit_adjdom *sdom);
   23.71 +                               struct xen_domctl_sched_credit *sdom);
   23.72  
   23.73  int xc_sched_credit_domain_get(int xc_handle,
   23.74                                 uint32_t domid,
   23.75 -                               struct sched_credit_adjdom *sdom);
   23.76 +                               struct xen_domctl_sched_credit *sdom);
   23.77  
   23.78  /*
   23.79   * EVENT CHANNEL FUNCTIONS
   23.80 @@ -377,7 +381,7 @@ int xc_readconsolering(int xc_handle,
   23.81                         unsigned int *pnr_chars,
   23.82                         int clear);
   23.83  
   23.84 -typedef dom0_physinfo_t xc_physinfo_t;
   23.85 +typedef xen_sysctl_physinfo_t xc_physinfo_t;
   23.86  int xc_physinfo(int xc_handle,
   23.87                  xc_physinfo_t *info);
   23.88  
   23.89 @@ -438,8 +442,8 @@ int xc_domain_iomem_permission(int xc_ha
   23.90  unsigned long xc_make_page_below_4G(int xc_handle, uint32_t domid,
   23.91                                      unsigned long mfn);
   23.92  
   23.93 -typedef dom0_perfc_desc_t xc_perfc_desc_t;
   23.94 -typedef dom0_perfc_val_t xc_perfc_val_t;
   23.95 +typedef xen_sysctl_perfc_desc_t xc_perfc_desc_t;
   23.96 +typedef xen_sysctl_perfc_val_t xc_perfc_val_t;
   23.97  /* IMPORTANT: The caller is responsible for mlock()'ing the @desc and @val
   23.98     arrays. */
   23.99  int xc_perfc_control(int xc_handle,
  23.100 @@ -561,8 +565,8 @@ int xc_tbuf_set_cpu_mask(int xc_handle, 
  23.101  
  23.102  int xc_tbuf_set_evt_mask(int xc_handle, uint32_t mask);
  23.103  
  23.104 -/* Execute a privileged dom0 operation. */
  23.105 -int xc_dom0_op(int xc_handle, dom0_op_t *op);
  23.106 +int xc_domctl(int xc_handle, struct xen_domctl *domctl);
  23.107 +int xc_sysctl(int xc_handle, struct xen_sysctl *sysctl);
  23.108  
  23.109  int xc_version(int xc_handle, int cmd, void *arg);
  23.110  

    24.1 --- a/tools/libxc/xg_private.h	Fri Aug 25 10:39:24 2006 +0100
    24.2 +++ b/tools/libxc/xg_private.h	Fri Aug 25 18:39:10 2006 +0100
    24.3 @@ -19,15 +19,6 @@
    24.4  #include <xen/memory.h>
    24.5  #include <xen/elfnote.h>
    24.6  
    24.7 -/* valgrind cannot see when a hypercall has filled in some values.  For this
    24.8 -   reason, we must zero the dom0_op_t instance before a call, if using
    24.9 -   valgrind.  */
   24.10 -#ifdef VALGRIND
   24.11 -#define DECLARE_DOM0_OP dom0_op_t op = { 0 }
   24.12 -#else
   24.13 -#define DECLARE_DOM0_OP dom0_op_t op
   24.14 -#endif
   24.15 -
   24.16  #ifndef ELFSIZE
   24.17  #include <limits.h>
   24.18  #if UINT_MAX == ULONG_MAX

    25.1 --- a/tools/misc/xenperf.c	Fri Aug 25 10:39:24 2006 +0100
    25.2 +++ b/tools/misc/xenperf.c	Fri Aug 25 18:39:10 2006 +0100
    25.3 @@ -64,7 +64,7 @@ int main(int argc, char *argv[])
    25.4      
    25.5      if ( reset )
    25.6      {
    25.7 -        if ( xc_perfc_control(xc_handle, DOM0_PERFCCONTROL_OP_RESET,
    25.8 +        if ( xc_perfc_control(xc_handle, XEN_SYSCTL_PERFCOP_reset,
    25.9                                NULL, NULL, NULL, NULL) != 0 )
   25.10          {
   25.11              fprintf(stderr, "Error reseting performance counters: %d (%s)\n",
   25.12 @@ -75,7 +75,7 @@ int main(int argc, char *argv[])
   25.13          return 0;
   25.14      }
   25.15  
   25.16 -	if ( xc_perfc_control(xc_handle, DOM0_PERFCCONTROL_OP_QUERY,
   25.17 +	if ( xc_perfc_control(xc_handle, XEN_SYSCTL_PERFCOP_query,
   25.18  						  NULL, NULL, &num_desc, &num_val) != 0 )
   25.19          {
   25.20              fprintf(stderr, "Error getting number of perf counters: %d (%s)\n",
   25.21 @@ -96,7 +96,7 @@ int main(int argc, char *argv[])
   25.22          exit(-1);
   25.23      }
   25.24  
   25.25 -    if ( xc_perfc_control(xc_handle, DOM0_PERFCCONTROL_OP_QUERY,
   25.26 +    if ( xc_perfc_control(xc_handle, XEN_SYSCTL_PERFCOP_query,
   25.27  						  pcd, pcv, NULL, NULL) != 0 )
   25.28      {
   25.29          fprintf(stderr, "Error getting perf counter: %d (%s)\n",

    26.1 --- a/tools/python/xen/lowlevel/xc/xc.c	Fri Aug 25 10:39:24 2006 +0100
    26.2 +++ b/tools/python/xen/lowlevel/xc/xc.c	Fri Aug 25 18:39:10 2006 +0100
    26.3 @@ -141,7 +141,7 @@ static PyObject *pyxc_vcpu_setaffinity(X
    26.4  {
    26.5      uint32_t dom;
    26.6      int vcpu = 0, i;
    26.7 -    cpumap_t cpumap = ~0ULL;
    26.8 +    uint64_t  cpumap = ~0ULL;
    26.9      PyObject *cpulist = NULL;
   26.10  
   26.11      static char *kwd_list[] = { "dom", "vcpu", "cpumap", NULL };
   26.12 @@ -154,7 +154,7 @@ static PyObject *pyxc_vcpu_setaffinity(X
   26.13      {
   26.14          cpumap = 0ULL;
   26.15          for ( i = 0; i < PyList_Size(cpulist); i++ ) 
   26.16 -            cpumap |= (cpumap_t)1 << PyInt_AsLong(PyList_GetItem(cpulist, i));
   26.17 +            cpumap |= (uint64_t)1 << PyInt_AsLong(PyList_GetItem(cpulist, i));
   26.18      }
   26.19    
   26.20      if ( xc_vcpu_setaffinity(self->xc_handle, dom, vcpu, cpumap) != 0 )
   26.21 @@ -289,7 +289,7 @@ static PyObject *pyxc_vcpu_getinfo(XcObj
   26.22      uint32_t dom, vcpu = 0;
   26.23      xc_vcpuinfo_t info;
   26.24      int rc, i;
   26.25 -    cpumap_t cpumap;
   26.26 +    uint64_t cpumap;
   26.27  
   26.28      static char *kwd_list[] = { "dom", "vcpu", NULL };
   26.29      
   26.30 @@ -300,6 +300,9 @@ static PyObject *pyxc_vcpu_getinfo(XcObj
   26.31      rc = xc_vcpu_getinfo(self->xc_handle, dom, vcpu, &info);
   26.32      if ( rc < 0 )
   26.33          return PyErr_SetFromErrno(xc_error);
   26.34 +    rc = xc_vcpu_getaffinity(self->xc_handle, dom, vcpu, &cpumap);
   26.35 +    if ( rc < 0 )
   26.36 +        return PyErr_SetFromErrno(xc_error);
   26.37  
   26.38      info_dict = Py_BuildValue("{s:i,s:i,s:i,s:L,s:i}",
   26.39                                "online",   info.online,
   26.40 @@ -308,7 +311,6 @@ static PyObject *pyxc_vcpu_getinfo(XcObj
   26.41                                "cpu_time", info.cpu_time,
   26.42                                "cpu",      info.cpu);
   26.43  
   26.44 -    cpumap = info.cpumap;
   26.45      cpulist = PyList_New(0);
   26.46      for ( i = 0; cpumap != 0; i++ )
   26.47      {
   26.48 @@ -632,11 +634,11 @@ static PyObject *pyxc_shadow_mem_control
   26.49          return NULL;
   26.50      
   26.51      if ( mbarg < 0 ) 
   26.52 -        op = DOM0_SHADOW_CONTROL_OP_GET_ALLOCATION;
   26.53 +        op = XEN_DOMCTL_SHADOW_OP_GET_ALLOCATION;
   26.54      else 
   26.55      {
   26.56          mb = mbarg;
   26.57 -        op = DOM0_SHADOW_CONTROL_OP_SET_ALLOCATION;
   26.58 +        op = XEN_DOMCTL_SHADOW_OP_SET_ALLOCATION;
   26.59      }
   26.60      if ( xc_shadow_control(xc->xc_handle, dom, op, NULL, 0, &mb, 0, NULL) < 0 )
   26.61          return PyErr_SetFromErrno(xc_error);
   26.62 @@ -654,7 +656,7 @@ static PyObject *pyxc_sched_credit_domai
   26.63      uint16_t cap;
   26.64      static char *kwd_list[] = { "dom", "weight", "cap", NULL };
   26.65      static char kwd_type[] = "I|HH";
   26.66 -    struct sched_credit_adjdom sdom;
   26.67 +    struct xen_domctl_sched_credit sdom;
   26.68      
   26.69      weight = 0;
   26.70      cap = (uint16_t)~0U;
   26.71 @@ -675,7 +677,7 @@ static PyObject *pyxc_sched_credit_domai
   26.72  static PyObject *pyxc_sched_credit_domain_get(XcObject *self, PyObject *args)
   26.73  {
   26.74      uint32_t domid;
   26.75 -    struct sched_credit_adjdom sdom;
   26.76 +    struct xen_domctl_sched_credit sdom;
   26.77      
   26.78      if( !PyArg_ParseTuple(args, "I", &domid) )
   26.79          return NULL;

    27.1 --- a/tools/xenmon/setmask.c	Fri Aug 25 10:39:24 2006 +0100
    27.2 +++ b/tools/xenmon/setmask.c	Fri Aug 25 18:39:10 2006 +0100
    27.3 @@ -40,15 +40,14 @@ typedef struct { int counter; } atomic_t
    27.4  
    27.5  int main(int argc, char * argv[])
    27.6  {
    27.7 -
    27.8 -    dom0_op_t op; 
    27.9 +    struct xen_sysctl sysctl;
   27.10      int ret;
   27.11  
   27.12      int xc_handle = xc_interface_open();
   27.13 -    op.cmd = DOM0_TBUFCONTROL;
   27.14 -    op.interface_version = DOM0_INTERFACE_VERSION;
   27.15 -    op.u.tbufcontrol.op  = DOM0_TBUF_GET_INFO;
   27.16 -    ret = xc_dom0_op(xc_handle, &op);
   27.17 +    sysctl.cmd = XEN_SYSCTL_tbuf_op;
   27.18 +    sysctl.interface_version = XEN_SYSCTL_INTERFACE_VERSION;
   27.19 +    sysctl.u.tbuf_op.cmd  = XEN_SYSCTL_TBUFOP_get_info;
   27.20 +    ret = xc_sysctl(xc_handle, &sysctl);
   27.21      if ( ret != 0 )
   27.22      {
   27.23          perror("Failure to get event mask from Xen");
   27.24 @@ -56,26 +55,26 @@ int main(int argc, char * argv[])
   27.25      }
   27.26      else
   27.27      {
   27.28 -        printf("Current event mask: 0x%.8x\n", op.u.tbufcontrol.evt_mask);
   27.29 +        printf("Current event mask: 0x%.8x\n", sysctl.u.tbuf_op.evt_mask);
   27.30      }
   27.31  
   27.32 -    op.cmd = DOM0_TBUFCONTROL;
   27.33 -    op.interface_version = DOM0_INTERFACE_VERSION;
   27.34 -    op.u.tbufcontrol.op  = DOM0_TBUF_SET_EVT_MASK;
   27.35 -    op.u.tbufcontrol.evt_mask = XENMON;
   27.36 +    sysctl.cmd = XEN_SYSCTL_tbuf_op;
   27.37 +    sysctl.interface_version = XEN_SYSCTL_INTERFACE_VERSION;
   27.38 +    sysctl.u.tbuf_op.cmd  = XEN_SYSCTL_TBUFOP_set_evt_mask;
   27.39 +    sysctl.u.tbuf_op.evt_mask = XENMON;
   27.40  
   27.41 -    ret = xc_dom0_op(xc_handle, &op);
   27.42 -    printf("Setting mask to 0x%.8x\n", op.u.tbufcontrol.evt_mask);
   27.43 +    ret = xc_sysctl(xc_handle, &sysctl);
   27.44 +    printf("Setting mask to 0x%.8x\n", sysctl.u.tbuf_op.evt_mask);
   27.45      if ( ret != 0 )
   27.46      {
   27.47          perror("Failure to get scheduler ID from Xen");
   27.48          exit(1);
   27.49      }
   27.50  
   27.51 -    op.cmd = DOM0_TBUFCONTROL;
   27.52 -    op.interface_version = DOM0_INTERFACE_VERSION;
   27.53 -    op.u.tbufcontrol.op  = DOM0_TBUF_GET_INFO;
   27.54 -    ret = xc_dom0_op(xc_handle, &op);
   27.55 +    sysctl.cmd = XEN_SYSCTL_tbuf_op;
   27.56 +    sysctl.interface_version = XEN_SYSCTL_INTERFACE_VERSION;
   27.57 +    sysctl.u.tbuf_op.cmd  = XEN_SYSCTL_TBUFOP_get_info;
   27.58 +    ret = xc_sysctl(xc_handle, &sysctl);
   27.59      if ( ret != 0 )
   27.60      {
   27.61          perror("Failure to get event mask from Xen");
   27.62 @@ -83,7 +82,7 @@ int main(int argc, char * argv[])
   27.63      }
   27.64      else
   27.65      {
   27.66 -        printf("Current event mask: 0x%.8x\n", op.u.tbufcontrol.evt_mask);
   27.67 +        printf("Current event mask: 0x%.8x\n", sysctl.u.tbuf_op.evt_mask);
   27.68      }
   27.69      xc_interface_close(xc_handle);
   27.70      return 0;

    28.1 --- a/tools/xenstat/libxenstat/src/xenstat.c	Fri Aug 25 10:39:24 2006 +0100
    28.2 +++ b/tools/xenstat/libxenstat/src/xenstat.c	Fri Aug 25 18:39:10 2006 +0100
    28.3 @@ -210,8 +210,8 @@ xenstat_node *xenstat_get_node(xenstat_h
    28.4  {
    28.5  #define DOMAIN_CHUNK_SIZE 256
    28.6  	xenstat_node *node;
    28.7 -	dom0_physinfo_t physinfo;
    28.8 -	dom0_getdomaininfo_t domaininfo[DOMAIN_CHUNK_SIZE];
    28.9 +	xc_physinfo_t physinfo;
   28.10 +	xc_domaininfo_t domaininfo[DOMAIN_CHUNK_SIZE];
   28.11  	unsigned int new_domains;
   28.12  	unsigned int i;
   28.13  
   28.14 @@ -530,7 +530,7 @@ static int xenstat_collect_vcpus(xenstat
   28.15  	
   28.16  		for (vcpu = 0; vcpu < node->domains[i].num_vcpus; vcpu++) {
   28.17  			/* FIXME: need to be using a more efficient mechanism*/
   28.18 -			dom0_getvcpuinfo_t info;
   28.19 +			xc_vcpuinfo_t info;
   28.20  
   28.21  			if (xc_vcpu_getinfo(node->handle->xc_handle,
   28.22  					    node->domains[i].id, vcpu, &info) != 0) {

    29.1 --- a/xen/arch/ia64/xen/dom0_ops.c	Fri Aug 25 10:39:24 2006 +0100
    29.2 +++ b/xen/arch/ia64/xen/dom0_ops.c	Fri Aug 25 18:39:10 2006 +0100
    29.3 @@ -10,14 +10,14 @@
    29.4  #include <xen/types.h>
    29.5  #include <xen/lib.h>
    29.6  #include <xen/mm.h>
    29.7 -#include <public/dom0_ops.h>
    29.8 +#include <public/domctl.h>
    29.9 +#include <public/sysctl.h>
   29.10  #include <xen/sched.h>
   29.11  #include <xen/event.h>
   29.12  #include <asm/pdb.h>
   29.13  #include <xen/trace.h>
   29.14  #include <xen/console.h>
   29.15  #include <xen/guest_access.h>
   29.16 -#include <public/sched_ctl.h>
   29.17  #include <asm/vmx.h>
   29.18  #include <asm/dom_fw.h>
   29.19  #include <xen/iocap.h>
   29.20 @@ -25,7 +25,8 @@
   29.21  void build_physmap_table(struct domain *d);
   29.22  
   29.23  extern unsigned long total_pages;
   29.24 -long arch_do_dom0_op(dom0_op_t *op, XEN_GUEST_HANDLE(dom0_op_t) u_dom0_op)
   29.25 +
   29.26 +long arch_do_domctl(xen_domctl_t *op, XEN_GUEST_HANDLE(xen_domctl_t) u_domctl)
   29.27  {
   29.28      long ret = 0;
   29.29  
   29.30 @@ -34,10 +35,10 @@ long arch_do_dom0_op(dom0_op_t *op, XEN_
   29.31  
   29.32      switch ( op->cmd )
   29.33      {
   29.34 -    case DOM0_GETMEMLIST:
   29.35 +    case XEN_DOMCTL_getmemlist:
   29.36      {
   29.37          unsigned long i;
   29.38 -        struct domain *d = find_domain_by_id(op->u.getmemlist.domain);
   29.39 +        struct domain *d = find_domain_by_id(op->domain);
   29.40          unsigned long start_page = op->u.getmemlist.max_pfns >> 32;
   29.41          unsigned long nr_pages = op->u.getmemlist.max_pfns & 0xffffffff;
   29.42          unsigned long mfn;
   29.43 @@ -63,39 +64,17 @@ long arch_do_dom0_op(dom0_op_t *op, XEN_
   29.44          }
   29.45  
   29.46          op->u.getmemlist.num_pfns = i;
   29.47 -        if (copy_to_guest(u_dom0_op, op, 1))
   29.48 +        if (copy_to_guest(u_domctl, op, 1))
   29.49              ret = -EFAULT;
   29.50  
   29.51          put_domain(d);
   29.52      }
   29.53      break;
   29.54  
   29.55 -    case DOM0_PHYSINFO:
   29.56 +    case XEN_DOMCTL_arch_setup:
   29.57      {
   29.58 -        dom0_physinfo_t *pi = &op->u.physinfo;
   29.59 -
   29.60 -        pi->threads_per_core =
   29.61 -            cpus_weight(cpu_sibling_map[0]);
   29.62 -        pi->cores_per_socket =
   29.63 -            cpus_weight(cpu_core_map[0]) / pi->threads_per_core;
   29.64 -        pi->sockets_per_node = 
   29.65 -            num_online_cpus() / cpus_weight(cpu_core_map[0]);
   29.66 -        pi->nr_nodes         = 1;
   29.67 -        pi->total_pages      = total_pages; 
   29.68 -        pi->free_pages       = avail_domheap_pages();
   29.69 -        pi->cpu_khz          = local_cpu_data->proc_freq / 1000;
   29.70 -        memset(pi->hw_cap, 0, sizeof(pi->hw_cap));
   29.71 -        //memcpy(pi->hw_cap, boot_cpu_data.x86_capability, NCAPINTS*4);
   29.72 -        ret = 0;
   29.73 -        if ( copy_to_guest(u_dom0_op, op, 1) )
   29.74 -            ret = -EFAULT;
   29.75 -    }
   29.76 -    break;
   29.77 -
   29.78 -    case DOM0_DOMAIN_SETUP:
   29.79 -    {
   29.80 -        dom0_domain_setup_t *ds = &op->u.domain_setup;
   29.81 -        struct domain *d = find_domain_by_id(ds->domain);
   29.82 +        xen_domctl_arch_setup_t *ds = &op->u.arch_setup;
   29.83 +        struct domain *d = find_domain_by_id(op->domain);
   29.84  
   29.85          if ( d == NULL) {
   29.86              ret = -EINVAL;
   29.87 @@ -112,7 +91,7 @@ long arch_do_dom0_op(dom0_op_t *op, XEN_
   29.88              ds->xsi_va = d->arch.shared_info_va;
   29.89              ds->hypercall_imm = d->arch.breakimm;
   29.90              /* Copy back.  */
   29.91 -            if ( copy_to_guest(u_dom0_op, op, 1) )
   29.92 +            if ( copy_to_guest(u_domctl, op, 1) )
   29.93                  ret = -EFAULT;
   29.94          }
   29.95          else {
   29.96 @@ -152,21 +131,21 @@ long arch_do_dom0_op(dom0_op_t *op, XEN_
   29.97      }
   29.98      break;
   29.99  
  29.100 -    case DOM0_SHADOW_CONTROL:
  29.101 +    case XEN_DOMCTL_shadow_op:
  29.102      {
  29.103          struct domain *d; 
  29.104          ret = -ESRCH;
  29.105 -        d = find_domain_by_id(op->u.shadow_control.domain);
  29.106 +        d = find_domain_by_id(op->domain);
  29.107          if ( d != NULL )
  29.108          {
  29.109 -            ret = shadow_mode_control(d, &op->u.shadow_control);
  29.110 +            ret = shadow_mode_control(d, &op->u.shadow_op);
  29.111              put_domain(d);
  29.112 -            copy_to_guest(u_dom0_op, op, 1);
  29.113 +            copy_to_guest(u_domctl, op, 1);
  29.114          } 
  29.115      }
  29.116      break;
  29.117  
  29.118 -    case DOM0_IOPORT_PERMISSION:
  29.119 +    case XEN_DOMCTL_ioport_permission:
  29.120      {
  29.121          struct domain *d;
  29.122          unsigned int fp = op->u.ioport_permission.first_port;
  29.123 @@ -174,7 +153,7 @@ long arch_do_dom0_op(dom0_op_t *op, XEN_
  29.124          unsigned int lp = fp + np - 1;
  29.125  
  29.126          ret = -ESRCH;
  29.127 -        d = find_domain_by_id(op->u.ioport_permission.domain);
  29.128 +        d = find_domain_by_id(op->domain);
  29.129          if (unlikely(d == NULL))
  29.130              break;
  29.131  
  29.132 @@ -191,7 +170,47 @@ long arch_do_dom0_op(dom0_op_t *op, XEN_
  29.133      }
  29.134      break;
  29.135      default:
  29.136 -        printf("arch_do_dom0_op: unrecognized dom0 op: %d!!!\n",op->cmd);
  29.137 +        printf("arch_do_domctl: unrecognized domctl: %d!!!\n",op->cmd);
  29.138 +        ret = -ENOSYS;
  29.139 +
  29.140 +    }
  29.141 +
  29.142 +    return ret;
  29.143 +}
  29.144 +
  29.145 +long arch_do_sysctl(xen_sysctl_t *op, XEN_GUEST_HANDLE(xen_sysctl_t) u_sysctl)
  29.146 +{
  29.147 +    long ret = 0;
  29.148 +
  29.149 +    if ( !IS_PRIV(current->domain) )
  29.150 +        return -EPERM;
  29.151 +
  29.152 +    switch ( op->cmd )
  29.153 +    {
  29.154 +    case XEN_SYSCTL_physinfo:
  29.155 +    {
  29.156 +        xen_sysctl_physinfo_t *pi = &op->u.physinfo;
  29.157 +
  29.158 +        pi->threads_per_core =
  29.159 +            cpus_weight(cpu_sibling_map[0]);
  29.160 +        pi->cores_per_socket =
  29.161 +            cpus_weight(cpu_core_map[0]) / pi->threads_per_core;
  29.162 +        pi->sockets_per_node = 
  29.163 +            num_online_cpus() / cpus_weight(cpu_core_map[0]);
  29.164 +        pi->nr_nodes         = 1;
  29.165 +        pi->total_pages      = total_pages; 
  29.166 +        pi->free_pages       = avail_domheap_pages();
  29.167 +        pi->cpu_khz          = local_cpu_data->proc_freq / 1000;
  29.168 +        memset(pi->hw_cap, 0, sizeof(pi->hw_cap));
  29.169 +        //memcpy(pi->hw_cap, boot_cpu_data.x86_capability, NCAPINTS*4);
  29.170 +        ret = 0;
  29.171 +        if ( copy_to_guest(u_sysctl, op, 1) )
  29.172 +            ret = -EFAULT;
  29.173 +    }
  29.174 +    break;
  29.175 +
  29.176 +    default:
  29.177 +        printf("arch_do_sysctl: unrecognized sysctl: %d!!!\n",op->cmd);
  29.178          ret = -ENOSYS;
  29.179  
  29.180      }

    30.1 --- a/xen/arch/ia64/xen/domain.c	Fri Aug 25 10:39:24 2006 +0100
    30.2 +++ b/xen/arch/ia64/xen/domain.c	Fri Aug 25 18:39:10 2006 +0100
    30.3 @@ -591,7 +591,7 @@ domain_set_shared_info_va (unsigned long
    30.4  /* Transfer and clear the shadow bitmap in 1kB chunks for L1 cache. */
    30.5  #define SHADOW_COPY_CHUNK (1024 / sizeof (unsigned long))
    30.6  
    30.7 -int shadow_mode_control(struct domain *d, dom0_shadow_control_t *sc)
    30.8 +int shadow_mode_control(struct domain *d, xen_domctl_shadow_ops_t *sc)
    30.9  {
   30.10  	unsigned int op = sc->op;
   30.11  	int          rc = 0;
   30.12 @@ -607,7 +607,7 @@ int shadow_mode_control(struct domain *d
   30.13  
   30.14  	switch (op)
   30.15  	{
   30.16 -	case DOM0_SHADOW_CONTROL_OP_OFF:
   30.17 +	case XEN_DOMCTL_SHADOW_OP_OFF:
   30.18  		if (shadow_mode_enabled (d)) {
   30.19  			u64 *bm = d->arch.shadow_bitmap;
   30.20  
   30.21 @@ -621,12 +621,12 @@ int shadow_mode_control(struct domain *d
   30.22  		}
   30.23  		break;
   30.24  
   30.25 -	case DOM0_SHADOW_CONTROL_OP_ENABLE_TEST:
   30.26 -	case DOM0_SHADOW_CONTROL_OP_ENABLE_TRANSLATE:
   30.27 +	case XEN_DOMCTL_SHADOW_OP_ENABLE_TEST:
   30.28 +	case XEN_DOMCTL_SHADOW_OP_ENABLE_TRANSLATE:
   30.29  		rc = -EINVAL;
   30.30  		break;
   30.31  
   30.32 -	case DOM0_SHADOW_CONTROL_OP_ENABLE_LOGDIRTY:
   30.33 +	case XEN_DOMCTL_SHADOW_OP_ENABLE_LOGDIRTY:
   30.34  		if (shadow_mode_enabled(d)) {
   30.35  			rc = -EINVAL;
   30.36  			break;
   30.37 @@ -653,7 +653,7 @@ int shadow_mode_control(struct domain *d
   30.38  		}
   30.39  		break;
   30.40  
   30.41 -	case DOM0_SHADOW_CONTROL_OP_CLEAN:
   30.42 +	case XEN_DOMCTL_SHADOW_OP_CLEAN:
   30.43  	  {
   30.44  		int nbr_longs;
   30.45  
   30.46 @@ -692,7 +692,7 @@ int shadow_mode_control(struct domain *d
   30.47  		break;
   30.48  	  }
   30.49  
   30.50 -	case DOM0_SHADOW_CONTROL_OP_PEEK:
   30.51 +	case XEN_DOMCTL_SHADOW_OP_PEEK:
   30.52  	{
   30.53  		unsigned long size;
   30.54  

    31.1 --- a/xen/arch/ia64/xen/hypercall.c	Fri Aug 25 10:39:24 2006 +0100
    31.2 +++ b/xen/arch/ia64/xen/hypercall.c	Fri Aug 25 18:39:10 2006 +0100
    31.3 @@ -18,7 +18,8 @@
    31.4  
    31.5  #include <asm/vcpu.h>
    31.6  #include <asm/dom_fw.h>
    31.7 -#include <public/dom0_ops.h>
    31.8 +#include <public/domctl.h>
    31.9 +#include <public/sysctl.h>
   31.10  #include <public/event_channel.h>
   31.11  #include <public/memory.h>
   31.12  #include <public/sched.h>
   31.13 @@ -43,7 +44,7 @@ hypercall_t ia64_hypercall_table[] =
   31.14  	(hypercall_t)do_ni_hypercall,		/* do_set_callbacks */
   31.15  	(hypercall_t)do_ni_hypercall,		/* do_fpu_taskswitch */		/*  5 */
   31.16  	(hypercall_t)do_sched_op_compat,
   31.17 -	(hypercall_t)do_dom0_op,
   31.18 +	(hypercall_t)do_ni_hypercall,
   31.19  	(hypercall_t)do_ni_hypercall,		/* do_set_debugreg */
   31.20  	(hypercall_t)do_ni_hypercall,		/* do_get_debugreg */
   31.21  	(hypercall_t)do_ni_hypercall,		/* do_update_descriptor */	/* 10 */
   31.22 @@ -71,8 +72,8 @@ hypercall_t ia64_hypercall_table[] =
   31.23  	(hypercall_t)do_event_channel_op,
   31.24  	(hypercall_t)do_physdev_op,
   31.25  	(hypercall_t)do_hvm_op,			/*  */
   31.26 -	(hypercall_t)do_ni_hypercall,		/*  */                  /* 35 */
   31.27 -	(hypercall_t)do_ni_hypercall,		/*  */
   31.28 +	(hypercall_t)do_sysctl,			/*  */                  /* 35 */
   31.29 +	(hypercall_t)do_domctl,			/*  */
   31.30  	(hypercall_t)do_ni_hypercall,		/*  */
   31.31  	(hypercall_t)do_ni_hypercall,		/*  */
   31.32  	(hypercall_t)do_ni_hypercall,		/*  */

    32.1 --- a/xen/arch/powerpc/dom0_ops.c	Fri Aug 25 10:39:24 2006 +0100
    32.2 +++ b/xen/arch/powerpc/dom0_ops.c	Fri Aug 25 18:39:10 2006 +0100
    32.3 @@ -24,10 +24,8 @@
    32.4  #include <xen/sched.h>
    32.5  #include <xen/guest_access.h>
    32.6  #include <public/xen.h>
    32.7 -#include <public/dom0_ops.h>
    32.8 -
    32.9 -extern void arch_getdomaininfo_ctxt(struct vcpu *v, vcpu_guest_context_t *c);
   32.10 -extern long arch_do_dom0_op(struct dom0_op *op, XEN_GUEST_HANDLE(dom0_op_t) u_dom0_op);
   32.11 +#include <public/domctl.h>
   32.12 +#include <public/sysctl.h>
   32.13  
   32.14  void arch_getdomaininfo_ctxt(struct vcpu *v, vcpu_guest_context_t *c)
   32.15  { 
   32.16 @@ -35,16 +33,17 @@ void arch_getdomaininfo_ctxt(struct vcpu
   32.17      /* XXX fill in rest of vcpu_guest_context_t */
   32.18  }
   32.19  
   32.20 -long arch_do_dom0_op(struct dom0_op *op, XEN_GUEST_HANDLE(dom0_op_t) u_dom0_op)
   32.21 +long arch_do_domctl(struct xen_domctl *domctl,
   32.22 +                    XEN_GUEST_HANDLE(xen_domctl_t) u_domctl)
   32.23  {
   32.24      long ret = 0;
   32.25  
   32.26 -    switch (op->cmd) {
   32.27 -    case DOM0_GETMEMLIST:
   32.28 +    switch (domctl->cmd) {
   32.29 +    case XEN_DOMCTL_getmemlist:
   32.30      {
   32.31          int i;
   32.32 -        struct domain *d = find_domain_by_id(op->u.getmemlist.domain);
   32.33 -        unsigned long max_pfns = op->u.getmemlist.max_pfns;
   32.34 +        struct domain *d = find_domain_by_id(domctl->domain);
   32.35 +        unsigned long max_pfns = domctl->u.getmemlist.max_pfns;
   32.36          xen_pfn_t mfn;
   32.37          struct list_head *list_ent;
   32.38  
   32.39 @@ -59,7 +58,7 @@ long arch_do_dom0_op(struct dom0_op *op,
   32.40              {
   32.41                  mfn = page_to_mfn(list_entry(
   32.42                      list_ent, struct page_info, list));
   32.43 -                if ( copy_to_guest_offset(op->u.getmemlist.buffer,
   32.44 +                if ( copy_to_guest_offset(domctl->u.getmemlist.buffer,
   32.45                                            i, &mfn, 1) )
   32.46                  {
   32.47                      ret = -EFAULT;
   32.48 @@ -69,17 +68,31 @@ long arch_do_dom0_op(struct dom0_op *op,
   32.49              }
   32.50              spin_unlock(&d->page_alloc_lock);
   32.51  
   32.52 -            op->u.getmemlist.num_pfns = i;
   32.53 -            copy_to_guest(u_dom0_op, op, 1);
   32.54 +            domctl->u.getmemlist.num_pfns = i;
   32.55 +            copy_to_guest(u_domctl, domctl, 1);
   32.56              
   32.57              put_domain(d);
   32.58          }
   32.59      }
   32.60      break;
   32.61  
   32.62 -    case DOM0_PHYSINFO:
   32.63 +    default:
   32.64 +        ret = -ENOSYS;
   32.65 +        break;
   32.66 +    }
   32.67 +
   32.68 +    return ret;
   32.69 +}
   32.70 +
   32.71 +long arch_do_sysctl(struct xen_sysctl *sysctl,
   32.72 +                    XEN_GUEST_HANDLE(xen_sysctl_t) u_sysctl)
   32.73 +{
   32.74 +    long ret = 0;
   32.75 +
   32.76 +    switch (sysctl->cmd) {
   32.77 +    case XEN_SYSCTL_physinfo:
   32.78      {
   32.79 -        dom0_physinfo_t *pi = &op->u.physinfo;
   32.80 +        xen_sysctl_physinfo_t *pi = &sysctl->u.physinfo;
   32.81  
   32.82          pi->threads_per_core = 1;
   32.83          pi->cores_per_socket = 1;
   32.84 @@ -90,7 +103,7 @@ long arch_do_dom0_op(struct dom0_op *op,
   32.85          pi->cpu_khz          = cpu_khz;
   32.86          memset(pi->hw_cap, 0, sizeof(pi->hw_cap));
   32.87          ret = 0;
   32.88 -        if ( copy_to_guest(u_dom0_op, op, 1) )
   32.89 +        if ( copy_to_guest(u_sysctl, sysctl, 1) )
   32.90              ret = -EFAULT;
   32.91      }
   32.92      break;
   32.93 @@ -102,3 +115,4 @@ long arch_do_dom0_op(struct dom0_op *op,
   32.94  
   32.95      return ret;
   32.96  }
   32.97 +

    33.1 --- a/xen/arch/powerpc/powerpc64/hypercall_table.S	Fri Aug 25 10:39:24 2006 +0100
    33.2 +++ b/xen/arch/powerpc/powerpc64/hypercall_table.S	Fri Aug 25 18:39:10 2006 +0100
    33.3 @@ -11,7 +11,7 @@
    33.4          .quad 0 /* do_set_callbacks */
    33.5          .quad 0 /* do_fpu_taskswitch */     /*  5 */
    33.6          .quad do_sched_op
    33.7 -        .quad do_dom0_op
    33.8 +        .quad 0 /* do_platform_op */
    33.9          .quad 0 /* do_set_debugreg */
   33.10          .quad 0 /* do_get_debugreg */
   33.11          .quad 0 /* do_update_descriptor */  /* 10 */
   33.12 @@ -38,46 +38,9 @@
   33.13          .quad 0 /* do_xenoprof_op */
   33.14          .quad do_event_channel_op
   33.15          .quad do_physdev_op
   33.16 +        .quad 0 /* do_hvm_op */
   33.17 +        .quad do_sysctl             /* 35 */
   33.18 +        .quad do_domctl
   33.19          .rept NR_hypercalls-((.-__hypercall_table)/8)
   33.20          .quad do_ni_hypercall
   33.21          .endr
   33.22 -
   33.23 -        .globl hypercall_args_table
   33.24 -hypercall_args_table:	
   33.25 -        .byte 1 /* do_set_trap_table    */  /*  0 */
   33.26 -        .byte 4 /* do_mmu_update        */
   33.27 -        .byte 2 /* do_set_gdt           */
   33.28 -        .byte 2 /* do_stack_switch      */
   33.29 -        .byte 4 /* do_set_callbacks     */
   33.30 -        .byte 1 /* do_fpu_taskswitch    */  /*  5 */
   33.31 -        .byte 2 /* do_arch_sched_op     */
   33.32 -        .byte 1 /* do_dom0_op           */
   33.33 -        .byte 2 /* do_set_debugreg      */
   33.34 -        .byte 1 /* do_get_debugreg      */
   33.35 -        .byte 4 /* do_update_descriptor */  /* 10 */
   33.36 -        .byte 0 /* do_ni_hypercall      */
   33.37 -        .byte 2 /* do_memory_op         */
   33.38 -        .byte 2 /* do_multicall         */
   33.39 -        .byte 4 /* do_update_va_mapping */
   33.40 -        .byte 2 /* do_set_timer_op      */  /* 15 */
   33.41 -        .byte 1 /* do_event_channel_op  */
   33.42 -        .byte 2 /* do_xen_version       */
   33.43 -        .byte 3 /* do_console_io        */
   33.44 -        .byte 1 /* do_physdev_op        */
   33.45 -        .byte 3 /* do_grant_table_op    */  /* 20 */
   33.46 -        .byte 2 /* do_vm_assist         */
   33.47 -        .byte 5 /* do_update_va_mapping_otherdomain */
   33.48 -        .byte 0 /* do_switch_vm86       */
   33.49 -        .byte 2 /* do_boot_vcpu         */
   33.50 -        .byte 0 /* do_ni_hypercall      */  /* 25 */
   33.51 -        .byte 4 /* do_mmuext_op         */
   33.52 -        .byte 1 /* do_acm_op            */
   33.53 -        .byte 2 /* do_nmi_op            */
   33.54 -        .byte 2 /* do_arch_sched_op     */
   33.55 -        .byte 2 /* do_callback_op       */  /* 30 */
   33.56 -        .byte 2 /* do_xenoprof_op       */
   33.57 -        .byte 2 /* do_event_channel_op  */
   33.58 -        .byte 2 /* do_physdev_op        */
   33.59 -        .rept NR_hypercalls-(.-hypercall_args_table)
   33.60 -        .byte 0 /* do_ni_hypercall      */
   33.61 -        .endr

    34.1 --- a/xen/arch/x86/Makefile	Fri Aug 25 10:39:24 2006 +0100
    34.2 +++ b/xen/arch/x86/Makefile	Fri Aug 25 18:39:10 2006 +0100
    34.3 @@ -12,12 +12,13 @@ obj-y += bitops.o
    34.4  obj-y += compat.o
    34.5  obj-y += delay.o
    34.6  obj-y += dmi_scan.o
    34.7 -obj-y += dom0_ops.o
    34.8 +obj-y += domctl.o
    34.9  obj-y += domain.o
   34.10  obj-y += domain_build.o
   34.11  obj-y += e820.o
   34.12  obj-y += extable.o
   34.13  obj-y += flushtlb.o
   34.14 +obj-y += platform_hypercall.o
   34.15  obj-y += i387.o
   34.16  obj-y += i8259.o
   34.17  obj-y += io_apic.o
   34.18 @@ -33,6 +34,7 @@ obj-y += shutdown.o
   34.19  obj-y += smp.o
   34.20  obj-y += smpboot.o
   34.21  obj-y += string.o
   34.22 +obj-y += sysctl.o
   34.23  obj-y += time.o
   34.24  obj-y += trampoline.o
   34.25  obj-y += traps.o

    35.1 --- a/xen/arch/x86/dom0_ops.c	Fri Aug 25 10:39:24 2006 +0100
    35.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    35.3 @@ -1,486 +0,0 @@
    35.4 -/******************************************************************************
    35.5 - * Arch-specific dom0_ops.c
    35.6 - * 
    35.7 - * Process command requests from domain-0 guest OS.
    35.8 - * 
    35.9 - * Copyright (c) 2002, K A Fraser
   35.10 - */
   35.11 -
   35.12 -#include <xen/config.h>
   35.13 -#include <xen/types.h>
   35.14 -#include <xen/lib.h>
   35.15 -#include <xen/mm.h>
   35.16 -#include <xen/guest_access.h>
   35.17 -#include <public/dom0_ops.h>
   35.18 -#include <xen/sched.h>
   35.19 -#include <xen/event.h>
   35.20 -#include <xen/domain_page.h>
   35.21 -#include <asm/msr.h>
   35.22 -#include <xen/trace.h>
   35.23 -#include <xen/console.h>
   35.24 -#include <xen/iocap.h>
   35.25 -#include <asm/shadow.h>
   35.26 -#include <asm/irq.h>
   35.27 -#include <asm/hvm/hvm.h>
   35.28 -#include <asm/hvm/support.h>
   35.29 -#include <asm/processor.h>
   35.30 -#include <public/sched_ctl.h>
   35.31 -
   35.32 -#include <asm/mtrr.h>
   35.33 -#include "cpu/mtrr/mtrr.h"
   35.34 -
   35.35 -#define TRC_DOM0OP_ENTER_BASE  0x00020000
   35.36 -#define TRC_DOM0OP_LEAVE_BASE  0x00030000
   35.37 -
   35.38 -static int msr_cpu_mask;
   35.39 -static unsigned long msr_addr;
   35.40 -static unsigned long msr_lo;
   35.41 -static unsigned long msr_hi;
   35.42 -
   35.43 -static void write_msr_for(void *unused)
   35.44 -{
   35.45 -    if ( ((1 << smp_processor_id()) & msr_cpu_mask) )
   35.46 -        (void)wrmsr_safe(msr_addr, msr_lo, msr_hi);
   35.47 -}
   35.48 -
   35.49 -static void read_msr_for(void *unused)
   35.50 -{
   35.51 -    if ( ((1 << smp_processor_id()) & msr_cpu_mask) )
   35.52 -        (void)rdmsr_safe(msr_addr, msr_lo, msr_hi);
   35.53 -}
   35.54 -
   35.55 -long arch_do_dom0_op(struct dom0_op *op, XEN_GUEST_HANDLE(dom0_op_t) u_dom0_op)
   35.56 -{
   35.57 -    long ret = 0;
   35.58 -
   35.59 -    switch ( op->cmd )
   35.60 -    {
   35.61 -
   35.62 -    case DOM0_MSR:
   35.63 -    {
   35.64 -        if ( op->u.msr.write )
   35.65 -        {
   35.66 -            msr_cpu_mask = op->u.msr.cpu_mask;
   35.67 -            msr_addr = op->u.msr.msr;
   35.68 -            msr_lo = op->u.msr.in1;
   35.69 -            msr_hi = op->u.msr.in2;
   35.70 -            smp_call_function(write_msr_for, NULL, 1, 1);
   35.71 -            write_msr_for(NULL);
   35.72 -        }
   35.73 -        else
   35.74 -        {
   35.75 -            msr_cpu_mask = op->u.msr.cpu_mask;
   35.76 -            msr_addr = op->u.msr.msr;
   35.77 -            smp_call_function(read_msr_for, NULL, 1, 1);
   35.78 -            read_msr_for(NULL);
   35.79 -
   35.80 -            op->u.msr.out1 = msr_lo;
   35.81 -            op->u.msr.out2 = msr_hi;
   35.82 -            copy_to_guest(u_dom0_op, op, 1);
   35.83 -        }
   35.84 -        ret = 0;
   35.85 -    }
   35.86 -    break;
   35.87 -
   35.88 -    case DOM0_SHADOW_CONTROL:
   35.89 -    {
   35.90 -        struct domain *d;
   35.91 -        ret = -ESRCH;
   35.92 -        d = find_domain_by_id(op->u.shadow_control.domain);
   35.93 -        if ( d != NULL )
   35.94 -        {
   35.95 -            ret = shadow2_control_op(d, &op->u.shadow_control, u_dom0_op);
   35.96 -            put_domain(d);
   35.97 -            copy_to_guest(u_dom0_op, op, 1);
   35.98 -        } 
   35.99 -    }
  35.100 -    break;
  35.101 -
  35.102 -    case DOM0_ADD_MEMTYPE:
  35.103 -    {
  35.104 -        ret = mtrr_add_page(
  35.105 -            op->u.add_memtype.mfn,
  35.106 -            op->u.add_memtype.nr_mfns,
  35.107 -            op->u.add_memtype.type,
  35.108 -            1);
  35.109 -        if ( ret > 0 )
  35.110 -        {
  35.111 -            op->u.add_memtype.handle = 0;
  35.112 -            op->u.add_memtype.reg    = ret;
  35.113 -            (void)copy_to_guest(u_dom0_op, op, 1);
  35.114 -            ret = 0;
  35.115 -        }
  35.116 -    }
  35.117 -    break;
  35.118 -
  35.119 -    case DOM0_DEL_MEMTYPE:
  35.120 -    {
  35.121 -        if (op->u.del_memtype.handle == 0
  35.122 -            /* mtrr/main.c otherwise does a lookup */
  35.123 -            && (int)op->u.del_memtype.reg >= 0)
  35.124 -        {
  35.125 -            ret = mtrr_del_page(op->u.del_memtype.reg, 0, 0);
  35.126 -            if (ret > 0)
  35.127 -                ret = 0;
  35.128 -        }
  35.129 -        else
  35.130 -            ret = -EINVAL;
  35.131 -    }
  35.132 -    break;
  35.133 -
  35.134 -    case DOM0_READ_MEMTYPE:
  35.135 -    {
  35.136 -        unsigned long mfn;
  35.137 -        unsigned int  nr_mfns;
  35.138 -        mtrr_type     type;
  35.139 -
  35.140 -        ret = -EINVAL;
  35.141 -        if ( op->u.read_memtype.reg < num_var_ranges )
  35.142 -        {
  35.143 -            mtrr_if->get(op->u.read_memtype.reg, &mfn, &nr_mfns, &type);
  35.144 -            op->u.read_memtype.mfn     = mfn;
  35.145 -            op->u.read_memtype.nr_mfns = nr_mfns;
  35.146 -            op->u.read_memtype.type    = type;
  35.147 -            (void)copy_to_guest(u_dom0_op, op, 1);
  35.148 -            ret = 0;
  35.149 -        }
  35.150 -    }
  35.151 -    break;
  35.152 -
  35.153 -    case DOM0_MICROCODE:
  35.154 -    {
  35.155 -        extern int microcode_update(void *buf, unsigned long len);
  35.156 -        ret = microcode_update(op->u.microcode.data.p, op->u.microcode.length);
  35.157 -    }
  35.158 -    break;
  35.159 -
  35.160 -    case DOM0_IOPORT_PERMISSION:
  35.161 -    {
  35.162 -        struct domain *d;
  35.163 -        unsigned int fp = op->u.ioport_permission.first_port;
  35.164 -        unsigned int np = op->u.ioport_permission.nr_ports;
  35.165 -
  35.166 -        ret = -EINVAL;
  35.167 -        if ( (fp + np) > 65536 )
  35.168 -            break;
  35.169 -
  35.170 -        ret = -ESRCH;
  35.171 -        if ( unlikely((d = find_domain_by_id(
  35.172 -            op->u.ioport_permission.domain)) == NULL) )
  35.173 -            break;
  35.174 -
  35.175 -        if ( np == 0 )
  35.176 -            ret = 0;
  35.177 -        else if ( op->u.ioport_permission.allow_access )
  35.178 -            ret = ioports_permit_access(d, fp, fp + np - 1);
  35.179 -        else
  35.180 -            ret = ioports_deny_access(d, fp, fp + np - 1);
  35.181 -
  35.182 -        put_domain(d);
  35.183 -    }
  35.184 -    break;
  35.185 -
  35.186 -    case DOM0_PHYSINFO:
  35.187 -    {
  35.188 -        dom0_physinfo_t *pi = &op->u.physinfo;
  35.189 -
  35.190 -        pi->threads_per_core =
  35.191 -            cpus_weight(cpu_sibling_map[0]);
  35.192 -        pi->cores_per_socket =
  35.193 -            cpus_weight(cpu_core_map[0]) / pi->threads_per_core;
  35.194 -        pi->sockets_per_node = 
  35.195 -            num_online_cpus() / cpus_weight(cpu_core_map[0]);
  35.196 -
  35.197 -        pi->nr_nodes         = 1;
  35.198 -        pi->total_pages      = total_pages;
  35.199 -        pi->free_pages       = avail_domheap_pages();
  35.200 -        pi->scrub_pages      = avail_scrub_pages();
  35.201 -        pi->cpu_khz          = cpu_khz;
  35.202 -        memset(pi->hw_cap, 0, sizeof(pi->hw_cap));
  35.203 -        memcpy(pi->hw_cap, boot_cpu_data.x86_capability, NCAPINTS*4);
  35.204 -        ret = 0;
  35.205 -        if ( copy_to_guest(u_dom0_op, op, 1) )
  35.206 -            ret = -EFAULT;
  35.207 -    }
  35.208 -    break;
  35.209 -    
  35.210 -    case DOM0_GETPAGEFRAMEINFO:
  35.211 -    {
  35.212 -        struct page_info *page;
  35.213 -        unsigned long mfn = op->u.getpageframeinfo.gmfn;
  35.214 -        domid_t dom = op->u.getpageframeinfo.domain;
  35.215 -        struct domain *d;
  35.216 -
  35.217 -        ret = -EINVAL;
  35.218 -
  35.219 -        if ( unlikely(!mfn_valid(mfn)) ||
  35.220 -             unlikely((d = find_domain_by_id(dom)) == NULL) )
  35.221 -            break;
  35.222 -
  35.223 -        page = mfn_to_page(mfn);
  35.224 -
  35.225 -        if ( likely(get_page(page, d)) )
  35.226 -        {
  35.227 -            ret = 0;
  35.228 -
  35.229 -            op->u.getpageframeinfo.type = NOTAB;
  35.230 -
  35.231 -            if ( (page->u.inuse.type_info & PGT_count_mask) != 0 )
  35.232 -            {
  35.233 -                switch ( page->u.inuse.type_info & PGT_type_mask )
  35.234 -                {
  35.235 -                case PGT_l1_page_table:
  35.236 -                    op->u.getpageframeinfo.type = L1TAB;
  35.237 -                    break;
  35.238 -                case PGT_l2_page_table:
  35.239 -                    op->u.getpageframeinfo.type = L2TAB;
  35.240 -                    break;
  35.241 -                case PGT_l3_page_table:
  35.242 -                    op->u.getpageframeinfo.type = L3TAB;
  35.243 -                    break;
  35.244 -                case PGT_l4_page_table:
  35.245 -                    op->u.getpageframeinfo.type = L4TAB;
  35.246 -                    break;
  35.247 -                }
  35.248 -            }
  35.249 -            
  35.250 -            put_page(page);
  35.251 -        }
  35.252 -
  35.253 -        put_domain(d);
  35.254 -
  35.255 -        copy_to_guest(u_dom0_op, op, 1);
  35.256 -    }
  35.257 -    break;
  35.258 -
  35.259 -    case DOM0_GETPAGEFRAMEINFO2:
  35.260 -    {
  35.261 -#define GPF2_BATCH (PAGE_SIZE / sizeof(unsigned long)) 
  35.262 -        int n,j;
  35.263 -        int num = op->u.getpageframeinfo2.num;
  35.264 -        domid_t dom = op->u.getpageframeinfo2.domain;
  35.265 -        struct domain *d;
  35.266 -        unsigned long *l_arr;
  35.267 -        ret = -ESRCH;
  35.268 -
  35.269 -        if ( unlikely((d = find_domain_by_id(dom)) == NULL) )
  35.270 -            break;
  35.271 -
  35.272 -        if ( unlikely(num > 1024) )
  35.273 -        {
  35.274 -            ret = -E2BIG;
  35.275 -            put_domain(d);
  35.276 -            break;
  35.277 -        }
  35.278 -
  35.279 -        l_arr = alloc_xenheap_page();
  35.280 - 
  35.281 -        ret = 0;
  35.282 -        for( n = 0; n < num; )
  35.283 -        {
  35.284 -            int k = ((num-n)>GPF2_BATCH)?GPF2_BATCH:(num-n);
  35.285 -
  35.286 -            if ( copy_from_guest_offset(l_arr, op->u.getpageframeinfo2.array,
  35.287 -                                        n, k) )
  35.288 -            {
  35.289 -                ret = -EINVAL;
  35.290 -                break;
  35.291 -            }
  35.292 -     
  35.293 -            for( j = 0; j < k; j++ )
  35.294 -            {      
  35.295 -                struct page_info *page;
  35.296 -                unsigned long mfn = l_arr[j];
  35.297 -
  35.298 -                page = mfn_to_page(mfn);
  35.299 -
  35.300 -                if ( likely(mfn_valid(mfn) && get_page(page, d)) ) 
  35.301 -                {
  35.302 -                    unsigned long type = 0;
  35.303 -
  35.304 -                    switch( page->u.inuse.type_info & PGT_type_mask )
  35.305 -                    {
  35.306 -                    case PGT_l1_page_table:
  35.307 -                        type = L1TAB;
  35.308 -                        break;
  35.309 -                    case PGT_l2_page_table:
  35.310 -                        type = L2TAB;
  35.311 -                        break;
  35.312 -                    case PGT_l3_page_table:
  35.313 -                        type = L3TAB;
  35.314 -                        break;
  35.315 -                    case PGT_l4_page_table:
  35.316 -                        type = L4TAB;
  35.317 -                        break;
  35.318 -                    }
  35.319 -
  35.320 -                    if ( page->u.inuse.type_info & PGT_pinned )
  35.321 -                        type |= LPINTAB;
  35.322 -                    l_arr[j] |= type;
  35.323 -                    put_page(page);
  35.324 -                }
  35.325 -                else
  35.326 -                    l_arr[j] |= XTAB;
  35.327 -
  35.328 -            }
  35.329 -
  35.330 -            if ( copy_to_guest_offset(op->u.getpageframeinfo2.array,
  35.331 -                                      n, l_arr, k) )
  35.332 -            {
  35.333 -                ret = -EINVAL;
  35.334 -                break;
  35.335 -            }
  35.336 -
  35.337 -            n += k;
  35.338 -        }
  35.339 -
  35.340 -        free_xenheap_page(l_arr);
  35.341 -
  35.342 -        put_domain(d);
  35.343 -    }
  35.344 -    break;
  35.345 -
  35.346 -    case DOM0_GETMEMLIST:
  35.347 -    {
  35.348 -        int i;
  35.349 -        struct domain *d = find_domain_by_id(op->u.getmemlist.domain);
  35.350 -        unsigned long max_pfns = op->u.getmemlist.max_pfns;
  35.351 -        unsigned long mfn;
  35.352 -        struct list_head *list_ent;
  35.353 -
  35.354 -        ret = -EINVAL;
  35.355 -        if ( d != NULL )
  35.356 -        {
  35.357 -            ret = 0;
  35.358 -
  35.359 -            spin_lock(&d->page_alloc_lock);
  35.360 -            list_ent = d->page_list.next;
  35.361 -            for ( i = 0; (i < max_pfns) && (list_ent != &d->page_list); i++ )
  35.362 -            {
  35.363 -                mfn = page_to_mfn(list_entry(
  35.364 -                    list_ent, struct page_info, list));
  35.365 -                if ( copy_to_guest_offset(op->u.getmemlist.buffer,
  35.366 -                                          i, &mfn, 1) )
  35.367 -                {
  35.368 -                    ret = -EFAULT;
  35.369 -                    break;
  35.370 -                }
  35.371 -                list_ent = mfn_to_page(mfn)->list.next;
  35.372 -            }
  35.373 -            spin_unlock(&d->page_alloc_lock);
  35.374 -
  35.375 -            op->u.getmemlist.num_pfns = i;
  35.376 -            copy_to_guest(u_dom0_op, op, 1);
  35.377 -            
  35.378 -            put_domain(d);
  35.379 -        }
  35.380 -    }
  35.381 -    break;
  35.382 -
  35.383 -    case DOM0_PLATFORM_QUIRK:
  35.384 -    {
  35.385 -        extern int opt_noirqbalance;
  35.386 -        int quirk_id = op->u.platform_quirk.quirk_id;
  35.387 -        switch ( quirk_id )
  35.388 -        {
  35.389 -        case QUIRK_NOIRQBALANCING:
  35.390 -            printk("Platform quirk -- Disabling IRQ balancing/affinity.\n");
  35.391 -            opt_noirqbalance = 1;
  35.392 -            setup_ioapic_dest();
  35.393 -            break;
  35.394 -        case QUIRK_IOAPIC_BAD_REGSEL:
  35.395 -        case QUIRK_IOAPIC_GOOD_REGSEL:
  35.396 -#ifndef sis_apic_bug
  35.397 -            sis_apic_bug = (quirk_id == QUIRK_IOAPIC_BAD_REGSEL);
  35.398 -            DPRINTK("Domain 0 says that IO-APIC REGSEL is %s\n",
  35.399 -                    sis_apic_bug ? "bad" : "good");
  35.400 -#else
  35.401 -            BUG_ON(sis_apic_bug != (quirk_id == QUIRK_IOAPIC_BAD_REGSEL));
  35.402 -#endif
  35.403 -            break;
  35.404 -        default:
  35.405 -            ret = -EINVAL;
  35.406 -            break;
  35.407 -        }
  35.408 -    }
  35.409 -    break;
  35.410 -
  35.411 -    case DOM0_HYPERCALL_INIT:
  35.412 -    {
  35.413 -        struct domain *d = find_domain_by_id(op->u.hypercall_init.domain);
  35.414 -        unsigned long gmfn = op->u.hypercall_init.gmfn;
  35.415 -        unsigned long mfn;
  35.416 -        void *hypercall_page;
  35.417 -
  35.418 -        ret = -ESRCH;
  35.419 -        if ( unlikely(d == NULL) )
  35.420 -            break;
  35.421 -
  35.422 -        mfn = gmfn_to_mfn(d, gmfn);
  35.423 -
  35.424 -        ret = -EACCES;
  35.425 -        if ( !mfn_valid(mfn) ||
  35.426 -             !get_page_and_type(mfn_to_page(mfn), d, PGT_writable_page) )
  35.427 -        {
  35.428 -            put_domain(d);
  35.429 -            break;
  35.430 -        }
  35.431 -
  35.432 -        ret = 0;
  35.433 -
  35.434 -        hypercall_page = map_domain_page(mfn);
  35.435 -        hypercall_page_initialise(d, hypercall_page);
  35.436 -        unmap_domain_page(hypercall_page);
  35.437 -
  35.438 -        put_page_and_type(mfn_to_page(mfn));
  35.439 -
  35.440 -        put_domain(d);
  35.441 -    }
  35.442 -    break;
  35.443 -
  35.444 -    default:
  35.445 -        ret = -ENOSYS;
  35.446 -        break;
  35.447 -    }
  35.448 -
  35.449 -    return ret;
  35.450 -}
  35.451 -
  35.452 -void arch_getdomaininfo_ctxt(
  35.453 -    struct vcpu *v, struct vcpu_guest_context *c)
  35.454 -{
  35.455 -    memcpy(c, &v->arch.guest_context, sizeof(*c));
  35.456 -
  35.457 -    if ( hvm_guest(v) )
  35.458 -    {
  35.459 -        hvm_store_cpu_guest_regs(v, &c->user_regs, c->ctrlreg);
  35.460 -    }
  35.461 -    else
  35.462 -    {
  35.463 -        /* IOPL privileges are virtualised: merge back into returned eflags. */
  35.464 -        BUG_ON((c->user_regs.eflags & EF_IOPL) != 0);
  35.465 -        c->user_regs.eflags |= v->arch.iopl << 12;
  35.466 -    }
  35.467 -
  35.468 -    c->flags = 0;
  35.469 -    if ( test_bit(_VCPUF_fpu_initialised, &v->vcpu_flags) )
  35.470 -        c->flags |= VGCF_I387_VALID;
  35.471 -    if ( guest_kernel_mode(v, &v->arch.guest_context.user_regs) )
  35.472 -        c->flags |= VGCF_IN_KERNEL;
  35.473 -    if ( hvm_guest(v) )
  35.474 -        c->flags |= VGCF_HVM_GUEST;
  35.475 -
  35.476 -    c->ctrlreg[3] = xen_pfn_to_cr3(pagetable_get_pfn(v->arch.guest_table));
  35.477 -
  35.478 -    c->vm_assist = v->domain->vm_assist;
  35.479 -}
  35.480 -
  35.481 -/*
  35.482 - * Local variables:
  35.483 - * mode: C
  35.484 - * c-set-style: "BSD"
  35.485 - * c-basic-offset: 4
  35.486 - * tab-width: 4
  35.487 - * indent-tabs-mode: nil
  35.488 - * End:
  35.489 - */

    36.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    36.2 +++ b/xen/arch/x86/domctl.c	Fri Aug 25 18:39:10 2006 +0100
    36.3 @@ -0,0 +1,326 @@
    36.4 +/******************************************************************************
    36.5 + * Arch-specific domctl.c
    36.6 + * 
    36.7 + * Copyright (c) 2002-2006, K A Fraser
    36.8 + */
    36.9 +
   36.10 +#include <xen/config.h>
   36.11 +#include <xen/types.h>
   36.12 +#include <xen/lib.h>
   36.13 +#include <xen/mm.h>
   36.14 +#include <xen/guest_access.h>
   36.15 +#include <public/domctl.h>
   36.16 +#include <xen/sched.h>
   36.17 +#include <xen/event.h>
   36.18 +#include <xen/domain_page.h>
   36.19 +#include <asm/msr.h>
   36.20 +#include <xen/trace.h>
   36.21 +#include <xen/console.h>
   36.22 +#include <xen/iocap.h>
   36.23 +#include <asm/shadow.h>
   36.24 +#include <asm/irq.h>
   36.25 +#include <asm/hvm/hvm.h>
   36.26 +#include <asm/hvm/support.h>
   36.27 +#include <asm/processor.h>
   36.28 +
   36.29 +long arch_do_domctl(
   36.30 +    struct xen_domctl *domctl,
   36.31 +    XEN_GUEST_HANDLE(xen_domctl_t) u_domctl)
   36.32 +{
   36.33 +    long ret = 0;
   36.34 +
   36.35 +    switch ( domctl->cmd )
   36.36 +    {
   36.37 +
   36.38 +    case XEN_DOMCTL_shadow_op:
   36.39 +    {
   36.40 +        struct domain *d;
   36.41 +        ret = -ESRCH;
   36.42 +        d = find_domain_by_id(domctl->domain);
   36.43 +        if ( d != NULL )
   36.44 +        {
   36.45 +            ret = shadow2_domctl(d, &domctl->u.shadow_op, u_domctl);
   36.46 +            put_domain(d);
   36.47 +            copy_to_guest(u_domctl, domctl, 1);
   36.48 +        } 
   36.49 +    }
   36.50 +    break;
   36.51 +
   36.52 +    case XEN_DOMCTL_ioport_permission:
   36.53 +    {
   36.54 +        struct domain *d;
   36.55 +        unsigned int fp = domctl->u.ioport_permission.first_port;
   36.56 +        unsigned int np = domctl->u.ioport_permission.nr_ports;
   36.57 +
   36.58 +        ret = -EINVAL;
   36.59 +        if ( (fp + np) > 65536 )
   36.60 +            break;
   36.61 +
   36.62 +        ret = -ESRCH;
   36.63 +        if ( unlikely((d = find_domain_by_id(domctl->domain)) == NULL) )
   36.64 +            break;
   36.65 +
   36.66 +        if ( np == 0 )
   36.67 +            ret = 0;
   36.68 +        else if ( domctl->u.ioport_permission.allow_access )
   36.69 +            ret = ioports_permit_access(d, fp, fp + np - 1);
   36.70 +        else
   36.71 +            ret = ioports_deny_access(d, fp, fp + np - 1);
   36.72 +
   36.73 +        put_domain(d);
   36.74 +    }
   36.75 +    break;
   36.76 +
   36.77 +    case XEN_DOMCTL_getpageframeinfo:
   36.78 +    {
   36.79 +        struct page_info *page;
   36.80 +        unsigned long mfn = domctl->u.getpageframeinfo.gmfn;
   36.81 +        domid_t dom = domctl->domain;
   36.82 +        struct domain *d;
   36.83 +
   36.84 +        ret = -EINVAL;
   36.85 +
   36.86 +        if ( unlikely(!mfn_valid(mfn)) ||
   36.87 +             unlikely((d = find_domain_by_id(dom)) == NULL) )
   36.88 +            break;
   36.89 +
   36.90 +        page = mfn_to_page(mfn);
   36.91 +
   36.92 +        if ( likely(get_page(page, d)) )
   36.93 +        {
   36.94 +            ret = 0;
   36.95 +
   36.96 +            domctl->u.getpageframeinfo.type = XEN_DOMCTL_PFINFO_NOTAB;
   36.97 +
   36.98 +            if ( (page->u.inuse.type_info & PGT_count_mask) != 0 )
   36.99 +            {
  36.100 +                switch ( page->u.inuse.type_info & PGT_type_mask )
  36.101 +                {
  36.102 +                case PGT_l1_page_table:
  36.103 +                    domctl->u.getpageframeinfo.type = XEN_DOMCTL_PFINFO_L1TAB;
  36.104 +                    break;
  36.105 +                case PGT_l2_page_table:
  36.106 +                    domctl->u.getpageframeinfo.type = XEN_DOMCTL_PFINFO_L2TAB;
  36.107 +                    break;
  36.108 +                case PGT_l3_page_table:
  36.109 +                    domctl->u.getpageframeinfo.type = XEN_DOMCTL_PFINFO_L3TAB;
  36.110 +                    break;
  36.111 +                case PGT_l4_page_table:
  36.112 +                    domctl->u.getpageframeinfo.type = XEN_DOMCTL_PFINFO_L4TAB;
  36.113 +                    break;
  36.114 +                }
  36.115 +            }
  36.116 +            
  36.117 +            put_page(page);
  36.118 +        }
  36.119 +
  36.120 +        put_domain(d);
  36.121 +
  36.122 +        copy_to_guest(u_domctl, domctl, 1);
  36.123 +    }
  36.124 +    break;
  36.125 +
  36.126 +    case XEN_DOMCTL_getpageframeinfo2:
  36.127 +    {
  36.128 +#define GPF2_BATCH (PAGE_SIZE / sizeof(long))
  36.129 +        int n,j;
  36.130 +        int num = domctl->u.getpageframeinfo2.num;
  36.131 +        domid_t dom = domctl->domain;
  36.132 +        struct domain *d;
  36.133 +        unsigned long *l_arr;
  36.134 +        ret = -ESRCH;
  36.135 +
  36.136 +        if ( unlikely((d = find_domain_by_id(dom)) == NULL) )
  36.137 +            break;
  36.138 +
  36.139 +        if ( unlikely(num > 1024) )
  36.140 +        {
  36.141 +            ret = -E2BIG;
  36.142 +            put_domain(d);
  36.143 +            break;
  36.144 +        }
  36.145 +
  36.146 +        l_arr = alloc_xenheap_page();
  36.147 + 
  36.148 +        ret = 0;
  36.149 +        for ( n = 0; n < num; )
  36.150 +        {
  36.151 +            int k = ((num-n)>GPF2_BATCH)?GPF2_BATCH:(num-n);
  36.152 +
  36.153 +            if ( copy_from_guest_offset(l_arr,
  36.154 +                                        domctl->u.getpageframeinfo2.array,
  36.155 +                                        n, k) )
  36.156 +            {
  36.157 +                ret = -EINVAL;
  36.158 +                break;
  36.159 +            }
  36.160 +     
  36.161 +            for ( j = 0; j < k; j++ )
  36.162 +            {      
  36.163 +                struct page_info *page;
  36.164 +                unsigned long mfn = l_arr[j];
  36.165 +
  36.166 +                page = mfn_to_page(mfn);
  36.167 +
  36.168 +                if ( likely(mfn_valid(mfn) && get_page(page, d)) ) 
  36.169 +                {
  36.170 +                    unsigned long type = 0;
  36.171 +
  36.172 +                    switch( page->u.inuse.type_info & PGT_type_mask )
  36.173 +                    {
  36.174 +                    case PGT_l1_page_table:
  36.175 +                        type = XEN_DOMCTL_PFINFO_L1TAB;
  36.176 +                        break;
  36.177 +                    case PGT_l2_page_table:
  36.178 +                        type = XEN_DOMCTL_PFINFO_L2TAB;
  36.179 +                        break;
  36.180 +                    case PGT_l3_page_table:
  36.181 +                        type = XEN_DOMCTL_PFINFO_L3TAB;
  36.182 +                        break;
  36.183 +                    case PGT_l4_page_table:
  36.184 +                        type = XEN_DOMCTL_PFINFO_L4TAB;
  36.185 +                        break;
  36.186 +                    }
  36.187 +
  36.188 +                    if ( page->u.inuse.type_info & PGT_pinned )
  36.189 +                        type |= XEN_DOMCTL_PFINFO_LPINTAB;
  36.190 +                    l_arr[j] |= type;
  36.191 +                    put_page(page);
  36.192 +                }
  36.193 +                else
  36.194 +                    l_arr[j] |= XEN_DOMCTL_PFINFO_XTAB;
  36.195 +
  36.196 +            }
  36.197 +
  36.198 +            if ( copy_to_guest_offset(domctl->u.getpageframeinfo2.array,
  36.199 +                                      n, l_arr, k) )
  36.200 +            {
  36.201 +                ret = -EINVAL;
  36.202 +                break;
  36.203 +            }
  36.204 +
  36.205 +            n += k;
  36.206 +        }
  36.207 +
  36.208 +        free_xenheap_page(l_arr);
  36.209 +
  36.210 +        put_domain(d);
  36.211 +    }
  36.212 +    break;
  36.213 +
  36.214 +    case XEN_DOMCTL_getmemlist:
  36.215 +    {
  36.216 +        int i;
  36.217 +        struct domain *d = find_domain_by_id(domctl->domain);
  36.218 +        unsigned long max_pfns = domctl->u.getmemlist.max_pfns;
  36.219 +        unsigned long mfn;
  36.220 +        struct list_head *list_ent;
  36.221 +
  36.222 +        ret = -EINVAL;
  36.223 +        if ( d != NULL )
  36.224 +        {
  36.225 +            ret = 0;
  36.226 +
  36.227 +            spin_lock(&d->page_alloc_lock);
  36.228 +            list_ent = d->page_list.next;
  36.229 +            for ( i = 0; (i < max_pfns) && (list_ent != &d->page_list); i++ )
  36.230 +            {
  36.231 +                mfn = page_to_mfn(list_entry(
  36.232 +                    list_ent, struct page_info, list));
  36.233 +                if ( copy_to_guest_offset(domctl->u.getmemlist.buffer,
  36.234 +                                          i, &mfn, 1) )
  36.235 +                {
  36.236 +                    ret = -EFAULT;
  36.237 +                    break;
  36.238 +                }
  36.239 +                list_ent = mfn_to_page(mfn)->list.next;
  36.240 +            }
  36.241 +            spin_unlock(&d->page_alloc_lock);
  36.242 +
  36.243 +            domctl->u.getmemlist.num_pfns = i;
  36.244 +            copy_to_guest(u_domctl, domctl, 1);
  36.245 +
  36.246 +            put_domain(d);
  36.247 +        }
  36.248 +    }
  36.249 +    break;
  36.250 +
  36.251 +    case XEN_DOMCTL_hypercall_init:
  36.252 +    {
  36.253 +        struct domain *d = find_domain_by_id(domctl->domain);
  36.254 +        unsigned long gmfn = domctl->u.hypercall_init.gmfn;
  36.255 +        unsigned long mfn;
  36.256 +        void *hypercall_page;
  36.257 +
  36.258 +        ret = -ESRCH;
  36.259 +        if ( unlikely(d == NULL) )
  36.260 +            break;
  36.261 +
  36.262 +        mfn = gmfn_to_mfn(d, gmfn);
  36.263 +
  36.264 +        ret = -EACCES;
  36.265 +        if ( !mfn_valid(mfn) ||
  36.266 +             !get_page_and_type(mfn_to_page(mfn), d, PGT_writable_page) )
  36.267 +        {
  36.268 +            put_domain(d);
  36.269 +            break;
  36.270 +        }
  36.271 +
  36.272 +        ret = 0;
  36.273 +
  36.274 +        hypercall_page = map_domain_page(mfn);
  36.275 +        hypercall_page_initialise(d, hypercall_page);
  36.276 +        unmap_domain_page(hypercall_page);
  36.277 +
  36.278 +        put_page_and_type(mfn_to_page(mfn));
  36.279 +
  36.280 +        put_domain(d);
  36.281 +    }
  36.282 +    break;
  36.283 +
  36.284 +    default:
  36.285 +        ret = -ENOSYS;
  36.286 +        break;
  36.287 +    }
  36.288 +
  36.289 +    return ret;
  36.290 +}
  36.291 +
  36.292 +void arch_getdomaininfo_ctxt(
  36.293 +    struct vcpu *v, struct vcpu_guest_context *c)
  36.294 +{
  36.295 +    memcpy(c, &v->arch.guest_context, sizeof(*c));
  36.296 +
  36.297 +    if ( hvm_guest(v) )
  36.298 +    {
  36.299 +        hvm_store_cpu_guest_regs(v, &c->user_regs, c->ctrlreg);
  36.300 +    }
  36.301 +    else
  36.302 +    {
  36.303 +        /* IOPL privileges are virtualised: merge back into returned eflags. */
  36.304 +        BUG_ON((c->user_regs.eflags & EF_IOPL) != 0);
  36.305 +        c->user_regs.eflags |= v->arch.iopl << 12;
  36.306 +    }
  36.307 +
  36.308 +    c->flags = 0;
  36.309 +    if ( test_bit(_VCPUF_fpu_initialised, &v->vcpu_flags) )
  36.310 +        c->flags |= VGCF_I387_VALID;
  36.311 +    if ( guest_kernel_mode(v, &v->arch.guest_context.user_regs) )
  36.312 +        c->flags |= VGCF_IN_KERNEL;
  36.313 +    if ( hvm_guest(v) )
  36.314 +        c->flags |= VGCF_HVM_GUEST;
  36.315 +
  36.316 +    c->ctrlreg[3] = xen_pfn_to_cr3(pagetable_get_pfn(v->arch.guest_table));
  36.317 +
  36.318 +    c->vm_assist = v->domain->vm_assist;
  36.319 +}
  36.320 +
  36.321 +/*
  36.322 + * Local variables:
  36.323 + * mode: C
  36.324 + * c-set-style: "BSD"
  36.325 + * c-basic-offset: 4
  36.326 + * tab-width: 4
  36.327 + * indent-tabs-mode: nil
  36.328 + * End:
  36.329 + */