[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 10/20] hw: Don't call visit_end_struct() after visit_
From: |
Luiz Capitulino |
Subject: |
[Qemu-devel] [PULL 10/20] hw: Don't call visit_end_struct() after visit_start_struct() fails |
Date: |
Fri, 16 May 2014 11:30:25 -0400 |
From: Markus Armbruster <address@hidden>
When visit_start_struct() fails, visit_end_struct() must not be
called. rtc_get_date() and balloon_stats_all() call it anyway. As
far as I can tell, they're only used with the string output visitor,
which doesn't care. Fix them anyway.
Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Signed-off-by: Luiz Capitulino <address@hidden>
---
hw/timer/mc146818rtc.c | 23 +++++++++++++++--------
hw/virtio/virtio-balloon.c | 25 +++++++++++++++++++------
2 files changed, 34 insertions(+), 14 deletions(-)
diff --git a/hw/timer/mc146818rtc.c b/hw/timer/mc146818rtc.c
index 8509309..6c3e3b6 100644
--- a/hw/timer/mc146818rtc.c
+++ b/hw/timer/mc146818rtc.c
@@ -793,19 +793,26 @@ static const MemoryRegionOps cmos_ops = {
static void rtc_get_date(Object *obj, Visitor *v, void *opaque,
const char *name, Error **errp)
{
+ Error *err = NULL;
RTCState *s = MC146818_RTC(obj);
struct tm current_tm;
rtc_update_time(s);
rtc_get_time(s, ¤t_tm);
- visit_start_struct(v, NULL, "struct tm", name, 0, errp);
- visit_type_int32(v, ¤t_tm.tm_year, "tm_year", errp);
- visit_type_int32(v, ¤t_tm.tm_mon, "tm_mon", errp);
- visit_type_int32(v, ¤t_tm.tm_mday, "tm_mday", errp);
- visit_type_int32(v, ¤t_tm.tm_hour, "tm_hour", errp);
- visit_type_int32(v, ¤t_tm.tm_min, "tm_min", errp);
- visit_type_int32(v, ¤t_tm.tm_sec, "tm_sec", errp);
- visit_end_struct(v, errp);
+ visit_start_struct(v, NULL, "struct tm", name, 0, &err);
+ if (err) {
+ goto out;
+ }
+ visit_type_int32(v, ¤t_tm.tm_year, "tm_year", &err);
+ visit_type_int32(v, ¤t_tm.tm_mon, "tm_mon", &err);
+ visit_type_int32(v, ¤t_tm.tm_mday, "tm_mday", &err);
+ visit_type_int32(v, ¤t_tm.tm_hour, "tm_hour", &err);
+ visit_type_int32(v, ¤t_tm.tm_min, "tm_min", &err);
+ visit_type_int32(v, ¤t_tm.tm_sec, "tm_sec", &err);
+ visit_end_struct(v, &err);
+
+out:
+ error_propagate(errp, err);
}
static void rtc_realizefn(DeviceState *dev, Error **errp)
diff --git a/hw/virtio/virtio-balloon.c b/hw/virtio/virtio-balloon.c
index 971a921..ca99bd5 100644
--- a/hw/virtio/virtio-balloon.c
+++ b/hw/virtio/virtio-balloon.c
@@ -108,6 +108,7 @@ static void balloon_stats_poll_cb(void *opaque)
static void balloon_stats_get_all(Object *obj, struct Visitor *v,
void *opaque, const char *name, Error **errp)
{
+ Error *err = NULL;
VirtIOBalloon *s = opaque;
int i;
@@ -116,17 +117,29 @@ static void balloon_stats_get_all(Object *obj, struct
Visitor *v,
return;
}
- visit_start_struct(v, NULL, "guest-stats", name, 0, errp);
- visit_type_int(v, &s->stats_last_update, "last-update", errp);
+ visit_start_struct(v, NULL, "guest-stats", name, 0, &err);
+ if (err) {
+ goto out;
+ }
+
+ visit_type_int(v, &s->stats_last_update, "last-update", &err);
- visit_start_struct(v, NULL, NULL, "stats", 0, errp);
+ visit_start_struct(v, NULL, NULL, "stats", 0, &err);
+ if (err) {
+ goto out_end;
+ }
+
for (i = 0; i < VIRTIO_BALLOON_S_NR; i++) {
visit_type_int64(v, (int64_t *) &s->stats[i], balloon_stat_names[i],
- errp);
+ &err);
}
- visit_end_struct(v, errp);
+ visit_end_struct(v, &err);
+
+out_end:
+ visit_end_struct(v, &err);
- visit_end_struct(v, errp);
+out:
+ error_propagate(errp, err);
}
static void balloon_stats_get_poll_interval(Object *obj, struct Visitor *v,
--
1.9.0
- [Qemu-devel] [PULL 09/20] hmp: Call visit_end_struct() after visit_start_struct() succeeds, (continued)
- [Qemu-devel] [PULL 09/20] hmp: Call visit_end_struct() after visit_start_struct() succeeds, Luiz Capitulino, 2014/05/16
- [Qemu-devel] [PULL 17/20] monitor: Add set_link arguments completion., Luiz Capitulino, 2014/05/16
- [Qemu-devel] [PULL 16/20] monitor: Add chardev-add backend argument completion., Luiz Capitulino, 2014/05/16
- [Qemu-devel] [PULL 15/20] monitor: Add chardev-remove command completion., Luiz Capitulino, 2014/05/16
- [Qemu-devel] [PULL 19/20] monitor: Add netdev_del id argument completion., Luiz Capitulino, 2014/05/16
- [Qemu-devel] [PULL 06/20] qapi: Clean up shadowing of parameters and locals in inner scopes, Luiz Capitulino, 2014/05/16
- [Qemu-devel] [PULL 18/20] monitor: Add netdev_add type argument completion., Luiz Capitulino, 2014/05/16
- [Qemu-devel] [PULL 12/20] qapi: Replace uncommon use of the error API by the common one, Luiz Capitulino, 2014/05/16
- [Qemu-devel] [PULL 03/20] qapi: Remove unused Visitor callbacks start_handle(), end_handle(), Luiz Capitulino, 2014/05/16
- [Qemu-devel] [PULL 05/20] qapi-visit.py: Clean up confusing push_indent() / pop_indent() use, Luiz Capitulino, 2014/05/16
- [Qemu-devel] [PULL 10/20] hw: Don't call visit_end_struct() after visit_start_struct() fails,
Luiz Capitulino <=
- [Qemu-devel] [PULL 04/20] qapi: Replace start_optional()/end_optional() by optional(), Luiz Capitulino, 2014/05/16
- [Qemu-devel] [PULL 07/20] qapi-visit.py: Clean up a sloppy use of field prefix, Luiz Capitulino, 2014/05/16
- [Qemu-devel] [PULL 02/20] qapi: Normalize marshalling's visitor initialization and cleanup, Luiz Capitulino, 2014/05/16
- Re: [Qemu-devel] [PULL 00/20] QMP queue, Peter Maydell, 2014/05/19