aboutsummaryrefslogtreecommitdiff
path: root/hw/piix_pci.c
diff options
context:
space:
mode:
authorIsaku Yamahata <yamahata@valinux.co.jp>2011-04-01 20:43:24 +0900
committerMichael S. Tsirkin <mst@redhat.com>2011-04-01 15:54:05 +0300
commitafe3ef1d01dd767b6824c0580ecb92f6a27b75cc (patch)
tree764af3e85b7d2642b0ed73c46f3f9efd28e61764 /hw/piix_pci.c
parentab431c283e7055bcd6fb622f212bb29e84a6a134 (diff)
downloadqemu-afe3ef1d01dd767b6824c0580ecb92f6a27b75cc.zip
qemu-afe3ef1d01dd767b6824c0580ecb92f6a27b75cc.tar.gz
qemu-afe3ef1d01dd767b6824c0580ecb92f6a27b75cc.tar.bz2
piix_pci: load path clean up
The previous patch didn't change the behavior when load, it resulted in ugly code. This patch cleans it up. With this patch, pic irq lines are manipulated when loaded. It is expected that it won't change the behaviour because the interrupts are level: at the moment e.g. pci devices already reassert interrupts on load. Test: - rung linux as guest and use flooding ping (ping -f) to host in order to trigger interrupts for e1000 emulated. - savevm/loadvm and see guest kept running after loadvm. To be honest, I'm not sure that ping -f caused enough interrupts because Linux e1000 driver supports NAPI. TODO: test more OSes, stress test with save/load, live-migration Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Diffstat (limited to 'hw/piix_pci.c')
-rw-r--r--hw/piix_pci.c12
1 files changed, 4 insertions, 8 deletions
diff --git a/hw/piix_pci.c b/hw/piix_pci.c
index 7ffb821..5f0d92f 100644
--- a/hw/piix_pci.c
+++ b/hw/piix_pci.c
@@ -281,8 +281,7 @@ static void piix3_set_irq_pic(PIIX3State *piix3, int pic_irq)
(pic_irq * PIIX_NUM_PIRQS))));
}
-static void piix3_set_irq_level(PIIX3State *piix3, int pirq, int level,
- bool propagate)
+static void piix3_set_irq_level(PIIX3State *piix3, int pirq, int level)
{
int pic_irq;
uint64_t mask;
@@ -296,15 +295,13 @@ static void piix3_set_irq_level(PIIX3State *piix3, int pirq, int level,
piix3->pic_levels &= ~mask;
piix3->pic_levels |= mask * !!level;
- if (propagate) {
- piix3_set_irq_pic(piix3, pic_irq);
- }
+ piix3_set_irq_pic(piix3, pic_irq);
}
static void piix3_set_irq(void *opaque, int pirq, int level)
{
PIIX3State *piix3 = opaque;
- piix3_set_irq_level(piix3, pirq, level, true);
+ piix3_set_irq_level(piix3, pirq, level);
}
/* irq routing is changed. so rebuild bitmap */
@@ -315,8 +312,7 @@ static void piix3_update_irq_levels(PIIX3State *piix3)
piix3->pic_levels = 0;
for (pirq = 0; pirq < PIIX_NUM_PIRQS; pirq++) {
piix3_set_irq_level(piix3, pirq,
- pci_bus_get_irq_level(piix3->dev.bus, pirq),
- false);
+ pci_bus_get_irq_level(piix3->dev.bus, pirq));
}
}