Rebase to qemu-kvm-3.1.0

0001-migration-colo.c-Fix-compilation-issue-when-disable-.patch

@@ -1,128 +0,0 @@
-From 5be2fefbc0999ada944c36a865b154d398e16e27 Mon Sep 17 00:00:00 2001
-From: Zhang Chen <zhangckid@gmail.com>
-Date: Thu, 1 Nov 2018 10:12:26 +0800
-Subject: migration/colo.c: Fix compilation issue when disable replication
-
-This compilation issue will occur when user use --disable-replication
-to config Qemu.
-
-Reported-by: Thomas Huth <thuth@redhat.com>
-Signed-off-by: Zhang Chen <zhangckid@gmail.com>
----
- migration/colo.c | 28 +++++++++++++++++++++++++++-
- 1 file changed, 27 insertions(+), 1 deletion(-)
-
-diff --git a/migration/colo.c b/migration/colo.c
-index 956ac23..fcff04c 100644
---- a/migration/colo.c
-+++ b/migration/colo.c
-@@ -59,6 +59,8 @@ static bool colo_runstate_is_stopped(void)
- 
- static void secondary_vm_do_failover(void)
- {
-+/* COLO needs enable block-replication */
-+#ifdef CONFIG_REPLICATION
-     int old_state;
-     MigrationIncomingState *mis = migration_incoming_get_current();
-     Error *local_err = NULL;
-@@ -121,10 +123,14 @@ static void secondary_vm_do_failover(void)
-     if (mis->migration_incoming_co) {
-         qemu_coroutine_enter(mis->migration_incoming_co);
-     }
-+#else
-+    abort();
-+#endif
- }
- 
- static void primary_vm_do_failover(void)
- {
-+#ifdef CONFIG_REPLICATION
-     MigrationState *s = migrate_get_current();
-     int old_state;
-     Error *local_err = NULL;
-@@ -165,6 +171,9 @@ static void primary_vm_do_failover(void)
- 
-     /* Notify COLO thread that failover work is finished */
-     qemu_sem_post(&s->colo_exit_sem);
-+#else
-+    abort();
-+#endif
- }
- 
- COLOMode get_colo_mode(void)
-@@ -415,11 +424,16 @@ static int colo_do_checkpoint_transaction(MigrationState *s,
-     /* Disable block migration */
-     migrate_set_block_enabled(false, &local_err);
-     qemu_mutex_lock_iothread();
-+
-+#ifdef CONFIG_REPLICATION
-     replication_do_checkpoint_all(&local_err);
-     if (local_err) {
-         qemu_mutex_unlock_iothread();
-         goto out;
-     }
-+#else
-+        abort();
-+#endif
- 
-     colo_send_message(s->to_dst_file, COLO_MESSAGE_VMSTATE_SEND, &local_err);
-     if (local_err) {
-@@ -523,11 +537,15 @@ static void colo_process_checkpoint(MigrationState *s)
-     object_unref(OBJECT(bioc));
- 
-     qemu_mutex_lock_iothread();
-+#ifdef CONFIG_REPLICATION
-     replication_start_all(REPLICATION_MODE_PRIMARY, &local_err);
-     if (local_err) {
-         qemu_mutex_unlock_iothread();
-         goto out;
-     }
-+#else
-+        abort();
-+#endif
- 
-     vm_start();
-     qemu_mutex_unlock_iothread();
-@@ -690,11 +708,15 @@ void *colo_process_incoming_thread(void *opaque)
-     object_unref(OBJECT(bioc));
- 
-     qemu_mutex_lock_iothread();
-+#ifdef CONFIG_REPLICATION
-     replication_start_all(REPLICATION_MODE_SECONDARY, &local_err);
-     if (local_err) {
-         qemu_mutex_unlock_iothread();
-         goto out;
-     }
-+#else
-+        abort();
-+#endif
-     vm_start();
-     trace_colo_vm_state_change("stop", "run");
-     qemu_mutex_unlock_iothread();
-@@ -785,18 +807,22 @@ void *colo_process_incoming_thread(void *opaque)
-             goto out;
-         }
- 
-+#ifdef CONFIG_REPLICATION
-         replication_get_error_all(&local_err);
-         if (local_err) {
-             qemu_mutex_unlock_iothread();
-             goto out;
-         }
-+
-         /* discard colo disk buffer */
-         replication_do_checkpoint_all(&local_err);
-         if (local_err) {
-             qemu_mutex_unlock_iothread();
-             goto out;
-         }
--
-+#else
-+        abort();
-+#endif
-         /* Notify all filters of all NIC to do checkpoint */
-         colo_notify_filters_event(COLO_EVENT_CHECKPOINT, &local_err);
- 
--- 
-1.8.3.1
-

0004-Initial-redhat-build.patch

@@ -1,4 +1,4 @@
-From f0cd0ed26f3a3ae0610fad93c9dde26b54910abb Mon Sep 17 00:00:00 2001
+From 8ff84e7f181aa0f64b3b6178d9ac808c61f5bec8 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
@@ -13,7 +13,14 @@ several issues are fixed in QEMU tree:
  - Use "/share/qemu-kvm" as SHARE_SUFFIX
   - We reconfigured our share to qemu-kvm to be consistent with used name
 
-This rebase includes changes up to qemu-kvm-2.12.0-42.el8
+This rebase includes changes up to qemu-kvm-2.12.0-47.el8
+
+Rebase notes (3.1.0):
+- added new configure options
+
+Merged patches (3.1.0):
+- 01f0c9f RHEL8: Add disable configure options to qemu spec file
+- Spec file cleanups
 ---
  Makefile                          |    3 +-
  block/Makefile.objs               |    2 +-
@@ -21,10 +28,11 @@ This rebase includes changes up to qemu-kvm-2.12.0-42.el8
  configure                         |   33 +-
  os-posix.c                        |    2 +-
  redhat/Makefile                   |   82 ++
- redhat/Makefile.common        |   49 ++
+ redhat/Makefile.common            |   49 +
- redhat/qemu-kvm.spec.template | 1723 +++++++++++++++++++++++++++++++++++++++++
+ redhat/qemu-kvm.spec.template     | 1813 +++++++++++++++++++++++++++++++++++++
+ redhat/scripts/process-patches.sh |    7 +-
  ui/vnc.c                          |    2 +-
- 9 files changed, 1972 insertions(+), 43 deletions(-)
+ 10 files changed, 2064 insertions(+), 48 deletions(-)
  create mode 100644 redhat/Makefile
  create mode 100644 redhat/Makefile.common
  create mode 100644 redhat/qemu-kvm.spec.template

0005-Enable-disable-devices-for-RHEL.patch

@@ -1,4 +1,4 @@
-From 38eba79aaa865ffa3e85bfa56e644e0846731744 Mon Sep 17 00:00:00 2001
+From 0533a6ee98fedfad9ca1466f5e6f5576169ed808 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
@@ -12,22 +12,33 @@ Rebase notes (qemu 3.1.0)
 - new hyperv.mak in default configs
 - Move changes from x86_64-softmmu.mak to i386-softmmu.mak
 - Added CONFIG_VIRTIO_MMIO to aarch64-softmmu.mak
+- Removed config_vga_isa.c changes as no longer needed
+- Removed new devices
+
+Merged patches (qemu 3.1.0):
+- d51e082 Re-enable CONFIG_HYPERV_TESTDEV
+- 4b889f3 Declare cirrus-vga as deprecated
+- b579d32 Do not build bluetooth support
+- 3eef52a Disable CONFIG_IPMI and CONFIG_I2C for ppc64
+- 9caf292 Disable CONFIG_CAN_BUS and CONFIG_CAN_SJA1000
 ---
- default-configs/aarch64-softmmu.mak | 40 +++++++++++++++++++++++++++----------
+ Makefile.objs                       |  4 ++--
- default-configs/hyperv.mak          |  2 +-
+ default-configs/aarch64-softmmu.mak | 40 ++++++++++++++++++++++++---------
- default-configs/i386-softmmu.mak    | 26 ++++++++++++------------
+ default-configs/i386-softmmu.mak    | 26 +++++++++++-----------
- default-configs/pci.mak             | 38 +++++++++++++++++------------------
+ default-configs/pci.mak             | 44 ++++++++++++++++++-------------------
- default-configs/ppc64-softmmu.mak   | 28 +++++++++++++++++++-------
+ default-configs/ppc64-softmmu.mak   | 30 ++++++++++++++++++-------
  default-configs/s390x-softmmu.mak   |  5 +++--
- default-configs/sound.mak           |  8 ++++----
+ default-configs/sound.mak           |  8 +++----
- default-configs/usb.mak             | 14 ++++++-------
+ default-configs/usb.mak             | 14 ++++++------
- default-configs/virtio.mak          |  5 ++---
+ default-configs/virtio.mak          |  6 ++---
  hw/acpi/ich9.c                      |  4 ++--
  hw/arm/Makefile.objs                |  2 +-
  hw/block/fdc.c                      |  1 +
+ hw/bt/Makefile.objs                 |  4 ++--
  hw/char/serial-pci.c                |  4 ++++
- hw/core/Makefile.objs               | 10 ++++++----
+ hw/core/Makefile.objs               | 10 +++++----
- hw/display/cirrus_vga_isa.c         |  2 ++
+ hw/display/Makefile.objs            |  5 +++--
+ hw/display/cirrus_vga.c             |  3 +++
  hw/i386/pc.c                        |  2 ++
  hw/ide/piix.c                       |  5 ++++-
  hw/ide/via.c                        |  2 ++
@@ -38,24 +49,39 @@ Rebase notes (qemu 3.1.0)
  hw/net/e1000.c                      |  2 ++
  hw/pci-host/piix.c                  |  4 ++++
  hw/ppc/spapr_cpu_core.c             |  2 ++
- hw/rdma/Makefile.objs               |  3 ++-
  hw/usb/ccid-card-emulated.c         |  2 ++
- hw/vfio/Makefile.objs               |  3 ---
+ hw/vfio/Makefile.objs               |  2 +-
  hw/vfio/pci-quirks.c                |  5 +++++
- hw/virtio/virtio-pci.c              |  8 ++++----
+ hw/vfio/pci.c                       |  5 +++++
- qemu-options.hx                     |  5 -----
+ hw/virtio/virtio-pci.c              |  8 +++----
+ qemu-options.hx                     |  7 ++----
  redhat/qemu-kvm.spec.template       |  2 +-
  stubs/Makefile.objs                 |  1 +
- stubs/ide-isa.c                     | 13 ++++++++++++
+ stubs/ide-isa.c                     | 13 +++++++++++
  target/arm/cpu.c                    |  4 +++-
- target/i386/cpu.c                   | 35 ++++++++++++++++++++++++--------
+ target/i386/cpu.c                   | 35 ++++++++++++++++++++++-------
- target/ppc/cpu-models.c             | 12 +++++++++++
+ target/ppc/cpu-models.c             | 12 ++++++++++
  target/s390x/cpu_models.c           |  3 +++
- target/s390x/kvm.c                  |  8 ++++++++
+ target/s390x/kvm.c                  |  8 +++++++
- vl.c                                |  2 +-
+ vl.c                                |  8 ++++++-
- 40 files changed, 229 insertions(+), 100 deletions(-)
+ 42 files changed, 253 insertions(+), 106 deletions(-)
  create mode 100644 stubs/ide-isa.c
 
+diff --git a/Makefile.objs b/Makefile.objs
+index 1e1ff38..26d578e 100644
+--- a/Makefile.objs
++++ b/Makefile.objs
+@@ -115,8 +115,8 @@ common-obj-y += replay/
+ 
+ common-obj-y += ui/
+ common-obj-m += ui/
+-common-obj-y += bt-host.o bt-vhci.o
+-bt-host.o-cflags := $(BLUEZ_CFLAGS)
++#common-obj-y += bt-host.o bt-vhci.o
++#bt-host.o-cflags := $(BLUEZ_CFLAGS)
+ 
+ common-obj-y += dma-helpers.o
+ common-obj-y += vl.o
 diff --git a/default-configs/aarch64-softmmu.mak b/default-configs/aarch64-softmmu.mak
 index 4ea9add..221e266 100644
 --- a/default-configs/aarch64-softmmu.mak
@@ -103,14 +129,6 @@ index 4ea9add..221e266 100644
 +CONFIG_USB=y
 +CONFIG_I2C=y
 +CONFIG_FW_CFG_DMA=y
-diff --git a/default-configs/hyperv.mak b/default-configs/hyperv.mak
-index 5d0d9fd..fce5d91 100644
---- a/default-configs/hyperv.mak
-+++ b/default-configs/hyperv.mak
-@@ -1,2 +1,2 @@
- CONFIG_HYPERV=$(CONFIG_KVM)
--CONFIG_HYPERV_TESTDEV=y
-+#CONFIG_HYPERV_TESTDEV=y
 diff --git a/default-configs/i386-softmmu.mak b/default-configs/i386-softmmu.mak
 index 64c998c..faea212 100644
 --- a/default-configs/i386-softmmu.mak
@@ -167,7 +185,7 @@ index 64c998c..faea212 100644
 -CONFIG_AMD_IOMMU=y
 +#CONFIG_AMD_IOMMU=y
 diff --git a/default-configs/pci.mak b/default-configs/pci.mak
-index 6c7be12..292b3f2 100644
+index 6c7be12..5929b5d 100644
 --- a/default-configs/pci.mak
 +++ b/default-configs/pci.mak
 @@ -4,22 +4,22 @@ CONFIG_ISA_BUS=y
@@ -214,10 +232,12 @@ index 6c7be12..292b3f2 100644
  CONFIG_SERIAL=y
  CONFIG_SERIAL_ISA=y
  CONFIG_SERIAL_PCI=y
- CONFIG_CAN_BUS=y
+-CONFIG_CAN_BUS=y
- CONFIG_CAN_SJA1000=y
+-CONFIG_CAN_SJA1000=y
 -CONFIG_CAN_PCI=y
 -CONFIG_IPACK=y
++#CONFIG_CAN_BUS=y
++#CONFIG_CAN_SJA1000=y
 +#CONFIG_CAN_PCI=y
 +#CONFIG_IPACK=y
  CONFIG_WDT_IB6300ESB=y
@@ -231,13 +251,14 @@ index 6c7be12..292b3f2 100644
  CONFIG_EDU=y
  CONFIG_VGA=y
  CONFIG_VGA_PCI=y
- CONFIG_BOCHS_DISPLAY=y
+-CONFIG_BOCHS_DISPLAY=y
 -CONFIG_IVSHMEM_DEVICE=$(CONFIG_IVSHMEM)
 -CONFIG_ROCKER=y
++#CONFIG_BOCHS_DISPLAY=y
 +#CONFIG_IVSHMEM_DEVICE=$(CONFIG_IVSHMEM)
 +#CONFIG_ROCKER=y
 diff --git a/default-configs/ppc64-softmmu.mak b/default-configs/ppc64-softmmu.mak
-index aec2855..a492986 100644
+index aec2855..242d277 100644
 --- a/default-configs/ppc64-softmmu.mak
 +++ b/default-configs/ppc64-softmmu.mak
 @@ -1,14 +1,28 @@
@@ -260,15 +281,16 @@ index aec2855..a492986 100644
 +CONFIG_VGA=y
 +CONFIG_VGA_PCI=y
 +CONFIG_SERIAL=y
-+CONFIG_I2C=y
++#CONFIG_I2C=y
  
  # For PowerNV
 -CONFIG_POWERNV=y
-+#CONFIG_POWERNV=y
+-CONFIG_IPMI=y
- CONFIG_IPMI=y
 -CONFIG_IPMI_LOCAL=y
 -CONFIG_IPMI_EXTERN=y
 -CONFIG_ISA_IPMI_BT=y
++#CONFIG_POWERNV=y
++#CONFIG_IPMI=y
 +#CONFIG_IPMI_LOCAL=y
 +#CONFIG_IPMI_EXTERN=y
 +#CONFIG_ISA_IPMI_BT=y
@@ -336,10 +358,10 @@ index e42cfea..cef6c0b 100644
 +#CONFIG_USB_NETWORK=y
 +#CONFIG_USB_BLUETOOTH=y
 diff --git a/default-configs/virtio.mak b/default-configs/virtio.mak
-index 1304849..6330e6b 100644
+index 1304849..b4f4743 100644
 --- a/default-configs/virtio.mak
 +++ b/default-configs/virtio.mak
-@@ -1,10 +1,9 @@
+@@ -1,10 +1,10 @@
 -CONFIG_VHOST_USER_SCSI=$(call land,$(CONFIG_VHOST_USER),$(CONFIG_LINUX))
 -CONFIG_VHOST_USER_BLK=$(call land,$(CONFIG_VHOST_USER),$(CONFIG_LINUX))
 +#CONFIG_VHOST_USER_SCSI=$(call land,$(CONFIG_VHOST_USER),$(CONFIG_LINUX))
@@ -349,6 +371,7 @@ index 1304849..6330e6b 100644
  CONFIG_VIRTIO_BALLOON=y
  CONFIG_VIRTIO_BLK=y
 -CONFIG_VIRTIO_CRYPTO=y
++#CONFIG_VIRTIO_CRYPTO=y
  CONFIG_VIRTIO_GPU=y
  CONFIG_VIRTIO_INPUT=y
  CONFIG_VIRTIO_NET=y
@@ -392,6 +415,16 @@ index 6f19f12..56b7aeb 100644
  }
  
  static const TypeInfo floppy_drive_info = {
+diff --git a/hw/bt/Makefile.objs b/hw/bt/Makefile.objs
+index 867a7d2..e678e9e 100644
+--- a/hw/bt/Makefile.objs
++++ b/hw/bt/Makefile.objs
+@@ -1,3 +1,3 @@
+-common-obj-y += core.o l2cap.o sdp.o hci.o hid.o
+-common-obj-y += hci-csr.o
++#common-obj-y += core.o l2cap.o sdp.o hci.o hid.o
++#common-obj-y += hci-csr.o
+ 
 diff --git a/hw/char/serial-pci.c b/hw/char/serial-pci.c
 index cb0d04c..d426982 100644
 --- a/hw/char/serial-pci.c
@@ -434,19 +467,35 @@ index a799c83..1c7ba0b 100644
 -common-obj-$(CONFIG_SOFTMMU) += generic-loader.o
 +#common-obj-$(CONFIG_SOFTMMU) += generic-loader.o
  common-obj-$(CONFIG_SOFTMMU) += null-machine.o
-diff --git a/hw/display/cirrus_vga_isa.c b/hw/display/cirrus_vga_isa.c
+diff --git a/hw/display/Makefile.objs b/hw/display/Makefile.objs
-index fa10b74..1cb607d 100644
+index 97acd5b..e39b87c 100644
---- a/hw/display/cirrus_vga_isa.c
+--- a/hw/display/Makefile.objs
-+++ b/hw/display/cirrus_vga_isa.c
++++ b/hw/display/Makefile.objs
-@@ -81,6 +81,8 @@ static void isa_cirrus_vga_class_init(ObjectClass *klass, void *data)
+@@ -1,7 +1,8 @@
-     dc->realize = isa_cirrus_vga_realizefn;
+ common-obj-y += edid-generate.o
-     dc->props = isa_cirrus_vga_properties;
-     set_bit(DEVICE_CATEGORY_DISPLAY, dc->categories);
-+    /* Disabled for Red Hat Enterprise Linux: */
-+    dc->user_creatable = false;
- }
  
