ddf19c
From 4df157781801c50224373be57fa3c8c3741c0535 Mon Sep 17 00:00:00 2001
ddf19c
From: Miroslav Rezanina <mrezanin@redhat.com>
ddf19c
Date: Fri, 12 Oct 2018 07:31:11 +0200
ddf19c
Subject: Initial redhat build
ddf19c
ddf19c
This patch introduces redhat build structure in redhat subdirectory. In addition,
ddf19c
several issues are fixed in QEMU tree:
ddf19c
ddf19c
 - Change of app name for sasl_server_init in VNC code from qemu to qemu-kvm
ddf19c
  - As we use qemu-kvm as name in all places, this is updated to be consistent
ddf19c
 - Man page renamed from qemu to qemu-kvm
ddf19c
  - man page is installed using make install so we have to fix it in qemu tree
ddf19c
 - Use "/share/qemu-kvm" as SHARE_SUFFIX
ddf19c
  - We reconfigured our share to qemu-kvm to be consistent with used name
ddf19c
ddf19c
This rebase includes changes up to qemu-kvm-4.1.0-18.el8
ddf19c
ddf19c
Rebase notes (3.1.0):
ddf19c
- added new configure options
ddf19c
ddf19c
Rebase notes (4.0.0):
ddf19c
- Added dependency to perl-Test-Harness (upstream)
ddf19c
- Added dependency to python3-sphinx (upstream)
ddf19c
- Change location of icons (upstream)
ddf19c
- Remove .desktop file (added upstream)
ddf19c
- Added qemu-trace-stap (added upstream)
ddf19c
- Removed elf2dmp (added upstream)
ddf19c
- Remove .buildinfo
ddf19c
- Added pvh.bin rom (added upstream)
ddf19c
- Added interop documentation files
ddf19c
- Use python module instead of qemu.py (upstream)
ddf19c
ddf19c
Rebase notes (4.1.0):
ddf19c
- Remove edk2 files generated by build
ddf19c
- Switch to rhel-8.1-candidate build target
ddf19c
- Remove specs documentation
ddf19c
- Switched from libssh2 to libssh
ddf19c
- Add rc0 tarball usage hacks
ddf19c
- Added BuildRequires for wget, rpm-build and python3-sphinx
ddf19c
- Removed new unpacked files
ddf19c
- Update configure line to use new options
ddf19c
ddf19c
Rebase notes (4.2.0):
ddf19c
- Disable iotest run during make check
ddf19c
- README renamed to README.rst (upstream)
ddf19c
- Removed ui-spice-app.so
ddf19c
- Added relevant changes from "505f7f4 redhat: Adding slirp to the exploded tree"
ddf19c
- Removed qemu-ga.8 install from spec file - installed by make
ddf19c
- Removed spapr-rtas.bin (upstream)
ddf19c
- Require newer SLOF (20191022)
ddf19c
ddf19c
Merged patches (3.1.0):
ddf19c
- 01f0c9f RHEL8: Add disable configure options to qemu spec file
ddf19c
- Spec file cleanups
ddf19c
ddf19c
Merged patches (4.0.0):
ddf19c
- aa4297c Add edk2 Requires to qemu-kvm
ddf19c
- d124ff5779 Fixing brew build target
ddf19c
- eb204b5 Introduce the qemu-kvm-tests rpm
ddf19c
- 223cf0c Load kvm module during boot (partial)
ddf19c
ddf19c
Merged patches (4.1.0):
ddf19c
- ebb6e97 redhat: Fix LOCALVERSION creation
ddf19c
- b0ab0cc redhat: enable tpmdev passthrough (not disabling tests)
ddf19c
- 7cb3c4a Enable libpmem to support nvdimm
ddf19c
- 8943607 qemu-kvm.spec: bump libseccomp >= 2.4.0
ddf19c
- 27b7c44 rh: set CONFIG_BOCHS_DISPLAY=y for x86 (partial)
ddf19c
- e1fe9fe x86_64-rh-devices: enable TPM emulation (partial)
ddf19c
ddf19c
Merged patches (4.2.0):
ddf19c
- 69e1fb2 enable virgla
ddf19c
- d4f6115 enable virgl, for real this time ...
ddf19c
ddf19c
Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
ddf19c
---
ddf19c
 .gitignore                        |    1 +
ddf19c
 Makefile                          |    3 +-
ddf19c
 configure                         |    1 +
ddf19c
 os-posix.c                        |    2 +-
ddf19c
 redhat/Makefile                   |   82 +
ddf19c
 redhat/Makefile.common            |   51 +
ddf19c
 redhat/README.tests               |   39 +
ddf19c
 redhat/qemu-kvm.spec.template     | 2434 +++++++++++++++++++++++++++++
ddf19c
 redhat/scripts/process-patches.sh |    7 +-
ddf19c
 tests/Makefile.include            |    2 +-
ddf19c
 ui/vnc.c                          |    2 +-
ddf19c
 11 files changed, 2615 insertions(+), 9 deletions(-)
ddf19c
 create mode 100644 redhat/Makefile
ddf19c
 create mode 100644 redhat/Makefile.common
ddf19c
 create mode 100644 redhat/README.tests
ddf19c
 create mode 100644 redhat/qemu-kvm.spec.template
