diff options
| author | Mike Larkin <mlarkin@cvs.openbsd.org> | 2017-01-19 23:18:56 +0000 |
|---|---|---|
| committer | Mike Larkin <mlarkin@cvs.openbsd.org> | 2017-01-19 23:18:56 +0000 |
| commit | 2450859e80b06904e1c55520152c75954c522727 (patch) | |
| tree | 93d3a7ed9e8300eec3ce56f5468aadc57f7c3f4d /sys | |
| parent | a946d7032236cadd7387a4bbdf7b0d1df6bd5a0f (diff) | |
forgot this in previous commit (SVM_MSR* macro definitions)
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/arch/amd64/include/vmmvar.h | 6 | ||||
| -rw-r--r-- | sys/arch/i386/include/vmmvar.h | 4 |
2 files changed, 9 insertions, 1 deletions
diff --git a/sys/arch/amd64/include/vmmvar.h b/sys/arch/amd64/include/vmmvar.h index 8240d7a89fb..f72eed99f78 100644 --- a/sys/arch/amd64/include/vmmvar.h +++ b/sys/arch/amd64/include/vmmvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: vmmvar.h,v 1.28 2017/01/19 05:53:40 mlarkin Exp $ */ +/* $OpenBSD: vmmvar.h,v 1.29 2017/01/19 23:18:55 mlarkin Exp $ */ /* * Copyright (c) 2014 Mike Larkin <mlarkin@openbsd.org> * @@ -458,6 +458,10 @@ struct vm_rwregs_params { #define VMX_MSRIDX(m) ((m) / 8) #define VMX_MSRBIT(m) (1 << (m) % 8) +#define SVM_MSRIDX(m) ((m) / 4) +#define SVM_MSRBIT_R(m) (1 << (((m) % 4) * 2)) +#define SVM_MSRBIT_W(m) (1 << (((m) % 4) * 2 + 1)) + enum { VMM_MODE_UNKNOWN, VMM_MODE_VMX, diff --git a/sys/arch/i386/include/vmmvar.h b/sys/arch/i386/include/vmmvar.h index 63bcf17e1be..7a971653a9f 100644 --- a/sys/arch/i386/include/vmmvar.h +++ b/sys/arch/i386/include/vmmvar.h @@ -449,6 +449,10 @@ struct vm_rwregs_params { #define VMX_MSRIDX(m) ((m) / 8) #define VMX_MSRBIT(m) (1 << (m) % 8) +#define SVM_MSRIDX(m) ((m) / 4) +#define SVM_MSRBIT_R(m) (1 << (((m) % 4) * 2)) +#define SVM_MSRBIT_W(m) (1 << (((m) % 4) * 2 + 1)) + enum { VMM_MODE_UNKNOWN, VMM_MODE_VMX, |