virtio/virtio-balloon: Prefer Object* over void* parameter
PATCH RESEND 1/1 virtio/virtio-balloon: Prefer Object* over void* parameter
*opaque is an alias to *obj. Using the ladder makes the code consistent with with other devices, e.g. accel/kvm/kvm-all and accel/tcg/tcg-all. It also makes the cast more typesafe.
--- hw/virtio/virtio-balloon.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
hw/virtio/virtio-balloon.c +5 -5
@@ -242,7 +242,7 @@ static void balloon_stats_get_all(Object *obj, Visitor *v, const char *name, void *opaque, Error **errp) { Error *err = NULL; -VirtIOBalloon *s = opaque; +VirtIOBalloon *s =VIRTIO_BALLOON (obj);int i;if (!visit_start_struct (v, name,NULL ,0 , &err)) {
@@ -277,7 +277,7 @@ static void balloon_stats_get_poll_interval(Object *obj, Visitor *v, const char *name, void *opaque, Error **errp) { - VirtIOBalloon *s = opaque; + VirtIOBalloon *s = VIRTIO_BALLOON(obj);visit_type_int (v, name, &s->stats_poll_interval, errp); }
@@ -285,7 +285,7 @@ static void balloon_stats_set_poll_interval(Object *obj, Visitor *v, const char *name, void *opaque, Error **errp) { - VirtIOBalloon *s = opaque; + VirtIOBalloon *s = VIRTIO_BALLOON(obj);int64_t value;if (!visit_type_int (v, name, &value, errp)) {
@@ -1015,12 +1015,12 @@ static void virtio_balloon_instance_init(Object *obj) s->free_page_hint_notify.notify = virtio_balloon_free_page_hint_notify;object_property_add (obj,"guest-stats" ,"guest statistics" , - balloon_stats_get_all,NULL ,NULL , s); + balloon_stats_get_all,NULL ,NULL ,NULL );object_property_add (obj,"guest-stats-polling-interval" ,"int" , balloon_stats_get_poll_interval, balloon_stats_set_poll_interval, -NULL , s); +NULL ,NULL ); }static const VMStateDescription vmstate_virtio_balloon = {
Signature · 1 line
2.35.1
PATCH 1/1 virtio/virtio-balloon: Prefer Object* over void* parameter
*opaque is an alias to *obj. Using the ladder makes the code consistent with with other devices, e.g. accel/kvm/kvm-all and accel/tcg/tcg-all. It also makes the cast more typesafe.
--- hw/virtio/virtio-balloon.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
hw/virtio/virtio-balloon.c +5 -5
@@ -242,7 +242,7 @@ static void balloon_stats_get_all(Object *obj, Visitor *v, const char *name, void *opaque, Error **errp) { Error *err = NULL; -VirtIOBalloon *s = opaque; +VirtIOBalloon *s =VIRTIO_BALLOON (obj);int i;if (!visit_start_struct (v, name,NULL ,0 , &err)) {
@@ -277,7 +277,7 @@ static void balloon_stats_get_poll_interval(Object *obj, Visitor *v, const char *name, void *opaque, Error **errp) { - VirtIOBalloon *s = opaque; + VirtIOBalloon *s = VIRTIO_BALLOON(obj);visit_type_int (v, name, &s->stats_poll_interval, errp); }
@@ -285,7 +285,7 @@ static void balloon_stats_set_poll_interval(Object *obj, Visitor *v, const char *name, void *opaque, Error **errp) { - VirtIOBalloon *s = opaque; + VirtIOBalloon *s = VIRTIO_BALLOON(obj);int64_t value;if (!visit_type_int (v, name, &value, errp)) {
@@ -1015,12 +1015,12 @@ static void virtio_balloon_instance_init(Object *obj) s->free_page_hint_notify.notify = virtio_balloon_free_page_hint_notify;object_property_add (obj,"guest-stats" ,"guest statistics" , - balloon_stats_get_all,NULL ,NULL , s); + balloon_stats_get_all,NULL ,NULL ,NULL );object_property_add (obj,"guest-stats-polling-interval" ,"int" , balloon_stats_get_poll_interval, balloon_stats_set_poll_interval, -NULL , s); +NULL ,NULL ); }static const VMStateDescription vmstate_virtio_balloon = {
Signature · 1 line
2.35.1
Quoted 6 lines · Bernhard Beschow
*opaque is an alias to *obj. Using the ladder makes the code consistent with with other devices, e.g. accel/kvm/kvm-all and accel/tcg/tcg-all. It also makes the cast more typesafe.
Signed-off-by Bernhard Beschow <[email protected]>Reviewed-by David Hildenbrand <[email protected]>
trivial tree pls
Quoted 52 lines
--- hw/virtio/virtio-balloon.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)hw/virtio/virtio-balloon.c +5
-5@@ -242,7 +242,7 @@ static void balloon_stats_get_all(Object *obj, Visitor *v, const char *name, void *opaque, Error **errp) { Error *err = NULL; -VirtIOBalloon *s = opaque; +VirtIOBalloon *s =VIRTIO_BALLOON (obj);int i;if (!visit_start_struct (v, name,NULL ,0 , &err)) {@@ -277,7 +277,7 @@ static void balloon_stats_get_poll_interval(Object *obj, Visitor *v, const char *name, void *opaque, Error **errp) { - VirtIOBalloon *s = opaque; + VirtIOBalloon *s = VIRTIO_BALLOON(obj);visit_type_int (v, name, &s->stats_poll_interval, errp); }@@ -285,7 +285,7 @@ static void balloon_stats_set_poll_interval(Object *obj, Visitor *v, const char *name, void *opaque, Error **errp) { - VirtIOBalloon *s = opaque; + VirtIOBalloon *s = VIRTIO_BALLOON(obj);int64_t value;if (!visit_type_int (v, name, &value, errp)) {@@ -1015,12 +1015,12 @@ static void virtio_balloon_instance_init(Object *obj) s->free_page_hint_notify.notify = virtio_balloon_free_page_hint_notify;object_property_add (obj,"guest-stats" ,"guest statistics" , - balloon_stats_get_all,NULL ,NULL , s); + balloon_stats_get_all,NULL ,NULL ,NULL );object_property_add (obj,"guest-stats-polling-interval" ,"int" , balloon_stats_get_poll_interval, balloon_stats_set_poll_interval, -NULL , s); +NULL ,NULL ); }static const VMStateDescription vmstate_virtio_balloon = {Signature · 1 line
2.35.1
Laurent Vivier
AppliedLe 04/03/2022 à 11:20, Michael S. Tsirkin a écrit :
Quoted 11 lines · Bernhard Beschow
Quoted 6 lines
*opaque is an alias to *obj. Using the ladder makes the code consistent with with other devices, e.g. accel/kvm/kvm-all and accel/tcg/tcg-all. It also makes the cast more typesafe.
Signed-off-by Bernhard Beschow <[email protected]>Reviewed-by David Hildenbrand <[email protected]>trivial tree pls
Applied to my trivial-patches branch.
Thanks,
Laurent
Am 1. März 2022 22:23:00 UTC schrieb Bernhard Beschow <[email protected]>:
Quoted 46 lines
*opaque is an alias to *obj. Using the ladder makes the code consistent with with other devices, e.g. accel/kvm/kvm-all and accel/tcg/tcg-all. It also makes the cast more typesafe.
Signed-off-by Bernhard Beschow <[email protected]>Reviewed-by David Hildenbrand <[email protected]>---
hw/virtio/virtio-balloon.c| 10 +++++-----1 file changed, 5 insertions(+), 5 deletions(-)hw/virtio/virtio-balloon.c +3
-4@@ -242,7 +242,7 @@ static void balloon_stats_get_all(Object *obj, Visitor *v, const char *name, void *opaque, Error **errp) { Error *err = NULL; -VirtIOBalloon *s = opaque; +VirtIOBalloon *s =VIRTIO_BALLOON (obj);int i;if (!visit_start_struct (v, name,NULL ,0 , &err)) {@@ -277,7 +277,7 @@ static void balloon_stats_get_poll_interval(Object *obj, Visitor *v, const char *name, void *opaque, Error **errp) { - VirtIOBalloon *s = opaque; + VirtIOBalloon *s = VIRTIO_BALLOON(obj);visit_type_int (v, name, &s->stats_poll_interval, errp); }@@ -285,7 +285,7 @@ static void balloon_stats_set_poll_interval(Object *obj, Visitor *v, const char *name, void *opaque, Error **errp) { - VirtIOBalloon *s = opaque; + VirtIOBalloon *s = VIRTIO_BALLOON(obj);int64_t value;if (!visit_type_int (v, name, &value, errp)) {@@ -1015,12 +1015,12 @@ static void virtio_balloon_instance_init(Object *obj) s->free_page_hint_notify.notify = virtio_balloon_free_page_hint_notify; object_property_add(obj, "guest-stats", "guest statistics", - balloon_stats_get_all,NULL ,NULL , s);
hw/virtio/virtio-balloon.c static void virtio_balloon_instance_init(Object *obj) · line 1026
Quoted 10 lines
hw/virtio/virtio-balloon.c +2
-1+ balloon_stats_get_all, NULL, NULL, NULL);object_property_add (obj,"guest-stats-polling-interval" ,"int" , balloon_stats_get_poll_interval, balloon_stats_set_poll_interval, -NULL , s); +NULL ,NULL ); }static const VMStateDescription vmstate_virtio_balloon = {
No changes. Just also CC'ed to qemu-trivial.