OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

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: 9cc43c94b3 ("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>
This commit is contained in:
Zhang Chen 2020-10-16 13:52:05 +08:00 committed by Jason Wang
parent 45b9e8c33a
commit 0c4266ef26
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
net/colo-compare.c
View File

@ -120,7 +120,7 @@ struct CompareState {
SendCo out_sendco; SendCo out_sendco;
SendCo notify_sendco; SendCo notify_sendco;
bool vnet_hdr; bool vnet_hdr;
uint32_t compare_timeout; uint64_t compare_timeout;
uint32_t expired_scan_cycle; uint32_t expired_scan_cycle;
/* /*
@ -1076,9 +1076,9 @@ static void compare_get_timeout(Object *obj, Visitor *v,
Error **errp) Error **errp)
{ {
CompareState *s = COLO_COMPARE(obj); 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, 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 **errp)
{ {
Error *local_err = NULL; 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) { if (local_err) {
goto out; goto out;
} }
@ -1391,7 +1391,7 @@ static void colo_compare_init(Object *obj)
object_property_add_str(obj, "notify_dev", object_property_add_str(obj, "notify_dev",
compare_get_notify_dev, compare_set_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_get_timeout,
compare_set_timeout, NULL, NULL); compare_set_timeout, NULL, NULL);