diff options
| author |   mlarkin <mlarkin@openbsd.org> | 2017-05-02 02:58:24 +0000 |
|---|---|---|
| committer | mlarkin <mlarkin@openbsd.org> | 2017-05-02 02:58:24 +0000 |
| commit | f39fb87651ecbea8079a0950f0dda033f8c4c50d (patch) | |
| tree | 68a8bb99c09e5d4e457131daa05a6e3bd470a2ee | |
| parent | Allow setting of guest MSRs from vmd(8). This change is the first part of (diff) | |
| download | wireguard-openbsd-f39fb87651ecbea8079a0950f0dda033f8c4c50d.tar.xz wireguard-openbsd-f39fb87651ecbea8079a0950f0dda033f8c4c50d.zip | |
Matching vmd(8) part of previous diff (first part of vmctl send/receive).
ok kettenis
| -rw-r--r-- | usr.sbin/vmd/vm.c | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/usr.sbin/vmd/vm.c b/usr.sbin/vmd/vm.c index 5aeed370764..2c831b0fb5e 100644 --- a/usr.sbin/vmd/vm.c +++ b/usr.sbin/vmd/vm.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vm.c,v 1.13 2017/04/25 06:44:35 reyk Exp $ */ +/* $OpenBSD: vm.c,v 1.14 2017/05/02 02:58:24 mlarkin Exp $ */ /* * Copyright (c) 2015 Mike Larkin <mlarkin@openbsd.org> @@ -133,6 +133,12 @@ static const struct vcpu_reg_state vcpu_init_flat32 = { .vrs_idtr = { 0x0, 0xFFFF, 0x0, 0x0}, .vrs_sregs[VCPU_REGS_LDTR] = { 0x0, 0xFFFF, 0x0082, 0x0}, .vrs_sregs[VCPU_REGS_TR] = { 0x0, 0xFFFF, 0x008B, 0x0}, + .vrs_msrs[VCPU_REGS_EFER] = 0ULL, + .vrs_msrs[VCPU_REGS_STAR] = 0ULL, + .vrs_msrs[VCPU_REGS_LSTAR] = 0ULL, + .vrs_msrs[VCPU_REGS_CSTAR] = 0ULL, + .vrs_msrs[VCPU_REGS_SFMASK] = 0ULL, + .vrs_msrs[VCPU_REGS_KGSBASE] = 0ULL }; /* @@ -161,6 +167,12 @@ static const struct vcpu_reg_state vcpu_init_flat16 = { .vrs_idtr = { 0x0, 0xFFFF, 0x0, 0x0}, .vrs_sregs[VCPU_REGS_LDTR] = { 0x0, 0xFFFF, 0x0082, 0x0}, .vrs_sregs[VCPU_REGS_TR] = { 0x0, 0xFFFF, 0x008B, 0x0}, + .vrs_msrs[VCPU_REGS_EFER] = 0ULL, + .vrs_msrs[VCPU_REGS_STAR] = 0ULL, + .vrs_msrs[VCPU_REGS_LSTAR] = 0ULL, + .vrs_msrs[VCPU_REGS_CSTAR] = 0ULL, + .vrs_msrs[VCPU_REGS_SFMASK] = 0ULL, + .vrs_msrs[VCPU_REGS_KGSBASE] = 0ULL }; /* |