diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2017-08-08 10:01:49 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2017-08-08 10:01:49 +0100 |
| commit | b4174c4b08a719e7df7e4f35c29f44b7c2517237 (patch) | |
| tree | fcfd296020160408d7caadc0ce477ddd28318cb7 /include | |
| parent | f22ab6cb0c47bd2a2785b7d58130949bd7d8d9af (diff) | |
| parent | e2a7f28693aea7e194ec1435697ec4feb24f8a6f (diff) | |
| download | qemu-b4174c4b08a719e7df7e4f35c29f44b7c2517237.zip qemu-b4174c4b08a719e7df7e4f35c29f44b7c2517237.tar.gz qemu-b4174c4b08a719e7df7e4f35c29f44b7c2517237.tar.bz2 | |
Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging
virtio: fix for rc2
It turns out there's a way to setup SHPC on Q35: just put
a PCI to PCI bridge behind a DMI to PCI one. Our _OSC is
thus incorrect.
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
# gpg: Signature made Mon 07 Aug 2017 22:39:20 BST
# gpg: using RSA key 0x281F0DB8D28D5469
# gpg: Good signature from "Michael S. Tsirkin <mst@kernel.org>"
# gpg: aka "Michael S. Tsirkin <mst@redhat.com>"
# Primary key fingerprint: 0270 606B 6F3C DF3D 0B17 0970 C350 3912 AFBE 8E67
# Subkey fingerprint: 5D09 FD08 71C8 F85B 94CA 8A0D 281F 0DB8 D28D 5469
* remotes/mst/tags/for_upstream:
cpu: add APIs to allocate/free CPU environment
hw/i386: allow SHPC for Q35 machine
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/qom/cpu.h | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/include/qom/cpu.h b/include/qom/cpu.h index 25eefea..e9d30c5 100644 --- a/include/qom/cpu.h +++ b/include/qom/cpu.h @@ -162,6 +162,10 @@ typedef struct CPUClass { void (*dump_statistics)(CPUState *cpu, FILE *f, fprintf_function cpu_fprintf, int flags); int64_t (*get_arch_id)(CPUState *cpu); + void * (*alloc_env)(CPUState *cpu); + void (*get_env)(CPUState *cpu, void *env); + void (*set_env)(CPUState *cpu, void *env); + void (*free_env)(CPUState *cpu, void *env); bool (*get_paging_enabled)(const CPUState *cpu); void (*get_memory_mapping)(CPUState *cpu, MemoryMappingList *list, Error **errp); @@ -440,6 +444,33 @@ extern bool mttcg_enabled; #define qemu_tcg_mttcg_enabled() (mttcg_enabled) /** + * cpu_alloc_env: allocate CPU environment structure + * @cpu: allocate environment structure for this CPU + */ +void *cpu_alloc_env(CPUState *cpu); + +/** + * cpu_get_env: retrieve CPU environment structure + * @cpu: CPU to use + * @env: environment structure to use + */ +void cpu_get_env(CPUState *cpu, void *env); + +/** + * cpu_set_env: switch to given CPU environment + * @cpu: CPU to use + * @env: environment structure to use + */ +void cpu_set_env(CPUState *cpu, void *env); + +/** + * cpu_free_env: free CPU environment structure + * @cpu: free environment structure for this CPU + * @env: structure to free + */ +void cpu_free_env(CPUState *cpu, void *env); + +/** * cpu_paging_enabled: * @cpu: The CPU whose state is to be inspected. * |