diff --git a/.gitignore b/.gitignore index f08ebba..514e53e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /qemu-3.1.0.tar.xz /qemu-4.0.0.tar.xz /qemu-4.1.0-rc4.tar.xz +/qemu-4.1.0.tar.xz diff --git a/0004-Initial-redhat-build.patch b/0004-Initial-redhat-build.patch index 882f7ef..ae67911 100644 --- a/0004-Initial-redhat-build.patch +++ b/0004-Initial-redhat-build.patch @@ -1,4 +1,4 @@ -From d7ed59eb82b87992582d05933bbf68107962ba43 Mon Sep 17 00:00:00 2001 +From faeb6cfa3f274d32bcaee546b9fb5f577f895c34 Mon Sep 17 00:00:00 2001 From: Miroslav Rezanina Date: Fri, 12 Oct 2018 07:31:11 +0200 Subject: Initial redhat build @@ -63,6 +63,8 @@ Merged patches (4.1.0-rc0): Merged patches (4.1.0-rc3): - e1fe9fe x86_64-rh-devices: enable TPM emulation (partial) + +Signed-off-by: Danilo C. L. de Paula --- .gitignore | 1 + Makefile | 3 +- @@ -71,7 +73,7 @@ Merged patches (4.1.0-rc3): redhat/Makefile | 82 ++ redhat/Makefile.common | 51 + redhat/README.tests | 39 + - redhat/qemu-kvm.spec.template | 2202 +++++++++++++++++++++++++++++++++++++ + redhat/qemu-kvm.spec.template | 2202 +++++++++++++++++++++++++++++ redhat/scripts/process-patches.sh | 7 +- ui/vnc.c | 2 +- 10 files changed, 2382 insertions(+), 8 deletions(-) @@ -81,7 +83,7 @@ Merged patches (4.1.0-rc3): create mode 100644 redhat/qemu-kvm.spec.template diff --git a/Makefile b/Makefile -index 85862fb..288a5ac 100644 +index 85862fb81a..288a5ac28a 100644 --- a/Makefile +++ b/Makefile @@ -493,6 +493,7 @@ CAP_CFLAGS += -DCAPSTONE_HAS_ARM @@ -102,7 +104,7 @@ index 85862fb..288a5ac 100644 $(INSTALL_DATA) docs/interop/qemu-qmp-ref.7 "$(DESTDIR)$(mandir)/man7" $(INSTALL_DATA) docs/qemu-block-drivers.7 "$(DESTDIR)$(mandir)/man7" diff --git a/configure b/configure -index 714e7fb..4ecc861 100755 +index 714e7fb6a1..4ecc861a43 100755 --- a/configure +++ b/configure @@ -2424,6 +2424,7 @@ if test "$seccomp" != "no" ; then @@ -114,7 +116,7 @@ index 714e7fb..4ecc861 100755 # xen probe diff --git a/os-posix.c b/os-posix.c -index 3ba7df8..ff26068 100644 +index 3ba7df8d75..ff26068d89 100644 --- a/os-posix.c +++ b/os-posix.c @@ -83,7 +83,7 @@ void os_setup_signal_handling(void) @@ -127,7 +129,7 @@ index 3ba7df8..ff26068 100644 char *os_find_datadir(void) { diff --git a/ui/vnc.c b/ui/vnc.c -index 38f92bf..933dc36 100644 +index 38f92bfca3..933dc36db5 100644 --- a/ui/vnc.c +++ b/ui/vnc.c @@ -3976,7 +3976,7 @@ void vnc_display_open(const char *id, Error **errp) @@ -140,5 +142,5 @@ index 38f92bf..933dc36 100644 if (saslErr != SASL_OK) { error_setg(errp, "Failed to initialize SASL auth: %s", -- -1.8.3.1 +2.20.1 diff --git a/0005-Enable-disable-devices-for-RHEL.patch b/0005-Enable-disable-devices-for-RHEL.patch index 6ae6fc7..8fa1c6d 100644 --- a/0005-Enable-disable-devices-for-RHEL.patch +++ b/0005-Enable-disable-devices-for-RHEL.patch @@ -1,4 +1,4 @@ -From 1421c61010f1de5e7381c107963839e17ea5b43a Mon Sep 17 00:00:00 2001 +From 36dad4518633c16a975df51d4d3a475c346b8aed 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 @@ -53,22 +53,24 @@ Merged patches (4.1.0-rc0): Merged patches (4.1.0-rc3): - 495a27d x86_64-rh-devices: add missing TPM passthrough - e1fe9fe x86_64-rh-devices: enable TPM emulation (partial) + +Signed-off-by: Danilo C. L. de Paula --- Makefile.objs | 4 +- - default-configs/aarch64-rh-devices.mak | 20 +++++++ - default-configs/aarch64-softmmu.mak | 10 ++-- - default-configs/ppc64-rh-devices.mak | 32 +++++++++++ - default-configs/ppc64-softmmu.mak | 8 ++- - default-configs/rh-virtio.mak | 10 ++++ - default-configs/s390x-rh-devices.mak | 15 +++++ + default-configs/aarch64-rh-devices.mak | 20 +++++ + default-configs/aarch64-softmmu.mak | 10 ++- + default-configs/ppc64-rh-devices.mak | 32 ++++++++ + default-configs/ppc64-softmmu.mak | 8 +- + default-configs/rh-virtio.mak | 10 +++ + default-configs/s390x-rh-devices.mak | 15 ++++ default-configs/s390x-softmmu.mak | 4 +- - default-configs/x86_64-rh-devices.mak | 100 +++++++++++++++++++++++++++++++++ + default-configs/x86_64-rh-devices.mak | 100 +++++++++++++++++++++++++ default-configs/x86_64-softmmu.mak | 4 +- hw/acpi/ich9.c | 4 +- hw/arm/Makefile.objs | 2 +- - hw/block/fdc.c | 10 ++++ + hw/block/fdc.c | 10 +++ hw/bt/Makefile.objs | 4 +- - hw/core/Makefile.objs | 9 +-- + hw/core/Makefile.objs | 9 ++- hw/cpu/Makefile.objs | 5 +- hw/display/Makefile.objs | 5 +- hw/display/cirrus_vga.c | 3 + @@ -77,19 +79,19 @@ Merged patches (4.1.0-rc3): hw/isa/Makefile.objs | 2 +- hw/misc/Makefile.objs | 2 +- hw/net/e1000.c | 2 + - hw/pci-host/piix.c | 4 ++ + hw/pci-host/piix.c | 4 + hw/ppc/spapr_cpu_core.c | 2 + hw/usb/ccid-card-emulated.c | 2 + hw/vfio/pci-quirks.c | 5 ++ hw/vfio/pci.c | 5 ++ - qemu-options.hx | 7 +-- + qemu-options.hx | 7 +- redhat/qemu-kvm.spec.template | 5 +- target/arm/cpu.c | 4 +- - target/i386/cpu.c | 35 +++++++++--- - target/ppc/cpu-models.c | 10 ++++ + target/i386/cpu.c | 35 +++++++-- + target/ppc/cpu-models.c | 10 +++ target/s390x/cpu_models.c | 3 + - target/s390x/kvm.c | 8 +++ - vl.c | 8 ++- + target/s390x/kvm.c | 8 ++ + vl.c | 8 +- 36 files changed, 316 insertions(+), 44 deletions(-) create mode 100644 default-configs/aarch64-rh-devices.mak create mode 100644 default-configs/ppc64-rh-devices.mak @@ -98,7 +100,7 @@ Merged patches (4.1.0-rc3): create mode 100644 default-configs/x86_64-rh-devices.mak diff --git a/Makefile.objs b/Makefile.objs -index 6a143dc..8e96af1 100644 +index 6a143dcd57..8e96af153d 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -65,8 +65,8 @@ common-obj-y += replay/ @@ -114,7 +116,7 @@ index 6a143dc..8e96af1 100644 common-obj-y += vl.o diff --git a/default-configs/aarch64-rh-devices.mak b/default-configs/aarch64-rh-devices.mak new file mode 100644 -index 0000000..a1ed641 +index 0000000000..a1ed641174 --- /dev/null +++ b/default-configs/aarch64-rh-devices.mak @@ -0,0 +1,20 @@ @@ -139,7 +141,7 @@ index 0000000..a1ed641 +CONFIG_VIRTIO_PCI=y +CONFIG_XIO3130=y diff --git a/default-configs/aarch64-softmmu.mak b/default-configs/aarch64-softmmu.mak -index 958b1e0..8f6867d 100644 +index 958b1e08e4..8f6867d48a 100644 --- a/default-configs/aarch64-softmmu.mak +++ b/default-configs/aarch64-softmmu.mak @@ -1,8 +1,10 @@ @@ -159,7 +161,7 @@ index 958b1e0..8f6867d 100644 +include aarch64-rh-devices.mak diff --git a/default-configs/ppc64-rh-devices.mak b/default-configs/ppc64-rh-devices.mak new file mode 100644 -index 0000000..35f2106 +index 0000000000..35f2106d06 --- /dev/null +++ b/default-configs/ppc64-rh-devices.mak @@ -0,0 +1,32 @@ @@ -196,7 +198,7 @@ index 0000000..35f2106 +CONFIG_XIVE_SPAPR=y +CONFIG_XIVE_KVM=y diff --git a/default-configs/ppc64-softmmu.mak b/default-configs/ppc64-softmmu.mak -index cca5266..fec354f 100644 +index cca52665d9..fec354f327 100644 --- a/default-configs/ppc64-softmmu.mak +++ b/default-configs/ppc64-softmmu.mak @@ -1,10 +1,12 @@ @@ -217,7 +219,7 @@ index cca5266..fec354f 100644 +include ppc64-rh-devices.mak diff --git a/default-configs/rh-virtio.mak b/default-configs/rh-virtio.mak new file mode 100644 -index 0000000..94ede1b +index 0000000000..94ede1b5f6 --- /dev/null +++ b/default-configs/rh-virtio.mak @@ -0,0 +1,10 @@ @@ -233,7 +235,7 @@ index 0000000..94ede1b +CONFIG_VIRTIO_SERIAL=y diff --git a/default-configs/s390x-rh-devices.mak b/default-configs/s390x-rh-devices.mak new file mode 100644 -index 0000000..c3c73fe +index 0000000000..c3c73fe752 --- /dev/null +++ b/default-configs/s390x-rh-devices.mak @@ -0,0 +1,15 @@ @@ -253,7 +255,7 @@ index 0000000..c3c73fe +CONFIG_VIRTIO_CCW=y +CONFIG_WDT_DIAG288=y diff --git a/default-configs/s390x-softmmu.mak b/default-configs/s390x-softmmu.mak -index f2287a1..3e2e388 100644 +index f2287a133f..3e2e388e91 100644 --- a/default-configs/s390x-softmmu.mak +++ b/default-configs/s390x-softmmu.mak @@ -10,4 +10,6 @@ @@ -266,7 +268,7 @@ index f2287a1..3e2e388 100644 +include s390x-rh-devices.mak diff --git a/default-configs/x86_64-rh-devices.mak b/default-configs/x86_64-rh-devices.mak new file mode 100644 -index 0000000..6b5d68e +index 0000000000..6b5d68e155 --- /dev/null +++ b/default-configs/x86_64-rh-devices.mak @@ -0,0 +1,100 @@ @@ -371,7 +373,7 @@ index 0000000..6b5d68e +CONFIG_TPM_EMULATOR=y +CONFIG_TPM_PASSTHROUGH=y diff --git a/default-configs/x86_64-softmmu.mak b/default-configs/x86_64-softmmu.mak -index 64b2ee2..b5de7e5 100644 +index 64b2ee2960..b5de7e5279 100644 --- a/default-configs/x86_64-softmmu.mak +++ b/default-configs/x86_64-softmmu.mak @@ -1,3 +1,5 @@ @@ -382,7 +384,7 @@ index 64b2ee2..b5de7e5 100644 + +include x86_64-rh-devices.mak diff --git a/hw/acpi/ich9.c b/hw/acpi/ich9.c -index e53dfe1..168a713 100644 +index e53dfe1ee3..168a713eff 100644 --- a/hw/acpi/ich9.c +++ b/hw/acpi/ich9.c @@ -446,8 +446,8 @@ void ich9_pm_add_properties(Object *obj, ICH9LPCPMRegs *pm, Error **errp) @@ -397,7 +399,7 @@ index e53dfe1..168a713 100644 object_property_add_uint32_ptr(obj, ACPI_PM_PROP_PM_IO_BASE, diff --git a/hw/arm/Makefile.objs b/hw/arm/Makefile.objs -index 43ce8d5..13fc950 100644 +index 43ce8d5b19..13fc9502ff 100644 --- a/hw/arm/Makefile.objs +++ b/hw/arm/Makefile.objs @@ -27,7 +27,7 @@ obj-$(CONFIG_VEXPRESS) += vexpress.o @@ -410,7 +412,7 @@ index 43ce8d5..13fc950 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 9b24cb9..440b53b 100644 +index 9b24cb9b85..440b53b60c 100644 --- a/hw/block/fdc.c +++ b/hw/block/fdc.c @@ -43,6 +43,8 @@ @@ -438,7 +440,7 @@ index 9b24cb9..440b53b 100644 error_setg(errp, "Cannot choose a fallback FDrive type of 'auto'"); } diff --git a/hw/bt/Makefile.objs b/hw/bt/Makefile.objs -index 867a7d2..e678e9e 100644 +index 867a7d2e8a..e678e9ee3c 100644 --- a/hw/bt/Makefile.objs +++ b/hw/bt/Makefile.objs @@ -1,3 +1,3 @@ @@ -448,7 +450,7 @@ index 867a7d2..e678e9e 100644 +#common-obj-y += hci-csr.o diff --git a/hw/core/Makefile.objs b/hw/core/Makefile.objs -index f8481d9..bab9c2d 100644 +index f8481d959f..bab9c2d443 100644 --- a/hw/core/Makefile.objs +++ b/hw/core/Makefile.objs @@ -17,11 +17,12 @@ common-obj-$(CONFIG_SOFTMMU) += machine.o @@ -469,7 +471,7 @@ index f8481d9..bab9c2d 100644 obj-$(CONFIG_SOFTMMU) += machine-qmp-cmds.o diff --git a/hw/cpu/Makefile.objs b/hw/cpu/Makefile.objs -index 8db9e8a..1601ea9 100644 +index 8db9e8a7b3..1601ea93c7 100644 --- a/hw/cpu/Makefile.objs +++ b/hw/cpu/Makefile.objs @@ -1,5 +1,6 @@ @@ -482,7 +484,7 @@ index 8db9e8a..1601ea9 100644 +common-obj-y += core.o +# cluster.o diff --git a/hw/display/Makefile.objs b/hw/display/Makefile.objs -index a64998f..88a60b3 100644 +index a64998fc7b..88a60b36c5 100644 --- a/hw/display/Makefile.objs +++ b/hw/display/Makefile.objs @@ -1,8 +1,9 @@ @@ -498,7 +500,7 @@ index a64998f..88a60b3 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 2e4911a..49c16c8 100644 +index 2e4911a1e3..49c16c8f8b 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) @@ -512,7 +514,7 @@ index 2e4911a..49c16c8 100644 Also accept 8 MB/16 MB for backward compatibility. */ if (s->vga.vram_size_mb != 4 && s->vga.vram_size_mb != 8 && diff --git a/hw/ide/piix.c b/hw/ide/piix.c -index b97e555..55b30e6 100644 +index b97e555072..55b30e65ae 100644 --- a/hw/ide/piix.c +++ b/hw/ide/piix.c @@ -253,7 +253,8 @@ static void piix3_ide_class_init(ObjectClass *klass, void *data) @@ -535,7 +537,7 @@ index b97e555..55b30e6 100644 static const TypeInfo piix4_ide_info = { diff --git a/hw/input/pckbd.c b/hw/input/pckbd.c -index 47a606f..562a9bc 100644 +index 47a606f5e3..562a9bc0a6 100644 --- a/hw/input/pckbd.c +++ b/hw/input/pckbd.c @@ -568,6 +568,8 @@ static void i8042_class_initfn(ObjectClass *klass, void *data) @@ -548,7 +550,7 @@ index 47a606f..562a9bc 100644 static const TypeInfo i8042_info = { diff --git a/hw/isa/Makefile.objs b/hw/isa/Makefile.objs -index 9e106df..0828964 100644 +index 9e106df186..0828964014 100644 --- a/hw/isa/Makefile.objs +++ b/hw/isa/Makefile.objs @@ -1,5 +1,5 @@ @@ -559,7 +561,7 @@ index 9e106df..0828964 100644 common-obj-$(CONFIG_I82378) += i82378.o common-obj-$(CONFIG_PC87312) += pc87312.o diff --git a/hw/misc/Makefile.objs b/hw/misc/Makefile.objs -index e9aab51..17f9422 100644 +index e9aab519a1..17f94225a6 100644 --- a/hw/misc/Makefile.objs +++ b/hw/misc/Makefile.objs @@ -9,7 +9,7 @@ common-obj-$(CONFIG_PCI_TESTDEV) += pci-testdev.o @@ -572,7 +574,7 @@ index e9aab51..17f9422 100644 # ARM devices diff --git a/hw/net/e1000.c b/hw/net/e1000.c -index a023ceb..15d6c7d 100644 +index a023ceb27c..15d6c7d3be 100644 --- a/hw/net/e1000.c +++ b/hw/net/e1000.c @@ -1794,6 +1794,7 @@ static const E1000Info e1000_devices[] = { @@ -592,7 +594,7 @@ index a023ceb..15d6c7d 100644 static void e1000_register_types(void) diff --git a/hw/pci-host/piix.c b/hw/pci-host/piix.c -index d9c70f7..f294fbc 100644 +index d9c70f7ce6..f294fbce6a 100644 --- a/hw/pci-host/piix.c +++ b/hw/pci-host/piix.c @@ -801,6 +801,7 @@ static const TypeInfo i440fx_info = { @@ -622,7 +624,7 @@ index d9c70f7..f294fbc 100644 type_register_static(&piix3_info); type_register_static(&piix3_xen_info); diff --git a/hw/ppc/spapr_cpu_core.c b/hw/ppc/spapr_cpu_core.c -index 5621fb9..b91a106 100644 +index 5621fb9a3d..b91a106074 100644 --- a/hw/ppc/spapr_cpu_core.c +++ b/hw/ppc/spapr_cpu_core.c @@ -387,10 +387,12 @@ static const TypeInfo spapr_cpu_core_type_infos[] = { @@ -639,7 +641,7 @@ index 5621fb9..b91a106 100644 DEFINE_SPAPR_CPU_CORE_TYPE("power7+_v2.1"), DEFINE_SPAPR_CPU_CORE_TYPE("power8_v2.0"), diff --git a/hw/usb/ccid-card-emulated.c b/hw/usb/ccid-card-emulated.c -index e20f8ed..0ddc26c 100644 +index e20f8ed293..0ddc26cb6c 100644 --- a/hw/usb/ccid-card-emulated.c +++ b/hw/usb/ccid-card-emulated.c @@ -603,6 +603,8 @@ static void emulated_class_initfn(ObjectClass *klass, void *data) @@ -652,7 +654,7 @@ index e20f8ed..0ddc26c 100644 static const TypeInfo emulated_card_info = { diff --git a/hw/vfio/pci-quirks.c b/hw/vfio/pci-quirks.c -index b35a640..e8e7480 100644 +index b35a640030..e8e7480c51 100644 --- a/hw/vfio/pci-quirks.c +++ b/hw/vfio/pci-quirks.c @@ -1386,6 +1386,8 @@ static void vfio_pci_igd_lpc_bridge_class_init(ObjectClass *klass, void *data) @@ -675,7 +677,7 @@ index b35a640..e8e7480 100644 /* * We need to create an LPC/ISA bridge at PCI bus address 00:1f.0 that we diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c -index d7a4e18..7c474a9 100644 +index d7a4e1875c..7c474a9d4a 100644 --- a/hw/vfio/pci.c +++ b/hw/vfio/pci.c @@ -3180,6 +3180,7 @@ static const TypeInfo vfio_pci_dev_info = { @@ -703,7 +705,7 @@ index d7a4e18..7c474a9 100644 type_init(register_vfio_pci_dev_type) diff --git a/qemu-options.hx b/qemu-options.hx -index 9621e93..6873f9e 100644 +index 9621e934c0..6873f9e674 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -2024,11 +2024,6 @@ ETEXI @@ -735,7 +737,7 @@ index 9621e93..6873f9e 100644 #ifdef CONFIG_TPM DEFHEADING(TPM device options:) diff --git a/target/arm/cpu.c b/target/arm/cpu.c -index ec2ab95..7e7ccee 100644 +index ec2ab95dbe..7e7ccee45d 100644 --- a/target/arm/cpu.c +++ b/target/arm/cpu.c @@ -2702,7 +2702,9 @@ static void arm_cpu_register_types(void) @@ -750,7 +752,7 @@ index ec2ab95..7e7ccee 100644 } diff --git a/target/i386/cpu.c b/target/i386/cpu.c -index 19751e3..47a1236 100644 +index 19751e37a7..47a1236e9f 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -1554,14 +1554,14 @@ static X86CPUDefinition builtin_x86_defs[] = { @@ -776,10 +778,11 @@ index 19751e3..47a1236 100644 .features[FEAT_8000_0001_ECX] = CPUID_EXT3_LAHF_LM | CPUID_EXT3_SVM, .xlevel = 0x8000000A, -@@ -1791,6 +1791,25 @@ static X86CPUDefinition builtin_x86_defs[] = { +@@ -1790,6 +1790,25 @@ static X86CPUDefinition builtin_x86_defs[] = { + .xlevel = 0x80000008, .model_id = "Intel(R) Atom(TM) CPU N270 @ 1.60GHz", }, - { ++ { + .name = "cpu64-rhel6", + .level = 4, + .vendor = CPUID_VENDOR_AMD, @@ -798,12 +801,11 @@ index 19751e3..47a1236 100644 + .xlevel = 0x8000000A, + .model_id = "QEMU Virtual CPU version (cpu64-rhel6)", + }, -+ { + { .name = "Conroe", .level = 10, - .vendor = CPUID_VENDOR_INTEL, diff --git a/target/ppc/cpu-models.c b/target/ppc/cpu-models.c -index 086548e..1bbf378 100644 +index 086548e9b9..1bbf378c18 100644 --- a/target/ppc/cpu-models.c +++ b/target/ppc/cpu-models.c @@ -66,6 +66,7 @@ @@ -873,7 +875,7 @@ index 086548e..1bbf378 100644 { NULL, NULL } }; diff --git a/target/s390x/cpu_models.c b/target/s390x/cpu_models.c -index 1d16d7d..47188ed 100644 +index 1d16d7d5e7..47188eddf4 100644 --- a/target/s390x/cpu_models.c +++ b/target/s390x/cpu_models.c @@ -404,6 +404,9 @@ static void check_unavailable_features(const S390CPUModel *max_model, @@ -887,7 +889,7 @@ index 1d16d7d..47188ed 100644 /* detect missing features if any to properly report them */ diff --git a/target/s390x/kvm.c b/target/s390x/kvm.c -index 6e814c2..153d092 100644 +index 6e814c230b..153d092d62 100644 --- a/target/s390x/kvm.c +++ b/target/s390x/kvm.c @@ -2363,6 +2363,14 @@ void kvm_s390_apply_cpu_model(const S390CPUModel *model, Error **errp) @@ -906,7 +908,7 @@ index 6e814c2..153d092 100644 prop.ibc = s390_ibc_from_cpu_model(model); /* configure cpu features indicated via STFL(e) */ diff --git a/vl.c b/vl.c -index b426b32..f9166f5 100644 +index b426b32134..f9166f509b 100644 --- a/vl.c +++ b/vl.c @@ -164,7 +164,7 @@ Chardev *parallel_hds[MAX_PARALLEL_PORTS]; @@ -963,5 +965,5 @@ index b426b32..f9166f5 100644 if (!xen_enabled()) { /* On 32-bit hosts, QEMU is limited by virtual address space */ -- -1.8.3.1 +2.20.1 diff --git a/0006-Machine-type-related-general-changes.patch b/0006-Machine-type-related-general-changes.patch index 42f26fa..0490225 100644 --- a/0006-Machine-type-related-general-changes.patch +++ b/0006-Machine-type-related-general-changes.patch @@ -1,4 +1,4 @@ -From 3d84e663576b363fc4cb808752cebd7d9766cdce Mon Sep 17 00:00:00 2001 +From 34edf0da6480f60393083de194d1a04cd2cfe5c7 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 @@ -33,29 +33,31 @@ Merged patches (4.0.0): Merged patches (4.0.0-rc0): - 479ad30 redhat: fix cut'n'paste garbage in hw_compat comments - f19738e compat: Generic hw_compat_rhel_8_0 + +Signed-off-by: Danilo C. L. de Paula --- - hw/acpi/ich9.c | 16 ++++++ + hw/acpi/ich9.c | 16 +++++ hw/acpi/piix4.c | 6 +- - hw/char/serial.c | 16 ++++++ - hw/core/machine.c | 146 ++++++++++++++++++++++++++++++++++++++++++++++++ + hw/char/serial.c | 16 +++++ + hw/core/machine.c | 146 ++++++++++++++++++++++++++++++++++++++++ hw/display/vga-isa.c | 2 +- - hw/net/e1000e.c | 21 +++++++ + hw/net/e1000e.c | 21 ++++++ hw/net/rtl8139.c | 4 +- hw/smbios/smbios.c | 1 + hw/timer/i8254_common.c | 2 +- hw/timer/mc146818rtc.c | 6 ++ hw/usb/hcd-uhci.c | 4 +- - hw/usb/hcd-xhci.c | 20 +++++++ + hw/usb/hcd-xhci.c | 20 ++++++ hw/usb/hcd-xhci.h | 2 + include/hw/acpi/ich9.h | 3 + - include/hw/boards.h | 21 +++++++ + include/hw/boards.h | 21 ++++++ include/hw/usb.h | 4 ++ migration/migration.c | 2 + migration/migration.h | 5 ++ 18 files changed, 274 insertions(+), 7 deletions(-) diff --git a/hw/acpi/ich9.c b/hw/acpi/ich9.c -index 168a713..0a6346f 100644 +index 168a713eff..0a6346f1cf 100644 --- a/hw/acpi/ich9.c +++ b/hw/acpi/ich9.c @@ -441,6 +441,18 @@ static void ich9_pm_set_enable_tco(Object *obj, bool value, Error **errp) @@ -89,7 +91,7 @@ index 168a713..0a6346f 100644 ich9_pm_get_disable_s3, ich9_pm_set_disable_s3, diff --git a/hw/acpi/piix4.c b/hw/acpi/piix4.c -index ec4e186..0d2c8e4 100644 +index ec4e186cec..0d2c8e4fe3 100644 --- a/hw/acpi/piix4.c +++ b/hw/acpi/piix4.c @@ -306,7 +306,7 @@ static bool piix4_vmstate_need_smbus(void *opaque, int version_id) @@ -113,7 +115,7 @@ index ec4e186..0d2c8e4 100644 DEFINE_PROP_BOOL("acpi-pci-hotplug-with-bridge-support", PIIX4PMState, use_acpi_pci_hotplug, true), diff --git a/hw/char/serial.c b/hw/char/serial.c -index 7c42a2a..ae63cc0 100644 +index 7c42a2abfc..ae63cc0104 100644 --- a/hw/char/serial.c +++ b/hw/char/serial.c @@ -30,6 +30,7 @@ @@ -168,7 +170,7 @@ index 7c42a2a..ae63cc0 100644 } diff --git a/hw/core/machine.c b/hw/core/machine.c -index 32d1ca9..f30afe0 100644 +index 32d1ca9abc..f30afe0f0b 100644 --- a/hw/core/machine.c +++ b/hw/core/machine.c @@ -27,6 +27,152 @@ @@ -325,7 +327,7 @@ index 32d1ca9..f30afe0 100644 { "VGA", "edid", "false" }, { "secondary-vga", "edid", "false" }, diff --git a/hw/display/vga-isa.c b/hw/display/vga-isa.c -index 945952a..db0681e 100644 +index 945952a9b0..db0681e891 100644 --- a/hw/display/vga-isa.c +++ b/hw/display/vga-isa.c @@ -82,7 +82,7 @@ static void vga_isa_realizefn(DeviceState *dev, Error **errp) @@ -338,7 +340,7 @@ index 945952a..db0681e 100644 }; diff --git a/hw/net/e1000e.c b/hw/net/e1000e.c -index 581f7d0..9a8b1ed 100644 +index 581f7d03d5..9a8b1ed805 100644 --- a/hw/net/e1000e.c +++ b/hw/net/e1000e.c @@ -76,6 +76,11 @@ typedef struct E1000EState { @@ -412,7 +414,7 @@ index 581f7d0..9a8b1ed 100644 e1000e_prop_disable_vnet, bool), DEFINE_PROP_SIGNED("subsys_ven", E1000EState, subsys_ven, diff --git a/hw/net/rtl8139.c b/hw/net/rtl8139.c -index 0927317..0cead11 100644 +index 09273171e5..0cead119ab 100644 --- a/hw/net/rtl8139.c +++ b/hw/net/rtl8139.c @@ -3176,7 +3176,7 @@ static int rtl8139_pre_save(void *opaque) @@ -435,7 +437,7 @@ index 0927317..0cead11 100644 VMSTATE_UINT16(tally_counters.TxUndrn, RTL8139State), diff --git a/hw/smbios/smbios.c b/hw/smbios/smbios.c -index 7bcd67b..dd0bc2b 100644 +index 7bcd67b098..dd0bc2b977 100644 --- a/hw/smbios/smbios.c +++ b/hw/smbios/smbios.c @@ -778,6 +778,7 @@ void smbios_set_defaults(const char *manufacturer, const char *product, @@ -447,7 +449,7 @@ index 7bcd67b..dd0bc2b 100644 SMBIOS_SET_DEFAULT(type2.product, product); SMBIOS_SET_DEFAULT(type2.version, version); diff --git a/hw/timer/i8254_common.c b/hw/timer/i8254_common.c -index 76ca6ec..e7c87a9 100644 +index 76ca6ec444..e7c87a9c67 100644 --- a/hw/timer/i8254_common.c +++ b/hw/timer/i8254_common.c @@ -270,7 +270,7 @@ static const VMStateDescription vmstate_pit_common = { @@ -460,7 +462,7 @@ index 76ca6ec..e7c87a9 100644 vmstate_pit_channel, PITChannelState), VMSTATE_INT64(channels[0].next_transition_time, diff --git a/hw/timer/mc146818rtc.c b/hw/timer/mc146818rtc.c -index ce4550b..777efe9 100644 +index ce4550b6f2..777efe9819 100644 --- a/hw/timer/mc146818rtc.c +++ b/hw/timer/mc146818rtc.c @@ -37,6 +37,7 @@ @@ -484,7 +486,7 @@ index ce4550b..777efe9 100644 } diff --git a/hw/usb/hcd-uhci.c b/hw/usb/hcd-uhci.c -index 98bd5cf..2fd2a9b 100644 +index 98bd5cf49d..2fd2a9bbf0 100644 --- a/hw/usb/hcd-uhci.c +++ b/hw/usb/hcd-uhci.c @@ -1218,12 +1218,14 @@ static void usb_uhci_common_realize(PCIDevice *dev, Error **errp) @@ -504,7 +506,7 @@ index 98bd5cf..2fd2a9b 100644 if (s->masterbus) { USBPort *ports[NB_PORTS]; diff --git a/hw/usb/hcd-xhci.c b/hw/usb/hcd-xhci.c -index 5894a18..9854fae 100644 +index 5894a18663..9854fae583 100644 --- a/hw/usb/hcd-xhci.c +++ b/hw/usb/hcd-xhci.c @@ -3584,9 +3584,27 @@ static const VMStateDescription vmstate_xhci_slot = { @@ -545,7 +547,7 @@ index 5894a18..9854fae 100644 } }; diff --git a/hw/usb/hcd-xhci.h b/hw/usb/hcd-xhci.h -index 2fad4df..f554b67 100644 +index 2fad4df2a7..f554b671e3 100644 --- a/hw/usb/hcd-xhci.h +++ b/hw/usb/hcd-xhci.h @@ -157,6 +157,8 @@ typedef struct XHCIEvent { @@ -558,7 +560,7 @@ index 2fad4df..f554b67 100644 typedef struct XHCIInterrupter { diff --git a/include/hw/acpi/ich9.h b/include/hw/acpi/ich9.h -index 41568d1..1a23ccc 100644 +index 41568d1837..1a23ccc412 100644 --- a/include/hw/acpi/ich9.h +++ b/include/hw/acpi/ich9.h @@ -61,6 +61,9 @@ typedef struct ICH9LPCPMRegs { @@ -572,7 +574,7 @@ index 41568d1..1a23ccc 100644 #define ACPI_PM_PROP_TCO_ENABLED "enable_tco" diff --git a/include/hw/boards.h b/include/hw/boards.h -index a71d1a5..521c625 100644 +index a71d1a53a5..521c6252bf 100644 --- a/include/hw/boards.h +++ b/include/hw/boards.h @@ -362,4 +362,25 @@ extern const size_t hw_compat_2_2_len; @@ -602,7 +604,7 @@ index a71d1a5..521c625 100644 + #endif diff --git a/include/hw/usb.h b/include/hw/usb.h -index c21f41c..71502b0 100644 +index c21f41c8a9..71502b0bad 100644 --- a/include/hw/usb.h +++ b/include/hw/usb.h @@ -604,4 +604,8 @@ int usb_get_quirks(uint16_t vendor_id, uint16_t product_id, @@ -615,7 +617,7 @@ index c21f41c..71502b0 100644 + #endif diff --git a/migration/migration.c b/migration/migration.c -index 8a607fe..beffbfd 100644 +index 8a607fe1e2..beffbfd6e1 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -116,6 +116,8 @@ enum mig_rp_message_type { @@ -628,7 +630,7 @@ index 8a607fe..beffbfd 100644 migrations at once. For now we don't need to add dynamic creation of migration */ diff --git a/migration/migration.h b/migration/migration.h -index 1fdd7b2..b89e901 100644 +index 1fdd7b21fd..b89e90199c 100644 --- a/migration/migration.h +++ b/migration/migration.h @@ -332,6 +332,11 @@ void init_dirty_bitmap_incoming_migration(void); @@ -644,5 +646,5 @@ index 1fdd7b2..b89e901 100644 #define qemu_ram_foreach_block \ #warning "Use foreach_not_ignored_block in migration code" -- -1.8.3.1 +2.20.1 diff --git a/0007-Add-aarch64-machine-types.patch b/0007-Add-aarch64-machine-types.patch index 4195926..578f879 100644 --- a/0007-Add-aarch64-machine-types.patch +++ b/0007-Add-aarch64-machine-types.patch @@ -1,4 +1,4 @@ -From 47a1c8ecb7b0b3846fe5fcefcbb912cd31d291c7 Mon Sep 17 00:00:00 2001 +From cddb8f9ba14dba3bc5d37241924e84340a2b1f6a Mon Sep 17 00:00:00 2001 From: Miroslav Rezanina Date: Fri, 19 Oct 2018 12:53:31 +0200 Subject: Add aarch64 machine types @@ -22,13 +22,15 @@ Merged patches (4.0.0): Merged patches (4.1.0-rc0): - c3e39ef aarch64: Add virt-rhel8.1.0 machine type for ARM - 59a46d1 aarch64: Allow ARM VIRT iommu option in RHEL8.1 machine + +Signed-off-by: Danilo C. L. de Paula --- - hw/arm/virt.c | 144 +++++++++++++++++++++++++++++++++++++++++++++++++- + hw/arm/virt.c | 144 +++++++++++++++++++++++++++++++++++++++++- include/hw/arm/virt.h | 11 ++++ 2 files changed, 154 insertions(+), 1 deletion(-) diff --git a/hw/arm/virt.c b/hw/arm/virt.c -index d9496c9..51fb5f8 100644 +index d9496c9363..51fb5f82b4 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -65,6 +65,7 @@ @@ -215,7 +217,7 @@ index d9496c9..51fb5f8 100644 +} +DEFINE_RHEL_MACHINE_AS_LATEST(8, 1, 0) diff --git a/include/hw/arm/virt.h b/include/hw/arm/virt.h -index a720942..1baa48d 100644 +index a72094204e..1baa48d46e 100644 --- a/include/hw/arm/virt.h +++ b/include/hw/arm/virt.h @@ -137,6 +137,7 @@ typedef struct { @@ -244,5 +246,5 @@ index a720942..1baa48d 100644 /* Return the number of used redistributor regions */ -- -1.8.3.1 +2.20.1 diff --git a/0008-Add-ppc64-machine-types.patch b/0008-Add-ppc64-machine-types.patch index be2cde0..95f4901 100644 --- a/0008-Add-ppc64-machine-types.patch +++ b/0008-Add-ppc64-machine-types.patch @@ -1,4 +1,4 @@ -From 9c73e7109477fecb0477bd6d53e94080eca30e64 Mon Sep 17 00:00:00 2001 +From 765586a71ea9b01f414e4662d11ea77288976f31 Mon Sep 17 00:00:00 2001 From: Miroslav Rezanina Date: Fri, 19 Oct 2018 13:27:13 +0200 Subject: Add ppc64 machine types @@ -25,8 +25,10 @@ Merged patches (4.1.0-rc0): - f21757edc target/ppc/spapr: Enable mitigations by default for pseries-4.0 machine type - 2511c63 redhat: sync pseries-rhel7.6.0 with rhel-av-8.0.1 - 89f01da redhat: define pseries-rhel8.1.0 machine type + +Signed-off-by: Danilo C. L. de Paula --- - hw/ppc/spapr.c | 243 ++++++++++++++++++++++++++++++++++++++++++++++++ + hw/ppc/spapr.c | 243 ++++++++++++++++++++++++++++++++++++++++ hw/ppc/spapr_cpu_core.c | 13 +++ include/hw/ppc/spapr.h | 1 + target/ppc/compat.c | 13 ++- @@ -34,7 +36,7 @@ Merged patches (4.1.0-rc0): 5 files changed, 270 insertions(+), 1 deletion(-) diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c -index 821f0d4..ab64d43 100644 +index 12ed4b065c..669eae100e 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -4382,6 +4382,7 @@ static void spapr_machine_class_init(ObjectClass *oc, void *data) @@ -316,7 +318,7 @@ index 821f0d4..ab64d43 100644 static void spapr_machine_register_types(void) { diff --git a/hw/ppc/spapr_cpu_core.c b/hw/ppc/spapr_cpu_core.c -index b91a106..29a3c7d 100644 +index b91a106074..29a3c7d8ee 100644 --- a/hw/ppc/spapr_cpu_core.c +++ b/hw/ppc/spapr_cpu_core.c @@ -21,6 +21,7 @@ @@ -354,7 +356,7 @@ index b91a106..29a3c7d 100644 spapr_cpu_reset(cpu); diff --git a/include/hw/ppc/spapr.h b/include/hw/ppc/spapr.h -index 60553d3..b0ba32e 100644 +index 60553d32c4..b0ba32e6dd 100644 --- a/include/hw/ppc/spapr.h +++ b/include/hw/ppc/spapr.h @@ -121,6 +121,7 @@ struct SpaprMachineClass { @@ -366,7 +368,7 @@ index 60553d3..b0ba32e 100644 uint64_t *buid, hwaddr *pio, hwaddr *mmio32, hwaddr *mmio64, diff --git a/target/ppc/compat.c b/target/ppc/compat.c -index 7de4bf3..3e2e353 100644 +index 7de4bf3122..3e2e35342d 100644 --- a/target/ppc/compat.c +++ b/target/ppc/compat.c @@ -105,8 +105,19 @@ static const CompatInfo *compat_by_pvr(uint32_t pvr) @@ -391,7 +393,7 @@ index 7de4bf3..3e2e353 100644 const CompatInfo *compat = compat_by_pvr(compat_pvr); const CompatInfo *min = compat_by_pvr(min_compat_pvr); diff --git a/target/ppc/cpu.h b/target/ppc/cpu.h -index c9beba2..76cb7c2 100644 +index c9beba2a5c..76cb7c2e37 100644 --- a/target/ppc/cpu.h +++ b/target/ppc/cpu.h @@ -1350,6 +1350,7 @@ static inline int cpu_mmu_index(CPUPPCState *env, bool ifetch) @@ -403,5 +405,5 @@ index c9beba2..76cb7c2 100644 uint32_t min_compat_pvr, uint32_t max_compat_pvr); bool ppc_type_check_compat(const char *cputype, uint32_t compat_pvr, -- -1.8.3.1 +2.20.1 diff --git a/0009-Add-s390x-machine-types.patch b/0009-Add-s390x-machine-types.patch index 767272b..3c353ee 100644 --- a/0009-Add-s390x-machine-types.patch +++ b/0009-Add-s390x-machine-types.patch @@ -1,4 +1,4 @@ -From e9de3d4a98a79e820be14e2a752e2ebb20e341d4 Mon Sep 17 00:00:00 2001 +From 2ae1e5940185a169886f2492f97fc98a625da889 Mon Sep 17 00:00:00 2001 From: Miroslav Rezanina Date: Fri, 19 Oct 2018 13:47:32 +0200 Subject: Add s390x machine types @@ -15,12 +15,14 @@ Merged patches (3.1.0): Merged patches (4.1.0-rc0): - 6c200d665b hw/s390x/s390-virtio-ccw: Add machine types for RHEL8.0.0 + +Signed-off-by: Danilo C. L. de Paula --- - hw/s390x/s390-virtio-ccw.c | 67 +++++++++++++++++++++++++++++++++++++++++++++- + hw/s390x/s390-virtio-ccw.c | 67 +++++++++++++++++++++++++++++++++++++- 1 file changed, 66 insertions(+), 1 deletion(-) diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c -index 5b6a9a4..4d8c2ec 100644 +index 5b6a9a4e55..4d8c2ec22a 100644 --- a/hw/s390x/s390-virtio-ccw.c +++ b/hw/s390x/s390-virtio-ccw.c @@ -636,7 +636,7 @@ bool css_migration_enabled(void) @@ -112,5 +114,5 @@ index 5b6a9a4..4d8c2ec 100644 static void ccw_machine_register_types(void) { -- -1.8.3.1 +2.20.1 diff --git a/0010-Add-x86_64-machine-types.patch b/0010-Add-x86_64-machine-types.patch index 0a6f333..23a3ebe 100644 --- a/0010-Add-x86_64-machine-types.patch +++ b/0010-Add-x86_64-machine-types.patch @@ -1,4 +1,4 @@ -From 83831de11704d0f48ab56fec1f434ae9396e9cc1 Mon Sep 17 00:00:00 2001 +From 728953bda3fcd8bc06026b59b3b86191fb7787c0 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 @@ -25,11 +25,13 @@ Merged patches (4.1.0-rc0): - 1de7949 kvm: clear out KVM_ASYNC_PF_DELIVERY_AS_PF_VMEXIT for older machine types - 18cf0d7 target/i386: Disable MPX support on named CPU models (partialy) - 2660667 rhel: Set host-phys-bits-limit=48 on rhel machine-types + +Signed-off-by: Danilo C. L. de Paula --- hw/i386/acpi-build.c | 3 + - hw/i386/pc.c | 226 ++++++++++++++++++++++++++++++++++++++++++++++++++- - hw/i386/pc_piix.c | 200 ++++++++++++++++++++++++++++++++++++++++++++- - hw/i386/pc_q35.c | 114 +++++++++++++++++++++++++- + hw/i386/pc.c | 226 ++++++++++++++++++++++++++++++++++++++++++- + hw/i386/pc_piix.c | 200 +++++++++++++++++++++++++++++++++++++- + hw/i386/pc_q35.c | 114 +++++++++++++++++++++- include/hw/boards.h | 2 + include/hw/i386/pc.h | 27 ++++++ target/i386/cpu.c | 9 +- @@ -37,7 +39,7 @@ Merged patches (4.1.0-rc0): 8 files changed, 578 insertions(+), 7 deletions(-) diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c -index f3fdfef..1d64f0b 100644 +index f3fdfefcd5..1d64f0bad2 100644 --- a/hw/i386/acpi-build.c +++ b/hw/i386/acpi-build.c @@ -203,6 +203,9 @@ static void acpi_get_pm_info(MachineState *machine, AcpiPmInfo *pm) @@ -51,7 +53,7 @@ index f3fdfef..1d64f0b 100644 } diff --git a/hw/i386/pc.c b/hw/i386/pc.c -index 549c437..9ded0db 100644 +index 549c437050..9ded0db80d 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -354,6 +354,224 @@ GlobalProperty pc_compat_1_4[] = { @@ -309,7 +311,7 @@ index 549c437..9ded0db 100644 hc->pre_plug = pc_machine_device_pre_plug_cb; hc->plug = pc_machine_device_plug_cb; diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c -index c2280c7..c86c48c 100644 +index c2280c72ef..c86c48c092 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -51,6 +51,7 @@ @@ -538,7 +540,7 @@ index c2280c7..c86c48c 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 397e1fd..4959ed3 100644 +index 397e1fdd2f..4959ed329f 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -198,8 +198,8 @@ static void pc_q35_init(MachineState *machine) @@ -674,7 +676,7 @@ index 397e1fd..4959ed3 100644 +DEFINE_PC_MACHINE(q35_rhel730, "pc-q35-rhel7.3.0", pc_q35_init_rhel730, + pc_q35_machine_rhel730_options); diff --git a/include/hw/boards.h b/include/hw/boards.h -index 521c625..b4a8c4a 100644 +index 521c6252bf..b4a8c4ab10 100644 --- a/include/hw/boards.h +++ b/include/hw/boards.h @@ -214,6 +214,8 @@ struct MachineClass { @@ -687,7 +689,7 @@ index 521c625..b4a8c4a 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 859b64c..605cc71 100644 +index 859b64c51d..605cc714d3 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -142,6 +142,9 @@ typedef struct PCMachineClass { @@ -732,7 +734,7 @@ index 859b64c..605cc71 100644 * depending on QEMU versions up to QEMU 2.4. */ diff --git a/target/i386/cpu.c b/target/i386/cpu.c -index 47a1236..cd71a09 100644 +index 47a1236e9f..cd71a09b33 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -1548,11 +1548,17 @@ static CPUCaches epyc_cache_info = { @@ -763,7 +765,7 @@ index 47a1236..cd71a09 100644 }; diff --git a/target/i386/kvm.c b/target/i386/kvm.c -index dbbb137..da5a5ef 100644 +index dbbb13772a..da5a5ef5f3 100644 --- a/target/i386/kvm.c +++ b/target/i386/kvm.c @@ -2805,6 +2805,7 @@ static int kvm_get_msrs(X86CPU *cpu) @@ -785,5 +787,5 @@ index dbbb137..da5a5ef 100644 case MSR_KVM_PV_EOI_EN: env->pv_eoi_en_msr = msrs[i].data; -- -1.8.3.1 +2.20.1 diff --git a/0011-Enable-make-check.patch b/0011-Enable-make-check.patch index a7a4882..6497683 100644 --- a/0011-Enable-make-check.patch +++ b/0011-Enable-make-check.patch @@ -1,4 +1,4 @@ -From c1635c2c93f0efe82a6ab1dc973402882882382c Mon Sep 17 00:00:00 2001 +From 70e14e50ec8652a4243111dc293fe09ebcef8de1 Mon Sep 17 00:00:00 2001 From: Miroslav Rezanina Date: Fri, 19 Oct 2018 13:48:41 +0200 Subject: Enable make check @@ -27,6 +27,8 @@ Merged patches (4.1.0-rc0): Conflicts: tests/qemu-iotests/group + +Signed-off-by: Danilo C. L. de Paula --- redhat/qemu-kvm.spec.template | 8 +++++++- tests/Makefile.include | 10 +++++----- @@ -41,7 +43,7 @@ Conflicts: 10 files changed, 39 insertions(+), 17 deletions(-) diff --git a/tests/Makefile.include b/tests/Makefile.include -index fd7fdb8..d3da940 100644 +index fd7fdb8658..d3da940f8c 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -164,7 +164,7 @@ check-qtest-i386-y += tests/ide-test$(EXESUF) @@ -83,7 +85,7 @@ index fd7fdb8..d3da940 100644 check-qtest-s390x-y += tests/cpu-plug-test$(EXESUF) check-qtest-s390x-y += tests/migration-test$(EXESUF) diff --git a/tests/boot-serial-test.c b/tests/boot-serial-test.c -index 24852d4..dce5860 100644 +index 24852d4c7d..dce5860d99 100644 --- a/tests/boot-serial-test.c +++ b/tests/boot-serial-test.c @@ -97,18 +97,22 @@ static testdef_t tests[] = { @@ -111,7 +113,7 @@ index 24852d4..dce5860 100644 { "sparc", "LX", "", "TMS390S10" }, { "sparc", "SS-4", "", "MB86904" }, diff --git a/tests/cpu-plug-test.c b/tests/cpu-plug-test.c -index 668f001..453ca8e 100644 +index 668f00144e..453ca8e583 100644 --- a/tests/cpu-plug-test.c +++ b/tests/cpu-plug-test.c @@ -190,8 +190,8 @@ static void add_pseries_test_case(const char *mname) @@ -126,7 +128,7 @@ index 668f001..453ca8e 100644 } data = g_new(PlugTestData, 1); diff --git a/tests/e1000-test.c b/tests/e1000-test.c -index c387984..c89112d 100644 +index c387984ef6..c89112d6f8 100644 --- a/tests/e1000-test.c +++ b/tests/e1000-test.c @@ -22,9 +22,11 @@ struct QE1000 { @@ -142,7 +144,7 @@ index c387984..c89112d 100644 static void *e1000_get_driver(void *obj, const char *interface) diff --git a/tests/prom-env-test.c b/tests/prom-env-test.c -index 61bc1d1..028d45c 100644 +index 61bc1d1e7b..028d45c7d7 100644 --- a/tests/prom-env-test.c +++ b/tests/prom-env-test.c @@ -88,10 +88,14 @@ int main(int argc, char *argv[]) @@ -161,7 +163,7 @@ index 61bc1d1..028d45c 100644 add_tests(sparc_machines); } else if (!strcmp(arch, "sparc64")) { diff --git a/tests/qemu-iotests/051 b/tests/qemu-iotests/051 -index ce942a5..f64429e 100755 +index ce942a5444..f64429e21f 100755 --- a/tests/qemu-iotests/051 +++ b/tests/qemu-iotests/051 @@ -181,11 +181,11 @@ run_qemu -drive if=virtio @@ -195,7 +197,7 @@ index ce942a5..f64429e 100755 *) ;; diff --git a/tests/qemu-iotests/group b/tests/qemu-iotests/group -index f13e5f2..813db25 100644 +index f13e5f2e23..813db2565b 100644 --- a/tests/qemu-iotests/group +++ b/tests/qemu-iotests/group @@ -92,7 +92,7 @@ @@ -217,7 +219,7 @@ index f13e5f2..813db25 100644 101 rw quick 102 rw quick diff --git a/tests/test-x86-cpuid-compat.c b/tests/test-x86-cpuid-compat.c -index e75b959..6b46b73 100644 +index e75b959950..6b46b73dd0 100644 --- a/tests/test-x86-cpuid-compat.c +++ b/tests/test-x86-cpuid-compat.c @@ -300,6 +300,7 @@ int main(int argc, char **argv) @@ -237,7 +239,7 @@ index e75b959..6b46b73 100644 /* Test feature parsing */ add_feature_test("x86/cpuid/features/plus", diff --git a/tests/usb-hcd-xhci-test.c b/tests/usb-hcd-xhci-test.c -index 9eb24b0..465ed26 100644 +index 9eb24b00e4..465ed26dfc 100644 --- a/tests/usb-hcd-xhci-test.c +++ b/tests/usb-hcd-xhci-test.c @@ -21,6 +21,7 @@ static void test_xhci_hotplug(void) @@ -267,5 +269,5 @@ index 9eb24b0..465ed26 100644 qtest_start("-device nec-usb-xhci,id=xhci" -- -1.8.3.1 +2.20.1 diff --git a/0012-vfio-cap-number-of-devices-that-can-be-assigned.patch b/0012-vfio-cap-number-of-devices-that-can-be-assigned.patch index 42b8e91..02030ab 100644 --- a/0012-vfio-cap-number-of-devices-that-can-be-assigned.patch +++ b/0012-vfio-cap-number-of-devices-that-can-be-assigned.patch @@ -1,4 +1,4 @@ -From ce492d69e627db370aef7907409e88b83e71619b Mon Sep 17 00:00:00 2001 +From 59f231a2ac7d8915f905cec514de580bbbf039c0 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 @@ -35,13 +35,14 @@ Merged patches (2.9.0): (cherry picked from commit 9fa3c9fc6dfcde76d80db1aa601b2d577f72ceec) (cherry picked from commit 3cb35556dc7d994f203d732fe952f95fcdb03c0a) +Signed-off-by: Danilo C. L. de Paula --- hw/vfio/pci.c | 29 ++++++++++++++++++++++++++++- hw/vfio/pci.h | 1 + 2 files changed, 29 insertions(+), 1 deletion(-) diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c -index 7c474a9..bb9f28e 100644 +index 7c474a9d4a..bb9f28ed95 100644 --- a/hw/vfio/pci.c +++ b/hw/vfio/pci.c @@ -41,6 +41,9 @@ @@ -97,7 +98,7 @@ index 7c474a9..bb9f28e 100644 false), DEFINE_PROP_BOOL("x-no-vfio-ioeventfd", VFIOPCIDevice, no_vfio_ioeventfd, diff --git a/hw/vfio/pci.h b/hw/vfio/pci.h -index 834a90d..205954e 100644 +index 834a90d646..205954e9f8 100644 --- a/hw/vfio/pci.h +++ b/hw/vfio/pci.h @@ -135,6 +135,7 @@ typedef struct VFIOPCIDevice { @@ -109,5 +110,5 @@ index 834a90d..205954e 100644 uint32_t device_id; uint32_t sub_vendor_id; -- -1.8.3.1 +2.20.1 diff --git a/0013-Add-support-statement-to-help-output.patch b/0013-Add-support-statement-to-help-output.patch index 421b5b5..b93abbf 100644 --- a/0013-Add-support-statement-to-help-output.patch +++ b/0013-Add-support-statement-to-help-output.patch @@ -1,4 +1,4 @@ -From c219069712b16be5664bfa6a4fcec4aa261d21c8 Mon Sep 17 00:00:00 2001 +From 9176ac2bc13e273deab798ec95fc2a01f35db43d 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 @@ -18,12 +18,13 @@ as unsupported by Red Hat, and advising users to use libvirt instead. Signed-off-by: Eduardo Habkost (cherry picked from commit 2a07700936e39856cc9f149c6a6517f0715536a6) (cherry picked from commit 5dd2f4706e2fef945771949e59a8fcc1b5452de9) +Signed-off-by: Danilo C. L. de Paula --- vl.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/vl.c b/vl.c -index f9166f5..dd1fadf 100644 +index f9166f509b..dd1fadfe08 100644 --- a/vl.c +++ b/vl.c @@ -1803,9 +1803,17 @@ static void version(void) @@ -53,5 +54,5 @@ index f9166f5..dd1fadf 100644 } -- -1.8.3.1 +2.20.1 diff --git a/0014-globally-limit-the-maximum-number-of-CPUs.patch b/0014-globally-limit-the-maximum-number-of-CPUs.patch index 84fa5b6..136895d 100644 --- a/0014-globally-limit-the-maximum-number-of-CPUs.patch +++ b/0014-globally-limit-the-maximum-number-of-CPUs.patch @@ -1,4 +1,4 @@ -From 29def10374e810c82ef7e01bcdac0c0e77b42aec Mon Sep 17 00:00:00 2001 +From 11b7001f3eb0c4de20695821eaee5589c4c3ac32 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 @@ -74,13 +74,15 @@ The recommended vcpu max limit (KVM_CAP_NR_VCPUS) should be used instead of the actual max vcpu limit (KVM_CAP_MAX_VCPUS) to give an error. This commit matches the limit to current KVM_CAP_NR_VCPUS value. + +Signed-off-by: Danilo C. L. de Paula --- accel/kvm/kvm-all.c | 12 ++++++++++++ vl.c | 18 ++++++++++++++++++ 2 files changed, 30 insertions(+) diff --git a/accel/kvm/kvm-all.c b/accel/kvm/kvm-all.c -index f450f25..2d850df 100644 +index f450f25295..2d850df9e0 100644 --- a/accel/kvm/kvm-all.c +++ b/accel/kvm/kvm-all.c @@ -1869,6 +1869,18 @@ static int kvm_init(MachineState *ms) @@ -103,7 +105,7 @@ index f450f25..2d850df 100644 if (nc->num > soft_vcpus_limit) { warn_report("Number of %s cpus requested (%d) exceeds " diff --git a/vl.c b/vl.c -index dd1fadf..7c52255 100644 +index dd1fadfe08..7c52255141 100644 --- a/vl.c +++ b/vl.c @@ -132,6 +132,8 @@ int main(int argc, char **argv) @@ -146,5 +148,5 @@ index dd1fadf..7c52255 100644 configure_rtc(qemu_find_opts_singleton("rtc")); -- -1.8.3.1 +2.20.1 diff --git a/0015-Add-support-for-simpletrace.patch b/0015-Add-support-for-simpletrace.patch index a845db4..6fc5c29 100644 --- a/0015-Add-support-for-simpletrace.patch +++ b/0015-Add-support-for-simpletrace.patch @@ -1,4 +1,4 @@ -From 1e856ec9fb79314305380aba4c89c5d8987616a9 Mon Sep 17 00:00:00 2001 +From c32f0e6a6369ce5bc5c337b1fa158c43c067ca6f Mon Sep 17 00:00:00 2001 From: Miroslav Rezanina Date: Thu, 8 Oct 2015 09:50:17 +0200 Subject: Add support for simpletrace @@ -21,11 +21,13 @@ Merged patches (2.3.0): - 5292fc3 trace: add SystemTap init scripts for simpletrace bridge - eda9e5e simpletrace: install simpletrace.py - 85c4c8f trace: add systemtap-initscript README file to RPM + +Signed-off-by: Danilo C. L. de Paula --- .gitignore | 2 ++ Makefile | 4 +++ - README.systemtap | 43 +++++++++++++++++++++++++++++++++ - redhat/qemu-kvm.spec.template | 26 +++++++++++++++++++- + README.systemtap | 43 +++++++++++++++++++++++++ + redhat/qemu-kvm.spec.template | 26 ++++++++++++++- scripts/systemtap/conf.d/qemu_kvm.conf | 4 +++ scripts/systemtap/script.d/qemu_kvm.stp | 1 + 6 files changed, 79 insertions(+), 1 deletion(-) @@ -34,7 +36,7 @@ Merged patches (2.3.0): create mode 100644 scripts/systemtap/script.d/qemu_kvm.stp diff --git a/Makefile b/Makefile -index 288a5ac..8caca6c 100644 +index 288a5ac28a..8caca6cfc0 100644 --- a/Makefile +++ b/Makefile @@ -910,6 +910,10 @@ endif @@ -50,7 +52,7 @@ index 288a5ac..8caca6c 100644 ctags: diff --git a/README.systemtap b/README.systemtap new file mode 100644 -index 0000000..ad913fc +index 0000000000..ad913fc990 --- /dev/null +++ b/README.systemtap @@ -0,0 +1,43 @@ @@ -99,7 +101,7 @@ index 0000000..ad913fc + # /usr/share/qemu-kvm/simpletrace.py --no-header /usr/share/qemu-kvm/trace-events /tmp/trace.log diff --git a/scripts/systemtap/conf.d/qemu_kvm.conf b/scripts/systemtap/conf.d/qemu_kvm.conf new file mode 100644 -index 0000000..372d816 +index 0000000000..372d8160a4 --- /dev/null +++ b/scripts/systemtap/conf.d/qemu_kvm.conf @@ -0,0 +1,4 @@ @@ -109,11 +111,11 @@ index 0000000..372d816 +qemu_kvm_OPT="-s4" # per-CPU buffer size, in megabytes diff --git a/scripts/systemtap/script.d/qemu_kvm.stp b/scripts/systemtap/script.d/qemu_kvm.stp new file mode 100644 -index 0000000..c04abf9 +index 0000000000..c04abf9449 --- /dev/null +++ b/scripts/systemtap/script.d/qemu_kvm.stp @@ -0,0 +1 @@ +probe qemu.kvm.simpletrace.handle_qmp_command,qemu.kvm.simpletrace.monitor_protocol_*,qemu.kvm.simpletrace.migrate_set_state {} -- -1.8.3.1 +2.20.1 diff --git a/0016-Use-qemu-kvm-in-documentation-instead-of-qemu-system.patch b/0016-Use-qemu-kvm-in-documentation-instead-of-qemu-system.patch index 35095e1..f6a6a9d 100644 --- a/0016-Use-qemu-kvm-in-documentation-instead-of-qemu-system.patch +++ b/0016-Use-qemu-kvm-in-documentation-instead-of-qemu-system.patch @@ -1,4 +1,4 @@ -From 6653aed7b06fd81e60633f7ff81d2d2cd35777fd Mon Sep 17 00:00:00 2001 +From 70a20c03876ba38ba94a5e8e6e1d848e60ef42eb Mon Sep 17 00:00:00 2001 From: Miroslav Rezanina Date: Fri, 30 Nov 2018 09:11:03 +0100 Subject: Use qemu-kvm in documentation instead of qemu-system- @@ -16,15 +16,16 @@ We change the name and location of qemu-kvm binaries. Update documentation to reflect this change. Only architectures available in RHEL are updated. Signed-off-by: Miroslav Rezanina +Signed-off-by: Danilo C. L. de Paula --- - docs/qemu-block-drivers.texi | 70 +++++++++++----------- - docs/qemu-cpu-models.texi | 8 +-- - qemu-doc.texi | 70 +++++++++++----------- - qemu-options.hx | 140 ++++++++++++++++++++++--------------------- + docs/qemu-block-drivers.texi | 70 +++++++++--------- + docs/qemu-cpu-models.texi | 8 +- + qemu-doc.texi | 70 +++++++++--------- + qemu-options.hx | 140 ++++++++++++++++++----------------- 4 files changed, 146 insertions(+), 142 deletions(-) diff --git a/docs/qemu-block-drivers.texi b/docs/qemu-block-drivers.texi -index 91ab0ec..35cc3d8 100644 +index 91ab0eceae..35cc3d838c 100644 --- a/docs/qemu-block-drivers.texi +++ b/docs/qemu-block-drivers.texi @@ -405,7 +405,7 @@ QEMU can automatically create a virtual FAT disk image from a @@ -235,7 +236,7 @@ index 91ab0ec..35cc3d8 100644 @var{host}:@var{bus}:@var{slot}.@var{func} is the NVMe controller's PCI device diff --git a/docs/qemu-cpu-models.texi b/docs/qemu-cpu-models.texi -index ad040cf..0de3229 100644 +index ad040cfc98..0de3229e43 100644 --- a/docs/qemu-cpu-models.texi +++ b/docs/qemu-cpu-models.texi @@ -578,25 +578,25 @@ CPU models / features in QEMU and libvirt @@ -269,7 +270,7 @@ index ad040cf..0de3229 100644 @end table diff --git a/qemu-doc.texi b/qemu-doc.texi -index 577d1e8..44427bb 100644 +index 577d1e8376..44427bb0e1 100644 --- a/qemu-doc.texi +++ b/qemu-doc.texi @@ -207,12 +207,12 @@ Note that, by default, GUS shares IRQ(7) with parallel ports and so @@ -561,7 +562,7 @@ index 577d1e8..44427bb 100644 -prom-env 'boot-args=conf=hd:2,\yaboot.conf' @end example diff --git a/qemu-options.hx b/qemu-options.hx -index 6873f9e..9f323ec 100644 +index 6873f9e674..9f323ec2a2 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -254,7 +254,7 @@ This option defines a free-form string that can be used to describe @var{fd}. @@ -953,5 +954,5 @@ index 6873f9e..9f323ec 100644 -chardev socket,id=chardev0,path=/path/to/socket \ -object cryptodev-vhost-user,id=cryptodev0,chardev=chardev0 \ -- -1.8.3.1 +2.20.1 diff --git a/0017-usb-xhci-Fix-PCI-capability-order.patch b/0017-usb-xhci-Fix-PCI-capability-order.patch index eea2b60..a74cc82 100644 --- a/0017-usb-xhci-Fix-PCI-capability-order.patch +++ b/0017-usb-xhci-Fix-PCI-capability-order.patch @@ -1,4 +1,4 @@ -From 3d4a21ffdf876acfd5a8546a2f3e9ab2bfcf2ff9 Mon Sep 17 00:00:00 2001 +From 4ebea24b67b02abb2fbbd67c3334496315d75b6f 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 @@ -56,12 +56,13 @@ Conflicts: (cherry picked from commit a42f86dc906cc7d2c16d02bf125ed76847b469cb) (cherry picked from commit 992ab2e4f6e15d3e51bc716763aa8d6f45c6d29d) +Signed-off-by: Danilo C. L. de Paula --- hw/usb/hcd-xhci.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/hw/usb/hcd-xhci.c b/hw/usb/hcd-xhci.c -index 9854fae..adfacac 100644 +index 9854fae583..adfacace65 100644 --- a/hw/usb/hcd-xhci.c +++ b/hw/usb/hcd-xhci.c @@ -3397,6 +3397,12 @@ static void usb_xhci_realize(struct PCIDevice *dev, Error **errp) @@ -91,5 +92,5 @@ index 9854fae..adfacac 100644 /* TODO check for errors, and should fail when msix=on */ msix_init(dev, xhci->numintrs, -- -1.8.3.1 +2.20.1 diff --git a/0018-virtio-scsi-Reject-scsi-cd-if-data-plane-enabled-RHE.patch b/0018-virtio-scsi-Reject-scsi-cd-if-data-plane-enabled-RHE.patch index 585ef69..3b3ae2c 100644 --- a/0018-virtio-scsi-Reject-scsi-cd-if-data-plane-enabled-RHE.patch +++ b/0018-virtio-scsi-Reject-scsi-cd-if-data-plane-enabled-RHE.patch @@ -1,4 +1,4 @@ -From 5ba84e6e9b843cc224735e293da35fc218da27fb Mon Sep 17 00:00:00 2001 +From 1a030226ff750613c7f567150f6bf97b902b0151 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] @@ -45,7 +45,7 @@ Signed-off-by: Danilo C. L. de Paula 1 file changed, 9 insertions(+) diff --git a/hw/scsi/virtio-scsi.c b/hw/scsi/virtio-scsi.c -index 8b9e5e2..9df5494 100644 +index 8b9e5e2b49..9df5494398 100644 --- a/hw/scsi/virtio-scsi.c +++ b/hw/scsi/virtio-scsi.c @@ -805,6 +805,15 @@ static void virtio_scsi_hotplug(HotplugHandler *hotplug_dev, DeviceState *dev, @@ -65,5 +65,5 @@ index 8b9e5e2..9df5494 100644 if (blk_op_is_blocked(sd->conf.blk, BLOCK_OP_TYPE_DATAPLANE, errp)) { return; -- -1.8.3.1 +2.20.1 diff --git a/0019-BZ1653590-Require-at-least-64kiB-pages-for-downstrea.patch b/0019-BZ1653590-Require-at-least-64kiB-pages-for-downstrea.patch index b932c83..a0260c2 100644 --- a/0019-BZ1653590-Require-at-least-64kiB-pages-for-downstrea.patch +++ b/0019-BZ1653590-Require-at-least-64kiB-pages-for-downstrea.patch @@ -1,4 +1,4 @@ -From 4653a397c083e29b2a54ade8b17c977f224a3b80 Mon Sep 17 00:00:00 2001 +From e0daf3e497f1f82a0d8c45a9d26e9982a6f866ac 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 @@ -32,7 +32,7 @@ Signed-off-by: Danilo C. L. de Paula 1 file changed, 7 insertions(+) diff --git a/hw/ppc/spapr_caps.c b/hw/ppc/spapr_caps.c -index bbb001f..40cd9dc 100644 +index bbb001f84a..40cd9dcde6 100644 --- a/hw/ppc/spapr_caps.c +++ b/hw/ppc/spapr_caps.c @@ -343,12 +343,19 @@ void spapr_check_pagesize(SpaprMachineState *spapr, hwaddr pagesize, @@ -56,5 +56,5 @@ index bbb001f..40cd9dc 100644 spapr_check_pagesize(spapr, qemu_minrampagesize(), errp); } -- -1.8.3.1 +2.20.1 diff --git a/kvm-pc-Don-t-make-die-id-mandatory-unless-necessary.patch b/0020-pc-Don-t-make-die-id-mandatory-unless-necessary.patch similarity index 93% rename from kvm-pc-Don-t-make-die-id-mandatory-unless-necessary.patch rename to 0020-pc-Don-t-make-die-id-mandatory-unless-necessary.patch index fa8a1bb..b527a07 100644 --- a/kvm-pc-Don-t-make-die-id-mandatory-unless-necessary.patch +++ b/0020-pc-Don-t-make-die-id-mandatory-unless-necessary.patch @@ -1,7 +1,7 @@ -From 7909ad1654df63be6321af36f1ef436a990ab6df Mon Sep 17 00:00:00 2001 +From 7d5c2ef35d0bd7eb90fac2f40225bcfb4a46421d Mon Sep 17 00:00:00 2001 From: Eduardo Habkost Date: Fri, 16 Aug 2019 17:16:33 +0100 -Subject: [PATCH 2/7] pc: Don't make die-id mandatory unless necessary +Subject: pc: Don't make die-id mandatory unless necessary RH-Author: Eduardo Habkost Message-id: <20190816171633.26797-2-ehabkost@redhat.com> @@ -45,13 +45,13 @@ Changes v1 -> v2: Signed-off-by: Danilo C. L. de Paula --- - hw/i386/pc.c | 8 ++++++++ - tests/acceptance/pc_cpu_hotplug_props.py | 35 ++++++++++++++++++++++++++++++++ + hw/i386/pc.c | 8 ++++++ + tests/acceptance/pc_cpu_hotplug_props.py | 35 ++++++++++++++++++++++++ 2 files changed, 43 insertions(+) create mode 100644 tests/acceptance/pc_cpu_hotplug_props.py diff --git a/hw/i386/pc.c b/hw/i386/pc.c -index 9ded0db..b3d2d1e 100644 +index 9ded0db80d..b3d2d1e88a 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -2622,6 +2622,14 @@ static void pc_cpu_pre_plug(HotplugHandler *hotplug_dev, @@ -71,7 +71,7 @@ index 9ded0db..b3d2d1e 100644 return; diff --git a/tests/acceptance/pc_cpu_hotplug_props.py b/tests/acceptance/pc_cpu_hotplug_props.py new file mode 100644 -index 0000000..08b7e63 +index 0000000000..08b7e632c6 --- /dev/null +++ b/tests/acceptance/pc_cpu_hotplug_props.py @@ -0,0 +1,35 @@ @@ -111,5 +111,5 @@ index 0000000..08b7e63 + self.vm.launch() + self.assertEquals(len(self.vm.command('query-cpus')), 2) -- -1.8.3.1 +2.20.1 diff --git a/kvm-Update-version-for-v4.1.0-release.patch b/kvm-Update-version-for-v4.1.0-release.patch deleted file mode 100644 index dcd36bc..0000000 --- a/kvm-Update-version-for-v4.1.0-release.patch +++ /dev/null @@ -1,42 +0,0 @@ -From cf5e1c094d045cbbb9fd58fd9ec9c8fe8342eb4f Mon Sep 17 00:00:00 2001 -From: Miroslav Rezanina -Date: Mon, 19 Aug 2019 08:54:19 +0100 -Subject: [PATCH 7/7] Update version for v4.1.0 release -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -RH-Author: Miroslav Rezanina -Message-id: <7fdfb1e847814fc97d2ef85172e75e2af70b5cae.1566204425.git.mrezanin@redhat.com> -Patchwork-id: 90055 -O-Subject: [RHEL-AV-8.1 qemu-kvm PATCH 5/5] Update version for v4.1.0 release -Bugzilla: 1733977 1740692 -RH-Acked-by: Philippe Mathieu-Daudé -RH-Acked-by: Yash Mankad -RH-Acked-by: Danilo de Paula - -From: Peter Maydell - -Signed-off-by: Peter Maydell -(cherry picked from commit 9e06029aea3b2eca1d5261352e695edc1e7d7b8b) -Signed-off-by: Danilo C. L. de Paula - -Conflicts: - VERSION - we do not backport rc5 version change - -Signed-off-by: Miroslav Rezanina -Signed-off-by: Danilo C. L. de Paula ---- - VERSION | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/VERSION b/VERSION -index 8048f65..ee74734 100644 ---- a/VERSION -+++ b/VERSION -@@ -1 +1 @@ --4.0.94 -+4.1.0 --- -1.8.3.1 - diff --git a/kvm-display-bochs-fix-pcie-support.patch b/kvm-display-bochs-fix-pcie-support.patch deleted file mode 100644 index dfdf84b..0000000 --- a/kvm-display-bochs-fix-pcie-support.patch +++ /dev/null @@ -1,86 +0,0 @@ -From 8ba44c5854ab6e6feac8bc979f07ae241825673d Mon Sep 17 00:00:00 2001 -From: Miroslav Rezanina -Date: Mon, 19 Aug 2019 08:54:15 +0100 -Subject: [PATCH 3/7] display/bochs: fix pcie support -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -RH-Author: Miroslav Rezanina -Message-id: -Patchwork-id: 90060 -O-Subject: [RHEL-AV-8.1 qemu-kvm PATCH 1/5] display/bochs: fix pcie support -Bugzilla: 1733977 1740692 -RH-Acked-by: Philippe Mathieu-Daudé -RH-Acked-by: Yash Mankad -RH-Acked-by: Danilo de Paula - -From: Gerd Hoffmann - -Set QEMU_PCI_CAP_EXPRESS unconditionally in init(), then clear it in -realize() in case the device is not connected to a PCIe bus. - -This makes sure the pci config space allocation is big enough, so -accessing the PCIe extended config space doesn't overflow the pci -config space buffer. - -PCI(e) config space is guest writable. Writes are limited by -write mask (which probably is also filled with random stuff), -so the guest can only flip enabled bits. But I suspect it -still might be exploitable, so rather serious because it might -be a host escape for the guest. On the other hand the device -is probably not yet in widespread use. - -(For a QEMU version without this commit, a mitigation for the -bug is available: use "-device bochs-display" as a conventional pci -device only.) - -Cc: qemu-stable@nongnu.org -Signed-off-by: Gerd Hoffmann -Message-id: 20190812065221.20907-2-kraxel@redhat.com -Reviewed-by: Alex Williamson -Reviewed-by: Paolo Bonzini -Signed-off-by: Peter Maydell -(cherry picked from commit 5e7bcdcfe69ce0fad66012b2cfb2035003c37eef) - -Signed-off-by: Miroslav Rezanina -Signed-off-by: Danilo C. L. de Paula ---- - hw/display/bochs-display.c | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -diff --git a/hw/display/bochs-display.c b/hw/display/bochs-display.c -index 582133d..8e83b51 100644 ---- a/hw/display/bochs-display.c -+++ b/hw/display/bochs-display.c -@@ -297,9 +297,10 @@ static void bochs_display_realize(PCIDevice *dev, Error **errp) - } - - if (pci_bus_is_express(pci_get_bus(dev))) { -- dev->cap_present |= QEMU_PCI_CAP_EXPRESS; - ret = pcie_endpoint_cap_init(dev, 0x80); - assert(ret > 0); -+ } else { -+ dev->cap_present &= ~QEMU_PCI_CAP_EXPRESS; - } - - memory_region_set_log(&s->vram, true, DIRTY_MEMORY_VGA); -@@ -322,11 +323,15 @@ static void bochs_display_set_big_endian_fb(Object *obj, bool value, - - static void bochs_display_init(Object *obj) - { -+ PCIDevice *dev = PCI_DEVICE(obj); -+ - /* Expose framebuffer byteorder via QOM */ - object_property_add_bool(obj, "big-endian-framebuffer", - bochs_display_get_big_endian_fb, - bochs_display_set_big_endian_fb, - NULL); -+ -+ dev->cap_present |= QEMU_PCI_CAP_EXPRESS; - } - - static void bochs_display_exit(PCIDevice *dev) --- -1.8.3.1 - diff --git a/kvm-riscv-roms-Fix-make-rules-for-building-sifive_u-bios.patch b/kvm-riscv-roms-Fix-make-rules-for-building-sifive_u-bios.patch deleted file mode 100644 index c3d3a29..0000000 --- a/kvm-riscv-roms-Fix-make-rules-for-building-sifive_u-bios.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 21412b5480ec8432fb47fad1a460512424d53dce Mon Sep 17 00:00:00 2001 -From: Miroslav Rezanina -Date: Mon, 19 Aug 2019 08:54:18 +0100 -Subject: [PATCH 6/7] riscv: roms: Fix make rules for building sifive_u bios -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -RH-Author: Miroslav Rezanina -Message-id: <87c86632af83319c3c4a7ab01f2cf6de7e455ef6.1566204425.git.mrezanin@redhat.com> -Patchwork-id: 90059 -O-Subject: [RHEL-AV-8.1 qemu-kvm PATCH 4/5] riscv: roms: Fix make rules for building sifive_u bios -Bugzilla: 1733977 1740692 -RH-Acked-by: Philippe Mathieu-Daudé -RH-Acked-by: Yash Mankad -RH-Acked-by: Danilo de Paula - -From: Bin Meng - -Currently the make rules are wrongly using qemu/virt opensbi image -for sifive_u machine. Correct it. - -Signed-off-by: Bin Meng -Reviewed-by: Chih-Min Chao -Reviewed-by: Alistair Francis -Message-id: 1564812484-20385-1-git-send-email-bmeng.cn@gmail.com -Signed-off-by: Peter Maydell -(cherry picked from commit 02db1be1d074d75ad1c9bd1e9681f1b0b6299cee) -Signed-off-by: Miroslav Rezanina -Signed-off-by: Danilo C. L. de Paula ---- - roms/Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/roms/Makefile b/roms/Makefile -index dc70fb5..775c963 100644 ---- a/roms/Makefile -+++ b/roms/Makefile -@@ -183,7 +183,7 @@ opensbi64-sifive_u: - $(MAKE) -C opensbi \ - CROSS_COMPILE=$(riscv64_cross_prefix) \ - PLATFORM="qemu/sifive_u" -- cp opensbi/build/platform/qemu/virt/firmware/fw_jump.bin ../pc-bios/opensbi-riscv64-sifive_u-fw_jump.bin -+ cp opensbi/build/platform/qemu/sifive_u/firmware/fw_jump.bin ../pc-bios/opensbi-riscv64-sifive_u-fw_jump.bin - - clean: - rm -rf seabios/.config seabios/out seabios/builds --- -1.8.3.1 - diff --git a/kvm-spapr-Reset-CAS-IRQ-subsystem-after-devices.patch b/kvm-spapr-Reset-CAS-IRQ-subsystem-after-devices.patch deleted file mode 100644 index 4842a54..0000000 --- a/kvm-spapr-Reset-CAS-IRQ-subsystem-after-devices.patch +++ /dev/null @@ -1,125 +0,0 @@ -From 2edb7c1181fb69e410ffc688986a12d36899f976 Mon Sep 17 00:00:00 2001 -From: Miroslav Rezanina -Date: Mon, 19 Aug 2019 08:54:16 +0100 -Subject: [PATCH 4/7] spapr: Reset CAS & IRQ subsystem after devices -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -RH-Author: Miroslav Rezanina -Message-id: <9b7c319c271fa2c8cda410e87aef985d8c180049.1566204425.git.mrezanin@redhat.com> -Patchwork-id: 90057 -O-Subject: [RHEL-AV-8.1 qemu-kvm PATCH 2/5] spapr: Reset CAS & IRQ subsystem after devices -Bugzilla: 1733977 -RH-Acked-by: Philippe Mathieu-Daudé -RH-Acked-by: Yash Mankad -RH-Acked-by: Danilo de Paula - -From: David Gibson - -Bugzilla: 1733977 - -This fixes a nasty regression in qemu-4.1 for the 'pseries' machine, -caused by the new "dual" interrupt controller model. Specifically, -qemu can crash when used with KVM if a 'system_reset' is requested -while there's active I/O in the guest. - -The problem is that in spapr_machine_reset() we: - -1. Reset the CAS vector state - spapr_ovec_cleanup(spapr->ov5_cas); - -2. Reset all devices - qemu_devices_reset() - -3. Reset the irq subsystem - spapr_irq_reset(); - -However (1) implicitly changes the interrupt delivery mode, because -whether we're using XICS or XIVE depends on the CAS state. We don't -properly initialize the new irq mode until (3) though - in particular -setting up the KVM devices. - -During (2), we can temporarily drop the BQL allowing some irqs to be -delivered which will go to an irq system that's not properly set up. - -Specifically, if the previous guest was in (KVM) XIVE mode, the CAS -reset will put us back in XICS mode. kvm_kernel_irqchip() still -returns true, because XIVE was using KVM, however XICs doesn't have -its KVM components intialized and kernel_xics_fd == -1. When the irq -is delivered it goes via ics_kvm_set_irq() which assert()s that -kernel_xics_fd != -1. - -This change addresses the problem by delaying the CAS reset until -after the devices reset. The device reset should quiesce all the -devices so we won't get irqs delivered while we mess around with the -IRQ. The CAS reset and irq re-initialize should also now be under the -same BQL critical section so nothing else should be able to interrupt -it either. - -We also move the spapr_irq_msi_reset() used in one of the legacy irq -modes, since it logically makes sense at the same point as the -spapr_irq_reset() (it's essentially an equivalent operation for older -machine types). Since we don't need to switch between different -interrupt controllers for those old machine types it shouldn't -actually be broken in those cases though. - -Cc: Cédric Le Goater - -Fixes: b2e22477 "spapr: add a 'reset' method to the sPAPR IRQ backend" -Fixes: 13db0cd9 "spapr: introduce a new sPAPR IRQ backend supporting - XIVE and XICS" -Signed-off-by: David Gibson -(cherry picked from commit 25c9780d38d4494f8610371d883865cf40b35dd6) - -Signed-off-by: Miroslav Rezanina -Signed-off-by: Danilo C. L. de Paula ---- - hw/ppc/spapr.c | 24 ++++++++++++------------ - 1 file changed, 12 insertions(+), 12 deletions(-) - -diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c -index ab64d43..669eae1 100644 ---- a/hw/ppc/spapr.c -+++ b/hw/ppc/spapr.c -@@ -1727,6 +1727,18 @@ static void spapr_machine_reset(MachineState *machine) - } - - /* -+ * NVLink2-connected GPU RAM needs to be placed on a separate NUMA node. -+ * We assign a new numa ID per GPU in spapr_pci_collect_nvgpu() which is -+ * called from vPHB reset handler so we initialize the counter here. -+ * If no NUMA is configured from the QEMU side, we start from 1 as GPU RAM -+ * must be equally distant from any other node. -+ * The final value of spapr->gpu_numa_id is going to be written to -+ * max-associativity-domains in spapr_build_fdt(). -+ */ -+ spapr->gpu_numa_id = MAX(1, nb_numa_nodes); -+ qemu_devices_reset(); -+ -+ /* - * If this reset wasn't generated by CAS, we should reset our - * negotiated options and start from scratch - */ -@@ -1742,18 +1754,6 @@ static void spapr_machine_reset(MachineState *machine) - } - - /* -- * NVLink2-connected GPU RAM needs to be placed on a separate NUMA node. -- * We assign a new numa ID per GPU in spapr_pci_collect_nvgpu() which is -- * called from vPHB reset handler so we initialize the counter here. -- * If no NUMA is configured from the QEMU side, we start from 1 as GPU RAM -- * must be equally distant from any other node. -- * The final value of spapr->gpu_numa_id is going to be written to -- * max-associativity-domains in spapr_build_fdt(). -- */ -- spapr->gpu_numa_id = MAX(1, nb_numa_nodes); -- qemu_devices_reset(); -- -- /* - * This is fixing some of the default configuration of the XIVE - * devices. To be called after the reset of the machine devices. - */ --- -1.8.3.1 - diff --git a/kvm-spapr-xive-Fix-migration-of-hot-plugged-CPUs.patch b/kvm-spapr-xive-Fix-migration-of-hot-plugged-CPUs.patch deleted file mode 100644 index 3cc18fb..0000000 --- a/kvm-spapr-xive-Fix-migration-of-hot-plugged-CPUs.patch +++ /dev/null @@ -1,135 +0,0 @@ -From 1a1ee2ef4c4c1dc310929e5d752a64eeb3f5245b Mon Sep 17 00:00:00 2001 -From: Miroslav Rezanina -Date: Mon, 19 Aug 2019 08:54:17 +0100 -Subject: [PATCH 5/7] spapr/xive: Fix migration of hot-plugged CPUs -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -RH-Author: Miroslav Rezanina -Message-id: <7cdadb2fe39b9edfc4c281f4efb6f5afa0b1503f.1566204425.git.mrezanin@redhat.com> -Patchwork-id: 90058 -O-Subject: [RHEL-AV-8.1 qemu-kvm PATCH 3/5] spapr/xive: Fix migration of hot-plugged CPUs -Bugzilla: 1733977 -RH-Acked-by: Philippe Mathieu-Daudé -RH-Acked-by: Yash Mankad -RH-Acked-by: Danilo de Paula - -From: Cédric Le Goater - -Bugzilla: 1733977 - -The migration sequence of a guest using the XIVE exploitation mode -relies on the fact that the states of all devices are restored before -the machine is. This is not true for hot-plug devices such as CPUs -which state come after the machine. This breaks migration because the -thread interrupt context registers are not correctly set. - -Fix migration of hotplugged CPUs by restoring their context in the -'post_load' handler of the XiveTCTX model. - -Fixes: 277dd3d7712a ("spapr/xive: add migration support for KVM") -Signed-off-by: Cédric Le Goater -Message-Id: <20190813064853.29310-1-clg@kaod.org> -Signed-off-by: David Gibson -(cherry picked from commit 310cda5b5e9df642b19a0e9c504368ffba3b3ab9) -Signed-off-by: Miroslav Rezanina -Signed-off-by: Danilo C. L. de Paula ---- - hw/intc/spapr_xive_kvm.c | 19 +++++++++++++++++-- - hw/intc/xive.c | 21 ++++++++++++++++++++- - include/hw/ppc/xive.h | 1 + - 3 files changed, 38 insertions(+), 3 deletions(-) - -diff --git a/hw/intc/spapr_xive_kvm.c b/hw/intc/spapr_xive_kvm.c -index 3bf8e7a..8898615 100644 ---- a/hw/intc/spapr_xive_kvm.c -+++ b/hw/intc/spapr_xive_kvm.c -@@ -72,11 +72,17 @@ static void kvm_cpu_disable_all(void) - * XIVE Thread Interrupt Management context (KVM) - */ - --static void kvmppc_xive_cpu_set_state(XiveTCTX *tctx, Error **errp) -+void kvmppc_xive_cpu_set_state(XiveTCTX *tctx, Error **errp) - { -+ SpaprXive *xive = SPAPR_MACHINE(qdev_get_machine())->xive; - uint64_t state[2]; - int ret; - -+ /* The KVM XIVE device is not in use yet */ -+ if (xive->fd == -1) { -+ return; -+ } -+ - /* word0 and word1 of the OS ring. */ - state[0] = *((uint64_t *) &tctx->regs[TM_QW1_OS]); - -@@ -655,7 +661,16 @@ int kvmppc_xive_post_load(SpaprXive *xive, int version_id) - } - } - -- /* Restore the thread interrupt contexts */ -+ /* -+ * Restore the thread interrupt contexts of initial CPUs. -+ * -+ * The context of hotplugged CPUs is restored later, by the -+ * 'post_load' handler of the XiveTCTX model because they are not -+ * available at the time the SpaprXive 'post_load' method is -+ * called. We can not restore the context of all CPUs in the -+ * 'post_load' handler of XiveTCTX because the machine is not -+ * necessarily connected to the KVM device at that time. -+ */ - CPU_FOREACH(cs) { - PowerPCCPU *cpu = POWERPC_CPU(cs); - -diff --git a/hw/intc/xive.c b/hw/intc/xive.c -index cf77bdb..da148e9 100644 ---- a/hw/intc/xive.c -+++ b/hw/intc/xive.c -@@ -615,12 +615,31 @@ static int vmstate_xive_tctx_pre_save(void *opaque) - return 0; - } - -+static int vmstate_xive_tctx_post_load(void *opaque, int version_id) -+{ -+ Error *local_err = NULL; -+ -+ if (kvm_irqchip_in_kernel()) { -+ /* -+ * Required for hotplugged CPU, for which the state comes -+ * after all states of the machine. -+ */ -+ kvmppc_xive_cpu_set_state(XIVE_TCTX(opaque), &local_err); -+ if (local_err) { -+ error_report_err(local_err); -+ return -1; -+ } -+ } -+ -+ return 0; -+} -+ - static const VMStateDescription vmstate_xive_tctx = { - .name = TYPE_XIVE_TCTX, - .version_id = 1, - .minimum_version_id = 1, - .pre_save = vmstate_xive_tctx_pre_save, -- .post_load = NULL, /* handled by the sPAPRxive model */ -+ .post_load = vmstate_xive_tctx_post_load, - .fields = (VMStateField[]) { - VMSTATE_BUFFER(regs, XiveTCTX), - VMSTATE_END_OF_LIST() -diff --git a/include/hw/ppc/xive.h b/include/hw/ppc/xive.h -index 55c53c7..7363351 100644 ---- a/include/hw/ppc/xive.h -+++ b/include/hw/ppc/xive.h -@@ -438,5 +438,6 @@ void kvmppc_xive_source_set_irq(void *opaque, int srcno, int val); - void kvmppc_xive_cpu_connect(XiveTCTX *tctx, Error **errp); - void kvmppc_xive_cpu_synchronize_state(XiveTCTX *tctx, Error **errp); - void kvmppc_xive_cpu_get_state(XiveTCTX *tctx, Error **errp); -+void kvmppc_xive_cpu_set_state(XiveTCTX *tctx, Error **errp); - - #endif /* PPC_XIVE_H */ --- -1.8.3.1 - diff --git a/kvm-spec-Update-seavgabios-dependency.patch b/kvm-spec-Update-seavgabios-dependency.patch deleted file mode 100644 index ee00575..0000000 --- a/kvm-spec-Update-seavgabios-dependency.patch +++ /dev/null @@ -1,48 +0,0 @@ -From a6e6495fc1369e1c9f8db872411eea7e0a4f2a67 Mon Sep 17 00:00:00 2001 -From: Miroslav Rezanina -Date: Tue, 9 Jul 2019 12:57:07 +0100 -Subject: [PATCH 1/7] spec: Update seavgabios dependency - -RH-Author: Miroslav Rezanina -Message-id: <1562677027-9619-1-git-send-email-mrezanin@redhat.com> -Patchwork-id: 89436 -O-Subject: [RHEL-AV-8.1.0 qemu-kvm PATCH] spec: Update seavgabios dependency -Bugzilla: 1725664 -RH-Acked-by: Laszlo Ersek -RH-Acked-by: Danilo de Paula -RH-Acked-by: Wainer dos Santos Moschetta - -From: Miroslav Rezanina - -Branch: rhel-av-8.1.0/master-4.0.0 -Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1725664 -Brew: https://brewweb.engineering.redhat.com/brew/taskinfo?taskID=22574916 -Upstream: n/a - -We introduced new vga bios files (vgabios-ramfb.bin and -vgabios-bochs-display.bin) recently. To prevent dangling symlinks, -we bump required seavgabios-bin package to version adding these -bios files. - -Signed-off-by: Miroslav Rezanina -Signed-off-by: Danilo C. L. de Paula ---- - redhat/qemu-kvm.spec.template | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/qemu-kvm.spec b/qemu-kvm.spec -index e6c0980..a43ebc8 100644 ---- a/qemu-kvm.spec -+++ b/qemu-kvm.spec -@@ -244,7 +244,7 @@ Requires: edk2-aarch64 - %endif - - %ifnarch aarch64 s390x --Requires: seavgabios-bin >= 1.10.2-1 -+Requires: seavgabios-bin >= 1.12.0-3 - Requires: ipxe-roms-qemu >= 20170123-1 - %endif - %ifarch %{power64} --- -1.8.3.1 - diff --git a/kvm.modules b/kvm.modules new file mode 100644 index 0000000..b9d9646 --- /dev/null +++ b/kvm.modules @@ -0,0 +1,18 @@ +#!/bin/sh + +case $(uname -m) in + ppc64) + grep OPAL /proc/cpuinfo >/dev/null 2>&1 && opal=1 + + modprobe -b kvm >/dev/null 2>&1 + modprobe -b kvm-pr >/dev/null 2>&1 && kvm=1 + if [ "$opal" ]; then + modprobe -b kvm-hv >/dev/null 2>&1 + fi + ;; + s390x) + modprobe -b kvm >/dev/null 2>&1 && kvm=1 + ;; +esac + +exit 0 diff --git a/qemu-kvm.spec b/qemu-kvm.spec index 93b6b7e..2af9ec5 100644 --- a/qemu-kvm.spec +++ b/qemu-kvm.spec @@ -76,7 +76,7 @@ URL: http://www.qemu.org/ ExclusiveArch: x86_64 %{power64} aarch64 s390x -Source0: http://wiki.qemu.org/download/qemu-4.1.0-rc4.tar.xz +Source0: http://wiki.qemu.org/download/qemu-4.1.0.tar.xz # KSM control scripts Source4: ksm.service @@ -120,21 +120,7 @@ Patch0016: 0016-Use-qemu-kvm-in-documentation-instead-of-qemu-system.patch 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 -# For bz#1741451 - Failed to hot-plug vcpus -Patch21: kvm-pc-Don-t-make-die-id-mandatory-unless-necessary.patch -# For bz#1733977 - Qemu core dumped: /home/ngu/qemu/hw/intc/xics_kvm.c:321: ics_kvm_set_irq: Assertion `kernel_xics_fd != -1' failed -# For bz#1740692 - Backport QEMU 4.1.0 rc5 & ga patches -Patch22: kvm-display-bochs-fix-pcie-support.patch -# For bz#1733977 - Qemu core dumped: /home/ngu/qemu/hw/intc/xics_kvm.c:321: ics_kvm_set_irq: Assertion `kernel_xics_fd != -1' failed -Patch23: kvm-spapr-Reset-CAS-IRQ-subsystem-after-devices.patch -# For bz#1733977 - Qemu core dumped: /home/ngu/qemu/hw/intc/xics_kvm.c:321: ics_kvm_set_irq: Assertion `kernel_xics_fd != -1' failed -Patch24: kvm-spapr-xive-Fix-migration-of-hot-plugged-CPUs.patch -# For bz#1733977 - Qemu core dumped: /home/ngu/qemu/hw/intc/xics_kvm.c:321: ics_kvm_set_irq: Assertion `kernel_xics_fd != -1' failed -# For bz#1740692 - Backport QEMU 4.1.0 rc5 & ga patches -Patch25: kvm-riscv-roms-Fix-make-rules-for-building-sifive_u-bios.patch -# For bz#1733977 - Qemu core dumped: /home/ngu/qemu/hw/intc/xics_kvm.c:321: ics_kvm_set_irq: Assertion `kernel_xics_fd != -1' failed -# For bz#1740692 - Backport QEMU 4.1.0 rc5 & ga patches -Patch26: kvm-Update-version-for-v4.1.0-release.patch +Patch0020: 0020-pc-Don-t-make-die-id-mandatory-unless-necessary.patch BuildRequires: wget BuildRequires: rpm-build @@ -419,7 +405,7 @@ the Secure Shell (SSH) protocol. %prep -%setup -n qemu-%{version}-rc4 +%setup -n qemu-%{version} %autopatch -p1 %build diff --git a/sources b/sources index 3c58d7d..b509b83 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (qemu-4.1.0-rc4.tar.xz) = 349e1e5281fa62201bfd332b1e8f628488302eeac0211a3464551a3ac0f3212e6e816d2e046f07e5fa84ec6f86954615c6215f722af995c0a0cb07c2190ddba9 +SHA512 (qemu-4.1.0.tar.xz) = 82fd51702a7b9b1b00b2f1bd3b4a832b80249018dbba1add0b0a73e7d4bee452afd45574b4d8df7ce4477d8711f3bda4ca072a1a6de25895c93eb21cf78fc4b2