-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA512 This seems to at least allow things to compile, qemu-system seems to be able to boot images on i386, but I may have missed something:
diff --git a/cpus.c b/cpus.c index 23cf7aa..11f8bab 100644 - --- a/cpus.c +++ b/cpus.c @@ -338,15 +338,8 @@ static int64_t qemu_icount_round(int64_t count) static void icount_warp_rt(void) { - - /* The icount_warp_timer is rescheduled soon after vm_clock_warp_start - - * changes from -1 to another value, so the race here is okay. - - */ - - if (atomic_read(&vm_clock_warp_start) == -1) { - - return; - - } - - seqlock_write_lock(&timers_state.vm_clock_seqlock); - - if (runstate_is_running()) { + if ((vm_clock_warp_start != -1) && runstate_is_running()) { int64_t clock = REPLAY_CLOCK(REPLAY_CLOCK_VIRTUAL_RT, cpu_get_clock_locked()); int64_t warp_delta; -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQF8BAEBCgBmBQJW+WNBXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRCQUFENDYzMkU3MTIxREU4RDIwOTk3REQx MjAxRUZDQTFFNzI3RTY0AAoJEBIB78oecn5kyMwH/0Gq6gHKhjtwSCInMNJgG0hv oAZmv0/2p0U1S3Kp84ALRU90z3K7nwKjShw7uBK6On5Z0mT7CpsFrrVLb1FErJAW VP3IDlTxUUpY2fvMlJjYRHcBmvVUpiKbFQ9eFBBdYK1erT7lVK4/lGtoCaltoqr+ HRY8XBV5m3IXY/MIypUuTq9hv4/KjFs/Jg5pDYbCGTvXgj3xbqRDdNpEKGLtmKHg UD3MpzD1LTVsTsT6t8ys6CMU3ykeWKwRc1vY33kfOCalK1VVVIWoq2XUmQK8DUGj U6FjXuPmA7+jY7C9RQL5uzJnz+gLG3JZE0j8LfLeRzA9fxAMe+tg8ZbhFU9vohw= =PQrC -----END PGP SIGNATURE-----