Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging

[qemu.git] / util / qemu-progress.c

diff --git a/util/qemu-progress.c b/util/qemu-progress.c
index 4ee5cd07f2776c16c7ba590b25f7a5262d386b79..f745233763aa8417ebf7599e6c2ca50271d60db1 100644 (file)
--- a/util/qemu-progress.c
+++ b/util/qemu-progress.c
@@ -22,9 +22,8 @@
  * THE SOFTWARE.
  */
 
-#include "qemu-common.h"
 #include "qemu/osdep.h"
-#include <stdio.h>
+#include "qemu-common.h"
 
 struct progress_state {
     float current;
@@ -152,7 +151,8 @@ void qemu_progress_print(float delta, int max)
     state.current = current;
 
     if (current > (state.last_print + state.min_skip) ||
-        (current == 100) || (current == 0)) {
+        current < (state.last_print - state.min_skip) ||
+        current == 100 || current == 0) {
         state.last_print = state.current;
         state.print();
     }