From fd472c53c63debd7b07cb0b2304a40a696e2822e Mon Sep 17 00:00:00 2001
From: "Michael S. Tsirkin" <mst@redhat.com>
Date: Sun, 4 Mar 2018 01:42:44 -0500
Subject: [PATCH] Revert "cpu: add APIs to allocate/free CPU environment"

This reverts commit e2a7f28693aea7e194ec1435697ec4feb24f8a6f.

This was not supposed to go upstream yet. Reverting.

Backports commit cde0a63ad721dbb538419a00f9405587680be436 from qemu
---
 qemu/include/qom/cpu.h | 27 ---------------------------
 qemu/qom/cpu.c         | 34 ----------------------------------
 2 files changed, 61 deletions(-)

diff --git a/qemu/include/qom/cpu.h b/qemu/include/qom/cpu.h
index f9071012..fc19efc2 100644
--- a/qemu/include/qom/cpu.h
+++ b/qemu/include/qom/cpu.h
@@ -350,33 +350,6 @@ static inline void cpu_tb_jmp_cache_clear(CPUState *cpu)
 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/qemu/qom/cpu.c b/qemu/qom/cpu.c
index fa7aa78a..265be07c 100644
--- a/qemu/qom/cpu.c
+++ b/qemu/qom/cpu.c
@@ -74,40 +74,6 @@ out:
     return cpu;
 }
 
-void *cpu_alloc_env(CPUState *cpu)
-{
-    CPUClass *cc = CPU_GET_CLASS(cpu->uc, cpu);
-
-    return cc->alloc_env ? cc->alloc_env(cpu) : NULL;
-}
-
-void cpu_get_env(CPUState *cpu, void *env)
-{
-    CPUClass *cc = CPU_GET_CLASS(cpu->uc, cpu);
-
-    if (cc->get_env) {
-        cc->get_env(cpu, env);
-    }
-}
-
-void cpu_set_env(CPUState *cpu, void *env)
-{
-    CPUClass *cc = CPU_GET_CLASS(cpu->uc, cpu);
-
-    if (cc->set_env) {
-        cc->set_env(cpu, env);
-    }
-}
-
-void cpu_free_env(CPUState *cpu, void *env)
-{
-    CPUClass *cc = CPU_GET_CLASS(cpu->uc, cpu);
-
-    if (cc->free_env) {
-        cc->free_env(cpu, env);
-    }
-}
-
 bool cpu_paging_enabled(const CPUState *cpu)
 {
     CPUClass *cc = CPU_GET_CLASS(cpu->uc, cpu);