timers: remove useless check
loadvm_state is called from: vl.c during startup, vmstart() is called after finishing loading. The other caller do_loadvm() does the call after a vm_stop(). At both places where we can be saving state we are stoped a few lines before Signed-off-by: Juan Quintela <quintela@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
parent
bbfe1408fa
commit
b03b2e48cb
6
vl.c
6
vl.c
@ -1067,9 +1067,6 @@ void qemu_get_timer(QEMUFile *f, QEMUTimer *ts)
|
|||||||
|
|
||||||
static void timer_save(QEMUFile *f, void *opaque)
|
static void timer_save(QEMUFile *f, void *opaque)
|
||||||
{
|
{
|
||||||
if (cpu_ticks_enabled) {
|
|
||||||
hw_error("cannot save state if virtual timers are running");
|
|
||||||
}
|
|
||||||
qemu_put_be64(f, cpu_ticks_offset);
|
qemu_put_be64(f, cpu_ticks_offset);
|
||||||
qemu_put_be64(f, ticks_per_sec);
|
qemu_put_be64(f, ticks_per_sec);
|
||||||
qemu_put_be64(f, cpu_clock_offset);
|
qemu_put_be64(f, cpu_clock_offset);
|
||||||
@ -1079,9 +1076,6 @@ static int timer_load(QEMUFile *f, void *opaque, int version_id)
|
|||||||
{
|
{
|
||||||
if (version_id != 1 && version_id != 2)
|
if (version_id != 1 && version_id != 2)
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
if (cpu_ticks_enabled) {
|
|
||||||
return -EINVAL;
|
|
||||||
}
|
|
||||||
cpu_ticks_offset=qemu_get_be64(f);
|
cpu_ticks_offset=qemu_get_be64(f);
|
||||||
ticks_per_sec=qemu_get_be64(f);
|
ticks_per_sec=qemu_get_be64(f);
|
||||||
if (version_id == 2) {
|
if (version_id == 2) {
|
||||||
|
Loading…
Reference in New Issue
Block a user