From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NFVud-00024o-NQ for qemu-devel@nongnu.org; Tue, 01 Dec 2009 11:49:15 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NFVuY-00022o-Lb for qemu-devel@nongnu.org; Tue, 01 Dec 2009 11:49:14 -0500 Received: from [199.232.76.173] (port=59694 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NFVuY-00022e-4p for qemu-devel@nongnu.org; Tue, 01 Dec 2009 11:49:10 -0500 Received: from cantor2.suse.de ([195.135.220.15]:47994 helo=mx2.suse.de) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NFVuX-0005rC-0U for qemu-devel@nongnu.org; Tue, 01 Dec 2009 11:49:09 -0500 Message-ID: <4B154903.2050409@suse.de> Date: Tue, 01 Dec 2009 17:49:07 +0100 From: Alexander Graf MIME-Version: 1.0 Subject: Re: [Qemu-devel] [PATCH v2 4/9] provide i8259-kvm References: <1258391527-18840-1-git-send-email-glommer@redhat.com> <1258391527-18840-2-git-send-email-glommer@redhat.com> <1258391527-18840-3-git-send-email-glommer@redhat.com> <1258391527-18840-4-git-send-email-glommer@redhat.com> <1258391527-18840-5-git-send-email-glommer@redhat.com> In-Reply-To: <1258391527-18840-5-git-send-email-glommer@redhat.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Glauber Costa Cc: aliguori@us.ibm.com, qemu-devel@nongnu.org Glauber Costa wrote: > This patch provides the file i8259-kvm.c, which implements a schim over > the kvm in-kernel PIC. > > Signed-off-by: Glauber Costa > --- > Makefile.target | 2 +- > hw/i8259-kvm.c | 112 +++++++++++++++++++++++++++++++++++++++++++++++= ++++++++ > hw/pc.c | 8 +++- > hw/pc.h | 1 + > kvm-all.c | 26 ++++++++++++- > kvm.h | 2 + > 6 files changed, 147 insertions(+), 4 deletions(-) > create mode 100644 hw/i8259-kvm.c > > diff --git a/Makefile.target b/Makefile.target > index 6e97ba7..86cf0a5 100644 > --- a/Makefile.target > +++ b/Makefile.target > @@ -199,7 +199,7 @@ obj-i386-y +=3D usb-uhci.o vmmouse.o vmport.o vmwar= e_vga.o hpet.o > obj-i386-y +=3D device-hotplug.o pci-hotplug.o smbios.o wdt_ib700.o > obj-i386-y +=3D ne2000-isa.o > =20 > -obj-i386-$(CONFIG_KVM) +=3D ioapic-kvm.o > +obj-i386-$(CONFIG_KVM) +=3D ioapic-kvm.o i8259-kvm.o > =20 > # shared objects > obj-ppc-y =3D ppc.o ide/core.o ide/qdev.o ide/isa.o ide/pci.o ide/maci= o.o > diff --git a/hw/i8259-kvm.c b/hw/i8259-kvm.c > new file mode 100644 > index 0000000..bd6387b > --- /dev/null > +++ b/hw/i8259-kvm.c > @@ -0,0 +1,112 @@ > +#include "hw.h" > +#include "pc.h" > +#include "isa.h" > +#include "monitor.h" > +#include "qemu-timer.h" > +#include "kvm.h" > + > +static void kvm_i8259_set_irq(void *opaque, int irq, int level) > +{ > + int pic_ret; > + > + if (kvm_set_irq(irq, level, &pic_ret)) { > + if (pic_ret !=3D 0) > + /* In theory, we should not be using any apic state, but w= e need > + * to warn devices such as the rtc about state of delivery= . Since this > + * one is just a marker, it is no big deal */ > + apic_set_irq_delivered(); > + return; > + } > +} > + > +static void kvm_pic_reset(void *opaque) > +{ > + struct kvm_pic_state *s =3D opaque; > + struct kvm_irqchip *chip; > + > + s->last_irr =3D 0; > + s->irr =3D 0; > + s->imr =3D 0; > + s->isr =3D 0; > + s->priority_add =3D 0; > + s->irq_base =3D 0; > + s->read_reg_select =3D 0; > + s->poll =3D 0; > + s->special_mask =3D 0; > + s->init_state =3D 0; > + s->auto_eoi =3D 0; > + s->rotate_on_auto_eoi =3D 0; > + s->special_fully_nested_mode =3D 0; > + s->init4 =3D 0; > + > + chip =3D container_of(s, struct kvm_irqchip, chip.pic); > + kvm_set_irqchip(chip); > +} > + > +static void pic_pre_save(void *opaque) > +{ > + struct kvm_pic_state *s =3D opaque; > + struct kvm_irqchip *chip; > + > + chip =3D container_of(s, struct kvm_irqchip, chip.pic); > + > + kvm_get_irqchip(chip); > +} > + > +static int pic_post_load(void *opaque, int version_id) > +{ > + struct kvm_pic_state *s =3D opaque; > + struct kvm_irqchip *chip; > + > + chip =3D container_of(s, struct kvm_irqchip, chip.pic); > + > + return kvm_set_irqchip(chip); > +} > + > +static const VMStateDescription vmstate_kvm_pic =3D { > + .name =3D "i8259-kvm", > + .version_id =3D 1, > + .pre_save =3D pic_pre_save, > + .post_load =3D pic_post_load, > + .minimum_version_id =3D 1, > + .fields =3D (VMStateField []) { > + VMSTATE_UINT8(last_irr, struct kvm_pic_state), > + VMSTATE_UINT8(irr, struct kvm_pic_state), > + VMSTATE_UINT8(imr, struct kvm_pic_state), > + VMSTATE_UINT8(isr, struct kvm_pic_state), > + VMSTATE_UINT8(priority_add, struct kvm_pic_state), > + VMSTATE_UINT8(irq_base, struct kvm_pic_state), > + VMSTATE_UINT8(read_reg_select, struct kvm_pic_state), > + VMSTATE_UINT8(poll, struct kvm_pic_state), > + VMSTATE_UINT8(special_mask, struct kvm_pic_state), > + VMSTATE_UINT8(init_state, struct kvm_pic_state), > + VMSTATE_UINT8(auto_eoi, struct kvm_pic_state), > + VMSTATE_UINT8(rotate_on_auto_eoi, struct kvm_pic_state), > + VMSTATE_UINT8(special_fully_nested_mode, struct kvm_pic_state)= , > + VMSTATE_UINT8(init4, struct kvm_pic_state), > + VMSTATE_UINT8(elcr, struct kvm_pic_state), > + VMSTATE_END_OF_LIST() > + } > +}; > + > +static void kvm_pic_init1(int io_addr, struct kvm_pic_state *s) > +{ > + vmstate_register(io_addr, &vmstate_kvm_pic, s); > + qemu_register_reset(kvm_pic_reset, s); > +} > + > +qemu_irq *kvm_i8259_init(qemu_irq parent_irq) > +{ > + struct kvm_irqchip *master, *slave; > + > + master =3D qemu_mallocz(sizeof(*master)); > + slave =3D qemu_mallocz(sizeof(*slave)); > + > + master->chip_id =3D KVM_IRQCHIP_PIC_MASTER; > + slave->chip_id =3D KVM_IRQCHIP_PIC_SLAVE; > + > + kvm_pic_init1(0x20, &master->chip.pic); > + kvm_pic_init1(0xa0, &slave->chip.pic); > + > + return qemu_allocate_irqs(kvm_i8259_set_irq, master, 16); > +} > diff --git a/hw/pc.c b/hw/pc.c > index b7a1734..003ae11 100644 > --- a/hw/pc.c > +++ b/hw/pc.c > @@ -1154,8 +1154,14 @@ static void pc_init1(ram_addr_t ram_size, > } > =20 > cpu_irq =3D qemu_allocate_irqs(pic_irq_request, NULL, 1); > - i8259 =3D i8259_init(cpu_irq[0]); > isa_irq_state =3D qemu_mallocz(sizeof(*isa_irq_state)); > + > + if (kvm_enabled() && kvm_irqchip_in_kernel()) { > + i8259 =3D kvm_i8259_init(cpu_irq[0]); > + } else { > + i8259 =3D i8259_init(cpu_irq[0]); > + } > + > isa_irq_state->i8259 =3D i8259; > isa_irq =3D qemu_allocate_irqs(isa_irq_handler, isa_irq_state, 24)= ; > =20 > diff --git a/hw/pc.h b/hw/pc.h > index 4c9b4c3..3d79b9d 100644 > --- a/hw/pc.h > +++ b/hw/pc.h > @@ -34,6 +34,7 @@ uint32_t pic_intack_read(PicState2 *s); > void pic_info(Monitor *mon); > void irq_info(Monitor *mon); > =20 > +qemu_irq *kvm_i8259_init(qemu_irq parent_irq); > /* APIC */ > typedef struct IOAPICState IOAPICState; > void apic_deliver_irq(uint8_t dest, uint8_t dest_mode, > diff --git a/kvm-all.c b/kvm-all.c > index fc542f3..c46a411 100644 > --- a/kvm-all.c > +++ b/kvm-all.c > @@ -391,7 +391,6 @@ int kvm_check_extension(KVMState *s, unsigned int e= xtension) > return ret; > } > =20 > -#ifdef KVM_CAP_IRQCHIP > int kvm_set_irqchip(struct kvm_irqchip *chip) > { > if (!kvm_state->irqchip_in_kernel) { > @@ -409,7 +408,30 @@ int kvm_get_irqchip(struct kvm_irqchip *chip) > =20 > return kvm_vm_ioctl(kvm_state, KVM_GET_IRQCHIP, chip); > } > -#endif > + > +int kvm_set_irq(int irq, int level, int *status) > +{ > + struct kvm_irq_level event; > + int r; > + > + if (!kvm_state->irqchip_in_kernel) { > + return 0; > + } > + > + event.level =3D level; > + event.irq =3D irq; > + > + r =3D kvm_vm_ioctl(kvm_state, KVM_IRQ_LINE_STATUS, &event); > =20 On S390X: /suse/agraf/work/kvm-s390/qemu.works/kvm-all.c: In function =E2=80=98kvm_= set_irq=E2=80=99: /suse/agraf/work/kvm-s390/qemu.works/kvm-all.c:425: error: =E2=80=98KVM_IRQ_LINE_STATUS=E2=80=99 undeclared (first use in this funct= ion) /suse/agraf/work/kvm-s390/qemu.works/kvm-all.c:425: error: (Each undeclared identifier is reported only once /suse/agraf/work/kvm-s390/qemu.works/kvm-all.c:425: error: for each function it appears in.) /suse/agraf/work/kvm-s390/qemu.works/kvm-all.c:431: error: =E2=80=98struc= t kvm_irq_level=E2=80=99 has no member named =E2=80=98status=E2=80=99 Alex