apic: convert ->busdev.qdev casts to C casts
Use C casts to avoid accessing ICCDevice's qdev field directly. Signed-off-by: Zhu Guihua <zhugh.fnst@cn.fujitsu.com> Reviewed-by: Igor Mammedov <imammedo@redhat.com> Reviewed-by: Andreas Färber <afaerber@suse.de> Acked-by: Andreas Färber <afaerber@suse.de> Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
This commit is contained in:
parent
458cf469f4
commit
be9f8a0872
|
@ -370,13 +370,14 @@ static int apic_irq_pending(APICCommonState *s)
|
||||||
static void apic_update_irq(APICCommonState *s)
|
static void apic_update_irq(APICCommonState *s)
|
||||||
{
|
{
|
||||||
CPUState *cpu;
|
CPUState *cpu;
|
||||||
|
DeviceState *dev = (DeviceState *)s;
|
||||||
|
|
||||||
cpu = CPU(s->cpu);
|
cpu = CPU(s->cpu);
|
||||||
if (!qemu_cpu_is_self(cpu)) {
|
if (!qemu_cpu_is_self(cpu)) {
|
||||||
cpu_interrupt(cpu, CPU_INTERRUPT_POLL);
|
cpu_interrupt(cpu, CPU_INTERRUPT_POLL);
|
||||||
} else if (apic_irq_pending(s) > 0) {
|
} else if (apic_irq_pending(s) > 0) {
|
||||||
cpu_interrupt(cpu, CPU_INTERRUPT_HARD);
|
cpu_interrupt(cpu, CPU_INTERRUPT_HARD);
|
||||||
} else if (!apic_accept_pic_intr(&s->busdev.qdev) || !pic_get_output(isa_pic)) {
|
} else if (!apic_accept_pic_intr(dev) || !pic_get_output(isa_pic)) {
|
||||||
cpu_reset_interrupt(cpu, CPU_INTERRUPT_HARD);
|
cpu_reset_interrupt(cpu, CPU_INTERRUPT_HARD);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -549,10 +550,12 @@ static void apic_deliver(DeviceState *dev, uint8_t dest, uint8_t dest_mode,
|
||||||
|
|
||||||
static bool apic_check_pic(APICCommonState *s)
|
static bool apic_check_pic(APICCommonState *s)
|
||||||
{
|
{
|
||||||
if (!apic_accept_pic_intr(&s->busdev.qdev) || !pic_get_output(isa_pic)) {
|
DeviceState *dev = (DeviceState *)s;
|
||||||
|
|
||||||
|
if (!apic_accept_pic_intr(dev) || !pic_get_output(isa_pic)) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
apic_deliver_pic_intr(&s->busdev.qdev, 1);
|
apic_deliver_pic_intr(dev, 1);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue