From patchwork Fri Aug 27 09:24:51 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Henrique Barboza X-Patchwork-Id: 12461601 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.5 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3EAF7C43216 for ; Fri, 27 Aug 2021 09:26:33 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id C5E5960F39 for ; Fri, 27 Aug 2021 09:26:32 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org C5E5960F39 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=nongnu.org Received: from localhost ([::1]:48966 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mJY87-0006mF-Mk for qemu-devel@archiver.kernel.org; Fri, 27 Aug 2021 05:26:31 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45424) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mJY6s-0004Kz-7H; Fri, 27 Aug 2021 05:25:14 -0400 Received: from mail-ua1-x930.google.com ([2607:f8b0:4864:20::930]:40495) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mJY6n-00024M-JW; Fri, 27 Aug 2021 05:25:13 -0400 Received: by mail-ua1-x930.google.com with SMTP id y36so3072575uad.7; Fri, 27 Aug 2021 02:25:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=g5Jdp9p1FcFlTUliocLqD9QgBTG6ccV0iJdgZ6gBA0U=; b=BUpD8MlSME/k3APv0k6d9tBBGmST6DJost375iMjW835IhPx6cl8o8OWSwa59j/5pF mtimwfNGcFYOaxIzT2haO1E4dV/5Xof2oF8TZ0SKLiOK53NQF76MING2EIeP05lvkq4t 1vkqi3Is3w5z+9yHD7AwvLJdGAWWy8K0AC1I9Mwv5zK0CZa4cNSVkLEFkapJDkIuuHdE ncafTzCJemg0VPls3pC9U4gqBmGQov6fJfTiZR5PJVAqbd7U0hDOv9udh9DnpPtf9ymR WP+uaFY5nHXcgE0q7WKl/Kn9eb2z9fQ07TuhSKluZITeAdSU0NxDXbLR3NwBLzTYzorp /QGg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=g5Jdp9p1FcFlTUliocLqD9QgBTG6ccV0iJdgZ6gBA0U=; b=iBk5mJG1bmEqajCqlBhjKm5FzmLv6hGUiPUtO0La1LF3/g1LWlYdSyQsIlHJvh0iUK oeue1KetXPSAAPUQu9tagw3nkKpXumj4rlZoetTIywwJ4JC8yM/o43SppwPJTHD2sC+N 81B5CCw6V2h3gOCbhEG0R6o//QNJMixooKtBzuOnyDiKkD2ydmQX/LtsyGkU9wXuH4QJ n25FGcCmqk7MoNOOuE5LU00EKIqFtoUYVCbqNBoWPk3iQnX2AMhZPKi7VAWuhknmmUap kOwICgJyT6fwe2Lq3Eh0K1K1fZfCfoMNiZ5bKxJ+gwPSpbASopasG7peG/x8jU5S852J c4lA== X-Gm-Message-State: AOAM5305V/rX0rMAPoM3Fiw86c49Pq99jwOu08g5wA9EOtZgmXvvnlgn R48TrnYyuYFnvYylq1Cupjejk0b9dhs= X-Google-Smtp-Source: ABdhPJzAf1BizHcXJQNiqAZmB2zIoHcuaIPHDvhVyVF1kC4WtJcxUTDzdKQPfl+C7Bz0FRcNimxDmA== X-Received: by 2002:ab0:6652:: with SMTP id b18mr5715328uaq.53.1630056308085; Fri, 27 Aug 2021 02:25:08 -0700 (PDT) Received: from rekt.COMFAST ([177.197.96.186]) by smtp.gmail.com with ESMTPSA id d17sm629180vsj.9.2021.08.27.02.25.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 Aug 2021 02:25:07 -0700 (PDT) From: Daniel Henrique Barboza To: qemu-devel@nongnu.org Subject: [PATCH v4 1/5] hw, spapr: add 6.2 compat pseries machine Date: Fri, 27 Aug 2021 06:24:51 -0300 Message-Id: <20210827092455.125411-2-danielhb413@gmail.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210827092455.125411-1-danielhb413@gmail.com> References: <20210827092455.125411-1-danielhb413@gmail.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::930; envelope-from=danielhb413@gmail.com; helo=mail-ua1-x930.google.com X-Spam_score_int: -17 X-Spam_score: -1.8 X-Spam_bar: - X-Spam_report: (-1.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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: Daniel Henrique Barboza , qemu-ppc@nongnu.org, groug@kaod.org, david@gibson.dropbear.id.au Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Daniel Henrique Barboza --- hw/core/machine.c | 3 +++ hw/ppc/spapr.c | 15 +++++++++++++-- include/hw/boards.h | 3 +++ 3 files changed, 19 insertions(+), 2 deletions(-) diff --git a/hw/core/machine.c b/hw/core/machine.c index 54e040587d..067f42b528 100644 --- a/hw/core/machine.c +++ b/hw/core/machine.c @@ -37,6 +37,9 @@ #include "hw/virtio/virtio.h" #include "hw/virtio/virtio-pci.h" +GlobalProperty hw_compat_6_1[] = {}; +const size_t hw_compat_6_1_len = G_N_ELEMENTS(hw_compat_6_1); + GlobalProperty hw_compat_6_0[] = { { "gpex-pcihost", "allow-unmapped-accesses", "false" }, { "i8042", "extended-state", "false"}, diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 81699d4f8b..d39fd4e644 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -4685,15 +4685,26 @@ static void spapr_machine_latest_class_options(MachineClass *mc) } \ type_init(spapr_machine_register_##suffix) +/* + * pseries-6.2 + */ +static void spapr_machine_6_2_class_options(MachineClass *mc) +{ + /* Defaults for the latest behaviour inherited from the base class */ +} + +DEFINE_SPAPR_MACHINE(6_2, "6.2", true); + /* * pseries-6.1 */ static void spapr_machine_6_1_class_options(MachineClass *mc) { - /* Defaults for the latest behaviour inherited from the base class */ + spapr_machine_6_2_class_options(mc); + compat_props_add(mc->compat_props, hw_compat_6_1, hw_compat_6_1_len); } -DEFINE_SPAPR_MACHINE(6_1, "6.1", true); +DEFINE_SPAPR_MACHINE(6_1, "6.1", false); /* * pseries-6.0 diff --git a/include/hw/boards.h b/include/hw/boards.h index accd6eff35..463a5514f9 100644 --- a/include/hw/boards.h +++ b/include/hw/boards.h @@ -353,6 +353,9 @@ struct MachineState { } \ type_init(machine_initfn##_register_types) +extern GlobalProperty hw_compat_6_1[]; +extern const size_t hw_compat_6_1_len; + extern GlobalProperty hw_compat_6_0[]; extern const size_t hw_compat_6_0_len;