- static const TypeInfo isa_cirrus_vga_info = {
+-common-obj-$(CONFIG_FW_CFG_DMA) += ramfb.o
+-common-obj-$(CONFIG_FW_CFG_DMA) += ramfb-standalone.o
++# Disabled for Red Hat Enterprise Linux
++#common-obj-$(CONFIG_FW_CFG_DMA) += ramfb.o
++#common-obj-$(CONFIG_FW_CFG_DMA) += ramfb-standalone.o
+ 
+ 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 a0e7146..058a8e0 100644
+--- a/hw/display/cirrus_vga.c
++++ b/hw/display/cirrus_vga.c
+@@ -2967,6 +2967,9 @@ static void pci_cirrus_vga_realize(PCIDevice *dev, Error **errp)
+      PCIDeviceClass *pc = PCI_DEVICE_GET_CLASS(dev);
+      int16_t device_id = pc->device_id;
+ 
++     warn_report("'cirrus-vga' is deprecated, "
++                 "please use a different VGA card instead");
++
+      /* 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.c b/hw/i386/pc.c
 index f095725..567439e 100644
 --- a/hw/i386/pc.c
@@ -637,18 +686,6 @@ index 2398ce6..63a7bb6 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/rdma/Makefile.objs b/hw/rdma/Makefile.objs
-index bd36cbf..e87e7e5 100644
---- a/hw/rdma/Makefile.objs
-+++ b/hw/rdma/Makefile.objs
-@@ -1,5 +1,6 @@
- ifeq ($(CONFIG_PVRDMA),y)
- obj-$(CONFIG_PCI) += rdma_utils.o rdma_backend.o rdma_rm.o
- obj-$(CONFIG_PCI) += vmw/pvrdma_dev_ring.o vmw/pvrdma_cmd.o \
--                     vmw/pvrdma_qp_ops.o vmw/pvrdma_main.o
-+                     vmw/pvrdma_qp_ops.o
-+#obj-$(CONFIG_PCI) += vmw/pvrdma_main.o
- endif
 diff --git a/hw/usb/ccid-card-emulated.c b/hw/usb/ccid-card-emulated.c
 index 25976ed..a793584 100644
 --- a/hw/usb/ccid-card-emulated.c
@@ -663,19 +700,18 @@ index 25976ed..a793584 100644
  
  static const TypeInfo emulated_card_info = {
 diff --git a/hw/vfio/Makefile.objs b/hw/vfio/Makefile.objs
-index 8b3f664..a6b6039 100644
+index 8b3f664..7e5c0ad 100644
 --- a/hw/vfio/Makefile.objs
 +++ b/hw/vfio/Makefile.objs
-@@ -2,9 +2,6 @@ ifeq ($(CONFIG_LINUX), y)
+@@ -2,7 +2,7 @@ ifeq ($(CONFIG_LINUX), y)
  obj-$(CONFIG_SOFTMMU) += common.o
  obj-$(CONFIG_PCI) += pci.o pci-quirks.o display.o
  obj-$(CONFIG_VFIO_CCW) += ccw.o
 -obj-$(CONFIG_SOFTMMU) += platform.o
--obj-$(CONFIG_VFIO_XGMAC) += calxeda-xgmac.o
++#obj-$(CONFIG_SOFTMMU) += platform.o
--obj-$(CONFIG_VFIO_AMD_XGBE) += amd-xgbe.o
+ obj-$(CONFIG_VFIO_XGMAC) += calxeda-xgmac.o
+ obj-$(CONFIG_VFIO_AMD_XGBE) += amd-xgbe.o
  obj-$(CONFIG_SOFTMMU) += spapr.o
- obj-$(CONFIG_VFIO_AP) += ap.o
- endif
 diff --git a/hw/vfio/pci-quirks.c b/hw/vfio/pci-quirks.c
 index eae31c7..4a6e98e 100644
 --- a/hw/vfio/pci-quirks.c
@@ -699,6 +735,34 @@ index eae31c7..4a6e98e 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 5c7bd96..6e0000c 100644
+--- a/hw/vfio/pci.c
++++ b/hw/vfio/pci.c
+@@ -3262,6 +3262,7 @@ static const TypeInfo vfio_pci_dev_info = {
+     },
+ };
+ 
++#if 0 /* Disabled for Red Hat Enterprise Linux */
+ static Property vfio_pci_dev_nohotplug_properties[] = {
+     DEFINE_PROP_BOOL("ramfb", VFIOPCIDevice, enable_ramfb, false),
+     DEFINE_PROP_END_OF_LIST(),
+@@ -3281,11 +3282,15 @@ static const TypeInfo vfio_pci_nohotplug_dev_info = {
+     .instance_size = sizeof(VFIOPCIDevice),
+     .class_init = vfio_pci_nohotplug_dev_class_init,
+ };
++#endif
+ 
+ static void register_vfio_pci_dev_type(void)
+ {
+     type_register_static(&vfio_pci_dev_info);
++
++#if 0 /* Disabled for Red Hat Enterprise Linux */
+     type_register_static(&vfio_pci_nohotplug_dev_info);
++#endif
+ }
+ 
+ type_init(register_vfio_pci_dev_type)
 diff --git a/hw/virtio/virtio-pci.c b/hw/virtio/virtio-pci.c
 index a954799..9a987cb 100644
 --- a/hw/virtio/virtio-pci.c
@@ -740,7 +804,7 @@ index a954799..9a987cb 100644
  #endif
  #ifdef CONFIG_VHOST_VSOCK
 diff --git a/qemu-options.hx b/qemu-options.hx
-index f7df472..cd2b25b 100644
+index 269eda7..5e13aa9 100644
 --- a/qemu-options.hx
 +++ b/qemu-options.hx
 @@ -1741,11 +1741,6 @@ ETEXI
@@ -755,6 +819,22 @@ index f7df472..cd2b25b 100644
  
  DEF("acpitable", HAS_ARG, QEMU_OPTION_acpitable,
      "-acpitable [sig=str][,rev=n][,oem_id=str][,oem_table_id=str][,oem_rev=n][,asl_compiler_id=str][,asl_compiler_rev=n][,{data|file}=file1[:file2]...]\n"
+@@ -2749,6 +2744,7 @@ STEXI
+ ETEXI
+ DEFHEADING()
+ 
++#if 0
+ DEFHEADING(Bluetooth(R) options:)
+ STEXI
+ @table @option
+@@ -2827,6 +2823,7 @@ STEXI
+ @end table
+ ETEXI
+ DEFHEADING()
++#endif
+ 
+ #ifdef CONFIG_TPM
+ DEFHEADING(TPM device options:)
 diff --git a/stubs/Makefile.objs b/stubs/Makefile.objs
 index 5dd0aee..f27250e 100644
 --- a/stubs/Makefile.objs
@@ -959,10 +1039,10 @@ index 2ebf26a..3a0337a 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 fa25d1a..39d152a 100644
+index a5ae5f2..22bd99c 100644
 --- a/vl.c
 +++ b/vl.c
-@@ -171,7 +171,7 @@ unsigned int max_cpus;
+@@ -172,7 +172,7 @@ unsigned int max_cpus;
  int smp_cores = 1;
  int smp_threads = 1;
  int acpi_enabled = 1;
@@ -971,6 +1051,50 @@ index fa25d1a..39d152a 100644
  int fd_bootchk = 1;
  static int no_reboot;
  int no_shutdown = 0;
+@@ -937,6 +937,7 @@ static void configure_rtc(QemuOpts *opts)
+     }
+ }
+ 
++#if 0 // Disabled for Red Hat Enterprise Linux
+ /***********************************************************/
+ /* Bluetooth support */
+ static int nb_hcis;
+@@ -1058,6 +1059,7 @@ static int bt_parse(const char *opt)
+     error_report("bad bluetooth parameter '%s'", opt);
+     return 1;
+ }
++#endif
+ 
+ static int parse_name(void *opaque, QemuOpts *opts, Error **errp)
+ {
+@@ -3273,6 +3275,7 @@ int main(int argc, char **argv, char **envp)
+                 }
+                 break;
+ #endif
++#if 0 /* Disabled for Red Hat Enterprise Linux */
+             case QEMU_OPTION_bt:
+                 warn_report("The bluetooth subsystem is deprecated and will "
+                             "be removed soon. If the bluetooth subsystem is "
+@@ -3280,6 +3283,7 @@ int main(int argc, char **argv, char **envp)
+                             "qemu-devel@nongnu.org with your usecase.");
+                 add_device_config(DEV_BT, optarg);
+                 break;
++#endif
+             case QEMU_OPTION_audio_help:
+                 AUD_help ();
+                 exit (0);
+@@ -4417,9 +4421,11 @@ int main(int argc, char **argv, char **envp)
+ 
+     tpm_init();
+ 
++#if 0 // Disabled for Red Hat Enterprise Linux
+     /* init the bluetooth world */
+     if (foreach_device_config(DEV_BT, bt_parse))
+         exit(1);
++#endif
+ 
+     if (!xen_enabled()) {
+         /* On 32-bit hosts, QEMU is limited by virtual address space */
 -- 
 1.8.3.1
 

0006-Machine-type-related-general-changes.patch

@@ -1,4 +1,4 @@
-From c59789ec7d5213bda9aeb48aacef2e3e897fdf7e Mon Sep 17 00:00:00 2001
+From 01e49fb467fd831c62f3640e546e313298a7c5c0 Mon Sep 17 00:00:00 2001
 From: Miroslav Rezanina <mrezanin@redhat.com>
 Date: Fri, 19 Oct 2018 12:36:59 +0200
 Subject: Machine type related general changes
@@ -12,7 +12,6 @@ Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
  hw/acpi/ich9.c                    |  16 +++
  hw/acpi/piix4.c                   |   6 +-
  hw/char/serial.c                  |  16 +++
- hw/display/cirrus_vga_isa.c       |   2 +-
  hw/display/vga-isa.c              |   2 +-
  hw/net/e1000.c                    |  18 ++-
  hw/net/e1000e.c                   |  21 ++++
@@ -30,7 +29,7 @@ Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
  migration/migration.h             |   5 +
  qdev-monitor.c                    |   1 -
  scripts/vmstate-static-checker.py |   1 -
- 21 files changed, 354 insertions(+), 11 deletions(-)
+ 20 files changed, 353 insertions(+), 10 deletions(-)
 
 diff --git a/hw/acpi/ich9.c b/hw/acpi/ich9.c
 index a4e87b8..23a7baa 100644
@@ -145,19 +144,6 @@ index 02463e3..a591387 100644
      return s->poll_msl >= 0;
  }
  
