aboutsummaryrefslogtreecommitdiff
path: root/sys/x86/xen/pv.c
diff options
context:
space:
mode:
Diffstat (limited to 'sys/x86/xen/pv.c')
-rw-r--r--sys/x86/xen/pv.c17
1 files changed, 2 insertions, 15 deletions
diff --git a/sys/x86/xen/pv.c b/sys/x86/xen/pv.c
index e33fa41c83d7..0e6492b124b8 100644
--- a/sys/x86/xen/pv.c
+++ b/sys/x86/xen/pv.c
@@ -147,12 +147,9 @@ isxen(void)
}
#define CRASH(...) do { \
- if (isxen()) { \
+ if (isxen()) \
xc_printf(__VA_ARGS__); \
- HYPERVISOR_shutdown(SHUTDOWN_crash); \
- } else { \
- halt(); \
- } \
+ halt(); \
} while (0)
uint64_t
@@ -162,16 +159,6 @@ hammer_time_xen(vm_paddr_t start_info_paddr)
uint64_t physfree;
char *kenv;
- if (isxen()) {
- vm_guest = VM_GUEST_XEN;
- xen_early_init();
- if (xen_cpuid_base == 0) {
- xc_printf(
- "ERROR: failed to initialize hypercall page\n");
- HYPERVISOR_shutdown(SHUTDOWN_crash);
- }
- }
-
start_info = (struct hvm_start_info *)(start_info_paddr + KERNBASE);
if (start_info->magic != XEN_HVM_START_MAGIC_VALUE) {
CRASH("Unknown magic value in start_info struct: %#x\n",