From patchwork Thu Mar 28 15:54:33 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 783606 Delivered-To: patch@linaro.org Received: by 2002:a5d:4e01:0:b0:33e:7753:30bd with SMTP id p1csp2799968wrt; Thu, 28 Mar 2024 08:59:10 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCX2Zr37bMX3t1WFkQ/4sb3//zex5PKEaaoedIZDtBWnK3AV2s/w/IZ7/0HMdbqMHgQxnGD7LGohVyiEr0+qvn6R X-Google-Smtp-Source: AGHT+IHYSETA8cvT54qcPQ4jQ03iUEr4P0KdwXU5rlW+kqYm8szs2NjraK06VAQy71BLXGM74ZtF X-Received: by 2002:a05:620a:44c4:b0:78a:6546:7e80 with SMTP id y4-20020a05620a44c400b0078a65467e80mr3536138qkp.54.1711641550581; Thu, 28 Mar 2024 08:59:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1711641550; cv=none; d=google.com; s=arc-20160816; b=du2rF3ZQKdlZR+7zxwOyqHDrBXYy1sZ/Ik8knONIxIrhxVVROqtZlEZSj02EOyK0+e WdtFEBRy2HU4E6JSmeDkW1wxaVfbJaV+sd4iAY1sN5mhYjz8kMlMwulSpnbwCJcsrav5 yWuBs47/LPNMDNgSD6zebJ4isuyrNONyZPfpBPNk+HYov1iZPiBrfCicNPIl0Ni1vcKg /S6+Dnc0Ie7PhyQ96ZW/FCDWbbuFFaqyK1yrhat4UH1djQXEp4Os8+tMK/iSXwyaynQx HgNJxUwvW8PYfsUPYyVfv9ajoYfVDbdoDE6Y3O1HQLzbpq14bnt2cV4b2ckFHpaQeKWq G9PQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=KZcClnRjP7+/0e8fY+P9N5bd75aoGZ6efgZZhKhlNAY=; fh=UDxTSeEolXQUwGzf6K2+0ghcCN8FdfJ4W87Ih9funHA=; b=sag9fOHBTiYWOTftdobNgxbNujknjXbzkaF7AeF0aKG7sRw0U1DuQECnjJRYQEWEsR i13CJmv3cu0lEsKP3v3J3DTgOJzrFKywv+K4nhcct7DezuFUh1RK23bfz8rUl+bm9+gp ydkLu/KCa+kMwT8RQtlopWoj821xM7gCrgQ8TV45P9JGluLiCn5sPAwOfVloW9s62CvE N7PFxQznY6M6ueAGr+f8XMJU1GWwW3EV8zRpolRrp8F5u4H482HHrxaZcw6rCLyrCSf6 gcodKxdnOge9jB9R7S/8rbHhm1FtWRSVa4XahqguJ3A0QgZWn43OTXa7Fw0bK7z4vnqE Ik1Q==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=TyCwPyPh; 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"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id y10-20020a05620a44ca00b00789fd90a80fsi1884173qkp.677.2024.03.28.08.59.10 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 28 Mar 2024 08:59:10 -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; dkim=pass header.i=@linaro.org header.s=google header.b=TyCwPyPh; 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"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rps85-0008Vc-7m; Thu, 28 Mar 2024 11:57:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rps82-000859-Mh for qemu-devel@nongnu.org; Thu, 28 Mar 2024 11:57:22 -0400 Received: from mail-ed1-x533.google.com ([2a00:1450:4864:20::533]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rps81-0002j1-3F for qemu-devel@nongnu.org; Thu, 28 Mar 2024 11:57:22 -0400 Received: by mail-ed1-x533.google.com with SMTP id 4fb4d7f45d1cf-56c12c73ed8so1458494a12.2 for ; Thu, 28 Mar 2024 08:57:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1711641439; x=1712246239; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=KZcClnRjP7+/0e8fY+P9N5bd75aoGZ6efgZZhKhlNAY=; b=TyCwPyPhRh1929UKMQEMeZoUubWRLkspcsSFjnqhDWUlPcH/U6+jL12lMi1grKFMtQ WqF4QZy9LZdPrlALfj1poub4jLN9TXkmSXe1CqSDCAAC9LjXJzNzK8zB6wjQPryXWo9D 9+b47+phR94y/+PXXF7zDQgMAA8jJ8QfsMDD11qIkrPIsS/udQ6mZB6I5I6v+gRDvLWY tyAN2H+b8T/bhYw02LAjI1E7B8PcNrkckLVaY0tKwqcXKyw30NO8dQ32+D/cLUK4/RPq DBFMR2kPVzPA/jdic3LmaFlsAsLg5e9BUDO9uoC30dO33gPDMaS4NMCa5BPH9BHNHkmE /3Eg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711641439; x=1712246239; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=KZcClnRjP7+/0e8fY+P9N5bd75aoGZ6efgZZhKhlNAY=; b=JXScT5z1ZCU9UZ/nc81ioDi0lcfgewo2KkEeN+w/bUNDz6PCSg4jCiwwim9Adfk43K DEpXLBRPhqdCj5lH6Zq8YQPsl0iwkHCf3Hffc9NdGkVy/XbVqwRg6DIIlY40gZtpsaZ4 hJtiRsXC1EjqrJma3LWMPOeJ4ojqKK03lCuCIu9rIKFpVd4hJowDwNX3IBkgUbd9cQUJ p0k+7i4Yr6LMLJBsFElAFbTHjngU7MHuz/jCzQ72FO2zEe9oCi6qiMz56nPqPZ0XpBkw A73oknZQJkTCK/SNbKw6as/15XG6cZ8B5MhgtrwMGh4Bwm323zJN0noFBN4ZcgbM3KAH obSQ== X-Gm-Message-State: AOJu0YwYHKMer+xJJpqleHyqOmuBVJJtz3q+LuP6Mqvr8YVNzCleunAE b4udpCyGA2HGXNNBlqz98Ru3KBGXUYCNyh8l+sODTdXeRmz333ZH6ZqIc7DBcmKKTgCfb+Gq0Ew d X-Received: by 2002:a17:907:971c:b0:a46:a1d0:8451 with SMTP id jg28-20020a170907971c00b00a46a1d08451mr2602412ejc.16.1711641439232; Thu, 28 Mar 2024 08:57:19 -0700 (PDT) Received: from m1x-phil.lan (pas38-h02-176-184-5-52.dsl.sta.abo.bbox.fr. [176.184.5.52]) by smtp.gmail.com with ESMTPSA id eb16-20020a170907281000b00a4e0df9e793sm887845ejc.136.2024.03.28.08.57.17 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 28 Mar 2024 08:57:18 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , Eduardo Habkost , Stefano Stabellini , xen-devel@lists.xenproject.org, Bernhard Beschow , Thomas Huth , Marcel Apfelbaum , "Michael S. Tsirkin" , Paolo Bonzini , Igor Mammedov , Anthony Perard , Ani Sinha , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [RFC PATCH-for-9.1 25/29] hw/i386/fw_cfg: Replace smbios_defaults() by !smbios_legacy_mode() Date: Thu, 28 Mar 2024 16:54:33 +0100 Message-ID: <20240328155439.58719-26-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240328155439.58719-1-philmd@linaro.org> References: <20240328155439.58719-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::533; envelope-from=philmd@linaro.org; helo=mail-ed1-x533.google.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, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, 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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org smbios_defaults() and smbios_legacy_mode() are logical opposite. Simplify using the latter. Signed-off-by: Philippe Mathieu-Daudé --- hw/i386/fw_cfg.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/hw/i386/fw_cfg.c b/hw/i386/fw_cfg.c index ffa60a4a33..df05fe060c 100644 --- a/hw/i386/fw_cfg.c +++ b/hw/i386/fw_cfg.c @@ -49,11 +49,6 @@ const char *fw_cfg_arch_key_name(uint16_t key) } #ifdef CONFIG_SMBIOS -static bool smbios_defaults(PCMachineState *pcms) -{ - return pc_machine_is_pci_enabled(pcms); -} - static bool smbios_legacy_mode(PCMachineState *pcms) { return !pc_machine_is_pci_enabled(pcms); @@ -70,7 +65,7 @@ void fw_cfg_build_smbios(PCMachineState *pcms, FWCfgState *fw_cfg, MachineClass *mc = MACHINE_GET_CLASS(pcms); X86CPU *cpu = X86_CPU(ms->possible_cpus->cpus[0].cpu); - if (smbios_defaults(pcms)) { + if (!smbios_legacy_mode(pcms)) { /* These values are guest ABI, do not change */ smbios_set_defaults("QEMU", mc->desc, mc->name); }