diff options
author | Anthony Liguori <aliguori@us.ibm.com> | 2010-02-08 10:06:54 -0600 |
---|---|---|
committer | Anthony Liguori <aliguori@us.ibm.com> | 2010-02-08 10:06:54 -0600 |
commit | 8217d945860c546844807e22088e8a7d97836aff (patch) | |
tree | b30fa9e9ac08830317d4314c4e11374bc286c813 /vl.c | |
parent | 4cb26382182bf5256de1d9058739946d922e9f49 (diff) | |
parent | c5f32c99c6855d466737daf1cd262e7e92062f87 (diff) | |
download | hqemu-8217d945860c546844807e22088e8a7d97836aff.zip hqemu-8217d945860c546844807e22088e8a7d97836aff.tar.gz |
Merge remote branch 'qemu-kvm/uq/master' into staging-tmp
Diffstat (limited to 'vl.c')
-rw-r--r-- | vl.c | 4 |
1 files changed, 4 insertions, 0 deletions
@@ -2996,6 +2996,7 @@ static void gui_update(void *opaque) DisplayState *ds = opaque; DisplayChangeListener *dcl = ds->listeners; + qemu_flush_coalesced_mmio_buffer(); dpy_refresh(ds); while (dcl != NULL) { @@ -3011,6 +3012,7 @@ static void nographic_update(void *opaque) { uint64_t interval = GUI_REFRESH_INTERVAL; + qemu_flush_coalesced_mmio_buffer(); qemu_mod_timer(nographic_timer, interval + qemu_get_clock(rt_clock)); } @@ -3280,6 +3282,8 @@ static int cpu_can_run(CPUState *env) return 0; if (env->stopped) return 0; + if (!vm_running) + return 0; return 1; } |