From: Richard Henderson <richard.henderson@linaro.org>
To: qemu-devel@nongnu.org
Cc: philmd@redhat.com, Wei Wang <wei.w.wang@intel.com>,
alex.bennee@linaro.org,
"Dr . David Alan Gilbert" <dgilbert@redhat.com>
Subject: [PATCH v4 2/6] migration: fix xbzrle encoding rate calculation
Date: Wed, 17 Jun 2020 13:13:05 -0700 [thread overview]
Message-ID: <20200617201309.1640952-3-richard.henderson@linaro.org> (raw)
In-Reply-To: <20200617201309.1640952-1-richard.henderson@linaro.org>
From: Wei Wang <wei.w.wang@intel.com>
It's reported an error of implicit conversion from "unsigned long" to
"double" when compiling with Clang 10. Simply make the encoding rate 0
when the encoded_size is 0.
Fixes: e460a4b1a4
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Reported-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Wei Wang <wei.w.wang@intel.com>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
migration/ram.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/migration/ram.c b/migration/ram.c
index 41cc530d9d..069b6e30bc 100644
--- a/migration/ram.c
+++ b/migration/ram.c
@@ -913,10 +913,8 @@ static void migration_update_rates(RAMState *rs, int64_t end_time)
unencoded_size = (xbzrle_counters.pages - rs->xbzrle_pages_prev) *
TARGET_PAGE_SIZE;
encoded_size = xbzrle_counters.bytes - rs->xbzrle_bytes_prev;
- if (xbzrle_counters.pages == rs->xbzrle_pages_prev) {
+ if (xbzrle_counters.pages == rs->xbzrle_pages_prev || !encoded_size) {
xbzrle_counters.encoding_rate = 0;
- } else if (!encoded_size) {
- xbzrle_counters.encoding_rate = UINT64_MAX;
} else {
xbzrle_counters.encoding_rate = unencoded_size / encoded_size;
}
--
2.25.1
next prev parent reply other threads:[~2020-06-17 20:15 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-17 20:13 [PATCH v4 0/6] Vs clang-10 and gcc-9 warnings Richard Henderson
2020-06-17 20:13 ` [PATCH v4 1/6] fpu/softfloat: Silence 'bitwise negation of boolean expression' warning Richard Henderson
2020-06-17 20:13 ` Richard Henderson [this message]
2020-06-17 20:13 ` [PATCH v4 3/6] configure: Clean up warning flag lists Richard Henderson
2020-06-17 20:13 ` [PATCH v4 4/6] configure: Disable -Wtautological-type-limit-compare Richard Henderson
2020-06-17 20:13 ` [PATCH v4 5/6] configure: Add -Wno-psabi Richard Henderson
2020-06-17 20:13 ` [PATCH v4 6/6] qht: Fix threshold rate calculation Richard Henderson
2020-06-17 20:58 ` Richard Henderson
2020-06-19 17:31 ` Peter Maydell
2020-06-18 10:22 ` [PATCH v4 0/6] Vs clang-10 and gcc-9 warnings Peter Maydell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200617201309.1640952-3-richard.henderson@linaro.org \
--to=richard.henderson@linaro.org \
--cc=alex.bennee@linaro.org \
--cc=dgilbert@redhat.com \
--cc=philmd@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=wei.w.wang@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).