@@ -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.
*
@@ -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);
This reverts commit e2a7f28693aea7e194ec1435697ec4feb24f8a6f. This was not supposed to go upstream yet. Reverting. Signed-off-by: Michael S. Tsirkin <mst@redhat.com> --- include/qom/cpu.h | 31 ------------------------------- qom/cpu.c | 34 ---------------------------------- 2 files changed, 65 deletions(-)