diff options
| author | blueswir1 <blueswir1@c046a42c-6fe2-441c-8c8c-71466251a162> | 2008-11-02 10:51:05 +0000 |
|---|---|---|
| committer | blueswir1 <blueswir1@c046a42c-6fe2-441c-8c8c-71466251a162> | 2008-11-02 10:51:05 +0000 |
| commit | 6d0c293dc336807e4a2ab9c3a74483da747601ce (patch) | |
| tree | 7a84f9a9a102f9cb2e6500097d0b57b4cd49abf7 /hw/slavio_misc.c | |
| parent | fdce4963ea58ec2405e87b2edf96f8c93275d919 (diff) | |
| download | qemu-6d0c293dc336807e4a2ab9c3a74483da747601ce.zip qemu-6d0c293dc336807e4a2ab9c3a74483da747601ce.tar.gz qemu-6d0c293dc336807e4a2ab9c3a74483da747601ce.tar.bz2 | |
Halt the CPU using a qemu_irq
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@5601 c046a42c-6fe2-441c-8c8c-71466251a162
Diffstat (limited to 'hw/slavio_misc.c')
| -rw-r--r-- | hw/slavio_misc.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/hw/slavio_misc.c b/hw/slavio_misc.c index 6a30f0c..2890cfd 100644 --- a/hw/slavio_misc.c +++ b/hw/slavio_misc.c @@ -50,7 +50,7 @@ typedef struct MiscState { uint8_t diag, mctrl; uint32_t sysctrl; uint16_t leds; - CPUState *env; + qemu_irq cpu_halt; qemu_irq fdc_tc; } MiscState; @@ -256,7 +256,7 @@ static void apc_mem_writeb(void *opaque, target_phys_addr_t addr, uint32_t val) MiscState *s = opaque; MISC_DPRINTF("Write power management %2.2x\n", val & 0xff); - cpu_interrupt(s->env, CPU_INTERRUPT_HALT); + qemu_irq_raise(s->cpu_halt); } static uint32_t apc_mem_readb(void *opaque, target_phys_addr_t addr) @@ -417,7 +417,7 @@ static int slavio_misc_load(QEMUFile *f, void *opaque, int version_id) void *slavio_misc_init(target_phys_addr_t base, target_phys_addr_t power_base, target_phys_addr_t aux1_base, target_phys_addr_t aux2_base, qemu_irq irq, - CPUState *env, qemu_irq **fdc_tc) + qemu_irq cpu_halt, qemu_irq **fdc_tc) { int io; MiscState *s; @@ -471,7 +471,7 @@ void *slavio_misc_init(target_phys_addr_t base, target_phys_addr_t power_base, } s->irq = irq; - s->env = env; + s->cpu_halt = cpu_halt; *fdc_tc = &s->fdc_tc; register_savevm("slavio_misc", base, 1, slavio_misc_save, slavio_misc_load, |