From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 86172C3ABC0 for ; Thu, 8 May 2025 13:41:54 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uD1VS-0001oZ-8p; Thu, 08 May 2025 09:41:46 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uD1VQ-0001np-PZ for qemu-devel@nongnu.org; Thu, 08 May 2025 09:41:44 -0400 Received: from mail-pl1-x62f.google.com ([2607:f8b0:4864:20::62f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uD1VM-0004cD-Fi for qemu-devel@nongnu.org; Thu, 08 May 2025 09:41:44 -0400 Received: by mail-pl1-x62f.google.com with SMTP id d9443c01a7336-22e09f57ed4so22840325ad.0 for ; Thu, 08 May 2025 06:41:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1746711698; x=1747316498; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=sqRI2bUWFL/LTWDPgHwj3plQ/Zek5ug5WOQHcPBpHVI=; b=B8ixyavlGVNn72GR+ktMu1GI2RNoKl/1jZ1zZkglyjs17bGIsRbg+NttK7ZHtd7nUK AB/IrubSQfetl1ZqZwY/SQlpucNwlQ2zqWxDpI9PIEGRbUrlifB+m5G1C9sh16dhNiNI EF0Y4D/1anaDp7kdnsyle7pAqDsnMD3y7VPDDB/+zEHpgsURfrINdArM5Krxujk6eo+b rX+lsUZ/T3zYaQ1+PUQDc41ITDlcjewADM4H6yQCjNhzYoFpKbQ6mu0hOsS9BS5rJ/b9 bw8FOGexKfSXSqbKiohMpBLHW/Oa2kjgkgsQz2oFc12LaDSOaul+P3H/Ss+Gay0TAQUv reTw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746711698; x=1747316498; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=sqRI2bUWFL/LTWDPgHwj3plQ/Zek5ug5WOQHcPBpHVI=; b=m03vD9zisNgPyDudTUkdpkt1V2z2WTgAwiP/wP6Ht02I/1rbipXa3RMXJdPO8Lnsdm k0B/aEfO0SJFu9Uggk/Mvh3RahPTbaLGIzc3X27cpWKuRGjP9w6/gN4Acy1h7g4fZZG5 UbEwLeFqTtEKT9fl9wArzSiBXEc68mNOF218EZRKGvXZOiVCHg45AIS7hzE7jysjF/Ow bS8PasSU6UTh529FHONAKcQV2q6H4eyQwXa2ejI+vSO6sBOQtJzUkAj3NGDB6I2MewNA bfgFo8aLutHnMSoj/qseBMPqtXTya1iQ2P3RVq8VT3A//vbMcsQaPxEULrz3O411ikZp Skfw== X-Gm-Message-State: AOJu0Yxrzf8OieLpw+irLz7W5vhvwAY9rivKt6VkdsX2lhxHZijYcui3 0P3GxttHGQAf9nywiEDEtN+wtUO5jtbrEF9JQUJD4gmV5GCO4F37xxTH6fMHW4g/M4zc0rLGqd7 +DZ9kKA== X-Gm-Gg: ASbGncs9uk5PM+l/VonCVOhPzxfk7bO6o3MjVg8tTZvBCs+MWTS3Bc9F9OPNT/XwnqC 8rwkurlCf3U6HLhvJ9zMNk9L7ECHHAbi4jhWO2mQEpixAqVxpzBnIv7RtsxT5R38/ga8BcrDp/f XUMfmtQcawoy1QbB75OhB/ushOosToTcvW68Vo8/QsMhDTEYF4N+6+ZB6MNDFjhhIkdX+G1ZFYz xwwS5szFJnHVgVbJUBnsnxZPYjwlfEWjBYrV8gnQyPwCSreZS91OA0tppt0GjDPl8bE1rBOkkuA 6lYgBWdyS0VPKZlMpvtoOqIuHpAzJJLPEr4wwtHAKLSCzr8CRtGT7WgrnxZ9cw2Do05FIgy16GY vxU1i+yyVoQb3Gw8= X-Google-Smtp-Source: AGHT+IFhRKm8yP4ybLtVM7FMTYL0LsALgcJNgjwXO7oc+jzCvJH9Gi2a3jIUCJN8VIl19enCQAvxwA== X-Received: by 2002:a17:902:c94f:b0:215:a303:24e9 with SMTP id d9443c01a7336-22e846a2ab2mr48657765ad.3.1746711698591; Thu, 08 May 2025 06:41:38 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-22e766dffefsm24985605ad.33.2025.05.08.06.41.24 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 08 May 2025 06:41:38 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , kvm@vger.kernel.org, Sergio Lopez , Gerd Hoffmann , Peter Maydell , Laurent Vivier , Jiaxun Yang , Yi Liu , "Michael S. Tsirkin" , Eduardo Habkost , Marcel Apfelbaum , Alistair Francis , Daniel Henrique Barboza , Marcelo Tosatti , qemu-riscv@nongnu.org, Weiwei Li , Amit Shah , Zhao Liu , Yanan Wang , Helge Deller , Palmer Dabbelt , Ani Sinha , Igor Mammedov , Fabiano Rosas , Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Liu Zhiwei , =?UTF-8?q?Cl=C3=A9ment=20Mathieu--Drif?= , qemu-arm@nongnu.org, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Huacai Chen , Jason Wang , Mark Cave-Ayland , Thomas Huth Subject: [PATCH v4 15/27] hw/core/machine: Remove hw_compat_2_6[] array Date: Thu, 8 May 2025 15:35:38 +0200 Message-ID: <20250508133550.81391-16-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250508133550.81391-1-philmd@linaro.org> References: <20250508133550.81391-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2607:f8b0:4864:20::62f; envelope-from=philmd@linaro.org; helo=mail-pl1-x62f.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org The hw_compat_2_6[] array was only used by the pc-q35-2.6 and pc-i440fx-2.6 machines, which got removed. Remove it. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Mark Cave-Ayland Reviewed-by: Thomas Huth --- include/hw/boards.h | 3 --- hw/core/machine.c | 8 -------- 2 files changed, 11 deletions(-) diff --git a/include/hw/boards.h b/include/hw/boards.h index 5f1a0fb7e28..a881db8e7d6 100644 --- a/include/hw/boards.h +++ b/include/hw/boards.h @@ -841,7 +841,4 @@ extern const size_t hw_compat_2_8_len; extern GlobalProperty hw_compat_2_7[]; extern const size_t hw_compat_2_7_len; -extern GlobalProperty hw_compat_2_6[]; -extern const size_t hw_compat_2_6_len; - #endif diff --git a/hw/core/machine.c b/hw/core/machine.c index e7001bf92cd..ce98820f277 100644 --- a/hw/core/machine.c +++ b/hw/core/machine.c @@ -275,14 +275,6 @@ GlobalProperty hw_compat_2_7[] = { }; const size_t hw_compat_2_7_len = G_N_ELEMENTS(hw_compat_2_7); -GlobalProperty hw_compat_2_6[] = { - { "virtio-mmio", "format_transport_address", "off" }, - /* Optional because not all virtio-pci devices support legacy mode */ - { "virtio-pci", "disable-modern", "on", .optional = true }, - { "virtio-pci", "disable-legacy", "off", .optional = true }, -}; -const size_t hw_compat_2_6_len = G_N_ELEMENTS(hw_compat_2_6); - MachineState *current_machine; static char *machine_get_kernel(Object *obj, Error **errp) -- 2.47.1