-diff --git a/hw/display/cirrus_vga_isa.c b/hw/display/cirrus_vga_isa.c
-index 1cb607d..22678a3 100644
---- a/hw/display/cirrus_vga_isa.c
-+++ b/hw/display/cirrus_vga_isa.c
-@@ -67,7 +67,7 @@ static void isa_cirrus_vga_realizefn(DeviceState *dev, Error **errp)
- 
- static Property isa_cirrus_vga_properties[] = {
-     DEFINE_PROP_UINT32("vgamem_mb", struct ISACirrusVGAState,
--                       cirrus_vga.vga.vram_size_mb, 4),
-+                       cirrus_vga.vga.vram_size_mb, 16),
-     DEFINE_PROP_BOOL("blitter", struct ISACirrusVGAState,
-                      cirrus_vga.enable_blitter, true),
-     DEFINE_PROP_END_OF_LIST(),
 diff --git a/hw/display/vga-isa.c b/hw/display/vga-isa.c
 index fa44242..7835c83 100644
 --- a/hw/display/vga-isa.c
@@ -707,7 +693,7 @@ index a5080ad..b943ec9 100644
 +
  #endif
 diff --git a/migration/migration.c b/migration/migration.c
-index b261c1e..fb425b5 100644
+index 49ffb99..0d9cb7a 100644
 --- a/migration/migration.c
 +++ b/migration/migration.c
 @@ -105,6 +105,8 @@ enum mig_rp_message_type {

0007-Add-aarch64-machine-types.patch

@@ -1,4 +1,4 @@
-From 6df04926524e1a9f1178b53bf2b7b8978a6d5935 Mon Sep 17 00:00:00 2001
+From 68e46b1a3bc650bc35ccc49606c3f31e29165512 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
@@ -12,7 +12,7 @@ Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
  2 files changed, 147 insertions(+), 1 deletion(-)
 
 diff --git a/hw/arm/virt.c b/hw/arm/virt.c
-index a2b8d8f..703f0dd 100644
+index f69e7eb..84a86c1 100644
 --- a/hw/arm/virt.c
 +++ b/hw/arm/virt.c
 @@ -60,6 +60,7 @@
@@ -61,7 +61,7 @@ index a2b8d8f..703f0dd 100644
  
  /* Number of external interrupt lines to configure the GIC with */
  #define NUM_IRQS 256
-@@ -1577,6 +1607,7 @@ static void machvirt_init(MachineState *machine)
+@@ -1578,6 +1608,7 @@ static void machvirt_init(MachineState *machine)
      qemu_add_machine_init_done_notifier(&vms->machine_done);
  }
  
