From: Andreas Färber <afaerber@suse.de>
Date: Sat, 27 Jul 2013 14:27:41 +0000 (+0200)
Subject: kvmvapic: QOM cast cleanup
X-Git-Tag: v1.6.0-rc0~17^2~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=253eacc2fb1f592af9de64c5a9a2157fbf8ccb0d;p=thirdparty%2Fqemu.git

kvmvapic: QOM cast cleanup

Signed-off-by: Andreas Färber <afaerber@suse.de>
---

diff --git a/hw/i386/kvmvapic.c b/hw/i386/kvmvapic.c
index a4506bcf42a..15beb8044e7 100644
--- a/hw/i386/kvmvapic.c
+++ b/hw/i386/kvmvapic.c
@@ -456,7 +456,7 @@ static void patch_instruction(VAPICROMState *s, X86CPU *cpu, target_ulong ip)
 void vapic_report_tpr_access(DeviceState *dev, CPUState *cs, target_ulong ip,
                              TPRAccess access)
 {
-    VAPICROMState *s = DO_UPCAST(VAPICROMState, busdev.qdev, dev);
+    VAPICROMState *s = VAPIC(dev);
     X86CPU *cpu = X86_CPU(cs);
     CPUX86State *env = &cpu->env;
 
@@ -508,7 +508,7 @@ static void vapic_enable_tpr_reporting(bool enable)
 
 static void vapic_reset(DeviceState *dev)
 {
-    VAPICROMState *s = DO_UPCAST(VAPICROMState, busdev.qdev, dev);
+    VAPICROMState *s = VAPIC(dev);
 
     if (s->state == VAPIC_ACTIVE) {
         s->state = VAPIC_STANDBY;