| commit | 7253cfe3c16eb4a741c9f1c1aa8cce981a45899f | |
| author | Marcelo Tosatti <mtosatti@redhat.com> | |
| Fri, 10 Feb 2012 18:11:14 +0000 (10 16:11 -0200) | ||
| committer | Marcelo Tosatti <mtosatti@redhat.com> | |
| Fri, 10 Feb 2012 18:11:14 +0000 (10 16:11 -0200) | ||
| tree | 1fc764215b8a55bab05897f5a57c0a3a1fe91b84 | treesnapshot (tar.gz zip) |
| parent | 3be7de65ca090717e71d1ed25533ebd85b7a8132 | commitdiff |
| parent | d34e8f6e9d3a396c3327aa9807c83f9e1f4a7bd7 | commitdiff |
Merge commit 'd34e8f6e9d3a396c3327aa9807c83f9e1f4a7bd7' into upstream-merge
* commit 'd34e8f6e9d3a396c3327aa9807c83f9e1f4a7bd7':
main-loop: For tools, initialize timers as part of qemu_init_main_loop()
main-loop: Fix SetEvent() on uninitialized handle on win32
Conflicts:
vl.c
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
* commit 'd34e8f6e9d3a396c3327aa9807c83f9e1f4a7bd7':
main-loop: For tools, initialize timers as part of qemu_init_main_loop()
main-loop: Fix SetEvent() on uninitialized handle on win32
Conflicts:
vl.c
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
| vl.c | diff1 | diff2 | blobhistory |