]> git.proxmox.com Git - mirror_qemu.git/commit - hw/i386/pc.c
hpet: enable to entitle more irq pins for hpet
authorLiu Ping Fan <qemulist@gmail.com>
Sun, 8 Dec 2013 09:38:17 +0000 (17:38 +0800)
committerMichael S. Tsirkin <mst@redhat.com>
Wed, 11 Dec 2013 18:11:09 +0000 (20:11 +0200)
commit7a10ef51c2397ac4323bc786af02c58b413b5cd2
tree1081bc99a1661c9cb112f681d300f12e4ef7c6a8
parent0d63b2dd31464cfccc80bbeedc24e3863fe4c895
hpet: enable to entitle more irq pins for hpet

Owning to some different hardware design, piix and q35 need
different compat. So making them diverge.

On q35, IRQ2/8 can be reserved for hpet timer 0/1. And pin 16~23
can be assigned to hpet as guest chooses. So we introduce intcap
property to do that.

Consider the compat and piix/q35, we finally have the following
value for intcap: For piix, hpet's intcap is hard coded as IRQ2.
For pc-q35-1.7 and earlier, we use IRQ2 for compat reason. Otherwise
IRQ2, IRQ8, and IRQ16~23 are allowed.

Signed-off-by: Liu Ping Fan <pingfank@linux.vnet.ibm.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
hw/i386/pc.c
hw/i386/pc_piix.c
hw/i386/pc_q35.c
hw/timer/hpet.c
include/hw/i386/pc.h