diff options
| author |   Avi Kivity <avi@redhat.com> | 2009-05-25 17:28:56 +0300 |
|---|---|---|
| committer | Avi Kivity <avi@redhat.com> | 2009-05-25 17:28:56 +0300 |
| commit | 3db8b916e35608d97d53820b79a935dc48f51b4e (patch) | |
| tree | 5143abf4b5fa50020fff86924611a64a7cb990dd /hw/i8254.c | |
| parent | Refactor how display drivers are selected (diff) | |
| parent | Remove unused variable (diff) | |
| download | qemu-kvm-3db8b916e35608d97d53820b79a935dc48f51b4e.tar.gz qemu-kvm-3db8b916e35608d97d53820b79a935dc48f51b4e.tar.bz2 qemu-kvm-3db8b916e35608d97d53820b79a935dc48f51b4e.zip | |
Merge branch 'master' of git://git.sv.gnu.org/qemu
* 'master' of git://git.sv.gnu.org/qemu: (41 commits)
Remove unused variable
ETRAX: Removed unused struct entry and fixed Windows build.
Add common BusState
Fix lance segfaults
Avoid errors when curl-config does not exist
bios: Use the correct mask to size the PCI option ROM BAR
x86: Add support for resume flag
net: Fix dump time stamps
Add HTTP protocol using curl v6
USB serial device support
serial: fix lost character after sysrq
usb-serial: implement break event.
slirp: Reassign same address to same DHCP client
kvm: x86: Save/restore KVM-specific CPU states
kvm: Rework VCPU reset
Introduce reset notifier order
kvm: Fix framebuffer dirty log sync
kvm: Add missing bits to support live migration
kvm: Rework dirty bitmap synchronization
kvm: Fix dirty log temporary buffer size
...
Conflicts:
Makefile
configure
exec.c
hw/ioapic.c
hw/pc.c
pc-bios/bios.bin
target-i386/machine.c
vl.c
Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'hw/i8254.c')
| -rw-r--r-- | hw/i8254.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/i8254.c b/hw/i8254.c index 41d1605cc..2f229f9ae 100644 --- a/hw/i8254.c +++ b/hw/i8254.c @@ -494,7 +494,7 @@ PITState *pit_init(int base, qemu_irq irq) register_savevm(PIT_SAVEVM_NAME, base, PIT_SAVEVM_VERSION, pit_save, pit_load, pit); - qemu_register_reset(pit_reset, pit); + qemu_register_reset(pit_reset, 0, pit); register_ioport_write(base, 4, 1, pit_ioport_write, pit); register_ioport_read(base, 3, 1, pit_ioport_read, pit); |