#ifdef __V3VEE__
+#include <palacios/vmcs.h>
#define VMX_SUCCESS 0
#define VMX_FAIL_INVALID 1
return VMX_SUCCESS;
}
-static inline int vmcs_read(vmcs_field_t vmcs_field, void * dst, int len) {
- uint64_t val = 0;
+static inline int vmcs_read(vmcs_field_t vmcs_field, void * dst) {
+ addr_t val = 0;
uint8_t ret_valid = 0;
uint8_t ret_invalid = 0;
__asm__ __volatile__ (
VMREAD_OPCODE
EAX_ECX_MODRM
- "seteb %0;" // fail valid
+ "seteb %1;" // fail valid
"setnaeb %1;" // fail invalid
- : "=q"(ret_valid), "=q"(ret_invalid), "=c"(val) // Use ECX
- : "a" (vmcs_field), "0"(ret_valid), "1"(ret_invalid)
+ : "=c"(val), "=d"(ret_valid) //, "=r"(ret_invalid) // Use ECX
+ : "a" (vmcs_field), "0"(0), "1"(ret_valid)
: "memory"
);
CHECK_VMXFAIL(ret_valid, ret_invalid);
- switch(len)
+ switch(v3_vmcs_get_field_len(vmcs_field))
{
case 2:
*((uint16_t*)dst) = (uint16_t)val;
"seteb %0;" // fail valid (ZF=1)
"setnaeb %1;" // fail invalid (CF=1)
: "=q" (ret_valid), "=q" (ret_invalid)
- : "a" (vmcs_field), "c"(value), "0"(ret_valid), "1"(ret_invalid)
+ : "a" (vmcs_field), "c"(value)
: "memory");
CHECK_VMXFAIL(ret_valid, ret_invalid);