diff options
| author | kaf24@scramble.cl.cam.ac.uk <kaf24@scramble.cl.cam.ac.uk> | 2004-06-18 14:46:29 +0000 |
|---|---|---|
| committer | kaf24@scramble.cl.cam.ac.uk <kaf24@scramble.cl.cam.ac.uk> | 2004-06-18 14:46:29 +0000 |
| commit | 60b6be9ccdd46b8cbddf1d96a89b4e6239248ee9 (patch) | |
| tree | b477b901498e1f22504ea55339680079600767d6 /extras | |
| parent | 82eefd80489f629cde550047982bece346aca22e (diff) | |
| download | xen-60b6be9ccdd46b8cbddf1d96a89b4e6239248ee9.tar.gz xen-60b6be9ccdd46b8cbddf1d96a89b4e6239248ee9.tar.bz2 xen-60b6be9ccdd46b8cbddf1d96a89b4e6239248ee9.zip | |
bitkeeper revision 1.982 (40d300456_XUbFFOMxRh4MjyB7AfJA)
Hacked the scheduler interfaces in Xen.
We now have synchronous pause.
Suspend/death VIRQs have gone away; replace by dom-controller msgs.
Xen no longer knows about PS/2 keyboard/mouse; DOM0 can go straight
at them.
Diffstat (limited to 'extras')
| -rw-r--r-- | extras/mini-os/h/hypervisor.h | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/extras/mini-os/h/hypervisor.h b/extras/mini-os/h/hypervisor.h index 52bc13a947..b77e1fa170 100644 --- a/extras/mini-os/h/hypervisor.h +++ b/extras/mini-os/h/hypervisor.h @@ -148,7 +148,7 @@ static inline int HYPERVISOR_shutdown(void) __asm__ __volatile__ ( TRAP_INSTR : "=a" (ret) : "0" (__HYPERVISOR_sched_op), - "b" (SCHEDOP_stop | (STOPCODE_shutdown << SCHEDOP_reasonshift)) + "b" (SCHEDOP_suspend | (STOPCODE_shutdown << SCHEDOP_reasonshift)) : "memory" ); return ret; @@ -160,7 +160,7 @@ static inline int HYPERVISOR_reboot(void) __asm__ __volatile__ ( TRAP_INSTR : "=a" (ret) : "0" (__HYPERVISOR_sched_op), - "b" (SCHEDOP_stop | (STOPCODE_reboot << SCHEDOP_reasonshift)) + "b" (SCHEDOP_suspend | (STOPCODE_reboot << SCHEDOP_reasonshift)) : "memory" ); return ret; @@ -173,7 +173,7 @@ static inline int HYPERVISOR_suspend(unsigned long srec) __asm__ __volatile__ ( TRAP_INSTR : "=a" (ret) : "0" (__HYPERVISOR_sched_op), - "b" (SCHEDOP_stop | (STOPCODE_suspend << SCHEDOP_reasonshift)), + "b" (SCHEDOP_suspend | (STOPCODE_suspend << SCHEDOP_reasonshift)), "S" (srec) : "memory" ); return ret; @@ -268,17 +268,6 @@ static __inline__ int HYPERVISOR_multicall(void *call_list, int nr_calls) return ret; } -static __inline__ long HYPERVISOR_kbd_op(unsigned char op, unsigned char val) -{ - int ret; - __asm__ __volatile__ ( - TRAP_INSTR - : "=a" (ret) : "0" (__HYPERVISOR_kbd_op), - "b" (op), "c" (val) : "memory" ); - - return ret; -} - static __inline__ int HYPERVISOR_update_va_mapping( unsigned long page_nr, unsigned long new_val, unsigned long flags) { |