From 4312e9a49588f468055903440551082cb702ab6e Mon Sep 17 00:00:00 2001 From: "Danilo C. L. de Paula" Date: Mon, 19 Aug 2019 23:03:56 +0100 Subject: [PATCH] * Mon Aug 19 2019 Danilo Cesar Lemes de Paula - 4.1.0-3.el8 - kvm-x86-machine-types-pc_rhel_8_0_compat.patch [bz#1719649] - kvm-x86-machine-types-q35-Fixup-units_per_default_bus.patch [bz#1719649] - kvm-x86-machine-types-Fixup-dynamic-sysbus-entries.patch [bz#1719649] - kvm-x86-machine-types-add-pc-q35-rhel8.1.0.patch [bz#1719649] - kvm-machine-types-Update-hw_compat_rhel_8_0-from-hw_comp.patch [bz#1719649] - kvm-virtio-Make-disable-legacy-disable-modern-compat-pro.patch [bz#1719649] - Resolves: bz#1719649 (8.1 machine type for x86) --- ...date-hw_compat_rhel_8_0-from-hw_comp.patch | 59 ++++++++++ ...ble-legacy-disable-modern-compat-pro.patch | 48 ++++++++ ...e-types-Fixup-dynamic-sysbus-entries.patch | 60 ++++++++++ ...6-machine-types-add-pc-q35-rhel8.1.0.patch | 103 ++++++++++++++++++ ...x86-machine-types-pc_rhel_8_0_compat.patch | 88 +++++++++++++++ ...ypes-q35-Fixup-units_per_default_bus.patch | 57 ++++++++++ qemu-kvm.spec | 24 +++- 7 files changed, 438 insertions(+), 1 deletion(-) create mode 100644 kvm-machine-types-Update-hw_compat_rhel_8_0-from-hw_comp.patch create mode 100644 kvm-virtio-Make-disable-legacy-disable-modern-compat-pro.patch create mode 100644 kvm-x86-machine-types-Fixup-dynamic-sysbus-entries.patch create mode 100644 kvm-x86-machine-types-add-pc-q35-rhel8.1.0.patch create mode 100644 kvm-x86-machine-types-pc_rhel_8_0_compat.patch create mode 100644 kvm-x86-machine-types-q35-Fixup-units_per_default_bus.patch diff --git a/kvm-machine-types-Update-hw_compat_rhel_8_0-from-hw_comp.patch b/kvm-machine-types-Update-hw_compat_rhel_8_0-from-hw_comp.patch new file mode 100644 index 0000000..b6d3807 --- /dev/null +++ b/kvm-machine-types-Update-hw_compat_rhel_8_0-from-hw_comp.patch @@ -0,0 +1,59 @@ +From 9f2bfaaa73a8fb2790ebc4fb16f5d3a629b39898 Mon Sep 17 00:00:00 2001 +From: "Dr. David Alan Gilbert" +Date: Wed, 31 Jul 2019 15:08:14 +0100 +Subject: [PATCH 5/6] machine types: Update hw_compat_rhel_8_0 from + hw_compat_4_0 + +RH-Author: Dr. David Alan Gilbert +Message-id: <20190731150814.29571-6-dgilbert@redhat.com> +Patchwork-id: 89817 +O-Subject: [RHEL-AV-8.1.0 qemu-kvm PATCH v3 5/5] machine types: Update hw_compat_rhel_8_0 from hw_compat_4_0 +Bugzilla: 1719649 +RH-Acked-by: Laszlo Ersek +RH-Acked-by: Markus Armbruster +RH-Acked-by: Cornelia Huck + +From: "Dr. David Alan Gilbert" + +Pull in the 4_0 compat entries into hw_compat_rhel_8_0 + +We don't need pl031's migrate-tick-offset because it's an ARM only +device and we don't have compatible types for Aarch yet. + +We don't have to copy virtio-balloon-device.qemu-4-0-config-size=false from +hw_compat_3_1[], since it immediately got reverted in hw_compat_4_0[]. + +Signed-off-by: Dr. David Alan Gilbert +Signed-off-by: Danilo C. L. de Paula +--- + hw/core/machine.c | 14 ++++++++++++++ + 1 file changed, 14 insertions(+) + +diff --git a/hw/core/machine.c b/hw/core/machine.c +index f30afe0..e2f812a 100644 +--- a/hw/core/machine.c ++++ b/hw/core/machine.c +@@ -54,6 +54,20 @@ GlobalProperty hw_compat_rhel_8_0[] = { + { "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-pci", "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); + +-- +1.8.3.1 + diff --git a/kvm-virtio-Make-disable-legacy-disable-modern-compat-pro.patch b/kvm-virtio-Make-disable-legacy-disable-modern-compat-pro.patch new file mode 100644 index 0000000..b59bdfe --- /dev/null +++ b/kvm-virtio-Make-disable-legacy-disable-modern-compat-pro.patch @@ -0,0 +1,48 @@ +From ca4a5e85de406a495512d544c3b2187ac3654e97 Mon Sep 17 00:00:00 2001 +From: "Dr. David Alan Gilbert" +Date: Thu, 1 Aug 2019 10:26:47 +0100 +Subject: [PATCH 6/6] virtio: Make disable-legacy/disable-modern compat + properties optional + +RH-Author: Dr. David Alan Gilbert +Message-id: <20190801102647.14173-1-dgilbert@redhat.com> +Patchwork-id: 89849 +O-Subject: [RHEL-AV-8.1.0 qemu-kvm PATCH v3 6/5] virtio: Make disable-legacy/disable-modern compat properties optional +Bugzilla: 1719649 +RH-Acked-by: Cornelia Huck +RH-Acked-by: Markus Armbruster +RH-Acked-by: Laszlo Ersek +RH-Acked-by: Eduardo Habkost + +From: "Dr. David Alan Gilbert" + +Upstream 53921bfdce3 by Eduardo made some hw_compat_2_6 entries optional +to fix a bug where non-transitional devices failed to be created on +old upstream machine types. Do the same fix to our old downstream +machines. + +Signed-off-by: Dr. David Alan Gilbert +Signed-off-by: Danilo C. L. de Paula +--- + hw/core/machine.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/hw/core/machine.c b/hw/core/machine.c +index e2f812a..c796b54 100644 +--- a/hw/core/machine.c ++++ b/hw/core/machine.c +@@ -152,8 +152,9 @@ GlobalProperty hw_compat_rhel_7_2[] = { + { "fw_cfg_mem", "dma_enabled", "off" }, + { "fw_cfg_io", "dma_enabled", "off" }, + { "isa-fdc", "fallback", "144" }, +- { "virtio-pci", "disable-modern", "on" }, +- { "virtio-pci", "disable-legacy", "off" }, ++ /* Optional because not all virtio-pci devices support legacy mode */ ++ { "virtio-pci", "disable-modern", "on", .optional = true }, ++ { "virtio-pci", "disable-legacy", "off", .optional = true }, + { TYPE_PCI_DEVICE, "x-pcie-lnksta-dllla", "off" }, + { "virtio-pci", "page-per-vq", "on" }, + /* hw_compat_rhel_7_2 - introduced with 2.10.0 */ +-- +1.8.3.1 + diff --git a/kvm-x86-machine-types-Fixup-dynamic-sysbus-entries.patch b/kvm-x86-machine-types-Fixup-dynamic-sysbus-entries.patch new file mode 100644 index 0000000..0ac47c3 --- /dev/null +++ b/kvm-x86-machine-types-Fixup-dynamic-sysbus-entries.patch @@ -0,0 +1,60 @@ +From 6df1559af7cd65e3faf7c61a2bb8f02667767ad6 Mon Sep 17 00:00:00 2001 +From: "Dr. David Alan Gilbert" +Date: Wed, 31 Jul 2019 15:08:12 +0100 +Subject: [PATCH 3/6] x86 machine types: Fixup dynamic sysbus entries + +RH-Author: Dr. David Alan Gilbert +Message-id: <20190731150814.29571-4-dgilbert@redhat.com> +Patchwork-id: 89814 +O-Subject: [RHEL-AV-8.1.0 qemu-kvm PATCH v3 3/5] x86 machine types: Fixup dynamic sysbus entries +Bugzilla: 1719649 +RH-Acked-by: Laszlo Ersek +RH-Acked-by: Markus Armbruster +RH-Acked-by: Cornelia Huck + +From: "Dr. David Alan Gilbert" + +We're missing a couple of upstream changes, add them for +consistency: + + v2.11.0-824-gef18310d54 Shouldn't have any effect + v2.12.0-1411-g94692dcd71 Should allow us to use RAMFB if we enable + it + +Signed-off-by: Dr. David Alan Gilbert +Signed-off-by: Danilo C. L. de Paula +--- + hw/i386/pc_piix.c | 1 + + hw/i386/pc_q35.c | 4 +++- + 2 files changed, 4 insertions(+), 1 deletion(-) + +diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c +index c86c48c..3b9ba95 100644 +--- a/hw/i386/pc_piix.c ++++ b/hw/i386/pc_piix.c +@@ -1037,6 +1037,7 @@ static void pc_machine_rhel7_options(MachineClass *m) + pcmc->default_nic_model = "e1000"; + m->default_display = "std"; + m->no_parallel = 1; ++ machine_class_allow_dynamic_sysbus_dev(m, TYPE_RAMFB_DEVICE); + compat_props_add(m->compat_props, pc_rhel_compat, pc_rhel_compat_len); + m->alias = "pc"; + m->is_default = 1; +diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c +index 068813d..edf8e54 100644 +--- a/hw/i386/pc_q35.c ++++ b/hw/i386/pc_q35.c +@@ -554,7 +554,9 @@ static void pc_q35_machine_rhel_options(MachineClass *m) + m->default_display = "std"; + m->no_floppy = 1; + m->no_parallel = 1; +- machine_class_allow_dynamic_sysbus_dev(m, TYPE_SYS_BUS_DEVICE); ++ machine_class_allow_dynamic_sysbus_dev(m, TYPE_AMD_IOMMU_DEVICE); ++ machine_class_allow_dynamic_sysbus_dev(m, TYPE_INTEL_IOMMU_DEVICE); ++ machine_class_allow_dynamic_sysbus_dev(m, TYPE_RAMFB_DEVICE); + m->alias = "q35"; + m->max_cpus = 384; + compat_props_add(m->compat_props, pc_rhel_compat, pc_rhel_compat_len); +-- +1.8.3.1 + diff --git a/kvm-x86-machine-types-add-pc-q35-rhel8.1.0.patch b/kvm-x86-machine-types-add-pc-q35-rhel8.1.0.patch new file mode 100644 index 0000000..73eb148 --- /dev/null +++ b/kvm-x86-machine-types-add-pc-q35-rhel8.1.0.patch @@ -0,0 +1,103 @@ +From 0784125ba3ccd72a590d210cf3f52d80e96b4263 Mon Sep 17 00:00:00 2001 +From: "Dr. David Alan Gilbert" +Date: Wed, 31 Jul 2019 15:08:13 +0100 +Subject: [PATCH 4/6] x86 machine types: add pc-q35-rhel8.1.0 + +RH-Author: Dr. David Alan Gilbert +Message-id: <20190731150814.29571-5-dgilbert@redhat.com> +Patchwork-id: 89813 +O-Subject: [RHEL-AV-8.1.0 qemu-kvm PATCH v3 4/5] x86 machine types: add pc-q35-rhel8.1.0 +Bugzilla: 1719649 +RH-Acked-by: Laszlo Ersek +RH-Acked-by: Markus Armbruster +RH-Acked-by: Cornelia Huck + +From: "Dr. David Alan Gilbert" + +Create the 8.1.0 machine type for q35 and update the _options +functions to keep compatibility. + +Note: + We don't have to copy the kernel_irqchip_split from 4_0 since it + immediately got reverted in 4_0_1 + +Signed-off-by: Dr. David Alan Gilbert +Signed-off-by: Danilo C. L. de Paula +--- + hw/i386/pc_piix.c | 6 ++++++ + hw/i386/pc_q35.c | 24 +++++++++++++++++++++++- + 2 files changed, 29 insertions(+), 1 deletion(-) + +diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c +index 3b9ba95..bf6b444 100644 +--- a/hw/i386/pc_piix.c ++++ b/hw/i386/pc_piix.c +@@ -1051,9 +1051,15 @@ static void pc_init_rhel760(MachineState *machine) + + static void pc_machine_rhel760_options(MachineClass *m) + { ++ PCMachineClass *pcmc = PC_MACHINE_CLASS(m); + pc_machine_rhel7_options(m); + m->desc = "RHEL 7.6.0 PC (i440FX + PIIX, 1996)"; + m->async_pf_vmexit_disable = true; ++ m->smbus_no_migration_support = true; ++ pcmc->pvh_enabled = false; ++ pcmc->default_cpu_version = CPU_VERSION_LEGACY; ++ compat_props_add(m->compat_props, hw_compat_rhel_8_0, hw_compat_rhel_8_0_len); ++ compat_props_add(m->compat_props, pc_rhel_8_0_compat, pc_rhel_8_0_compat_len); + compat_props_add(m->compat_props, hw_compat_rhel_7_6, hw_compat_rhel_7_6_len); + compat_props_add(m->compat_props, pc_rhel_7_6_compat, pc_rhel_7_6_compat_len); + } +diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c +index edf8e54..b6d0bb3 100644 +--- a/hw/i386/pc_q35.c ++++ b/hw/i386/pc_q35.c +@@ -554,6 +554,7 @@ static void pc_q35_machine_rhel_options(MachineClass *m) + m->default_display = "std"; + m->no_floppy = 1; + m->no_parallel = 1; ++ pcmc->default_cpu_version = 1; + machine_class_allow_dynamic_sysbus_dev(m, TYPE_AMD_IOMMU_DEVICE); + machine_class_allow_dynamic_sysbus_dev(m, TYPE_INTEL_IOMMU_DEVICE); + machine_class_allow_dynamic_sysbus_dev(m, TYPE_RAMFB_DEVICE); +@@ -562,6 +563,20 @@ static void pc_q35_machine_rhel_options(MachineClass *m) + compat_props_add(m->compat_props, pc_rhel_compat, pc_rhel_compat_len); + } + ++static void pc_q35_init_rhel810(MachineState *machine) ++{ ++ pc_q35_init(machine); ++} ++ ++static void pc_q35_machine_rhel810_options(MachineClass *m) ++{ ++ pc_q35_machine_rhel_options(m); ++ m->desc = "RHEL-8.1.0 PC (Q35 + ICH9, 2009)"; ++} ++ ++DEFINE_PC_MACHINE(q35_rhel810, "pc-q35-rhel8.1.0", pc_q35_init_rhel810, ++ pc_q35_machine_rhel810_options); ++ + static void pc_q35_init_rhel800(MachineState *machine) + { + pc_q35_init(machine); +@@ -569,8 +584,15 @@ static void pc_q35_init_rhel800(MachineState *machine) + + static void pc_q35_machine_rhel800_options(MachineClass *m) + { +- pc_q35_machine_rhel_options(m); ++ PCMachineClass *pcmc = PC_MACHINE_CLASS(m); ++ pc_q35_machine_rhel810_options(m); + m->desc = "RHEL-8.0.0 PC (Q35 + ICH9, 2009)"; ++ m->smbus_no_migration_support = true; ++ m->alias = NULL; ++ pcmc->pvh_enabled = false; ++ pcmc->default_cpu_version = CPU_VERSION_LEGACY; ++ compat_props_add(m->compat_props, hw_compat_rhel_8_0, hw_compat_rhel_8_0_len); ++ compat_props_add(m->compat_props, pc_rhel_8_0_compat, pc_rhel_8_0_compat_len); + } + + DEFINE_PC_MACHINE(q35_rhel800, "pc-q35-rhel8.0.0", pc_q35_init_rhel800, +-- +1.8.3.1 + diff --git a/kvm-x86-machine-types-pc_rhel_8_0_compat.patch b/kvm-x86-machine-types-pc_rhel_8_0_compat.patch new file mode 100644 index 0000000..cb2371f --- /dev/null +++ b/kvm-x86-machine-types-pc_rhel_8_0_compat.patch @@ -0,0 +1,88 @@ +From e42808c29bdcebe62cdb5cdb1de4dc0910dd21d9 Mon Sep 17 00:00:00 2001 +From: "Dr. David Alan Gilbert" +Date: Wed, 31 Jul 2019 15:08:10 +0100 +Subject: [PATCH 1/6] x86 machine types: pc_rhel_8_0_compat + +RH-Author: Dr. David Alan Gilbert +Message-id: <20190731150814.29571-2-dgilbert@redhat.com> +Patchwork-id: 89816 +O-Subject: [RHEL-AV-8.1.0 qemu-kvm PATCH v3 1/5] x86 machine types: pc_rhel_8_0_compat +Bugzilla: 1719649 +RH-Acked-by: Laszlo Ersek +RH-Acked-by: Markus Armbruster +RH-Acked-by: Cornelia Huck + +From: "Dr. David Alan Gilbert" + +Create the pc_rhel_8_0_compat array based off pc_compat_3_1. +It's the same except for a chunk of mpx=on entries that +we already put in the pc_rhel_7_6_compat. + +Signed-off-by: Dr. David Alan Gilbert +Signed-off-by: Danilo C. L. de Paula +--- + hw/i386/pc.c | 33 +++++++++++++++++++++++++++++++++ + include/hw/i386/pc.h | 3 +++ + 2 files changed, 36 insertions(+) + +diff --git a/hw/i386/pc.c b/hw/i386/pc.c +index b3d2d1e..f19fed4 100644 +--- a/hw/i386/pc.c ++++ b/hw/i386/pc.c +@@ -366,6 +366,39 @@ GlobalProperty pc_rhel_compat[] = { + }; + const size_t pc_rhel_compat_len = G_N_ELEMENTS(pc_rhel_compat); + ++GlobalProperty pc_rhel_8_0_compat[] = { ++ /* pc_rhel_8_0_compat from pc_compat_3_1 */ ++ { "intel-iommu", "dma-drain", "off" }, ++ /* pc_rhel_8_0_compat from pc_compat_3_1 */ ++ { "Opteron_G3" "-" TYPE_X86_CPU, "rdtscp", "off" }, ++ /* pc_rhel_8_0_compat from pc_compat_3_1 */ ++ { "Opteron_G4" "-" TYPE_X86_CPU, "rdtscp", "off" }, ++ /* pc_rhel_8_0_compat from pc_compat_3_1 */ ++ { "Opteron_G4" "-" TYPE_X86_CPU, "npt", "off" }, ++ /* pc_rhel_8_0_compat from pc_compat_3_1 */ ++ { "Opteron_G4" "-" TYPE_X86_CPU, "nrip-save", "off" }, ++ /* pc_rhel_8_0_compat from pc_compat_3_1 */ ++ { "Opteron_G5" "-" TYPE_X86_CPU, "rdtscp", "off" }, ++ /* pc_rhel_8_0_compat from pc_compat_3_1 */ ++ { "Opteron_G5" "-" TYPE_X86_CPU, "npt", "off" }, ++ /* pc_rhel_8_0_compat from pc_compat_3_1 */ ++ { "Opteron_G5" "-" TYPE_X86_CPU, "nrip-save", "off" }, ++ /* pc_rhel_8_0_compat from pc_compat_3_1 */ ++ { "EPYC" "-" TYPE_X86_CPU, "npt", "off" }, ++ /* pc_rhel_8_0_compat from pc_compat_3_1 */ ++ { "EPYC" "-" TYPE_X86_CPU, "nrip-save", "off" }, ++ /* pc_rhel_8_0_compat from pc_compat_3_1 */ ++ { "EPYC-IBPB" "-" TYPE_X86_CPU, "npt", "off" }, ++ /* pc_rhel_8_0_compat from pc_compat_3_1 */ ++ { "EPYC-IBPB" "-" TYPE_X86_CPU, "nrip-save", "off" }, ++ /** The mpx=on entries from pc_compat_3_1 are in pc_rhel_7_6_compat **/ ++ /* pc_rhel_8_0_compat from pc_compat_3_1 */ ++ { "Cascadelake-Server" "-" TYPE_X86_CPU, "stepping", "5" }, ++ /* pc_rhel_8_0_compat from pc_compat_3_1 */ ++ { TYPE_X86_CPU, "x-intel-pt-auto-level", "off" }, ++}; ++const size_t pc_rhel_8_0_compat_len = G_N_ELEMENTS(pc_rhel_8_0_compat); ++ + /* Similar to PC_COMPAT_3_0 + PC_COMPAT_2_12, but: + * all of the 2_12 stuff was already in 7.6 from bz 1481253 + * x-migrate-smi-count comes from PC_COMPAT_2_11 but +diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h +index 605cc71..2f24333 100644 +--- a/include/hw/i386/pc.h ++++ b/include/hw/i386/pc.h +@@ -368,6 +368,9 @@ extern const size_t pc_compat_1_4_len; + extern GlobalProperty pc_rhel_compat[]; + extern const size_t pc_rhel_compat_len; + ++extern GlobalProperty pc_rhel_8_0_compat[]; ++extern const size_t pc_rhel_8_0_compat_len; ++ + extern GlobalProperty pc_rhel_7_6_compat[]; + extern const size_t pc_rhel_7_6_compat_len; + +-- +1.8.3.1 + diff --git a/kvm-x86-machine-types-q35-Fixup-units_per_default_bus.patch b/kvm-x86-machine-types-q35-Fixup-units_per_default_bus.patch new file mode 100644 index 0000000..781c3af --- /dev/null +++ b/kvm-x86-machine-types-q35-Fixup-units_per_default_bus.patch @@ -0,0 +1,57 @@ +From 9de83a880cf0e397db7c8bfdbf009f137c8eaf8a Mon Sep 17 00:00:00 2001 +From: "Dr. David Alan Gilbert" +Date: Wed, 31 Jul 2019 15:08:11 +0100 +Subject: [PATCH 2/6] x86 machine types: q35: Fixup units_per_default_bus + +RH-Author: Dr. David Alan Gilbert +Message-id: <20190731150814.29571-3-dgilbert@redhat.com> +Patchwork-id: 89818 +O-Subject: [RHEL-AV-8.1.0 qemu-kvm PATCH v3 2/5] x86 machine types: q35: Fixup units_per_default_bus +Bugzilla: 1719649 +RH-Acked-by: Laszlo Ersek +RH-Acked-by: Markus Armbruster +RH-Acked-by: Cornelia Huck + +x86 machine types: q35: Fixup units_per_default_bus + +We omitted the line: + m->units_per_default_bus = 1; + +in our rebase from 2.1.2 (which doesn't have ->units_per_default_bus) +to 2.3.0 (which does). Specifically, in commit ed6d215ef93. + +It's safe for us to add, because: + a) It changes the behaviour when you don't specify a bus/device + number, however libvirt always specifies it, so it's always + safe downstream for us with libvirt which we require. + + b) The behaviour change isn't actually seen by the guest. i.e. + the change from having two SATA devices from: + ide0-hd0, ide0-hd1 + to + ide0-hd0, ide1-hd0 + + is hidden because by the time it gets through the SATA code + it ends up back as two single SATA devices on their own bus. + +Signed-off-by: Dr. David Alan Gilbert +Signed-off-by: Danilo C. L. de Paula +--- + hw/i386/pc_q35.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c +index 4959ed3..068813d 100644 +--- a/hw/i386/pc_q35.c ++++ b/hw/i386/pc_q35.c +@@ -549,6 +549,7 @@ static void pc_q35_machine_rhel_options(MachineClass *m) + PCMachineClass *pcmc = PC_MACHINE_CLASS(m); + pcmc->default_nic_model = "e1000e"; + m->family = "pc_q35_Z"; ++ m->units_per_default_bus = 1; + m->default_machine_opts = "firmware=bios-256k.bin"; + m->default_display = "std"; + m->no_floppy = 1; +-- +1.8.3.1 + diff --git a/qemu-kvm.spec b/qemu-kvm.spec index 2af9ec5..0f0e249 100644 --- a/qemu-kvm.spec +++ b/qemu-kvm.spec @@ -67,7 +67,7 @@ Obsoletes: %1-rhev Summary: QEMU is a machine emulator and virtualizer Name: qemu-kvm Version: 4.1.0 -Release: 2%{?dist} +Release: 3%{?dist} # Epoch because we pushed a qemu-1.0 package. AIUI this can't ever be dropped Epoch: 15 License: GPLv2 and GPLv2+ and CC-BY @@ -121,6 +121,18 @@ Patch0017: 0017-usb-xhci-Fix-PCI-capability-order.patch Patch0018: 0018-virtio-scsi-Reject-scsi-cd-if-data-plane-enabled-RHE.patch Patch0019: 0019-BZ1653590-Require-at-least-64kiB-pages-for-downstrea.patch Patch0020: 0020-pc-Don-t-make-die-id-mandatory-unless-necessary.patch +# For bz#1719649 - 8.1 machine type for x86 +Patch21: kvm-x86-machine-types-pc_rhel_8_0_compat.patch +# For bz#1719649 - 8.1 machine type for x86 +Patch22: kvm-x86-machine-types-q35-Fixup-units_per_default_bus.patch +# For bz#1719649 - 8.1 machine type for x86 +Patch23: kvm-x86-machine-types-Fixup-dynamic-sysbus-entries.patch +# For bz#1719649 - 8.1 machine type for x86 +Patch24: kvm-x86-machine-types-add-pc-q35-rhel8.1.0.patch +# For bz#1719649 - 8.1 machine type for x86 +Patch25: kvm-machine-types-Update-hw_compat_rhel_8_0-from-hw_comp.patch +# For bz#1719649 - 8.1 machine type for x86 +Patch26: kvm-virtio-Make-disable-legacy-disable-modern-compat-pro.patch BuildRequires: wget BuildRequires: rpm-build @@ -1062,6 +1074,16 @@ useradd -r -u 107 -g qemu -G kvm -d / -s /sbin/nologin \ %changelog +* Mon Aug 19 2019 Danilo Cesar Lemes de Paula - 4.1.0-3.el8 +- kvm-x86-machine-types-pc_rhel_8_0_compat.patch [bz#1719649] +- kvm-x86-machine-types-q35-Fixup-units_per_default_bus.patch [bz#1719649] +- kvm-x86-machine-types-Fixup-dynamic-sysbus-entries.patch [bz#1719649] +- kvm-x86-machine-types-add-pc-q35-rhel8.1.0.patch [bz#1719649] +- kvm-machine-types-Update-hw_compat_rhel_8_0-from-hw_comp.patch [bz#1719649] +- kvm-virtio-Make-disable-legacy-disable-modern-compat-pro.patch [bz#1719649] +- Resolves: bz#1719649 + (8.1 machine type for x86) + * Mon Aug 19 2019 Danilo Cesar Lemes de Paula - 4.1.0-2.el8 - kvm-spec-Update-seavgabios-dependency.patch [bz#1725664] - kvm-pc-Don-t-make-die-id-mandatory-unless-necessary.patch [bz#1741451]