diff options
| author | Zhang Chen | 2020-10-16 07:52:05 +0200 |
|---|---|---|
| committer | Jason Wang | 2020-11-11 09:52:23 +0100 |
| commit | 0c4266ef2690312512512ad6f4e44b5ac1d44c0c (patch) | |
| tree | 7524eb8ffa40222c0db45c40bc21c5069b0500b8 | |
| parent | colo-compare: check mark in mutual exclusion (diff) | |
| download | qemu-0c4266ef2690312512512ad6f4e44b5ac1d44c0c.tar.gz qemu-0c4266ef2690312512512ad6f4e44b5ac1d44c0c.tar.xz qemu-0c4266ef2690312512512ad6f4e44b5ac1d44c0c.zip | |
net/colo-compare.c: Fix compare_timeout format issue
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>
Signed-off-by: Jason Wang <jasowang@redhat.com>
| -rw-r--r-- | net/colo-compare.c | 12 |
1 files 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); |