You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
692 lines
27 KiB
692 lines
27 KiB
From 18ae40658bedd6dceab0ffe0bce77ba48e6f0fae Mon Sep 17 00:00:00 2001
|
|
From: Miroslav Rezanina <mrezanin@redhat.com>
|
|
Date: Fri, 11 Jan 2019 09:54:45 +0100
|
|
Subject: Machine type related general changes
|
|
|
|
This patch is first part of original "Add RHEL machine types" patch we
|
|
split to allow easier review. It contains changes not related to any
|
|
architecture.
|
|
|
|
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
|
---
|
|
Rebase notes (9.1.0 rc0):
|
|
- Upstream removed uuid_encoced argument on smbios_set_defaults
|
|
|
|
Merged commits (9.1.0 rc0):
|
|
- 043ad5ce97 Add upstream compatibility bits (partial)
|
|
- bfbdab5824 rhel 9.4.0 machine type compat for virtio-gpu migration
|
|
---
|
|
hw/acpi/piix4.c | 2 +-
|
|
hw/arm/virt.c | 3 +-
|
|
hw/core/machine.c | 281 +++++++++++++++++++++++++++++++++++
|
|
hw/i386/fw_cfg.c | 3 +-
|
|
hw/net/rtl8139.c | 4 +-
|
|
hw/smbios/smbios.c | 46 +++++-
|
|
hw/timer/i8254_common.c | 2 +-
|
|
hw/usb/hcd-xhci-pci.c | 59 ++++++--
|
|
hw/usb/hcd-xhci-pci.h | 1 +
|
|
hw/virtio/virtio-mem.c | 3 +-
|
|
include/hw/boards.h | 43 ++++++
|
|
include/hw/firmware/smbios.h | 4 +-
|
|
include/hw/i386/pc.h | 3 +
|
|
13 files changed, 430 insertions(+), 24 deletions(-)
|
|
|
|
diff --git a/hw/acpi/piix4.c b/hw/acpi/piix4.c
|
|
index debe1adb84..e8ddcd716e 100644
|
|
--- a/hw/acpi/piix4.c
|
|
+++ b/hw/acpi/piix4.c
|
|
@@ -245,7 +245,7 @@ static bool vmstate_test_migrate_acpi_index(void *opaque, int version_id)
|
|
static const VMStateDescription vmstate_acpi = {
|
|
.name = "piix4_pm",
|
|
.version_id = 3,
|
|
- .minimum_version_id = 3,
|
|
+ .minimum_version_id = 2,
|
|
.post_load = vmstate_acpi_post_load,
|
|
.fields = (const VMStateField[]) {
|
|
VMSTATE_PCI_DEVICE(parent_obj, PIIX4PMState),
|
|
diff --git a/hw/arm/virt.c b/hw/arm/virt.c
|
|
index eea7d2d038..b2aa3f1355 100644
|
|
--- a/hw/arm/virt.c
|
|
+++ b/hw/arm/virt.c
|
|
@@ -1699,7 +1699,8 @@ static void virt_build_smbios(VirtMachineState *vms)
|
|
}
|
|
|
|
smbios_set_defaults("QEMU", product,
|
|
- vmc->smbios_old_sys_ver ? "1.0" : mc->name);
|
|
+ vmc->smbios_old_sys_ver ? "1.0" : mc->name,
|
|
+ NULL, NULL);
|
|
|
|
/* build the array of physical mem area from base_memmap */
|
|
mem_array.address = vms->memmap[VIRT_MEM].base;
|
|
diff --git a/hw/core/machine.c b/hw/core/machine.c
|
|
index 27dcda0248..f7fed78e4b 100644
|
|
--- a/hw/core/machine.c
|
|
+++ b/hw/core/machine.c
|
|
@@ -305,6 +305,287 @@ GlobalProperty hw_compat_2_1[] = {
|
|
};
|
|
const size_t hw_compat_2_1_len = G_N_ELEMENTS(hw_compat_2_1);
|
|
|
|
+/*
|
|
+ * RHEL only: machine types for previous major releases are deprecated
|
|
+ */
|
|
+const char *rhel_old_machine_deprecation =
|
|
+ "machine types for previous major releases are deprecated";
|
|
+
|
|
+GlobalProperty hw_compat_rhel_9_5[] = {
|
|
+ /* hw_compat_rhel_9_5 from hw_compat_8_2 */
|
|
+ { "migration", "zero-page-detection", "legacy"},
|
|
+ /* hw_compat_rhel_9_5 from hw_compat_8_2 */
|
|
+ { TYPE_VIRTIO_IOMMU_PCI, "granule", "4k" },
|
|
+ /* hw_compat_rhel_9_5 from hw_compat_8_2 */
|
|
+ { TYPE_VIRTIO_IOMMU_PCI, "aw-bits", "64" },
|
|
+ /* hw_compat_rhel_9_5 from hw_compat_8_2 */
|
|
+ { "virtio-gpu-device", "x-scanout-vmstate-version", "1" },
|
|
+};
|
|
+const size_t hw_compat_rhel_9_5_len = G_N_ELEMENTS(hw_compat_rhel_9_5);
|
|
+
|
|
+GlobalProperty hw_compat_rhel_9_4[] = {
|
|
+ /* hw_compat_rhel_9_4 from hw_compat_8_0 */
|
|
+ { TYPE_VIRTIO_NET, "host_uso", "off"},
|
|
+ /* hw_compat_rhel_9_4 from hw_compat_8_0 */
|
|
+ { TYPE_VIRTIO_NET, "guest_uso4", "off"},
|
|
+ /* hw_compat_rhel_9_4 from hw_compat_8_0 */
|
|
+ { TYPE_VIRTIO_NET, "guest_uso6", "off"},
|
|
+ /* hw_compat_rhel_9_4 from hw_compat_8_1 */
|
|
+ { TYPE_PCI_BRIDGE, "x-pci-express-writeable-slt-bug", "true" },
|
|
+ /* hw_compat_rhel_9_4 from hw_compat_8_1 */
|
|
+ { "ramfb", "x-migrate", "off" },
|
|
+ /* hw_compat_rhel_9_4 from hw_compat_8_1 */
|
|
+ { "vfio-pci-nohotplug", "x-ramfb-migrate", "off" },
|
|
+ /* hw_compat_rhel_9_4 from hw_compat_8_1 */
|
|
+ { "igb", "x-pcie-flr-init", "off" },
|
|
+ /* hw_compat_rhel_9_4 jira RHEL-24045 */
|
|
+ { "virtio-mem", "dynamic-memslots", "off" },
|
|
+};
|
|
+const size_t hw_compat_rhel_9_4_len = G_N_ELEMENTS(hw_compat_rhel_9_4);
|
|
+
|
|
+GlobalProperty hw_compat_rhel_9_3[] = {
|
|
+ /* hw_compat_rhel_9_3 from hw_compat_8_0 */
|
|
+ { "migration", "multifd-flush-after-each-section", "on"},
|
|
+ /* hw_compat_rhel_9_3 from hw_compat_8_0 */
|
|
+ { TYPE_PCI_DEVICE, "x-pcie-ari-nextfn-1", "on" },
|
|
+};
|
|
+const size_t hw_compat_rhel_9_3_len = G_N_ELEMENTS(hw_compat_rhel_9_3);
|
|
+
|
|
+GlobalProperty hw_compat_rhel_9_2[] = {
|
|
+ /* hw_compat_rhel_9_2 from hw_compat_7_2 */
|
|
+ { "e1000e", "migrate-timadj", "off" },
|
|
+ /* hw_compat_rhel_9_2 from hw_compat_7_2 */
|
|
+ { "virtio-mem", "x-early-migration", "false" },
|
|
+ /* hw_compat_rhel_9_2 from hw_compat_7_2 */
|
|
+ { "migration", "x-preempt-pre-7-2", "true" },
|
|
+ /* hw_compat_rhel_9_2 from hw_compat_7_2 */
|
|
+ { TYPE_PCI_DEVICE, "x-pcie-err-unc-mask", "off" },
|
|
+};
|
|
+const size_t hw_compat_rhel_9_2_len = G_N_ELEMENTS(hw_compat_rhel_9_2);
|
|
+
|
|
+/*
|
|
+ * Mostly the same as hw_compat_7_0
|
|
+ */
|
|
+GlobalProperty hw_compat_rhel_9_1[] = {
|
|
+ /* hw_compat_rhel_9_1 from hw_compat_7_0 */
|
|
+ { "arm-gicv3-common", "force-8-bit-prio", "on" },
|
|
+ /* hw_compat_rhel_9_1 from hw_compat_7_0 */
|
|
+ { "nvme-ns", "eui64-default", "on"},
|
|
+ /* hw_compat_rhel_9_1 from hw_compat_7_1 */
|
|
+ { "virtio-device", "queue_reset", "false" },
|
|
+ /* hw_compat_rhel_9_1 bz 2155749 */
|
|
+ { "virtio-rng-pci", "vectors", "0" },
|
|
+ /* hw_compat_rhel_9_1 bz 2162569 */
|
|
+ { "virtio-rng-pci-transitional", "vectors", "0" },
|
|
+ { "virtio-rng-pci-non-transitional", "vectors", "0" },
|
|
+};
|
|
+const size_t hw_compat_rhel_9_1_len = G_N_ELEMENTS(hw_compat_rhel_9_1);
|
|
+
|
|
+/*
|
|
+ * Mostly the same as hw_compat_6_2
|
|
+ */
|
|
+GlobalProperty hw_compat_rhel_9_0[] = {
|
|
+ /* hw_compat_rhel_9_0 from hw_compat_6_2 */
|
|
+ { "PIIX4_PM", "x-not-migrate-acpi-index", "on"},
|
|
+};
|
|
+const size_t hw_compat_rhel_9_0_len = G_N_ELEMENTS(hw_compat_rhel_9_0);
|
|
+
|
|
+GlobalProperty hw_compat_rhel_8_6[] = {
|
|
+ /* hw_compat_rhel_8_6 bz 2065589 */
|
|
+ /*
|
|
+ * vhost-vsock device in RHEL 8 kernels doesn't support seqpacket, so
|
|
+ * we need do disable it downstream on the latest hw_compat_rhel_8.
|
|
+ */
|
|
+ { "vhost-vsock-device", "seqpacket", "off" },
|
|
+};
|
|
+const size_t hw_compat_rhel_8_6_len = G_N_ELEMENTS(hw_compat_rhel_8_6);
|
|
+
|
|
+/*
|
|
+ * Mostly the same as hw_compat_6_0 and hw_compat_6_1
|
|
+ */
|
|
+GlobalProperty hw_compat_rhel_8_5[] = {
|
|
+ /* hw_compat_rhel_8_5 from hw_compat_6_0 */
|
|
+ { "gpex-pcihost", "allow-unmapped-accesses", "false" },
|
|
+ /* hw_compat_rhel_8_5 from hw_compat_6_0 */
|
|
+ { "i8042", "extended-state", "false"},
|
|
+ /* hw_compat_rhel_8_5 from hw_compat_6_0 */
|
|
+ { "nvme-ns", "eui64-default", "off"},
|
|
+ /* hw_compat_rhel_8_5 from hw_compat_6_0 */
|
|
+ { "e1000", "init-vet", "off" },
|
|
+ /* hw_compat_rhel_8_5 from hw_compat_6_0 */
|
|
+ { "e1000e", "init-vet", "off" },
|
|
+ /* hw_compat_rhel_8_5 from hw_compat_6_0 */
|
|
+ { "vhost-vsock-device", "seqpacket", "off" },
|
|
+ /* hw_compat_rhel_8_5 from hw_compat_6_1 */
|
|
+ { "vhost-user-vsock-device", "seqpacket", "off" },
|
|
+ /* hw_compat_rhel_8_5 from hw_compat_6_1 */
|
|
+ { "nvme-ns", "shared", "off" },
|
|
+};
|
|
+const size_t hw_compat_rhel_8_5_len = G_N_ELEMENTS(hw_compat_rhel_8_5);
|
|
+
|
|
+/*
|
|
+ * Mostly the same as hw_compat_5_2
|
|
+ */
|
|
+GlobalProperty hw_compat_rhel_8_4[] = {
|
|
+ /* hw_compat_rhel_8_4 from hw_compat_5_2 */
|
|
+ { "ICH9-LPC", "smm-compat", "on"},
|
|
+ /* hw_compat_rhel_8_4 from hw_compat_5_2 */
|
|
+ { "PIIX4_PM", "smm-compat", "on"},
|
|
+ /* hw_compat_rhel_8_4 from hw_compat_5_2 */
|
|
+ { "virtio-blk-device", "report-discard-granularity", "off" },
|
|
+ /* hw_compat_rhel_8_4 from hw_compat_5_2 */
|
|
+ /*
|
|
+ * Upstream incorrectly had "virtio-net-pci" instead of "virtio-net-pci-base",
|
|
+ * (https://bugzilla.redhat.com/show_bug.cgi?id=1999141)
|
|
+ */
|
|
+ { "virtio-net-pci-base", "vectors", "3"},
|
|
+};
|
|
+const size_t hw_compat_rhel_8_4_len = G_N_ELEMENTS(hw_compat_rhel_8_4);
|
|
+
|
|
+/*
|
|
+ * Mostly the same as hw_compat_5_1
|
|
+ */
|
|
+GlobalProperty hw_compat_rhel_8_3[] = {
|
|
+ /* hw_compat_rhel_8_3 from hw_compat_5_1 */
|
|
+ { "vhost-scsi", "num_queues", "1"},
|
|
+ /* hw_compat_rhel_8_3 from hw_compat_5_1 */
|
|
+ { "vhost-user-blk", "num-queues", "1"},
|
|
+ /* hw_compat_rhel_8_3 from hw_compat_5_1 */
|
|
+ { "vhost-user-scsi", "num_queues", "1"},
|
|
+ /* hw_compat_rhel_8_3 from hw_compat_5_1 */
|
|
+ { "virtio-blk-device", "num-queues", "1"},
|
|
+ /* hw_compat_rhel_8_3 from hw_compat_5_1 */
|
|
+ { "virtio-scsi-device", "num_queues", "1"},
|
|
+ /* hw_compat_rhel_8_3 from hw_compat_5_1 */
|
|
+ { "nvme", "use-intel-id", "on"},
|
|
+ /* hw_compat_rhel_8_3 from hw_compat_5_1 */
|
|
+ { "pvpanic", "events", "1"}, /* PVPANIC_PANICKED */
|
|
+ /* hw_compat_rhel_8_3 from hw_compat_5_1 */
|
|
+ { "pl011", "migrate-clk", "off" },
|
|
+ /* hw_compat_rhel_8_3 bz 1912846 */
|
|
+ { "pci-xhci", "x-rh-late-msi-cap", "off" },
|
|
+ /* hw_compat_rhel_8_3 from hw_compat_5_1 */
|
|
+ { "virtio-pci", "x-ats-page-aligned", "off"},
|
|
+};
|
|
+const size_t hw_compat_rhel_8_3_len = G_N_ELEMENTS(hw_compat_rhel_8_3);
|
|
+
|
|
+/*
|
|
+ * The same as hw_compat_4_2 + hw_compat_5_0
|
|
+ */
|
|
+GlobalProperty hw_compat_rhel_8_2[] = {
|
|
+ /* hw_compat_rhel_8_2 from hw_compat_4_2 */
|
|
+ { "virtio-blk-device", "queue-size", "128"},
|
|
+ /* hw_compat_rhel_8_2 from hw_compat_4_2 */
|
|
+ { "virtio-scsi-device", "virtqueue_size", "128"},
|
|
+ /* hw_compat_rhel_8_2 from hw_compat_4_2 */
|
|
+ { "virtio-blk-device", "x-enable-wce-if-config-wce", "off" },
|
|
+ /* hw_compat_rhel_8_2 from hw_compat_4_2 */
|
|
+ { "virtio-blk-device", "seg-max-adjust", "off"},
|
|
+ /* hw_compat_rhel_8_2 from hw_compat_4_2 */
|
|
+ { "virtio-scsi-device", "seg_max_adjust", "off"},
|
|
+ /* hw_compat_rhel_8_2 from hw_compat_4_2 */
|
|
+ { "vhost-blk-device", "seg_max_adjust", "off"},
|
|
+ /* hw_compat_rhel_8_2 from hw_compat_4_2 */
|
|
+ { "usb-host", "suppress-remote-wake", "off" },
|
|
+ /* hw_compat_rhel_8_2 from hw_compat_4_2 */
|
|
+ { "usb-redir", "suppress-remote-wake", "off" },
|
|
+ /* hw_compat_rhel_8_2 from hw_compat_4_2 */
|
|
+ { "qxl", "revision", "4" },
|
|
+ /* hw_compat_rhel_8_2 from hw_compat_4_2 */
|
|
+ { "qxl-vga", "revision", "4" },
|
|
+ /* hw_compat_rhel_8_2 from hw_compat_4_2 */
|
|
+ { "fw_cfg", "acpi-mr-restore", "false" },
|
|
+ /* hw_compat_rhel_8_2 from hw_compat_4_2 */
|
|
+ { "virtio-device", "use-disabled-flag", "false" },
|
|
+ /* hw_compat_rhel_8_2 from hw_compat_5_0 */
|
|
+ { "pci-host-bridge", "x-config-reg-migration-enabled", "off" },
|
|
+ /* hw_compat_rhel_8_2 from hw_compat_5_0 */
|
|
+ { "virtio-balloon-device", "page-poison", "false" },
|
|
+ /* hw_compat_rhel_8_2 from hw_compat_5_0 */
|
|
+ { "vmport", "x-read-set-eax", "off" },
|
|
+ /* hw_compat_rhel_8_2 from hw_compat_5_0 */
|
|
+ { "vmport", "x-signal-unsupported-cmd", "off" },
|
|
+ /* hw_compat_rhel_8_2 from hw_compat_5_0 */
|
|
+ { "vmport", "x-report-vmx-type", "off" },
|
|
+ /* hw_compat_rhel_8_2 from hw_compat_5_0 */
|
|
+ { "vmport", "x-cmds-v2", "off" },
|
|
+ /* hw_compat_rhel_8_2 from hw_compat_5_0 */
|
|
+ { "virtio-device", "x-disable-legacy-check", "true" },
|
|
+};
|
|
+const size_t hw_compat_rhel_8_2_len = G_N_ELEMENTS(hw_compat_rhel_8_2);
|
|
+
|
|
+/*
|
|
+ * The same as hw_compat_4_1
|
|
+ */
|
|
+GlobalProperty hw_compat_rhel_8_1[] = {
|
|
+ /* hw_compat_rhel_8_1 from hw_compat_4_1 */
|
|
+ { "virtio-pci", "x-pcie-flr-init", "off" },
|
|
+};
|
|
+const size_t hw_compat_rhel_8_1_len = G_N_ELEMENTS(hw_compat_rhel_8_1);
|
|
+
|
|
+/* 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" },
|
|
+ /* hw_compat_rhel_8_0 from hw_compat_4_0 */
|
|
+ { "VGA", "edid", "false" },
|
|
+ /* hw_compat_rhel_8_0 from hw_compat_4_0 */
|
|
+ { "secondary-vga", "edid", "false" },
|
|
+ /* hw_compat_rhel_8_0 from hw_compat_4_0 */
|
|
+ { "bochs-display", "edid", "false" },
|
|
+ /* hw_compat_rhel_8_0 from hw_compat_4_0 */
|
|
+ { "virtio-vga", "edid", "false" },
|
|
+ /* hw_compat_rhel_8_0 from hw_compat_4_0 */
|
|
+ { "virtio-gpu-device", "edid", "false" },
|
|
+ /* hw_compat_rhel_8_0 from hw_compat_4_0 */
|
|
+ { "virtio-device", "use-started", "false" },
|
|
+ /* hw_compat_rhel_8_0 from hw_compat_3_1 - that was added in 4.1 */
|
|
+ { "pcie-root-port-base", "disable-acs", "true" },
|
|
+};
|
|
+const size_t hw_compat_rhel_8_0_len = G_N_ELEMENTS(hw_compat_rhel_8_0);
|
|
+
|
|
+/* The same as hw_compat_3_0 + hw_compat_2_12
|
|
+ * except that
|
|
+ * there's nothing in 3_0
|
|
+ * migration.decompress-error-check=off was in 7.5 from bz 1584139
|
|
+ */
|
|
+GlobalProperty hw_compat_rhel_7_6[] = {
|
|
+ /* hw_compat_rhel_7_6 from hw_compat_2_12 */
|
|
+ { "hda-audio", "use-timer", "false" },
|
|
+ /* hw_compat_rhel_7_6 from hw_compat_2_12 */
|
|
+ { "cirrus-vga", "global-vmstate", "true" },
|
|
+ /* hw_compat_rhel_7_6 from hw_compat_2_12 */
|
|
+ { "VGA", "global-vmstate", "true" },
|
|
+ /* hw_compat_rhel_7_6 from hw_compat_2_12 */
|
|
+ { "vmware-svga", "global-vmstate", "true" },
|
|
+ /* hw_compat_rhel_7_6 from hw_compat_2_12 */
|
|
+ { "qxl-vga", "global-vmstate", "true" },
|
|
+};
|
|
+const size_t hw_compat_rhel_7_6_len = G_N_ELEMENTS(hw_compat_rhel_7_6);
|
|
+
|
|
MachineState *current_machine;
|
|
|
|
static char *machine_get_kernel(Object *obj, Error **errp)
|
|
diff --git a/hw/i386/fw_cfg.c b/hw/i386/fw_cfg.c
|
|
index 0e4494627c..33ef280420 100644
|
|
--- a/hw/i386/fw_cfg.c
|
|
+++ b/hw/i386/fw_cfg.c
|
|
@@ -73,7 +73,8 @@ void fw_cfg_build_smbios(PCMachineState *pcms, FWCfgState *fw_cfg,
|
|
|
|
if (pcmc->smbios_defaults) {
|
|
/* These values are guest ABI, do not change */
|
|
- smbios_set_defaults("QEMU", mc->desc, mc->name);
|
|
+ smbios_set_defaults("QEMU", mc->desc, mc->name,
|
|
+ pcmc->smbios_stream_product, pcmc->smbios_stream_version);
|
|
}
|
|
|
|
/* tell smbios about cpuid version and features */
|
|
diff --git a/hw/net/rtl8139.c b/hw/net/rtl8139.c
|
|
index 03a204ef8a..f2fe057535 100644
|
|
--- a/hw/net/rtl8139.c
|
|
+++ b/hw/net/rtl8139.c
|
|
@@ -3173,7 +3173,7 @@ static int rtl8139_pre_save(void *opaque)
|
|
|
|
static const VMStateDescription vmstate_rtl8139 = {
|
|
.name = "rtl8139",
|
|
- .version_id = 5,
|
|
+ .version_id = 4,
|
|
.minimum_version_id = 3,
|
|
.post_load = rtl8139_post_load,
|
|
.pre_save = rtl8139_pre_save,
|
|
@@ -3254,7 +3254,9 @@ static const VMStateDescription vmstate_rtl8139 = {
|
|
VMSTATE_UINT32(tally_counters.TxMCol, RTL8139State),
|
|
VMSTATE_UINT64(tally_counters.RxOkPhy, RTL8139State),
|
|
VMSTATE_UINT64(tally_counters.RxOkBrd, RTL8139State),
|
|
+#if 0 /* Disabled for Red Hat Enterprise Linux bz 1420195 */
|
|
VMSTATE_UINT32_V(tally_counters.RxOkMul, RTL8139State, 5),
|
|
+#endif
|
|
VMSTATE_UINT16(tally_counters.TxAbt, RTL8139State),
|
|
VMSTATE_UINT16(tally_counters.TxUndrn, RTL8139State),
|
|
|
|
diff --git a/hw/smbios/smbios.c b/hw/smbios/smbios.c
|
|
index a394514264..88642ccce0 100644
|
|
--- a/hw/smbios/smbios.c
|
|
+++ b/hw/smbios/smbios.c
|
|
@@ -38,6 +38,10 @@ size_t usr_blobs_len;
|
|
static unsigned usr_table_max;
|
|
static unsigned usr_table_cnt;
|
|
|
|
+/* Set to true for modern Windows 10 HardwareID-6 compat */
|
|
+static bool smbios_type2_required;
|
|
+
|
|
+
|
|
uint8_t *smbios_tables;
|
|
size_t smbios_tables_len;
|
|
unsigned smbios_table_max;
|
|
@@ -626,7 +630,7 @@ static void smbios_build_type_1_table(void)
|
|
|
|
static void smbios_build_type_2_table(void)
|
|
{
|
|
- SMBIOS_BUILD_TABLE_PRE(2, T2_BASE, false); /* optional */
|
|
+ SMBIOS_BUILD_TABLE_PRE(2, T2_BASE, smbios_type2_required);
|
|
|
|
SMBIOS_TABLE_SET_STR(2, manufacturer_str, type2.manufacturer);
|
|
SMBIOS_TABLE_SET_STR(2, product_str, type2.product);
|
|
@@ -1014,15 +1018,51 @@ void smbios_set_default_processor_family(uint16_t processor_family)
|
|
}
|
|
|
|
void smbios_set_defaults(const char *manufacturer, const char *product,
|
|
- const char *version)
|
|
+ const char *version,
|
|
+ const char *stream_product,
|
|
+ const char *stream_version)
|
|
{
|
|
smbios_have_defaults = true;
|
|
|
|
+ /*
|
|
+ * If @stream_product & @stream_version are non-NULL, then
|
|
+ * we're following rules for new Windows driver support.
|
|
+ * The data we have to report is defined in this doc:
|
|
+ *
|
|
+ * https://docs.microsoft.com/en-us/windows-hardware/drivers/install/specifying-hardware-ids-for-a-computer
|
|
+ *
|
|
+ * The Windows drivers are written to expect use of the
|
|
+ * scheme documented as "HardwareID-6" against Windows 10,
|
|
+ * which uses SMBIOS System (Type 1) and Base Board (Type 2)
|
|
+ * tables and will match on
|
|
+ *
|
|
+ * System Manufacturer = Red Hat (@manufacturer)
|
|
+ * System SKU Number = 8.2.0 (@stream_version)
|
|
+ * Baseboard Manufacturer = Red Hat (@manufacturer)
|
|
+ * Baseboard Product = RHEL-AV (@stream_product)
|
|
+ *
|
|
+ * NB, SKU must be changed with each RHEL-AV release
|
|
+ *
|
|
+ * Other fields can be freely used by applications using
|
|
+ * QEMU. For example apps can use the "System product"
|
|
+ * and "System version" to identify themselves.
|
|
+ *
|
|
+ * We get 'System Manufacturer' and 'Baseboard Manufacturer'
|
|
+ */
|
|
SMBIOS_SET_DEFAULT(smbios_type1.manufacturer, manufacturer);
|
|
SMBIOS_SET_DEFAULT(smbios_type1.product, product);
|
|
SMBIOS_SET_DEFAULT(smbios_type1.version, version);
|
|
+ SMBIOS_SET_DEFAULT(smbios_type1.family, "Red Hat Enterprise Linux");
|
|
+ if (stream_version != NULL) {
|
|
+ SMBIOS_SET_DEFAULT(smbios_type1.sku, stream_version);
|
|
+ }
|
|
SMBIOS_SET_DEFAULT(type2.manufacturer, manufacturer);
|
|
- SMBIOS_SET_DEFAULT(type2.product, product);
|
|
+ if (stream_product != NULL) {
|
|
+ SMBIOS_SET_DEFAULT(type2.product, stream_product);
|
|
+ smbios_type2_required = true;
|
|
+ } else {
|
|
+ SMBIOS_SET_DEFAULT(type2.product, product);
|
|
+ }
|
|
SMBIOS_SET_DEFAULT(type2.version, version);
|
|
SMBIOS_SET_DEFAULT(type3.manufacturer, manufacturer);
|
|
SMBIOS_SET_DEFAULT(type3.version, version);
|
|
diff --git a/hw/timer/i8254_common.c b/hw/timer/i8254_common.c
|
|
index 28fdabc321..bad13ec224 100644
|
|
--- a/hw/timer/i8254_common.c
|
|
+++ b/hw/timer/i8254_common.c
|
|
@@ -229,7 +229,7 @@ static const VMStateDescription vmstate_pit_common = {
|
|
.pre_save = pit_dispatch_pre_save,
|
|
.post_load = pit_dispatch_post_load,
|
|
.fields = (const VMStateField[]) {
|
|
- VMSTATE_UINT32_V(channels[0].irq_disabled, PITCommonState, 3),
|
|
+ VMSTATE_UINT32(channels[0].irq_disabled, PITCommonState), /* qemu-kvm's v2 had 'flags' here */
|
|
VMSTATE_STRUCT_ARRAY(channels, PITCommonState, 3, 2,
|
|
vmstate_pit_channel, PITChannelState),
|
|
VMSTATE_INT64(channels[0].next_transition_time,
|
|
diff --git a/hw/usb/hcd-xhci-pci.c b/hw/usb/hcd-xhci-pci.c
|
|
index 264d7ebb77..2b9a3e06d4 100644
|
|
--- a/hw/usb/hcd-xhci-pci.c
|
|
+++ b/hw/usb/hcd-xhci-pci.c
|
|
@@ -104,6 +104,33 @@ static int xhci_pci_vmstate_post_load(void *opaque, int version_id)
|
|
return 0;
|
|
}
|
|
|
|
+/* RH bz 1912846 */
|
|
+static bool usb_xhci_pci_add_msi(struct PCIDevice *dev, Error **errp)
|
|
+{
|
|
+ int ret;
|
|
+ Error *err = NULL;
|
|
+ XHCIPciState *s = XHCI_PCI(dev);
|
|
+
|
|
+ ret = msi_init(dev, 0x70, s->xhci.numintrs, true, false, &err);
|
|
+ /*
|
|
+ * Any error other than -ENOTSUP(board's MSI support is broken)
|
|
+ * is a programming error
|
|
+ */
|
|
+ assert(!ret || ret == -ENOTSUP);
|
|
+ if (ret && s->msi == ON_OFF_AUTO_ON) {
|
|
+ /* Can't satisfy user's explicit msi=on request, fail */
|
|
+ error_append_hint(&err, "You have to use msi=auto (default) or "
|
|
+ "msi=off with this machine type.\n");
|
|
+ error_propagate(errp, err);
|
|
+ return true;
|
|
+ }
|
|
+ assert(!err || s->msi == ON_OFF_AUTO_AUTO);
|
|
+ /* With msi=auto, we fall back to MSI off silently */
|
|
+ error_free(err);
|
|
+
|
|
+ return false;
|
|
+}
|
|
+
|
|
static void usb_xhci_pci_realize(struct PCIDevice *dev, Error **errp)
|
|
{
|
|
int ret;
|
|
@@ -125,23 +152,12 @@ static void usb_xhci_pci_realize(struct PCIDevice *dev, Error **errp)
|
|
s->xhci.nec_quirks = true;
|
|
}
|
|
|
|
- if (s->msi != ON_OFF_AUTO_OFF) {
|
|
- ret = msi_init(dev, 0x70, s->xhci.numintrs, true, false, &err);
|
|
- /*
|
|
- * Any error other than -ENOTSUP(board's MSI support is broken)
|
|
- * is a programming error
|
|
- */
|
|
- assert(!ret || ret == -ENOTSUP);
|
|
- if (ret && s->msi == ON_OFF_AUTO_ON) {
|
|
- /* Can't satisfy user's explicit msi=on request, fail */
|
|
- error_append_hint(&err, "You have to use msi=auto (default) or "
|
|
- "msi=off with this machine type.\n");
|
|
+ if (s->msi != ON_OFF_AUTO_OFF && s->rh_late_msi_cap) {
|
|
+ /* This gives the behaviour from 5.2.0 onwards, lspci shows 90,a0,70 */
|
|
+ if (usb_xhci_pci_add_msi(dev, &err)) {
|
|
error_propagate(errp, err);
|
|
return;
|
|
}
|
|
- assert(!err || s->msi == ON_OFF_AUTO_AUTO);
|
|
- /* With msi=auto, we fall back to MSI off silently */
|
|
- error_free(err);
|
|
}
|
|
pci_register_bar(dev, 0,
|
|
PCI_BASE_ADDRESS_SPACE_MEMORY |
|
|
@@ -153,6 +169,14 @@ static void usb_xhci_pci_realize(struct PCIDevice *dev, Error **errp)
|
|
assert(ret > 0);
|
|
}
|
|
|
|
+ /* RH bz 1912846 */
|
|
+ if (s->msi != ON_OFF_AUTO_OFF && !s->rh_late_msi_cap) {
|
|
+ /* This gives the older RH machine behaviour, lspci shows 90,70,a0 */
|
|
+ if (usb_xhci_pci_add_msi(dev, &err)) {
|
|
+ error_propagate(errp, err);
|
|
+ return;
|
|
+ }
|
|
+ }
|
|
if (s->msix != ON_OFF_AUTO_OFF) {
|
|
/* TODO check for errors, and should fail when msix=on */
|
|
msix_init(dev, s->xhci.numintrs,
|
|
@@ -197,11 +221,18 @@ static void xhci_instance_init(Object *obj)
|
|
qdev_alias_all_properties(DEVICE(&s->xhci), obj);
|
|
}
|
|
|
|
+static Property xhci_pci_properties[] = {
|
|
+ /* RH bz 1912846 */
|
|
+ DEFINE_PROP_BOOL("x-rh-late-msi-cap", XHCIPciState, rh_late_msi_cap, true),
|
|
+ DEFINE_PROP_END_OF_LIST()
|
|
+};
|
|
+
|
|
static void xhci_class_init(ObjectClass *klass, void *data)
|
|
{
|
|
PCIDeviceClass *k = PCI_DEVICE_CLASS(klass);
|
|
DeviceClass *dc = DEVICE_CLASS(klass);
|
|
|
|
+ device_class_set_props(dc, xhci_pci_properties);
|
|
dc->reset = xhci_pci_reset;
|
|
dc->vmsd = &vmstate_xhci_pci;
|
|
set_bit(DEVICE_CATEGORY_USB, dc->categories);
|
|
diff --git a/hw/usb/hcd-xhci-pci.h b/hw/usb/hcd-xhci-pci.h
|
|
index 08f70ce97c..1be7527c1b 100644
|
|
--- a/hw/usb/hcd-xhci-pci.h
|
|
+++ b/hw/usb/hcd-xhci-pci.h
|
|
@@ -40,6 +40,7 @@ typedef struct XHCIPciState {
|
|
XHCIState xhci;
|
|
OnOffAuto msi;
|
|
OnOffAuto msix;
|
|
+ bool rh_late_msi_cap; /* bz 1912846 */
|
|
} XHCIPciState;
|
|
|
|
#endif
|
|
diff --git a/hw/virtio/virtio-mem.c b/hw/virtio/virtio-mem.c
|
|
index ef64bf1b4a..ba11aa4646 100644
|
|
--- a/hw/virtio/virtio-mem.c
|
|
+++ b/hw/virtio/virtio-mem.c
|
|
@@ -1694,8 +1694,9 @@ static Property virtio_mem_properties[] = {
|
|
#endif
|
|
DEFINE_PROP_BOOL(VIRTIO_MEM_EARLY_MIGRATION_PROP, VirtIOMEM,
|
|
early_migration, true),
|
|
+ /* RHEL: default-enable "dynamic-memslots" (jira RHEL-24045) */
|
|
DEFINE_PROP_BOOL(VIRTIO_MEM_DYNAMIC_MEMSLOTS_PROP, VirtIOMEM,
|
|
- dynamic_memslots, false),
|
|
+ dynamic_memslots, true),
|
|
DEFINE_PROP_END_OF_LIST(),
|
|
};
|
|
|
|
diff --git a/include/hw/boards.h b/include/hw/boards.h
|
|
index 48ff6d8b93..ccfc3e10eb 100644
|
|
--- a/include/hw/boards.h
|
|
+++ b/include/hw/boards.h
|
|
@@ -822,4 +822,47 @@ 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_9_5[];
|
|
+extern const size_t hw_compat_rhel_9_5_len;
|
|
+
|
|
+extern GlobalProperty hw_compat_rhel_9_4[];
|
|
+extern const size_t hw_compat_rhel_9_4_len;
|
|
+
|
|
+extern GlobalProperty hw_compat_rhel_9_3[];
|
|
+extern const size_t hw_compat_rhel_9_3_len;
|
|
+
|
|
+extern GlobalProperty hw_compat_rhel_9_2[];
|
|
+extern const size_t hw_compat_rhel_9_2_len;
|
|
+
|
|
+extern GlobalProperty hw_compat_rhel_9_1[];
|
|
+extern const size_t hw_compat_rhel_9_1_len;
|
|
+
|
|
+extern GlobalProperty hw_compat_rhel_9_0[];
|
|
+extern const size_t hw_compat_rhel_9_0_len;
|
|
+
|
|
+extern GlobalProperty hw_compat_rhel_8_6[];
|
|
+extern const size_t hw_compat_rhel_8_6_len;
|
|
+
|
|
+extern GlobalProperty hw_compat_rhel_8_5[];
|
|
+extern const size_t hw_compat_rhel_8_5_len;
|
|
+
|
|
+extern GlobalProperty hw_compat_rhel_8_4[];
|
|
+extern const size_t hw_compat_rhel_8_4_len;
|
|
+
|
|
+extern GlobalProperty hw_compat_rhel_8_3[];
|
|
+extern const size_t hw_compat_rhel_8_3_len;
|
|
+
|
|
+extern GlobalProperty hw_compat_rhel_8_2[];
|
|
+extern const size_t hw_compat_rhel_8_2_len;
|
|
+
|
|
+extern GlobalProperty hw_compat_rhel_8_1[];
|
|
+extern const size_t hw_compat_rhel_8_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;
|
|
+
|
|
+extern const char *rhel_old_machine_deprecation;
|
|
#endif
|
|
diff --git a/include/hw/firmware/smbios.h b/include/hw/firmware/smbios.h
|
|
index f066ab7262..e805d25fbe 100644
|
|
--- a/include/hw/firmware/smbios.h
|
|
+++ b/include/hw/firmware/smbios.h
|
|
@@ -331,7 +331,9 @@ void smbios_add_usr_blob_size(size_t size);
|
|
void smbios_entry_add(QemuOpts *opts, Error **errp);
|
|
void smbios_set_cpuid(uint32_t version, uint32_t features);
|
|
void smbios_set_defaults(const char *manufacturer, const char *product,
|
|
- const char *version);
|
|
+ const char *version,
|
|
+ const char *stream_product,
|
|
+ const char *stream_version);
|
|
void smbios_set_default_processor_family(uint16_t processor_family);
|
|
uint8_t *smbios_get_table_legacy(size_t *length, Error **errp);
|
|
void smbios_get_tables(MachineState *ms,
|
|
diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h
|
|
index 4e55d7ef6e..8776a3c937 100644
|
|
--- a/include/hw/i386/pc.h
|
|
+++ b/include/hw/i386/pc.h
|
|
@@ -103,6 +103,9 @@ struct PCMachineClass {
|
|
bool smbios_defaults;
|
|
bool smbios_legacy_mode;
|
|
SmbiosEntryPointType default_smbios_ep_type;
|
|
+ /* New fields needed for Windows HardwareID-6 matching */
|
|
+ const char *smbios_stream_product;
|
|
+ const char *smbios_stream_version;
|
|
|
|
/* RAM / address space compat: */
|
|
bool gigabyte_align;
|
|
--
|
|
2.39.3
|
|
|