qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Zhang Chen <chen.zhang@intel.com >
To: Jason Wang <jasowang@redhat.com>, qemu-dev <qemu-devel@nongnu.org>
Cc: "Derek Su" <dereksu@qnap.com>,
	"Zhang Chen" <chen.zhang@intel.com>,
	"Philippe Mathieu-Daudé" <philmd@redhat.com>,
	"Zhang Chen" <zhangckid@gmail.com>
Subject: [PATCH V2 07/10] net/colo-compare.c: Fix compare_timeout format issue
Date: Fri, 16 Oct 2020 13:52:05 +0800	[thread overview]
Message-ID: <20201016055208.7969-8-chen.zhang@intel.com> (raw)
In-Reply-To: <20201016055208.7969-1-chen.zhang@intel.com>

From: Zhang Chen <chen.zhang@intel.com>

This parameter need compare with the return of qemu_clock_get_ms(),
it is uint64_t. So we need fix this issue here.

Fixes: 9cc43c94b31 ("net/colo-compare.c: Expose "compare_timeout" to users")

Reported-by: Derek Su <dereksu@qnap.com>
Signed-off-by: Zhang Chen <chen.zhang@intel.com>
Reviewed-by: Li Zhijian <lizhijian@cn.fujitsu.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
 net/colo-compare.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/net/colo-compare.c b/net/colo-compare.c
index 8d476bbd99..76b83a9ca0 100644
--- a/net/colo-compare.c
+++ b/net/colo-compare.c
@@ -120,7 +120,7 @@ struct CompareState {
     SendCo out_sendco;
     SendCo notify_sendco;
     bool vnet_hdr;
-    uint32_t compare_timeout;
+    uint64_t compare_timeout;
     uint32_t expired_scan_cycle;
 
     /*
@@ -1076,9 +1076,9 @@ static void compare_get_timeout(Object *obj, Visitor *v,
                                 Error **errp)
 {
     CompareState *s = COLO_COMPARE(obj);
-    uint32_t value = s->compare_timeout;
+    uint64_t value = s->compare_timeout;
 
-    visit_type_uint32(v, name, &value, errp);
+    visit_type_uint64(v, name, &value, errp);
 }
 
 static void compare_set_timeout(Object *obj, Visitor *v,
@@ -1141,9 +1141,9 @@ static void set_max_queue_size(Object *obj, Visitor *v,
                                Error **errp)
 {
     Error *local_err = NULL;
-    uint32_t value;
+    uint64_t value;
 
-    visit_type_uint32(v, name, &value, &local_err);
+    visit_type_uint64(v, name, &value, &local_err);
     if (local_err) {
         goto out;
     }
@@ -1391,7 +1391,7 @@ static void colo_compare_init(Object *obj)
     object_property_add_str(obj, "notify_dev",
                             compare_get_notify_dev, compare_set_notify_dev);
 
-    object_property_add(obj, "compare_timeout", "uint32",
+    object_property_add(obj, "compare_timeout", "uint64",
                         compare_get_timeout,
                         compare_set_timeout, NULL, NULL);
 
-- 
2.17.1



  parent reply	other threads:[~2020-10-16  5:56 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-10-16  5:51 [PATCH V2 00/10] COLO project queued patches 20-Oct Zhang Chen
2020-10-16  5:51 ` [PATCH V2 01/10] net/filter-rewriter: destroy g_hash_table in colo_rewriter_cleanup Zhang Chen
2020-10-16  5:52 ` [PATCH V2 02/10] Optimize seq_sorter function for colo-compare Zhang Chen
2020-10-16  5:52 ` [PATCH V2 03/10] Reduce the time of checkpoint for COLO Zhang Chen
2020-10-16  5:52 ` [PATCH V2 04/10] Fix the qemu crash when guest shutdown in COLO mode Zhang Chen
2020-10-16  5:52 ` [PATCH V2 05/10] colo-compare: fix missing compare_seq initialization Zhang Chen
2020-10-16  5:52 ` [PATCH V2 06/10] colo-compare: check mark in mutual exclusion Zhang Chen
2020-10-16  5:52 ` Zhang Chen [this message]
2020-10-16  5:52 ` [PATCH V2 08/10] net/colo-compare.c: Change the timer clock type Zhang Chen
2020-10-16  5:52 ` [PATCH V2 09/10] net/colo-compare.c: Add secondary old packet detection Zhang Chen
2020-10-16  5:52 ` [PATCH V2 10/10] net/colo-compare.c: Increase default queued packet scan frequency Zhang Chen
2020-10-19  6:52 ` [PATCH V2 00/10] COLO project queued patches 20-Oct Jason Wang

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=20201016055208.7969-8-chen.zhang@intel.com \
    --to=chen.zhang@intel.com \
    --cc=dereksu@qnap.com \
    --cc=jasowang@redhat.com \
    --cc=philmd@redhat.com \
    --cc=qemu-devel@nongnu.org \
    --cc=zhangckid@gmail.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).