diff options
| author | Blue Swirl <blauwirbel@gmail.com> | 2009-06-17 19:23:44 +0000 |
|---|---|---|
| committer | Blue Swirl <blauwirbel@gmail.com> | 2009-06-17 19:23:44 +0000 |
| commit | 42f1ced228c9b616cfa2b69846025271618e4ef5 (patch) | |
| tree | 4739f43120484ddb3d08611da06ffdc8daa8a0f2 | |
| parent | eae6bcbfd87c94fd2399b334c2b0a3a9cfa51f52 (diff) | |
| download | focaccia-qemu-42f1ced228c9b616cfa2b69846025271618e4ef5.tar.gz focaccia-qemu-42f1ced228c9b616cfa2b69846025271618e4ef5.zip | |
Don't set IRQs on device reset and loadvm/savevm
Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
| -rw-r--r-- | hw/esp.c | 2 | ||||
| -rw-r--r-- | hw/iommu.c | 1 | ||||
| -rw-r--r-- | hw/sbi.c | 6 | ||||
| -rw-r--r-- | hw/slavio_timer.c | 1 | ||||
| -rw-r--r-- | hw/sun4c_intctl.c | 2 |
5 files changed, 0 insertions, 12 deletions
diff --git a/hw/esp.c b/hw/esp.c index 5fa910c8b7..3698917704 100644 --- a/hw/esp.c +++ b/hw/esp.c @@ -401,8 +401,6 @@ static void esp_reset(void *opaque) { ESPState *s = opaque; - esp_lower_irq(s); - memset(s->rregs, 0, ESP_REGS); memset(s->wregs, 0, ESP_REGS); s->rregs[ESP_TCHI] = TCHI_FAS100A; // Indicate fas100a diff --git a/hw/iommu.c b/hw/iommu.c index 694adbddd4..eff62a2019 100644 --- a/hw/iommu.c +++ b/hw/iommu.c @@ -362,7 +362,6 @@ static void iommu_reset(void *opaque) s->regs[IOMMU_AFSR] = IOMMU_AFSR_RESV; s->regs[IOMMU_AER] = IOMMU_AER_EN_P0_ARB | IOMMU_AER_EN_P1_ARB; s->regs[IOMMU_MASK_ID] = IOMMU_TS_MASK; - qemu_irq_lower(s->irq); } void *iommu_init(target_phys_addr_t addr, uint32_t version, qemu_irq irq) diff --git a/hw/sbi.c b/hw/sbi.c index 4350b6ef95..80de8c3ed5 100644 --- a/hw/sbi.c +++ b/hw/sbi.c @@ -47,10 +47,6 @@ typedef struct SBIState { #define SBI_SIZE (SBI_NREGS * 4) -static void sbi_check_interrupts(void *opaque) -{ -} - static void sbi_set_irq(void *opaque, int irq, int level) { } @@ -122,7 +118,6 @@ static int sbi_load(QEMUFile *f, void *opaque, int version_id) for (i = 0; i < MAX_CPUS; i++) { qemu_get_be32s(f, &s->intreg_pending[i]); } - sbi_check_interrupts(s); return 0; } @@ -135,7 +130,6 @@ static void sbi_reset(void *opaque) for (i = 0; i < MAX_CPUS; i++) { s->intreg_pending[i] = 0; } - sbi_check_interrupts(s); } void *sbi_init(target_phys_addr_t addr, qemu_irq **irq, qemu_irq **cpu_irq, diff --git a/hw/slavio_timer.c b/hw/slavio_timer.c index 08dc5ffab2..dda5b623bf 100644 --- a/hw/slavio_timer.c +++ b/hw/slavio_timer.c @@ -359,7 +359,6 @@ static void slavio_timer_reset(void *opaque) ptimer_run(s->timer, 0); } s->running = 1; - qemu_irq_lower(s->irq); } static SLAVIO_TIMERState *slavio_timer_init(target_phys_addr_t addr, diff --git a/hw/sun4c_intctl.c b/hw/sun4c_intctl.c index caad6611d9..16f3d94204 100644 --- a/hw/sun4c_intctl.c +++ b/hw/sun4c_intctl.c @@ -183,7 +183,6 @@ static int sun4c_intctl_load(QEMUFile *f, void *opaque, int version_id) qemu_get_8s(f, &s->reg); qemu_get_8s(f, &s->pending); - sun4c_check_interrupts(s); return 0; } @@ -194,7 +193,6 @@ static void sun4c_intctl_reset(void *opaque) s->reg = 1; s->pending = 0; - sun4c_check_interrupts(s); } void *sun4c_intctl_init(target_phys_addr_t addr, qemu_irq **irq, |