From patchwork Thu May 1 21:04: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: 886367 Delivered-To: patch@linaro.org Received: by 2002:a5d:430f:0:b0:38f:210b:807b with SMTP id h15csp513895wrq; Thu, 1 May 2025 14:06:11 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCULBnkRo8s61ZDWjTOvy/zFpODp6FxyQKp4jy8pdfdFCvQiEy5KlXorHWDntu/Y4eDA5m4+1Q==@linaro.org X-Google-Smtp-Source: AGHT+IHyAQcAYyTnie4+McGgr7XaWctL5AuoUOkbsmH/RIq2zO14RmEDJZ+YoXRpYwVuHEWlK+AC X-Received: by 2002:a05:620a:4448:b0:7c3:cd78:df43 with SMTP id af79cd13be357-7cad5bc2554mr86408885a.58.1746133571471; Thu, 01 May 2025 14:06:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1746133571; cv=none; d=google.com; s=arc-20240605; b=abasdIhLy9JLoXmXxAmmLwkBV0iVb7V7FN5ysnDHy4invKD0iV61Ptz/BvDD9HDpMu Q+Sjn9ZFJV7h4XZouFcViRIPP+60cuewaQeD9n/89o9PGVKEzjUjlsWAcg57aXxLiTgm /qeSvP9JxKGYyf1LOKtmox+uxZL0Czrp8HltrGNbMwqBudMlgGltdgRJOyqpGzXv/l2O BF+AiLaNvIKDXmQ1rWIEtQRfwuNRi2cW6n4b9gjj6E8hPBW9L2kZmvp0hPDUAahfAy9R FSh+RvpDMn0elFDCJm8pBTUOcMcwNS5XDeTPxf+v6YKY3buO/hkl7JEt8wi6Lv8uFstA JaOA== 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=0h0T0XYnYLjPAQZ2YEHiTRTZsrkk7NXiD5Jirf7sOvY=; fh=uloqeIiLIhsqAWHY8zIEmzfMIcw7bGWZuINspytDykk=; b=D296IsRowRLUM93d4vsxQE+8aC0G0rsjRDoBLPYhv2Vt/2bLELTMU4Q4OUnHUexkHi quG9R98XkEJ1OBvmAPQFp1Ho06oJ38yFQLoZv0GJ3iEjReThML1/KYkG3EO81Sx/utFC 9cKBS4KgqrNuEEoA2Q0/Xkduj7ub1B1mio1PkMn0qbiWgepGWyDPf+V0CsXdzn0T8ckZ 6S5eEUQmY+w2vZ6Npl4UXErnsFw0ijj8T97LaMk/Q3lVoeyRbtjDFA27rFwQZNm99gIs CuFq/MNdm8CQvRRxBUFLTN6o3Bhzs+dGxFC/kfErMJj5x5jrkwia7U131COAEeC1ajqH npSA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=KX9wbSGo; 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-7cad2430ae4si153963185a.344.2025.05.01.14.06.11 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 01 May 2025 14:06: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=KX9wbSGo; 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 1uAb5o-000100-7r; Thu, 01 May 2025 17:05: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 1uAb5m-0000zF-2y for qemu-devel@nongnu.org; Thu, 01 May 2025 17:05:14 -0400 Received: from mail-il1-x131.google.com ([2607:f8b0:4864:20::131]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uAb5k-0006Sa-J3 for qemu-devel@nongnu.org; Thu, 01 May 2025 17:05:13 -0400 Received: by mail-il1-x131.google.com with SMTP id e9e14a558f8ab-3d6d162e516so11463135ab.1 for ; Thu, 01 May 2025 14:05:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1746133511; x=1746738311; 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=0h0T0XYnYLjPAQZ2YEHiTRTZsrkk7NXiD5Jirf7sOvY=; b=KX9wbSGoSQN4BGpuJ213MWBFl34bwzOH3kUgdSAcrw1E9QGFvHcmzlCtB/lpG70s5K wYDnfXiUE7VAgUyIe5/0FSPfpI05c4OtcoCrR0Ki+W2FYce5RSK2fMoqYcnJ+rp2bcOw tBLxoau9S0UXPu8VDsakAssn+4Tdalh7ZWc/p4E+Us+KZQTAPDIuu6qekwKJabTQ+Dyw XDtuxdTi4rjmGLuu5YolRXjL0ZfpmWy+ueJsFGrNoWLWbzAG1Zr6ncduN7mLgJOUf3oM gDnYwoGCbhKkkPgfJGq3I4iC/7TNXBL+oS6qf0OKiGGoCNao+xT7MIsyl7aQJokxBGfh jCNw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746133511; x=1746738311; 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=0h0T0XYnYLjPAQZ2YEHiTRTZsrkk7NXiD5Jirf7sOvY=; b=ocoUNVr+8FvZls/2uigQmO0srUd7VPDE7sCs+L+Q8h+hBQfRW0zTeMyohCiPPb5PZr bfzD7niZUhlst5reKDCNxF4bibUQinZCubDyVN6F6+y1xC8pnA8tD5wCFV+n0wjr2A4i ylp4Rezy2ukYmg617kfrGCOHH5FC1DJGQTMWVe9eJlIVFCmY8RlhvYnKEN1W22jtWslm sdyUTrk1/G7y9LDGfmsIB/fT+0/ZAFfQq6ATgxD9w7ykWHAIlWqsFkUuoY/D/MUCOlKv qyv21DgWMRiSr/uTGxIKIIuRxxiHcB3rLM0lzkoU5ib2c3g1lhDFlZ/1IZA6fcjGy2Vh WT8Q== X-Gm-Message-State: AOJu0YytQkPYgUwUBQh72lrjSeq5eK9frlYJ3+rbCc8+jSAIZdVOZ6B+ 3QWmEjnURw4W/3vm52xbD72MONRw42WlWs+yMVSxeFpeYrJ4DZbKMahYkGF9NStzlUN20/T7rm4 T X-Gm-Gg: ASbGncvgpsSyxA/F0KPY2Wbr1rGNSre3Vl1gDukbFtyeA0hRN5oNc9tdfnlO4Z7Yv9c hoewS+Cq/CnaWMl1tCJ8vS3IM5knnYoX1xbe4/dPs+tLz6wW7bnkdLvp0gkN1XCGtGBFMxZ60G2 B9vUHR00H6TK76TNmXhBXFX94BrxEj/kmSh5WRSn2zuhmbc0GVdGykWsyzUzkLxxk7m5PpV3z1w QHdekDVL0DCew15jdDcre+qPpldq2ko29O28sFlvB87GX/xWMjBSvsxW8UGV8sqSoMR6UozHHFw IIKdQINTywE79CCbCfNX2A5BQgJD6wfXOHHGqVzDdSRuL/UoYqbqc/c0zidT4kL4Ef9q5VCrpnG YxPkHVuXvpTLWPPU= X-Received: by 2002:a05:6e02:b46:b0:3d9:43fe:8e49 with SMTP id e9e14a558f8ab-3d97c1ade2bmr5797325ab.8.1746133510774; Thu, 01 May 2025 14:05:10 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 8926c6da1cb9f-4f88aa5832bsm44463173.84.2025.05.01.14.05.07 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 01 May 2025 14:05:10 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Cl=C3=A9ment_Mathieu--Drif?= , Zhao Liu , Hanna Reitz , Igor Mammedov , Marcel Apfelbaum , =?utf-8?q?Philippe_Mathieu-D?= =?utf-8?q?aud=C3=A9?= , Paolo Bonzini , Eduardo Habkost , qemu-block@nongnu.org, Jason Wang , Richard Henderson , Yanan Wang , Ani Sinha , "Michael S. Tsirkin" , Thomas Huth , Gerd Hoffmann , Kevin Wolf , Yi Liu Subject: [PATCH 01/18] hw/i386/pc: Remove deprecated pc-q35-2.8 and pc-i440fx-2.8 machines Date: Thu, 1 May 2025 23:04:39 +0200 Message-ID: <20250501210456.89071-2-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250501210456.89071-1-philmd@linaro.org> References: <20250501210456.89071-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::131; envelope-from=philmd@linaro.org; helo=mail-il1-x131.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é --- hw/i386/pc_piix.c | 9 --------- hw/i386/pc_q35.c | 9 --------- 2 files changed, 18 deletions(-) diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index 98bd8d0e67b..0d6ad9db627 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -746,15 +746,6 @@ static void pc_i440fx_machine_2_9_options(MachineClass *m) DEFINE_I440FX_MACHINE(2, 9); -static void pc_i440fx_machine_2_8_options(MachineClass *m) -{ - pc_i440fx_machine_2_9_options(m); - compat_props_add(m->compat_props, hw_compat_2_8, hw_compat_2_8_len); - compat_props_add(m->compat_props, pc_compat_2_8, pc_compat_2_8_len); -} - -DEFINE_I440FX_MACHINE(2, 8); - #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 a1f46cd8f03..54c18100122 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -639,12 +639,3 @@ static void pc_q35_machine_2_9_options(MachineClass *m) } DEFINE_Q35_MACHINE(2, 9); - -static void pc_q35_machine_2_8_options(MachineClass *m) -{ - pc_q35_machine_2_9_options(m); - compat_props_add(m->compat_props, hw_compat_2_8, hw_compat_2_8_len); - compat_props_add(m->compat_props, pc_compat_2_8, pc_compat_2_8_len); -} - -DEFINE_Q35_MACHINE(2, 8); From patchwork Thu May 1 21:04: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: 886369 Delivered-To: patch@linaro.org Received: by 2002:a5d:430f:0:b0:38f:210b:807b with SMTP id h15csp513902wrq; Thu, 1 May 2025 14:06:13 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVIuuKnbQMh/L7QCijJZhwKLq9rOxdvWY4GerQx5IICgtVQezAtXd7l9YJvlgdRW1mrJhfcFA==@linaro.org X-Google-Smtp-Source: AGHT+IHR0C5HX+98aBdbh1lkLX9//YQ23NW6pi5TrzX3MFUaCw//atyvA/gqVmVacChZAnf+9MQM X-Received: by 2002:a05:6214:1bcb:b0:6eb:28e4:8519 with SMTP id 6a1803df08f44-6f51538d979mr11891056d6.21.1746133572859; Thu, 01 May 2025 14:06:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1746133572; cv=none; d=google.com; s=arc-20240605; b=RGS2Oyseh9gyHMzSfcY5Rw74ZGtSVxUXdxxMc46WI3Fqe3aUykWWhgr5dvTkihuNKO LSoYv9DvkMiOhtvvEkDVfhwxp+TKKQ62LyU3qfAhoRu+oLxlqXiVIeBWsu8djgg18a4O Kn5PHhAIsdLEf2K69mTmxljMM2ISeu4Rxg1/hrD/SyarOdl+B54AWLfRumZhCxQNuXEM upGmKSLG8Ho8FPOJJ5QrUyx6RVF9biBsjMRkXkyQyh8SmV/9waHGLKuoA36DwyR1tnQ+ wjYtKZNVNp89tZ8YLpRW6dq0HwcyduO58pFQAQS0CxMw5IkrW5GJMJ3UNDPFuuggTDIY HC+Q== 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=NGgUb/s2/eo1hN4YzKtPUZJhBvJN/kDbmTO2X06CYEM=; fh=uloqeIiLIhsqAWHY8zIEmzfMIcw7bGWZuINspytDykk=; b=joKen225r2fUI7SHZyhIOKzFcuRfwIDUAbCE5LLLvO8CxADk5x5V6f7BkOZ0BUA8/h fa+tyul9XL2yyMQOyfilg0wH4/MdqkoGntgGU6pzhdM5GIo0WhB60Cz1uY1J/95WP3yD N0wOY7iGI7LdkUx9f/lMDYCEd+6pXq7e7uHFJSF+gekp+fYFzFhqknQIhxM1vTqPZ8co AtbCGnSqOuebPqiZg8GUNCfeIYTq0sobjt5lu4/uW9pULCw5ZEh6/3vs+0MbISluGJOd +ziY2rW67tNhLhCgk1oUBUSt+NKzK/sGF0LpZ9cIMWDhuXyaQwhGmIHn2jrEX8WsLVh+ I/Gg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=lS7os7SO; 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-7cad241bebfsi148445085a.212.2025.05.01.14.06.12 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 01 May 2025 14:06: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=lS7os7SO; 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 1uAb5w-00011s-8a; Thu, 01 May 2025 17:05:24 -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 1uAb5u-000112-H9 for qemu-devel@nongnu.org; Thu, 01 May 2025 17:05:22 -0400 Received: from mail-io1-xd2e.google.com ([2607:f8b0:4864:20::d2e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uAb5s-0006Tu-UU for qemu-devel@nongnu.org; Thu, 01 May 2025 17:05:22 -0400 Received: by mail-io1-xd2e.google.com with SMTP id ca18e2360f4ac-85de3e8d0adso34150839f.1 for ; Thu, 01 May 2025 14:05:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1746133519; x=1746738319; 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=NGgUb/s2/eo1hN4YzKtPUZJhBvJN/kDbmTO2X06CYEM=; b=lS7os7SOjwVWqKVql0zxfpCbVEbZbEKXWhQkEDtvbzsTjiLKuUyR8ECdK2MOSnqFDK FBChmQx9KMAExY019UJ+A1XGtBbM+UIymMuL3yiFQS5Fq6gLytNH+Zzx9jlMKkTe2HhS dUhFg69tDI3wau7oHBh3T0W89cbqBUkYIfBQnV4qpOUVbL+55fZB3CGQfsWcT/Z6qiL8 6t2QohUYy2HTTQYDHviAJNq0duU0utN+ZkC/Y5cFpHHxh/BnyKpWUGOs8QHfqwoDb/K1 DgKm2e0agVbNvOa4e087/N5xIrxV0SOLxvVEuyFMtf1vkCGReVVvsM5LCyHWVCpGq3Tn bW7A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746133519; x=1746738319; 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=NGgUb/s2/eo1hN4YzKtPUZJhBvJN/kDbmTO2X06CYEM=; b=v2oDoEXemnIFm/TS2pR+WBU7lfmuGcfI7sDGdias6OxUJ6HyX1sWXJHf7kwNwV6Ogi UAAmtea0OqbMJjK/7XJulWN/uk+vbkm8+/sDrTwhWco9EWDp14L9qb2E9EBVloymn2pY lN36jy9xlLTpKeye/huPpjxUm1yBsvEpd8+omHDt73u7ZN/KwLCPSDfBxXDIKaZ6sJ7/ viayJx0rGmTg7ft3jQt3dPUzujK9nixVoq/O87K/FX2O0344psdDbywo9RcgdUfDPpa6 T0UDwYHa0Iy3fmrVAV9c/oqesqfVoUzKvbF2lQn5TlHn+xyU+/4Q26vG8O/mXdPpgLWN uFSA== X-Gm-Message-State: AOJu0YwoldterA74gjGQjLDqSizaJmugLUDDK195JUMPJwYaAfV6hquT lj1KZXuT4UDyCbC7MTbHDDF0LntMT23Ew2ZMoeEvBCQ7dhqF2xlWl55ZDYI6gSj8p7u2orL5H50 q X-Gm-Gg: ASbGncujd5rzrs5CHVdzLDRAGPUMgSmcuITJ72OySHx1rgWC8S6DZqejD0hRFBewzKC 2s1ly7mWW52HRMcSlfuAhXf8zRxdJ6wJ6adQhkGRp4Q4VFqSYwh4zo2XOTaR9Stk6QWfgWueWD/ AWj0zGKNzfR98TaaAHlItyxxAveQ21YCPayV2dIPhejGEiyTWg9pPwDDzGJdf/jt2jEHbm69jNu JxS/fyP7sB0obeKc7ay150qCpsLnsb0iegDgWVUWXJ2JdiH9ZngI2M0B74KRTR5l0Wz90hRVTCE YAI4B09zwaxYR06LwiLsyy3XtQHQRmKpznms5Bh7Rrcs6kxCzWc9SnWzfOWb+ZPXpPMnIb8W5lw 0U50Z4Z9LkdFDhN4= X-Received: by 2002:a05:6602:7285:b0:85b:538e:1fad with SMTP id ca18e2360f4ac-8669f99d5bdmr118117739f.6.1746133519384; Thu, 01 May 2025 14:05: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 ca18e2360f4ac-8668c2ee05esm6459539f.30.2025.05.01.14.05.15 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 01 May 2025 14:05:19 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Cl=C3=A9ment_Mathieu--Drif?= , Zhao Liu , Hanna Reitz , Igor Mammedov , Marcel Apfelbaum , =?utf-8?q?Philippe_Mathieu-D?= =?utf-8?q?aud=C3=A9?= , Paolo Bonzini , Eduardo Habkost , qemu-block@nongnu.org, Jason Wang , Richard Henderson , Yanan Wang , Ani Sinha , "Michael S. Tsirkin" , Thomas Huth , Gerd Hoffmann , Kevin Wolf , Yi Liu Subject: [PATCH 02/18] hw/i386/pc: Remove pc_compat_2_8[] array Date: Thu, 1 May 2025 23:04:40 +0200 Message-ID: <20250501210456.89071-3-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250501210456.89071-1-philmd@linaro.org> References: <20250501210456.89071-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::d2e; envelope-from=philmd@linaro.org; helo=mail-io1-xd2e.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 The pc_compat_2_8[] array was only used by the pc-q35-2.8 and pc-i440fx-2.8 machines, which got removed. Remove it. Signed-off-by: Philippe Mathieu-Daudé --- include/hw/i386/pc.h | 3 --- hw/i386/pc.c | 9 --------- 2 files changed, 12 deletions(-) diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index 319ec82f709..db02cbc0d65 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -286,9 +286,6 @@ extern const size_t pc_compat_2_10_len; extern GlobalProperty pc_compat_2_9[]; extern const size_t pc_compat_2_9_len; -extern GlobalProperty pc_compat_2_8[]; -extern const size_t pc_compat_2_8_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 ee7095c89a8..5f07a44d447 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -232,15 +232,6 @@ GlobalProperty pc_compat_2_9[] = { }; const size_t pc_compat_2_9_len = G_N_ELEMENTS(pc_compat_2_9); -GlobalProperty pc_compat_2_8[] = { - { TYPE_X86_CPU, "tcg-cpuid", "off" }, - { "kvmclock", "x-mach-use-reliable-get-clock", "off" }, - { "ICH9-LPC", "x-smi-broadcast", "off" }, - { TYPE_X86_CPU, "vmware-cpuid-freq", "off" }, - { "Haswell-" TYPE_X86_CPU, "stepping", "1" }, -}; -const size_t pc_compat_2_8_len = G_N_ELEMENTS(pc_compat_2_8); - /* * @PC_FW_DATA: * Size of the chunk of memory at the top of RAM for the BIOS ACPI tables From patchwork Thu May 1 21:04: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: 886368 Delivered-To: patch@linaro.org Received: by 2002:a5d:430f:0:b0:38f:210b:807b with SMTP id h15csp513897wrq; Thu, 1 May 2025 14:06:11 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXLnsQhIBci0GAGnqunnHhdfPxfmFOwaAGJ5LmwjBp6gwg2NH0U+8MZ75NXscDvui7mwr8N5g==@linaro.org X-Google-Smtp-Source: AGHT+IHLwyt02CdwTHCifH/KxVMx2v2+xFL3zMQQgyWqv3xE5pa4G5sruWnqjR37gHXIDS6mRBoG X-Received: by 2002:a05:622a:4cca:b0:477:1b2d:f05 with SMTP id d75a77b69052e-48c1950a30emr11797711cf.15.1746133571470; Thu, 01 May 2025 14:06:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1746133571; cv=none; d=google.com; s=arc-20240605; b=RUm7p3TxZHkpxbNd0J1frGxs8645Y0DzEBELpzBjOWuLElpH1GyYUi4zhbq+Lx/U2z 9Uxdwwt2W1IHoffODU0GiHOXCtOLuO4WGXIhegUEqhRc7Fa50fyJquuoXyqUPWP4A+M8 ywnHq/kz8asVBFXIV96L8lWmPRQ2xo5IdGFggS2nsFLYhCi283BQHKoCWswbXjP9XpiB BVS4t3hsphq86mVJMN7GLJnMOIXnzqHhcZx6xyFydGES6M0lE8um9vVynLXx7CkdCZyc /3kvoQelf3AdAul+kuYlQct5HnJ0Xf93HSi7lvAV3PuZ6k8pmDfM6eKimnbu6keG+Rzo xtOg== 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=j5ZMEn7NCnklWa+DQm3mEiEs22N/Anfjag2M9l8eBgM=; fh=uloqeIiLIhsqAWHY8zIEmzfMIcw7bGWZuINspytDykk=; b=Z2yCmsh4PptU9tp97sFfc6Ow5U4RSZPk6mgBCHpbIowcy8rk+gxCgx3r2OKnolF4ja uY6eiD1nwQXfYARZdszIdIIdN4RH9NbvLWvOjjQOIOj+6GhONDOwH5dxvXBB6cqKfiSq DnQrhUd+569SmWBpoTbaWvNSZotGG0hFbWDitVq0MoLBHtSup+O6C6QcxBGlC0Hrl7Lv 0MsMmeaF37qYaJymlWlGr7NhHSbRoyp8BemyrwUe/7oVru8RZHtv3G3A9nRu/h5tkOFe YiO2XVA88io/ClFgBo317B9ZXoZXvbpGSX6Ie+Rx/HvYre1NF7ZybSNoAihPEMWyZGCn 6DYA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="gDP/Cp1+"; 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-48b9872442csi14347981cf.353.2025.05.01.14.06.11 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 01 May 2025 14:06: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="gDP/Cp1+"; 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 1uAb64-00014K-UZ; Thu, 01 May 2025 17:05:32 -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 1uAb63-00013G-Gc for qemu-devel@nongnu.org; Thu, 01 May 2025 17:05:31 -0400 Received: from mail-il1-x12d.google.com ([2607:f8b0:4864:20::12d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uAb61-0006VR-MQ for qemu-devel@nongnu.org; Thu, 01 May 2025 17:05:31 -0400 Received: by mail-il1-x12d.google.com with SMTP id e9e14a558f8ab-3d8fc9dbce4so9431785ab.0 for ; Thu, 01 May 2025 14:05:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1746133528; x=1746738328; 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=j5ZMEn7NCnklWa+DQm3mEiEs22N/Anfjag2M9l8eBgM=; b=gDP/Cp1+nSdU3DlP3mtW04nBm9J4WCQR7XHpqtmvYc5tTDHZI7BK/quNDH21I8kqs2 5T8oU+FuAgDSzl4LMOusSq2FX9fUgTsfeFGc7CpuoROSVffwN+oMwgvvw3QtkFKWkNZo 0fkcG8Fp6bsy1AxIwmjCYPW0NLDHaNuOzJKABDYKWGO7EhHN6sbCDoa23cVU1KT6cWbo ELRjMZ9+jztJ+Ho9rK2W5RblCQ0/WkgNPZS6u86GKBYzDG+SUSuRN6GBYdkT8lVKUAZj baxfujiuOJf768bpVVD53n7NrAUGnbOjWBwiBpzXLsyA2GPJw/OunX/2xMRCwTIFqpao 3oaQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746133528; x=1746738328; 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=j5ZMEn7NCnklWa+DQm3mEiEs22N/Anfjag2M9l8eBgM=; b=BrKbnc9bjYq7M/qvO2lVLh9jYMuC05r9wHYT9+n7VxtgIPuc+kNB6677KJr85Q9O/O v6rWRz7zrA6J9BfhkIKqJ3mlfpa3qnna456AZqb+w4plavrPtQicrdy9dD9xqBfF/mF1 wV4p53g4DATG9FIxsSQxkH63LxB4koV4OQ5WnECCPE2jmFA+rXWDvDUzaJEB0NljiKVp o8we41W4VVO8/bwKsMBjsLZMKRHxlj0FiVNsGfBFHhWPVKyA/V3uFuRGdnIuxvk8XEVH BVNMfe+hFEA+8AS1jSnbWqiIhy2b/Pdp4pPHtYhH7rxZH2LhalGSj/7ITDif3NL2g0w8 hxsw== X-Gm-Message-State: AOJu0YxGdA1VOUV2WXoD98J9TyFEARCfF3p8DpFjWJMLn5nwJHoYtgQu P33aPWZX+WL2WPbod65Onqhj/NvamzoHZJnB/yqgQYib/TLfc+hOpG52VYBfA3id7/CAPJFgpIh N X-Gm-Gg: ASbGncv6nXe5dRR2r/+iTzok8pnkkOrOd2jiZqlWsPhS5fQ1Mykkp929vfDGmhAKcpk e5YwUJMIMX0q+HeJZann1ds8AV783TKdL8CHIlkfMjxViV9/TbrEw0JK8tRVv01EfxhaFlj8Ano +tsbdxt0e0J8cL11D8+hm2Y8NqQWL32Cp79zV5UYRiHDOnYvGmvrTX5ohtw4o1t47QRCNPTCF2v cut21RTT6hm2pPah569xvbbJQ3nd4PWucSqT+irDoQ7OANGFUQTBdF+BA24zMacmS+p209MpXw3 y7weX157UqrfHqHYDeSPsWkLBkhacgZdW/ssXz/DbOMTJSm/amOdO+/9VnkD4KqZebUEqbDV24t +HzQsIwebtCup1cCEOtEAB44ebg== X-Received: by 2002:a05:6e02:3e8d:b0:3d9:3675:f531 with SMTP id e9e14a558f8ab-3d97ae710cbmr8096145ab.6.1746133528213; Thu, 01 May 2025 14:05:28 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id e9e14a558f8ab-3d975e27d71sm3033745ab.10.2025.05.01.14.05.24 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 01 May 2025 14:05:27 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Cl=C3=A9ment_Mathieu--Drif?= , Zhao Liu , Hanna Reitz , Igor Mammedov , Marcel Apfelbaum , =?utf-8?q?Philippe_Mathieu-D?= =?utf-8?q?aud=C3=A9?= , Paolo Bonzini , Eduardo Habkost , qemu-block@nongnu.org, Jason Wang , Richard Henderson , Yanan Wang , Ani Sinha , "Michael S. Tsirkin" , Thomas Huth , Gerd Hoffmann , Kevin Wolf , Yi Liu Subject: [PATCH 03/18] hw/southbridge/ich9: Remove ICH9_LPC_SMI_F_BROADCAST_BIT definition Date: Thu, 1 May 2025 23:04:41 +0200 Message-ID: <20250501210456.89071-4-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250501210456.89071-1-philmd@linaro.org> References: <20250501210456.89071-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::12d; envelope-from=philmd@linaro.org; helo=mail-il1-x12d.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 ICH9_LPC_SMI_F_BROADCAST_BIT feature bit was only set in the pc_compat_2_8[] array, via the 'x-smi-broadcast=off' property. We removed all machines using that array, lets remove that property and all the code around it. Signed-off-by: Philippe Mathieu-Daudé --- include/hw/southbridge/ich9.h | 1 - hw/acpi/ich9.c | 6 ++---- hw/isa/lpc_ich9.c | 22 +++------------------- 3 files changed, 5 insertions(+), 24 deletions(-) diff --git a/include/hw/southbridge/ich9.h b/include/hw/southbridge/ich9.h index 1e231e89c92..4764c03ac2d 100644 --- a/include/hw/southbridge/ich9.h +++ b/include/hw/southbridge/ich9.h @@ -244,7 +244,6 @@ struct ICH9LPCState { #define ICH9_LPC_SMI_NEGOTIATED_FEAT_PROP "x-smi-negotiated-features" /* bit positions used in fw_cfg SMI feature negotiation */ -#define ICH9_LPC_SMI_F_BROADCAST_BIT 0 #define ICH9_LPC_SMI_F_CPU_HOTPLUG_BIT 1 #define ICH9_LPC_SMI_F_CPU_HOT_UNPLUG_BIT 2 diff --git a/hw/acpi/ich9.c b/hw/acpi/ich9.c index c7a735bf642..40564605735 100644 --- a/hw/acpi/ich9.c +++ b/hw/acpi/ich9.c @@ -477,8 +477,7 @@ void ich9_pm_device_pre_plug_cb(HotplugHandler *hotplug_dev, DeviceState *dev, if (object_dynamic_cast(OBJECT(dev), TYPE_CPU)) { uint64_t negotiated = lpc->smi_negotiated_features; - if (negotiated & BIT_ULL(ICH9_LPC_SMI_F_BROADCAST_BIT) && - !(negotiated & BIT_ULL(ICH9_LPC_SMI_F_CPU_HOTPLUG_BIT))) { + if (!(negotiated & BIT_ULL(ICH9_LPC_SMI_F_CPU_HOTPLUG_BIT))) { error_setg(errp, "cpu hotplug with SMI wasn't enabled by firmware"); error_append_hint(errp, "update machine type to newer than 5.1 " "and firmware that suppors CPU hotplug with SMM"); @@ -526,8 +525,7 @@ void ich9_pm_device_unplug_request_cb(HotplugHandler *hotplug_dev, !lpc->pm.cpu_hotplug_legacy) { uint64_t negotiated = lpc->smi_negotiated_features; - if (negotiated & BIT_ULL(ICH9_LPC_SMI_F_BROADCAST_BIT) && - !(negotiated & BIT_ULL(ICH9_LPC_SMI_F_CPU_HOT_UNPLUG_BIT))) { + if (!(negotiated & BIT_ULL(ICH9_LPC_SMI_F_CPU_HOT_UNPLUG_BIT))) { error_setg(errp, "cpu hot-unplug with SMI wasn't enabled " "by firmware"); error_append_hint(errp, "update machine type to a version having " diff --git a/hw/isa/lpc_ich9.c b/hw/isa/lpc_ich9.c index 71afb45b631..c57a06e0dde 100644 --- a/hw/isa/lpc_ich9.c +++ b/hw/isa/lpc_ich9.c @@ -400,15 +400,6 @@ static void smi_features_ok_callback(void *opaque) guest_cpu_hotplug_features = guest_features & (BIT_ULL(ICH9_LPC_SMI_F_CPU_HOTPLUG_BIT) | BIT_ULL(ICH9_LPC_SMI_F_CPU_HOT_UNPLUG_BIT)); - if (!(guest_features & BIT_ULL(ICH9_LPC_SMI_F_BROADCAST_BIT)) && - guest_cpu_hotplug_features) { - /* - * cpu hot-[un]plug with SMI requires SMI broadcast, - * leave @features_ok at zero - */ - return; - } - if (guest_cpu_hotplug_features == BIT_ULL(ICH9_LPC_SMI_F_CPU_HOT_UNPLUG_BIT)) { /* cpu hot-unplug is unsupported without cpu-hotplug */ @@ -470,14 +461,9 @@ static void ich9_apm_ctrl_changed(uint32_t val, void *arg) /* SMI_EN = PMBASE + 30. SMI control and enable register */ if (lpc->pm.smi_en & ICH9_PMIO_SMI_EN_APMC_EN) { - if (lpc->smi_negotiated_features & - (UINT64_C(1) << ICH9_LPC_SMI_F_BROADCAST_BIT)) { - CPUState *cs; - CPU_FOREACH(cs) { - cpu_interrupt(cs, CPU_INTERRUPT_SMI); - } - } else { - cpu_interrupt(current_cpu, CPU_INTERRUPT_SMI); + CPUState *cs; + CPU_FOREACH(cs) { + cpu_interrupt(cs, CPU_INTERRUPT_SMI); } } } @@ -830,8 +816,6 @@ static const Property ich9_lpc_properties[] = { DEFINE_PROP_BOOL("noreboot", ICH9LPCState, pin_strap.spkr_hi, false), DEFINE_PROP_BOOL("smm-compat", ICH9LPCState, pm.smm_compat, false), DEFINE_PROP_BOOL("smm-enabled", ICH9LPCState, pm.smm_enabled, false), - DEFINE_PROP_BIT64("x-smi-broadcast", ICH9LPCState, smi_host_features, - ICH9_LPC_SMI_F_BROADCAST_BIT, true), DEFINE_PROP_BIT64("x-smi-cpu-hotplug", ICH9LPCState, smi_host_features, ICH9_LPC_SMI_F_CPU_HOTPLUG_BIT, true), DEFINE_PROP_BIT64("x-smi-cpu-hotunplug", ICH9LPCState, smi_host_features, From patchwork Thu May 1 21:04: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: 886377 Delivered-To: patch@linaro.org Received: by 2002:a5d:430f:0:b0:38f:210b:807b with SMTP id h15csp514714wrq; Thu, 1 May 2025 14:08:26 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUupv1wEdgQMrqc7LPuqexpqmrd7aHBeo7n9F8j9k5NP93vGokpltwvJfdEDt11dvUwhaawyQ==@linaro.org X-Google-Smtp-Source: AGHT+IF/tE4LfbJXbYD0PzdOkEZzO7I8edcC/JuFpyaFm3icdcX2/G2d2/CK6pX1EK6eJM/q5JWC X-Received: by 2002:a05:622a:1b03:b0:479:1a41:b50d with SMTP id d75a77b69052e-48c3163d98dmr6213391cf.17.1746133706284; Thu, 01 May 2025 14:08:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1746133706; cv=none; d=google.com; s=arc-20240605; b=bosuTTt02f2tjYvFKvZMtOX3TKQXUnkMiygkBsqzjXMdBqn8MkEZ9Kq6lfSWOD2LLk CLYG/3hILj1kJFenZr8SyG9ihiw8/m76+ffqnKbDb6KmMNyW0S/nBmX7tNRY7ke6qCJH sEmgDR2J1u9bsZjGHslklRvuIVy+msvuk+Po2zUNSXPqJArkWo+Qe3/CzyaH6uKPGRte cGFjUOzysGJWOpb0AEILcyE91D+Vfr9aOnTfwaqgObX03Zfrwfu4wTsWFlyC/zUYIMCH T+po/OGaSqABr5yVUoqV48KOhTNWaBzrwZ0qJ/4p/28/p0cYEZcO2bwzKMxwb5b3IZpG 7IAQ== 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=F+9tG6D5CrQpBCxb8rCcSa1c4gmLBRkbtI6i0IG/w1E=; fh=uloqeIiLIhsqAWHY8zIEmzfMIcw7bGWZuINspytDykk=; b=PvuJXUVkvzvMBaDOc3m+pSqH0m+3q+aKw57fgV4RIRlb6lRWWS+zdCgX2BonXJsUZt 3p1LPCWO+4lphtK1rGFVNjYvKzLvpjMZvpMIgdzV2DCLpNT+6bae/Ckw+iwpKRaUT+71 9eg/7E2rKz4UxGfEbxOUIMAjejrSbmDu9u7Be/4jDhpLclVucFj15ps3veRRm/407WE7 ZyikKU8wMadWW74oJqTH3nJIJqtqGbuXjyi0FOjChSh4Im32u4/MKlG1CFHKkajdUq7f boPd/Fc3rWEIJn9AwQiQS4YJEMnm7tk+Ui6is0lTsjFIDPqEGlQ8eZ5kZPE4W+Uc01Gf Hk5w==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=eJAPIuGo; 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-48b966cdc18si13841811cf.141.2025.05.01.14.08.26 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 01 May 2025 14:08:26 -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=eJAPIuGo; 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 1uAb6E-0001AB-7T; Thu, 01 May 2025 17:05:42 -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 1uAb6C-00019Y-95 for qemu-devel@nongnu.org; Thu, 01 May 2025 17:05:40 -0400 Received: from mail-il1-x131.google.com ([2607:f8b0:4864:20::131]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uAb6A-0006XP-Jq for qemu-devel@nongnu.org; Thu, 01 May 2025 17:05:40 -0400 Received: by mail-il1-x131.google.com with SMTP id e9e14a558f8ab-3d81768268dso11950385ab.3 for ; Thu, 01 May 2025 14:05:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1746133537; x=1746738337; 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=F+9tG6D5CrQpBCxb8rCcSa1c4gmLBRkbtI6i0IG/w1E=; b=eJAPIuGoHz+Os1ioFy6Diov6MpfVL59X1ly52+VBSCl7qsfIwbMwkkKLb43kohHlBU LXpuEdY5hLoBK7moDYFkrnHUcSY67fK9PE8DjLC3pnpmCwf2+B1eJpzDEAB6vk4Wrevc KP9LID+1ezZP7sR9bXtbARcaC/WMgUsyb6/H9/IvCFzBzFhP0f+E5K9hWc/q4nlc2Ppn i5M6cK4+0veskFSm0vtYEhHI+zYuu7kdqTwVh+qljNZCAjoo/cRjxuZVi53EFX5wCeFe LULiJlK4Cgja+/u5iVYAvbsTaKEqAX2IZXKjLyPygWBjHcxTY3wMjlmY/FtGu5LW1/4l SWEw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746133537; x=1746738337; 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=F+9tG6D5CrQpBCxb8rCcSa1c4gmLBRkbtI6i0IG/w1E=; b=ttdT5BtAnpIH5I9/K0hXZ5ZnvPWJW5VOtJw9d79hn9z+BaGWA/0Ks16mItwNOuPfZl nZXqu1SZ3v0FKTkBwWB/mX5LG20/OIRG54pGqFwFS5MjF/KKjj7PJ5mOS0jqMb1o+NfG xul9z68ZgQtDxp+7fONpQPzfzHEYejPLgdemFWEg67PHDFgiIYocE5V7qHpK40GdA5/0 K3wBpNiHleAMkwW5jvIDXIqfk5RMaYUjvGvg9AZSe8l4qLKSAKGeGNtaPQ3gNj+E6X2w sr15uo5gwJWHM6HZkCDgqZUcEDGW2znBzGbPB6KJY+h7BXA9aBR6JSOCPqPdjBgvxtGx hdvA== X-Gm-Message-State: AOJu0YyOsRyUKiNb5uUgpPSD0ex1TXCHVol9NQUO+tFcSwSGD9sSuVyK Isbq3gyp2x5K3f0HQgnWl2i8OPc+fvqJLZ4gsU8ZEMfW/kStu4c0iAiyywBe1Juaed7lPKu4sE2 T X-Gm-Gg: ASbGncvjq5typ2P/IJR9uBzCqUgNhh7NVdJLzzAuKAvkUOUo+QzIdqUhohpOQcEmVzW 3DF+LktaHLqUZTE9Vk50bF2T7EwEKzi16na2Q4jTTRlo3k0H6tsF1CaREYShHzT8qghKrN2NVs3 m4gTd+14WugsOG4RfAx8VmiVCMJ63nKqPA4hUCjH4ImsegKDipl+n4fV1+Jq9ysca79tK5nFJ2s PIaHiV4VU/T0QATILqJWvuKYLm5HLSDtudjQ/VrSgB3DQHpUsKZI+u4RCfJBq6Pm9vLc3PMVeme jWYD+aqND8w3DLCVlaeS2sddRkGkijcsZkBFsb9C6/wpgylGrWQc3R5NJ4Ea+i5WbKBU8oaGhjS rWQKR4Iz0ZOBWIpQ= X-Received: by 2002:a05:6e02:1529:b0:3d9:3e8e:60da with SMTP id e9e14a558f8ab-3d97c237917mr4932745ab.17.1746133536916; Thu, 01 May 2025 14:05: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 8926c6da1cb9f-4f88a918039sm48520173.55.2025.05.01.14.05.33 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 01 May 2025 14:05:36 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Cl=C3=A9ment_Mathieu--Drif?= , Zhao Liu , Hanna Reitz , Igor Mammedov , Marcel Apfelbaum , =?utf-8?q?Philippe_Mathieu-D?= =?utf-8?q?aud=C3=A9?= , Paolo Bonzini , Eduardo Habkost , qemu-block@nongnu.org, Jason Wang , Richard Henderson , Yanan Wang , Ani Sinha , "Michael S. Tsirkin" , Thomas Huth , Gerd Hoffmann , Kevin Wolf , Yi Liu Subject: [PATCH 04/18] hw/i386/kvm: Remove KVMClockState::mach_use_reliable_get_clock field Date: Thu, 1 May 2025 23:04:42 +0200 Message-ID: <20250501210456.89071-5-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250501210456.89071-1-philmd@linaro.org> References: <20250501210456.89071-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::131; envelope-from=philmd@linaro.org; helo=mail-il1-x131.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 KVMClockState::mach_use_reliable_get_clock boolean was only used by the pc-q35-2.8 and pc-i440fx-2.8 machines, which got removed. Remove it, along with the 'x-mach-use-reliable-get-clock' property. Signed-off-by: Philippe Mathieu-Daudé --- hw/i386/kvm/clock.c | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/hw/i386/kvm/clock.c b/hw/i386/kvm/clock.c index f56382717f7..726ebfcb0cb 100644 --- a/hw/i386/kvm/clock.c +++ b/hw/i386/kvm/clock.c @@ -23,7 +23,6 @@ #include "migration/vmstate.h" #include "hw/sysbus.h" #include "hw/i386/kvm/clock.h" -#include "hw/qdev-properties.h" #include "qapi/error.h" #include @@ -43,9 +42,6 @@ struct KVMClockState { /* whether the 'clock' value was obtained in the 'paused' state */ bool runstate_paused; - /* whether machine type supports reliable KVM_GET_CLOCK */ - bool mach_use_reliable_get_clock; - /* whether the 'clock' value was obtained in a host with * reliable KVM_GET_CLOCK */ bool clock_is_reliable; @@ -232,18 +228,10 @@ static void kvmclock_realize(DeviceState *dev, Error **errp) qemu_add_vm_change_state_handler(kvmclock_vm_state_change, s); } -static bool kvmclock_clock_is_reliable_needed(void *opaque) -{ - KVMClockState *s = opaque; - - return s->mach_use_reliable_get_clock; -} - static const VMStateDescription kvmclock_reliable_get_clock = { .name = "kvmclock/clock_is_reliable", .version_id = 1, .minimum_version_id = 1, - .needed = kvmclock_clock_is_reliable_needed, .fields = (const VMStateField[]) { VMSTATE_BOOL(clock_is_reliable, KVMClockState), VMSTATE_END_OF_LIST() @@ -304,18 +292,12 @@ static const VMStateDescription kvmclock_vmsd = { } }; -static const Property kvmclock_properties[] = { - DEFINE_PROP_BOOL("x-mach-use-reliable-get-clock", KVMClockState, - mach_use_reliable_get_clock, true), -}; - static void kvmclock_class_init(ObjectClass *klass, const void *data) { DeviceClass *dc = DEVICE_CLASS(klass); dc->realize = kvmclock_realize; dc->vmsd = &kvmclock_vmsd; - device_class_set_props(dc, kvmclock_properties); } static const TypeInfo kvmclock_info = { From patchwork Thu May 1 21:04: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: 886376 Delivered-To: patch@linaro.org Received: by 2002:a5d:430f:0:b0:38f:210b:807b with SMTP id h15csp514668wrq; Thu, 1 May 2025 14:08:20 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWhc46W4H5qKxy7w/S1OqS3+hcSCfSF3X+XDgm9QeIfvkyXNlgoZlIPKgdf2fsFG0truWLAlg==@linaro.org X-Google-Smtp-Source: AGHT+IG2KOq0YYiWhb3f6S9HB+bb8jAJjT+jLwhnU+MvQjhUiE/nn24tTZtmkqRBHvebaW3Hq3np X-Received: by 2002:a05:6214:5190:b0:6f5:d21:cf90 with SMTP id 6a1803df08f44-6f5155ef4a2mr10875016d6.29.1746133700141; Thu, 01 May 2025 14:08:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1746133700; cv=none; d=google.com; s=arc-20240605; b=eL/RYOVpWTorSNZou2BQdvbunbfSwZhu93SCps1KjbqVZ3EgX2LZPX7gOAl8bzriwl rTjPEaBMCBRMgkzVfNY9V2JVrPkfvGusH355+82RNlkIlSFrnssRWdUgkc2vZX/hCIAZ fzRHLpw0V9y/Zk6a53/gyzSiuEXZqWcJiLrQWoBP8AFAELhK5WRfkCDR8BykLWLiXXgk G/XfgDbikq5nN7wbj9Us/qs++a0xgSZEuQIlC+aJUklAWRAvlrEIP8nswvzGyuUpiD9d 2HS7FSZ7uC8dAPchRD6BHJOUR+Jyk8cnm0RKQGlGyFU6tnK1BTTCSd/E1cnw6RK4Cz8v euJA== 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=o/QVQ9eARYed3NJFRK9UiivRgqBpCyWfc+XTOWrPU4o=; fh=uloqeIiLIhsqAWHY8zIEmzfMIcw7bGWZuINspytDykk=; b=EMsJgZWwTuDdzSjSWhzPJ2l/lE5jOhdYayCNyW4hGr3P5VH1brKiBAndCmFL/JdBcd WsGf9v0TYCod+55MzhjwG7vPKfW3ZkvFxgeM+klMRLcRIIEjHDgG/sskNOFEazMD5vnD JU98p5Aj4yVTcuGF9xp3ikQvY5uOe1YC+J4AI05aRWaxdMXUu3rDSEneVCGAWMvKGKJz jGU3y15NnkgU7vMdeEtWyN7+4H3ZCN8NY9hbyvEuR170QCcW0zsCb/K936A2zL0iERYe dZNzhgxzARon5CLRDcr6KFMZ3/0fM8sLtcGxCRTbLh+FhLxldjrU060t7KdALTMyVxDF HdZQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=aDZV01h+; 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-48b960cf6cfsi14214661cf.66.2025.05.01.14.08.20 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 01 May 2025 14:08:20 -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=aDZV01h+; 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 1uAb6Q-0001JT-7g; Thu, 01 May 2025 17:05:54 -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 1uAb6L-0001HI-Es for qemu-devel@nongnu.org; Thu, 01 May 2025 17:05:49 -0400 Received: from mail-il1-x131.google.com ([2607:f8b0:4864:20::131]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uAb6J-0006Z4-Ph for qemu-devel@nongnu.org; Thu, 01 May 2025 17:05:49 -0400 Received: by mail-il1-x131.google.com with SMTP id e9e14a558f8ab-3d817bc6eb0so4548315ab.1 for ; Thu, 01 May 2025 14:05:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1746133545; x=1746738345; 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=o/QVQ9eARYed3NJFRK9UiivRgqBpCyWfc+XTOWrPU4o=; b=aDZV01h+aNa/6oF+owR4bkoobkcnTEUSjeLXC1D2c79flAKDLg01NkrmBu2/GtdR8S 87Wv27uC1L5wnZZQDvzbUFGb/75OHfU60LbBP9DX/M2flC8oQswCIGEyPcmRhEjPGdzP CaGB0WJ2x7oiuq71ecAp9xV7jezDRsgy+zwxlF2IW750NEgcyU1imxyTa9P/ZRLYhL9W aePxNjOCuN4y7H3dWyWiN28K9ZkiPyM2uCFPwRTz3zCQGgjSEwRD7zBM28qUSoKl5irs tITM8ohtvnXyKr/yDvHMmtHrA+577l5aBZP00vT8V58SpbbEYaozggjtItqQdcb8Yxk5 6ZzA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746133545; x=1746738345; 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=o/QVQ9eARYed3NJFRK9UiivRgqBpCyWfc+XTOWrPU4o=; b=BLy4W0pYRZjtOJoR5DqRcKgmG2WKqyvVtUyTcNXBmhwkfLgOhNwGgciGYC9ABxmgS3 av5B23dwZ1GwgcrVXqxERT0a8Zc2f1kjeTz0+1URbtlHr6+dK4O6JThKu1OsUgX8keMK bv33ZOCtqwt2nOpu6DltDsZsTd0v03kg2eGkL8FTtngcv1X12VJtGm0EiNfdIxWff3s0 Esh/sySe3JdjY9/qna7IubFMY7/B1Fw/nnqcnl7GlPoIsRlvUKPCNFY5lnSOpJF0+u9g Tf/g5qSKXuOnE3gY82qQswOwwX+Lko2TggvrB3aEHPKrDGpUq92iNn3BgoAVn+B+bWr8 /52Q== X-Gm-Message-State: AOJu0Ywnu/Gt/lOdpLxQOgg/z1eyQKJZreTUqvu3pqighDI3E5thxsGM EwomaYpWHOMzlwIVuwdHr54Yf8cnyYc2tTksg8wsPINnYNIKKZFoVY4Cb11VTabgCPbGwAFzPeo f X-Gm-Gg: ASbGnctr12qbrYsqHeNhIA+Y9unahhFpMR95fC/oH5ScEr02wCk4yXpp+vaiddgwuKC 40BKjtNKl9dnqqbpBBCpncW3nGROWmPS8FVvCTO4FO7skurTY9VKtk5mPTPBLXTQ6oktUdgLGTN i36Z0kUETT2VhZ+4uaRB9NKFrTGJTIxd/Zxfy0WHC99QJBET9nZqpjsSwEo2fpr6rBMuCvXovFG b0zhm9Nc1iKzGSalO25DIatLspyFPiYvsaRIs8+xEzg3OdruBs7/SxlCBXpngmMLC/pe679sS5w DEFrb0Zf18Rfdmiyjc8AOzyJjDRhH+Eov08H5w6A9ncTRnXCywAqrD1Kg0mcvOGoTq35rdsKnAS Wfj0N/bl8301zECI= X-Received: by 2002:a05:6e02:1a85:b0:3d8:1d0e:5308 with SMTP id e9e14a558f8ab-3d97c17f122mr5120005ab.6.1746133545451; Thu, 01 May 2025 14:05: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 e9e14a558f8ab-3d975eca768sm3074505ab.37.2025.05.01.14.05.42 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 01 May 2025 14:05:45 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Cl=C3=A9ment_Mathieu--Drif?= , Zhao Liu , Hanna Reitz , Igor Mammedov , Marcel Apfelbaum , =?utf-8?q?Philippe_Mathieu-D?= =?utf-8?q?aud=C3=A9?= , Paolo Bonzini , Eduardo Habkost , qemu-block@nongnu.org, Jason Wang , Richard Henderson , Yanan Wang , Ani Sinha , "Michael S. Tsirkin" , Thomas Huth , Gerd Hoffmann , Kevin Wolf , Yi Liu Subject: [PATCH 05/18] hw/core/machine: Remove hw_compat_2_8[] array Date: Thu, 1 May 2025 23:04:43 +0200 Message-ID: <20250501210456.89071-6-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250501210456.89071-1-philmd@linaro.org> References: <20250501210456.89071-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::131; envelope-from=philmd@linaro.org; helo=mail-il1-x131.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 The hw_compat_2_8[] array was only used by the pc-q35-2.8 and pc-i440fx-2.8 machines, which got removed. Remove it. Signed-off-by: Philippe Mathieu-Daudé --- include/hw/boards.h | 3 --- hw/core/machine.c | 14 -------------- 2 files changed, 17 deletions(-) diff --git a/include/hw/boards.h b/include/hw/boards.h index 77707c4376a..84bd3735c42 100644 --- a/include/hw/boards.h +++ b/include/hw/boards.h @@ -835,7 +835,4 @@ extern const size_t hw_compat_2_10_len; extern GlobalProperty hw_compat_2_9[]; extern const size_t hw_compat_2_9_len; -extern GlobalProperty hw_compat_2_8[]; -extern const size_t hw_compat_2_8_len; - #endif diff --git a/hw/core/machine.c b/hw/core/machine.c index bde19a2ff67..bc0606cf740 100644 --- a/hw/core/machine.c +++ b/hw/core/machine.c @@ -252,20 +252,6 @@ GlobalProperty hw_compat_2_9[] = { }; const size_t hw_compat_2_9_len = G_N_ELEMENTS(hw_compat_2_9); -GlobalProperty hw_compat_2_8[] = { - { "fw_cfg_mem", "x-file-slots", "0x10" }, - { "fw_cfg_io", "x-file-slots", "0x10" }, - { "pflash_cfi01", "old-multiple-chip-handling", "on" }, - { "pci-bridge", "shpc", "on" }, - { TYPE_PCI_DEVICE, "x-pcie-extcap-init", "off" }, - { "virtio-pci", "x-pcie-deverr-init", "off" }, - { "virtio-pci", "x-pcie-lnkctl-init", "off" }, - { "virtio-pci", "x-pcie-pm-init", "off" }, - { "cirrus-vga", "vgamem_mb", "8" }, - { "isa-cirrus-vga", "vgamem_mb", "8" }, -}; -const size_t hw_compat_2_8_len = G_N_ELEMENTS(hw_compat_2_8); - MachineState *current_machine; static char *machine_get_kernel(Object *obj, Error **errp) From patchwork Thu May 1 21:04: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: 886372 Delivered-To: patch@linaro.org Received: by 2002:a5d:430f:0:b0:38f:210b:807b with SMTP id h15csp514217wrq; Thu, 1 May 2025 14:07:03 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXzuLjymc9RJ8B4y4q5c5TfV+hyBGJdETjDLzMWBUmCvq/kkYeCK0NYzOS0KyjGjppdQ/24Lg==@linaro.org X-Google-Smtp-Source: AGHT+IFzaNFvvRt8RSogMpXHRXGJ2favy+t90NqX9DGew0YPQBJghIDwAxHuyu+NxuLKiHSJFr2d X-Received: by 2002:a05:6214:492:b0:6ed:19d1:212f with SMTP id 6a1803df08f44-6f5152542demr12455536d6.5.1746133623157; Thu, 01 May 2025 14:07:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1746133623; cv=none; d=google.com; s=arc-20240605; b=E6Mo9WkjFOYGCd00M4LUxGTFMvhWEGF7AF+paWGShUcoFWVxwktqQJoDrt8tzMLnFk dPQrmXts87HCqPzd048R1KKXEi8vACwWuvyQ0dsWBzhDn5BCyGqmC71lIxP8aPUZI6Xp JNrSBGb+Zys8UIhWePtSJeb9S7Gu56orl5IMg9y/uW5h6rnP0JFnyM0y0Azp3vHFbx0q zkA+vVzAtu100KvHlwoWtqnsf83keg5RZGy9UdzFRfJDhx+hdEyYj7Tt3GIHE/uJs9aj NYBvTWUxPslzVVt5pr4FuL1airmEY56gxJMejs7npb1hw4aJD5PoPF8OtO1G+0Z8Txlk t4eg== 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=S1tUkE2fqrTbr3cXQ8k1xcGcvFxNEjegGfUTV61cZkA=; fh=uloqeIiLIhsqAWHY8zIEmzfMIcw7bGWZuINspytDykk=; b=Ne34LtwPzPylzRqiaRZ44SwK5koP0WslNjAmu1yOFU9b9YcqtkpDsz1/lMY71IU3H9 YHugvAxPzddk0Apoq1CJ27UT1dD3757R6gKN2b2DYRRLnNMXAqYk8Q63kI287mVq06AC zr1jb5ppNfMCqjfCHHHWSFw25xAMwR/OzrAamcXk/aP4WfM4nIYdC07EQXm02c3f3L13 cMJgInDTSjibMFD3xmH0OCtgDj2oGykcSxtJjQzSXBn/G0Xxp80rLEVGiyHuhYSwyHjO rz27XyH5vhTlwuYH7hL5mkxWR9l3IyrWt6dYMTZHIwp/sN9aktFuxQJhGnUGi17yGWQN l7og==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=EbXFJ30A; 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-6f50f47a816si15928046d6.248.2025.05.01.14.07.03 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 01 May 2025 14:07: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=EbXFJ30A; 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 1uAb6U-0001Ke-V4; Thu, 01 May 2025 17:05:58 -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 1uAb6T-0001KH-Qw for qemu-devel@nongnu.org; Thu, 01 May 2025 17:05:57 -0400 Received: from mail-il1-x12d.google.com ([2607:f8b0:4864:20::12d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uAb6R-0006am-LP for qemu-devel@nongnu.org; Thu, 01 May 2025 17:05:57 -0400 Received: by mail-il1-x12d.google.com with SMTP id e9e14a558f8ab-3d9189e9a06so5153255ab.2 for ; Thu, 01 May 2025 14:05:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1746133554; x=1746738354; 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=S1tUkE2fqrTbr3cXQ8k1xcGcvFxNEjegGfUTV61cZkA=; b=EbXFJ30A946jsPQLWn2SXFovj1q8wmST0y8Ek3Q7sGPSD43hiO+wAXDb3jajsbpLE7 Qhzmt7AsDqZaR0y4iK2zHr4PdfaGt2h3Ha7QnA/LLpqCbenXLYqC/9RGR2j7FMWbrnx0 GjgyjH5uIYXIVSEJUZ2uvdppdCaXnWV55VrFCL1Jm6fcwZYyDfEHwwOCXblG9F4tWGN/ sjZANgV0tfT4oEKymupqxNGVPSWxe76yYxdqvPZpCok4NfJmYt36slkWe4IfsL0yvcZq YeqvsBuiqk+DXVFd4PM2U74vTcqddMWVAqGqg2MKGzERI2jFytJ4ev5uoxOEULuv7a5D feJQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746133554; x=1746738354; 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=S1tUkE2fqrTbr3cXQ8k1xcGcvFxNEjegGfUTV61cZkA=; b=HVEO4JcwznmkNHp/da5pM5Fl8DnrPAi/BrZK1myyDLVYLsRz6uN76M4TVCQ/gQNOdX 1adhDkVoYJY49IrlXjGrT6r2F/Yb6aR4+2ZI+GbyS+7e12peJDyNg4xXgfNe/qifS0lf JpEmO97KHxlSq67eXHVE1xGDiLQ9oRTbeW9IUh0bHqB5Q8fYGZEfJnysy34bI+XOsfQS PJ2X1NsQlUnRQJXWIHq+7J0YsFWlVICm9nxZNaq3sw7y+i9sXL+Qr/8GjZLKRR+2lUaI KUIT4lVLWVRGPei3IBA1Ndk14vz0qAYbRfVtZwZ8x+4VLdC7nWlQJOLqGM8KJEh7O+iV QONw== X-Gm-Message-State: AOJu0YxNBF99eBpDmHsQPBf33z8G8dZe+NT462rZstQyLBaROArcjNhA 807AY6XxV4KIIP20sI+jZxyCLp2gFRtN3v666iePIibaAk4eYb4uqs3cUwQNLPmMA3f8DABJzXm u X-Gm-Gg: ASbGncuaa6cakNFUoYEyoTNHSEbKdVZmSrh3SwojL/N+rHiCdn+1xZi7L1t+4LZXc9J sMmZFOPcpruRTqDQHheaOUg8WreRzInQQPrXZT41rVnFfpgH05EH3gwPz9L+7baiiX5Z4VZ3YGD nS86abW4X+N10MC9AjShFZOyKqEp9Gh6Z479kOkT5NFle0V+tV28W8kh/rvEqg6kXt6JNcSE7fM zxzQTchGad2k1pyWPfhC8PUIYk6/SsS5mJF/hIR1PCHAAOHbe4BPesvW+lWHEDsZOPW/HfdXEJ3 g+5z6zZRfwyyg6vBYKI+8+ru0qQHqiuRmNkh3H7V+85118fKQkOZd7U1MZCx76nESaMXj0SKXzC W8s8JKpvjN2PN3Zc= X-Received: by 2002:a05:6e02:1a8f:b0:3d8:1ed0:e167 with SMTP id e9e14a558f8ab-3d97c239b27mr4578815ab.14.1746133554154; Thu, 01 May 2025 14:05:54 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id e9e14a558f8ab-3d975f58be3sm3253625ab.58.2025.05.01.14.05.50 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 01 May 2025 14:05:53 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Cl=C3=A9ment_Mathieu--Drif?= , Zhao Liu , Hanna Reitz , Igor Mammedov , Marcel Apfelbaum , =?utf-8?q?Philippe_Mathieu-D?= =?utf-8?q?aud=C3=A9?= , Paolo Bonzini , Eduardo Habkost , qemu-block@nongnu.org, Jason Wang , Richard Henderson , Yanan Wang , Ani Sinha , "Michael S. Tsirkin" , Thomas Huth , Gerd Hoffmann , Kevin Wolf , Yi Liu Subject: [PATCH 06/18] hw/block/pflash: Remove PFlashCFI01::old_multiple_chip_handling field Date: Thu, 1 May 2025 23:04:44 +0200 Message-ID: <20250501210456.89071-7-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250501210456.89071-1-philmd@linaro.org> References: <20250501210456.89071-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::12d; envelope-from=philmd@linaro.org; helo=mail-il1-x12d.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 PFlashCFI01::old_multiple_chip_handling boolean was only set in the hw_compat_2_8[] array, via the 'old-multiple-chip-handling=on' property. We removed all machines using that array, lets remove that property and all the code around it. Signed-off-by: Philippe Mathieu-Daudé --- hw/block/pflash_cfi01.c | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/hw/block/pflash_cfi01.c b/hw/block/pflash_cfi01.c index 168101d8dfe..bba099a0c9e 100644 --- a/hw/block/pflash_cfi01.c +++ b/hw/block/pflash_cfi01.c @@ -84,7 +84,6 @@ struct PFlashCFI01 { char *name; void *storage; VMChangeStateEntry *vmstate; - bool old_multiple_chip_handling; /* block update buffer */ unsigned char *blk_bytes; @@ -703,13 +702,8 @@ static void pflash_cfi01_fill_cfi_table(PFlashCFI01 *pfl) * in the cfi_table[]. */ num_devices = pfl->device_width ? (pfl->bank_width / pfl->device_width) : 1; - if (pfl->old_multiple_chip_handling) { - blocks_per_device = pfl->nb_blocs / num_devices; - sector_len_per_device = pfl->sector_len; - } else { - blocks_per_device = pfl->nb_blocs; - sector_len_per_device = pfl->sector_len / num_devices; - } + blocks_per_device = pfl->nb_blocs; + sector_len_per_device = pfl->sector_len / num_devices; device_len = sector_len_per_device * blocks_per_device; /* Hardcoded CFI table */ @@ -765,7 +759,7 @@ static void pflash_cfi01_fill_cfi_table(PFlashCFI01 *pfl) pfl->cfi_table[0x2A] = 0x0B; } pfl->writeblock_size = 1 << pfl->cfi_table[0x2A]; - if (!pfl->old_multiple_chip_handling && num_devices > 1) { + if (num_devices > 1) { pfl->writeblock_size *= num_devices; } @@ -930,8 +924,6 @@ static const Property pflash_cfi01_properties[] = { DEFINE_PROP_UINT16("id2", PFlashCFI01, ident2, 0), DEFINE_PROP_UINT16("id3", PFlashCFI01, ident3, 0), DEFINE_PROP_STRING("name", PFlashCFI01, name), - DEFINE_PROP_BOOL("old-multiple-chip-handling", PFlashCFI01, - old_multiple_chip_handling, false), }; static void pflash_cfi01_class_init(ObjectClass *klass, const void *data) From patchwork Thu May 1 21:04: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: 886371 Delivered-To: patch@linaro.org Received: by 2002:a5d:430f:0:b0:38f:210b:807b with SMTP id h15csp514144wrq; Thu, 1 May 2025 14:06:52 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVLpoToW5Uj8sIgL3jYM/GVDQ7Hx/BV4RiR7rTA7SRqs22OKwFTwVg3+Vf6U4Z17jDrrjJrjA==@linaro.org X-Google-Smtp-Source: AGHT+IEXdjyZibMTKzheiRm3h+UxIbpfl9mAOEywDy2AFnRFHOIj7KCem5KgfbW4Nq9BHxJnPhBM X-Received: by 2002:a05:6214:212a:b0:6f2:d25e:8d17 with SMTP id 6a1803df08f44-6f515386d13mr10700876d6.21.1746133612053; Thu, 01 May 2025 14:06:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1746133612; cv=none; d=google.com; s=arc-20240605; b=hfQJYAb4yu4YlTk/zT+GypMNcPB716ex1RAvrwkSh2Vk8YagPoTV7Sh0Nar9SG/YC6 4efK7uax5YonsmfVEKA8zzD8LnIo0rJer+7Yrb2UegcE6uW6dJziL2urMhAWYGcNCJzO okqvbZiG78FZ/K3HBpbCiqdB7PJ83ns/32/HN450wgwFNmPD5zeju6vUK9XdHTdGW6NT V0BeHNKRdMs7paLhZVyNFtpQhp4x8etYTC51lZIrEliJM13BIg6grb9EugH5WAGz0hHL 59Fp1X5yTTWhGKPcDb2VuJW1emTepXcBLqWHDd18tmNa10L10MYWI9BC17TDqEaTRhKP jbEw== 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=2UZQft0G0qLlkzlmAjD0AN5/aAoxDFjk+IIAiFxxuxk=; fh=uloqeIiLIhsqAWHY8zIEmzfMIcw7bGWZuINspytDykk=; b=aQSLzbfzencEmmkxDLAXOqXBjh98tZd9lQZkUOAN68x6eze6CbEvKbC2sTpBz3utpc kKiyG3LIanuBXw3JpmvTRse/IXmPyJ19xcwE4eGunMHdTP9WSne0VEYakX1DiXMjUj9Y Qp3V55b6HxH367gfkTDBlRiMDdeixt7q5se/KKKZZIchu3tdz68rybpfDh1/4Uqj9wt2 F99mmFf3lHHAxDeSBtU/gcIPUJ47iNICIvRLZTlV5CYUyccEheWzOrR/ogELV7K67f8D kfHqhBNAupc5OnBA0P+AFKBRqofMzEeAwh9J+drdAbqx5BM/EaGBh/1A1cHzcGrO9HuG NbGA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Wtk+b9wB; 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-6f50f3ab817si15751746d6.90.2025.05.01.14.06.51 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 01 May 2025 14:06:52 -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=Wtk+b9wB; 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 1uAb71-0002AZ-0c; Thu, 01 May 2025 17:06: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 1uAb6d-0001RD-9o for qemu-devel@nongnu.org; Thu, 01 May 2025 17:06:15 -0400 Received: from mail-il1-x12c.google.com ([2607:f8b0:4864:20::12c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uAb6a-0006cT-Jd for qemu-devel@nongnu.org; Thu, 01 May 2025 17:06:06 -0400 Received: by mail-il1-x12c.google.com with SMTP id e9e14a558f8ab-3d5e68418b5so13085815ab.2 for ; Thu, 01 May 2025 14:06:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1746133563; x=1746738363; 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=2UZQft0G0qLlkzlmAjD0AN5/aAoxDFjk+IIAiFxxuxk=; b=Wtk+b9wBVk38HPrXI90RbZSR5BhexoRwnSnhSGq44BatVkjicuCPiPb6knSrjfntTV VNil/y9ftsbM7WUY+oA5EXJDJxIKbetjmTbByOi5Fcymg1L1tLwoDuCMAueKXtUH4e4E cMAoQ3lyUScB40aqET6H2eUSIanzv5JY/aAYRivhYHyY5FoCyco9yY2UQYXGi3u5oIEo Vpy9XDju38ibod/5Kx5YKh8KSPNn5O0xwSB9SOz37TqGQIaBRs4ut4DvScniSo9TQJet 7CsAxdj9riASCLUcGBuvyjZ2vSyqEM7NtSbN1cRNfCQwa8y/05uiR8QGnYbTr0YuCK9k c/pw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746133563; x=1746738363; 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=2UZQft0G0qLlkzlmAjD0AN5/aAoxDFjk+IIAiFxxuxk=; b=GR1zcYKFhhZPQJWaadJuRwnbTxC61GH9qCRvrlEkIdjGw9TInk8XbmkFI8Zp+ZVE3c bITMh3MQ4EcwFndxmN28Tn8IuHUxW9xgQH8gWGk6OHPR/oLtcfuCKCqGaE8zAuuelb+Y ENtn3t4G/IkEPxEjlMYG32v9MaSJzpwC8jI1IM1yqbkgludYdXUFegTBZ+Nle38qHgbQ cuXAnBwRDFEfbaRg0wm4vuHJVUSaB5zqkC5riXj9E3yUcZ0KXElqjN/ihJIpztam7lZp dbKuiPuN53QWlw3TqQUiEJIh4p878wOTC6ZDInvl5qF5HHMGH7vsqiZCLkoeqUh34Z3z smCw== X-Gm-Message-State: AOJu0YzIqjvXEVJGl8aj/s0y0tSrRwcNB/KyeE5p29aWVrAxepJv2DpI 056Mzdt1YS2ObFxqRZgGayqdQ2CNRUGSZMHQadshlg1j/yquTchfwp9D3oK+pSgJOfYJ0RK4uSB r X-Gm-Gg: ASbGncuwW4C0+1n5aYVkXIVchcy+dStq9Pef2nYv2C0GtRJDJxeVSOYiczCzygvSOLO 3xtZtD8LrA1EgYvWSEMOfgn2B3rT/RMZJnMgtqOazwt8dbSLSEhOxbCPb4v4Rsqs6+h8z9x7jel +NDN+rSD6A+qtnk2TvojsWcR2oflzSXq3yOUu43/+gTiLjxUnfmbxbBLmJPZwKJHonUlVFKkSwh ebtsRY28JdJOykBHBSEyssR7v+ii3t2JeCYRND+3n8OcnxYR4C97IhpgxEDsNCgoo7iwlgQIy+o IPYlBLEPLZd3bX2YJK2bIn2pW8RKw7M/e+FmdWHVgfLMTWaNlHSmx4Zl29MI6Jb/8B7p37aAvvO 6l9clV+XFK5Ro22E= X-Received: by 2002:a05:6e02:1a85:b0:3d3:d074:b0d2 with SMTP id e9e14a558f8ab-3d97c1771a7mr5740545ab.2.1746133562899; Thu, 01 May 2025 14:06:02 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id e9e14a558f8ab-3d975f6d755sm3065295ab.69.2025.05.01.14.05.59 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 01 May 2025 14:06:02 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Cl=C3=A9ment_Mathieu--Drif?= , Zhao Liu , Hanna Reitz , Igor Mammedov , Marcel Apfelbaum , =?utf-8?q?Philippe_Mathieu-D?= =?utf-8?q?aud=C3=A9?= , Paolo Bonzini , Eduardo Habkost , qemu-block@nongnu.org, Jason Wang , Richard Henderson , Yanan Wang , Ani Sinha , "Michael S. Tsirkin" , Thomas Huth , Gerd Hoffmann , Kevin Wolf , Yi Liu Subject: [PATCH 07/18] hw/pci/pcie: Remove QEMU_PCIE_EXTCAP_INIT definition Date: Thu, 1 May 2025 23:04:45 +0200 Message-ID: <20250501210456.89071-8-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250501210456.89071-1-philmd@linaro.org> References: <20250501210456.89071-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::12c; envelope-from=philmd@linaro.org; helo=mail-il1-x12c.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 QEMU_PCIE_EXTCAP_INIT was only used by the hw_compat_2_8[] array, via the 'x-pcie-extcap-init=off' property. We removed all machines using that array, lets remove all the code around QEMU_PCIE_EXTCAP_INIT. Signed-off-by: Philippe Mathieu-Daudé --- include/hw/pci/pci.h | 2 -- hw/pci/pci.c | 2 -- hw/pci/pcie.c | 5 ----- 3 files changed, 9 deletions(-) diff --git a/include/hw/pci/pci.h b/include/hw/pci/pci.h index c2fe6caa2c6..6c72a61c4b6 100644 --- a/include/hw/pci/pci.h +++ b/include/hw/pci/pci.h @@ -210,8 +210,6 @@ enum { /* Link active status in endpoint capability is always set */ #define QEMU_PCIE_LNKSTA_DLLLA_BITNR 8 QEMU_PCIE_LNKSTA_DLLLA = (1 << QEMU_PCIE_LNKSTA_DLLLA_BITNR), -#define QEMU_PCIE_EXTCAP_INIT_BITNR 9 - QEMU_PCIE_EXTCAP_INIT = (1 << QEMU_PCIE_EXTCAP_INIT_BITNR), #define QEMU_PCIE_CXL_BITNR 10 QEMU_PCIE_CAP_CXL = (1 << QEMU_PCIE_CXL_BITNR), #define QEMU_PCIE_ERR_UNC_MASK_BITNR 11 diff --git a/hw/pci/pci.c b/hw/pci/pci.c index fe38c4c0287..36206c77b7c 100644 --- a/hw/pci/pci.c +++ b/hw/pci/pci.c @@ -90,8 +90,6 @@ static const Property pci_props[] = { QEMU_PCI_CAP_MULTIFUNCTION_BITNR, false), DEFINE_PROP_BIT("x-pcie-lnksta-dllla", PCIDevice, cap_present, QEMU_PCIE_LNKSTA_DLLLA_BITNR, true), - DEFINE_PROP_BIT("x-pcie-extcap-init", PCIDevice, cap_present, - QEMU_PCIE_EXTCAP_INIT_BITNR, true), DEFINE_PROP_STRING("failover_pair_id", PCIDevice, failover_pair_id), DEFINE_PROP_UINT32("acpi-index", PCIDevice, acpi_index, 0), diff --git a/hw/pci/pcie.c b/hw/pci/pcie.c index 1b12db6fa29..a3969423bd3 100644 --- a/hw/pci/pcie.c +++ b/hw/pci/pcie.c @@ -245,11 +245,6 @@ int pcie_cap_init(PCIDevice *dev, uint8_t offset, pci_set_word(dev->wmask + pos + PCI_EXP_DEVCTL2, PCI_EXP_DEVCTL2_EETLPPB); - if (dev->cap_present & QEMU_PCIE_EXTCAP_INIT) { - /* read-only to behave like a 'NULL' Extended Capability Header */ - pci_set_long(dev->wmask + PCI_CONFIG_SPACE_SIZE, 0); - } - return pos; } From patchwork Thu May 1 21:04: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: 886381 Delivered-To: patch@linaro.org Received: by 2002:a5d:430f:0:b0:38f:210b:807b with SMTP id h15csp515462wrq; Thu, 1 May 2025 14:10:33 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXPLjzGcmgfCGdhNWm9Y16pPK1zAYW0s00hxZCAnubjHlRVXDq0wyyVxdkLRe1LdKBB3T8L4w==@linaro.org X-Google-Smtp-Source: AGHT+IHKzRRrisAMTdYz0eEyBoGn2NIPMV+k1MGzPNZ/oIXrKpsVo7YW6+B0Xpx6PHeYw7ES1luk X-Received: by 2002:a05:6122:1799:b0:529:be0:8353 with SMTP id 71dfb90a1353d-52aed66ffa7mr571305e0c.2.1746133833195; Thu, 01 May 2025 14:10:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1746133833; cv=none; d=google.com; s=arc-20240605; b=GDcUk5NpKKSGe0xpunWwdWnP+Sxc9SjjMP75lVAFfYAmZVPHG8jrhRe0QVGoDYP7Tz 7V3MJLJEOXdbWU23OBDXZjLrwrPk/+x5mw6ikQRZWAppH5G0ikUeqB/k7AgFo2EusaPz 4t7M8CS3f7ZnMNNehajGz/aXN4emqtW7OprP3BtB8yXhVaVvZtqLOkQg1omoJK3szKvy 6idHdYumaQoi9bKVTmt0gZznOxnOsa+INJ2lCP6dYGvWEhoJhb5ZbqLe9UK3S8kRrlR2 i5Nw3xTAyQexnLu3qfTVdx/3JDyFamYr6UyC/ImA8zCs0jcXsIo6zTtu7jP1Z7GarVZd qf+A== 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=ZrPNr0Aj9fn0eddJzV+2Kcwv9eRua4WW4O8jcqwzOW4=; fh=uloqeIiLIhsqAWHY8zIEmzfMIcw7bGWZuINspytDykk=; b=YZ2WLdNBZmoqwVxKVva260NnydsiTtF9Og1TJPHnxX9JSNavBNzpjIDmly5fvf3Dmv OaWjP5AGbJ1qmsjFB0XLTdueaI7DjoIcDbolYo54ShAv0IbkPhUgPFb5RI0uSmdHc4W0 dptsQiFHJqop4yluejLt3GiKeXnMUzOW+75IsBKj8rEer0WdxYSMkVfQyqqog1EhEpJQ 9v+QZMpoHH8TT+NYBBKOl6Kyo7fycE3YagtNoDTpn1J4ixIYKNGjlt3mwYOJ5E0tUL/D pR/wUwA6xXOtcG4PX0+C9t+NuqNbeqTo2BqSmlOjfKcroi/Luptmxh3BbffF2ZcMPobY jqjg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=cOMx2CDv; 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-52ae413affasi551113e0c.141.2025.05.01.14.10.33 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 01 May 2025 14:10:33 -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=cOMx2CDv; 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 1uAb7R-0002m1-2q; Thu, 01 May 2025 17:06: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 1uAb6m-0001d6-J8 for qemu-devel@nongnu.org; Thu, 01 May 2025 17:06:19 -0400 Received: from mail-il1-x12c.google.com ([2607:f8b0:4864:20::12c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uAb6i-0006eG-Vq for qemu-devel@nongnu.org; Thu, 01 May 2025 17:06:16 -0400 Received: by mail-il1-x12c.google.com with SMTP id e9e14a558f8ab-3d91db4f0c3so7471395ab.3 for ; Thu, 01 May 2025 14:06:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1746133571; x=1746738371; 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=ZrPNr0Aj9fn0eddJzV+2Kcwv9eRua4WW4O8jcqwzOW4=; b=cOMx2CDvkQSjjXA6Et2HTSy0eIvhbetCnvRCHp4WB/JnV9ZxNziKmkE8kR5q6u97rU cd45lCvdBZrMjUAt9NwzLXYY8u5J2qcvOsVZToBbjZt5rslkzQN8ldpUZTxc6XMByrGY FLe7Ru0C/Q7HTfdJVWvhoXiu0ECf8+5eCayYZYBG29clWviObq1sNlR7jM2b789O8ZFF 52oXfGLQGp+tIZKlf7fp3mMW1uyLvj8KVQWZDL5eXS/yoZ9IJ7dKiwKVjdPWGYQn3V8a z13n/loOk53k0BHNSogpJ5C0tvX/wnW1ZDnbXq/LeOEisQK2cWioWMY/0PHg07+3mclh KbDQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746133571; x=1746738371; 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=ZrPNr0Aj9fn0eddJzV+2Kcwv9eRua4WW4O8jcqwzOW4=; b=JUKgSzrkgWkbM/Zb20heoAQtISpklFO+etvim8qDZRi6BdFR+zEXLLc21MxfA5TTvt sJmZzuTuUbLzVn9LSkd5JiaD0jiTPiaXKonxuXc/qouXnVuc3WGEO/2Z92XK/nWYYYRd 9DWs6ZFXRS4YhP59eq8eT44U0BS/bSs84yUNHyB8+eP4s7USOf+y0vGUHAU3/ElzUx6h kHTQrJ8b5XbGmeQZoLeubTeASEVfhyXwVQdDfrl0WGpSnITUjEB4SQKU1qAZRynlxe8N mXKy0hPgqf2lUcWWQP2o0dM8oBwxmU0EheXWI/3qon/nGPgx2QJ4ZHWK2OPv5R1uO2CD 5aMA== X-Gm-Message-State: AOJu0YxqFY6FcshTkAbPKLI9Q4K2GsFrk11UQTY3lOLysW89Puo9tB05 xL7Fg4cgZlaYfmA0TQFm91wi3HQvwHLv2XeKz5J3sqES9tvkM9yX5/SXt3auYFRTUbcqDlTfPii M X-Gm-Gg: ASbGncv/LWUofzj1q1yjMOL5dvprS8MzACqhFkZ2rTG2+T7NF3IeejQjNfiT4giWhPD vbFmKOGt7aBXz4+L4nujY9LHhTyAvSUHfweXPjzttXWok1zf5mwbEzRpyoArRl+yDLiOx6RyEe2 al7t2AGG3s8dqGEZxQwyPiKLcqgaBd1H9O7HMkBcum0CxgkYlYW0gznafvL44Ic7G8U6Wr1a/Zy rIHqdy8wteXgScZ6IJREO/3ylPT7JlhyYFXwuBjTUF/SRLww9PHzCLSp0UAv1xuY8WNIWZ86d4b bQ/OBKU753rI8mNuxuM1ueVQdicSozUhBiHGNXtoKbEZ67+2aau3zVYe5ZJRetmxwDhSHItwYcZ u7ubkRksLkjgAGaw= X-Received: by 2002:a05:6e02:12e7:b0:3d3:fdcc:8fb8 with SMTP id e9e14a558f8ab-3d97c18897bmr5250535ab.10.1746133571433; Thu, 01 May 2025 14:06:11 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 8926c6da1cb9f-4f88aac80f6sm43264173.141.2025.05.01.14.06.08 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 01 May 2025 14:06:11 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Cl=C3=A9ment_Mathieu--Drif?= , Zhao Liu , Hanna Reitz , Igor Mammedov , Marcel Apfelbaum , =?utf-8?q?Philippe_Mathieu-D?= =?utf-8?q?aud=C3=A9?= , Paolo Bonzini , Eduardo Habkost , qemu-block@nongnu.org, Jason Wang , Richard Henderson , Yanan Wang , Ani Sinha , "Michael S. Tsirkin" , Thomas Huth , Gerd Hoffmann , Kevin Wolf , Yi Liu Subject: [PATCH 08/18] hw/virtio/virtio-pci: Remove VIRTIO_PCI_FLAG_INIT_DEVERR definition Date: Thu, 1 May 2025 23:04:46 +0200 Message-ID: <20250501210456.89071-9-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250501210456.89071-1-philmd@linaro.org> References: <20250501210456.89071-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::12c; envelope-from=philmd@linaro.org; helo=mail-il1-x12c.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 VIRTIO_PCI_FLAG_INIT_DEVERR was only used by the hw_compat_2_8[] array, via the 'x-pcie-deverr-init=off' property. We removed all machines using that array, lets remove all the code around VIRTIO_PCI_FLAG_INIT_DEVERR (see commit 9a4c0e220d8 for similar VIRTIO_PCI_FLAG_* enum removal). Signed-off-by: Philippe Mathieu-Daudé --- include/hw/virtio/virtio-pci.h | 4 ---- hw/virtio/virtio-pci.c | 8 ++------ 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/include/hw/virtio/virtio-pci.h b/include/hw/virtio/virtio-pci.h index 8abc5f8f20d..ed142932f7b 100644 --- a/include/hw/virtio/virtio-pci.h +++ b/include/hw/virtio/virtio-pci.h @@ -34,7 +34,6 @@ enum { VIRTIO_PCI_FLAG_USE_IOEVENTFD_BIT, VIRTIO_PCI_FLAG_MODERN_PIO_NOTIFY_BIT, VIRTIO_PCI_FLAG_ATS_BIT, - VIRTIO_PCI_FLAG_INIT_DEVERR_BIT, VIRTIO_PCI_FLAG_INIT_LNKCTL_BIT, VIRTIO_PCI_FLAG_INIT_PM_BIT, VIRTIO_PCI_FLAG_INIT_FLR_BIT, @@ -62,9 +61,6 @@ enum { /* address space translation service */ #define VIRTIO_PCI_FLAG_ATS (1 << VIRTIO_PCI_FLAG_ATS_BIT) -/* Init error enabling flags */ -#define VIRTIO_PCI_FLAG_INIT_DEVERR (1 << VIRTIO_PCI_FLAG_INIT_DEVERR_BIT) - /* Init Link Control register */ #define VIRTIO_PCI_FLAG_INIT_LNKCTL (1 << VIRTIO_PCI_FLAG_INIT_LNKCTL_BIT) diff --git a/hw/virtio/virtio-pci.c b/hw/virtio/virtio-pci.c index 4e0d4bda6ed..0075ae590db 100644 --- a/hw/virtio/virtio-pci.c +++ b/hw/virtio/virtio-pci.c @@ -2215,10 +2215,8 @@ static void virtio_pci_realize(PCIDevice *pci_dev, Error **errp) last_pcie_cap_offset += PCI_ERR_SIZEOF; } - if (proxy->flags & VIRTIO_PCI_FLAG_INIT_DEVERR) { - /* Init error enabling flags */ - pcie_cap_deverr_init(pci_dev); - } + /* Init error enabling flags */ + pcie_cap_deverr_init(pci_dev); if (proxy->flags & VIRTIO_PCI_FLAG_INIT_LNKCTL) { /* Init Link Control Register */ @@ -2349,8 +2347,6 @@ static const Property virtio_pci_properties[] = { VIRTIO_PCI_FLAG_ATS_BIT, false), DEFINE_PROP_BIT("x-ats-page-aligned", VirtIOPCIProxy, flags, VIRTIO_PCI_FLAG_ATS_PAGE_ALIGNED_BIT, true), - DEFINE_PROP_BIT("x-pcie-deverr-init", VirtIOPCIProxy, flags, - VIRTIO_PCI_FLAG_INIT_DEVERR_BIT, true), DEFINE_PROP_BIT("x-pcie-lnkctl-init", VirtIOPCIProxy, flags, VIRTIO_PCI_FLAG_INIT_LNKCTL_BIT, true), DEFINE_PROP_BIT("x-pcie-pm-init", VirtIOPCIProxy, flags, From patchwork Thu May 1 21:04: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: 886373 Delivered-To: patch@linaro.org Received: by 2002:a5d:430f:0:b0:38f:210b:807b with SMTP id h15csp514235wrq; Thu, 1 May 2025 14:07:07 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVZ88WHvNvAqWwRpiudcNXNME2X3oHgANrzWezYPsXfTCPyQrlZFQ+Nwv4LCs47r4N8AOEIvQ==@linaro.org X-Google-Smtp-Source: AGHT+IG8diFPCkE2wOi4WXcBaGWdHLPdULP2oMlANORddvUtZpQLjyoQPIvd+NA1FB2hfRF4BwJW X-Received: by 2002:a05:6214:2249:b0:6e8:9bcd:bba6 with SMTP id 6a1803df08f44-6f515730808mr11493076d6.7.1746133626862; Thu, 01 May 2025 14:07:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1746133626; cv=none; d=google.com; s=arc-20240605; b=PPhbV9MfzUAsHTG+R1b+MnH2NdQ8yLeq6RlhvUZH6xnlDlAGHsBJvOmykgk6aHDFfy LeCNUct4YU1+HHM6p+WrTKMxtWJF3Ei+EnTSegMZw+F23fQsrywJu6Byz/fnRvP1lo6G 9re8tw+Yr6cPiUYuBi2kZEaIIiubfA+DvJxlk7Is/SmVTYNa5zlRACybfTmObtSMox1U Aqs9JmpcULwyUc6qCQIGGKy+ZST24mOkd2X6yhFGxL2yZx2Qa6kP89FE+tjTyiM/ZabM /3EU/5IBKjYPk+LbOvDy8qikNPVmRx1CpO2jwP6CCa5uA2NZ+SPe1p7m3f5EFJORn0kS Nq8Q== 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=isJ+xEvRBKFtxiyi/HDhWV18nqZ0er3zYVHJmZNBiUM=; fh=uloqeIiLIhsqAWHY8zIEmzfMIcw7bGWZuINspytDykk=; b=lDHjEWhfxJ8jT+CMTByshWE9ZuOj3+/RW6s+TxVXR7Xk6IAHVpgI6njCb9t+VzDjak B3EJWicqKVSTor6zCqOuP4jyaj650cUXUyiOu4ZCXtGBzVKUV9IkdMbihRA/9feSpelE k+e0URyNKi/CzjpfQTvjhxBjgUZDktlRdHCk5ctrLCpzbzsB0ZCgKhJNGUWZf6MmcYKq PoCQOmtFdDoxz/N93l3SYk8zrEzowdXqp43corE6i0MT3k8ZMZ7Cq+E3FqfN2b9aHM8V 1gIRlqZI/h/bfyD+92035YXz9iiS7j9GggTw4vYlJm1RFwoxbswW/OJQAQnxi+0cJHeT Q+wA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=gmOWgzwv; 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-7cad24460c4si147154485a.497.2025.05.01.14.07.06 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 01 May 2025 14:07: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=gmOWgzwv; 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 1uAb70-0002AF-UU; Thu, 01 May 2025 17:06: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 1uAb6t-0001ks-CI for qemu-devel@nongnu.org; Thu, 01 May 2025 17:06:24 -0400 Received: from mail-il1-x133.google.com ([2607:f8b0:4864:20::133]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uAb6r-0006fx-Na for qemu-devel@nongnu.org; Thu, 01 May 2025 17:06:23 -0400 Received: by mail-il1-x133.google.com with SMTP id e9e14a558f8ab-3d5e2606a1bso12501555ab.0 for ; Thu, 01 May 2025 14:06:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1746133580; x=1746738380; 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=isJ+xEvRBKFtxiyi/HDhWV18nqZ0er3zYVHJmZNBiUM=; b=gmOWgzwv7LdjGmEZxoL+p8bJnqDW02Elt+H8FCyHtVIQIPWLkcrmJO8+7NlkCVz68d lQd9AnaA6e+WWL1tccFMM7hyq34Gf2fRZRB3mCzu0tNYcSC13mA7tMaV9X+nXPfJl7GH 2B9TRkL3tsuoXgyZGqstcUaBDsZaOdeMCIaIuGRNeAWYXxFNgAqByvlh0vhkvK0liRIY dpqaZmZo+/wq+tTMH8i+tLvH0gEimCHMUyVyqyvOy5GLIlKusIT1Bi/CTsKX+Ax7sZnA yu/cEv+yEDsS+DzCBn1RK5Nl6ndWDkH8RpwftZa4/Y9FM+Q1RsjxzJSIsQbdQok2HJ5M zVGA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746133580; x=1746738380; 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=isJ+xEvRBKFtxiyi/HDhWV18nqZ0er3zYVHJmZNBiUM=; b=D0ASi1CpCrGq1oH9UlY4NsTh0W6Wf4KA9pSctxw4bWGgW0C6SZ9AEbDv+tjcAgJoiG ybyTDVVixCGm3sQJlcCc49ZjTgR9M4hnnYAYPBqrc7UcIazUcEhsce/bg0PaDvl4MpQL T9unlK7n3/4DJzPLr57wU1BRU5AVSvVTDypm6pQYEp6ttyb4LGLbsK+i47HJ+L8Vdpoe AhqghSdInLzVMmUXzznlVUxvJGk5EzqjB44xQHwv0FXJuASrJ7wMXmlOYZ9k7ifh35ZT hn2a5pvkAmIHUHn8Drl95KQkuKtzSINun2gfOVlcdV22wQYM7aSkfGrWNOUch8aLm5Ct c04Q== X-Gm-Message-State: AOJu0YxhB3lxZ5mYdp5L7jeZOSn5IAsntYXYOZuxHlEy7MZ6LLBYGjO1 ttprStTUPjbZEA2aurhqqhaEXmrp6QTdfR/yLZyWgP5AaGvDP7k5gggIACa6ECv1I7JRbO13EDH m X-Gm-Gg: ASbGnctJvmtjIuoCTnbK7lDDLR8lBC1j0v0XvdPt99qCJpU4tAxTkI7Z/DhiD3Oa56W ttatmOxX5/8QEEoGvPwTqX289Qss+LOitPumrsF5nzbgG+B+Hecc8qNnRkOs8dO/+a26+sI827I tr4LO+4T0Toqv9/KOQdC3yFcsLBMtDthH5H4UDqR6MyRJcF3X343WXDYvxJX75tc4VC9aZ+CBZn g9FOVd1pyIJocH6dC+TkoNnshL5Nr6cEApZ4zqadl/kTjgTzrn4mrvSqDOo/AeGTdIHd30rVFaj gFILRyUKlN8gaAcG7xsbXbBJKhuGkVwSjhrE/8fUAZUPbbYZ+tRrKqh/DeNJrsweAqrDMtC9rmc MP1JDrgr4gLO500w= X-Received: by 2002:a05:6e02:3a01:b0:3d4:3db1:77ae with SMTP id e9e14a558f8ab-3d97c239085mr5769385ab.18.1746133580005; Thu, 01 May 2025 14:06:20 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 8926c6da1cb9f-4f88aac7f88sm44327173.133.2025.05.01.14.06.16 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 01 May 2025 14:06:19 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Cl=C3=A9ment_Mathieu--Drif?= , Zhao Liu , Hanna Reitz , Igor Mammedov , Marcel Apfelbaum , =?utf-8?q?Philippe_Mathieu-D?= =?utf-8?q?aud=C3=A9?= , Paolo Bonzini , Eduardo Habkost , qemu-block@nongnu.org, Jason Wang , Richard Henderson , Yanan Wang , Ani Sinha , "Michael S. Tsirkin" , Thomas Huth , Gerd Hoffmann , Kevin Wolf , Yi Liu Subject: [PATCH 09/18] hw/virtio/virtio-pci: Remove VIRTIO_PCI_FLAG_INIT_LNKCTL definition Date: Thu, 1 May 2025 23:04:47 +0200 Message-ID: <20250501210456.89071-10-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250501210456.89071-1-philmd@linaro.org> References: <20250501210456.89071-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::133; envelope-from=philmd@linaro.org; helo=mail-il1-x133.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_INIT_LNKCTL was only used by the hw_compat_2_8[] array, via the 'x-pcie-lnkctl-init=off' property. We removed all machines using that array, lets remove all the code around VIRTIO_PCI_FLAG_INIT_LNKCTL (see commit 9a4c0e220d8 for similar VIRTIO_PCI_FLAG_* enum removal). Signed-off-by: Philippe Mathieu-Daudé --- include/hw/virtio/virtio-pci.h | 4 ---- hw/virtio/virtio-pci.c | 8 ++------ 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/include/hw/virtio/virtio-pci.h b/include/hw/virtio/virtio-pci.h index ed142932f7b..a8dd613ffbc 100644 --- a/include/hw/virtio/virtio-pci.h +++ b/include/hw/virtio/virtio-pci.h @@ -34,7 +34,6 @@ enum { VIRTIO_PCI_FLAG_USE_IOEVENTFD_BIT, VIRTIO_PCI_FLAG_MODERN_PIO_NOTIFY_BIT, VIRTIO_PCI_FLAG_ATS_BIT, - VIRTIO_PCI_FLAG_INIT_LNKCTL_BIT, VIRTIO_PCI_FLAG_INIT_PM_BIT, VIRTIO_PCI_FLAG_INIT_FLR_BIT, VIRTIO_PCI_FLAG_AER_BIT, @@ -61,9 +60,6 @@ enum { /* address space translation service */ #define VIRTIO_PCI_FLAG_ATS (1 << VIRTIO_PCI_FLAG_ATS_BIT) -/* Init Link Control register */ -#define VIRTIO_PCI_FLAG_INIT_LNKCTL (1 << VIRTIO_PCI_FLAG_INIT_LNKCTL_BIT) - /* Init Power Management */ #define VIRTIO_PCI_FLAG_INIT_PM (1 << VIRTIO_PCI_FLAG_INIT_PM_BIT) diff --git a/hw/virtio/virtio-pci.c b/hw/virtio/virtio-pci.c index 0075ae590db..5b86a9a447c 100644 --- a/hw/virtio/virtio-pci.c +++ b/hw/virtio/virtio-pci.c @@ -2218,10 +2218,8 @@ static void virtio_pci_realize(PCIDevice *pci_dev, Error **errp) /* Init error enabling flags */ pcie_cap_deverr_init(pci_dev); - if (proxy->flags & VIRTIO_PCI_FLAG_INIT_LNKCTL) { - /* Init Link Control Register */ - pcie_cap_lnkctl_init(pci_dev); - } + /* Init Link Control Register */ + pcie_cap_lnkctl_init(pci_dev); if (proxy->flags & VIRTIO_PCI_FLAG_PM_NO_SOFT_RESET) { pci_set_word(pci_dev->config + pos + PCI_PM_CTRL, @@ -2347,8 +2345,6 @@ static const Property virtio_pci_properties[] = { VIRTIO_PCI_FLAG_ATS_BIT, false), DEFINE_PROP_BIT("x-ats-page-aligned", VirtIOPCIProxy, flags, VIRTIO_PCI_FLAG_ATS_PAGE_ALIGNED_BIT, true), - DEFINE_PROP_BIT("x-pcie-lnkctl-init", VirtIOPCIProxy, flags, - VIRTIO_PCI_FLAG_INIT_LNKCTL_BIT, true), DEFINE_PROP_BIT("x-pcie-pm-init", VirtIOPCIProxy, flags, VIRTIO_PCI_FLAG_INIT_PM_BIT, true), DEFINE_PROP_BIT("x-pcie-pm-no-soft-reset", VirtIOPCIProxy, flags, From patchwork Thu May 1 21:04: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: 886379 Delivered-To: patch@linaro.org Received: by 2002:a5d:430f:0:b0:38f:210b:807b with SMTP id h15csp514991wrq; Thu, 1 May 2025 14:09:13 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXRs40liq69C+BUZeZeEolidcKxWMTFaMOdXyDlgfxvZQNYsshhHR1Xz0hHhQ5w6Bt+lh4T2g==@linaro.org X-Google-Smtp-Source: AGHT+IGbIxGX0JMKg6lvXP3vpurQIAOyVj+VhUSAQSOnRd24CB3gbQVzO7ZcMkvMUYZhNEyaCiA9 X-Received: by 2002:a05:620a:4707:b0:7c5:99f9:6ada with SMTP id af79cd13be357-7cad5ba3f1bmr81161185a.50.1746133753707; Thu, 01 May 2025 14:09:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1746133753; cv=none; d=google.com; s=arc-20240605; b=eeBtS2woCcIVr8Am7h+mr+fCnvCLKXebCcQzGPomsL9V5yoeXAauIDvxBooDEsblmn kBIp3HC/WTlk7Sx8X939illx/mXSQ80NzrVw1szOXuD5qHMcTxzBAFznvXsyHmtxHQUs hhxJARHNteRJtqxpngmx2WxEjO9LZP0i3r19h5yhb9vaSI+gWX9k3VklyUVb3aWdBtqU Vu5C2hSoVG+9c9wzwaSIumemue2dqoYr3KLu39UGOi+XzTPLmGrO6+o8o7Bp8cJpk7Kf SoJekIzimgHTKGGduut7bDaN/Zg/5xoLH5VoshNDtxH+sJaDN6xBGiwQ74qv3s0Eml8j SMUw== 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=LMeOw16G5YJoFKNLKg7ffX48/cP4PPOz2cimaZ7eFnY=; fh=uloqeIiLIhsqAWHY8zIEmzfMIcw7bGWZuINspytDykk=; b=ARRC7F2wZAe8/+qRTJjVOjZ94nnp5d6P6fDWnyYw+u/TQni/L25xvhiucPse3Rei3W G+98lvq2q0Poll9Y1iMl4OU8155i4kEZOfajSriF9+ZsSto4dUM9O7X1/X7SLV/VjEPt PyFM/OxFVaziZ3qniCXtgC29UensXF1DXznoPXVhUvTIWXcXHsmJVYFITTS4CppLUS0W 2eehYRQlzDwwsh4Jsw1vKgdyOIWqNsasX0WQChlIySzYl9j7qPETjD0AbkvQuoDroieL y1hiud/w2DNmDuG7dVnZmW1PXxOdh5V5luLHXQgveT1WxkUWXTz6TDHcU3GBW6n8mtBP /GKw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=uJeoy0To; 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-7cad2448381si144153185a.557.2025.05.01.14.09.13 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 01 May 2025 14:09:13 -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=uJeoy0To; 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 1uAb7R-0002jP-32; Thu, 01 May 2025 17:06: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 1uAb71-0002IT-Po for qemu-devel@nongnu.org; Thu, 01 May 2025 17:06:31 -0400 Received: from mail-il1-x135.google.com ([2607:f8b0:4864:20::135]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uAb6z-0006hb-Tm for qemu-devel@nongnu.org; Thu, 01 May 2025 17:06:31 -0400 Received: by mail-il1-x135.google.com with SMTP id e9e14a558f8ab-3d57143ee39so12492415ab.1 for ; Thu, 01 May 2025 14:06:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1746133588; x=1746738388; 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=LMeOw16G5YJoFKNLKg7ffX48/cP4PPOz2cimaZ7eFnY=; b=uJeoy0Toqw1Sx0ZbDY69SUTez5FKtpyUF/vyXj0MMLRfTIbNUAWD5KPxww22tlrgmP hoNoM4d2eAlu48pK4j1k+yMG1aX1vt8lQSjJiNoJtN4TE5P+Zey/epSS+yTPXcS/JZAj y0TsoZorucbgUTEVtmqht+JUs5PvqoSQgfs0ZLNkRgWxRTzFKUfb7k8fmyDcjiP0+QR6 UPA4tFbB01kbZOJ44UXjO3+Ot5NxZlSZz8a5dIQ+tbNNVnEvkYchdLvq+V46JVjLPKgk xdnI2aYqdCBeXBOiCBZpNI6MpgkJNDkb8pcQVsNd86pYMJWr/3bynfRrNzln/HYh6mYA GRFA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746133588; x=1746738388; 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=LMeOw16G5YJoFKNLKg7ffX48/cP4PPOz2cimaZ7eFnY=; b=cD/f/BKN6Jsv+cOCsOrFpmyGDK3Y+znvaTrjn5HTAmJB6Ta6oXQW7IHevq6njlXLxo ClbZ7wZkWEJylh18+ufc9dIjkkgjQAFle7DXesB9LfvwZDTnpNcHd2mO9jkTVw2hKbR2 r3Wa5wU3W4Yo2fVJYBSSjr4P+mcMjS9/Df9KfObKlqt9NoMhNXmpg4oZCtWylHLj0rba p19eRCzBiAgUI09JhM1+7idQKhFUP0GiqKbaQpV4gPpbB42laSOKGmbOM/bFHfpZnJaK v4uQv7IacwGhWZx4QRwfin+Udf5hEZ1CMAwmQ2p/wz2mYJSSWd6XgZE+tob3zZByxx3p D+fA== X-Gm-Message-State: AOJu0YxoOZ5xQbWcyVaL/2c8cyxO6tzKT15z2edx2Enb6OiwwJFmxReI ty1ccrQWkkBJAfa0r1qFx+DL4Af2BYnafzKSq/UlSoZJcjgLHbJVH13yQgOKxvSovk99PWG9QL0 4 X-Gm-Gg: ASbGnctO3hLZo1v+MNBbONg5Cgdq1FCTbZ/E21eCOdmUyqFuXmE7yv6c+h0eJLvKL6W MzfthAYsGkhpZAPLu+kp1/Bmb87yWH4QGlfei6d+D7QWG4QAa4UBRA3dfHhBrQE5Tln4oTWoNvJ RsJmcnBJNhK5Qx054AqswrWb6N3ZkZuROR1zwkRHmKRO4QRDCS8F9P5IHxLNCXP9c6bSWQYUNig povTIhyDbQNWHfunRoYTuyBnYsINj5/psbteCHy6lIdLp2f02FxUJmVDi33BvAvP5CTOSgBF93t 7oe/CT8UJpIXc0mKWzXdukevz1el6jks/vsiG7A9D90Pvtrm5YZ9Cn0lXpTmS+pa9hfl16+FiZi F9fxIFI8UxeWvcB2GjuKgvj6jKA== X-Received: by 2002:a05:6e02:19cf:b0:3d4:244b:db20 with SMTP id e9e14a558f8ab-3d97c22820emr4819675ab.16.1746133588571; Thu, 01 May 2025 14:06:28 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 8926c6da1cb9f-4f88aa588afsm45456173.75.2025.05.01.14.06.25 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 01 May 2025 14:06:28 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Cl=C3=A9ment_Mathieu--Drif?= , Zhao Liu , Hanna Reitz , Igor Mammedov , Marcel Apfelbaum , =?utf-8?q?Philippe_Mathieu-D?= =?utf-8?q?aud=C3=A9?= , Paolo Bonzini , Eduardo Habkost , qemu-block@nongnu.org, Jason Wang , Richard Henderson , Yanan Wang , Ani Sinha , "Michael S. Tsirkin" , Thomas Huth , Gerd Hoffmann , Kevin Wolf , Yi Liu Subject: [PATCH 10/18] hw/virtio/virtio-pci: Remove VIRTIO_PCI_FLAG_INIT_PM definition Date: Thu, 1 May 2025 23:04:48 +0200 Message-ID: <20250501210456.89071-11-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250501210456.89071-1-philmd@linaro.org> References: <20250501210456.89071-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::135; envelope-from=philmd@linaro.org; helo=mail-il1-x135.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_INIT_PM was only used by the hw_compat_2_8[] array, via the 'x-pcie-pm-init=off' property. We removed all machines using that array, lets remove all the code around VIRTIO_PCI_FLAG_INIT_PM (see commit 9a4c0e220d8 for similar VIRTIO_PCI_FLAG_* enum removal). Signed-off-by: Philippe Mathieu-Daudé --- include/hw/virtio/virtio-pci.h | 4 ---- hw/virtio/virtio-pci.c | 19 +++++-------------- 2 files changed, 5 insertions(+), 18 deletions(-) diff --git a/include/hw/virtio/virtio-pci.h b/include/hw/virtio/virtio-pci.h index a8dd613ffbc..d1f7403cbdf 100644 --- a/include/hw/virtio/virtio-pci.h +++ b/include/hw/virtio/virtio-pci.h @@ -34,7 +34,6 @@ enum { VIRTIO_PCI_FLAG_USE_IOEVENTFD_BIT, VIRTIO_PCI_FLAG_MODERN_PIO_NOTIFY_BIT, VIRTIO_PCI_FLAG_ATS_BIT, - VIRTIO_PCI_FLAG_INIT_PM_BIT, VIRTIO_PCI_FLAG_INIT_FLR_BIT, VIRTIO_PCI_FLAG_AER_BIT, VIRTIO_PCI_FLAG_ATS_PAGE_ALIGNED_BIT, @@ -60,9 +59,6 @@ enum { /* address space translation service */ #define VIRTIO_PCI_FLAG_ATS (1 << VIRTIO_PCI_FLAG_ATS_BIT) -/* Init Power Management */ -#define VIRTIO_PCI_FLAG_INIT_PM (1 << VIRTIO_PCI_FLAG_INIT_PM_BIT) - /* Init The No_Soft_Reset bit of Power Management */ #define VIRTIO_PCI_FLAG_PM_NO_SOFT_RESET \ (1 << VIRTIO_PCI_FLAG_PM_NO_SOFT_RESET_BIT) diff --git a/hw/virtio/virtio-pci.c b/hw/virtio/virtio-pci.c index 5b86a9a447c..9ec92d5a736 100644 --- a/hw/virtio/virtio-pci.c +++ b/hw/virtio/virtio-pci.c @@ -2226,11 +2226,9 @@ static void virtio_pci_realize(PCIDevice *pci_dev, Error **errp) PCI_PM_CTRL_NO_SOFT_RESET); } - if (proxy->flags & VIRTIO_PCI_FLAG_INIT_PM) { - /* Init Power Management Control Register */ - pci_set_word(pci_dev->wmask + pos + PCI_PM_CTRL, - PCI_PM_CTRL_STATE_MASK); - } + /* Init Power Management Control Register */ + pci_set_word(pci_dev->wmask + pos + PCI_PM_CTRL, + PCI_PM_CTRL_STATE_MASK); if (proxy->flags & VIRTIO_PCI_FLAG_ATS) { pcie_ats_init(pci_dev, last_pcie_cap_offset, @@ -2323,16 +2321,11 @@ static void virtio_pci_bus_reset_hold(Object *obj, ResetType type) virtio_pci_reset(qdev); if (pci_is_express(dev)) { - VirtIOPCIProxy *proxy = VIRTIO_PCI(dev); - pcie_cap_deverr_reset(dev); pcie_cap_lnkctl_reset(dev); - if (proxy->flags & VIRTIO_PCI_FLAG_INIT_PM) { - pci_word_test_and_clear_mask( - dev->config + dev->pm_cap + PCI_PM_CTRL, - PCI_PM_CTRL_STATE_MASK); - } + pci_word_test_and_clear_mask(dev->config + dev->pm_cap + PCI_PM_CTRL, + PCI_PM_CTRL_STATE_MASK); } } @@ -2345,8 +2338,6 @@ static const Property virtio_pci_properties[] = { VIRTIO_PCI_FLAG_ATS_BIT, false), DEFINE_PROP_BIT("x-ats-page-aligned", VirtIOPCIProxy, flags, VIRTIO_PCI_FLAG_ATS_PAGE_ALIGNED_BIT, true), - DEFINE_PROP_BIT("x-pcie-pm-init", VirtIOPCIProxy, flags, - VIRTIO_PCI_FLAG_INIT_PM_BIT, true), DEFINE_PROP_BIT("x-pcie-pm-no-soft-reset", VirtIOPCIProxy, flags, VIRTIO_PCI_FLAG_PM_NO_SOFT_RESET_BIT, false), DEFINE_PROP_BIT("x-pcie-flr-init", VirtIOPCIProxy, flags, From patchwork Thu May 1 21:04: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: 886375 Delivered-To: patch@linaro.org Received: by 2002:a5d:430f:0:b0:38f:210b:807b with SMTP id h15csp514568wrq; Thu, 1 May 2025 14:08:06 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCU5TOILkBFQ8EZjNlhQx2GBQHBU+GRQQvGPFlwWtOt7vcyQmgJS+Shtx7Y0pbKH90bHxqy5bw==@linaro.org X-Google-Smtp-Source: AGHT+IHY0lcNsf1CcE8Sm5jGtERw9uabdvb6efYqvgIqtfCuJAgWarA0xaUsD5xp1F+Us6YncUtI X-Received: by 2002:a05:6214:76b:b0:6e8:fbb7:6760 with SMTP id 6a1803df08f44-6f515262bc9mr12169226d6.1.1746133686158; Thu, 01 May 2025 14:08:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1746133686; cv=none; d=google.com; s=arc-20240605; b=A4Ac1jJph9Xb1w2QbMYhQimRHBUyMyHkKpITv3EK3ax/wjtLdJezmYBIT38GOskSjt HW6caqN2Ev9NNQBZ7+sBFPeTIQ5balZIyLUC1TgaWmwn1vVI/fAkOMvLgOSFP2iMKaZl IKa1D30Wn+9ni8CqxTkdGFl03qjvQzaD9n9YF8oPwVCv0Wwk9zY4DXhZrrUxst672eYa 5puJaYTN/1Jf4rE3EX005T534pocmU+Yr3GkjryrYR81QeIiJmPi08EnQlf2rX+6h2Sa d5rv6SLigQjn7D4twWabGjbKu5sDWfTc/8rymJQz9ozkobxr4w0Za56R00NMYxW5WemE heow== 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=plmsFCscLUV04uq2qYRMQ5RH6cv8iwmOj9x5he8hi0s=; fh=uloqeIiLIhsqAWHY8zIEmzfMIcw7bGWZuINspytDykk=; b=koRc6L3LuDiTbuSfVlOiPVoROOmZhipQdeKq74FDKz///4+irkAC40HtNfi/9Ia9fS vVzKXBXtjnceYHrnEzHS9rp9KzYK0JeE893T5HgRPhik+/bPs4XeT7ZVuYZAMPlIb5bE S/h0pC8K7KiaxP+qW45Fuc0hJ7fADakHLcGNTCxYMJTgQ7Pf85MbekA0JofaVn2vLj+M hdKfvUZn7PJPk8J27sXeQMVLU8o18HyD4DaR4cMBIit5Bw5oSyTtIMdmG8LyR/DSmYAx p70+v7i+8Fb7J1MZDUjSvqxzeDHny4StkOE/JnxuOwwz9YKqzIH4zXaL6vS6urODoXCZ 9LKw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=hDEsHcZR; 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-6f50f4908c9si15373266d6.344.2025.05.01.14.08.05 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 01 May 2025 14:08: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=hDEsHcZR; 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 1uAb7W-00033H-D8; Thu, 01 May 2025 17:07: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 1uAb7B-0002Z3-HA for qemu-devel@nongnu.org; Thu, 01 May 2025 17:06:43 -0400 Received: from mail-il1-x131.google.com ([2607:f8b0:4864:20::131]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uAb78-0006jJ-Nf for qemu-devel@nongnu.org; Thu, 01 May 2025 17:06:40 -0400 Received: by mail-il1-x131.google.com with SMTP id e9e14a558f8ab-3d813c1c39eso12175435ab.0 for ; Thu, 01 May 2025 14:06:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1746133597; x=1746738397; 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=plmsFCscLUV04uq2qYRMQ5RH6cv8iwmOj9x5he8hi0s=; b=hDEsHcZRkfRTZeMkOPd2tfSxGmBfI68GpzkSzZtSrDgCWsnTPEdRuTHgTWvDRCZz2F +8cMyDTmuKJsAmQ/y/EhZMArwFBoHYjVUnTJUtonLtvdOkO4l1cBWMawzsKbByhXvpJZ icl7WScDrKYKFGQzb9Pv/Qv2h2IF8h1kJh0lqjjWgYShjcm8dtT+ytIluLlnjnZMs1kL 01prLfYFKCxjIsGMZkHfevlT4LyU522Ej/NLjRosj4fYZKbuWrhgW9zuh+R3BTWhbBqv ATM+9jOklbOwysdNXuohIk+u5tAvbQlIv2F8ajFzWwUtk1JLTLjGeMxAbfUR48bQ+aIb geIw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746133597; x=1746738397; 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=plmsFCscLUV04uq2qYRMQ5RH6cv8iwmOj9x5he8hi0s=; b=dcZvIvb4tBORnSr3GKvPVvbra81rdee2MjA0jxQ/zrxK9scBt4mwBBxLuVq9WO7mf/ djDLciVNSkDRvGPVFT1gL4poTjrw0J23RkjUH0z4XKTEzAjrHflfKGkXQD8k/0+bN+vO jNbGQsdbwEwMtNIWcPaHkoZmGZkf/5vmzdYQ/JDLsZN29agWl7UbdPjnnhKb90DH4Erq v95qkDaKbigUTVjKM13qH10v+OcPvbKIEV8mG3SsEH6jFXeaHlSFU+gSOuVIHaqH/qkj OTRw0xMnUbupZCTc8TiN19O5oyrZq5foVz0zOYjWMJFhHkJHD+sDTW3Wz/iTnmUu+hjo iRgQ== X-Gm-Message-State: AOJu0YxusVf8UIaQzn3P0hhzRDt6Llc71pZz4XVj0JgNQyzB2cKgmRLF ZdzJr48DGhHV6Om8Ptdn25GlrR5hGEvqYTVdC/7b9MBKhhpyIkJoQeJwy6O7yooz+BQ/3/HzJIR S X-Gm-Gg: ASbGncvQfFRLmm3MYvHXVqFn4qbCqZK4ORZhdZSIV10IjHd2S0ecO292nN8x7q5qXeq x/nLl8sy+YSNQXG0UJXeAR2l5/PtXihySJ95ybOtdS6cx0u7vom/V18B0Z6jSOOAk221ICMUt+e Z1BG6aT4vl1BlVnqgPTyO2om5/tmzIv3b5lVgTS0eqZ1l/kJ5+g3vHAPK6+odj/YVxHrK0j1S4b o3SyWHW8z/pq04ecybPqFUhgwLEKqYulp+/VZr+BJPFg/pTkoDhlK11XUp1ZzhYDPlhqgAqMhoR 6q2vnxZmaa0E4ySykPsgQhQmf7cKhz9PTHPJSMDcX9xnEeuwc2+5i8MfTRp1p9fC2/2Pon16TZJ P44VAWGAXsHtplus= X-Received: by 2002:a05:6e02:148d:b0:3d5:deaf:b443 with SMTP id e9e14a558f8ab-3d97c13449bmr5738325ab.3.1746133597257; Thu, 01 May 2025 14:06: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 8926c6da1cb9f-4f88a91b069sm48588173.52.2025.05.01.14.06.33 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 01 May 2025 14:06:36 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Cl=C3=A9ment_Mathieu--Drif?= , Zhao Liu , Hanna Reitz , Igor Mammedov , Marcel Apfelbaum , =?utf-8?q?Philippe_Mathieu-D?= =?utf-8?q?aud=C3=A9?= , Paolo Bonzini , Eduardo Habkost , qemu-block@nongnu.org, Jason Wang , Richard Henderson , Yanan Wang , Ani Sinha , "Michael S. Tsirkin" , Thomas Huth , Gerd Hoffmann , Kevin Wolf , Yi Liu Subject: [PATCH 11/18] hw/nvram/fw_cfg: Remove FWCfgState::file_slots field Date: Thu, 1 May 2025 23:04:49 +0200 Message-ID: <20250501210456.89071-12-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250501210456.89071-1-philmd@linaro.org> References: <20250501210456.89071-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::131; envelope-from=philmd@linaro.org; helo=mail-il1-x131.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 FWCfgState::file_slots integer was only set in the hw_compat_2_8[] array, via the 'x-file-slots=0x10' property. We removed all machines using that array, lets remove that property and all the code around it. The number of slots is always FW_CFG_FILE_SLOTS_DFLT (32). Signed-off-by: Philippe Mathieu-Daudé --- include/hw/nvram/fw_cfg.h | 1 - hw/nvram/fw_cfg.c | 24 +----------------------- 2 files changed, 1 insertion(+), 24 deletions(-) diff --git a/include/hw/nvram/fw_cfg.h b/include/hw/nvram/fw_cfg.h index d41b9328fd1..07a31d214db 100644 --- a/include/hw/nvram/fw_cfg.h +++ b/include/hw/nvram/fw_cfg.h @@ -59,7 +59,6 @@ struct FWCfgState { SysBusDevice parent_obj; /*< public >*/ - uint16_t file_slots; FWCfgEntry *entries[2]; int *entry_order; FWCfgFiles *files; diff --git a/hw/nvram/fw_cfg.c b/hw/nvram/fw_cfg.c index 54cfa07d3f5..71c41c979d7 100644 --- a/hw/nvram/fw_cfg.c +++ b/hw/nvram/fw_cfg.c @@ -257,7 +257,7 @@ static void fw_cfg_write(FWCfgState *s, uint8_t value) static inline uint16_t fw_cfg_file_slots(const FWCfgState *s) { - return s->file_slots; + return FW_CFG_FILE_SLOTS_DFLT; } /* Note: this function returns an exclusive limit. */ @@ -1153,24 +1153,6 @@ static const TypeInfo fw_cfg_info = { static void fw_cfg_file_slots_allocate(FWCfgState *s, Error **errp) { - uint16_t file_slots_max; - - if (fw_cfg_file_slots(s) < FW_CFG_FILE_SLOTS_MIN) { - error_setg(errp, "\"file_slots\" must be at least 0x%x", - FW_CFG_FILE_SLOTS_MIN); - return; - } - - /* (UINT16_MAX & FW_CFG_ENTRY_MASK) is the highest inclusive selector value - * that we permit. The actual (exclusive) value coming from the - * configuration is (FW_CFG_FILE_FIRST + fw_cfg_file_slots(s)). */ - file_slots_max = (UINT16_MAX & FW_CFG_ENTRY_MASK) - FW_CFG_FILE_FIRST + 1; - if (fw_cfg_file_slots(s) > file_slots_max) { - error_setg(errp, "\"file_slots\" must not exceed 0x%" PRIx16, - file_slots_max); - return; - } - s->entries[0] = g_new0(FWCfgEntry, fw_cfg_max_entry(s)); s->entries[1] = g_new0(FWCfgEntry, fw_cfg_max_entry(s)); s->entry_order = g_new0(int, fw_cfg_max_entry(s)); @@ -1179,8 +1161,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), }; static void fw_cfg_io_realize(DeviceState *dev, Error **errp) @@ -1228,8 +1208,6 @@ static const Property fw_cfg_mem_properties[] = { DEFINE_PROP_UINT32("data_width", FWCfgMemState, data_width, -1), DEFINE_PROP_BOOL("dma_enabled", FWCfgMemState, parent_obj.dma_enabled, true), - DEFINE_PROP_UINT16("x-file-slots", FWCfgMemState, parent_obj.file_slots, - FW_CFG_FILE_SLOTS_DFLT), }; static void fw_cfg_mem_realize(DeviceState *dev, Error **errp) From patchwork Thu May 1 21:04: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: 886374 Delivered-To: patch@linaro.org Received: by 2002:a5d:430f:0:b0:38f:210b:807b with SMTP id h15csp514491wrq; Thu, 1 May 2025 14:07:52 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXLj9NqF2UD5Oi9t0/EMMVi6GNKIAAn8exnCmQPcnrO2i36m8ce/7pr8zbPZC1N0WpR/E8klg==@linaro.org X-Google-Smtp-Source: AGHT+IFDohpDKow7uRYeMhmtp9RF9LKuHTz3eG+zD0V9JowiNx2pokwsWEhSGZ/McfepeCpStBJf X-Received: by 2002:ad4:5bec:0:b0:6ea:d033:2853 with SMTP id 6a1803df08f44-6f51527cbe6mr11954476d6.16.1746133672332; Thu, 01 May 2025 14:07:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1746133672; cv=none; d=google.com; s=arc-20240605; b=TrY9YwJ5rdLu33f3d2yoVvEGw1bK6byxAbye8ZyNoijVH+m2klA9r5dF48Zthmrqck gRgrC3CI8d3QTj8FhXKRqwTH5t4HmN3Gxpc4qKfNWOzbuhON1T7lYFJ/8LckR6z8DMj5 zxWj/XNvEUuziCuiJt07Z1oTJtN0RbT7BVTxSwxj2jLVJHadhpbS7oXWuXP+QIpFh4ij ALVX6wCZVwBymk8diDlSFZlhbuJFcXJUvx4qvskY/iboBc2i1fcF65ABOevtspJ4OgqV sCp5hqOo25HXkyPnI3t0C9+K7umsO62I593gUveL8Tk+ieQZhtuM58mwwkbC03+baBpB V4KQ== 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=pT5M0lz4iXxP6eQat70i7GTGsl8o8UafTe6D3H+LKG8=; fh=uloqeIiLIhsqAWHY8zIEmzfMIcw7bGWZuINspytDykk=; b=hxCEdi/lK2oc6xEaUaR/fvLf05AzA3ItBvuwzRpusmA0tCLiU3jh7HOwZFsLJk558k StUQzYshonnBjxPEdrW8Y6J+xJysnUEvEozuPyVShf7B3hmDLva76BIhjZvKn/WvBDjA EL3a0e4wm7Oa/oeZlTmyD/YlUMa2CzFvOwxIq4sCY5rlQMIUrdtGznzZ53bGCIJnQX8s k3PxzznwbEVybYcZ6zkuBrQzLtFRtGRjT9YRHaqupQUiYCmnS3b+xusENrAJRgA0a2e8 e6TBdlG4aHYvce9fQuYqJaYRm7urIwzEQwHs7r5lyPk5u9M0OqgJ0mIrK8gbLW+oo+1/ Tbmw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Sua5MDqv; 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-7cad241be5dsi150459885a.328.2025.05.01.14.07.52 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 01 May 2025 14:07:52 -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=Sua5MDqv; 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 1uAb7b-0003Ny-4x; Thu, 01 May 2025 17:07: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 1uAb7J-0002hA-3e for qemu-devel@nongnu.org; Thu, 01 May 2025 17:06:49 -0400 Received: from mail-il1-x12a.google.com ([2607:f8b0:4864:20::12a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uAb7H-0006kk-K2 for qemu-devel@nongnu.org; Thu, 01 May 2025 17:06:48 -0400 Received: by mail-il1-x12a.google.com with SMTP id e9e14a558f8ab-3d7f111e9e1so15688715ab.1 for ; Thu, 01 May 2025 14:06:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1746133606; x=1746738406; 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=pT5M0lz4iXxP6eQat70i7GTGsl8o8UafTe6D3H+LKG8=; b=Sua5MDqv7+6kbyAqjpct4jTdLQdqHqv0IN5nm61nsYJ5oko+xCpP0FaSGXQrt4x2kz HPMfOt6CDVHsFVaekaf3aGxjsemz9+90wqyYKOBZMJbeko1U6JCQ1ncv5zwyNsR+7uCT lUOsJQtpHnneU9UCRnozttz0HTE3s5d8HLdzUfZFP7332y6qS5xPB78DRT3z5BuYDXPg zHezqZRJ32bbNvsTmy/NTI7jbu3e1dkPoPYloJiiMTwzm2TXD9ogoBtHOJ1GeDoXEQg2 4OMCSKuKVKXIyG27Q42OaWrmUr5UWj+/1sgOFwvE9JDJYjnNn/TWujAWjDoqKE+kEa2H WTng== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746133606; x=1746738406; 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=pT5M0lz4iXxP6eQat70i7GTGsl8o8UafTe6D3H+LKG8=; b=k3fDjbHxesh7wskVBgObOmDgFDUZDMht8hTqXhbgQG85tPCW4clkUYbgnssJMD80E7 O/WwKDiEpzaop79aqbB5qtG/OZHfqKcV0qi6KIpt2oJYDYGB8ITOzoX+FqXxc4HN31Np 2LSm2ngE9kUUZCBPt9E3rtSWI6u3qnc8A5aDQetl/MpIp4GHEaL0s/ZUMqrI2BE3CAe9 c/MLMVQ5U2quTjCCmLyhQkbKfH5W/SmIwWBBOh6lVHUYSXnqUUdC2hTX5N6mtEuPouzz FKibBVkvyKiuu1Pcfe/k0/UyzYSs3Qd1WmZjeTTOU11A/8F5ERy5kxSXlPof20wInEcl OPXA== X-Gm-Message-State: AOJu0Yy139C/nAAjJFYA5pjO5tp8YQO4fHhmaX8W/+522xWT4R2Fsiia MYK2/66j/kAAs4yh1mVVAR1bkUBsx1Xg19vKmQ50QqU0rAAP+QV1yKMm4r2qPEb1Vfv/mo/DEvk b X-Gm-Gg: ASbGnct3wdKD6W9/48b+0xLet8fybJnsntJclyZedANecZ4nQ3W6s7Sgt95A8ybzms0 /wneDWZsBc/TnIVbEskPoAFYjQiyU74yTzJlBD/hta9VWkUO1m3rH8sDVS94GL0XswLag9NWSN0 WQ1ADmyfXanyelwkbr4dErP96ZjosczXKA3ctrTIeuvOt5J3v4UHkMY5ezUI7ahyS+pcPpotfrL hxAmiM470Gntk+VwOSEI4y9KA6l+flfSUSuacFVTtz3CdgeVUBrKLmffRrWDHJbCMu0KbjnOrmv uf065jw6suMvw3czj0cNnGaSCYhCAGA3l47RuKbKc32ga+cGSQ8zcKkbpMzNMElzBzdkjJl8xPN u0Lx59pS3sY3Qkr4= X-Received: by 2002:a05:6e02:3784:b0:3d8:21ae:d9c with SMTP id e9e14a558f8ab-3d97c154012mr5765095ab.5.1746133606161; Thu, 01 May 2025 14:06: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 8926c6da1cb9f-4f88aac7e27sm44626173.138.2025.05.01.14.06.42 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 01 May 2025 14:06:45 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Cl=C3=A9ment_Mathieu--Drif?= , Zhao Liu , Hanna Reitz , Igor Mammedov , Marcel Apfelbaum , =?utf-8?q?Philippe_Mathieu-D?= =?utf-8?q?aud=C3=A9?= , Paolo Bonzini , Eduardo Habkost , qemu-block@nongnu.org, Jason Wang , Richard Henderson , Yanan Wang , Ani Sinha , "Michael S. Tsirkin" , Thomas Huth , Gerd Hoffmann , Kevin Wolf , Yi Liu Subject: [PATCH 12/18] hw/nvram/fw_cfg: Inline fw_cfg_file_slots() Date: Thu, 1 May 2025 23:04:50 +0200 Message-ID: <20250501210456.89071-13-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250501210456.89071-1-philmd@linaro.org> References: <20250501210456.89071-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::12a; envelope-from=philmd@linaro.org; helo=mail-il1-x12a.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 fw_cfg_file_slots() only returns FW_CFG_FILE_SLOTS_DFLT, we can inline it. Signed-off-by: Philippe Mathieu-Daudé --- hw/nvram/fw_cfg.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/hw/nvram/fw_cfg.c b/hw/nvram/fw_cfg.c index 71c41c979d7..de65ee8342e 100644 --- a/hw/nvram/fw_cfg.c +++ b/hw/nvram/fw_cfg.c @@ -255,15 +255,10 @@ static void fw_cfg_write(FWCfgState *s, uint8_t value) /* nothing, write support removed in QEMU v2.4+ */ } -static inline uint16_t fw_cfg_file_slots(const FWCfgState *s) -{ - return FW_CFG_FILE_SLOTS_DFLT; -} - /* Note: this function returns an exclusive limit. */ static inline uint32_t fw_cfg_max_entry(const FWCfgState *s) { - return FW_CFG_FILE_FIRST + fw_cfg_file_slots(s); + return FW_CFG_FILE_FIRST + FW_CFG_FILE_SLOTS_DFLT; } static int fw_cfg_select(FWCfgState *s, uint16_t key) @@ -845,13 +840,13 @@ void fw_cfg_add_file_callback(FWCfgState *s, const char *filename, int order = 0; if (!s->files) { - dsize = sizeof(uint32_t) + sizeof(FWCfgFile) * fw_cfg_file_slots(s); + dsize = sizeof(uint32_t) + sizeof(FWCfgFile) * FW_CFG_FILE_SLOTS_DFLT; s->files = g_malloc0(dsize); fw_cfg_add_bytes(s, FW_CFG_FILE_DIR, s->files, dsize); } count = be32_to_cpu(s->files->count); - assert(count < fw_cfg_file_slots(s)); + assert(count < FW_CFG_FILE_SLOTS_DFLT); /* Find the insertion point, sorting by file name. */ for (index = count; @@ -926,7 +921,7 @@ void *fw_cfg_modify_file(FWCfgState *s, const char *filename, } } - assert(index < fw_cfg_file_slots(s)); + assert(index < FW_CFG_FILE_SLOTS_DFLT); /* add new one */ fw_cfg_add_file_callback(s, filename, NULL, NULL, NULL, data, len, true); From patchwork Thu May 1 21:04:51 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: 886380 Delivered-To: patch@linaro.org Received: by 2002:a5d:430f:0:b0:38f:210b:807b with SMTP id h15csp515026wrq; Thu, 1 May 2025 14:09:20 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVuWx/1s8JSliK7wea87adP8CsJ1i7caOKonoyBfb0bJzeUQoIKxlbcfDz5mLcosdNC1WYWkQ==@linaro.org X-Google-Smtp-Source: AGHT+IGdhDgy49wcbth0f/7xpmPCyYEzjnbyP6zX1szQHPBmT7cgULTvNONNIyOcPS0Dne8vbum3 X-Received: by 2002:a05:620a:4726:b0:7c7:b5e9:e9a1 with SMTP id af79cd13be357-7cad5babbcamr85742885a.58.1746133760744; Thu, 01 May 2025 14:09:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1746133760; cv=none; d=google.com; s=arc-20240605; b=ZMP0apCiUo4IfT+8IQI3RhPO5/FKg7F7XD80ae/qDB582WOSAWtJA8O6gqnKuyuuN3 1yLykzEJHaIVo88tF1OoC3j95Tj6kjocbJX1JVSrHHOJWTwifeu7LMcrB+wEq1Tj5v5K NmoBvvk3SN7wwMAyB0K9jr7KzAyi6dRACgPeFuUO0DKWUDCnaX/NzVrcTLY5SDg1N/dp W3ULnsRJo4MUuUWrRbfFBy9l3vVQ3M4BTTxMy/dpHLk3FkTDruzqWEXbkkuXLjj9V/vq RF4IkJcKuY1c/fP5A1gRpb84P353PrAjQFHf+fbvd5r0GJ0kkmMXPs1y8IOyitlzjiZX dNmg== 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=5ZHrZc/SqHQCuHNUknWmlRcBkOUid9mb6wG/E9aJXzY=; fh=uloqeIiLIhsqAWHY8zIEmzfMIcw7bGWZuINspytDykk=; b=OtdSenqveMGP2eEt5u5zrRNFPLOWepF9QhPNL0TkNAq2eR2xJzBc/GyDZs4u/VPITA ff1PU5qsCNa2T/V+1HynfMzuduzVcJgK7LEo7BZuVq2M1bn2trjUUllDNouil4T5jL2t BPdYYNBDE4uM4zrNdUqbreOnepUULnw1JqDLc2Uhlgzdj7Wys/UKBHp13BHvRuZW9nuR 1PiuErBcwSyCb5ggyrAhqKT11uRoSj2uYCgMei4PD5t7ruco5Cebk1B4I+astvx/UL4g W9yCcQyVgbumpp5L/OtOC4/OPUu8Wq0V7nM0W6Bg/kAmZmT7oveHeP6oeW1IoXSraJTd /JIg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=JB1ZcBEh; 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-7cad23ba2e3si149767985a.119.2025.05.01.14.09.20 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 01 May 2025 14:09:20 -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=JB1ZcBEh; 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 1uAb8p-0005gx-P1; Thu, 01 May 2025 17:08:26 -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 1uAb7S-0002vY-Iz for qemu-devel@nongnu.org; Thu, 01 May 2025 17:06:59 -0400 Received: from mail-io1-xd32.google.com ([2607:f8b0:4864:20::d32]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uAb7Q-0006m0-O4 for qemu-devel@nongnu.org; Thu, 01 May 2025 17:06:58 -0400 Received: by mail-io1-xd32.google.com with SMTP id ca18e2360f4ac-8616987c261so47491639f.3 for ; Thu, 01 May 2025 14:06:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1746133615; x=1746738415; 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=5ZHrZc/SqHQCuHNUknWmlRcBkOUid9mb6wG/E9aJXzY=; b=JB1ZcBEhox8DyxEtyex6GQ9rcteS6g+DR4lZ5Eo28liSC7CvVI9myw9qIcTxqQzs3C 2Sc6cslZ91ZWqg7wa/lR9GJheZ2si9HlZi34ewVALsq0H9Uok1LmZybooqIH3G1roc0O 8+DMU8BBuGiaGSIuni3P2m8CMVkRJOvrtp2EhFRwxsfSnTIqOSc2YhPb7NoPz0rvSlGI ehEOSQUcXFOzlnISfzYYIqt2dOwZfs+UPqqJvDM9O5GgTtzOn/9kmDQILbhHRYnyTaLB Es/DzVJshcKWuOdxEOq+gL80kVyOmqaB+T3TmDdQjFIoi2r2B351/7nfTsciGqkfze2/ lOiA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746133615; x=1746738415; 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=5ZHrZc/SqHQCuHNUknWmlRcBkOUid9mb6wG/E9aJXzY=; b=VCK6SFhWU+oJzYCVR3j8rOkr0LvD0A+fBQ4LdTrPEw1kC74/ZqnkeEMVGFy6o1cvp6 jf8ilRIKsIOUZMNsqn2YN68/nCF87XPc9RPHOcG38WKIGv9SJMJ5eqZGcT2vN/7eHkET 5+JR75gaYZIvUEi0gyUEKJ/urcwXFp5U30stirnFCpb8Juyn2aZw2bWhJlHqxdoxaI77 43Wc2OgDAV26ZPQ4P08/RBrpaKidZ7VA7aW9ZaBgEJIRiBx0V2xWv9itPaV/Njl4PnWd VfajLXVh4Ge5rfevMHWNT0Dcmc9GED7gzP8Syvew7MnX7auWDPJgYX9fXq1Qwkh+d9wq CwGQ== X-Gm-Message-State: AOJu0Yz2/XdeWEb0h5v5gezgmGHn74B6CFh9AcsNh9ejfiEYj6ElEmGs +DUThUA2BlOCcWj5hPgRPyNqqaSkrFhUqAFjuEssGoSUBr36SB5qisG7aZk9SBVnU/2Oo7OE3EL Y X-Gm-Gg: ASbGncuRhKHGe6HEgblNCdw20PwqUYr3xilbM/4T7xvHFGWrJBhhfy09KDmxOBiYa9Z /c0Ceu8vu+QOKiMOvRsafOHQ00GJurs+5IjzVMLd4lPHR3ALc5/0ON7MgbL7MeREtAl+OuOi510 +UHfoOLCc1Btg9qokqxRyBG59755ydO0+37hjV0WSYBcHXv7YsCFfNQOQCc4lhJDPWCpgv56uOU NIr4MIoVdx6x5qSM+KgQcC66h4TkOh7Y4q2yhVSz7ooNJYpcUPOIDXCmicdQn2ZTVjYQEfjvztU dW59RiqkEOvpwflEr6fa54N5MGMtnKEsHobQ0ZbUiV3aZQNQY1xN67UaWGdat+YSrKPdXDlgkN3 EkzXweRpXxJ5G5fY= X-Received: by 2002:a05:6602:3a15:b0:85b:577b:37c9 with SMTP id ca18e2360f4ac-866b4298812mr90498639f.12.1746133614798; Thu, 01 May 2025 14:06:54 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ca18e2360f4ac-864aa443886sm24652739f.36.2025.05.01.14.06.51 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 01 May 2025 14:06:54 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Cl=C3=A9ment_Mathieu--Drif?= , Zhao Liu , Hanna Reitz , Igor Mammedov , Marcel Apfelbaum , =?utf-8?q?Philippe_Mathieu-D?= =?utf-8?q?aud=C3=A9?= , Paolo Bonzini , Eduardo Habkost , qemu-block@nongnu.org, Jason Wang , Richard Henderson , Yanan Wang , Ani Sinha , "Michael S. Tsirkin" , Thomas Huth , Gerd Hoffmann , Kevin Wolf , Yi Liu Subject: [PATCH 13/18] hw/i386/pc: Remove deprecated pc-q35-2.9 and pc-i440fx-2.9 machines Date: Thu, 1 May 2025 23:04:51 +0200 Message-ID: <20250501210456.89071-14-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250501210456.89071-1-philmd@linaro.org> References: <20250501210456.89071-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::d32; envelope-from=philmd@linaro.org; helo=mail-io1-xd32.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é --- hw/i386/pc_piix.c | 9 --------- hw/i386/pc_q35.c | 9 --------- 2 files changed, 18 deletions(-) diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index 0d6ad9db627..5c7d0c50f8e 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -737,15 +737,6 @@ static void pc_i440fx_machine_2_10_options(MachineClass *m) DEFINE_I440FX_MACHINE(2, 10); -static void pc_i440fx_machine_2_9_options(MachineClass *m) -{ - pc_i440fx_machine_2_10_options(m); - compat_props_add(m->compat_props, hw_compat_2_9, hw_compat_2_9_len); - compat_props_add(m->compat_props, pc_compat_2_9, pc_compat_2_9_len); -} - -DEFINE_I440FX_MACHINE(2, 9); - #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 54c18100122..d66d64b3b62 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -630,12 +630,3 @@ static void pc_q35_machine_2_10_options(MachineClass *m) } DEFINE_Q35_MACHINE(2, 10); - -static void pc_q35_machine_2_9_options(MachineClass *m) -{ - pc_q35_machine_2_10_options(m); - compat_props_add(m->compat_props, hw_compat_2_9, hw_compat_2_9_len); - compat_props_add(m->compat_props, pc_compat_2_9, pc_compat_2_9_len); -} - -DEFINE_Q35_MACHINE(2, 9); From patchwork Thu May 1 21:04:52 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: 886382 Delivered-To: patch@linaro.org Received: by 2002:a5d:430f:0:b0:38f:210b:807b with SMTP id h15csp515611wrq; Thu, 1 May 2025 14:10:59 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWUfhEm2KrkVoMwx8Mw8fa1uXmIshGs7t9vz8AnscqA/LOtzSSt7x5gnKcbQp4ssAbt3QRTqw==@linaro.org X-Google-Smtp-Source: AGHT+IG1PCqAaNi+Kdeva+0H/xQt8tLrHZN3L9oFFifbQgNwNHmpTta21S+uZlQc01aaxmSoMZ1U X-Received: by 2002:a05:620a:318c:b0:7c7:a5b7:b288 with SMTP id af79cd13be357-7cad5b3fe4amr75751685a.19.1746133859111; Thu, 01 May 2025 14:10:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1746133859; cv=none; d=google.com; s=arc-20240605; b=BfhYAk5rqEYpVqPkXxDxLOg9YDrgDHMkVCuxQAdBBIh49o1S8Wp0srcjAJM2rNkJ0k MKYvlFSsrcUXSwigPsWBVaTSdZ5a8UI8PHYiPMpq2F92u63Lawmz40R15bMakGKDHe0g LhK9w7FC9bubZ7hYmSGXrv6vumbOxSkuMJavrDCmNfOeiu4bIqVnidQLPZ8JFu8+wZ7h TvNttNmacO6WBVL9ER+zhsgUEyODEoUpAqqeMDCg1A/yAxl/hYVwraL9W9qreknFheUL kdzifzTACo36Qn5bTisr3viD/YVZaIykjb33TMYNXM3gNGUZQ7/EA85rbCl8/+1CyuNk 3p+Q== 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=F1TIfqPI6KIjdWpPpNOR70tHHt9G+GWWZtqNrt0CoWM=; fh=uloqeIiLIhsqAWHY8zIEmzfMIcw7bGWZuINspytDykk=; b=QwfT4LJb+WR3IMIrDMTLyNE/hin3IxURRfTm0Q92hQ7ekV+eQr5+XUYbj33egYjI8O zfuNMxkXYKIbsa712RXT/zCGtr5X3nnLJdqKaydr+LX0gZvzEBvLCbdUKK6ulRXyIQuE LDvPpSjzdBSkVkmAXjkRrWXpIrvFpOwrJsKY/cjwfGJSWROpRQXcclPtzhY5G2yGHFmE xsGw5CY4Y5yzFi6R2IOQgsZXaSdck+oNIgOvlikc5OH3fqQiGgYex7bdL3GRr+iebclq aVJcYHyOAKm+aJBND3mAS1vJ7AweglhEwqw7v27jMajlkETHHuiw8Dk6DFhyHopFITGH 4RfA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="i1DD/FRQ"; 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-7cad2456e35si142766185a.643.2025.05.01.14.10.58 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 01 May 2025 14:10: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="i1DD/FRQ"; 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 1uAb8I-0004Sr-L2; Thu, 01 May 2025 17:07:51 -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 1uAb7b-0003U5-2Z for qemu-devel@nongnu.org; Thu, 01 May 2025 17:07:08 -0400 Received: from mail-io1-xd2b.google.com ([2607:f8b0:4864:20::d2b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uAb7Z-0006nS-Bs for qemu-devel@nongnu.org; Thu, 01 May 2025 17:07:06 -0400 Received: by mail-io1-xd2b.google.com with SMTP id ca18e2360f4ac-86192b64d0bso128886139f.3 for ; Thu, 01 May 2025 14:07:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1746133623; x=1746738423; 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=F1TIfqPI6KIjdWpPpNOR70tHHt9G+GWWZtqNrt0CoWM=; b=i1DD/FRQ3mlTl65g1WbBQNkpy1k0WbeloXEkeWp6Dv26z2Hje/C6OXVaWoMGnH0CPa 2rYcqYW0FCYcaSbe/NPV4265ofHGd/lZlHffIYh192Px89ORoM5t6ZWIFHHHHBGZEU73 Z+Lobk2mlJg5gPsyb8i/52A/wp/FDlNkfApMcIfQ6o6ZfJD1GDpg769m8rhA82MlndZz oSREaYFr62q9KjuWlgVEnsB6325mbhVyd88Ti2OwBNeNgxLtXPmL27qQxJ0vkvdsXCQl wEcl5ShsQrNXt5WPelRt9ArerqOU1QDNhBqmEB2HIiPt6bBW6s2WDC9FFV2PpZyXZ2M6 RIag== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746133623; x=1746738423; 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=F1TIfqPI6KIjdWpPpNOR70tHHt9G+GWWZtqNrt0CoWM=; b=b1UnGazgvtlB6NGx9unHmSBMT0Fdoec3mlh/adt4ayOy24HiC/RVzexjd4akrVjHxy SHLiMm6M+MpWIEsLxJjuIK9jCYAWxODlYGXS23NKnukVhGxM2N2q2TDBjL0Lf5t0jGwZ SoMgVp3QwnkuE5d+qCckdqDeOcTmVnYqZdIKiMWbjkS4lyvNRuiXdtagZJVStriwWyen 4qBQ9MB4cdCrTZJ0dUCCpLaLgqGsfAySw0a/FxXse7TxDyDwzxJE29t0FEeBb/B4JsEa NFmoIBY07xziF1cWEubllS1hOwvk/W35gc8bSOnaIOkjgNVIDqkhuXDjFLqTyBAlOfav 4QZA== X-Gm-Message-State: AOJu0Yyez7FZTQkAMqogGRFCPyfC+Zz+FhcebaijBUuKsBVsOqWOf2M3 AEV1HVyHn1ovY8AorPdXxrbL7paW9qxrxd1JyW6lF6Jw5qMiwRiNsnefTsmxh4tOk8gtr3hbt8w h X-Gm-Gg: ASbGncsIsniju93AZRTyj2ItF6bXS3c1siA3Vmt2OSA3LQGoU3At1qvgvasSB42Hnsb zXBRwrsHT+d2O5auTY5KRRbQuNyiP2qddOlQ2+iqHXNM0Xr9BbhjjQir1ojaMjAyEtwNEUOVzVt y1c+5ntISh7Ff/oqUyHmcUgvhDrPs/EUjjUElPFg+yGAIyu2jRPKe7h/lEABtWo7QcYS11GVTkX GlKPvXGPlDllNppHWwMZC39J8Jyuzrf9uhwELPboZtWlTO8ahqEeb7+pUBGCI6OQLfLykjuelns S9F7uPra9vLSMD0ZPh4m/PAVKUi3V+Gu9A8VlgniMK65ImUIuWgnRL2suYYysXgDO33MWPKOQfS Vyrnb94skWauQ/6Tt5kWj8NbXyQ== X-Received: by 2002:a05:6e02:1d84:b0:3d8:8900:9a28 with SMTP id e9e14a558f8ab-3d97c2d395bmr6279525ab.20.1746133623583; Thu, 01 May 2025 14:07: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 8926c6da1cb9f-4f88a91638fsm49050173.46.2025.05.01.14.07.00 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 01 May 2025 14:07:03 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Cl=C3=A9ment_Mathieu--Drif?= , Zhao Liu , Hanna Reitz , Igor Mammedov , Marcel Apfelbaum , =?utf-8?q?Philippe_Mathieu-D?= =?utf-8?q?aud=C3=A9?= , Paolo Bonzini , Eduardo Habkost , qemu-block@nongnu.org, Jason Wang , Richard Henderson , Yanan Wang , Ani Sinha , "Michael S. Tsirkin" , Thomas Huth , Gerd Hoffmann , Kevin Wolf , Yi Liu Subject: [PATCH 14/18] hw/i386/pc: Remove pc_compat_2_9[] array Date: Thu, 1 May 2025 23:04:52 +0200 Message-ID: <20250501210456.89071-15-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250501210456.89071-1-philmd@linaro.org> References: <20250501210456.89071-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::d2b; envelope-from=philmd@linaro.org; helo=mail-io1-xd2b.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_9[] array was only used by the pc-q35-2.9 and pc-i440fx-2.9 machines, which got removed. Remove it. Signed-off-by: Philippe Mathieu-Daudé --- include/hw/i386/pc.h | 3 --- hw/i386/pc.c | 5 ----- 2 files changed, 8 deletions(-) diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index db02cbc0d65..455b869cce9 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -283,9 +283,6 @@ extern const size_t pc_compat_2_11_len; extern GlobalProperty pc_compat_2_10[]; extern const size_t pc_compat_2_10_len; -extern GlobalProperty pc_compat_2_9[]; -extern const size_t pc_compat_2_9_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 5f07a44d447..298091932ab 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -227,11 +227,6 @@ GlobalProperty pc_compat_2_10[] = { }; const size_t pc_compat_2_10_len = G_N_ELEMENTS(pc_compat_2_10); -GlobalProperty pc_compat_2_9[] = { - { "mch", "extended-tseg-mbytes", "0" }, -}; -const size_t pc_compat_2_9_len = G_N_ELEMENTS(pc_compat_2_9); - /* * @PC_FW_DATA: * Size of the chunk of memory at the top of RAM for the BIOS ACPI tables From patchwork Thu May 1 21:04:53 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: 886385 Delivered-To: patch@linaro.org Received: by 2002:a5d:430f:0:b0:38f:210b:807b with SMTP id h15csp516188wrq; Thu, 1 May 2025 14:12:34 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUxeD5iAvyq1NLyq6cG8zbi/97KExAYwVa1vzuC15Oe0cWs8X5At6MM1q6a3txunTHdgijnTg==@linaro.org X-Google-Smtp-Source: AGHT+IFxkQDrIrzhUjH2EsMHAh+pDx/j/zIywOPSrrNYZ6/m8/ZfybmokqniJdyBbvevqHpYxhnP X-Received: by 2002:a05:620a:bcb:b0:7c5:e283:7d0a with SMTP id af79cd13be357-7cad5b570b8mr80295885a.30.1746133954749; Thu, 01 May 2025 14:12:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1746133954; cv=none; d=google.com; s=arc-20240605; b=VJ9OOCssklbXtjpFTLliyDKzTCT+iytE33va3h9T7vsoDcgFtfcv4nDsZoQ9LzN7VF KqTJM221i5AOSopR/42J9yqg/+6nWDMYc8carZd0C7b/mq76+4UKftu5fNXAVksojEwh 6JiycdAjspTzJqbYvzU9jk9rQ2xFkWSeT+YSsRhc+jQjs7nxkwX70SbnmG4g03HDy9+9 zPxTourHCArItGotsPCXB304SdURIoOQzsqxZkg2iS8RXrHJBourPoRZoumOZ0R7fFy8 pRyZ4vxJHZ/TTsvoq768A/b8IMIoBNHyqmaPq26svXoQgNFslqafvWRtm27KwfQyFNjz e9FA== 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=WwJU5ZPxxxnKG6o6jl5mOPQrDWUSsO9Sle41Xc0jm2Q=; fh=uloqeIiLIhsqAWHY8zIEmzfMIcw7bGWZuINspytDykk=; b=N2KhLVz/yiCJQuunbtBaWyrYiae6wGG35pRehNdeUh9YlW1fjvqyaOGHeTafJFsa48 VUDueq3+n3ubI+TTQAkVDKNkYBvvvgWtA08eFJS5pWjM3vYcrYxaog8fL6X/UUiWJEpQ NMy7xayCabggHf0A0FImSwhK2IFuzchsfcjc8BZt9bDGNDOS79iWunwHjFiGjhYk1JRe U2aDYS8Xw90X5Ll0nNzIEvTw/5zcOCCAUOrZ8RI3uZ4ACyTPeJxJebtRZLICtzXNG3go T5cApolu6puWFu03HwH2yNyBdLYvN/AubC6LqyxQdZOcCS9uarMuOyMOT7oXbxxBQbHG qycQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=jXmzCvFx; 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-7cad2447fedsi145585385a.501.2025.05.01.14.12.34 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 01 May 2025 14:12:34 -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=jXmzCvFx; 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 1uAb8K-0004aQ-Fj; Thu, 01 May 2025 17:07:52 -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 1uAb7n-0003pE-UC for qemu-devel@nongnu.org; Thu, 01 May 2025 17:07:25 -0400 Received: from mail-il1-x12f.google.com ([2607:f8b0:4864:20::12f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uAb7k-0006p6-LD for qemu-devel@nongnu.org; Thu, 01 May 2025 17:07:18 -0400 Received: by mail-il1-x12f.google.com with SMTP id e9e14a558f8ab-3d96d16b369so12886055ab.0 for ; Thu, 01 May 2025 14:07:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1746133632; x=1746738432; 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=WwJU5ZPxxxnKG6o6jl5mOPQrDWUSsO9Sle41Xc0jm2Q=; b=jXmzCvFxuGGk27bOEpVB/qF1VgR+IA3gbU7PENbjAXAjyakEAuP2ZoSy8KrPDdQIID VnFAUewGzFhbZ+4CqAFFIEJi+cMgoafhJQHglecqfTa+qV4zQhHZYxI2cnK4goRHwetx YbPlSHGE1kO7CXhXklYfAobWcZb7CNgOnF7X1uRqS5dalZXxJTpjD5+N0XbHmUG3kTz5 nwSvR9fzOfmnpLB95nYEmJxseUrDDYNYPoT54KDi11m5z+EWRkWiqaBFiVsCPM4Kque7 p3yQH2xKubuePDXumet9gtGkjE+U0fCMEtRUkhAcTNNxI1MNyk2EVwIYGAk+ImUd+H60 t0Kw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746133632; x=1746738432; 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=WwJU5ZPxxxnKG6o6jl5mOPQrDWUSsO9Sle41Xc0jm2Q=; b=vXfw+N9TVD+hCL8en0WgtSoSqCJ9KxflHXI5y1E8Jw/qO/XjDNncpjydjJTKBl+k73 +dmtjwS/oFvBhNJc0hFGABczaAL3g2PQmTKgcAWc9TgAOrLnJVL72kNtb9CNXjHub0pS 1kQwWrZnHTFtuzvP7zVRgYAvy5kjMdy2hXhz0FMPAFoRp+Ryb8OJSd1HzCNeWVurUIEa 6WS73xAGCsdAaskTAGn4suHI0sjSLVfzBjxjaDcYqFexUcYZ9F1FuYooRRK3MD9IkfvJ 8isKUmKTGYNfhMCDrRpEUw3xnZwMPPhgeFq6eP91I5kg89AALVm8/WB07zGQe4JPxIDJ iVcA== X-Gm-Message-State: AOJu0Yy/foHAWO7fh3XAgMCxO6ZB7bBonoQCjh3OxbUU4D44AgxiP+ru k9xs258Lar6pZdE926hiv27fN0z6iN9YHN+xf3M5SKYnDfWkVXdp8IjWcTOvHkEgalRTHjwUgcr 8 X-Gm-Gg: ASbGncvQA2gq4pgrez2mmI2df7k8InVUYayZb0/1runddzKjUMnqNNK4BS5vjVQwtc1 56C/8z3LE+la0iRjsqyhMbFpP0Ro3QQwTxzJM54r7zUMR7UQEeRm4Yb5Coc5XVkljrYM5wkuRIA QPIt9hBtfNMq6Bb+Pqbv/H6GrPqLBdUbxWMdVLw7Brck0vml5Pw5mH2LnAw0hYMGbmFoBOileV+ t8ClazjnL3Q8Doo/T/n/ANdTcy6q4oYgcB8P8iYYJNqhsG4/0wc49bXrDvi46FF2nOFwNRXWSR6 OROfJOUCEJYXPJwI7HCaVTFIoWG1Xy6IkDL/XHV0MjOhDzhuZMCBjEjgd3PRdQ4/+eL7iKxT2Bi ZYCxOc48XoWL9crY= X-Received: by 2002:a92:ca4e:0:b0:3d5:8923:faa5 with SMTP id e9e14a558f8ab-3d97c1af64bmr5387935ab.10.1746133632331; Thu, 01 May 2025 14:07: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 8926c6da1cb9f-4f88aa58ecesm46024173.98.2025.05.01.14.07.08 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 01 May 2025 14:07:11 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Cl=C3=A9ment_Mathieu--Drif?= , Zhao Liu , Hanna Reitz , Igor Mammedov , Marcel Apfelbaum , =?utf-8?q?Philippe_Mathieu-D?= =?utf-8?q?aud=C3=A9?= , Paolo Bonzini , Eduardo Habkost , qemu-block@nongnu.org, Jason Wang , Richard Henderson , Yanan Wang , Ani Sinha , "Michael S. Tsirkin" , Thomas Huth , Gerd Hoffmann , Kevin Wolf , Yi Liu Subject: [PATCH 15/18] hw/core/machine: Remove hw_compat_2_9[] array Date: Thu, 1 May 2025 23:04:53 +0200 Message-ID: <20250501210456.89071-16-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250501210456.89071-1-philmd@linaro.org> References: <20250501210456.89071-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::12f; envelope-from=philmd@linaro.org; helo=mail-il1-x12f.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_9[] array was only used by the pc-q35-2.9 and pc-i440fx-2.9 machines, which got removed. Remove it. Signed-off-by: Philippe Mathieu-Daudé --- 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 84bd3735c42..513eb2a54fd 100644 --- a/include/hw/boards.h +++ b/include/hw/boards.h @@ -832,7 +832,4 @@ extern const size_t hw_compat_2_11_len; extern GlobalProperty hw_compat_2_10[]; extern const size_t hw_compat_2_10_len; -extern GlobalProperty hw_compat_2_9[]; -extern const size_t hw_compat_2_9_len; - #endif diff --git a/hw/core/machine.c b/hw/core/machine.c index bc0606cf740..486d1adb4b9 100644 --- a/hw/core/machine.c +++ b/hw/core/machine.c @@ -244,14 +244,6 @@ GlobalProperty hw_compat_2_10[] = { }; const size_t hw_compat_2_10_len = G_N_ELEMENTS(hw_compat_2_10); -GlobalProperty hw_compat_2_9[] = { - { "pci-bridge", "shpc", "off" }, - { "intel-iommu", "pt", "off" }, - { "virtio-net-device", "x-mtu-bypass-backend", "off" }, - { "pcie-root-port", "x-migrate-msix", "false" }, -}; -const size_t hw_compat_2_9_len = G_N_ELEMENTS(hw_compat_2_9); - MachineState *current_machine; static char *machine_get_kernel(Object *obj, Error **errp) From patchwork Thu May 1 21:04:54 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: 886384 Delivered-To: patch@linaro.org Received: by 2002:a5d:430f:0:b0:38f:210b:807b with SMTP id h15csp516158wrq; Thu, 1 May 2025 14:12:29 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWyHnO5DwyNq4PdTt1TDvE1+B87DpO8xkwWPFbqp5HqxAQB3ByLWToyccb0WrWtRloj+RPWrw==@linaro.org X-Google-Smtp-Source: AGHT+IFB8AtZCATDW7XfzRl4KxHgDTcqgkOZFZKT1IIHALtsJ1ird84t7msszBpH4jvbotnM75js X-Received: by 2002:a05:620a:3721:b0:7c9:64b9:6391 with SMTP id af79cd13be357-7cad57be1ecmr121068785a.28.1746133949709; Thu, 01 May 2025 14:12:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1746133949; cv=none; d=google.com; s=arc-20240605; b=JV8fONLIfVuCEWVFYtKkB/c4LkN+vFnKfLaG9sRtjfZqdJMfV87AyLVF9NaLCqZY14 v/dpdCoeqXpIJW/N1Yz6OrfGxh1JHYDLp3TAUtbNunaXNwS8lztaRCHxEvCto/RyIXOP YNw0dFrnSb27w+jZMkfbvjzvpufDHJIZl2JXrGFk2EZDcHBMRIRV0/8OFBCpbAHZO0Ic srjIAbraCPuBDZajclRKFJ4tcYXoUR+Wij+7O09UeCQgxBXuG2zpWj1eEB8cwnOAyIDF j+dmul1SQWTFaEw4RT2Msidt1xTnZg1bRQLZMSjh6o4sLkwQgGdq3ezflC/YJaCXZgxp xtFA== 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=+sYT96Q+b8vV/xVN5xVJCJ5YUm+R4rge65haKgSbsJY=; fh=uloqeIiLIhsqAWHY8zIEmzfMIcw7bGWZuINspytDykk=; b=W8WTJQ9Erc3zcMzYnSmZ1UNpeXYrvNFY7OJcsekpSsJoIlM1oxh1Xloig+DpfFAuoN aJgXA+cYtMVon/7l9sWFHQFI+jnJm0XzDqgl4xurdiGWOGUlx0kuiiXM81SHObNeN9dG eSU6cTYMKt1QK/MyHj657BJzw/8j30/1wQeZXUyQZWfKF5jqBZjw0QZFgor57i5uwTCt I5/qc1z8iN63LC4GruAlX19gkezU+jivdoQa4bvXY6Jj6NAZkN0xgDQvzayyStKkgDky TE9SSD7lmkY2rxVozBNBC/I7jVFSz7O9pONFceDY5kagRgNss0q8fQDNhMcpVAfs7zHj DiHQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Ma9XUVrN; 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-7cad2432967si149632285a.391.2025.05.01.14.12.29 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 01 May 2025 14:12:29 -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=Ma9XUVrN; 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 1uAbAq-0007YL-Jf; Thu, 01 May 2025 17:10: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 1uAb7v-0003qR-E3 for qemu-devel@nongnu.org; Thu, 01 May 2025 17:07:31 -0400 Received: from mail-io1-xd34.google.com ([2607:f8b0:4864:20::d34]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uAb7r-0006qH-Iu for qemu-devel@nongnu.org; Thu, 01 May 2025 17:07:25 -0400 Received: by mail-io1-xd34.google.com with SMTP id ca18e2360f4ac-85db3475637so87039939f.1 for ; Thu, 01 May 2025 14:07:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1746133641; x=1746738441; 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=+sYT96Q+b8vV/xVN5xVJCJ5YUm+R4rge65haKgSbsJY=; b=Ma9XUVrNMPO0Cyx3Wm26LTcrduCW6S1K5VUa6gio800UkvEgDtuXQlaTqKGcJga/Dw l3M1ZovSylb5P+MYlyoElnstWrWAKijO5tODkv7xkUYpY0uOI8FnFkT7QkVg8WSyqxe9 0DzoklSRsO9gcAr+QylL6T+5IYSBe24YmRH11binljuqcw1JBWYLZ0TmzEqcY6eJmTBt 26r9cZJkYYtwzA+W2GABPWJsmJjgKhsjvpxhShoPAtqWCn5DuJlHuE6gIAL0PdEq9fRh JvBRkeIsCn6ghBQsPI0UYNrhIR8ljMTcJU4qnBdyqA0lAvka5+FYi9VoV3xfBEDNNciW HxvA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746133641; x=1746738441; 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=+sYT96Q+b8vV/xVN5xVJCJ5YUm+R4rge65haKgSbsJY=; b=q10qwmpWV+JNmQ5dis+ZTDQSBl3pQkuj/b/oujLPmmKZP1CdIwPprttUIzFr5RqhYj 4Tm/QTytDKO+mJ6AmuP/H93nZoBxOznt4oP5kZLNS++Kwma/DhddT2cfzYSeRYtN9YaA HQMm1NZYHIzfPMsDcXBiqoJ0xR2Cz6lrczI30g/rhQP/tcnxZOjAjxvSmstCuKwuAaZH wbICRYrU46sJZCqQQbGZE2ekIi61UfQEGUujnWs4O+IjaI0UQLkKygh1ytIuo3qPgaLM pY7ZIiLcp6FVEfnPWRl66FAH0KjOb3blMGDLsp1d16Gy9itxYPIPaUIwjLWgHQUCyk/u 2Zmg== X-Gm-Message-State: AOJu0YxYosUw43FTgTdYWqPma+/caWHx4Ilh6ElNEx+YvjvBug9266DW Y1Kx8ppS/nLhOPI3NlFkiY0sFOIwsDuiuRNvWDdnKS8DXTO+U7P21RjtvfUNGdTv0qwDawnLNzG T X-Gm-Gg: ASbGncsrJRlHEY570OAcNupC0LaJPSfDT9/tuJEAyrjNVKuea7ruJwazTqBFHS6hA+J o6LcIbqPSRCh0CKaLPmsxZt0QI8k9ZTLoPUgyrpcbUyloBiv76W3E8YJVMEyHVNyQKWc4P987oy vm5WzwagjS8/TQvwjdmJkiukVS/ZJSXcUUyfIjf9MSMbH+2ufL5y6R6c4/Lq4qa5lTCNF9PicOl VCU4ryE6svbyGljIavhmF9jK/dEiizGOmyzmdRmLarQAWKlBgaePfo6qVB8R8OtPN3H7/b0m1b9 yfW5mE84vo0fsC5pjK+sJMxG78LjP3h7p83dQXXyUSbnn/7pTGeLzFHw2CWOZnecm/Ia0C0R7cD K2eirUsQayFQD+nQ= X-Received: by 2002:a6b:601a:0:b0:85e:d0ca:b635 with SMTP id ca18e2360f4ac-864a3bceb99mr487124339f.2.1746133641157; Thu, 01 May 2025 14:07:21 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 8926c6da1cb9f-4f88a8d0fecsm50261173.12.2025.05.01.14.07.17 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 01 May 2025 14:07:20 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Cl=C3=A9ment_Mathieu--Drif?= , Zhao Liu , Hanna Reitz , Igor Mammedov , Marcel Apfelbaum , =?utf-8?q?Philippe_Mathieu-D?= =?utf-8?q?aud=C3=A9?= , Paolo Bonzini , Eduardo Habkost , qemu-block@nongnu.org, Jason Wang , Richard Henderson , Yanan Wang , Ani Sinha , "Michael S. Tsirkin" , Thomas Huth , Gerd Hoffmann , Kevin Wolf , Yi Liu Subject: [PATCH 16/18] hw/net/virtio-net: Remove VirtIONet::mtu_bypass_backend field Date: Thu, 1 May 2025 23:04:54 +0200 Message-ID: <20250501210456.89071-17-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250501210456.89071-1-philmd@linaro.org> References: <20250501210456.89071-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::d34; envelope-from=philmd@linaro.org; helo=mail-io1-xd34.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 The VirtIONet::mtu_bypass_backend boolean was only set in the hw_compat_2_9[] array, via the 'x-mtu-bypass-backend=off' property. We removed all machines using that array, lets remove that property and all the code around it. Signed-off-by: Philippe Mathieu-Daudé --- include/hw/virtio/virtio-net.h | 1 - hw/net/virtio-net.c | 8 ++------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/include/hw/virtio/virtio-net.h b/include/hw/virtio/virtio-net.h index b9ea9e824e3..353e872f677 100644 --- a/include/hw/virtio/virtio-net.h +++ b/include/hw/virtio/virtio-net.h @@ -214,7 +214,6 @@ struct VirtIONet { uint64_t saved_guest_offloads; AnnounceTimer announce_timer; bool needs_vnet_hdr_swap; - bool mtu_bypass_backend; /* primary failover device is hidden*/ bool failover_primary_hidden; bool failover; diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c index 2de037c2736..a8a43ffa242 100644 --- a/hw/net/virtio-net.c +++ b/hw/net/virtio-net.c @@ -801,8 +801,7 @@ static uint64_t virtio_net_get_features(VirtIODevice *vdev, uint64_t features, features = vhost_net_get_features(get_vhost_net(nc->peer), features); vdev->backend_features = features; - if (n->mtu_bypass_backend && - (n->host_features & 1ULL << VIRTIO_NET_F_MTU)) { + if (n->host_features & (1ULL << VIRTIO_NET_F_MTU)) { features |= (1ULL << VIRTIO_NET_F_MTU); } @@ -953,8 +952,7 @@ static void virtio_net_set_features(VirtIODevice *vdev, uint64_t features) Error *err = NULL; int i; - if (n->mtu_bypass_backend && - !virtio_has_feature(vdev->backend_features, VIRTIO_NET_F_MTU)) { + if (!virtio_has_feature(vdev->backend_features, VIRTIO_NET_F_MTU)) { features &= ~(1ULL << VIRTIO_NET_F_MTU); } @@ -4121,8 +4119,6 @@ static const Property virtio_net_properties[] = { DEFINE_PROP_UINT16("tx_queue_size", VirtIONet, net_conf.tx_queue_size, VIRTIO_NET_TX_QUEUE_DEFAULT_SIZE), DEFINE_PROP_UINT16("host_mtu", VirtIONet, net_conf.mtu, 0), - DEFINE_PROP_BOOL("x-mtu-bypass-backend", VirtIONet, mtu_bypass_backend, - true), DEFINE_PROP_INT32("speed", VirtIONet, net_conf.speed, SPEED_UNKNOWN), DEFINE_PROP_STRING("duplex", VirtIONet, net_conf.duplex_str), DEFINE_PROP_BOOL("failover", VirtIONet, failover, false), From patchwork Thu May 1 21:04:55 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: 886378 Delivered-To: patch@linaro.org Received: by 2002:a5d:430f:0:b0:38f:210b:807b with SMTP id h15csp514891wrq; Thu, 1 May 2025 14:08:57 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXLZYkw1iGF7X6ZlgrJ6CSO9qv5WGl/ODAZ4U6iKflDCk9H9zYfGIiUlcOUkTFZrwL5LWUGwA==@linaro.org X-Google-Smtp-Source: AGHT+IEJDWDYtijN5lWdsV4wZJ7YKNokO1aTBSqragQS77jwU2bRb+uk5Id4KVGKcn5L/i6exXD1 X-Received: by 2002:a05:6214:262e:b0:6e6:6aa5:2326 with SMTP id 6a1803df08f44-6f51538a880mr10723276d6.24.1746133737510; Thu, 01 May 2025 14:08:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1746133737; cv=none; d=google.com; s=arc-20240605; b=DSyNBaL4oZcfdFV5QQfZghWSxskAzTxBYCArFXl4hiivA6XMY2IAzupxdEN1h6tTxO ylkHVyiPykesswvOVxX9pS6b4QC0oKTS52JjpK/z+z51nCItR6yCl/cPZng0z2Vw5Bru p5xks9m7vFtyc+HuS/2mQyndI1o7T8OT41hzDfyTylR5b2/R4shgzjuutgmd2ZpzBGn2 2jnh75J87YiITdDbr/o2IJY8/rN9bfW78EepeF9BEkVZgFSRVyXiwD8I8ejSdMfI3sex t130PoT70ITr8Td4JKShwF6kX3czNCLkhYZEO2aTDEgS7PsUwQ7fFjHDnNQh5GaZkrVp VYfg== 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=KzLE2lKYGYuJ3IoUvDO5W4ZXh+AwpN8VPQtHB7fCw5w=; fh=uloqeIiLIhsqAWHY8zIEmzfMIcw7bGWZuINspytDykk=; b=TPhzjK8h6JE3tIPfbHuFA0ZANuK0E6pA2Ad/sZlXVJEHRHH8RAkKwdfUQx31Jp1hxJ mshUz8Itq8rCQV0lEhTFLYc1p48EoCTtZ0xF7QaELgDDuMV7QzidsskY72ioTrwEQo0L jMFb6Pi9VnS9WaZk5cQ/I9UU1A3JwESBBWGlnokHsJcuJUN3IxVj+pgo0E8CYRH4gmdW xv0UebKgkGJiRSZEo0p6Rhuu24pk2sje0/qF11/K9/aEl8JklVxNVB5UroReiXOgzSwR IOJPRSCKH4FK3lra+cQV+WOQlEfKS4MP1FKSBLDDh4zTht/AH8ubfWiCxzTVKLF//H1z 6x7g==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=LjPtNiwU; 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-6f50f3bf4bbsi15276626d6.125.2025.05.01.14.08.57 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 01 May 2025 14:08: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=LjPtNiwU; 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 1uAb8k-0005dI-6f; Thu, 01 May 2025 17:08: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 1uAb83-00041f-9l for qemu-devel@nongnu.org; Thu, 01 May 2025 17:07:35 -0400 Received: from mail-io1-xd2d.google.com ([2607:f8b0:4864:20::d2d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uAb80-0006rO-Fg for qemu-devel@nongnu.org; Thu, 01 May 2025 17:07:34 -0400 Received: by mail-io1-xd2d.google.com with SMTP id ca18e2360f4ac-85b3f92c8f8so164499739f.1 for ; Thu, 01 May 2025 14:07:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1746133650; x=1746738450; 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=KzLE2lKYGYuJ3IoUvDO5W4ZXh+AwpN8VPQtHB7fCw5w=; b=LjPtNiwUTXlEwqq5gFaPJ+bGimccjIWzgjGAQcbZ5O1kItHlcGp161yX/ic4BJlxDJ 9s7TuGUzNq1kSsGDJHMuoyF4ay4wsDTqOvmggxouVQG+Ytelz9ZFZFY/Og+4YjIwPt6S QCK+geQiWn/IeN2OGVLfi+WbYNJ1FiSFmMQn/+FCj5+GRyi0tqjJ9Hyt6zgiDmXoK8Z9 jCrt6U7K0duJslxLo7HYhs/uOADkOLsrmQmRU5sYiwR9w7D9cc9LdPtCEYqVgE0dM5TB m/EcPigztFqH16CWLCL6jm/vKAF61FrM4usXfYm9Tyfu/KnmRRT90zR6C1+zQhI3SwZl nATA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746133650; x=1746738450; 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=KzLE2lKYGYuJ3IoUvDO5W4ZXh+AwpN8VPQtHB7fCw5w=; b=P6ka7alY4YWfSAvP9XXhfUskYHYaRt6SywHlu1mqs2FnkdjGAfpztADlqUMmJ6kBSF A97CPKKFwqWgoG2iZVN+IIIBmHy0MyuVLWMwoioWVhBf6GyACMiawzKqFNydpiOjjcJh 0cqxx2escVoqoKCd/r1Lv7aBW3QXpkzNMVMgjmAZomF8M2kQT5SmU8dFnw53nN40uIgp u88YgNNeH46M1eRLYwXgHmu1zJwR6Su+DOK83CC2r+2EIGtBA+D4yl9FZEdkjwuV1Kt7 gYH+XU2PiG23cJZNQef/AKj+6+l5RZifPG0j28Hl78dQwkLvd7pww157j1utML/23bov tbtg== X-Gm-Message-State: AOJu0YxA2MeU/6Tskjaztge0jDHrqo8JqMk1sANPNsulpvPwhac544Ut EsxRcFmWIzm7av2vUGzU5AYzEIC4+3Z4JU3z9oGjaF0OAHVpbxWC+2Ul9ZUHKu36h9ldUlm6fe2 E X-Gm-Gg: ASbGnctBN3j8aZ4yxmFJoSboyDLVEPKphfOz7+xUuunrHQI4ykazsYMaI3eRFdavzVE wVpWW6hs7xDt6eBSablz0IolVF4InCMS9lgLfR4uAj0s4UH5FJVr+N4uZaIU7+H8CuqQNw4qsr9 jzZtqRxlCnVM1dOeo3VI/rNkYqgPupGwYP1ADEq0MgUeWJCAAj8dr+UJOz4QJZYuS6CDk6uVlQO rk/PXPBUw+e2gHx8Cn79BAYcxUbuDzv+OevzGQOPBdkktOa+ehKecr7OLNrhOqGbFnWmSgxIrxD te4btijoCV2pHnAmLxNGTo7/Meadruuh4ouqN5oPe4kERVd1I769dvEi0A1EvXzMOQxXxKfrb+a 5XWeEfQ103+8qfjk= X-Received: by 2002:a05:6e02:87:b0:3d9:5d50:e3b1 with SMTP id e9e14a558f8ab-3d97c295980mr6542775ab.18.1746133650032; Thu, 01 May 2025 14:07: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 8926c6da1cb9f-4f88a915f23sm49076173.39.2025.05.01.14.07.26 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 01 May 2025 14:07:29 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Cl=C3=A9ment_Mathieu--Drif?= , Zhao Liu , Hanna Reitz , Igor Mammedov , Marcel Apfelbaum , =?utf-8?q?Philippe_Mathieu-D?= =?utf-8?q?aud=C3=A9?= , Paolo Bonzini , Eduardo Habkost , qemu-block@nongnu.org, Jason Wang , Richard Henderson , Yanan Wang , Ani Sinha , "Michael S. Tsirkin" , Thomas Huth , Gerd Hoffmann , Kevin Wolf , Yi Liu Subject: [PATCH 17/18] hw/pci-bridge/gen_pcie_rp: Remove GenPCIERootPort::migrate_msix field Date: Thu, 1 May 2025 23:04:55 +0200 Message-ID: <20250501210456.89071-18-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250501210456.89071-1-philmd@linaro.org> References: <20250501210456.89071-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::d2d; envelope-from=philmd@linaro.org; helo=mail-io1-xd2d.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 The GenPCIERootPort::migrate_msix boolean was only set in the hw_compat_2_9[] array, via the 'x-migrate-msix=false' property. We removed all machines using that array, lets remove that property and all the code around it. Signed-off-by: Philippe Mathieu-Daudé --- hw/pci-bridge/gen_pcie_root_port.c | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/hw/pci-bridge/gen_pcie_root_port.c b/hw/pci-bridge/gen_pcie_root_port.c index d9078e783bf..831d21225e9 100644 --- a/hw/pci-bridge/gen_pcie_root_port.c +++ b/hw/pci-bridge/gen_pcie_root_port.c @@ -35,8 +35,6 @@ struct GenPCIERootPort { PCIESlot parent_obj; /*< public >*/ - bool migrate_msix; - /* additional resources to reserve */ PCIResReserve res_reserve; }; @@ -66,13 +64,6 @@ static void gen_rp_interrupts_uninit(PCIDevice *d) msix_uninit_exclusive_bar(d); } -static bool gen_rp_test_migrate_msix(void *opaque, int version_id) -{ - GenPCIERootPort *rp = opaque; - - return rp->migrate_msix; -} - static void gen_rp_realize(DeviceState *dev, Error **errp) { PCIDevice *d = PCI_DEVICE(dev); @@ -121,16 +112,13 @@ static const VMStateDescription vmstate_rp_dev = { VMSTATE_PCI_DEVICE(parent_obj.parent_obj.parent_obj, PCIESlot), VMSTATE_STRUCT(parent_obj.parent_obj.parent_obj.exp.aer_log, PCIESlot, 0, vmstate_pcie_aer_log, PCIEAERLog), - VMSTATE_MSIX_TEST(parent_obj.parent_obj.parent_obj.parent_obj, - GenPCIERootPort, - gen_rp_test_migrate_msix), + VMSTATE_MSIX(parent_obj.parent_obj.parent_obj.parent_obj, + GenPCIERootPort), VMSTATE_END_OF_LIST() } }; static const Property gen_rp_props[] = { - DEFINE_PROP_BOOL("x-migrate-msix", GenPCIERootPort, - migrate_msix, true), DEFINE_PROP_UINT32("bus-reserve", GenPCIERootPort, res_reserve.bus, -1), DEFINE_PROP_SIZE("io-reserve", GenPCIERootPort, From patchwork Thu May 1 21:04:56 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: 886383 Delivered-To: patch@linaro.org Received: by 2002:a5d:430f:0:b0:38f:210b:807b with SMTP id h15csp515620wrq; Thu, 1 May 2025 14:11:00 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWZAO8HZJsr1MhvnmgLp8jmYWK1+dVp1Va4baLntcF8sxHu3e6pYSNa/GUJrkGmVU//IjT6Lg==@linaro.org X-Google-Smtp-Source: AGHT+IEmd2knclYXefQZpALPggr5m2aXORmhx6ZrSD61gi1jhkWABvjdwVmz1El1eHI7xmlQ5NmI X-Received: by 2002:a05:622a:4005:b0:476:bb8e:a90e with SMTP id d75a77b69052e-48c3173799fmr9080921cf.20.1746133860580; Thu, 01 May 2025 14:11:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1746133860; cv=none; d=google.com; s=arc-20240605; b=R9KbxgkW4bOFnoKZaAMhowTaBHrHk28w4GPJ0bMCAFZXXXgfcQT1JqrqzdRCTka7TX RTT+f4hov5QH1Pzq6gNB3Hjsz2vRyfiq+aEE/Uaz1LlHlTRb27kgLe/+e7wgQbTg5+Jq Yfwi1aeTJav4Mg8mAYmyYvVz+1Q/eroQ5uoI8wwZNTyrYMO/vY1dawl4FzlUhNfqzH5k JB4N1IDqdvcPHi50yBQZa0bxrFH/MmuK/z9tSt/0MpQaiGhp+z3jTai9IQ93KmHqsSfk urb81E9d6oiP9MuqhOXtfpCz6XjR2LkcpipYih2KkhDIQmQOk4UVcD3IWyWtWaw/pAj8 1fyA== 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=Vdzft+xCucigY9en84sWDKvV9F8XabM3RidQg1HEXDs=; fh=uloqeIiLIhsqAWHY8zIEmzfMIcw7bGWZuINspytDykk=; b=j60VJoIWuRRg4w0bG+iq9fEnitMwgP1XlkJNHN3DzuCZcYDx4+TZs8tHMxh7cgzY4R MqG94eRI89pkNXU9nmiL6CQxeSkPR342RwWOPb7GkGSno/kqhUnueKmCa274+ICn9iIe srnZZ1x90X5+KIvhr1KiQTjA0iz2Bsi0wcQ+W3XhD5Y6Nkd40A4Gow86XeeH6vW2fcic XSknH9URmEuI+dl5wmQkcoFuop7CzeaUQkvI4P/Vn6aKs7oMJ1/1EqC4cQOaYWJN4Mf/ 7NQKJo+5hzKtJradrtytUiEHiJq1VOlfnaFBez6F3d6JtQUe6lEGncFlOHDhW1i7dIt+ Mw3Q==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=IgqS5vbT; 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-48b98246ba5si13946621cf.329.2025.05.01.14.11.00 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 01 May 2025 14:11: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=IgqS5vbT; 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 1uAbAj-0007PB-Ap; Thu, 01 May 2025 17:10: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 1uAb89-0004I5-QW for qemu-devel@nongnu.org; Thu, 01 May 2025 17:07:47 -0400 Received: from mail-il1-x12e.google.com ([2607:f8b0:4864:20::12e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uAb88-0006sc-35 for qemu-devel@nongnu.org; Thu, 01 May 2025 17:07:41 -0400 Received: by mail-il1-x12e.google.com with SMTP id e9e14a558f8ab-3d93deba52fso4621585ab.0 for ; Thu, 01 May 2025 14:07:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1746133659; x=1746738459; 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=Vdzft+xCucigY9en84sWDKvV9F8XabM3RidQg1HEXDs=; b=IgqS5vbT09UI6H6Lf6GSYXrxHx+96pcdd5SeJBGp9+77qxK2U+fKmdCniViQ11h/mr E3Mb3wD5AzjGx11NpwVGDpmvdqeSpd2SPcI06sq2Sw5T6MnJTARbKTuYjPLdi5d6Gtas EkHBdKdv0aCVOIZl6XuMFHpk0J8nIyHdCFEZagm41yCBBPd6E76cUAmciSTwELhZDzAs Jpm20kt6dUUQRjt/r+WbgzVQZj2obSS5L1RAJOAsJPgkUZu0nuI37gxw+VtgsGuReww7 Fvz9UV0FB/HMr3oJ0CnySA5Rsp80DtCHCL/KnFxrxDafgCw3a6AM/i3KCRa/X0vsIQIM PZkA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746133659; x=1746738459; 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=Vdzft+xCucigY9en84sWDKvV9F8XabM3RidQg1HEXDs=; b=LB4YzLH9uKa4VTBu0CVTd3MtcuIMcmWU5yjjgp3+sa+4h7AgqEbv0Asf/BBGvxw6OC qV9rKDyoS+y43PeAWy/M+Jz4c0mPMzadkBffcU8U4Lr9lsa3XZ4wNTkPY0oAAQVTEUWG FVhQOlf7jS001gEgxNtwQ3M1zniXuIvM5M8SbajtMogDJGz6Dwul/zC1PW5MAYb5MLCl 6zaMrf7EBFGL/F/Q+3EZHsVxoL3MKvl9y/62dZ10Rng5E12KCBMcRWP5ALaQ21jpFK3d zwcEl55yXZVuRdauEujif2dfRPOf8Uuaon/Ge/kN3MQsHhG2hPP073N+0Wqk70ShUSRe w3JQ== X-Gm-Message-State: AOJu0YwwC3VNnPjJVd3Io/PdnDW3Oh58d4r4NyCjfEQ9vKUdULneEo7J DCW19YmKlA17+rivOBSR/lLhbaAWxfpvqHfIXNgYSXyNrmatWVm5ahyJrHp6NCcg5ya+GXUMyu5 5 X-Gm-Gg: ASbGncsbbtzuVa/RpjtmikCYzZNq5LHMZChAG30kCZrFVJcCp6Q8wS50lQOxluCkmxL d2jLS5u7lylWzhLxpS6Jdo46Q27PBgsDlLpeD5b/aaXO+6/r97KeugBpfVQbjYtYSWfZwnsHctN 6s8bdSD8TAJsUZ9Ywq5hoXiLuusA2vq7Nz9kPDCRbzgGKsy5/wGALHuaOIacezbc+IJxp0aNm0Q JMjX5Ar9iNKwD2lmOf9UJ9hMf5bGKskp1C6f44D464ALGczhy8cA98jZDlD3A3hLvfXFbHZ5U9x ox1kvVP+sRV7WCxAh6P+LVzQUQvYxhBu/TDP0q6GpDSq3cq9RK51op7u2OK2ZtApBd/ghdNbLfS /PFidrzjk/WUZUltnA3wIClpVjw== X-Received: by 2002:a92:c24b:0:b0:3d4:337f:121c with SMTP id e9e14a558f8ab-3d97c182360mr6369495ab.10.1746133658742; Thu, 01 May 2025 14:07: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 8926c6da1cb9f-4f88a9140e2sm49190173.37.2025.05.01.14.07.35 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 01 May 2025 14:07:38 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Cl=C3=A9ment_Mathieu--Drif?= , Zhao Liu , Hanna Reitz , Igor Mammedov , Marcel Apfelbaum , =?utf-8?q?Philippe_Mathieu-D?= =?utf-8?q?aud=C3=A9?= , Paolo Bonzini , Eduardo Habkost , qemu-block@nongnu.org, Jason Wang , Richard Henderson , Yanan Wang , Ani Sinha , "Michael S. Tsirkin" , Thomas Huth , Gerd Hoffmann , Kevin Wolf , Yi Liu Subject: [PATCH 18/18] hw/i386/x86-iommu: Remove X86IOMMUState::pt_supported field Date: Thu, 1 May 2025 23:04:56 +0200 Message-ID: <20250501210456.89071-19-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250501210456.89071-1-philmd@linaro.org> References: <20250501210456.89071-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::12e; envelope-from=philmd@linaro.org; helo=mail-il1-x12e.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, 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 The X86IOMMUState::pt_supported boolean was only set in the hw_compat_2_9[] array, via the 'pt=off' property. We removed all machines using that array, lets remove that property and all the code around it, always setting the VTD_ECAP_PT capability. Signed-off-by: Philippe Mathieu-Daudé --- include/hw/i386/x86-iommu.h | 1 - hw/i386/amd_iommu.c | 12 ++---------- hw/i386/intel_iommu.c | 13 ++----------- hw/i386/x86-iommu.c | 1 - 4 files changed, 4 insertions(+), 23 deletions(-) diff --git a/include/hw/i386/x86-iommu.h b/include/hw/i386/x86-iommu.h index bfd21649d08..d6e52b1eb6b 100644 --- a/include/hw/i386/x86-iommu.h +++ b/include/hw/i386/x86-iommu.h @@ -63,7 +63,6 @@ struct X86IOMMUState { SysBusDevice busdev; OnOffAuto intr_supported; /* Whether vIOMMU supports IR */ bool dt_supported; /* Whether vIOMMU supports DT */ - bool pt_supported; /* Whether vIOMMU supports pass-through */ QLIST_HEAD(, IEC_Notifier) iec_notifiers; /* IEC notify list */ }; diff --git a/hw/i386/amd_iommu.c b/hw/i386/amd_iommu.c index 2cf7e24a21d..516e231bf13 100644 --- a/hw/i386/amd_iommu.c +++ b/hw/i386/amd_iommu.c @@ -1426,7 +1426,6 @@ static AddressSpace *amdvi_host_dma_iommu(PCIBus *bus, void *opaque, int devfn) AMDVIState *s = opaque; AMDVIAddressSpace **iommu_as, *amdvi_dev_as; int bus_num = pci_bus_num(bus); - X86IOMMUState *x86_iommu = X86_IOMMU_DEVICE(s); iommu_as = s->address_spaces[bus_num]; @@ -1486,15 +1485,8 @@ static AddressSpace *amdvi_host_dma_iommu(PCIBus *bus, void *opaque, int devfn) AMDVI_INT_ADDR_FIRST, &amdvi_dev_as->iommu_ir, 1); - if (!x86_iommu->pt_supported) { - memory_region_set_enabled(&amdvi_dev_as->iommu_nodma, false); - memory_region_set_enabled(MEMORY_REGION(&amdvi_dev_as->iommu), - true); - } else { - memory_region_set_enabled(MEMORY_REGION(&amdvi_dev_as->iommu), - false); - memory_region_set_enabled(&amdvi_dev_as->iommu_nodma, true); - } + memory_region_set_enabled(&amdvi_dev_as->iommu_nodma, false); + memory_region_set_enabled(MEMORY_REGION(&amdvi_dev_as->iommu), true); } return &iommu_as[devfn]->as; } diff --git a/hw/i386/intel_iommu.c b/hw/i386/intel_iommu.c index c980cecb4ee..cc08dc41441 100644 --- a/hw/i386/intel_iommu.c +++ b/hw/i386/intel_iommu.c @@ -1066,6 +1066,7 @@ static inline bool vtd_ce_type_check(X86IOMMUState *x86_iommu, { switch (vtd_ce_get_type(ce)) { case VTD_CONTEXT_TT_MULTI_LEVEL: + case VTD_CONTEXT_TT_PASS_THROUGH: /* Always supported */ break; case VTD_CONTEXT_TT_DEV_IOTLB: @@ -1074,12 +1075,6 @@ static inline bool vtd_ce_type_check(X86IOMMUState *x86_iommu, return false; } break; - case VTD_CONTEXT_TT_PASS_THROUGH: - if (!x86_iommu->pt_supported) { - error_report_once("%s: PT specified but not supported", __func__); - return false; - } - break; default: /* Unknown type */ error_report_once("%s: unknown ce type: %"PRIu32, __func__, @@ -4520,7 +4515,7 @@ static void vtd_cap_init(IntelIOMMUState *s) { X86IOMMUState *x86_iommu = X86_IOMMU_DEVICE(s); - s->cap = VTD_CAP_FRO | VTD_CAP_NFR | VTD_CAP_ND | + s->cap = VTD_CAP_FRO | VTD_CAP_NFR | VTD_CAP_ND | VTD_ECAP_PT | VTD_CAP_MAMV | VTD_CAP_PSI | VTD_CAP_SLLPS | VTD_CAP_MGAW(s->aw_bits); if (s->dma_drain) { @@ -4548,10 +4543,6 @@ static void vtd_cap_init(IntelIOMMUState *s) s->ecap |= VTD_ECAP_DT; } - if (x86_iommu->pt_supported) { - s->ecap |= VTD_ECAP_PT; - } - if (s->caching_mode) { s->cap |= VTD_CAP_CM; } diff --git a/hw/i386/x86-iommu.c b/hw/i386/x86-iommu.c index d34a6849f4a..ca7cd953e98 100644 --- a/hw/i386/x86-iommu.c +++ b/hw/i386/x86-iommu.c @@ -129,7 +129,6 @@ static const Property x86_iommu_properties[] = { DEFINE_PROP_ON_OFF_AUTO("intremap", X86IOMMUState, intr_supported, ON_OFF_AUTO_AUTO), DEFINE_PROP_BOOL("device-iotlb", X86IOMMUState, dt_supported, false), - DEFINE_PROP_BOOL("pt", X86IOMMUState, pt_supported, true), }; static void x86_iommu_class_init(ObjectClass *klass, const void *data)