bhyvectl: Prepare to add arm64 support

Move MD code into a separate directory and add a simple interface which
lets the MD bits register options and handle them.

No functional change intended.

Reviewed by:	jhb
Sponsored by:	Innovate UK
Differential Revision:	https://reviews.freebsd.org/D44932

5 files changed, 1978 insertions, 1811 deletions

diff --git a/usr.sbin/bhyvectl/Makefile b/usr.sbin/bhyvectl/Makefile
index 4f15bc35adf8..e5c6ad18d286 100644
--- a/usr.sbin/bhyvectl/Makefile
+++ b/usr.sbin/bhyvectl/Makefile
@@ -1,17 +1,18 @@
-#
-#
-
 .include <src.opts.mk>
 
+.PATH: ${.CURDIR}/${MACHINE_CPUARCH}
+
 PROG=	bhyvectl
 SRCS=	bhyvectl.c
 PACKAGE=	bhyve
 
+.include "${MACHINE_CPUARCH}/Makefile.inc"
+
 MAN=	bhyvectl.8
 
 LIBADD=	vmmapi util
 
-CFLAGS+= -I${SRCTOP}/sys/amd64/vmm
+CFLAGS+= -I${.CURDIR} -I${SRCTOP}/sys/amd64/vmm
 
 .if ${MK_BHYVE_SNAPSHOT} != "no"
 LIBADD+= nv
