diff options
| author | xiaoqiang zhao <zxq_yx_007@163.com> | 2013-11-05 18:16:02 +0800 |
|---|---|---|
| committer | Andreas Färber <afaerber@suse.de> | 2013-12-24 18:02:18 +0100 |
| commit | d3b0c9e90a9853984c60478dae45bedf8aadf42a (patch) | |
| tree | a6d922bef11f01da02a5ce5e244e43fdfb1c5e00 /hw/i386 | |
| parent | 6780a22cc71227068925e7b70faa71d6641a9b1b (diff) | |
apic: Cleanup for QOM'ification
Do some cleanup, including:
1. Remove DO_UPCAST() for APICCommonState
2. Change DeviceState pointers from 'd' to 'dev', better to understand
3. Rename 'register_types' to specifically 'apic_common_register_types'
Signed-off-by: xiaoqiang zhao <zxq_yx_007@163.com>
Signed-off-by: Andreas Färber <afaerber@suse.de>
Diffstat (limited to 'hw/i386')
| -rw-r--r-- | hw/i386/kvm/apic.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/hw/i386/kvm/apic.c b/hw/i386/kvm/apic.c index 5609063120..84f605692e 100644 --- a/hw/i386/kvm/apic.c +++ b/hw/i386/kvm/apic.c @@ -25,9 +25,9 @@ static inline uint32_t kvm_apic_get_reg(struct kvm_lapic_state *kapic, return *((uint32_t *)(kapic->regs + (reg_id << 4))); } -void kvm_put_apic_state(DeviceState *d, struct kvm_lapic_state *kapic) +void kvm_put_apic_state(DeviceState *dev, struct kvm_lapic_state *kapic) { - APICCommonState *s = DO_UPCAST(APICCommonState, busdev.qdev, d); + APICCommonState *s = APIC_COMMON(dev); int i; memset(kapic, 0, sizeof(*kapic)); @@ -51,9 +51,9 @@ void kvm_put_apic_state(DeviceState *d, struct kvm_lapic_state *kapic) kvm_apic_set_reg(kapic, 0x3e, s->divide_conf); } -void kvm_get_apic_state(DeviceState *d, struct kvm_lapic_state *kapic) +void kvm_get_apic_state(DeviceState *dev, struct kvm_lapic_state *kapic) { - APICCommonState *s = DO_UPCAST(APICCommonState, busdev.qdev, d); + APICCommonState *s = APIC_COMMON(dev); int i, v; s->id = kvm_apic_get_reg(kapic, 0x2) >> 24; |