@@ -69,7 +69,7 @@ index a2b8d8f..703f0dd 100644
  static bool virt_get_secure(Object *obj, Error **errp)
  {
      VirtMachineState *vms = VIRT_MACHINE(obj);
-@@ -1605,6 +1636,7 @@ static void virt_set_virt(Object *obj, bool value, Error **errp)
+@@ -1606,6 +1637,7 @@ static void virt_set_virt(Object *obj, bool value, Error **errp)
      vms->virt = value;
  }
  
@@ -77,7 +77,7 @@ index a2b8d8f..703f0dd 100644
  static bool virt_get_highmem(Object *obj, Error **errp)
  {
      VirtMachineState *vms = VIRT_MACHINE(obj);
-@@ -1659,6 +1691,7 @@ static void virt_set_gic_version(Object *obj, const char *value, Error **errp)
+@@ -1660,6 +1692,7 @@ static void virt_set_gic_version(Object *obj, const char *value, Error **errp)
      }
  }
  
@@ -85,7 +85,7 @@ index a2b8d8f..703f0dd 100644
  static char *virt_get_iommu(Object *obj, Error **errp)
  {
      VirtMachineState *vms = VIRT_MACHINE(obj);
-@@ -1686,6 +1719,7 @@ static void virt_set_iommu(Object *obj, const char *value, Error **errp)
+@@ -1687,6 +1720,7 @@ static void virt_set_iommu(Object *obj, const char *value, Error **errp)
          error_append_hint(errp, "Valid values are none, smmuv3.\n");
      }
  }
@@ -93,7 +93,7 @@ index a2b8d8f..703f0dd 100644
  
  static CpuInstanceProperties
  virt_cpu_index_to_props(MachineState *ms, unsigned cpu_index)
-@@ -1725,6 +1759,7 @@ static const CPUArchIdList *virt_possible_cpu_arch_ids(MachineState *ms)
+@@ -1726,6 +1760,7 @@ static const CPUArchIdList *virt_possible_cpu_arch_ids(MachineState *ms)
      return ms->possible_cpus;
  }
  
@@ -101,7 +101,7 @@ index a2b8d8f..703f0dd 100644
  static void virt_machine_device_plug_cb(HotplugHandler *hotplug_dev,
                                          DeviceState *dev, Error **errp)
  {
-@@ -1889,6 +1924,9 @@ DEFINE_VIRT_MACHINE(3, 0)
+@@ -1890,6 +1925,9 @@ DEFINE_VIRT_MACHINE(3, 0)
  #define VIRT_COMPAT_2_12 \
      HW_COMPAT_2_12
  
@@ -111,7 +111,7 @@ index a2b8d8f..703f0dd 100644
  static void virt_2_12_instance_init(Object *obj)
  {
      virt_3_0_instance_init(obj);
-@@ -2016,3 +2054,89 @@ static void virt_machine_2_6_options(MachineClass *mc)
+@@ -2017,3 +2055,89 @@ static void virt_machine_2_6_options(MachineClass *mc)
      vmc->no_pmu = true;
  }
  DEFINE_VIRT_MACHINE(2, 6)

0008-Add-ppc64-machine-types.patch

@@ -1,4 +1,4 @@
-From 0f1a361c4bd8fc0874cc5d05e611fadb67524a1e Mon Sep 17 00:00:00 2001
+From 4f9094b11eb831317879d9c6108f6f706546fea5 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

0009-Add-s390x-machine-types.patch

@@ -1,4 +1,4 @@
-From a47c6d2b9d75dcb15810fcfedcddf5eadf0ec227 Mon Sep 17 00:00:00 2001
+From 07b2731f23166ca13bace5faacd35ab5129fb878 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

0010-Add-x86_64-machine-types.patch

@@ -1,4 +1,4 @@
-From edae60c4f30697c3c859cc9c88f80c0ed3dc0f0e Mon Sep 17 00:00:00 2001
+From a4f172dc05fc5b2fc28cd1a2121b70a3d4549ab2 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
@@ -6,15 +6,17 @@ Subject: Add x86_64 machine types
 Adding changes to add RHEL machine types for x86_64 architecture.
 
 Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
+
+Rebase notes (3.1.0):
+- Removed xsave changes
 ---
  hw/i386/acpi-build.c |   3 +
  hw/i386/pc.c         |   7 +-
- hw/i386/pc_piix.c     | 194 ++++++++++++++++-
+ hw/i386/pc_piix.c    | 191 ++++++++++++++++-
  hw/i386/pc_q35.c     |  93 ++++++++-
- include/hw/i386/pc.h  | 564 ++++++++++++++++++++++++++++++++++++++++++++++++++
+ include/hw/i386/pc.h | 564 +++++++++++++++++++++++++++++++++++++++++++++++++++
  target/i386/cpu.c    |   9 +-
- target/i386/machine.c |  21 ++
+ 6 files changed, 860 insertions(+), 7 deletions(-)
- 7 files changed, 884 insertions(+), 7 deletions(-)
 
 diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
 index 236a20e..3360da9 100644
@@ -63,7 +65,7 @@ index 567439e..a609332 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 7092d6d..83c22ae 100644
+index 7092d6d..af9eb8c 100644
 --- a/hw/i386/pc_piix.c
 +++ b/hw/i386/pc_piix.c
 @@ -50,6 +50,7 @@
@@ -93,20 +95,10 @@ index 7092d6d..83c22ae 100644
  static void pc_compat_2_3(MachineState *machine)
  {
      PCMachineState *pcms = PC_MACHINE(machine);
-@@ -433,6 +435,7 @@ static void pc_i440fx_3_1_machine_options(MachineClass *m)
+@@ -1157,3 +1159,188 @@ static void xenfv_machine_options(MachineClass *m)
-     pc_i440fx_machine_options(m);
-     m->alias = "pc";
-     m->is_default = 1;
-+    SET_MACHINE_COMPAT(m, PC_COMPAT_2_12);
- }
- 
- DEFINE_I440FX_MACHINE(v3_1, "pc-i440fx-3.1", NULL,
-@@ -1157,3 +1160,190 @@ static void xenfv_machine_options(MachineClass *m)
  DEFINE_PC_MACHINE(xenfv, "xenfv", pc_xen_hvm_init,
                    xenfv_machine_options);
  #endif
-+machine_init(pc_machine_init);
-+
 +#endif  /* Disabled for Red Hat Enterprise Linux */
 +
 +/* Red Hat Enterprise Linux machine types */
@@ -1025,45 +1017,6 @@ index e9b9183..573de14 100644
      { NULL, NULL },
  };
  
-diff --git a/target/i386/machine.c b/target/i386/machine.c
-index 225b5d4..c60e1b8 100644
---- a/target/i386/machine.c
-+++ b/target/i386/machine.c
-@@ -964,6 +964,26 @@ static const VMStateDescription vmstate_svm_npt = {
-     }
- };
- 
-+static bool vmstate_xsave_needed(void *opaque)
-+{
-+    /* The xsave state is already on the main "cpu" section */
-+    return false;
-+}
-+
-+static const VMStateDescription vmstate_xsave ={
-+    .name = "cpu/xsave",
-+    .version_id = 1,
-+    .minimum_version_id = 1,
-+    .minimum_version_id_old = 1,
-+    .needed = vmstate_xsave_needed,
-+    .fields      = (VMStateField []) {
-+        VMSTATE_UINT64_V(env.xcr0, X86CPU, 1),
-+        VMSTATE_UINT64_V(env.xstate_bv, X86CPU, 1),
-+        VMSTATE_YMMH_REGS_VARS(env.xmm_regs, X86CPU, CPU_NB_REGS, 1),
-+        VMSTATE_END_OF_LIST()
-+    }
-+};
-+
- VMStateDescription vmstate_x86_cpu = {
-     .name = "cpu",
-     .version_id = 12,
-@@ -1089,6 +1109,7 @@ VMStateDescription vmstate_x86_cpu = {
-         &vmstate_msr_intel_pt,
-         &vmstate_msr_virt_ssbd,
-         &vmstate_svm_npt,
-+        &vmstate_xsave,
-         NULL
-     }
- };
 -- 
 1.8.3.1
 

0011-Enable-make-check.patch

@@ -1,4 +1,4 @@
-From 51a0ce09fb01c87cb9bd7f1fca850e8d5d573f5f Mon Sep 17 00:00:00 2001
+From 5a614332800ab5367d0be248e665250fe92964ba 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
@@ -9,7 +9,7 @@ make check run during build.
 Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
 ---
  redhat/qemu-kvm.spec.template |  2 +-
- tests/Makefile.include        | 32 ++++++++++++++++----------------
+ tests/Makefile.include        | 20 ++++++++++----------
  tests/boot-serial-test.c      |  6 +++++-
  tests/cpu-plug-test.c         |  3 ++-
  tests/e1000-test.c            |  2 ++
@@ -18,10 +18,10 @@ Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
  tests/qemu-iotests/group      |  4 ++--
  tests/test-x86-cpuid-compat.c |  2 ++
  tests/usb-hcd-xhci-test.c     |  4 ++++
- 10 files changed, 42 insertions(+), 27 deletions(-)
+ 10 files changed, 36 insertions(+), 21 deletions(-)
 
 diff --git a/tests/Makefile.include b/tests/Makefile.include
-index 613242b..baeb608 100644
+index fb0b449..f2305a5 100644
 --- a/tests/Makefile.include
 +++ b/tests/Makefile.include
 @@ -171,20 +171,20 @@ check-qtest-pci-$(CONFIG_IPACK) += $(check-qtest-ipack-y)
@@ -80,44 +80,6 @@ index 613242b..baeb608 100644
  check-qtest-ppc64-$(CONFIG_RTL8139_PCI) += tests/test-filter-redirector$(EXESUF)
  check-qtest-ppc64-y += tests/display-vga-test$(EXESUF)
  check-qtest-ppc64-y += tests/numa-test$(EXESUF)