diff --git a/usr.sbin/bhyvectl/amd64/Makefile.inc b/usr.sbin/bhyvectl/amd64/Makefile.inc
new file mode 100644
index 000000000000..047e8d6c70bc
--- /dev/null
+++ b/usr.sbin/bhyvectl/amd64/Makefile.inc
@@ -0,0 +1 @@
+SRCS+=	bhyvectl_machdep.c
diff --git a/usr.sbin/bhyvectl/amd64/bhyvectl_machdep.c b/usr.sbin/bhyvectl/amd64/bhyvectl_machdep.c
new file mode 100644
index 000000000000..d7dc002d413e
--- /dev/null
+++ b/usr.sbin/bhyvectl/amd64/bhyvectl_machdep.c
@@ -0,0 +1,1888 @@
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
+ * Copyright (c) 2011 NetApp, Inc.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY NETAPP, INC ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL NETAPP, INC OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include <sys/types.h>
+#include <sys/mman.h>
+
+#include <machine/cpufunc.h>
+#include <machine/specialreg.h>
+
+#include <err.h>
+#include <fcntl.h>
+#include <getopt.h>
+#include <stdbool.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <time.h>
+#include <unistd.h>
+
+#include <vmmapi.h>
+#include "amd/vmcb.h"
+#include "intel/vmcs.h"
+
+#include "bhyvectl.h"
+
+enum {
+	SET_EFER = OPT_START_MD,
+	SET_CR0,
+	SET_CR2,
+	SET_CR3,
+	SET_CR4,
+	SET_DR0,
+	SET_DR1,
+	SET_DR2,
+	SET_DR3,
+	SET_DR6,
+	SET_DR7,
+	SET_RSP,
+	SET_RIP,
+	SET_RAX,
+	SET_RFLAGS,
+	DESC_BASE,
+	DESC_LIMIT,
+	DESC_ACCESS,
+	SET_CS,
+	SET_DS,
+	SET_ES,
+	SET_FS,
+	SET_GS,
+	SET_SS,
+	SET_TR,
+	SET_LDTR,
+	SET_X2APIC_STATE,
+	UNASSIGN_PPTDEV,
+	GET_GPA_PMAP,
+	ASSERT_LAPIC_LVT,
+	SET_RTC_TIME,
+	SET_RTC_NVRAM,
+	RTC_NVRAM_OFFSET,
+};
+
+static int get_rtc_time, set_rtc_time;
+static int get_rtc_nvram, set_rtc_nvram;
+static int rtc_nvram_offset;
+static uint8_t rtc_nvram_value;
+static time_t rtc_secs;
+static int get_gpa_pmap;
+static vm_paddr_t gpa_pmap;
+static int inject_nmi, assert_lapic_lvt = -1;
+static int get_intinfo;
+static int set_cr0, get_cr0, set_cr2, get_cr2, set_cr3, get_cr3;
+static int set_cr4, get_cr4;
+static uint64_t set_cr0_val, set_cr2_val, set_cr3_val, set_cr4_val;
+static int set_efer, get_efer;
+static uint64_t set_efer_val;
+static int set_dr0, get_dr0;
+static int set_dr1, get_dr1;
+static int set_dr2, get_dr2;
+static int set_dr3, get_dr3;
+static int set_dr6, get_dr6;
+static int set_dr7, get_dr7;
+static uint64_t set_dr0_val, set_dr1_val, set_dr2_val, set_dr3_val, set_dr6_val;
+static uint64_t set_dr7_val;
+static int set_rsp, get_rsp, set_rip, get_rip, set_rflags, get_rflags;
+static int set_rax, get_rax;
+static uint64_t set_rsp_val, set_rip_val, set_rflags_val, set_rax_val;
+static int get_rbx, get_rcx, get_rdx, get_rsi, get_rdi, get_rbp;
+static int get_r8, get_r9, get_r10, get_r11, get_r12, get_r13, get_r14, get_r15;
+static int set_desc_ds, get_desc_ds;
+static int set_desc_es, get_desc_es;
+static int set_desc_fs, get_desc_fs;
+static int set_desc_gs, get_desc_gs;
+static int set_desc_cs, get_desc_cs;
+static int set_desc_ss, get_desc_ss;
+static int set_desc_gdtr, get_desc_gdtr;
+static int set_desc_idtr, get_desc_idtr;
+static int set_desc_tr, get_desc_tr;
+static int set_desc_ldtr, get_desc_ldtr;
+static int set_cs, set_ds, set_es, set_fs, set_gs, set_ss, set_tr, set_ldtr;
+static int get_cs, get_ds, get_es, get_fs, get_gs, get_ss, get_tr, get_ldtr;
+static uint64_t set_cs_val, set_ds_val, set_es_val, set_fs_val, set_gs_val;
+static uint64_t set_ss_val, set_tr_val, set_ldtr_val;
+static int set_x2apic_state, get_x2apic_state;
+static enum x2apic_state x2apic_state;
+static int unassign_pptdev, bus, slot, func;
+
+static uint64_t desc_base;
+static uint32_t desc_limit, desc_access;
+
+/*
+ * VMCB specific.
+ */
+static int get_vmcb_intercept, get_vmcb_exit_details, get_vmcb_tlb_ctrl;
+static int get_vmcb_virq, get_avic_table;
+
+/*
+ * VMCS-specific fields
+ */
+static int get_pinbased_ctls, get_procbased_ctls, get_procbased_ctls2;
+static int get_eptp, get_io_bitmap, get_tsc_offset;
+static int get_vmcs_entry_interruption_info;
+static int get_vmcs_interruptibility;
+static int get_vmcs_gpa, get_vmcs_gla;
+static int get_exception_bitmap;
+static int get_cr0_mask, get_cr0_shadow;
+static int get_cr4_mask, get_cr4_shadow;
+static int get_cr3_targets;
+static int get_apic_access_addr, get_virtual_apic_addr, get_tpr_threshold;
+static int get_msr_bitmap, get_msr_bitmap_address;
+static int get_vpid_asid;
+static int get_inst_err, get_exit_ctls, get_entry_ctls;
+static int get_host_cr0, get_host_cr3, get_host_cr4;
+static int get_host_rip, get_host_rsp;
+static int get_guest_pat, get_host_pat;
+static int get_guest_sysenter, get_vmcs_link;
+static int get_exit_reason, get_vmcs_exit_qualification;
+static int get_vmcs_exit_interruption_info, get_vmcs_exit_interruption_error;
+static int get_vmcs_exit_inst_length;
+
+static bool
+cpu_vendor_intel(void)
+{
+	u_int regs[4], v[3];
+
+	do_cpuid(0, regs);
+	v[0] = regs[1];
+	v[1] = regs[3];
+	v[2] = regs[2];
+
+	if (memcmp(v, "GenuineIntel", sizeof(v)) == 0)
+		return (true);
+	if (memcmp(v, "AuthenticAMD", sizeof(v)) == 0 ||
+	    memcmp(v, "HygonGenuine", sizeof(v)) == 0)
+		return (false);
+	fprintf(stderr, "Unknown cpu vendor \"%s\"\n", (const char *)v);
+	exit(1);
+}
+
+void
+bhyvectl_dump_vm_run_exitcode(struct vm_exit *vmexit, int vcpu)
+{
+	printf("vm exit[%d]\n", vcpu);
+	printf("\trip\t\t0x%016lx\n", vmexit->rip);
+	printf("\tinst_length\t%d\n", vmexit->inst_length);
+	switch (vmexit->exitcode) {
+	case VM_EXITCODE_INOUT:
+		printf("\treason\t\tINOUT\n");
+		printf("\tdirection\t%s\n", vmexit->u.inout.in ? "IN" : "OUT");
+		printf("\tbytes\t\t%d\n", vmexit->u.inout.bytes);
+		printf("\tflags\t\t%s%s\n",
+			vmexit->u.inout.string ? "STRING " : "",
+			vmexit->u.inout.rep ? "REP " : "");
+		printf("\tport\t\t0x%04x\n", vmexit->u.inout.port);
+		printf("\teax\t\t0x%08x\n", vmexit->u.inout.eax);
+		break;
+	case VM_EXITCODE_VMX:
+		printf("\treason\t\tVMX\n");
+		printf("\tstatus\t\t%d\n", vmexit->u.vmx.status);
+		printf("\texit_reason\t0x%08x (%u)\n",
+		    vmexit->u.vmx.exit_reason, vmexit->u.vmx.exit_reason);
+		printf("\tqualification\t0x%016lx\n",
+			vmexit->u.vmx.exit_qualification);
+		printf("\tinst_type\t\t%d\n", vmexit->u.vmx.inst_type);
+		printf("\tinst_error\t\t%d\n", vmexit->u.vmx.inst_error);
+		break;
+	case VM_EXITCODE_SVM:
+		printf("\treason\t\tSVM\n");
+		printf("\texit_reason\t\t%#lx\n", vmexit->u.svm.exitcode);
+		printf("\texitinfo1\t\t%#lx\n", vmexit->u.svm.exitinfo1);
+		printf("\texitinfo2\t\t%#lx\n", vmexit->u.svm.exitinfo2);
+		break;
+	default:
+		printf("*** unknown vm run exitcode %d\n", vmexit->exitcode);
+		break;
+	}
+}
+
+static const char *
+wday_str(int idx)
+{
+	static const char *weekdays[] = {
+		"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"
+	};
+
+	if (idx >= 0 && idx < 7)
+		return (weekdays[idx]);
+	else
+		return ("UNK");
+}
+
+static const char *
+mon_str(int idx)
+{
+	static const char *months[] = {
+		"Jan", "Feb", "Mar", "Apr", "May", "Jun",
+		"Jul", "Aug", "Sep", "Oct", "Nov", "Dec"
+	};
+
+	if (idx >= 0 && idx < 12)
+		return (months[idx]);
+	else
+		return ("UNK");
+}
+
+static void
+print_intinfo(const char *banner, uint64_t info)
+{
+	int type;
+
+	printf("%s:\t", banner);
+	if (info & VM_INTINFO_VALID) {
+		type = info & VM_INTINFO_TYPE;
+		switch (type) {
+		case VM_INTINFO_HWINTR:
+			printf("extint");
+			break;
+		case VM_INTINFO_NMI:
+			printf("nmi");
+			break;
+		case VM_INTINFO_SWINTR:
+			printf("swint");
+			break;
+		default:
+			printf("exception");
+			break;
+		}
+		printf(" vector %d", (int)VM_INTINFO_VECTOR(info));
+		if (info & VM_INTINFO_DEL_ERRCODE)
+			printf(" errcode %#x", (u_int)(info >> 32));
+	} else {
+		printf("n/a");
+	}
+	printf("\n");
+}
+
+/* AMD 6th generation and Intel compatible MSRs */
+#define MSR_AMD6TH_START	0xC0000000
+#define MSR_AMD6TH_END		0xC0001FFF
+/* AMD 7th and 8th generation compatible MSRs */
+#define MSR_AMD7TH_START	0xC0010000
+#define MSR_AMD7TH_END		0xC0011FFF
+
+static const char *
+msr_name(uint32_t msr)
+{
+	static char buf[32];
+
+	switch (msr) {
+	case MSR_TSC:
+		return ("MSR_TSC");
+	case MSR_EFER:
+		return ("MSR_EFER");
+	case MSR_STAR:
+		return ("MSR_STAR");
+	case MSR_LSTAR:
+		return ("MSR_LSTAR");
+	case MSR_CSTAR:
+		return ("MSR_CSTAR");
+	case MSR_SF_MASK:
+		return ("MSR_SF_MASK");
+	case MSR_FSBASE:
+		return ("MSR_FSBASE");
+	case MSR_GSBASE:
+		return ("MSR_GSBASE");
+	case MSR_KGSBASE:
+		return ("MSR_KGSBASE");
+	case MSR_SYSENTER_CS_MSR:
+		return ("MSR_SYSENTER_CS_MSR");
+	case MSR_SYSENTER_ESP_MSR:
+		return ("MSR_SYSENTER_ESP_MSR");
+	case MSR_SYSENTER_EIP_MSR:
+		return ("MSR_SYSENTER_EIP_MSR");
+	case MSR_PAT:
+		return ("MSR_PAT");
+	}
+	snprintf(buf, sizeof(buf), "MSR       %#08x", msr);
+
+	return (buf);
+}
+
+static inline void
+print_msr_pm(uint64_t msr, int vcpu, int readable, int writeable)
+{
+
+	if (readable || writeable) {
+		printf("%-20s[%d]\t\t%c%c\n", msr_name(msr), vcpu,
+			readable ? 'R' : '-', writeable ? 'W' : '-');
+	}
+}
+
+/*
+ * Reference APM vol2, section 15.11 MSR Intercepts.
+ */
+static void
+dump_amd_msr_pm(const char *bitmap, int vcpu)
+{
+	int byte, bit, readable, writeable;
+	uint32_t msr;
+
+	for (msr = 0; msr < 0x2000; msr++) {
+		byte = msr / 4;
+		bit = (msr % 4) * 2;
+
+		/* Look at MSRs in the range 0x00000000 to 0x00001FFF */
+		readable = (bitmap[byte] & (1 << bit)) ? 0 : 1;
+		writeable = (bitmap[byte] & (2 << bit)) ?  0 : 1;
+		print_msr_pm(msr, vcpu, readable, writeable);
+
+		/* Look at MSRs in the range 0xC0000000 to 0xC0001FFF */
+		byte += 2048;
+		readable = (bitmap[byte] & (1 << bit)) ? 0 : 1;
+		writeable = (bitmap[byte] & (2 << bit)) ?  0 : 1;
+		print_msr_pm(msr + MSR_AMD6TH_START, vcpu, readable,
+				writeable);
+
+		/* MSR 0xC0010000 to 0xC0011FF is only for AMD */
+		byte += 4096;
+		readable = (bitmap[byte] & (1 << bit)) ? 0 : 1;
+		writeable = (bitmap[byte] & (2 << bit)) ?  0 : 1;
+		print_msr_pm(msr + MSR_AMD7TH_START, vcpu, readable,
+				writeable);
+	}
+}
+
+/*
+ * Reference Intel SDM Vol3 Section 24.6.9 MSR-Bitmap Address
+ */
+static void
+dump_intel_msr_pm(const char *bitmap, int vcpu)
+{
+	int byte, bit, readable, writeable;
+	uint32_t msr;
+
+	for (msr = 0; msr < 0x2000; msr++) {
+		byte = msr / 8;
+		bit = msr & 0x7;
+
+		/* Look at MSRs in the range 0x00000000 to 0x00001FFF */
+		readable = (bitmap[byte] & (1 << bit)) ? 0 : 1;
+		writeable = (bitmap[2048 + byte] & (1 << bit)) ?  0 : 1;
+		print_msr_pm(msr, vcpu, readable, writeable);
+
+		/* Look at MSRs in the range 0xC0000000 to 0xC0001FFF */
+		byte += 1024;
+		readable = (bitmap[byte] & (1 << bit)) ? 0 : 1;
+		writeable = (bitmap[2048 + byte] & (1 << bit)) ?  0 : 1;
+		print_msr_pm(msr + MSR_AMD6TH_START, vcpu, readable,
+				writeable);
+	}
+}
+
+static int
+dump_msr_bitmap(int vcpu, uint64_t addr, bool cpu_intel)
+{
+	char *bitmap;
+	int error, fd, map_size;
+
+	error = -1;
+	bitmap = MAP_FAILED;
+
+	fd = open("/dev/mem", O_RDONLY, 0);
+	if (fd < 0) {
+		perror("Couldn't open /dev/mem");
+		goto done;
+	}
+
+	if (cpu_intel)
+		map_size = PAGE_SIZE;
+	else
+		map_size = 2 * PAGE_SIZE;
+
+	bitmap = mmap(NULL, map_size, PROT_READ, MAP_SHARED, fd, addr);
+	if (bitmap == MAP_FAILED) {
+		perror("mmap failed");
+		goto done;
+	}
+
+	if (cpu_intel)
+		dump_intel_msr_pm(bitmap, vcpu);
+	else
+		dump_amd_msr_pm(bitmap, vcpu);
+
+	error = 0;
+done:
+	if (bitmap != MAP_FAILED)
+		munmap((void *)bitmap, map_size);
+	if (fd >= 0)
+		close(fd);
+
+	return (error);
+}
+
+static int
+vm_get_vmcs_field(struct vcpu *vcpu, int field, uint64_t *ret_val)
+{
+
+	return (vm_get_register(vcpu, VMCS_IDENT(field), ret_val));
+}
+
+static int
+vm_get_vmcb_field(struct vcpu *vcpu, int off, int bytes,
+	uint64_t *ret_val)
+{
+
+	return (vm_get_register(vcpu, VMCB_ACCESS(off, bytes), ret_val));
+}
+
+static int
+get_all_registers(struct vcpu *vcpu, int vcpuid, bool get_all)
+{
+	uint64_t cr0, cr2, cr3, cr4, dr0, dr1, dr2, dr3, dr6, dr7;
+	uint64_t rsp, rip, rflags, efer;
+	uint64_t rax, rbx, rcx, rdx, rsi, rdi, rbp;
+	uint64_t r8, r9, r10, r11, r12, r13, r14, r15;
+	int error = 0;
+
+	if (!error && (get_efer || get_all)) {
+		error = vm_get_register(vcpu, VM_REG_GUEST_EFER, &efer);
+		if (error == 0)
+			printf("efer[%d]\t\t0x%016lx\n", vcpuid, efer);
+	}
+
+	if (!error && (get_cr0 || get_all)) {
+		error = vm_get_register(vcpu, VM_REG_GUEST_CR0, &cr0);
+		if (error == 0)
+			printf("cr0[%d]\t\t0x%016lx\n", vcpuid, cr0);
+	}
+
+	if (!error && (get_cr2 || get_all)) {
+		error = vm_get_register(vcpu, VM_REG_GUEST_CR2, &cr2);
+		if (error == 0)
+			printf("cr2[%d]\t\t0x%016lx\n", vcpuid, cr2);
+	}
+
+	if (!error && (get_cr3 || get_all)) {
+		error = vm_get_register(vcpu, VM_REG_GUEST_CR3, &cr3);
+		if (error == 0)
+			printf("cr3[%d]\t\t0x%016lx\n", vcpuid, cr3);
+	}
+
+	if (!error && (get_cr4 || get_all)) {
+		error = vm_get_register(vcpu, VM_REG_GUEST_CR4, &cr4);
+		if (error == 0)
+			printf("cr4[%d]\t\t0x%016lx\n", vcpuid, cr4);
+	}
+
+	if (!error && (get_dr0 || get_all)) {
+		error = vm_get_register(vcpu, VM_REG_GUEST_DR0, &dr0);
+		if (error == 0)
+			printf("dr0[%d]\t\t0x%016lx\n", vcpuid, dr0);
+	}
+
+	if (!error && (get_dr1 || get_all)) {
+		error = vm_get_register(vcpu, VM_REG_GUEST_DR1, &dr1);
+		if (error == 0)
+			printf("dr1[%d]\t\t0x%016lx\n", vcpuid, dr1);
+	}
+
+	if (!error && (get_dr2 || get_all)) {
+		error = vm_get_register(vcpu, VM_REG_GUEST_DR2, &dr2);
+		if (error == 0)
+			printf("dr2[%d]\t\t0x%016lx\n", vcpuid, dr2);
+	}
+
+	if (!error && (get_dr3 || get_all)) {
+		error = vm_get_register(vcpu, VM_REG_GUEST_DR3, &dr3);
+		if (error == 0)
+			printf("dr3[%d]\t\t0x%016lx\n", vcpuid, dr3);
+	}
+
+	if (!error && (get_dr6 || get_all)) {
+		error = vm_get_register(vcpu, VM_REG_GUEST_DR6, &dr6);
+		if (error == 0)
+			printf("dr6[%d]\t\t0x%016lx\n", vcpuid, dr6);
+	}
+
+	if (!error && (get_dr7 || get_all)) {
+		error = vm_get_register(vcpu, VM_REG_GUEST_DR7, &dr7);
+		if (error == 0)
+			printf("dr7[%d]\t\t0x%016lx\n", vcpuid, dr7);
+	}
+
+	if (!error && (get_rsp || get_all)) {
+		error = vm_get_register(vcpu, VM_REG_GUEST_RSP, &rsp);
+		if (error == 0)
+			printf("rsp[%d]\t\t0x%016lx\n", vcpuid, rsp);
+	}
+
+	if (!error && (get_rip || get_all)) {
+		error = vm_get_register(vcpu, VM_REG_GUEST_RIP, &rip);
+		if (error == 0)
+			printf("rip[%d]\t\t0x%016lx\n", vcpuid, rip);
+	}
+
+	if (!error && (get_rax || get_all)) {
+		error = vm_get_register(vcpu, VM_REG_GUEST_RAX, &rax);
+		if (error == 0)
+			printf("rax[%d]\t\t0x%016lx\n", vcpuid, rax);
+	}
+
+	if (!error && (get_rbx || get_all)) {
+		error = vm_get_register(vcpu, VM_REG_GUEST_RBX, &rbx);
+		if (error == 0)
+			printf("rbx[%d]\t\t0x%016lx\n", vcpuid, rbx);
+	}
+
+	if (!error && (get_rcx || get_all)) {
+		error = vm_get_register(vcpu, VM_REG_GUEST_RCX, &rcx);
+		if (error == 0)
+			printf("rcx[%d]\t\t0x%016lx\n", vcpuid, rcx);
+	}
+
+	if (!error && (get_rdx || get_all)) {
+		error = vm_get_register(vcpu, VM_REG_GUEST_RDX, &rdx);
+		if (error == 0)
+			printf("rdx[%d]\t\t0x%016lx\n", vcpuid, rdx);
+	}
+
+	if (!error && (get_rsi || get_all)) {
+		error = vm_get_register(vcpu, VM_REG_GUEST_RSI, &rsi);
+		if (error == 0)
+			printf("rsi[%d]\t\t0x%016lx\n", vcpuid, rsi);
+	}
+
+	if (!error && (get_rdi || get_all)) {
+		error = vm_get_register(vcpu, VM_REG_GUEST_RDI, &rdi);
+		if (error == 0)
+			printf("rdi[%d]\t\t0x%016lx\n", vcpuid, rdi);
+	}
+
+	if (!error && (get_rbp || get_all)) {
+		error = vm_get_register(vcpu, VM_REG_GUEST_RBP, &rbp);
+		if (error == 0)
+			printf("rbp[%d]\t\t0x%016lx\n", vcpuid, rbp);
+	}
+
+	if (!error && (get_r8 || get_all)) {
+		error = vm_get_register(vcpu, VM_REG_GUEST_R8, &r8);
+		if (error == 0)
+			printf("r8[%d]\t\t0x%016lx\n", vcpuid, r8);
+	}
+
+	if (!error && (get_r9 || get_all)) {
+		error = vm_get_register(vcpu, VM_REG_GUEST_R9, &r9);
+		if (error == 0)
+			printf("r9[%d]\t\t0x%016lx\n", vcpuid, r9);
+	}
+
+	if (!error && (get_r10 || get_all)) {
+		error = vm_get_register(vcpu, VM_REG_GUEST_R10, &r10);
+		if (error == 0)
+			printf("r10[%d]\t\t0x%016lx\n", vcpuid, r10);
+	}
+
+	if (!error && (get_r11 || get_all)) {
+		error = vm_get_register(vcpu, VM_REG_GUEST_R11, &r11);
+		if (error == 0)
+			printf("r11[%d]\t\t0x%016lx\n", vcpuid, r11);
+	}
+
+	if (!error && (get_r12 || get_all)) {
+		error = vm_get_register(vcpu, VM_REG_GUEST_R12, &r12);
+		if (error == 0)
+			printf("r12[%d]\t\t0x%016lx\n", vcpuid, r12);
+	}
+
+	if (!error && (get_r13 || get_all)) {
+		error = vm_get_register(vcpu, VM_REG_GUEST_R13, &r13);
+		if (error == 0)
+			printf("r13[%d]\t\t0x%016lx\n", vcpuid, r13);
+	}
+
+	if (!error && (get_r14 || get_all)) {
+		error = vm_get_register(vcpu, VM_REG_GUEST_R14, &r14);
+		if (error == 0)
+			printf("r14[%d]\t\t0x%016lx\n", vcpuid, r14);
+	}
+
+	if (!error && (get_r15 || get_all)) {
+		error = vm_get_register(vcpu, VM_REG_GUEST_R15, &r15);
+		if (error == 0)
+			printf("r15[%d]\t\t0x%016lx\n", vcpuid, r15);
+	}
+
+	if (!error && (get_rflags || get_all)) {
+		error = vm_get_register(vcpu, VM_REG_GUEST_RFLAGS,
+					&rflags);
+		if (error == 0)
+			printf("rflags[%d]\t0x%016lx\n", vcpuid, rflags);
+	}
+
+	return (error);
+}
+
+static int
+get_all_segments(struct vcpu *vcpu, int vcpuid, bool get_all)
+{
+	uint64_t cs, ds, es, fs, gs, ss, tr, ldtr;
+	int error = 0;
+
+	if (!error && (get_desc_ds || get_all)) {
+		error = vm_get_desc(vcpu, VM_REG_GUEST_DS,
+				   &desc_base, &desc_limit, &desc_access);
+		if (error == 0) {
+			printf("ds desc[%d]\t0x%016lx/0x%08x/0x%08x\n",
+			      vcpuid, desc_base, desc_limit, desc_access);
+		}
+	}
+
+	if (!error && (get_desc_es || get_all)) {
+		error = vm_get_desc(vcpu, VM_REG_GUEST_ES,
+				    &desc_base, &desc_limit, &desc_access);
+		if (error == 0) {
+			printf("es desc[%d]\t0x%016lx/0x%08x/0x%08x\n",
+			       vcpuid, desc_base, desc_limit, desc_access);
+		}
+	}
+
+	if (!error && (get_desc_fs || get_all)) {
+		error = vm_get_desc(vcpu, VM_REG_GUEST_FS,
+				    &desc_base, &desc_limit, &desc_access);
+		if (error == 0) {
+			printf("fs desc[%d]\t0x%016lx/0x%08x/0x%08x\n",
+			       vcpuid, desc_base, desc_limit, desc_access);
+		}
+	}
+
+	if (!error && (get_desc_gs || get_all)) {
+		error = vm_get_desc(vcpu, VM_REG_GUEST_GS,
+				    &desc_base, &desc_limit, &desc_access);
+		if (error == 0) {
+			printf("gs desc[%d]\t0x%016lx/0x%08x/0x%08x\n",
+			       vcpuid, desc_base, desc_limit, desc_access);
+		}
+	}
+
+	if (!error && (get_desc_ss || get_all)) {
+		error = vm_get_desc(vcpu, VM_REG_GUEST_SS,
+				    &desc_base, &desc_limit, &desc_access);
+		if (error == 0) {
+			printf("ss desc[%d]\t0x%016lx/0x%08x/0x%08x\n",
+			       vcpuid, desc_base, desc_limit, desc_access);
+		}
+	}
+
+	if (!error && (get_desc_cs || get_all)) {
+		error = vm_get_desc(vcpu, VM_REG_GUEST_CS,
+				    &desc_base, &desc_limit, &desc_access);
+		if (error == 0) {
+			printf("cs desc[%d]\t0x%016lx/0x%08x/0x%08x\n",
+			       vcpuid, desc_base, desc_limit, desc_access);
+		}
+	}
+
+	if (!error && (get_desc_tr || get_all)) {
+		error = vm_get_desc(vcpu, VM_REG_GUEST_TR,
+				    &desc_base, &desc_limit, &desc_access);
+		if (error == 0) {
+			printf("tr desc[%d]\t0x%016lx/0x%08x/0x%08x\n",
+			       vcpuid, desc_base, desc_limit, desc_access);
+		}
+	}
+
+	if (!error && (get_desc_ldtr || get_all)) {
+		error = vm_get_desc(vcpu, VM_REG_GUEST_LDTR,
+				    &desc_base, &desc_limit, &desc_access);
+		if (error == 0) {
+			printf("ldtr desc[%d]\t0x%016lx/0x%08x/0x%08x\n",
+			       vcpuid, desc_base, desc_limit, desc_access);
+		}
+	}
+
+	if (!error && (get_desc_gdtr || get_all)) {
+		error = vm_get_desc(vcpu, VM_REG_GUEST_GDTR,
+				    &desc_base, &desc_limit, &desc_access);
+		if (error == 0) {
+			printf("gdtr[%d]\t\t0x%016lx/0x%08x\n",
+			       vcpuid, desc_base, desc_limit);
+		}
+	}
+
+	if (!error && (get_desc_idtr || get_all)) {
+		error = vm_get_desc(vcpu, VM_REG_GUEST_IDTR,
+				    &desc_base, &desc_limit, &desc_access);
+		if (error == 0) {
+			printf("idtr[%d]\t\t0x%016lx/0x%08x\n",
+			       vcpuid, desc_base, desc_limit);
+		}
+	}
+
+	if (!error && (get_cs || get_all)) {
+		error = vm_get_register(vcpu, VM_REG_GUEST_CS, &cs);
+		if (error == 0)
+			printf("cs[%d]\t\t0x%04lx\n", vcpuid, cs);
+	}
+
+	if (!error && (get_ds || get_all)) {
+		error = vm_get_register(vcpu, VM_REG_GUEST_DS, &ds);
+		if (error == 0)
+			printf("ds[%d]\t\t0x%04lx\n", vcpuid, ds);
+	}
+
+	if (!error && (get_es || get_all)) {
+		error = vm_get_register(vcpu, VM_REG_GUEST_ES, &es);
+		if (error == 0)
+			printf("es[%d]\t\t0x%04lx\n", vcpuid, es);
+	}
+
+	if (!error && (get_fs || get_all)) {
+		error = vm_get_register(vcpu, VM_REG_GUEST_FS, &fs);
+		if (error == 0)
+			printf("fs[%d]\t\t0x%04lx\n", vcpuid, fs);
+	}
+
+	if (!error && (get_gs || get_all)) {
+		error = vm_get_register(vcpu, VM_REG_GUEST_GS, &gs);
+		if (error == 0)
+			printf("gs[%d]\t\t0x%04lx\n", vcpuid, gs);
+	}
+
+	if (!error && (get_ss || get_all)) {
+		error = vm_get_register(vcpu, VM_REG_GUEST_SS, &ss);
+		if (error == 0)
+			printf("ss[%d]\t\t0x%04lx\n", vcpuid, ss);
+	}
+
+	if (!error && (get_tr || get_all)) {
+		error = vm_get_register(vcpu, VM_REG_GUEST_TR, &tr);
+		if (error == 0)
+			printf("tr[%d]\t\t0x%04lx\n", vcpuid, tr);
+	}
+
+	if (!error && (get_ldtr || get_all)) {
+		error = vm_get_register(vcpu, VM_REG_GUEST_LDTR, &ldtr);
+		if (error == 0)
+			printf("ldtr[%d]\t\t0x%04lx\n", vcpuid, ldtr);
+	}
+
+	return (error);
+}
+
+static int
+get_misc_vmcs(struct vcpu *vcpu, int vcpuid, bool get_all)
+{
+	uint64_t ctl, cr0, cr3, cr4, rsp, rip, pat, addr, u64;
+	int error = 0;
+
+	if (!error && (get_cr0_mask || get_all)) {
+		uint64_t cr0mask;
+		error = vm_get_vmcs_field(vcpu, VMCS_CR0_MASK, &cr0mask);
+		if (error == 0)
+			printf("cr0_mask[%d]\t\t0x%016lx\n", vcpuid, cr0mask);
+	}
+
+	if (!error && (get_cr0_shadow || get_all)) {
+		uint64_t cr0shadow;
+		error = vm_get_vmcs_field(vcpu, VMCS_CR0_SHADOW,
+					  &cr0shadow);
+		if (error == 0)
+			printf("cr0_shadow[%d]\t\t0x%016lx\n", vcpuid, cr0shadow);
+	}
+
+	if (!error && (get_cr4_mask || get_all)) {
+		uint64_t cr4mask;
+		error = vm_get_vmcs_field(vcpu, VMCS_CR4_MASK, &cr4mask);
+		if (error == 0)
+			printf("cr4_mask[%d]\t\t0x%016lx\n", vcpuid, cr4mask);
+	}
+
+	if (!error && (get_cr4_shadow || get_all)) {
+		uint64_t cr4shadow;
+		error = vm_get_vmcs_field(vcpu, VMCS_CR4_SHADOW,
+					  &cr4shadow);
+		if (error == 0)
+			printf("cr4_shadow[%d]\t\t0x%016lx\n", vcpuid, cr4shadow);
+	}
+
+	if (!error && (get_cr3_targets || get_all)) {
+		uint64_t target_count, target_addr;
+		error = vm_get_vmcs_field(vcpu, VMCS_CR3_TARGET_COUNT,
+					  &target_count);
+		if (error == 0) {
+			printf("cr3_target_count[%d]\t0x%016lx\n",
+				vcpuid, target_count);
+		}
+
+		error = vm_get_vmcs_field(vcpu, VMCS_CR3_TARGET0,
+					  &target_addr);
+		if (error == 0) {
+			printf("cr3_target0[%d]\t\t0x%016lx\n",
+				vcpuid, target_addr);
+		}
+
+		error = vm_get_vmcs_field(vcpu, VMCS_CR3_TARGET1,
+					  &target_addr);
+		if (error == 0) {
+			printf("cr3_target1[%d]\t\t0x%016lx\n",
+				vcpuid, target_addr);
+		}
+
+		error = vm_get_vmcs_field(vcpu, VMCS_CR3_TARGET2,
+					  &target_addr);
+		if (error == 0) {
+			printf("cr3_target2[%d]\t\t0x%016lx\n",
+				vcpuid, target_addr);
+		}
+
+		error = vm_get_vmcs_field(vcpu, VMCS_CR3_TARGET3,
+					  &target_addr);
+		if (error == 0) {
+			printf("cr3_target3[%d]\t\t0x%016lx\n",
+				vcpuid, target_addr);
+		}
+	}
+
+	if (!error && (get_pinbased_ctls || get_all)) {
+		error = vm_get_vmcs_field(vcpu, VMCS_PIN_BASED_CTLS, &ctl);
+		if (error == 0)
+			printf("pinbased_ctls[%d]\t0x%016lx\n", vcpuid, ctl);
+	}
+
+	if (!error && (get_procbased_ctls || get_all)) {
+		error = vm_get_vmcs_field(vcpu,
+					  VMCS_PRI_PROC_BASED_CTLS, &ctl);
+		if (error == 0)
+			printf("procbased_ctls[%d]\t0x%016lx\n", vcpuid, ctl);
+	}
+
+	if (!error && (get_procbased_ctls2 || get_all)) {
+		error = vm_get_vmcs_field(vcpu,
+					  VMCS_SEC_PROC_BASED_CTLS, &ctl);
+		if (error == 0)
+			printf("procbased_ctls2[%d]\t0x%016lx\n", vcpuid, ctl);
+	}
+
+	if (!error && (get_vmcs_gla || get_all)) {
+		error = vm_get_vmcs_field(vcpu,
+					  VMCS_GUEST_LINEAR_ADDRESS, &u64);
+		if (error == 0)
+			printf("gla[%d]\t\t0x%016lx\n", vcpuid, u64);
+	}
+
+	if (!error && (get_vmcs_gpa || get_all)) {
+		error = vm_get_vmcs_field(vcpu,
+					  VMCS_GUEST_PHYSICAL_ADDRESS, &u64);
+		if (error == 0)
+			printf("gpa[%d]\t\t0x%016lx\n", vcpuid, u64);
+	}
+
+	if (!error && (get_vmcs_entry_interruption_info ||
+		get_all)) {
+		error = vm_get_vmcs_field(vcpu, VMCS_ENTRY_INTR_INFO,&u64);
+		if (error == 0) {
+			printf("entry_interruption_info[%d]\t0x%016lx\n",
+				vcpuid, u64);
+		}
+	}
+
+	if (!error && (get_tpr_threshold || get_all)) {
+		uint64_t threshold;
+		error = vm_get_vmcs_field(vcpu, VMCS_TPR_THRESHOLD,
+					  &threshold);
+		if (error == 0)
+			printf("tpr_threshold[%d]\t0x%016lx\n", vcpuid, threshold);
+	}
+
+	if (!error && (get_inst_err || get_all)) {
+		uint64_t insterr;
+		error = vm_get_vmcs_field(vcpu, VMCS_INSTRUCTION_ERROR,
+					  &insterr);
+		if (error == 0) {
+			printf("instruction_error[%d]\t0x%016lx\n",
+				vcpuid, insterr);
+		}
+	}
+
+	if (!error && (get_exit_ctls || get_all)) {
+		error = vm_get_vmcs_field(vcpu, VMCS_EXIT_CTLS, &ctl);
+		if (error == 0)
+			printf("exit_ctls[%d]\t\t0x%016lx\n", vcpuid, ctl);
+	}
+
+	if (!error && (get_entry_ctls || get_all)) {
+		error = vm_get_vmcs_field(vcpu, VMCS_ENTRY_CTLS, &ctl);
+		if (error == 0)
+			printf("entry_ctls[%d]\t\t0x%016lx\n", vcpuid, ctl);
+	}
+
+	if (!error && (get_host_pat || get_all)) {
+		error = vm_get_vmcs_field(vcpu, VMCS_HOST_IA32_PAT, &pat);
+		if (error == 0)
+			printf("host_pat[%d]\t\t0x%016lx\n", vcpuid, pat);
+	}
+
+	if (!error && (get_host_cr0 || get_all)) {
+		error = vm_get_vmcs_field(vcpu, VMCS_HOST_CR0, &cr0);
+		if (error == 0)
+			printf("host_cr0[%d]\t\t0x%016lx\n", vcpuid, cr0);
+	}
+
+	if (!error && (get_host_cr3 || get_all)) {
+		error = vm_get_vmcs_field(vcpu, VMCS_HOST_CR3, &cr3);
+		if (error == 0)
+			printf("host_cr3[%d]\t\t0x%016lx\n", vcpuid, cr3);
+	}
+
+	if (!error && (get_host_cr4 || get_all)) {
+		error = vm_get_vmcs_field(vcpu, VMCS_HOST_CR4, &cr4);
+		if (error == 0)
+			printf("host_cr4[%d]\t\t0x%016lx\n", vcpuid, cr4);
+	}
+
+	if (!error && (get_host_rip || get_all)) {
+		error = vm_get_vmcs_field(vcpu, VMCS_HOST_RIP, &rip);
+		if (error == 0)
+			printf("host_rip[%d]\t\t0x%016lx\n", vcpuid, rip);
+	}
+
+	if (!error && (get_host_rsp || get_all)) {
+		error = vm_get_vmcs_field(vcpu, VMCS_HOST_RSP, &rsp);
+		if (error == 0)
+			printf("host_rsp[%d]\t\t0x%016lx\n", vcpuid, rsp);
+	}
+
+	if (!error && (get_vmcs_link || get_all)) {
+		error = vm_get_vmcs_field(vcpu, VMCS_LINK_POINTER, &addr);
+		if (error == 0)
+			printf("vmcs_pointer[%d]\t0x%016lx\n", vcpuid, addr);
+	}
+
+	if (!error && (get_vmcs_exit_interruption_info || get_all)) {
+		error = vm_get_vmcs_field(vcpu, VMCS_EXIT_INTR_INFO, &u64);
+		if (error == 0) {
+			printf("vmcs_exit_interruption_info[%d]\t0x%016lx\n",
+				vcpuid, u64);
+		}
+	}
+
+	if (!error && (get_vmcs_exit_interruption_error || get_all)) {
+		error = vm_get_vmcs_field(vcpu, VMCS_EXIT_INTR_ERRCODE, &u64);
+		if (error == 0) {
+			printf("vmcs_exit_interruption_error[%d]\t0x%016lx\n",
+				vcpuid, u64);
+		}
+	}
+
+	if (!error && (get_vmcs_interruptibility || get_all)) {
+		error = vm_get_vmcs_field(vcpu,
+					  VMCS_GUEST_INTERRUPTIBILITY, &u64);
+		if (error == 0) {
+			printf("vmcs_guest_interruptibility[%d]\t0x%016lx\n",
+				vcpuid, u64);
+		}
+	}
+
+	if (!error && (get_vmcs_exit_inst_length || get_all)) {
+		error = vm_get_vmcs_field(vcpu,
+		    VMCS_EXIT_INSTRUCTION_LENGTH, &u64);
+		if (error == 0)
+			printf("vmcs_exit_inst_length[%d]\t0x%08x\n", vcpuid,
+			    (uint32_t)u64);
+	}
+
+	if (!error && (get_vmcs_exit_qualification || get_all)) {
+		error = vm_get_vmcs_field(vcpu, VMCS_EXIT_QUALIFICATION,
+					  &u64);
+		if (error == 0)
+			printf("vmcs_exit_qualification[%d]\t0x%016lx\n",
+				vcpuid, u64);
+	}
+
+	return (error);
+}
+
+static int
+get_misc_vmcb(struct vcpu *vcpu, int vcpuid, bool get_all)
+{
+	uint64_t ctl, addr;
+	int error = 0;
+
+	if (!error && (get_vmcb_intercept || get_all)) {
+		error = vm_get_vmcb_field(vcpu, VMCB_OFF_CR_INTERCEPT, 4,
+		    &ctl);
+		if (error == 0)
+			printf("cr_intercept[%d]\t0x%08x\n", vcpuid, (int)ctl);
+
+		error = vm_get_vmcb_field(vcpu, VMCB_OFF_DR_INTERCEPT, 4,
+		    &ctl);
+		if (error == 0)
+			printf("dr_intercept[%d]\t0x%08x\n", vcpuid, (int)ctl);
+
+		error = vm_get_vmcb_field(vcpu, VMCB_OFF_EXC_INTERCEPT, 4,
+		    &ctl);
+		if (error == 0)
+			printf("exc_intercept[%d]\t0x%08x\n", vcpuid, (int)ctl);
+
+		error = vm_get_vmcb_field(vcpu, VMCB_OFF_INST1_INTERCEPT,
+		    4, &ctl);
+		if (error == 0)
+			printf("inst1_intercept[%d]\t0x%08x\n", vcpuid, (int)ctl);
+
+		error = vm_get_vmcb_field(vcpu, VMCB_OFF_INST2_INTERCEPT,
+		    4, &ctl);
+		if (error == 0)
+			printf("inst2_intercept[%d]\t0x%08x\n", vcpuid, (int)ctl);
+	}
+
+	if (!error && (get_vmcb_tlb_ctrl || get_all)) {
+		error = vm_get_vmcb_field(vcpu, VMCB_OFF_TLB_CTRL,
+					  4, &ctl);
+		if (error == 0)
+			printf("TLB ctrl[%d]\t0x%016lx\n", vcpuid, ctl);
+	}
+
+	if (!error && (get_vmcb_exit_details || get_all)) {
+		error = vm_get_vmcb_field(vcpu, VMCB_OFF_EXITINFO1,
+					  8, &ctl);
+		if (error == 0)
+			printf("exitinfo1[%d]\t0x%016lx\n", vcpuid, ctl);
+		error = vm_get_vmcb_field(vcpu, VMCB_OFF_EXITINFO2,
+					  8, &ctl);
+		if (error == 0)
+			printf("exitinfo2[%d]\t0x%016lx\n", vcpuid, ctl);
+		error = vm_get_vmcb_field(vcpu, VMCB_OFF_EXITINTINFO,
+					  8, &ctl);
+		if (error == 0)
+			printf("exitintinfo[%d]\t0x%016lx\n", vcpuid, ctl);
+	}
+
+	if (!error && (get_vmcb_virq || get_all)) {
+		error = vm_get_vmcb_field(vcpu, VMCB_OFF_VIRQ,
+					  8, &ctl);
+		if (error == 0)
+			printf("v_irq/tpr[%d]\t0x%016lx\n", vcpuid, ctl);
+	}
+
+	if (!error && (get_apic_access_addr || get_all)) {
+		error = vm_get_vmcb_field(vcpu, VMCB_OFF_AVIC_BAR, 8,
+					  &addr);
+		if (error == 0)
+			printf("AVIC apic_bar[%d]\t0x%016lx\n", vcpuid, addr);
+	}
+
+	if (!error && (get_virtual_apic_addr || get_all)) {
+		error = vm_get_vmcb_field(vcpu, VMCB_OFF_AVIC_PAGE, 8,
+					  &addr);
+		if (error == 0)
+			printf("AVIC backing page[%d]\t0x%016lx\n", vcpuid, addr);
+	}
+
+	if (!error && (get_avic_table || get_all)) {
+		error = vm_get_vmcb_field(vcpu, VMCB_OFF_AVIC_LT, 8,
+					  &addr);
+		if (error == 0)
+			printf("AVIC logical table[%d]\t0x%016lx\n",
+				vcpuid, addr);
+		error = vm_get_vmcb_field(vcpu, VMCB_OFF_AVIC_PT, 8,
+					  &addr);
+		if (error == 0)
+			printf("AVIC physical table[%d]\t0x%016lx\n",
+				vcpuid, addr);
+	}
+
+	return (error);
+}
+
+struct option *
+bhyvectl_opts(const struct option *options, size_t count)
+{
+	const struct option common_opts[] = {
+		{ "set-efer",	REQ_ARG,	0,	SET_EFER },
+		{ "set-cr0",	REQ_ARG,	0,	SET_CR0 },
+		{ "set-cr2",	REQ_ARG,	0,	SET_CR2 },
+		{ "set-cr3",	REQ_ARG,	0,	SET_CR3 },
+		{ "set-cr4",	REQ_ARG,	0,	SET_CR4 },
+		{ "set-dr0",	REQ_ARG,	0,	SET_DR0 },
+		{ "set-dr1",	REQ_ARG,	0,	SET_DR1 },
+		{ "set-dr2",	REQ_ARG,	0,	SET_DR2 },
+		{ "set-dr3",	REQ_ARG,	0,	SET_DR3 },
+		{ "set-dr6",	REQ_ARG,	0,	SET_DR6 },
+		{ "set-dr7",	REQ_ARG,	0,	SET_DR7 },
+		{ "set-rsp",	REQ_ARG,	0,	SET_RSP },
+		{ "set-rip",	REQ_ARG,	0,	SET_RIP },
+		{ "set-rax",	REQ_ARG,	0,	SET_RAX },
+		{ "set-rflags",	REQ_ARG,	0,	SET_RFLAGS },
+		{ "desc-base",	REQ_ARG,	0,	DESC_BASE },
+		{ "desc-limit",	REQ_ARG,	0,	DESC_LIMIT },
+		{ "desc-access",REQ_ARG,	0,	DESC_ACCESS },
+		{ "set-cs",	REQ_ARG,	0,	SET_CS },
+		{ "set-ds",	REQ_ARG,	0,	SET_DS },
+		{ "set-es",	REQ_ARG,	0,	SET_ES },
+		{ "set-fs",	REQ_ARG,	0,	SET_FS },
+		{ "set-gs",	REQ_ARG,	0,	SET_GS },
+		{ "set-ss",	REQ_ARG,	0,	SET_SS },
+		{ "set-tr",	REQ_ARG,	0,	SET_TR },
+		{ "set-ldtr",	REQ_ARG,	0,	SET_LDTR },
+		{ "set-x2apic-state",REQ_ARG,	0,	SET_X2APIC_STATE },
+		{ "unassign-pptdev", REQ_ARG,	0,	UNASSIGN_PPTDEV },
+		{ "get-gpa-pmap", REQ_ARG,	0,	GET_GPA_PMAP },
+		{ "assert-lapic-lvt", REQ_ARG,	0,	ASSERT_LAPIC_LVT },
+		{ "get-rtc-time", NO_ARG,	&get_rtc_time,	1 },
+		{ "set-rtc-time", REQ_ARG,	0,	SET_RTC_TIME },
+		{ "rtc-nvram-offset", REQ_ARG,	0,	RTC_NVRAM_OFFSET },
+		{ "get-rtc-nvram", NO_ARG,	&get_rtc_nvram,	1 },
+		{ "set-rtc-nvram", REQ_ARG,	0,	SET_RTC_NVRAM },
+		{ "get-desc-ds",NO_ARG,		&get_desc_ds,	1 },
+		{ "set-desc-ds",NO_ARG,		&set_desc_ds,	1 },
+		{ "get-desc-es",NO_ARG,		&get_desc_es,	1 },
+		{ "set-desc-es",NO_ARG,		&set_desc_es,	1 },
+		{ "get-desc-ss",NO_ARG,		&get_desc_ss,	1 },
+		{ "set-desc-ss",NO_ARG,		&set_desc_ss,	1 },
+		{ "get-desc-cs",NO_ARG,		&get_desc_cs,	1 },
+		{ "set-desc-cs",NO_ARG,		&set_desc_cs,	1 },
+		{ "get-desc-fs",NO_ARG,		&get_desc_fs,	1 },
+		{ "set-desc-fs",NO_ARG,		&set_desc_fs,	1 },
+		{ "get-desc-gs",NO_ARG,		&get_desc_gs,	1 },
+		{ "set-desc-gs",NO_ARG,		&set_desc_gs,	1 },
+		{ "get-desc-tr",NO_ARG,		&get_desc_tr,	1 },
+		{ "set-desc-tr",NO_ARG,		&set_desc_tr,	1 },
+		{ "set-desc-ldtr", NO_ARG,	&set_desc_ldtr,	1 },
+		{ "get-desc-ldtr", NO_ARG,	&get_desc_ldtr,	1 },
+		{ "set-desc-gdtr", NO_ARG,	&set_desc_gdtr, 1 },
+		{ "get-desc-gdtr", NO_ARG,	&get_desc_gdtr, 1 },
+		{ "set-desc-idtr", NO_ARG,	&set_desc_idtr, 1 },
+		{ "get-desc-idtr", NO_ARG,	&get_desc_idtr, 1 },
+		{ "get-efer",	NO_ARG,		&get_efer,	1 },
+		{ "get-cr0",	NO_ARG,		&get_cr0,	1 },
+		{ "get-cr2",	NO_ARG,		&get_cr2,	1 },
+		{ "get-cr3",	NO_ARG,		&get_cr3,	1 },
+		{ "get-cr4",	NO_ARG,		&get_cr4,	1 },
+		{ "get-dr0",	NO_ARG,		&get_dr0,	1 },
+		{ "get-dr1",	NO_ARG,		&get_dr1,	1 },
+		{ "get-dr2",	NO_ARG,		&get_dr2,	1 },
+		{ "get-dr3",	NO_ARG,		&get_dr3,	1 },
+		{ "get-dr6",	NO_ARG,		&get_dr6,	1 },
+		{ "get-dr7",	NO_ARG,		&get_dr7,	1 },
+		{ "get-rsp",	NO_ARG,		&get_rsp,	1 },
+		{ "get-rip",	NO_ARG,		&get_rip,	1 },
+		{ "get-rax",	NO_ARG,		&get_rax,	1 },
+		{ "get-rbx",	NO_ARG,		&get_rbx,	1 },
+		{ "get-rcx",	NO_ARG,		&get_rcx,	1 },
+		{ "get-rdx",	NO_ARG,		&get_rdx,	1 },
+		{ "get-rsi",	NO_ARG,		&get_rsi,	1 },
+		{ "get-rdi",	NO_ARG,		&get_rdi,	1 },
+		{ "get-rbp",	NO_ARG,		&get_rbp,	1 },
+		{ "get-r8",	NO_ARG,		&get_r8,	1 },
+		{ "get-r9",	NO_ARG,		&get_r9,	1 },
+		{ "get-r10",	NO_ARG,		&get_r10,	1 },
+		{ "get-r11",	NO_ARG,		&get_r11,	1 },
+		{ "get-r12",	NO_ARG,		&get_r12,	1 },
+		{ "get-r13",	NO_ARG,		&get_r13,	1 },
+		{ "get-r14",	NO_ARG,		&get_r14,	1 },
+		{ "get-r15",	NO_ARG,		&get_r15,	1 },
+		{ "get-rflags",	NO_ARG,		&get_rflags,	1 },
+		{ "get-cs",	NO_ARG,		&get_cs,	1 },
+		{ "get-ds",	NO_ARG,		&get_ds,	1 },
+		{ "get-es",	NO_ARG,		&get_es,	1 },
+		{ "get-fs",	NO_ARG,		&get_fs,	1 },
+		{ "get-gs",	NO_ARG,		&get_gs,	1 },
+		{ "get-ss",	NO_ARG,		&get_ss,	1 },
+		{ "get-tr",	NO_ARG,		&get_tr,	1 },
+		{ "get-ldtr",	NO_ARG,		&get_ldtr,	1 },
+		{ "get-eptp",	NO_ARG,		&get_eptp,	1 },
+		{ "get-exception-bitmap", NO_ARG, &get_exception_bitmap, 1 },
+		{ "get-io-bitmap-address", NO_ARG,	&get_io_bitmap, 1 },
+		{ "get-tsc-offset",	NO_ARG, &get_tsc_offset,	1 },
+		{ "get-msr-bitmap",	NO_ARG, &get_msr_bitmap, 1 },
+		{ "get-msr-bitmap-address", NO_ARG, &get_msr_bitmap_address, 1},
+		{ "get-guest-pat",	NO_ARG,	&get_guest_pat,		1 },
+		{ "get-guest-sysenter",	NO_ARG,	&get_guest_sysenter,	1 },
+		{ "get-exit-reason",	NO_ARG,	&get_exit_reason,	1 },
+		{ "get-x2apic-state",	NO_ARG,	&get_x2apic_state,	1 },
+		{ "inject-nmi",		NO_ARG,	&inject_nmi,		1 },
+		{ "get-intinfo",	NO_ARG,	&get_intinfo,		1 },
+	};
+	const struct option intel_opts[] = {
+		{ "get-vmcs-pinbased-ctls",
+				NO_ARG,		&get_pinbased_ctls, 1 },
+		{ "get-vmcs-procbased-ctls",
+				NO_ARG,		&get_procbased_ctls, 1 },
+		{ "get-vmcs-procbased-ctls2",
+				NO_ARG,		&get_procbased_ctls2, 1 },
+		{ "get-vmcs-guest-linear-address",
+				NO_ARG,		&get_vmcs_gla,	1 },
+		{ "get-vmcs-guest-physical-address",
+				NO_ARG,		&get_vmcs_gpa,	1 },
+		{ "get-vmcs-entry-interruption-info",
+				NO_ARG, &get_vmcs_entry_interruption_info, 1},
+		{ "get-vmcs-cr0-mask", NO_ARG,	&get_cr0_mask,	1 },
+		{ "get-vmcs-cr0-shadow", NO_ARG,&get_cr0_shadow, 1 },
+		{ "get-vmcs-cr4-mask",		NO_ARG, &get_cr4_mask,    1 },
+		{ "get-vmcs-cr4-shadow",	NO_ARG, &get_cr4_shadow,  1 },
+		{ "get-vmcs-cr3-targets",	NO_ARG, &get_cr3_targets, 1 },
+		{ "get-vmcs-tpr-threshold",
+					NO_ARG,	&get_tpr_threshold, 1 },
+		{ "get-vmcs-vpid",	NO_ARG,	&get_vpid_asid,	    1 },
+		{ "get-vmcs-exit-ctls",	NO_ARG,	&get_exit_ctls,	    1 },
+		{ "get-vmcs-entry-ctls",
+					NO_ARG,	&get_entry_ctls, 1 },
+		{ "get-vmcs-instruction-error",
+					NO_ARG,	&get_inst_err,	1 },
+		{ "get-vmcs-host-pat",	NO_ARG,	&get_host_pat,	1 },
+		{ "get-vmcs-host-cr0",
+					NO_ARG,	&get_host_cr0,	1 },
+		{ "get-vmcs-exit-qualification",
+				NO_ARG,	&get_vmcs_exit_qualification, 1 },
+		{ "get-vmcs-exit-inst-length",
+				NO_ARG,	&get_vmcs_exit_inst_length, 1 },
+		{ "get-vmcs-interruptibility",
+				NO_ARG, &get_vmcs_interruptibility, 1 },
+		{ "get-vmcs-exit-interruption-error",
+				NO_ARG,	&get_vmcs_exit_interruption_error, 1 },
+		{ "get-vmcs-exit-interruption-info",
+				NO_ARG,	&get_vmcs_exit_interruption_info, 1 },
+		{ "get-vmcs-link",	NO_ARG,		&get_vmcs_link, 1 },
+		{ "get-vmcs-host-cr3",
+					NO_ARG,		&get_host_cr3,	1 },
+		{ "get-vmcs-host-cr4",
+				NO_ARG,		&get_host_cr4,	1 },
+		{ "get-vmcs-host-rip",
+				NO_ARG,		&get_host_rip,	1 },
+		{ "get-vmcs-host-rsp",
+				NO_ARG,		&get_host_rsp,	1 },
+		{ "get-apic-access-address",
+				NO_ARG,		&get_apic_access_addr, 1},
+		{ "get-virtual-apic-address",
+				NO_ARG,		&get_virtual_apic_addr, 1}
+	};
+	const struct option amd_opts[] = {
+		{ "get-vmcb-intercepts",
+				NO_ARG,	&get_vmcb_intercept, 	1 },
+		{ "get-vmcb-asid",
+				NO_ARG,	&get_vpid_asid,	     	1 },
+		{ "get-vmcb-exit-details",
+				NO_ARG, &get_vmcb_exit_details,	1 },
+		{ "get-vmcb-tlb-ctrl",
+				NO_ARG, &get_vmcb_tlb_ctrl, 	1 },
+		{ "get-vmcb-virq",
+				NO_ARG, &get_vmcb_virq, 	1 },
+		{ "get-avic-apic-bar",
+				NO_ARG,	&get_apic_access_addr, 	1 },
+		{ "get-avic-backing-page",
+				NO_ARG,	&get_virtual_apic_addr, 1 },
+		{ "get-avic-table",
+				NO_ARG,	&get_avic_table, 	1 }
+	};
+	const struct option null_opt = {
+		NULL, 0, NULL, 0
+	};
+
+	struct option *all_opts;
+	char *cp;
+	int optlen;
+	bool cpu_intel;
+
+	cpu_intel = cpu_vendor_intel();
+	optlen = count * sizeof(struct option) + sizeof(common_opts);
+
+	if (cpu_intel)
+		optlen += sizeof(intel_opts);
+	else
+		optlen += sizeof(amd_opts);
+
+	optlen += sizeof(null_opt);
+
+	all_opts = malloc(optlen);
+	if (all_opts == NULL)
+		err(1, "malloc");
+
+	cp = (char *)all_opts;
+	memcpy(cp, options, count * sizeof(struct option));
+	cp += count * sizeof(struct option);
+	memcpy(cp, common_opts, sizeof(common_opts));
+	cp += sizeof(common_opts);
+
+	if (cpu_intel) {
+		memcpy(cp, intel_opts, sizeof(intel_opts));
+		cp += sizeof(intel_opts);
+	} else {
+		memcpy(cp, amd_opts, sizeof(amd_opts));
+		cp += sizeof(amd_opts);
+	}
+
+	memcpy(cp, &null_opt, sizeof(null_opt));
+	cp += sizeof(null_opt);
+
+	return (all_opts);
+}
+
+void
+bhyvectl_handle_opt(const struct option *opts, int opt)
+{
+	switch (opt) {
+	case SET_EFER:
+		set_efer_val = strtoul(optarg, NULL, 0);
+		set_efer = 1;
+		break;
+	case SET_CR0:
+		set_cr0_val = strtoul(optarg, NULL, 0);
+		set_cr0 = 1;
+		break;
+	case SET_CR2:
+		set_cr2_val = strtoul(optarg, NULL, 0);
+		set_cr2 = 1;
+		break;
+	case SET_CR3:
+		set_cr3_val = strtoul(optarg, NULL, 0);
+		set_cr3 = 1;
+		break;
+	case SET_CR4:
+		set_cr4_val = strtoul(optarg, NULL, 0);
+		set_cr4 = 1;
+		break;
+	case SET_DR0:
+		set_dr0_val = strtoul(optarg, NULL, 0);
+		set_dr0 = 1;
+		break;
+	case SET_DR1:
+		set_dr1_val = strtoul(optarg, NULL, 0);
+		set_dr1 = 1;
+		break;
+	case SET_DR2:
+		set_dr2_val = strtoul(optarg, NULL, 0);
+		set_dr2 = 1;
+		break;
+	case SET_DR3:
+		set_dr3_val = strtoul(optarg, NULL, 0);
+		set_dr3 = 1;
+		break;
+	case SET_DR6:
+		set_dr6_val = strtoul(optarg, NULL, 0);
+		set_dr6 = 1;
+		break;
+	case SET_DR7:
+		set_dr7_val = strtoul(optarg, NULL, 0);
+		set_dr7 = 1;
+		break;
+	case SET_RSP:
+		set_rsp_val = strtoul(optarg, NULL, 0);
+		set_rsp = 1;
+		break;
+	case SET_RIP:
+		set_rip_val = strtoul(optarg, NULL, 0);
+		set_rip = 1;
+		break;
+	case SET_RAX:
+		set_rax_val = strtoul(optarg, NULL, 0);
+		set_rax = 1;
+		break;
+	case SET_RFLAGS:
+		set_rflags_val = strtoul(optarg, NULL, 0);
+		set_rflags = 1;
+		break;
+	case DESC_BASE:
+		desc_base = strtoul(optarg, NULL, 0);
+		break;
+	case DESC_LIMIT:
+		desc_limit = strtoul(optarg, NULL, 0);
+		break;
+	case DESC_ACCESS:
+		desc_access = strtoul(optarg, NULL, 0);
+		break;
+	case SET_CS:
+		set_cs_val = strtoul(optarg, NULL, 0);
+		set_cs = 1;
+		break;
+	case SET_DS:
+		set_ds_val = strtoul(optarg, NULL, 0);
+		set_ds = 1;
+		break;
+	case SET_ES:
+		set_es_val = strtoul(optarg, NULL, 0);
+		set_es = 1;
+		break;
+	case SET_FS:
+		set_fs_val = strtoul(optarg, NULL, 0);
+		set_fs = 1;
+		break;
+	case SET_GS:
+		set_gs_val = strtoul(optarg, NULL, 0);
+		set_gs = 1;
+		break;
+	case SET_SS:
+		set_ss_val = strtoul(optarg, NULL, 0);
+		set_ss = 1;
+		break;
+	case SET_TR:
+		set_tr_val = strtoul(optarg, NULL, 0);
+		set_tr = 1;
+		break;
+	case SET_LDTR:
+		set_ldtr_val = strtoul(optarg, NULL, 0);
+		set_ldtr = 1;
+		break;
+	case SET_X2APIC_STATE:
+		x2apic_state = strtol(optarg, NULL, 0);
+		set_x2apic_state = 1;
+		break;
+	case SET_RTC_TIME:
+		rtc_secs = strtoul(optarg, NULL, 0);
+		set_rtc_time = 1;
+		break;
+	case SET_RTC_NVRAM:
+		rtc_nvram_value = (uint8_t)strtoul(optarg, NULL, 0);
+		set_rtc_nvram = 1;
+		break;
+	case RTC_NVRAM_OFFSET:
+		rtc_nvram_offset = strtoul(optarg, NULL, 0);
+		break;
+	case GET_GPA_PMAP:
+		gpa_pmap = strtoul(optarg, NULL, 0);
+		get_gpa_pmap = 1;
+		break;
+	case UNASSIGN_PPTDEV:
+		unassign_pptdev = 1;
+		if (sscanf(optarg, "%d/%d/%d", &bus, &slot, &func) != 3)
+			usage(opts);
+		break;
+	case ASSERT_LAPIC_LVT:
+		assert_lapic_lvt = atoi(optarg);
+		break;
+	}
+}
+
+const char *
+bhyvectl_opt_desc(int opt)
+{
+	switch (opt) {
+	case SET_EFER:
+		return ("EFER");
+	case SET_CR0:
+		return ("CR0");
+	case SET_CR2:
+		return ("CR2");
+	case SET_CR3:
+		return ("CR3");
+	case SET_CR4:
+		return ("CR4");
+	case SET_DR0:
+		return ("DR0");
+	case SET_DR1:
+		return ("DR1");
+	case SET_DR2:
+		return ("DR2");
+	case SET_DR3:
+		return ("DR3");
+	case SET_DR6:
+		return ("DR6");
+	case SET_DR7:
+		return ("DR7");
+	case SET_RSP:
+		return ("RSP");
+	case SET_RIP:
+		return ("RIP");
+	case SET_RAX:
+		return ("RAX");
+	case SET_RFLAGS:
+		return ("RFLAGS");
+	case DESC_BASE:
+		return ("BASE");
+	case DESC_LIMIT:
+		return ("LIMIT");
+	case DESC_ACCESS:
+		return ("ACCESS");
+	case SET_CS:
+		return ("CS");
+	case SET_DS:
+		return ("DS");
+	case SET_ES:
+		return ("ES");
+	case SET_FS:
+		return ("FS");
+	case SET_GS:
+		return ("GS");
+	case SET_SS:
+		return ("SS");
+	case SET_TR:
+		return ("TR");
+	case SET_LDTR:
+		return ("LDTR");
+	case SET_X2APIC_STATE:
+		return ("state");
+	case UNASSIGN_PPTDEV:
+		return ("bus/slot.func");
+	case GET_GPA_PMAP:
+		return ("gpa");
+	case ASSERT_LAPIC_LVT:
+		return ("pin");
+	case SET_RTC_TIME:
+		return ("secs");
+	case SET_RTC_NVRAM:
+		return ("val");
+	case RTC_NVRAM_OFFSET:
+		return ("offset");
+	default:
+		return ("???");
+	}
+}
+
+void
+bhyvectl_md_main(struct vmctx *ctx, struct vcpu *vcpu, int vcpuid, bool get_all)
+{
+	struct tm tm;
+	uint64_t info[2], pteval[4], *pte;
+	uint64_t addr, bm, eptp, u64;
+	uint64_t cs, rsp, rip, pat;
+	int error, ptenum;
+	bool cpu_intel;
+
+	cpu_intel = cpu_vendor_intel();
+	error = 0;
+
+	if (!error && set_efer)
+		error = vm_set_register(vcpu, VM_REG_GUEST_EFER, set_efer_val);
+
+	if (!error && set_cr0)
+		error = vm_set_register(vcpu, VM_REG_GUEST_CR0, set_cr0_val);
+
+	if (!error && set_cr2)
+		error = vm_set_register(vcpu, VM_REG_GUEST_CR2, set_cr2_val);
+
+	if (!error && set_cr3)
+		error = vm_set_register(vcpu, VM_REG_GUEST_CR3, set_cr3_val);
+
+	if (!error && set_cr4)
+		error = vm_set_register(vcpu, VM_REG_GUEST_CR4, set_cr4_val);
+
+	if (!error && set_dr0)
+		error = vm_set_register(vcpu, VM_REG_GUEST_DR0, set_dr0_val);
+
+	if (!error && set_dr1)
+		error = vm_set_register(vcpu, VM_REG_GUEST_DR1, set_dr1_val);
+
+	if (!error && set_dr2)
+		error = vm_set_register(vcpu, VM_REG_GUEST_DR2, set_dr2_val);
+
+	if (!error && set_dr3)
+		error = vm_set_register(vcpu, VM_REG_GUEST_DR3, set_dr3_val);
+
+	if (!error && set_dr6)
+		error = vm_set_register(vcpu, VM_REG_GUEST_DR6, set_dr6_val);
+
+	if (!error && set_dr7)
+		error = vm_set_register(vcpu, VM_REG_GUEST_DR7, set_dr7_val);
+
+	if (!error && set_rsp)
+		error = vm_set_register(vcpu, VM_REG_GUEST_RSP, set_rsp_val);
+
+	if (!error && set_rip)
+		error = vm_set_register(vcpu, VM_REG_GUEST_RIP, set_rip_val);
+
+	if (!error && set_rax)
+		error = vm_set_register(vcpu, VM_REG_GUEST_RAX, set_rax_val);
+
+	if (!error && set_rflags)
+		error = vm_set_register(vcpu, VM_REG_GUEST_RFLAGS,
+		    set_rflags_val);
+
+	if (!error && set_desc_ds) {
+		error = vm_set_desc(vcpu, VM_REG_GUEST_DS,
+		    desc_base, desc_limit, desc_access);
+	}
+
+	if (!error && set_desc_es) {
+		error = vm_set_desc(vcpu, VM_REG_GUEST_ES,
+		    desc_base, desc_limit, desc_access);
+	}
+
+	if (!error && set_desc_ss) {
+		error = vm_set_desc(vcpu, VM_REG_GUEST_SS,
+		    desc_base, desc_limit, desc_access);
+	}
+
+	if (!error && set_desc_cs) {
+		error = vm_set_desc(vcpu, VM_REG_GUEST_CS,
+		    desc_base, desc_limit, desc_access);
+	}
+
+	if (!error && set_desc_fs) {
+		error = vm_set_desc(vcpu, VM_REG_GUEST_FS,
+		    desc_base, desc_limit, desc_access);
+	}
+
+	if (!error && set_desc_gs) {
+		error = vm_set_desc(vcpu, VM_REG_GUEST_GS,
+		    desc_base, desc_limit, desc_access);
+	}
+
+	if (!error && set_desc_tr) {
+		error = vm_set_desc(vcpu, VM_REG_GUEST_TR,
+		    desc_base, desc_limit, desc_access);
+	}
+
+	if (!error && set_desc_ldtr) {
+		error = vm_set_desc(vcpu, VM_REG_GUEST_LDTR,
+		    desc_base, desc_limit, desc_access);
+	}
+
+	if (!error && set_desc_gdtr) {
+		error = vm_set_desc(vcpu, VM_REG_GUEST_GDTR,
+		    desc_base, desc_limit, 0);
+	}
+
+	if (!error && set_desc_idtr) {
+		error = vm_set_desc(vcpu, VM_REG_GUEST_IDTR,
+		    desc_base, desc_limit, 0);
+	}
+
+	if (!error && set_cs)
+		error = vm_set_register(vcpu, VM_REG_GUEST_CS, set_cs_val);
+
+	if (!error && set_ds)
+		error = vm_set_register(vcpu, VM_REG_GUEST_DS, set_ds_val);
+
+	if (!error && set_es)
+		error = vm_set_register(vcpu, VM_REG_GUEST_ES, set_es_val);
+
+	if (!error && set_fs)
+		error = vm_set_register(vcpu, VM_REG_GUEST_FS, set_fs_val);
+
+	if (!error && set_gs)
+		error = vm_set_register(vcpu, VM_REG_GUEST_GS, set_gs_val);
+
+	if (!error && set_ss)
+		error = vm_set_register(vcpu, VM_REG_GUEST_SS, set_ss_val);
+
+	if (!error && set_tr)
+		error = vm_set_register(vcpu, VM_REG_GUEST_TR, set_tr_val);
+
+	if (!error && set_ldtr)
+		error = vm_set_register(vcpu, VM_REG_GUEST_LDTR, set_ldtr_val);
+
+	if (!error && set_x2apic_state)
+		error = vm_set_x2apic_state(vcpu, x2apic_state);
+
+	if (!error && unassign_pptdev)
+		error = vm_unassign_pptdev(ctx, bus, slot, func);
+
+	if (!error && inject_nmi)
+		error = vm_inject_nmi(vcpu);
+
+	if (!error && assert_lapic_lvt != -1)
+		error = vm_lapic_local_irq(vcpu, assert_lapic_lvt);
+
+	if (!error)
+		error = get_all_registers(vcpu, vcpuid, get_all);
+
+	if (!error)
+		error = get_all_segments(vcpu, vcpuid, get_all);
+
+	if (!error) {
+		if (cpu_intel)
+			error = get_misc_vmcs(vcpu, vcpuid, get_all);
+		else
+			error = get_misc_vmcb(vcpu, vcpuid, get_all);
+	}
+
+	if (!error && (get_x2apic_state || get_all)) {
+		error = vm_get_x2apic_state(vcpu, &x2apic_state);
+		if (error == 0)
+			printf("x2apic_state[%d]\t%d\n", vcpuid, x2apic_state);
+	}
+
+	if (!error && (get_eptp || get_all)) {
+		if (cpu_intel)
+			error = vm_get_vmcs_field(vcpu, VMCS_EPTP, &eptp);
+		else
+			error = vm_get_vmcb_field(vcpu, VMCB_OFF_NPT_BASE, 8,
+			    &eptp);
+		if (error == 0)
+			printf("%s[%d]\t\t0x%016lx\n",
+				cpu_intel ? "eptp" : "rvi/npt", vcpuid, eptp);
+	}
+
+	if (!error && (get_exception_bitmap || get_all)) {
+		if (cpu_intel)
+			error = vm_get_vmcs_field(vcpu, VMCS_EXCEPTION_BITMAP,
+			    &bm);
+		else
+			error = vm_get_vmcb_field(vcpu, VMCB_OFF_EXC_INTERCEPT,
+			    4, &bm);
+		if (error == 0)
+			printf("exception_bitmap[%d]\t%#lx\n", vcpuid, bm);
+	}
+
+	if (!error && (get_io_bitmap || get_all)) {
+		if (cpu_intel) {
+			error = vm_get_vmcs_field(vcpu, VMCS_IO_BITMAP_A, &bm);
+			if (error == 0)
+				printf("io_bitmap_a[%d]\t%#lx\n", vcpuid, bm);
+			error = vm_get_vmcs_field(vcpu, VMCS_IO_BITMAP_B, &bm);
+			if (error == 0)
+				printf("io_bitmap_b[%d]\t%#lx\n", vcpuid, bm);
+		} else {
+			error = vm_get_vmcb_field(vcpu, VMCB_OFF_IO_PERM, 8,
+			    &bm);
+			if (error == 0)
+				printf("io_bitmap[%d]\t%#lx\n", vcpuid, bm);
+		}
+	}
+
+	if (!error && (get_tsc_offset || get_all)) {
+		uint64_t tscoff;
+
+		if (cpu_intel)
+			error = vm_get_vmcs_field(vcpu, VMCS_TSC_OFFSET,
+			    &tscoff);
+		else
+			error = vm_get_vmcb_field(vcpu, VMCB_OFF_TSC_OFFSET, 8,
+			    &tscoff);
+		if (error == 0)
+			printf("tsc_offset[%d]\t0x%016lx\n", vcpuid, tscoff);
+	}
+
+	if (!error && (get_msr_bitmap_address || get_all)) {
+		if (cpu_intel)
+			error = vm_get_vmcs_field(vcpu, VMCS_MSR_BITMAP, &addr);
+		else
+			error = vm_get_vmcb_field(vcpu, VMCB_OFF_MSR_PERM, 8,
+			    &addr);
+		if (error == 0)
+			printf("msr_bitmap[%d]\t\t%#lx\n", vcpuid, addr);
+	}
+
+	if (!error && (get_msr_bitmap || get_all)) {
+		if (cpu_intel) {
+			error = vm_get_vmcs_field(vcpu, VMCS_MSR_BITMAP, &addr);
+		} else {
+			error = vm_get_vmcb_field(vcpu, VMCB_OFF_MSR_PERM, 8,
+			    &addr);
+		}
+
+		if (error == 0)
+			error = dump_msr_bitmap(vcpuid, addr, cpu_intel);
+	}
+
+	if (!error && (get_vpid_asid || get_all)) {
+		uint64_t vpid;
+
+		if (cpu_intel)
+			error = vm_get_vmcs_field(vcpu, VMCS_VPID, &vpid);
+		else
+			error = vm_get_vmcb_field(vcpu, VMCB_OFF_ASID, 4,
+			    &vpid);
+		if (error == 0)
+			printf("%s[%d]\t\t0x%04lx\n",
+				cpu_intel ? "vpid" : "asid", vcpuid, vpid);
+	}
+
+	if (!error && (get_guest_pat || get_all)) {
+		if (cpu_intel)
+			error = vm_get_vmcs_field(vcpu, VMCS_GUEST_IA32_PAT,
+			    &pat);
+		else
+			error = vm_get_vmcb_field(vcpu, VMCB_OFF_GUEST_PAT, 8,
+			    &pat);
+		if (error == 0)
+			printf("guest_pat[%d]\t\t0x%016lx\n", vcpuid, pat);
+	}
+
+	if (!error && (get_guest_sysenter || get_all)) {
+		if (cpu_intel)
+			error = vm_get_vmcs_field(vcpu,
+			    VMCS_GUEST_IA32_SYSENTER_CS, &cs);
+		else
+			error = vm_get_vmcb_field(vcpu,
+			    VMCB_OFF_SYSENTER_CS, 8, &cs);
+
+		if (error == 0)
+			printf("guest_sysenter_cs[%d]\t%#lx\n", vcpuid, cs);
+		if (cpu_intel)
+			error = vm_get_vmcs_field(vcpu,
+			    VMCS_GUEST_IA32_SYSENTER_ESP, &rsp);
+		else
+			error = vm_get_vmcb_field(vcpu, VMCB_OFF_SYSENTER_ESP,
+			    8, &rsp);
+
+		if (error == 0)
+			printf("guest_sysenter_sp[%d]\t%#lx\n", vcpuid, rsp);
+		if (cpu_intel)
+			error = vm_get_vmcs_field(vcpu,
+			    VMCS_GUEST_IA32_SYSENTER_EIP, &rip);
+		else
+			error = vm_get_vmcb_field(vcpu, VMCB_OFF_SYSENTER_EIP,
+			    8, &rip);
+		if (error == 0)
+			printf("guest_sysenter_ip[%d]\t%#lx\n", vcpuid, rip);
+	}
+
+	if (!error && (get_exit_reason || get_all)) {
+		if (cpu_intel)
+			error = vm_get_vmcs_field(vcpu, VMCS_EXIT_REASON, &u64);
+		else
+			error = vm_get_vmcb_field(vcpu, VMCB_OFF_EXIT_REASON, 8,
+			    &u64);
+		if (error == 0)
+			printf("exit_reason[%d]\t%#lx\n", vcpuid, u64);
+	}
+
+	if (!error && get_gpa_pmap) {
+		error = vm_get_gpa_pmap(ctx, gpa_pmap, pteval, &ptenum);
+		if (error == 0) {
+			printf("gpa %#lx:", gpa_pmap);
+			pte = &pteval[0];
+			while (ptenum-- > 0)
+				printf(" %#lx", *pte++);
+			printf("\n");
+		}
+	}
+
+	if (!error && set_rtc_nvram)
+		error = vm_rtc_write(ctx, rtc_nvram_offset, rtc_nvram_value);
+
+	if (!error && (get_rtc_nvram || get_all)) {
+		error = vm_rtc_read(ctx, rtc_nvram_offset, &rtc_nvram_value);
+		if (error == 0) {
+			printf("rtc nvram[%03d]: 0x%02x\n", rtc_nvram_offset,
+			    rtc_nvram_value);
+		}
+	}
+
+	if (!error && set_rtc_time)
+		error = vm_rtc_settime(ctx, rtc_secs);
+
+	if (!error && (get_rtc_time || get_all)) {
+		error = vm_rtc_gettime(ctx, &rtc_secs);
+		if (error == 0) {
+			gmtime_r(&rtc_secs, &tm);
+			printf("rtc time %#lx: %s %s %02d %02d:%02d:%02d %d\n",
+			    rtc_secs, wday_str(tm.tm_wday), mon_str(tm.tm_mon),
+			    tm.tm_mday, tm.tm_hour, tm.tm_min, tm.tm_sec,
+			    1900 + tm.tm_year);
+		}
+	}
+
+	if (!error && (get_intinfo || get_all)) {
+		error = vm_get_intinfo(vcpu, &info[0], &info[1]);
+		if (!error) {
+			print_intinfo("pending", info[0]);
+			print_intinfo("current", info[1]);
+		}
+	}
+}
diff --git a/usr.sbin/bhyvectl/bhyvectl.c b/usr.sbin/bhyvectl/bhyvectl.c
index 90c9d51c2138..5e23860d711c 100644
--- a/usr.sbin/bhyvectl/bhyvectl.c
+++ b/usr.sbin/bhyvectl/bhyvectl.c
@@ -27,7 +27,6 @@
  */
 
 #include <sys/param.h>
