[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 2/5] Revert "cpu: add APIs to allocate/free CPU envir
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] [PULL 2/5] Revert "cpu: add APIs to allocate/free CPU environment" |
Date: |
Wed, 9 Aug 2017 04:50:48 +0300 |
This reverts commit e2a7f28693aea7e194ec1435697ec4feb24f8a6f.
This was not supposed to go upstream yet. Reverting.
Signed-off-by: Michael S. Tsirkin <address@hidden>
---
include/qom/cpu.h | 31 -------------------------------
qom/cpu.c | 34 ----------------------------------
2 files changed, 65 deletions(-)
diff --git a/include/qom/cpu.h b/include/qom/cpu.h
index e9d30c5..25eefea 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.
*
diff --git a/qom/cpu.c b/qom/cpu.c
index 9201fd9..4f38db0 100644
--- a/qom/cpu.c
+++ b/qom/cpu.c
@@ -89,40 +89,6 @@ out:
return cpu;
}
-void *cpu_alloc_env(CPUState *cpu)
-{
- CPUClass *cc = CPU_GET_CLASS(cpu);
-
- return cc->alloc_env ? cc->alloc_env(cpu) : NULL;
-}
-
-void cpu_get_env(CPUState *cpu, void *env)
-{
- CPUClass *cc = CPU_GET_CLASS(cpu);
-
- if (cc->get_env) {
- cc->get_env(cpu, env);
- }
-}
-
-void cpu_set_env(CPUState *cpu, void *env)
-{
- CPUClass *cc = CPU_GET_CLASS(cpu);
-
- if (cc->set_env) {
- cc->set_env(cpu, env);
- }
-}
-
-void cpu_free_env(CPUState *cpu, void *env)
-{
- CPUClass *cc = CPU_GET_CLASS(cpu);
-
- if (cc->free_env) {
- cc->free_env(cpu, env);
- }
-}
-
bool cpu_paging_enabled(const CPUState *cpu)
{
CPUClass *cc = CPU_GET_CLASS(cpu);
--
MST
- [Qemu-devel] [PULL 0/5] pc, vhost: fixes for rc3, Michael S. Tsirkin, 2017/08/08
- [Qemu-devel] [PULL 1/5] acpi-test: update expected DSDT files, Michael S. Tsirkin, 2017/08/08
- [Qemu-devel] [PULL 2/5] Revert "cpu: add APIs to allocate/free CPU environment",
Michael S. Tsirkin <=
- [Qemu-devel] [PULL 3/5] net: fix -netdev socket, fd= for UDP sockets, Michael S. Tsirkin, 2017/08/08
- [Qemu-devel] [PULL 4/5] libvhost-user: quit when no more data received, Michael S. Tsirkin, 2017/08/08
- [Qemu-devel] [PULL 5/5] libqtest: always set up signal handler for SIGABRT, Michael S. Tsirkin, 2017/08/08
- Re: [Qemu-devel] [PULL 0/5] pc, vhost: fixes for rc3, Peter Maydell, 2017/08/10