From patchwork Mon Jun 17 07:11:05 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: 804852 Delivered-To: patch@linaro.org Received: by 2002:adf:fb90:0:b0:360:93e7:1765 with SMTP id a16csp434451wrr; Mon, 17 Jun 2024 00:13:41 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWdZLfiqZwZgromnP9QXlPwSydnabzJJV/VyiUynQhOb4e3mp93G9oZ/i2l32KoVBjBpx3o0hHzjgJrZ2VY3wPN X-Google-Smtp-Source: AGHT+IHKXABPCLZLZ3V4xMksAMDwdH6MQO6U1ZVw9sCpworynIFZ1OIFisFhSLd1cetHqR1rXDve X-Received: by 2002:a05:620a:444f:b0:795:5815:2f9f with SMTP id af79cd13be357-798d241d00fmr1117768085a.25.1718608421207; Mon, 17 Jun 2024 00:13:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1718608421; cv=none; d=google.com; s=arc-20160816; b=dkEhBwGC33bzdTZ4YOKwKo64wtm9bgs+TrdLxRb65w3uvsAXhYq5lGVp4ZsDxr2ef/ NFKRT//jGzfHcQzt7Yxy4O7f8DJywi/mOmiflLw6fwzpDMVZowrX/JMkay/XKFCZ+KjM P/zRCCt8wP8mJsJzMoznCIMoy6m0/FNZv/j+ChJGAEwwg9lJP6QpUZsB0xba/88yxzXP VJ8PBPXviUyGBeaHkJC8dY1B/FRoZjgWse4sJVO5zOs+m1F3Y6V0uixKIcEwqkNtYLv8 F6eUz19xdxEoXM2JvPlKfniP6tRln1rBitZfizFR/9AQoPGpm3uHbVcuLsSWzthTW/Ij AJRw== 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=Jy+NKKxzRsNSVOw4XNFiJizT7ql+sFnoJXDbQFpH2Zk=; fh=LxU1EPCBVYorV++vrCt2dyzDsbIeuRBouOVrSj5U16k=; b=XLvKyU2uVNuDewfp86MZPhJ0Q6Qytk5ncU6Zyrpih5wQgEZPBodlTbEQpaSp1zotty AgbNqKavWh87KaoA6aCX/YZmqP08N0xRNa6PdCt8/JutrAKBoVXsZL4FeJkbrYc70DYm jnV/AIpdg1wzwIQY81VVjYsBZz+bYM+fScso13Ux61MYAv/Ra/yFzuIT4IkUsDJD+5UW UE+HJr++nw/GhQ0eFglp07j95J7zSXjA/mHMB6iCi5Q2GDA7o+/U9fix6e2FKxCcXddw JYZYAGfEJjB4qJkvLkD+LspVRy6tR67crxXGTXcLsS+CWO7CqyFPnyIHg4nAPOFYlRkb YaDw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=qmKjKvwV; 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 d75a77b69052e-441f2fe31dfsi74007821cf.575.2024.06.17.00.13.41 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 17 Jun 2024 00:13:41 -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=qmKjKvwV; 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 1sJ6XO-00046Y-M6; Mon, 17 Jun 2024 03:12:22 -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 1sJ6XM-00044o-Cs for qemu-devel@nongnu.org; Mon, 17 Jun 2024 03:12:20 -0400 Received: from mail-ed1-x535.google.com ([2a00:1450:4864:20::535]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sJ6XK-0002I2-Qu for qemu-devel@nongnu.org; Mon, 17 Jun 2024 03:12:20 -0400 Received: by mail-ed1-x535.google.com with SMTP id 4fb4d7f45d1cf-57cce3bc8c6so1762846a12.3 for ; Mon, 17 Jun 2024 00:12:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1718608337; x=1719213137; 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=Jy+NKKxzRsNSVOw4XNFiJizT7ql+sFnoJXDbQFpH2Zk=; b=qmKjKvwVH7ZBzzYQe4vULOQv2VRa9j07N1gocZ3OBl1Lg8R6VIuiZGkNcTfsnmGOXg zso11R0zMXv4zKaNnI2TBeYy+CegPlb0Z9L3T/+nkY5VOCqzAj78NHb4AjyeM3z2tcrZ Hvj1LhDHZsD4RzIOkNu49jpJhKjK2GvIOd+0q1dkzumcQ+aRU6YmSwBurbj47k27K2l+ 3Jyoaw/ykh2X/GT+gQrtTCju8tGkqwlzePud3SKlJxg+H57uR1tCyK/fkKyg14nOl4o+ FdczJYkFXyy9UDx9iXiw42e8B7ka1teMZUeCFA6VuOFt35L+nZ4PCErp3rFlv4J71zsR kcDQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1718608337; x=1719213137; 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=Jy+NKKxzRsNSVOw4XNFiJizT7ql+sFnoJXDbQFpH2Zk=; b=mkKkOY9h0CPCsm+Pq6z5lQMhTeFZmyh4fC6HZ9liuvigXE3q6zuMPumc9lZ8yiKmkG nTWw6FWCk+x7iQSDLpKTAWnKRyNX2xDH0M11y7t9vRGmA3wis0tQLOsX+zDo4Ygn5Cy8 Vy6t0yjykJA58nSMZ5xJhkj1k23krp1HrybdMM94cEWiu20LK6zmmr0qq2ildVoyL4eA jOFjLcMhzeGI3WgMfDVL3b3vYtD4KlEuJRli5ipiIiqFkmoVJ2EtGeGkWBaI0sKRUEO0 EyEt6f+PoKATSlrHQLrM0wSTj9mZV1YnxVfw1v9ppYsdQrhXujNQJa6SivJLK4mbBISo MsTA== X-Gm-Message-State: AOJu0Yy0TqJaC8BuGg1bP8FixAsAAadXKnMEUB6ceQQ6wEfrYQpfcM1T uQR+pt1c3VxN34EOqckgMWx7gs9dGzzAOwJynbU569gQDA8n9qMuYR5tGn/1GO1H/G5VlRlD0qT REMc= X-Received: by 2002:a05:6402:17d9:b0:57c:c712:a3c7 with SMTP id 4fb4d7f45d1cf-57cc712a42emr4638452a12.36.1718608336894; Mon, 17 Jun 2024 00:12:16 -0700 (PDT) Received: from m1x-phil.lan ([176.176.169.90]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-57cb72da156sm5973482a12.22.2024.06.17.00.12.15 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 17 Jun 2024 00:12:16 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Igor Mammedov , "Michael S. Tsirkin" , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= , Thomas Huth , Zhao Liu Subject: [PATCH v6 10/23] hw/i386/pc: Remove PCMachineClass::smbios_uuid_encoded Date: Mon, 17 Jun 2024 09:11:05 +0200 Message-ID: <20240617071118.60464-11-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240617071118.60464-1-philmd@linaro.org> References: <20240617071118.60464-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::535; envelope-from=philmd@linaro.org; helo=mail-ed1-x535.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, T_SCC_BODY_TEXT_LINE=-0.01 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 PCMachineClass::smbios_uuid_encoded was only used by the pc-i440fx-2.1 machine, which got removed. It is now always true, remove it. Reviewed-by: Thomas Huth Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Zhao Liu Reviewed-by: Igor Mammedov --- include/hw/i386/pc.h | 1 - hw/i386/fw_cfg.c | 3 +-- hw/i386/pc.c | 1 - 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index 0d730318fe..5667b87ed0 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -109,7 +109,6 @@ struct PCMachineClass { /* SMBIOS compat: */ bool smbios_defaults; bool smbios_legacy_mode; - bool smbios_uuid_encoded; SmbiosEntryPointType default_smbios_ep_type; /* RAM / address space compat: */ diff --git a/hw/i386/fw_cfg.c b/hw/i386/fw_cfg.c index 6e0d9945d0..f9e8af3bf5 100644 --- a/hw/i386/fw_cfg.c +++ b/hw/i386/fw_cfg.c @@ -63,8 +63,7 @@ void fw_cfg_build_smbios(PCMachineState *pcms, FWCfgState *fw_cfg, if (pcmc->smbios_defaults) { /* These values are guest ABI, do not change */ - smbios_set_defaults("QEMU", mc->desc, mc->name, - pcmc->smbios_uuid_encoded); + smbios_set_defaults("QEMU", mc->desc, mc->name, true); } /* tell smbios about cpuid version and features */ diff --git a/hw/i386/pc.c b/hw/i386/pc.c index b0b8ecd64d..215462e861 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -1796,7 +1796,6 @@ static void pc_machine_class_init(ObjectClass *oc, void *data) pcmc->has_acpi_build = true; pcmc->rsdp_in_ram = true; pcmc->smbios_defaults = true; - pcmc->smbios_uuid_encoded = true; pcmc->gigabyte_align = true; pcmc->has_reserved_memory = true; pcmc->enforce_aligned_dimm = true;