-#include <sys/types.h>
 #include <sys/cpuset.h>
 #include <sys/errno.h>
 #include <sys/mman.h>
@@ -45,371 +44,54 @@
 #include <libutil.h>
 #include <fcntl.h>
 #include <getopt.h>
-#include <time.h>
-#include <assert.h>
 #include <libutil.h>
 
 #include <machine/cpufunc.h>
-#include <machine/specialreg.h>
 #include <machine/vmm.h>
 #include <machine/vmm_dev.h>
 #include <vmmapi.h>
 
-#include "amd/vmcb.h"
-#include "intel/vmcs.h"
-
 #ifdef BHYVE_SNAPSHOT
 #include "snapshot.h"
 #endif
 
+#include "bhyvectl.h"
+
 #define	MB	(1UL << 20)
 #define	GB	(1UL << 30)
 
-#define	REQ_ARG		required_argument
-#define	NO_ARG		no_argument
-#define	OPT_ARG		optional_argument
-
 static const char *progname;
 
-static int get_rtc_time, set_rtc_time;
-static int get_rtc_nvram, set_rtc_nvram;
-static int rtc_nvram_offset;
-static uint8_t rtc_nvram_value;
-static time_t rtc_secs;
-
-static int get_stats, getcap, setcap, capval, get_gpa_pmap;
-static int inject_nmi, assert_lapic_lvt;
+static int get_stats, getcap, setcap, capval;
 static int force_reset, force_poweroff;
 static const char *capname;
 static int create, destroy, get_memmap, get_memseg;