ddf19c
ddf19c
diff --git a/Makefile b/Makefile
ddf19c
index b437a346d7..086727dbb9 100644
ddf19c
--- a/Makefile
ddf19c
+++ b/Makefile
ddf19c
@@ -512,6 +512,7 @@ CAP_CFLAGS += -DCAPSTONE_HAS_ARM
ddf19c
 CAP_CFLAGS += -DCAPSTONE_HAS_ARM64
ddf19c
 CAP_CFLAGS += -DCAPSTONE_HAS_POWERPC
ddf19c
 CAP_CFLAGS += -DCAPSTONE_HAS_X86
ddf19c
+CAP_CFLAGS += -Wp,-D_GLIBCXX_ASSERTIONS
ddf19c
 
ddf19c
 .PHONY: capstone/all
ddf19c
 capstone/all: .git-submodule-status
ddf19c
@@ -826,7 +827,7 @@ install-doc: $(DOCS) install-sphinxdocs
ddf19c
 	$(INSTALL_DATA) docs/interop/qemu-qmp-ref.txt "$(DESTDIR)$(qemu_docdir)"
ddf19c
 ifdef CONFIG_POSIX
ddf19c
 	$(INSTALL_DIR) "$(DESTDIR)$(mandir)/man1"
ddf19c
-	$(INSTALL_DATA) qemu.1 "$(DESTDIR)$(mandir)/man1"
ddf19c
+	$(INSTALL_DATA) qemu.1 "$(DESTDIR)$(mandir)/man1/qemu-kvm.1"
ddf19c
 	$(INSTALL_DIR) "$(DESTDIR)$(mandir)/man7"
ddf19c
 	$(INSTALL_DATA) docs/interop/qemu-qmp-ref.7 "$(DESTDIR)$(mandir)/man7"
ddf19c
 	$(INSTALL_DATA) docs/qemu-block-drivers.7 "$(DESTDIR)$(mandir)/man7"
ddf19c
diff --git a/configure b/configure
ddf19c
index 6099be1d84..16564f8ccc 100755
ddf19c
--- a/configure
ddf19c
+++ b/configure
ddf19c
@@ -2424,6 +2424,7 @@ if test "$seccomp" != "no" ; then
ddf19c
         seccomp="no"
ddf19c
     fi
ddf19c
 fi
ddf19c
+
ddf19c
 ##########################################
ddf19c
 # xen probe
ddf19c
 
ddf19c
diff --git a/os-posix.c b/os-posix.c
ddf19c
index 86cffd2c7d..1c9f86768d 100644
ddf19c
--- a/os-posix.c
ddf19c
+++ b/os-posix.c
ddf19c
@@ -83,7 +83,7 @@ void os_setup_signal_handling(void)
ddf19c
 /* Find a likely location for support files using the location of the binary.
ddf19c
    For installed binaries this will be "$bindir/../share/qemu".  When
ddf19c
    running from the build tree this will be "$bindir/../pc-bios".  */
ddf19c
-#define SHARE_SUFFIX "/share/qemu"
ddf19c
+#define SHARE_SUFFIX "/share/qemu-kvm"
ddf19c
 #define BUILD_SUFFIX "/pc-bios"
ddf19c
 char *os_find_datadir(void)
ddf19c
 {
ddf19c
diff --git a/tests/Makefile.include b/tests/Makefile.include
ddf19c
index 8566f5f119..b483790cf3 100644
ddf19c
--- a/tests/Makefile.include
ddf19c
+++ b/tests/Makefile.include
ddf19c
@@ -1194,7 +1194,7 @@ check-acceptance: check-venv $(TESTS_RESULTS_DIR)
ddf19c
 check-qapi-schema: check-tests/qapi-schema/frontend check-tests/qapi-schema/doc-good.texi
ddf19c
 check-qtest: $(patsubst %,check-qtest-%, $(QTEST_TARGETS))
ddf19c
 check-block: $(patsubst %,check-%, $(check-block-y))
ddf19c
-check: check-block check-qapi-schema check-unit check-softfloat check-qtest check-decodetree
ddf19c
+check: check-qapi-schema check-unit check-softfloat check-qtest check-decodetree
ddf19c
 check-clean:
ddf19c
 	rm -rf $(check-unit-y) tests/*.o $(QEMU_IOTESTS_HELPERS-y)
ddf19c
 	rm -rf $(sort $(foreach target,$(SYSEMU_TARGET_LIST), $(check-qtest-$(target)-y)) $(check-qtest-generic-y))
ddf19c
diff --git a/ui/vnc.c b/ui/vnc.c
ddf19c
index 87b8045afe..ecf6276f5b 100644
ddf19c
--- a/ui/vnc.c
ddf19c
+++ b/ui/vnc.c
ddf19c
@@ -3987,7 +3987,7 @@ void vnc_display_open(const char *id, Error **errp)
ddf19c
 
ddf19c
 #ifdef CONFIG_VNC_SASL
ddf19c
     if (sasl) {
ddf19c
-        int saslErr = sasl_server_init(NULL, "qemu");
ddf19c
+        int saslErr = sasl_server_init(NULL, "qemu-kvm");
ddf19c
 
ddf19c
         if (saslErr != SASL_OK) {
ddf19c
             error_setg(errp, "Failed to initialize SASL auth: %s",
ddf19c
-- 
ddf19c
2.21.0
ddf19c