| commit | 0c81e6b5b6b7395306c7d2e5400ce9b3780291fb | |
| author | Avi Kivity <avi@redhat.com> | |
| Sun, 16 May 2010 12:54:50 +0000 (16 15:54 +0300) | ||
| committer | Avi Kivity <avi@redhat.com> | |
| Sun, 16 May 2010 12:54:50 +0000 (16 15:54 +0300) | ||
| tree | d04e17a30f5486248e151a1c8e9907e056a07e1c | treesnapshot (tar.gz zip) |
| parent | 39b38c8b8f3f39cdb585c9c40089e6dfe93f8c3e | commitdiff |
| parent | ec2654fb299306941e80c4907b7a9798cb6c6f05 | commitdiff |
Merge commit 'ec2654fb299306941e80c4907b7a9798cb6c6f05' into upstream-merge
* commit 'ec2654fb299306941e80c4907b7a9798cb6c6f05':
pc: remove global variable rtc_state by using qemu_irq.
pc: remove a global variable, floppy_controller.
pc: make an unnecessary global variable, pit, local.
pc, i440fx: Make smm enable/disable function i440fx independent.
Conflicts:
hw/pc.c
Signed-off-by: Avi Kivity <avi@redhat.com>
* commit 'ec2654fb299306941e80c4907b7a9798cb6c6f05':
pc: remove global variable rtc_state by using qemu_irq.
pc: remove a global variable, floppy_controller.
pc: make an unnecessary global variable, pit, local.
pc, i440fx: Make smm enable/disable function i440fx independent.
Conflicts:
hw/pc.c
Signed-off-by: Avi Kivity <avi@redhat.com>
| hw/pc.c | diff1 | diff2 | blobhistory |
| hw/pc.h | diff1 | diff2 | blobhistory |
| hw/piix_pci.c | diff1 | diff2 | blobhistory |