| Message ID | 20200918092203.20384-2-chen.zhang@intel.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | Several optimization and bugfix for COLO compare. | expand |
On 9/18/20 5:22 PM, Zhang Chen wrote: > From: Zhang Chen <chen.zhang@intel.com> > > This parameter need compare with the return of qemu_clock_get_ms(), > it is uinit64_t. So we need fix this issue here. > > Reported-by: Derek Su <dereksu@qnap.com> > Signed-off-by: Zhang Chen <chen.zhang@intel.com> Reviewed-by: Li Zhijian <lizhijian@cn.fujitsu.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 3a45d64175..7cba573dae 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; > > /* > @@ -1081,9 +1081,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, > @@ -1146,9 +1146,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; > } > @@ -1396,7 +1396,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); >
diff --git a/net/colo-compare.c b/net/colo-compare.c index 3a45d64175..7cba573dae 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; /* @@ -1081,9 +1081,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, @@ -1146,9 +1146,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; } @@ -1396,7 +1396,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);