s390x/pci: introduce S390PCIBus

[qemu.git] / target-alpha / cpu-qom.h

diff --git a/target-alpha/cpu-qom.h b/target-alpha/cpu-qom.h
index 16367d2ea4a4f11ecfe372217e63b39af57d1260..bae4945344660474421e97e3af994fc7a41d85d5 100644 (file)
--- a/target-alpha/cpu-qom.h
+++ b/target-alpha/cpu-qom.h
@@ -21,7 +21,6 @@
 #define QEMU_ALPHA_CPU_QOM_H
 
 #include "qom/cpu.h"
-#include "cpu.h"
 
 #define TYPE_ALPHA_CPU "alpha-cpu"
 
@@ -34,6 +33,7 @@
 
 /**
  * AlphaCPUClass:
+ * @parent_realize: The parent class' realize handler.
  * @parent_reset: The parent class' reset handler.
  *
  * An Alpha CPU model.
@@ -43,32 +43,10 @@ typedef struct AlphaCPUClass {
     CPUClass parent_class;
     /*< public >*/
 
+    DeviceRealize parent_realize;
     void (*parent_reset)(CPUState *cpu);
 } AlphaCPUClass;
 
-/**
- * AlphaCPU:
- * @env: #CPUAlphaState
- *
- * An Alpha CPU.
- */
-typedef struct AlphaCPU {
-    /*< private >*/
-    CPUState parent_obj;
-    /*< public >*/
-
-    CPUAlphaState env;
-
-    /* This alarm doesn't exist in real hardware; we wish it did.  */
-    struct QEMUTimer *alarm_timer;
-} AlphaCPU;
-
-static inline AlphaCPU *alpha_env_get_cpu(CPUAlphaState *env)
-{
-    return ALPHA_CPU(container_of(env, AlphaCPU, env));
-}
-
-#define ENV_GET_CPU(e) CPU(alpha_env_get_cpu(e))
-
+typedef struct AlphaCPU AlphaCPU;
 
 #endif