-@@ -685,15 +685,15 @@ tests/endianness-test$(EXESUF): tests/endianness-test.o
- tests/spapr-phb-test$(EXESUF): tests/spapr-phb-test.o $(libqos-obj-y)
- tests/prom-env-test$(EXESUF): tests/prom-env-test.o $(libqos-obj-y)
- tests/rtas-test$(EXESUF): tests/rtas-test.o $(libqos-spapr-obj-y)
--tests/fdc-test$(EXESUF): tests/fdc-test.o
-+#tests/fdc-test$(EXESUF): tests/fdc-test.o
- tests/ide-test$(EXESUF): tests/ide-test.o $(libqos-pc-obj-y)
- tests/ahci-test$(EXESUF): tests/ahci-test.o $(libqos-pc-obj-y)
--tests/ipmi-kcs-test$(EXESUF): tests/ipmi-kcs-test.o
--tests/ipmi-bt-test$(EXESUF): tests/ipmi-bt-test.o
-+#tests/ipmi-kcs-test$(EXESUF): tests/ipmi-kcs-test.o
-+#tests/ipmi-bt-test$(EXESUF): tests/ipmi-bt-test.o
- tests/hd-geo-test$(EXESUF): tests/hd-geo-test.o
- tests/boot-order-test$(EXESUF): tests/boot-order-test.o $(libqos-obj-y)
- tests/boot-serial-test$(EXESUF): tests/boot-serial-test.o $(libqos-obj-y)
--tests/bios-tables-test$(EXESUF): tests/bios-tables-test.o \
-+#tests/bios-tables-test$(EXESUF): tests/bios-tables-test.o \
- 	tests/boot-sector.o tests/acpi-utils.o $(libqos-obj-y)
- tests/pxe-test$(EXESUF): tests/pxe-test.o tests/boot-sector.o $(libqos-obj-y)
- tests/tmp105-test$(EXESUF): tests/tmp105-test.o $(libqos-omap-obj-y)
-@@ -707,7 +707,7 @@ tests/e1000-test$(EXESUF): tests/e1000-test.o
- tests/e1000e-test$(EXESUF): tests/e1000e-test.o $(libqos-pc-obj-y)
- tests/rtl8139-test$(EXESUF): tests/rtl8139-test.o $(libqos-pc-obj-y)
- tests/pcnet-test$(EXESUF): tests/pcnet-test.o
--tests/pnv-xscom-test$(EXESUF): tests/pnv-xscom-test.o
-+#tests/pnv-xscom-test$(EXESUF): tests/pnv-xscom-test.o
- tests/eepro100-test$(EXESUF): tests/eepro100-test.o
- tests/vmxnet3-test$(EXESUF): tests/vmxnet3-test.o
- tests/ne2000-test$(EXESUF): tests/ne2000-test.o
-@@ -755,7 +755,7 @@ tests/test-filter-mirror$(EXESUF): tests/test-filter-mirror.o $(qtest-obj-y)
- tests/test-filter-redirector$(EXESUF): tests/test-filter-redirector.o $(qtest-obj-y)
- tests/test-x86-cpuid-compat$(EXESUF): tests/test-x86-cpuid-compat.o $(qtest-obj-y)
- tests/ivshmem-test$(EXESUF): tests/ivshmem-test.o contrib/ivshmem-server/ivshmem-server.o $(libqos-pc-obj-y) $(libqos-spapr-obj-y)
--tests/megasas-test$(EXESUF): tests/megasas-test.o $(libqos-spapr-obj-y) $(libqos-pc-obj-y)
-+#tests/megasas-test$(EXESUF): tests/megasas-test.o $(libqos-spapr-obj-y) $(libqos-pc-obj-y)
- tests/vhost-user-bridge$(EXESUF): tests/vhost-user-bridge.o $(test-util-obj-y) libvhost-user.a
- tests/test-uuid$(EXESUF): tests/test-uuid.o $(test-util-obj-y)
- tests/test-arm-mptimer$(EXESUF): tests/test-arm-mptimer.o
 diff --git a/tests/boot-serial-test.c b/tests/boot-serial-test.c
 index 8ec6aed..6a533b9 100644
 --- a/tests/boot-serial-test.c
@@ -222,7 +184,7 @@ index 32741d7..85ef52e 100755
       *)
          ;;
 diff --git a/tests/qemu-iotests/group b/tests/qemu-iotests/group
-index 2722103..ede8887 100644
+index 61a6d98..05996ae 100644
 --- a/tests/qemu-iotests/group
 +++ b/tests/qemu-iotests/group
 @@ -77,7 +77,7 @@

0012-Use-kvm-by-default.patch

@@ -1,4 +1,4 @@
-From b91ee13e30cef65d02e3e0f9324931f1e2589426 Mon Sep 17 00:00:00 2001
+From 445df6a548c20d21c3275d91bcd96c6b0fde9c97 Mon Sep 17 00:00:00 2001
 From: Miroslav Rezanina <mrezanin@redhat.com>
 Date: Thu, 18 Dec 2014 06:27:49 +0100
 Subject: Use kvm by default

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

@@ -1,4 +1,4 @@
-From 3094b4ac400f54f26b837226f44fc0a18f0726e6 Mon Sep 17 00:00:00 2001
+From 0b8b44ec1fc3a0d17f13c07ac4c7351769a63300 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
@@ -37,7 +37,7 @@ Merged patches (2.9.0):
  1 file changed, 14 insertions(+), 1 deletion(-)
 
 diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c
-index 5c7bd96..598f771 100644
+index 6e0000c..d242c62 100644
 --- a/hw/vfio/pci.c
 +++ b/hw/vfio/pci.c
 @@ -36,6 +36,7 @@

0014-Add-support-statement-to-help-output.patch

@@ -1,4 +1,4 @@
-From 2bfcbb3ece3cda4cf977cb3983df84830bde90a3 Mon Sep 17 00:00:00 2001
+From f06750384e9e241c7cc6f14b6fdedea3c4237790 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
@@ -23,7 +23,7 @@ Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
  1 file changed, 9 insertions(+)
 
 diff --git a/vl.c b/vl.c
-index 39d152a..db628b8 100644
+index 22bd99c..74b32c4 100644
 --- a/vl.c
 +++ b/vl.c
 @@ -1904,9 +1904,17 @@ static void version(void)

0015-globally-limit-the-maximum-number-of-CPUs.patch

@@ -1,4 +1,4 @@
-From c214bfc318a3128dc92fe5017ca0dd54fc50ffed Mon Sep 17 00:00:00 2001
+From b64599f8f72d89ac75557608f1890abb8effb88b 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
@@ -106,10 +106,10 @@ index 4880a05..a8f5d47 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 db628b8..7b0f19a 100644
+index 74b32c4..0a9bdc2 100644
 --- a/vl.c
 +++ b/vl.c
-@@ -133,6 +133,8 @@ int main(int argc, char **argv)
+@@ -134,6 +134,8 @@ int main(int argc, char **argv)
  
  #define MAX_VIRTIO_CONSOLES 1
  
@@ -118,7 +118,7 @@ index db628b8..7b0f19a 100644
  static const char *data_dir[16];
  static int data_dir_idx;
  const char *bios_name = NULL;
-@@ -1460,6 +1462,20 @@ MachineClass *find_default_machine(void)
+@@ -1463,6 +1465,20 @@ MachineClass *find_default_machine(void)
      return mc;
  }
  
@@ -139,7 +139,7 @@ index db628b8..7b0f19a 100644
  MachineInfoList *qmp_query_machines(Error **errp)
  {
      GSList *el, *machines = object_class_get_list(TYPE_MACHINE, false);
-@@ -4012,6 +4028,8 @@ int main(int argc, char **argv, char **envp)
+@@ -4021,6 +4037,8 @@ int main(int argc, char **argv, char **envp)
                       "mutually exclusive");
          exit(EXIT_FAILURE);
      }

0016-Add-support-for-simpletrace.patch

@@ -1,4 +1,4 @@
-From 30887ffc7e908ebed5381c08181cd6a2a6bc5e98 Mon Sep 17 00:00:00 2001
+From 490f864563ddcb367e6cf58d1be4a9cbed3a5e2b 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

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

@@ -1,6 +1,6 @@
-From d0656d8b2e0de42d04c224db36fe9c1ec015a9cc Mon Sep 17 00:00:00 2001
+From 081800f80d82ce8d71a1075b3d888f2e298ad183 Mon Sep 17 00:00:00 2001
 From: Miroslav Rezanina <mrezanin@redhat.com>
-Date: Fri, 14 Nov 2014 08:51:50 +0100
+Date: Fri, 30 Nov 2018 09:11:03 +0100
 Subject: Use qemu-kvm in documentation instead of qemu-system-<arch>
 
 Patchwork-id: 62380
@@ -17,89 +17,12 @@ to reflect this change. Only architectures available in RHEL are updated.
 
 Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
 ---
- docs/COLO-FT.txt             |   4 +-
- docs/can.txt                 |   8 +--
- docs/pr-manager.rst          |   4 +-
  docs/qemu-block-drivers.texi |  70 +++++++++++-----------
  docs/qemu-cpu-models.texi    |   8 +--
- docs/replay.txt              |   4 +-
- docs/specs/tpm.txt           |   8 +--
  qemu-doc.texi                |  70 +++++++++++-----------
  qemu-options.hx              | 140 ++++++++++++++++++++++---------------------
- 9 files changed, 160 insertions(+), 156 deletions(-)
+ 4 files changed, 146 insertions(+), 142 deletions(-)
 
