{"id":815767,"url":"http://patchwork.ozlabs.org/api/patches/815767/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170919180038.26056-5-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-5-dgilbert@redhat.com>","list_archive_url":null,"date":"2017-09-19T18:00:37","name":"[4/5] migration: Route errors up through vmstate_save","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"c5b57608824ead4563115e9f32ad048841699e25","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-5-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/815767/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/815767/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-mx08.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx08.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 3xxW8X2tmRz9s7c\n\tfor ;\n\tWed, 20 Sep 2017 04:08:44 +1000 (AEST)","from localhost ([::1]:44680 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1duMws-0003KV-HA\n\tfor incoming@patchwork.ozlabs.org; Tue, 19 Sep 2017 14:08:42 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:36981)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1duMpQ-0005tn-Pp\n\tfor qemu-devel@nongnu.org; Tue, 19 Sep 2017 14:01:06 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1duMpP-00006i-Vl\n\tfor qemu-devel@nongnu.org; Tue, 19 Sep 2017 14:01:00 -0400","from mx1.redhat.com ([209.132.183.28]:53124)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from ) id 1duMpP-0008WK-QX\n\tfor qemu-devel@nongnu.org; Tue, 19 Sep 2017 14:00:59 -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 BBCCFC0587E4;\n\tTue, 19 Sep 2017 18:00:58 +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 6630B4F6B1;\n\tTue, 19 Sep 2017 18:00:57 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com BBCCFC0587E4","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:37 +0100","Message-Id":"<20170919180038.26056-5-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.32]);\n\tTue, 19 Sep 2017 18:00:58 +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 4/5] migration: Route errors up through\n\tvmstate_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 vsmtate_save_state back up through\nvmstate_save and out to the normal device state path.\nThat's the normal error path done.\n\nSigned-off-by: Dr. David Alan Gilbert \n---\n migration/savevm.c | 19 ++++++++++++++-----\n 1 file changed, 14 insertions(+), 5 deletions(-)","diff":"diff --git a/migration/savevm.c b/migration/savevm.c\nindex 8d18a57ca0..c22a2fd758 100644\n--- a/migration/savevm.c\n+++ b/migration/savevm.c\n@@ -751,14 +751,14 @@ static void vmstate_save_old_style(QEMUFile *f, SaveStateEntry *se, QJSON *vmdes\n }\n }\n \n-static void vmstate_save(QEMUFile *f, SaveStateEntry *se, QJSON *vmdesc)\n+static int vmstate_save(QEMUFile *f, SaveStateEntry *se, QJSON *vmdesc)\n {\n trace_vmstate_save(se->idstr, se->vmsd ? se->vmsd->name : \"(old)\");\n if (!se->vmsd) {\n vmstate_save_old_style(f, se, vmdesc);\n- return;\n+ return 0;\n }\n- vmstate_save_state(f, se->vmsd, se->opaque, vmdesc);\n+ return vmstate_save_state(f, se->vmsd, se->opaque, vmdesc);\n }\n \n /*\n@@ -1147,7 +1147,11 @@ int qemu_savevm_state_complete_precopy(QEMUFile *f, bool iterable_only,\n json_prop_int(vmdesc, \"instance_id\", se->instance_id);\n \n save_section_header(f, se, QEMU_VM_SECTION_FULL);\n- vmstate_save(f, se, vmdesc);\n+ ret = vmstate_save(f, se, vmdesc);\n+ if (ret) {\n+ qemu_file_set_error(f, ret);\n+ return ret;\n+ }\n trace_savevm_section_end(se->idstr, se->section_id, 0);\n save_section_footer(f, se);\n \n@@ -1289,6 +1293,8 @@ static int qemu_save_device_state(QEMUFile *f)\n cpu_synchronize_all_states();\n \n QTAILQ_FOREACH(se, &savevm_state.handlers, entry) {\n+ int ret;\n+\n if (se->is_ram) {\n continue;\n }\n@@ -1301,7 +1307,10 @@ static int qemu_save_device_state(QEMUFile *f)\n \n save_section_header(f, se, QEMU_VM_SECTION_FULL);\n \n- vmstate_save(f, se, NULL);\n+ ret = vmstate_save(f, se, NULL);\n+ if (ret) {\n+ return ret;\n+ }\n \n save_section_footer(f, se);\n }\n","prefixes":["4/5"]}