diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2012-02-23 07:31:23 -0800 |
|---|---|---|
| committer | android code review <noreply-gerritcodereview@google.com> | 2012-02-23 07:31:25 -0800 |
| commit | 1991d8c2b6b85170ee1707ca19fe5c746187a77c (patch) | |
| tree | bcbc52ee128f47fb1d05e200402e60f197a33e25 /target-i386/hax-i386.h | |
| parent | 1533b3ad6f215e3727ba081ebf6c170c22794c3c (diff) | |
| parent | 4a5a0efd49f100c7d53920807c83d9c74304ecd8 (diff) | |
| download | external_qemu-1991d8c2b6b85170ee1707ca19fe5c746187a77c.zip external_qemu-1991d8c2b6b85170ee1707ca19fe5c746187a77c.tar.gz external_qemu-1991d8c2b6b85170ee1707ca19fe5c746187a77c.tar.bz2 | |
Merge "Check HAXM capability in QEMU"
Diffstat (limited to 'target-i386/hax-i386.h')
| -rw-r--r-- | target-i386/hax-i386.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/target-i386/hax-i386.h b/target-i386/hax-i386.h index 5ad22ad..a5a7e1d 100644 --- a/target-i386/hax-i386.h +++ b/target-i386/hax-i386.h @@ -40,6 +40,7 @@ struct hax_state hax_fd fd; /* the global hax device interface */ uint32_t version; struct hax_vm *vm; + uint64_t mem_quota; }; #define HAX_MAX_VCPU 0x10 @@ -67,6 +68,7 @@ int hax_sync_vcpu_state(CPUState *env, struct vcpu_state_t *state, int set); int hax_sync_msr(CPUState *env, struct hax_msr_data *msrs, int set); int hax_sync_fpu(CPUState *env, struct fx_layout *fl, int set); int hax_vm_destroy(struct hax_vm *vm); +int hax_capability(struct hax_state *hax, struct hax_capabilityinfo *cap); /* Common host function */ int hax_host_create_vm(struct hax_state *hax, int *vm_id); |