diff options
| author | Peter Maydell | 2017-08-10 11:05:29 +0200 |
|---|---|---|
| committer | Peter Maydell | 2017-08-10 11:05:29 +0200 |
| commit | 8a6be122e4eec029501a0d61f104fca3a5ae6f30 (patch) | |
| tree | a47e36f4fe6dad3c0361032ff552ebb0ce9eb1b6 /include/qom/cpu.h | |
| parent | Update version for v2.10.0-rc2 release (diff) | |
| parent | libqtest: always set up signal handler for SIGABRT (diff) | |
| download | qemu-8a6be122e4eec029501a0d61f104fca3a5ae6f30.tar.gz qemu-8a6be122e4eec029501a0d61f104fca3a5ae6f30.tar.xz qemu-8a6be122e4eec029501a0d61f104fca3a5ae6f30.zip | |
Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging
pc, vhost: fixes for rc3
Fix up bugs and warnings in tests. Revert an experimental commit that I
put in by mistake: harmless but useless.
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
# gpg: Signature made Wed 09 Aug 2017 02:23:17 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:
libqtest: always set up signal handler for SIGABRT
libvhost-user: quit when no more data received
net: fix -netdev socket,fd= for UDP sockets
Revert "cpu: add APIs to allocate/free CPU environment"
acpi-test: update expected DSDT files
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include/qom/cpu.h')
| -rw-r--r-- | include/qom/cpu.h | 31 |
1 files changed, 0 insertions, 31 deletions
diff --git a/include/qom/cpu.h b/include/qom/cpu.h index e9d30c52b4..25eefea7ab 100644 --- a/include/qom/cpu.h +++ b/include/qom/cpu.h @@ -162,10 +162,6 @@ 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); @@ -444,33 +440,6 @@ 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. * |