From patchwork Tue Jul 16 15:38:11 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shameerali Kolothum Thodi X-Patchwork-Id: 169066 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp1024941ilk; Tue, 16 Jul 2019 08:41:40 -0700 (PDT) X-Google-Smtp-Source: APXvYqy44HrUQvJFrlAj6ZmRMMsVwZTs67/HvIkADJ9u27BnuZRBziH1k3DTHaiUgtgQraLSzoDv X-Received: by 2002:a50:94a2:: with SMTP id s31mr30189883eda.290.1563291700120; Tue, 16 Jul 2019 08:41:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1563291700; cv=none; d=google.com; s=arc-20160816; b=Q4u84VAXIrYJM20oNpHEpGLUMKHsfGYPCr6Sxq8/5HUMfUc+c1dSPfI3Uz38RHWUHh XaEixbyLunHFs3sw1BZNJiPOevpFC/4UN8Byhr6FJ52zImnyE9YPrUF7aXEADGke5CHN pxxeLU48mLdDUd6uGSgAMr7iRDRS+loxTaYuSraK99rZInuIXZivF9yF8CfXNK+4ejRt tQFPLuwdvRD0uPCXLRG4jodGBG9VTq0fjbQHak1il72DoClVu3FN8LfO6aJEPk9ZV2Ex nXYbV1qVkBz1CbnDOsgwb5f7fDpmgcrM/Sx1PArYrZnrDLzqucDoQZF79PxQfCRjwzBv LBjg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:mime-version:references :in-reply-to:message-id:date:to:from; bh=t9dCXvwMMkBBuXiX26ujEDoTqn4InjH0Siiz759sWWU=; b=OBEEYemHKm24RERZSVcKylhD260eA60Y0GiJCgg4rpp0TbPpAkmgy4aXd8nYkUwY/O bopbhX24ywMCk18OMGcytFSjzMLPNoyeeU4sIJLieQ7PBe3qHxkwWQsrU5Dz+ZAycnRX 3nNMNXlM+Qc3UUaapmU7abo0Ply1kW1n4ddv/i/JSM65RKl3uC0vEXQ7NXb67jHdUY2/ 5uodxAe/S72XtpJFdf7AvwYQbxe1QxiTES24zwadw4iYAzGCx3xEzQwQntpNRM1kZ4Ot shhcjVqDC3R0EfYlUZ+O0u9J0UU2zTfr1HAz69NszjjpkDSYA99fNb7xGJGMXBiFlAyy W84Q== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org" Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id x46si11815951eda.54.2019.07.16.08.41.39 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 16 Jul 2019 08:41:40 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org" Received: from localhost ([::1]:50200 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hnPaE-0007hz-JK for patch@linaro.org; Tue, 16 Jul 2019 11:41:38 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36604) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hnPZq-0007UF-Ha for qemu-devel@nongnu.org; Tue, 16 Jul 2019 11:41:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hnPZp-0004P1-EW for qemu-devel@nongnu.org; Tue, 16 Jul 2019 11:41:14 -0400 Received: from szxga05-in.huawei.com ([45.249.212.191]:2237 helo=huawei.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hnPZm-0004IE-Kg; Tue, 16 Jul 2019 11:41:11 -0400 Received: from DGGEMS402-HUB.china.huawei.com (unknown [172.30.72.58]) by Forcepoint Email with ESMTP id 4479D35118994EE01CED; Tue, 16 Jul 2019 23:41:04 +0800 (CST) Received: from S00345302A-PC.china.huawei.com (10.202.227.237) by DGGEMS402-HUB.china.huawei.com (10.3.19.202) with Microsoft SMTP Server id 14.3.439.0; Tue, 16 Jul 2019 23:40:54 +0800 From: Shameer Kolothum To: , , , Date: Tue, 16 Jul 2019 16:38:11 +0100 Message-ID: <20190716153816.17676-6-shameerali.kolothum.thodi@huawei.com> X-Mailer: git-send-email 2.12.0.windows.1 In-Reply-To: <20190716153816.17676-1-shameerali.kolothum.thodi@huawei.com> References: <20190716153816.17676-1-shameerali.kolothum.thodi@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.202.227.237] 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.191 Subject: [Qemu-devel] [PATCH-for-4.2 v7 05/10] hw/arm/virt: Add 4.2 machine type X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, sameo@linux.intel.com, ard.biesheuvel@linaro.org, linuxarm@huawei.com, xuwei5@hisilicon.com, shannon.zhaosl@gmail.com, sebastien.boeuf@intel.com, lersek@redhat.com Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" This is in preparation to create ACPI GED device as we need to disable it for <4.2 for migration to work. Signed-off-by: Shameer Kolothum --- hw/arm/virt.c | 9 ++++++++- hw/core/machine.c | 3 +++ include/hw/boards.h | 3 +++ 3 files changed, 14 insertions(+), 1 deletion(-) -- 2.17.1 Reviewed-by: Igor Mammedov diff --git a/hw/arm/virt.c b/hw/arm/virt.c index 907fb64bb9..bbe156dc35 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -2095,10 +2095,17 @@ static void machvirt_machine_init(void) } type_init(machvirt_machine_init); +static void virt_machine_4_2_options(MachineClass *mc) +{ +} +DEFINE_VIRT_MACHINE_AS_LATEST(4, 2) + static void virt_machine_4_1_options(MachineClass *mc) { + virt_machine_4_2_options(mc); + compat_props_add(mc->compat_props, hw_compat_4_1, hw_compat_4_1_len); } -DEFINE_VIRT_MACHINE_AS_LATEST(4, 1) +DEFINE_VIRT_MACHINE(4, 1) static void virt_machine_4_0_options(MachineClass *mc) { diff --git a/hw/core/machine.c b/hw/core/machine.c index c58a8e594e..a79d4ad740 100644 --- a/hw/core/machine.c +++ b/hw/core/machine.c @@ -27,6 +27,9 @@ #include "hw/pci/pci.h" #include "hw/mem/nvdimm.h" +GlobalProperty hw_compat_4_1[] = {}; +const size_t hw_compat_4_1_len = G_N_ELEMENTS(hw_compat_4_1); + GlobalProperty hw_compat_4_0[] = { { "VGA", "edid", "false" }, { "secondary-vga", "edid", "false" }, diff --git a/include/hw/boards.h b/include/hw/boards.h index a71d1a53a5..d9ec37d807 100644 --- a/include/hw/boards.h +++ b/include/hw/boards.h @@ -317,6 +317,9 @@ struct MachineState { } \ type_init(machine_initfn##_register_types) +extern GlobalProperty hw_compat_4_1[]; +extern const size_t hw_compat_4_1_len; + extern GlobalProperty hw_compat_4_0[]; extern const size_t hw_compat_4_0_len;