{"id":815765,"url":"http://patchwork.ozlabs.org/api/patches/815765/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170919180038.26056-4-dgilbert@redhat.com/","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/projects/14/?format=json","name":"QEMU Development","link_name":"qemu-devel","list_id":"qemu-devel.nongnu.org","list_email":"qemu-devel@nongnu.org","web_url":"","scm_url":"","webscm_url":"","list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20170919180038.26056-4-dgilbert@redhat.com>","list_archive_url":null,"date":"2017-09-19T18:00:36","name":"[3/5] migration: wire vmstate_save_state errors up to vmstate_subsection_save","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"889027ec809e231b853c084ac66b613f127c83d5","submitter":{"id":48102,"url":"http://patchwork.ozlabs.org/api/people/48102/?format=json","name":"Dr. David Alan Gilbert","email":"dgilbert@redhat.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170919180038.26056-4-dgilbert@redhat.com/mbox/","series":[{"id":3942,"url":"http://patchwork.ozlabs.org/api/series/3942/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=3942","date":"2017-09-19T18:00:35","name":"migration: let pre_save fail","version":1,"mbox":"http://patchwork.ozlabs.org/series/3942/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/815765/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/815765/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":["ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=nongnu.org\n\t(client-ip=2001:4830:134:3::11; helo=lists.gnu.org;\n\tenvelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n\treceiver=)","ext-mx03.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx03.extmail.prod.ext.phx2.redhat.com;\n\tspf=fail smtp.mailfrom=dgilbert@redhat.com"],"Received":["from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11])\n\t(using TLSv1 with cipher AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3xxW3d0ccxz9sPk\n\tfor ;\n\tWed, 20 Sep 2017 04:04:29 +1000 (AEST)","from localhost ([::1]:44653 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1duMsl-0008U5-75\n\tfor incoming@patchwork.ozlabs.org; Tue, 19 Sep 2017 14:04:27 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:36949)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1duMpP-0005sR-A9\n\tfor qemu-devel@nongnu.org; Tue, 19 Sep 2017 14:01:05 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1duMpO-0008Tx-Cl\n\tfor qemu-devel@nongnu.org; Tue, 19 Sep 2017 14:00:59 -0400","from mx1.redhat.com ([209.132.183.28]:54534)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from ) id 1duMpO-0008Rw-2a\n\tfor qemu-devel@nongnu.org; Tue, 19 Sep 2017 14:00:58 -0400","from smtp.corp.redhat.com\n\t(int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14])\n\t(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby mx1.redhat.com (Postfix) with ESMTPS id 17EF57E459;\n\tTue, 19 Sep 2017 18:00:57 +0000 (UTC)","from dgilbert-t530.redhat.com (ovpn-117-120.ams2.redhat.com\n\t[10.36.117.120])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id D91A55D980;\n\tTue, 19 Sep 2017 18:00:53 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com 17EF57E459","From":"\"Dr. David Alan Gilbert (git)\" ","To":"qemu-devel@nongnu.org,\n\tquintela@redhat.com,\n\tpeterx@redhat.com","Date":"Tue, 19 Sep 2017 19:00:36 +0100","Message-Id":"<20170919180038.26056-4-dgilbert@redhat.com>","In-Reply-To":"<20170919180038.26056-1-dgilbert@redhat.com>","References":"<20170919180038.26056-1-dgilbert@redhat.com>","X-Scanned-By":"MIMEDefang 2.79 on 10.5.11.14","X-Greylist":"Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.27]);\n\tTue, 19 Sep 2017 18:00:57 +0000 (UTC)","X-detected-operating-system":"by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]\n\t[fuzzy]","X-Received-From":"209.132.183.28","Subject":"[Qemu-devel] [PATCH 3/5] migration: wire vmstate_save_state errors\n\tup to vmstate_subsection_save","X-BeenThere":"qemu-devel@nongnu.org","X-Mailman-Version":"2.1.21","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Cc":"peter.maydell@linaro.org, cohuck@redhat.com, rth@twiddle.net","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"},"content":"From: \"Dr. David Alan Gilbert\" \n\nRoute the errors from vmstate_subsection_save up through\nvmstate_subsection_save (and back down, all rather recursive).\n\nSigned-off-by: Dr. David Alan Gilbert \n---\n migration/vmstate.c | 20 ++++++++++++--------\n 1 file changed, 12 insertions(+), 8 deletions(-)","diff":"diff --git a/migration/vmstate.c b/migration/vmstate.c\nindex abff9466b7..4146992373 100644\n--- a/migration/vmstate.c\n+++ b/migration/vmstate.c\n@@ -21,8 +21,8 @@\n #include \"trace.h\"\n #include \"qjson.h\"\n \n-static void vmstate_subsection_save(QEMUFile *f, const VMStateDescription *vmsd,\n- void *opaque, QJSON *vmdesc);\n+static int vmstate_subsection_save(QEMUFile *f, const VMStateDescription *vmsd,\n+ void *opaque, QJSON *vmdesc);\n static int vmstate_subsection_load(QEMUFile *f, const VMStateDescription *vmsd,\n void *opaque);\n \n@@ -390,9 +390,7 @@ int vmstate_save_state(QEMUFile *f, const VMStateDescription *vmsd,\n json_end_array(vmdesc);\n }\n \n- vmstate_subsection_save(f, vmsd, opaque, vmdesc);\n-\n- return 0;\n+ return vmstate_subsection_save(f, vmsd, opaque, vmdesc);\n }\n \n static const VMStateDescription *\n@@ -458,11 +456,12 @@ static int vmstate_subsection_load(QEMUFile *f, const VMStateDescription *vmsd,\n return 0;\n }\n \n-static void vmstate_subsection_save(QEMUFile *f, const VMStateDescription *vmsd,\n- void *opaque, QJSON *vmdesc)\n+static int vmstate_subsection_save(QEMUFile *f, const VMStateDescription *vmsd,\n+ void *opaque, QJSON *vmdesc)\n {\n const VMStateDescription **sub = vmsd->subsections;\n bool subsection_found = false;\n+ int ret = 0;\n \n trace_vmstate_subsection_save_top(vmsd->name);\n while (sub && *sub && (*sub)->needed) {\n@@ -486,7 +485,10 @@ static void vmstate_subsection_save(QEMUFile *f, const VMStateDescription *vmsd,\n qemu_put_byte(f, len);\n qemu_put_buffer(f, (uint8_t *)vmsdsub->name, len);\n qemu_put_be32(f, vmsdsub->version_id);\n- vmstate_save_state(f, vmsdsub, opaque, vmdesc);\n+ ret = vmstate_save_state(f, vmsdsub, opaque, vmdesc);\n+ if (ret) {\n+ return ret;\n+ }\n \n if (vmdesc) {\n json_end_object(vmdesc);\n@@ -498,4 +500,6 @@ static void vmstate_subsection_save(QEMUFile *f, const VMStateDescription *vmsd,\n if (vmdesc && subsection_found) {\n json_end_array(vmdesc);\n }\n+\n+ return ret;\n }\n","prefixes":["3/5"]}