-static int get_intinfo;
 static int get_active_cpus, get_debug_cpus, get_suspended_cpus;
 static uint64_t memsize;
-static int set_cr0, get_cr0, set_cr2, get_cr2, set_cr3, get_cr3;
-static int set_cr4, get_cr4;
-static int set_efer, get_efer;
-static int set_dr0, get_dr0;
-static int set_dr1, get_dr1;
-static int set_dr2, get_dr2;
-static int set_dr3, get_dr3;
-static int set_dr6, get_dr6;
-static int set_dr7, get_dr7;
-static int set_rsp, get_rsp, set_rip, get_rip, set_rflags, get_rflags;
-static int set_rax, get_rax;
-static int get_rbx, get_rcx, get_rdx, get_rsi, get_rdi, get_rbp;
-static int get_r8, get_r9, get_r10, get_r11, get_r12, get_r13, get_r14, get_r15;
-static int set_desc_ds, get_desc_ds;
-static int set_desc_es, get_desc_es;
-static int set_desc_fs, get_desc_fs;
-static int set_desc_gs, get_desc_gs;
-static int set_desc_cs, get_desc_cs;
-static int set_desc_ss, get_desc_ss;
-static int set_desc_gdtr, get_desc_gdtr;
-static int set_desc_idtr, get_desc_idtr;
-static int set_desc_tr, get_desc_tr;
-static int set_desc_ldtr, get_desc_ldtr;
-static int set_cs, set_ds, set_es, set_fs, set_gs, set_ss, set_tr, set_ldtr;
-static int get_cs, get_ds, get_es, get_fs, get_gs, get_ss, get_tr, get_ldtr;
-static int set_x2apic_state, get_x2apic_state;
-static enum x2apic_state x2apic_state;
-static int unassign_pptdev, bus, slot, func;
 static int run;
 static int get_cpu_topology;
 #ifdef BHYVE_SNAPSHOT
 static int vm_suspend_opt;
 #endif
 
