From 68a8aa6b4d9183b2a9fede54885bc592ef6a3686 Mon Sep 17 00:00:00 2001 From: "Danilo C. L. de Paula" Date: Wed, 13 May 2020 10:58:13 -0400 Subject: [PATCH] Properly syncronize with the actuall 5.0.0 GA of qemu -Resolves: rhbz#1809650 (rebase qemu-kvm to 5.1 for RHEL AV-8.3.0) --- ...at-Adding-slirp-to-the-exploded-tree.patch | 2 +- 0005-Initial-redhat-build.patch | 12 +++--- 0006-Enable-disable-devices-for-RHEL.patch | 43 +++++++++---------- ...Machine-type-related-general-changes.patch | 27 ++++++------ 0008-Add-aarch64-machine-types.patch | 29 ++++++------- 0009-Add-ppc64-machine-types.patch | 2 +- 0010-Add-s390x-machine-types.patch | 10 ++--- 0011-Add-x86_64-machine-types.patch | 38 ++++++++-------- 0012-Enable-make-check.patch | 4 +- ...mber-of-devices-that-can-be-assigned.patch | 2 +- ...Add-support-statement-to-help-output.patch | 4 +- ...lly-limit-the-maximum-number-of-CPUs.patch | 4 +- 0016-Add-support-for-simpletrace.patch | 6 +-- ...documentation-instead-of-qemu-system.patch | 2 +- 0018-usb-xhci-Fix-PCI-capability-order.patch | 2 +- ...ct-scsi-cd-if-data-plane-enabled-RHE.patch | 2 +- ...e-at-least-64kiB-pages-for-downstrea.patch | 2 +- ...x-blockdev-reopen-API-with-feature-f.patch | 2 +- qemu-kvm.spec | 1 + sources | 2 +- 20 files changed, 95 insertions(+), 101 deletions(-) diff --git a/0001-redhat-Adding-slirp-to-the-exploded-tree.patch b/0001-redhat-Adding-slirp-to-the-exploded-tree.patch index 04e73be..da6d424 100644 --- a/0001-redhat-Adding-slirp-to-the-exploded-tree.patch +++ b/0001-redhat-Adding-slirp-to-the-exploded-tree.patch @@ -1,4 +1,4 @@ -From e4d185c8c4efbf15a9380c1433bc66b49a09e79d Mon Sep 17 00:00:00 2001 +From 606314e48b9307fd4c79b08017a143d9f749d395 Mon Sep 17 00:00:00 2001 From: Miroslav Rezanina Date: Thu, 23 Apr 2020 05:26:54 +0200 Subject: redhat: Adding slirp to the exploded tree diff --git a/0005-Initial-redhat-build.patch b/0005-Initial-redhat-build.patch index 174bcc9..21a0cf8 100644 --- a/0005-Initial-redhat-build.patch +++ b/0005-Initial-redhat-build.patch @@ -1,4 +1,4 @@ -From 4b7f57db366243eeafc0528d3cff4fa6967e7522 Mon Sep 17 00:00:00 2001 +From b510775819649eeb2499b9d4b9baf93538d4bde7 Mon Sep 17 00:00:00 2001 From: Miroslav Rezanina Date: Fri, 12 Oct 2018 07:31:11 +0200 Subject: Initial redhat build @@ -11,7 +11,7 @@ several issues are fixed in QEMU tree: - Man page renamed from qemu to qemu-kvm - man page is installed using make install so we have to fix it in qemu tree -This rebase includes changes up to qemu-kvm-4.2.0-20.el8 +This rebase includes changes up to qemu-kvm-4.2.0-19.el8 Rebase notes (3.1.0): - added new configure options @@ -120,19 +120,19 @@ Conflicts: redhat/Makefile | 88 ++ redhat/Makefile.common | 51 + redhat/README.tests | 39 + - redhat/qemu-kvm.spec.template | 2820 +++++++++++++++++++++++++++++++++++ + redhat/qemu-kvm.spec.template | 2812 +++++++++++++++++++++++++++++++++++ redhat/scripts/extract_build_cmd.py | 2 +- redhat/scripts/process-patches.sh | 7 +- tests/check-block.sh | 2 + ui/vnc.c | 2 +- - 11 files changed, 3008 insertions(+), 8 deletions(-) + 11 files changed, 3000 insertions(+), 8 deletions(-) create mode 100644 redhat/Makefile create mode 100644 redhat/Makefile.common create mode 100644 redhat/README.tests create mode 100644 redhat/qemu-kvm.spec.template diff --git a/Makefile b/Makefile -index 34275f5..aee2e8e 100644 +index 8a9113e..a89cc44 100644 --- a/Makefile +++ b/Makefile @@ -548,6 +548,7 @@ CAP_CFLAGS += -DCAPSTONE_HAS_ARM @@ -143,7 +143,7 @@ index 34275f5..aee2e8e 100644 .PHONY: capstone/all capstone/all: .git-submodule-status -@@ -883,7 +884,7 @@ install-doc: $(DOCS) install-sphinxdocs +@@ -884,7 +885,7 @@ install-doc: $(DOCS) install-sphinxdocs $(INSTALL_DATA) docs/interop/qemu-qmp-ref.txt "$(DESTDIR)$(qemu_docdir)" ifdef CONFIG_POSIX $(INSTALL_DIR) "$(DESTDIR)$(mandir)/man1" diff --git a/0006-Enable-disable-devices-for-RHEL.patch b/0006-Enable-disable-devices-for-RHEL.patch index ff90dbb..7ebe37c 100644 --- a/0006-Enable-disable-devices-for-RHEL.patch +++ b/0006-Enable-disable-devices-for-RHEL.patch @@ -1,4 +1,4 @@ -From db33b6f22ff44edfb3ca54ef7bf051ccfc53e479 Mon Sep 17 00:00:00 2001 +From 950e13b225f6e890a2c19223b8a05cdc9ecabfa7 Mon Sep 17 00:00:00 2001 From: Miroslav Rezanina Date: Mon, 11 Jan 2016 11:53:33 +0100 Subject: Enable/disable devices for RHEL @@ -65,12 +65,9 @@ Merged patches (4.2.0): Merged patches (weekly-200108): - 4543a3c i386: Remove cpu64-rhel6 CPU model - -Conflicts: - target/arm/cpu.c --- backends/Makefile.objs | 3 +- - default-configs/aarch64-rh-devices.mak | 21 +++++++ + default-configs/aarch64-rh-devices.mak | 20 +++++++ default-configs/aarch64-softmmu.mak | 10 ++-- default-configs/ppc64-rh-devices.mak | 34 +++++++++++ default-configs/ppc64-softmmu.mak | 10 ++-- @@ -95,13 +92,13 @@ Conflicts: qemu-options.hx | 4 -- redhat/qemu-kvm.spec.template | 5 +- softmmu/vl.c | 2 +- - target/arm/cpu.c | 3 + + target/arm/cpu.c | 4 +- target/i386/cpu.c | 17 +++--- target/ppc/cpu-models.c | 10 ++++ target/s390x/cpu_models.c | 3 + target/s390x/kvm.c | 8 +++ util/memfd.c | 2 +- - 32 files changed, 281 insertions(+), 36 deletions(-) + 32 files changed, 280 insertions(+), 37 deletions(-) create mode 100644 default-configs/aarch64-rh-devices.mak create mode 100644 default-configs/ppc64-rh-devices.mak create mode 100644 default-configs/rh-virtio.mak @@ -125,10 +122,10 @@ index 28a847c..0eda216 100644 dbus-vmstate.o-cflags = $(GIO_CFLAGS) diff --git a/default-configs/aarch64-rh-devices.mak b/default-configs/aarch64-rh-devices.mak new file mode 100644 -index 0000000..0d756a2 +index 0000000..a1ed641 --- /dev/null +++ b/default-configs/aarch64-rh-devices.mak -@@ -0,0 +1,21 @@ +@@ -0,0 +1,20 @@ +include rh-virtio.mak + +CONFIG_ARM_GIC_KVM=y @@ -149,7 +146,6 @@ index 0000000..0d756a2 +CONFIG_VIRTIO_MMIO=y +CONFIG_VIRTIO_PCI=y +CONFIG_XIO3130=y -+CONFIG_NVDIMM=y diff --git a/default-configs/aarch64-softmmu.mak b/default-configs/aarch64-softmmu.mak index 958b1e0..8f6867d 100644 --- a/default-configs/aarch64-softmmu.mak @@ -426,7 +422,7 @@ index 534a6a1..bd62442 100644 obj-$(CONFIG_PXA2XX) += pxa2xx.o pxa2xx_gpio.o pxa2xx_pic.o obj-$(CONFIG_DIGIC) += digic.o diff --git a/hw/block/fdc.c b/hw/block/fdc.c -index 9628cc1..37989fe 100644 +index 33bc9e2..3cb8779 100644 --- a/hw/block/fdc.c +++ b/hw/block/fdc.c @@ -46,6 +46,8 @@ @@ -452,7 +448,7 @@ index 9628cc1..37989fe 100644 + if (fdctrl->fallback == FLOPPY_DRIVE_TYPE_AUTO) { error_setg(errp, "Cannot choose a fallback FDrive type of 'auto'"); - return; + } diff --git a/hw/bt/Makefile.objs b/hw/bt/Makefile.objs new file mode 100644 index 0000000..e678e9e @@ -492,10 +488,10 @@ index 77a7d62..68c793e 100644 common-obj-$(CONFIG_ADS7846) += ads7846.o common-obj-$(CONFIG_VGA_CIRRUS) += cirrus_vga.o diff --git a/hw/display/cirrus_vga.c b/hw/display/cirrus_vga.c -index 1f29731..cac9e40 100644 +index 0d391e1..fb1b2c4 100644 --- a/hw/display/cirrus_vga.c +++ b/hw/display/cirrus_vga.c -@@ -2973,6 +2973,9 @@ static void pci_cirrus_vga_realize(PCIDevice *dev, Error **errp) +@@ -2975,6 +2975,9 @@ static void pci_cirrus_vga_realize(PCIDevice *dev, Error **errp) PCIDeviceClass *pc = PCI_DEVICE_GET_CLASS(dev); int16_t device_id = pc->device_id; @@ -637,7 +633,7 @@ index 292d4e7..1df25ae 100644 DEF("acpitable", HAS_ARG, QEMU_OPTION_acpitable, "-acpitable [sig=str][,rev=n][,oem_id=str][,oem_table_id=str][,oem_rev=n][,asl_compiler_id=str][,asl_compiler_rev=n][,{data|file}=file1[:file2]...]\n" diff --git a/softmmu/vl.c b/softmmu/vl.c -index afd2615..00f7604 100644 +index 32c0047..46b4d98 100644 --- a/softmmu/vl.c +++ b/softmmu/vl.c @@ -144,7 +144,7 @@ static Chardev **serial_hds; @@ -650,21 +646,22 @@ index afd2615..00f7604 100644 static int no_reboot; int no_shutdown = 0; diff --git a/target/arm/cpu.c b/target/arm/cpu.c -index 5d64adf..f1d18b8 100644 +index a79f233..dcdf3b2 100644 --- a/target/arm/cpu.c +++ b/target/arm/cpu.c -@@ -2904,6 +2904,9 @@ static void arm_cpu_register_types(void) +@@ -2905,7 +2905,9 @@ static void arm_cpu_register_types(void) + type_register_static(&idau_interface_type_info); while (info->name) { - arm_cpu_register(info); +- cpu_register(info); + /* RHEL specific: Filter out unsupported cpu models */ -+ if (!strcmp(info->name, "cortex-a15-arm-cpu")) -+ arm_cpu_register(info); ++ if (!strcmp(info->name, "cortex-a15")) ++ cpu_register(info); info++; } diff --git a/target/i386/cpu.c b/target/i386/cpu.c -index 9c256ab..26a8584 100644 +index 90ffc5f..d98618c 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -1801,20 +1801,21 @@ static CPUCaches epyc_rome_cache_info = { @@ -782,10 +779,10 @@ index 7c32180..88bf4a9 100644 /* detect missing features if any to properly report them */ diff --git a/target/s390x/kvm.c b/target/s390x/kvm.c -index 69881a0..9802878 100644 +index 7f7ebab..8dc2df2 100644 --- a/target/s390x/kvm.c +++ b/target/s390x/kvm.c -@@ -2494,6 +2494,14 @@ void kvm_s390_apply_cpu_model(const S390CPUModel *model, Error **errp) +@@ -2429,6 +2429,14 @@ void kvm_s390_apply_cpu_model(const S390CPUModel *model, Error **errp) error_setg(errp, "KVM doesn't support CPU models"); return; } diff --git a/0007-Machine-type-related-general-changes.patch b/0007-Machine-type-related-general-changes.patch index a302d2c..bb565a1 100644 --- a/0007-Machine-type-related-general-changes.patch +++ b/0007-Machine-type-related-general-changes.patch @@ -1,4 +1,4 @@ -From 799c934a1ec957ae2e163f367f5f7550949178da Mon Sep 17 00:00:00 2001 +From 355248605abeab3ad30da6be267d6352dfea65f0 Mon Sep 17 00:00:00 2001 From: Miroslav Rezanina Date: Fri, 11 Jan 2019 09:54:45 +0100 Subject: Machine type related general changes @@ -35,9 +35,6 @@ Merged patches (4.2.0): Merged patches (weekly-200318): - e6c3fbf hw/smbios: set new default SMBIOS fields for Windows driver support (partialy) - -Merged patches (weekly-200506): -- 8f9f4d8 compat: disable 'edid' for virtio-gpu-ccw --- hw/acpi/ich9.c | 16 ++++ hw/acpi/piix4.c | 5 +- @@ -122,10 +119,10 @@ index 964d6f5..b8458ba 100644 DEFINE_PROP_BOOL("acpi-pci-hotplug-with-bridge-support", PIIX4PMState, use_acpi_pci_hotplug, true), diff --git a/hw/arm/virt.c b/hw/arm/virt.c -index 171e690..25e6839 100644 +index 7dc96ab..1f8d6bf 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c -@@ -1436,7 +1436,7 @@ static void virt_build_smbios(VirtMachineState *vms) +@@ -1413,7 +1413,7 @@ static void virt_build_smbios(VirtMachineState *vms) smbios_set_defaults("QEMU", product, vmc->smbios_old_sys_ver ? "1.0" : mc->name, false, @@ -190,7 +187,7 @@ index c822a9a..0c7f1ff 100644 } diff --git a/hw/core/machine.c b/hw/core/machine.c -index c1a444c..af407cc 100644 +index c1a444c..3c45365 100644 --- a/hw/core/machine.c +++ b/hw/core/machine.c @@ -28,6 +28,176 @@ @@ -242,7 +239,7 @@ index c1a444c..af407cc 100644 + /* 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" }, ++ { "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 */ @@ -384,10 +381,10 @@ index 0633ed3..b703e9e 100644 }; diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c -index b75087d..b255d56 100644 +index 22dee0e..26ff640 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c -@@ -177,6 +177,8 @@ static void pc_init1(MachineState *machine, +@@ -176,6 +176,8 @@ static void pc_init1(MachineState *machine, smbios_set_defaults("QEMU", "Standard PC (i440FX + PIIX, 1996)", mc->name, pcmc->smbios_legacy_mode, pcmc->smbios_uuid_encoded, @@ -397,10 +394,10 @@ index b75087d..b255d56 100644 } diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c -index d2806c1..461e1cd 100644 +index d37c425..f67232e 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c -@@ -202,6 +202,8 @@ static void pc_q35_init(MachineState *machine) +@@ -201,6 +201,8 @@ static void pc_q35_init(MachineState *machine) smbios_set_defaults("QEMU", "Standard PC (Q35 + ICH9, 2009)", mc->name, pcmc->smbios_legacy_mode, pcmc->smbios_uuid_encoded, @@ -507,7 +504,7 @@ index 70aca7e..0950cee 100644 VMSTATE_UINT16(tally_counters.TxUndrn, RTL8139State), diff --git a/hw/rtc/mc146818rtc.c b/hw/rtc/mc146818rtc.c -index d18c099..8a3bd68 100644 +index dc4269c..3fb9469 100644 --- a/hw/rtc/mc146818rtc.c +++ b/hw/rtc/mc146818rtc.c @@ -42,6 +42,7 @@ @@ -763,7 +760,7 @@ index 02a0ced..67e38a1 100644 void smbios_get_tables(MachineState *ms, const struct smbios_phys_mem_area *mem_array, diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h -index 05e1945..811c3d5 100644 +index 6ab6eda..69fca4e 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -100,6 +100,9 @@ typedef struct PCMachineClass { @@ -790,7 +787,7 @@ index c24d968..b353438 100644 + #endif diff --git a/migration/migration.c b/migration/migration.c -index 177cce9..2864560 100644 +index 187ac04..041b773 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -128,6 +128,8 @@ enum mig_rp_message_type { diff --git a/0008-Add-aarch64-machine-types.patch b/0008-Add-aarch64-machine-types.patch index 320b19f..ce2aba5 100644 --- a/0008-Add-aarch64-machine-types.patch +++ b/0008-Add-aarch64-machine-types.patch @@ -1,4 +1,4 @@ -From a373b0198f9268478a5211efb6a545d9c598b364 Mon Sep 17 00:00:00 2001 +From 449b1fd5bc6075a535cb57e6e0b0eda837663a52 Mon Sep 17 00:00:00 2001 From: Miroslav Rezanina Date: Fri, 19 Oct 2018 12:53:31 +0200 Subject: Add aarch64 machine types @@ -38,23 +38,23 @@ Merged patches (4.1.0): - c3e39ef aarch64: Add virt-rhel8.1.0 machine type for ARM - 59a46d1 aarch64: Allow ARM VIRT iommu option in RHEL8.1 machine --- - hw/arm/virt.c | 169 +++++++++++++++++++++++++++++++++++++++++++++++++- + hw/arm/virt.c | 168 +++++++++++++++++++++++++++++++++++++++++++++++++- include/hw/arm/virt.h | 11 ++++ - 2 files changed, 179 insertions(+), 1 deletion(-) + 2 files changed, 178 insertions(+), 1 deletion(-) diff --git a/hw/arm/virt.c b/hw/arm/virt.c -index 25e6839..1387ff6 100644 +index 1f8d6bf..1559689 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c -@@ -79,6 +79,7 @@ +@@ -78,6 +78,7 @@ + #include "hw/virtio/virtio-iommu.h" #include "hw/char/pl011.h" - #include "qemu/guest-random.h" +#if 0 /* Disabled for Red Hat Enterprise Linux */ #define DEFINE_VIRT_MACHINE_LATEST(major, minor, latest) \ static void virt_##major##_##minor##_class_init(ObjectClass *oc, \ void *data) \ -@@ -105,7 +106,49 @@ +@@ -104,7 +105,49 @@ DEFINE_VIRT_MACHINE_LATEST(major, minor, true) #define DEFINE_VIRT_MACHINE(major, minor) \ DEFINE_VIRT_MACHINE_LATEST(major, minor, false) @@ -105,7 +105,7 @@ index 25e6839..1387ff6 100644 /* Number of external interrupt lines to configure the GIC with */ #define NUM_IRQS 256 -@@ -1914,6 +1957,7 @@ static void machvirt_init(MachineState *machine) +@@ -1879,6 +1922,7 @@ static void machvirt_init(MachineState *machine) qemu_add_machine_init_done_notifier(&vms->machine_done); } @@ -113,7 +113,7 @@ index 25e6839..1387ff6 100644 static bool virt_get_secure(Object *obj, Error **errp) { VirtMachineState *vms = VIRT_MACHINE(obj); -@@ -1942,6 +1986,7 @@ static void virt_set_virt(Object *obj, bool value, Error **errp) +@@ -1907,6 +1951,7 @@ static void virt_set_virt(Object *obj, bool value, Error **errp) vms->virt = value; } @@ -121,7 +121,7 @@ index 25e6839..1387ff6 100644 static bool virt_get_highmem(Object *obj, Error **errp) { VirtMachineState *vms = VIRT_MACHINE(obj); -@@ -2218,6 +2263,7 @@ static int virt_kvm_type(MachineState *ms, const char *type_str) +@@ -2176,6 +2221,7 @@ static int virt_kvm_type(MachineState *ms, const char *type_str) return requested_pa_size > 40 ? requested_pa_size : 0; } @@ -129,7 +129,7 @@ index 25e6839..1387ff6 100644 static void virt_machine_class_init(ObjectClass *oc, void *data) { MachineClass *mc = MACHINE_CLASS(oc); -@@ -2478,3 +2524,124 @@ static void virt_machine_2_6_options(MachineClass *mc) +@@ -2435,3 +2481,123 @@ static void virt_machine_2_6_options(MachineClass *mc) vmc->no_pmu = true; } DEFINE_VIRT_MACHINE(2, 6) @@ -163,7 +163,6 @@ index 25e6839..1387ff6 100644 + hc->plug = virt_machine_device_plug_cb; + hc->unplug_request = virt_machine_device_unplug_request_cb; + mc->numa_mem_supported = true; -+ mc->nvdimm_supported = true; + mc->auto_enable_numa_with_memhp = true; + mc->default_ram_id = "mach-virt.ram"; + @@ -255,10 +254,10 @@ index 25e6839..1387ff6 100644 +} +DEFINE_RHEL_MACHINE_AS_LATEST(8, 2, 0) diff --git a/include/hw/arm/virt.h b/include/hw/arm/virt.h -index 6d67ace..e44e25c 100644 +index 60b2f52..ae44797 100644 --- a/include/hw/arm/virt.h +++ b/include/hw/arm/virt.h -@@ -156,6 +156,7 @@ typedef struct { +@@ -155,6 +155,7 @@ typedef struct { #define VIRT_ECAM_ID(high) (high ? VIRT_HIGH_PCIE_ECAM : VIRT_PCIE_ECAM) @@ -266,7 +265,7 @@ index 6d67ace..e44e25c 100644 #define TYPE_VIRT_MACHINE MACHINE_TYPE_NAME("virt") #define VIRT_MACHINE(obj) \ OBJECT_CHECK(VirtMachineState, (obj), TYPE_VIRT_MACHINE) -@@ -164,6 +165,16 @@ typedef struct { +@@ -163,6 +164,16 @@ typedef struct { #define VIRT_MACHINE_CLASS(klass) \ OBJECT_CLASS_CHECK(VirtMachineClass, klass, TYPE_VIRT_MACHINE) diff --git a/0009-Add-ppc64-machine-types.patch b/0009-Add-ppc64-machine-types.patch index b14fcee..0c3b0df 100644 --- a/0009-Add-ppc64-machine-types.patch +++ b/0009-Add-ppc64-machine-types.patch @@ -1,4 +1,4 @@ -From c50a71e2a577b532a904e70d23f7533aca0b3a6f Mon Sep 17 00:00:00 2001 +From a07369c763a13a1bbc97b162f5d029a0d98d6fd3 Mon Sep 17 00:00:00 2001 From: Miroslav Rezanina Date: Fri, 19 Oct 2018 13:27:13 +0200 Subject: Add ppc64 machine types diff --git a/0010-Add-s390x-machine-types.patch b/0010-Add-s390x-machine-types.patch index bed50e9..4b5b8c5 100644 --- a/0010-Add-s390x-machine-types.patch +++ b/0010-Add-s390x-machine-types.patch @@ -1,4 +1,4 @@ -From 349c332a69933b977b40f4a2198236611d002818 Mon Sep 17 00:00:00 2001 +From d51b2da2b2f22313593ec618f510ebf7452b94af Mon Sep 17 00:00:00 2001 From: Miroslav Rezanina Date: Fri, 19 Oct 2018 13:47:32 +0200 Subject: Add s390x machine types @@ -25,10 +25,10 @@ Merged patches (4.2.0): 1 file changed, 70 insertions(+), 1 deletion(-) diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c -index 45292fb..1b3a04c 100644 +index 0fa00a9..d61d85d 100644 --- a/hw/s390x/s390-virtio-ccw.c +++ b/hw/s390x/s390-virtio-ccw.c -@@ -777,7 +777,7 @@ bool css_migration_enabled(void) +@@ -648,7 +648,7 @@ bool css_migration_enabled(void) { \ MachineClass *mc = MACHINE_CLASS(oc); \ ccw_machine_##suffix##_class_options(mc); \ @@ -37,7 +37,7 @@ index 45292fb..1b3a04c 100644 if (latest) { \ mc->alias = "s390-ccw-virtio"; \ mc->is_default = true; \ -@@ -801,6 +801,7 @@ bool css_migration_enabled(void) +@@ -672,6 +672,7 @@ bool css_migration_enabled(void) } \ type_init(ccw_machine_register_##suffix) @@ -45,7 +45,7 @@ index 45292fb..1b3a04c 100644 static void ccw_machine_5_0_instance_options(MachineState *machine) { } -@@ -1041,6 +1042,74 @@ static void ccw_machine_2_4_class_options(MachineClass *mc) +@@ -912,6 +913,74 @@ static void ccw_machine_2_4_class_options(MachineClass *mc) compat_props_add(mc->compat_props, compat, G_N_ELEMENTS(compat)); } DEFINE_CCW_MACHINE(2_4, "2.4", false); diff --git a/0011-Add-x86_64-machine-types.patch b/0011-Add-x86_64-machine-types.patch index fba69c6..338c262 100644 --- a/0011-Add-x86_64-machine-types.patch +++ b/0011-Add-x86_64-machine-types.patch @@ -1,4 +1,4 @@ -From 9da7d3c4b5a90c155ea4227c412b0ebd4d2a9b87 Mon Sep 17 00:00:00 2001 +From fa1624d37542a12fc2668b23b2a7a9a650457dcc Mon Sep 17 00:00:00 2001 From: Miroslav Rezanina Date: Fri, 19 Oct 2018 13:10:31 +0200 Subject: Add x86_64 machine types @@ -54,10 +54,10 @@ Merged patches (weekly-200318): 8 files changed, 675 insertions(+), 7 deletions(-) diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c -index 2e15f68..8dbf49b 100644 +index 23c77ee..6cfcdfc 100644 --- a/hw/i386/acpi-build.c +++ b/hw/i386/acpi-build.c -@@ -213,6 +213,9 @@ static void acpi_get_pm_info(MachineState *machine, AcpiPmInfo *pm) +@@ -207,6 +207,9 @@ static void acpi_get_pm_info(MachineState *machine, AcpiPmInfo *pm) pm->fadt.reset_reg = r; pm->fadt.reset_val = 0xf; pm->fadt.flags |= 1 << ACPI_FADT_F_RESET_REG_SUP; @@ -68,10 +68,10 @@ index 2e15f68..8dbf49b 100644 } diff --git a/hw/i386/pc.c b/hw/i386/pc.c -index f6b8431..2ed002f 100644 +index 5143c51..382a17b 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c -@@ -341,6 +341,263 @@ GlobalProperty pc_compat_1_4[] = { +@@ -340,6 +340,263 @@ GlobalProperty pc_compat_1_4[] = { }; const size_t pc_compat_1_4_len = G_N_ELEMENTS(pc_compat_1_4); @@ -335,7 +335,7 @@ index f6b8431..2ed002f 100644 GSIState *pc_gsi_create(qemu_irq **irqs, bool pci_enabled) { GSIState *s; -@@ -1031,7 +1288,8 @@ void pc_memory_init(PCMachineState *pcms, +@@ -1030,7 +1287,8 @@ void pc_memory_init(PCMachineState *pcms, option_rom_mr = g_malloc(sizeof(*option_rom_mr)); memory_region_init_ram(option_rom_mr, NULL, "pc.rom", PC_ROM_SIZE, &error_fatal); @@ -345,7 +345,7 @@ index f6b8431..2ed002f 100644 memory_region_set_readonly(option_rom_mr, true); } memory_region_add_subregion_overlap(rom_memory, -@@ -1937,6 +2195,8 @@ static void pc_machine_class_init(ObjectClass *oc, void *data) +@@ -1936,6 +2194,8 @@ static void pc_machine_class_init(ObjectClass *oc, void *data) pcmc->linuxboot_dma_enabled = true; pcmc->pvh_enabled = true; assert(!mc->get_hotplug_handler); @@ -354,7 +354,7 @@ index f6b8431..2ed002f 100644 mc->get_hotplug_handler = pc_get_hotplug_handler; mc->hotplug_allowed = pc_hotplug_allowed; mc->cpu_index_to_instance_props = x86_cpu_index_to_props; -@@ -1948,7 +2208,8 @@ static void pc_machine_class_init(ObjectClass *oc, void *data) +@@ -1947,7 +2207,8 @@ static void pc_machine_class_init(ObjectClass *oc, void *data) mc->hot_add_cpu = pc_hot_add_cpu; mc->smp_parse = pc_smp_parse; mc->block_default_type = IF_IDE; @@ -365,7 +365,7 @@ index f6b8431..2ed002f 100644 mc->wakeup = pc_machine_wakeup; hc->pre_plug = pc_machine_device_pre_plug_cb; diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c -index b255d56..8eb64d1 100644 +index 26ff640..74a434d 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -53,6 +53,7 @@ @@ -376,7 +376,7 @@ index b255d56..8eb64d1 100644 #ifdef CONFIG_XEN #include #include "hw/xen/xen_pt.h" -@@ -174,8 +175,8 @@ static void pc_init1(MachineState *machine, +@@ -173,8 +174,8 @@ static void pc_init1(MachineState *machine, if (pcmc->smbios_defaults) { MachineClass *mc = MACHINE_GET_CLASS(machine); /* These values are guest ABI, do not change */ @@ -387,7 +387,7 @@ index b255d56..8eb64d1 100644 pcmc->smbios_uuid_encoded, pcmc->smbios_stream_product, pcmc->smbios_stream_version, -@@ -312,6 +313,7 @@ static void pc_init1(MachineState *machine, +@@ -310,6 +311,7 @@ static void pc_init1(MachineState *machine, * hw_compat_*, pc_compat_*, or * pc_*_machine_options(). */ @@ -395,7 +395,7 @@ index b255d56..8eb64d1 100644 static void pc_compat_2_3_fn(MachineState *machine) { X86MachineState *x86ms = X86_MACHINE(machine); -@@ -975,3 +977,207 @@ static void xenfv_3_1_machine_options(MachineClass *m) +@@ -973,3 +975,207 @@ static void xenfv_3_1_machine_options(MachineClass *m) DEFINE_PC_MACHINE(xenfv, "xenfv-3.1", pc_xen_hvm_init, xenfv_3_1_machine_options); #endif @@ -604,10 +604,10 @@ index b255d56..8eb64d1 100644 +DEFINE_PC_MACHINE(rhel700, "pc-i440fx-rhel7.0.0", pc_init_rhel700, + pc_machine_rhel700_options); diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c -index 461e1cd..f5ae759 100644 +index f67232e..daa05f4 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c -@@ -199,8 +199,8 @@ static void pc_q35_init(MachineState *machine) +@@ -198,8 +198,8 @@ static void pc_q35_init(MachineState *machine) if (pcmc->smbios_defaults) { /* These values are guest ABI, do not change */ @@ -618,7 +618,7 @@ index 461e1cd..f5ae759 100644 pcmc->smbios_uuid_encoded, pcmc->smbios_stream_product, pcmc->smbios_stream_version, -@@ -335,6 +335,7 @@ static void pc_q35_init(MachineState *machine) +@@ -333,6 +333,7 @@ static void pc_q35_init(MachineState *machine) DEFINE_PC_MACHINE(suffix, name, pc_init_##suffix, optionfn) @@ -626,7 +626,7 @@ index 461e1cd..f5ae759 100644 static void pc_q35_machine_options(MachineClass *m) { PCMachineClass *pcmc = PC_MACHINE_CLASS(m); -@@ -549,3 +550,160 @@ static void pc_q35_2_4_machine_options(MachineClass *m) +@@ -547,3 +548,160 @@ static void pc_q35_2_4_machine_options(MachineClass *m) DEFINE_Q35_MACHINE(v2_4, "pc-q35-2.4", NULL, pc_q35_2_4_machine_options); @@ -801,7 +801,7 @@ index 0046ab5..d81225b 100644 int nb_nodes, ram_addr_t size); bool ignore_boot_device_suffixes; diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h -index 811c3d5..5b90f8b 100644 +index 69fca4e..2e0395b 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -118,6 +118,9 @@ typedef struct PCMachineClass { @@ -814,7 +814,7 @@ index 811c3d5..5b90f8b 100644 } PCMachineClass; #define TYPE_PC_MACHINE "generic-pc-machine" -@@ -260,6 +263,36 @@ extern const size_t pc_compat_1_5_len; +@@ -273,6 +276,36 @@ extern const size_t pc_compat_1_5_len; extern GlobalProperty pc_compat_1_4[]; extern const size_t pc_compat_1_4_len; @@ -852,7 +852,7 @@ index 811c3d5..5b90f8b 100644 * depending on QEMU versions up to QEMU 2.4. */ diff --git a/target/i386/cpu.c b/target/i386/cpu.c -index 26a8584..dc4d1c9 100644 +index d98618c..4cfaf91 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -1806,7 +1806,7 @@ static X86CPUDefinition builtin_x86_defs[] = { diff --git a/0012-Enable-make-check.patch b/0012-Enable-make-check.patch index cab4413..1c4fe6c 100644 --- a/0012-Enable-make-check.patch +++ b/0012-Enable-make-check.patch @@ -1,4 +1,4 @@ -From 0114b7010c87be70014b170ffdf66e1317f6becc Mon Sep 17 00:00:00 2001 +From 19bc7ed029e014148be05551a2f36b7d41035b1c Mon Sep 17 00:00:00 2001 From: Miroslav Rezanina Date: Fri, 19 Oct 2018 13:48:41 +0200 Subject: Enable make check @@ -82,7 +82,7 @@ index 034d3a3..aadc413 100755 *) ;; diff --git a/tests/qemu-iotests/group b/tests/qemu-iotests/group -index 1710470..0711b66 100644 +index 435dccd..4ad61bc 100644 --- a/tests/qemu-iotests/group +++ b/tests/qemu-iotests/group @@ -92,7 +92,7 @@ diff --git a/0013-vfio-cap-number-of-devices-that-can-be-assigned.patch b/0013-vfio-cap-number-of-devices-that-can-be-assigned.patch index 77ec099..b85574f 100644 --- a/0013-vfio-cap-number-of-devices-that-can-be-assigned.patch +++ b/0013-vfio-cap-number-of-devices-that-can-be-assigned.patch @@ -1,4 +1,4 @@ -From e77808a25ee638b717e1507a1e55cbf8350afbfd Mon Sep 17 00:00:00 2001 +From 59faef98f835eb3522a0b49f6af6302b20b17b72 Mon Sep 17 00:00:00 2001 From: Bandan Das Date: Tue, 3 Dec 2013 20:05:13 +0100 Subject: vfio: cap number of devices that can be assigned diff --git a/0014-Add-support-statement-to-help-output.patch b/0014-Add-support-statement-to-help-output.patch index d87713a..54d2b1b 100644 --- a/0014-Add-support-statement-to-help-output.patch +++ b/0014-Add-support-statement-to-help-output.patch @@ -1,4 +1,4 @@ -From 8b189d52c8b8e2c251d76c7b00dc4a2a0a570bf8 Mon Sep 17 00:00:00 2001 +From 583a53be6a7c1c7291ab3fa0d2a4b864ad07358f Mon Sep 17 00:00:00 2001 From: Eduardo Habkost Date: Wed, 4 Dec 2013 18:53:17 +0100 Subject: Add support statement to -help output @@ -23,7 +23,7 @@ Signed-off-by: Eduardo Habkost 1 file changed, 9 insertions(+) diff --git a/softmmu/vl.c b/softmmu/vl.c -index 00f7604..5ba8c19 100644 +index 46b4d98..552bae5 100644 --- a/softmmu/vl.c +++ b/softmmu/vl.c @@ -1674,9 +1674,17 @@ static void version(void) diff --git a/0015-globally-limit-the-maximum-number-of-CPUs.patch b/0015-globally-limit-the-maximum-number-of-CPUs.patch index 89e14e7..1a7f388 100644 --- a/0015-globally-limit-the-maximum-number-of-CPUs.patch +++ b/0015-globally-limit-the-maximum-number-of-CPUs.patch @@ -1,4 +1,4 @@ -From e0aee69fcafe1c3656db2676b8a0d379a48c299c Mon Sep 17 00:00:00 2001 +From 08d4d4615d252407ba4753e1b53087df813eb9d1 Mon Sep 17 00:00:00 2001 From: Andrew Jones Date: Tue, 21 Jan 2014 10:46:52 +0100 Subject: globally limit the maximum number of CPUs @@ -103,7 +103,7 @@ index 439a4ef..6f804b8 100644 if (nc->num > soft_vcpus_limit) { warn_report("Number of %s cpus requested (%d) exceeds " diff --git a/softmmu/vl.c b/softmmu/vl.c -index 5ba8c19..e98ab6b 100644 +index 552bae5..bdc4f7f 100644 --- a/softmmu/vl.c +++ b/softmmu/vl.c @@ -115,6 +115,8 @@ diff --git a/0016-Add-support-for-simpletrace.patch b/0016-Add-support-for-simpletrace.patch index d64625b..6725065 100644 --- a/0016-Add-support-for-simpletrace.patch +++ b/0016-Add-support-for-simpletrace.patch @@ -1,4 +1,4 @@ -From 565cee8e4965ece9e0c271cad813263b606b3e65 Mon Sep 17 00:00:00 2001 +From 6941da1d2cca51e23c525630610e10202db3434b Mon Sep 17 00:00:00 2001 From: Miroslav Rezanina Date: Thu, 8 Oct 2015 09:50:17 +0200 Subject: Add support for simpletrace @@ -37,10 +37,10 @@ Merged patches (2.3.0): create mode 100644 scripts/systemtap/script.d/qemu_kvm.stp diff --git a/Makefile b/Makefile -index aee2e8e..ded56e5 100644 +index a89cc44..dcd088e 100644 --- a/Makefile +++ b/Makefile -@@ -999,6 +999,10 @@ endif +@@ -1000,6 +1000,10 @@ endif $(INSTALL_DATA) $(SRC_PATH)/pc-bios/keymaps/$$x "$(DESTDIR)$(qemu_datadir)/keymaps"; \ done $(INSTALL_DATA) $(BUILD_DIR)/trace-events-all "$(DESTDIR)$(qemu_datadir)/trace-events-all" diff --git a/0017-Use-qemu-kvm-in-documentation-instead-of-qemu-system.patch b/0017-Use-qemu-kvm-in-documentation-instead-of-qemu-system.patch index 7065d7d..cc223aa 100644 --- a/0017-Use-qemu-kvm-in-documentation-instead-of-qemu-system.patch +++ b/0017-Use-qemu-kvm-in-documentation-instead-of-qemu-system.patch @@ -1,4 +1,4 @@ -From 4375e8b568866c7ddbde19de1bb999cf3ebfe6fe Mon Sep 17 00:00:00 2001 +From aaf64f4f80e6266921d9547f0b3b71e57abaf922 Mon Sep 17 00:00:00 2001 From: Miroslav Rezanina Date: Wed, 29 Jan 2020 09:30:03 +0100 Subject: Use qemu-kvm in documentation instead of qemu-system- diff --git a/0018-usb-xhci-Fix-PCI-capability-order.patch b/0018-usb-xhci-Fix-PCI-capability-order.patch index 8137171..33c77ab 100644 --- a/0018-usb-xhci-Fix-PCI-capability-order.patch +++ b/0018-usb-xhci-Fix-PCI-capability-order.patch @@ -1,4 +1,4 @@ -From 50d4f1973a86696cb7487173cbdbc68453445c54 Mon Sep 17 00:00:00 2001 +From ffa7a8516256750abd8c3bfb6964811582d36835 Mon Sep 17 00:00:00 2001 From: "Dr. David Alan Gilbert" Date: Fri, 5 May 2017 19:06:14 +0200 Subject: usb-xhci: Fix PCI capability order diff --git a/0019-virtio-scsi-Reject-scsi-cd-if-data-plane-enabled-RHE.patch b/0019-virtio-scsi-Reject-scsi-cd-if-data-plane-enabled-RHE.patch index c087f5e..ac784ce 100644 --- a/0019-virtio-scsi-Reject-scsi-cd-if-data-plane-enabled-RHE.patch +++ b/0019-virtio-scsi-Reject-scsi-cd-if-data-plane-enabled-RHE.patch @@ -1,4 +1,4 @@ -From 5d9529f40e7cc092a57f9203aad22f3644a2b6d6 Mon Sep 17 00:00:00 2001 +From 6f3b48a5ead2663197589066dfd4ed81d4658fe2 Mon Sep 17 00:00:00 2001 From: Fam Zheng Date: Wed, 14 Jun 2017 15:37:01 +0200 Subject: virtio-scsi: Reject scsi-cd if data plane enabled [RHEL only] diff --git a/0020-BZ1653590-Require-at-least-64kiB-pages-for-downstrea.patch b/0020-BZ1653590-Require-at-least-64kiB-pages-for-downstrea.patch index 41c655c..e999a52 100644 --- a/0020-BZ1653590-Require-at-least-64kiB-pages-for-downstrea.patch +++ b/0020-BZ1653590-Require-at-least-64kiB-pages-for-downstrea.patch @@ -1,4 +1,4 @@ -From 3ea4a35afce28805241b3be3c11de605600ecda1 Mon Sep 17 00:00:00 2001 +From 45b492a99791a4a463486be35e9ab44986507efe Mon Sep 17 00:00:00 2001 From: David Gibson Date: Wed, 6 Feb 2019 03:58:56 +0000 Subject: BZ1653590: Require at least 64kiB pages for downstream guests & hosts diff --git a/0021-block-Versioned-x-blockdev-reopen-API-with-feature-f.patch b/0021-block-Versioned-x-blockdev-reopen-API-with-feature-f.patch index be042ba..026ba5b 100644 --- a/0021-block-Versioned-x-blockdev-reopen-API-with-feature-f.patch +++ b/0021-block-Versioned-x-blockdev-reopen-API-with-feature-f.patch @@ -1,4 +1,4 @@ -From f07c3ee209b3897efebb4cf008c88a390205a5dd Mon Sep 17 00:00:00 2001 +From ce12fa518d472f85d7d036c65867f40ec69ca759 Mon Sep 17 00:00:00 2001 From: Kevin Wolf Date: Fri, 13 Mar 2020 12:34:32 +0000 Subject: block: Versioned x-blockdev-reopen API with feature flag diff --git a/qemu-kvm.spec b/qemu-kvm.spec index cfd328b..75a223b 100644 --- a/qemu-kvm.spec +++ b/qemu-kvm.spec @@ -1075,6 +1075,7 @@ useradd -r -u 107 -g qemu -G kvm -d / -s /sbin/nologin \ %changelog * Tue May 12 2020 Danilo Cesar Lemes de Paula - 5.0.0-0 - Temporary rebase of qemu-kvm to 5.0.0 +- Updated the tarball to actually point to 5.0.0 GA * Tue Apr 14 2020 Danilo Cesar Lemes de Paula - 4.2.0-19.el8_2 - kvm-target-i386-do-not-set-unsupported-VMX-secondary-exe.patch [bz#1822682] diff --git a/sources b/sources index 23b2923..bc432c6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (qemu-5.0.0.tar.xz) = 34c87dfc56c5a63c7649cdc1281cb742e7665e9f3fe2c1dfc1c6b3abf0ca937a2b8a0d4d8894060f6f3e03f4ba6616a11097c48b32db2cbc8925f87255b4acb5 +SHA512 (qemu-5.0.0.tar.xz) = 21ef0cbe107c468a40f0fa2635db2a40048c8790b629dfffca5cd62bb1b502ea8eb133bfc40df5ecf1489e2bffe87f6829aee041cb8a380ff04a8afa23b39fcf