From nobody Tue Feb 10 02:44:08 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=oracle.com ARC-Seal: i=1; a=rsa-sha256; t=1655305644; cv=none; d=zohomail.com; s=zohoarc; b=F8CFzrlj2Vh3MMsuVE91RPwGyWOecK+Lg6OT0cHKxk+0w+r6J4v+gd9AieMHUIKB/IPRYsEBaE5wULzZ08IqYS3Ae12Ry/cuLivfvGvOJTg62tcTBgZ3LhvCcGgWQ05vJ834aPIGVYZdlBU3pxMaqP7RWjzFdbg8nH4ut7jA8Us= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1655305644; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=VXFSP3he1Qn7f9PCKt9d1pzoHH/4Rt6Bt6/zgwsBvzo=; b=AZHQvNBTva31/Phjr1jHghdHQ4georrfT8lfNzItqRgqvc9/pGitCOrgTXELD/c1xfSc0FJCgcJPH8t4ukxS2rQ7rP4RCtRS+cqRAA2lqcKzUp5GjeEMjEZX0fxuPJt/HBkJmSwInlsUaT+8Mn45iT29327nmrEJZWI4T2QRPzw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1655305644692507.8975178615349; Wed, 15 Jun 2022 08:07:24 -0700 (PDT) Received: from localhost ([::1]:39628 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o1Uc6-0002t2-I4 for importer@patchew.org; Wed, 15 Jun 2022 11:07:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47808) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o1UOn-0007mZ-IA for qemu-devel@nongnu.org; Wed, 15 Jun 2022 10:53:39 -0400 Received: from mx0b-00069f02.pphosted.com ([205.220.177.32]:8800) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o1UOl-00016I-3O for qemu-devel@nongnu.org; Wed, 15 Jun 2022 10:53:37 -0400 Received: from pps.filterd (m0246631.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.5/8.17.1.5) with ESMTP id 25FE0Gw4025874; Wed, 15 Jun 2022 14:53:08 GMT Received: from phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta03.appoci.oracle.com [138.1.37.129]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3gmhu2rxg3-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 15 Jun 2022 14:53:08 +0000 Received: from pps.filterd (phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (8.16.1.2/8.16.1.2) with SMTP id 25FEQ73I023089; Wed, 15 Jun 2022 14:53:07 GMT Received: from pps.reinject (localhost [127.0.0.1]) by phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com with ESMTP id 3gpr25vq4g-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 15 Jun 2022 14:53:07 +0000 Received: from phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by pps.reinject (8.16.0.36/8.16.0.36) with SMTP id 25FEqSNl018501; Wed, 15 Jun 2022 14:53:06 GMT Received: from ca-dev63.us.oracle.com (ca-dev63.us.oracle.com [10.211.8.221]) by phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com with ESMTP id 3gpr25vpfm-33; Wed, 15 Jun 2022 14:53:06 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : in-reply-to : references; s=corp-2021-07-09; bh=VXFSP3he1Qn7f9PCKt9d1pzoHH/4Rt6Bt6/zgwsBvzo=; b=OsXW/zdhTWVPa6ZsYOu/yM3MUnE3HryhBs1b5+yRPD6xeJqwPjh6spr6W9k8KjO0gMvr ikp+4DWiWvC5vR4/rD2KxYlLFZrgI81oQKCrGGM/UXshHMu5AA92Y8++OkW7fLgh5tgH j/XU0/IspgQSGrFgAzyBYDH99d/Op4fJWIQWrnpGiD2tgv4QQIFjeDiAlKScHiDSTcyT 8T4fuk1bDHTLwH9sM4G8O74weh/6726UrS7B3BoKIdrqH3dOL/jhXeUyGWFFIbHiLUDl O1Z706lRoxY905nKt5EjATrhE9iYNDVLz35wx9Apls9qVjEBbj68Nb4Mgcs39GVrNkPb xQ== From: Steve Sistare To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Stefan Hajnoczi , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , =?UTF-8?q?Alex=20Benn=C3=A9e?= , "Dr. David Alan Gilbert" , "Michael S. Tsirkin" , Marcel Apfelbaum , Alex Williamson , "Daniel P. Berrange" , Juan Quintela , Markus Armbruster , Eric Blake , Jason Zeng , Zheng Chuan , Steve Sistare , Mark Kanda , Guoyi Tu , Peter Maydell , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Igor Mammedov , David Hildenbrand , John Snow Subject: [PATCH V8 32/39] loader: suppress rom_reset during cpr Date: Wed, 15 Jun 2022 07:52:19 -0700 Message-Id: <1655304746-102776-33-git-send-email-steven.sistare@oracle.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1655304746-102776-1-git-send-email-steven.sistare@oracle.com> References: <1655304746-102776-1-git-send-email-steven.sistare@oracle.com> X-Proofpoint-GUID: yAhot5a2Dz8XMV1rBTKtyjKBPT13ba8o X-Proofpoint-ORIG-GUID: yAhot5a2Dz8XMV1rBTKtyjKBPT13ba8o Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=205.220.177.32; envelope-from=steven.sistare@oracle.com; helo=mx0b-00069f02.pphosted.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_MED=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @oracle.com) X-ZM-MESSAGEID: 1655305646813100001 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Reported-by: Zheng Chuan Signed-off-by: Steve Sistare --- hw/core/loader.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/hw/core/loader.c b/hw/core/loader.c index 0548830..7b39c07 100644 --- a/hw/core/loader.c +++ b/hw/core/loader.c @@ -51,6 +51,7 @@ #include "hw/hw.h" #include "disas/disas.h" #include "migration/vmstate.h" +#include "migration/cpr.h" #include "monitor/monitor.h" #include "sysemu/reset.h" #include "sysemu/sysemu.h" @@ -1153,6 +1154,7 @@ ssize_t rom_add_option(const char *file, int32_t boot= index) static void rom_reset(void *unused) { Rom *rom; + bool cpr_is_active =3D (cpr_get_mode() !=3D CPR_MODE_NONE); =20 QTAILQ_FOREACH(rom, &roms, next) { if (rom->fw_file) { @@ -1163,7 +1165,7 @@ static void rom_reset(void *unused) * the data in during the next incoming migration in all cases. N= ote * that some of those RAMs can actually be modified by the guest. */ - if (runstate_check(RUN_STATE_INMIGRATE)) { + if (runstate_check(RUN_STATE_INMIGRATE) || cpr_is_active) { if (rom->data && rom->isrom) { /* * Free it so that a rom_reset after migration doesn't --=20 1.8.3.1