-/*
- * VMCB specific.
- */
-static int get_vmcb_intercept, get_vmcb_exit_details, get_vmcb_tlb_ctrl;
-static int get_vmcb_virq, get_avic_table;
-
-/*
- * VMCS-specific fields
- */
-static int get_pinbased_ctls, get_procbased_ctls, get_procbased_ctls2;
-static int get_eptp, get_io_bitmap, get_tsc_offset;
-static int get_vmcs_entry_interruption_info;
-static int get_vmcs_interruptibility;
-static int get_vmcs_gpa, get_vmcs_gla;
-static int get_exception_bitmap;
-static int get_cr0_mask, get_cr0_shadow;
-static int get_cr4_mask, get_cr4_shadow;
-static int get_cr3_targets;
-static int get_apic_access_addr, get_virtual_apic_addr, get_tpr_threshold;
-static int get_msr_bitmap, get_msr_bitmap_address;
-static int get_vpid_asid;
-static int get_inst_err, get_exit_ctls, get_entry_ctls;
-static int get_host_cr0, get_host_cr3, get_host_cr4;
-static int get_host_rip, get_host_rsp;
-static int get_guest_pat, get_host_pat;
-static int get_guest_sysenter, get_vmcs_link;
-static int get_exit_reason, get_vmcs_exit_qualification;
-static int get_vmcs_exit_interruption_info, get_vmcs_exit_interruption_error;
-static int get_vmcs_exit_inst_length;
-
-static uint64_t desc_base;
-static uint32_t desc_limit, desc_access;
-
 static int get_all;
 
-static void
-dump_vm_run_exitcode(struct vm_exit *vmexit, int vcpu)
-{
-	printf("vm exit[%d]\n", vcpu);
-	printf("\trip\t\t0x%016lx\n", vmexit->rip);
-	printf("\tinst_length\t%d\n", vmexit->inst_length);
-	switch (vmexit->exitcode) {
-	case VM_EXITCODE_INOUT:
-		printf("\treason\t\tINOUT\n");
-		printf("\tdirection\t%s\n", vmexit->u.inout.in ? "IN" : "OUT");
-		printf("\tbytes\t\t%d\n", vmexit->u.inout.bytes);
-		printf("\tflags\t\t%s%s\n",
-			vmexit->u.inout.string ? "STRING " : "",
-			vmexit->u.inout.rep ? "REP " : "");
-		printf("\tport\t\t0x%04x\n", vmexit->u.inout.port);
-		printf("\teax\t\t0x%08x\n", vmexit->u.inout.eax);
-		break;
-	case VM_EXITCODE_VMX:
-		printf("\treason\t\tVMX\n");
-		printf("\tstatus\t\t%d\n", vmexit->u.vmx.status);
-		printf("\texit_reason\t0x%08x (%u)\n",
-		    vmexit->u.vmx.exit_reason, vmexit->u.vmx.exit_reason);
-		printf("\tqualification\t0x%016lx\n",
-			vmexit->u.vmx.exit_qualification);
-		printf("\tinst_type\t\t%d\n", vmexit->u.vmx.inst_type);
-		printf("\tinst_error\t\t%d\n", vmexit->u.vmx.inst_error);
-		break;
-	case VM_EXITCODE_SVM:
-		printf("\treason\t\tSVM\n");
-		printf("\texit_reason\t\t%#lx\n", vmexit->u.svm.exitcode);
-		printf("\texitinfo1\t\t%#lx\n", vmexit->u.svm.exitinfo1);
-		printf("\texitinfo2\t\t%#lx\n", vmexit->u.svm.exitinfo2);
-		break;
-	default:
-		printf("*** unknown vm run exitcode %d\n", vmexit->exitcode);
-		break;
-	}
-}
-
-/* AMD 6th generation and Intel compatible MSRs */
-#define MSR_AMD6TH_START	0xC0000000
-#define MSR_AMD6TH_END		0xC0001FFF
-/* AMD 7th and 8th generation compatible MSRs */
-#define MSR_AMD7TH_START	0xC0010000
-#define MSR_AMD7TH_END		0xC0011FFF
-
-static const char *
-msr_name(uint32_t msr)
-{
-	static char buf[32];
-
-	switch(msr) {
-	case MSR_TSC:
-		return ("MSR_TSC");
-	case MSR_EFER:
-		return ("MSR_EFER");
-	case MSR_STAR:
-		return ("MSR_STAR");
-	case MSR_LSTAR:	
-		return ("MSR_LSTAR");
-	case MSR_CSTAR:
-		return ("MSR_CSTAR");
-	case MSR_SF_MASK:
-		return ("MSR_SF_MASK");
-	case MSR_FSBASE:
-		return ("MSR_FSBASE");
-	case MSR_GSBASE:
-		return ("MSR_GSBASE");
-	case MSR_KGSBASE:
-		return ("MSR_KGSBASE");
-	case MSR_SYSENTER_CS_MSR:
-		return ("MSR_SYSENTER_CS_MSR");
-	case MSR_SYSENTER_ESP_MSR:
-		return ("MSR_SYSENTER_ESP_MSR");
-	case MSR_SYSENTER_EIP_MSR:
-		return ("MSR_SYSENTER_EIP_MSR");
-	case MSR_PAT:
-		return ("MSR_PAT");
-	}
-	snprintf(buf, sizeof(buf), "MSR       %#08x", msr);
-
-	return (buf);
-}
-
-static inline void
-print_msr_pm(uint64_t msr, int vcpu, int readable, int writeable)
-{
-
-	if (readable || writeable) {
-		printf("%-20s[%d]\t\t%c%c\n", msr_name(msr), vcpu,
-			readable ? 'R' : '-', writeable ? 'W' : '-');
-	}
-}
-
-/*
- * Reference APM vol2, section 15.11 MSR Intercepts.
- */
-static void
-dump_amd_msr_pm(const char *bitmap, int vcpu)
-{
-	int byte, bit, readable, writeable;
-	uint32_t msr;
-
-	for (msr = 0; msr < 0x2000; msr++) {
-		byte = msr / 4;
-		bit = (msr % 4) * 2;
-
-		/* Look at MSRs in the range 0x00000000 to 0x00001FFF */
-		readable = (bitmap[byte] & (1 << bit)) ? 0 : 1;
-		writeable = (bitmap[byte] & (2 << bit)) ?  0 : 1;
-		print_msr_pm(msr, vcpu, readable, writeable);
-
-		/* Look at MSRs in the range 0xC0000000 to 0xC0001FFF */
-		byte += 2048;
-		readable = (bitmap[byte] & (1 << bit)) ? 0 : 1;
-		writeable = (bitmap[byte] & (2 << bit)) ?  0 : 1;
-		print_msr_pm(msr + MSR_AMD6TH_START, vcpu, readable,
-				writeable);
-		
-		/* MSR 0xC0010000 to 0xC0011FF is only for AMD */
-		byte += 4096;
-		readable = (bitmap[byte] & (1 << bit)) ? 0 : 1;
-		writeable = (bitmap[byte] & (2 << bit)) ?  0 : 1;
-		print_msr_pm(msr + MSR_AMD7TH_START, vcpu, readable,
-				writeable);
-	}
-}
-
-/*
- * Reference Intel SDM Vol3 Section 24.6.9 MSR-Bitmap Address
- */
-static void
-dump_intel_msr_pm(const char *bitmap, int vcpu)
-{
-	int byte, bit, readable, writeable;
-	uint32_t msr;
-
-	for (msr = 0; msr < 0x2000; msr++) {
-		byte = msr / 8;
-		bit = msr & 0x7;
-
-		/* Look at MSRs in the range 0x00000000 to 0x00001FFF */
-		readable = (bitmap[byte] & (1 << bit)) ? 0 : 1;
-		writeable = (bitmap[2048 + byte] & (1 << bit)) ?  0 : 1;
-		print_msr_pm(msr, vcpu, readable, writeable);
-
-		/* Look at MSRs in the range 0xC0000000 to 0xC0001FFF */
-		byte += 1024;
-		readable = (bitmap[byte] & (1 << bit)) ? 0 : 1;
-		writeable = (bitmap[2048 + byte] & (1 << bit)) ?  0 : 1;
-		print_msr_pm(msr + MSR_AMD6TH_START, vcpu, readable,
-				writeable);
-	}
-}
-
-static int
-dump_msr_bitmap(int vcpu, uint64_t addr, bool cpu_intel)
-{
-	char *bitmap;
-	int error, fd, map_size;
-
-	error = -1;
-	bitmap = MAP_FAILED;
-
-	fd = open("/dev/mem", O_RDONLY, 0);
-	if (fd < 0) {
-		perror("Couldn't open /dev/mem");
-		goto done;
-	}
-
-	if (cpu_intel)
-		map_size = PAGE_SIZE;
-	else
-		map_size = 2 * PAGE_SIZE;
-
-	bitmap = mmap(NULL, map_size, PROT_READ, MAP_SHARED, fd, addr);
-	if (bitmap == MAP_FAILED) {
-		perror("mmap failed");
-		goto done;
-	}
-	
-	if (cpu_intel)
-		dump_intel_msr_pm(bitmap, vcpu);
-	else	
-		dump_amd_msr_pm(bitmap, vcpu);
-
-	error = 0;
-done:
-	if (bitmap != MAP_FAILED)
-		munmap((void *)bitmap, map_size);
-	if (fd >= 0)
-		close(fd);
-
-	return (error);
-}
-
-static int
-vm_get_vmcs_field(struct vcpu *vcpu, int field, uint64_t *ret_val)
-{
-
-	return (vm_get_register(vcpu, VMCS_IDENT(field), ret_val));
-}
-
-static int
-vm_get_vmcb_field(struct vcpu *vcpu, int off, int bytes,
-	uint64_t *ret_val)
-{
-
-	return (vm_get_register(vcpu, VMCB_ACCESS(off, bytes), ret_val));
-}
-
 enum {
-	VMNAME = 1000,	/* avoid collision with return values from getopt */
+	VMNAME = OPT_START,	/* avoid collision with return values from getopt */
 	VCPU,
 	SET_MEM,
-	SET_EFER,
-	SET_CR0,
-	SET_CR2,
-	SET_CR3,
-	SET_CR4,
-	SET_DR0,
-	SET_DR1,
-	SET_DR2,
-	SET_DR3,
-	SET_DR6,
-	SET_DR7,
-	SET_RSP,
-	SET_RIP,
-	SET_RAX,
-	SET_RFLAGS,
-	DESC_BASE,
-	DESC_LIMIT,
-	DESC_ACCESS,
-	SET_CS,
-	SET_DS,
-	SET_ES,
-	SET_FS,
-	SET_GS,
-	SET_SS,
-	SET_TR,
-	SET_LDTR,
-	SET_X2APIC_STATE,
 	SET_CAP,
 	CAPNAME,
-	UNASSIGN_PPTDEV,
-	GET_GPA_PMAP,
-	ASSERT_LAPIC_LVT,
-	SET_RTC_TIME,
-	SET_RTC_NVRAM,
-	RTC_NVRAM_OFFSET,
 #ifdef BHYVE_SNAPSHOT
 	SET_CHECKPOINT_FILE,
 	SET_SUSPEND_FILE,
 #endif
+	OPT_LAST,
 };
 
+_Static_assert(OPT_LAST < OPT_START_MD,
+    "OPT_LAST must be less than OPT_START_MD");
+
 static void
 print_cpus(const char *banner, const cpuset_t *cpus)
 {
@@ -429,848 +111,28 @@ print_cpus(const char *banner, const cpuset_t *cpus)
 	printf("\n");
 }
 
