{"id":815762,"url":"http://patchwork.ozlabs.org/api/patches/815762/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170919180038.26056-3-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-3-dgilbert@redhat.com>","list_archive_url":null,"date":"2017-09-19T18:00:35","name":"[2/5] migration: check pre_save return in vmstate_save_state","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"f18e0db982cd017ca85536f997935b334f324af8","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-3-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/815762/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/815762/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-mx02.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx02.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 3xxW0T19MHz9s7c\n\tfor ;\n\tWed, 20 Sep 2017 04:01:45 +1000 (AEST)","from localhost ([::1]:44641 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1duMq7-0005tb-6k\n\tfor incoming@patchwork.ozlabs.org; Tue, 19 Sep 2017 14:01:43 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:36925)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1duMpN-0005qo-52\n\tfor qemu-devel@nongnu.org; Tue, 19 Sep 2017 14:00:58 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1duMpK-0008Jq-Te\n\tfor qemu-devel@nongnu.org; Tue, 19 Sep 2017 14:00:57 -0400","from mx1.redhat.com ([209.132.183.28]:41382)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from ) id 1duMpK-0008HR-MD\n\tfor qemu-devel@nongnu.org; Tue, 19 Sep 2017 14:00:54 -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 90E63806A3;\n\tTue, 19 Sep 2017 18:00:53 +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 1F9045D980;\n\tTue, 19 Sep 2017 18:00:51 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com 90E63806A3","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:35 +0100","Message-Id":"<20170919180038.26056-3-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.26]);\n\tTue, 19 Sep 2017 18:00:53 +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 2/5] migration: check pre_save return in\n\tvmstate_save_state","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\nCheck the return value of pre_save state and fail vmstate_save_state\nif the pre_save failed.\n\nSigned-off-by: Dr. David Alan Gilbert \n---\n include/migration/vmstate.h | 4 ++--\n migration/trace-events | 1 +\n migration/vmstate.c | 18 +++++++++++++++---\n 3 files changed, 18 insertions(+), 5 deletions(-)","diff":"diff --git a/include/migration/vmstate.h b/include/migration/vmstate.h\nindex da46b1a36d..88b55df5ae 100644\n--- a/include/migration/vmstate.h\n+++ b/include/migration/vmstate.h\n@@ -994,8 +994,8 @@ extern const VMStateInfo vmstate_info_qtailq;\n \n int vmstate_load_state(QEMUFile *f, const VMStateDescription *vmsd,\n void *opaque, int version_id);\n-void vmstate_save_state(QEMUFile *f, const VMStateDescription *vmsd,\n- void *opaque, QJSON *vmdesc);\n+int vmstate_save_state(QEMUFile *f, const VMStateDescription *vmsd,\n+ void *opaque, QJSON *vmdesc);\n \n bool vmstate_save_needed(const VMStateDescription *vmsd, void *opaque);\n \ndiff --git a/migration/trace-events b/migration/trace-events\nindex d2910a6e7b..6f29fcc686 100644\n--- a/migration/trace-events\n+++ b/migration/trace-events\n@@ -40,6 +40,7 @@ savevm_state_iterate(void) \"\"\n savevm_state_cleanup(void) \"\"\n savevm_state_complete_precopy(void) \"\"\n vmstate_save(const char *idstr, const char *vmsd_name) \"%s, %s\"\n+vmstate_save_state_pre_save_res(const char *name, int res) \"%s/%d\"\n vmstate_save_state_loop(const char *name, const char *field, int n_elems) \"%s/%s[%d]\"\n vmstate_save_state_top(const char *idstr) \"%s\"\n vmstate_subsection_save_loop(const char *name, const char *sub) \"%s/%s\"\ndiff --git a/migration/vmstate.c b/migration/vmstate.c\nindex 3226e8eb45..abff9466b7 100644\n--- a/migration/vmstate.c\n+++ b/migration/vmstate.c\n@@ -308,15 +308,21 @@ bool vmstate_save_needed(const VMStateDescription *vmsd, void *opaque)\n }\n \n \n-void vmstate_save_state(QEMUFile *f, const VMStateDescription *vmsd,\n+int vmstate_save_state(QEMUFile *f, const VMStateDescription *vmsd,\n void *opaque, QJSON *vmdesc)\n {\n+ int ret = 0;\n VMStateField *field = vmsd->fields;\n \n trace_vmstate_save_state_top(vmsd->name);\n \n if (vmsd->pre_save) {\n- vmsd->pre_save(opaque);\n+ ret = vmsd->pre_save(opaque);\n+ trace_vmstate_save_state_pre_save_res(vmsd->name, ret);\n+ if (ret) {\n+ error_report(\"pre-save failed: %s\", vmsd->name);\n+ return ret;\n+ }\n }\n \n if (vmdesc) {\n@@ -353,7 +359,11 @@ void vmstate_save_state(QEMUFile *f, const VMStateDescription *vmsd,\n assert(field->flags & VMS_ARRAY_OF_POINTER);\n vmstate_info_nullptr.put(f, curr_elem, size, NULL, NULL);\n } else if (field->flags & VMS_STRUCT) {\n- vmstate_save_state(f, field->vmsd, curr_elem, vmdesc_loop);\n+ int ret = vmstate_save_state(f, field->vmsd, curr_elem,\n+ vmdesc_loop);\n+ if (ret) {\n+ return ret;\n+ }\n } else {\n field->info->put(f, curr_elem, size, field, vmdesc_loop);\n }\n@@ -381,6 +391,8 @@ void vmstate_save_state(QEMUFile *f, const VMStateDescription *vmsd,\n }\n \n vmstate_subsection_save(f, vmsd, opaque, vmdesc);\n+\n+ return 0;\n }\n \n static const VMStateDescription *\n","prefixes":["2/5"]}