From a861ffef237e81521a50c17018dd444eb8425200 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Philippe=20Mathieu-Daud=C3=A9?= Date: Thu, 1 May 2025 23:31:56 +0200 Subject: [PATCH] hw/core/machine: Remove the hw_compat_3_1[] array MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit The hw_compat_3_1[] array was only used by the pc-q35-3.1 and pc-i440fx-3.1 machines, which got removed. Remove it. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Thomas Huth Message-Id: <20260307152635.83893-9-philmd@linaro.org> --- hw/core/machine.c | 17 ----------------- include/hw/core/boards.h | 3 --- 2 files changed, 20 deletions(-) diff --git a/hw/core/machine.c b/hw/core/machine.c index 162600425b0..9a3d826c3cb 100644 --- a/hw/core/machine.c +++ b/hw/core/machine.c @@ -221,23 +221,6 @@ GlobalProperty hw_compat_4_0[] = { }; const size_t hw_compat_4_0_len = G_N_ELEMENTS(hw_compat_4_0); -GlobalProperty hw_compat_3_1[] = { - { "pcie-root-port", "x-speed", "2_5" }, - { "pcie-root-port", "x-width", "1" }, - { "memory-backend-file", "x-use-canonical-path-for-ramblock-id", "true" }, - { "memory-backend-memfd", "x-use-canonical-path-for-ramblock-id", "true" }, - { "tpm-crb", "ppi", "false" }, - { "tpm-tis", "ppi", "false" }, - { "usb-kbd", "serial", "42" }, - { "usb-mouse", "serial", "42" }, - { "usb-tablet", "serial", "42" }, - { "virtio-blk-device", "discard", "false" }, - { "virtio-blk-device", "write-zeroes", "false" }, - { "virtio-balloon-device", "qemu-4-0-config-size", "false" }, - { "pcie-root-port-base", "disable-acs", "true" }, /* Added in 4.1 */ -}; -const size_t hw_compat_3_1_len = G_N_ELEMENTS(hw_compat_3_1); - MachineState *current_machine; static char *machine_get_kernel(Object *obj, Error **errp) diff --git a/include/hw/core/boards.h b/include/hw/core/boards.h index e15dbcea83b..9155e0cc9ed 100644 --- a/include/hw/core/boards.h +++ b/include/hw/core/boards.h @@ -867,7 +867,4 @@ extern const size_t hw_compat_4_1_len; extern GlobalProperty hw_compat_4_0[]; extern const size_t hw_compat_4_0_len; -extern GlobalProperty hw_compat_3_1[]; -extern const size_t hw_compat_3_1_len; - #endif -- 2.47.3