-static void
-print_intinfo(const char *banner, uint64_t info)
-{
-	int type;
-
-	printf("%s:\t", banner);
-	if (info & VM_INTINFO_VALID) {
-		type = info & VM_INTINFO_TYPE;
-		switch (type) {
-		case VM_INTINFO_HWINTR:
-			printf("extint");
-			break;
-		case VM_INTINFO_NMI:
-			printf("nmi");
-			break;
-		case VM_INTINFO_SWINTR:
-			printf("swint");
-			break;
-		default:
-			printf("exception");
-			break;
-		}
-		printf(" vector %d", (int)VM_INTINFO_VECTOR(info));
-		if (info & VM_INTINFO_DEL_ERRCODE)
-			printf(" errcode %#x", (u_int)(info >> 32));
-	} else {
-		printf("n/a");
-	}
-	printf("\n");
-}
-
-static bool
-cpu_vendor_intel(void)
-{
-	u_int regs[4], v[3];
-
-	do_cpuid(0, regs);
-	v[0] = regs[1];
-	v[1] = regs[3];
-	v[2] = regs[2];
-
-	if (memcmp(v, "GenuineIntel", sizeof(v)) == 0)
-		return (true);
-	if (memcmp(v, "AuthenticAMD", sizeof(v)) == 0 ||
-	    memcmp(v, "HygonGenuine", sizeof(v)) == 0)
-		return (false);
-	fprintf(stderr, "Unknown cpu vendor \"%s\"\n", (const char *)v);
-	exit(1);
-}
-
-static int
-get_all_registers(struct vcpu *vcpu, int vcpuid)
-{
-	uint64_t cr0, cr2, cr3, cr4, dr0, dr1, dr2, dr3, dr6, dr7;
-	uint64_t rsp, rip, rflags, efer;
-	uint64_t rax, rbx, rcx, rdx, rsi, rdi, rbp;
-	uint64_t r8, r9, r10, r11, r12, r13, r14, r15;
-	int error = 0;
-
-	if (!error && (get_efer || get_all)) {
-		error = vm_get_register(vcpu, VM_REG_GUEST_EFER, &efer);
-		if (error == 0)
-			printf("efer[%d]\t\t0x%016lx\n", vcpuid, efer);
-	}
-
-	if (!error && (get_cr0 || get_all)) {
-		error = vm_get_register(vcpu, VM_REG_GUEST_CR0, &cr0);
-		if (error == 0)
-			printf("cr0[%d]\t\t0x%016lx\n", vcpuid, cr0);
-	}
-
-	if (!error && (get_cr2 || get_all)) {
-		error = vm_get_register(vcpu, VM_REG_GUEST_CR2, &cr2);
-		if (error == 0)
-			printf("cr2[%d]\t\t0x%016lx\n", vcpuid, cr2);
-	}
-
-	if (!error && (get_cr3 || get_all)) {
-		error = vm_get_register(vcpu, VM_REG_GUEST_CR3, &cr3);
-		if (error == 0)
-			printf("cr3[%d]\t\t0x%016lx\n", vcpuid, cr3);
-	}
-
-	if (!error && (get_cr4 || get_all)) {
-		error = vm_get_register(vcpu, VM_REG_GUEST_CR4, &cr4);
-		if (error == 0)
-			printf("cr4[%d]\t\t0x%016lx\n", vcpuid, cr4);
-	}
-
-	if (!error && (get_dr0 || get_all)) {
-		error = vm_get_register(vcpu, VM_REG_GUEST_DR0, &dr0);
-		if (error == 0)
-			printf("dr0[%d]\t\t0x%016lx\n", vcpuid, dr0);
-	}
-
-	if (!error && (get_dr1 || get_all)) {
-		error = vm_get_register(vcpu, VM_REG_GUEST_DR1, &dr1);
-		if (error == 0)
-			printf("dr1[%d]\t\t0x%016lx\n", vcpuid, dr1);
-	}
-
-	if (!error && (get_dr2 || get_all)) {
-		error = vm_get_register(vcpu, VM_REG_GUEST_DR2, &dr2);
-		if (error == 0)
-			printf("dr2[%d]\t\t0x%016lx\n", vcpuid, dr2);
-	}
-
-	if (!error && (get_dr3 || get_all)) {
-		error = vm_get_register(vcpu, VM_REG_GUEST_DR3, &dr3);
-		if (error == 0)
-			printf("dr3[%d]\t\t0x%016lx\n", vcpuid, dr3);
-	}
-
-	if (!error && (get_dr6 || get_all)) {
-		error = vm_get_register(vcpu, VM_REG_GUEST_DR6, &dr6);
-		if (error == 0)
-			printf("dr6[%d]\t\t0x%016lx\n", vcpuid, dr6);
-	}
-
-	if (!error && (get_dr7 || get_all)) {
-		error = vm_get_register(vcpu, VM_REG_GUEST_DR7, &dr7);
-		if (error == 0)
-			printf("dr7[%d]\t\t0x%016lx\n", vcpuid, dr7);
-	}
-
-	if (!error && (get_rsp || get_all)) {
-		error = vm_get_register(vcpu, VM_REG_GUEST_RSP, &rsp);
-		if (error == 0)
-			printf("rsp[%d]\t\t0x%016lx\n", vcpuid, rsp);
-	}
-
-	if (!error && (get_rip || get_all)) {
-		error = vm_get_register(vcpu, VM_REG_GUEST_RIP, &rip);
-		if (error == 0)
-			printf("rip[%d]\t\t0x%016lx\n", vcpuid, rip);
-	}
-
-	if (!error && (get_rax || get_all)) {
-		error = vm_get_register(vcpu, VM_REG_GUEST_RAX, &rax);
-		if (error == 0)
-			printf("rax[%d]\t\t0x%016lx\n", vcpuid, rax);
-	}
-
-	if (!error && (get_rbx || get_all)) {
-		error = vm_get_register(vcpu, VM_REG_GUEST_RBX, &rbx);
-		if (error == 0)
-			printf("rbx[%d]\t\t0x%016lx\n", vcpuid, rbx);
-	}
-
-	if (!error && (get_rcx || get_all)) {
-		error = vm_get_register(vcpu, VM_REG_GUEST_RCX, &rcx);
-		if (error == 0)
-			printf("rcx[%d]\t\t0x%016lx\n", vcpuid, rcx);
-	}
-
-	if (!error && (get_rdx || get_all)) {
-		error = vm_get_register(vcpu, VM_REG_GUEST_RDX, &rdx);
-		if (error == 0)
-			printf("rdx[%d]\t\t0x%016lx\n", vcpuid, rdx);
-	}
-
-	if (!error && (get_rsi || get_all)) {
-		error = vm_get_register(vcpu, VM_REG_GUEST_RSI, &rsi);
-		if (error == 0)
-			printf("rsi[%d]\t\t0x%016lx\n", vcpuid, rsi);
-	}
-
-	if (!error && (get_rdi || get_all)) {
-		error = vm_get_register(vcpu, VM_REG_GUEST_RDI, &rdi);
-		if (error == 0)
-			printf("rdi[%d]\t\t0x%016lx\n", vcpuid, rdi);
-	}
-
-	if (!error && (get_rbp || get_all)) {
-		error = vm_get_register(vcpu, VM_REG_GUEST_RBP, &rbp);
-		if (error == 0)
-			printf("rbp[%d]\t\t0x%016lx\n", vcpuid, rbp);
-	}
-
-	if (!error && (get_r8 || get_all)) {
-		error = vm_get_register(vcpu, VM_REG_GUEST_R8, &r8);
-		if (error == 0)
-			printf("r8[%d]\t\t0x%016lx\n", vcpuid, r8);
-	}
-
-	if (!error && (get_r9 || get_all)) {
-		error = vm_get_register(vcpu, VM_REG_GUEST_R9, &r9);
-		if (error == 0)
-			printf("r9[%d]\t\t0x%016lx\n", vcpuid, r9);
-	}
-
-	if (!error && (get_r10 || get_all)) {
-		error = vm_get_register(vcpu, VM_REG_GUEST_R10, &r10);
-		if (error == 0)
-			printf("r10[%d]\t\t0x%016lx\n", vcpuid, r10);
-	}
-
-	if (!error && (get_r11 || get_all)) {
-		error = vm_get_register(vcpu, VM_REG_GUEST_R11, &r11);
-		if (error == 0)
-			printf("r11[%d]\t\t0x%016lx\n", vcpuid, r11);
-	}
-
-	if (!error && (get_r12 || get_all)) {
-		error = vm_get_register(vcpu, VM_REG_GUEST_R12, &r12);
-		if (error == 0)
-			printf("r12[%d]\t\t0x%016lx\n", vcpuid, r12);
-	}
-
-	if (!error && (get_r13 || get_all)) {
-		error = vm_get_register(vcpu, VM_REG_GUEST_R13, &r13);
-		if (error == 0)
-			printf("r13[%d]\t\t0x%016lx\n", vcpuid, r13);
-	}
-
-	if (!error && (get_r14 || get_all)) {
-		error = vm_get_register(vcpu, VM_REG_GUEST_R14, &r14);
-		if (error == 0)
-			printf("r14[%d]\t\t0x%016lx\n", vcpuid, r14);
-	}
-
-	if (!error && (get_r15 || get_all)) {
-		error = vm_get_register(vcpu, VM_REG_GUEST_R15, &r15);
-		if (error == 0)
-			printf("r15[%d]\t\t0x%016lx\n", vcpuid, r15);
-	}
-
-	if (!error && (get_rflags || get_all)) {
-		error = vm_get_register(vcpu, VM_REG_GUEST_RFLAGS,
-					&rflags);
-		if (error == 0)
-			printf("rflags[%d]\t0x%016lx\n", vcpuid, rflags);
-	}
-
-	return (error);
-}
-
-static int
-get_all_segments(struct vcpu *vcpu, int vcpuid)
-{
-	uint64_t cs, ds, es, fs, gs, ss, tr, ldtr;
-	int error = 0;
-
-	if (!error && (get_desc_ds || get_all)) {
-		error = vm_get_desc(vcpu, VM_REG_GUEST_DS,
-				   &desc_base, &desc_limit, &desc_access);
-		if (error == 0) {
-			printf("ds desc[%d]\t0x%016lx/0x%08x/0x%08x\n",
-			      vcpuid, desc_base, desc_limit, desc_access);
-		}
-	}
-
-	if (!error && (get_desc_es || get_all)) {
-		error = vm_get_desc(vcpu, VM_REG_GUEST_ES,
-				    &desc_base, &desc_limit, &desc_access);
-		if (error == 0) {
-			printf("es desc[%d]\t0x%016lx/0x%08x/0x%08x\n",
-			       vcpuid, desc_base, desc_limit, desc_access);
-		}
-	}
-
-	if (!error && (get_desc_fs || get_all)) {
-		error = vm_get_desc(vcpu, VM_REG_GUEST_FS,
-				    &desc_base, &desc_limit, &desc_access);
-		if (error == 0) {
-			printf("fs desc[%d]\t0x%016lx/0x%08x/0x%08x\n",
-			       vcpuid, desc_base, desc_limit, desc_access);
-		}
-	}
-
-	if (!error && (get_desc_gs || get_all)) {
-		error = vm_get_desc(vcpu, VM_REG_GUEST_GS,
-				    &desc_base, &desc_limit, &desc_access);
-		if (error == 0) {
-			printf("gs desc[%d]\t0x%016lx/0x%08x/0x%08x\n",
-			       vcpuid, desc_base, desc_limit, desc_access);
-		}
-	}
-
-	if (!error && (get_desc_ss || get_all)) {
-		error = vm_get_desc(vcpu, VM_REG_GUEST_SS,
-				    &desc_base, &desc_limit, &desc_access);
-		if (error == 0) {
-			printf("ss desc[%d]\t0x%016lx/0x%08x/0x%08x\n",
-			       vcpuid, desc_base, desc_limit, desc_access);
-		}
-	}
-
-	if (!error && (get_desc_cs || get_all)) {
-		error = vm_get_desc(vcpu, VM_REG_GUEST_CS,
-				    &desc_base, &desc_limit, &desc_access);
-		if (error == 0) {
-			printf("cs desc[%d]\t0x%016lx/0x%08x/0x%08x\n",
-			       vcpuid, desc_base, desc_limit, desc_access);
-		}
-	}
-
-	if (!error && (get_desc_tr || get_all)) {
-		error = vm_get_desc(vcpu, VM_REG_GUEST_TR,
-				    &desc_base, &desc_limit, &desc_access);
-		if (error == 0) {
-			printf("tr desc[%d]\t0x%016lx/0x%08x/0x%08x\n",
-			       vcpuid, desc_base, desc_limit, desc_access);
-		}
-	}
-
-	if (!error && (get_desc_ldtr || get_all)) {
-		error = vm_get_desc(vcpu, VM_REG_GUEST_LDTR,
-				    &desc_base, &desc_limit, &desc_access);
-		if (error == 0) {
-			printf("ldtr desc[%d]\t0x%016lx/0x%08x/0x%08x\n",
-			       vcpuid, desc_base, desc_limit, desc_access);
-		}
-	}
-
-	if (!error && (get_desc_gdtr || get_all)) {
-		error = vm_get_desc(vcpu, VM_REG_GUEST_GDTR,
-				    &desc_base, &desc_limit, &desc_access);
-		if (error == 0) {
-			printf("gdtr[%d]\t\t0x%016lx/0x%08x\n",
-			       vcpuid, desc_base, desc_limit);
-		}
-	}
-
-	if (!error && (get_desc_idtr || get_all)) {
-		error = vm_get_desc(vcpu, VM_REG_GUEST_IDTR,
-				    &desc_base, &desc_limit, &desc_access);
-		if (error == 0) {
-			printf("idtr[%d]\t\t0x%016lx/0x%08x\n",
-			       vcpuid, desc_base, desc_limit);
-		}
-	}
-
-	if (!error && (get_cs || get_all)) {
-		error = vm_get_register(vcpu, VM_REG_GUEST_CS, &cs);
-		if (error == 0)
-			printf("cs[%d]\t\t0x%04lx\n", vcpuid, cs);
-	}
-
-	if (!error && (get_ds || get_all)) {
-		error = vm_get_register(vcpu, VM_REG_GUEST_DS, &ds);
-		if (error == 0)
-			printf("ds[%d]\t\t0x%04lx\n", vcpuid, ds);
-	}
-
-	if (!error && (get_es || get_all)) {
-		error = vm_get_register(vcpu, VM_REG_GUEST_ES, &es);
-		if (error == 0)
-			printf("es[%d]\t\t0x%04lx\n", vcpuid, es);
-	}
-
-	if (!error && (get_fs || get_all)) {
-		error = vm_get_register(vcpu, VM_REG_GUEST_FS, &fs);
-		if (error == 0)
-			printf("fs[%d]\t\t0x%04lx\n", vcpuid, fs);
-	}
-
-	if (!error && (get_gs || get_all)) {
-		error = vm_get_register(vcpu, VM_REG_GUEST_GS, &gs);
-		if (error == 0)
-			printf("gs[%d]\t\t0x%04lx\n", vcpuid, gs);
-	}
-
-	if (!error && (get_ss || get_all)) {
-		error = vm_get_register(vcpu, VM_REG_GUEST_SS, &ss);
-		if (error == 0)
-			printf("ss[%d]\t\t0x%04lx\n", vcpuid, ss);
-	}
-
-	if (!error && (get_tr || get_all)) {
-		error = vm_get_register(vcpu, VM_REG_GUEST_TR, &tr);
-		if (error == 0)
-			printf("tr[%d]\t\t0x%04lx\n", vcpuid, tr);
-	}
-
-	if (!error && (get_ldtr || get_all)) {
-		error = vm_get_register(vcpu, VM_REG_GUEST_LDTR, &ldtr);
-		if (error == 0)
-			printf("ldtr[%d]\t\t0x%04lx\n", vcpuid, ldtr);
-	}
-
-	return (error);
-}
-
-static int
-get_misc_vmcs(struct vcpu *vcpu, int vcpuid)
-{
-	uint64_t ctl, cr0, cr3, cr4, rsp, rip, pat, addr, u64;
-	int error = 0;
-
-	if (!error && (get_cr0_mask || get_all)) {
-		uint64_t cr0mask;
-		error = vm_get_vmcs_field(vcpu, VMCS_CR0_MASK, &cr0mask);
-		if (error == 0)
-			printf("cr0_mask[%d]\t\t0x%016lx\n", vcpuid, cr0mask);
-	}
-
-	if (!error && (get_cr0_shadow || get_all)) {
-		uint64_t cr0shadow;
-		error = vm_get_vmcs_field(vcpu, VMCS_CR0_SHADOW,
-					  &cr0shadow);
-		if (error == 0)
-			printf("cr0_shadow[%d]\t\t0x%016lx\n", vcpuid, cr0shadow);
-	}
-
-	if (!error && (get_cr4_mask || get_all)) {
-		uint64_t cr4mask;
-		error = vm_get_vmcs_field(vcpu, VMCS_CR4_MASK, &cr4mask);
-		if (error == 0)
-			printf("cr4_mask[%d]\t\t0x%016lx\n", vcpuid, cr4mask);
-	}
-
-	if (!error && (get_cr4_shadow || get_all)) {
-		uint64_t cr4shadow;
-		error = vm_get_vmcs_field(vcpu, VMCS_CR4_SHADOW,
-					  &cr4shadow);
-		if (error == 0)
-			printf("cr4_shadow[%d]\t\t0x%016lx\n", vcpuid, cr4shadow);
-	}
-	
-	if (!error && (get_cr3_targets || get_all)) {
-		uint64_t target_count, target_addr;
-		error = vm_get_vmcs_field(vcpu, VMCS_CR3_TARGET_COUNT,
-					  &target_count);
-		if (error == 0) {
-			printf("cr3_target_count[%d]\t0x%016lx\n",
-				vcpuid, target_count);
-		}
-
-		error = vm_get_vmcs_field(vcpu, VMCS_CR3_TARGET0,
-					  &target_addr);
-		if (error == 0) {
-			printf("cr3_target0[%d]\t\t0x%016lx\n",
-				vcpuid, target_addr);
-		}
-
-		error = vm_get_vmcs_field(vcpu, VMCS_CR3_TARGET1,
-					  &target_addr);
-		if (error == 0) {
-			printf("cr3_target1[%d]\t\t0x%016lx\n",
-				vcpuid, target_addr);
-		}
-
-		error = vm_get_vmcs_field(vcpu, VMCS_CR3_TARGET2,
-					  &target_addr);
-		if (error == 0) {
-			printf("cr3_target2[%d]\t\t0x%016lx\n",
-				vcpuid, target_addr);
-		}
-
-		error = vm_get_vmcs_field(vcpu, VMCS_CR3_TARGET3,
-					  &target_addr);
-		if (error == 0) {
-			printf("cr3_target3[%d]\t\t0x%016lx\n",
-				vcpuid, target_addr);
-		}
-	}
-
-	if (!error && (get_pinbased_ctls || get_all)) {
-		error = vm_get_vmcs_field(vcpu, VMCS_PIN_BASED_CTLS, &ctl);
-		if (error == 0)
-			printf("pinbased_ctls[%d]\t0x%016lx\n", vcpuid, ctl);
-	}
-
-	if (!error && (get_procbased_ctls || get_all)) {
-		error = vm_get_vmcs_field(vcpu,
-					  VMCS_PRI_PROC_BASED_CTLS, &ctl);
-		if (error == 0)
-			printf("procbased_ctls[%d]\t0x%016lx\n", vcpuid, ctl);
-	}
-
-	if (!error && (get_procbased_ctls2 || get_all)) {
-		error = vm_get_vmcs_field(vcpu,
-					  VMCS_SEC_PROC_BASED_CTLS, &ctl);
-		if (error == 0)
-			printf("procbased_ctls2[%d]\t0x%016lx\n", vcpuid, ctl);
-	}
-
-	if (!error && (get_vmcs_gla || get_all)) {
-		error = vm_get_vmcs_field(vcpu,
-					  VMCS_GUEST_LINEAR_ADDRESS, &u64);
-		if (error == 0)
-			printf("gla[%d]\t\t0x%016lx\n", vcpuid, u64);
-	}
-
-	if (!error && (get_vmcs_gpa || get_all)) {
-		error = vm_get_vmcs_field(vcpu,
-					  VMCS_GUEST_PHYSICAL_ADDRESS, &u64);
-		if (error == 0)
-			printf("gpa[%d]\t\t0x%016lx\n", vcpuid, u64);
-	}
-
-	if (!error && (get_vmcs_entry_interruption_info || 
-		get_all)) {
-		error = vm_get_vmcs_field(vcpu, VMCS_ENTRY_INTR_INFO,&u64);
-		if (error == 0) {
-			printf("entry_interruption_info[%d]\t0x%016lx\n",
-				vcpuid, u64);
-		}
-	}
-
-	if (!error && (get_tpr_threshold || get_all)) {
-		uint64_t threshold;
-		error = vm_get_vmcs_field(vcpu, VMCS_TPR_THRESHOLD,
-					  &threshold);
-		if (error == 0)
-			printf("tpr_threshold[%d]\t0x%016lx\n", vcpuid, threshold);
-	}
-
-	if (!error && (get_inst_err || get_all)) {
-		uint64_t insterr;
-		error = vm_get_vmcs_field(vcpu, VMCS_INSTRUCTION_ERROR,
-					  &insterr);
-		if (error == 0) {
-			printf("instruction_error[%d]\t0x%016lx\n",
-				vcpuid, insterr);
-		}
-	}
-
-	if (!error && (get_exit_ctls || get_all)) {
-		error = vm_get_vmcs_field(vcpu, VMCS_EXIT_CTLS, &ctl);
-		if (error == 0)
-			printf("exit_ctls[%d]\t\t0x%016lx\n", vcpuid, ctl);
-	}
-
-	if (!error && (get_entry_ctls || get_all)) {
-		error = vm_get_vmcs_field(vcpu, VMCS_ENTRY_CTLS, &ctl);
-		if (error == 0)
-			printf("entry_ctls[%d]\t\t0x%016lx\n", vcpuid, ctl);
-	}
-
-	if (!error && (get_host_pat || get_all)) {
-		error = vm_get_vmcs_field(vcpu, VMCS_HOST_IA32_PAT, &pat);
-		if (error == 0)
-			printf("host_pat[%d]\t\t0x%016lx\n", vcpuid, pat);
-	}
-
-	if (!error && (get_host_cr0 || get_all)) {
-		error = vm_get_vmcs_field(vcpu, VMCS_HOST_CR0, &cr0);
-		if (error == 0)
-			printf("host_cr0[%d]\t\t0x%016lx\n", vcpuid, cr0);
-	}
-
-	if (!error && (get_host_cr3 || get_all)) {
-		error = vm_get_vmcs_field(vcpu, VMCS_HOST_CR3, &cr3);
-		if (error == 0)
-			printf("host_cr3[%d]\t\t0x%016lx\n", vcpuid, cr3);
-	}
-
-	if (!error && (get_host_cr4 || get_all)) {
-		error = vm_get_vmcs_field(vcpu, VMCS_HOST_CR4, &cr4);
-		if (error == 0)
-			printf("host_cr4[%d]\t\t0x%016lx\n", vcpuid, cr4);
-	}
-
-	if (!error && (get_host_rip || get_all)) {
-		error = vm_get_vmcs_field(vcpu, VMCS_HOST_RIP, &rip);
-		if (error == 0)
-			printf("host_rip[%d]\t\t0x%016lx\n", vcpuid, rip);
-	}
-
-	if (!error && (get_host_rsp || get_all)) {
-		error = vm_get_vmcs_field(vcpu, VMCS_HOST_RSP, &rsp);
-		if (error == 0)
-			printf("host_rsp[%d]\t\t0x%016lx\n", vcpuid, rsp);
-	}
-
-	if (!error && (get_vmcs_link || get_all)) {
-		error = vm_get_vmcs_field(vcpu, VMCS_LINK_POINTER, &addr);
-		if (error == 0)
-			printf("vmcs_pointer[%d]\t0x%016lx\n", vcpuid, addr);
-	}
-
-	if (!error && (get_vmcs_exit_interruption_info || get_all)) {
-		error = vm_get_vmcs_field(vcpu, VMCS_EXIT_INTR_INFO, &u64);
-		if (error == 0) {
-			printf("vmcs_exit_interruption_info[%d]\t0x%016lx\n",
-				vcpuid, u64);
-		}
-	}
-
-	if (!error && (get_vmcs_exit_interruption_error || get_all)) {
-		error = vm_get_vmcs_field(vcpu, VMCS_EXIT_INTR_ERRCODE,
-		    			  &u64);
-		if (error == 0) {
-			printf("vmcs_exit_interruption_error[%d]\t0x%016lx\n",
-				vcpuid, u64);
-		}
-	}
-
-	if (!error && (get_vmcs_interruptibility || get_all)) {
-		error = vm_get_vmcs_field(vcpu,
-					  VMCS_GUEST_INTERRUPTIBILITY, &u64);
-		if (error == 0) {
-			printf("vmcs_guest_interruptibility[%d]\t0x%016lx\n",
-				vcpuid, u64);
-		}
-	}
-
-	if (!error && (get_vmcs_exit_inst_length || get_all)) {
-		error = vm_get_vmcs_field(vcpu,
-		    VMCS_EXIT_INSTRUCTION_LENGTH, &u64);
-		if (error == 0)
-			printf("vmcs_exit_inst_length[%d]\t0x%08x\n", vcpuid,
-			    (uint32_t)u64);
-	}
-
-	if (!error && (get_vmcs_exit_qualification || get_all)) {
-		error = vm_get_vmcs_field(vcpu, VMCS_EXIT_QUALIFICATION,
-					  &u64);
-		if (error == 0)
-			printf("vmcs_exit_qualification[%d]\t0x%016lx\n",
-				vcpuid, u64);
-	}
-	
-	return (error);
-}
-
-static int
-get_misc_vmcb(struct vcpu *vcpu, int vcpuid)
-{
-	uint64_t ctl, addr;
-	int error = 0;
-
-	if (!error && (get_vmcb_intercept || get_all)) {
-		error = vm_get_vmcb_field(vcpu, VMCB_OFF_CR_INTERCEPT, 4,
-		    &ctl);
-		if (error == 0)
-			printf("cr_intercept[%d]\t0x%08x\n", vcpuid, (int)ctl);
-
-		error = vm_get_vmcb_field(vcpu, VMCB_OFF_DR_INTERCEPT, 4,
-		    &ctl);
-		if (error == 0)
-			printf("dr_intercept[%d]\t0x%08x\n", vcpuid, (int)ctl);
-
-		error = vm_get_vmcb_field(vcpu, VMCB_OFF_EXC_INTERCEPT, 4,
-		    &ctl);
-		if (error == 0)
-			printf("exc_intercept[%d]\t0x%08x\n", vcpuid, (int)ctl);
-
-		error = vm_get_vmcb_field(vcpu, VMCB_OFF_INST1_INTERCEPT,
-		    4, &ctl);
-		if (error == 0)
-			printf("inst1_intercept[%d]\t0x%08x\n", vcpuid, (int)ctl);
-
-		error = vm_get_vmcb_field(vcpu, VMCB_OFF_INST2_INTERCEPT,
-		    4, &ctl);
-		if (error == 0)
-			printf("inst2_intercept[%d]\t0x%08x\n", vcpuid, (int)ctl);
-	}
-
-	if (!error && (get_vmcb_tlb_ctrl || get_all)) {
-		error = vm_get_vmcb_field(vcpu, VMCB_OFF_TLB_CTRL,
-					  4, &ctl);
-		if (error == 0)
-			printf("TLB ctrl[%d]\t0x%016lx\n", vcpuid, ctl);
-	}
-
-	if (!error && (get_vmcb_exit_details || get_all)) {
-		error = vm_get_vmcb_field(vcpu, VMCB_OFF_EXITINFO1,
-					  8, &ctl);
-		if (error == 0)
-			printf("exitinfo1[%d]\t0x%016lx\n", vcpuid, ctl);
-		error = vm_get_vmcb_field(vcpu, VMCB_OFF_EXITINFO2,
-					  8, &ctl);
-		if (error == 0)
-			printf("exitinfo2[%d]\t0x%016lx\n", vcpuid, ctl);
-		error = vm_get_vmcb_field(vcpu, VMCB_OFF_EXITINTINFO,
-					  8, &ctl);
-		if (error == 0)
-			printf("exitintinfo[%d]\t0x%016lx\n", vcpuid, ctl);
-	}
-
-	if (!error && (get_vmcb_virq || get_all)) {
-		error = vm_get_vmcb_field(vcpu, VMCB_OFF_VIRQ,
-					  8, &ctl);
-		if (error == 0)
-			printf("v_irq/tpr[%d]\t0x%016lx\n", vcpuid, ctl);
-	}
-
-	if (!error && (get_apic_access_addr || get_all)) {
-		error = vm_get_vmcb_field(vcpu, VMCB_OFF_AVIC_BAR, 8,
-					  &addr);
-		if (error == 0)
-			printf("AVIC apic_bar[%d]\t0x%016lx\n", vcpuid, addr);
-	}
-
-	if (!error && (get_virtual_apic_addr || get_all)) {
-		error = vm_get_vmcb_field(vcpu, VMCB_OFF_AVIC_PAGE, 8,
-					  &addr);
-		if (error == 0)
-			printf("AVIC backing page[%d]\t0x%016lx\n", vcpuid, addr);
-	}
-
-	if (!error && (get_avic_table || get_all)) {
-		error = vm_get_vmcb_field(vcpu, VMCB_OFF_AVIC_LT, 8,
-					  &addr);
-		if (error == 0)
-			printf("AVIC logical table[%d]\t0x%016lx\n",
-				vcpuid, addr);
-		error = vm_get_vmcb_field(vcpu, VMCB_OFF_AVIC_PT, 8,
-					  &addr);
-		if (error == 0)
-			printf("AVIC physical table[%d]\t0x%016lx\n",
-				vcpuid, addr);
-	}
-
-	return (error);
-}
-
 static struct option *
