From patchwork Mon May 13 12:42:59 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dongjiu Geng X-Patchwork-Id: 1098851 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=huawei.com Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 452h5V5cZqz9sBr for ; Mon, 13 May 2019 23:10:54 +1000 (AEST) Received: from localhost ([127.0.0.1]:57078 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hQAjE-0001JH-MB for incoming@patchwork.ozlabs.org; Mon, 13 May 2019 09:10:52 -0400 Received: from eggs.gnu.org ([209.51.188.92]:50329) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hQAbo-0003al-Ji for qemu-devel@nongnu.org; Mon, 13 May 2019 09:03:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hQALz-00083v-UM for qemu-devel@nongnu.org; Mon, 13 May 2019 08:46:52 -0400 Received: from szxga07-in.huawei.com ([45.249.212.35]:51608 helo=huawei.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hQALy-0007xN-C2; Mon, 13 May 2019 08:46:50 -0400 Received: from DGGEMS401-HUB.china.huawei.com (unknown [172.30.72.59]) by Forcepoint Email with ESMTP id 718BCA2345FBE687C237; Mon, 13 May 2019 20:46:43 +0800 (CST) Received: from ros.huawei.com (10.143.28.118) by DGGEMS401-HUB.china.huawei.com (10.3.19.201) with Microsoft SMTP Server id 14.3.439.0; Mon, 13 May 2019 20:46:32 +0800 From: Dongjiu Geng To: , , , , , , , , , , , , , , , , , Date: Mon, 13 May 2019 05:42:59 -0700 Message-ID: <1557751388-27063-2-git-send-email-gengdongjiu@huawei.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1557751388-27063-1-git-send-email-gengdongjiu@huawei.com> References: <1557751388-27063-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.35 Subject: [Qemu-devel] [PATCH v16 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" 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;