Re: [PATCH v2 08/10] hw/core/machine: Remove the hw_compat_3_1[] array

2026-03-10 Thread Zhao Liu
On Mon, Mar 09, 2026 at 03:50:10PM +0100, Philippe Mathieu-Daudé wrote:
> Date: Mon,  9 Mar 2026 15:50:10 +0100
> From: Philippe Mathieu-Daudé 
> Subject: [PATCH v2 08/10] hw/core/machine: Remove the hw_compat_3_1[] array
> X-Mailer: git-send-email 2.53.0
> 
> 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: <[email protected]>
> ---
>  include/hw/core/boards.h |  3 ---
>  hw/core/machine.c| 17 -
>  2 files changed, 20 deletions(-)

Reviewed-by: Zhao Liu 




[PATCH v2 08/10] hw/core/machine: Remove the hw_compat_3_1[] array

2026-03-09 Thread Philippe Mathieu-Daudé
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: <[email protected]>
---
 include/hw/core/boards.h |  3 ---
 hw/core/machine.c| 17 -
 2 files changed, 20 deletions(-)

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
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)
-- 
2.53.0