-setup_options(bool cpu_intel)
+setup_options(void)
 {
 	const struct option common_opts[] = {
 		{ "vm",		REQ_ARG,	0,	VMNAME },
 		{ "cpu",	REQ_ARG,	0,	VCPU },
 		{ "set-mem",	REQ_ARG,	0,	SET_MEM },
-		{ "set-efer",	REQ_ARG,	0,	SET_EFER },
-		{ "set-cr0",	REQ_ARG,	0,	SET_CR0 },
-		{ "set-cr2",	REQ_ARG,	0,	SET_CR2 },
-		{ "set-cr3",	REQ_ARG,	0,	SET_CR3 },
-		{ "set-cr4",	REQ_ARG,	0,	SET_CR4 },
-		{ "set-dr0",	REQ_ARG,	0,	SET_DR0 },
-		{ "set-dr1",	REQ_ARG,	0,	SET_DR1 },
-		{ "set-dr2",	REQ_ARG,	0,	SET_DR2 },
-		{ "set-dr3",	REQ_ARG,	0,	SET_DR3 },
-		{ "set-dr6",	REQ_ARG,	0,	SET_DR6 },
-		{ "set-dr7",	REQ_ARG,	0,	SET_DR7 },
-		{ "set-rsp",	REQ_ARG,	0,	SET_RSP },
-		{ "set-rip",	REQ_ARG,	0,	SET_RIP },
-		{ "set-rax",	REQ_ARG,	0,	SET_RAX },
-		{ "set-rflags",	REQ_ARG,	0,	SET_RFLAGS },
-		{ "desc-base",	REQ_ARG,	0,	DESC_BASE },
-		{ "desc-limit",	REQ_ARG,	0,	DESC_LIMIT },
-		{ "desc-access",REQ_ARG,	0,	DESC_ACCESS },
-		{ "set-cs",	REQ_ARG,	0,	SET_CS },
-		{ "set-ds",	REQ_ARG,	0,	SET_DS },
-		{ "set-es",	REQ_ARG,	0,	SET_ES },
-		{ "set-fs",	REQ_ARG,	0,	SET_FS },
-		{ "set-gs",	REQ_ARG,	0,	SET_GS },
-		{ "set-ss",	REQ_ARG,	0,	SET_SS },
-		{ "set-tr",	REQ_ARG,	0,	SET_TR },
-		{ "set-ldtr",	REQ_ARG,	0,	SET_LDTR },
-		{ "set-x2apic-state",REQ_ARG,	0,	SET_X2APIC_STATE },
 		{ "capname",	REQ_ARG,	0,	CAPNAME },
-		{ "unassign-pptdev", REQ_ARG,	0,	UNASSIGN_PPTDEV },
 		{ "setcap",	REQ_ARG,	0,	SET_CAP },
-		{ "get-gpa-pmap", REQ_ARG,	0,	GET_GPA_PMAP },
-		{ "assert-lapic-lvt", REQ_ARG,	0,	ASSERT_LAPIC_LVT },
-		{ "get-rtc-time", NO_ARG,	&get_rtc_time,	1 },
-		{ "set-rtc-time", REQ_ARG,	0,	SET_RTC_TIME },
-		{ "rtc-nvram-offset", REQ_ARG,	0,	RTC_NVRAM_OFFSET },
-		{ "get-rtc-nvram", NO_ARG,	&get_rtc_nvram,	1 },
-		{ "set-rtc-nvram", REQ_ARG,	0,	SET_RTC_NVRAM },
 		{ "getcap",	NO_ARG,		&getcap,	1 },
 		{ "get-stats",	NO_ARG,		&get_stats,	1 },
-		{ "get-desc-ds",NO_ARG,		&get_desc_ds,	1 },
-		{ "set-desc-ds",NO_ARG,		&set_desc_ds,	1 },
-		{ "get-desc-es",NO_ARG,		&get_desc_es,	1 },
-		{ "set-desc-es",NO_ARG,		&set_desc_es,	1 },
-		{ "get-desc-ss",NO_ARG,		&get_desc_ss,	1 },
-		{ "set-desc-ss",NO_ARG,		&set_desc_ss,	1 },
-		{ "get-desc-cs",NO_ARG,		&get_desc_cs,	1 },
-		{ "set-desc-cs",NO_ARG,		&set_desc_cs,	1 },
-		{ "get-desc-fs",NO_ARG,		&get_desc_fs,	1 },
-		{ "set-desc-fs",NO_ARG,		&set_desc_fs,	1 },
-		{ "get-desc-gs",NO_ARG,		&get_desc_gs,	1 },
-		{ "set-desc-gs",NO_ARG,		&set_desc_gs,	1 },
-		{ "get-desc-tr",NO_ARG,		&get_desc_tr,	1 },
-		{ "set-desc-tr",NO_ARG,		&set_desc_tr,	1 },
-		{ "set-desc-ldtr", NO_ARG,	&set_desc_ldtr,	1 },
-		{ "get-desc-ldtr", NO_ARG,	&get_desc_ldtr,	1 },
-		{ "set-desc-gdtr", NO_ARG,	&set_desc_gdtr, 1 },
-		{ "get-desc-gdtr", NO_ARG,	&get_desc_gdtr, 1 },
-		{ "set-desc-idtr", NO_ARG,	&set_desc_idtr, 1 },
-		{ "get-desc-idtr", NO_ARG,	&get_desc_idtr, 1 },
 		{ "get-memmap",	NO_ARG,		&get_memmap,	1 },
 		{ "get-memseg", NO_ARG,		&get_memseg,	1 },
-		{ "get-efer",	NO_ARG,		&get_efer,	1 },
-		{ "get-cr0",	NO_ARG,		&get_cr0,	1 },
-		{ "get-cr2",	NO_ARG,		&get_cr2,	1 },
-		{ "get-cr3",	NO_ARG,		&get_cr3,	1 },
-		{ "get-cr4",	NO_ARG,		&get_cr4,	1 },
-		{ "get-dr0",	NO_ARG,		&get_dr0,	1 },
-		{ "get-dr1",	NO_ARG,		&get_dr1,	1 },
-		{ "get-dr2",	NO_ARG,		&get_dr2,	1 },
-		{ "get-dr3",	NO_ARG,		&get_dr3,	1 },
-		{ "get-dr6",	NO_ARG,		&get_dr6,	1 },
-		{ "get-dr7",	NO_ARG,		&get_dr7,	1 },
-		{ "get-rsp",	NO_ARG,		&get_rsp,	1 },
-		{ "get-rip",	NO_ARG,		&get_rip,	1 },
-		{ "get-rax",	NO_ARG,		&get_rax,	1 },
-		{ "get-rbx",	NO_ARG,		&get_rbx,	1 },
-		{ "get-rcx",	NO_ARG,		&get_rcx,	1 },
-		{ "get-rdx",	NO_ARG,		&get_rdx,	1 },
-		{ "get-rsi",	NO_ARG,		&get_rsi,	1 },
-		{ "get-rdi",	NO_ARG,		&get_rdi,	1 },
-		{ "get-rbp",	NO_ARG,		&get_rbp,	1 },
-		{ "get-r8",	NO_ARG,		&get_r8,	1 },
-		{ "get-r9",	NO_ARG,		&get_r9,	1 },
-		{ "get-r10",	NO_ARG,		&get_r10,	1 },
-		{ "get-r11",	NO_ARG,		&get_r11,	1 },
-		{ "get-r12",	NO_ARG,		&get_r12,	1 },
-		{ "get-r13",	NO_ARG,		&get_r13,	1 },
-		{ "get-r14",	NO_ARG,		&get_r14,	1 },
-		{ "get-r15",	NO_ARG,		&get_r15,	1 },
-		{ "get-rflags",	NO_ARG,		&get_rflags,	1 },
-		{ "get-cs",	NO_ARG,		&get_cs,	1 },
-		{ "get-ds",	NO_ARG,		&get_ds,	1 },
-		{ "get-es",	NO_ARG,		&get_es,	1 },
-		{ "get-fs",	NO_ARG,		&get_fs,	1 },
-		{ "get-gs",	NO_ARG,		&get_gs,	1 },
-		{ "get-ss",	NO_ARG,		&get_ss,	1 },
-		{ "get-tr",	NO_ARG,		&get_tr,	1 },
-		{ "get-ldtr",	NO_ARG,		&get_ldtr,	1 },
-		{ "get-eptp", 	NO_ARG,		&get_eptp,	1 },
-		{ "get-exception-bitmap",
-					NO_ARG,	&get_exception_bitmap,  1 },
-		{ "get-io-bitmap-address",
-					NO_ARG,	&get_io_bitmap,		1 },
-		{ "get-tsc-offset", 	NO_ARG, &get_tsc_offset, 	1 },
-		{ "get-msr-bitmap",
-					NO_ARG,	&get_msr_bitmap, 	1 },
-		{ "get-msr-bitmap-address",
-					NO_ARG,	&get_msr_bitmap_address, 1 },
-		{ "get-guest-pat",	NO_ARG,	&get_guest_pat,		1 },
-		{ "get-guest-sysenter",
-					NO_ARG,	&get_guest_sysenter, 	1 },
-		{ "get-exit-reason",
-					NO_ARG,	&get_exit_reason, 	1 },
-		{ "get-x2apic-state",	NO_ARG,	&get_x2apic_state, 	1 },
 		{ "get-all",		NO_ARG,	&get_all,		1 },
 		{ "run",		NO_ARG,	&run,			1 },
 		{ "create",		NO_ARG,	&create,		1 },
 		{ "destroy",		NO_ARG,	&destroy,		1 },
-		{ "inject-nmi",		NO_ARG,	&inject_nmi,		1 },
 		{ "force-reset",	NO_ARG,	&force_reset,		1 },
 		{ "force-poweroff", 	NO_ARG,	&force_poweroff, 	1 },
 		{ "get-active-cpus", 	NO_ARG,	&get_active_cpus, 	1 },
 		{ "get-debug-cpus",	NO_ARG,	&get_debug_cpus,	1 },
 		{ "get-suspended-cpus", NO_ARG,	&get_suspended_cpus, 	1 },
-		{ "get-intinfo", 	NO_ARG,	&get_intinfo,		1 },
 		{ "get-cpu-topology",	NO_ARG, &get_cpu_topology,	1 },
 #ifdef BHYVE_SNAPSHOT
 		{ "checkpoint", 	REQ_ARG, 0,	SET_CHECKPOINT_FILE},
@@ -1278,157 +140,17 @@ setup_options(bool cpu_intel)
 #endif
 	};
 
-	const struct option intel_opts[] = {
-		{ "get-vmcs-pinbased-ctls",
-				NO_ARG,		&get_pinbased_ctls, 1 },
-		{ "get-vmcs-procbased-ctls",
-				NO_ARG,		&get_procbased_ctls, 1 },
-		{ "get-vmcs-procbased-ctls2",
-				NO_ARG,		&get_procbased_ctls2, 1 },
-		{ "get-vmcs-guest-linear-address",
-				NO_ARG,		&get_vmcs_gla,	1 },
-		{ "get-vmcs-guest-physical-address",
-				NO_ARG,		&get_vmcs_gpa,	1 },
-		{ "get-vmcs-entry-interruption-info",
-				NO_ARG, &get_vmcs_entry_interruption_info, 1},
-		{ "get-vmcs-cr0-mask", NO_ARG,	&get_cr0_mask,	1 },
-		{ "get-vmcs-cr0-shadow", NO_ARG,&get_cr0_shadow, 1 },
-		{ "get-vmcs-cr4-mask", 		NO_ARG,	&get_cr4_mask,	  1 },
-		{ "get-vmcs-cr4-shadow", 	NO_ARG, &get_cr4_shadow,  1 },
-		{ "get-vmcs-cr3-targets", 	NO_ARG, &get_cr3_targets, 1 },
-		{ "get-vmcs-tpr-threshold",
-					NO_ARG,	&get_tpr_threshold, 1 },
-		{ "get-vmcs-vpid", 	NO_ARG,	&get_vpid_asid,	    1 },
-		{ "get-vmcs-exit-ctls", NO_ARG,	&get_exit_ctls,	    1 },
-		{ "get-vmcs-entry-ctls",
-					NO_ARG,	&get_entry_ctls, 1 },
-		{ "get-vmcs-instruction-error",
-					NO_ARG,	&get_inst_err,	1 },
-		{ "get-vmcs-host-pat",	NO_ARG,	&get_host_pat,	1 },
-		{ "get-vmcs-host-cr0",
-					NO_ARG,	&get_host_cr0,	1 },
-		{ "get-vmcs-exit-qualification",
-				NO_ARG,	&get_vmcs_exit_qualification, 1 },
-		{ "get-vmcs-exit-inst-length",
-				NO_ARG,	&get_vmcs_exit_inst_length, 1 },
-		{ "get-vmcs-interruptibility",
-				NO_ARG, &get_vmcs_interruptibility, 1 },
-		{ "get-vmcs-exit-interruption-error",
-				NO_ARG,	&get_vmcs_exit_interruption_error, 1 },
-		{ "get-vmcs-exit-interruption-info",
-				NO_ARG,	&get_vmcs_exit_interruption_info, 1 },
-		{ "get-vmcs-link", 	NO_ARG,		&get_vmcs_link, 1 },
-		{ "get-vmcs-host-cr3",
-					NO_ARG,		&get_host_cr3,	1 },
-		{ "get-vmcs-host-cr4",
-				NO_ARG,		&get_host_cr4,	1 },
-		{ "get-vmcs-host-rip",
-				NO_ARG,		&get_host_rip,	1 },
-		{ "get-vmcs-host-rsp",
-				NO_ARG,		&get_host_rsp,	1 },
-		{ "get-apic-access-address",
-				NO_ARG,		&get_apic_access_addr, 1},
-		{ "get-virtual-apic-address",
-				NO_ARG,		&get_virtual_apic_addr, 1}
-	};
-
-	const struct option amd_opts[] = {
-		{ "get-vmcb-intercepts",
-				NO_ARG,	&get_vmcb_intercept, 	1 },
-		{ "get-vmcb-asid", 
-				NO_ARG,	&get_vpid_asid,	     	1 },
-		{ "get-vmcb-exit-details",
-				NO_ARG, &get_vmcb_exit_details,	1 },
-		{ "get-vmcb-tlb-ctrl",
-				NO_ARG, &get_vmcb_tlb_ctrl, 	1 },
-		{ "get-vmcb-virq",
-				NO_ARG, &get_vmcb_virq, 	1 },
-		{ "get-avic-apic-bar",
-				NO_ARG,	&get_apic_access_addr, 	1 },
-		{ "get-avic-backing-page",
-				NO_ARG,	&get_virtual_apic_addr, 1 },
-		{ "get-avic-table",
-				NO_ARG,	&get_avic_table, 	1 }
-	};
-
-	const struct option null_opt = {
-		NULL, 0, NULL, 0
-	};
-
-	struct option *all_opts;
-	char *cp;
-	int optlen;
-
-	optlen = sizeof(common_opts);
-
-	if (cpu_intel)
-		optlen += sizeof(intel_opts);
-	else
-		optlen += sizeof(amd_opts);
-
-	optlen += sizeof(null_opt);
-
-	all_opts = malloc(optlen);
-
-	cp = (char *)all_opts;
-	memcpy(cp, common_opts, sizeof(common_opts));
-	cp += sizeof(common_opts);
-
-	if (cpu_intel) {
-		memcpy(cp, intel_opts, sizeof(intel_opts));
-		cp += sizeof(intel_opts);
-	} else {
-		memcpy(cp, amd_opts, sizeof(amd_opts));
-		cp += sizeof(amd_opts);
-	}
-
-	memcpy(cp, &null_opt, sizeof(null_opt));
-	cp += sizeof(null_opt);
-
-	return (all_opts);
+	return (bhyvectl_opts(common_opts, nitems(common_opts)));
 }
 
