vmd(8): remove some i386 remnants that missed the original cleanup

ok pd, kn, deraadt

2 files changed, 2 insertions, 47 deletions

diff --git a/usr.sbin/vmd/loadfile_elf.c b/usr.sbin/vmd/loadfile_elf.c
index 72d294f5606..dd6b2f7f578 100644
--- a/usr.sbin/vmd/loadfile_elf.c
+++ b/usr.sbin/vmd/loadfile_elf.c
@@ -1,5 +1,5 @@
 /* $NetBSD: loadfile.c,v 1.10 2000/12/03 02:53:04 tsutsui Exp $ */
-/* $OpenBSD: loadfile_elf.c,v 1.33 2018/12/12 21:20:57 claudio Exp $ */
+/* $OpenBSD: loadfile_elf.c,v 1.34 2019/03/01 07:32:29 mlarkin Exp $ */
 
 /*-
  * Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -111,14 +111,8 @@ union {
 	Elf64_Ehdr elf64;
 } hdr;
 
-#ifdef __i386__
-typedef uint32_t pt_entry_t;
-static void setsegment(struct segment_descriptor *, uint32_t,
-    size_t, int, int, int, int);
-#else
 static void setsegment(struct mem_segment_descriptor *, uint32_t,
     size_t, int, int, int, int);
-#endif
 static int elf32_exec(FILE *, Elf32_Ehdr *, u_long *, int);
 static int elf64_exec(FILE *, Elf64_Ehdr *, u_long *, int);
 static size_t create_bios_memmap(struct vm_create_params *, bios_memmap_t *);
@@ -152,15 +146,9 @@ extern int vm_id;
  *  def32: default 16/32 bit size of the segment
  *  gran: granularity of the segment (byte/page)
  */
-#ifdef __i386__
-static void
-setsegment(struct segment_descriptor *sd, uint32_t base, size_t limit,
-    int type, int dpl, int def32, int gran)
-#else
 static void
 setsegment(struct mem_segment_descriptor *sd, uint32_t base, size_t limit,
     int type, int dpl, int def32, int gran)
