From nobody Wed Nov 5 16:15:29 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1496980394025787.9626336753488; Thu, 8 Jun 2017 20:53:14 -0700 (PDT) Received: from localhost ([::1]:52491 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dJAz2-0005RD-Fd for importer@patchew.org; Thu, 08 Jun 2017 23:53:12 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33295) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dJAvW-0002aM-Lb for qemu-devel@nongnu.org; Thu, 08 Jun 2017 23:49:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dJAvV-0007eH-Lu for qemu-devel@nongnu.org; Thu, 08 Jun 2017 23:49:34 -0400 Received: from mx1.redhat.com ([209.132.183.28]:36878) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dJAvV-0007dV-Ci for qemu-devel@nongnu.org; Thu, 08 Jun 2017 23:49:33 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 5FE988553E for ; Fri, 9 Jun 2017 03:49:32 +0000 (UTC) Received: from pxdev.xzpeter.org.com (ovpn-12-95.pek2.redhat.com [10.72.12.95]) by smtp.corp.redhat.com (Postfix) with ESMTP id 159E71759C; Fri, 9 Jun 2017 03:49:28 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 5FE988553E Authentication-Results: ext-mx04.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx04.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=peterx@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 5FE988553E From: Peter Xu To: qemu-devel@nongnu.org Date: Fri, 9 Jun 2017 11:49:02 +0800 Message-Id: <1496980142-8986-7-git-send-email-peterx@redhat.com> In-Reply-To: <1496980142-8986-1-git-send-email-peterx@redhat.com> References: <1496980142-8986-1-git-send-email-peterx@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Fri, 09 Jun 2017 03:49:32 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v2 6/6] migration: move skip_section_footers X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Laurent Vivier , peterx@redhat.com, Markus Armbruster , "Dr . David Alan Gilbert" , Juan Quintela Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Move it into MigrationState, with a property binded to it. Same trick is played like previous patches. Signed-off-by: Peter Xu Reviewed-by: Juan Quintela --- hw/i386/pc_piix.c | 1 - hw/ppc/spapr.c | 1 - hw/xen/xen-common.c | 2 +- include/hw/compat.h | 4 ++++ include/migration/migration.h | 3 ++- migration/migration.c | 2 ++ migration/savevm.c | 11 ++--------- 7 files changed, 11 insertions(+), 13 deletions(-) diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index 529018d..1be23e2 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -313,7 +313,6 @@ static void pc_init1(MachineState *machine, static void pc_compat_2_3(MachineState *machine) { PCMachineState *pcms =3D PC_MACHINE(machine); - savevm_skip_section_footers(); if (kvm_enabled()) { pcms->smm =3D ON_OFF_AUTO_OFF; } diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 227b03b..944f829 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -3592,7 +3592,6 @@ DEFINE_SPAPR_MACHINE(2_4, "2.4", false); static void spapr_machine_2_3_instance_options(MachineState *machine) { spapr_machine_2_4_instance_options(machine); - savevm_skip_section_footers(); } =20 static void spapr_machine_2_3_class_options(MachineClass *mc) diff --git a/hw/xen/xen-common.c b/hw/xen/xen-common.c index a80034f..e8f08bb 100644 --- a/hw/xen/xen-common.c +++ b/hw/xen/xen-common.c @@ -146,7 +146,7 @@ static int xen_init(MachineState *ms) */ register_compat_prop("migration", "store-global-state", "off"); register_compat_prop("migration", "skip-configuration", "on"); - savevm_skip_section_footers(); + register_compat_prop("migration", "skip-section-footer", "on"); =20 return 0; } diff --git a/include/hw/compat.h b/include/hw/compat.h index 4ed2ae7..ef5fbc7 100644 --- a/include/hw/compat.h +++ b/include/hw/compat.h @@ -183,6 +183,10 @@ .value =3D "on",\ },{\ .driver =3D "migration",\ + .property =3D "skip-section-footer",\ + .value =3D "on",\ + },{\ + .driver =3D "migration",\ .property =3D "store-global-state",\ .value =3D "off",\ }, diff --git a/include/migration/migration.h b/include/migration/migration.h index 5f6861c..dc35567 100644 --- a/include/migration/migration.h +++ b/include/migration/migration.h @@ -174,6 +174,8 @@ struct MigrationState =20 /* Whether we skip QEMU_VM_CONFIGURATION for migration */ bool skip_configuration; + /* Whether we skip section footer */ + bool skip_section_footer; }; =20 void migrate_set_state(int *state, int old_state, int new_state); @@ -250,7 +252,6 @@ size_t ram_control_save_page(QEMUFile *f, ram_addr_t bl= ock_offset, ram_addr_t offset, size_t size, uint64_t *bytes_sent); =20 -void savevm_skip_section_footers(void); void register_global_state(void); int global_state_store(void); void global_state_store_running(void); diff --git a/migration/migration.c b/migration/migration.c index a4ab83d..9f90f7b 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -2107,6 +2107,8 @@ static Property migration_properties[] =3D { DEFINE_PROP_BOOL("only-migratable", MigrationState, only_migratable, f= alse), DEFINE_PROP_BOOL("skip-configuration", MigrationState, skip_configuration, false), + DEFINE_PROP_BOOL("skip-section-footer", MigrationState, + skip_section_footer, false), DEFINE_PROP_END_OF_LIST(), }; =20 diff --git a/migration/savevm.c b/migration/savevm.c index 222af4c..06d6986 100644 --- a/migration/savevm.c +++ b/migration/savevm.c @@ -65,8 +65,6 @@ =20 const unsigned int postcopy_ram_discard_version =3D 0; =20 -static bool skip_section_footers; - /* Subcommands for QEMU_VM_COMMAND */ enum qemu_vm_cmd { MIG_CMD_INVALID =3D 0, /* Must be 0 */ @@ -780,11 +778,6 @@ static void vmstate_save(QEMUFile *f, SaveStateEntry *= se, QJSON *vmdesc) vmstate_save_state(f, se->vmsd, se->opaque, vmdesc); } =20 -void savevm_skip_section_footers(void) -{ - skip_section_footers =3D true; -} - /* * Write the header for device section (QEMU_VM_SECTION START/END/PART/FUL= L) */ @@ -812,7 +805,7 @@ static void save_section_header(QEMUFile *f, SaveStateE= ntry *se, */ static void save_section_footer(QEMUFile *f, SaveStateEntry *se) { - if (!skip_section_footers) { + if (!migrate_get_current()->skip_section_footer) { qemu_put_byte(f, QEMU_VM_SECTION_FOOTER); qemu_put_be32(f, se->section_id); } @@ -1810,7 +1803,7 @@ static bool check_section_footer(QEMUFile *f, SaveSta= teEntry *se) uint8_t read_mark; uint32_t read_section_id; =20 - if (skip_section_footers) { + if (migrate_get_current()->skip_section_footer) { /* No footer to check */ return true; } --=20 2.7.4