80 lines
2.9 KiB
Diff
80 lines
2.9 KiB
Diff
|
From f19738e4bf8b9d5fb44ef30042cdad31b92edb22 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Laurent Vivier <lvivier@redhat.com>
|
||
|
|
Date: Fri, 24 May 2019 12:13:02 +0100
|
||
|
|
Subject: [PATCH 2/4] compat: Generic hw_compat_rhel_8_0
|
||
|
|
|
||
|
|
RH-Author: Laurent Vivier <lvivier@redhat.com>
|
||
|
|
Message-id: <20190524121304.15530-3-lvivier@redhat.com>
|
||
|
|
Patchwork-id: 88201
|
||
|
|
O-Subject: [RHEL-AV qemu-kvm PATCH v4 2/4] compat: Generic hw_compat_rhel_8_0
|
||
|
|
Bugzilla: 1709726
|
||
|
|
RH-Acked-by: David Gibson <dgibson@redhat.com>
|
||
|
|
RH-Acked-by: Cornelia Huck <cohuck@redhat.com>
|
||
|
|
RH-Acked-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
|
||
|
|
|
||
|
|
Signed-off-by: Laurent Vivier <lvivier@redhat.com>
|
||
|
|
Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
|
||
|
|
---
|
||
|
|
hw/core/machine.c | 30 ++++++++++++++++++++++++++++++
|
||
|
|
include/hw/boards.h | 3 +++
|
||
|
|
2 files changed, 33 insertions(+)
|
||
|
|
|
||
|
|
diff --git a/hw/core/machine.c b/hw/core/machine.c
|
||
|
|
index e808151..c4aa354 100644
|
||
|
|
--- a/hw/core/machine.c
|
||
|
|
+++ b/hw/core/machine.c
|
||
|
|
@@ -291,6 +291,36 @@ GlobalProperty hw_compat_rhel_7_6[] = {
|
||
|
|
};
|
||
|
|
const size_t hw_compat_rhel_7_6_len = G_N_ELEMENTS(hw_compat_rhel_7_6);
|
||
|
|
|
||
|
|
+/* The same as hw_compat_3_1
|
||
|
|
+ * format of array has been changed by:
|
||
|
|
+ * 6c36bddf5340 ("machine: Use shorter format for GlobalProperty arrays")
|
||
|
|
+ */
|
||
|
|
+GlobalProperty hw_compat_rhel_8_0[] = {
|
||
|
|
+ /* hw_compat_rhel_8_0 from hw_compat_3_1 */
|
||
|
|
+ { "pcie-root-port", "x-speed", "2_5" },
|
||
|
|
+ /* hw_compat_rhel_8_0 from hw_compat_3_1 */
|
||
|
|
+ { "pcie-root-port", "x-width", "1" },
|
||
|
|
+ /* hw_compat_rhel_8_0 from hw_compat_3_1 */
|
||
|
|
+ { "memory-backend-file", "x-use-canonical-path-for-ramblock-id", "true" },
|
||
|
|
+ /* hw_compat_rhel_8_0 from hw_compat_3_1 */
|
||
|
|
+ { "memory-backend-memfd", "x-use-canonical-path-for-ramblock-id", "true" },
|
||
|
|
+ /* hw_compat_rhel_8_0 from hw_compat_3_1 */
|
||
|
|
+ { "tpm-crb", "ppi", "false" },
|
||
|
|
+ /* hw_compat_rhel_8_0 from hw_compat_3_1 */
|
||
|
|
+ { "tpm-tis", "ppi", "false" },
|
||
|
|
+ /* hw_compat_rhel_8_0 from hw_compat_3_1 */
|
||
|
|
+ { "usb-kbd", "serial", "42" },
|
||
|
|
+ /* hw_compat_rhel_8_0 from hw_compat_3_1 */
|
||
|
|
+ { "usb-mouse", "serial", "42" },
|
||
|
|
+ /* hw_compat_rhel_8_0 from hw_compat_3_1 */
|
||
|
|
+ { "usb-tablet", "serial", "42" },
|
||
|
|
+ /* hw_compat_rhel_8_0 from hw_compat_3_1 */
|
||
|
|
+ { "virtio-blk-device", "discard", "false" },
|
||
|
|
+ /* hw_compat_rhel_8_0 from hw_compat_3_1 */
|
||
|
|
+ { "virtio-blk-device", "write-zeroes", "false" },
|
||
|
|
+};
|
||
|
|
+const size_t hw_compat_rhel_8_0_len = G_N_ELEMENTS(hw_compat_rhel_8_0);
|
||
|
|
+
|
||
|
|
|
||
|
|
GlobalProperty hw_compat_3_1[] = {
|
||
|
|
{ "pcie-root-port", "x-speed", "2_5" },
|
||
|
|
diff --git a/include/hw/boards.h b/include/hw/boards.h
|
||
|
|
index b292365..f159e9e 100644
|
||
|
|
--- a/include/hw/boards.h
|
||
|
|
+++ b/include/hw/boards.h
|
||
|
|
@@ -337,6 +337,9 @@ extern const size_t hw_compat_2_2_len;
|
||
|
|
extern GlobalProperty hw_compat_2_1[];
|
||
|
|
extern const size_t hw_compat_2_1_len;
|
||
|
|
|
||
|
|
+extern GlobalProperty hw_compat_rhel_8_0[];
|
||
|
|
+extern const size_t hw_compat_rhel_8_0_len;
|
||
|
|
+
|
||
|
|
extern GlobalProperty hw_compat_rhel_7_6[];
|
||
|
|
extern const size_t hw_compat_rhel_7_6_len;
|
||
|
|
|
||
|
|
--
|
||
|
|
1.8.3.1
|
||
|
|
|