-#endif
 {
 	sd->sd_lolimit = (int)limit;
 	sd->sd_lobase = (int)base;
@@ -168,12 +156,8 @@ setsegment(struct mem_segment_descriptor *sd, uint32_t base, size_t limit,
 	sd->sd_dpl = dpl;
 	sd->sd_p = 1;
 	sd->sd_hilimit = (int)limit >> 16;
-#ifdef __i386__
-	sd->sd_xx = 0;
-#else
 	sd->sd_avl = 0;
 	sd->sd_long = 0;
-#endif
 	sd->sd_def32 = def32;
 	sd->sd_gran = gran;
 	sd->sd_hibase = (int)base >> 24;
@@ -191,19 +175,11 @@ static void
 push_gdt(void)
 {
 	uint8_t gdtpage[PAGE_SIZE];
-#ifdef __i386__
-	struct segment_descriptor *sd;
-#else
 	struct mem_segment_descriptor *sd;
-#endif
 
 	memset(&gdtpage, 0, sizeof(gdtpage));
 
-#ifdef __i386__
-	sd = (struct segment_descriptor *)&gdtpage;
-#else
 	sd = (struct mem_segment_descriptor *)&gdtpage;
-#endif
 
 	/*
 	 * Create three segment descriptors:
@@ -333,13 +309,8 @@ loadfile_elf(FILE *fp, struct vm_create_params *vcp,
 	bootargsz = push_bootargs(memmap, n, bootmac);
 	stacksize = push_stack(bootargsz, marks[MARK_END], bootdev, howto);
 
-#ifdef __i386__
-	vrs->vrs_gprs[VCPU_REGS_EIP] = (uint32_t)marks[MARK_ENTRY];
-	vrs->vrs_gprs[VCPU_REGS_ESP] = (uint32_t)(STACK_PAGE + PAGE_SIZE) - stacksize;
-#else
 	vrs->vrs_gprs[VCPU_REGS_RIP] = (uint64_t)marks[MARK_ENTRY];
 	vrs->vrs_gprs[VCPU_REGS_RSP] = (uint64_t)(STACK_PAGE + PAGE_SIZE) - stacksize;
-#endif
 	vrs->vrs_gdtr.vsi_base = GDT_PAGE;
 
 	log_debug("%s: loaded ELF kernel", __func__);
diff --git a/usr.sbin/vmd/vm.c b/usr.sbin/vmd/vm.c
index 223ad283854..c865137dbe9 100644
--- a/usr.sbin/vmd/vm.c
+++ b/usr.sbin/vmd/vm.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vm.c,v 1.44 2019/02/20 07:00:25 mlarkin Exp $	*/
+/*	$OpenBSD: vm.c,v 1.45 2019/03/01 07:32:29 mlarkin Exp $	*/
 
 /*
  * Copyright (c) 2015 Mike Larkin <mlarkin@openbsd.org>
@@ -127,15 +127,9 @@ uint8_t vcpu_done[VMM_MAX_VCPUS_PER_VM];
  *        features of the CPU in use.
  */
 static const struct vcpu_reg_state vcpu_init_flat64 = {
-#ifdef __i386__
-	.vrs_gprs[VCPU_REGS_EFLAGS] = 0x2,
-	.vrs_gprs[VCPU_REGS_EIP] = 0x0,
-	.vrs_gprs[VCPU_REGS_ESP] = 0x0,
-#else
 	.vrs_gprs[VCPU_REGS_RFLAGS] = 0x2,
 	.vrs_gprs[VCPU_REGS_RIP] = 0x0,
 	.vrs_gprs[VCPU_REGS_RSP] = 0x0,
-#endif
 	.vrs_crs[VCPU_REGS_CR0] = CR0_CD | CR0_NW | CR0_ET | CR0_PE | CR0_PG,
 	.vrs_crs[VCPU_REGS_CR3] = PML4_PAGE,
 	.vrs_crs[VCPU_REGS_CR4] = CR4_PAE | CR4_PSE,
@@ -160,7 +154,6 @@ static const struct vcpu_reg_state vcpu_init_flat64 = {
 	.vrs_drs[VCPU_REGS_DR3] = 0x0,
 	.vrs_drs[VCPU_REGS_DR6] = 0xFFFF0FF0,
 	.vrs_drs[VCPU_REGS_DR7] = 0x400,
-#ifndef __i386__
 	.vrs_msrs[VCPU_REGS_STAR] = 0ULL,
 	.vrs_msrs[VCPU_REGS_LSTAR] = 0ULL,
 	.vrs_msrs[VCPU_REGS_CSTAR] = 0ULL,
@@ -168,7 +161,6 @@ static const struct vcpu_reg_state vcpu_init_flat64 = {
 	.vrs_msrs[VCPU_REGS_KGSBASE] = 0ULL,
 	.vrs_msrs[VCPU_REGS_MISC_ENABLE] = 0ULL,
 	.vrs_crs[VCPU_REGS_XCR0] = XCR0_X87
-#endif
 };
 
 /*
@@ -176,15 +168,9 @@ static const struct vcpu_reg_state vcpu_init_flat64 = {
  * as a flat 16 bit address space.
  */
 static const struct vcpu_reg_state vcpu_init_flat16 = {
-#ifdef __i386__
-	.vrs_gprs[VCPU_REGS_EFLAGS] = 0x2,
-	.vrs_gprs[VCPU_REGS_EIP] = 0xFFF0,
-	.vrs_gprs[VCPU_REGS_ESP] = 0x0,
-#else
 	.vrs_gprs[VCPU_REGS_RFLAGS] = 0x2,
 	.vrs_gprs[VCPU_REGS_RIP] = 0xFFF0,
 	.vrs_gprs[VCPU_REGS_RSP] = 0x0,
-#endif
 	.vrs_crs[VCPU_REGS_CR0] = 0x60000010,
 	.vrs_crs[VCPU_REGS_CR3] = 0,
 	.vrs_sregs[VCPU_REGS_CS] = { 0xF000, 0xFFFF, 0x809F, 0xF0000},
@@ -204,14 +190,12 @@ static const struct vcpu_reg_state vcpu_init_flat16 = {
 	.vrs_drs[VCPU_REGS_DR3] = 0x0,
 	.vrs_drs[VCPU_REGS_DR6] = 0xFFFF0FF0,
 	.vrs_drs[VCPU_REGS_DR7] = 0x400,
-#ifndef __i386__
 	.vrs_msrs[VCPU_REGS_STAR] = 0ULL,
 	.vrs_msrs[VCPU_REGS_LSTAR] = 0ULL,
 	.vrs_msrs[VCPU_REGS_CSTAR] = 0ULL,
 	.vrs_msrs[VCPU_REGS_SFMASK] = 0ULL,
 	.vrs_msrs[VCPU_REGS_KGSBASE] = 0ULL,
 	.vrs_crs[VCPU_REGS_XCR0] = XCR0_X87
-#endif
 };
 
 /*