Received: from eggs.gnu.org ([2001:4830:134:3::10]:44013) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yv2UX-0004wb-8c for qemu-devel@nongnu.org; Wed, 20 May 2015 07:48:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Yv2UT-000426-9v for qemu-devel@nongnu.org; Wed, 20 May 2015 07:48:53 -0400 Received: from mx1.redhat.com ([209.132.183.28]:54991) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yv2UT-00041o-0k for qemu-devel@nongnu.org; Wed, 20 May 2015 07:48:49 -0400 Date: Wed, 20 May 2015 13:48:40 +0200 From: Igor Mammedov Message-ID: <20150520134840.0132bb0f@nial.brq.redhat.com> In-Reply-To: <5813534d8a2afa9ae2ff8f42c17b53dad2b3386e.1431936953.git.zhugh.fnst@cn.fujitsu.com> References: <5813534d8a2afa9ae2ff8f42c17b53dad2b3386e.1431936953.git.zhugh.fnst@cn.fujitsu.com> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH v6 2/4] apic: convert ->busdev.qdev casts to C casts List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Zhu Guihua Cc: ehabkost@redhat.com, qemu-devel@nongnu.org, guz.fnst@cn.fujitsu.com, izumi.taku@jp.fujitsu.com, chen.fan.fnst@cn.fujitsu.com, pbonzini@redhat.com, afaerber@suse.de On Wed, 20 May 2015 10:40:47 +0800 Zhu Guihua wrote: > Use C casts to avoid accessing ICCDevice's qdev field > directly. > > Signed-off-by: Zhu Guihua Reviewed-by: Igor Mammedov > --- > hw/intc/apic.c | 9 ++++++--- > 1 file changed, 6 insertions(+), 3 deletions(-) > > diff --git a/hw/intc/apic.c b/hw/intc/apic.c > index 0f97b47..77b639c 100644 > --- a/hw/intc/apic.c > +++ b/hw/intc/apic.c > @@ -370,13 +370,14 @@ static int apic_irq_pending(APICCommonState *s) > static void apic_update_irq(APICCommonState *s) > { > CPUState *cpu; > + DeviceState *dev = (DeviceState *)s; > > cpu = CPU(s->cpu); > if (!qemu_cpu_is_self(cpu)) { > cpu_interrupt(cpu, CPU_INTERRUPT_POLL); > } else if (apic_irq_pending(s) > 0) { > 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); > } > } > @@ -549,10 +550,12 @@ static void apic_deliver(DeviceState *dev, uint8_t dest, uint8_t dest_mode, > > 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; > } > - apic_deliver_pic_intr(&s->busdev.qdev, 1); > + apic_deliver_pic_intr(dev, 1); > return true; > } >