ehmry/genode
ehmry
/
genode
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

vbox: Sync hw_x86_64_muen subject state with Muen SK 

VM-exit interruption info was dropped and Vbox only needs guest CR3
value for guest-physical memory translation but does not actually change
it since the VM is running in unrestricted guest mode.
This commit is contained in:
Adrian-Ken Rueegsegger 2017-03-31 10:26:31 +02:00 committed by Christian Helmuth
parent a431657851
commit 1db8694fd0
2 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
repos/ports/src/virtualbox/spec/muen/sup.cc
View File

@ -219,10 +219,6 @@ inline bool set_cr(struct Subject_state *cur_state, unsigned cr, uint64_t value)
cur_state->Regs.Cr2 = value;
res = true;
break;
case 3:
cur_state->Cr3 = value;
res = true;
break;
case 4:
cur_state->Shadow_cr4 = value;
cur_state->Cr4 = value | 1 << 13;
@ -433,7 +429,6 @@ int SUPR3CallVMMR0Fast(PVMR0 pVMR0, unsigned uOperation, VMCPUID idCpu)
set_cr(cur_state, 0, pCtx->cr0);
set_cr(cur_state, 2, pCtx->cr2);
set_cr(cur_state, 3, pCtx->cr3);
set_cr(cur_state, 4, pCtx->cr4);
GENODE_WRITE_SELREG(cs);

3
repos/ports/src/virtualbox/spec/muen/vcpu.h
View File

@ -49,7 +49,6 @@ struct Subject_state
struct Cpu_registers Regs;
Genode::uint32_t Exit_reason;
Genode::uint32_t Intr_state;
Genode::uint32_t Interrupt_info;
Genode::uint32_t Sysenter_cs;
Genode::uint64_t Exit_qualification;
Genode::uint64_t Guest_phys_addr;
@ -75,6 +74,6 @@ struct Subject_state
Segment ldtr;
Segment gdtr;
Segment idtr;
} __attribute__((packed));
};
#endif /* _VIRTUALBOX__SPEC__MUEN__VCPU_H_ */