From patchwork Thu May 1 18:36:18 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: 886354 Delivered-To: patch@linaro.org Received: by 2002:a5d:430f:0:b0:38f:210b:807b with SMTP id h15csp463494wrq; Thu, 1 May 2025 11:38:29 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUp/dHT5FY1PhAIAxd5oO8GOUqoIuvBuxWRno4T2Nn6isbTddEUKaKVMoLgNgO7LplxwtPhOw==@linaro.org X-Google-Smtp-Source: AGHT+IGys08w2kdxhyVzauZ2iA8MRVcgTos0qOm0zXT/bXKnZe7Dr+GPv1k7Kth1inwdjU8qXnbC X-Received: by 2002:a05:620a:3728:b0:7c0:c469:d651 with SMTP id af79cd13be357-7cad5bb7e7dmr17170885a.57.1746124709096; Thu, 01 May 2025 11:38:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1746124709; cv=none; d=google.com; s=arc-20240605; b=VS851FxFv5AKlyQMYPXQH6F7pW3l5wpj6gPbyUmu/3iMHSWUYXRjSxX9gufrRVcsyD 3to5xqKK+4IQYgp0Q0PjnQBGiKRoW1y7axvK/u4flr619+dO5O14cqldRcv8J5MELoTL zUtNu4jZEzacns/Xm/mVStmW9FXXIG3rFrfzufur1oz+dknXVg2v43n44P/LWMae4ulU mu0C+QDf82n5MwHFYAZeoOqkXEpZ7bBsRF2LKIQsMxZAubVq29C+FYeXOdUc0FfWf74H zITa+24E/75BvOc3cLnl8ShrgIyUi1e94ioyJQgvmUJCfy1lvzf7+b9Gu/W+ppFHr8IB jvPA== 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=1oEZ8pcFL0QpEheuXUBBXfN5IHyToSd/0wmZn4AbYIQ=; fh=hoe06aprcDnk5P3d0vwgQt6uC5al0E2l9mfTIGTxZjA=; b=iyEAphM8xD8/2FY7SNRjd3zk/9Q+I69L+86Y9lbMETEVKe/5kYB2MLZQq2tdWK2oTB 9dk5Qyo7sDn0VD0YR9LUnbUTykMx9zDUpRW9h509OYKs8+xfDNsfzbQxkh1Z67qR1nWe Plgk1NC9K5jPfxoWX0eTftxxXw5CvjghaceD+zcUJkxHPcegbDFuoWLwW7DgNPSFVuUU 73q7scWdswx2n/RilndkZmQkXdx1HG6i3OKVKptT0hxUZxtPZgsB5Um25hqUH2JFmFfi P7FRbyKB8wbArgMd3AD3LCcI2at4h85Mcr6TEy/GhXsKH27cPZC+6Zn40FjN8GqZRwlx oAEw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=fGaBVytx; 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-7cad2421bbasi124188185a.283.2025.05.01.11.38.28 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 01 May 2025 11:38: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=fGaBVytx; 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 1uAYnb-0001VF-VB; Thu, 01 May 2025 14:38:20 -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 1uAYmr-0008BR-Tz for qemu-devel@nongnu.org; Thu, 01 May 2025 14:37:37 -0400 Received: from mail-io1-xd2a.google.com ([2607:f8b0:4864:20::d2a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uAYmo-000874-FJ for qemu-devel@nongnu.org; Thu, 01 May 2025 14:37:31 -0400 Received: by mail-io1-xd2a.google.com with SMTP id ca18e2360f4ac-86135ad7b4cso45849139f.1 for ; Thu, 01 May 2025 11:37:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1746124649; x=1746729449; 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=1oEZ8pcFL0QpEheuXUBBXfN5IHyToSd/0wmZn4AbYIQ=; b=fGaBVytxzxAuWA9JvLK6PXvZVoQdxLdKxrgwDbWtso+ixf8RN85HORsPEdJPZU36ic FexaJt6Ij82KkHHis0cCnQVplna9XmcgJ4D9x/X/wH6+HdYA7NCR6GJdk44o2CUGMtdd Rbe2QTcr0qb0gTCJqFYapP7Ux2eVB92NVyh3LmmGXpmInRboJPpbkjSzamXrmcMTgI+s SVMd4M/sCwLKW6bJATVEhOh48M+1Eaq1rlhOkm98Bx4cdKdEi2GV8N4R8uuhWM3pgs0m DXOZZaA5y68zxPxfvnBFx06le9tUWE9NFEov69f60E5cLBk0TfZBraURGZWu+fgwOjvH bssw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746124649; x=1746729449; 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=1oEZ8pcFL0QpEheuXUBBXfN5IHyToSd/0wmZn4AbYIQ=; b=kjnspykLXqipZCLVzciGMVEN2i5dnCvQDm1WbF8/lyoosXnBZx1mUnwmT2eUzZOc65 Sr4twLYUVjooVHLDJbXVILI9uYRkGKHhQCXcDl/ir0EaPR7UjbTSI2ROaFK7VzY0Zaro TfcCGoV8PVMdyNAblUAqnmX0zc5Djl9k9TRtqGr5D+eDDNzmDM95S01cFU1yxWkL7KGc L1FP7IRZsGO8LWtbkX5ImH4Pg1yQKCG0s75mZ9ep89AZVITieZFgvi+W4xOIupMBOF/b NSZIKBu6/Sej0RPAKjkP6kEZ/rD4B/7X+3nX+REK6j1d8MdAwhXydnsOgxKpw5G9hXTB U12g== X-Gm-Message-State: AOJu0Yzmaa3asTYSbuBzqJergrRIFczvL+pm/8Wg1yQtwUxLUjcKErQ+ C9Fr+dAvhGV9OxtN0ljqkx2o1QEwIW27xWcJcEhsPek7xepztTPOrMBPdXr6ofw6jPRW+JPVHVn h X-Gm-Gg: ASbGncvehENs1Jnt4c/f8AVZE6EZwdKdSyuZImpXO82hGSjfFSqfDYzqEUGo0LJE3ag aJuOwJ4xdHCw/KnDaGdoPC5RIrvuwYrsgnQmPE4OTz4w2nM9gt4ghkr11TYLicXtz24qp92pWGp dgUbdxstgGiDnBQ/XMiYax19H4mex/KJJqmMax4yi5pvnMaUIoYZojfnsOBeAWrCylPMyygt7Kn 4Z2xNPkK+/IfNkq+XOZtD1LY0zrqx8HfkrjYkTfjbC/cZP0NmSEB/UMBAWI4SsKMTNI350ucBYq NRb5qcEKAf1KHEwgUBzuMSTxAmQXDVkBgh+HzM0Mrl4FbJou26rTXtZ9+Or79EY40A/vohTNZSF nTmrgJT6eWv2+IUsGTRAJiOL0ZJMwmh8= X-Received: by 2002:a05:6602:3890:b0:861:7d39:d4d3 with SMTP id ca18e2360f4ac-8669f967ce1mr37488939f.3.1746124648901; Thu, 01 May 2025 11:37: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 ca18e2360f4ac-864aa32f7cbsm21510239f.28.2025.05.01.11.37.25 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 01 May 2025 11:37:28 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Igor Mammedov , Gerd Hoffmann , =?utf-8?q?Cl=C3=A9ment_Mathieu--Drif?= , Yi Liu , Paolo Bonzini , Amit Shah , Zhao Liu , "Michael S. Tsirkin" , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Richard Henderson , Sergio Lopez , Laurent Vivier , Jason Wang , Eduardo Habkost , Yanan Wang , Marcel Apfelbaum , Ani Sinha , Thomas Huth Subject: [PATCH v2 06/16] hw/core/machine: Remove hw_compat_2_6[] array Date: Thu, 1 May 2025 20:36:18 +0200 Message-ID: <20250501183628.87479-7-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250501183628.87479-1-philmd@linaro.org> References: <20250501183628.87479-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::d2a; envelope-from=philmd@linaro.org; helo=mail-io1-xd2a.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_6[] array was only used by the pc-q35-2.6 and pc-i440fx-2.6 machines, which got removed. Remove it. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Mark Cave-Ayland --- include/hw/boards.h | 3 --- hw/core/machine.c | 8 -------- 2 files changed, 11 deletions(-) diff --git a/include/hw/boards.h b/include/hw/boards.h index 5f1a0fb7e28..a881db8e7d6 100644 --- a/include/hw/boards.h +++ b/include/hw/boards.h @@ -841,7 +841,4 @@ extern const size_t hw_compat_2_8_len; extern GlobalProperty hw_compat_2_7[]; extern const size_t hw_compat_2_7_len; -extern GlobalProperty hw_compat_2_6[]; -extern const size_t hw_compat_2_6_len; - #endif diff --git a/hw/core/machine.c b/hw/core/machine.c index e7001bf92cd..ce98820f277 100644 --- a/hw/core/machine.c +++ b/hw/core/machine.c @@ -275,14 +275,6 @@ GlobalProperty hw_compat_2_7[] = { }; const size_t hw_compat_2_7_len = G_N_ELEMENTS(hw_compat_2_7); -GlobalProperty hw_compat_2_6[] = { - { "virtio-mmio", "format_transport_address", "off" }, - /* Optional because not all virtio-pci devices support legacy mode */ - { "virtio-pci", "disable-modern", "on", .optional = true }, - { "virtio-pci", "disable-legacy", "off", .optional = true }, -}; -const size_t hw_compat_2_6_len = G_N_ELEMENTS(hw_compat_2_6); - MachineState *current_machine; static char *machine_get_kernel(Object *obj, Error **errp)