From patchwork Tue May 14 11:18:14 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dongjiu Geng X-Patchwork-Id: 10942747 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id C9F11912 for ; Tue, 14 May 2019 11:23:57 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B613C284D2 for ; Tue, 14 May 2019 11:23:57 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A5778286A1; Tue, 14 May 2019 11:23:57 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 36E24284D2 for ; Tue, 14 May 2019 11:23:57 +0000 (UTC) Received: from localhost ([127.0.0.1]:45890 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hQVXI-0007QS-Gg for patchwork-qemu-devel@patchwork.kernel.org; Tue, 14 May 2019 07:23:56 -0400 Received: from eggs.gnu.org ([209.51.188.92]:48275) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hQVVX-0005zN-Nb for qemu-devel@nongnu.org; Tue, 14 May 2019 07:22:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hQVVW-0002Bu-My for qemu-devel@nongnu.org; Tue, 14 May 2019 07:22:07 -0400 Received: from szxga06-in.huawei.com ([45.249.212.32]:33832 helo=huawei.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hQVVT-00024G-BN; Tue, 14 May 2019 07:22:03 -0400 Received: from DGGEMS411-HUB.china.huawei.com (unknown [172.30.72.60]) by Forcepoint Email with ESMTP id 2FDC12560BFF5A8ED008; Tue, 14 May 2019 19:22:00 +0800 (CST) Received: from ros.huawei.com (10.143.28.118) by DGGEMS411-HUB.china.huawei.com (10.3.19.211) with Microsoft SMTP Server id 14.3.439.0; Tue, 14 May 2019 19:21:49 +0800 From: Dongjiu Geng To: , , , , , , , , , , , , , , , , , Date: Tue, 14 May 2019 04:18:14 -0700 Message-ID: <1557832703-42620-2-git-send-email-gengdongjiu@huawei.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1557832703-42620-1-git-send-email-gengdongjiu@huawei.com> References: <1557832703-42620-1-git-send-email-gengdongjiu@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.143.28.118] X-CFilter-Loop: Reflected X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 45.249.212.32 Subject: [Qemu-devel] [PATCH v17 01/10] hw/arm/virt: Add RAS platform version for migration 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: , Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Support this feature since version 4.1, disable it by default in the old version. Signed-off-by: Dongjiu Geng --- hw/arm/virt.c | 6 ++++++ include/hw/arm/virt.h | 1 + 2 files changed, 7 insertions(+) diff --git a/hw/arm/virt.c b/hw/arm/virt.c index 5331ab7..7bdd41b 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -2043,8 +2043,14 @@ DEFINE_VIRT_MACHINE_AS_LATEST(4, 1) static void virt_machine_4_0_options(MachineClass *mc) { + VirtMachineClass *vmc = VIRT_MACHINE_CLASS(OBJECT_CLASS(mc)); + virt_machine_4_1_options(mc); compat_props_add(mc->compat_props, hw_compat_4_0, hw_compat_4_0_len); + /* Disable memory recovery feature for 4.0 as RAS support was + * introduced with 4.1. + */ + vmc->no_ras = true; } DEFINE_VIRT_MACHINE(4, 0) diff --git a/include/hw/arm/virt.h b/include/hw/arm/virt.h index 4240709..7f1a033 100644 --- a/include/hw/arm/virt.h +++ b/include/hw/arm/virt.h @@ -104,6 +104,7 @@ typedef struct { bool disallow_affinity_adjustment; bool no_its; bool no_pmu; + bool no_ras; bool claim_edge_triggered_timers; bool smbios_old_sys_ver; bool no_highmem_ecam;