diff options
| author | Marcelo Tosatti <mtosatti@redhat.com> | 2010-07-13 19:55:50 -0300 |
|---|---|---|
| committer | Marcelo Tosatti <mtosatti@redhat.com> | 2010-07-13 19:55:50 -0300 |
| commit | 9237b68be75a7e8036975c9a91c54ddc496ec7ae (patch) | |
| tree | dbd706c62b10ca909715d9201accb8b2682819e4 /qemu-timer.c | |
| parent | 6b440ef2a97e45f6839413f7609fa16090c5d5ff (diff) | |
| parent | 0be71e324f774a77243f1a1487f468232d69542b (diff) | |
Merge commit '0be71e324f774a77243f1a1487f468232d69542b' into upstream-merge
* commit '0be71e324f774a77243f1a1487f468232d69542b':
savevm: Add DeviceState param
pci: Implement BusInfo.get_dev_path()
qdev: Add a get_dev_path() function to BusInfo
pc: Allocate all ram in a single qemu_ram_alloc()
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Diffstat (limited to 'qemu-timer.c')
| -rw-r--r-- | qemu-timer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/qemu-timer.c b/qemu-timer.c index 6021ad8ac..77185656e 100644 --- a/qemu-timer.c +++ b/qemu-timer.c @@ -664,7 +664,7 @@ static const VMStateDescription vmstate_timers = { void configure_icount(const char *option) { - vmstate_register(0, &vmstate_timers, &timers_state); + vmstate_register(NULL, 0, &vmstate_timers, &timers_state); if (!option) return; |