7b74d99404
- kvm-arm-virt-Register-highmem-and-gic-version-as-class-p.patch [bz#1952449] - kvm-hw-arm-virt-Add-8.5-and-9.0-machine-types-and-remove.patch [bz#1952449] - kvm-aarch64-rh-devices-add-CONFIG_PVPANIC_PCI.patch [bz#1747467] - kvm-spec-Do-not-build-qemu-kvm-block-gluster.patch [bz#1964795] - kvm-spec-Do-not-link-pcnet-and-ne2k_pci-roms.patch [bz#1965961] - kvm-redhat-s390x-add-rhel-8.5.0-compat-machine.patch [bz#1957194] - kvm-redhat-add-missing-entries-in-hw_compat_rhel_8_4.patch [bz#1957194] - kvm-redhat-Define-pseries-rhel8.5.0-machine-type.patch [bz#1957194] - kvm-virtio-net-failover-add-missing-remove_migration_sta.patch [bz#1957194] - kvm-hw-arm-virt-Disable-PL011-clock-migration-through-hw.patch [bz#1957194] - kvm-virtio-blk-Fix-rollback-path-in-virtio_blk_data_plan.patch [bz#1957194] - kvm-virtio-blk-Configure-all-host-notifiers-in-a-single-.patch [bz#1957194] - kvm-virtio-scsi-Set-host-notifiers-and-callbacks-separat.patch [bz#1957194] - kvm-virtio-scsi-Configure-all-host-notifiers-in-a-single.patch [bz#1957194] - kvm-hw-arm-smmuv3-Another-range-invalidation-fix.patch [bz#1957194] - Resolves: bz#1952449 ([aarch64] define RHEL9 machine types) - Resolves: bz#1747467 ([aarch64] [qemu] PVPANIC support) - Resolves: bz#1964795 (Remove qemu-kvm-block-gluster package) - Resolves: bz#1965961 (Remove links to not build roms) - Resolves: bz#1957194 (Synchronize RHEL-AV 8.5.0 changes to RHEL 9.0.0 Beta)
78 lines
3.4 KiB
Diff
78 lines
3.4 KiB
Diff
From e808acaa50effe471c56a48b80d5e0d2d196b495 Mon Sep 17 00:00:00 2001
|
|
From: Eric Auger <eric.auger@redhat.com>
|
|
Date: Tue, 25 May 2021 09:22:23 +0200
|
|
Subject: [PATCH 01/15] arm/virt: Register highmem and gic-version as class
|
|
properties
|
|
|
|
RH-Author: Eric Auger <eric.auger@redhat.com>
|
|
RH-MergeRequest: 1: Add 9.0.0 and 8.5.0 arm-virt machine types
|
|
RH-Commit: [1/2] 1ff3970773e09f2efb194430511928ae852c02ba (eauger1/centos-qemu-kvm)
|
|
RH-Bugzilla: 1952449
|
|
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
RH-Acked-by: Gavin Shan <gshan@redhat.com>
|
|
RH-Acked-by: Andrew Jones <drjones@redhat.com>
|
|
|
|
This mirrors changes made in commit
|
|
b91def7b8382 ("rm/virt: Register most properties as class properties")
|
|
for the highmem and gic-version properties. This makes the
|
|
code easier to diff against upstream.
|
|
|
|
Signed-off-by: Eric Auger <eric.auger@redhat.com>
|
|
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
---
|
|
hw/arm/virt.c | 23 ++++++++++++-----------
|
|
1 file changed, 12 insertions(+), 11 deletions(-)
|
|
|
|
diff --git a/hw/arm/virt.c b/hw/arm/virt.c
|
|
index 080cf54ef1..51a415570c 100644
|
|
--- a/hw/arm/virt.c
|
|
+++ b/hw/arm/virt.c
|
|
@@ -2996,6 +2996,18 @@ static void rhel_machine_class_init(ObjectClass *oc, void *data)
|
|
object_class_property_set_description(oc, "acpi",
|
|
"Enable ACPI");
|
|
|
|
+ object_class_property_add_bool(oc, "highmem", virt_get_highmem,
|
|
+ virt_set_highmem);
|
|
+ object_class_property_set_description(oc, "highmem",
|
|
+ "Set on/off to enable/disable using "
|
|
+ "physical address space above 32 bits");
|
|
+
|
|
+ object_class_property_add_str(oc, "gic-version", virt_get_gic_version,
|
|
+ virt_set_gic_version);
|
|
+ object_class_property_set_description(oc, "gic-version",
|
|
+ "Set GIC version. "
|
|
+ "Valid values are 2, 3, host and max");
|
|
+
|
|
object_class_property_add_str(oc, "x-oem-id",
|
|
virt_get_oem_id,
|
|
virt_set_oem_id);
|
|
@@ -3004,7 +3016,6 @@ static void rhel_machine_class_init(ObjectClass *oc, void *data)
|
|
"in ACPI table header."
|
|
"The string may be up to 6 bytes in size");
|
|
|
|
-
|
|
object_class_property_add_str(oc, "x-oem-table-id",
|
|
virt_get_oem_table_id,
|
|
virt_set_oem_table_id);
|
|
@@ -3027,17 +3038,7 @@ static void rhel_virt_instance_init(Object *obj)
|
|
|
|
/* High memory is enabled by default */
|
|
vms->highmem = true;
|
|
- object_property_add_bool(obj, "highmem", virt_get_highmem,
|
|
- virt_set_highmem);
|
|
- object_property_set_description(obj, "highmem",
|
|
- "Set on/off to enable/disable using "
|
|
- "physical address space above 32 bits");
|
|
vms->gic_version = VIRT_GIC_VERSION_NOSEL;
|
|
- object_property_add_str(obj, "gic-version", virt_get_gic_version,
|
|
- virt_set_gic_version);
|
|
- object_property_set_description(obj, "gic-version",
|
|
- "Set GIC version. "
|
|
- "Valid values are 2, 3, host and max");
|
|
|
|
vms->highmem_ecam = !vmc->no_highmem_ecam;
|
|
|
|
--
|
|
2.27.0
|
|
|