From patchwork Thu May 8 13:35:24 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: 888583 Delivered-To: patch@linaro.org Received: by 2002:adf:b60d:0:b0:3a1:f579:ae88 with SMTP id f13csp6480wre; Thu, 8 May 2025 06:37:03 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCX0IC/J2Puw9N5sM1piZxCqZeZg986bjGXOUVk5A3RtYJxvVcpQ8DtEZ3cUj2gIHVG95uj9tg==@linaro.org X-Google-Smtp-Source: AGHT+IH3OT3QOWfEU1CXlPB+5zqXf70ZMGs2ES4BwwObVBNwEAdDp1DykrnIQq4LFRRONa41AOAd X-Received: by 2002:a05:622a:410f:b0:48d:8053:df56 with SMTP id d75a77b69052e-4922795ddb7mr112611301cf.48.1746711423327; Thu, 08 May 2025 06:37:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1746711423; cv=none; d=google.com; s=arc-20240605; b=RQKp/Nfo4VNeLylS2K6eAL5ZbWSxb2147G8v8TVd0ZiPGSfYlVRZ3MHU+xZqImO17J luOc60DVEmPidrip23DPiAnZBooOGayxD9o2hEsU37c5ZhYHTkAogs9229hD2eTGpJ8o pzjspZymSlGp4f4cao2/hZiph7QfbrI0R0aHjnNHjvT4NLpRA8JP4SuZkkNP2MhxHEnv ZO0Zg2+/A1Eo5enJnrZQA+rY9nBJCwOII/GeBaEfZSme1leprPE13QP+pWvI4isZ/pbh DIqMTWcYf+jYYVSCfWL3vF0M7UtBphKUWDKbeK1viLJlB+ihYD7DzKTALJkNjBVntBHy TuaA== 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=XP+ZGWOYnOiwfrA3/LUhv7eqSLRqDyC8l2H8ehhMIaA=; fh=fPkRSEYCel/EUuwKjeUH2HSngyX7ytCg7docWFAAYgw=; b=JY2KkfH3OL5FRWljeA8vbs+1fLb0pUxXCdgbHSxo98fiVLscZhDk0cytjV8CshOfCF xqJMWj04AGhNSquCBnPD+bAtutizDKIkW84s38hdNXwk87qSWtuHADM5oIboawuBE9RV Rn/s7SKP5PprGL1KfHiY+SQ0uydH/7LAt9uZm/L9j8aPztw70ArLwW4pigDNlSkKDKub ubGI/Dx/irvFqgWLdErmRn3zj2Kpv58wCAS49EGgZUfzq2OF9/+TDtPvhS+2grvYr+Qv iPmq6KVWckgQEi6W8olaIvofiDPnF0w2VMmlN2pNIcrD9ke+lqzAqmpSVijB82YItLpt r6NQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="aE/K7Sca"; 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-4922354e31dsi43475211cf.580.2025.05.08.06.37.03 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 08 May 2025 06:37:03 -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="aE/K7Sca"; 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 1uD1QU-0006Af-S9; Thu, 08 May 2025 09:36:38 -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 1uD1QS-0006A8-Al for qemu-devel@nongnu.org; Thu, 08 May 2025 09:36:36 -0400 Received: from mail-pg1-x535.google.com ([2607:f8b0: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 1uD1QP-0003iP-1p for qemu-devel@nongnu.org; Thu, 08 May 2025 09:36:36 -0400 Received: by mail-pg1-x535.google.com with SMTP id 41be03b00d2f7-b1fb650bdf7so559907a12.1 for ; Thu, 08 May 2025 06:36:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1746711391; x=1747316191; 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=XP+ZGWOYnOiwfrA3/LUhv7eqSLRqDyC8l2H8ehhMIaA=; b=aE/K7ScaiJjh+A9fvZjiGuJUAI0/3374/OqP+zRb/9Td+ff6F49YmgMs5dheZ1rZub WNv+ZhwMv2j4C5SJdDlAxbbYzLWgbsbSFUPV3bA3ju7Czww3H6ypoTkO1QNFFHXR0U6w v7EzyKr+ePKxDleGqpHqKM09JufYAiQPQ8vdDYnWXwgLeSqoeTziHlD6BlGCGQn39hA8 SZNyEvhoD7vyqpJI+faHBjgtfxU0JsiAlAZiqoUxHAiSxmu2pPmaLU2QRIrb5/Eag/h8 eV3fI7Y/R+7AqFsTu9ZYs8RQlwvoOR4kiyvv3nuBpq0LR5Ko71rRIRjilLF6ymMrQdKf STtA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746711391; x=1747316191; 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=XP+ZGWOYnOiwfrA3/LUhv7eqSLRqDyC8l2H8ehhMIaA=; b=QWJL1lBojhXXorv60Eo0UrbyqNKowyHFXwcmoINarKlHa+3OYp8L49IFS1cS9wn9+B UuZofdY76JAfE78k9/WWdQFxnzMfUs4Ga8Cmdp+5xgthY+6En/TRKlSctuMVS5u4bjZW irogUbHxcn52e60Vy7Tae3ku+MH55ckSaqJWB0NjV2PyF/Q67gEnfRNtvcpue0CZYunG LIMxlIxuGpO/maFQYhpsOcRF/wEXwYuffRaUnR9Y0WNl83ml0njvbJeqijJSEuF8Pe+V HSCGYccjKifvZrlVz1dVQj+KxWYEh9nGoOsuiS0/gB33ForRHW33bH5LbCOFTLn7kZTV Z9mA== X-Gm-Message-State: AOJu0YwwaOYF1wVtcHor3OGJKq46JqV2472A6EzZah5iKbK8HJ49KzsB J63Mag9Uvz9jsNz7gs+qXHJEQUyH8GGSEqrE4lg9fjbr6z+uUK5UR0fMcEsbYNORP29ee21Zza0 +avu9Ng== X-Gm-Gg: ASbGnctVSCiz5LJk2WYggbGXbmiF3W/kpOHgHDKv0o7bIZb3cR4sST2oLn7OLNEuSZ6 5bFuRNPSgeS8T5eGoHP1rKRgyCpLOzLP/hKAZMNz3dJ/KirXR4hd5d1eplxmVzM1s+zkSlbQ8Jl pv2T7BCLGUpNAnLOhimTsfZkuLIBvx+1HV7T7y91AG2KiPlsGTZQj7GuLY18HW5HwKhkCbhFZnc Rk5E/BGQf61CrRCjRYZEZq0xTzcO67whaLa7l6jO/PoTnXHP0HHi6xHg4x6lTT3cy8I0gCHCMBF As99YzgGksL08PCAjUgIMURhLk848evLUgcLXdCLa6dB9OQe3kiF7TTynmT4yGfte40eLyv6cMe 5VBYyvVLGVJWMAgg= X-Received: by 2002:a05:6a20:9f48:b0:1f5:535c:82dc with SMTP id adf61e73a8af0-2148d3124f5mr10576405637.42.1746711390803; Thu, 08 May 2025 06:36:30 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-b1fb3c6a590sm11373659a12.66.2025.05.08.06.36.16 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 08 May 2025 06:36:30 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , kvm@vger.kernel.org, Sergio Lopez , Gerd Hoffmann , Peter Maydell , Laurent Vivier , Jiaxun Yang , Yi Liu , "Michael S. Tsirkin" , Eduardo Habkost , Marcel Apfelbaum , Alistair Francis , Daniel Henrique Barboza , Marcelo Tosatti , qemu-riscv@nongnu.org, Weiwei Li , Amit Shah , Zhao Liu , Yanan Wang , Helge Deller , Palmer Dabbelt , Ani Sinha , Igor Mammedov , Fabiano Rosas , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Liu Zhiwei , =?utf-8?q?Cl=C3=A9ment_Mathieu--?= =?utf-8?q?Drif?= , qemu-arm@nongnu.org, =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Huacai Chen , Jason Wang , Mark Cave-Ayland , Thomas Huth Subject: [PATCH v4 01/27] hw/i386/pc: Remove deprecated pc-q35-2.6 and pc-i440fx-2.6 machines Date: Thu, 8 May 2025 15:35:24 +0200 Message-ID: <20250508133550.81391-2-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250508133550.81391-1-philmd@linaro.org> References: <20250508133550.81391-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::535; envelope-from=philmd@linaro.org; helo=mail-pg1-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 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 These machines has been supported for a period of more than 6 years. According to our versioned machine support policy (see commit ce80c4fa6ff "docs: document special exception for machine type deprecation & removal") they can now be removed. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Mark Cave-Ayland Reviewed-by: Thomas Huth Reviewed-by: Zhao Liu --- hw/i386/pc_piix.c | 14 -------------- hw/i386/pc_q35.c | 14 -------------- 2 files changed, 28 deletions(-) diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index 7a62bb06500..98a118fd4a0 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -764,20 +764,6 @@ static void pc_i440fx_machine_2_7_options(MachineClass *m) DEFINE_I440FX_MACHINE(2, 7); -static void pc_i440fx_machine_2_6_options(MachineClass *m) -{ - X86MachineClass *x86mc = X86_MACHINE_CLASS(m); - PCMachineClass *pcmc = PC_MACHINE_CLASS(m); - - pc_i440fx_machine_2_7_options(m); - pcmc->legacy_cpu_hotplug = true; - x86mc->fwcfg_dma_enabled = false; - compat_props_add(m->compat_props, hw_compat_2_6, hw_compat_2_6_len); - compat_props_add(m->compat_props, pc_compat_2_6, pc_compat_2_6_len); -} - -DEFINE_I440FX_MACHINE(2, 6); - #ifdef CONFIG_ISAPC static void isapc_machine_options(MachineClass *m) { diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c index 33211b1876f..b7ffb5f1216 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -658,17 +658,3 @@ static void pc_q35_machine_2_7_options(MachineClass *m) } DEFINE_Q35_MACHINE(2, 7); - -static void pc_q35_machine_2_6_options(MachineClass *m) -{ - X86MachineClass *x86mc = X86_MACHINE_CLASS(m); - PCMachineClass *pcmc = PC_MACHINE_CLASS(m); - - pc_q35_machine_2_7_options(m); - pcmc->legacy_cpu_hotplug = true; - x86mc->fwcfg_dma_enabled = false; - compat_props_add(m->compat_props, hw_compat_2_6, hw_compat_2_6_len); - compat_props_add(m->compat_props, pc_compat_2_6, pc_compat_2_6_len); -} - -DEFINE_Q35_MACHINE(2, 6); From patchwork Thu May 8 13:35:25 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: 888586 Delivered-To: patch@linaro.org Received: by 2002:adf:b60d:0:b0:3a1:f579:ae88 with SMTP id f13csp6986wre; Thu, 8 May 2025 06:38:13 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXnDjD7tmsnW1tPzlWw+lWoCwxqhvdAoaRgAebKgZhyzT2VfWkIAG/RjG4R6RTw9XqgXaRXvQ==@linaro.org X-Google-Smtp-Source: AGHT+IGzXLinzEft9Bq1wrIi8rsLGTI0oD6MlJ1PtL6gInPcxebnasa7xAxtgl6AY6wZixZ9kPH+ X-Received: by 2002:a05:622a:1a16:b0:476:fd53:287 with SMTP id d75a77b69052e-49227f47643mr100966551cf.44.1746711492816; Thu, 08 May 2025 06:38:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1746711492; cv=none; d=google.com; s=arc-20240605; b=MVku6HqRzcIjjX5X2iLalKwZAYPJSIuGpEEFn16DxlwoexTa6O64TFQLPMWSwhTdfW uxSnLksYxD11s5dyqV7y7jQPZBZDg/sdz3LLMAsrjFemu49NE/ENJI3DvC7eXG92zViH f5p6gf1gnDTsEe2bLJS8KEsBv6TJ/m6WlcsJnnF0DQ9ARB7XOzAUiOB1NuaCk1Cs+KN/ dAtjIqiN3n9rY7OWC9jrW091NMTTYOJO1IlZHL2S0suxT2i4DH2AAbx9Lx46iuyr37Tm Mnd993aeGdZR2ziY37w2qKh4jy9iyWNSPFyxGd95gy+opKfKjKEB76hNXc+Lxwq/Ii00 eERw== 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=mqgogeCazIgNGaFHm1QR/r57XUs47z0A0mc8QZ9eeJQ=; fh=fPkRSEYCel/EUuwKjeUH2HSngyX7ytCg7docWFAAYgw=; b=HAOWKtL7E9LJmIp+Y8FRWJFJljFqs8wHQvvDs+keiyqzekvDET8WYYt1JW0StCO63V WoC3BhwwL63JErOXQDFhO/GAhgS4fTBwgNLChTUhiCEgd6QpG2Bmn3tViUQ+XbKgjlpK R631BJiJ9zI57SMHPuXw1Gud66cdy5dIGgN993hmseBy0/f6+9UeHF1+TX6yCweXkzAH t0pE9J0KSzgFAfb8lfmLr84T3Kn1++Qr3z4GtTx5KE516lKcXos4MuW3ncfb+rEzdc4w X7S4XbJPTM6kxnVF9R5/iMd2eNuDm2tfz+cVCwcZXsq5HmP54ZcruABgaHvjQcM2K2gm v2Iw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="lg1J/RLx"; 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-49223928ea6si46679981cf.639.2025.05.08.06.38.12 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 08 May 2025 06:38:12 -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="lg1J/RLx"; 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 1uD1R4-0006lH-C0; Thu, 08 May 2025 09:37:14 -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 1uD1R0-0006VZ-4t for qemu-devel@nongnu.org; Thu, 08 May 2025 09:37:10 -0400 Received: from mail-pl1-x62e.google.com ([2607:f8b0:4864:20::62e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uD1Qw-0003kh-BS for qemu-devel@nongnu.org; Thu, 08 May 2025 09:37:09 -0400 Received: by mail-pl1-x62e.google.com with SMTP id d9443c01a7336-22e7e5bce38so10598675ad.1 for ; Thu, 08 May 2025 06:36:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1746711414; x=1747316214; 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=mqgogeCazIgNGaFHm1QR/r57XUs47z0A0mc8QZ9eeJQ=; b=lg1J/RLxw7h6JC5kj12K56gBfyxYWysdmWuVU5vKMZID/tAcNKwy1Ha3AWU709Z+VT I6spfmICa0WAdUYxvj6Gx1qWB7s10+13Mf0jPyu5vdRHwD5dpBavTuUQjQjy+sK+fFXo TOpxOXlG7th2y3yvbhSnB9ATdbIRbhCAyWFSr/MgGGPDrKnbxNIkdPGaT0xTniId0rSD bK8Dd3QjN2NsUMkzU8DjSI1923ucaAFqfgXSeaXcuVPnTgGGF9gllqtbW+RuTWoVjTGe 93tvKw5uD+2ajDEHjiNsRG57b26kaZkJ7M6enQdoxOJfcGuXgjl1piSqtSVcHjbsJoHe 4YoQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746711414; x=1747316214; 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=mqgogeCazIgNGaFHm1QR/r57XUs47z0A0mc8QZ9eeJQ=; b=WsumzT0PReXaer2eAmFQuVuLrrA5a/GQe9XKLiPlilyAbDINHGcx5N3X+abBDttB// ip9U0nppD5kOY9+zV0o9P+/Se8K2Os3tO84apTKw8QOOHccAG2e1m6FkX+nFM2foN1CU ilbYAqX8r+rpnwvHyImbi75IaYViUw/0OXN7iR/zKREOdl+a7wHRBknvt3+b7SQw4gUl UnNKsPx8RhciOHSe4JHuIjkUlR5q4rkxStT1s/YFAjs6aLNyljt5V4sQQKqFAIHG0Rjn VvzYQYRCGCLmVg6IqS5TRYFJoH0C0WDclb+HPZLqZ+YlbkQxbHe43q4AjIZR4C4/aVO4 JxLw== X-Gm-Message-State: AOJu0Yy4g6QbNOjsUUPEt7NxM1slLWjF2DLj8sW4FiVXcrg2RP/lUEBI uqathXdJeHxic+1ZnOlFf00N7P2Yffgx9c3O8cvDDJDbeHWnWGpBQNlpWremy14p75X1e4CnhYR K1euljQ== X-Gm-Gg: ASbGncvvoMuq8I5Ebk76CXeo053DanSee9i1qNFSgQjcjQhbnxf0bSWHH1eS8lwuT7Z 7eeQu189JaS99hdif/KkOqZlrRHO9TNksQMG1RlFtIU8em/nrGJM/1BCTFNyAU7B1bzajz0OsTv kU7+PV3vkBz0ivMgBvNcjtSUXlkozY4zMMiB6bUOHdr3Ud6EIzAANJxqhv0c3b0C+simo0CxGds ufdxSqFUEMJLd8RcZEoMCp/oFbNK0re6holAW9Q4OrJ5LRdT/pXML7FWzr1IoEk+r8cB+bRdume 9Ks+4WtvhTjMlWuSpemSo2t8Dw77ooFJhYVg/s9oRxm+aMBz6pVIKOKe+Y3pGBw5O/OhZA/jq6g P00V0yEiwaDMQY8Y= X-Received: by 2002:a17:902:e950:b0:22e:3f1e:a106 with SMTP id d9443c01a7336-22e5ea422a2mr118803165ad.5.1746711413862; Thu, 08 May 2025 06:36:53 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-22e151e97eesm112419795ad.71.2025.05.08.06.36.39 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 08 May 2025 06:36:53 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , kvm@vger.kernel.org, Sergio Lopez , Gerd Hoffmann , Peter Maydell , Laurent Vivier , Jiaxun Yang , Yi Liu , "Michael S. Tsirkin" , Eduardo Habkost , Marcel Apfelbaum , Alistair Francis , Daniel Henrique Barboza , Marcelo Tosatti , qemu-riscv@nongnu.org, Weiwei Li , Amit Shah , Zhao Liu , Yanan Wang , Helge Deller , Palmer Dabbelt , Ani Sinha , Igor Mammedov , Fabiano Rosas , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Liu Zhiwei , =?utf-8?q?Cl=C3=A9ment_Mathieu--?= =?utf-8?q?Drif?= , qemu-arm@nongnu.org, =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Huacai Chen , Jason Wang , Mark Cave-Ayland , Thomas Huth Subject: [PATCH v4 02/27] hw/i386/pc: Remove PCMachineClass::legacy_cpu_hotplug field Date: Thu, 8 May 2025 15:35:25 +0200 Message-ID: <20250508133550.81391-3-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250508133550.81391-1-philmd@linaro.org> References: <20250508133550.81391-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::62e; envelope-from=philmd@linaro.org; helo=mail-pl1-x62e.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 PCMachineClass::legacy_cpu_hotplug boolean was only used by the pc-q35-2.6 and pc-i440fx-2.6 machines, which got removed. Remove it and simplify build_dsdt(), removing build_legacy_cpu_hotplug_aml() altogether. Note, this field was added by commit 679dd1a957d ("pc: use new CPU hotplug interface since 2.7 machine type"): > For compatibility reasons PC/Q35 will start with legacy > CPU hotplug interface by default but with new CPU hotplug > AML code since 2.7 machine type. That way legacy firmware > that doesn't use QEMU generated ACPI tables will be > able to continue using legacy CPU hotplug interface. > > While new machine type, with firmware supporting QEMU > provided ACPI tables, will generate new CPU hotplug AML, > which will switch to new CPU hotplug interface when > guest OS executes its _INI method on ACPI tables > loading. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Mark Cave-Ayland Reviewed-by: Thomas Huth Reviewed-by: Zhao Liu --- include/hw/acpi/cpu_hotplug.h | 3 - include/hw/i386/pc.h | 3 - hw/acpi/cpu_hotplug.c | 230 ---------------------------------- hw/i386/acpi-build.c | 4 +- 4 files changed, 1 insertion(+), 239 deletions(-) diff --git a/include/hw/acpi/cpu_hotplug.h b/include/hw/acpi/cpu_hotplug.h index 3b932abbbbe..aeee630cf05 100644 --- a/include/hw/acpi/cpu_hotplug.h +++ b/include/hw/acpi/cpu_hotplug.h @@ -34,7 +34,4 @@ void legacy_acpi_cpu_hotplug_init(MemoryRegion *parent, Object *owner, void acpi_switch_to_modern_cphp(AcpiCpuHotplug *gpe_cpu, CPUHotplugState *cpuhp_state, uint16_t io_port); - -void build_legacy_cpu_hotplug_aml(Aml *ctx, MachineState *machine, - uint16_t io_base); #endif diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index 79b72c54dd3..a3de3e9560d 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -110,9 +110,6 @@ struct PCMachineClass { bool enforce_amd_1tb_hole; bool isa_bios_alias; - /* generate legacy CPU hotplug AML */ - bool legacy_cpu_hotplug; - /* use PVH to load kernels that support this feature */ bool pvh_enabled; diff --git a/hw/acpi/cpu_hotplug.c b/hw/acpi/cpu_hotplug.c index aa0e1e3efa5..fe439705bda 100644 --- a/hw/acpi/cpu_hotplug.c +++ b/hw/acpi/cpu_hotplug.c @@ -116,233 +116,3 @@ void acpi_switch_to_modern_cphp(AcpiCpuHotplug *gpe_cpu, memory_region_del_subregion(parent, &gpe_cpu->io); cpu_hotplug_hw_init(parent, gpe_cpu->device, cpuhp_state, io_port); } - -void build_legacy_cpu_hotplug_aml(Aml *ctx, MachineState *machine, - uint16_t io_base) -{ - Aml *dev; - Aml *crs; - Aml *pkg; - Aml *field; - Aml *method; - Aml *if_ctx; - Aml *else_ctx; - int i, apic_idx; - Aml *sb_scope = aml_scope("_SB"); - uint8_t madt_tmpl[8] = {0x00, 0x08, 0x00, 0x00, 0x00, 0, 0, 0}; - Aml *cpu_id = aml_arg(1); - Aml *apic_id = aml_arg(0); - Aml *cpu_on = aml_local(0); - Aml *madt = aml_local(1); - Aml *cpus_map = aml_name(CPU_ON_BITMAP); - Aml *zero = aml_int(0); - Aml *one = aml_int(1); - MachineClass *mc = MACHINE_GET_CLASS(machine); - const CPUArchIdList *apic_ids = mc->possible_cpu_arch_ids(machine); - X86MachineState *x86ms = X86_MACHINE(machine); - - /* - * _MAT method - creates an madt apic buffer - * apic_id = Arg0 = Local APIC ID - * cpu_id = Arg1 = Processor ID - * cpu_on = Local0 = CPON flag for this cpu - * madt = Local1 = Buffer (in madt apic form) to return - */ - method = aml_method(CPU_MAT_METHOD, 2, AML_NOTSERIALIZED); - aml_append(method, - aml_store(aml_derefof(aml_index(cpus_map, apic_id)), cpu_on)); - aml_append(method, - aml_store(aml_buffer(sizeof(madt_tmpl), madt_tmpl), madt)); - /* Update the processor id, lapic id, and enable/disable status */ - aml_append(method, aml_store(cpu_id, aml_index(madt, aml_int(2)))); - aml_append(method, aml_store(apic_id, aml_index(madt, aml_int(3)))); - aml_append(method, aml_store(cpu_on, aml_index(madt, aml_int(4)))); - aml_append(method, aml_return(madt)); - aml_append(sb_scope, method); - - /* - * _STA method - return ON status of cpu - * apic_id = Arg0 = Local APIC ID - * cpu_on = Local0 = CPON flag for this cpu - */ - method = aml_method(CPU_STATUS_METHOD, 1, AML_NOTSERIALIZED); - aml_append(method, - aml_store(aml_derefof(aml_index(cpus_map, apic_id)), cpu_on)); - if_ctx = aml_if(cpu_on); - { - aml_append(if_ctx, aml_return(aml_int(0xF))); - } - aml_append(method, if_ctx); - else_ctx = aml_else(); - { - aml_append(else_ctx, aml_return(zero)); - } - aml_append(method, else_ctx); - aml_append(sb_scope, method); - - method = aml_method(CPU_EJECT_METHOD, 2, AML_NOTSERIALIZED); - aml_append(method, aml_sleep(200)); - aml_append(sb_scope, method); - - method = aml_method(CPU_SCAN_METHOD, 0, AML_NOTSERIALIZED); - { - Aml *while_ctx, *if_ctx2, *else_ctx2; - Aml *bus_check_evt = aml_int(1); - Aml *remove_evt = aml_int(3); - Aml *status_map = aml_local(5); /* Local5 = active cpu bitmap */ - Aml *byte = aml_local(2); /* Local2 = last read byte from bitmap */ - Aml *idx = aml_local(0); /* Processor ID / APIC ID iterator */ - Aml *is_cpu_on = aml_local(1); /* Local1 = CPON flag for cpu */ - Aml *status = aml_local(3); /* Local3 = active state for cpu */ - - aml_append(method, aml_store(aml_name(CPU_STATUS_MAP), status_map)); - aml_append(method, aml_store(zero, byte)); - aml_append(method, aml_store(zero, idx)); - - /* While (idx < SizeOf(CPON)) */ - while_ctx = aml_while(aml_lless(idx, aml_sizeof(cpus_map))); - aml_append(while_ctx, - aml_store(aml_derefof(aml_index(cpus_map, idx)), is_cpu_on)); - - if_ctx = aml_if(aml_and(idx, aml_int(0x07), NULL)); - { - /* Shift down previously read bitmap byte */ - aml_append(if_ctx, aml_shiftright(byte, one, byte)); - } - aml_append(while_ctx, if_ctx); - - else_ctx = aml_else(); - { - /* Read next byte from cpu bitmap */ - aml_append(else_ctx, aml_store(aml_derefof(aml_index(status_map, - aml_shiftright(idx, aml_int(3), NULL))), byte)); - } - aml_append(while_ctx, else_ctx); - - aml_append(while_ctx, aml_store(aml_and(byte, one, NULL), status)); - if_ctx = aml_if(aml_lnot(aml_equal(is_cpu_on, status))); - { - /* State change - update CPON with new state */ - aml_append(if_ctx, aml_store(status, aml_index(cpus_map, idx))); - if_ctx2 = aml_if(aml_equal(status, one)); - { - aml_append(if_ctx2, - aml_call2(AML_NOTIFY_METHOD, idx, bus_check_evt)); - } - aml_append(if_ctx, if_ctx2); - else_ctx2 = aml_else(); - { - aml_append(else_ctx2, - aml_call2(AML_NOTIFY_METHOD, idx, remove_evt)); - } - } - aml_append(if_ctx, else_ctx2); - aml_append(while_ctx, if_ctx); - - aml_append(while_ctx, aml_increment(idx)); /* go to next cpu */ - aml_append(method, while_ctx); - } - aml_append(sb_scope, method); - - /* The current AML generator can cover the APIC ID range [0..255], - * inclusive, for VCPU hotplug. */ - QEMU_BUILD_BUG_ON(ACPI_CPU_HOTPLUG_ID_LIMIT > 256); - if (x86ms->apic_id_limit > ACPI_CPU_HOTPLUG_ID_LIMIT) { - error_report("max_cpus is too large. APIC ID of last CPU is %u", - x86ms->apic_id_limit - 1); - exit(1); - } - - /* create PCI0.PRES device and its _CRS to reserve CPU hotplug MMIO */ - dev = aml_device("PCI0." stringify(CPU_HOTPLUG_RESOURCE_DEVICE)); - aml_append(dev, aml_name_decl("_HID", aml_eisaid("PNP0A06"))); - aml_append(dev, - aml_name_decl("_UID", aml_string("CPU Hotplug resources")) - ); - /* device present, functioning, decoding, not shown in UI */ - aml_append(dev, aml_name_decl("_STA", aml_int(0xB))); - crs = aml_resource_template(); - aml_append(crs, - aml_io(AML_DECODE16, io_base, io_base, 1, ACPI_GPE_PROC_LEN) - ); - aml_append(dev, aml_name_decl("_CRS", crs)); - aml_append(sb_scope, dev); - /* declare CPU hotplug MMIO region and PRS field to access it */ - aml_append(sb_scope, aml_operation_region( - "PRST", AML_SYSTEM_IO, aml_int(io_base), ACPI_GPE_PROC_LEN)); - field = aml_field("PRST", AML_BYTE_ACC, AML_NOLOCK, AML_PRESERVE); - aml_append(field, aml_named_field("PRS", 256)); - aml_append(sb_scope, field); - - /* build Processor object for each processor */ - for (i = 0; i < apic_ids->len; i++) { - int cpu_apic_id = apic_ids->cpus[i].arch_id; - - assert(cpu_apic_id < ACPI_CPU_HOTPLUG_ID_LIMIT); - - dev = aml_processor(i, 0, 0, "CP%.02X", cpu_apic_id); - - method = aml_method("_MAT", 0, AML_NOTSERIALIZED); - aml_append(method, - aml_return(aml_call2(CPU_MAT_METHOD, - aml_int(cpu_apic_id), aml_int(i)) - )); - aml_append(dev, method); - - method = aml_method("_STA", 0, AML_NOTSERIALIZED); - aml_append(method, - aml_return(aml_call1(CPU_STATUS_METHOD, aml_int(cpu_apic_id)))); - aml_append(dev, method); - - method = aml_method("_EJ0", 1, AML_NOTSERIALIZED); - aml_append(method, - aml_return(aml_call2(CPU_EJECT_METHOD, aml_int(cpu_apic_id), - aml_arg(0))) - ); - aml_append(dev, method); - - aml_append(sb_scope, dev); - } - - /* build this code: - * Method(NTFY, 2) {If (LEqual(Arg0, 0x00)) {Notify(CP00, Arg1)} ...} - */ - /* Arg0 = APIC ID */ - method = aml_method(AML_NOTIFY_METHOD, 2, AML_NOTSERIALIZED); - for (i = 0; i < apic_ids->len; i++) { - int cpu_apic_id = apic_ids->cpus[i].arch_id; - - if_ctx = aml_if(aml_equal(aml_arg(0), aml_int(cpu_apic_id))); - aml_append(if_ctx, - aml_notify(aml_name("CP%.02X", cpu_apic_id), aml_arg(1)) - ); - aml_append(method, if_ctx); - } - aml_append(sb_scope, method); - - /* build "Name(CPON, Package() { One, One, ..., Zero, Zero, ... })" - * - * Note: The ability to create variable-sized packages was first - * introduced in ACPI 2.0. ACPI 1.0 only allowed fixed-size packages - * ith up to 255 elements. Windows guests up to win2k8 fail when - * VarPackageOp is used. - */ - pkg = x86ms->apic_id_limit <= 255 ? aml_package(x86ms->apic_id_limit) : - aml_varpackage(x86ms->apic_id_limit); - - for (i = 0, apic_idx = 0; i < apic_ids->len; i++) { - int cpu_apic_id = apic_ids->cpus[i].arch_id; - - for (; apic_idx < cpu_apic_id; apic_idx++) { - aml_append(pkg, aml_int(0)); - } - aml_append(pkg, aml_int(apic_ids->cpus[i].cpu ? 1 : 0)); - apic_idx = cpu_apic_id + 1; - } - aml_append(sb_scope, aml_name_decl(CPU_ON_BITMAP, pkg)); - aml_append(ctx, sb_scope); - - method = aml_method("\\_GPE._E02", 0, AML_NOTSERIALIZED); - aml_append(method, aml_call0("\\_SB." CPU_SCAN_METHOD)); - aml_append(ctx, method); -} diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c index 3fffa4a3328..625889783ec 100644 --- a/hw/i386/acpi-build.c +++ b/hw/i386/acpi-build.c @@ -1465,9 +1465,7 @@ build_dsdt(GArray *table_data, BIOSLinker *linker, } aml_append(dsdt, scope); - if (pcmc->legacy_cpu_hotplug) { - build_legacy_cpu_hotplug_aml(dsdt, machine, pm->cpu_hp_io_base); - } else { + { CPUHotplugFeatures opts = { .acpi_1_compatible = true, .has_legacy_cphp = true, .smi_path = pm->smi_on_cpuhp ? "\\_SB.PCI0.SMI0.SMIC" : NULL, From patchwork Thu May 8 13:35:26 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: 888585 Delivered-To: patch@linaro.org Received: by 2002:adf:b60d:0:b0:3a1:f579:ae88 with SMTP id f13csp6853wre; Thu, 8 May 2025 06:37:57 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCU86si9l1pcHzAoS5xaHhLF2gZ6Ay9v/LQGcFnfZB6Fl5dLT3V/1w/QKzQv56eJCdJcnfBUZw==@linaro.org X-Google-Smtp-Source: AGHT+IEluLEzgt+E6RN2phnCxSPVAQezDiNBKZ5cmcnl4ZMQGVfyXZlxpqYcs9y1dyHN+2p/9hfD X-Received: by 2002:a05:622a:1354:b0:48a:4465:bfd8 with SMTP id d75a77b69052e-4944963f74bmr56831231cf.49.1746711477623; Thu, 08 May 2025 06:37:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1746711477; cv=none; d=google.com; s=arc-20240605; b=gxF/5+LoBoDTDSaqu5Q1zdXWH6kk9+PCBVBl/JVjGOggi56LR6yMgY01ij3Hcdany5 UeIlZS21M5D4o/OwUxPWdLhBvjZfg3YIFO/5BFq/WAF5pruuJc2YNLrF/3rb39tKELdu K/8gTMwht9Ehrfry5POkTNLvkjLaa9Zn/aYee8q6wDJ6O4UnJWARvy1pAQCNhyhblduX tm4xJAV+wQoVU5s2ZuTWfrnIyoSR4O21Uu0uzEGtAIlUrEgko00zvCJKtqX0cS0Q9cBy h7Iq0hwjZTj/k38o1g2FVlM07bHPB6GAh2RQ8gBxPrGispkrdN3LgZSeadIjVHQBVhdg sa0w== 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=5TBd8qqudhdD0Z8zjZ7s78pINlfboYf1Urx2r0CkJAA=; fh=t4sCPXSJJxzszaJF+1Mm6mpQfCAwhf2cujSX+L6g5pY=; b=Sj96bUtX3ASQEd847q/AtvDcf7bCI5yTP3DNlSY/VRJByy2eLJxZ8ZDspo0+x+6zSq vAjZI8AAOacKWAUuoDr44Los6wdZG+paNZxmNpVBI5+vIrVwPEbpPMnHjdHy7V+nc7zp y+GzzpRYiUeMIUr4hk1NoEZy5lymKTyTQFd8WeltYveTibvgwuD8B3/KjslOjeY//+Lc RS6k2O02M9gA30dFLZ0zBYlWfTPHnUxzt5mmRkRzEYTOPLJUjvjpnuALz+M5Pg+r5wYY +d39WLQMkE2KXseKACU28MxOj7Y2ln5BiOl4jitXV3dQQgU9KBd53ARbahJu3EsDgVCl 9aqw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=S429XQ0t; 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-4922354d633si45429761cf.590.2025.05.08.06.37.57 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 08 May 2025 06:37:57 -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=S429XQ0t; 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 1uD1RB-0006yC-Bt; Thu, 08 May 2025 09:37:21 -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 1uD1R9-0006uq-5v for qemu-devel@nongnu.org; Thu, 08 May 2025 09:37:19 -0400 Received: from mail-pl1-x633.google.com ([2607:f8b0:4864:20::633]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uD1R7-0003mU-8y for qemu-devel@nongnu.org; Thu, 08 May 2025 09:37:18 -0400 Received: by mail-pl1-x633.google.com with SMTP id d9443c01a7336-22e8461d872so10227335ad.3 for ; Thu, 08 May 2025 06:37:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1746711435; x=1747316235; 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=5TBd8qqudhdD0Z8zjZ7s78pINlfboYf1Urx2r0CkJAA=; b=S429XQ0tOrkMZD1st2icj26/ufTBgFP10Lh5LA5ngiFSDnES4gFd+cEjJXFfZ9oPJ6 405pKS8DM7MQGE8v/MZ6j+/89M8IBAUU/FolhHIiFIKQ7WGaIMJgnmb+Z10x4ZWpRy9a ueP+qMiJZh8VYl47hoWqA8dkJ8hVc4K9B8M+ZkE5A0maZzsSBmViVk6Sg2CR3cYyZqkP /pyLGZGmJmjIct8G4mcCX7/1zy3fgVhDmkphDuWlX0n1wPp4OdtIW6NtRJOtdn6zDFpi 2plN2zX3Sk/UvGr/847XyLj/iAbX22f/mb39kpcL4iqAq0mgmgiGD9KaHJz4bdtAC13Z g4PQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746711435; x=1747316235; 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=5TBd8qqudhdD0Z8zjZ7s78pINlfboYf1Urx2r0CkJAA=; b=V5S4+1eR0jLnaavT+4Ewk1wIkMOiSPDDnDyQYtuqYAjyHHxSPmkWzE5HXB18s0ylMN JCfYaLwBMjcDy62+ux9LYfsIegixsujguOgd4r3BEJ1IQ7CEqpEZ11ABq0H3tUPzojI0 pLQ4Vjar9TNE/lnY6c8sR+y3U584080BIAePUVz62EvOVweL6BC47pS65MjHiE4NUL4a fT89UzxCl5vdNmFcH2F1yqqFWjXVKdCqaaQcvw0KuOZ5b9EZcsF+HQXPZTC0hP+sFSa9 jVX5lsZxCIhJMz+ISaMacfYMjxla35YAquBsKyas/sfWaYB58jfQPeQSp+dCDI1ivB/c BRPQ== X-Gm-Message-State: AOJu0Yxe6fmujo41Rzg44OeEO+m2N1EJC6wimPMI2JY1wtiO4+bYyYF9 Nkp1QJbyNeJsfLaAa0Q1sDonC+0AC+EaM78W0Wq3k3orzr/iH8kiGj6i6PsLloPECWrWMWuj4Ar RaUbtsg== X-Gm-Gg: ASbGncu27dGfpJcYeMid6Th6Nl2Gr/AiykBJ9C4lfuJ9m3m+YyGodDUDwcOk1FPrgil REB4fDJwTYWUo9Rt5wOrlIVRQZ02K9yo6mCfjVnT8hzhzX9J12HWxHrMGyPtisf2k6c1pWyMd9x odlv8jgioOHmWVzhHjwjhRKcy6nBfY3Jf011Ty2w7HXCo7f6qWmMug1Ajkuod5K57yRk87QTccQ Hp86MXPhL2e5PM09WSi9i2GTsZbomnhTkKxg6GdYCtfyiho4gI5Mcllp4LTl3gXf5byNctV/t+7 PWkKeWAGTKTo1v97PJxaTy8GenqEw7KnjwQv13pafwVWbvuwcNAy+STnfx4Kpr5H+U9oBGrO4dq FPDXeVjpUXux9/cY8LuLJix/8gw== X-Received: by 2002:a17:903:440c:b0:226:5dbf:373f with SMTP id d9443c01a7336-22e8560ce56mr54655525ad.10.1746711435370; Thu, 08 May 2025 06:37:15 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-22e1521fb4asm111932715ad.113.2025.05.08.06.37.01 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 08 May 2025 06:37:14 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , kvm@vger.kernel.org, Sergio Lopez , Gerd Hoffmann , Peter Maydell , Laurent Vivier , Jiaxun Yang , Yi Liu , "Michael S. Tsirkin" , Eduardo Habkost , Marcel Apfelbaum , Alistair Francis , Daniel Henrique Barboza , Marcelo Tosatti , qemu-riscv@nongnu.org, Weiwei Li , Amit Shah , Zhao Liu , Yanan Wang , Helge Deller , Palmer Dabbelt , Ani Sinha , Igor Mammedov , Fabiano Rosas , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Liu Zhiwei , =?utf-8?q?Cl=C3=A9ment_Mathieu--?= =?utf-8?q?Drif?= , qemu-arm@nongnu.org, =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Huacai Chen , Jason Wang Subject: [PATCH v4 03/27] hw/nvram/fw_cfg: Rename fw_cfg_init_mem() with '_nodma' suffix Date: Thu, 8 May 2025 15:35:26 +0200 Message-ID: <20250508133550.81391-4-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250508133550.81391-1-philmd@linaro.org> References: <20250508133550.81391-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::633; envelope-from=philmd@linaro.org; helo=mail-pl1-x633.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 Rename fw_cfg_init_mem() as fw_cfg_init_mem_nodma() to distinct with the DMA version (currently named fw_cfg_init_mem_wide). Suggested-by: Zhao Liu Signed-off-by: Philippe Mathieu-Daudé --- include/hw/nvram/fw_cfg.h | 3 ++- hw/hppa/machine.c | 2 +- hw/nvram/fw_cfg.c | 7 +++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/hw/nvram/fw_cfg.h b/include/hw/nvram/fw_cfg.h index d41b9328fd1..d5161a79436 100644 --- a/include/hw/nvram/fw_cfg.h +++ b/include/hw/nvram/fw_cfg.h @@ -307,7 +307,8 @@ bool fw_cfg_add_file_from_generator(FWCfgState *s, FWCfgState *fw_cfg_init_io_dma(uint32_t iobase, uint32_t dma_iobase, AddressSpace *dma_as); -FWCfgState *fw_cfg_init_mem(hwaddr ctl_addr, hwaddr data_addr); +FWCfgState *fw_cfg_init_mem_nodma(hwaddr ctl_addr, hwaddr data_addr, + unsigned data_width); FWCfgState *fw_cfg_init_mem_wide(hwaddr ctl_addr, hwaddr data_addr, uint32_t data_width, hwaddr dma_addr, AddressSpace *dma_as); diff --git a/hw/hppa/machine.c b/hw/hppa/machine.c index dacedc5409c..0d768cb90b0 100644 --- a/hw/hppa/machine.c +++ b/hw/hppa/machine.c @@ -201,7 +201,7 @@ static FWCfgState *create_fw_cfg(MachineState *ms, PCIBus *pci_bus, int btlb_entries = HPPA_BTLB_ENTRIES(&cpu[0]->env); int len; - fw_cfg = fw_cfg_init_mem(addr, addr + 4); + fw_cfg = fw_cfg_init_mem_nodma(addr, addr + 4, 1); fw_cfg_add_i16(fw_cfg, FW_CFG_NB_CPUS, ms->smp.cpus); fw_cfg_add_i16(fw_cfg, FW_CFG_MAX_CPUS, HPPA_MAX_CPUS); fw_cfg_add_i64(fw_cfg, FW_CFG_RAM_SIZE, ms->ram_size); diff --git a/hw/nvram/fw_cfg.c b/hw/nvram/fw_cfg.c index 54cfa07d3f5..10f8f8db86f 100644 --- a/hw/nvram/fw_cfg.c +++ b/hw/nvram/fw_cfg.c @@ -1087,11 +1087,10 @@ FWCfgState *fw_cfg_init_mem_wide(hwaddr ctl_addr, return s; } -FWCfgState *fw_cfg_init_mem(hwaddr ctl_addr, hwaddr data_addr) +FWCfgState *fw_cfg_init_mem_nodma(hwaddr ctl_addr, hwaddr data_addr, + unsigned data_width) { - return fw_cfg_init_mem_wide(ctl_addr, data_addr, - fw_cfg_data_mem_ops.valid.max_access_size, - 0, NULL); + return fw_cfg_init_mem_wide(ctl_addr, data_addr, data_width, 0, NULL); } From patchwork Thu May 8 13:35:27 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: 888588 Delivered-To: patch@linaro.org Received: by 2002:adf:b60d:0:b0:3a1:f579:ae88 with SMTP id f13csp7347wre; Thu, 8 May 2025 06:39:08 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCURkhC9IPKYc6A5hKLUP4sGDR+oUzy7RiuGY2ENSaCorG7MIv2N7YauBvVb66vGbfJRxAjrXA==@linaro.org X-Google-Smtp-Source: AGHT+IHgpIugpTYeVEHvVfB/7yfCtq5nEwVpEblF7la2CK68pIPTuuAzNoGTHQZXYUbQLWDCnjSi X-Received: by 2002:ac8:5a49:0:b0:494:48b1:a047 with SMTP id d75a77b69052e-49449623b74mr43930281cf.40.1746711548472; Thu, 08 May 2025 06:39:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1746711548; cv=none; d=google.com; s=arc-20240605; b=ejHQ8ur6XZrD+YPufmaHfHC1WlwIrfN83FYVgFLpwIgT9cxJzzFAfQ0YicWGZnlfzi yVyjl6OuGo4Nyz+rLDr94BgMSNFJjzDhd5FwolteCDi0gbY7ixVApG5n+yQE+CQwyhtY KIJktwom/uym1h+bJMxfqM+3IEpcnARi8I3KMOo0HNMsK+DRP/30K7La4cbbYNuGHMIa Dq4zm6YlWnjnDf9aKZ4XBRhf5Th2AIu/pGAh4nQEahghDCixtRE5I14EuWY0B6ulI5B0 7Nw/ZOpz1vvUst+eaNDL/mG7TfADr6DU8LzfjH1P8RrP0YfDl6Itu/0KJ3ORU4L1Y4T2 VQWA== 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=kL4pIFttZ2qmq1tFiNzzTmUrRSAgtctinyd6wOyzE6Q=; fh=t4sCPXSJJxzszaJF+1Mm6mpQfCAwhf2cujSX+L6g5pY=; b=EO0juY8N7NoGYwyF7vft6a4Cu2ro0FV6J+n+rddFgjnxWhKmnf5OGhHJwWXlQJ57uU xskSKu/9ZDtgyV3LMTOPou9fH+s3UJtC1F/FTNOkS+IbOkBKAmzFKfe6ylALmo5KU8LW kcCADEc0ID9EpHVw+N5aH8R+YHdktw+5If00DzaRh5Oyo2/5dkfqhMib0HrThplIVgQb 0FVxCKFEFiHDwXVHTtf8T8F8EcqlpsJMTkM5uYXt6k+BLSs1+h5r+53UV//iNCgSumLk DgIb7f4r2nHqaJ6i0RMMHBRENXsyxP2fI2QxPjk2bxXBFTb3DDufYzFtDQ9SysUbdCKv IGvA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=pZEXRn+u; 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-49222f8b009si45526331cf.464.2025.05.08.06.39.08 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 08 May 2025 06:39:08 -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=pZEXRn+u; 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 1uD1SF-0000RX-A6; Thu, 08 May 2025 09:38:30 -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 1uD1RU-0007ku-OO for qemu-devel@nongnu.org; Thu, 08 May 2025 09:37:45 -0400 Received: from mail-pj1-x1030.google.com ([2607:f8b0:4864:20::1030]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uD1RT-0003pU-6L for qemu-devel@nongnu.org; Thu, 08 May 2025 09:37:40 -0400 Received: by mail-pj1-x1030.google.com with SMTP id 98e67ed59e1d1-30ab344a1d8so988175a91.3 for ; Thu, 08 May 2025 06:37:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1746711457; x=1747316257; 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=kL4pIFttZ2qmq1tFiNzzTmUrRSAgtctinyd6wOyzE6Q=; b=pZEXRn+uUUcZV7rv5n+DbYGDAf7vo8d+hGkxidM8y0S9kSSlKk2Vaqjq+4xIyOXiZs 19UANWsu9Kd/pUgNGJqvO/m55ZZ8DFEunL6EEf4lxLnDWNbTQ+CKI48GmhDkGxcoqI1v clb3AxFZyTsu4XHeTeIG7HwKYbncKHGVsUlMJfyXt4u5AauhqyJZ7pJT8+XmN4osl1kr O1fOO/1jRse3c2H+1gmnHCATwKFYsfeqgQynZ9pmk6+z6dGoItTxFkjJqBNmvWjvn0Gw OeyUJt+KjJo43TNcgcJitpVgCNYBj2YzDpuPsWHggwIS0RNfVq35qJMrbcY5oE10KMNx 7uIQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746711457; x=1747316257; 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=kL4pIFttZ2qmq1tFiNzzTmUrRSAgtctinyd6wOyzE6Q=; b=QMlu3BBdoq7WLq4DBXWUZSbKP0+2fLic3jx3n2QowbZ7b0clTHuWQJEhzuh3h+Z5xP 5cQa+ni1/hz1AqB39ZlhUSo0Ji5+kPQXhN4J4JkI+yCm1fu5Iout+NiRy7MQ0j1TN6CJ s/VU0lbwR1oJese9yeA5g7gXCx3SolFEVsF+iZYcDVjiMbI6A+li09/MXenFBrJjBgbG hlLmhdbrZo0IYq7NJefMzWXb/qOyfR3B5lgCCWtZWqx4trBCFXbdcUY7xCAsUpjM+e2j usdICMFCkRnAV2r/dCyUSXXe35UvKHUrooNPLDoZJd0kFs3vH5s4qeXvZzSWpYVmdGLS 9R+w== X-Gm-Message-State: AOJu0YwWsfYuHPw0uQLX/nbtAf4M75SUGYNOP4iZsKOMc1YUKrEPMYwD qiRoA+Z7M08jjvRxF/VoxnSd/h6jrJVNJw9D5hrX6juNCbYzaJ77uSuHAtDF5QJVsxDRmIoTcai fUQJOKw== X-Gm-Gg: ASbGncvQKYp//WZgOry5+TK20SLxVkAOKb4Hi45k0RLPlxrKnXnGtiykwKNBLJoO5dv 7olF+jyRQF2qisYKmnRN1z6KbA4+zxJSnyf5z19sGn9wE8ZNb06A/w3SuPgi1ABKifYq/k/SPiC XMfojxHtxTC/2F8MQJ1tdD2mH0ByaQCSj5N2qWfuZ20IwVileV4jkCknecbhMQXGweqHdH9BI9V nJ7IjiEIH2SQK/iV8sLjvHt5RLNbMJd8+MDXYfghh+guNxzkGU70hTo7fqUCyH4nT+0OZxyAiEl skaKb6tflwOGrmktoHv/zGtqBm5hKxBez1FynWvGcE5gLZ/0EqpCkq4+VIG3JZEWv6tlp2PEj/6 +UeHuoEa5aBKrvQQBiJAR8P4k8Q== X-Received: by 2002:a17:90b:1d03:b0:2fe:e0a9:49d4 with SMTP id 98e67ed59e1d1-30b28cd784amr5179358a91.2.1746711457171; Thu, 08 May 2025 06:37:37 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-22e15228ce9sm112128395ad.163.2025.05.08.06.37.23 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 08 May 2025 06:37:36 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , kvm@vger.kernel.org, Sergio Lopez , Gerd Hoffmann , Peter Maydell , Laurent Vivier , Jiaxun Yang , Yi Liu , "Michael S. Tsirkin" , Eduardo Habkost , Marcel Apfelbaum , Alistair Francis , Daniel Henrique Barboza , Marcelo Tosatti , qemu-riscv@nongnu.org, Weiwei Li , Amit Shah , Zhao Liu , Yanan Wang , Helge Deller , Palmer Dabbelt , Ani Sinha , Igor Mammedov , Fabiano Rosas , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Liu Zhiwei , =?utf-8?q?Cl=C3=A9ment_Mathieu--?= =?utf-8?q?Drif?= , qemu-arm@nongnu.org, =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Huacai Chen , Jason Wang Subject: [PATCH v4 04/27] hw/mips/loongson3_virt: Prefer using fw_cfg_init_mem_nodma() Date: Thu, 8 May 2025 15:35:27 +0200 Message-ID: <20250508133550.81391-5-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250508133550.81391-1-philmd@linaro.org> References: <20250508133550.81391-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::1030; envelope-from=philmd@linaro.org; helo=mail-pj1-x1030.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 fw_cfg_init_mem_wide() is prefered to initialize fw_cfg with DMA support. Without DMA, use fw_cfg_init_mem_nodma(). Signed-off-by: Philippe Mathieu-Daudé --- hw/mips/loongson3_virt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/mips/loongson3_virt.c b/hw/mips/loongson3_virt.c index de6fbcc0cb4..654a2f0999f 100644 --- a/hw/mips/loongson3_virt.c +++ b/hw/mips/loongson3_virt.c @@ -286,7 +286,7 @@ static void fw_conf_init(void) FWCfgState *fw_cfg; hwaddr cfg_addr = virt_memmap[VIRT_FW_CFG].base; - fw_cfg = fw_cfg_init_mem_wide(cfg_addr, cfg_addr + 8, 8, 0, NULL); + fw_cfg = fw_cfg_init_mem_nodma(cfg_addr, cfg_addr + 8, 8); fw_cfg_add_i16(fw_cfg, FW_CFG_NB_CPUS, (uint16_t)current_machine->smp.cpus); fw_cfg_add_i16(fw_cfg, FW_CFG_MAX_CPUS, (uint16_t)current_machine->smp.max_cpus); fw_cfg_add_i64(fw_cfg, FW_CFG_RAM_SIZE, loaderparams.ram_size); From patchwork Thu May 8 13:35:28 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: 888587 Delivered-To: patch@linaro.org Received: by 2002:adf:b60d:0:b0:3a1:f579:ae88 with SMTP id f13csp7295wre; Thu, 8 May 2025 06:39:01 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVpNTf+0utRKW54MeohcGejarrd1a8fJd9hV4Vax6SfAwZJQL3ccJliCE54efK/CrIm4Z+6hQ==@linaro.org X-Google-Smtp-Source: AGHT+IGDu/ycPfZ5LGCDNLPACAq+igveMJGHNa8QMe8Oj+8oto5DYmMH1Ibi9/0rmU/mX3x8Ys0/ X-Received: by 2002:a05:6214:e49:b0:6ec:f0aa:83b4 with SMTP id 6a1803df08f44-6f5429b2eafmr121503076d6.8.1746711541589; Thu, 08 May 2025 06:39:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1746711541; cv=none; d=google.com; s=arc-20240605; b=AqCUQo7Qk/Ag3WFJrvZQtNruHRPWO4Dt4wYLucCsjg0VR7XsQZFqcc63KEmmc3hGsI DPpURHS1HXhhBLd1mcu5P+7TS8im8+M3N2WwcDAM0QkQfchtdw0R9gXvYl8xRv3ten2F j7RnrubE9BrGHUZebz/VaLRjCOvM/l5HD2ciA49vYcRGX7Hex1L0nWkenD9flhIiDxUV v/yZCZnVnI9ki9+NWWGF7djRL1ff6+JeV8raJsgPVW1XXjd73DNctlLVCjxW3izOffjk oyocVdWJFuiPNURgZeVpoCMC2+Iru9aXsXhEFa2DkUWZkeoeY/HwbLvLCAFGv6vuCej9 ZSsg== 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=WY7gSBXT6cR7bWSaiDRLSHPRiSnEJ0DiKBMO01arpK0=; fh=t4sCPXSJJxzszaJF+1Mm6mpQfCAwhf2cujSX+L6g5pY=; b=AiMKIrryZ9RGWMqZDsvYAtCXDqBWGI4kgdmFH0veXO28xmeW0+F35MzO+P9S9kiA4e veXb9gjpLzN7KjCDe4SZuJ3s5cF9XDC2LU76b0kvOVFNcVL2VsKTAADmo+gnqLu59P0f XVRzJiG9MP2JLTAA8hnOJHbhH/xhIKlfxZ1IHfW9c3nbLOf3dAFL4Oq87iN5my+Ah36u QzyhG+foYjvUADjRL5d9NJkuDDw2hRGhzxBULiHhhQ/o7psr5/GtYUSDh342kxE+lFu9 zTBQYZj42Gq+enziIRy1F8m6tL699nn7uJ9H8aieqdS1fTg0eLIelCZkUyC8CU4c5Bz9 VUjA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=st6zY8gd; 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 6a1803df08f44-6f5427b0e43si42921936d6.310.2025.05.08.06.39.01 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 08 May 2025 06:39:01 -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=st6zY8gd; 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 1uD1SM-0000Wo-FF; Thu, 08 May 2025 09:38:36 -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 1uD1Rq-0008Lb-PQ for qemu-devel@nongnu.org; Thu, 08 May 2025 09:38:03 -0400 Received: from mail-pl1-x635.google.com ([2607:f8b0:4864:20::635]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uD1Ro-0003qo-HZ for qemu-devel@nongnu.org; Thu, 08 May 2025 09:38:02 -0400 Received: by mail-pl1-x635.google.com with SMTP id d9443c01a7336-22e45088d6eso13992165ad.0 for ; Thu, 08 May 2025 06:38:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1746711478; x=1747316278; 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=WY7gSBXT6cR7bWSaiDRLSHPRiSnEJ0DiKBMO01arpK0=; b=st6zY8gdtQxfu2ev4NTpXSr0YGXqWQuhwEir7C8e4T7OpoUad6V60nP0sK4urVXcjq DEvol2Wl0MbfpG0iACc7zikVVtoHPJJVfKw0tvwZoEkJGib6hCdD/DWPldOXgy0GVco+ th75CjygbmUzsY3CoLpE1pepTmhveIky62hA/wIWr2inHSvBzOe/JWUzt3CwzjhQJBRE mhY8E2ZmBbccu87M2cfMswhwy6OZGc1sC33jA4CGg0Txo0GhobKat3Se5TSwcla8XxI+ O84tg+hQaKP3Oo623djRdERsR02exbaNGkLT9VS4mKoXAiSaHbnC+Er+DrZ1fDhWQxsN yOCg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746711478; x=1747316278; 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=WY7gSBXT6cR7bWSaiDRLSHPRiSnEJ0DiKBMO01arpK0=; b=nY1JIurNRbrp5jOHjiiAALwLV5twQq3La8ThtTMQkGE753cKNE4l2XvqWZ4V1926TX MvHu/lhAB/Bd7Nts3eHK92YGEBp7VcOYNK8dxITvEuxt9fBBA15ZwPJNNMOLWfX+dOIq iXV4m8J36sq6sMc/cfHJq63NFUzXJeqJXAQZuPUXrdysslyH64hnYjJCE0IM2hpV5Yvq 3AY8jPucMbeoMydq6reDm8m3h6ULPGdU3D24NmmdRuq3wC03zu6NMKbozlV3yPrN22IJ gETmZWZbS8rEQLrfmSjVqNzm4rfC57ybZCM0pfGvIaN+IBy1xzH/Hk0k2w5lVNvrwqxH bANQ== X-Gm-Message-State: AOJu0Yw33VzpZvG69Q+ysvCOCEvyn0wtUzVX7Fakwqig68ZazawVUdS2 Davwzgh5liMHh5ya307PAOyv59gnUOyq7HI+IS++EuRV0q7FxgQZFdf1/imBFW2nVE0H1MZjMcc MjiRW+Q== X-Gm-Gg: ASbGncvVRi8EEUWFzEey8BXTIhUyM2SscRcuyEEsrxfENAbb8kKPfCA+P0ZeVCxCc6u g0j0xV2quJg+WpA/lAOY90HSR090HsHPDAn97/WgrJ1QVwNt3XbjPhzCtzEUIufjhXB9Pbdiete BPmkXOMFvkJvy8/PxE7iYfq67xERnd0YuKPyKDk39vNeS7mIWri93xVikoLoCCOB61s1dBsOgH8 5Twqa1Zd7Is+QfGhEsEhXzlhUlw0txHaWtnDlP0cWv2EiVCvfHHGfnYiDd+K5LVrE2nVFwPY4S/ sE7wP6vMOQuLIQPBHPF3kM7u5dc1K5D8+p5sezhaLj8U61aZmiXnrCPHqFlceiqwNHj2xIp3nMo CpOvm+/6xuNijV7d1jUK+TSkaUw== X-Received: by 2002:a17:903:244b:b0:22e:b215:1b6 with SMTP id d9443c01a7336-22eb2150297mr51984415ad.28.1746711478628; Thu, 08 May 2025 06:37:58 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-22e151ebd08sm111835505ad.104.2025.05.08.06.37.45 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 08 May 2025 06:37:58 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , kvm@vger.kernel.org, Sergio Lopez , Gerd Hoffmann , Peter Maydell , Laurent Vivier , Jiaxun Yang , Yi Liu , "Michael S. Tsirkin" , Eduardo Habkost , Marcel Apfelbaum , Alistair Francis , Daniel Henrique Barboza , Marcelo Tosatti , qemu-riscv@nongnu.org, Weiwei Li , Amit Shah , Zhao Liu , Yanan Wang , Helge Deller , Palmer Dabbelt , Ani Sinha , Igor Mammedov , Fabiano Rosas , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Liu Zhiwei , =?utf-8?q?Cl=C3=A9ment_Mathieu--?= =?utf-8?q?Drif?= , qemu-arm@nongnu.org, =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Huacai Chen , Jason Wang Subject: [PATCH v4 05/27] hw/nvram/fw_cfg: Factor fw_cfg_init_mem_internal() out Date: Thu, 8 May 2025 15:35:28 +0200 Message-ID: <20250508133550.81391-6-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250508133550.81391-1-philmd@linaro.org> References: <20250508133550.81391-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::635; envelope-from=philmd@linaro.org; helo=mail-pl1-x635.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 Factor fw_cfg_init_mem_internal() out of fw_cfg_init_mem_wide(). In fw_cfg_init_mem_wide(), assert DMA arguments are provided. Callers without DMA have to use the fw_cfg_init_mem() helper. Signed-off-by: Philippe Mathieu-Daudé --- hw/nvram/fw_cfg.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/hw/nvram/fw_cfg.c b/hw/nvram/fw_cfg.c index 10f8f8db86f..4067324fb09 100644 --- a/hw/nvram/fw_cfg.c +++ b/hw/nvram/fw_cfg.c @@ -1053,9 +1053,9 @@ FWCfgState *fw_cfg_init_io_dma(uint32_t iobase, uint32_t dma_iobase, return s; } -FWCfgState *fw_cfg_init_mem_wide(hwaddr ctl_addr, - hwaddr data_addr, uint32_t data_width, - hwaddr dma_addr, AddressSpace *dma_as) +static FWCfgState *fw_cfg_init_mem_internal(hwaddr ctl_addr, + hwaddr data_addr, uint32_t data_width, + hwaddr dma_addr, AddressSpace *dma_as) { DeviceState *dev; SysBusDevice *sbd; @@ -1087,10 +1087,19 @@ FWCfgState *fw_cfg_init_mem_wide(hwaddr ctl_addr, return s; } +FWCfgState *fw_cfg_init_mem_wide(hwaddr ctl_addr, + hwaddr data_addr, uint32_t data_width, + hwaddr dma_addr, AddressSpace *dma_as) +{ + assert(dma_addr && dma_as); + return fw_cfg_init_mem_internal(ctl_addr, data_addr, data_addr, + dma_addr, dma_as); +} + FWCfgState *fw_cfg_init_mem_nodma(hwaddr ctl_addr, hwaddr data_addr, unsigned data_width) { - return fw_cfg_init_mem_wide(ctl_addr, data_addr, data_width, 0, NULL); + return fw_cfg_init_mem_internal(ctl_addr, data_addr, data_width, 0, NULL); } From patchwork Thu May 8 13:35:29 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: 888590 Delivered-To: patch@linaro.org Received: by 2002:adf:b60d:0:b0:3a1:f579:ae88 with SMTP id f13csp7449wre; Thu, 8 May 2025 06:39:22 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXLuMxB03TopcBCAfOFvSt27O8uBh6h95tr3++mzaKkhJlRS/ifzesD3w3mZzUFi2ZUmbjcpg==@linaro.org X-Google-Smtp-Source: AGHT+IEHFyOGuzmDdqf7/iRI7EWQZBuOoBVeawvDEWBo+L5SOTKQLljJGlF5qbgIlnQ+v/ATG8F9 X-Received: by 2002:a05:622a:11cf:b0:47b:3a2:ff22 with SMTP id d75a77b69052e-492265ebbe8mr100520341cf.29.1746711562080; Thu, 08 May 2025 06:39:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1746711562; cv=none; d=google.com; s=arc-20240605; b=OwEKBDqBBJuj0TcSrDrK5CZ/Bb/7q6V4RMpEPuGYLyspaMXOrOGZetQXibWSUbej2B ss/dl6Si2udcEjCOxG6baL+A2h5e1XhpAVThqlIwiJ9FDcJv5RgACU/jzVBKFjqW+jw/ XHhZ3tkUGevcZD4WgX2FpLqSNk1nxTOJOqKUanvIvcQZmczXdxwR0rshAQiYFnNaxoyn 9v0Ww9MYoQfEASUOisVq44CZx9PW95liKr6El0y6JoTZEPom//q1uESwQvffAA0nm7wz 6+E9eime4Cmse8QoPHHgGMYqRByWSfrHWjZ0exmUd6RRVtraSKIjxjNQ2lOHB9wQy5xb cspQ== 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=wpFm28NPDHDVh+ccZL7bpwZ5qyD7oJMGgna414/IiOE=; fh=t4sCPXSJJxzszaJF+1Mm6mpQfCAwhf2cujSX+L6g5pY=; b=BlIphBFH0xjLppKl91QzjYoTwYSUw75qIZ7oLkP+1PKHBoNojr2b/mTCq92rNasEm/ XA7KW1SUCcQ5tUNRVoyRWKiX8fzGAB8dc96Za2cnBI6Ftu/gKpuYsPr8LYx8do4iwNhg kBgzBBvMKLMc4u3iZfeACWsWQ/vAD7qNunZkwofuPQCwFOgJ8fQoXim65WnkJesO3P9m 5PL3lfNf6sHDwNYPovQeDatGFddQr8oIe9Z0AfGWfFsqrsFX+qgtKKFTwFt2fCuYGPIs Vu2FaKvykyldQwG7AXWg8rn3UDkOys2mFjxXZjymWpFXSCEBDhlYLSQvvu3dJsh7s2Sk svQg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=dxa9saRt; 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-49222f8af9fsi46341471cf.467.2025.05.08.06.39.21 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 08 May 2025 06:39:22 -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=dxa9saRt; 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 1uD1Si-0001Hq-Jz; Thu, 08 May 2025 09:38:57 -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 1uD1SD-0000Wz-E7 for qemu-devel@nongnu.org; Thu, 08 May 2025 09:38:30 -0400 Received: from mail-pl1-x62b.google.com ([2607:f8b0:4864:20::62b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uD1S9-0003sU-Qm for qemu-devel@nongnu.org; Thu, 08 May 2025 09:38:24 -0400 Received: by mail-pl1-x62b.google.com with SMTP id d9443c01a7336-22e5df32197so10935615ad.0 for ; Thu, 08 May 2025 06:38:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1746711500; x=1747316300; 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=wpFm28NPDHDVh+ccZL7bpwZ5qyD7oJMGgna414/IiOE=; b=dxa9saRtQ5WgUstWpDY6Qkt9Fpayc5ysgWzHsFIc7v6mRvw7DuNifaIWStnh1l27Wt SMsDwtWpKPk1CIxTYRvU62hlZht2XD3FP9CgyTFM93eA+vzaTFjjzup1c6kSHwR+XJ7p ZPQavg8uj7J7Qmw0TRAM4tx/DXtBCsM5T7LVBnfUkACJkVNMAkBEMpBt1l7ndAzJXH9e 9isMl2Tnc+getmmKG4DyBMGxeMEvw9eZkHL64EbeQEm6UxYM/9AegEpO77rqUoiMeGUb IDk1zP2lk5o0Mycb160r7hyZtCEY0xeeEqlO4RQQR0mYLrrcC+HmqjLuceINK/E1IUjG Q+zQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746711500; x=1747316300; 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=wpFm28NPDHDVh+ccZL7bpwZ5qyD7oJMGgna414/IiOE=; b=XeVzMH53vjLURAaI8RRisdodg5+PJBYGAL2M9W+147vEf1dQ6s5BB8n9HBeSPGOcld z/yDFC4vJI2ENSL0XLlsBaYrtYjcHPkTf5PK2teTCAvBqH100ESX1w7/MN2KZ52WIg8B kQyujLjQf+NDt71Vg0z3q/wA5v2BrRLhSz7O8OcZd9vPq2Ub8mFHOccxG3TsKFbDhIVY rqnQ3/RIno+kglMZS0lzv/MUMXbLbU2iupKnJTfv1Qkn3allU2JxXnD6Srack5REL07a ImW6cEOuv+o6FcuAkGlFd0wqBmRr2tY0YyVwDOZkSWjOU5t8Fo6DhVZxni+DTYJmZIKG sx1w== X-Gm-Message-State: AOJu0YyQCxwTFUPzROD/VOHg4WW4/WXAponcw+pFAWc6KHOEcD61B4iC yfmXNvp0296Io9tML2RMvovLSGEQ8H6ICi5HjZRmsMRsvEU4slYtKplEx8x8gX0byuMdDHW6sdE yikqoyg== X-Gm-Gg: ASbGncu88qvVGDtDnRFligYpnzBH4XKTO5+nRodU0ht+b1XzcOmRsv9qZK5UlRnum0Q OMLtJOI4hQIqML7VCtMRrtdmS0amzr8rA3vk2sI5+tcgaDi0mQRDTqh6fGt3A037lBm8G2euRiI EqZT6lhHOxPPfD25E5QohBwyQGJ+w9kogpnfAIEmA8eNn4+m8bENwmqvJuGi1wutLR4ghSDsG20 JI7V6bDXclZ3w8a3YLC86xiijaeZN52XBwh+EXNgxHmCD1LY4HIfyffxBA0fawk+Fi9x3uOh2tu oGfi4npGyp2rC0Gkdz/jtSJx2u9573DpF540SqlLa4ei6inWJHDA2e/dj1U4FCjs8LfIq8TDNmm n35nHhYvvbJH9puc= X-Received: by 2002:a17:902:ecc6:b0:224:10a2:cae7 with SMTP id d9443c01a7336-22e5edf9e5cmr112894945ad.40.1746711499714; Thu, 08 May 2025 06:38:19 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-22e15232797sm112617585ad.240.2025.05.08.06.38.06 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 08 May 2025 06:38:19 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , kvm@vger.kernel.org, Sergio Lopez , Gerd Hoffmann , Peter Maydell , Laurent Vivier , Jiaxun Yang , Yi Liu , "Michael S. Tsirkin" , Eduardo Habkost , Marcel Apfelbaum , Alistair Francis , Daniel Henrique Barboza , Marcelo Tosatti , qemu-riscv@nongnu.org, Weiwei Li , Amit Shah , Zhao Liu , Yanan Wang , Helge Deller , Palmer Dabbelt , Ani Sinha , Igor Mammedov , Fabiano Rosas , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Liu Zhiwei , =?utf-8?q?Cl=C3=A9ment_Mathieu--?= =?utf-8?q?Drif?= , qemu-arm@nongnu.org, =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Huacai Chen , Jason Wang Subject: [PATCH v4 06/27] hw/nvram/fw_cfg: Rename fw_cfg_init_mem_wide() -> fw_cfg_init_mem_dma() Date: Thu, 8 May 2025 15:35:29 +0200 Message-ID: <20250508133550.81391-7-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250508133550.81391-1-philmd@linaro.org> References: <20250508133550.81391-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::62b; envelope-from=philmd@linaro.org; helo=mail-pl1-x62b.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 "wide" in fw_cfg_init_mem_wide() means "DMA support". Rename for clarity. Suggested-by: Zhao Liu Signed-off-by: Philippe Mathieu-Daudé --- include/hw/nvram/fw_cfg.h | 6 +++--- hw/arm/virt.c | 2 +- hw/nvram/fw_cfg.c | 6 +++--- hw/riscv/virt.c | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/include/hw/nvram/fw_cfg.h b/include/hw/nvram/fw_cfg.h index d5161a79436..c4c49886754 100644 --- a/include/hw/nvram/fw_cfg.h +++ b/include/hw/nvram/fw_cfg.h @@ -309,9 +309,9 @@ FWCfgState *fw_cfg_init_io_dma(uint32_t iobase, uint32_t dma_iobase, AddressSpace *dma_as); FWCfgState *fw_cfg_init_mem_nodma(hwaddr ctl_addr, hwaddr data_addr, unsigned data_width); -FWCfgState *fw_cfg_init_mem_wide(hwaddr ctl_addr, - hwaddr data_addr, uint32_t data_width, - hwaddr dma_addr, AddressSpace *dma_as); +FWCfgState *fw_cfg_init_mem_dma(hwaddr ctl_addr, + hwaddr data_addr, uint32_t data_width, + hwaddr dma_addr, AddressSpace *dma_as); FWCfgState *fw_cfg_find(void); bool fw_cfg_dma_enabled(void *opaque); diff --git a/hw/arm/virt.c b/hw/arm/virt.c index 9a6cd085a37..7583f0a85d9 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -1361,7 +1361,7 @@ static FWCfgState *create_fw_cfg(const VirtMachineState *vms, AddressSpace *as) FWCfgState *fw_cfg; char *nodename; - fw_cfg = fw_cfg_init_mem_wide(base + 8, base, 8, base + 16, as); + fw_cfg = fw_cfg_init_mem_dma(base + 8, base, 8, base + 16, as); fw_cfg_add_i16(fw_cfg, FW_CFG_NB_CPUS, (uint16_t)ms->smp.cpus); nodename = g_strdup_printf("/fw-cfg@%" PRIx64, base); diff --git a/hw/nvram/fw_cfg.c b/hw/nvram/fw_cfg.c index 4067324fb09..51b028b5d0a 100644 --- a/hw/nvram/fw_cfg.c +++ b/hw/nvram/fw_cfg.c @@ -1087,9 +1087,9 @@ static FWCfgState *fw_cfg_init_mem_internal(hwaddr ctl_addr, return s; } -FWCfgState *fw_cfg_init_mem_wide(hwaddr ctl_addr, - hwaddr data_addr, uint32_t data_width, - hwaddr dma_addr, AddressSpace *dma_as) +FWCfgState *fw_cfg_init_mem_dma(hwaddr ctl_addr, + hwaddr data_addr, uint32_t data_width, + hwaddr dma_addr, AddressSpace *dma_as) { assert(dma_addr && dma_as); return fw_cfg_init_mem_internal(ctl_addr, data_addr, data_addr, diff --git a/hw/riscv/virt.c b/hw/riscv/virt.c index be1bf0f6468..3ddea18c93e 100644 --- a/hw/riscv/virt.c +++ b/hw/riscv/virt.c @@ -1266,8 +1266,8 @@ static FWCfgState *create_fw_cfg(const MachineState *ms) hwaddr base = virt_memmap[VIRT_FW_CFG].base; FWCfgState *fw_cfg; - fw_cfg = fw_cfg_init_mem_wide(base + 8, base, 8, base + 16, - &address_space_memory); + fw_cfg = fw_cfg_init_mem_dma(base + 8, base, 8, base + 16, + &address_space_memory); fw_cfg_add_i16(fw_cfg, FW_CFG_NB_CPUS, (uint16_t)ms->smp.cpus); return fw_cfg; From patchwork Thu May 8 13:35:30 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: 888589 Delivered-To: patch@linaro.org Received: by 2002:adf:b60d:0:b0:3a1:f579:ae88 with SMTP id f13csp7440wre; Thu, 8 May 2025 06:39:21 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUQI5lE/vpS4CC14L7fXde9jliyJSxg4o+sD9bNRw3wBoGvsgIFYIduD0YWlN+VkT6NiQ9sLw==@linaro.org X-Google-Smtp-Source: AGHT+IHJO/ypBI2HOb48SkDl4eWK2muXNhAkaSEpfJfIdXqTFlsDwlE4z1GH/t6RKFGtHki08N81 X-Received: by 2002:a05:620a:24c3:b0:7c8:c9c:2a8a with SMTP id af79cd13be357-7caf741291bmr1134446685a.49.1746711561342; Thu, 08 May 2025 06:39:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1746711561; cv=none; d=google.com; s=arc-20240605; b=TSfpgTVVOXog0xkK4iZ/c8KmuoDR0nuPXuPIixeBq4jZ0l08HvBo2ibCZa/o887rUO bxJ4DfJTTzXKjo9RrZN0E6Wx6DwRO76mckpuAQ7npyJzM9bnFDeSsl6mrPxOfK8yzZ0M pmpLynZXL6dv4Dvso5A0ru2+76ZV3/mh4bzRqni/kkUFGCbTVEOg1q21Tc5kVf8a8zXV 9GCZqK67w76gn6TcNeAJFfGH7PsBSwY6kLo3PZE652K85EjuMMxQIR1jqNaOzz8Y7KfZ 3+BWYCVSLG0Dlftm2eYNpQlc89GzvIaUAGs7FPnyuqs+vKLC1fpTCHVl1geUcDZXAfPc mB0w== 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=ePutPBZZqx13DDtsmzXUVgqQnJtyUKSO1VjVCMGLpvw=; fh=t4sCPXSJJxzszaJF+1Mm6mpQfCAwhf2cujSX+L6g5pY=; b=V1XzwGpGzdAcLEE/zf3TOBZwGcAgBLp571GG9J2FnJTNl5A3W+MaEBB89grHPrv5FF ieKOBgbVjOReuYv7fFwTWewWWOk5/tJOQfMXUhMpQn6GbMCDifmK00pZjHHQlMobLD6e Fovtcf1m23hkABULNW+uFdtZHQbxyR11ONsx2xtzul2uamrvj4D2ITuFHSH0UiZhUID1 EcB3IvstkGAOikEP9YxzOEQZuM6oxQnpX+FWdVKdEvcqdelWJbm/M4HLaLUKGlAgOm03 KcYR++tQaQZiN4oQvPlXwjNQqVsjBf0Nni+nQk7fwI5qLc2Ai4kJa3DL3QUbHYnQnAxy hG3A==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=DmQVI2BE; 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 af79cd13be357-7caf751d7aesi467620685a.19.2025.05.08.06.39.21 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 08 May 2025 06:39:21 -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=DmQVI2BE; 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 1uD1Sm-0001Oe-Sc; Thu, 08 May 2025 09:39:02 -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 1uD1SY-00012X-El for qemu-devel@nongnu.org; Thu, 08 May 2025 09:38:47 -0400 Received: from mail-pl1-x62a.google.com ([2607:f8b0:4864:20::62a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uD1SU-0003xE-Uo for qemu-devel@nongnu.org; Thu, 08 May 2025 09:38:46 -0400 Received: by mail-pl1-x62a.google.com with SMTP id d9443c01a7336-22e033a3a07so11452235ad.0 for ; Thu, 08 May 2025 06:38:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1746711521; x=1747316321; 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=ePutPBZZqx13DDtsmzXUVgqQnJtyUKSO1VjVCMGLpvw=; b=DmQVI2BEN1CwGD+i3WIDfSUsucc1//Oy68U5bV5QWb39ZSXi10yYf7jLk+065ZiXbC LSOPdTefsDvChMpFLgXfwW4bPkSo3D98NjHY9178Tz+W7AQ+mQYXu69EX2lDytpb932v Gq66TonR93Xxj3zQHlfbtRwzGbUpLahR3KiDxp/mdNgryZY0p4O6HpTGg6rOrbIm+8WV pLrJe+YvcwP3k17IRAefYKlGhWNPlXkBw5DOc+PKoH4xc7/l5LPAh8hvA3XRRhBgKL1U TjOb4rXYdrCK8nNk+QCW93GhJGGGnxPOub9lqCSR82kRkqe2AzRcnD//PS+Vfk48bolr oL3A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746711521; x=1747316321; 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=ePutPBZZqx13DDtsmzXUVgqQnJtyUKSO1VjVCMGLpvw=; b=kv5Hr+ejTZ7FGGGQmmlcH5EEb9tga7L8W24dQRvVETLTomdzVk7rJOwXNSKmGTtCTP GjTguMWX1xVu/z8ldd3aYQXBlZnxtHOp9HGfEqFKnlgDutleJz5gRKEGjvPOkqBamKiZ 9EvDS02I2qVsgcdAbiN6oFery38470xqG71myhzidSLXS95JmdocwKkTFdB6Ie+B61Ka ZDv4bPiZLBQjMJ0uXvBcH7p3YRUGdVRUz1//QBxVrTXJ6xrNWr0Lg0n9eiuvsZI8Xn5z +vQ6VRIdy8halzAYOCaCFZJn0SRXSwSm8DA7V7jL7TpgoBzxAdflPDZcBj7ZE2jqLXsE Si5A== X-Gm-Message-State: AOJu0YxDUyGypM1HlU2NP9/MWnP4KSnpTVEESAzW+F76pj/mARH47DuH 75OIzaz/cE6jZAxVFl9mdrsIXReekk6B9s+naA9Qb4tknRcJG9Gb2hj5bz01jKwSk51nqvaE3bY JZ5CddA== X-Gm-Gg: ASbGncthHxduQyBA/XvsLOI037GWLEPIxyHNQAhtvgVq4Nwq3XDapNXTeJyJN5DIyXH ety8BhoHyDa/jxBnAMxQV+z1yIQUsoNIP35RnAECQHVuuTmP+w+89UZfPP9xI+hPsX1KZH48L9t YkxbyMtdH0L0B3GFbth19eZAcq6Bn0HfENU+WvTPVRqog/TfNR1RD+MKUvpZUhfRWJw3bXVBT3O WZZijWL7AqPNGkdnKI3FBPiR7ozMgd/56JQ8krD2lSdrVJN4zwr7kEjDKemqtF0N6fKPY9zddS3 ngJefJoiiLnUGYXvtH15bZapHJZdYSxTnm+5I/jEYL65AOSyrWVJWgoV8MyWPmcJU3Q8W962M7Q Ulhl0mgEZh8ZyeE4= X-Received: by 2002:a17:903:32c1:b0:21f:4c8b:c4de with SMTP id d9443c01a7336-22e5ecab7c3mr113369565ad.42.1746711521068; Thu, 08 May 2025 06:38:41 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-22e4299618esm51501905ad.198.2025.05.08.06.38.27 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 08 May 2025 06:38:40 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , kvm@vger.kernel.org, Sergio Lopez , Gerd Hoffmann , Peter Maydell , Laurent Vivier , Jiaxun Yang , Yi Liu , "Michael S. Tsirkin" , Eduardo Habkost , Marcel Apfelbaum , Alistair Francis , Daniel Henrique Barboza , Marcelo Tosatti , qemu-riscv@nongnu.org, Weiwei Li , Amit Shah , Zhao Liu , Yanan Wang , Helge Deller , Palmer Dabbelt , Ani Sinha , Igor Mammedov , Fabiano Rosas , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Liu Zhiwei , =?utf-8?q?Cl=C3=A9ment_Mathieu--?= =?utf-8?q?Drif?= , qemu-arm@nongnu.org, =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Huacai Chen , Jason Wang Subject: [PATCH v4 07/27] hw/i386/x86: Remove X86MachineClass::fwcfg_dma_enabled field Date: Thu, 8 May 2025 15:35:30 +0200 Message-ID: <20250508133550.81391-8-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250508133550.81391-1-philmd@linaro.org> References: <20250508133550.81391-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::62a; envelope-from=philmd@linaro.org; helo=mail-pl1-x62a.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 X86MachineClass::fwcfg_dma_enabled boolean was only used by the pc-q35-2.6 and pc-i440fx-2.6 machines, which got removed. Remove it and simplify. 'multiboot.bin' isn't used anymore, we'll remove it in the next commit. Signed-off-by: Philippe Mathieu-Daudé --- include/hw/i386/x86.h | 2 -- hw/i386/microvm.c | 3 --- hw/i386/multiboot.c | 7 +------ hw/i386/x86-common.c | 3 +-- hw/i386/x86.c | 2 -- 5 files changed, 2 insertions(+), 15 deletions(-) diff --git a/include/hw/i386/x86.h b/include/hw/i386/x86.h index fc460b82f82..29d37af11e6 100644 --- a/include/hw/i386/x86.h +++ b/include/hw/i386/x86.h @@ -29,8 +29,6 @@ struct X86MachineClass { MachineClass parent; - /* use DMA capable linuxboot option rom */ - bool fwcfg_dma_enabled; /* CPU and apic information: */ bool apic_xrupt_override; }; diff --git a/hw/i386/microvm.c b/hw/i386/microvm.c index e0daf0d4fc3..b1262fb1523 100644 --- a/hw/i386/microvm.c +++ b/hw/i386/microvm.c @@ -637,7 +637,6 @@ GlobalProperty microvm_properties[] = { static void microvm_class_init(ObjectClass *oc, const void *data) { - X86MachineClass *x86mc = X86_MACHINE_CLASS(oc); MicrovmMachineClass *mmc = MICROVM_MACHINE_CLASS(oc); MachineClass *mc = MACHINE_CLASS(oc); HotplugHandlerClass *hc = HOTPLUG_HANDLER_CLASS(oc); @@ -671,8 +670,6 @@ static void microvm_class_init(ObjectClass *oc, const void *data) hc->unplug_request = microvm_device_unplug_request_cb; hc->unplug = microvm_device_unplug_cb; - x86mc->fwcfg_dma_enabled = true; - object_class_property_add(oc, MICROVM_MACHINE_RTC, "OnOffAuto", microvm_machine_get_rtc, microvm_machine_set_rtc, diff --git a/hw/i386/multiboot.c b/hw/i386/multiboot.c index 6e6b96bc345..bfa7e8f1e83 100644 --- a/hw/i386/multiboot.c +++ b/hw/i386/multiboot.c @@ -153,7 +153,6 @@ int load_multiboot(X86MachineState *x86ms, int kernel_file_size, uint8_t *header) { - bool multiboot_dma_enabled = X86_MACHINE_GET_CLASS(x86ms)->fwcfg_dma_enabled; int i, is_multiboot = 0; uint32_t flags = 0; uint32_t mh_entry_addr; @@ -402,11 +401,7 @@ int load_multiboot(X86MachineState *x86ms, fw_cfg_add_bytes(fw_cfg, FW_CFG_INITRD_DATA, mb_bootinfo_data, sizeof(bootinfo)); - if (multiboot_dma_enabled) { - option_rom[nb_option_roms].name = "multiboot_dma.bin"; - } else { - option_rom[nb_option_roms].name = "multiboot.bin"; - } + option_rom[nb_option_roms].name = "multiboot_dma.bin"; option_rom[nb_option_roms].bootindex = 0; nb_option_roms++; diff --git a/hw/i386/x86-common.c b/hw/i386/x86-common.c index 1b0671c5239..27254a0e9f1 100644 --- a/hw/i386/x86-common.c +++ b/hw/i386/x86-common.c @@ -634,7 +634,6 @@ void x86_load_linux(X86MachineState *x86ms, int acpi_data_size, bool pvh_enabled) { - bool linuxboot_dma_enabled = X86_MACHINE_GET_CLASS(x86ms)->fwcfg_dma_enabled; uint16_t protocol; int setup_size, kernel_size, cmdline_size; int dtb_size, setup_data_offset; @@ -993,7 +992,7 @@ void x86_load_linux(X86MachineState *x86ms, option_rom[nb_option_roms].bootindex = 0; option_rom[nb_option_roms].name = "linuxboot.bin"; - if (linuxboot_dma_enabled && fw_cfg_dma_enabled(fw_cfg)) { + if (fw_cfg_dma_enabled(fw_cfg)) { option_rom[nb_option_roms].name = "linuxboot_dma.bin"; } nb_option_roms++; diff --git a/hw/i386/x86.c b/hw/i386/x86.c index f80533df1c5..dbf104d60af 100644 --- a/hw/i386/x86.c +++ b/hw/i386/x86.c @@ -375,14 +375,12 @@ static void x86_machine_initfn(Object *obj) static void x86_machine_class_init(ObjectClass *oc, const void *data) { MachineClass *mc = MACHINE_CLASS(oc); - X86MachineClass *x86mc = X86_MACHINE_CLASS(oc); NMIClass *nc = NMI_CLASS(oc); mc->cpu_index_to_instance_props = x86_cpu_index_to_props; mc->get_default_cpu_node_id = x86_get_default_cpu_node_id; mc->possible_cpu_arch_ids = x86_possible_cpu_arch_ids; mc->kvm_type = x86_kvm_type; - x86mc->fwcfg_dma_enabled = true; nc->nmi_monitor_handler = x86_nmi; object_class_property_add(oc, X86_MACHINE_SMM, "OnOffAuto", From patchwork Thu May 8 13:35:31 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: 888591 Delivered-To: patch@linaro.org Received: by 2002:adf:b60d:0:b0:3a1:f579:ae88 with SMTP id f13csp7446wre; Thu, 8 May 2025 06:39:22 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVwiU25Knyp9dZNdJ0ZIJzdvRqij858W1B0xEZBLSqy3+ORF9UstdtLQGYCzL6g7KHGGYfWow==@linaro.org X-Google-Smtp-Source: AGHT+IH632OwvNpBWQFx3r7kUOm1alyYzdkmYOnDXBxJnRI+GuhEFePVjYa/idHDRhno5N+8CgQ/ X-Received: by 2002:a05:620a:bd5:b0:7c5:5e9f:eb2d with SMTP id af79cd13be357-7ccf9e74329mr494123785a.44.1746711561884; Thu, 08 May 2025 06:39:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1746711561; cv=none; d=google.com; s=arc-20240605; b=WSphFM2DGuUvjna876EmPbk5qKDvasnh61Vs6rXxbOhhvII7NQrBMOFIusnt3nwU8k CCrfNvs+R4oGhfpiHTsbAww0MzJ6ewPfgRI2DJeWzT/vLOpagjgT6kDE1GvXvDYaCBRI EABceCuSixEeshkOS0jxo/QD/FOsMi6oScchd1lnyya0HSQWt/3EbZWR1Tif2BDHggV6 EaaH2V4HnSBzvtV1a/smxxqhPlnHWqN5laM1SM8g2y9OHgw1DFeRGdj7rW8oBHAcE/gI U0Yf8JpVQ8ddBW780KIfIhAJ+1sVol5C21hgjamwxvrc2X+oX+5YIldmK9zkS6FjaJwY TZ6w== 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=kTrksqwiAVthFG19vVz8wjp27rY4ezfgcLCtbhgdHyw=; fh=xyeXvpamOH1eRGtBV+YDaJ5x5nGSJHDSUFJV25PfZrc=; b=MFamh6kF1NY5jCnzkn1mMO+zO9Mx6PtaPc7X6XRKXauFQ5CmX1Xu9NI4B1eXxRK1HV tn178rtVI4ogkE14wn6Y2CdZiyFB/FzNulIok8R893QPcrw4ls+U/qZw9hkAOpzl+SA6 vLoTiXMy8+3P2QT6h0w70y9JZcP5oAtMZnCrpvTY5Tj4L540CDBHimKIB6FYMX6tVGjq 1jtkk/WbvAKLMjhpuMQXnzsBd4JERoSTdkv1YTQdxL44u+6iVHEN0ssCfs8ggqf1tYbN zB/4RwDKBMlzJnklCaMw8Lsb/5poJVkffFUH2j5aXu6VbvairEtOnncPzBA1/4vmbGx5 zPOQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=a2IJVOiL; 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 6a1803df08f44-6f5427d2cd7si43568856d6.367.2025.05.08.06.39.21 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 08 May 2025 06:39:21 -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=a2IJVOiL; 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 1uD1T0-00029P-K0; Thu, 08 May 2025 09:39:16 -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 1uD1Sv-0001xU-LI for qemu-devel@nongnu.org; Thu, 08 May 2025 09:39:09 -0400 Received: from mail-pf1-x42d.google.com ([2607:f8b0:4864:20::42d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uD1Sr-000411-Ra for qemu-devel@nongnu.org; Thu, 08 May 2025 09:39:09 -0400 Received: by mail-pf1-x42d.google.com with SMTP id d2e1a72fcca58-736c062b1f5so1067455b3a.0 for ; Thu, 08 May 2025 06:39:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1746711544; x=1747316344; 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=kTrksqwiAVthFG19vVz8wjp27rY4ezfgcLCtbhgdHyw=; b=a2IJVOiLWKV765cqUBc47qV8tAD5vKbCTBT+rF+5yYw6TRr5/xyw7ByRCow3EYmJ0n 2yynVdAuQ3/FhDCypzq5hVQZbI8QXEanjnNj8CGMJ/ulz42WGuNXcXJFasG45m9FjRjI VwHUlu5jB4hDp4+jfLHBHjICQiYdaa0uSkY5IMFpk1Ts51ode+gqS44D7oiTmCY76/Eh svzwO+N2USXD9YRR+wzz4xsbo8qSeUGdyIc0uUi0n9U3ij1GLtJ/+gjrkieIwoT0/mcc c1CzPapBkwpYTKOzJX7ABQqHylZtb+oZ9XIO+Ksn+h1EIV8vwj/6aCJr0ZqjQyTxGthA mzqw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746711544; x=1747316344; 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=kTrksqwiAVthFG19vVz8wjp27rY4ezfgcLCtbhgdHyw=; b=B3yFNzPjXYa0mryQptbts0b/lYVldVUVSGxtUTonMdcFtQbggX+6MV2JL9R7QLNmIl BpVMusVrNl05t90Ic9z3R8/2e0sLobyS4mcNqYzyG2I7U29cfQsRWV22RYz+CtedthYw 1yhUlMeMMvNsifc/Mu9MfjgIJTNgEVLhG/NNhUGuGgHxBtTEns/jXcu8cMkBnb3QsKWx t+znGLUVlLLU8kYu5gsI4woJYc+wybV2Z94ugkkeEIfnURaScUtDLTtd4JdlxzLIP5RY 5TVLdYfhSetCWq6ZtM9vgwtXPpEjGOYG2/9fvFFsW64uR4C1SNcJRsplWguopTny+SaZ ERFA== X-Gm-Message-State: AOJu0YwifzYdO8HYV8RNc6EwRnsfl7O8Gv1n6BY+QLeKg3OwJbG+uAB9 Ia+fkR4FHts/LxvJ7gS6x+tIOJD62vuGyIp0ffOrK1nvRWBGYLri8ZqPgdtfWptVtbRjN8iVB3s QEWUBzQ== X-Gm-Gg: ASbGncs/srsM9+A+Y0tx14r9DU0J25q6jRceZsfMI+wXw9asVO45GRH6vJvEihN1Gl3 7EM5+czamoUy74p3qjgHfatDhGxaAXbc37yS+RWrXsGHvOrk1HIljTPc1LAE1uUmHgI/jPl6s0f Sjw79muu90WPL33yQBL8jM6crjVzSNpEMzhKVoz/qgLRwYyV7pyTvFOBDy53fQPOBgUUCpI0js+ 6ul0cOtiIr1F+lnRbe9LmHUd7CV6HhEp11esHnnoP16YZeXmL+yWE9vDyAl+Clqx2vUj9YNP+ur hf3sCQt37y0OXYi+d0+LsGmyAhtJVB8+YDkYHKvxe1EySa7IerxpmqyeeFSDh4vCxZohCBOEcz1 NZRlMtjkIVgDZrVo= X-Received: by 2002:aa7:804e:0:b0:740:aa31:fe66 with SMTP id d2e1a72fcca58-740aa31fee7mr3700388b3a.4.1746711543560; Thu, 08 May 2025 06:39:03 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-740d961e27fsm131505b3a.19.2025.05.08.06.38.49 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 08 May 2025 06:39:03 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , kvm@vger.kernel.org, Sergio Lopez , Gerd Hoffmann , Peter Maydell , Laurent Vivier , Jiaxun Yang , Yi Liu , "Michael S. Tsirkin" , Eduardo Habkost , Marcel Apfelbaum , Alistair Francis , Daniel Henrique Barboza , Marcelo Tosatti , qemu-riscv@nongnu.org, Weiwei Li , Amit Shah , Zhao Liu , Yanan Wang , Helge Deller , Palmer Dabbelt , Ani Sinha , Igor Mammedov , Fabiano Rosas , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Liu Zhiwei , =?utf-8?q?Cl=C3=A9ment_Mathieu--?= =?utf-8?q?Drif?= , qemu-arm@nongnu.org, =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Huacai Chen , Jason Wang , Thomas Huth Subject: [PATCH v4 08/27] hw/i386/pc: Remove multiboot.bin Date: Thu, 8 May 2025 15:35:31 +0200 Message-ID: <20250508133550.81391-9-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250508133550.81391-1-philmd@linaro.org> References: <20250508133550.81391-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::42d; envelope-from=philmd@linaro.org; helo=mail-pf1-x42d.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 All PC machines now use the multiboot_dma.bin binary, we can remove the non-DMA version (multiboot.bin). Suggested-by: Thomas Huth Signed-off-by: Philippe Mathieu-Daudé --- pc-bios/optionrom/optionrom.h | 4 - hw/i386/pc.c | 1 - pc-bios/meson.build | 1 - pc-bios/multiboot.bin | Bin 1024 -> 0 bytes pc-bios/optionrom/Makefile | 2 +- pc-bios/optionrom/multiboot.S | 232 ----------------------------- pc-bios/optionrom/multiboot_dma.S | 234 +++++++++++++++++++++++++++++- 7 files changed, 233 insertions(+), 241 deletions(-) delete mode 100644 pc-bios/multiboot.bin delete mode 100644 pc-bios/optionrom/multiboot.S diff --git a/pc-bios/optionrom/optionrom.h b/pc-bios/optionrom/optionrom.h index 7bcdf0eeb24..2e6e2493f83 100644 --- a/pc-bios/optionrom/optionrom.h +++ b/pc-bios/optionrom/optionrom.h @@ -117,16 +117,12 @@ * * Clobbers: %eax, %edx, %es, %ecx, %edi and adresses %esp-20 to %esp */ -#ifdef USE_FW_CFG_DMA #define read_fw_blob_dma(var) \ read_fw var ## _SIZE; \ mov %eax, %ecx; \ read_fw var ## _ADDR; \ mov %eax, %edi ; \ read_fw_dma var ## _DATA, %ecx, %edi -#else -#define read_fw_blob_dma(var) read_fw_blob(var) -#endif #define read_fw_blob_pre(var) \ read_fw var ## _SIZE; \ diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 49632b69d29..524d2fd98e8 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -657,7 +657,6 @@ void xen_load_linux(PCMachineState *pcms) assert(!strcmp(option_rom[i].name, "linuxboot.bin") || !strcmp(option_rom[i].name, "linuxboot_dma.bin") || !strcmp(option_rom[i].name, "pvh.bin") || - !strcmp(option_rom[i].name, "multiboot.bin") || !strcmp(option_rom[i].name, "multiboot_dma.bin")); rom_add_option(option_rom[i].name, option_rom[i].bootindex); } diff --git a/pc-bios/meson.build b/pc-bios/meson.build index 79bb2e18008..f2d4dc416a4 100644 --- a/pc-bios/meson.build +++ b/pc-bios/meson.build @@ -62,7 +62,6 @@ blobs = [ 'efi-e1000e.rom', 'efi-vmxnet3.rom', 'qemu-nsis.bmp', - 'multiboot.bin', 'multiboot_dma.bin', 'linuxboot.bin', 'linuxboot_dma.bin', diff --git a/pc-bios/multiboot.bin b/pc-bios/multiboot.bin deleted file mode 100644 index e772713c95749bee82c20002b50ec6d05b2d4987..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1024 zcmeHFF-Tic6utlZQ$OjD#Hxcx2u0GNQv6GySOkZR(ulaX<>%N!Y#>cWhY}nf36J7X zN(%*X6NHY>xcqO11dG^02a8L@B~ihln|%1*|7(haWa`)l@80w7;U4Ziyv0rZ8{K-w zX(Ib3tLZ)RgZ}w1ei{~QEqQq9q1J-iHc} z{m%E-b32A??+@XljSYirtWObwngil#NmvPZ7KCt40l-CQ}*)y. - * - * Copyright Novell Inc, 2009 - * Authors: Alexander Graf - */ - -#include "optionrom.h" - -#define BOOT_ROM_PRODUCT "multiboot loader" - -#define MULTIBOOT_MAGIC 0x2badb002 - -#define GS_PROT_JUMP 0 -#define GS_GDT_DESC 6 - - -BOOT_ROM_START - -run_multiboot: - - cli - cld - - mov %cs, %eax - shl $0x4, %eax - - /* set up a long jump descriptor that is PC relative */ - - /* move stack memory to %gs */ - mov %ss, %ecx - shl $0x4, %ecx - mov %esp, %ebx - add %ebx, %ecx - sub $0x20, %ecx - sub $0x30, %esp - shr $0x4, %ecx - mov %cx, %gs - - /* now push the indirect jump descriptor there */ - mov (prot_jump), %ebx - add %eax, %ebx - movl %ebx, %gs:GS_PROT_JUMP - mov $8, %bx - movw %bx, %gs:GS_PROT_JUMP + 4 - - /* fix the gdt descriptor to be PC relative */ - movw (gdt_desc), %bx - movw %bx, %gs:GS_GDT_DESC - movl (gdt_desc+2), %ebx - add %eax, %ebx - movl %ebx, %gs:GS_GDT_DESC + 2 - - xor %eax, %eax - mov %eax, %es - - /* Read the bootinfo struct into RAM */ - read_fw_blob_dma(FW_CFG_INITRD) - - /* FS = bootinfo_struct */ - read_fw FW_CFG_INITRD_ADDR - shr $4, %eax - mov %ax, %fs - - /* Account for the EBDA in the multiboot structure's e801 - * map. - */ - int $0x12 - cwtl - movl %eax, %fs:4 - - /* ES = mmap_addr */ - mov %fs:48, %eax - shr $4, %eax - mov %ax, %es - - /* Initialize multiboot mmap structs using int 0x15(e820) */ - xor %ebx, %ebx - /* Start storing mmap data at %es:0 */ - xor %edi, %edi - -mmap_loop: - /* The multiboot entry size has offset -4, so leave some space */ - add $4, %di - /* entry size (mmap struct) & max buffer size (int15) */ - movl $20, %ecx - /* e820 */ - movl $0x0000e820, %eax - /* 'SMAP' magic */ - movl $0x534d4150, %edx - int $0x15 - -mmap_check_entry: - /* Error or last entry already done? */ - jb mmap_done - -mmap_store_entry: - /* store entry size */ - /* old as(1) doesn't like this insn so emit the bytes instead: - movl %ecx, %es:-4(%edi) - */ - .dc.b 0x26,0x67,0x66,0x89,0x4f,0xfc - - /* %edi += entry_size, store as mbs_mmap_length */ - add %ecx, %edi - movw %di, %fs:0x2c - - /* Continuation value 0 means last entry */ - test %ebx, %ebx - jnz mmap_loop - -mmap_done: - /* Calculate upper_mem field: The amount of memory between 1 MB and - the first upper memory hole. Get it from the mmap. */ - xor %di, %di - mov $0x100000, %edx -upper_mem_entry: - cmp %fs:0x2c, %di - je upper_mem_done - add $4, %di - - /* Skip if type != 1 */ - cmpl $1, %es:16(%di) - jne upper_mem_next - - /* Skip if > 4 GB */ - movl %es:4(%di), %eax - test %eax, %eax - jnz upper_mem_next - - /* Check for contiguous extension (base <= %edx < base + length) */ - movl %es:(%di), %eax - cmp %eax, %edx - jb upper_mem_next - addl %es:8(%di), %eax - cmp %eax, %edx - jae upper_mem_next - - /* If so, update %edx, and restart the search (mmap isn't ordered) */ - mov %eax, %edx - xor %di, %di - jmp upper_mem_entry - -upper_mem_next: - addl %es:-4(%di), %edi - jmp upper_mem_entry - -upper_mem_done: - sub $0x100000, %edx - shr $10, %edx - mov %edx, %fs:0x8 - -real_to_prot: - /* Load the GDT before going into protected mode */ -lgdt: - data32 lgdt %gs:GS_GDT_DESC - - /* get us to protected mode now */ - movl $1, %eax - movl %eax, %cr0 - - /* the LJMP sets CS for us and gets us to 32-bit */ -ljmp: - data32 ljmp *%gs:GS_PROT_JUMP - -prot_mode: -.code32 - - /* initialize all other segments */ - movl $0x10, %eax - movl %eax, %ss - movl %eax, %ds - movl %eax, %es - movl %eax, %fs - movl %eax, %gs - - /* Read the kernel and modules into RAM */ - read_fw_blob_dma(FW_CFG_KERNEL) - - /* Jump off to the kernel */ - read_fw FW_CFG_KERNEL_ENTRY - mov %eax, %ecx - - /* EBX contains a pointer to the bootinfo struct */ - read_fw FW_CFG_INITRD_ADDR - movl %eax, %ebx - - /* EAX has to contain the magic */ - movl $MULTIBOOT_MAGIC, %eax -ljmp2: - jmp *%ecx - -/* Variables */ -.align 4, 0 -prot_jump: .long prot_mode - .short 8 - -.align 4, 0 -gdt: - /* 0x00 */ -.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - - /* 0x08: code segment (base=0, limit=0xfffff, type=32bit code exec/read, DPL=0, 4k) */ -.byte 0xff, 0xff, 0x00, 0x00, 0x00, 0x9a, 0xcf, 0x00 - - /* 0x10: data segment (base=0, limit=0xfffff, type=32bit data read/write, DPL=0, 4k) */ -.byte 0xff, 0xff, 0x00, 0x00, 0x00, 0x92, 0xcf, 0x00 - - /* 0x18: code segment (base=0, limit=0x0ffff, type=16bit code exec/read/conf, DPL=0, 1b) */ -.byte 0xff, 0xff, 0x00, 0x00, 0x00, 0x9e, 0x00, 0x00 - - /* 0x20: data segment (base=0, limit=0x0ffff, type=16bit data read/write, DPL=0, 1b) */ -.byte 0xff, 0xff, 0x00, 0x00, 0x00, 0x92, 0x00, 0x00 - -gdt_desc: -.short (5 * 8) - 1 -.long gdt - -BOOT_ROM_END diff --git a/pc-bios/optionrom/multiboot_dma.S b/pc-bios/optionrom/multiboot_dma.S index d809af3e23f..181a4b03a3f 100644 --- a/pc-bios/optionrom/multiboot_dma.S +++ b/pc-bios/optionrom/multiboot_dma.S @@ -1,2 +1,232 @@ -#define USE_FW_CFG_DMA 1 -#include "multiboot.S" +/* + * Multiboot Option ROM + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, see . + * + * Copyright Novell Inc, 2009 + * Authors: Alexander Graf + */ + +#include "optionrom.h" + +#define BOOT_ROM_PRODUCT "multiboot loader" + +#define MULTIBOOT_MAGIC 0x2badb002 + +#define GS_PROT_JUMP 0 +#define GS_GDT_DESC 6 + + +BOOT_ROM_START + +run_multiboot: + + cli + cld + + mov %cs, %eax + shl $0x4, %eax + + /* set up a long jump descriptor that is PC relative */ + + /* move stack memory to %gs */ + mov %ss, %ecx + shl $0x4, %ecx + mov %esp, %ebx + add %ebx, %ecx + sub $0x20, %ecx + sub $0x30, %esp + shr $0x4, %ecx + mov %cx, %gs + + /* now push the indirect jump descriptor there */ + mov (prot_jump), %ebx + add %eax, %ebx + movl %ebx, %gs:GS_PROT_JUMP + mov $8, %bx + movw %bx, %gs:GS_PROT_JUMP + 4 + + /* fix the gdt descriptor to be PC relative */ + movw (gdt_desc), %bx + movw %bx, %gs:GS_GDT_DESC + movl (gdt_desc+2), %ebx + add %eax, %ebx + movl %ebx, %gs:GS_GDT_DESC + 2 + + xor %eax, %eax + mov %eax, %es + + /* Read the bootinfo struct into RAM */ + read_fw_blob_dma(FW_CFG_INITRD) + + /* FS = bootinfo_struct */ + read_fw FW_CFG_INITRD_ADDR + shr $4, %eax + mov %ax, %fs + + /* Account for the EBDA in the multiboot structure's e801 + * map. + */ + int $0x12 + cwtl + movl %eax, %fs:4 + + /* ES = mmap_addr */ + mov %fs:48, %eax + shr $4, %eax + mov %ax, %es + + /* Initialize multiboot mmap structs using int 0x15(e820) */ + xor %ebx, %ebx + /* Start storing mmap data at %es:0 */ + xor %edi, %edi + +mmap_loop: + /* The multiboot entry size has offset -4, so leave some space */ + add $4, %di + /* entry size (mmap struct) & max buffer size (int15) */ + movl $20, %ecx + /* e820 */ + movl $0x0000e820, %eax + /* 'SMAP' magic */ + movl $0x534d4150, %edx + int $0x15 + +mmap_check_entry: + /* Error or last entry already done? */ + jb mmap_done + +mmap_store_entry: + /* store entry size */ + /* old as(1) doesn't like this insn so emit the bytes instead: + movl %ecx, %es:-4(%edi) + */ + .dc.b 0x26,0x67,0x66,0x89,0x4f,0xfc + + /* %edi += entry_size, store as mbs_mmap_length */ + add %ecx, %edi + movw %di, %fs:0x2c + + /* Continuation value 0 means last entry */ + test %ebx, %ebx + jnz mmap_loop + +mmap_done: + /* Calculate upper_mem field: The amount of memory between 1 MB and + the first upper memory hole. Get it from the mmap. */ + xor %di, %di + mov $0x100000, %edx +upper_mem_entry: + cmp %fs:0x2c, %di + je upper_mem_done + add $4, %di + + /* Skip if type != 1 */ + cmpl $1, %es:16(%di) + jne upper_mem_next + + /* Skip if > 4 GB */ + movl %es:4(%di), %eax + test %eax, %eax + jnz upper_mem_next + + /* Check for contiguous extension (base <= %edx < base + length) */ + movl %es:(%di), %eax + cmp %eax, %edx + jb upper_mem_next + addl %es:8(%di), %eax + cmp %eax, %edx + jae upper_mem_next + + /* If so, update %edx, and restart the search (mmap isn't ordered) */ + mov %eax, %edx + xor %di, %di + jmp upper_mem_entry + +upper_mem_next: + addl %es:-4(%di), %edi + jmp upper_mem_entry + +upper_mem_done: + sub $0x100000, %edx + shr $10, %edx + mov %edx, %fs:0x8 + +real_to_prot: + /* Load the GDT before going into protected mode */ +lgdt: + data32 lgdt %gs:GS_GDT_DESC + + /* get us to protected mode now */ + movl $1, %eax + movl %eax, %cr0 + + /* the LJMP sets CS for us and gets us to 32-bit */ +ljmp: + data32 ljmp *%gs:GS_PROT_JUMP + +prot_mode: +.code32 + + /* initialize all other segments */ + movl $0x10, %eax + movl %eax, %ss + movl %eax, %ds + movl %eax, %es + movl %eax, %fs + movl %eax, %gs + + /* Read the kernel and modules into RAM */ + read_fw_blob_dma(FW_CFG_KERNEL) + + /* Jump off to the kernel */ + read_fw FW_CFG_KERNEL_ENTRY + mov %eax, %ecx + + /* EBX contains a pointer to the bootinfo struct */ + read_fw FW_CFG_INITRD_ADDR + movl %eax, %ebx + + /* EAX has to contain the magic */ + movl $MULTIBOOT_MAGIC, %eax +ljmp2: + jmp *%ecx + +/* Variables */ +.align 4, 0 +prot_jump: .long prot_mode + .short 8 + +.align 4, 0 +gdt: + /* 0x00 */ +.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + + /* 0x08: code segment (base=0, limit=0xfffff, type=32bit code exec/read, DPL=0, 4k) */ +.byte 0xff, 0xff, 0x00, 0x00, 0x00, 0x9a, 0xcf, 0x00 + + /* 0x10: data segment (base=0, limit=0xfffff, type=32bit data read/write, DPL=0, 4k) */ +.byte 0xff, 0xff, 0x00, 0x00, 0x00, 0x92, 0xcf, 0x00 + + /* 0x18: code segment (base=0, limit=0x0ffff, type=16bit code exec/read/conf, DPL=0, 1b) */ +.byte 0xff, 0xff, 0x00, 0x00, 0x00, 0x9e, 0x00, 0x00 + + /* 0x20: data segment (base=0, limit=0x0ffff, type=16bit data read/write, DPL=0, 1b) */ +.byte 0xff, 0xff, 0x00, 0x00, 0x00, 0x92, 0x00, 0x00 + +gdt_desc: +.short (5 * 8) - 1 +.long gdt + +BOOT_ROM_END From patchwork Thu May 8 13:35:32 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: 888592 Delivered-To: patch@linaro.org Received: by 2002:adf:b60d:0:b0:3a1:f579:ae88 with SMTP id f13csp7667wre; Thu, 8 May 2025 06:39:54 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUbV5yxxA2xNvV6oFCqThXm9AjyUt60Isis3HNW1AV6AZEaXWPOv8imqJCZ9615aYinI91LBA==@linaro.org X-Google-Smtp-Source: AGHT+IFe9XomU4hLOnZv+Uy+6nj22aBaf7TU9pPrhTlG6pTvIY5x8utnUxupnc4hZ1Jk1QP2uMQO X-Received: by 2002:a05:620a:3911:b0:7c7:f7ba:270a with SMTP id af79cd13be357-7ccf9e985bamr608028785a.47.1746711594224; Thu, 08 May 2025 06:39:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1746711594; cv=none; d=google.com; s=arc-20240605; b=F0uZT9ejEgqocwcdUgf4MHnRF53VZN/E8587Z+Wsyr40SxRr2Pn+l3crFShyBvQPag t+q0UH4mruvN1ayUL/xj/4WTfUgWo8lN89miRovJeNf+IdBR243xw0pW9+tQEd+EboIr fsXfOOrvwK2n0q+cehPCrprMevVPvnMXTvjKOGT5xX+TdW2Cbc42RRfLBgB+PXeg6ZE8 EGyJQFIWjoQRlPBeycrlMKsa9796VSwNPDz5WoI28vEii/jNDy5tZiMrqwE6QJOdphw5 0cpwcUFdj7GWSNb1TboSaoJ2X3PwQRncY2JK7F5BJ/Wk71lm1EI8JIllgTWvuCrMtDo1 tlSQ== 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=cAbS7dd6OYaBgTRts6heMSablah9GO0KM+pjh24R5k0=; fh=t4sCPXSJJxzszaJF+1Mm6mpQfCAwhf2cujSX+L6g5pY=; b=BQ+ncYqqS7BQmmbg1RfQe9dpPBbpckCPrO003Eqs+DSbIqxfIeZOcMW9eYw5JZKDA8 tKxPa/vpqH5vj58H1sPrRtc1yF8J7DRpzvqu/iKjUGzTh2h70kHnvtRMqU/DiyWr8rVE uOAyOwgPprgoi4qL9gFI4YPXYrLpDc1tB/vjNO7SPAS9rzJsYBt1aKmLoXXm4H6xV/+e Yu8WSATCrpctlmwWNy+R5kOxlo8wTIrR7UJ53myghoWBXocu247UODxVfGwNxtT8y5V9 +M28x3sYgSAb38PyI5nfHEZm5m5TjvPXtUaXS/KqRzVQpqZ2Rm75csGeJj6Gj2Sa5VIe 8ptw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=dOAdpsG9; 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 af79cd13be357-7caf75ace15si443066285a.350.2025.05.08.06.39.54 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 08 May 2025 06:39:54 -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=dOAdpsG9; 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 1uD1TS-0004YW-Dn; Thu, 08 May 2025 09:39:44 -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 1uD1TG-0003zz-5X for qemu-devel@nongnu.org; Thu, 08 May 2025 09:39:30 -0400 Received: from mail-pj1-x1033.google.com ([2607:f8b0:4864:20::1033]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uD1TD-00042S-1D for qemu-devel@nongnu.org; Thu, 08 May 2025 09:39:29 -0400 Received: by mail-pj1-x1033.google.com with SMTP id 98e67ed59e1d1-306bf444ba2so998601a91.1 for ; Thu, 08 May 2025 06:39:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1746711564; x=1747316364; 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=cAbS7dd6OYaBgTRts6heMSablah9GO0KM+pjh24R5k0=; b=dOAdpsG9EnPQpmszWr/jscn/jA7AlzbHmqcCZ0Lq3G67QYIFG/XXCuo/xQKTew0ykD 6iINDH6VqcFU4XghhMng1o2kzc1zZy2zndsZ0Kk857/exQVBRLrGGXITK3fHnqzoXt2g IwotSYQQCCWxdRduOM5jDQihFuGctUU/fjoqc2Lilv4g30yHhzy1l6Eh2w+r7ZNwkGxY aqU8+oUEhiwTMSFLzMp9gAFiojnDR6yMg+ZcZtG/kLJm0348ht93kIV4MyYeu94F/Sj0 EIRvTMqpAufDqSW5ol/H+4j6l0YhR6cQEdEP3A41TaIuiRqifKA4yY4QGrT2zYFID197 dA1w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746711564; x=1747316364; 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=cAbS7dd6OYaBgTRts6heMSablah9GO0KM+pjh24R5k0=; b=qfyFfD5W9zoMs0MlgieYaVjkAFtBieNFAhhxM7+dwmA2CakQ/uOi15K8qBdXZ+ukRo 84gUPqutwDRB02Qee6ZC5QgOzbI0NH3Bb9zFdse5fDe42c1sRfc9D6kvm8l0lw3Lp8sN AMRQuIWjVE6tNcV+z7FmP92Y7y3u46EcuIEPdB12+g25pAmHh859DTtvAkXgtAOS7Eav wnVZJo+dWWaeqqq4uhmWOZMyJJW2jZsCQ9vELTux0NHUNCq7qWURrbtyOWU4QckUEn+S CzD10M9CPdPqbNcJ5ky+TR5Tq/CSptE6GFUuX8OGTApoy+wiS5Oi2+UlG2UXMe9sQuSE v4sw== X-Gm-Message-State: AOJu0YyP93/+LlKreiwCb8NEQhwuSvtZW1J6FhZTAFBsgcgB30tLyuUv BEh1fTY9J93dDNwJy3/8IymXkCZzVvBshKGSAJ20Ij2O2KkL5pRj59OUokIqPe2Tn7eQJC9aH5s csHqSAQ== X-Gm-Gg: ASbGnctPu2C8ISusuesV0sL7rekbiXFUL+lVjOxDAFMoy0VJhY5rZNRw83azpnk1lel Rxc1iiIgpi3jpIHB/4VvLHrCCvO/5zlyyUBb9FgfkL/XCCrrGtgYQZGfhxc0pBcKVnSuDMrRMcH VRwfIPkaufuVwhdu2gQ4mtW4LyZKgmZQPaVFZX8dTM8ZH0XuiirOzkiQMSTh7X6sk+5q4C1aOfB Lnb/M/OiyQfnU+2C/V1Wt3Kf6unDlv+G+KmDuYvGh7+dCn4lg4di1AVCWzd+a0JS1xg1Tq6m7Tj B3/yBFr+/Xj26oixK3tMIJT3FRzusjSv8sYUq7mI4yMRaCWuRjvobGaiGW3C6P7z0PsMin+/4E4 CR6vdcxc0RewbeWs= X-Received: by 2002:a17:90b:4ad2:b0:30a:a38f:f78b with SMTP id 98e67ed59e1d1-30b3a65b933mr5249495a91.9.1746711564599; Thu, 08 May 2025 06:39:24 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-22e1522a667sm111765955ad.171.2025.05.08.06.39.11 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 08 May 2025 06:39:24 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , kvm@vger.kernel.org, Sergio Lopez , Gerd Hoffmann , Peter Maydell , Laurent Vivier , Jiaxun Yang , Yi Liu , "Michael S. Tsirkin" , Eduardo Habkost , Marcel Apfelbaum , Alistair Francis , Daniel Henrique Barboza , Marcelo Tosatti , qemu-riscv@nongnu.org, Weiwei Li , Amit Shah , Zhao Liu , Yanan Wang , Helge Deller , Palmer Dabbelt , Ani Sinha , Igor Mammedov , Fabiano Rosas , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Liu Zhiwei , =?utf-8?q?Cl=C3=A9ment_Mathieu--?= =?utf-8?q?Drif?= , qemu-arm@nongnu.org, =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Huacai Chen , Jason Wang Subject: [PATCH v4 09/27] hw/nvram/fw_cfg: Remove fw_cfg_io_properties::dma_enabled Date: Thu, 8 May 2025 15:35:32 +0200 Message-ID: <20250508133550.81391-10-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250508133550.81391-1-philmd@linaro.org> References: <20250508133550.81391-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::1033; envelope-from=philmd@linaro.org; helo=mail-pj1-x1033.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 Now than all calls to fw_cfg_init_io_dma() pass DMA arguments, the 'dma_enabled' of the TYPE_FW_CFG_IO type is not used anymore. Remove it, simplifying fw_cfg_init_io_dma() and fw_cfg_io_realize(). Note, we can not remove the equivalent in fw_cfg_mem_properties[] because it is still used in HPPA and MIPS Loongson3 machines: $ git grep -w fw_cfg_init_mem_nodma hw/hppa/machine.c:204: fw_cfg = fw_cfg_init_mem_nodma(addr, addr + 4, 1); hw/mips/loongson3_virt.c:289: fw_cfg = fw_cfg_init_mem_nodma(cfg_addr, cfg_addr + 8, 8); 'linuxboot.bin' isn't used anymore, we'll remove it in the next commit. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Zhao Liu --- hw/i386/fw_cfg.c | 5 +---- hw/i386/x86-common.c | 5 +---- hw/nvram/fw_cfg.c | 26 ++++++++------------------ 3 files changed, 10 insertions(+), 26 deletions(-) diff --git a/hw/i386/fw_cfg.c b/hw/i386/fw_cfg.c index 5c0bcd5f8a9..1fe084fd720 100644 --- a/hw/i386/fw_cfg.c +++ b/hw/i386/fw_cfg.c @@ -221,10 +221,7 @@ void fw_cfg_add_acpi_dsdt(Aml *scope, FWCfgState *fw_cfg) * of the i/o region used is FW_CFG_CTL_SIZE; when using DMA, the * DMA control register is located at FW_CFG_DMA_IO_BASE + 4 */ - Object *obj = OBJECT(fw_cfg); - uint8_t io_size = object_property_get_bool(obj, "dma_enabled", NULL) ? - ROUND_UP(FW_CFG_CTL_SIZE, 4) + sizeof(dma_addr_t) : - FW_CFG_CTL_SIZE; + uint8_t io_size = ROUND_UP(FW_CFG_CTL_SIZE, 4) + sizeof(dma_addr_t); Aml *dev = aml_device("FWCF"); Aml *crs = aml_resource_template(); diff --git a/hw/i386/x86-common.c b/hw/i386/x86-common.c index 27254a0e9f1..ee594364415 100644 --- a/hw/i386/x86-common.c +++ b/hw/i386/x86-common.c @@ -991,10 +991,7 @@ void x86_load_linux(X86MachineState *x86ms, } option_rom[nb_option_roms].bootindex = 0; - option_rom[nb_option_roms].name = "linuxboot.bin"; - if (fw_cfg_dma_enabled(fw_cfg)) { - option_rom[nb_option_roms].name = "linuxboot_dma.bin"; - } + option_rom[nb_option_roms].name = "linuxboot_dma.bin"; nb_option_roms++; } diff --git a/hw/nvram/fw_cfg.c b/hw/nvram/fw_cfg.c index 51b028b5d0a..ef976a4bce2 100644 --- a/hw/nvram/fw_cfg.c +++ b/hw/nvram/fw_cfg.c @@ -1026,12 +1026,9 @@ FWCfgState *fw_cfg_init_io_dma(uint32_t iobase, uint32_t dma_iobase, FWCfgIoState *ios; FWCfgState *s; MemoryRegion *iomem = get_system_io(); - bool dma_requested = dma_iobase && dma_as; + assert(dma_iobase); dev = qdev_new(TYPE_FW_CFG_IO); - if (!dma_requested) { - qdev_prop_set_bit(dev, "dma_enabled", false); - } object_property_add_child(OBJECT(qdev_get_machine()), TYPE_FW_CFG, OBJECT(dev)); @@ -1042,13 +1039,10 @@ FWCfgState *fw_cfg_init_io_dma(uint32_t iobase, uint32_t dma_iobase, memory_region_add_subregion(iomem, iobase, &ios->comb_iomem); s = FW_CFG(dev); - - if (s->dma_enabled) { - /* 64 bits for the address field */ - s->dma_as = dma_as; - s->dma_addr = 0; - memory_region_add_subregion(iomem, dma_iobase, &s->dma_iomem); - } + /* 64 bits for the address field */ + s->dma_as = dma_as; + s->dma_addr = 0; + memory_region_add_subregion(iomem, dma_iobase, &s->dma_iomem); return s; } @@ -1185,8 +1179,6 @@ static void fw_cfg_file_slots_allocate(FWCfgState *s, Error **errp) } static const Property fw_cfg_io_properties[] = { - DEFINE_PROP_BOOL("dma_enabled", FWCfgIoState, parent_obj.dma_enabled, - true), DEFINE_PROP_UINT16("x-file-slots", FWCfgIoState, parent_obj.file_slots, FW_CFG_FILE_SLOTS_DFLT), }; @@ -1207,11 +1199,9 @@ static void fw_cfg_io_realize(DeviceState *dev, Error **errp) memory_region_init_io(&s->comb_iomem, OBJECT(s), &fw_cfg_comb_mem_ops, FW_CFG(s), "fwcfg", FW_CFG_CTL_SIZE); - if (FW_CFG(s)->dma_enabled) { - memory_region_init_io(&FW_CFG(s)->dma_iomem, OBJECT(s), - &fw_cfg_dma_mem_ops, FW_CFG(s), "fwcfg.dma", - sizeof(dma_addr_t)); - } + memory_region_init_io(&FW_CFG(s)->dma_iomem, OBJECT(s), + &fw_cfg_dma_mem_ops, FW_CFG(s), "fwcfg.dma", + sizeof(dma_addr_t)); fw_cfg_common_realize(dev, errp); } From patchwork Thu May 8 13:35:33 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: 888594 Delivered-To: patch@linaro.org Received: by 2002:adf:b60d:0:b0:3a1:f579:ae88 with SMTP id f13csp8051wre; Thu, 8 May 2025 06:40:50 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCU2BQZmXMpdexCDSXFwz7QlQiaL4xL/XbDBfMw8DFv/+dH9aQ/411H2IYAVClyznpp5kw4kyQ==@linaro.org X-Google-Smtp-Source: AGHT+IFa53EezjcQKeogAVwuwZ4zowy4AdHmebn50eWTMdnL1XzlM7diM0/nkH2OeYvUu2+rY0E6 X-Received: by 2002:a05:620a:4104:b0:7c9:2537:be48 with SMTP id af79cd13be357-7ccf9e06856mr488941185a.24.1746711650455; Thu, 08 May 2025 06:40:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1746711650; cv=none; d=google.com; s=arc-20240605; b=U1SHsIUqKffh0goRUYGXMk/Wfvx7gJywjZJpYEt744uykR71ULtj7lN72grkxLhz+O CYSsQKNrSQkz3TJ1sDSNY27ihfwocg8YKRXgPFUNWGj6fyNUGV/d54/MPzy81E71HBbc eq3tQdAzquw5SBNvqYqWNq/cq5bn1zm0Dc1p4U/TZDtTkz2krQ1E6rK20C6H53X/nMck /jzlbyDoAn3LTq5vO8NH/tgULE53S72hHp9GG2yQWFl6/brroF6/hEwu/c+DIVHVlVdO 5eDd/jUPqoU0nG3k27oDt82aEdMenudXxVl6hVO0RsvRQeaoxG9lkJIhlv+gtPX+UyED qfxQ== 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=LkeIBMUss+wtjS4ebn41wnF/9BG8kxWBr1hV0emyy84=; fh=xyeXvpamOH1eRGtBV+YDaJ5x5nGSJHDSUFJV25PfZrc=; b=JnCwZzSqR7mFXMPJUV6UlecxJjDy0d+Yxd7lME+7rgXtpy3YFSxw6D+YVCCm/NodZZ Euj91e0sHhNE/kedmECmRSvYA6SMQkVWmJpUxYMjp7Ha9/tP+f+1wJDMl0jorj190n1H W3gFCAc/WhBxJJlNZ0KO2L7eFdJ+/cm4E3W/KfIqeozUfck+QPwjNHTb5jyrVd/GikpB kL1pWoBE2eQ+Zzie1LSGp4mSiDwvHLKLznncbEmhNCL2hawmILqAGsQ1XGsxSYI2i1NG yNKxqvLF2Oo5XojohWMdZgIwQAp6TwY6P/0n4G0L0OhleDt7cyuZ4lqO3Pd2qOdlDrz8 Xn3A==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=e+FyG83a; 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 af79cd13be357-7caf751e759si424985385a.16.2025.05.08.06.40.50 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 08 May 2025 06:40:50 -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=e+FyG83a; 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 1uD1UH-0005nS-LF; Thu, 08 May 2025 09:40:33 -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 1uD1Td-0004oG-0R for qemu-devel@nongnu.org; Thu, 08 May 2025 09:39:53 -0400 Received: from mail-pg1-x531.google.com ([2607:f8b0:4864:20::531]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uD1TZ-00048Y-7v for qemu-devel@nongnu.org; Thu, 08 May 2025 09:39:52 -0400 Received: by mail-pg1-x531.google.com with SMTP id 41be03b00d2f7-af579e46b5dso578814a12.3 for ; Thu, 08 May 2025 06:39:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1746711587; x=1747316387; 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=LkeIBMUss+wtjS4ebn41wnF/9BG8kxWBr1hV0emyy84=; b=e+FyG83aASK38W0I6CSA7bE9Z92uGQYCgsjhayAqtQFlw4JPT4toGZ50V8Ao9jZlJF 47scVdKKg0upu89pj2NL2hoN8CCQHI/1fPC1B5b4pzZGQvyXuKAVqP545IPxPx9vVDxo 4RO1dOLRBdc8qrUd7KeSkE9Lh2hsCxApuMuG9upfXwAkDckDU/GQJx+sLt99Q4Lv8XyM it+G1OiaJ5Xj6M1n89dubp6Tm6iQnRmxi2sTtkuAftNETGmTAx01BkIJ+P10hXVEMbc8 DQTwjl6E4FDUcIgQsTyNYc22UBG+KfQ4vT2jeHgv8/72w/w8y2hPIE5SxQY3ZOnyJiAY c2vA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746711587; x=1747316387; 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=LkeIBMUss+wtjS4ebn41wnF/9BG8kxWBr1hV0emyy84=; b=o+HeaUKlO2BiSmFDDqBLD4dXdRcLt146+hmZyl3VvE3CW1MnXf2BObYI18lSnqkFy6 VWgDujQhCT6KMjt0axzh0DwLb698bhB5k8mztYBENkRmuMu5C6cJAkUr5EfaGWx96nNF SkVmK23vp0huIUzHiEGcCtA/Vd0mFKGuwoT9Whi/ejqZpWoAXKTnx+Qr0zAtbyIPx9o2 UKvIl3n4AW5ZSbSb3Z1TdDj7VPSDQ2WtrIOD8u3qHEj09PW3Rdl9tA3YK3Voz4LzHvHM wbzxKEUUm1jGNMrHN8v90JGeq62OdMUlDFdHGFXQo7/de3PHwC5WekitDE3C9oeioHGQ Ec+w== X-Gm-Message-State: AOJu0Yz3/98AkCh+Va18whb8kzlgbnZ0l5Ydat1H83t4uIb7ov9qRyWP vHgiJYLozNgLt0kxfW9xUbGXfX+ANxLYMDhSa8cxhouGHcneJafsuUiw4E6KBTrt1KgC6YE+HvA 3OQvxuQ== X-Gm-Gg: ASbGncscijHRswDIS+eU46YpIpli9K9OVhy42SjccTkQSuh1DnAcr94omCALkYxTWhi tdW8bqEpFQCIduWvIVnaW4D+bs4qSXLWknUHQffANaRK9mDL70GQzGriiFY2Y9s6oRBrDLOdOc1 nZCkYi6Znoy48f2k9IxmUgZBmiQaMK4d4QenKfW3C/FcB8SJOwUwwRzTp8vBrXWaA1JM//LCm8R JBwUmtMlmXblLsVr7xjANROQkjfoIjVzxeLvn3irG+df5A9NLhvhaPoVPDKcmVkX7x9tmYH2NLh fIf3Iv4osnHfZofRp8n++vJSWYluZ8az9Hxjt8qcA9HXEvPGL0m6Dc6Ep6cc4/uAGczaQpnsASx kLqx9+KvSsM4rz6s= X-Received: by 2002:a17:90b:3803:b0:2fe:9783:afd3 with SMTP id 98e67ed59e1d1-30b28cec4d7mr5237370a91.2.1746711586707; Thu, 08 May 2025 06:39:46 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-30ad4d5341dsm2150592a91.21.2025.05.08.06.39.33 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 08 May 2025 06:39:46 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , kvm@vger.kernel.org, Sergio Lopez , Gerd Hoffmann , Peter Maydell , Laurent Vivier , Jiaxun Yang , Yi Liu , "Michael S. Tsirkin" , Eduardo Habkost , Marcel Apfelbaum , Alistair Francis , Daniel Henrique Barboza , Marcelo Tosatti , qemu-riscv@nongnu.org, Weiwei Li , Amit Shah , Zhao Liu , Yanan Wang , Helge Deller , Palmer Dabbelt , Ani Sinha , Igor Mammedov , Fabiano Rosas , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Liu Zhiwei , =?utf-8?q?Cl=C3=A9ment_Mathieu--?= =?utf-8?q?Drif?= , qemu-arm@nongnu.org, =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Huacai Chen , Jason Wang , Thomas Huth Subject: [PATCH v4 10/27] hw/i386/pc: Remove linuxboot.bin Date: Thu, 8 May 2025 15:35:33 +0200 Message-ID: <20250508133550.81391-11-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250508133550.81391-1-philmd@linaro.org> References: <20250508133550.81391-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::531; envelope-from=philmd@linaro.org; helo=mail-pg1-x531.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, LOTS_OF_MONEY=0.001, 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 All PC machines now use the linuxboot_dma.bin binary, we can remove the non-DMA version (linuxboot.bin). Suggested-by: Thomas Huth Signed-off-by: Philippe Mathieu-Daudé --- hw/i386/pc.c | 3 +- pc-bios/meson.build | 1 - pc-bios/optionrom/Makefile | 2 +- pc-bios/optionrom/linuxboot.S | 195 ---------------------------------- 4 files changed, 2 insertions(+), 199 deletions(-) delete mode 100644 pc-bios/optionrom/linuxboot.S diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 524d2fd98e8..4e6fe68e2e0 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -654,8 +654,7 @@ void xen_load_linux(PCMachineState *pcms) x86_load_linux(x86ms, fw_cfg, PC_FW_DATA, pcmc->pvh_enabled); for (i = 0; i < nb_option_roms; i++) { - assert(!strcmp(option_rom[i].name, "linuxboot.bin") || - !strcmp(option_rom[i].name, "linuxboot_dma.bin") || + assert(!strcmp(option_rom[i].name, "linuxboot_dma.bin") || !strcmp(option_rom[i].name, "pvh.bin") || !strcmp(option_rom[i].name, "multiboot_dma.bin")); rom_add_option(option_rom[i].name, option_rom[i].bootindex); diff --git a/pc-bios/meson.build b/pc-bios/meson.build index f2d4dc416a4..39a7fea332e 100644 --- a/pc-bios/meson.build +++ b/pc-bios/meson.build @@ -63,7 +63,6 @@ blobs = [ 'efi-vmxnet3.rom', 'qemu-nsis.bmp', 'multiboot_dma.bin', - 'linuxboot.bin', 'linuxboot_dma.bin', 'kvmvapic.bin', 'pvh.bin', diff --git a/pc-bios/optionrom/Makefile b/pc-bios/optionrom/Makefile index 1183ef88922..e694c7aac00 100644 --- a/pc-bios/optionrom/Makefile +++ b/pc-bios/optionrom/Makefile @@ -2,7 +2,7 @@ include config.mak SRC_DIR := $(TOPSRC_DIR)/pc-bios/optionrom VPATH = $(SRC_DIR) -all: multiboot_dma.bin linuxboot.bin linuxboot_dma.bin kvmvapic.bin pvh.bin +all: multiboot_dma.bin linuxboot_dma.bin kvmvapic.bin pvh.bin # Dummy command so that make thinks it has done something @true diff --git a/pc-bios/optionrom/linuxboot.S b/pc-bios/optionrom/linuxboot.S deleted file mode 100644 index ba821ab922d..00000000000 --- a/pc-bios/optionrom/linuxboot.S +++ /dev/null @@ -1,195 +0,0 @@ -/* - * Linux Boot Option ROM - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, see . - * - * Copyright Novell Inc, 2009 - * Authors: Alexander Graf - * - * Based on code in hw/pc.c. - */ - -#include "optionrom.h" - -#define BOOT_ROM_PRODUCT "Linux loader" - -BOOT_ROM_START - -run_linuxboot: - - cli - cld - - jmp copy_kernel -boot_kernel: - - read_fw FW_CFG_SETUP_ADDR - - mov %eax, %ebx - shr $4, %ebx - - /* All segments contain real_addr */ - mov %bx, %ds - mov %bx, %es - mov %bx, %fs - mov %bx, %gs - mov %bx, %ss - - /* CX = CS we want to jump to */ - add $0x20, %bx - mov %bx, %cx - - /* SP = cmdline_addr-real_addr-16 */ - read_fw FW_CFG_CMDLINE_ADDR - mov %eax, %ebx - read_fw FW_CFG_SETUP_ADDR - sub %eax, %ebx - sub $16, %ebx - mov %ebx, %esp - - /* Build indirect lret descriptor */ - pushw %cx /* CS */ - xor %ax, %ax - pushw %ax /* IP = 0 */ - - /* Clear registers */ - xor %eax, %eax - xor %ebx, %ebx - xor %ecx, %ecx - xor %edx, %edx - xor %edi, %edi - xor %ebp, %ebp - - /* Jump to Linux */ - lret - - -copy_kernel: - /* Read info block in low memory (0x10000 or 0x90000) */ - read_fw FW_CFG_SETUP_ADDR - shr $4, %eax - mov %eax, %es - xor %edi, %edi - read_fw_blob_addr32_edi(FW_CFG_SETUP) - - cmpw $0x203, %es:0x206 // if protocol >= 0x203 - jae 1f // have initrd_max - movl $0x37ffffff, %es:0x22c // else assume 0x37ffffff -1: - - /* Check if using kernel-specified initrd address */ - read_fw FW_CFG_INITRD_ADDR - mov %eax, %edi // (load_kernel wants it in %edi) - read_fw FW_CFG_INITRD_SIZE // find end of initrd - add %edi, %eax - xor %es:0x22c, %eax // if it matches es:0x22c - and $-4096, %eax // (apart from padding for page) - jz load_kernel // then initrd is not at top - // of memory - - /* pc.c placed the initrd at end of memory. Compute a better - * initrd address based on e801 data. - */ - mov $0xe801, %ax - xor %cx, %cx - xor %dx, %dx - int $0x15 - - /* Output could be in AX/BX or CX/DX */ - or %cx, %cx - jnz 1f - or %dx, %dx - jnz 1f - mov %ax, %cx - mov %bx, %dx -1: - - or %dx, %dx - jnz 2f - addw $1024, %cx /* add 1 MB */ - movzwl %cx, %edi - shll $10, %edi /* convert to bytes */ - jmp 3f - -2: - addw $16777216 >> 16, %dx /* add 16 MB */ - movzwl %dx, %edi - shll $16, %edi /* convert to bytes */ - -3: - read_fw FW_CFG_INITRD_SIZE - subl %eax, %edi - andl $-4096, %edi /* EDI = start of initrd */ - movl %edi, %es:0x218 /* put it in the header */ - -load_kernel: - /* We need to load the kernel into memory we can't access in 16 bit - mode, so let's get into 32 bit mode, write the kernel and jump - back again. */ - - /* Reserve space on the stack for our GDT descriptor. */ - mov %esp, %ebp - sub $16, %esp - - /* Now create the GDT descriptor */ - movw $((3 * 8) - 1), -16(%bp) - mov %cs, %eax - movzwl %ax, %eax - shl $4, %eax - addl $gdt, %eax - movl %eax, -14(%bp) - - /* And load the GDT */ - data32 lgdt -16(%bp) - mov %ebp, %esp - - /* Get us to protected mode now */ - mov $1, %eax - mov %eax, %cr0 - - /* So we can set ES to a 32-bit segment */ - mov $0x10, %eax - mov %eax, %es - - /* We're now running in 16-bit CS, but 32-bit ES! */ - - /* Load kernel and initrd */ - read_fw_blob_addr32_edi(FW_CFG_INITRD) - read_fw_blob_addr32(FW_CFG_KERNEL) - read_fw_blob_addr32(FW_CFG_CMDLINE) - - /* And now jump into Linux! */ - mov $0, %eax - mov %eax, %cr0 - - /* ES = CS */ - mov %cs, %ax - mov %ax, %es - - jmp boot_kernel - -/* Variables */ - -.align 4, 0 -gdt: - /* 0x00 */ -.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - - /* 0x08: code segment (base=0, limit=0xfffff, type=32bit code exec/read, DPL=0, 4k) */ -.byte 0xff, 0xff, 0x00, 0x00, 0x00, 0x9a, 0xcf, 0x00 - - /* 0x10: data segment (base=0, limit=0xfffff, type=32bit data read/write, DPL=0, 4k) */ -.byte 0xff, 0xff, 0x00, 0x00, 0x00, 0x92, 0xcf, 0x00 - -BOOT_ROM_END From patchwork Thu May 8 13:35:34 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: 888593 Delivered-To: patch@linaro.org Received: by 2002:adf:b60d:0:b0:3a1:f579:ae88 with SMTP id f13csp7949wre; Thu, 8 May 2025 06:40:37 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCV6/lcEXAZjpuAbmEZVFXVCXgtwXIL0V5MM3dvsZxjGKZB8J8m8WUxBJ7r7tArY/FkJrlYcOw==@linaro.org X-Google-Smtp-Source: AGHT+IGuttVhhVaRa00rsUFIulW5asmOti2y0u8tc7umXA8QRU4Ts8GtWuXOIAVjcjI6MxFHHlf7 X-Received: by 2002:a05:620a:2698:b0:7c5:4b6a:d862 with SMTP id af79cd13be357-7caf73ac0d8mr951528385a.33.1746711637573; Thu, 08 May 2025 06:40:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1746711637; cv=none; d=google.com; s=arc-20240605; b=GK5LlDibaqqaCuZzKK8fuTgF962ADwDcFqEMQqWtxRqwnXaJ1FltTpc1ni4i5i4BxE MDcQOlimg96dJ54PayBTfOrhHCrOWcl4IZz/LDumfUuJ/6ysb8Po/z1LLsvFgbzV/iLo P4Yg6iinuxOZLrF5yh+YnTit51NaL35bMLUUVbM+sjMl5Thq3so/xWDGUWXiOjb2Ek/d MFNsWDsnmb0oRXmlXaqGjXrRlDTjZF14FB9eFq1zO2zT2vVTLDWxQIqCLAHdd9byASt9 2AklT1uKNWTLpCcaT5NUxNOfsFoI62Bb7HBwLDD9VZnFru18onTS+sLz2dJhGky75Tso A1Gw== 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=p8Pwvw+j4e5J09FPHtAsan2JUEBLBE3y7JNJd5PTK2A=; fh=fPkRSEYCel/EUuwKjeUH2HSngyX7ytCg7docWFAAYgw=; b=YXTddxuFUe57RsL1Msn/syK9+bMR9+Kwiq4kmN0lTKcNTkHYBDlyrMc9B9dsJmqZKE Ph3TGz9hTUvtghPmrO/zWv1aIN35O+MSbQiZWuPihItZ5o9val2rxAmkAEO0AbPQADP/ PCm7PfFdrRNA2eP9kQt7MA84yYXlEM/1oWNTE7TqRn9VCgqhn8s1lDejeQIJzzJ+y/lj 5L2qazNPv7B7W9ce805NxH3nJkHNBtZ75+RtqIhJNJC1Oxb5Lp+xvCDKJRXJph+W04zV 2YJT+JElDVDe/Z7WeNtZqdl8C+3p2cuLTb9REY7gs5P5X4O3PUtFLM7360q5ZHhbEcFu t6aA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=FIr8rXow; 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 af79cd13be357-7caf752b141si438480885a.185.2025.05.08.06.40.37 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 08 May 2025 06:40:37 -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=FIr8rXow; 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 1uD1UF-0005eP-FN; Thu, 08 May 2025 09:40:31 -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 1uD1Ty-0005I3-Hk for qemu-devel@nongnu.org; Thu, 08 May 2025 09:40:21 -0400 Received: from mail-pl1-x633.google.com ([2607:f8b0:4864:20::633]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uD1Tv-0004Rd-7u for qemu-devel@nongnu.org; Thu, 08 May 2025 09:40:13 -0400 Received: by mail-pl1-x633.google.com with SMTP id d9443c01a7336-22fa48f7cb2so5971365ad.1 for ; Thu, 08 May 2025 06:40:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1746711609; x=1747316409; 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=p8Pwvw+j4e5J09FPHtAsan2JUEBLBE3y7JNJd5PTK2A=; b=FIr8rXowpQIUXzOEZdUGYb58XXuwzHw4cT0VouJvTE324WZ94CAzqFN4BH2oJ3V5UB /1DzrTBfgVqBejhToh4NTs/v9uC8Io1py9wOX2dMoK3hEAMXwc8RfsuJwZyIkpGUscup VRzeCG1T6YcPgFF/kUiYvWjTDZk2FkokiAQA1/KnUXx6RXthXV2bO/uLk3jozNiSdvL5 g09eKet8+l/rJ+QxhOufHii//S/HDHNwsguHw7CxjvSn4J+5hMM5h4/RUpfUx8aOVUtu SupR/q/RhddYpAFviWn9IeNMnX0t4uIwJuwsa3Bf9VYTiW7xD68UpXJ9af1j8ItVhQ84 rXMA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746711609; x=1747316409; 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=p8Pwvw+j4e5J09FPHtAsan2JUEBLBE3y7JNJd5PTK2A=; b=SY6aS79XLDo4OgpHQdufIJzhMe/ntdt8sQXawL6iVfB6ocO2hYo0CtQAyFPnLyWNE8 /CTExc0GiCW0dh9mnkLpO4dh2OV4UATyc02HTheUmEsbkm8VrApTO7RZrsWGutfKetTX Sh1f8jZoRqH1SIiBYa06fkLYOvBncerfa28W4SXcR6Ns+031AgSA7OK+bF7JW2mPPEi/ bx5LIu0O2rpQy0Bbs7wkjmZc0dmUjUkjZLE+A19JqLsFHbaXgxs9XJXi6r0XCt/l5r/3 bjifvNqE8jo+8isN2re9rxuYvSDGBa4rg3mLXOw3UdpMtzgCKuZ6kCyV/AXtzJ2/smYg v75Q== X-Gm-Message-State: AOJu0YxC1eHUW9YjKpG52WkUl8X3dul4ksm1BhCELXfvtvuvjzOywuds uX91SQw+4HTppgnP1WUX985W5qQWj3/O4xe1hwCaJvt8uzOzfQSdj1FdY3jiQXWrZP0+M0YuaXR 3GwP41Q== X-Gm-Gg: ASbGnct7RA03sqBg3Z45BN9TtSqK/xX/VlYNWbsM4onsibjAOp4hRItkp7S+QQe2zi0 ECrWmjeSu253xp/ss5Q8JKALY+IZJVoyDGFO95gEKEHvy5GvimFSvkG0EIvcUZjFkEC1mDZCSp1 o95K0hNIaQtTPI+9HZ7suIMY4QnSZU3dD2OxqnUMqT1VXbl/FQ3HWRy5zKXyPjkVcAAj14fhg1f F+PTd7H8UwkwT1owtwIM9RIEJRSzD1r1GlYhby8oikJEfI7lszg47FWKM8h+1BGRzIjdU+QRNfD HKbDzIFUNIRA+yRAZ47GIx2rlHyjOCjB822ItlkGkJbzAsYaari70/D7T7kOgbae+S+2k7jfeJq ZZDNqnHiFa5XQp9A= X-Received: by 2002:a17:902:d50d:b0:221:78a1:27fb with SMTP id d9443c01a7336-22e5ea38b30mr113474455ad.11.1746711609535; Thu, 08 May 2025 06:40:09 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-b1fb3b62502sm11305764a12.32.2025.05.08.06.39.55 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 08 May 2025 06:40:09 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , kvm@vger.kernel.org, Sergio Lopez , Gerd Hoffmann , Peter Maydell , Laurent Vivier , Jiaxun Yang , Yi Liu , "Michael S. Tsirkin" , Eduardo Habkost , Marcel Apfelbaum , Alistair Francis , Daniel Henrique Barboza , Marcelo Tosatti , qemu-riscv@nongnu.org, Weiwei Li , Amit Shah , Zhao Liu , Yanan Wang , Helge Deller , Palmer Dabbelt , Ani Sinha , Igor Mammedov , Fabiano Rosas , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Liu Zhiwei , =?utf-8?q?Cl=C3=A9ment_Mathieu--?= =?utf-8?q?Drif?= , qemu-arm@nongnu.org, =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Huacai Chen , Jason Wang , Mark Cave-Ayland , Thomas Huth Subject: [PATCH v4 11/27] hw/i386/pc: Remove pc_compat_2_6[] array Date: Thu, 8 May 2025 15:35:34 +0200 Message-ID: <20250508133550.81391-12-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250508133550.81391-1-philmd@linaro.org> References: <20250508133550.81391-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::633; envelope-from=philmd@linaro.org; helo=mail-pl1-x633.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 pc_compat_2_6[] array was only used by the pc-q35-2.6 and pc-i440fx-2.6 machines, which got removed. Remove it. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Mark Cave-Ayland Reviewed-by: Thomas Huth Reviewed-by: Zhao Liu --- include/hw/i386/pc.h | 3 --- hw/i386/pc.c | 8 -------- 2 files changed, 11 deletions(-) diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index a3de3e9560d..4fb2033bc54 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -292,9 +292,6 @@ extern const size_t pc_compat_2_8_len; extern GlobalProperty pc_compat_2_7[]; extern const size_t pc_compat_2_7_len; -extern GlobalProperty pc_compat_2_6[]; -extern const size_t pc_compat_2_6_len; - #define DEFINE_PC_MACHINE(suffix, namestr, initfn, optsfn) \ static void pc_machine_##suffix##_class_init(ObjectClass *oc, \ const void *data) \ diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 4e6fe68e2e0..65a11ea8f99 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -251,14 +251,6 @@ GlobalProperty pc_compat_2_7[] = { }; const size_t pc_compat_2_7_len = G_N_ELEMENTS(pc_compat_2_7); -GlobalProperty pc_compat_2_6[] = { - { TYPE_X86_CPU, "cpuid-0xb", "off" }, - { "vmxnet3", "romfile", "" }, - { TYPE_X86_CPU, "fill-mtrr-mask", "off" }, - { "apic-common", "legacy-instance-id", "on", } -}; -const size_t pc_compat_2_6_len = G_N_ELEMENTS(pc_compat_2_6); - /* * @PC_FW_DATA: * Size of the chunk of memory at the top of RAM for the BIOS ACPI tables From patchwork Thu May 8 13:35:35 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: 888595 Delivered-To: patch@linaro.org Received: by 2002:adf:b60d:0:b0:3a1:f579:ae88 with SMTP id f13csp8173wre; Thu, 8 May 2025 06:41:12 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXaaR+IIq3t55Zl3zEXwWM2yGoMbMslLBWNlM1v2wrt+wNW2i5hyN8qNltm0mvixqXHyAM/3g==@linaro.org X-Google-Smtp-Source: AGHT+IGi0Wk9M5l+cTdPabcDOBonQc5yf9pK9Tdi/zV1F2r/7vZLmcuieTt/R995wzJ2qu1Lc23g X-Received: by 2002:a05:6214:20ae:b0:6f5:4214:774a with SMTP id 6a1803df08f44-6f542b03f7emr122369196d6.41.1746711660982; Thu, 08 May 2025 06:41:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1746711660; cv=none; d=google.com; s=arc-20240605; b=DYqebOBD/G2IOffZihWMY7DyyIUhShGgXP3+RmFmiQzWxzsb7kXmS9HwOGGJa7Ca4Z Cx755fOZdXPVC6gg5WZqP6dPN+p1KZkzebNxdCI97wYqJyJQl13fcLibtjoNqbNAFTr1 N4is1QLrKtsSSEkNNIIyTFq6CsK+NLK6xiXPYJre2is9V6D3XDCBEIl6PJfiYDi8Wbgx V9ijQkJ6WY2BvCOzfoZYPHBSaXBjPLhyOxiL9KgdfAwr92rLfFKhZuBBCCwQAib8q2oC olbb3cPstPDX1Puho6Hpxo43HvFswMRPzPuyzPywj5DgArCqkQszEQ64cJcBATkkffXH cjGQ== 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=asjuzn+eAAncdD20eXT1wyN528c12dvw5wk014+4k7o=; fh=t4sCPXSJJxzszaJF+1Mm6mpQfCAwhf2cujSX+L6g5pY=; b=DTXd8B5/S6Gyd32FZJQjPtjbzLkAMu4zJIItaCbJ4G3cv+hZ0qUhZqnkneBaS/LRbd c0msklhKCoKsRP1Bi8fzRWF9iw1zMWLa6+wTBgP7iUQ8TdYTxxmgn8QaWTW78K6OOVIG vlOjn2oTE7p3jUbcgcWHTWcGArqiFYG7uvkBPgWMrn18ypc7tfuOBp2dGyKG0IJQ3Q/y EhZ+u5K2si3L3yHFBXJCA8QsNJV0DaNGvZK/PQvOcvcdyqKkhwklz8Gl8DrXbLQxT4rW nb2PRZldOlHfze9QBNFRagR5FppW0KKRuGfG3cR2lmeq+YC0FfalxZ8OrzDXDfoWxeta TcGg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=n4+hUlyJ; 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 6a1803df08f44-6f5427e4e5asi41870626d6.384.2025.05.08.06.41.00 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 08 May 2025 06:41:00 -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=n4+hUlyJ; 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 1uD1Uf-0006w1-3O; Thu, 08 May 2025 09:40:57 -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 1uD1UN-0006OI-Pd for qemu-devel@nongnu.org; Thu, 08 May 2025 09:40:42 -0400 Received: from mail-pl1-x62d.google.com ([2607:f8b0:4864:20::62d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uD1UH-0004Uq-U0 for qemu-devel@nongnu.org; Thu, 08 May 2025 09:40:39 -0400 Received: by mail-pl1-x62d.google.com with SMTP id d9443c01a7336-22e033a3a07so11499545ad.0 for ; Thu, 08 May 2025 06:40:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1746711631; x=1747316431; 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=asjuzn+eAAncdD20eXT1wyN528c12dvw5wk014+4k7o=; b=n4+hUlyJXXiVURMDEaXhmuAIeke3CbU/WhW2sNX2vqjWn5djXq1b+c7tuhFuX7a3Jp qQpf0PQ390AtQVr/vpAuDeyE/gwAkYWH63Nn6yUXvRFbuZtai6WTgWDsXWkIqWWFmSfv 7rqVuKKaS3881y6bkfa/hUrntcEe34Bawu/SSuxqbUO7LUeUPcMtQCMWs9tAb8G53/lx cCayG3dri6IS+icrP12Af0XK3Exjkk+DAjL7z/hZXBF9/vYGHD2InnZDzxu7DBC5ucwk 9UmfkdVtS9F2+fHvY0Exbjo/iVumaOwZ2gVuNj1NIw+IHmT0uFpX0g0rBHIPMWU2lJ1z TY5Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746711631; x=1747316431; 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=asjuzn+eAAncdD20eXT1wyN528c12dvw5wk014+4k7o=; b=OkXB8+F8oAnX2bbDM/uACR+ORo50C8eiTo0gYPCuciHaCtMOqyJN0haMQYo1Wm1rFM yvMhNiBni5AuUUmnx+90mBpFMiDN2aRnLf0Sxw771WrwjfQoFfVGH3fXV61rsKT8Ylf1 T6B1jbZWNE1CZM5k86bZ1YDcJdgC+E2y0/B1wXGeI90joQSwepaF5A4UA2VSMY1zdKkw pYudsz95yyfP8pJC/p5pnMnWPOxU0Xo+1T81OUWb7IJ4Jg4IxFL2C3ja/+cz1FHf2ijC JOZDOdYVIcneOSCFVWz1DriQNPqxZAWSLhJzbqPQhpFoX36oj5b+4tV5R1LQNRz9RwJW f7Mw== X-Gm-Message-State: AOJu0YyRhKIjAtJhIas71P9bqxeRFHc/VKQE5SfHsesxUUrlkNtoWrkB USSM43UKy7DX0gTbBZwfhgquS2/fdJK5hShnuZQc+xilsNJl7cCEgtG+k/h/ZIB1b17fb2vQ3ZH vyIM41A== X-Gm-Gg: ASbGncvKGSsdO1E7PJM/s9i0/Kd+uSkQcsrH6gTen38qH1JyAK1d/RU+yQq3n5YRVzf ueCcaf5mzoWb6Yzg8Ml5zNSIkeF9gEDAK2MZCqM5dg5B5CcgveX+jJgXgCRt/96o5SlifzeomWj 5nbFwzA8k3jWuO5gdaoIZHoI9bCWqaUlVeo/IOnUManQWtUK8qOtWlK3RCyyrfJkgYHEMTLv9h7 ODriRmaJHHqLXSl/AJsr6c5c8TQ9tdnWv1NS6/Zg4K02ZO1rwgbx2IYRE7CIrZEKZMNjHJcTfnE zuQ5ymhl7qrwLZbGb3NgeV/N+d92scnntiMurQv7aHyvxuxO2WQJ4LOgfLj+ADiaU1++uVyG2GL crP2+elDDTkAlXV4= X-Received: by 2002:a17:903:3bc6:b0:223:4d7e:e52c with SMTP id d9443c01a7336-22e5ea1d4b2mr110687105ad.5.1746711631350; Thu, 08 May 2025 06:40:31 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-22fbd4474c1sm3299195ad.112.2025.05.08.06.40.17 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 08 May 2025 06:40:30 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , kvm@vger.kernel.org, Sergio Lopez , Gerd Hoffmann , Peter Maydell , Laurent Vivier , Jiaxun Yang , Yi Liu , "Michael S. Tsirkin" , Eduardo Habkost , Marcel Apfelbaum , Alistair Francis , Daniel Henrique Barboza , Marcelo Tosatti , qemu-riscv@nongnu.org, Weiwei Li , Amit Shah , Zhao Liu , Yanan Wang , Helge Deller , Palmer Dabbelt , Ani Sinha , Igor Mammedov , Fabiano Rosas , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Liu Zhiwei , =?utf-8?q?Cl=C3=A9ment_Mathieu--?= =?utf-8?q?Drif?= , qemu-arm@nongnu.org, =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Huacai Chen , Jason Wang Subject: [PATCH v4 12/27] target/i386/cpu: Remove CPUX86State::enable_cpuid_0xb field Date: Thu, 8 May 2025 15:35:35 +0200 Message-ID: <20250508133550.81391-13-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250508133550.81391-1-philmd@linaro.org> References: <20250508133550.81391-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::62d; envelope-from=philmd@linaro.org; helo=mail-pl1-x62d.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 CPUX86State::enable_cpuid_0xb boolean was only disabled for the pc-q35-2.6 and pc-i440fx-2.6 machines, which got removed. Being now always %true, we can remove it and simplify cpu_x86_cpuid(). Signed-off-by: Philippe Mathieu-Daudé --- target/i386/cpu.h | 3 --- target/i386/cpu.c | 6 ------ 2 files changed, 9 deletions(-) diff --git a/target/i386/cpu.h b/target/i386/cpu.h index 0db70a70439..06817a31cf9 100644 --- a/target/i386/cpu.h +++ b/target/i386/cpu.h @@ -2241,9 +2241,6 @@ struct ArchCPU { */ bool legacy_multi_node; - /* Compatibility bits for old machine types: */ - bool enable_cpuid_0xb; - /* Enable auto level-increase for all CPUID leaves */ bool full_cpuid_auto_level; diff --git a/target/i386/cpu.c b/target/i386/cpu.c index 49179f35812..6fe37f71b1e 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -6982,11 +6982,6 @@ void cpu_x86_cpuid(CPUX86State *env, uint32_t index, uint32_t count, break; case 0xB: /* Extended Topology Enumeration Leaf */ - if (!cpu->enable_cpuid_0xb) { - *eax = *ebx = *ecx = *edx = 0; - break; - } - *ecx = count & 0xff; *edx = cpu->apic_id; @@ -8828,7 +8823,6 @@ static const Property x86_cpu_properties[] = { DEFINE_PROP_UINT64("ucode-rev", X86CPU, ucode_rev, 0), DEFINE_PROP_BOOL("full-cpuid-auto-level", X86CPU, full_cpuid_auto_level, true), DEFINE_PROP_STRING("hv-vendor-id", X86CPU, hyperv_vendor), - DEFINE_PROP_BOOL("cpuid-0xb", X86CPU, enable_cpuid_0xb, true), DEFINE_PROP_BOOL("x-vendor-cpuid-only", X86CPU, vendor_cpuid_only, true), DEFINE_PROP_BOOL("x-amd-topoext-features-only", X86CPU, amd_topoext_features_only, true), DEFINE_PROP_BOOL("lmce", X86CPU, enable_lmce, false), From patchwork Thu May 8 13:35:36 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: 888596 Delivered-To: patch@linaro.org Received: by 2002:adf:b60d:0:b0:3a1:f579:ae88 with SMTP id f13csp8180wre; Thu, 8 May 2025 06:41:12 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVyybEU98hZXiTcFT4f4FYVLSjAW+mUyv7ND4N5S3pyLkWGfRsoD5XequHiqyFkpMPO69ZpYQ==@linaro.org X-Google-Smtp-Source: AGHT+IHXngritzNxKSEcEF69FrE8r7UOTCmGvP/Wumkwl41sIcvpqQtmiDA/4Z0RhsJmifZ3qcVs X-Received: by 2002:a05:6214:1c4d:b0:6e8:eabf:fd44 with SMTP id 6a1803df08f44-6f54c41ccfbmr53996036d6.27.1746711672496; Thu, 08 May 2025 06:41:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1746711672; cv=none; d=google.com; s=arc-20240605; b=aOIXtlnfiaZIR/sjfCBny+OJWu9Lh1xIr30V1XNEdmJDz2jF6BG41ilXOBj32yOW91 zub/0MWM6rG95zm5M76Uog2GIzqS39fmWEijr7KsyRKbBhqB4ktfqXGFIcfKdf4vRyk5 wqksrceD2gIkhKdr2uWDYbnQtRYGd6VRdYAZW4IKmsJWR3vU91YwYyQtOvm/4PD5zUCe tASet3zpG+LbsYzFkVGQT9x05hogV4vAtkUnIpkRFXWKDzzE7pzDQSe/ucVQJ9gwCp7f 8fUHP6SYPrzpxDwoSZgo/UVkC81eFsCfwkJOhOFNkgctel+yuA4aPh3tcHE+WVj+e85I TV1w== 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=mAafb+dHM0R7U2T8OMZzAcuOcBI3QoaSzAwGll5ygQs=; fh=t4sCPXSJJxzszaJF+1Mm6mpQfCAwhf2cujSX+L6g5pY=; b=YYUQGf85d4NNYySWuh/MiNoPJwYhDn6uQMvoGmp1Y+rIjwpZx70hHWuHHxUJUe2dY/ 022J5hLQmOyakI7oST2tOzv3eA/H2ZE2DsmHeRx/1MHfNMWCI9ATbxnpqiIMRJLqVVg4 XQt3nOr6Gz00EVAi5HfDR5umVt+/Eej1u01dYcQxPLxkmOu5UyddQp2jCv9Wv/1Qn7+9 JIH0+sbO+M7kdGUWHr5ifVAFqeQUODPq86WSkeo1i7rVZSNI13QlfNF3z9X1qoktfqtN UYaXpjT6+BZWfhgrHen3zO0u5J4ReqmUfbXmAF2B5DrLVIICwpW+EQrkXxD8U9AaU/mL SjFA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=O+JrDn7M; 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 6a1803df08f44-6f5428fd787si44428786d6.445.2025.05.08.06.41.12 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 08 May 2025 06:41:12 -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=O+JrDn7M; 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 1uD1Uo-0007oF-Jb; Thu, 08 May 2025 09:41:06 -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 1uD1Ui-0007Ob-1o for qemu-devel@nongnu.org; Thu, 08 May 2025 09:41:00 -0400 Received: from mail-pl1-x631.google.com ([2607:f8b0:4864:20::631]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uD1Ue-0004XC-KX for qemu-devel@nongnu.org; Thu, 08 May 2025 09:40:59 -0400 Received: by mail-pl1-x631.google.com with SMTP id d9443c01a7336-22c3407a87aso13358195ad.3 for ; Thu, 08 May 2025 06:40:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1746711653; x=1747316453; 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=mAafb+dHM0R7U2T8OMZzAcuOcBI3QoaSzAwGll5ygQs=; b=O+JrDn7MLNTxze7nteuj+q6kgqyFdjSXaG1BrCcNTkeRrBUIZ2hNFJKS2CdNehcCrZ RbSASv9Dw/VZiK+bhEj8qj7qvqyR9aZ4fqetfbjXOTth3F1s6mJsz2QZFd8UQGcDE/Bb tJeEE7MuSpqQQQ4Nj3r/+27OQWohhQiCfxnTMWmsNqxLdEALd9PGAxcmPVbGQwcWBGHs FMgNbLkod6MBjYFl7JcAip+VRUNSq6cdHa6yJuG/kt01/RE7dASjK+odVxM7vx6vHEyS jdglCqb3h53kyM3GqEQci/XRPQOhpbrwmMMlmn5jXp/1dyE1d70rtkLof6wJMAukAiRj YRbg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746711653; x=1747316453; 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=mAafb+dHM0R7U2T8OMZzAcuOcBI3QoaSzAwGll5ygQs=; b=sSJTnUJ6ZhXes9we+rGKlZC1JXF/r9YbRh3yIW7yrjU3P4/5jwU+U1A1uzmZJmlyb5 8as3I/AHl3vIyDiiL+mL9OqfCE7+DtfUXhBb7wJC3eoYXwrqVcd0XkVFaAZKCnpXVaPn 5vTebByJaW3QS7tAZnayork0grQ7mVXHcuLTpk52UHmqVnICNB6pbxQQPntq1qPaoLxF 92MJdFBjX+iYUBjr6ns4xfrxiZqr6LKc7ttnjs8GUDBzFcYvEDweutG7WzVMQY33T7Rj d8CjNKYmeaZLW/T0dJzbrbdtvBMPBqWi0wt9n047HOlKiPKNVa8c4zbJWc1c2+jtPz/g rPfw== X-Gm-Message-State: AOJu0YwPPwjvIvI1ruUotkFWLOUIrd1j3GGDq0+YrpVQ9umF3Gelv5MT mOm00uHNQUSOPf7WdDYWTcI1kMULtLnBtI8XXxSQc7uyoP9skbhN5q0A11W6lhGorjJl/Rtgu2s ZF1LG5w== X-Gm-Gg: ASbGncs5dvv8dSWwaZsoTGaJf+ZDxXkmSnd3QFzhH1XdX0ebvJyre+Gb7wsbPgLRjt3 Q2ntQhouDtGdJn6vL9UjZypohcnA7GvwrRh2eLIO7kgWT+jB5FHo1Mc5JVKkBJpTmU5AS4jlAN4 yYHNcYW2aMkKjhFmPUy05X95/nYydBxSM6Q/+Luay7e7zRh+zIRILyrDL10izYff6dlH5sgxeNp VTpvQTBKjO/JDtSC8jmd31qI9wEKn0vU4V20NOtwR91YZ8Yqczv4EGB1yWDCCXV9DMipNIyhY4S FCrirSlPo3dl+a3Dw4JzBTPq7R1zESgQYeD4/nI4CkxXnGPQC5P3IySs7OaaEi4li8DSay71e1N clTQjCMIoMa1XSDk= X-Received: by 2002:a17:903:194e:b0:224:f12:3734 with SMTP id d9443c01a7336-22e8660509bmr47849675ad.30.1746711653500; Thu, 08 May 2025 06:40:53 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-22e150eb5d2sm112359365ad.7.2025.05.08.06.40.40 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 08 May 2025 06:40:53 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , kvm@vger.kernel.org, Sergio Lopez , Gerd Hoffmann , Peter Maydell , Laurent Vivier , Jiaxun Yang , Yi Liu , "Michael S. Tsirkin" , Eduardo Habkost , Marcel Apfelbaum , Alistair Francis , Daniel Henrique Barboza , Marcelo Tosatti , qemu-riscv@nongnu.org, Weiwei Li , Amit Shah , Zhao Liu , Yanan Wang , Helge Deller , Palmer Dabbelt , Ani Sinha , Igor Mammedov , Fabiano Rosas , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Liu Zhiwei , =?utf-8?q?Cl=C3=A9ment_Mathieu--?= =?utf-8?q?Drif?= , qemu-arm@nongnu.org, =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Huacai Chen , Jason Wang Subject: [PATCH v4 13/27] target/i386/cpu: Remove CPUX86State::fill_mtrr_mask field Date: Thu, 8 May 2025 15:35:36 +0200 Message-ID: <20250508133550.81391-14-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250508133550.81391-1-philmd@linaro.org> References: <20250508133550.81391-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::631; envelope-from=philmd@linaro.org; helo=mail-pl1-x631.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 CPUX86State::fill_mtrr_mask boolean was only disabled for the pc-q35-2.6 and pc-i440fx-2.6 machines, which got removed. Being now always %true, we can remove it and simplify kvm_get_msrs(). Signed-off-by: Philippe Mathieu-Daudé --- target/i386/cpu.h | 3 --- target/i386/cpu.c | 1 - target/i386/kvm/kvm.c | 10 +++------- 3 files changed, 3 insertions(+), 11 deletions(-) diff --git a/target/i386/cpu.h b/target/i386/cpu.h index 06817a31cf9..7585407da54 100644 --- a/target/i386/cpu.h +++ b/target/i386/cpu.h @@ -2253,9 +2253,6 @@ struct ArchCPU { /* Enable auto level-increase for Intel Processor Trace leave */ bool intel_pt_auto_level; - /* if true fill the top bits of the MTRR_PHYSMASKn variable range */ - bool fill_mtrr_mask; - /* if true override the phys_bits value with a value read from the host */ bool host_phys_bits; diff --git a/target/i386/cpu.c b/target/i386/cpu.c index 6fe37f71b1e..fb505d13122 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -8810,7 +8810,6 @@ static const Property x86_cpu_properties[] = { DEFINE_PROP_UINT32("guest-phys-bits", X86CPU, guest_phys_bits, -1), DEFINE_PROP_BOOL("host-phys-bits", X86CPU, host_phys_bits, false), DEFINE_PROP_UINT8("host-phys-bits-limit", X86CPU, host_phys_bits_limit, 0), - DEFINE_PROP_BOOL("fill-mtrr-mask", X86CPU, fill_mtrr_mask, true), DEFINE_PROP_UINT32("level-func7", X86CPU, env.cpuid_level_func7, UINT32_MAX), DEFINE_PROP_UINT32("level", X86CPU, env.cpuid_level, UINT32_MAX), diff --git a/target/i386/kvm/kvm.c b/target/i386/kvm/kvm.c index c9a3c02e3e3..87edce99e85 100644 --- a/target/i386/kvm/kvm.c +++ b/target/i386/kvm/kvm.c @@ -4635,13 +4635,9 @@ static int kvm_get_msrs(X86CPU *cpu) * we're migrating to. */ - if (cpu->fill_mtrr_mask) { - QEMU_BUILD_BUG_ON(TARGET_PHYS_ADDR_SPACE_BITS > 52); - assert(cpu->phys_bits <= TARGET_PHYS_ADDR_SPACE_BITS); - mtrr_top_bits = MAKE_64BIT_MASK(cpu->phys_bits, 52 - cpu->phys_bits); - } else { - mtrr_top_bits = 0; - } + QEMU_BUILD_BUG_ON(TARGET_PHYS_ADDR_SPACE_BITS > 52); + assert(cpu->phys_bits <= TARGET_PHYS_ADDR_SPACE_BITS); + mtrr_top_bits = MAKE_64BIT_MASK(cpu->phys_bits, 52 - cpu->phys_bits); for (i = 0; i < ret; i++) { uint32_t index = msrs[i].index; From patchwork Thu May 8 13:35:37 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: 888597 Delivered-To: patch@linaro.org Received: by 2002:adf:b60d:0:b0:3a1:f579:ae88 with SMTP id f13csp8367wre; Thu, 8 May 2025 06:41:42 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVlR2+EBjhBxsIhPhmwxVaMgeJsiD6HPtWQ9ssRPWSoCb09QH39uIc0vrrnS/s5pg0LYL99ng==@linaro.org X-Google-Smtp-Source: AGHT+IGzRTVtpJBdsW2UiEpEeWFA0kA5kAqTyromTzc8f4yisseMs0sf48T5PfRYtXbMMNcKhiVs X-Received: by 2002:a05:622a:19a0:b0:474:fee1:7915 with SMTP id d75a77b69052e-4922620916fmr107841971cf.31.1746711701948; Thu, 08 May 2025 06:41:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1746711701; cv=none; d=google.com; s=arc-20240605; b=fto0LB+ZnKDdhm7trKi6M1YNvR7k6NYp4qKX68MAb84rjfimCmqE0MUHlD2WXw6Nmz n32QgQeOgtPLGj8zqjUr0Eshu1VisYuoBfvnlq8YC+EW76QwO/xlkke9t1TNy/PvDaZK gKOy7sDglH1q6Spy9oEZIfDWrMPH/1r6RGMfD6JegyLR8XtmJ8T1h6e+sSeO1zQ8CVsU zKywxQ4GxmQ7rAc5uFTdZDoOreBQ1v3WFb9v95f3PbAZBL3e1PXxlUouUMShwooe5jkv 79uyIYMTYZNIXP7guxk8W6fRiA4sfSBWMbRKCLl9OEj+pHTSbTsqybdzeJ/xW2ERMIc1 ilAw== 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=GfnNMh8um2i71NVQR7Vo7AAo9gkZrP7mDUQkPEIxOEM=; fh=fPkRSEYCel/EUuwKjeUH2HSngyX7ytCg7docWFAAYgw=; b=CMKc36zK8N/2MWXWi2JmvpMNQPtQwXvhdQIio5X7xwPrYjM16g7kUEM1pm4KhyATQa xZktVgTrPcDh+ROI5mLDuJCZw5Zma4C5GQ7L56LJqMYMJXXqosd0yj2CwtFltew0AYUF N+uOK3GAnRDYgK27HocYUhi55gRySJ1aK1fE35gzH1HF3sC5H1L5Y300flSF9viH1Wom D2n0cvDa/hs68dXXPhIO6nG8sfU8gPT8B0HNlli+OUufECWGRt7QldA8oAt7Rz63jzNy EDBJpwOQmvjOxsQD7hOY/HDSxyTS2jvSwSyInfoatm7q/xaCfkQp2aphLQtHkjtouX7b OjDQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="HPKYNVL/"; 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-49223457d9dsi43105021cf.534.2025.05.08.06.41.41 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 08 May 2025 06:41: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="HPKYNVL/"; 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 1uD1V7-0001Ay-Fz; Thu, 08 May 2025 09:41: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 1uD1V5-00014i-5E for qemu-devel@nongnu.org; Thu, 08 May 2025 09:41:23 -0400 Received: from mail-pj1-x1032.google.com ([2607:f8b0:4864:20::1032]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uD1Uz-0004Yk-UL for qemu-devel@nongnu.org; Thu, 08 May 2025 09:41:22 -0400 Received: by mail-pj1-x1032.google.com with SMTP id 98e67ed59e1d1-306b78ae2d1so945924a91.3 for ; Thu, 08 May 2025 06:41:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1746711676; x=1747316476; 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=GfnNMh8um2i71NVQR7Vo7AAo9gkZrP7mDUQkPEIxOEM=; b=HPKYNVL/Oo3D9bI81bb6wIyVbcgPC0g8Qdd4/aj+veIe0nnneDIBgm0zxzhNlEdmHF QhA+uAdq7HzTNb9kdyNWfPEYDIajoWakuUrrI6Q+28+Z0U+zxjMErE+MCzp9OuhEhS4r EvoCxDiW3iVND21Fnu2v/BDy1GHZz7g28CpcmdFgPSFuhDxReM62i1p1KA04Y839355y XAiCsW14q56WCviGKwrfgmsWQ4jfUPaCnxT4v9iNNuGqEp2jztLzOxkKHkmDhxjnbnqM NUWQo60rCgPvLyGzauGTNA0qjEhz2X9eG90YNAPotdwpuKbEixlS9i2XCf7qLOQMwlmU oYRQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746711676; x=1747316476; 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=GfnNMh8um2i71NVQR7Vo7AAo9gkZrP7mDUQkPEIxOEM=; b=YD3M+qCoUBA9vQdH2m0eOJYG6B5Eqmy07JQt8XbTjU/thCsEGdO9Ha3TeqDunFAO1V gvGpos1GcPphOy0bjUpmzd417hhAxySoTOpPvHipBfc4m0v5hN1zBjWdBevG5/QYtYsW SlG1PenZ+z8GJUQAnOqQSo92FKmwWcnSaCSMphbTyvkm767Kt//4PWNUkhBdz3bIbXXG VhE/nLKVYd5BlyWGTvarjOYSdA7OfJq0/a8SPkVczsiTV2TwGNovNsTskAcG3T3g05W4 VXY1uanLvi7FWaDI0/FnAoI2eOr+QY38NiZ1Bb9uCBoKHiRKjg2pXbb0Ygyi7/FgskhZ MbJQ== X-Gm-Message-State: AOJu0YyHa/WKK1Rwp2rtxuILhSgFwxEetSaWyIxqxcVyW5RZTQ3Aoi95 KOSzHrJKUIDHOMedy94Ti/tjUleTW7sO3XneP/QGFd9vzYv5VJN7ySKqzNr7Y1xHPfP+5PsreSU 39WaniA== X-Gm-Gg: ASbGnctVBUKL0hqHbXQDp6GTbj+b7Zxtd6aButbAma92TdMKChlku6aN9uH/vwctwZT kelgGmZtUSZ3DSBrvsg4l6orEKSJ4vEo7qJuye9epmr+WiFFtWAvUVrlZo5FPPmpFbMdXUkkL/a WapOlHnn4PfKbZc0eNPW4zTbMU53wUG3n0rvEKqDEyf8YhqSX3hD7CmuiWFkF4wd+sEvjR0QzLt hRSpVP2hzERoMQyiDbj5b1t/BSQnV2/4zSIxk5TkCoB4Vi0YftKtvYdPJu/+6sS01VtyiSQJaHB mtPqrLup1nbioPQGHY3SiTWc+HaqkIOnwQhzUXMl8FpILh6WcngYVvKkWUxUAE2N6GT5irX97d6 tCExQjiqD/0jZ48A= X-Received: by 2002:a17:90b:278e:b0:2fa:1a23:c01d with SMTP id 98e67ed59e1d1-30aac1b407amr10664017a91.21.1746711675615; Thu, 08 May 2025 06:41:15 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-30ad4d56981sm2115127a91.28.2025.05.08.06.41.01 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 08 May 2025 06:41:15 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , kvm@vger.kernel.org, Sergio Lopez , Gerd Hoffmann , Peter Maydell , Laurent Vivier , Jiaxun Yang , Yi Liu , "Michael S. Tsirkin" , Eduardo Habkost , Marcel Apfelbaum , Alistair Francis , Daniel Henrique Barboza , Marcelo Tosatti , qemu-riscv@nongnu.org, Weiwei Li , Amit Shah , Zhao Liu , Yanan Wang , Helge Deller , Palmer Dabbelt , Ani Sinha , Igor Mammedov , Fabiano Rosas , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Liu Zhiwei , =?utf-8?q?Cl=C3=A9ment_Mathieu--?= =?utf-8?q?Drif?= , qemu-arm@nongnu.org, =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Huacai Chen , Jason Wang , Mark Cave-Ayland , Thomas Huth Subject: [PATCH v4 14/27] hw/intc/apic: Remove APICCommonState::legacy_instance_id field Date: Thu, 8 May 2025 15:35:37 +0200 Message-ID: <20250508133550.81391-15-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250508133550.81391-1-philmd@linaro.org> References: <20250508133550.81391-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::1032; envelope-from=philmd@linaro.org; helo=mail-pj1-x1032.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, T_SPF_TEMPERROR=0.01 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 APICCommonState::legacy_instance_id boolean was only set in the pc_compat_2_6[] array, via the 'legacy-instance-id=on' property. We removed all machines using that array, lets remove that property, simplifying apic_common_realize(). Because instance_id is initialized as initial_apic_id, we can not register vmstate_apic_common directly via dc->vmsd. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Mark Cave-Ayland Reviewed-by: Thomas Huth --- include/hw/i386/apic_internal.h | 1 - hw/intc/apic_common.c | 5 ----- 2 files changed, 6 deletions(-) diff --git a/include/hw/i386/apic_internal.h b/include/hw/i386/apic_internal.h index 429278da618..db6a9101530 100644 --- a/include/hw/i386/apic_internal.h +++ b/include/hw/i386/apic_internal.h @@ -188,7 +188,6 @@ struct APICCommonState { uint32_t vapic_control; DeviceState *vapic; hwaddr vapic_paddr; /* note: persistence via kvmvapic */ - bool legacy_instance_id; uint32_t extended_log_dest; }; diff --git a/hw/intc/apic_common.c b/hw/intc/apic_common.c index 37a7a7019d3..1d259b97e63 100644 --- a/hw/intc/apic_common.c +++ b/hw/intc/apic_common.c @@ -294,9 +294,6 @@ static void apic_common_realize(DeviceState *dev, Error **errp) info->enable_tpr_reporting(s, true); } - if (s->legacy_instance_id) { - instance_id = VMSTATE_INSTANCE_ID_ANY; - } vmstate_register_with_alias_id(NULL, instance_id, &vmstate_apic_common, s, -1, 0, NULL); @@ -412,8 +409,6 @@ static const Property apic_properties_common[] = { DEFINE_PROP_UINT8("version", APICCommonState, version, 0x14), DEFINE_PROP_BIT("vapic", APICCommonState, vapic_control, VAPIC_ENABLE_BIT, true), - DEFINE_PROP_BOOL("legacy-instance-id", APICCommonState, legacy_instance_id, - false), }; static void apic_common_get_id(Object *obj, Visitor *v, const char *name, From patchwork Thu May 8 13:35:38 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: 888598 Delivered-To: patch@linaro.org Received: by 2002:adf:b60d:0:b0:3a1:f579:ae88 with SMTP id f13csp8477wre; Thu, 8 May 2025 06:41:54 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVOEFGHb7zU2zqhUdGMDiylHbtd9oQskenYcNC6cdReFrtcwPEatqH1fX5+uX0v0nTn/+9BTQ==@linaro.org X-Google-Smtp-Source: AGHT+IEBNiEJVrZGsn+9OLdcl6/FLRHlUNEGPWOa/zz+cQo2UrrQ4TuS4J2qUAo4K9YETbVHK0Ts X-Received: by 2002:ac8:7c48:0:b0:477:bd4:6a4c with SMTP id d75a77b69052e-4944922ec60mr40641481cf.1.1746711714372; Thu, 08 May 2025 06:41:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1746711714; cv=none; d=google.com; s=arc-20240605; b=ITawHC/0UDg6ztRZyVrpGozkriuSl4CYCz3ogJce12j6ZnT92rer2YX2Phqoi1D8Ll JqLZXXLlIfCMV6TkoeiW5Mh9BcWnwDxU2UPqkc2NztdKPe5VNEUJqU555vhFuK1nEhZg CVrRX7iFeKueb86+iemD8QtSSDGzft4/eKHSFpS14BqEZUys3SZEPSPOEWRsKmiCZKVU 6q+fXBty8DylVZCEbQ8KfgMfVU7KbH9PnwC5NtpfjQRMMvGZWhEicv9bIc2uN4wBfhMc B0jGgMDzAAxlEHOGl0gJVm1IHXyC2RMfhG4cpyYCq8ZUmu6fgRT400gABZKLgxy9zE73 C5ug== 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=sqRI2bUWFL/LTWDPgHwj3plQ/Zek5ug5WOQHcPBpHVI=; fh=fPkRSEYCel/EUuwKjeUH2HSngyX7ytCg7docWFAAYgw=; b=Kp/lDzK7F8J336PrTFarMK7kjD/rbFk9Ry+vgHSGhFRsahn9ZKFWaK+7fIekANdO5m N+FTxzcdq5SDx6qG2/rh1CAPbO5Y++p0owFD4kkbdtQ7QE/TMQZ9sBO5YggGEZ6V5ELJ ejk8MqlI+zso0tcX6YBLnd8C76VzM/lgFrZkXujPjZoc0GEW79p4iheFoH1+pZwWfyHe lNGSYTlEi1V16msoQDk2lOf/1VLEyR6dqkrh8j15O2D9/rGWJ2P3yt8+pKq7ww/m1mak qiXWmp6OoLMATqntP8iIdU1alpnLnbs1ToAagUig6AdXwGjWqy9wRAYWmqSJercokm6V ostw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=B8ixyavl; 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-49223928943si46514031cf.644.2025.05.08.06.41.54 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 08 May 2025 06:41:54 -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=B8ixyavl; 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 1uD1VS-0001oZ-8p; Thu, 08 May 2025 09:41:46 -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 1uD1VQ-0001np-PZ for qemu-devel@nongnu.org; Thu, 08 May 2025 09:41:44 -0400 Received: from mail-pl1-x62f.google.com ([2607:f8b0:4864:20::62f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uD1VM-0004cD-Fi for qemu-devel@nongnu.org; Thu, 08 May 2025 09:41:44 -0400 Received: by mail-pl1-x62f.google.com with SMTP id d9443c01a7336-22e09f57ed4so22840325ad.0 for ; Thu, 08 May 2025 06:41:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1746711698; x=1747316498; 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=sqRI2bUWFL/LTWDPgHwj3plQ/Zek5ug5WOQHcPBpHVI=; b=B8ixyavlGVNn72GR+ktMu1GI2RNoKl/1jZ1zZkglyjs17bGIsRbg+NttK7ZHtd7nUK AB/IrubSQfetl1ZqZwY/SQlpucNwlQ2zqWxDpI9PIEGRbUrlifB+m5G1C9sh16dhNiNI EF0Y4D/1anaDp7kdnsyle7pAqDsnMD3y7VPDDB/+zEHpgsURfrINdArM5Krxujk6eo+b rX+lsUZ/T3zYaQ1+PUQDc41ITDlcjewADM4H6yQCjNhzYoFpKbQ6mu0hOsS9BS5rJ/b9 bw8FOGexKfSXSqbKiohMpBLHW/Oa2kjgkgsQz2oFc12LaDSOaul+P3H/Ss+Gay0TAQUv reTw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746711698; x=1747316498; 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=sqRI2bUWFL/LTWDPgHwj3plQ/Zek5ug5WOQHcPBpHVI=; b=m03vD9zisNgPyDudTUkdpkt1V2z2WTgAwiP/wP6Ht02I/1rbipXa3RMXJdPO8Lnsdm k0B/aEfO0SJFu9Uggk/Mvh3RahPTbaLGIzc3X27cpWKuRGjP9w6/gN4Acy1h7g4fZZG5 UbEwLeFqTtEKT9fl9wArzSiBXEc68mNOF218EZRKGvXZOiVCHg45AIS7hzE7jysjF/Ow bS8PasSU6UTh529FHONAKcQV2q6H4eyQwXa2ejI+vSO6sBOQtJzUkAj3NGDB6I2MewNA bfgFo8aLutHnMSoj/qseBMPqtXTya1iQ2P3RVq8VT3A//vbMcsQaPxEULrz3O411ikZp Skfw== X-Gm-Message-State: AOJu0Yxrzf8OieLpw+irLz7W5vhvwAY9rivKt6VkdsX2lhxHZijYcui3 0P3GxttHGQAf9nywiEDEtN+wtUO5jtbrEF9JQUJD4gmV5GCO4F37xxTH6fMHW4g/M4zc0rLGqd7 +DZ9kKA== X-Gm-Gg: ASbGncs9uk5PM+l/VonCVOhPzxfk7bO6o3MjVg8tTZvBCs+MWTS3Bc9F9OPNT/XwnqC 8rwkurlCf3U6HLhvJ9zMNk9L7ECHHAbi4jhWO2mQEpixAqVxpzBnIv7RtsxT5R38/ga8BcrDp/f XUMfmtQcawoy1QbB75OhB/ushOosToTcvW68Vo8/QsMhDTEYF4N+6+ZB6MNDFjhhIkdX+G1ZFYz xwwS5szFJnHVgVbJUBnsnxZPYjwlfEWjBYrV8gnQyPwCSreZS91OA0tppt0GjDPl8bE1rBOkkuA 6lYgBWdyS0VPKZlMpvtoOqIuHpAzJJLPEr4wwtHAKLSCzr8CRtGT7WgrnxZ9cw2Do05FIgy16GY vxU1i+yyVoQb3Gw8= X-Received: by 2002:a17:902:c94f:b0:215:a303:24e9 with SMTP id d9443c01a7336-22e846a2ab2mr48657765ad.3.1746711698591; Thu, 08 May 2025 06:41:38 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-22e766dffefsm24985605ad.33.2025.05.08.06.41.24 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 08 May 2025 06:41:38 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , kvm@vger.kernel.org, Sergio Lopez , Gerd Hoffmann , Peter Maydell , Laurent Vivier , Jiaxun Yang , Yi Liu , "Michael S. Tsirkin" , Eduardo Habkost , Marcel Apfelbaum , Alistair Francis , Daniel Henrique Barboza , Marcelo Tosatti , qemu-riscv@nongnu.org, Weiwei Li , Amit Shah , Zhao Liu , Yanan Wang , Helge Deller , Palmer Dabbelt , Ani Sinha , Igor Mammedov , Fabiano Rosas , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Liu Zhiwei , =?utf-8?q?Cl=C3=A9ment_Mathieu--?= =?utf-8?q?Drif?= , qemu-arm@nongnu.org, =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Huacai Chen , Jason Wang , Mark Cave-Ayland , Thomas Huth Subject: [PATCH v4 15/27] hw/core/machine: Remove hw_compat_2_6[] array Date: Thu, 8 May 2025 15:35:38 +0200 Message-ID: <20250508133550.81391-16-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250508133550.81391-1-philmd@linaro.org> References: <20250508133550.81391-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::62f; envelope-from=philmd@linaro.org; helo=mail-pl1-x62f.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 hw_compat_2_6[] array was only used by the pc-q35-2.6 and pc-i440fx-2.6 machines, which got removed. Remove it. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Mark Cave-Ayland Reviewed-by: Thomas Huth --- include/hw/boards.h | 3 --- hw/core/machine.c | 8 -------- 2 files changed, 11 deletions(-) diff --git a/include/hw/boards.h b/include/hw/boards.h index 5f1a0fb7e28..a881db8e7d6 100644 --- a/include/hw/boards.h +++ b/include/hw/boards.h @@ -841,7 +841,4 @@ extern const size_t hw_compat_2_8_len; extern GlobalProperty hw_compat_2_7[]; extern const size_t hw_compat_2_7_len; -extern GlobalProperty hw_compat_2_6[]; -extern const size_t hw_compat_2_6_len; - #endif diff --git a/hw/core/machine.c b/hw/core/machine.c index e7001bf92cd..ce98820f277 100644 --- a/hw/core/machine.c +++ b/hw/core/machine.c @@ -275,14 +275,6 @@ GlobalProperty hw_compat_2_7[] = { }; const size_t hw_compat_2_7_len = G_N_ELEMENTS(hw_compat_2_7); -GlobalProperty hw_compat_2_6[] = { - { "virtio-mmio", "format_transport_address", "off" }, - /* Optional because not all virtio-pci devices support legacy mode */ - { "virtio-pci", "disable-modern", "on", .optional = true }, - { "virtio-pci", "disable-legacy", "off", .optional = true }, -}; -const size_t hw_compat_2_6_len = G_N_ELEMENTS(hw_compat_2_6); - MachineState *current_machine; static char *machine_get_kernel(Object *obj, Error **errp) From patchwork Thu May 8 13:35:39 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: 888599 Delivered-To: patch@linaro.org Received: by 2002:adf:b60d:0:b0:3a1:f579:ae88 with SMTP id f13csp8621wre; Thu, 8 May 2025 06:42:13 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVRpSzOCf5D3bNPr6WOaVcByBvjOID/Z98+6bVtmHJUa5HS5N5JwYpC20TTwq0DnklN8Ptm0Q==@linaro.org X-Google-Smtp-Source: AGHT+IESC6Kw93qdFBkwJd0MLALTarw3shjaxP9J9jLbzHJ4kUu6u5ecp10PHz97pc1C7hZTgSNZ X-Received: by 2002:a05:620a:361e:b0:7cc:a80c:6237 with SMTP id af79cd13be357-7cca80c626emr577141785a.44.1746711731549; Thu, 08 May 2025 06:42:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1746711731; cv=none; d=google.com; s=arc-20240605; b=L0KSGK+nuwEMZ0U4zFZ4zcS/jtcOtYSwbYAFzMCjiwVHv4FkjFPo3/DmlFW21XxmMt bNksENh2nHUQjRv7EwrJ7F7ZndGg6klq+hKQcC2qcDi8XC/Lsz/FxIj5nOeBg54vrZc6 BECcu4v1NHldcsDARB0fgw04RsG8srkmmIs0bqNC2wpRwxA4kiPHN6z14UgxgZsfCbto VtDQtboMb0rhhdQ8nv99h/Cj77CpPhw+jPUzbvf5IeBfodM+SDhywV0DKhbeYDxWeroz 5aFMTH1Pi2oE/jCL1rUXNQQvPsCQKrSUCXf3wkG0bPfruFg155oMWIJH/f1fAJEwa/My P5eg== 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=fvLizXjiSVqZDvieXMhXwGlqnaF81TYck8XbLuFhLlo=; fh=fPkRSEYCel/EUuwKjeUH2HSngyX7ytCg7docWFAAYgw=; b=Ff2ULV++g8jn8pvwtZ7Gjs2kl8XUwiylg19CcDJT80bzx0TvnduOMgdx9MrRiv7BmF zKkP8FfLXEIHwTCvCia2sjZseg96SscVpqrx+xRgMGd2oUkdLifXaGmAXvoYY3geYYeg QUrYKyjEBr2BlOSqTebpJju1EwcIIj/E949uKtyBmyHsskFpVIXgS68loRQiCpJgEib0 Jd8u6MpiVfPIgJ/zIqHsrUOrck4fi7m8BFi37HuEayAdtNYk8g4otl3omtGtkunTpFKW wJQ7jDMfkPZZO/BmvShA48DrQ9l+AtCwmefeP26itWdXgTtbNI/oZtKpeZDULMMSiNKT YSdA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=mXVvzg6H; 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 af79cd13be357-7caf75b2584si471153085a.454.2025.05.08.06.42.11 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 08 May 2025 06:42:11 -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=mXVvzg6H; 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 1uD1Vo-0002jH-Pw; Thu, 08 May 2025 09:42:08 -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 1uD1Vm-0002hX-SY for qemu-devel@nongnu.org; Thu, 08 May 2025 09:42:07 -0400 Received: from mail-pl1-x62e.google.com ([2607:f8b0:4864:20::62e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uD1Vj-0004ee-GS for qemu-devel@nongnu.org; Thu, 08 May 2025 09:42:06 -0400 Received: by mail-pl1-x62e.google.com with SMTP id d9443c01a7336-22fb33898bbso5794435ad.3 for ; Thu, 08 May 2025 06:42:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1746711721; x=1747316521; 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=fvLizXjiSVqZDvieXMhXwGlqnaF81TYck8XbLuFhLlo=; b=mXVvzg6HqhzKM+DmrgHd8/SaaSWYIvtsXGxk1NUpcVOIFdOKzY3MLKdgtLMPUdpM5v j8CPSG4ACkXcdCQ18Xxvu2hbC9aJhFFXA/h5yuu3wBacOJQcni0OMS7iToZBHlOmrxUh 8j8wgukB7h4UjGeOJwqNBrUpDPXWI3EX19gfwQHJ5z3al3ItDk4txOHB8BEA+Ckii4mK mRGu9eXt5cJxz7anCexeSlYt7vrSsCBe0iatPfUFBA5iTbOzoYYrQBQbLZUzqZG7mS0s 4LzLtKOFKsWAffrsxI/wvRFEkWCEz54i8bm8I5M41PM8avRR5CpEuCxFY5/Bq3Ct/5Hw skpw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746711721; x=1747316521; 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=fvLizXjiSVqZDvieXMhXwGlqnaF81TYck8XbLuFhLlo=; b=ogKym3s6glkyJJ30UYnNEAREVPNyuc1gM0bAtpOy0nLI69eHiH/jM8uS9vcKC+f6/8 y4x2fw9PVBNXL9MjIdZKezpo5pwVAN6bad6qgQ0Vak0CSJ5Mg7UMXCZkoKtIHFo94f2K Ceqz7AKDRHp2ZUuho14pnTTCErrd5GU+ozAENkoh5PKgc9fGC936Jly1uGSHFnG6qGH6 rZgy/D1+m2+zjoRcdxNliZ1PRl0poT5i8NJkhj76YZJfSTEFqIRqRXEC7AnoMCi2prUO mVC3phl1vvM/X/9Wk4Wwc+3pVqNqPy/bPwxrf6V3CgCuNGkb1TBEX33NLxpKu5W3MR+f ZZZA== X-Gm-Message-State: AOJu0Ywn9XGqwoZ2vm5LvS5J4N6khfYtnWmJWzsEdYtOlNFFRjLQQwf/ McBDjUMeJLzTMYFILcLcfYst1qw0T/LMvjJqNHruGeyCJIQCKhu/ixS5bnJPGWkyJQcCFXTZeDl 9l+SwSw== X-Gm-Gg: ASbGnct9jpjIxbD5LCtucAGA3EvEZojtRnfDfG3AT+NnW6CBndE91x9BbMin6Rohcdb MbmXzO1pthBKmTsaiYTBPWsUeXfhu7ZJGf/L8AF6zQIph/gRgxR3EVov1//JhvyzXx66s/ngIqR Pdem9nMNYuuipcSsvBRdFMXFSnQdnVaZTqJ7nlZDxcikCbXiLqKWcAdjxS26WVo/MXS6qginHnS lxdPWAWdMbZBY4m5ebU+z0bH5Yn8b+M/owfWOifIt889fyPTXbOcGbaGjTPI0eAlhyl0HKzLM75 1KvJX8JwQA2P9uK9puh+6ZH+rbxlv9WJfVx+1QbGveFv/UFIyV2Hm2NpAWR3q8Gc2SX5OIIZyNG Es32VbiBL4PzuRIk= X-Received: by 2002:a17:902:e38a:b0:22e:634b:14cd with SMTP id d9443c01a7336-22e634b171emr74212065ad.39.1746711721364; Thu, 08 May 2025 06:42:01 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-22e1522911bsm112537925ad.191.2025.05.08.06.41.47 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 08 May 2025 06:42:00 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , kvm@vger.kernel.org, Sergio Lopez , Gerd Hoffmann , Peter Maydell , Laurent Vivier , Jiaxun Yang , Yi Liu , "Michael S. Tsirkin" , Eduardo Habkost , Marcel Apfelbaum , Alistair Francis , Daniel Henrique Barboza , Marcelo Tosatti , qemu-riscv@nongnu.org, Weiwei Li , Amit Shah , Zhao Liu , Yanan Wang , Helge Deller , Palmer Dabbelt , Ani Sinha , Igor Mammedov , Fabiano Rosas , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Liu Zhiwei , =?utf-8?q?Cl=C3=A9ment_Mathieu--?= =?utf-8?q?Drif?= , qemu-arm@nongnu.org, =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Huacai Chen , Jason Wang , Mark Cave-Ayland , Thomas Huth Subject: [PATCH v4 16/27] hw/virtio/virtio-mmio: Remove VirtIOMMIOProxy::format_transport_address field Date: Thu, 8 May 2025 15:35:39 +0200 Message-ID: <20250508133550.81391-17-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250508133550.81391-1-philmd@linaro.org> References: <20250508133550.81391-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::62e; envelope-from=philmd@linaro.org; helo=mail-pl1-x62e.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 VirtIOMMIOProxy::format_transport_address boolean was only set in the hw_compat_2_6[] array, via the 'format_transport_address=off' property. We removed all machines using that array, lets remove that property, simplifying virtio_mmio_bus_get_dev_path(). Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Mark Cave-Ayland Reviewed-by: Thomas Huth --- include/hw/virtio/virtio-mmio.h | 1 - hw/virtio/virtio-mmio.c | 15 --------------- 2 files changed, 16 deletions(-) diff --git a/include/hw/virtio/virtio-mmio.h b/include/hw/virtio/virtio-mmio.h index aa492620228..8b19ec2291a 100644 --- a/include/hw/virtio/virtio-mmio.h +++ b/include/hw/virtio/virtio-mmio.h @@ -66,7 +66,6 @@ struct VirtIOMMIOProxy { uint32_t guest_page_shift; /* virtio-bus */ VirtioBusState bus; - bool format_transport_address; /* Fields only used for non-legacy (v2) devices */ uint32_t guest_features[2]; VirtIOMMIOQueue vqs[VIRTIO_QUEUE_MAX]; diff --git a/hw/virtio/virtio-mmio.c b/hw/virtio/virtio-mmio.c index 532c67107ba..b7ee115b990 100644 --- a/hw/virtio/virtio-mmio.c +++ b/hw/virtio/virtio-mmio.c @@ -752,8 +752,6 @@ static void virtio_mmio_pre_plugged(DeviceState *d, Error **errp) /* virtio-mmio device */ static const Property virtio_mmio_properties[] = { - DEFINE_PROP_BOOL("format_transport_address", VirtIOMMIOProxy, - format_transport_address, true), DEFINE_PROP_BOOL("force-legacy", VirtIOMMIOProxy, legacy, true), DEFINE_PROP_BIT("ioeventfd", VirtIOMMIOProxy, flags, VIRTIO_IOMMIO_FLAG_USE_IOEVENTFD_BIT, true), @@ -815,19 +813,6 @@ static char *virtio_mmio_bus_get_dev_path(DeviceState *dev) virtio_mmio_proxy = VIRTIO_MMIO(virtio_mmio_bus->parent); proxy_path = qdev_get_dev_path(DEVICE(virtio_mmio_proxy)); - /* - * If @format_transport_address is false, then we just perform the same as - * virtio_bus_get_dev_path(): we delegate the address formatting for the - * device on the virtio-mmio bus to the bus that the virtio-mmio proxy - * (i.e., the device that implements the virtio-mmio bus) resides on. In - * this case the base address of the virtio-mmio transport will be - * invisible. - */ - if (!virtio_mmio_proxy->format_transport_address) { - return proxy_path; - } - - /* Otherwise, we append the base address of the transport. */ section = memory_region_find(&virtio_mmio_proxy->iomem, 0, 0x200); assert(section.mr); From patchwork Thu May 8 13:35:40 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: 888600 Delivered-To: patch@linaro.org Received: by 2002:adf:b60d:0:b0:3a1:f579:ae88 with SMTP id f13csp8995wre; Thu, 8 May 2025 06:42:59 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWhIVGd5NVK667C57nABbepMAFnHtfWYUgdO7DkmYNmg9iXdV9VitUARtJ/+D/Zu1S5jAzZMA==@linaro.org X-Google-Smtp-Source: AGHT+IE7V17AJwN0UYraZ5s/mCUmlq8X9I0xdY979AnZfR/IQzrj55DKSY5oQXRdxwI75knQbigt X-Received: by 2002:a05:622a:4812:b0:477:1126:5a33 with SMTP id d75a77b69052e-4944921228emr52504481cf.1.1746711779565; Thu, 08 May 2025 06:42:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1746711779; cv=none; d=google.com; s=arc-20240605; b=E2O7Ry8ZInPliWLavBqV7GdyVpL/FcQaS/sVFge2AQKTA+WvtS2BtjdHicwGQ0WfLt 8lQcUQAD1c6c7iV1/zJpV6+tlkC6SNRNSWpnTJhAPrzLOE3btQBkwaTizmJNQqaW80Ub v9Ys/ig7vufM2lh8CySXQbh55XvfBNlkH9aFx9f2E8vEi12bSGHObcZ0bKlZV7IGXpgG 06uK+kT0wykjzd+rLQOXQ108W14qKU5BS1bWETKqR/t7yn4z2+U99Hvyqhsja7ANwrKZ ESwVXmmmZHqqvRiChcLGkDSEeoqzJqd1MhlpPLXTRqZLkkNcE9snMZ3evJoCVGfmyJYp 4iRg== 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=zEKZAR/VZgMFUr6PYFqtHtppbGxXvaRql4Q5kTcH03k=; fh=fPkRSEYCel/EUuwKjeUH2HSngyX7ytCg7docWFAAYgw=; b=hntagYY7Jx0275BHIH0YNst26i5bw3OpccsM3hTPyicvw25XagApwKjnYO+NOGyAtZ ZOnRnWNTA9PL1rER2YYv4I32HONsyPcdtJuBmgZwCoNNqgQn3TXyINMzaXDP54a1MFo1 tsNFciiFnGG4SIy2sFujk7jUfbK2m3C2DiI39tfeqN1IT+NS1y5ZwH763AUa52CH27Hx qc+fAfvfACqPaq8tMZcoIk5SyMeab3nxWDSdYZbcIjN4DsrECXH/V0TO1XqHjeESbfCj 2PJlM6IX39c9fpYzJYmRCfoN4uUJpN3xNKENwu41XtbV5mujneFtTeBSUjupHYJnMMlF pPPQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=QDlobytF; 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-492229a5bbdsi44652141cf.274.2025.05.08.06.42.59 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 08 May 2025 06:42:59 -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=QDlobytF; 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 1uD1WL-0003zU-Ck; Thu, 08 May 2025 09:42:41 -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 1uD1WB-0003ls-98 for qemu-devel@nongnu.org; Thu, 08 May 2025 09:42:31 -0400 Received: from mail-pj1-x1033.google.com ([2607:f8b0:4864:20::1033]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uD1W6-0004gd-AW for qemu-devel@nongnu.org; Thu, 08 May 2025 09:42:29 -0400 Received: by mail-pj1-x1033.google.com with SMTP id 98e67ed59e1d1-309fac646adso2036232a91.1 for ; Thu, 08 May 2025 06:42:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1746711744; x=1747316544; 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=zEKZAR/VZgMFUr6PYFqtHtppbGxXvaRql4Q5kTcH03k=; b=QDlobytFiUCP5MMBsbHeXpXcF3D7zGK+ybfv/zzhMfY86T0316LdO8RMI8Ak45i26U a6sE/C8hEGADJni5eQ3J81k6AvANmlGEru1ID3fKcJ2N/+Mk2j9vn7a0FUD/L7uhTKfM rCkHjqMhLDUHE2kVATpmEd0h80dK1YqfuWK8WBYe0XZSKrH1TGDKYhz9JGdr2OxvYM41 iipdGn+1oP/RDRhnbgJxqKPz9irTeON9Xt66BFO5UEO6b+FWqz2Si0Zf69k6FLeKKCou PMhsmZ1N4KzHrRebgn3UKIiRwcUyA0aqQtSghMIt9ctZkZeF9tn/Y6DMQ4z2RUlJHDTO 3hog== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746711744; x=1747316544; 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=zEKZAR/VZgMFUr6PYFqtHtppbGxXvaRql4Q5kTcH03k=; b=NN+WVSuUkoQuu7Q8QrRERd+GqzPZoGivoD4f3F7lfYBa4YVIZUlhAMVAef4at2HrTW FE+g7d989dQZqY1nRQNiFzjjiByUnmEtiHKElWINLJVTMR5o3zsU0d5HtJO6slrcbo0X ZgXJIEK+9kLg9YlMkAAC2TNtpjWz3HCinmBmZuer4x5yGnONxm0c2uOVq0taPX7Lcr6j gMYuurMgnCFsB5NAZLGX3Y4E0xwgtX63WnjsZWAgDG6WIgfzQ9ddk42+QFzuFh3xdVKb vS7QfNmfVmbnxKHD7BgLUVVresaHPEfhnkJjaSpsxBT8MFQ+7/r3RIfnsfCAB/JRJJzy csWw== X-Gm-Message-State: AOJu0Yxbm6jJSMd38KwO7TahjEvj8KfGsBCJW9ymbqoPJfPHsj1vodxl mTiFh6wt3XmRtEp9hXYkEsVvJoUI7LhVyNyJiV0SJLO7TaWRm/Binr9qNMUewG7Dve4pc8xc8WM a2TqkKQ== X-Gm-Gg: ASbGncuba2RY6DaeKftqeldB29u05H135HkxqiwLaT7MwxRugqy7n4iXVlnGvide9VJ Jkb09eG8ynwiEM2zzqnmQ59t81CC2HiYdA5XayI9T9prNzYgxdYVgMNNV2JOxj0LjRwiZh2D/JI rhePjJtDD8KDNhOk+WsZWVg3lTWRpukSY0783APxYASKIUD3a4iPGFjEUnEdlmPPLGZY1nGliFE pG3WKKJBkUPufAPppa5cqLq1jc8wZmlaC8S0+sJXgo+dpYRyBv/GccXIT95GHLQG7s5GbKaRceD 6CQTv3W1bbDMCPjgdQJPWplE4H6rGYmvn5bWdo6bC2jSseDaREBvj3/vZRLIqOXwvf7WXm2S7y3 tEBbwPVMVFv9293I= X-Received: by 2002:a17:90b:3b91:b0:2ee:8cbb:de28 with SMTP id 98e67ed59e1d1-30adbf18acamr5563077a91.8.1746711743871; Thu, 08 May 2025 06:42:23 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-30ad4d2f15dsm2382033a91.18.2025.05.08.06.42.09 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 08 May 2025 06:42:23 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , kvm@vger.kernel.org, Sergio Lopez , Gerd Hoffmann , Peter Maydell , Laurent Vivier , Jiaxun Yang , Yi Liu , "Michael S. Tsirkin" , Eduardo Habkost , Marcel Apfelbaum , Alistair Francis , Daniel Henrique Barboza , Marcelo Tosatti , qemu-riscv@nongnu.org, Weiwei Li , Amit Shah , Zhao Liu , Yanan Wang , Helge Deller , Palmer Dabbelt , Ani Sinha , Igor Mammedov , Fabiano Rosas , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Liu Zhiwei , =?utf-8?q?Cl=C3=A9ment_Mathieu--?= =?utf-8?q?Drif?= , qemu-arm@nongnu.org, =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Huacai Chen , Jason Wang , Mark Cave-Ayland , Thomas Huth Subject: [PATCH v4 17/27] hw/i386/pc: Remove deprecated pc-q35-2.7 and pc-i440fx-2.7 machines Date: Thu, 8 May 2025 15:35:40 +0200 Message-ID: <20250508133550.81391-18-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250508133550.81391-1-philmd@linaro.org> References: <20250508133550.81391-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::1033; envelope-from=philmd@linaro.org; helo=mail-pj1-x1033.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 These machines has been supported for a period of more than 6 years. According to our versioned machine support policy (see commit ce80c4fa6ff "docs: document special exception for machine type deprecation & removal") they can now be removed. Remove the qtest in test-x86-cpuid-compat.c file. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Mark Cave-Ayland Reviewed-by: Thomas Huth --- hw/i386/pc_piix.c | 9 --------- hw/i386/pc_q35.c | 10 ---------- tests/qtest/test-x86-cpuid-compat.c | 11 ----------- 3 files changed, 30 deletions(-) diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index 98a118fd4a0..98bd8d0e67b 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -755,15 +755,6 @@ static void pc_i440fx_machine_2_8_options(MachineClass *m) DEFINE_I440FX_MACHINE(2, 8); -static void pc_i440fx_machine_2_7_options(MachineClass *m) -{ - pc_i440fx_machine_2_8_options(m); - compat_props_add(m->compat_props, hw_compat_2_7, hw_compat_2_7_len); - compat_props_add(m->compat_props, pc_compat_2_7, pc_compat_2_7_len); -} - -DEFINE_I440FX_MACHINE(2, 7); - #ifdef CONFIG_ISAPC static void isapc_machine_options(MachineClass *m) { diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c index b7ffb5f1216..a1f46cd8f03 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -648,13 +648,3 @@ static void pc_q35_machine_2_8_options(MachineClass *m) } DEFINE_Q35_MACHINE(2, 8); - -static void pc_q35_machine_2_7_options(MachineClass *m) -{ - pc_q35_machine_2_8_options(m); - m->max_cpus = 255; - compat_props_add(m->compat_props, hw_compat_2_7, hw_compat_2_7_len); - compat_props_add(m->compat_props, pc_compat_2_7, pc_compat_2_7_len); -} - -DEFINE_Q35_MACHINE(2, 7); diff --git a/tests/qtest/test-x86-cpuid-compat.c b/tests/qtest/test-x86-cpuid-compat.c index 456e2af6657..5e0547e81b7 100644 --- a/tests/qtest/test-x86-cpuid-compat.c +++ b/tests/qtest/test-x86-cpuid-compat.c @@ -345,17 +345,6 @@ int main(int argc, char **argv) /* Check compatibility of old machine-types that didn't * auto-increase level/xlevel/xlevel2: */ - if (qtest_has_machine("pc-i440fx-2.7")) { - add_cpuid_test("x86/cpuid/auto-level/pc-2.7", - "486", "arat=on,avx512vbmi=on,xsaveopt=on", - "pc-i440fx-2.7", "level", 1); - add_cpuid_test("x86/cpuid/auto-xlevel/pc-2.7", - "486", "3dnow=on,sse4a=on,invtsc=on,npt=on,svm=on", - "pc-i440fx-2.7", "xlevel", 0); - add_cpuid_test("x86/cpuid/auto-xlevel2/pc-2.7", - "486", "xstore=on", "pc-i440fx-2.7", - "xlevel2", 0); - } if (qtest_has_machine("pc-i440fx-2.9")) { add_cpuid_test("x86/cpuid/auto-level7/pc-i440fx-2.9/off", "Conroe", NULL, "pc-i440fx-2.9", From patchwork Thu May 8 13:35:41 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: 888601 Delivered-To: patch@linaro.org Received: by 2002:adf:b60d:0:b0:3a1:f579:ae88 with SMTP id f13csp9072wre; Thu, 8 May 2025 06:43:10 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXodlaFz3oQoeL21WxWo0PDCTHp+iRUVWAnJ/FSIw7BQVQCGc4pZqP8RqO5g5b4e2LzZXeKIg==@linaro.org X-Google-Smtp-Source: AGHT+IHmVkE+9Gi7L+jcKzqKy+so4WSugnXD543Hc6/GqrR0LvKYngyrNO0mo44zXr0z+1tnECHF X-Received: by 2002:a05:620a:4083:b0:7c7:a5f6:2633 with SMTP id af79cd13be357-7ccf9dffa03mr483802885a.6.1746711789946; Thu, 08 May 2025 06:43:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1746711789; cv=none; d=google.com; s=arc-20240605; b=OEMlX79wOwpN3VxAwXnvNPazf9FrXD4spomtauaiTwdLXrwP1eFEEEjBwf0kEyigQS I6HyYPcfKxzXR19UIzTcV8ZtgSfMPnsIpQych5WJNvE8CkC5ub9DBExDIMHxkYsr+MYS 5rFi1SkzZxWiQNGZIrfrD+zKBxf7eGb4YBEbxRwZHKEVtvGGtiH2YxeZdFSVzzoThgfe CD+AuOFbWYK/CpEzQN3w+Sf8KR0HLSjam6o8PT9E1MzWtZexSudndhJx+kGXeOrivMLR ybREtvbyTUfK8ogaoJsdN6RZOcQds/LTl41+ggoXDPm3mlnNrIdpdZaZO92X4K5TD225 H9Zg== 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=gg679U0oeTq/CrQiB/JmPwYk2e2+O7nBapgQj4COJfQ=; fh=qkK1RBlCchS9kCqqoLn396d6WKggtWTjkzjmenPsbzA=; b=Rwgr5Qhed3bOh/YIYQt0GTvKoBZfrCC7ZjnyKDkPgJ82nL9ly9B0ftSpH2lDksqfdG 7C3bljyYL8P0p05q3isd6RAMeilAXKi3gJIQViuXBgw4oco1IiWKi+egUBflzmnR1Ofj t29a7BCXwW0UNaJpdIPdSKfj5aXFZYbukgz0Mu7pxE2UsuTUELoYwB+eLIrDD/VohmdA p8J6HWP+g2FDsr6NnBy69qH8WlHo/SrGn7YEEHmKMpO1il7eYIkpm+YksNSC4FelwloO 7iffOh7HWEdeXprnJpyvRTldH5wbof2ML5AHXspTZzRbVUKUIhLwd4QFYClgJP+IPo2Y FzBw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=VCLuXgvo; 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 af79cd13be357-7caf75c9b9fsi471866185a.538.2025.05.08.06.43.09 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 08 May 2025 06:43:09 -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=VCLuXgvo; 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 1uD1Wd-0004W0-8d; Thu, 08 May 2025 09:43:00 -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 1uD1WU-0004Q0-N7 for qemu-devel@nongnu.org; Thu, 08 May 2025 09:42:50 -0400 Received: from mail-pl1-x633.google.com ([2607:f8b0:4864:20::633]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uD1WR-0004jj-Hz for qemu-devel@nongnu.org; Thu, 08 May 2025 09:42:50 -0400 Received: by mail-pl1-x633.google.com with SMTP id d9443c01a7336-22c3407a87aso13408265ad.3 for ; Thu, 08 May 2025 06:42:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1746711765; x=1747316565; 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=gg679U0oeTq/CrQiB/JmPwYk2e2+O7nBapgQj4COJfQ=; b=VCLuXgvoFb4mjBA3mHRP7790++foWnuIb8qexm19n/uuzXW3ybcunp9TonNPNGhUw2 b9itChusjpb6dxe6CiIjlUeLZTyEHfp+FQbrxBa74cNw+hgY1OBOBRXXuqEkTsUvVE14 PK0/xPHFJZw1HwRw180/adto8dysyMSZmH5l0vf7+ceA6PptajxTBlAFtC9wtjrGBZSv 4lzAm1O5fjAbWtfgjMp2c8oygkHmJ9stlYvbSA1E7nwpb85L5I8eG2NkqTBWB9CnE6GV AazqTUkRrdeUxgQi8mZD76xFg6mU/5nPmJW4YbLT99GWQc9VCgdHZYOWbBUYKsgxk21V iTOg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746711765; x=1747316565; 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=gg679U0oeTq/CrQiB/JmPwYk2e2+O7nBapgQj4COJfQ=; b=jvOnDIVuJKTj+InqwQ7w11P+HPnh2GjAluIo9NAj8WnKnZFXsAPPhhhvryzC3jOyQ7 LcwbnkfYMPOoA+mPMxe4LpFHcNwIFqWlaDbrid86KVW9vIW0NNwAY8XoQ7c0SWPmukum p8vKby8rdWqpDM2o/jBvgkKtNe8SF0QFQs07XjZGEY3cdJuN2aS5NoCAMDmzd+WMnPzp hsYQEeOWDP2AVTET2hznOMC6f4Xgt88xzPReHq2kyg5ayJ9hs+73Du4i2Wh70Z9uLrtH uFOaZnWSz+oxG1UdmCCoLYzKqXgkrgXLxp+BW7jb/yyK3KHpOykZ+rus0f7FX8vxhKKh +6Mw== X-Gm-Message-State: AOJu0Yw2HtIGfts45NLk7/KwY+9vLwKFVGuEu9Jfp9/FvPXna0T+09PE uOVhof2L2h6V0tQ3oxOVENqYYKEdvYTIGa33pQpO6UNZ/tGM4lTFYoGOQj/nTtZ7Z/WDnJPmONt vKdSdjw== X-Gm-Gg: ASbGncuS3mFgZYpItwL9ax1Xod1bNGRHqqkMuRkELaBcHt8CgrIONKA+8jVbNUj0YzS I/H5NScTYqHZoJe1FufbcP8RDnkeLXD+BJOZp5s4P/5hsa6znRPxWBnoFu1jEjcCm8rimYmPRDz ofaW1/amNER9RZuDmeV6+i5x0leftvE67c/JWsdyPoXCA9nDXKTFjrn/BrUmQWTIP7FAZeBqLca TXpPFDMhQH6ylWT9IoR8S6VJee/U1ZDUrNAaT+EvkF0mXyfIRQcgdDKWHUujLfQCD5GeR+Bxlgo qEGEs2WONNqGzYFvPn6ZfizzptiGgX6OslG3goIJienC1d/RbBeY2U5E8wI8Iv8GGYxqj742aYB 44rzPK0Nk8NUtq6cqAKViJFWZPQ== X-Received: by 2002:a17:903:41ca:b0:22e:421b:49ad with SMTP id d9443c01a7336-22e8f0b60a9mr53754775ad.46.1746711765042; Thu, 08 May 2025 06:42:45 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-22e15232655sm111626845ad.259.2025.05.08.06.42.31 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 08 May 2025 06:42:44 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , kvm@vger.kernel.org, Sergio Lopez , Gerd Hoffmann , Peter Maydell , Laurent Vivier , Jiaxun Yang , Yi Liu , "Michael S. Tsirkin" , Eduardo Habkost , Marcel Apfelbaum , Alistair Francis , Daniel Henrique Barboza , Marcelo Tosatti , qemu-riscv@nongnu.org, Weiwei Li , Amit Shah , Zhao Liu , Yanan Wang , Helge Deller , Palmer Dabbelt , Ani Sinha , Igor Mammedov , Fabiano Rosas , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Liu Zhiwei , =?utf-8?q?Cl=C3=A9ment_Mathieu--?= =?utf-8?q?Drif?= , qemu-arm@nongnu.org, =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Huacai Chen , Jason Wang , Mark Cave-Ayland Subject: [PATCH v4 18/27] hw/i386/pc: Remove pc_compat_2_7[] array Date: Thu, 8 May 2025 15:35:41 +0200 Message-ID: <20250508133550.81391-19-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250508133550.81391-1-philmd@linaro.org> References: <20250508133550.81391-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::633; envelope-from=philmd@linaro.org; helo=mail-pl1-x633.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 pc_compat_2_7[] array was only used by the pc-q35-2.7 and pc-i440fx-2.7 machines, which got removed. Remove it. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Mark Cave-Ayland --- include/hw/i386/pc.h | 3 --- hw/i386/pc.c | 10 ---------- 2 files changed, 13 deletions(-) diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index 4fb2033bc54..319ec82f709 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -289,9 +289,6 @@ extern const size_t pc_compat_2_9_len; extern GlobalProperty pc_compat_2_8[]; extern const size_t pc_compat_2_8_len; -extern GlobalProperty pc_compat_2_7[]; -extern const size_t pc_compat_2_7_len; - #define DEFINE_PC_MACHINE(suffix, namestr, initfn, optsfn) \ static void pc_machine_##suffix##_class_init(ObjectClass *oc, \ const void *data) \ diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 65a11ea8f99..c7cdbe93753 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -241,16 +241,6 @@ GlobalProperty pc_compat_2_8[] = { }; const size_t pc_compat_2_8_len = G_N_ELEMENTS(pc_compat_2_8); -GlobalProperty pc_compat_2_7[] = { - { TYPE_X86_CPU, "l3-cache", "off" }, - { TYPE_X86_CPU, "full-cpuid-auto-level", "off" }, - { "Opteron_G3" "-" TYPE_X86_CPU, "family", "15" }, - { "Opteron_G3" "-" TYPE_X86_CPU, "model", "6" }, - { "Opteron_G3" "-" TYPE_X86_CPU, "stepping", "1" }, - { "isa-pcspk", "migrate", "off" }, -}; -const size_t pc_compat_2_7_len = G_N_ELEMENTS(pc_compat_2_7); - /* * @PC_FW_DATA: * Size of the chunk of memory at the top of RAM for the BIOS ACPI tables From patchwork Thu May 8 13:35:42 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: 888602 Delivered-To: patch@linaro.org Received: by 2002:adf:b60d:0:b0:3a1:f579:ae88 with SMTP id f13csp9222wre; Thu, 8 May 2025 06:43:31 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUg6nQQ0vXvIw+IWEX03vLJHuOgku+xijNAd0goIJEt1KxwjaKLW/KHxCT77LmQ8rEQo602YQ==@linaro.org X-Google-Smtp-Source: AGHT+IGDrot+wXG1MkEQEWe/QwTi6rJemm7RV6E8rPLPcP9YHAcQBUrBT5sZPRmBoUbXeuTiY5Pt X-Received: by 2002:a05:6214:f03:b0:6f2:a457:19a with SMTP id 6a1803df08f44-6f542ad7344mr129467426d6.25.1746711811570; Thu, 08 May 2025 06:43:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1746711811; cv=none; d=google.com; s=arc-20240605; b=iBoJ2cr06a/ySCjIN5a4R1d6OdaXmSt6TPdRnqAhTEwHE1rM4mPl1WtK8BqKUhxv/L 34RW9nGBytIgu6p5RAenPiDr3KRZ8JP1hnFo9ybkOra/blNT5w4Ekm2tn2nboBDwZodU P+vt5F3axmtMbBUMzIgUm9E0jXuMOIqXMAzJv7pIMgIgysHC4SVon3RDuixnOz/zYrD8 AJAOV8M62y/P00GBAAfiNGPZbTK6/Z6ehIbjNvWAqrMHGX/SCQbxOqMzw9CimRmW8OsW /U+j1LOHmcSb55pBK++17XucfM8YsEc7J1ctK+t2qJ159HSDWSi4AX3s4A7MUjWnF9V1 824w== 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=4ftaUxFMOJWyPcpYYJywN7GZrXuW4pScDj+n5IUMy18=; fh=t4sCPXSJJxzszaJF+1Mm6mpQfCAwhf2cujSX+L6g5pY=; b=hhu+ID0LBzpVtVg6VWuUSYGCvA02mwarDZqpQ6fcrjBZ56fHJEpn+Iffr450nyC0ay u7RskeQH4jxC/5bKyjN5y31omaBCuurdOsa7vjOXqzuEesc76aUc46LKgQKzfIKlKJZ7 bbfIYn3Qjdwn1xpw5QQMGAqiymvFC3LHVnSRF3Q/44SH9DacciiGScq0cnnu4fPKCiDp kNNm65cD/W/7iWZTiak5+dXqHMo/PH9JJtdsbaVscSUuvk1hL+6muMbv96B04D9KmW0i o82Lpxgw3fO73bJe4Mn2DyMSiD1ANt5Zvo3JWZ4irFooCxgq/cxvNRQme3yLXN+F7EpB FNbA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=vRQBUfY7; 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 6a1803df08f44-6f5427c576bsi41950066d6.334.2025.05.08.06.43.31 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 08 May 2025 06:43:31 -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=vRQBUfY7; 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 1uD1Wv-0005bz-09; Thu, 08 May 2025 09:43:17 -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 1uD1Ws-0005VZ-Nw for qemu-devel@nongnu.org; Thu, 08 May 2025 09:43:14 -0400 Received: from mail-pl1-x62e.google.com ([2607:f8b0:4864:20::62e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uD1Wo-0004oz-Rl for qemu-devel@nongnu.org; Thu, 08 May 2025 09:43:14 -0400 Received: by mail-pl1-x62e.google.com with SMTP id d9443c01a7336-227b828de00so9655645ad.1 for ; Thu, 08 May 2025 06:43:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1746711789; x=1747316589; 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=4ftaUxFMOJWyPcpYYJywN7GZrXuW4pScDj+n5IUMy18=; b=vRQBUfY7jAiZ/J9ugccgjCUdR2u2+nXIZQmL6kBfZAk1ZSeSh40LZ90aLQO21+IioW NxITz0Ciu37fwZuRs0SmjXn4L+SHfg9LpPlfsGwKSf8hx89j4OpWj+Nj/LE4QnVEMDu9 jyGJTrDaUWeQGJS3nFpa/R1GGzn9+rRBuLgZ5Dhh23JVMd++guV8hgb6aGFp08zeuiTG 1wISoj/yVpC0Wi03MjPimedKboyOhUokIrI91iqhe1yXUs7HakMfYYRax2u7GL1qk2ge N4b4XHmb+DQz8s7sT8qWusXWtRIB8hXDSmCP10t8L+sp63Ql1gieW9Vb/UF0LvK2utJQ z9Ng== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746711789; x=1747316589; 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=4ftaUxFMOJWyPcpYYJywN7GZrXuW4pScDj+n5IUMy18=; b=qyKDphJzaz7IzpRrzSrt/9U1HTP5nn1xT1m/PZuBtQjws082CZ2+X/WKVRTFg+wxdL X0+KaVfWwCQrwjAk9gJxxbeOjcb08mHaDHcW81Nlu3N0td0RtBP8tw48tGPn6bBx15Ph hQNjDQ3fRKJW03rt9K4A4dTNs/oRF44/y7lMrNHGpjV5bGC2huwCpav3eCi1Xt0H2ZD0 qMRYqpemh8S558ZG/cJCh5vjTR8owid6i+6kA78T32eendUxD+carXITdsykOMotldVS HMp4UIy48ZH4OaU72MrGa6WBthJpxk4w3kG0ykrLLavlWJqfK5S3FYwtNjEJD6xZRGm7 sbxA== X-Gm-Message-State: AOJu0YxqOFA/661PUqdNM617VvT2s0WpIM+b2SBdwQvcLUhfRuqySze3 xj0mupsvRZC6wemeFL51pNt+1pArIPNHA5SnNoT89pLO/m7uAKbN+/CpxzXce7lZ0lZjRTrCydi TpTz1ug== X-Gm-Gg: ASbGncs3W9pyRC741b2yzZVhpqj5Sh2BSyqZDluGys3005TzkzEjwBIeJ46bM1IfNL3 z0hbre3Bj3FFe6q2nJCrC+qPW3cfRC1CmASMOVkA4MNHlCt2Wse4y2iz92r2U9w9IbEESzTVWqF LavetnUjBV2oj76QxY6YnHr8Y9TnUQoO8hA+uy7i8L0k6Mcpzcfhg77L/t79Zn5XoQxmuA/k7QC xaS+cll4kU8DGstdPJImUmQWNoS3vzUQWj9xzxmogJgsHlB+JwezLnMpf2Zo0Z49/pUq8fGpx92 ouWIGs3640sadg4b7kfArpQwl1SQW+V/Etu8+ZzvugV+tx/67tK233DRZdjfh8jSeKw9XrYjYSk 7qe6ks850vJcqHYI= X-Received: by 2002:a17:903:2310:b0:223:62f5:fd44 with SMTP id d9443c01a7336-22e5ec997b4mr119109545ad.40.1746711787379; Thu, 08 May 2025 06:43:07 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-b22b0594a67sm240599a12.23.2025.05.08.06.42.53 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 08 May 2025 06:43:07 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , kvm@vger.kernel.org, Sergio Lopez , Gerd Hoffmann , Peter Maydell , Laurent Vivier , Jiaxun Yang , Yi Liu , "Michael S. Tsirkin" , Eduardo Habkost , Marcel Apfelbaum , Alistair Francis , Daniel Henrique Barboza , Marcelo Tosatti , qemu-riscv@nongnu.org, Weiwei Li , Amit Shah , Zhao Liu , Yanan Wang , Helge Deller , Palmer Dabbelt , Ani Sinha , Igor Mammedov , Fabiano Rosas , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Liu Zhiwei , =?utf-8?q?Cl=C3=A9ment_Mathieu--?= =?utf-8?q?Drif?= , qemu-arm@nongnu.org, =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Huacai Chen , Jason Wang Subject: [PATCH v4 19/27] target/i386/cpu: Remove CPUX86State::full_cpuid_auto_level field Date: Thu, 8 May 2025 15:35:42 +0200 Message-ID: <20250508133550.81391-20-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250508133550.81391-1-philmd@linaro.org> References: <20250508133550.81391-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::62e; envelope-from=philmd@linaro.org; helo=mail-pl1-x62e.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 CPUX86State::full_cpuid_auto_level boolean was only disabled for the pc-q35-2.7 and pc-i440fx-2.7 machines, which got removed. Being now always %true, we can remove it and simplify x86_cpu_expand_features(). Signed-off-by: Philippe Mathieu-Daudé --- target/i386/cpu.h | 3 -- target/i386/cpu.c | 106 ++++++++++++++++++++++------------------------ 2 files changed, 51 insertions(+), 58 deletions(-) diff --git a/target/i386/cpu.h b/target/i386/cpu.h index 7585407da54..b5cbd91c156 100644 --- a/target/i386/cpu.h +++ b/target/i386/cpu.h @@ -2241,9 +2241,6 @@ struct ArchCPU { */ bool legacy_multi_node; - /* Enable auto level-increase for all CPUID leaves */ - bool full_cpuid_auto_level; - /* Only advertise CPUID leaves defined by the vendor */ bool vendor_cpuid_only; diff --git a/target/i386/cpu.c b/target/i386/cpu.c index fb505d13122..6b9a1f2251a 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -7843,68 +7843,65 @@ void x86_cpu_expand_features(X86CPU *cpu, Error **errp) /* CPUID[EAX=7,ECX=0].EBX always increased level automatically: */ x86_cpu_adjust_feat_level(cpu, FEAT_7_0_EBX); - if (cpu->full_cpuid_auto_level) { - x86_cpu_adjust_feat_level(cpu, FEAT_1_EDX); - x86_cpu_adjust_feat_level(cpu, FEAT_1_ECX); - x86_cpu_adjust_feat_level(cpu, FEAT_6_EAX); - x86_cpu_adjust_feat_level(cpu, FEAT_7_0_ECX); - x86_cpu_adjust_feat_level(cpu, FEAT_7_1_EAX); - x86_cpu_adjust_feat_level(cpu, FEAT_7_1_EDX); - x86_cpu_adjust_feat_level(cpu, FEAT_7_2_EDX); - x86_cpu_adjust_feat_level(cpu, FEAT_8000_0001_EDX); - x86_cpu_adjust_feat_level(cpu, FEAT_8000_0001_ECX); - x86_cpu_adjust_feat_level(cpu, FEAT_8000_0007_EDX); - x86_cpu_adjust_feat_level(cpu, FEAT_8000_0008_EBX); - x86_cpu_adjust_feat_level(cpu, FEAT_C000_0001_EDX); - x86_cpu_adjust_feat_level(cpu, FEAT_SVM); - x86_cpu_adjust_feat_level(cpu, FEAT_XSAVE); + x86_cpu_adjust_feat_level(cpu, FEAT_1_EDX); + x86_cpu_adjust_feat_level(cpu, FEAT_1_ECX); + x86_cpu_adjust_feat_level(cpu, FEAT_6_EAX); + x86_cpu_adjust_feat_level(cpu, FEAT_7_0_ECX); + x86_cpu_adjust_feat_level(cpu, FEAT_7_1_EAX); + x86_cpu_adjust_feat_level(cpu, FEAT_7_1_EDX); + x86_cpu_adjust_feat_level(cpu, FEAT_7_2_EDX); + x86_cpu_adjust_feat_level(cpu, FEAT_8000_0001_EDX); + x86_cpu_adjust_feat_level(cpu, FEAT_8000_0001_ECX); + x86_cpu_adjust_feat_level(cpu, FEAT_8000_0007_EDX); + x86_cpu_adjust_feat_level(cpu, FEAT_8000_0008_EBX); + x86_cpu_adjust_feat_level(cpu, FEAT_C000_0001_EDX); + x86_cpu_adjust_feat_level(cpu, FEAT_SVM); + x86_cpu_adjust_feat_level(cpu, FEAT_XSAVE); - /* Intel Processor Trace requires CPUID[0x14] */ - if ((env->features[FEAT_7_0_EBX] & CPUID_7_0_EBX_INTEL_PT)) { - if (cpu->intel_pt_auto_level) { - x86_cpu_adjust_level(cpu, &cpu->env.cpuid_min_level, 0x14); - } else if (cpu->env.cpuid_min_level < 0x14) { - mark_unavailable_features(cpu, FEAT_7_0_EBX, - CPUID_7_0_EBX_INTEL_PT, - "Intel PT need CPUID leaf 0x14, please set by \"-cpu ...,intel-pt=on,min-level=0x14\""); - } + /* Intel Processor Trace requires CPUID[0x14] */ + if ((env->features[FEAT_7_0_EBX] & CPUID_7_0_EBX_INTEL_PT)) { + if (cpu->intel_pt_auto_level) { + x86_cpu_adjust_level(cpu, &cpu->env.cpuid_min_level, 0x14); + } else if (cpu->env.cpuid_min_level < 0x14) { + mark_unavailable_features(cpu, FEAT_7_0_EBX, CPUID_7_0_EBX_INTEL_PT, + "Intel PT need CPUID leaf 0x14, please set by \"-cpu ...,intel-pt=on,min-level=0x14\""); } + } - /* - * Intel CPU topology with multi-dies support requires CPUID[0x1F]. - * For AMD Rome/Milan, cpuid level is 0x10, and guest OS should detect - * extended toplogy by leaf 0xB. Only adjust it for Intel CPU, unless - * cpu->vendor_cpuid_only has been unset for compatibility with older - * machine types. - */ - if (x86_has_extended_topo(env->avail_cpu_topo) && - (IS_INTEL_CPU(env) || !cpu->vendor_cpuid_only)) { - x86_cpu_adjust_level(cpu, &env->cpuid_min_level, 0x1F); - } + /* + * Intel CPU topology with multi-dies support requires CPUID[0x1F]. + * For AMD Rome/Milan, cpuid level is 0x10, and guest OS should detect + * extended toplogy by leaf 0xB. Only adjust it for Intel CPU, unless + * cpu->vendor_cpuid_only has been unset for compatibility with older + * machine types. + */ + if (x86_has_extended_topo(env->avail_cpu_topo) && + (IS_INTEL_CPU(env) || !cpu->vendor_cpuid_only)) { + x86_cpu_adjust_level(cpu, &env->cpuid_min_level, 0x1F); + } - /* Advanced Vector Extensions 10 (AVX10) requires CPUID[0x24] */ - if (env->features[FEAT_7_1_EDX] & CPUID_7_1_EDX_AVX10) { - x86_cpu_adjust_level(cpu, &env->cpuid_min_level, 0x24); - } + /* Advanced Vector Extensions 10 (AVX10) requires CPUID[0x24] */ + if (env->features[FEAT_7_1_EDX] & CPUID_7_1_EDX_AVX10) { + x86_cpu_adjust_level(cpu, &env->cpuid_min_level, 0x24); + } - /* SVM requires CPUID[0x8000000A] */ - if (env->features[FEAT_8000_0001_ECX] & CPUID_EXT3_SVM) { - x86_cpu_adjust_level(cpu, &env->cpuid_min_xlevel, 0x8000000A); - } + /* SVM requires CPUID[0x8000000A] */ + if (env->features[FEAT_8000_0001_ECX] & CPUID_EXT3_SVM) { + x86_cpu_adjust_level(cpu, &env->cpuid_min_xlevel, 0x8000000A); + } - /* SEV requires CPUID[0x8000001F] */ - if (sev_enabled()) { - x86_cpu_adjust_level(cpu, &env->cpuid_min_xlevel, 0x8000001F); - } + /* SEV requires CPUID[0x8000001F] */ + if (sev_enabled()) { + x86_cpu_adjust_level(cpu, &env->cpuid_min_xlevel, 0x8000001F); + } - if (env->features[FEAT_8000_0021_EAX]) { - x86_cpu_adjust_level(cpu, &env->cpuid_min_xlevel, 0x80000021); - } + if (env->features[FEAT_8000_0021_EAX]) { + x86_cpu_adjust_level(cpu, &env->cpuid_min_xlevel, 0x80000021); + } - /* SGX requires CPUID[0x12] for EPC enumeration */ - if (env->features[FEAT_7_0_EBX] & CPUID_7_0_EBX_SGX) { - x86_cpu_adjust_level(cpu, &env->cpuid_min_level, 0x12); - } + /* SGX requires CPUID[0x12] for EPC enumeration */ + if (env->features[FEAT_7_0_EBX] & CPUID_7_0_EBX_SGX) { + x86_cpu_adjust_level(cpu, &env->cpuid_min_level, 0x12); } /* Set cpuid_*level* based on cpuid_min_*level, if not explicitly set */ @@ -8820,7 +8817,6 @@ static const Property x86_cpu_properties[] = { DEFINE_PROP_UINT32("min-xlevel2", X86CPU, env.cpuid_min_xlevel2, 0), DEFINE_PROP_UINT8("avx10-version", X86CPU, env.avx10_version, 0), DEFINE_PROP_UINT64("ucode-rev", X86CPU, ucode_rev, 0), - DEFINE_PROP_BOOL("full-cpuid-auto-level", X86CPU, full_cpuid_auto_level, true), DEFINE_PROP_STRING("hv-vendor-id", X86CPU, hyperv_vendor), DEFINE_PROP_BOOL("x-vendor-cpuid-only", X86CPU, vendor_cpuid_only, true), DEFINE_PROP_BOOL("x-amd-topoext-features-only", X86CPU, amd_topoext_features_only, true), From patchwork Thu May 8 13:35:43 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: 888603 Delivered-To: patch@linaro.org Received: by 2002:adf:b60d:0:b0:3a1:f579:ae88 with SMTP id f13csp9323wre; Thu, 8 May 2025 06:43:51 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUdMT/G6lsesS6VQGnzAlJZk5Xigj9bbOr2GkRKw/lif8OfI+LNtvmkLV7/C0J7DYlty4APzQ==@linaro.org X-Google-Smtp-Source: AGHT+IF25CvmGQ46wyWYsQQnRS7nwUHOn9T/W5PKXtTCBIi/K6t7c0s89cHE8357ZBlHEaS7b9OH X-Received: by 2002:a05:620a:400c:b0:7c5:61b2:b7c with SMTP id af79cd13be357-7ccf9ea0581mr540392985a.47.1746711831636; Thu, 08 May 2025 06:43:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1746711831; cv=none; d=google.com; s=arc-20240605; b=S1SwvdWWd7mMSiu6YsRlxL/MSBPA/95lHHAwjyifRoNcJEqGGUAgVv/lECXmZgEUIv 3SwjZQqiPJl2/HED4NymygKlvW7Xyfe7ZxzKC8gVHLAKMLBY1y4JKetNMjyIF3nj/YwH 9PeRxFKvFFuNxDppAX1FTvV8KCDUTxj1ocOt/dnTSKhbn7e7o4Lm9CpaMPQCNle6hNhb rFCa+elcjw5VkGpW5nAXnLFnY5r3evdLdGxBEjsFtoW0XaGgtgTpPPD8gqHUm55y0YGf ymltcim1g/RUaosrdEcOQTUrDOUj3gXZHYttlgMPX+H4TlxxupfVAHytUcMaqTxRT6Ft bluA== 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=pfVenGRAMwE+Z64hRHr90BeNRoYPJugExqalvrobNt0=; fh=t4sCPXSJJxzszaJF+1Mm6mpQfCAwhf2cujSX+L6g5pY=; b=C9FnmTPiuVKdOlwgs0xM+tELDYG7AzK456ZJOpJszTiBhqv+M3g0qttLOLoEUYTmdJ naeBZlAGtf64Di2OZ9sTWh19e2Loaw8EdM/5BTBjZUG8iJc3eDW2xk6FlRaXdqYTK0Of +Fg0UptHFsEkHF1CE2HyAhbFJy4uklAyW88JQJU1R3/OcOeDDM8ovYNrs4ALfTmcLnB3 d3wSyUsygiF5dm6BItkpVwvnkINN7h2fB9ZW1idVdoBg4PJWZwacIQzn8Dm/8HgYYSj2 Dwnk/J3OAsfJDhEeXizrlS7yUP/bKeKgEHU774dO+7fwWgMFW0Z2kqUZHk3mOKjzxcZn j2YQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=hulytKT1; 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 af79cd13be357-7caf752be3bsi449331785a.174.2025.05.08.06.43.51 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 08 May 2025 06:43:51 -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=hulytKT1; 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 1uD1XE-0006mM-HK; Thu, 08 May 2025 09:43:36 -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 1uD1XC-0006hz-3A for qemu-devel@nongnu.org; Thu, 08 May 2025 09:43:34 -0400 Received: from mail-pl1-x634.google.com ([2607:f8b0:4864:20::634]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uD1X9-0004sF-UT for qemu-devel@nongnu.org; Thu, 08 May 2025 09:43:33 -0400 Received: by mail-pl1-x634.google.com with SMTP id d9443c01a7336-22e8e4423ecso9475235ad.0 for ; Thu, 08 May 2025 06:43:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1746711809; x=1747316609; 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=pfVenGRAMwE+Z64hRHr90BeNRoYPJugExqalvrobNt0=; b=hulytKT1hPoVIjADKnGCtwnlbRUBYbFzdK0xK1GO4Of87SOThpj1m3e+lk/cHbM+NW GR18dhdjKZXAYczkNk0oMBtQKjtA7Rm+2bb1OhRVwlhv3O0O40jhdmifGyqi7WqnkSE0 g5/vTb4+CpKDkiggTnwXYRdaCwXyM+LVh1m/52J5M8mSf+LFfvPI87cAaNp6L++4nNhE PuPotLdh11CW9HhuxNxNlscDbVV6G18ZTCbpO3rVSMw2YwU9wYJpVi7erdHOK+7SHw4C MeQlYXHNdXKa1KGqmaj1UjAdUzYFAC4kwflHVSyaPOoy8LbW556lBvl4puwQSkdsJMCl j7fg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746711809; x=1747316609; 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=pfVenGRAMwE+Z64hRHr90BeNRoYPJugExqalvrobNt0=; b=xALFHbsAUZvz4yfzaaXSfs/XZ+HHkXZZ4M3SJBBHii6d740MiBsrI+YQk7O8+MPTfL wZqC+NaAqtEhUnN6JvnrCrD2nzyLfNprPz7CveHtXrUyeosmEH9TOkvj+wVUojNuxO6E U4Y4KlOb4WmPhtX9ZWaa9vYS1ya9aXKWyC4Qi7U5Gs4WH/HOR++frkoyAp9FN89KMIOr 8YcHoDF0/4hyNqg020wp8VL367Fn5W9aLIN+abp9Tz8KJ7tR7XM1OMIAv0JO6AD7a79X r4e/5yjWDQewboi5RzPHHHPxvjZ7bnRSHkwdTnng7ye0sutoxgstqumfMii7oQKKgaL4 MEgA== X-Gm-Message-State: AOJu0YwU4UA5YiGL8o3+aUIfh/YH6BVSVo3IdA6YUgKgtAkw3LRDFo4g gao+CD/XiCoNMrrgLMFwjFqq2FHWq2ycOEHZ5f9eblbF2885UNj9IXCQ8YR2XEHQUJ1xfqK3DTw 2C1cqJw== X-Gm-Gg: ASbGncs8gX1gpQi9q2emFWQ2biVZ13BipYbMHn7ZqILzvWMA5i+XMSGDZzSY1XWQz4e pDbQcYHWBc06lOaCBxom/QO3gYEdMdVidXE+TMJy80PrmYN8Ge7XYPIeWO2/4Ms8T7IHmdh9YAF arP5oTNsjUAaa8H4/9VT+sJLObXCkvw9aqNJlep/ptanShwhPtnnBxHpKLP3uC0Jq5WBLmT4o0b VCOIjx971Y5q8onUWSovclAaVMbanWqAIl+hdmIwO3ZQGN4ZyVtJEXoK6f+keDs+ArlCJZfV8hF z9I286qsS68fDnfppxlQnSWtstpnAJF5BcedZGgWE9DJ23pv4Ds+ql2ijGYuCFuqpPveQ88Q0o/ +ndac7S+LWCOAL2g= X-Received: by 2002:a17:902:da84:b0:224:11fc:40c0 with SMTP id d9443c01a7336-22e85613e2amr56447695ad.11.1746711809443; Thu, 08 May 2025 06:43:29 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-22e15228fa7sm111988195ad.181.2025.05.08.06.43.15 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 08 May 2025 06:43:29 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , kvm@vger.kernel.org, Sergio Lopez , Gerd Hoffmann , Peter Maydell , Laurent Vivier , Jiaxun Yang , Yi Liu , "Michael S. Tsirkin" , Eduardo Habkost , Marcel Apfelbaum , Alistair Francis , Daniel Henrique Barboza , Marcelo Tosatti , qemu-riscv@nongnu.org, Weiwei Li , Amit Shah , Zhao Liu , Yanan Wang , Helge Deller , Palmer Dabbelt , Ani Sinha , Igor Mammedov , Fabiano Rosas , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Liu Zhiwei , =?utf-8?q?Cl=C3=A9ment_Mathieu--?= =?utf-8?q?Drif?= , qemu-arm@nongnu.org, =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Huacai Chen , Jason Wang Subject: [PATCH v4 20/27] target/i386/cpu: Remove CPUX86State::enable_l3_cache field Date: Thu, 8 May 2025 15:35:43 +0200 Message-ID: <20250508133550.81391-21-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250508133550.81391-1-philmd@linaro.org> References: <20250508133550.81391-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::634; envelope-from=philmd@linaro.org; helo=mail-pl1-x634.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 CPUX86State::enable_l3_cache boolean was only disabled for the pc-q35-2.7 and pc-i440fx-2.7 machines, which got removed. Being now always %true, we can remove it and simplify cpu_x86_cpuid() and encode_cache_cpuid80000006(). Signed-off-by: Philippe Mathieu-Daudé --- target/i386/cpu.h | 6 ------ target/i386/cpu.c | 39 +++++++++++++-------------------------- 2 files changed, 13 insertions(+), 32 deletions(-) diff --git a/target/i386/cpu.h b/target/i386/cpu.h index b5cbd91c156..62239b0a562 100644 --- a/target/i386/cpu.h +++ b/target/i386/cpu.h @@ -2219,12 +2219,6 @@ struct ArchCPU { */ bool enable_lmce; - /* Compatibility bits for old machine types. - * If true present virtual l3 cache for VM, the vcpus in the same virtual - * socket share an virtual l3 cache. - */ - bool enable_l3_cache; - /* Compatibility bits for old machine types. * If true present L1 cache as per-thread, not per-core. */ diff --git a/target/i386/cpu.c b/target/i386/cpu.c index 6b9a1f2251a..4be174ea9c7 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -468,17 +468,13 @@ static void encode_cache_cpuid80000006(CPUCacheInfo *l2, (AMD_ENC_ASSOC(l2->associativity) << 12) | (l2->lines_per_tag << 8) | (l2->line_size); - if (l3) { - assert(l3->size % (512 * 1024) == 0); - assert(l3->associativity > 0); - assert(l3->lines_per_tag > 0); - assert(l3->line_size > 0); - *edx = ((l3->size / (512 * 1024)) << 18) | - (AMD_ENC_ASSOC(l3->associativity) << 12) | - (l3->lines_per_tag << 8) | (l3->line_size); - } else { - *edx = 0; - } + assert(l3->size % (512 * 1024) == 0); + assert(l3->associativity > 0); + assert(l3->lines_per_tag > 0); + assert(l3->line_size > 0); + *edx = ((l3->size / (512 * 1024)) << 18) | + (AMD_ENC_ASSOC(l3->associativity) << 12) | + (l3->lines_per_tag << 8) | (l3->line_size); } /* Encode cache info for CPUID[8000001D] */ @@ -6849,11 +6845,7 @@ void cpu_x86_cpuid(CPUX86State *env, uint32_t index, uint32_t count, } *eax = 1; /* Number of CPUID[EAX=2] calls required */ *ebx = 0; - if (!cpu->enable_l3_cache) { - *ecx = 0; - } else { - *ecx = cpuid2_cache_descriptor(env->cache_info_cpuid2.l3_cache); - } + *ecx = cpuid2_cache_descriptor(env->cache_info_cpuid2.l3_cache); *edx = (cpuid2_cache_descriptor(env->cache_info_cpuid2.l1d_cache) << 16) | (cpuid2_cache_descriptor(env->cache_info_cpuid2.l1i_cache) << 8) | (cpuid2_cache_descriptor(env->cache_info_cpuid2.l2_cache)); @@ -6907,13 +6899,10 @@ void cpu_x86_cpuid(CPUX86State *env, uint32_t index, uint32_t count, eax, ebx, ecx, edx); break; case 3: /* L3 cache info */ - if (cpu->enable_l3_cache) { - encode_cache_cpuid4(env->cache_info_cpuid4.l3_cache, - topo_info, - eax, ebx, ecx, edx); - break; - } - /* fall through */ + encode_cache_cpuid4(env->cache_info_cpuid4.l3_cache, + topo_info, + eax, ebx, ecx, edx); + break; default: /* end of info */ *eax = *ebx = *ecx = *edx = 0; break; @@ -7284,8 +7273,7 @@ void cpu_x86_cpuid(CPUX86State *env, uint32_t index, uint32_t count, (AMD_ENC_ASSOC(L2_ITLB_4K_ASSOC) << 12) | (L2_ITLB_4K_ENTRIES); encode_cache_cpuid80000006(env->cache_info_amd.l2_cache, - cpu->enable_l3_cache ? - env->cache_info_amd.l3_cache : NULL, + env->cache_info_amd.l3_cache, ecx, edx); break; case 0x80000007: @@ -8821,7 +8809,6 @@ static const Property x86_cpu_properties[] = { DEFINE_PROP_BOOL("x-vendor-cpuid-only", X86CPU, vendor_cpuid_only, true), DEFINE_PROP_BOOL("x-amd-topoext-features-only", X86CPU, amd_topoext_features_only, true), DEFINE_PROP_BOOL("lmce", X86CPU, enable_lmce, false), - DEFINE_PROP_BOOL("l3-cache", X86CPU, enable_l3_cache, true), DEFINE_PROP_BOOL("kvm-pv-enforce-cpuid", X86CPU, kvm_pv_enforce_cpuid, false), DEFINE_PROP_BOOL("vmware-cpuid-freq", X86CPU, vmware_cpuid_freq, true), From patchwork Thu May 8 13:35:44 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: 888604 Delivered-To: patch@linaro.org Received: by 2002:adf:b60d:0:b0:3a1:f579:ae88 with SMTP id f13csp9411wre; Thu, 8 May 2025 06:44:08 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWXvkrm7w/SlEh66X8n1naGoYLAX7mA5hgIKEdQB4+H+YhlhnNiktVCVQ+Lt8lBuBhR9kGv8Q==@linaro.org X-Google-Smtp-Source: AGHT+IHCec9jL6A7rtV9racb+Y8jBRuDUN6xQ98o+BSIR8ohdEx4MTBIvn/9woaWcjRdkOrI0e5b X-Received: by 2002:a05:622a:ca:b0:477:1ee2:1260 with SMTP id d75a77b69052e-494495a2e4fmr54727781cf.1.1746711848657; Thu, 08 May 2025 06:44:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1746711848; cv=none; d=google.com; s=arc-20240605; b=WEhzHL4eCXZ3kAC8KlmYwOop5JOkQIqH+mJ3h34TVEyb8zYw5XWzgh0fuMB9I+UK9x EWmE2mb7+Jr5/t1tmNALaItGzhBlfFo6HQ7RkTlZ3gNkWSOY5QdMKFHM7A7W2ZEqhC1T aQ3RIzGNJjVkwy5Ak9sI7ZeginBYd5v0EZZngfkvc6F/NgSTLdNLxmXR4vlGtLvZSpFw 26tVu7HZqABIsO8L6S6haM2QPtjzb/2zJDXstb+Xcc1kVyb0kLgaTQgGEj5XwC2CPaYC mTH5YdaZoCmphyUb7KWBA7QtIoeP0VczRv6JmLOo5agG0y07C3F/aHerZQ7J6/JM6Fiw ROYA== 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=Iz56OqXDxt7nqC4LwA+a7OYiuZlEyLYttSp20fJi6+I=; fh=fPkRSEYCel/EUuwKjeUH2HSngyX7ytCg7docWFAAYgw=; b=D1Q24alzRKZ25r1efzRXmEpCU0M6yviAvOh+NVvGIJAmBsOYxohXleTCL1SP2Uco1P QFwal3xYl36bMLLM2bWt/ons4C4NuzDiIrurfBFLrqCACD0wIrj86jQqIaljpRgh7VK1 HcF7/hqfmA2TbWThJYWkRHknWSpjXnp/U7GfvREmw8Q3Ou2BJg9tP8ZtI+XzFOSl61R2 a71hu5s9qvMdzta+5MMAptAO3TA6cACnBgixOUh5elrxGExehc02BcXz/1RNJq3tjiAO i5+liArDw3u8EADKilH4VwkzI3kLEqeY/CIzrnY/Qd6wG3mALMhqcL+vB45nBWpoXKBE 6ZOg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=RYMclTj9; 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-4922354c782si42856741cf.494.2025.05.08.06.44.08 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 08 May 2025 06:44:08 -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=RYMclTj9; 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 1uD1Xc-0007lg-VL; Thu, 08 May 2025 09:44:01 -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 1uD1Xa-0007df-Fb for qemu-devel@nongnu.org; Thu, 08 May 2025 09:43:58 -0400 Received: from mail-pf1-x435.google.com ([2607:f8b0:4864:20::435]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uD1XW-0004uK-L6 for qemu-devel@nongnu.org; Thu, 08 May 2025 09:43:58 -0400 Received: by mail-pf1-x435.google.com with SMTP id d2e1a72fcca58-736aaeed234so902606b3a.0 for ; Thu, 08 May 2025 06:43:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1746711832; x=1747316632; 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=Iz56OqXDxt7nqC4LwA+a7OYiuZlEyLYttSp20fJi6+I=; b=RYMclTj9lOI1cUlMD3feG4ufuIXaaBlvI0giA9qYKpOCsUval6rcNOdTDHw8tC23RP d8J0PTMhRaie4r6CEVA/osf2C8RzHcKs1Rl5bQ8heX/vXh+EoW9DTqTVajkDt17Gw4E/ nXDVGIX3QGR+xYFYa0P/PDObQYf/ZPqzEP6sYe+sZtJucVJT2o17ALVBVmWC8wff7lXJ VJDlZ3xKQAvI+R/jxb7Zq51gvYsj7Keg9B8eWr1woVvvNCMB73xnukJakGZhEKCaqMD8 CpZ3mYMjQ9DNg4fdvshJTpXa+DWz3Alkylx56utGoxZjTmQqLww9yFZqt80XVQrbJydg 951w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746711832; x=1747316632; 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=Iz56OqXDxt7nqC4LwA+a7OYiuZlEyLYttSp20fJi6+I=; b=jQl3hO1UVBdpcolcz6U70h+H95UQBS42DL4mRGHciadUWryvuBFzATv4r0KqqL5W61 6xzwLVsSBhvbgDwV96GzTvkwGdsQbdcPF5vY8SkO/y5XtV3bWHiGew8Kc93F9vhRshqV LX3o3JnZ4dXhWWjcJ/D7QXVFTBraqmekGghGterk42IH0FxBkObIsGyYLC5FoAp4ueiI IzJxmFbCmV1Sid7Y7cWdTgsXpBs2xlSvyAWnO+PBQGCEQisYK48LhdXFFVi1M0UDyfXA TxousLTbWg+tVeE74yF2Emu0dNbiSUU7IcZP8RtgYkYIPodV3M81fQ5bUIK4UVYq1GxY qU2g== X-Gm-Message-State: AOJu0YzVQywY5kzEh7QeCdsXC/+P1U6wTXewtNcmYdQwIJLzGn4YqfoS POX/TNYe1p6NTEdzS1JLDrMXl/Po2fm9K7yBwSFe/PcIkkbWs8P0yMByeGVUkfPJ4Ful+kLRX7N ECkDKrA== X-Gm-Gg: ASbGncuYdFgRIyjW4ZB0WFfW/z2TR19oO5AXVW/Qjg8/cvVO4lud8ZNYXxwl9gz9SUq kpuowSbDbSp1MevWYtB1QdodsEibaictOwAjgK3XP/ZvnwdCJ0fSDfsle7SghxEEy41pC2+2ORt 7f8gcSlZI/IRajai4SVYIVI0SoCVFmpPLGEro2VgwB684ZG+fmJE5U/2jr3bgNX+INPD/P554IY zbf7N01T5cu/yT5UkJDjuTfYdOdbpwKu5mVIQSZLanyIbPidGKSAP8x7AipkxMjcfyQszWgabAR gRtjjs28dMYK1qtQl2dvPKnrrnEFYpSO8Qm6pX7PPAYy02A5UcZCyrT8LklPdT+pDkwwkFs1O8w r9Rc8FFjdx11UYgU= X-Received: by 2002:a05:6a00:418d:b0:736:4e0a:7e82 with SMTP id d2e1a72fcca58-740a99ab539mr4600433b3a.10.1746711832328; Thu, 08 May 2025 06:43:52 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-7405902154dsm13751300b3a.90.2025.05.08.06.43.37 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 08 May 2025 06:43:51 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , kvm@vger.kernel.org, Sergio Lopez , Gerd Hoffmann , Peter Maydell , Laurent Vivier , Jiaxun Yang , Yi Liu , "Michael S. Tsirkin" , Eduardo Habkost , Marcel Apfelbaum , Alistair Francis , Daniel Henrique Barboza , Marcelo Tosatti , qemu-riscv@nongnu.org, Weiwei Li , Amit Shah , Zhao Liu , Yanan Wang , Helge Deller , Palmer Dabbelt , Ani Sinha , Igor Mammedov , Fabiano Rosas , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Liu Zhiwei , =?utf-8?q?Cl=C3=A9ment_Mathieu--?= =?utf-8?q?Drif?= , qemu-arm@nongnu.org, =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Huacai Chen , Jason Wang , Mark Cave-Ayland , Thomas Huth Subject: [PATCH v4 21/27] hw/audio/pcspk: Remove PCSpkState::migrate field Date: Thu, 8 May 2025 15:35:44 +0200 Message-ID: <20250508133550.81391-22-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250508133550.81391-1-philmd@linaro.org> References: <20250508133550.81391-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::435; envelope-from=philmd@linaro.org; helo=mail-pf1-x435.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 PCSpkState::migrate boolean was only set in the pc_compat_2_7[] array, via the 'migrate=off' property. We removed all machines using that array, lets remove that property, simplifying vmstate_spk[]. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Mark Cave-Ayland Reviewed-by: Thomas Huth --- hw/audio/pcspk.c | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/hw/audio/pcspk.c b/hw/audio/pcspk.c index a419161b5b1..0e83ba0bf73 100644 --- a/hw/audio/pcspk.c +++ b/hw/audio/pcspk.c @@ -56,7 +56,6 @@ struct PCSpkState { unsigned int play_pos; uint8_t data_on; uint8_t dummy_refresh_clock; - bool migrate; }; static const char *s_spk = "pcspk"; @@ -196,18 +195,10 @@ static void pcspk_realizefn(DeviceState *dev, Error **errp) pcspk_state = s; } -static bool migrate_needed(void *opaque) -{ - PCSpkState *s = opaque; - - return s->migrate; -} - static const VMStateDescription vmstate_spk = { .name = "pcspk", .version_id = 1, .minimum_version_id = 1, - .needed = migrate_needed, .fields = (const VMStateField[]) { VMSTATE_UINT8(data_on, PCSpkState), VMSTATE_UINT8(dummy_refresh_clock, PCSpkState), @@ -218,7 +209,6 @@ static const VMStateDescription vmstate_spk = { static const Property pcspk_properties[] = { DEFINE_AUDIO_PROPERTIES(PCSpkState, card), DEFINE_PROP_UINT32("iobase", PCSpkState, iobase, 0x61), - DEFINE_PROP_BOOL("migrate", PCSpkState, migrate, true), }; static void pcspk_class_initfn(ObjectClass *klass, const void *data) From patchwork Thu May 8 13:35:45 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: 888605 Delivered-To: patch@linaro.org Received: by 2002:adf:b60d:0:b0:3a1:f579:ae88 with SMTP id f13csp9617wre; Thu, 8 May 2025 06:44:36 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCW+u3dFpWX65s4piTVMhiZ20X2BW+o7sFutMI9aD8KxrVX2vDFPZUTxTHAYaXTTavUyrAWdMw==@linaro.org X-Google-Smtp-Source: AGHT+IEQihb5syN5vyUXbxAp8Hrnr9+rIZDM1mqE7z94m4H3uC4aleMWIDNDBTine8WOADKO46SK X-Received: by 2002:a05:622a:34e:b0:476:8288:9563 with SMTP id d75a77b69052e-49225a3e2ecmr88206401cf.10.1746711876444; Thu, 08 May 2025 06:44:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1746711876; cv=none; d=google.com; s=arc-20240605; b=iZ78Op1TTAE15lmETgTS7Rvqfk+NFD9+OnUMbaLlj1kwU9mLCfGwrvdR2n7b4XtsET MJPnxYULjXgDwhYN8323QYrE07gHUKm5Aini5sZ53FCiDCilXpKyNb9iPowKT0aT5nlw fg73XAznqY3S43VqsNiX1g3ZukQFc3UpsSGfG/EcaGnrx8kdLr/h5koRo8xgGbi6mgXz 1ynHrBuw5P5FqJXMoXO4Ufv2VWuEuVFr4RWQxhmcNK2sFz8szvwfEQUC2LO9SftrTJ7O cFLJBxWbhriyt1Tx8dzwwux1G6DjkW0Lh5VQQKtuNoXRxORQdW40Gh4UP8zR6g8g+KAA AIlg== 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=gMLC32cD5rQa4ngqh9n69biVbtvyYihadQEH/qk7LQg=; fh=qkK1RBlCchS9kCqqoLn396d6WKggtWTjkzjmenPsbzA=; b=Q00m8nhLDHjYVU9wPwV6kzQ310Z85xxaTRtGp0aK5cPoXIov56pbTdGRdL/wpQbdHZ 7tIITXQnd4m5gGDaqlMZDDJi3FnziCIeuL45PAR5xsEtF3l59CuZzv4Xn46XZlCVpRyS l8Oz0BgvjFv0O+1nVDVRP2YyEhUNl1Iui/R+jHUL2EXARp59B7FQ4d+c3+2oVaSgu1Mo 5G9Ns5q5QQtfzJmHu7OD4pHMaupuKEsBwJuuuHgn6oE8L4W8m7DGDzDYc7x6xcOo8X39 hcKaCI/ZLfDli/q6UQU8IUyR5hZbZ7J7e09fs2FYZRdFnMxQNj3vJfyRKyvkl6zmrrZr fCpg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=dTWvQ8bj; 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-492229a5d70si42348281cf.298.2025.05.08.06.44.36 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 08 May 2025 06:44:36 -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=dTWvQ8bj; 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 1uD1Xy-0000nR-RA; Thu, 08 May 2025 09:44: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 1uD1Xw-0000eJ-2Y for qemu-devel@nongnu.org; Thu, 08 May 2025 09:44:20 -0400 Received: from mail-pf1-x42a.google.com ([2607:f8b0:4864:20::42a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uD1Xs-0004wz-V6 for qemu-devel@nongnu.org; Thu, 08 May 2025 09:44:19 -0400 Received: by mail-pf1-x42a.google.com with SMTP id d2e1a72fcca58-736a7e126c7so965376b3a.3 for ; Thu, 08 May 2025 06:44:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1746711855; x=1747316655; 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=gMLC32cD5rQa4ngqh9n69biVbtvyYihadQEH/qk7LQg=; b=dTWvQ8bjrLumrHb0Cg/sgd0tPT7FLfbCLx5UwPeoOKUxxcgM6Zg0hVNtW2fj61CmMh Pt4aMkvbBJ/DzW5apd3hv5W6yTmUe7bw+JTMutNIgXxTCyusKWjwR1u8L8zA48dJP7aH +IPK04VXLkQzBv5l50a/ue/CwL398lkL7EjEXgh8zQukJSwcylfbUld/42kpbzhgtmX4 tZ3PHvyQTJWL4EFuHPfoVv8bWTowfb3ixt6QCLqHhZMKFr4WSXbWl5fCc7fXlidLlRXA jrGQNKfQUsmIgDeh9uvseMR+l6N1dzwQrlY8wxX6EDeuw7DSIDgCxpUxSfCTA9zQOBRa FnJw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746711855; x=1747316655; 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=gMLC32cD5rQa4ngqh9n69biVbtvyYihadQEH/qk7LQg=; b=bnrzLQwYuZOEEjmcn4QY7G2xUesxmf7f2Jva14Fy9suE6AopIkLGCBpyfTuWFkt4fw spx2y4FhCxP6NpYmQrzfRbX8expyPQ1/UYdMytHt2c/itt6LR5PHR2sWVIXVStnVs7Ef nTGrwl3zpZom84LSW4C7dKPxH/rDeY3WMQgPuS+3Xy2uPfFEepUQc7Sh56xsSv05rNY6 xYk8rqxbSD59adu6AM5QSYcpz9cQdOe6knYKhpR//pxTxRHMEBA8NhVMm+xGKa67GmMa 4pXCTeTbvhKHJaY0EX+mTJai4JqqfxfmOAH6QdCeR9F22aGPUBdz3z1e78UQbJD9IXPD K8Yg== X-Gm-Message-State: AOJu0YwQF5hAbKaLtaGgLM5t46RcVd+FbNEmm6Jo+bsa7/fF6VcEYzm+ VJ3TDUk8OVUWkezvYriiAljiMtchpcFEWbhktp5X+0fjrxGhXhs4xIjl+REClwLj53iqiEKT6YV dqrWbfw== X-Gm-Gg: ASbGnctsKLUnRWQGXQOrkS66qQu3We7aFN6DcfVcGub4iomgma+aRrcNc3EoGjMBux2 /l0JJ3dUqYDcEIb/i5M2yC3XTSjD7kktZr4Xg6VMsUXOpHjZ4sUsnDjIEffEM/Ds485CzAQBkut Ebnnmkewuq/ioPksKHmi6vlzsWpZsk46F1MEN8GQ68+ZNL1W0em2TP0BYfu+eUJwzoGWcltn2zH e15JdliDNVl+M+zfO20jRgG2WZpsj26PIMAwu2TCl4Wj4MKe6skbgsmiq9BvvqkhIEwpdaVZVM+ Yy0tA9v86RIfnkWgj1RpJHRCdMZ2kX5tZ9ox2myJoPAOuDsZ042OcjJHggJ+X89ja9hTVhaEts3 pTotFMA7ky0mArw0= X-Received: by 2002:a05:6a21:6e41:b0:1f5:852a:dd81 with SMTP id adf61e73a8af0-2148d52bbe3mr13246245637.34.1746711854843; Thu, 08 May 2025 06:44:14 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-74058df2a6csm13272789b3a.81.2025.05.08.06.44.00 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 08 May 2025 06:44:14 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , kvm@vger.kernel.org, Sergio Lopez , Gerd Hoffmann , Peter Maydell , Laurent Vivier , Jiaxun Yang , Yi Liu , "Michael S. Tsirkin" , Eduardo Habkost , Marcel Apfelbaum , Alistair Francis , Daniel Henrique Barboza , Marcelo Tosatti , qemu-riscv@nongnu.org, Weiwei Li , Amit Shah , Zhao Liu , Yanan Wang , Helge Deller , Palmer Dabbelt , Ani Sinha , Igor Mammedov , Fabiano Rosas , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Liu Zhiwei , =?utf-8?q?Cl=C3=A9ment_Mathieu--?= =?utf-8?q?Drif?= , qemu-arm@nongnu.org, =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Huacai Chen , Jason Wang , Mark Cave-Ayland Subject: [PATCH v4 22/27] hw/core/machine: Remove hw_compat_2_7[] array Date: Thu, 8 May 2025 15:35:45 +0200 Message-ID: <20250508133550.81391-23-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250508133550.81391-1-philmd@linaro.org> References: <20250508133550.81391-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::42a; envelope-from=philmd@linaro.org; helo=mail-pf1-x42a.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 hw_compat_2_7[] array was only used by the pc-q35-2.7 and pc-i440fx-2.7 machines, which got removed. Remove it. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Mark Cave-Ayland --- include/hw/boards.h | 3 --- hw/core/machine.c | 9 --------- 2 files changed, 12 deletions(-) diff --git a/include/hw/boards.h b/include/hw/boards.h index a881db8e7d6..77707c4376a 100644 --- a/include/hw/boards.h +++ b/include/hw/boards.h @@ -838,7 +838,4 @@ extern const size_t hw_compat_2_9_len; extern GlobalProperty hw_compat_2_8[]; extern const size_t hw_compat_2_8_len; -extern GlobalProperty hw_compat_2_7[]; -extern const size_t hw_compat_2_7_len; - #endif diff --git a/hw/core/machine.c b/hw/core/machine.c index ce98820f277..bde19a2ff67 100644 --- a/hw/core/machine.c +++ b/hw/core/machine.c @@ -266,15 +266,6 @@ GlobalProperty hw_compat_2_8[] = { }; const size_t hw_compat_2_8_len = G_N_ELEMENTS(hw_compat_2_8); -GlobalProperty hw_compat_2_7[] = { - { "virtio-pci", "page-per-vq", "on" }, - { "virtio-serial-device", "emergency-write", "off" }, - { "ioapic", "version", "0x11" }, - { "intel-iommu", "x-buggy-eim", "true" }, - { "virtio-pci", "x-ignore-backend-features", "on" }, -}; -const size_t hw_compat_2_7_len = G_N_ELEMENTS(hw_compat_2_7); - MachineState *current_machine; static char *machine_get_kernel(Object *obj, Error **errp) From patchwork Thu May 8 13:35:46 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: 888606 Delivered-To: patch@linaro.org Received: by 2002:adf:b60d:0:b0:3a1:f579:ae88 with SMTP id f13csp9839wre; Thu, 8 May 2025 06:45:03 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUE++1JFkltsCa9/laKG6NRxKM9zfme6NykfrfX/Tq2hCahewQtu8xHjay2Pb0a88y/YshISw==@linaro.org X-Google-Smtp-Source: AGHT+IHiGoHWRhHR3J7aCRLAzg9s2Oq+vdjB6bd/NPpjjHAWydYvFcin6PH8PymJcRGG//qnOG1y X-Received: by 2002:ac8:7dd6:0:b0:48d:342e:7c84 with SMTP id d75a77b69052e-4944924ec9emr52088461cf.10.1746711902924; Thu, 08 May 2025 06:45:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1746711902; cv=none; d=google.com; s=arc-20240605; b=PNBBbv+fBKSKJ4pz7odTn1s33ii+HDRRHHQ5sMqjdEVwqPkHM6Y4fmFVKZyk8PYCn4 pgQnOBpnr4siWJAyHWvBrivtCF5ckI5EAL0HubHGrXo8C4y0yav/98e+goFSq9ymSG/h roFIyBid447gFr6gXOu+6N+NzS9KfWDVqLtaElLVo00aJZVkht/cxprxERqZuv1ww1NZ nh1whtQM7KaYQkut2xHlnQcxULEe1HrhyTHirea3nA3XH9zC/wxpyARvWr8MDG1MpQW2 p+y9a8dEOEXmzIkRxXjmmB4xS9V1NzN+9ycrr2VSh5JwHu6D3QgLwdbOCYK4Ht85yACW aWCQ== 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=ABC8+QfGyso1WyDvOcXI+0OZWgW+TnNwcrP3jxKT+bs=; fh=qkK1RBlCchS9kCqqoLn396d6WKggtWTjkzjmenPsbzA=; b=gQPj8MrI4t7tCPGd3TIJSkXKz6Mw6tmr0IKItnmNaUL6Dv1jQz/co/z2BtVMFCGE9d 6Ci0VDxLvPdM3CWqh1vF32uG/9Fa9NtUWJ1yB1lAkBSQdGzOQf3XL+VWFr0KdvqnHcLc 4Dm5LZo/tnpiSVsQRO8L7+/5WoZ6NwEflC/XzKs9w0XSAs+DWIT+sTKEoO4UGUClbneg YGuXCy4HMLdL+CNAG8tV1e5h+hLYd19TalErIc6noD5yD6KQ2PbXw+aw4WkbkZ0++5jG qn8gW7mdAzfIMB6z1oFYGtG42NMOCLvp0kHnP/sHDBMrjLOCbpeIaXjSUfGUiaZ434t0 6V9w==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=QOUTzPxC; 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-49220f83047si44345151cf.33.2025.05.08.06.45.02 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 08 May 2025 06:45:02 -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=QOUTzPxC; 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 1uD1YO-0001fg-QB; Thu, 08 May 2025 09:44:48 -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 1uD1YI-0001RA-MH for qemu-devel@nongnu.org; Thu, 08 May 2025 09:44:42 -0400 Received: from mail-pj1-x1033.google.com ([2607:f8b0:4864:20::1033]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uD1YE-0004yN-St for qemu-devel@nongnu.org; Thu, 08 May 2025 09:44:42 -0400 Received: by mail-pj1-x1033.google.com with SMTP id 98e67ed59e1d1-30ac268a8e0so1460257a91.0 for ; Thu, 08 May 2025 06:44:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1746711877; x=1747316677; 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=ABC8+QfGyso1WyDvOcXI+0OZWgW+TnNwcrP3jxKT+bs=; b=QOUTzPxCqlZc4K9W/VfTZrsgac9diUmTUlj3ALrUr05YAoqk3Z9Rk+P/DD7rotCo1x qyY/BzuH/fE6MoGbC7zHQtqUBXjNETy/7f+zoFfpwd0G+cwiDDAFCiX4ZJ2IAg+xPdFZ duT+inpobW+E/hI9pL/0Ic7KFTnjC4tOFFF5CuoJRMVBfcxHO+KxaSHIkzvLSOx0ElL8 Mgimi4UwsTiVQeQ5npRArdK0Up4TAHqTXpdDtOtqrg6OAK+hz7p976M3qoU0w+SvLRDa Deo6oNpHp2jU6RCqcrFXi231i4uI8u8AXZcUacUDenng5dTEJkLYe0YQdiGNPT2E5cpM bL9Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746711877; x=1747316677; 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=ABC8+QfGyso1WyDvOcXI+0OZWgW+TnNwcrP3jxKT+bs=; b=m/qn/eleZRDsKwxCVgxqR1dIdyevJJ0S1Rpw9JSErrbJvi07poZ5STkMZ6Jx9sjCVr G0+5XwYt6KZzKzu8wdILsi2Ikh1adzl8Mst+e70qW5rkijtbWpXvgFkpg2p9JMtmVwes paR4zZ2dcxs4XRoK4HKdev3aD4MIXQLiM2+BBNN4DRYtAVIvVcqkn9GTjPZnnVDOY5e5 jep6jVLyItyzXSjJ7zf7lCRGGMy4x+WaMHY3EfuixdlgetuUkxKhOBjFYxCIyuQl8sce bQG8gfdz8yYRcpW2zdEfHvry3xNL2QGikDgwtvWuhJpVoPYHlDdy5UflMv2LxOBUjB97 +szg== X-Gm-Message-State: AOJu0YyYYE/sPPfpk0+/3jzkpWHxjBIHls3u7aIDIWDyOScmi3vzr8RC WG873OF9wK33iCJOM57MqJUzienn/ppBHsw2UFWmjO8n+o7cnseEJiBZIHD+WGl4Xfx9wGNRIRi OjUT7lQ== X-Gm-Gg: ASbGncsWv0sLSd37ocWmfZhuavXuBJ6btg6oZSR4+3q4JhGjlgIDrB2A97VlBZqcSks wrJjYPauUZ5kWs23bk2v6yD7DYkYGIViK9CBzABlygnkh72Cskw1cRJZ08+CiMtz+uyRYl1Z2aL P1vsm28W97tATdQXaYYryndwfT5KDeQQhhCNZAX0BLCrs54XUje8TxXAD2TarK25AUEDlZMorXD frD0VVhxVMtUBAmbR3SK9P8tgGW2P1vDQJpVG2RsrWxM+TrIBkGEADJ/1au/A8vrC7xc1CYKMjy RlU5yyl7P+U02CGdBo2lsUZXX3m3ImdSJYUgJjs7j7wMQ2uRror9HaLY85Ew3ls50gzyuK2kwmR qhoteZXqb8WeeZ5A= X-Received: by 2002:a17:90b:224e:b0:2ee:c30f:33c9 with SMTP id 98e67ed59e1d1-30adbf3b191mr5502686a91.14.1746711876787; Thu, 08 May 2025 06:44:36 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-30ad474a05bsm2173239a91.2.2025.05.08.06.44.22 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 08 May 2025 06:44:36 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , kvm@vger.kernel.org, Sergio Lopez , Gerd Hoffmann , Peter Maydell , Laurent Vivier , Jiaxun Yang , Yi Liu , "Michael S. Tsirkin" , Eduardo Habkost , Marcel Apfelbaum , Alistair Francis , Daniel Henrique Barboza , Marcelo Tosatti , qemu-riscv@nongnu.org, Weiwei Li , Amit Shah , Zhao Liu , Yanan Wang , Helge Deller , Palmer Dabbelt , Ani Sinha , Igor Mammedov , Fabiano Rosas , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Liu Zhiwei , =?utf-8?q?Cl=C3=A9ment_Mathieu--?= =?utf-8?q?Drif?= , qemu-arm@nongnu.org, =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Huacai Chen , Jason Wang , Mark Cave-Ayland Subject: [PATCH v4 23/27] hw/i386/intel_iommu: Remove IntelIOMMUState::buggy_eim field Date: Thu, 8 May 2025 15:35:46 +0200 Message-ID: <20250508133550.81391-24-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250508133550.81391-1-philmd@linaro.org> References: <20250508133550.81391-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::1033; envelope-from=philmd@linaro.org; helo=mail-pj1-x1033.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 IntelIOMMUState::buggy_eim boolean was only set in the hw_compat_2_7[] array, via the 'x-buggy-eim=true' property. We removed all machines using that array, lets remove that property, simplifying vtd_decide_config(). Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Mark Cave-Ayland --- include/hw/i386/intel_iommu.h | 1 - hw/i386/intel_iommu.c | 5 ++--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/include/hw/i386/intel_iommu.h b/include/hw/i386/intel_iommu.h index e95477e8554..29304329d05 100644 --- a/include/hw/i386/intel_iommu.h +++ b/include/hw/i386/intel_iommu.h @@ -303,7 +303,6 @@ struct IntelIOMMUState { uint32_t intr_size; /* Number of IR table entries */ bool intr_eime; /* Extended interrupt mode enabled */ OnOffAuto intr_eim; /* Toggle for EIM cabability */ - bool buggy_eim; /* Force buggy EIM unless eim=off */ uint8_t aw_bits; /* Host/IOVA address width (in bits) */ bool dma_drain; /* Whether DMA r/w draining enabled */ bool dma_translation; /* Whether DMA translation supported */ diff --git a/hw/i386/intel_iommu.c b/hw/i386/intel_iommu.c index 5f8ed1243d1..c980cecb4ee 100644 --- a/hw/i386/intel_iommu.c +++ b/hw/i386/intel_iommu.c @@ -3823,7 +3823,6 @@ static const Property vtd_properties[] = { DEFINE_PROP_UINT32("version", IntelIOMMUState, version, 0), DEFINE_PROP_ON_OFF_AUTO("eim", IntelIOMMUState, intr_eim, ON_OFF_AUTO_AUTO), - DEFINE_PROP_BOOL("x-buggy-eim", IntelIOMMUState, buggy_eim, false), DEFINE_PROP_UINT8("aw-bits", IntelIOMMUState, aw_bits, VTD_HOST_ADDRESS_WIDTH), DEFINE_PROP_BOOL("caching-mode", IntelIOMMUState, caching_mode, FALSE), @@ -4731,11 +4730,11 @@ static bool vtd_decide_config(IntelIOMMUState *s, Error **errp) } if (s->intr_eim == ON_OFF_AUTO_AUTO) { - s->intr_eim = (kvm_irqchip_in_kernel() || s->buggy_eim) + s->intr_eim = kvm_irqchip_in_kernel() && x86_iommu_ir_supported(x86_iommu) ? ON_OFF_AUTO_ON : ON_OFF_AUTO_OFF; } - if (s->intr_eim == ON_OFF_AUTO_ON && !s->buggy_eim) { + if (s->intr_eim == ON_OFF_AUTO_ON) { if (kvm_irqchip_is_split() && !kvm_enable_x2apic()) { error_setg(errp, "eim=on requires support on the KVM side" "(X2APIC_API, first shipped in v4.7)"); From patchwork Thu May 8 13:35:47 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: 888607 Delivered-To: patch@linaro.org Received: by 2002:adf:b60d:0:b0:3a1:f579:ae88 with SMTP id f13csp10055wre; Thu, 8 May 2025 06:45:26 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVG15rRu/KPt3Mu2I/Wto/ljr6DmEkIoFj9ITzpTIEHGCOmUjA/gIZzBOhYCLmkU97Eoo7RCA==@linaro.org X-Google-Smtp-Source: AGHT+IGFw/k49Y1H5Thbt5aDtSLrilf8VFXxroZQZoyPDT2hfsAPqmcpEF8s8Z5PMys+jrbkpDaW X-Received: by 2002:a05:622a:191c:b0:48d:cac2:9432 with SMTP id d75a77b69052e-49225d25179mr115344081cf.21.1746711925958; Thu, 08 May 2025 06:45:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1746711925; cv=none; d=google.com; s=arc-20240605; b=YQZnbpsGEZoGlA4aAhYOhUoMqUtEWlKJzmr0eD1Pm6AjOjJ2KNY8gF+EAxvr0EkAug ybJxe66z17/9BhmsWQNYoyS8IRFMhDvM/NdTtzj9YOawD500TVJVSt0o00YZMWG81i9U cLZTQwO5onLI+nYKhDoK+hZlsEsMQcRkuSNgS3V41plrxMRXZz+jxEJk6ArGt1AANXfR n/ulbu9SJW2K5GSoq5qMYFAlx49RfgW0H5pVrvIR+5+tqmjkcP3TywBkxlEYreLScTtX vW00umFYiiqmZAFbGMNLMS5fOWrQTKjYgB+wpCHT/2uXhonRCY8rP1jBUgVsLz5PtJ4L 6BtQ== 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=J0A/U1sPooJ/zOn+77YMR3kP+UO0nbbTuEYORNZS6uE=; fh=qkK1RBlCchS9kCqqoLn396d6WKggtWTjkzjmenPsbzA=; b=lAW06oV4fgpor7oBD0/Gy51nu+4bFaJu2Wt4L37YwEYYuSkHojscoJjWYnNC32sNpT xQkP4TGjO+XVXsgMOESfe7XMTuytB8uIhM8lBQoIBVLG76eU6hroJfr7RrDc2M0Cmp5W AgbWf9exw7Z4/HECGnEEKGRjkybY7hTLU54wy9Kpl1+Vy2+5dJzE4RT0PMAh5bKsaxmB T1KmnJnus/kqDgfk2Q+CfZG+tY6nyO2vlOwQ1yQCXt5vzsHFvoipLEC/pOyVLXDMh5TE 0gxfM3t5TW36wFfCtbbL9ax1gBUCQv7g3jk+Xova8vkSF4NOCX0YgGdVv/nOrICciapa rQTw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=jLNNEGzS; 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-4922126b335si43607271cf.178.2025.05.08.06.45.25 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 08 May 2025 06:45:25 -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=jLNNEGzS; 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 1uD1Yh-0002J3-WF; Thu, 08 May 2025 09:45:08 -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 1uD1Yf-0002I2-TC for qemu-devel@nongnu.org; Thu, 08 May 2025 09:45:05 -0400 Received: from mail-pf1-x435.google.com ([2607:f8b0:4864:20::435]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uD1Yc-00050F-3R for qemu-devel@nongnu.org; Thu, 08 May 2025 09:45:05 -0400 Received: by mail-pf1-x435.google.com with SMTP id d2e1a72fcca58-7390d21bb1cso1018854b3a.2 for ; Thu, 08 May 2025 06:45:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1746711900; x=1747316700; 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=J0A/U1sPooJ/zOn+77YMR3kP+UO0nbbTuEYORNZS6uE=; b=jLNNEGzSqFJoGW4G6SrVMZ59JgdHaOJBBsjsYWp3tIzkt8oZ1NYNxGrkwd5CK6anbG 2YG9ioGkc4jAxqetauvY87deEW6oEiaZbqZXCN84+8cTeMV229+E5IY0pz6fG4gYnUpA utZ/aC/bcbvVJvYf3EuepY1hlE96IrXCJIkz4kJMHklpznEqJhb7JtyaWADIBcnNZre/ CpwxWPqwexuyEE92IBEjcy7d1+SpzxueYeqQdbybIFIeXnZUxBbt/CdMCF5jWPC/4oqR yD6B/yaiG5/pfXlFgBjEhWZAAMomws5DiyXu/JzYzpQyWLwqvA8L64RRr/OSGaiFAZng dtfA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746711900; x=1747316700; 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=J0A/U1sPooJ/zOn+77YMR3kP+UO0nbbTuEYORNZS6uE=; b=LVD1k1VMdAIHR/7I9+VRRIFZsMUlZ4bVI/DcMvLHCtg4nFssTrkKJgGc0XsI/eweOj Epm23g47Ik7SD8gUDFKxwyg43p0BPJq2pSFf5JgMWVI4SfMbX9aOwNmv+fImpwfZIEm/ iZvIYxvvSUcB12x4Az+KSwk9JeXof7cSm6nMHfkZpOcAP7WrjN7VE9ORHX8hNUYdYNYy 83BDDMthmguCIueIM8v38+shFtS/z0fidftgJ2WZQbL4U1OAGQG7dwvBEffW/FzzR1yZ ajF1h2SXBLJhkwctuX3pwSJUOzYeBuRjYtAHfv5q0QsH2MyEqP7Q0of0S3CZdEhL3o2E Zjgg== X-Gm-Message-State: AOJu0Yxt474SMRgkd2Bi8JNbHTR5J/AER4FA8dg5aozILKVLGhbAs0Et EabwYN+u4qC/1xxF60T7it0pr4lXhK29nt5+keTZVUdBGe75UisV+HMu91fWfwXxHVNVQsL3At9 ENGZVSQ== X-Gm-Gg: ASbGncugPDvHV81xNridp4lNvJJEcv16Zi3jW/HkD7gqvMGV4ydiTtlrEFwezB2Gp3R 54Er65OcLECcp0wmJn/UYkH7N9VGO0tbpDK6LVwaA5o7I71DadnLNO+lx3K+rTKevfThhsiiyqE nGzhnRUL4M2fY8TUOs2tzgwMxasMUWdv4qHt9a9XSBiYkTvqfATVKQcmOE0KD0MlelWSUNsP5z0 cj5eSRUD9a6tbhsdy3FOAAmy9a0M3HdnskmamsTq4efHfsr8bxUuw0mw7OBPjAAGkdShdqSpbfe Kb0XLCBPry+UXV/bHldJqSuq7VY56JMYvz9DIeAkr2RuKNtt+8T+GFXTAktec7AfCYnG8wL9J42 NCIgs2AabnKfYXUo= X-Received: by 2002:a05:6a00:2791:b0:730:927c:d451 with SMTP id d2e1a72fcca58-7409cfd813dmr10943548b3a.20.1746711900247; Thu, 08 May 2025 06:45:00 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-740590a489asm13619132b3a.170.2025.05.08.06.44.44 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 08 May 2025 06:44:59 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , kvm@vger.kernel.org, Sergio Lopez , Gerd Hoffmann , Peter Maydell , Laurent Vivier , Jiaxun Yang , Yi Liu , "Michael S. Tsirkin" , Eduardo Habkost , Marcel Apfelbaum , Alistair Francis , Daniel Henrique Barboza , Marcelo Tosatti , qemu-riscv@nongnu.org, Weiwei Li , Amit Shah , Zhao Liu , Yanan Wang , Helge Deller , Palmer Dabbelt , Ani Sinha , Igor Mammedov , Fabiano Rosas , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Liu Zhiwei , =?utf-8?q?Cl=C3=A9ment_Mathieu--?= =?utf-8?q?Drif?= , qemu-arm@nongnu.org, =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Huacai Chen , Jason Wang , Mark Cave-Ayland Subject: [PATCH v4 24/27] hw/intc/ioapic: Remove IOAPICCommonState::version field Date: Thu, 8 May 2025 15:35:47 +0200 Message-ID: <20250508133550.81391-25-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250508133550.81391-1-philmd@linaro.org> References: <20250508133550.81391-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::435; envelope-from=philmd@linaro.org; helo=mail-pf1-x435.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 IOAPICCommonState::version integer was only set in the hw_compat_2_7[] array, via the 'version=0x11' property. We removed all machines using that array, lets remove that property, simplify by only using the default version (defined as IOAPIC_VER_DEF). For the record, this field was introduced in commit 20fd4b7b6d9 ("x86: ioapic: add support for explicit EOI"): > Some old Linux kernels (upstream before v4.0), or any released RHEL > kernels has problem in sending APIC EOI when IR is enabled. > Meanwhile, many of them only support explicit EOI for IOAPIC, which > is only introduced in IOAPIC version 0x20. This patch provide a way > to boost QEMU IOAPIC to version 0x20, in order for QEMU to correctly > receive EOI messages. > > Without boosting IOAPIC version to 0x20, kernels before commit > d32932d ("x86/irq: Convert IOAPIC to use hierarchical irqdomain > interfaces") will have trouble enabling both IR and level-triggered > interrupt devices (like e1000). > > To upgrade IOAPIC to version 0x20, we need to specify: > > -global ioapic.version=0x20 > > To be compatible with old systems, 0x11 will still be the default > IOAPIC version. Here 0x11 and 0x20 are the only versions to be > supported. > > One thing to mention: this patch only applies to emulated IOAPIC. It > does not affect kernel IOAPIC behavior. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Mark Cave-Ayland --- hw/intc/ioapic_internal.h | 3 +-- hw/intc/ioapic.c | 18 ++---------------- hw/intc/ioapic_common.c | 2 +- 3 files changed, 4 insertions(+), 19 deletions(-) diff --git a/hw/intc/ioapic_internal.h b/hw/intc/ioapic_internal.h index 51205767f44..330ce195222 100644 --- a/hw/intc/ioapic_internal.h +++ b/hw/intc/ioapic_internal.h @@ -82,7 +82,7 @@ #define IOAPIC_ID_MASK 0xf #define IOAPIC_VER_ENTRIES_SHIFT 16 - +#define IOAPIC_VER_DEF 0x20 #define TYPE_IOAPIC_COMMON "ioapic-common" OBJECT_DECLARE_TYPE(IOAPICCommonState, IOAPICCommonClass, IOAPIC_COMMON) @@ -104,7 +104,6 @@ struct IOAPICCommonState { uint32_t irr; uint64_t ioredtbl[IOAPIC_NUM_PINS]; Notifier machine_done; - uint8_t version; uint64_t irq_count[IOAPIC_NUM_PINS]; int irq_level[IOAPIC_NUM_PINS]; int irq_eoi[IOAPIC_NUM_PINS]; diff --git a/hw/intc/ioapic.c b/hw/intc/ioapic.c index 133bef852d1..5cc97767d9d 100644 --- a/hw/intc/ioapic.c +++ b/hw/intc/ioapic.c @@ -315,7 +315,7 @@ ioapic_mem_read(void *opaque, hwaddr addr, unsigned int size) val = s->id << IOAPIC_ID_SHIFT; break; case IOAPIC_REG_VER: - val = s->version | + val = IOAPIC_VER_DEF | ((IOAPIC_NUM_PINS - 1) << IOAPIC_VER_ENTRIES_SHIFT); break; default: @@ -411,8 +411,7 @@ ioapic_mem_write(void *opaque, hwaddr addr, uint64_t val, } break; case IOAPIC_EOI: - /* Explicit EOI is only supported for IOAPIC version 0x20 */ - if (size != 4 || s->version != 0x20) { + if (size != 4) { break; } ioapic_eoi_broadcast(val); @@ -444,18 +443,10 @@ static void ioapic_machine_done_notify(Notifier *notifier, void *data) #endif } -#define IOAPIC_VER_DEF 0x20 - static void ioapic_realize(DeviceState *dev, Error **errp) { IOAPICCommonState *s = IOAPIC_COMMON(dev); - if (s->version != 0x11 && s->version != 0x20) { - error_setg(errp, "IOAPIC only supports version 0x11 or 0x20 " - "(default: 0x%x).", IOAPIC_VER_DEF); - return; - } - memory_region_init_io(&s->io_memory, OBJECT(s), &ioapic_io_ops, s, "ioapic", 0x1000); @@ -476,10 +467,6 @@ static void ioapic_unrealize(DeviceState *dev) timer_free(s->delayed_ioapic_service_timer); } -static const Property ioapic_properties[] = { - DEFINE_PROP_UINT8("version", IOAPICCommonState, version, IOAPIC_VER_DEF), -}; - static void ioapic_class_init(ObjectClass *klass, const void *data) { IOAPICCommonClass *k = IOAPIC_COMMON_CLASS(klass); @@ -493,7 +480,6 @@ static void ioapic_class_init(ObjectClass *klass, const void *data) */ k->post_load = ioapic_update_kvm_routes; device_class_set_legacy_reset(dc, ioapic_reset_common); - device_class_set_props(dc, ioapic_properties); } static const TypeInfo ioapic_info = { diff --git a/hw/intc/ioapic_common.c b/hw/intc/ioapic_common.c index fce3486e519..8b3e2ba9384 100644 --- a/hw/intc/ioapic_common.c +++ b/hw/intc/ioapic_common.c @@ -83,7 +83,7 @@ static void ioapic_print_redtbl(GString *buf, IOAPICCommonState *s) int i; g_string_append_printf(buf, "ioapic0: ver=0x%x id=0x%02x sel=0x%02x", - s->version, s->id, s->ioregsel); + IOAPIC_VER_DEF, s->id, s->ioregsel); if (s->ioregsel) { g_string_append_printf(buf, " (redir[%u])\n", (s->ioregsel - IOAPIC_REG_REDTBL_BASE) >> 1); From patchwork Thu May 8 13:35:48 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: 888608 Delivered-To: patch@linaro.org Received: by 2002:adf:b60d:0:b0:3a1:f579:ae88 with SMTP id f13csp10427wre; Thu, 8 May 2025 06:46:07 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWNuXviKVHeWvJXdo/S1SegKCBnZxjyc2Cu8zzja1lXuXdWywh9Q4DVI6l2UJhWzRbksFpyYQ==@linaro.org X-Google-Smtp-Source: AGHT+IFX92K24fLhRjwqvXE+kT5mNAP5eOr9zIu3sKEUByhd7G0Uu5UzHm+3gA2230EiAYFvHRQL X-Received: by 2002:a05:6214:29cd:b0:6e8:fee2:aae6 with SMTP id 6a1803df08f44-6f54c49f51bmr45569406d6.41.1746711966789; Thu, 08 May 2025 06:46:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1746711966; cv=none; d=google.com; s=arc-20240605; b=IViDRVm1Vzi2WILOQZNzGmgzi2TPZxVXtIjsKShWfj/TqCjyOQPovBlzKjS6xel5n+ mBBlgFXO0+59UL4QlQlWby/N2r1T7Ei7xKO6E30oXiMHJvcSU+Dk7QgvCJYwGPQIFKfi HHVg/w6rB0Zb49ymxjTJoz6ncmt6HNXtGLZzH3+w5yv8C/e7hhHEvxnKa+LUPuQHkkCK iNx7TRtkoRKprWO30vCBTyBnKH4sgN5cmEUyB6a7On0zZhauXwAuxvRQfclkLOz1wChX CegusMEFyw4kMZwc9Np1Iwo8AM+jOVr1q37aUgLq493dlCxUzOptAyfgGI798cZJV7Sb V0iA== 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=OvirrR3TiqgBPme4BwNGSV4VqzG47GBw5DwB3TzFavY=; fh=qkK1RBlCchS9kCqqoLn396d6WKggtWTjkzjmenPsbzA=; b=aF3hoxkfIvYmQZc+AlAKgkuBfV1IsnhHKdsClT58t6V9H9uJ7QYOKgxI1dKBSQG0fB DDw31GJOxXDIJTSxZBsLodKcmnSaYtcQBQul3J7Yh3pDG8dd/qNKocCtmXaoZJhJibup ltMBT0BgXGVZ1caVs1bWmAxedUfUhLLALbnqfrGFDny819PHqfjqXbgTUTRSDMl3eFaT 63eDAra9tG3iXrE6t71LIPPH/lv7mD9ypL9Zoh0rQVa42B1EKqbx2r2HwO641yQ6TjxG D338gjYzBxcdVQx0vThjfybqncOSeHhECF3PDX1zN9zW7wd03d23zRR9VPOK4ZrHGr3M Lvkg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=vNu66OQf; 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 6a1803df08f44-6f6e39e6e47si4596d6.68.2025.05.08.06.46.06 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 08 May 2025 06:46:06 -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=vNu66OQf; 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 1uD1ZL-0003Um-1N; Thu, 08 May 2025 09:45:48 -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 1uD1Z3-0003Gm-Gs for qemu-devel@nongnu.org; Thu, 08 May 2025 09:45:30 -0400 Received: from mail-pj1-x102a.google.com ([2607:f8b0:4864:20::102a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uD1Z0-0005EF-NX for qemu-devel@nongnu.org; Thu, 08 May 2025 09:45:29 -0400 Received: by mail-pj1-x102a.google.com with SMTP id 98e67ed59e1d1-30aa79ee726so1018257a91.2 for ; Thu, 08 May 2025 06:45:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1746711925; x=1747316725; 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=OvirrR3TiqgBPme4BwNGSV4VqzG47GBw5DwB3TzFavY=; b=vNu66OQf3+aYtHHWTde5LBQ5T1cLOvD4h6+ypqUk6sMt7mqEYt7jXZ5Vn7NDo/R2vY l/SYIsYNP0BMl5IXb598aL4rweq94/FOadb4Ng6GVxHTlyCk97eEDjR25wonlgNO3Gd3 5Va73geEn8xLRz5paluIFukReQYAq4Xk4kuwPJh/8JW+vrDQTPo5+2mGL4wRY/NBppxT sUh1PQ5n3E4zXIZRhawuA1CocV4OjqoxipPrXuosR9nnX6LDUS7r52FOhI+ReouFAsDO C07SvOCgOpjcb314jNaD6OU2HYdInP8YQVtFvB79OyIGcSMEubiKkTh62XJfKps1L5QN Vjyw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746711925; x=1747316725; 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=OvirrR3TiqgBPme4BwNGSV4VqzG47GBw5DwB3TzFavY=; b=nzRPIMERLr6Mov+3dwSi351OdInOSfw4XW3TMhkfJkFeCHkacU4tUNW05gP43JmqG0 ZUtYYFuNvXUHgsJdD8ttPvx/KcCTfmnYmLJLb+X1eB/eDR6eZJxvJ6u3D+x0fVh/Ee/m Y31ScigMOkqWGyoe2ifChTXT+h8iiFgvnJ4OhpssACGgVBqjYBgad8VBJVtJ0mqvlg/k Q4pljFhfJiR38YTCiDbYhpfW7+w/UHDGbypZ7xzvpUiTcW7eqtaiY0ZvhD0V92YAQwbe pwNZu+Edr7C1mW1bWzeysdru0V4hm4WhZmnNo4Er6B6i7LKGEgbbWmkMwGOvCrCYCS8N qRgA== X-Gm-Message-State: AOJu0Yy0Rn74hs2L7XHpmdYu0ou9fhf7NtSvniOUV6BGEY3ICJS1yJJx ZlSXgsDCL85Ota+7zUfX930XnEU+lVClVjHctqDp6+xF8YAWWWooZP1bdllaQziZ0al6agS0689 8Z170rw== X-Gm-Gg: ASbGncvgba0bMBRp3rVX7VoeC5+Ps44LcbsHDRLMqaAFP33E00kCxi7o+VnWRp7dsxV FVG/cd60dGdUmStJA09Y43Td1ySETwiiyBrNvegutX3m55GmThhGSX3iYIMpoltVSP8iIldBseb QLMR+3J3/l5PyYbOaWoczDNc/Lltdpuqc2Y371lJbmYNHqq8+iZWIm1VGDFJw59UjxXTsSRbyRJ eNC7GVRGi7YfYmbCewkorgvxP+ZYI57kmP8QUNDDbDlJDS5bQcnqKeA2l0Ds61cmg5a3toED1ih TFoK1BLhfU8yOBmteM0WBLMDt1/c4Sg3bNXSvdBCiu2FnxP3JNuBcPA4brlgNRmTFMqy+PIcdMi AyCy9rtFObw5d6bBeW5n1EOabRQ== X-Received: by 2002:a17:90b:1a91:b0:2ee:ab29:1a63 with SMTP id 98e67ed59e1d1-30b28cea048mr5022708a91.3.1746711924724; Thu, 08 May 2025 06:45:24 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-22e1522f0c3sm112275035ad.209.2025.05.08.06.45.09 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 08 May 2025 06:45:24 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , kvm@vger.kernel.org, Sergio Lopez , Gerd Hoffmann , Peter Maydell , Laurent Vivier , Jiaxun Yang , Yi Liu , "Michael S. Tsirkin" , Eduardo Habkost , Marcel Apfelbaum , Alistair Francis , Daniel Henrique Barboza , Marcelo Tosatti , qemu-riscv@nongnu.org, Weiwei Li , Amit Shah , Zhao Liu , Yanan Wang , Helge Deller , Palmer Dabbelt , Ani Sinha , Igor Mammedov , Fabiano Rosas , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Liu Zhiwei , =?utf-8?q?Cl=C3=A9ment_Mathieu--?= =?utf-8?q?Drif?= , qemu-arm@nongnu.org, =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Huacai Chen , Jason Wang , Mark Cave-Ayland Subject: [PATCH v4 25/27] hw/virtio/virtio-pci: Remove VirtIOPCIProxy::ignore_backend_features field Date: Thu, 8 May 2025 15:35:48 +0200 Message-ID: <20250508133550.81391-26-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250508133550.81391-1-philmd@linaro.org> References: <20250508133550.81391-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::102a; envelope-from=philmd@linaro.org; helo=mail-pj1-x102a.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 VirtIOPCIProxy::ignore_backend_features boolean was only set in the hw_compat_2_7[] array, via the 'x-ignore-backend-features=on' property. We removed all machines using that array, lets remove that property, simplify by only using the default version. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Mark Cave-Ayland --- include/hw/virtio/virtio-pci.h | 1 - hw/virtio/virtio-pci.c | 5 +---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/include/hw/virtio/virtio-pci.h b/include/hw/virtio/virtio-pci.h index f962c9116c1..9838e8650a6 100644 --- a/include/hw/virtio/virtio-pci.h +++ b/include/hw/virtio/virtio-pci.h @@ -149,7 +149,6 @@ struct VirtIOPCIProxy { int config_cap; uint32_t flags; bool disable_modern; - bool ignore_backend_features; OnOffAuto disable_legacy; /* Transitional device id */ uint16_t trans_devid; diff --git a/hw/virtio/virtio-pci.c b/hw/virtio/virtio-pci.c index 8d68e56641a..7c965771907 100644 --- a/hw/virtio/virtio-pci.c +++ b/hw/virtio/virtio-pci.c @@ -1965,8 +1965,7 @@ static void virtio_pci_device_plugged(DeviceState *d, Error **errp) * Virtio capabilities present without * VIRTIO_F_VERSION_1 confuses guests */ - if (!proxy->ignore_backend_features && - !virtio_has_feature(vdev->host_features, VIRTIO_F_VERSION_1)) { + if (!virtio_has_feature(vdev->host_features, VIRTIO_F_VERSION_1)) { virtio_pci_disable_modern(proxy); if (!legacy) { @@ -2351,8 +2350,6 @@ static const Property virtio_pci_properties[] = { VIRTIO_PCI_FLAG_MODERN_PIO_NOTIFY_BIT, false), DEFINE_PROP_BIT("page-per-vq", VirtIOPCIProxy, flags, VIRTIO_PCI_FLAG_PAGE_PER_VQ_BIT, false), - DEFINE_PROP_BOOL("x-ignore-backend-features", VirtIOPCIProxy, - ignore_backend_features, false), DEFINE_PROP_BIT("ats", VirtIOPCIProxy, flags, VIRTIO_PCI_FLAG_ATS_BIT, false), DEFINE_PROP_BIT("x-ats-page-aligned", VirtIOPCIProxy, flags, From patchwork Thu May 8 13:35:49 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: 888609 Delivered-To: patch@linaro.org Received: by 2002:adf:b60d:0:b0:3a1:f579:ae88 with SMTP id f13csp10522wre; Thu, 8 May 2025 06:46:17 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCX05ibt4XuMdSSpuOPusaK04yeOpDuUpVQa6qWZCYD4Fcykivh3B13OHnO01MKC9/7D7fpRlg==@linaro.org X-Google-Smtp-Source: AGHT+IGZmE9QPUeGIrV14kVYANvMg51F8j0vU7XVVDNimZadilDzfe3qrPmP8Hn0GaIyEeQ7zYbB X-Received: by 2002:ac8:5846:0:b0:476:78a8:435c with SMTP id d75a77b69052e-49225b38036mr114897051cf.16.1746711977284; Thu, 08 May 2025 06:46:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1746711977; cv=none; d=google.com; s=arc-20240605; b=WwB5iqxXnZSGEGbXSYNrjm1zn8E2UIEGN5PN64wThDTXkQ0cJ8J/pJnKixyRZRRsvL mmGBjXqB0x0+jAVE93ENoSZtXo/M2153b/CdOloTQxlFeW2V7kdFnBY8TYZy8ap4WAWV mUT8S9iMnO1Z/6myUu2iXsoxSMOMQtqCSW1AbhqGtCynrixkvfd9RYIjXKLzWV6A2PJX dvkLazIHKhY5aozhRq87Oqj6s6mwdvlKOsOTCu0tBYBGG5SnBRQtVvW/UrgKrhSrZDeE EjqCuiDCDzACGCdPtmz+rmpwaB1IWnQVutlaDgj6z7wosVMchVONk0ymOJ29aeZ/OsXF rswQ== 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=ns6abkUGaM6ukyij9Yk70LzU+Vns27nmI4rpIretkkk=; fh=t4sCPXSJJxzszaJF+1Mm6mpQfCAwhf2cujSX+L6g5pY=; b=llx9zqCY0A4tapAMH9rO0sAUGNaQeWreG4sVyK5WTyiw5pbmDV9oVZeQI9vajwwDAw maTJyyhTqOatsNhUpinRySC6WI7iy+kM4z1AxBbrpbjibSf4JhKxK9wQxS5xi+Bs+kAt GX7DE0sdy1P1RAT/s8v9Ojk92aN489lGDDTVWCFWMM47SabQQ6xiepu83iTviVxvhO73 dHE05aUwsA4R/wybH9oPTSyzRmEthRkDv3xjwkGHQbqq4jltcmQtkeSWQv6axN83S+im 7PPaXnyVexnxFfuIia80Nz9wypVTIjbTQ2QBU821dRAzpePyhF6Vm0PKPN8YSms5XPUW FqbQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=kdHczDAt; 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-49220f82faasi43924151cf.70.2025.05.08.06.46.17 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 08 May 2025 06:46:17 -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=kdHczDAt; 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 1uD1Zc-0003xU-EQ; Thu, 08 May 2025 09:46:04 -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 1uD1ZS-0003i8-3x for qemu-devel@nongnu.org; Thu, 08 May 2025 09:46:02 -0400 Received: from mail-pf1-x430.google.com ([2607:f8b0:4864:20::430]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uD1ZO-0005GV-Mg for qemu-devel@nongnu.org; Thu, 08 May 2025 09:45:53 -0400 Received: by mail-pf1-x430.google.com with SMTP id d2e1a72fcca58-736ab1c43c4so1054284b3a.1 for ; Thu, 08 May 2025 06:45:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1746711948; x=1747316748; 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=ns6abkUGaM6ukyij9Yk70LzU+Vns27nmI4rpIretkkk=; b=kdHczDAtzYUdFYPmu5hfBEzLvF8wmfwBN7007LSkfLejx1VFYJc3Rj8sfhm/JHrhcg Np695U8C98kezeliXhUr8sC/vp5MPaGRsIux+inELLMievxcJl8EcrNO1Qwu7dgCLUE6 1aXCL/4dWmwoTpsnsSmJSrN3gRv9wp8tKAsP8vZdIrXj3CD8up8kfNjOlEHS7fMqKKUX Q8I8F9HnyBM2Iv7QtsurhJZBe8jGbuz1ESdtl1u028bAYvEk7f0ZxLDWYjO/eqLK2Ev/ 4NFTkA12MeaY5TrdVS3H/iARZiI/jUDdZ+92BaNGvABScFDocg5aPAKc45yfAdJ53Da9 I7sg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746711949; x=1747316749; 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=ns6abkUGaM6ukyij9Yk70LzU+Vns27nmI4rpIretkkk=; b=XPs10ABV2bPMJqdHmbRNpNhR6ocQ3jXkndTnQruVvmCSs6Ri3Nsx/mDO6NGtVXmWPe wkxqZgtKD8G9OebHoUK0L3H3/c7FfBrDcrt/b4zxWoInXJuBopS1JjGmbZ+uuTu+/L5P UT6ApTKtWK/PP8kgCeYLLauKpptG8MWfh9JI0UK8ek8C9kP4SIZgEm08oY8reDi/feN/ lR0tvvtXbtDygBLQog03trncEu+pDXDb+QCz947alXSvUc8DE19Hs80x0cW8/aqtg5xN PFgvzmowox7I2bW0+IL64Jzf4uE+3qXapz9LTG7lN+NGrhPpLkXgzJxDu4iuFrCAUHyU PBTA== X-Gm-Message-State: AOJu0YzyrJlznWZkTfudek5MA3ljw/9MqUU8+tSe3kYF1IWO2Gs8V6F+ +gMirk28eSB6NqPn62wUPQH/f3D2RhyFE63K8DY6gfKN4qDK4ri1Bb1wPo6VHOX/+MZOz6QCcxh 6hMFkyg== X-Gm-Gg: ASbGncuhy+J2cJJWj/zJ40PnlIX+fUEcplwVr6yjaFE78jCKD3SeknU855+bymWxyg8 lRsyzTqsB4dBqNABUeC+cLysOyrGRCckJuPhtrodiHkFB3DeLSPwwMz46EzSON0atCFmPtdY2m5 4nfSt/mH5QwoxOmV/YQTjvWxjD9FNpY6QBqyid5uettLM9tTvLvvxmu22qLC3Vc1OTfRukC+P9B Xqiwl500Bw4e9aSl4yoJuXVyTuj63Vv2sasD/nx2/+Otul82LMGSdVZ3ZzqEZ91DASQfTzDFeVa c/384J8vTCvByUoCzCnEFhA0h1hCobv6ZbIon4qj7Z03v7KPDIDCB/3xQrOsJDvPjejhcrSZgqN luEJSj0itycT46cM= X-Received: by 2002:a05:6a00:1308:b0:740:a879:4f7b with SMTP id d2e1a72fcca58-740a8794fcamr6118097b3a.18.1746711948529; Thu, 08 May 2025 06:45:48 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-7405906372fsm13690156b3a.148.2025.05.08.06.45.33 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 08 May 2025 06:45:48 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , kvm@vger.kernel.org, Sergio Lopez , Gerd Hoffmann , Peter Maydell , Laurent Vivier , Jiaxun Yang , Yi Liu , "Michael S. Tsirkin" , Eduardo Habkost , Marcel Apfelbaum , Alistair Francis , Daniel Henrique Barboza , Marcelo Tosatti , qemu-riscv@nongnu.org, Weiwei Li , Amit Shah , Zhao Liu , Yanan Wang , Helge Deller , Palmer Dabbelt , Ani Sinha , Igor Mammedov , Fabiano Rosas , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Liu Zhiwei , =?utf-8?q?Cl=C3=A9ment_Mathieu--?= =?utf-8?q?Drif?= , qemu-arm@nongnu.org, =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Huacai Chen , Jason Wang Subject: [PATCH v4 26/27] hw/char/virtio-serial: Do not expose the 'emergency-write' property Date: Thu, 8 May 2025 15:35:49 +0200 Message-ID: <20250508133550.81391-27-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250508133550.81391-1-philmd@linaro.org> References: <20250508133550.81391-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::430; envelope-from=philmd@linaro.org; helo=mail-pf1-x430.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 VIRTIO_CONSOLE_F_EMERG_WRITE feature bit was only set in the hw_compat_2_7[] array, via the 'emergency-write=off' property. We removed all machines using that array, lets remove that property. All instances have this feature bit set and it can not be disabled. VirtIOSerial::host_features mask is now unused, remove it. Signed-off-by: Philippe Mathieu-Daudé --- include/hw/virtio/virtio-serial.h | 2 -- hw/char/virtio-serial-bus.c | 9 +++------ 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/include/hw/virtio/virtio-serial.h b/include/hw/virtio/virtio-serial.h index d87c62eab7a..e6ceacec309 100644 --- a/include/hw/virtio/virtio-serial.h +++ b/include/hw/virtio/virtio-serial.h @@ -185,8 +185,6 @@ struct VirtIOSerial { struct VirtIOSerialPostLoad *post_load; virtio_serial_conf serial; - - uint64_t host_features; }; /* Interface to the virtio-serial bus */ diff --git a/hw/char/virtio-serial-bus.c b/hw/char/virtio-serial-bus.c index eb79f5258b6..cfc8fa42186 100644 --- a/hw/char/virtio-serial-bus.c +++ b/hw/char/virtio-serial-bus.c @@ -557,7 +557,7 @@ static uint64_t get_features(VirtIODevice *vdev, uint64_t features, vser = VIRTIO_SERIAL(vdev); - features |= vser->host_features; + features |= BIT_ULL(VIRTIO_CONSOLE_F_EMERG_WRITE); if (vser->bus.max_nr_ports > 1) { virtio_add_feature(&features, VIRTIO_CONSOLE_F_MULTIPORT); } @@ -587,8 +587,7 @@ static void set_config(VirtIODevice *vdev, const uint8_t *config_data) VirtIOSerialPortClass *vsc; uint8_t emerg_wr_lo; - if (!virtio_has_feature(vser->host_features, - VIRTIO_CONSOLE_F_EMERG_WRITE) || !config->emerg_wr) { + if (!config->emerg_wr) { return; } @@ -1039,7 +1038,7 @@ static void virtio_serial_device_realize(DeviceState *dev, Error **errp) return; } - if (!virtio_has_feature(vser->host_features, + if (!virtio_has_feature(vdev->host_features, VIRTIO_CONSOLE_F_EMERG_WRITE)) { config_size = offsetof(struct virtio_console_config, emerg_wr); } @@ -1155,8 +1154,6 @@ static const VMStateDescription vmstate_virtio_console = { static const Property virtio_serial_properties[] = { DEFINE_PROP_UINT32("max_ports", VirtIOSerial, serial.max_virtserial_ports, 31), - DEFINE_PROP_BIT64("emergency-write", VirtIOSerial, host_features, - VIRTIO_CONSOLE_F_EMERG_WRITE, true), }; static void virtio_serial_class_init(ObjectClass *klass, const void *data) From patchwork Thu May 8 13:35:50 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: 888610 Delivered-To: patch@linaro.org Received: by 2002:adf:b60d:0:b0:3a1:f579:ae88 with SMTP id f13csp10615wre; Thu, 8 May 2025 06:46:31 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVIyRUS8NPkI/+goDy+f/pImH426M+Gg+N8ZfZIJXJXUt4kePiPrWFCu1GnRO9rjMAyZMuD5w==@linaro.org X-Google-Smtp-Source: AGHT+IGR9sgqiBRWXh0Q9DdJgvcaZdiz6/bdfTJ4EZJxSZLtDOjjDRPLMLW37BbjXQPjazJFLkNj X-Received: by 2002:a05:6122:181b:b0:529:2644:676f with SMTP id 71dfb90a1353d-52c37ab8509mr5158080e0c.8.1746711991683; Thu, 08 May 2025 06:46:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1746711991; cv=none; d=google.com; s=arc-20240605; b=MrGVDhFGDFBqUSLMRJhCCtE6gJ6jKVvadewxFbldBnXm4KWQmNB50niDKTeGL2jjpJ xy7CC7IjAiYW/7wsem37KTv66J1x31q3EHSum78Epsi4PcJdxaxIFTRO9I4rU/J0MB5K lGj/esvk6b8wbzr+aF3T60YsjFfsMtD/CvjP/6Sy0Ugc/BsWSzQCuGIVyyziH5DKSi8n ZiJXKIt3pxPETv/hMQAMNRNtQT1R6wBCWUrnZJGpVkz76hNNtIhsq9WeOrkqDz7qkdya SaUFESJnt6D/EYtH5t6mXQzJnwS30uQPerhbEs+vlTwh9pska5v/LIIERZmZBNXTp6MB m89w== 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=dAEnpROpQK6DxM6uJJQ1bpWzbrmSzQalAkAVB3r0tgU=; fh=qkK1RBlCchS9kCqqoLn396d6WKggtWTjkzjmenPsbzA=; b=GPQVPLYuYskbsnvl9V6AWCB3GZ/PJgZ2oDjVgyGEQf1XWz9HG3L7VjGiD9LqTXk2oF uIhy24fLjHAp/DShMN0D7iIB9pQhcgqyA5pvaqPlyScqhrP8CRT7CJIkfOpJZXYJLhGP VwWuNOKKuX3w/E1+szirRCWwoMGQVPUYcM2ePUZcijX/Vb5kvPD0X0LaAl8MB/e0QJr5 Frzjog78k2c1Ip6pkAi7hESmXAWqjxYvJbKuc4Yj1CtLnaqKyMvfoJStnAKmWXzGyv9l C8LRqbpHx4J7j2baxnJLu0rlNQCySi8Utdhnhk66lj7qvm3WNV2fG7ZJEjbQWWcR4uY3 AH6A==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=KdqjNB3v; 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 71dfb90a1353d-52ae413b92csi4579026e0c.140.2025.05.08.06.46.31 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 08 May 2025 06:46:31 -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=KdqjNB3v; 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 1uD1Zs-0005GP-PE; Thu, 08 May 2025 09:46:21 -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 1uD1Zp-00053j-Ll for qemu-devel@nongnu.org; Thu, 08 May 2025 09:46:17 -0400 Received: from mail-pg1-x534.google.com ([2607:f8b0:4864:20::534]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uD1Zm-0005Iy-VS for qemu-devel@nongnu.org; Thu, 08 May 2025 09:46:17 -0400 Received: by mail-pg1-x534.google.com with SMTP id 41be03b00d2f7-b1a1930a922so631098a12.3 for ; Thu, 08 May 2025 06:46:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1746711972; x=1747316772; 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=dAEnpROpQK6DxM6uJJQ1bpWzbrmSzQalAkAVB3r0tgU=; b=KdqjNB3v2TPCkIeePrVgdcO+TaS/pmxH4S/VN+EWl6FW+iwYPIeTS/9DbO0I1cMNuT 83WSZGtNDnAOGnGhgqCQQV26qbQA+M7cYtj9rSjEjnE/tgMbJbg+YSipsXdLABzbR+3V Cu14WErV7D4G2B4GzSrYrAHH21CDgOu4zbQf21ZGMhb7L+m1rLAYjfLbSz1sHY3e0vxj 9ZQmYW/rwBo0VaatHNupxDyahJM9nc8hVUhgnAref1Xz5iEvqyuqviuTbpxjkcDi6GBx 9filnkk70SP8l0Vvyz6gZ1DzbSl8jiX+aENC6uM7NcDA3EXgimTaRSsExWEOtxuFb/ic jSWw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746711972; x=1747316772; 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=dAEnpROpQK6DxM6uJJQ1bpWzbrmSzQalAkAVB3r0tgU=; b=GtViSBTRLmy0V2P+nUJ+U/+Wsx0dC2i+hA1KxOtJvEx7zO1os+yMqjpUHmqyzUcSRY rusKooxXAVEy9Pqgs/F7nnLmDcWLQkiL8CzC6MoGY+/OYGZWudpl10DYo7DtLjP21Ji3 /k32MEgl164C7KGT7bXNSRIA1M4hhMdcVKo0wgvvYkAIIo1HzQjyTN4E3Y41MIsTH67o eTUe7770lT8tQxx7TZMn7ywNJ+B5UbZma4QuhY7UN6VIsSW40wwexZOxBvGxB6EEICnY y9rqBaG8/OJ6MuE1giJn9vFoXN3oI00WGwHim0C8tJ4WW6OV+7UR1m+fhcCODhtpNDgQ ZwHA== X-Gm-Message-State: AOJu0YyWyzWTpxcOtHrlRQVhxior4iueSF9s2ApjfYvZxHBU/du6NtXO zClqs/Olqzej8n7MY0sY02SFUzcjjhtz0af4EbQR/xviffcRzQKexs1WQWEi+ZQJYMonOUNHIfW 5LV3UVw== X-Gm-Gg: ASbGncvDyF2ivaHQGoYBcs9bQV1eEErK4MH5r/b0knod2DXQV0oPcY/ECxNK9PxpFpY vvrTDH7o3VKarS6Ew1iKoQwLaGYYOKA4C/m3EV3k8ik0uIGgh3HSNoZul7KwPUttyMAEh3JPTV3 ORZJqmPUan/iEHybBftFITelY5rMrGUP2mGIGOHp5yuIwKM9fI9BRdfo2gb5U+CrkLLUGSW+M5s xAAkB3n2asnRWvh90Uj0a1OyRk+xeDiSdf+QmG6wwIcwOy5KicLCCOEVMacxSjz89rDRKTxbpRi XiPKD8XPqYzlnRquDLHfEeU28A3Agpy1r4p++DEWuLEGx37a8lYRiDh90o+PZKErTjV6Q5HUlvW 1OpZxmn6mWLzVZw0= X-Received: by 2002:a05:6a20:9f8f:b0:1f5:5ca4:2744 with SMTP id adf61e73a8af0-2148ba256e3mr9499152637.17.1746711972638; Thu, 08 May 2025 06:46:12 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-74058d7a397sm13221110b3a.28.2025.05.08.06.45.56 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 08 May 2025 06:46:12 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , kvm@vger.kernel.org, Sergio Lopez , Gerd Hoffmann , Peter Maydell , Laurent Vivier , Jiaxun Yang , Yi Liu , "Michael S. Tsirkin" , Eduardo Habkost , Marcel Apfelbaum , Alistair Francis , Daniel Henrique Barboza , Marcelo Tosatti , qemu-riscv@nongnu.org, Weiwei Li , Amit Shah , Zhao Liu , Yanan Wang , Helge Deller , Palmer Dabbelt , Ani Sinha , Igor Mammedov , Fabiano Rosas , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Liu Zhiwei , =?utf-8?q?Cl=C3=A9ment_Mathieu--?= =?utf-8?q?Drif?= , qemu-arm@nongnu.org, =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Huacai Chen , Jason Wang , Mark Cave-Ayland Subject: [PATCH v4 27/27] hw/virtio/virtio-pci: Remove VIRTIO_PCI_FLAG_PAGE_PER_VQ definition Date: Thu, 8 May 2025 15:35:50 +0200 Message-ID: <20250508133550.81391-28-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250508133550.81391-1-philmd@linaro.org> References: <20250508133550.81391-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::534; envelope-from=philmd@linaro.org; helo=mail-pg1-x534.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 VIRTIO_PCI_FLAG_PAGE_PER_VQ was only used by the hw_compat_2_7[] array, via the 'page-per-vq=on' property. We removed all machines using that array, lets remove all the code around VIRTIO_PCI_FLAG_PAGE_PER_VQ (see commit 9a4c0e220d8 for similar VIRTIO_PCI_FLAG_* enum removal). Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Mark Cave-Ayland --- include/hw/virtio/virtio-pci.h | 1 - hw/display/virtio-vga.c | 10 ---------- hw/virtio/virtio-pci.c | 7 +------ 3 files changed, 1 insertion(+), 17 deletions(-) diff --git a/include/hw/virtio/virtio-pci.h b/include/hw/virtio/virtio-pci.h index 9838e8650a6..8abc5f8f20d 100644 --- a/include/hw/virtio/virtio-pci.h +++ b/include/hw/virtio/virtio-pci.h @@ -33,7 +33,6 @@ enum { VIRTIO_PCI_FLAG_BUS_MASTER_BUG_MIGRATION_BIT, VIRTIO_PCI_FLAG_USE_IOEVENTFD_BIT, VIRTIO_PCI_FLAG_MODERN_PIO_NOTIFY_BIT, - VIRTIO_PCI_FLAG_PAGE_PER_VQ_BIT, VIRTIO_PCI_FLAG_ATS_BIT, VIRTIO_PCI_FLAG_INIT_DEVERR_BIT, VIRTIO_PCI_FLAG_INIT_LNKCTL_BIT, diff --git a/hw/display/virtio-vga.c b/hw/display/virtio-vga.c index 40e60f70fcd..83d01f089b5 100644 --- a/hw/display/virtio-vga.c +++ b/hw/display/virtio-vga.c @@ -141,16 +141,6 @@ static void virtio_vga_base_realize(VirtIOPCIProxy *vpci_dev, Error **errp) VIRTIO_GPU_SHM_ID_HOST_VISIBLE); } - if (!(vpci_dev->flags & VIRTIO_PCI_FLAG_PAGE_PER_VQ)) { - /* - * with page-per-vq=off there is no padding space we can use - * for the stdvga registers. Make the common and isr regions - * smaller then. - */ - vpci_dev->common.size /= 2; - vpci_dev->isr.size /= 2; - } - offset = memory_region_size(&vpci_dev->modern_bar); offset -= vpci_dev->notify.size; vpci_dev->notify.offset = offset; diff --git a/hw/virtio/virtio-pci.c b/hw/virtio/virtio-pci.c index 7c965771907..4e0d4bda6ed 100644 --- a/hw/virtio/virtio-pci.c +++ b/hw/virtio/virtio-pci.c @@ -314,12 +314,9 @@ static bool virtio_pci_ioeventfd_enabled(DeviceState *d) return (proxy->flags & VIRTIO_PCI_FLAG_USE_IOEVENTFD) != 0; } -#define QEMU_VIRTIO_PCI_QUEUE_MEM_MULT 0x1000 - static inline int virtio_pci_queue_mem_mult(struct VirtIOPCIProxy *proxy) { - return (proxy->flags & VIRTIO_PCI_FLAG_PAGE_PER_VQ) ? - QEMU_VIRTIO_PCI_QUEUE_MEM_MULT : 4; + return 4; } static int virtio_pci_ioeventfd_assign(DeviceState *d, EventNotifier *notifier, @@ -2348,8 +2345,6 @@ static const Property virtio_pci_properties[] = { VIRTIO_PCI_FLAG_BUS_MASTER_BUG_MIGRATION_BIT, false), DEFINE_PROP_BIT("modern-pio-notify", VirtIOPCIProxy, flags, VIRTIO_PCI_FLAG_MODERN_PIO_NOTIFY_BIT, false), - DEFINE_PROP_BIT("page-per-vq", VirtIOPCIProxy, flags, - VIRTIO_PCI_FLAG_PAGE_PER_VQ_BIT, false), DEFINE_PROP_BIT("ats", VirtIOPCIProxy, flags, VIRTIO_PCI_FLAG_ATS_BIT, false), DEFINE_PROP_BIT("x-ats-page-aligned", VirtIOPCIProxy, flags,