-diff --git a/docs/COLO-FT.txt b/docs/COLO-FT.txt
-index e2686bb..8c48f86 100644
---- a/docs/COLO-FT.txt
-+++ b/docs/COLO-FT.txt
-@@ -147,7 +147,7 @@ in test procedure.
- == Test procedure ==
- 1. Startup qemu
- Primary:
--# qemu-system-x86_64 -accel kvm -m 2048 -smp 2 -qmp stdio -name primary \
-+# qemu-kvm -accel kvm -m 2048 -smp 2 -qmp stdio -name primary \
-   -device piix3-usb-uhci -vnc :7 \
-   -device usb-tablet -netdev tap,id=hn0,vhost=off \
-   -device virtio-net-pci,id=net-pci0,netdev=hn0 \
-@@ -155,7 +155,7 @@ Primary:
-          children.0.file.filename=1.raw,\
-          children.0.driver=raw -S
- Secondary:
--# qemu-system-x86_64 -accel kvm -m 2048 -smp 2 -qmp stdio -name secondary \
-+# qemu-kvm -accel kvm -m 2048 -smp 2 -qmp stdio -name secondary \
-   -device piix3-usb-uhci -vnc :7 \
-   -device usb-tablet -netdev tap,id=hn0,vhost=off \
-   -device virtio-net-pci,id=net-pci0,netdev=hn0 \
-diff --git a/docs/can.txt b/docs/can.txt
-index 7ba23b2..4ae5690 100644
---- a/docs/can.txt
-+++ b/docs/can.txt
-@@ -50,9 +50,9 @@ CAN boards can be selected
- The ''kvaser_pci'' board/device model is compatible with and has been tested with
- ''kvaser_pci'' driver included in mainline Linux kernel.
- The tested setup was Linux 4.9 kernel on the host and guest side.
--Example for qemu-system-x86_64:
-+Example for qemu-kvm (intel architecture):
- 
--    qemu-system-x86_64 -accel kvm -kernel /boot/vmlinuz-4.9.0-4-amd64 \
-+    qemu-kvm -accel kvm -kernel /boot/vmlinuz-4.9.0-4-amd64 \
-       -initrd ramdisk.cpio \
-       -virtfs local,path=shareddir,security_model=none,mount_tag=shareddir \
-       -object can-bus,id=canbus0 \
-@@ -60,9 +60,9 @@ Example for qemu-system-x86_64:
-       -device kvaser_pci,canbus=canbus0 \
-       -nographic -append "console=ttyS0"
- 
--Example for qemu-system-arm:
-+Example for qemu-kvm (arm architecture):
- 
--    qemu-system-arm -cpu arm1176 -m 256 -M versatilepb \
-+    qemu-kvm -cpu arm1176 -m 256 -M versatilepb \
-       -kernel kernel-qemu-arm1176-versatilepb \
-       -hda rpi-wheezy-overlay \
-       -append "console=ttyAMA0 root=/dev/sda2 ro init=/sbin/init-overlay" \
-diff --git a/docs/pr-manager.rst b/docs/pr-manager.rst
-index 9b1de19..45cb8be 100644
---- a/docs/pr-manager.rst
-+++ b/docs/pr-manager.rst
-@@ -36,7 +36,7 @@ accepts the path to the helper program's Unix socket.  For example,
- the following command line defines a ``pr-manager-helper`` object and
- attaches it to a SCSI passthrough device::
- 
--      $ qemu-system-x86_64
-+      $ qemu-kvm
-           -device virtio-scsi \
-           -object pr-manager-helper,id=helper0,path=/var/run/qemu-pr-helper.sock
-           -drive if=none,id=hd,driver=raw,file.filename=/dev/sdb,file.pr-manager=helper0
-@@ -44,7 +44,7 @@ attaches it to a SCSI passthrough device::
- 
- Alternatively, using ``-blockdev``::
- 
--      $ qemu-system-x86_64
-+      $ qemu-kvm
-           -device virtio-scsi \
-           -object pr-manager-helper,id=helper0,path=/var/run/qemu-pr-helper.sock
-           -blockdev node-name=hd,driver=raw,file.driver=host_device,file.filename=/dev/sdb,file.pr-manager=helper0
 diff --git a/docs/qemu-block-drivers.texi b/docs/qemu-block-drivers.texi
 index 38e9f34..2e71ec9 100644
 --- a/docs/qemu-block-drivers.texi
@@ -345,68 +268,6 @@ index 1935f98..93672de 100644
  @end example
  
  @end table
-diff --git a/docs/replay.txt b/docs/replay.txt
-index 3497585..8d67ea7 100644
---- a/docs/replay.txt
-+++ b/docs/replay.txt
-@@ -25,7 +25,7 @@ Deterministic replay has the following features:
- 
- Usage of the record/replay:
-  * First, record the execution with the following command line:
--    qemu-system-i386 \
-+    qemu-kvm \
-      -icount shift=7,rr=record,rrfile=replay.bin \
-      -drive file=disk.qcow2,if=none,id=img-direct \
-      -drive driver=blkreplay,if=none,image=img-direct,id=img-blkreplay \
-@@ -33,7 +33,7 @@ Usage of the record/replay:
-      -netdev user,id=net1 -device rtl8139,netdev=net1 \
-      -object filter-replay,id=replay,netdev=net1
-  * After recording, you can replay it by using another command line:
--    qemu-system-i386 \
-+    qemu-kvm \
-      -icount shift=7,rr=replay,rrfile=replay.bin \
-      -drive file=disk.qcow2,if=none,id=img-direct \
-      -drive driver=blkreplay,if=none,image=img-direct,id=img-blkreplay \
-diff --git a/docs/specs/tpm.txt b/docs/specs/tpm.txt
-index 1af82bb..b2741ac 100644
---- a/docs/specs/tpm.txt
-+++ b/docs/specs/tpm.txt
-@@ -113,7 +113,7 @@ QEMU files related to the TPM passthrough device:
- Command line to start QEMU with the TPM passthrough device using the host's
- hardware TPM /dev/tpm0:
- 
--qemu-system-x86_64 -display sdl -accel kvm \
-+qemu-kvm -display vnc -accel kvm \
-   -m 1024 -boot d -bios bios-256k.bin -boot menu=on \
-   -tpmdev passthrough,id=tpm0,path=/dev/tpm0 \
-   -device tpm-tis,tpmdev=tpm0 test.img
-@@ -179,7 +179,7 @@ swtpm socket --tpmstate dir=/tmp/mytpm1 \
- Command line to start QEMU with the TPM emulator device communicating with
- the swtpm:
- 
--qemu-system-x86_64 -display sdl -accel kvm \
-+qemu-kvm -display vnc -accel kvm \
-   -m 1024 -boot d -bios bios-256k.bin -boot menu=on \
-   -chardev socket,id=chrtpm,path=/tmp/mytpm1/swtpm-sock \
-   -tpmdev emulator,id=tpm0,chardev=chrtpm \
-@@ -237,7 +237,7 @@ swtpm socket --tpmstate dir=/tmp/mytpm1 \
- 
- In a 2nd terminal start the VM:
- 
--qemu-system-x86_64 -display sdl -accel kvm \
-+qemu-kvm -display sdl -accel kvm \
-   -m 1024 -boot d -bios bios-256k.bin -boot menu=on \
-   -chardev socket,id=chrtpm,path=/tmp/mytpm1/swtpm-sock \
-   -tpmdev emulator,id=tpm0,chardev=chrtpm \
-@@ -270,7 +270,7 @@ swtpm socket --tpmstate dir=/tmp/mytpm1 \
- In the 2nd terminal restore the state of the VM using the additional
- '-incoming' option.
- 
--qemu-system-x86_64 -display sdl -accel kvm \
-+qemu-kvm -display sdl -accel kvm \
-   -m 1024 -boot d -bios bios-256k.bin -boot menu=on \
-   -chardev socket,id=chrtpm,path=/tmp/mytpm1/swtpm-sock \
-   -tpmdev emulator,id=tpm0,chardev=chrtpm \
 diff --git a/qemu-doc.texi b/qemu-doc.texi
 index f7ad1df..0e4b34a 100644
 --- a/qemu-doc.texi
@@ -700,7 +561,7 @@ index f7ad1df..0e4b34a 100644
   -prom-env 'boot-args=conf=hd:2,\yaboot.conf'
  @end example
 diff --git a/qemu-options.hx b/qemu-options.hx
-index cd2b25b..a65c63b 100644
+index 5e13aa9..2a60e51 100644
 --- a/qemu-options.hx
 +++ b/qemu-options.hx
 @@ -253,7 +253,7 @@ This option defines a free-form string that can be used to describe @var{fd}.
@@ -1037,7 +898,7 @@ index cd2b25b..a65c63b 100644
  @end example
  
  @item -netdev hubport,id=@var{id},hubid=@var{hubid}[,netdev=@var{nd}]
-@@ -2804,7 +2808,7 @@ and communicate.  Requires the Linux @code{vhci} driver installed.  Can
+@@ -2805,7 +2809,7 @@ and communicate.  Requires the Linux @code{vhci} driver installed.  Can
  be used as following:
  
  @example
@@ -1046,7 +907,7 @@ index cd2b25b..a65c63b 100644
  @end example
  
  @item -bt device:@var{dev}[,vlan=@var{n}]
-@@ -3253,14 +3257,14 @@ ETEXI
+@@ -3255,14 +3259,14 @@ ETEXI
  
  DEF("realtime", HAS_ARG, QEMU_OPTION_realtime,
      "-realtime [mlock=on|off]\n"
@@ -1064,7 +925,7 @@ index cd2b25b..a65c63b 100644
  (enabled by default).
  ETEXI
  
-@@ -3298,7 +3302,7 @@ connections will likely be TCP-based, but also UDP, pseudo TTY, or even
+@@ -3300,7 +3304,7 @@ connections will likely be TCP-based, but also UDP, pseudo TTY, or even
  stdio are reasonable use case. The latter is allowing to start QEMU from
  within gdb and establish the connection via a pipe:
  @example
@@ -1073,7 +934,7 @@ index cd2b25b..a65c63b 100644
  @end example
  ETEXI
  
-@@ -4247,7 +4251,7 @@ which specify the queue number of cryptodev backend, the default of
+@@ -4251,7 +4255,7 @@ which specify the queue number of cryptodev backend, the default of
  
  @example
  
@@ -1082,7 +943,7 @@ index cd2b25b..a65c63b 100644
     [...] \
         -object cryptodev-backend-builtin,id=cryptodev0 \
         -device virtio-crypto-pci,id=crypto0,cryptodev=cryptodev0 \
-@@ -4267,7 +4271,7 @@ of cryptodev backend for multiqueue vhost-user, the default of @var{queues} is 1
+@@ -4271,7 +4275,7 @@ of cryptodev backend for multiqueue vhost-user, the default of @var{queues} is 1
  
  @example
  

0018-usb-xhci-Fix-PCI-capability-order.patch

@@ -1,4 +1,4 @@
-From 0c8a71a5751106013f9ecfdc20f308cc1e44045b Mon Sep 17 00:00:00 2001
+From a3d01620dcbc301493f6704265edddf78f6bfe1b 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

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

@@ -1,4 +1,4 @@
-From 7d316f7aebb9634c3ac5b79f5b1198e27726a0fd Mon Sep 17 00:00:00 2001
+From 19f1b23aa923eab88c3fdda7b7fdc157c313e4eb 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]

qemu-kvm.spec

@@ -7,11 +7,8 @@
 %global have_fdt      0
 %global have_gluster  1
 %global have_kvm_setup 0
