From patchwork Tue Jul 7 13:08:57 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juan Quintela X-Patchwork-Id: 492241 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 438B61402C2 for ; Tue, 7 Jul 2015 23:18:19 +1000 (AEST) Received: from localhost ([::1]:57497 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZCSlN-0001ft-CG for incoming@patchwork.ozlabs.org; Tue, 07 Jul 2015 09:18:17 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49599) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZCSd0-0004sQ-MK for qemu-devel@nongnu.org; Tue, 07 Jul 2015 09:09:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZCScz-0003PC-G7 for qemu-devel@nongnu.org; Tue, 07 Jul 2015 09:09:38 -0400 Received: from mx1.redhat.com ([209.132.183.28]:38839) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZCScz-0003P4-78 for qemu-devel@nongnu.org; Tue, 07 Jul 2015 09:09:37 -0400 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (Postfix) with ESMTPS id F23932635 for ; Tue, 7 Jul 2015 13:09:36 +0000 (UTC) Received: from trasno.mitica (ovpn-116-56.ams2.redhat.com [10.36.116.56]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id t67D9Ap2004895; Tue, 7 Jul 2015 09:09:35 -0400 From: Juan Quintela To: qemu-devel@nongnu.org Date: Tue, 7 Jul 2015 15:08:57 +0200 Message-Id: <1436274549-28826-17-git-send-email-quintela@redhat.com> In-Reply-To: <1436274549-28826-1-git-send-email-quintela@redhat.com> References: <1436274549-28826-1-git-send-email-quintela@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 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] [PULL 16/28] global_state: Make section optional 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 This section would be sent: a- for all new machine types b- for old machine types if section state is different form {running,paused} that were the only giving us troubles. So, in new qemus: it is alwasy there. In old qemus: they are only there if it an error has happened, basically stoping on target. Signed-off-by: Juan Quintela Reviewed-by: Dr. David Alan Gilbert --- hw/i386/pc_piix.c | 1 + hw/i386/pc_q35.c | 1 + hw/ppc/spapr.c | 1 + include/migration/migration.h | 1 + migration/migration.c | 29 +++++++++++++++++++++++++++++ 5 files changed, 33 insertions(+) diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index 56cdcb9..3ee3b47 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -312,6 +312,7 @@ static void pc_compat_2_3(MachineState *machine) if (kvm_enabled()) { pcms->smm = ON_OFF_AUTO_OFF; } + global_state_set_optional(); } static void pc_compat_2_2(MachineState *machine) diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c index 8aa3a67..0dc4ab1 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -295,6 +295,7 @@ static void pc_compat_2_3(MachineState *machine) if (kvm_enabled()) { pcms->smm = ON_OFF_AUTO_OFF; } + global_state_set_optional(); } static void pc_compat_2_2(MachineState *machine) diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 01f8da8..bcf5f0f 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -1853,6 +1853,7 @@ static const TypeInfo spapr_machine_info = { static void spapr_compat_2_3(Object *obj) { savevm_skip_section_footers(); + global_state_set_optional(); } static void spapr_compat_2_2(Object *obj) diff --git a/include/migration/migration.h b/include/migration/migration.h index 86df6cc..f153eba 100644 --- a/include/migration/migration.h +++ b/include/migration/migration.h @@ -198,4 +198,5 @@ size_t ram_control_save_page(QEMUFile *f, ram_addr_t block_offset, void ram_mig_init(void); void savevm_skip_section_footers(void); void register_global_state(void); +void global_state_set_optional(void); #endif diff --git a/migration/migration.c b/migration/migration.c index 5e436f7..edb4f3e 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -100,6 +100,7 @@ void migration_incoming_state_destroy(void) typedef struct { + bool optional; uint32_t size; uint8_t runstate[100]; } GlobalState; @@ -122,6 +123,33 @@ static char *global_state_get_runstate(void) return (char *)global_state.runstate; } +void global_state_set_optional(void) +{ + global_state.optional = true; +} + +static bool global_state_needed(void *opaque) +{ + GlobalState *s = opaque; + char *runstate = (char *)s->runstate; + + /* If it is not optional, it is mandatory */ + + if (s->optional == false) { + return true; + } + + /* If state is running or paused, it is not needed */ + + if (strcmp(runstate, "running") == 0 || + strcmp(runstate, "paused") == 0) { + return false; + } + + /* for any other state it is needed */ + return true; +} + static int global_state_post_load(void *opaque, int version_id) { GlobalState *s = opaque; @@ -161,6 +189,7 @@ static const VMStateDescription vmstate_globalstate = { .minimum_version_id = 1, .post_load = global_state_post_load, .pre_save = global_state_pre_save, + .needed = global_state_needed, .fields = (VMStateField[]) { VMSTATE_UINT32(size, GlobalState), VMSTATE_BUFFER(runstate, GlobalState),