diff options
| author |   Avi Kivity <avi@redhat.com> | 2009-08-09 18:14:54 +0300 |
|---|---|---|
| committer | Avi Kivity <avi@redhat.com> | 2009-08-09 18:14:54 +0300 |
| commit | 1c45eec341763ed38270a3d1f230044fdfeefb16 (patch) | |
| tree | 3f7e5465515dd4e84efdfc5eba8193d5081b0e0f /qemu-kvm.c | |
| parent | Do not disable autostart for live migration (diff) | |
| parent | Use qemu_irq for system_powerdown (diff) | |
| download | qemu-kvm-1c45eec341763ed38270a3d1f230044fdfeefb16.tar.gz qemu-kvm-1c45eec341763ed38270a3d1f230044fdfeefb16.tar.bz2 qemu-kvm-1c45eec341763ed38270a3d1f230044fdfeefb16.zip | |
Merge commit 'upstream/master'
* commit 'upstream/master':
Use qemu_irq for system_powerdown
Sparc32: use qemu_irq for system_powerdown
Sparc32: move sparc32_dma init to sun4m.c
Sparc32: remove VRAM and NVRAM sizes from hwdef
Sparc32: remove IRQ numbers from hwdef
Sparc32: move intbit_to_level table back to slavio_intctl.c
Sparc32: move device instantiation to sun4m.c
Sparc32: Refactor slavio timer
ppc_newworld: configure screen size from QEMU command line options
Sparc64: configure screen size from QEMU command line options
ppc_oldworld: configure screen size from qemu command line options
Sparc64: replace tsptr with helper routine
Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'qemu-kvm.c')
| -rw-r--r-- | qemu-kvm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/qemu-kvm.c b/qemu-kvm.c index 605ddf481..b59e40370 100644 --- a/qemu-kvm.c +++ b/qemu-kvm.c @@ -2005,7 +2005,7 @@ int kvm_main_loop(void) } else break; } else if (qemu_powerdown_requested()) - qemu_system_powerdown(); + qemu_irq_raise(qemu_system_powerdown); else if (qemu_reset_requested()) qemu_kvm_system_reset(); else if (kvm_debug_cpu_requested) { |