fabian.freyer_physik.tu-berlin.de updated this revision to Diff 39653.
fabian.freyer_physik.tu-berlin.de added a comment.
This revision now requires review to proceed.
pass `USERBOOT_VERSION_5` to `loader_main`.
REPOSITORY
rS FreeBSD src repository
CHANGES SINCE LAST UPDATE
https://reviews.freebsd.org/D14473?vs=39622&id=39653
REVISION DETAIL
https://reviews.freebsd.org/D14473
AFFECTED FILES
stand/userboot/userboot.h
usr.sbin/bhyveload/bhyveload.c
EMAIL PREFERENCES
https://reviews.freebsd.org/settings/panel/emailpreferences/
To: fabian.freyer_physik.tu-berlin.de, imp, rgrimes, #bhyve, grehan
Cc: grehan, imp, freebsd-virtualization-list, #contributor_reviews_base
diff --git a/usr.sbin/bhyveload/bhyveload.c b/usr.sbin/bhyveload/bhyveload.c
--- a/usr.sbin/bhyveload/bhyveload.c
+++ b/usr.sbin/bhyveload/bhyveload.c
@@ -560,6 +560,33 @@
return (vm_set_desc(ctx, vcpu, reg, base, limit, access));
}
+static int
+cb_vm_get_unrestricted_guest(void* arg, int vcpu, int *retval)
+{
+
+ return (vm_get_capability(ctx, vcpu,
+ VM_CAP_UNRESTRICTED_GUEST, retval));
+}
+
+static int
+cb_vm_set_unrestricted_guest(void* arg, int vcpu, int val)
+{
+ int error, tmp;
+
+ if ((error = cb_vm_get_unrestricted_guest(arg, vcpu, &tmp)))
+ return (error);
+
+ return (vm_set_capability(ctx, vcpu,
+ VM_CAP_UNRESTRICTED_GUEST, val));
+}
+
+static int
+cb_vcpu_reset(void* arg, int vcpu)
+{
+
+ return (vcpu_reset(ctx, vcpu));
+}
+
static struct loader_callbacks cb = {
.getc = cb_getc,
.putc = cb_putc,
@@ -593,6 +620,11 @@
/* Version 4 additions */
.vm_set_register = cb_vm_set_register,
.vm_set_desc = cb_vm_set_desc,
+
+ /* Version 5 additions */
+ .vm_set_unrestricted_guest = cb_vm_set_unrestricted_guest,
+ .vm_get_unrestricted_guest = cb_vm_get_unrestricted_guest,
+ .vcpu_reset = cb_vcpu_reset,
};
static int
@@ -790,7 +822,7 @@
addenv("smbios.bios.vendor=BHYVE");
addenv("boot_serial=1");
- func(&cb, NULL, USERBOOT_VERSION_4, ndisks);
+ func(&cb, NULL, USERBOOT_VERSION_5, ndisks);
free(loader);
return (0);
diff --git a/stand/userboot/userboot.h b/stand/userboot/userboot.h
--- a/stand/userboot/userboot.h
+++ b/stand/userboot/userboot.h
@@ -41,6 +41,14 @@
*/
#define USERBOOT_VERSION_4 4
+/*
+ * Version 5 adds callbacks to set unrestricted guest
+ * capabilities and reset the vcpu state. The callback
+ * structure backward compatible (new callbacks have
+ * been added at the tail end).
+ */
+#define USERBOOT_VERSION_5 5
+
/*
* Exit codes from the loader
*/
@@ -210,4 +218,22 @@
int (*vm_set_register)(void *arg, int vcpu, int reg, uint64_t val);
int (*vm_set_desc)(void *arg, int vcpu, int reg, uint64_t base,
u_int limit, u_int access);
+
+ /*
+ * Version 5 additions.
+ *
+ * vm_get_unrestricted_guest checks support for the UNRESTRICTED_GUEST
+ * capability and if supported, sets 'retval'. If unsupported, an error
+ * code is returned.
+ *
+ * vm_set_unrestricted_guest sets the UNRESTRICTED_GUEST capability if
+ * supported, and returns an error code otherwise.
+ *
+ * vcpu_reset initializes the vCPU state as defined in
+ * Intel Vol 3a, Table 9.1. IA-32 Processor States Following Power-up,
+ * Reset or INIT
+ */
+ int (*vm_get_unrestricted_guest)(void* arg, int vcpu, int *retval);
+ int (*vm_set_unrestricted_guest)(void* arg, int vcpu, int val);
+ int (*vcpu_reset)(void* arg, int vcpu);
};
_______________________________________________
freebsd-virtualization@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/freebsd-virtualization
To unsubscribe, send any mail to
"freebsd-virtualization-unsubscr...@freebsd.org"
