diff options
| author | jhb <jhb@FreeBSD.org> | 2014-06-12 15:20:59 +0000 |
|---|---|---|
| committer | jhb <jhb@FreeBSD.org> | 2014-06-12 15:20:59 +0000 |
| commit | fa121e2a0583ed4d209ed72ba227f186e7b9e0f7 (patch) | |
| tree | eae60a05387f74ba5f6cf3252cf8783aba4ddd6b /usr.sbin/bhyveload | |
| parent | a9824f54c0278b53ff825eeb0a4a4165549e7e41 (diff) | |
| download | FreeBSD-src-fa121e2a0583ed4d209ed72ba227f186e7b9e0f7.zip FreeBSD-src-fa121e2a0583ed4d209ed72ba227f186e7b9e0f7.tar.gz | |
MFC 261504:
Add support for FreeBSD/i386 guests under bhyve.
Diffstat (limited to 'usr.sbin/bhyveload')
| -rw-r--r-- | usr.sbin/bhyveload/bhyveload.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/usr.sbin/bhyveload/bhyveload.c b/usr.sbin/bhyveload/bhyveload.c index 94cb1b1..701e9c3 100644 --- a/usr.sbin/bhyveload/bhyveload.c +++ b/usr.sbin/bhyveload/bhyveload.c @@ -465,7 +465,12 @@ cb_exec(void *arg, uint64_t rip) { int error; - error = vm_setup_freebsd_registers(ctx, BSP, rip, cr3, gdtbase, rsp); + if (cr3 == 0) + error = vm_setup_freebsd_registers_i386(ctx, BSP, rip, gdtbase, + rsp); + else + error = vm_setup_freebsd_registers(ctx, BSP, rip, cr3, gdtbase, + rsp); if (error) { perror("vm_setup_freebsd_registers"); cb_exit(NULL, USERBOOT_EXIT_QUIT); |
