2020-05-13 14:58:13 +00:00
|
|
|
From b510775819649eeb2499b9d4b9baf93538d4bde7 Mon Sep 17 00:00:00 2001
|
2018-10-14 17:48:54 +00:00
|
|
|
From: Miroslav Rezanina <mrezanin@redhat.com>
|
2018-11-29 12:09:34 +00:00
|
|
|
Date: Fri, 12 Oct 2018 07:31:11 +0200
|
2018-10-14 17:48:54 +00:00
|
|
|
Subject: Initial redhat build
|
|
|
|
|
|
2018-11-08 17:02:33 +00:00
|
|
|
This patch introduces redhat build structure in redhat subdirectory. In addition,
|
|
|
|
|
several issues are fixed in QEMU tree:
|
2018-10-14 17:48:54 +00:00
|
|
|
|
2018-11-29 12:09:34 +00:00
|
|
|
- Change of app name for sasl_server_init in VNC code from qemu to qemu-kvm
|
|
|
|
|
- As we use qemu-kvm as name in all places, this is updated to be consistent
|
|
|
|
|
- Man page renamed from qemu to qemu-kvm
|
|
|
|
|
- man page is installed using make install so we have to fix it in qemu tree
|
2018-10-14 17:48:54 +00:00
|
|
|
|
2020-05-13 14:58:13 +00:00
|
|
|
This rebase includes changes up to qemu-kvm-4.2.0-19.el8
|
2018-12-13 12:54:47 +00:00
|
|
|
|
|
|
|
|
Rebase notes (3.1.0):
|
|
|
|
|
- added new configure options
|
|
|
|
|
|
2019-05-07 21:00:36 +00:00
|
|
|
Rebase notes (4.0.0):
|
|
|
|
|
- Added dependency to perl-Test-Harness (upstream)
|
|
|
|
|
- Added dependency to python3-sphinx (upstream)
|
|
|
|
|
- Change location of icons (upstream)
|
|
|
|
|
- Remove .desktop file (added upstream)
|
|
|
|
|
- Added qemu-trace-stap (added upstream)
|
|
|
|
|
- Removed elf2dmp (added upstream)
|
|
|
|
|
- Remove .buildinfo
|
|
|
|
|
- Added pvh.bin rom (added upstream)
|
|
|
|
|
- Added interop documentation files
|
|
|
|
|
- Use python module instead of qemu.py (upstream)
|
|
|
|
|
|
2019-11-15 14:35:04 +00:00
|
|
|
Rebase notes (4.1.0):
|
2019-08-15 04:45:41 +00:00
|
|
|
- Remove edk2 files generated by build
|
|
|
|
|
- Switch to rhel-8.1-candidate build target
|
|
|
|
|
- Remove specs documentation
|
|
|
|
|
- Switched from libssh2 to libssh
|
|
|
|
|
- Add rc0 tarball usage hacks
|
|
|
|
|
- Added BuildRequires for wget, rpm-build and python3-sphinx
|
|
|
|
|
- Removed new unpacked files
|
|
|
|
|
- Update configure line to use new options
|
|
|
|
|
|
2019-12-09 20:39:05 +00:00
|
|
|
Rebase notes (4.2.0):
|
2019-11-15 14:35:04 +00:00
|
|
|
- Disable iotest run during make check
|
|
|
|
|
- README renamed to README.rst (upstream)
|
|
|
|
|
- Removed ui-spice-app.so
|
|
|
|
|
- Added relevant changes from "505f7f4 redhat: Adding slirp to the exploded tree"
|
|
|
|
|
- Removed qemu-ga.8 install from spec file - installed by make
|
|
|
|
|
- Removed spapr-rtas.bin (upstream)
|
2019-12-09 20:39:05 +00:00
|
|
|
- Require newer SLOF (20191022)
|
2019-11-15 14:35:04 +00:00
|
|
|
|
2020-05-13 01:03:43 +00:00
|
|
|
Rebase notes (weekly-200115):
|
|
|
|
|
- Added index.html (upstream)
|
|
|
|
|
|
|
|
|
|
Rebase notes (weekly-200122):
|
|
|
|
|
- Use python3 for virtio_seg_max_adjust.py test
|
|
|
|
|
- Removed qemu-trace-stap shebang from spec file
|
|
|
|
|
|
|
|
|
|
Rebase notes (weekly-200129):
|
|
|
|
|
- Ship docs/qemu-kvm/system help files (added upstream)
|
|
|
|
|
|
|
|
|
|
Rebase notes (weekly-200212):
|
|
|
|
|
- Added virtiofsd.1 (upstream)
|
|
|
|
|
|
|
|
|
|
Rebase notes (weekly-200219):
|
|
|
|
|
- Use out-of-tree build
|
|
|
|
|
|
|
|
|
|
Rebase notes (weekly-200226):
|
|
|
|
|
- added tools documentation (upstream)
|
|
|
|
|
|
|
|
|
|
Rebase notes (weekly-200304):
|
|
|
|
|
- Update local build
|
|
|
|
|
|
|
|
|
|
Rebase notes (weekly-200311):
|
|
|
|
|
- Add docs/qemu-kvm/user help files (added upstream)
|
|
|
|
|
- Removing installed qemu-storage-daemon (added upstream)
|
|
|
|
|
|
|
|
|
|
Rebase notes (weekly-200318):
|
|
|
|
|
- Removing opensbi-riscv32-sifive_u-fw_jump.bin (added upstream)
|
|
|
|
|
|
|
|
|
|
Rebase notes (weekly-200325):
|
|
|
|
|
- Disable iotests (moved from Enable make check commit)
|
|
|
|
|
|
|
|
|
|
Rebase notes (5.0.0 rc2):
|
|
|
|
|
- Added missing configure options
|
|
|
|
|
|
|
|
|
|
Rebase notes (5.0.0 rc3):
|
|
|
|
|
- Reorder configure options
|
|
|
|
|
|
2018-12-13 12:54:47 +00:00
|
|
|
Merged patches (3.1.0):
|
|
|
|
|
- 01f0c9f RHEL8: Add disable configure options to qemu spec file
|
|
|
|
|
- Spec file cleanups
|
2019-05-07 21:00:36 +00:00
|
|
|
|
|
|
|
|
Merged patches (4.0.0):
|
|
|
|
|
- aa4297c Add edk2 Requires to qemu-kvm
|
|
|
|
|
- d124ff5779 Fixing brew build target
|
|
|
|
|
- eb204b5 Introduce the qemu-kvm-tests rpm
|
|
|
|
|
- 223cf0c Load kvm module during boot (partial)
|
|
|
|
|
|
2019-11-15 14:35:04 +00:00
|
|
|
Merged patches (4.1.0):
|
2019-08-15 04:45:41 +00:00
|
|
|
- ebb6e97 redhat: Fix LOCALVERSION creation
|
|
|
|
|
- b0ab0cc redhat: enable tpmdev passthrough (not disabling tests)
|
|
|
|
|
- 7cb3c4a Enable libpmem to support nvdimm
|
|
|
|
|
- 8943607 qemu-kvm.spec: bump libseccomp >= 2.4.0
|
|
|
|
|
- 27b7c44 rh: set CONFIG_BOCHS_DISPLAY=y for x86 (partial)
|
|
|
|
|
- e1fe9fe x86_64-rh-devices: enable TPM emulation (partial)
|
2019-08-19 21:26:36 +00:00
|
|
|
|
2019-12-13 13:10:42 +00:00
|
|
|
Merged patches (4.2.0):
|
2019-11-15 14:35:04 +00:00
|
|
|
- 69e1fb2 enable virgla
|
|
|
|
|
- d4f6115 enable virgl, for real this time ...
|
|
|
|
|
|
2020-05-13 01:03:43 +00:00
|
|
|
Merged patches (weekly-200205):
|
|
|
|
|
- 5edf6bd Add support for rh-brew-module
|
|
|
|
|
- f77d52d redhat: ship virtiofsd vhost-user device backend
|
|
|
|
|
|
|
|
|
|
Conflicts:
|
|
|
|
|
gdbstub.c
|
2018-10-14 17:48:54 +00:00
|
|
|
---
|
2020-05-13 01:03:43 +00:00
|
|
|
.gitignore | 1 +
|
|
|
|
|
Makefile | 3 +-
|
|
|
|
|
configure | 1 +
|
|
|
|
|
redhat/Makefile | 88 ++
|
|
|
|
|
redhat/Makefile.common | 51 +
|
|
|
|
|
redhat/README.tests | 39 +
|
2020-05-13 14:58:13 +00:00
|
|
|
redhat/qemu-kvm.spec.template | 2812 +++++++++++++++++++++++++++++++++++
|
2020-05-13 01:03:43 +00:00
|
|
|
redhat/scripts/extract_build_cmd.py | 2 +-
|
|
|
|
|
redhat/scripts/process-patches.sh | 7 +-
|
|
|
|
|
tests/check-block.sh | 2 +
|
|
|
|
|
ui/vnc.c | 2 +-
|
2020-05-13 14:58:13 +00:00
|
|
|
11 files changed, 3000 insertions(+), 8 deletions(-)
|
2018-10-14 17:48:54 +00:00
|
|
|
create mode 100644 redhat/Makefile
|
|
|
|
|
create mode 100644 redhat/Makefile.common
|
2019-05-07 21:00:36 +00:00
|
|
|
create mode 100644 redhat/README.tests
|
2018-10-14 17:48:54 +00:00
|
|
|
create mode 100644 redhat/qemu-kvm.spec.template
|
|
|
|
|
|
|
|
|
|
diff --git a/Makefile b/Makefile
|
2020-05-13 14:58:13 +00:00
|
|
|
index 8a9113e..a89cc44 100644
|
2018-10-14 17:48:54 +00:00
|
|
|
--- a/Makefile
|
|
|
|
|
+++ b/Makefile
|
2020-05-13 01:03:43 +00:00
|
|
|
@@ -548,6 +548,7 @@ CAP_CFLAGS += -DCAPSTONE_HAS_ARM
|
2018-10-14 17:48:54 +00:00
|
|
|
CAP_CFLAGS += -DCAPSTONE_HAS_ARM64
|
|
|
|
|
CAP_CFLAGS += -DCAPSTONE_HAS_POWERPC
|
|
|
|
|
CAP_CFLAGS += -DCAPSTONE_HAS_X86
|
|
|
|
|
+CAP_CFLAGS += -Wp,-D_GLIBCXX_ASSERTIONS
|
|
|
|
|
|
2019-08-15 04:45:41 +00:00
|
|
|
.PHONY: capstone/all
|
|
|
|
|
capstone/all: .git-submodule-status
|
2020-05-13 14:58:13 +00:00
|
|
|
@@ -884,7 +885,7 @@ install-doc: $(DOCS) install-sphinxdocs
|
2018-10-14 17:48:54 +00:00
|
|
|
$(INSTALL_DATA) docs/interop/qemu-qmp-ref.txt "$(DESTDIR)$(qemu_docdir)"
|
|
|
|
|
ifdef CONFIG_POSIX
|
|
|
|
|
$(INSTALL_DIR) "$(DESTDIR)$(mandir)/man1"
|
2020-05-13 01:03:43 +00:00
|
|
|
- $(INSTALL_DATA) $(MANUAL_BUILDDIR)/system/qemu.1 "$(DESTDIR)$(mandir)/man1"
|
|
|
|
|
+ $(INSTALL_DATA) $(MANUAL_BUILDDIR)/system/qemu.1 "$(DESTDIR)$(mandir)/man1/qemu-kvm.1"
|
2018-10-14 17:48:54 +00:00
|
|
|
$(INSTALL_DIR) "$(DESTDIR)$(mandir)/man7"
|
|
|
|
|
$(INSTALL_DATA) docs/interop/qemu-qmp-ref.7 "$(DESTDIR)$(mandir)/man7"
|
2020-05-13 01:03:43 +00:00
|
|
|
$(INSTALL_DATA) $(MANUAL_BUILDDIR)/system/qemu-block-drivers.7 "$(DESTDIR)$(mandir)/man7"
|
2018-10-14 17:48:54 +00:00
|
|
|
diff --git a/configure b/configure
|
2020-05-13 01:03:43 +00:00
|
|
|
index 23b5e93..1b40d7e 100755
|
2018-10-14 17:48:54 +00:00
|
|
|
--- a/configure
|
|
|
|
|
+++ b/configure
|
2020-05-13 01:03:43 +00:00
|
|
|
@@ -2538,6 +2538,7 @@ if test "$seccomp" != "no" ; then
|
2019-08-15 04:45:41 +00:00
|
|
|
seccomp="no"
|
|
|
|
|
fi
|
2018-10-14 17:48:54 +00:00
|
|
|
fi
|
2019-08-15 04:45:41 +00:00
|
|
|
+
|
2019-05-07 21:00:36 +00:00
|
|
|
##########################################
|
2019-08-15 04:45:41 +00:00
|
|
|
# xen probe
|
2018-10-14 17:48:54 +00:00
|
|
|
|
2020-05-13 01:03:43 +00:00
|
|
|
diff --git a/tests/check-block.sh b/tests/check-block.sh
|
|
|
|
|
index ad320c2..1f26083 100755
|
|
|
|
|
--- a/tests/check-block.sh
|
|
|
|
|
+++ b/tests/check-block.sh
|
|
|
|
|
@@ -43,6 +43,8 @@ if ! (sed --version | grep 'GNU sed') > /dev/null 2>&1 ; then
|
|
|
|
|
fi
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
+exit 0
|
|
|
|
|
+
|
|
|
|
|
cd tests/qemu-iotests
|
|
|
|
|
|
|
|
|
|
ret=0
|
2018-10-14 17:48:54 +00:00
|
|
|
diff --git a/ui/vnc.c b/ui/vnc.c
|
2020-05-13 01:03:43 +00:00
|
|
|
index 1d7138a..1fc55b7 100644
|
2018-10-14 17:48:54 +00:00
|
|
|
--- a/ui/vnc.c
|
|
|
|
|
+++ b/ui/vnc.c
|
2020-05-13 01:03:43 +00:00
|
|
|
@@ -3972,7 +3972,7 @@ void vnc_display_open(const char *id, Error **errp)
|
2018-10-14 17:48:54 +00:00
|
|
|
|
|
|
|
|
#ifdef CONFIG_VNC_SASL
|
2018-11-29 12:09:34 +00:00
|
|
|
if (sasl) {
|
|
|
|
|
- int saslErr = sasl_server_init(NULL, "qemu");
|
|
|
|
|
+ int saslErr = sasl_server_init(NULL, "qemu-kvm");
|
|
|
|
|
|
|
|
|
|
if (saslErr != SASL_OK) {
|
|
|
|
|
error_setg(errp, "Failed to initialize SASL auth: %s",
|
2018-10-14 17:48:54 +00:00
|
|
|
--
|
2020-05-13 01:03:43 +00:00
|
|
|
1.8.3.1
|
2018-10-14 17:48:54 +00:00
|
|
|
|
