From patchwork Wed Jun 17 01:50:27 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juan Quintela X-Patchwork-Id: 485245 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 5BAE414027C for ; Wed, 17 Jun 2015 11:53:32 +1000 (AEST) Received: from localhost ([::1]:43760 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z52Xi-0001nb-Eg for incoming@patchwork.ozlabs.org; Tue, 16 Jun 2015 21:53:30 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38792) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z52V3-0005Ky-PI for qemu-devel@nongnu.org; Tue, 16 Jun 2015 21:50:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Z52V2-0004Vi-Dv for qemu-devel@nongnu.org; Tue, 16 Jun 2015 21:50:45 -0400 Received: from mx1.redhat.com ([209.132.183.28]:55678) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z52V1-0004VU-Vi for qemu-devel@nongnu.org; Tue, 16 Jun 2015 21:50:44 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (Postfix) with ESMTPS id 7BA2833B35C for ; Wed, 17 Jun 2015 01:50:43 +0000 (UTC) Received: from trasno.mitica (ovpn-116-125.ams2.redhat.com [10.36.116.125]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id t5H1oYsU015454; Tue, 16 Jun 2015 21:50:42 -0400 From: Juan Quintela To: qemu-devel@nongnu.org Date: Wed, 17 Jun 2015 03:50:27 +0200 Message-Id: <1434505833-11234-6-git-send-email-quintela@redhat.com> In-Reply-To: <1434505833-11234-1-git-send-email-quintela@redhat.com> References: <1434505833-11234-1-git-send-email-quintela@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: amit.shah@redhat.com Subject: [Qemu-devel] [PATCH 05/11] vmstate: Create optional sections X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org To make sections optional, we need to do it at the beggining of the code. Signed-off-by: Juan Quintela Reviewed-by: Dr. David Alan Gilbert --- include/migration/vmstate.h | 2 ++ migration/savevm.c | 8 ++++++++ migration/vmstate.c | 11 +++++++++++ trace-events | 1 + 4 files changed, 22 insertions(+) diff --git a/include/migration/vmstate.h b/include/migration/vmstate.h index 7153b1e..38de790 100644 --- a/include/migration/vmstate.h +++ b/include/migration/vmstate.h @@ -815,6 +815,8 @@ int vmstate_load_state(QEMUFile *f, const VMStateDescription *vmsd, void vmstate_save_state(QEMUFile *f, const VMStateDescription *vmsd, void *opaque, QJSON *vmdesc); +bool vmstate_save_needed(const VMStateDescription *vmsd, void *opaque); + int vmstate_register_with_alias_id(DeviceState *dev, int instance_id, const VMStateDescription *vmsd, void *base, int alias_id, diff --git a/migration/savevm.c b/migration/savevm.c index 2091882..b018f30 100644 --- a/migration/savevm.c +++ b/migration/savevm.c @@ -834,6 +834,11 @@ void qemu_savevm_state_complete(QEMUFile *f) if ((!se->ops || !se->ops->save_state) && !se->vmsd) { continue; } + if (se->vmsd && !vmstate_save_needed(se->vmsd, se->opaque)) { + trace_savevm_section_skip(se->idstr, se->section_id); + continue; + } + trace_savevm_section_start(se->idstr, se->section_id); json_start_object(vmdesc, NULL); @@ -947,6 +952,9 @@ static int qemu_save_device_state(QEMUFile *f) if ((!se->ops || !se->ops->save_state) && !se->vmsd) { continue; } + if (se->vmsd && !vmstate_save_needed(se->vmsd, se->opaque)) { + continue; + } save_section_header(f, se, QEMU_VM_SECTION_FULL); diff --git a/migration/vmstate.c b/migration/vmstate.c index 6138d1a..e8ccf22 100644 --- a/migration/vmstate.c +++ b/migration/vmstate.c @@ -276,6 +276,17 @@ static void vmsd_desc_field_end(const VMStateDescription *vmsd, QJSON *vmdesc, json_end_object(vmdesc); } + +bool vmstate_save_needed(const VMStateDescription *vmsd, void *opaque) +{ + if (vmsd->needed && !vmsd->needed(opaque)) { + /* optional section not needed */ + return false; + } + return true; +} + + void vmstate_save_state(QEMUFile *f, const VMStateDescription *vmsd, void *opaque, QJSON *vmdesc) { diff --git a/trace-events b/trace-events index 52b7efa..bcdce29 100644 --- a/trace-events +++ b/trace-events @@ -1191,6 +1191,7 @@ qemu_loadvm_state_section_partend(uint32_t section_id) "%u" qemu_loadvm_state_section_startfull(uint32_t section_id, const char *idstr, uint32_t instance_id, uint32_t version_id) "%u(%s) %u %u" savevm_section_start(const char *id, unsigned int section_id) "%s, section_id %u" savevm_section_end(const char *id, unsigned int section_id, int ret) "%s, section_id %u -> %d" +savevm_section_skip(const char *id, unsigned int section_id) "%s, section_id %u" savevm_state_begin(void) "" savevm_state_header(void) "" savevm_state_iterate(void) ""