From nobody Tue Feb 10 01:33:02 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1606902690; cv=none; d=zohomail.com; s=zohoarc; b=avdglY8E71gshHVeLHLMK+lFP6A7TCuinV2nU6qqV7G3nQ6Bk7SIMgxGnicOW/KEfNzgvmFh5w1hn7c9++Xr5HCd2UGPjxvKJnOhNOR5s1v4OVaduQxmu9e1P5661NiM4Ht1i08qR5pFI7jZWrcxBlzdCGincyCRsDB7b4DpCYw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1606902690; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=VthueJ+wcmCD21Tv2S71bw+Fela9fIth1B3tPzW5ixA=; b=JwnzUIrRh0TJqDpKue91S7DQ6EQG9MC6niBP/zYYagiEWJoHQSLH4nTQI9ybdmCygNjdM67QY2qL8RTr/tRvBmGhRa4Jq+mZGXMSlAJi0Cm5sODpNr5B9W8SHCQvxiSmf9+QvDM6bGqlWtax8LuWnRSEssvPqCY2am6yOSG9c0k= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1606902690143730.2906115243491; Wed, 2 Dec 2020 01:51:30 -0800 (PST) Received: from localhost ([::1]:44292 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kkOnH-0000fJ-UY for importer@patchew.org; Wed, 02 Dec 2020 04:51:27 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:42632) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kkNM4-0006c7-RJ for qemu-devel@nongnu.org; Wed, 02 Dec 2020 03:19:19 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:20993) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kkNM1-0006wk-4P for qemu-devel@nongnu.org; Wed, 02 Dec 2020 03:19:16 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-237-gR8cJwKeMEiUfcYnsMugMQ-1; Wed, 02 Dec 2020 03:19:06 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 32CAB185A0CA for ; Wed, 2 Dec 2020 08:19:04 +0000 (UTC) Received: from virtlab701.virt.lab.eng.bos.redhat.com (virtlab701.virt.lab.eng.bos.redhat.com [10.19.152.228]) by smtp.corp.redhat.com (Postfix) with ESMTP id E1A90100238C; Wed, 2 Dec 2020 08:19:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1606897147; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=VthueJ+wcmCD21Tv2S71bw+Fela9fIth1B3tPzW5ixA=; b=V01/5IIQcegnQfvlyi7ZcTukoBmSe98V1ZVMfPAYNPBD3idFA1S533LXsYBsMflA5GWRhI IlH2P9Ph8W/SD/4ZnfDQmTAroPe22jmiX2Eykp7i8ZYvHPRIGW32RwtprJMSGUopz4Ue3x TUHBbqlWb1bvZmdKxfPNc0gFnmMAZfI= X-MC-Unique: gR8cJwKeMEiUfcYnsMugMQ-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 09/15] machine: record whether nvdimm= was set Date: Wed, 2 Dec 2020 03:18:48 -0500 Message-Id: <20201202081854.4126071-10-pbonzini@redhat.com> In-Reply-To: <20201202081854.4126071-1-pbonzini@redhat.com> References: <20201202081854.4126071-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=216.205.24.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -35 X-Spam_score: -3.6 X-Spam_bar: --- X-Spam_report: (-3.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1.497, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, 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: imammedo@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" This is needed for SPAPR which has different defaults than everyone else. Right now it looks at the -machine QemuOpts, but those will go away. Signed-off-by: Paolo Bonzini --- hw/core/machine.c | 1 + include/hw/mem/nvdimm.h | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/hw/core/machine.c b/hw/core/machine.c index 2c0bc15143..94992fa1c0 100644 --- a/hw/core/machine.c +++ b/hw/core/machine.c @@ -455,6 +455,7 @@ static void machine_set_nvdimm(Object *obj, bool value,= Error **errp) { MachineState *ms =3D MACHINE(obj); =20 + ms->nvdimms_state->has_is_enabled =3D true; ms->nvdimms_state->is_enabled =3D value; } =20 diff --git a/include/hw/mem/nvdimm.h b/include/hw/mem/nvdimm.h index c699842dd0..14c101c180 100644 --- a/include/hw/mem/nvdimm.h +++ b/include/hw/mem/nvdimm.h @@ -129,7 +129,7 @@ typedef struct NvdimmFitBuffer NvdimmFitBuffer; =20 struct NVDIMMState { /* detect if NVDIMM support is enabled. */ - bool is_enabled; + bool has_is_enabled, is_enabled; =20 /* the data of the fw_cfg file NVDIMM_DSM_MEM_FILE. */ GArray *dsm_mem; --=20 2.26.2