-%global have_seccomp 1
 %global have_memlock_limits 0
 %global have_vxhs     0
-%global have_vhost_user 1
-%global have_tcmalloc 0
 
 %ifnarch %{ix86} x86_64
     %global have_usbredir 0
@@ -64,15 +61,14 @@ Requires: %{name}-block-rbd = %{epoch}:%{version}-%{release}     \
 Requires: %{name}-block-ssh = %{epoch}:%{version}-%{release}
 
 # Macro to properly setup RHEL/RHEV conflict handling
-%define rhel_rhev_conflicts()                                          \
+%define rhev_ma_conflicts()                                      \
-Conflicts: %1-ma                                                       \
+Obsoletes: %1-ma                                                 \
-Conflicts: %1-rhev                                                     \
+Obsoletes: %1-rhev
-Provides: %1-rhel = %{epoch}:%{version}-%{release}
 
 Summary: QEMU is a machine emulator and virtualizer
 Name: qemu-kvm
 Version: 3.1.0
-Release: 0%{?dist}.next.candidate
+Release: 1%{?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
@@ -81,11 +77,6 @@ URL: http://www.qemu.org/
 ExclusiveArch: x86_64 %{power64} aarch64 s390x
 
 
-# OOM killer breaks builds with parallel make on s390x
-%ifarch s390x
-    %define _smp_mflags %{nil}
-%endif
-
 Source0: http://wiki.qemu.org/download/qemu-3.1.0.tar.xz
 
 # KSM control scripts
@@ -113,24 +104,22 @@ Source34: 81-kvm-rhel.rules
 Source35: udev-kvm-check.c
 
 
-
+Patch0004: 0004-Initial-redhat-build.patch
-Patch0001: 0001-migration-colo.c-Fix-compilation-issue-when-disable-.patch
+Patch0005: 0005-Enable-disable-devices-for-RHEL.patch
-Patch0005: 0005-Initial-redhat-build.patch
+Patch0006: 0006-Machine-type-related-general-changes.patch
-Patch0006: 0006-Enable-disable-devices-for-RHEL.patch
+Patch0007: 0007-Add-aarch64-machine-types.patch
-Patch0007: 0007-Machine-type-related-general-changes.patch
+Patch0008: 0008-Add-ppc64-machine-types.patch
-Patch0008: 0008-Add-aarch64-machine-types.patch
+Patch0009: 0009-Add-s390x-machine-types.patch
-Patch0009: 0009-Add-ppc64-machine-types.patch
+Patch0010: 0010-Add-x86_64-machine-types.patch
-Patch0010: 0010-Add-s390x-machine-types.patch
+Patch0011: 0011-Enable-make-check.patch
-Patch0011: 0011-Add-x86_64-machine-types.patch
+Patch0012: 0012-Use-kvm-by-default.patch
-Patch0012: 0012-Enable-make-check.patch
+Patch0013: 0013-vfio-cap-number-of-devices-that-can-be-assigned.patch
-Patch0013: 0013-Use-kvm-by-default.patch
+Patch0014: 0014-Add-support-statement-to-help-output.patch
-Patch0014: 0014-vfio-cap-number-of-devices-that-can-be-assigned.patch
+Patch0015: 0015-globally-limit-the-maximum-number-of-CPUs.patch
-Patch0015: 0015-Add-support-statement-to-help-output.patch
+Patch0016: 0016-Add-support-for-simpletrace.patch
-Patch0016: 0016-globally-limit-the-maximum-number-of-CPUs.patch
+Patch0017: 0017-Use-qemu-kvm-in-documentation-instead-of-qemu-system.patch
-Patch0017: 0017-Add-support-for-simpletrace.patch
+Patch0018: 0018-usb-xhci-Fix-PCI-capability-order.patch
-Patch0018: 0018-Use-qemu-kvm-in-documentation-instead-of-qemu-system.patch
+Patch0019: 0019-virtio-scsi-Reject-scsi-cd-if-data-plane-enabled-RHE.patch
-Patch0019: 0019-usb-xhci-Fix-PCI-capability-order.patch
-Patch0020: 0020-virtio-scsi-Reject-scsi-cd-if-data-plane-enabled-RHE.patch
 
 BuildRequires: zlib-devel
 BuildRequires: glib2-devel
@@ -157,9 +146,7 @@ BuildRequires: libcacard-devel
 # For smartcard NSS support
 BuildRequires: nss-devel
 %endif
-%if %{have_seccomp}
 BuildRequires: libseccomp-devel >= 2.3.0
-%endif
 # For network block driver
 BuildRequires: libcurl-devel
 BuildRequires: libssh2-devel
@@ -236,8 +223,7 @@ Requires:      mesa-dri-drivers
 %endif
 
 Requires: qemu-kvm-core = %{epoch}:%{version}-%{release}
-Conflicts: qemu-kvm-ma
+%rhev_ma_conflicts qemu-kvm
-Conflicts: qemu-kvm-rhev
 
 %{requires_all_modules}
 
@@ -265,9 +251,7 @@ Requires: ipxe-roms-qemu >= 20170123-1
 Requires: SLOF >= %{SLOF_gittagdate}-1.git%{SLOF_gittagcommit}
 %endif
 Requires: %{name}-common = %{epoch}:%{version}-%{release}
-%if %{have_seccomp}
 Requires: libseccomp >= 2.3.0
-%endif
 # For compressed guest memory dumps
 Requires: lzo snappy
 %if %{have_gluster}
@@ -284,7 +268,7 @@ Requires: libusbx >= 1.0.19
 Requires: usbredir >= 0.7.1
 %endif
 
-%rhel_rhev_conflicts qemu-kvm
+%rhev_ma_conflicts qemu-kvm
 
 %description -n qemu-kvm-core
 qemu-kvm is an open source virtualizer that provides hardware
@@ -297,7 +281,7 @@ hardware for a full system such as a PC and its associated peripherals.
 Summary: QEMU command line tool for manipulating disk images
 Group: Development/Tools
 
-%rhel_rhev_conflicts qemu-img
+%rhev_ma_conflicts qemu-img
 
 %description -n qemu-img
 This package provides a command line tool for manipulating disk images.
@@ -312,7 +296,7 @@ Requires(post): systemd-units
 Requires(preun): systemd-units
 Requires(postun): systemd-units
 
-%rhel_rhev_conflicts qemu-kvm-common
+%rhev_ma_conflicts qemu-kvm-common
 
 %description -n qemu-kvm-common
 qemu-kvm is an open source virtualizer that provides hardware emulation for
@@ -327,11 +311,6 @@ Requires(post): systemd-units
 Requires(preun): systemd-units
 Requires(postun): systemd-units
 
-# OOM killer breaks builds with parallel make on s390x
-%ifarch s390x
-    %define _smp_mflags %{nil}
-%endif
-
 %description -n qemu-guest-agent
 qemu-kvm is an open source virtualizer that provides hardware emulation for
 the KVM hypervisor.
@@ -397,25 +376,8 @@ the Secure Shell (SSH) protocol.
 
 
 %prep
-%setup -q -n qemu-%{version}
+%setup -n qemu-%{version}
-
+%autopatch -p1
-%patch0001 -p1
-%patch0005 -p1
-%patch0006 -p1
-%patch0007 -p1
-%patch0008 -p1
-%patch0009 -p1
-%patch0010 -p1
-%patch0011 -p1
-%patch0012 -p1
-%patch0013 -p1
-%patch0014 -p1
-%patch0015 -p1
-%patch0016 -p1
-%patch0017 -p1
-%patch0018 -p1
-%patch0019 -p1
-%patch0020 -p1
 
 %build
 %global buildarch %{kvm_target}-softmmu
@@ -467,11 +429,8 @@ buildldflags="VL_LDFLAGS=-Wl,--build-id"
 %else
   --disable-rdma \
 %endif
-%if 0%{have_seccomp}
+  --disable-pvrdma \
   --enable-seccomp \
-%else
-  --disable-seccomp \
-%endif
 %if 0%{have_spice}
   --enable-spice \
   --enable-smartcard \
@@ -489,20 +448,17 @@ buildldflags="VL_LDFLAGS=-Wl,--build-id"
 %else
   --disable-usb-redir \
 %endif
-%if 0%{have_tcmalloc}
-  --enable-tcmalloc \
-%else
   --disable-tcmalloc \
-%endif
 %if 0%{have_vxhs}
   --enable-vxhs \
 %else
   --disable-vxhs \
 %endif
-%if 0%{have_vhost_user}
   --enable-vhost-user \
+%ifarch %{ix86} x86_64
+  --enable-avx2 \
 %else
-  --disable-vhost-user \
+  --disable-avx2 \
 %endif
   --python=%{__python3} \
   --target-list="%{buildarch}" \
@@ -582,8 +538,16 @@ buildldflags="VL_LDFLAGS=-Wl,--build-id"
   --enable-capstone \
   --disable-git-update \
   --disable-crypto-afalg \
-  --disable-debug-mutex
+  --disable-debug-mutex \
-
+  --disable-bochs \
+  --disable-cloop \
+  --disable-dmg \
+  --disable-qcow1 \
+  --disable-vdi \
+  --disable-vvfat \
+  --disable-qed \
+  --disable-parallels \
+  --disable-sheepdog
 
 echo "config-host.mak contents:"
 echo "==="
@@ -812,12 +776,6 @@ install -D -m 0644 %{SOURCE12} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/bridge.conf
 install -m 0644 %{_sourcedir}/qemu-pr-helper.service %{buildroot}%{_unitdir}
 install -m 0644 %{_sourcedir}/qemu-pr-helper.socket %{buildroot}%{_unitdir}
 
-%if 0
-make %{?_smp_mflags} $buildldflags DESTDIR=$RPM_BUILD_ROOT install-libcacard
-
-find $RPM_BUILD_ROOT -name "libcacard.so*" -exec chmod +x \{\} \;
-%endif
-
 find $RPM_BUILD_ROOT -name '*.la' -or -name '*.a' | xargs rm -f
 
 # We need to make the block device modules executable else
@@ -1004,8 +962,123 @@ useradd -r -u 107 -g qemu -G kvm -d / -s /sbin/nologin \
 
 
 %changelog
-* Mon Nov 05 2018 Danilo Cesar Lemes de Paula <ddepaula@redhat.com> - 3.1.0-0.el8
+* Thu Dec 13 2018 Danilo Cesar Lemes de Paula <ddepaula@redhat.com> - 3.1.0-1.el8
-- Rebase qemu-kvm to qemu 3.1.0 RC2
+- Rebase to qemu-kvm 3.1.0
+
+* Tue Dec 11 2018 Danilo Cesar Lemes de Paula <ddepaula@redhat.com> - qemu-kvm-2.12.0-47
+- kvm-Disable-CONFIG_IPMI-and-CONFIG_I2C-for-ppc64.patch [bz#1640044]
+- kvm-Disable-CONFIG_CAN_BUS-and-CONFIG_CAN_SJA1000.patch [bz#1640042]
+- Resolves: bz#1640042
+  (Disable CONFIG_CAN_BUS and CONFIG_CAN_SJA1000 config switches)
+- Resolves: bz#1640044
+  (Disable CONFIG_I2C and CONFIG_IPMI in default-configs/ppc64-softmmu.mak)
+
+* Tue Dec 11 2018 Danilo Cesar Lemes de Paula <ddepaula@redhat.com> - qemu-kvm-2.12.0-46 
+- kvm-qcow2-Give-the-refcount-cache-the-minimum-possible-s.patch [bz#1656507]
+- kvm-docs-Document-the-new-default-sizes-of-the-qcow2-cac.patch [bz#1656507]
+- kvm-qcow2-Fix-Coverity-warning-when-calculating-the-refc.patch [bz#1656507]
+- kvm-include-Add-IEC-binary-prefixes-in-qemu-units.h.patch [bz#1656507]
+- kvm-qcow2-Options-documentation-fixes.patch [bz#1656507]
+- kvm-include-Add-a-lookup-table-of-sizes.patch [bz#1656507]
+- kvm-qcow2-Make-sizes-more-humanly-readable.patch [bz#1656507]
+- kvm-qcow2-Avoid-duplication-in-setting-the-refcount-cach.patch [bz#1656507]
+- kvm-qcow2-Assign-the-L2-cache-relatively-to-the-image-si.patch [bz#1656507]
+- kvm-qcow2-Increase-the-default-upper-limit-on-the-L2-cac.patch [bz#1656507]
+- kvm-qcow2-Resize-the-cache-upon-image-resizing.patch [bz#1656507]
+- kvm-qcow2-Set-the-default-cache-clean-interval-to-10-min.patch [bz#1656507]
+- kvm-qcow2-Explicit-number-replaced-by-a-constant.patch [bz#1656507]
+- kvm-block-backend-Set-werror-rerror-defaults-in-blk_new.patch [bz#1657637]
+- kvm-qcow2-Fix-cache-clean-interval-documentation.patch [bz#1656507]
+- Resolves: bz#1656507
+  ([RHEL.8] qcow2 cache is too small)
+- Resolves: bz#1657637
+  (Wrong werror default for -device drive=<node-name>)
+
+* Thu Dec 06 2018 Danilo Cesar Lemes de Paula <ddepaula@redhat.com> - qemu-kvm-2.12.0-45
+- kvm-target-ppc-add-basic-support-for-PTCR-on-POWER9.patch [bz#1639069]
+- kvm-linux-headers-Update-for-nested-KVM-HV-downstream-on.patch [bz#1639069]
+- kvm-target-ppc-Add-one-reg-id-for-ptcr.patch [bz#1639069]
+- kvm-ppc-spapr_caps-Add-SPAPR_CAP_NESTED_KVM_HV.patch [bz#1639069]
+- kvm-Re-enable-CONFIG_HYPERV_TESTDEV.patch [bz#1651195]
+- kvm-qxl-use-guest_monitor_config-for-local-renderer.patch [bz#1610163]
+- kvm-Declare-cirrus-vga-as-deprecated.patch [bz#1651994]
+- kvm-Do-not-build-bluetooth-support.patch [bz#1654651]
+- kvm-vfio-helpers-Fix-qemu_vfio_open_pci-crash.patch [bz#1645840]
+- kvm-balloon-Allow-multiple-inhibit-users.patch [bz#1650272]
+- kvm-Use-inhibit-to-prevent-ballooning-without-synchr.patch [bz#1650272]
+- kvm-vfio-Inhibit-ballooning-based-on-group-attachment-to.patch [bz#1650272]
+- kvm-vfio-ccw-pci-Allow-devices-to-opt-in-for-ballooning.patch [bz#1650272]
+- kvm-vfio-pci-Handle-subsystem-realpath-returning-NULL.patch [bz#1650272]
+- kvm-vfio-pci-Fix-failure-to-close-file-descriptor-on-err.patch [bz#1650272]
+- kvm-postcopy-Synchronize-usage-of-the-balloon-inhibitor.patch [bz#1650272]
+- Resolves: bz#1610163
+  (guest shows border blurred screen with some resolutions when qemu boot with -device qxl-vga ,and guest on rhel7.6 has no  such question)
+- Resolves: bz#1639069
+  ([IBM 8.0 FEAT] POWER9 - Nested virtualization in RHEL8.0 KVM for ppc64le - qemu-kvm side)
+- Resolves: bz#1645840
+  (Qemu core dump when hotplug nvme:// drive via -blockdev)
+- Resolves: bz#1650272
+  (Ballooning is incompatible with vfio assigned devices, but not prevented)
+- Resolves: bz#1651195
+  (Re-enable hyperv-testdev device)
+- Resolves: bz#1651994
+  (Declare the "Cirrus VGA" device emulation of QEMU as deprecated in RHEL8)
+- Resolves: bz#1654651
+  (Qemu: hw: bt: keep bt/* objects from building [rhel-8.0])
+
+* Tue Nov 27 2018 Danilo Cesar Lemes de Paula <ddepaula@redhat.com> - qemu-kvm-2.12.0-43
+- kvm-block-Make-more-block-drivers-compile-time-configura.patch [bz#1598842 bz#1598842]
+- kvm-RHEL8-Add-disable-configure-options-to-qemu-spec-fil.patch [bz#1598842]
+- Resolves: bz#1598842
+  (Compile out unused block drivers)
+
+* Mon Nov 26 2018 Danilo Cesar Lemes de Paula <ddepaula@redhat.com> - qemu-kvm-2.12.0-43
+
+- kvm-configure-add-test-for-libudev.patch [bz#1636185]
+- kvm-qga-linux-report-disk-serial-number.patch [bz#1636185]
+- kvm-qga-linux-return-disk-device-in-guest-get-fsinfo.patch [bz#1636185]
+- kvm-qemu-error-introduce-error-warn-_report_once.patch [bz#1625173]
+- kvm-intel-iommu-start-to-use-error_report_once.patch [bz#1625173]
+- kvm-intel-iommu-replace-more-vtd_err_-traces.patch [bz#1625173]
+- kvm-intel_iommu-introduce-vtd_reset_caches.patch [bz#1625173]
+- kvm-intel_iommu-better-handling-of-dmar-state-switch.patch [bz#1625173]
+- kvm-intel_iommu-move-ce-fetching-out-when-sync-shadow.patch [bz#1625173 bz#1629616]
+- kvm-intel_iommu-handle-invalid-ce-for-shadow-sync.patch [bz#1625173 bz#1629616]
+- kvm-block-remove-bdrv_dirty_bitmap_make_anon.patch [bz#1518989]
+- kvm-block-simplify-code-around-releasing-bitmaps.patch [bz#1518989]
+- kvm-hbitmap-Add-advance-param-to-hbitmap_iter_next.patch [bz#1518989]
+- kvm-test-hbitmap-Add-non-advancing-iter_next-tests.patch [bz#1518989]
+- kvm-block-dirty-bitmap-Add-bdrv_dirty_iter_next_area.patch [bz#1518989]
+- kvm-blockdev-backup-add-bitmap-argument.patch [bz#1518989]
+- kvm-dirty-bitmap-switch-assert-fails-to-errors-in-bdrv_m.patch [bz#1518989]
+- kvm-dirty-bitmap-rename-bdrv_undo_clear_dirty_bitmap.patch [bz#1518989]
+- kvm-dirty-bitmap-make-it-possible-to-restore-bitmap-afte.patch [bz#1518989]
+- kvm-blockdev-rename-block-dirty-bitmap-clear-transaction.patch [bz#1518989]
+- kvm-qapi-add-transaction-support-for-x-block-dirty-bitma.patch [bz#1518989]
+- kvm-block-dirty-bitmaps-add-user_locked-status-checker.patch [bz#1518989]
+- kvm-block-dirty-bitmaps-fix-merge-permissions.patch [bz#1518989]
+- kvm-block-dirty-bitmaps-allow-clear-on-disabled-bitmaps.patch [bz#1518989]
+- kvm-block-dirty-bitmaps-prohibit-enable-disable-on-locke.patch [bz#1518989]
+- kvm-block-backup-prohibit-backup-from-using-in-use-bitma.patch [bz#1518989]
+- kvm-nbd-forbid-use-of-frozen-bitmaps.patch [bz#1518989]
+- kvm-bitmap-Update-count-after-a-merge.patch [bz#1518989]
+- kvm-iotests-169-drop-deprecated-autoload-parameter.patch [bz#1518989]
+- kvm-block-qcow2-improve-error-message-in-qcow2_inactivat.patch [bz#1518989]
+- kvm-bloc-qcow2-drop-dirty_bitmaps_loaded-state-variable.patch [bz#1518989]
+- kvm-dirty-bitmaps-clean-up-bitmaps-loading-and-migration.patch [bz#1518989]
+- kvm-iotests-improve-169.patch [bz#1518989]
+- kvm-iotests-169-add-cases-for-source-vm-resuming.patch [bz#1518989]
+- kvm-pc-dimm-turn-alignment-assert-into-check.patch [bz#1630116]
+- Resolves: bz#1518989
+  (RFE: QEMU Incremental live backup)
+- Resolves: bz#1625173
+  ([NVMe Device Assignment] Guest could not boot up with q35+iommu)
+- Resolves: bz#1629616
+  (boot guest with q35+vIOMMU+ device assignment, qemu terminal shows "qemu-kvm: VFIO_UNMAP_DMA: -22" when return assigned network devices from vfio driver to ixgbe in guest)
+- Resolves: bz#1630116
+  (pc_dimm_get_free_addr: assertion failed: (QEMU_ALIGN_UP(address_space_start, align) == address_space_start))
+- Resolves: bz#1636185
+  ([RFE] Report disk device name and serial number (qemu-guest-agent on Linux))
 
 * Mon Nov 05 2018 Danilo Cesar Lemes de Paula <ddepaula@redhat.com> - 2.12.0-42.el8
 - kvm-luks-Allow-share-rw-on.patch [bz#1629701]

sources

@@ -1 +0,0 @@
-SHA512 (qemu-3.1.0.tar.xz) = 610ec222853ebeea764a2c972418645dea7917e796a0f540d6c4a0f588244e6fdf6f5e6c214f161eb11fbc497f136a43e000fc85554ebb2cf8f10c846a186437