rpms
/
qemu-kvm
7
0
Fork 0
Code Issues Pull Requests Releases Activity

rebase to qemu-kvm-4.2.0-rc4

This commit is contained in:
Danilo C. L. de Paula 2019-12-09 20:39:05 +00:00
parent 320ac89d3f
commit e9e1d3955a
22 changed files with 16689 additions and 285 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -3,3 +3,4 @@
/qemu-4.1.0-rc4.tar.xz
/qemu-4.1.0.tar.xz
/qemu-4.2.0-rc1.tar.xz
/qemu-4.2.0-rc4.tar.xz

16352
0001-redhat-Adding-slirp-to-the-exploded-tree.patch Normal file
View File

File diff suppressed because it is too large Load Diff

29
0005-Initial-redhat-build.patch
View File

@ -1,4 +1,4 @@
From 8b38b3cb83404f47ba268958cec8121c674b8153 Mon Sep 17 00:00:00 2001
From 1285db562351e2233413d163bfef3ed002b10259 Mon Sep 17 00:00:00 2001
From: Miroslav Rezanina <mrezanin@redhat.com>
Date: Fri, 12 Oct 2018 07:31:11 +0200
Subject: Initial redhat build
@ -40,21 +40,14 @@ Rebase notes (4.1.0):
- Removed new unpacked files
- Update configure line to use new options
Rebase notes (weekly-190823):
Rebase notes (4.2.0):
- Disable iotest run during make check
Rebase notes (weekly-190906):
- README renamed to README.rst (upstream)
- Removed ui-spice-app.so
Rebase notes (weekly-190913):
- Added relevant changes from "505f7f4 redhat: Adding slirp to the exploded tree"
Rebase notes (weekly-190927):
- Removed qemu-ga.8 install from spec file - installed by make
Rebase notes (weekly-191011):
- Removed spapr-rtas.bin (upstream)
- Require newer SLOF (20191022)
Merged patches (3.1.0):
- 01f0c9f RHEL8: Add disable configure options to qemu spec file
@ -86,10 +79,10 @@ Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
Makefile | 3 +-
configure | 1 +
os-posix.c | 2 +-
redhat/Makefile | 82 +
redhat/Makefile | 82 ++
redhat/Makefile.common | 51 +
redhat/README.tests | 39 +
redhat/qemu-kvm.spec.template | 2369 +++++++++++++++++++++++++++++
redhat/qemu-kvm.spec.template | 2369 +++++++++++++++++++++++++++++++++++++
redhat/scripts/process-patches.sh | 7 +-
tests/Makefile.include | 2 +-
ui/vnc.c | 2 +-
@ -100,7 +93,7 @@ Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
create mode 100644 redhat/qemu-kvm.spec.template
diff --git a/Makefile b/Makefile
index b437a346d7..086727dbb9 100644
index b437a34..086727d 100644
--- a/Makefile
+++ b/Makefile
@@ -512,6 +512,7 @@ CAP_CFLAGS += -DCAPSTONE_HAS_ARM
@ -121,7 +114,7 @@ index b437a346d7..086727dbb9 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 6099be1d84..16564f8ccc 100755
index 6099be1..16564f8 100755
--- a/configure
+++ b/configure
@@ -2424,6 +2424,7 @@ if test "$seccomp" != "no" ; then
@ -133,7 +126,7 @@ index 6099be1d84..16564f8ccc 100755
# xen probe
diff --git a/os-posix.c b/os-posix.c
index 86cffd2c7d..1c9f86768d 100644
index 86cffd2..1c9f867 100644
--- a/os-posix.c
+++ b/os-posix.c
@@ -83,7 +83,7 @@ void os_setup_signal_handling(void)
@ -146,7 +139,7 @@ index 86cffd2c7d..1c9f86768d 100644
char *os_find_datadir(void)
{
diff --git a/tests/Makefile.include b/tests/Makefile.include
index 8566f5f119..b483790cf3 100644
index 8566f5f..b483790 100644
--- a/tests/Makefile.include
+++ b/tests/Makefile.include
@@ -1194,7 +1194,7 @@ check-acceptance: check-venv $(TESTS_RESULTS_DIR)
@ -159,7 +152,7 @@ index 8566f5f119..b483790cf3 100644
rm -rf $(check-unit-y) tests/*.o $(QEMU_IOTESTS_HELPERS-y)
rm -rf $(sort $(foreach target,$(SYSEMU_TARGET_LIST), $(check-qtest-$(target)-y)) $(check-qtest-generic-y))
diff --git a/ui/vnc.c b/ui/vnc.c
index 87b8045afe..ecf6276f5b 100644
index 87b8045..ecf6276 100644
--- a/ui/vnc.c
+++ b/ui/vnc.c
@@ -3987,7 +3987,7 @@ void vnc_display_open(const char *id, Error **errp)
@ -172,5 +165,5 @@ index 87b8045afe..ecf6276f5b 100644
if (saslErr != SASL_OK) {
error_setg(errp, "Failed to initialize SASL auth: %s",
--
2.21.0
1.8.3.1

245
0006-Enable-disable-devices-for-RHEL.patch
View File

@ -1,4 +1,4 @@
From 067b5ced8f6f2ee7cd44cfe8e17021974f403206 Mon Sep 17 00:00:00 2001
From e75b1c31b76463b4b8f30cb6dbd23ded014e9269 Mon Sep 17 00:00:00 2001
From: Miroslav Rezanina <mrezanin@redhat.com>
Date: Mon, 11 Jan 2016 11:53:33 +0100
Subject: Enable/disable devices for RHEL
@ -35,6 +35,10 @@ Rebase notes (4.2.0-rc0):
- Use conditional build for isa-superio.c (upstream change)
- Rename PCI_PIIX to PCI_I440FX (upstream change)
Rebase notes (4.2.0-rc3):
- Disabled ccid-card-emulated (patch 92566)
- Disabled vfio-pci-igd-lpc-bridge (patch 92565)
Merged patches (qemu 3.1.0):
- d51e082 Re-enable CONFIG_HYPERV_TESTDEV
- 4b889f3 Declare cirrus-vga as deprecated
@ -53,51 +57,44 @@ Merged patches (4.1.0):
Merged patches (weekly-190823):
- f7587dd RHEL: disable hostmem-memfd
Conflicts:
hw/isa/Makefile.objs
Conflicts:
hw/pci-host/i440fx.c
Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
---
Makefile.objs | 4 +-
backends/Makefile.objs | 3 +-
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/cpu/Makefile.objs | 5 +-
hw/display/Makefile.objs | 5 +-
hw/display/cirrus_vga.c | 3 +
hw/i386/pc_piix.c | 2 +
hw/ide/piix.c | 5 +-
hw/input/pckbd.c | 2 +
hw/net/e1000.c | 2 +
hw/pci-host/i440fx.c | 4 +
hw/pci-host/i440fx.c | 4 ++
hw/ppc/spapr_cpu_core.c | 2 +
hw/usb/ccid-card-emulated.c | 2 +
hw/vfio/pci-quirks.c | 5 ++
hw/usb/Makefile.objs | 4 +-
hw/vfio/pci-quirks.c | 9 +++
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 ++
target/s390x/kvm.c | 8 +++
util/memfd.c | 2 +-
vl.c | 8 +-
36 files changed, 314 insertions(+), 40 deletions(-)
vl.c | 8 ++-
35 files changed, 317 insertions(+), 41 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
@ -105,7 +102,7 @@ Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
create mode 100644 default-configs/x86_64-rh-devices.mak
diff --git a/Makefile.objs b/Makefile.objs
index 11ba1a36bd..fcf63e1096 100644
index 11ba1a3..fcf63e1 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -65,8 +65,8 @@ common-obj-y += replay/
@ -120,7 +117,7 @@ index 11ba1a36bd..fcf63e1096 100644
common-obj-y += dma-helpers.o
common-obj-y += vl.o
diff --git a/backends/Makefile.objs b/backends/Makefile.objs
index f0691116e8..f328d404bf 100644
index f069111..f328d40 100644
--- a/backends/Makefile.objs
+++ b/backends/Makefile.objs
@@ -16,4 +16,5 @@ endif
@ -132,7 +129,7 @@ index f0691116e8..f328d404bf 100644
+# common-obj-$(CONFIG_LINUX) += hostmem-memfd.o
diff --git a/default-configs/aarch64-rh-devices.mak b/default-configs/aarch64-rh-devices.mak
new file mode 100644
index 0000000000..a1ed641174
index 0000000..a1ed641
--- /dev/null
+++ b/default-configs/aarch64-rh-devices.mak
@@ -0,0 +1,20 @@
@ -157,7 +154,7 @@ index 0000000000..a1ed641174
+CONFIG_VIRTIO_PCI=y
+CONFIG_XIO3130=y
diff --git a/default-configs/aarch64-softmmu.mak b/default-configs/aarch64-softmmu.mak
index 958b1e08e4..8f6867d48a 100644
index 958b1e0..8f6867d 100644
--- a/default-configs/aarch64-softmmu.mak
+++ b/default-configs/aarch64-softmmu.mak
@@ -1,8 +1,10 @@
@ -177,7 +174,7 @@ index 958b1e08e4..8f6867d48a 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 0000000000..35f2106d06
index 0000000..35f2106
--- /dev/null
+++ b/default-configs/ppc64-rh-devices.mak
@@ -0,0 +1,32 @@
@ -214,7 +211,7 @@ index 0000000000..35f2106d06
+CONFIG_XIVE_SPAPR=y
+CONFIG_XIVE_KVM=y
diff --git a/default-configs/ppc64-softmmu.mak b/default-configs/ppc64-softmmu.mak
index cca52665d9..fec354f327 100644
index cca5266..fec354f 100644
--- a/default-configs/ppc64-softmmu.mak
+++ b/default-configs/ppc64-softmmu.mak
@@ -1,10 +1,12 @@
@ -235,7 +232,7 @@ index cca52665d9..fec354f327 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 0000000000..94ede1b5f6
index 0000000..94ede1b
--- /dev/null
+++ b/default-configs/rh-virtio.mak
@@ -0,0 +1,10 @@
@ -251,7 +248,7 @@ index 0000000000..94ede1b5f6
+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 0000000000..c3c73fe752
index 0000000..c3c73fe
--- /dev/null
+++ b/default-configs/s390x-rh-devices.mak
@@ -0,0 +1,15 @@
@ -271,7 +268,7 @@ index 0000000000..c3c73fe752
+CONFIG_VIRTIO_CCW=y
+CONFIG_WDT_DIAG288=y
diff --git a/default-configs/s390x-softmmu.mak b/default-configs/s390x-softmmu.mak
index f2287a133f..3e2e388e91 100644
index f2287a1..3e2e388 100644
--- a/default-configs/s390x-softmmu.mak
+++ b/default-configs/s390x-softmmu.mak
@@ -10,4 +10,6 @@
@ -284,7 +281,7 @@ index f2287a133f..3e2e388e91 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 0000000000..d59b6d9bb5
index 0000000..d59b6d9
--- /dev/null
+++ b/default-configs/x86_64-rh-devices.mak
@@ -0,0 +1,100 @@
@ -389,7 +386,7 @@ index 0000000000..d59b6d9bb5
+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 64b2ee2960..b5de7e5279 100644
index 64b2ee2..b5de7e5 100644
--- a/default-configs/x86_64-softmmu.mak
+++ b/default-configs/x86_64-softmmu.mak
@@ -1,3 +1,5 @@
@ -400,7 +397,7 @@ index 64b2ee2960..b5de7e5279 100644
+
+include x86_64-rh-devices.mak
diff --git a/hw/acpi/ich9.c b/hw/acpi/ich9.c
index 2034dd749e..ab203ad448 100644
index 2034dd7..ab203ad 100644
--- a/hw/acpi/ich9.c
+++ b/hw/acpi/ich9.c
@@ -449,8 +449,8 @@ void ich9_pm_add_properties(Object *obj, ICH9LPCPMRegs *pm, Error **errp)
@ -415,7 +412,7 @@ index 2034dd749e..ab203ad448 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 fe749f65fd..2aa1a9efdd 100644
index fe749f6..2aa1a9e 100644
--- a/hw/arm/Makefile.objs
+++ b/hw/arm/Makefile.objs
@@ -27,7 +27,7 @@ obj-$(CONFIG_VEXPRESS) += vexpress.o
@ -428,7 +425,7 @@ index fe749f65fd..2aa1a9efdd 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 ac5d31e8c1..e925bac002 100644
index ac5d31e..e925bac 100644
--- a/hw/block/fdc.c
+++ b/hw/block/fdc.c
@@ -46,6 +46,8 @@
@ -456,7 +453,7 @@ index ac5d31e8c1..e925bac002 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 867a7d2e8a..e678e9ee3c 100644
index 867a7d2..e678e9e 100644
--- a/hw/bt/Makefile.objs
+++ b/hw/bt/Makefile.objs
@@ -1,3 +1,3 @@
@ -466,7 +463,7 @@ index 867a7d2e8a..e678e9ee3c 100644
+#common-obj-y += hci-csr.o
diff --git a/hw/cpu/Makefile.objs b/hw/cpu/Makefile.objs
index 8db9e8a7b3..1601ea93c7 100644
index 8db9e8a..1601ea9 100644
--- a/hw/cpu/Makefile.objs
+++ b/hw/cpu/Makefile.objs
@@ -1,5 +1,6 @@
@ -479,7 +476,7 @@ index 8db9e8a7b3..1601ea93c7 100644
+common-obj-y += core.o
+# cluster.o
diff --git a/hw/display/Makefile.objs b/hw/display/Makefile.objs
index f2182e3bef..3d0cda1b52 100644
index f2182e3..3d0cda1 100644
--- a/hw/display/Makefile.objs
+++ b/hw/display/Makefile.objs
@@ -1,8 +1,9 @@
@ -495,7 +492,7 @@ index f2182e3bef..3d0cda1b52 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 cd283e53b4..93afa26fda 100644
index cd283e5..93afa26 100644
--- a/hw/display/cirrus_vga.c
+++ b/hw/display/cirrus_vga.c
@@ -2975,6 +2975,9 @@ static void pci_cirrus_vga_realize(PCIDevice *dev, Error **errp)
@ -508,22 +505,8 @@ index cd283e53b4..93afa26fda 100644
/* follow real hardware, cirrus card emulated has 4 MB video memory.
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/i386/pc_piix.c b/hw/i386/pc_piix.c
index 2aefa3b8df..a19f8058ab 100644
--- a/hw/i386/pc_piix.c
+++ b/hw/i386/pc_piix.c
@@ -78,7 +78,9 @@ static void pc_init1(MachineState *machine,
X86MachineState *x86ms = X86_MACHINE(machine);
MemoryRegion *system_memory = get_system_memory();
MemoryRegion *system_io = get_system_io();
+#ifdef CONFIG_IDE_ISA
int i;
+#endif
PCIBus *pci_bus;
ISABus *isa_bus;
PCII440FXState *i440fx_state;
diff --git a/hw/ide/piix.c b/hw/ide/piix.c
index db313dd3b1..e14858ca64 100644
index db313dd..e14858c 100644
--- a/hw/ide/piix.c
+++ b/hw/ide/piix.c
@@ -251,7 +251,8 @@ static void piix3_ide_class_init(ObjectClass *klass, void *data)
@ -546,7 +529,7 @@ index db313dd3b1..e14858ca64 100644
static const TypeInfo piix4_ide_info = {
diff --git a/hw/input/pckbd.c b/hw/input/pckbd.c
index f0acfd86f7..390eb6579c 100644
index f0acfd8..390eb65 100644
--- a/hw/input/pckbd.c
+++ b/hw/input/pckbd.c
@@ -571,6 +571,8 @@ static void i8042_class_initfn(ObjectClass *klass, void *data)
@ -559,7 +542,7 @@ index f0acfd86f7..390eb6579c 100644
static const TypeInfo i8042_info = {
diff --git a/hw/net/e1000.c b/hw/net/e1000.c
index a73f8d404e..fc73fdd6fa 100644
index a73f8d4..fc73fdd 100644
--- a/hw/net/e1000.c
+++ b/hw/net/e1000.c
@@ -1795,6 +1795,7 @@ static const E1000Info e1000_devices[] = {
@ -579,7 +562,7 @@ index a73f8d404e..fc73fdd6fa 100644
static void e1000_register_types(void)
diff --git a/hw/pci-host/i440fx.c b/hw/pci-host/i440fx.c
index f27131102d..17f10efae2 100644
index f271311..17f10ef 100644
--- a/hw/pci-host/i440fx.c
+++ b/hw/pci-host/i440fx.c
@@ -386,6 +386,7 @@ static const TypeInfo i440fx_info = {
@ -609,10 +592,10 @@ index f27131102d..17f10efae2 100644
}
diff --git a/hw/ppc/spapr_cpu_core.c b/hw/ppc/spapr_cpu_core.c
index ef7b27a66d..ef034a1279 100644
index 8339c4c..301cd7b 100644
--- a/hw/ppc/spapr_cpu_core.c
+++ b/hw/ppc/spapr_cpu_core.c
@@ -408,10 +408,12 @@ static const TypeInfo spapr_cpu_core_type_infos[] = {
@@ -403,10 +403,12 @@ static const TypeInfo spapr_cpu_core_type_infos[] = {
.instance_size = sizeof(SpaprCpuCore),
.class_size = sizeof(SpaprCpuCoreClass),
},
@ -625,47 +608,91 @@ index ef7b27a66d..ef034a1279 100644
DEFINE_SPAPR_CPU_CORE_TYPE("power7_v2.3"),
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 291e41db8a..1c0f190f1b 100644
--- a/hw/usb/ccid-card-emulated.c
+++ b/hw/usb/ccid-card-emulated.c
@@ -604,6 +604,8 @@ static void emulated_class_initfn(ObjectClass *klass, void *data)
set_bit(DEVICE_CATEGORY_INPUT, dc->categories);
dc->desc = "emulated smartcard";
dc->props = emulated_card_properties;
+ /* Disabled for Red Hat Enterprise Linux: */
+ dc->user_creatable = false;
}
static const TypeInfo emulated_card_info = {
diff --git a/hw/usb/Makefile.objs b/hw/usb/Makefile.objs
index 303ac08..700a918 100644
--- a/hw/usb/Makefile.objs
+++ b/hw/usb/Makefile.objs
@@ -30,7 +30,9 @@ common-obj-$(CONFIG_USB_BLUETOOTH) += dev-bluetooth.o
ifeq ($(CONFIG_USB_SMARTCARD),y)
common-obj-y += dev-smartcard-reader.o
common-obj-$(CONFIG_SMARTCARD) += smartcard.mo
-smartcard.mo-objs := ccid-card-passthru.o ccid-card-emulated.o
+# Disabled for Red Hat Enterprise Linux:
+# smartcard.mo-objs := ccid-card-passthru.o ccid-card-emulated.o
+smartcard.mo-objs := ccid-card-passthru.o
smartcard.mo-cflags := $(SMARTCARD_CFLAGS)
smartcard.mo-libs := $(SMARTCARD_LIBS)
endif
diff --git a/hw/vfio/pci-quirks.c b/hw/vfio/pci-quirks.c
index 136f3a9ad6..d761fcaf75 100644
index 136f3a9..4505ffe 100644
--- a/hw/vfio/pci-quirks.c
+++ b/hw/vfio/pci-quirks.c
@@ -1391,6 +1391,8 @@ static void vfio_pci_igd_lpc_bridge_class_init(ObjectClass *klass, void *data)
set_bit(DEVICE_CATEGORY_BRIDGE, dc->categories);
dc->desc = "VFIO dummy ISA/LPC bridge for IGD assignment";
dc->hotpluggable = false;
+ /* Disabled in Red Hat Enterprise Linux */
+ dc->user_creatable = false;
k->realize = vfio_pci_igd_lpc_bridge_realize;
k->class_id = PCI_CLASS_BRIDGE_ISA;
@@ -1166,6 +1166,7 @@ static void vfio_probe_rtl8168_bar2_quirk(VFIOPCIDevice *vdev, int nr)
trace_vfio_quirk_rtl8168_probe(vdev->vbasedev.name);
}
@@ -1584,6 +1586,9 @@ static void vfio_probe_igd_bar4_quirk(VFIOPCIDevice *vdev, int nr)
0, PCI_DEVFN(0x2, 0))) {
return;
}
+
+ /* Disabled in Red Hat Enterprise Linux */
+ return;
+#if 0 /* Disabled for Red Hat Enterprise Linux */
/*
* Intel IGD support
*
@@ -1239,6 +1240,7 @@ static int igd_gen(VFIOPCIDevice *vdev)
return 8; /* Assume newer is compatible */
}
+#endif
typedef struct VFIOIGDQuirk {
struct VFIOPCIDevice *vdev;
@@ -1311,6 +1313,7 @@ typedef struct {
uint8_t len;
} IGDHostInfo;
+#if 0 /* Disabled for Red Hat Enterprise Linux */
static const IGDHostInfo igd_host_bridge_infos[] = {
{PCI_REVISION_ID, 2},
{PCI_SUBSYSTEM_VENDOR_ID, 2},
@@ -1559,9 +1562,11 @@ static const MemoryRegionOps vfio_igd_index_quirk = {
.write = vfio_igd_quirk_index_write,
.endianness = DEVICE_LITTLE_ENDIAN,
};
+#endif
static void vfio_probe_igd_bar4_quirk(VFIOPCIDevice *vdev, int nr)
{
+#if 0 /* Disabled for Red Hat Enterprise Linux */
struct vfio_region_info *rom = NULL, *opregion = NULL,
*host = NULL, *lpc = NULL;
VFIOQuirk *quirk;
@@ -1572,6 +1577,7 @@ static void vfio_probe_igd_bar4_quirk(VFIOPCIDevice *vdev, int nr)
uint32_t gmch;
uint16_t cmd_orig, cmd;
Error *err = NULL;
+#endif
/*
* This must be an Intel VGA device at address 00:02.0 for us to even
@@ -1585,6 +1591,8 @@ static void vfio_probe_igd_bar4_quirk(VFIOPCIDevice *vdev, int nr)
return;
}
+#if 0 /* Disabled for Red Hat Enterprise Linux */
+
/*
* We need to create an LPC/ISA bridge at PCI bus address 00:1f.0 that we
* can stuff host values into, so if there's already one there and it's not
@@ -1809,6 +1817,7 @@ out:
g_free(opregion);
g_free(host);
g_free(lpc);
+#endif
}
/*
diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c
index e6569a7968..5cff163334 100644
index 2d40b39..c8534d3 100644
--- a/hw/vfio/pci.c
+++ b/hw/vfio/pci.c
@@ -3200,6 +3200,7 @@ static const TypeInfo vfio_pci_dev_info = {
@@ -3220,6 +3220,7 @@ static const TypeInfo vfio_pci_dev_info = {
},
};
@ -673,7 +700,7 @@ index e6569a7968..5cff163334 100644
static Property vfio_pci_dev_nohotplug_properties[] = {
DEFINE_PROP_BOOL("ramfb", VFIOPCIDevice, enable_ramfb, false),
DEFINE_PROP_END_OF_LIST(),
@@ -3219,11 +3220,15 @@ static const TypeInfo vfio_pci_nohotplug_dev_info = {
@@ -3239,11 +3240,15 @@ static const TypeInfo vfio_pci_nohotplug_dev_info = {
.instance_size = sizeof(VFIOPCIDevice),
.class_init = vfio_pci_nohotplug_dev_class_init,
};
@ -690,7 +717,7 @@ index e6569a7968..5cff163334 100644
type_init(register_vfio_pci_dev_type)
diff --git a/qemu-options.hx b/qemu-options.hx
index 65c9473b73..fc17aca631 100644
index 65c9473..fc17aca 100644
--- a/qemu-options.hx
+++ b/qemu-options.hx
@@ -2111,11 +2111,6 @@ ETEXI
@ -722,7 +749,7 @@ index 65c9473b73..fc17aca631 100644
#ifdef CONFIG_TPM
DEFHEADING(TPM device options:)
diff --git a/target/arm/cpu.c b/target/arm/cpu.c
index 7a4ac9339b..3788fc3c4a 100644
index 7a4ac93..3788fc3 100644
--- a/target/arm/cpu.c
+++ b/target/arm/cpu.c
@@ -2744,7 +2744,9 @@ static void arm_cpu_register_types(void)
@ -737,10 +764,10 @@ index 7a4ac9339b..3788fc3c4a 100644
}
diff --git a/target/i386/cpu.c b/target/i386/cpu.c
index a624163ac2..ba5e9faeae 100644
index 69f518a..1b7880a 100644
--- a/target/i386/cpu.c
+++ b/target/i386/cpu.c
@@ -1807,14 +1807,14 @@ static X86CPUDefinition builtin_x86_defs[] = {
@@ -1835,14 +1835,14 @@ static X86CPUDefinition builtin_x86_defs[] = {
.family = 6,
.model = 6,
.stepping = 3,
@ -763,11 +790,10 @@ index a624163ac2..ba5e9faeae 100644
.features[FEAT_8000_0001_ECX] =
CPUID_EXT3_LAHF_LM | CPUID_EXT3_SVM,
.xlevel = 0x8000000A,
@@ -2043,6 +2043,25 @@ static X86CPUDefinition builtin_x86_defs[] = {
.xlevel = 0x80000008,
@@ -2129,6 +2129,25 @@ static X86CPUDefinition builtin_x86_defs[] = {
.model_id = "Intel(R) Atom(TM) CPU N270 @ 1.60GHz",
},
+ {
{
+ .name = "cpu64-rhel6",
+ .level = 4,
+ .vendor = CPUID_VENDOR_AMD,
@ -786,11 +812,12 @@ index a624163ac2..ba5e9faeae 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 086548e9b9..1bbf378c18 100644
index 086548e..1bbf378 100644
--- a/target/ppc/cpu-models.c
+++ b/target/ppc/cpu-models.c
@@ -66,6 +66,7 @@
@ -860,7 +887,7 @@ index 086548e9b9..1bbf378c18 100644
{ NULL, NULL }
};
diff --git a/target/s390x/cpu_models.c b/target/s390x/cpu_models.c
index 7e92fb2e15..be718220d7 100644
index 7e92fb2..be71822 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,
@ -874,7 +901,7 @@ index 7e92fb2e15..be718220d7 100644
/* detect missing features if any to properly report them */
diff --git a/target/s390x/kvm.c b/target/s390x/kvm.c
index 0c9d14b4b1..a02d569537 100644
index 0c9d14b..a02d569 100644
--- a/target/s390x/kvm.c
+++ b/target/s390x/kvm.c
@@ -2387,6 +2387,14 @@ void kvm_s390_apply_cpu_model(const S390CPUModel *model, Error **errp)
@ -893,7 +920,7 @@ index 0c9d14b4b1..a02d569537 100644
prop.ibc = s390_ibc_from_cpu_model(model);
/* configure cpu features indicated via STFL(e) */
diff --git a/util/memfd.c b/util/memfd.c
index 4a3c07e0be..3303ec9da4 100644
index 4a3c07e..3303ec9 100644
--- a/util/memfd.c
+++ b/util/memfd.c
@@ -193,7 +193,7 @@ bool qemu_memfd_alloc_check(void)
@ -906,7 +933,7 @@ index 4a3c07e0be..3303ec9da4 100644
if (mfd >= 0) {
diff --git a/vl.c b/vl.c
index 6a65a64bfd..668a34577e 100644
index 6a65a64..668a345 100644
--- a/vl.c
+++ b/vl.c
@@ -166,7 +166,7 @@ Chardev *parallel_hds[MAX_PARALLEL_PORTS];
@ -963,5 +990,5 @@ index 6a65a64bfd..668a34577e 100644
if (!xen_enabled()) {
/* On 32-bit hosts, QEMU is limited by virtual address space */
--
2.21.0
1.8.3.1

56
0007-Machine-type-related-general-changes.patch
View File

@ -1,4 +1,4 @@
From 701a0ad0e6220c5cf9d860e3689f79f8154274bd Mon Sep 17 00:00:00 2001
From c47eea7192e103a6cc57cd7d07421b8e684d3db5 Mon Sep 17 00:00:00 2001
From: Miroslav Rezanina <mrezanin@redhat.com>
Date: Fri, 11 Jan 2019 09:54:45 +0100
Subject: Machine type related general changes
@ -34,28 +34,28 @@ Merged patches (weekly-190823):
Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
---
hw/acpi/ich9.c | 16 ++++
hw/acpi/ich9.c | 16 +++++
hw/acpi/piix4.c | 5 +-
hw/char/serial.c | 16 ++++
hw/core/machine.c | 161 ++++++++++++++++++++++++++++++++++++++++
hw/char/serial.c | 16 +++++
hw/core/machine.c | 161 ++++++++++++++++++++++++++++++++++++++++++++++++
hw/display/vga-isa.c | 2 +-
hw/net/e1000e.c | 21 ++++++
hw/net/e1000e.c | 21 +++++++
hw/net/rtl8139.c | 4 +-
hw/rtc/mc146818rtc.c | 6 ++
hw/smbios/smbios.c | 1 +
hw/timer/i8254_common.c | 2 +-
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/usb.h | 4 +
include/hw/boards.h | 21 +++++++
include/hw/usb.h | 4 ++
migration/migration.c | 2 +
migration/migration.h | 5 ++
18 files changed, 289 insertions(+), 6 deletions(-)
diff --git a/hw/acpi/ich9.c b/hw/acpi/ich9.c
index ab203ad448..7ec26884e8 100644
index ab203ad..7ec2688 100644
--- a/hw/acpi/ich9.c
+++ b/hw/acpi/ich9.c
@@ -444,6 +444,18 @@ static void ich9_pm_set_enable_tco(Object *obj, bool value, Error **errp)
@ -89,7 +89,7 @@ index ab203ad448..7ec26884e8 100644
ich9_pm_get_disable_s3,
ich9_pm_set_disable_s3,
diff --git a/hw/acpi/piix4.c b/hw/acpi/piix4.c
index 93aec2dd2c..3a26193cbe 100644
index 93aec2d..3a26193 100644
--- a/hw/acpi/piix4.c
+++ b/hw/acpi/piix4.c
@@ -274,6 +274,7 @@ static const VMStateDescription vmstate_acpi = {
@ -112,7 +112,7 @@ index 93aec2dd2c..3a26193cbe 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 b4aa250950..0012f0e44d 100644
index b4aa250..0012f0e 100644
--- a/hw/char/serial.c
+++ b/hw/char/serial.c
@@ -34,6 +34,7 @@
@ -167,7 +167,7 @@ index b4aa250950..0012f0e44d 100644
}
diff --git a/hw/core/machine.c b/hw/core/machine.c
index 1689ad3bf8..2b130bb585 100644
index 1689ad3..2b130bb 100644
--- a/hw/core/machine.c
+++ b/hw/core/machine.c
@@ -27,6 +27,167 @@
@ -339,7 +339,7 @@ index 1689ad3bf8..2b130bb585 100644
{ "virtio-pci", "x-pcie-flr-init", "off" },
};
diff --git a/hw/display/vga-isa.c b/hw/display/vga-isa.c
index 873e5e9706..d1a2efe47e 100644
index 873e5e9..d1a2efe 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)
@ -352,7 +352,7 @@ index 873e5e9706..d1a2efe47e 100644
};
diff --git a/hw/net/e1000e.c b/hw/net/e1000e.c
index b69fd7d8ad..d8be50a1ce 100644
index b69fd7d..d8be50a 100644
--- a/hw/net/e1000e.c
+++ b/hw/net/e1000e.c
@@ -79,6 +79,11 @@ typedef struct E1000EState {
@ -426,7 +426,7 @@ index b69fd7d8ad..d8be50a1ce 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 88a97d756d..21d80e96cf 100644
index 88a97d7..21d80e9 100644
--- a/hw/net/rtl8139.c
+++ b/hw/net/rtl8139.c
@@ -3177,7 +3177,7 @@ static int rtl8139_pre_save(void *opaque)
@ -449,7 +449,7 @@ index 88a97d756d..21d80e96cf 100644
VMSTATE_UINT16(tally_counters.TxUndrn, RTL8139State),
diff --git a/hw/rtc/mc146818rtc.c b/hw/rtc/mc146818rtc.c
index ee6bf82b40..d704213824 100644
index 74ae74b..7382051 100644
--- a/hw/rtc/mc146818rtc.c
+++ b/hw/rtc/mc146818rtc.c
@@ -42,6 +42,7 @@
@ -460,7 +460,7 @@ index ee6bf82b40..d704213824 100644
#ifdef TARGET_I386
#include "qapi/qapi-commands-misc-target.h"
@@ -819,6 +820,11 @@ static int rtc_post_load(void *opaque, int version_id)
@@ -820,6 +821,11 @@ static int rtc_post_load(void *opaque, int version_id)
static bool rtc_irq_reinject_on_ack_count_needed(void *opaque)
{
RTCState *s = (RTCState *)opaque;
@ -473,7 +473,7 @@ index ee6bf82b40..d704213824 100644
}
diff --git a/hw/smbios/smbios.c b/hw/smbios/smbios.c
index 11d476c4a2..e6e9355384 100644
index 11d476c..e6e9355 100644
--- a/hw/smbios/smbios.c
+++ b/hw/smbios/smbios.c
@@ -777,6 +777,7 @@ void smbios_set_defaults(const char *manufacturer, const char *product,
@ -485,7 +485,7 @@ index 11d476c4a2..e6e9355384 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 050875b497..32935da46c 100644
index 050875b..32935da 100644
--- a/hw/timer/i8254_common.c
+++ b/hw/timer/i8254_common.c
@@ -231,7 +231,7 @@ static const VMStateDescription vmstate_pit_common = {
@ -498,7 +498,7 @@ index 050875b497..32935da46c 100644
vmstate_pit_channel, PITChannelState),
VMSTATE_INT64(channels[0].next_transition_time,
diff --git a/hw/usb/hcd-uhci.c b/hw/usb/hcd-uhci.c
index 23507ad3b5..9fd87a7ad9 100644
index 23507ad..9fd87a7 100644
--- a/hw/usb/hcd-uhci.c
+++ b/hw/usb/hcd-uhci.c
@@ -1219,12 +1219,14 @@ static void usb_uhci_common_realize(PCIDevice *dev, Error **errp)
@ -518,7 +518,7 @@ index 23507ad3b5..9fd87a7ad9 100644
if (s->masterbus) {
USBPort *ports[NB_PORTS];
diff --git a/hw/usb/hcd-xhci.c b/hw/usb/hcd-xhci.c
index 80988bb305..8fed2eedd6 100644
index 80988bb..8fed2ee 100644
--- a/hw/usb/hcd-xhci.c
+++ b/hw/usb/hcd-xhci.c
@@ -3590,9 +3590,27 @@ static const VMStateDescription vmstate_xhci_slot = {
@ -559,7 +559,7 @@ index 80988bb305..8fed2eedd6 100644
}
};
diff --git a/hw/usb/hcd-xhci.h b/hw/usb/hcd-xhci.h
index 2fad4df2a7..f554b671e3 100644
index 2fad4df..f554b67 100644
--- a/hw/usb/hcd-xhci.h
+++ b/hw/usb/hcd-xhci.h
@@ -157,6 +157,8 @@ typedef struct XHCIEvent {
@ -572,7 +572,7 @@ index 2fad4df2a7..f554b671e3 100644
typedef struct XHCIInterrupter {
diff --git a/include/hw/acpi/ich9.h b/include/hw/acpi/ich9.h
index 41568d1837..1a23ccc412 100644
index 41568d1..1a23ccc 100644
--- a/include/hw/acpi/ich9.h
+++ b/include/hw/acpi/ich9.h
@@ -61,6 +61,9 @@ typedef struct ICH9LPCPMRegs {
@ -586,7 +586,7 @@ index 41568d1837..1a23ccc412 100644
#define ACPI_PM_PROP_TCO_ENABLED "enable_tco"
diff --git a/include/hw/boards.h b/include/hw/boards.h
index de45087f34..cc11116585 100644
index de45087..cc11116 100644
--- a/include/hw/boards.h
+++ b/include/hw/boards.h
@@ -377,4 +377,25 @@ extern const size_t hw_compat_2_2_len;
@ -616,7 +616,7 @@ index de45087f34..cc11116585 100644
+
#endif
diff --git a/include/hw/usb.h b/include/hw/usb.h
index c24d968a19..b353438ea0 100644
index c24d968..b353438 100644
--- a/include/hw/usb.h
+++ b/include/hw/usb.h
@@ -605,4 +605,8 @@ int usb_get_quirks(uint16_t vendor_id, uint16_t product_id,
@ -629,7 +629,7 @@ index c24d968a19..b353438ea0 100644
+
#endif
diff --git a/migration/migration.c b/migration/migration.c
index 354ad072fa..30c53c623b 100644
index 354ad07..30c53c6 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -121,6 +121,8 @@ enum mig_rp_message_type {
@ -642,7 +642,7 @@ index 354ad072fa..30c53c623b 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 79b3dda146..0b1b0d4df5 100644
index 79b3dda..0b1b0d4 100644
--- a/migration/migration.h
+++ b/migration/migration.h
@@ -335,6 +335,11 @@ void init_dirty_bitmap_incoming_migration(void);
@ -658,5 +658,5 @@ index 79b3dda146..0b1b0d4df5 100644
#define qemu_ram_foreach_block \
#warning "Use foreach_not_ignored_block in migration code"
--
2.21.0
1.8.3.1

54
0008-Add-aarch64-machine-types.patch
View File

@ -1,4 +1,4 @@
From 5d044a17a88f2e6adc72e2b6579052e2a3e98e97 Mon Sep 17 00:00:00 2001
From e9fbad8d9e530189a029533f738bac62559e4d52 Mon Sep 17 00:00:00 2001
From: Miroslav Rezanina <mrezanin@redhat.com>
Date: Fri, 19 Oct 2018 12:53:31 +0200
Subject: Add aarch64 machine types
@ -14,9 +14,15 @@ Rebase changes (4.1.0-rc0):
- Removed a15memmap (upstream)
- Use virt_flash_create in rhel800_virt_instance_init
Rebase changes (weekly-190913):
Rebase changes (4.2.0-rc0):
- Set numa_mem_supported
Rebase notes (4.2.0-rc3):
- aarch64: Add virt-rhel8.2.0 machine type for ARM (patch 92246)
- aarch64: virt: Allow more than 1TB of RAM (patch 92249)
- aarch64: virt: Allow PCDIMM instantiation (patch 92247)
- aarch64: virt: Enhance the comment related to gic-version (patch 92248)
Merged patches (4.0.0):
- 7bfdb4c aarch64: Add virt-rhel8.0.0 machine type for ARM
- 3433e69 aarch64: Set virt-rhel8.0.0 max_cpus to 512
@ -28,12 +34,12 @@ Merged patches (4.1.0):
Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
---
hw/arm/virt.c | 145 +++++++++++++++++++++++++++++++++++++++++-
hw/arm/virt.c | 161 +++++++++++++++++++++++++++++++++++++++++++++++++-
include/hw/arm/virt.h | 11 ++++
2 files changed, 155 insertions(+), 1 deletion(-)
2 files changed, 171 insertions(+), 1 deletion(-)
diff --git a/hw/arm/virt.c b/hw/arm/virt.c
index d4bedc2607..1892378914 100644
index d4bedc2..e108391 100644
--- a/hw/arm/virt.c
+++ b/hw/arm/virt.c
@@ -72,6 +72,7 @@
@ -111,15 +117,15 @@ index d4bedc2607..1892378914 100644
static bool virt_get_highmem(Object *obj, Error **errp)
{
VirtMachineState *vms = VIRT_MACHINE(obj);
@@ -1912,6 +1957,7 @@ static const CPUArchIdList *virt_possible_cpu_arch_ids(MachineState *ms)
return ms->possible_cpus;
@@ -2022,6 +2067,7 @@ static int virt_kvm_type(MachineState *ms, const char *type_str)
return requested_pa_size > 40 ? requested_pa_size : 0;
}
+#if 0 /* Disabled for Red Hat Enterprise Linux */
static void virt_memory_pre_plug(HotplugHandler *hotplug_dev, DeviceState *dev,
Error **errp)
static void virt_machine_class_init(ObjectClass *oc, void *data)
{
@@ -2258,3 +2304,100 @@ static void virt_machine_2_6_options(MachineClass *mc)
MachineClass *mc = MACHINE_CLASS(oc);
@@ -2258,3 +2304,116 @@ static void virt_machine_2_6_options(MachineClass *mc)
vmc->no_pmu = true;
}
DEFINE_VIRT_MACHINE(2, 6)
@ -128,6 +134,7 @@ index d4bedc2607..1892378914 100644
+static void rhel_machine_class_init(ObjectClass *oc, void *data)
+{
+ MachineClass *mc = MACHINE_CLASS(oc);
+ HotplugHandlerClass *hc = HOTPLUG_HANDLER_CLASS(oc);
+
+ mc->family = "virt-rhel-Z";
+ mc->init = machvirt_init;
@ -145,7 +152,14 @@ index d4bedc2607..1892378914 100644
+ mc->cpu_index_to_instance_props = virt_cpu_index_to_props;
+ mc->default_cpu_type = ARM_CPU_TYPE_NAME("cortex-a57");
+ mc->get_default_cpu_node_id = virt_get_default_cpu_node_id;
+ mc->kvm_type = virt_kvm_type;
+ assert(!mc->get_hotplug_handler);
+ mc->get_hotplug_handler = virt_machine_get_hotplug_handler;
+ hc->pre_plug = virt_machine_device_pre_plug_cb;
+ hc->plug = virt_machine_device_plug_cb;
+ hc->unplug_request = virt_machine_device_unplug_request_cb;
+ mc->numa_mem_supported = true;
+ mc->auto_enable_numa_with_memhp = true;
+}
+
+static const TypeInfo rhel_machine_info = {
@ -155,6 +169,10 @@ index d4bedc2607..1892378914 100644
+ .instance_size = sizeof(VirtMachineState),
+ .class_size = sizeof(VirtMachineClass),
+ .class_init = rhel_machine_class_init,
+ .interfaces = (InterfaceInfo[]) {
+ { TYPE_HOTPLUG_HANDLER },
+ { }
+ },
+};
+
+static void rhel_machine_init(void)
@ -163,7 +181,7 @@ index d4bedc2607..1892378914 100644
+}
+type_init(rhel_machine_init);
+
+static void rhel810_virt_instance_init(Object *obj)
+static void rhel820_virt_instance_init(Object *obj)
+{
+ VirtMachineState *vms = VIRT_MACHINE(obj);
+ VirtMachineClass *vmc = VIRT_MACHINE_GET_CLASS(vms);
@ -180,7 +198,11 @@ index d4bedc2607..1892378914 100644
+ "Set on/off to enable/disable using "
+ "physical address space above 32 bits",
+ NULL);
+ /* Default GIC type is still v2, but became configurable for RHEL */
+ /*
+ * Default GIC type is still v2, but became configurable for RHEL. We
+ * keep v2 instead of max as TCG CI test cases require an MSI controller
+ * and there is no userspace ITS MSI emulation available.
+ */
+ vms->gic_version = 2;
+ object_property_add_str(obj, "gic-version", virt_get_gic_version,
+ virt_set_gic_version, NULL);
@ -215,13 +237,13 @@ index d4bedc2607..1892378914 100644
+ virt_flash_create(vms);
+}
+
+static void rhel810_virt_options(MachineClass *mc)
+static void rhel820_virt_options(MachineClass *mc)
+{
+ compat_props_add(mc->compat_props, arm_rhel_compat, arm_rhel_compat_len);
+}
+DEFINE_RHEL_MACHINE_AS_LATEST(8, 1, 0)
+DEFINE_RHEL_MACHINE_AS_LATEST(8, 2, 0)
diff --git a/include/hw/arm/virt.h b/include/hw/arm/virt.h
index 0b41083e9d..53fdf16563 100644
index 0b41083..53fdf16 100644
--- a/include/hw/arm/virt.h
+++ b/include/hw/arm/virt.h
@@ -142,6 +142,7 @@ typedef struct {
@ -250,5 +272,5 @@ index 0b41083e9d..53fdf16563 100644
/* Return the number of used redistributor regions */
--
2.21.0
1.8.3.1

34
0009-Add-ppc64-machine-types.patch
View File

@ -1,4 +1,4 @@
From dbf2123f930a53e949cbeea7a272e453f3efe124 Mon Sep 17 00:00:00 2001
From 4a62a0bf849ff8f533d3fc5bd3faec6bd09cf562 Mon Sep 17 00:00:00 2001
From: Miroslav Rezanina <mrezanin@redhat.com>
Date: Fri, 19 Oct 2018 13:27:13 +0200
Subject: Add ppc64 machine types
@ -31,7 +31,7 @@ Merged patches (weekly-190830):
Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
---
hw/ppc/spapr.c | 251 ++++++++++++++++++++++++++++++++++++++++
hw/ppc/spapr.c | 251 ++++++++++++++++++++++++++++++++++++++++++++++++
hw/ppc/spapr_cpu_core.c | 13 +++
include/hw/ppc/spapr.h | 1 +
target/ppc/compat.c | 13 ++-
@ -39,10 +39,10 @@ Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
5 files changed, 278 insertions(+), 1 deletion(-)
diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
index 94f9d27096..59ccd182d4 100644
index e076f60..f3652ed 100644
--- a/hw/ppc/spapr.c
+++ b/hw/ppc/spapr.c
@@ -4442,6 +4442,7 @@ static void spapr_machine_class_init(ObjectClass *oc, void *data)
@@ -4447,6 +4447,7 @@ static void spapr_machine_class_init(ObjectClass *oc, void *data)
smc->linux_pci_probe = true;
smc->smp_threads_vsmt = true;
smc->nr_xirqs = SPAPR_NR_XIRQS;
@ -50,7 +50,7 @@ index 94f9d27096..59ccd182d4 100644
}
static const TypeInfo spapr_machine_info = {
@@ -4486,6 +4487,7 @@ static const TypeInfo spapr_machine_info = {
@@ -4491,6 +4492,7 @@ static const TypeInfo spapr_machine_info = {
} \
type_init(spapr_machine_register_##suffix)
@ -58,7 +58,7 @@ index 94f9d27096..59ccd182d4 100644
/*
* pseries-4.2
*/
@@ -4515,6 +4517,7 @@ static void spapr_machine_4_1_class_options(MachineClass *mc)
@@ -4520,6 +4522,7 @@ static void spapr_machine_4_1_class_options(MachineClass *mc)
}
DEFINE_SPAPR_MACHINE(4_1, "4.1", false);
@ -66,7 +66,7 @@ index 94f9d27096..59ccd182d4 100644
/*
* pseries-4.0
@@ -4531,6 +4534,7 @@ static void phb_placement_4_0(SpaprMachineState *spapr, uint32_t index,
@@ -4536,6 +4539,7 @@ static void phb_placement_4_0(SpaprMachineState *spapr, uint32_t index,
*nv2atsd = 0;
}
@ -74,7 +74,7 @@ index 94f9d27096..59ccd182d4 100644
static void spapr_machine_4_0_class_options(MachineClass *mc)
{
SpaprMachineClass *smc = SPAPR_MACHINE_CLASS(mc);
@@ -4690,6 +4694,7 @@ DEFINE_SPAPR_MACHINE(2_8, "2.8", false);
@@ -4695,6 +4699,7 @@ DEFINE_SPAPR_MACHINE(2_8, "2.8", false);
/*
* pseries-2.7
*/
@ -82,7 +82,7 @@ index 94f9d27096..59ccd182d4 100644
static void phb_placement_2_7(SpaprMachineState *spapr, uint32_t index,
uint64_t *buid, hwaddr *pio,
@@ -4744,6 +4749,7 @@ static void phb_placement_2_7(SpaprMachineState *spapr, uint32_t index,
@@ -4749,6 +4754,7 @@ static void phb_placement_2_7(SpaprMachineState *spapr, uint32_t index,
*nv2atsd = 0;
}
@ -90,7 +90,7 @@ index 94f9d27096..59ccd182d4 100644
static void spapr_machine_2_7_class_options(MachineClass *mc)
{
SpaprMachineClass *smc = SPAPR_MACHINE_CLASS(mc);
@@ -4858,6 +4864,251 @@ static void spapr_machine_2_1_class_options(MachineClass *mc)
@@ -4863,6 +4869,251 @@ static void spapr_machine_2_1_class_options(MachineClass *mc)
compat_props_add(mc->compat_props, hw_compat_2_1, hw_compat_2_1_len);
}
DEFINE_SPAPR_MACHINE(2_1, "2.1", false);
@ -343,7 +343,7 @@ index 94f9d27096..59ccd182d4 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 ef034a1279..05f0a83128 100644
index 301cd7b..ba5a8fb 100644
--- a/hw/ppc/spapr_cpu_core.c
+++ b/hw/ppc/spapr_cpu_core.c
@@ -24,6 +24,7 @@
@ -354,7 +354,7 @@ index ef034a1279..05f0a83128 100644
static void spapr_reset_vcpu(PowerPCCPU *cpu)
{
@@ -247,6 +248,7 @@ static void spapr_realize_vcpu(PowerPCCPU *cpu, SpaprMachineState *spapr,
@@ -242,6 +243,7 @@ static void spapr_realize_vcpu(PowerPCCPU *cpu, SpaprMachineState *spapr,
CPUPPCState *env = &cpu->env;
CPUState *cs = CPU(cpu);
Error *local_err = NULL;
@ -362,7 +362,7 @@ index ef034a1279..05f0a83128 100644
object_property_set_bool(OBJECT(cpu), true, "realized", &local_err);
if (local_err) {
@@ -259,6 +261,17 @@ static void spapr_realize_vcpu(PowerPCCPU *cpu, SpaprMachineState *spapr,
@@ -254,6 +256,17 @@ static void spapr_realize_vcpu(PowerPCCPU *cpu, SpaprMachineState *spapr,
cpu_ppc_set_vhyp(cpu, PPC_VIRTUAL_HYPERVISOR(spapr));
kvmppc_set_papr(cpu);
@ -381,7 +381,7 @@ index ef034a1279..05f0a83128 100644
goto error_intc_create;
}
diff --git a/include/hw/ppc/spapr.h b/include/hw/ppc/spapr.h
index d5ab5ea7b2..aa89cc4a95 100644
index d5ab5ea..aa89cc4 100644
--- a/include/hw/ppc/spapr.h
+++ b/include/hw/ppc/spapr.h
@@ -125,6 +125,7 @@ struct SpaprMachineClass {
@ -393,7 +393,7 @@ index d5ab5ea7b2..aa89cc4a95 100644
uint64_t *buid, hwaddr *pio,
hwaddr *mmio32, hwaddr *mmio64,
diff --git a/target/ppc/compat.c b/target/ppc/compat.c
index 7de4bf3122..3e2e35342d 100644
index 7de4bf3..3e2e353 100644
--- a/target/ppc/compat.c
+++ b/target/ppc/compat.c
@@ -105,8 +105,19 @@ static const CompatInfo *compat_by_pvr(uint32_t pvr)
@ -418,7 +418,7 @@ index 7de4bf3122..3e2e35342d 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 e3e82327b7..5c53801cfd 100644
index e3e8232..5c53801 100644
--- a/target/ppc/cpu.h
+++ b/target/ppc/cpu.h
@@ -1367,6 +1367,7 @@ static inline int cpu_mmu_index(CPUPPCState *env, bool ifetch)
@ -430,5 +430,5 @@ index e3e82327b7..5c53801cfd 100644
uint32_t min_compat_pvr, uint32_t max_compat_pvr);
bool ppc_type_check_compat(const char *cputype, uint32_t compat_pvr,
--
2.21.0
1.8.3.1

8
0010-Add-s390x-machine-types.patch
View File

@ -1,4 +1,4 @@
From 18847aab397e7480af49e3a5cd4f6e3b7deae361 Mon Sep 17 00:00:00 2001
From 88abdedad4c594c86eb2b92d490b676fa7494d6c Mon Sep 17 00:00:00 2001
From: Miroslav Rezanina <mrezanin@redhat.com>
Date: Fri, 19 Oct 2018 13:47:32 +0200
Subject: Add s390x machine types
@ -22,11 +22,11 @@ Merged patches (weekly-190830):
Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
---
hw/s390x/s390-virtio-ccw.c | 80 +++++++++++++++++++++++++++++++++++++-
hw/s390x/s390-virtio-ccw.c | 80 +++++++++++++++++++++++++++++++++++++++++++++-
1 file changed, 79 insertions(+), 1 deletion(-)
diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c
index d3edeef0ad..7bca634666 100644
index d3edeef..7bca634 100644
--- a/hw/s390x/s390-virtio-ccw.c
+++ b/hw/s390x/s390-virtio-ccw.c
@@ -615,7 +615,7 @@ bool css_migration_enabled(void)
@ -131,5 +131,5 @@ index d3edeef0ad..7bca634666 100644
static void ccw_machine_register_types(void)
{
--
2.21.0
1.8.3.1

58
0011-Add-x86_64-machine-types.patch
View File

@ -1,4 +1,4 @@
From 3f0ddfe3f8bc734af3f68884c01c58800ef42d0d Mon Sep 17 00:00:00 2001
From aef82bbd0ad99c43bc0b97932cf87fd16303bf5e Mon Sep 17 00:00:00 2001
From: Miroslav Rezanina <mrezanin@redhat.com>
Date: Fri, 19 Oct 2018 13:10:31 +0200
Subject: Add x86_64 machine types
@ -16,6 +16,9 @@ Rebase notes (3.1.0):
Rebase notes (4.1.0):
- Updated format for compat structures
Rebase notes (4.2.0-rc2):
- Use X86MachineClass for save_tsc_khz (upstream change)
Merged patches (4.1.0):
- f4dc802 pc: 7.5 compat entries
- 456ed3e pc: PC_RHEL7_6_COMPAT
@ -36,17 +39,17 @@ Merged patches (weekly-190823):
Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
---
hw/i386/acpi-build.c | 3 +
hw/i386/pc.c | 259 ++++++++++++++++++++++++++++++++++++++++++-
hw/i386/pc_piix.c | 207 +++++++++++++++++++++++++++++++++-
hw/i386/pc_q35.c | 139 ++++++++++++++++++++++-
hw/i386/pc.c | 259 ++++++++++++++++++++++++++++++++++++++++++++++++++-
hw/i386/pc_piix.c | 208 ++++++++++++++++++++++++++++++++++++++++-
hw/i386/pc_q35.c | 139 ++++++++++++++++++++++++++-
include/hw/boards.h | 2 +
include/hw/i386/pc.h | 30 +++++
include/hw/i386/pc.h | 30 ++++++
target/i386/cpu.c | 9 +-
target/i386/kvm.c | 4 +
8 files changed, 646 insertions(+), 7 deletions(-)
8 files changed, 647 insertions(+), 7 deletions(-)
diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
index 12ff55fcfb..64001893ab 100644
index 12ff55f..6400189 100644
--- a/hw/i386/acpi-build.c
+++ b/hw/i386/acpi-build.c
@@ -204,6 +204,9 @@ static void acpi_get_pm_info(MachineState *machine, AcpiPmInfo *pm)
@ -60,7 +63,7 @@ index 12ff55fcfb..64001893ab 100644
}
diff --git a/hw/i386/pc.c b/hw/i386/pc.c
index 96715f8a3f..677b63a37f 100644
index ac08e63..28850ae 100644
--- a/hw/i386/pc.c
+++ b/hw/i386/pc.c
@@ -344,6 +344,257 @@ GlobalProperty pc_compat_1_4[] = {
@ -331,7 +334,7 @@ index 96715f8a3f..677b63a37f 100644
memory_region_set_readonly(option_rom_mr, true);
}
memory_region_add_subregion_overlap(rom_memory,
@@ -2199,6 +2451,8 @@ static void pc_machine_class_init(ObjectClass *oc, void *data)
@@ -2198,6 +2450,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);
@ -340,7 +343,7 @@ index 96715f8a3f..677b63a37f 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;
@@ -2210,7 +2464,8 @@ static void pc_machine_class_init(ObjectClass *oc, void *data)
@@ -2209,7 +2463,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;
@ -351,7 +354,7 @@ index 96715f8a3f..677b63a37f 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 a19f8058ab..a66005a0ec 100644
index 1bd70d1..7f2ee97 100644
--- a/hw/i386/pc_piix.c
+++ b/hw/i386/pc_piix.c
@@ -53,6 +53,7 @@
@ -362,7 +365,7 @@ index a19f8058ab..a66005a0ec 100644
#ifdef CONFIG_XEN
#include <xen/hvm/hvm_info_table.h>
#include "hw/xen/xen_pt.h"
@@ -176,8 +177,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 */
@ -373,7 +376,7 @@ index a19f8058ab..a66005a0ec 100644
pcmc->smbios_uuid_encoded,
SMBIOS_ENTRY_POINT_21);
}
@@ -309,6 +310,7 @@ else {
@@ -307,6 +308,7 @@ else {
* hw_compat_*, pc_compat_*, or * pc_*_machine_options().
*/
@ -381,7 +384,7 @@ index a19f8058ab..a66005a0ec 100644
static void pc_compat_2_3_fn(MachineState *machine)
{
PCMachineState *pcms = PC_MACHINE(machine);
@@ -1028,3 +1030,204 @@ static void xenfv_machine_options(MachineClass *m)
@@ -1026,3 +1028,205 @@ static void xenfv_machine_options(MachineClass *m)
DEFINE_PC_MACHINE(xenfv, "xenfv", pc_xen_hvm_init,
xenfv_machine_options);
#endif
@ -497,10 +500,11 @@ index a19f8058ab..a66005a0ec 100644
+static void pc_machine_rhel720_options(MachineClass *m)
+{
+ PCMachineClass *pcmc = PC_MACHINE_CLASS(m);
+ X86MachineClass *x86mc = X86_MACHINE_CLASS(m);
+ pc_machine_rhel730_options(m);
+ m->desc = "RHEL 7.2.0 PC (i440FX + PIIX, 1996)";
+ /* From pc_i440fx_2_5_machine_options */
+ pcmc->save_tsc_khz = false;
+ x86mc->save_tsc_khz = false;
+ m->legacy_fw_cfg_order = 1;
+ /* Note: broken_reserved_end was already in 7.2 */
+ /* From pc_i440fx_2_6_machine_options */
@ -587,7 +591,7 @@ index a19f8058ab..a66005a0ec 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 d51f524727..542947b032 100644
index 385e5cf..4598db2 100644
--- a/hw/i386/pc_q35.c
+++ b/hw/i386/pc_q35.c
@@ -197,8 +197,8 @@ static void pc_q35_init(MachineState *machine)
@ -748,7 +752,7 @@ index d51f524727..542947b032 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 cc11116585..3cc126f0f4 100644
index cc11116..3cc126f 100644
--- a/include/hw/boards.h
+++ b/include/hw/boards.h
@@ -222,6 +222,8 @@ struct MachineClass {
@ -761,10 +765,10 @@ index cc11116585..3cc126f0f4 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 e6fa8418ca..379ed968b3 100644
index 1f86eba..dd680ae 100644
--- a/include/hw/i386/pc.h
+++ b/include/hw/i386/pc.h
@@ -126,6 +126,9 @@ typedef struct PCMachineClass {
@@ -124,6 +124,9 @@ typedef struct PCMachineClass {
/* use PVH to load kernels that support this feature */
bool pvh_enabled;
@ -774,7 +778,7 @@ index e6fa8418ca..379ed968b3 100644
} PCMachineClass;
#define TYPE_PC_MACHINE "generic-pc-machine"
@@ -302,6 +305,33 @@ extern const size_t pc_compat_1_5_len;
@@ -300,6 +303,33 @@ extern const size_t pc_compat_1_5_len;
extern GlobalProperty pc_compat_1_4[];
extern const size_t pc_compat_1_4_len;
@ -809,10 +813,10 @@ index e6fa8418ca..379ed968b3 100644
* depending on QEMU versions up to QEMU 2.4.
*/
diff --git a/target/i386/cpu.c b/target/i386/cpu.c
index ba5e9faeae..a4ae730ca5 100644
index 1b7880a..790db77 100644
--- a/target/i386/cpu.c
+++ b/target/i386/cpu.c
@@ -1801,11 +1801,17 @@ static CPUCaches epyc_cache_info = {
@@ -1829,11 +1829,17 @@ static CPUCaches epyc_cache_info = {
static X86CPUDefinition builtin_x86_defs[] = {
{
@ -831,7 +835,7 @@ index ba5e9faeae..a4ae730ca5 100644
.stepping = 3,
.features[FEAT_1_EDX] = CPUID_SSE2 | CPUID_SSE | CPUID_FXSR |
CPUID_MMX | CPUID_CLFLUSH | CPUID_PSE36 | CPUID_PAT | CPUID_CMOV |
@@ -3173,6 +3179,7 @@ static PropValue kvm_default_props[] = {
@@ -3932,6 +3938,7 @@ static PropValue kvm_default_props[] = {
{ "acpi", "off" },
{ "monitor", "off" },
{ "svm", "off" },
@ -840,10 +844,10 @@ index ba5e9faeae..a4ae730ca5 100644
};
diff --git a/target/i386/kvm.c b/target/i386/kvm.c
index bfd09bd441..da312a4801 100644
index bf16556..1b19797 100644
--- a/target/i386/kvm.c
+++ b/target/i386/kvm.c
@@ -3064,6 +3064,7 @@ static int kvm_get_msrs(X86CPU *cpu)
@@ -3071,6 +3071,7 @@ static int kvm_get_msrs(X86CPU *cpu)
struct kvm_msr_entry *msrs = cpu->kvm_msr_buf->entries;
int ret, i;
uint64_t mtrr_top_bits;
@ -851,7 +855,7 @@ index bfd09bd441..da312a4801 100644
kvm_msr_buf_reset(cpu);
@@ -3370,6 +3371,9 @@ static int kvm_get_msrs(X86CPU *cpu)
@@ -3380,6 +3381,9 @@ static int kvm_get_msrs(X86CPU *cpu)
break;
case MSR_KVM_ASYNC_PF_EN:
env->async_pf_en_msr = msrs[i].data;
@ -862,5 +866,5 @@ index bfd09bd441..da312a4801 100644
case MSR_KVM_PV_EOI_EN:
env->pv_eoi_en_msr = msrs[i].data;
--
2.21.0
1.8.3.1

24
0012-Enable-make-check.patch
View File

@ -1,4 +1,4 @@
From e8c1a5f4768a41cabdcb54cfdbc1a5a4146ff1ad Mon Sep 17 00:00:00 2001
From 88d09fe5c46c80214f883bd097ca86a99ca1ca41 Mon Sep 17 00:00:00 2001
From: Miroslav Rezanina <mrezanin@redhat.com>
Date: Fri, 19 Oct 2018 13:48:41 +0200
Subject: Enable make check
@ -44,7 +44,7 @@ Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
11 files changed, 37 insertions(+), 17 deletions(-)
diff --git a/tests/Makefile.include b/tests/Makefile.include
index b483790cf3..53bdbdfee0 100644
index b483790..53bdbdf 100644
--- a/tests/Makefile.include
+++ b/tests/Makefile.include
@@ -172,7 +172,7 @@ check-qtest-i386-y += tests/ide-test$(EXESUF)
@ -86,7 +86,7 @@ index b483790cf3..53bdbdfee0 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 d3a54a0ba5..33ce72b89c 100644
index d3a54a0..33ce72b 100644
--- a/tests/boot-serial-test.c
+++ b/tests/boot-serial-test.c
@@ -108,19 +108,23 @@ static testdef_t tests[] = {
@ -115,7 +115,7 @@ index d3a54a0ba5..33ce72b89c 100644
{ "sparc", "LX", "", "TMS390S10" },
{ "sparc", "SS-4", "", "MB86904" },
diff --git a/tests/cpu-plug-test.c b/tests/cpu-plug-test.c
index 30e514bbfb..a04beae1c6 100644
index 30e514b..a04beae 100644
--- a/tests/cpu-plug-test.c
+++ b/tests/cpu-plug-test.c
@@ -185,8 +185,8 @@ static void add_pseries_test_case(const char *mname)
@ -130,7 +130,7 @@ index 30e514bbfb..a04beae1c6 100644
}
data = g_new(PlugTestData, 1);
diff --git a/tests/e1000-test.c b/tests/e1000-test.c
index c387984ef6..c89112d6f8 100644
index c387984..c89112d 100644
--- a/tests/e1000-test.c
+++ b/tests/e1000-test.c
@@ -22,9 +22,11 @@ struct QE1000 {
@ -146,7 +146,7 @@ index c387984ef6..c89112d6f8 100644
static void *e1000_get_driver(void *obj, const char *interface)
diff --git a/tests/hd-geo-test.c b/tests/hd-geo-test.c
index 7e86c5416c..cc068bad87 100644
index 7e86c54..cc068ba 100644
--- a/tests/hd-geo-test.c
+++ b/tests/hd-geo-test.c
@@ -732,6 +732,7 @@ static void test_override_ide(void)
@ -178,7 +178,7 @@ index 7e86c5416c..cc068bad87 100644
qtest_add_func("hd-geo/override/zero_chs", test_override_zero_chs);
qtest_add_func("hd-geo/override/scsi_hot_unplug",
diff --git a/tests/prom-env-test.c b/tests/prom-env-test.c
index 61bc1d1e7b..028d45c7d7 100644
index 61bc1d1..028d45c 100644
--- a/tests/prom-env-test.c
+++ b/tests/prom-env-test.c
@@ -88,10 +88,14 @@ int main(int argc, char *argv[])
@ -197,7 +197,7 @@ index 61bc1d1e7b..028d45c7d7 100644
add_tests(sparc_machines);
} else if (!strcmp(arch, "sparc64")) {
diff --git a/tests/qemu-iotests/051 b/tests/qemu-iotests/051
index 53bcdbc911..b387e0c233 100755
index 53bcdbc..b387e0c 100755
--- a/tests/qemu-iotests/051
+++ b/tests/qemu-iotests/051
@@ -181,11 +181,11 @@ run_qemu -drive if=virtio
@ -231,7 +231,7 @@ index 53bcdbc911..b387e0c233 100755
*)
;;
diff --git a/tests/qemu-iotests/group b/tests/qemu-iotests/group
index 065040398d..959fb52824 100644
index 6b10a6a..06cc734 100644
--- a/tests/qemu-iotests/group
+++ b/tests/qemu-iotests/group
@@ -92,7 +92,7 @@
@ -253,7 +253,7 @@ index 065040398d..959fb52824 100644
101 rw quick
102 rw quick
diff --git a/tests/test-x86-cpuid-compat.c b/tests/test-x86-cpuid-compat.c
index 772287bdb4..e7c075ed98 100644
index 772287b..e7c075e 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)
@ -273,7 +273,7 @@ index 772287bdb4..e7c075ed98 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 10ef9d2a91..3855873050 100644
index 10ef9d2..3855873 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)
@ -303,5 +303,5 @@ index 10ef9d2a91..3855873050 100644
qtest_start("-device nec-usb-xhci,id=xhci"
--
2.21.0
1.8.3.1

12
0013-vfio-cap-number-of-devices-that-can-be-assigned.patch
View File

@ -1,4 +1,4 @@
From 5ff7edc72cce5a04a816fd71b0198f2d530d6630 Mon Sep 17 00:00:00 2001
From 58e199b5cb9364f46b68d8cf618dff7564d427bb Mon Sep 17 00:00:00 2001
From: Bandan Das <bsd@redhat.com>
Date: Tue, 3 Dec 2013 20:05:13 +0100
Subject: vfio: cap number of devices that can be assigned
@ -42,7 +42,7 @@ Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
2 files changed, 29 insertions(+), 1 deletion(-)
diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c
index 5cff163334..5184011217 100644
index c8534d3..309535f 100644
--- a/hw/vfio/pci.c
+++ b/hw/vfio/pci.c
@@ -47,6 +47,9 @@
@ -55,7 +55,7 @@ index 5cff163334..5184011217 100644
static void vfio_disable_interrupts(VFIOPCIDevice *vdev);
static void vfio_mmap_set_enabled(VFIOPCIDevice *vdev, bool enabled);
@@ -2710,9 +2713,30 @@ static void vfio_realize(PCIDevice *pdev, Error **errp)
@@ -2722,9 +2725,30 @@ static void vfio_realize(PCIDevice *pdev, Error **errp)
ssize_t len;
struct stat st;
int groupid;
@ -87,7 +87,7 @@ index 5cff163334..5184011217 100644
if (!vdev->vbasedev.sysfsdev) {
if (!(~vdev->host.domain || ~vdev->host.bus ||
~vdev->host.slot || ~vdev->host.function)) {
@@ -3147,6 +3171,9 @@ static Property vfio_pci_dev_properties[] = {
@@ -3167,6 +3191,9 @@ static Property vfio_pci_dev_properties[] = {
DEFINE_PROP_BOOL("x-no-kvm-msix", VFIOPCIDevice, no_kvm_msix, false),
DEFINE_PROP_BOOL("x-no-geforce-quirks", VFIOPCIDevice,
no_geforce_quirks, false),
@ -98,7 +98,7 @@ index 5cff163334..5184011217 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 b329d50338..b37c81d882 100644
index 35626cd..0cd4803 100644
--- a/hw/vfio/pci.h
+++ b/hw/vfio/pci.h
@@ -135,6 +135,7 @@ typedef struct VFIOPCIDevice {
@ -110,5 +110,5 @@ index b329d50338..b37c81d882 100644
uint32_t device_id;
uint32_t sub_vendor_id;
--
2.21.0
1.8.3.1

6
0014-Add-support-statement-to-help-output.patch
View File

@ -1,4 +1,4 @@
From 339380067c7f385a9a6c368204e24193b630e78b Mon Sep 17 00:00:00 2001
From 73edca2e4885b3f2b65edb08b6cdb53d68494c13 Mon Sep 17 00:00:00 2001
From: Eduardo Habkost <ehabkost@redhat.com>
Date: Wed, 4 Dec 2013 18:53:17 +0100
Subject: Add support statement to -help output
@ -24,7 +24,7 @@ Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
1 file changed, 9 insertions(+)
diff --git a/vl.c b/vl.c
index 668a34577e..9f3e7e7733 100644
index 668a345..9f3e7e7 100644
--- a/vl.c
+++ b/vl.c
@@ -1822,9 +1822,17 @@ static void version(void)
@ -54,5 +54,5 @@ index 668a34577e..9f3e7e7733 100644
}
--
2.21.0
1.8.3.1

10
0015-globally-limit-the-maximum-number-of-CPUs.patch
View File

@ -1,4 +1,4 @@
From 25283fab966a911cbeb4d0d3524cb1e0f1f8f448 Mon Sep 17 00:00:00 2001
From 9647d94ec17c7fa645336a881147a7e841cb78c2 Mon Sep 17 00:00:00 2001
From: Andrew Jones <drjones@redhat.com>
Date: Tue, 21 Jan 2014 10:46:52 +0100
Subject: globally limit the maximum number of CPUs
@ -82,10 +82,10 @@ Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
2 files changed, 30 insertions(+)
diff --git a/accel/kvm/kvm-all.c b/accel/kvm/kvm-all.c
index 140b0bd8f6..7a4399c3ef 100644
index ca00daa..dc3ed7f 100644
--- a/accel/kvm/kvm-all.c
+++ b/accel/kvm/kvm-all.c
@@ -1925,6 +1925,18 @@ static int kvm_init(MachineState *ms)
@@ -1943,6 +1943,18 @@ static int kvm_init(MachineState *ms)
soft_vcpus_limit = kvm_recommended_vcpus(s);
hard_vcpus_limit = kvm_max_vcpus(s);
@ -105,7 +105,7 @@ index 140b0bd8f6..7a4399c3ef 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 9f3e7e7733..1550aa2aaa 100644
index 9f3e7e7..1550aa2 100644
--- a/vl.c
+++ b/vl.c
@@ -134,6 +134,8 @@ int main(int argc, char **argv)
@ -148,5 +148,5 @@ index 9f3e7e7733..1550aa2aaa 100644
configure_rtc(qemu_find_opts_singleton("rtc"));
--
2.21.0
1.8.3.1

16
0016-Add-support-for-simpletrace.patch
View File

@ -1,4 +1,4 @@
From 850e66fc482eb897babd9e1f3d1216fd0f7c6382 Mon Sep 17 00:00:00 2001
From d78f2713725382c792154ce482a1b03b749b909f Mon Sep 17 00:00:00 2001
From: Miroslav Rezanina <mrezanin@redhat.com>
Date: Thu, 8 Oct 2015 09:50:17 +0200
Subject: Add support for simpletrace
@ -26,8 +26,8 @@ Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
---
.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(-)
@ -36,7 +36,7 @@ Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
create mode 100644 scripts/systemtap/script.d/qemu_kvm.stp
diff --git a/Makefile b/Makefile
index 086727dbb9..4254950f7f 100644
index 086727d..4254950 100644
--- a/Makefile
+++ b/Makefile
@@ -939,6 +939,10 @@ endif
@ -52,7 +52,7 @@ index 086727dbb9..4254950f7f 100644
ctags:
diff --git a/README.systemtap b/README.systemtap
new file mode 100644
index 0000000000..ad913fc990
index 0000000..ad913fc
--- /dev/null
+++ b/README.systemtap
@@ -0,0 +1,43 @@
@ -101,7 +101,7 @@ index 0000000000..ad913fc990
+ # /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 0000000000..372d8160a4
index 0000000..372d816
--- /dev/null
+++ b/scripts/systemtap/conf.d/qemu_kvm.conf
@@ -0,0 +1,4 @@
@ -111,11 +111,11 @@ index 0000000000..372d8160a4
+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 0000000000..c04abf9449
index 0000000..c04abf9
--- /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 {}
--
2.21.0
1.8.3.1

14
0017-Use-qemu-kvm-in-documentation-instead-of-qemu-system.patch
View File

@ -1,4 +1,4 @@
From dce5c0db33a1f7420254944c78962ca1887d3c08 Mon Sep 17 00:00:00 2001
From 4dcf2dac71a39d2e5b44cf6a4a43abdd89a11c60 Mon Sep 17 00:00:00 2001
From: Miroslav Rezanina <mrezanin@redhat.com>
Date: Fri, 30 Nov 2018 09:11:03 +0100
Subject: Use qemu-kvm in documentation instead of qemu-system-<arch>
@ -25,7 +25,7 @@ Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
4 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/docs/qemu-block-drivers.texi b/docs/qemu-block-drivers.texi
index 2c7ea49c32..5d0afb3dee 100644
index 2c7ea49..5d0afb3 100644
--- a/docs/qemu-block-drivers.texi
+++ b/docs/qemu-block-drivers.texi
@@ -2,7 +2,7 @@
@ -38,7 +38,7 @@ index 2c7ea49c32..5d0afb3dee 100644
@c man begin DESCRIPTION
diff --git a/docs/qemu-cpu-models.texi b/docs/qemu-cpu-models.texi
index f88a1def0d..c82cf8fab7 100644
index f88a1de..c82cf8f 100644
--- a/docs/qemu-cpu-models.texi
+++ b/docs/qemu-cpu-models.texi
@@ -2,7 +2,7 @@
@ -51,7 +51,7 @@ index f88a1def0d..c82cf8fab7 100644
@c man begin DESCRIPTION
diff --git a/qemu-doc.texi b/qemu-doc.texi
index 3c5022050f..f770e86a90 100644
index 3ddf5c0..d460f8d 100644
--- a/qemu-doc.texi
+++ b/qemu-doc.texi
@@ -11,8 +11,8 @@
@ -65,7 +65,7 @@ index 3c5022050f..f770e86a90 100644
@ifinfo
@direntry
@@ -1826,7 +1826,7 @@ Set the initial VGA graphic mode. The default is 800x600x32.
@@ -1827,7 +1827,7 @@ Set the initial VGA graphic mode. The default is 800x600x32.
Set OpenBIOS variables in NVRAM, for example:
@example
@ -75,7 +75,7 @@ index 3c5022050f..f770e86a90 100644
-prom-env 'boot-args=conf=hd:2,\yaboot.conf'
@end example
diff --git a/qemu-options.hx b/qemu-options.hx
index fc17aca631..df1d27b6f2 100644
index fc17aca..df1d27b 100644
--- a/qemu-options.hx
+++ b/qemu-options.hx
@@ -2737,11 +2737,11 @@ be created for multiqueue vhost-user.
@ -114,5 +114,5 @@ index fc17aca631..df1d27b6f2 100644
ETEXI
--
2.21.0
1.8.3.1

6
0018-usb-xhci-Fix-PCI-capability-order.patch
View File

@ -1,4 +1,4 @@
From 9fe2902d4c8f5cd5ad72af06c6bc54813e642e27 Mon Sep 17 00:00:00 2001
From eba5ef4e161aeb71df26b1c43577945ae3093f2b Mon Sep 17 00:00:00 2001
From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
Date: Fri, 5 May 2017 19:06:14 +0200
Subject: usb-xhci: Fix PCI capability order
@ -62,7 +62,7 @@ Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/hw/usb/hcd-xhci.c b/hw/usb/hcd-xhci.c
index 8fed2eedd6..d2b9744030 100644
index 8fed2ee..d2b9744 100644
--- a/hw/usb/hcd-xhci.c
+++ b/hw/usb/hcd-xhci.c
@@ -3403,6 +3403,12 @@ static void usb_xhci_realize(struct PCIDevice *dev, Error **errp)
@ -92,5 +92,5 @@ index 8fed2eedd6..d2b9744030 100644
/* TODO check for errors, and should fail when msix=on */
msix_init(dev, xhci->numintrs,
--
2.21.0
1.8.3.1

6
0019-virtio-scsi-Reject-scsi-cd-if-data-plane-enabled-RHE.patch
View File

@ -1,4 +1,4 @@
From e6fd66897236f8a3348235447ed32b8e5de109bb Mon Sep 17 00:00:00 2001
From 033166f31288a5104d4e55a828ce8d62c9ccca1c Mon Sep 17 00:00:00 2001
From: Fam Zheng <famz@redhat.com>
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 <ddepaula@redhat.com>
1 file changed, 9 insertions(+)
diff --git a/hw/scsi/virtio-scsi.c b/hw/scsi/virtio-scsi.c
index e8b2b64d09..54108c0056 100644
index e8b2b64..54108c0 100644
--- a/hw/scsi/virtio-scsi.c
+++ b/hw/scsi/virtio-scsi.c
@@ -808,6 +808,15 @@ static void virtio_scsi_hotplug(HotplugHandler *hotplug_dev, DeviceState *dev,
@ -65,5 +65,5 @@ index e8b2b64d09..54108c0056 100644
if (blk_op_is_blocked(sd->conf.blk, BLOCK_OP_TYPE_DATAPLANE, errp)) {
return;
--
2.21.0
1.8.3.1

6
0020-BZ1653590-Require-at-least-64kiB-pages-for-downstrea.patch
View File

@ -1,4 +1,4 @@
From 8b3c1edc606bea84b5e52369ed8d211889a44b6c Mon Sep 17 00:00:00 2001
From 6ce9df118313e3b2d21c70994d0b42b33b59d27c Mon Sep 17 00:00:00 2001
From: David Gibson <dgibson@redhat.com>
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 <ddepaula@redhat.com>
1 file changed, 7 insertions(+)
diff --git a/hw/ppc/spapr_caps.c b/hw/ppc/spapr_caps.c
index 481dfd2a27..805f38533e 100644
index 481dfd2..805f385 100644
--- a/hw/ppc/spapr_caps.c
+++ b/hw/ppc/spapr_caps.c
@@ -351,12 +351,19 @@ void spapr_check_pagesize(SpaprMachineState *spapr, hwaddr pagesize,
@ -56,5 +56,5 @@ index 481dfd2a27..805f38533e 100644
spapr_check_pagesize(spapr, qemu_minrampagesize(), errp);
}
--
2.21.0
1.8.3.1

6
0021-Using-ip_deq-after-m_free-might-read-pointers-from-a.patch
View File

@ -1,4 +1,4 @@
From 9c91fc25dd4edd7447a342dd37b2fd8d3e2301f6 Mon Sep 17 00:00:00 2001
From a0059f1ef0bfd6852f838491120adf1be20857cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= <philmd@redhat.com>
Date: Mon, 16 Sep 2019 17:07:00 +0100
Subject: Using ip_deq after m_free might read pointers from an allocation
@ -31,7 +31,7 @@ Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/slirp/src/ip_input.c b/slirp/src/ip_input.c
index 8c75d91495..df1c846ade 100644
index 8c75d91..df1c846 100644
--- a/slirp/src/ip_input.c
+++ b/slirp/src/ip_input.c
@@ -292,6 +292,7 @@ static struct ip *ip_reass(Slirp *slirp, struct ip *ip, struct ipq *fp)
@ -57,5 +57,5 @@ index 8c75d91495..df1c846ade 100644
insert:
--
2.21.0
1.8.3.1

11
0023-Temporarily-update-VERSION-to-8.2.0.patch
View File

@ -1,4 +1,4 @@
From 1afa318b8a37aa999221ad4afa01e14a242f7476 Mon Sep 17 00:00:00 2001
From 2a87b3e90278f47395975a77fc056d2f964f4725 Mon Sep 17 00:00:00 2001
From: "Danilo C. L. de Paula" <ddepaula@redhat.com>
Date: Tue, 19 Nov 2019 08:41:33 -0300
Subject: Temporarily update VERSION to 8.2.0
@ -8,18 +8,21 @@ rhbz#1773397
This will change when the official release appears.
But, to make qemu-kvm --version happy, we need to fix this now.
Conflicts:
VERSION
Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
---
VERSION | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/VERSION b/VERSION
index cfcbdd75dd..6aba2b245a 100644
index dcd8753..6aba2b2 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-4.1.91
-4.1.94
+4.2.0
--
2.21.0
1.8.3.1

18
qemu-kvm.spec
View File

@ -1,6 +1,6 @@
%global SLOF_gittagdate 20191022
%global SLOF_gittagcommit 899d9883
%global rcversion -rc1
%global rcversion -rc4
%global have_usbredir 1
%global have_spice 1
@ -68,7 +68,7 @@ Obsoletes: %1-rhev
Summary: QEMU is a machine emulator and virtualizer
Name: qemu-kvm
Version: 4.2.0
Release: 1%{?dist}
Release: 2%{?dist}
# Epoch because we pushed a qemu-1.0 package. AIUI this can't ever be dropped
Epoch: 15
License: GPLv2 and GPLv2+ and CC-BY
@ -77,7 +77,7 @@ URL: http://www.qemu.org/
ExclusiveArch: x86_64 %{power64} aarch64 s390x
Source0: http://wiki.qemu.org/download/qemu-4.2.0-rc1.tar.xz
Source0: http://wiki.qemu.org/download/qemu-4.2.0-rc4.tar.xz
# KSM control scripts
Source4: ksm.service
@ -105,6 +105,7 @@ Source35: udev-kvm-check.c
Source36: README.tests
Patch0001: 0001-redhat-Adding-slirp-to-the-exploded-tree.patch
Patch0005: 0005-Initial-redhat-build.patch
Patch0006: 0006-Enable-disable-devices-for-RHEL.patch
Patch0007: 0007-Machine-type-related-general-changes.patch
@ -409,6 +410,9 @@ the Secure Shell (SSH) protocol.
%prep
%setup -n qemu-%{version}%{rcversion}
# Remove slirp content in scratchbuilds because it's being applyed as a patch
rm -fr slirp
mkdir slirp
%autopatch -p1
%build
@ -1057,16 +1061,14 @@ useradd -r -u 107 -g qemu -G kvm -d / -s /sbin/nologin \
%changelog
* Tue Nov 19 2019 Danilo Cesar Lemes de Paula <ddepaula@redhat.com> - 4.2.0-1.el8
* Tue Nov 19 2019 Danilo Cesar Lemes de Paula <ddepaula@redhat.com> - 4.2.0-2.el8
- 0023-Temporarily-update-VERSION-to-8.2.0.patch [bz#1773397]
- Resolves: bz#1773397
(QEMU emulator version is "4.1.91" for qemu-kvm-4.2.0-0.module+el8.2.0+471)
(QEMU emulator version is "4.1.91" for qemu-kvm-4.2.0-0.module+el8.2.0+471
- Resoves: bz#1773392
([ppc] Need to rebase SLOF image for qemu-kvm-4.2)
* Fri Nov 15 2019 Danilo Cesar Lemes de Paula <ddepaula@redhat.com> - 4.2.0-0.el8
- Rebase to 4.2
* Tue Oct 29 2019 Danilo Cesar Lemes de Paula <ddepaula@redhat.com> - 4.1.0-14.el8
- kvm-Revert-qcow2-skip-writing-zero-buffers-to-empty-COW-.patch [bz#1751934]
- kvm-coroutine-Add-qemu_co_mutex_assert_locked.patch [bz#1764721]

2
sources
View File

@ -1 +1 @@
SHA512 (qemu-4.2.0-rc1.tar.xz) = 8ad5e0472fd384a9ba03b2e8fbb1e887169abb47a50a3f130b1943b39f45677a9e65ca5d1deb96338a5b3c3953db67f50e194a6763e9121c0eb5f620896162a9
SHA512 (qemu-4.2.0-rc4.tar.xz) = 01d7fd8368b37ce9239b5884654962c947e2c597c0042b256bb9d1ebf2fd5159b1182e43094e966e54368c792b390f48ce12bce7ee878f5f3ab685fc118aa7db