Merge commit '92a16d7a9a904d5dd55d012b89ad798f0e4cd0bd' into upstream-merge

* commit '92a16d7a9a904d5dd55d012b89ad798f0e4cd0bd':
  apic: qdev conversion cleanup

Conflicts:
	hw/apic.h

Signed-off-by: Avi Kivity <avi@redhat.com>

1 files changed, 12 insertions, 12 deletions

diff --git a/hw/apic.h b/hw/apic.h
index e71b5f6f8..c857d5254 100644
--- a/hw/apic.h
+++ b/hw/apic.h
@@ -1,28 +1,28 @@
 #ifndef APIC_H
 #define APIC_H
 
+#include "qemu-common.h"
+
 /* apic.c */
-typedef struct APICState APICState;
 void apic_deliver_irq(uint8_t dest, uint8_t dest_mode,
                              uint8_t delivery_mode,
                              uint8_t vector_num, uint8_t polarity,
                              uint8_t trigger_mode);
-APICState *apic_init(void *env, uint8_t apic_id);
-int apic_accept_pic_intr(APICState *s);
-void apic_deliver_pic_intr(APICState *s, int level);
-int apic_get_interrupt(APICState *s);
+int apic_accept_pic_intr(DeviceState *s);
+void apic_deliver_pic_intr(DeviceState *s, int level);
+int apic_get_interrupt(DeviceState *s);
 void apic_reset_irq_delivered(void);
 int apic_get_irq_delivered(void);
 void apic_set_irq_delivered(void);
-void cpu_set_apic_base(APICState *s, uint64_t val);
-uint64_t cpu_get_apic_base(APICState *s);
-void cpu_set_apic_tpr(APICState *s, uint8_t val);
-uint8_t cpu_get_apic_tpr(APICState *s);
-void apic_init_reset(APICState *s);
-void apic_sipi(APICState *s);
+void cpu_set_apic_base(DeviceState *s, uint64_t val);
+uint64_t cpu_get_apic_base(DeviceState *s);
+void cpu_set_apic_tpr(DeviceState *s, uint8_t val);
+uint8_t cpu_get_apic_tpr(DeviceState *s);
+void apic_init_reset(DeviceState *s);
+void apic_sipi(DeviceState *s);
 
 /* pc.c */
 int cpu_is_bsp(CPUState *env);
-APICState *cpu_get_current_apic(void);
+DeviceState *cpu_get_current_apic(void);
 
 #endif