From mboxrd@z Thu Jan 1 00:00:00 1970 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.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS 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 47883C433FE for ; Mon, 7 Dec 2020 16:11:18 +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 9A1E323741 for ; Mon, 7 Dec 2020 16:11:17 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9A1E323741 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:55256 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kmJ6a-0007a4-Do for qemu-devel@archiver.kernel.org; Mon, 07 Dec 2020 11:11:16 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:53534) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kmJ36-0004JT-GN for qemu-devel@nongnu.org; Mon, 07 Dec 2020 11:07:40 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:41410) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kmJ33-0003AJ-0q for qemu-devel@nongnu.org; Mon, 07 Dec 2020 11:07:39 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1607357255; 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=j5Zc5djlbTMy7EE8x7Wb7ekzFaFKfnacaLMhCgHTlkE=; b=QByrNcu8NQBP8R8Jtb3lGYkugVPmQvPNOdzHooE0M93Kvwdccu3KL84Zwc2tlF2oGFHaml uVcb36yAO6OfN2FiOo1c4msg1kPbeMu5gsv7CetSgf99pOnDVsl4idJHbEfzXZGcrpUCkg xTmihm+1lHc+b9w+1fQH2xB5X7CXiuE= 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-506-T0wPhxauP4OP4bKTb3lO5A-1; Mon, 07 Dec 2020 11:07:33 -0500 X-MC-Unique: T0wPhxauP4OP4bKTb3lO5A-1 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 788EC800D53; Mon, 7 Dec 2020 16:07:31 +0000 (UTC) Received: from localhost (unknown [10.40.208.65]) by smtp.corp.redhat.com (Postfix) with ESMTP id 211F610016F5; Mon, 7 Dec 2020 16:07:29 +0000 (UTC) Date: Mon, 7 Dec 2020 17:07:28 +0100 From: Igor Mammedov To: Paolo Bonzini Subject: Re: [PATCH 10/15] vl: make qemu_get_machine_opts static Message-ID: <20201207170728.0a39f201@redhat.com> In-Reply-To: <20201202081854.4126071-11-pbonzini@redhat.com> References: <20201202081854.4126071-1-pbonzini@redhat.com> <20201202081854.4126071-11-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=imammedo@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Received-SPF: pass client-ip=63.128.21.124; envelope-from=imammedo@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, 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_H4=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: danielhb413@gmail.com, qemu-devel@nongnu.org, david@gibson.dropbear.id.au Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On Wed, 2 Dec 2020 03:18:49 -0500 Paolo Bonzini wrote: > Machine options can be retrieved as properties of the machine object. > Encourage that by removing the "easy" accessor to machine options. > > Signed-off-by: Paolo Bonzini > --- > accel/kvm/kvm-all.c | 11 ++++------- > hw/arm/boot.c | 2 +- > hw/microblaze/boot.c | 9 ++++----- > hw/nios2/boot.c | 9 ++++----- > hw/ppc/e500.c | 5 ++--- > hw/ppc/spapr_nvdimm.c | 4 ++-- > hw/ppc/virtex_ml507.c | 2 +- > hw/riscv/sifive_u.c | 6 ++---- > hw/riscv/virt.c | 6 ++---- > hw/xtensa/xtfpga.c | 9 ++++----- > include/sysemu/sysemu.h | 2 -- > softmmu/device_tree.c | 2 +- > softmmu/vl.c | 2 +- > 13 files changed, 28 insertions(+), 41 deletions(-) > [...] > diff --git a/hw/ppc/spapr_nvdimm.c b/hw/ppc/spapr_nvdimm.c > index a833a63b5e..84715a4d78 100644 > --- a/hw/ppc/spapr_nvdimm.c > +++ b/hw/ppc/spapr_nvdimm.c > @@ -38,7 +38,6 @@ bool spapr_nvdimm_validate(HotplugHandler *hotplug_dev, NVDIMMDevice *nvdimm, > { > const MachineClass *mc = MACHINE_GET_CLASS(hotplug_dev); > const MachineState *ms = MACHINE(hotplug_dev); > - const char *nvdimm_opt = qemu_opt_get(qemu_get_machine_opts(), "nvdimm"); > g_autofree char *uuidstr = NULL; > QemuUUID uuid; > int ret; > @@ -57,10 +56,11 @@ bool spapr_nvdimm_validate(HotplugHandler *hotplug_dev, NVDIMMDevice *nvdimm, > * ensure that, if the user sets nvdimm=off, we error out > * regardless of being 5.1 or newer. > */ > - if (!ms->nvdimms_state->is_enabled && nvdimm_opt) { > + if (!ms->nvdimms_state->is_enabled && ms->nvdimms_state->has_is_enabled) { > error_setg(errp, "nvdimm device found but 'nvdimm=off' was set"); > return false; > } > + ms->nvdimms_state->is_enabled = true; it looks like nvdimm is always enabled since 5.0 and there is no way to disable it how about dropping 9/15 and just error out is it's not enabled, something like: diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index b7e0894019..d63f095bff 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -2668,6 +2668,7 @@ static void spapr_machine_init(MachineState *machine) char *filename; Error *resize_hpt_err = NULL; + if (mc->nvdimm_supported) { // by default it is always enabled + ms->nvdimms_state->is_enabled = true; + } msi_nonbroken = true; QLIST_INIT(&spapr->phbs); diff --git a/hw/ppc/spapr_nvdimm.c b/hw/ppc/spapr_nvdimm.c index a833a63b5e..b11c85dbaa 100644 --- a/hw/ppc/spapr_nvdimm.c +++ b/hw/ppc/spapr_nvdimm.c @@ -57,7 +57,7 @@ bool spapr_nvdimm_validate(HotplugHandler *hotplug_dev, NVDIMMDevice *nvdimm, * ensure that, if the user sets nvdimm=off, we error out * regardless of being 5.1 or newer. */ - if (!ms->nvdimms_state->is_enabled && nvdimm_opt) { + if (!ms->nvdimms_state->is_enabled) { error_setg(errp, "nvdimm device found but 'nvdimm=off' was set"); return false; } if I didn't miss something, that way we do not abuse nvdimm_opt and still have nvdimm enabled by default and error out if it turns to disabled for whatever reason. > if (object_property_get_int(OBJECT(nvdimm), NVDIMM_LABEL_SIZE_PROP, > &error_abort) == 0) { [...]