diff options
Diffstat (limited to 'sys/arch')
| -rw-r--r-- | sys/arch/sparc64/include/hypervisor.h | 18 | ||||
| -rw-r--r-- | sys/arch/sparc64/sparc64/hvcall.S | 19 |
2 files changed, 21 insertions, 16 deletions
diff --git a/sys/arch/sparc64/include/hypervisor.h b/sys/arch/sparc64/include/hypervisor.h index 4172f1ecce4..a7b42ad0287 100644 --- a/sys/arch/sparc64/include/hypervisor.h +++ b/sys/arch/sparc64/include/hypervisor.h @@ -1,4 +1,4 @@ -/* $OpenBSD: hypervisor.h,v 1.3 2008/08/10 13:55:19 kettenis Exp $ */ +/* $OpenBSD: hypervisor.h,v 1.4 2008/12/30 00:51:26 kettenis Exp $ */ /* * Copyright (c) 2008 Mark Kettenis @@ -31,12 +31,6 @@ int64_t hv_api_get_version(uint64_t api_group, * Domain services */ -int64_t hv_mach_set_soft_state(uint64_t software_state, - paddr_t software_description_ptr); - -#define SIS_NORMAL 0x1 -#define SIS_TRANSITION 0x2 - /* * CPU services */ @@ -122,6 +116,16 @@ int64_t hv_cons_putchar(int64_t ch); int64_t hv_api_putchar(int64_t ch); /* + * Domain state services + */ + +int64_t hv_soft_state_set(uint64_t software_state, + paddr_t software_description_ptr); + +#define SIS_NORMAL 0x1 +#define SIS_TRANSITION 0x2 + +/* * PCI I/O services */ diff --git a/sys/arch/sparc64/sparc64/hvcall.S b/sys/arch/sparc64/sparc64/hvcall.S index 07f43bf5969..34c8fb3a72d 100644 --- a/sys/arch/sparc64/sparc64/hvcall.S +++ b/sys/arch/sparc64/sparc64/hvcall.S @@ -1,4 +1,4 @@ -/* $OpenBSD: hvcall.S,v 1.3 2008/08/10 13:55:19 kettenis Exp $ */ +/* $OpenBSD: hvcall.S,v 1.4 2008/12/30 00:51:26 kettenis Exp $ */ /* * Copyright (c) 2008 Mark Kettenis @@ -27,8 +27,6 @@ #define MACH_EXIT 0x00 #define MACH_DESC 0x01 #define MACH_SIR 0x02 -#define MACH_SET_SOFT_STATE 0x03 -#define MACH_GET_SOFT_STATE 0x04 #define MACH_SET_WATCHDOG 0x05 #define CPU_START 0x10 @@ -65,6 +63,9 @@ #define CONS_GETCHAR 0x60 #define CONS_PUTCHAR 0x61 +#define SOFT_STATE_SET 0x70 +#define SOFT_STATE_GET 0x71 + #define INTR_DEVINO2SYSINO 0xa0 #define INTR_GETENABLED 0xa1 #define INTR_SETENABLED 0xa2 @@ -107,12 +108,6 @@ ENTRY(hv_api_get_version) retl stx %o2, [%o4] -ENTRY(hv_mach_set_soft_state) - mov MACH_SET_SOFT_STATE, %o5 - ta FAST_TRAP - retl - nop - ENTRY(hv_cpu_yield) mov CPU_YIELD, %o5 ta FAST_TRAP @@ -246,6 +241,12 @@ ENTRY(hv_cons_putchar) retl nop +ENTRY(hv_soft_state_set) + mov SOFT_STATE_SET, %o5 + ta FAST_TRAP + retl + nop + ENTRY(hv_intr_devino_to_sysino) mov INTR_DEVINO2SYSINO, %o5 ta FAST_TRAP |