-static void
+void
 usage(const struct option *opts)
 {
 	static const char *set_desc[] = {
 	    [VCPU] = "vcpu_number",
 	    [SET_MEM] = "memory in units of MB",
-	    [SET_EFER] = "EFER",
-	    [SET_CR0] = "CR0",
-	    [SET_CR2] = "CR2",
-	    [SET_CR3] = "CR3",
-	    [SET_CR4] = "CR4",
-	    [SET_DR0] = "DR0",
-	    [SET_DR1] = "DR1",
-	    [SET_DR2] = "DR2",
-	    [SET_DR3] = "DR3",
-	    [SET_DR6] = "DR6",
-	    [SET_DR7] = "DR7",
-	    [SET_RSP] = "RSP",
-	    [SET_RIP] = "RIP",
-	    [SET_RAX] = "RAX",
-	    [SET_RFLAGS] = "RFLAGS",
-	    [DESC_BASE] = "BASE",
-	    [DESC_LIMIT] = "LIMIT",
-	    [DESC_ACCESS] = "ACCESS",
-	    [SET_CS] = "CS",
-	    [SET_DS] = "DS",
-	    [SET_ES] = "ES",
-	    [SET_FS] = "FS",
-	    [SET_GS] = "GS",
-	    [SET_SS] = "SS",
-	    [SET_TR] = "TR",
-	    [SET_LDTR] = "LDTR",
-	    [SET_X2APIC_STATE] = "state",
 	    [SET_CAP] = "0|1",
 	    [CAPNAME] = "capname",
-	    [UNASSIGN_PPTDEV] = "bus/slot.func",
-	    [GET_GPA_PMAP] = "gpa",
-	    [ASSERT_LAPIC_LVT] = "pin",
-	    [SET_RTC_TIME] = "secs",
-	    [SET_RTC_NVRAM] = "val",
-	    [RTC_NVRAM_OFFSET] = "offset",
 #ifdef BHYVE_SNAPSHOT
 	    [SET_CHECKPOINT_FILE] = "filename",
 	    [SET_SUSPEND_FILE] = "filename",
@@ -1438,42 +160,17 @@ usage(const struct option *opts)
 	for (const struct option *o = opts; o->name; o++) {
 		if (strcmp(o->name, "vm") == 0)
 			continue;
-		if (o->has_arg == REQ_ARG)
-			(void)fprintf(stderr, "       [--%s=<%s>]\n",
-			    o->name, set_desc[o->val]);
-		else
+		if (o->has_arg == REQ_ARG) {
+			(void)fprintf(stderr, "       [--%s=<%s>]\n", o->name,
+			    o->val >= OPT_START_MD ? bhyvectl_opt_desc(o->val) :
+			    set_desc[o->val]);
+		} else {
 			(void)fprintf(stderr, "       [--%s]\n", o->name);
+		}
 	}
 	exit(1);
 }
 
-static const char *
-wday_str(int idx)
-{
-	static const char *weekdays[] = {
-		"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"
-	};
-
-	if (idx >= 0 && idx < 7)
-		return (weekdays[idx]);
-	else
-		return ("UNK");
-}
-
-static const char *
-mon_str(int idx)
-{
-	static const char *months[] = {
-		"Jan", "Feb", "Mar", "Apr", "May", "Jun",
-		"Jul", "Aug", "Sep", "Oct", "Nov", "Dec"
-	};
-
-	if (idx >= 0 && idx < 12)
-		return (months[idx]);
-	else
-		return ("UNK");
-}
-
 static int
 show_memmap(struct vmctx *ctx)
 {
@@ -1513,10 +210,12 @@ show_memmap(struct vmctx *ctx)
 			printf("%cwired", delim);
 			delim = '/';
 		}
+#ifdef __amd64__
 		if (flags & VM_MEMMAP_F_IOMMU) {
 			printf("%ciommu", delim);
 			delim = '/';
 		}
+#endif
 		printf("\n");
 
 		gpa += maplen;
@@ -1627,32 +326,28 @@ int
 main(int argc, char *argv[])
 {
 	char *vmname;
-	int error, ch, vcpuid, ptenum;
-	vm_paddr_t gpa_pmap;
+	int error, ch, vcpuid;
 	struct vm_run vmrun;
-	uint64_t rax, cr0, cr2, cr3, cr4, dr0, dr1, dr2, dr3, dr6, dr7;
-	uint64_t rsp, rip, rflags, efer, pat;
-	uint64_t eptp, bm, addr, u64, pteval[4], *pte, info[2];
 	struct vmctx *ctx;
 	struct vcpu *vcpu;
 	cpuset_t cpus;
-	bool cpu_intel;
-	uint64_t cs, ds, es, fs, gs, ss, tr, ldtr;
-	struct tm tm;
 	struct option *opts;
 #ifdef BHYVE_SNAPSHOT
 	char *checkpoint_file = NULL;
 #endif
 
-	cpu_intel = cpu_vendor_intel();
-	opts = setup_options(cpu_intel);
+	opts = setup_options();
 
 	vcpuid = 0;
 	vmname = NULL;
-	assert_lapic_lvt = -1;
 	progname = basename(argv[0]);
 
 	while ((ch = getopt_long(argc, argv, "", opts, NULL)) != -1) {
+		if (ch >= OPT_START_MD) {
+			bhyvectl_handle_opt(opts, ch);
+			continue;
+		}
+
 		switch (ch) {
 		case 0:
 			break;
@@ -1666,141 +361,13 @@ main(int argc, char *argv[])
 			memsize = atoi(optarg) * MB;
 			memsize = roundup(memsize, 2 * MB);
 			break;
-		case SET_EFER:
-			efer = strtoul(optarg, NULL, 0);
-			set_efer = 1;
-			break;
-		case SET_CR0:
-			cr0 = strtoul(optarg, NULL, 0);
-			set_cr0 = 1;
-			break;
-		case SET_CR2:
-			cr2 = strtoul(optarg, NULL, 0);
-			set_cr2 = 1;
-			break;
-		case SET_CR3:
-			cr3 = strtoul(optarg, NULL, 0);
-			set_cr3 = 1;
-			break;
-		case SET_CR4:
-			cr4 = strtoul(optarg, NULL, 0);
-			set_cr4 = 1;
-			break;
-		case SET_DR0:
-			dr0 = strtoul(optarg, NULL, 0);
-			set_dr0 = 1;
-			break;
-		case SET_DR1:
-			dr1 = strtoul(optarg, NULL, 0);
-			set_dr1 = 1;
-			break;
-		case SET_DR2:
-			dr2 = strtoul(optarg, NULL, 0);
-			set_dr2 = 1;
-			break;
-		case SET_DR3:
-			dr3 = strtoul(optarg, NULL, 0);
-			set_dr3 = 1;
-			break;
-		case SET_DR6:
-			dr6 = strtoul(optarg, NULL, 0);
-			set_dr6 = 1;
-			break;
-		case SET_DR7:
-			dr7 = strtoul(optarg, NULL, 0);
-			set_dr7 = 1;
-			break;
-		case SET_RSP:
-			rsp = strtoul(optarg, NULL, 0);
-			set_rsp = 1;
-			break;
-		case SET_RIP:
-			rip = strtoul(optarg, NULL, 0);
-			set_rip = 1;
-			break;
-		case SET_RAX:
-			rax = strtoul(optarg, NULL, 0);
-			set_rax = 1;
-			break;
-		case SET_RFLAGS:
-			rflags = strtoul(optarg, NULL, 0);
-			set_rflags = 1;
-			break;
-		case DESC_BASE:
-			desc_base = strtoul(optarg, NULL, 0);
-			break;
-		case DESC_LIMIT:
-			desc_limit = strtoul(optarg, NULL, 0);
-			break;
-		case DESC_ACCESS:
-			desc_access = strtoul(optarg, NULL, 0);
-			break;
-		case SET_CS:
-			cs = strtoul(optarg, NULL, 0);
-			set_cs = 1;
-			break;
-		case SET_DS:
-			ds = strtoul(optarg, NULL, 0);
-			set_ds = 1;
-			break;
-		case SET_ES:
-			es = strtoul(optarg, NULL, 0);
-			set_es = 1;
-			break;
-		case SET_FS:
-			fs = strtoul(optarg, NULL, 0);
-			set_fs = 1;
-			break;
-		case SET_GS:
-			gs = strtoul(optarg, NULL, 0);
-			set_gs = 1;
-			break;
-		case SET_SS:
-			ss = strtoul(optarg, NULL, 0);
-			set_ss = 1;
-			break;
-		case SET_TR:
-			tr = strtoul(optarg, NULL, 0);
-			set_tr = 1;
-			break;
-		case SET_LDTR:
-			ldtr = strtoul(optarg, NULL, 0);
-			set_ldtr = 1;
-			break;
-		case SET_X2APIC_STATE:
-			x2apic_state = strtol(optarg, NULL, 0);
-			set_x2apic_state = 1;
-			break;
 		case SET_CAP:
 			capval = strtoul(optarg, NULL, 0);
 			setcap = 1;
 			break;
-		case SET_RTC_TIME:
-			rtc_secs = strtoul(optarg, NULL, 0);
-			set_rtc_time = 1;
-			break;
-		case SET_RTC_NVRAM:
-			rtc_nvram_value = (uint8_t)strtoul(optarg, NULL, 0);
-			set_rtc_nvram = 1;
-			break;
-		case RTC_NVRAM_OFFSET:
-			rtc_nvram_offset = strtoul(optarg, NULL, 0);
-			break;
-		case GET_GPA_PMAP:
-			gpa_pmap = strtoul(optarg, NULL, 0);
-			get_gpa_pmap = 1;
-			break;
 		case CAPNAME:
 			capname = optarg;
 			break;
-		case UNASSIGN_PPTDEV:
-			unassign_pptdev = 1;
-			if (sscanf(optarg, "%d/%d/%d", &bus, &slot, &func) != 3)
-				usage(opts);
-			break;
-		case ASSERT_LAPIC_LVT:
-			assert_lapic_lvt = atoi(optarg);
-			break;
 #ifdef BHYVE_SNAPSHOT
 		case SET_CHECKPOINT_FILE:
 		case SET_SUSPEND_FILE:
@@ -1832,7 +399,7 @@ main(int argc, char *argv[])
 			fprintf(stderr,
 			    "vm_open: %s could not be opened: %s\n",
 			    vmname, strerror(errno));
-			exit (1);
+			exit(1);
 		}
 		vcpu = vm_vcpu_open(ctx, vcpuid);
 	}
@@ -1840,141 +407,6 @@ main(int argc, char *argv[])
 	if (!error && memsize)
 		error = vm_setup_memory(ctx, memsize, VM_MMAP_ALL);
 
-	if (!error && set_efer)
-		error = vm_set_register(vcpu, VM_REG_GUEST_EFER, efer);
-
-	if (!error && set_cr0)
-		error = vm_set_register(vcpu, VM_REG_GUEST_CR0, cr0);
-
-	if (!error && set_cr2)
-		error = vm_set_register(vcpu, VM_REG_GUEST_CR2, cr2);
-
-	if (!error && set_cr3)
-		error = vm_set_register(vcpu, VM_REG_GUEST_CR3, cr3);
-
-	if (!error && set_cr4)
-		error = vm_set_register(vcpu, VM_REG_GUEST_CR4, cr4);
-
-	if (!error && set_dr0)
-		error = vm_set_register(vcpu, VM_REG_GUEST_DR0, dr0);
-
-	if (!error && set_dr1)
-		error = vm_set_register(vcpu, VM_REG_GUEST_DR1, dr1);
-
-	if (!error && set_dr2)
-		error = vm_set_register(vcpu, VM_REG_GUEST_DR2, dr2);
-
-	if (!error && set_dr3)
-		error = vm_set_register(vcpu, VM_REG_GUEST_DR3, dr3);
-
-	if (!error && set_dr6)
-		error = vm_set_register(vcpu, VM_REG_GUEST_DR6, dr6);
-
-	if (!error && set_dr7)
-		error = vm_set_register(vcpu, VM_REG_GUEST_DR7, dr7);
-
-	if (!error && set_rsp)
-		error = vm_set_register(vcpu, VM_REG_GUEST_RSP, rsp);
-
-	if (!error && set_rip)
-		error = vm_set_register(vcpu, VM_REG_GUEST_RIP, rip);
-
-	if (!error && set_rax)
-		error = vm_set_register(vcpu, VM_REG_GUEST_RAX, rax);
-
-	if (!error && set_rflags) {
-		error = vm_set_register(vcpu, VM_REG_GUEST_RFLAGS,
-					rflags);
-	}
-
-	if (!error && set_desc_ds) {
-		error = vm_set_desc(vcpu, VM_REG_GUEST_DS,
-				    desc_base, desc_limit, desc_access);
-	}
-
-	if (!error && set_desc_es) {
-		error = vm_set_desc(vcpu, VM_REG_GUEST_ES,
-				    desc_base, desc_limit, desc_access);
-	}
-
-	if (!error && set_desc_ss) {
-		error = vm_set_desc(vcpu, VM_REG_GUEST_SS,
-				    desc_base, desc_limit, desc_access);
-	}
-
-	if (!error && set_desc_cs) {
-		error = vm_set_desc(vcpu, VM_REG_GUEST_CS,
-				    desc_base, desc_limit, desc_access);
-	}
-
-	if (!error && set_desc_fs) {
-		error = vm_set_desc(vcpu, VM_REG_GUEST_FS,
-				    desc_base, desc_limit, desc_access);
-	}
-
-	if (!error && set_desc_gs) {
-		error = vm_set_desc(vcpu, VM_REG_GUEST_GS,
-				    desc_base, desc_limit, desc_access);
-	}
-
-	if (!error && set_desc_tr) {
-		error = vm_set_desc(vcpu, VM_REG_GUEST_TR,
-				    desc_base, desc_limit, desc_access);
-	}
-
-	if (!error && set_desc_ldtr) {
-		error = vm_set_desc(vcpu, VM_REG_GUEST_LDTR,
-				    desc_base, desc_limit, desc_access);
-	}
-
-	if (!error && set_desc_gdtr) {
-		error = vm_set_desc(vcpu, VM_REG_GUEST_GDTR,
-				    desc_base, desc_limit, 0);
-	}
-
-	if (!error && set_desc_idtr) {
-		error = vm_set_desc(vcpu, VM_REG_GUEST_IDTR,
-				    desc_base, desc_limit, 0);
-	}
-
-	if (!error && set_cs)
-		error = vm_set_register(vcpu, VM_REG_GUEST_CS, cs);
-
-	if (!error && set_ds)
-		error = vm_set_register(vcpu, VM_REG_GUEST_DS, ds);
-
-	if (!error && set_es)
-		error = vm_set_register(vcpu, VM_REG_GUEST_ES, es);
-
-	if (!error && set_fs)
-		error = vm_set_register(vcpu, VM_REG_GUEST_FS, fs);
-
-	if (!error && set_gs)
-		error = vm_set_register(vcpu, VM_REG_GUEST_GS, gs);
-
-	if (!error && set_ss)
-		error = vm_set_register(vcpu, VM_REG_GUEST_SS, ss);
-
-	if (!error && set_tr)
-		error = vm_set_register(vcpu, VM_REG_GUEST_TR, tr);
-
-	if (!error && set_ldtr)
-		error = vm_set_register(vcpu, VM_REG_GUEST_LDTR, ldtr);
-
-	if (!error && set_x2apic_state)
-		error = vm_set_x2apic_state(vcpu, x2apic_state);
-
-	if (!error && unassign_pptdev)
-		error = vm_unassign_pptdev(ctx, bus, slot, func);
-
-	if (!error && inject_nmi) {
-		error = vm_inject_nmi(vcpu);
-	}
-
-	if (!error && assert_lapic_lvt != -1) {
-		error = vm_lapic_local_irq(vcpu, assert_lapic_lvt);
-	}
-
 	if (!error && (get_memseg || get_all))
 		error = show_memseg(ctx);
 
@@ -1982,217 +414,17 @@ main(int argc, char *argv[])
 		error = show_memmap(ctx);
 
 	if (!error)
-		error = get_all_registers(vcpu, vcpuid);
-
-	if (!error)
-		error = get_all_segments(vcpu, vcpuid);
-
-	if (!error) {
-		if (cpu_intel)
-			error = get_misc_vmcs(vcpu, vcpuid);
-		else
-			error = get_misc_vmcb(vcpu, vcpuid);
-	}
-	
-	if (!error && (get_x2apic_state || get_all)) {
-		error = vm_get_x2apic_state(vcpu, &x2apic_state);
-		if (error == 0)
-			printf("x2apic_state[%d]\t%d\n", vcpuid, x2apic_state);
-	}
-
-	if (!error && (get_eptp || get_all)) {
-		if (cpu_intel)
-			error = vm_get_vmcs_field(vcpu, VMCS_EPTP, &eptp);
-		else
-			error = vm_get_vmcb_field(vcpu, VMCB_OFF_NPT_BASE,
-						   8, &eptp);
-		if (error == 0)
-			printf("%s[%d]\t\t0x%016lx\n",
-				cpu_intel ? "eptp" : "rvi/npt", vcpuid, eptp);
-	}
-
-	if (!error && (get_exception_bitmap || get_all)) {
-		if(cpu_intel)
-			error = vm_get_vmcs_field(vcpu,
-						VMCS_EXCEPTION_BITMAP, &bm);
-		else
-			error = vm_get_vmcb_field(vcpu,
-						  VMCB_OFF_EXC_INTERCEPT,
-						  4, &bm);
-		if (error == 0)
-			printf("exception_bitmap[%d]\t%#lx\n", vcpuid, bm);
-	}
-
-	if (!error && (get_io_bitmap || get_all)) {
-		if (cpu_intel) {
-			error = vm_get_vmcs_field(vcpu, VMCS_IO_BITMAP_A,
-						  &bm);
-			if (error == 0)
-				printf("io_bitmap_a[%d]\t%#lx\n", vcpuid, bm);
-			error = vm_get_vmcs_field(vcpu, VMCS_IO_BITMAP_B,
-						  &bm);
-			if (error == 0)
-				printf("io_bitmap_b[%d]\t%#lx\n", vcpuid, bm);
-		} else {
-			error = vm_get_vmcb_field(vcpu,
-						  VMCB_OFF_IO_PERM, 8, &bm);
-			if (error == 0)
-				printf("io_bitmap[%d]\t%#lx\n", vcpuid, bm);
-		}
-	}
-
-	if (!error && (get_tsc_offset || get_all)) {
-		uint64_t tscoff;
-		if (cpu_intel)
-			error = vm_get_vmcs_field(vcpu, VMCS_TSC_OFFSET,
-						  &tscoff);
-		else
-			error = vm_get_vmcb_field(vcpu,
-						  VMCB_OFF_TSC_OFFSET, 
-						  8, &tscoff);
-		if (error == 0)
-			printf("tsc_offset[%d]\t0x%016lx\n", vcpuid, tscoff);
-	}
-
-	if (!error && (get_msr_bitmap_address || get_all)) {
-		if (cpu_intel)
-			error = vm_get_vmcs_field(vcpu, VMCS_MSR_BITMAP, 
-						  &addr);
-		else
-			error = vm_get_vmcb_field(vcpu,
-						  VMCB_OFF_MSR_PERM, 8, &addr);
-		if (error == 0)
-			printf("msr_bitmap[%d]\t\t%#lx\n", vcpuid, addr);
-	}
-
-	if (!error && (get_msr_bitmap || get_all)) {
-		if (cpu_intel) {
-			error = vm_get_vmcs_field(vcpu, 
-						  VMCS_MSR_BITMAP, &addr);
-		} else {
-			error = vm_get_vmcb_field(vcpu,
-						  VMCB_OFF_MSR_PERM, 8,
-						  &addr);
-		}
-
-		if (error == 0)
-			error = dump_msr_bitmap(vcpuid, addr, cpu_intel);
-	}
-
-	if (!error && (get_vpid_asid || get_all)) {
-		uint64_t vpid;
-		if (cpu_intel)
-			error = vm_get_vmcs_field(vcpu, VMCS_VPID, &vpid);
-		else
-			error = vm_get_vmcb_field(vcpu, VMCB_OFF_ASID, 
-						  4, &vpid);
-		if (error == 0)
-			printf("%s[%d]\t\t0x%04lx\n", 
-				cpu_intel ? "vpid" : "asid", vcpuid, vpid);
-	}
-
-	if (!error && (get_guest_pat || get_all)) {
-		if (cpu_intel)
-			error = vm_get_vmcs_field(vcpu,
-						  VMCS_GUEST_IA32_PAT, &pat);
-		else
-			error = vm_get_vmcb_field(vcpu,
-						  VMCB_OFF_GUEST_PAT, 8, &pat);
-		if (error == 0)
-			printf("guest_pat[%d]\t\t0x%016lx\n", vcpuid, pat);
-	}
-
-	if (!error && (get_guest_sysenter || get_all)) {
-		if (cpu_intel)
-			error = vm_get_vmcs_field(vcpu,
-						  VMCS_GUEST_IA32_SYSENTER_CS,
-						  &cs);
-		else
-			error = vm_get_vmcb_field(vcpu,
-						  VMCB_OFF_SYSENTER_CS, 8,
-						  &cs);
-
-		if (error == 0)
-			printf("guest_sysenter_cs[%d]\t%#lx\n", vcpuid, cs);
-		if (cpu_intel)
-			error = vm_get_vmcs_field(vcpu,
-						  VMCS_GUEST_IA32_SYSENTER_ESP,
-						  &rsp);
-		else
-			error = vm_get_vmcb_field(vcpu,
-						  VMCB_OFF_SYSENTER_ESP, 8,
-						  &rsp);
-
-		if (error == 0)
-			printf("guest_sysenter_sp[%d]\t%#lx\n", vcpuid, rsp);
-		if (cpu_intel)
-			error = vm_get_vmcs_field(vcpu,
-						  VMCS_GUEST_IA32_SYSENTER_EIP,
-						  &rip);
-		else
-			error = vm_get_vmcb_field(vcpu,
-						  VMCB_OFF_SYSENTER_EIP, 8, 
-						  &rip);
-		if (error == 0)
-			printf("guest_sysenter_ip[%d]\t%#lx\n", vcpuid, rip);
-	}
-
-	if (!error && (get_exit_reason || get_all)) {
-		if (cpu_intel)
-			error = vm_get_vmcs_field(vcpu, VMCS_EXIT_REASON,
-						  &u64);
-		else	
-			error = vm_get_vmcb_field(vcpu,
-						  VMCB_OFF_EXIT_REASON, 8,
-						  &u64);
-		if (error == 0)
-			printf("exit_reason[%d]\t%#lx\n", vcpuid, u64);
-	}
+		bhyvectl_md_main(ctx, vcpu, vcpuid, get_all);
 
 	if (!error && setcap) {
 		int captype;
+
 		captype = vm_capability_name2type(capname);
 		error = vm_set_capability(vcpu, captype, capval);
 		if (error != 0 && errno == ENOENT)
 			printf("Capability \"%s\" is not available\n", capname);
 	}
 
-	if (!error && get_gpa_pmap) {
-		error = vm_get_gpa_pmap(ctx, gpa_pmap, pteval, &ptenum);
-		if (error == 0) {
-			printf("gpa %#lx:", gpa_pmap);
-			pte = &pteval[0];
-			while (ptenum-- > 0)
-				printf(" %#lx", *pte++);
-			printf("\n");
-		}
-	}
-
-	if (!error && set_rtc_nvram)
-		error = vm_rtc_write(ctx, rtc_nvram_offset, rtc_nvram_value);
-
-	if (!error && (get_rtc_nvram || get_all)) {
-		error = vm_rtc_read(ctx, rtc_nvram_offset, &rtc_nvram_value);
-		if (error == 0) {
-			printf("rtc nvram[%03d]: 0x%02x\n", rtc_nvram_offset,
-			    rtc_nvram_value);
-		}
-	}
-
-	if (!error && set_rtc_time)
-		error = vm_rtc_settime(ctx, rtc_secs);
-
-	if (!error && (get_rtc_time || get_all)) {
-		error = vm_rtc_gettime(ctx, &rtc_secs);
-		if (error == 0) {
-			gmtime_r(&rtc_secs, &tm);
-			printf("rtc time %#lx: %s %s %02d %02d:%02d:%02d %d\n",
-			    rtc_secs, wday_str(tm.tm_wday), mon_str(tm.tm_mon),
-			    tm.tm_mday, tm.tm_hour, tm.tm_min, tm.tm_sec,
-			    1900 + tm.tm_year);
-		}
-	}
-
 	if (!error && (getcap || get_all)) {
 		int captype, val, getcaptype;
 
@@ -2237,14 +469,6 @@ main(int argc, char *argv[])
 			print_cpus("suspended cpus", &cpus);
 	}
 
-	if (!error && (get_intinfo || get_all)) {
-		error = vm_get_intinfo(vcpu, &info[0], &info[1]);
-		if (!error) {
-			print_intinfo("pending", info[0]);
-			print_intinfo("current", info[1]);
-		}
-	}
-
 	if (!error && (get_stats || get_all)) {
 		int i, num_stats;
 		uint64_t *stats;
@@ -2278,7 +502,7 @@ main(int argc, char *argv[])
 		vmrun.cpusetsize = sizeof(cpuset);
 		error = vm_run(vcpu, &vmrun);
 		if (error == 0)
-			dump_vm_run_exitcode(&vmexit, vcpuid);
+			bhyvectl_dump_vm_run_exitcode(&vmexit, vcpuid);
 		else
 			printf("vm_run error %d\n", error);
 	}
@@ -2300,6 +524,6 @@ main(int argc, char *argv[])
 		error = snapshot_request(vmname, checkpoint_file, vm_suspend_opt);
 #endif
 
-	free (opts);
+	free(opts);
 	exit(error);
 }
diff --git a/usr.sbin/bhyvectl/bhyvectl.h b/usr.sbin/bhyvectl/bhyvectl.h
new file mode 100644
index 000000000000..c37a671bf795
--- /dev/null
+++ b/usr.sbin/bhyvectl/bhyvectl.h
@@ -0,0 +1,53 @@
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
+ * Copyright (c) 2011 NetApp, Inc.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY NETAPP, INC ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL NETAPP, INC OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#ifndef _BHYVECTL_H_
+#define	_BHYVECTL_H_
+
+#include <stdbool.h>
+
+#define	OPT_START	1000
+#define	OPT_START_MD	2000
+
+#define	REQ_ARG		required_argument
+#define	NO_ARG		no_argument
+#define	OPT_ARG		optional_argument
+
+struct option;
+struct vmctx;
+struct vmexit;
+
+void bhyvectl_md_main(struct vmctx *ctx, struct vcpu *vcpu, int vcpuid,
+    bool get_all);
+struct option *bhyvectl_opts(const struct option *options, size_t count);
+void bhyvectl_handle_opt(const struct option *opts, int opt);
+const char *bhyvectl_opt_desc(int opt);
+void bhyvectl_dump_vm_run_exitcode(struct vm_exit *vmexit, int vcpu);
+void usage(const struct option *opts);
+
+#endif