From patchwork Wed Jan 15 17:10:07 2025 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: 857611 Delivered-To: patch@linaro.org Received: by 2002:a5d:525c:0:b0:385:e875:8a9e with SMTP id k28csp2581423wrc; Wed, 15 Jan 2025 09:12:54 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCXPkrDOMpa+ZaUrbdUoXRyRGyNceaNVyZfH45yEdub0luZcuLo/KasbC4bx6wfQS1U43+FUNg==@linaro.org X-Google-Smtp-Source: AGHT+IH54CnQh03wmkQnXPj8IpioAgEyFGw69MIA9tMMDjyOBOTrJFbq/q3l7GVu2xYuHHkkFGLL X-Received: by 2002:a05:622a:1451:b0:466:a119:f4d3 with SMTP id d75a77b69052e-46c710f9d8cmr459808051cf.45.1736961173944; Wed, 15 Jan 2025 09:12:53 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1736961173; cv=none; d=google.com; s=arc-20240605; b=gCTB0v0hEW8w4CA8GXjaPwKHHZk1acPK4wBbyAi9vEep7dRDLUHbLm52IuwJt6K3P8 2bq2Q+kGswZEN1AnmM8FglSp5PF1phxP4AxHbG5HVL4bxI/JFNnTQ59FEMGlC8UiUTfA 4Kq/ym++M1pdVqijdemzsiOXx2mb4Oytlp+Ws+kvzu3np5OBp6tlYQs6bFPPQlohqJpR W/yXj6KiGM0URDe71D4VeKi39LSRdbNC5sVnxP5ivBswt0mlGlHz4i3n2XDiG1JcksNW bpe6uPpP8DP0eBEqNyUMQ7unj4Dzaf29dOYXWSZWBB2Khi0K/2Yp6/3F+iCyZj/3eBhH iTCw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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=Pa1qCoN+HFadRplHhWS5olMOGiE0VGbusTWsCAk4+KA=; fh=AJ3qCIQ5DJZT11MzfbCwuu67/MTA0x1zWNBwak43Xwk=; b=D8uYZ4b64g98skO9ZyIKHb6TnGQv8ckixBcqfobrRBLwmpHg4RzXRhQHrYkUJWmI90 wblDgRUlp5juiyUAmKsIbh1paoyaeCoSuBxQpD+d5Qg713spinl/ZOYaCsBoerrFYi8P cLowG5lqJv3IoMyTkvDGLF6a229uhP5qTBmc6IVnzXFTp/1rbH8LQk89Qnrr6Xre4+6F PkTig6tIiz5F5LnytIY0K6hvzQX8y/sHn6rYegzHu8e68nSQbIbLRC/vgnvueWgLYlfM /iB8Mb2ZWU/DwOoj9FfVeh9sOmFJGj7RxAT89NOVluRD5rRLrKYczJXvggL0LDcIiYPs nwbQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=HctiuCNc; 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; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id d75a77b69052e-46c873e4ad7si142223991cf.293.2025.01.15.09.12.53 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 15 Jan 2025 09:12:53 -0800 (PST) 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=HctiuCNc; 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; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tY6v8-0007oa-Aw; Wed, 15 Jan 2025 12:11:10 -0500 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 1tY6v5-0007lz-VD for qemu-devel@nongnu.org; Wed, 15 Jan 2025 12:11:07 -0500 Received: from mail-wm1-x333.google.com ([2a00:1450:4864:20::333]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tY6v3-0006ci-KB for qemu-devel@nongnu.org; Wed, 15 Jan 2025 12:11:07 -0500 Received: by mail-wm1-x333.google.com with SMTP id 5b1f17b1804b1-4364a37a1d7so71884635e9.3 for ; Wed, 15 Jan 2025 09:11:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1736961064; x=1737565864; 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=Pa1qCoN+HFadRplHhWS5olMOGiE0VGbusTWsCAk4+KA=; b=HctiuCNckYM0/rmBwP5kYRJydkDSY8Db61NzhG0iebv4PUzmcyk2YooA+wHsf3K/Y4 WrIxHQ6BCddHYimGq/pZGXTw7WfGpQSj3ef4/VxiC3NaygKmfS0m8dfxPXz3qKkeJweM 1f4aWOqpZm3qfSs6sU2cn0FjVz4Zcdacvj3Y+hoa5Hvr3EPsa/xpFIOSMhrbfJZE0V4N AxtUHR8sN3AIp4d9lS5Z8m329fD0dJcbJUxJHejcOYFxaUsR1UWIVlaQk4zVxkqPfneL pQ746uNSxDqXGsebIdQESo06rkuZvlDi4csvbkzHbMTpVw+3VsikNxYY3NHLp/0p2o83 57GQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1736961064; x=1737565864; 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=Pa1qCoN+HFadRplHhWS5olMOGiE0VGbusTWsCAk4+KA=; b=MmWUm5qGjcUzT4b/H6EPx1pUSPHF3b3lxmG82K6Q5XLbMdSBPqKjkIrSjUx94imLaj xgsEn2bbw/rBY0IGAtxvSchXWCme1NJUH0uMnsF7z6uBl17kY6nA1DYxmRHkI3umKHe7 EXDFykUTa4wrFrDwy2BWT9j7w08zT6G8C9MP6zOjjL5Z78FDka0epwN6qNhrVnzyOzOr G3sEkTU/AFUB9Uh/eVb+FexllYh5sorR4HBnzuefOkbswGcBXQeTRYR8ANko0sbw6FlW mubJpKN97IXlq7lPufbfxpyFCQASs2pkvSLbZ3/3Cxb3ZCoAkkOrBybioatE4wsjn0dY cNpQ== X-Gm-Message-State: AOJu0Ywk+wuxuZ6hZ+oxfiRTuSQM4JvDQ53vXisWkyNphn7p0anWHCmg d+nXA+clw1oMGU/ky/WAIfh0XALx9FKYMEqoET60l9Dg2SgEyPPLoJYcCfBwfyGO8dm8Q7JPa1n yOd4= X-Gm-Gg: ASbGnctiJK/nLzz+8VY7V5wwXfsKIqiU3WTxgj5baFCOYfhlDw6z5mlmqkLq19uefAa +75TIV58tUFVxWqy7Z0KneUVuX81DUVU9iaHAGTje6Q/OUHw6b/qBMcGrEKPo2zfHOSQ470bzoo qEetGO1ctelcUuhqLL2povDVYVeKk5rVUZNBtQCRHsgVzJwsVVGBXLxMgo67uunAtYNBlC0o/d1 tkJAGUihZFursuQzptLZrq6vDoHWNj8IF6DMCgZv+o79Prct/GD+5dwe0NymVNdEkrWHV38+Yun eaZWcts7Rsa6rJU+qBkEANQZOZL8K+NIWwAj X-Received: by 2002:a05:600c:4704:b0:436:469f:2210 with SMTP id 5b1f17b1804b1-436e267f796mr222655705e9.1.1736961063756; Wed, 15 Jan 2025 09:11:03 -0800 (PST) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-437c74f9ccasm29530045e9.39.2025.01.15.09.11.02 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 15 Jan 2025 09:11:03 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Ani Sinha , Igor Mammedov , Thomas Huth , Peter Maydell , Andrew Jones , qemu-arm@nongnu.org, Shannon Zhao , "Michael S. Tsirkin" , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= Subject: [PATCH 11/13] hw/arm/virt: Remove VirtMachineClass::smbios_old_sys_ver field Date: Wed, 15 Jan 2025 18:10:07 +0100 Message-ID: <20250115171009.19302-12-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250115171009.19302-1-philmd@linaro.org> References: <20250115171009.19302-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::333; envelope-from=philmd@linaro.org; helo=mail-wm1-x333.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=unavailable 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 The VirtMachineClass::smbios_old_sys_ver field was only used by virt-2.11 machine, which got removed. Remove it and simplify virt_build_smbios(). Signed-off-by: Philippe Mathieu-Daudé --- include/hw/arm/virt.h | 1 - hw/arm/virt.c | 4 +--- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/include/hw/arm/virt.h b/include/hw/arm/virt.h index 9c531e28d04..b2cc012a402 100644 --- a/include/hw/arm/virt.h +++ b/include/hw/arm/virt.h @@ -118,7 +118,6 @@ typedef enum VirtGICType { struct VirtMachineClass { MachineClass parent; bool no_tcg_its; - bool smbios_old_sys_ver; bool no_highmem_compact; bool no_highmem_ecam; bool no_ged; /* Machines < 4.2 have no support for ACPI GED device */ diff --git a/hw/arm/virt.c b/hw/arm/virt.c index ae331df9349..08117b396a6 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -1688,7 +1688,6 @@ static void virt_build_smbios(VirtMachineState *vms) { MachineClass *mc = MACHINE_GET_CLASS(vms); MachineState *ms = MACHINE(vms); - VirtMachineClass *vmc = VIRT_MACHINE_GET_CLASS(vms); uint8_t *smbios_tables, *smbios_anchor; size_t smbios_tables_len, smbios_anchor_len; struct smbios_phys_mem_area mem_array; @@ -1698,8 +1697,7 @@ static void virt_build_smbios(VirtMachineState *vms) product = "KVM Virtual Machine"; } - smbios_set_defaults("QEMU", product, - vmc->smbios_old_sys_ver ? "1.0" : mc->name); + smbios_set_defaults("QEMU", product, mc->name); /* build the array of physical mem area from base_memmap */ mem_array.address = vms->memmap[VIRT_MEM].base;