From patchwork Tue Aug 13 21:05:32 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: 171220 Delivered-To: patch@linaro.org Received: by 2002:a92:d204:0:0:0:0:0 with SMTP id y4csp1400723ily; Tue, 13 Aug 2019 14:12:56 -0700 (PDT) X-Google-Smtp-Source: APXvYqx6g8N/SoTFheElteOnrwnQIPZchMot5ztYin9rjv6vfUxsu1ieI+r5iZ061YhQLH5rIHL9 X-Received: by 2002:ac8:2f84:: with SMTP id l4mr35993323qta.55.1565730776813; Tue, 13 Aug 2019 14:12:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1565730776; cv=none; d=google.com; s=arc-20160816; b=rxzian9YWqnGoRqiTr9/pZnps2Y0QSSG0EBwLWNOZz+h2uHudT7f3QiRgtXdoi+EQ2 9sH0ytGZI5g9lW14B2tBUR8G9K/4L62qzOZ86gbFATYtzHSH1jGCHyyd2aNsSBFSfs4m PgfBIIbxl3i8kA6Uk2KViUmKXKJJXCIFcMBLcaAPKHha3/RqTrlPdlTwcE6qFnIigqJ2 F+1ar41Wlr+wQBU2Mwy3ovWGBAyNdIsgx25I6Evig/xIYN9e4r52X+0GgpsjlaerbWML HbAVShUF7E2zKIW3MDSnQEcklLgd/LIWpiqznTk3p/QZwsIJupUL1fBnKKOeYs+vkR2V /3zg== 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=902FfrCE18fMMDnbH1AbjewyJewJhlr780PGsmnk3K4=; b=K0OuRLoM+7cAXPlojDjkFSxlW+bqhEzEu6MMndvhBnLuiJscP52UJottiupAMspfvZ FxisAoqbPVoZD++EsMluGuJ9iXTHxDpVU3eSLeK33uQygWYy63nUlDWVDOQKdfttiitf z70eqSXaQmhHI5rSQJZogMTt6FIRx8w9PwhGFZp+iSqIo+bxDW5cCU3KGWidCM4DhI9I kCdnj7rbk9iBRd4NDJb2N+VfEGD9J9xNJoc+dY0OQE2F3DBP1uKlUohPvK1aPO8fjYrD D1EqVqzPS7RoUOOhoZuSwjsrPusqKZDww3njt4LhdXnRSOxxIy/fgj0bwH536yD9Z1TN 3zFw== 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 h50si67495118qvh.86.2019.08.13.14.12.56 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 13 Aug 2019 14:12:56 -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]:55524 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hxe6C-0003yz-DW for patch@linaro.org; Tue, 13 Aug 2019 17:12:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41726) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hxe19-0004vQ-W3 for qemu-devel@nongnu.org; Tue, 13 Aug 2019 17:07:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hxe17-0001Kr-Vs for qemu-devel@nongnu.org; Tue, 13 Aug 2019 17:07:43 -0400 Received: from szxga06-in.huawei.com ([45.249.212.32]:33576 helo=huawei.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hxe0z-0001CJ-Lm; Tue, 13 Aug 2019 17:07:34 -0400 Received: from DGGEMS409-HUB.china.huawei.com (unknown [172.30.72.60]) by Forcepoint Email with ESMTP id B3D2A16FBA25251D182D; Wed, 14 Aug 2019 05:07:31 +0800 (CST) Received: from S00345302A-PC.china.huawei.com (10.47.94.0) by DGGEMS409-HUB.china.huawei.com (10.3.19.209) with Microsoft SMTP Server id 14.3.439.0; Wed, 14 Aug 2019 05:07:21 +0800 From: Shameer Kolothum To: , , , Date: Tue, 13 Aug 2019 22:05:32 +0100 Message-ID: <20190813210539.31164-6-shameerali.kolothum.thodi@huawei.com> X-Mailer: git-send-email 2.12.0.windows.1 In-Reply-To: <20190813210539.31164-1-shameerali.kolothum.thodi@huawei.com> References: <20190813210539.31164-1-shameerali.kolothum.thodi@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.47.94.0] 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-for-4.2 v9 05/12] 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 Reviewed-by: Igor Mammedov --- 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 diff --git a/hw/arm/virt.c b/hw/arm/virt.c index 72cde9deba..ef65e721d2 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -2097,10 +2097,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 32d1ca9abc..83cd1bfeec 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;