Merge branch 'qemu' into 'master'

Qemu: Various fixes



See merge request !193

4 files changed, 9 insertions, 226 deletions

diff --git a/user/qemu/12-12-Fix-configure-for-s390-qemu-on-alpine.patch b/user/qemu/12-12-Fix-configure-for-s390-qemu-on-alpine.patch
deleted file mode 100644
index 38b32da2a..000000000
--- a/user/qemu/12-12-Fix-configure-for-s390-qemu-on-alpine.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From patchwork Fri Jan 19 16:42:59 2018
-Content-Type: text/plain; charset="utf-8"
-MIME-Version: 1.0
-Content-Transfer-Encoding: 7bit
-Subject: [12/12] Fix configure for s390 qemu on alpine
-X-Patchwork-Submitter: Christian Borntraeger <borntraeger@de.ibm.com>
-X-Patchwork-Id: 863654
-Message-Id: <1516380179-12737-1-git-send-email-borntraeger@de.ibm.com>
-To: qemu-s390x@nongnu.org, qemu-devel@nongnu.org,
- Peter Maydell <peter.maydell@linaro.org>,
- Paolo Bonzini <pbonzini@redhat.com>
-Cc: Christian Borntraeger <borntraeger@de.ibm.com>,
- Alice Frosi <alice@linux.vnet.ibm.com>,
- Alice Frosi <alice@linux.vnet.ibm.comx>
-Date: Fri, 19 Jan 2018 17:42:59 +0100
-From: Christian Borntraeger <borntraeger@de.ibm.com>
-List-Id: <qemu-devel.nongnu.org>
-
-From: Alice Frosi <alice@linux.vnet.ibm.comx>
-
-In alpine docker image the qemu-system-s390x build is broken and
-it throws this error:
-qemu-system-s390x: Initialization of device s390-ipl failed: could not
-load bootloader 's390-ccw.img'
-
-The grep command of busybox uses regex. This fails on binary data
-(e.g. stops on every \0), so it does not identify the string 
-BiGeNdIaN in the test case big/little. Therefore, it assumes 
-that the architecture is little endian.
-
-This fix solves the grep problem by printing the content of
-TMPO with strings
-
-Signed-off-by: Alice Frosi <alice@linux.vnet.ibm.com>
-Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
-[some changes to patch description, add -a option to strings]
----
- configure | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/configure b/configure
-index 6d8c996..383b14e 100755
---- a/configure
-+++ b/configure
-@@ -1906,9 +1906,9 @@ int main(int argc, char *argv[]) {
- EOF
- 
- if compile_object ; then
--    if grep -q BiGeNdIaN $TMPO ; then
-+    if strings -a $TMPO | grep -q BiGeNdIaN ; then
-         bigendian="yes"
--    elif grep -q LiTtLeEnDiAn $TMPO ; then
-+    elif strings -a $TMPO | grep -q LiTtLeEnDiAn ; then
-         bigendian="no"
-     else
-         echo big/little test failed
diff --git a/user/qemu/APKBUILD b/user/qemu/APKBUILD
index f64964b3c..9d7239c45 100644
--- a/user/qemu/APKBUILD
+++ b/user/qemu/APKBUILD
@@ -5,7 +5,7 @@
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=qemu
 pkgver=3.0.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Machine emulator and virtualisation software"
 url="https://www.qemu.org/"
 arch="all"
@@ -34,7 +34,6 @@ makedepends="
 	linux-headers
 	lzo-dev
 	ncurses-dev
-	paxmark
 	python3
 	snappy-dev
 	spice-dev
@@ -56,6 +55,7 @@ subpackages="$pkgname-doc $pkgname-lang $pkgname-guest-agent:guest
 
 _user_subsystems="
 	aarch64
+	aarch64_be
 	alpha
 	arm
 	armeb
@@ -71,11 +71,14 @@ _user_subsystems="
 	mipsel
 	mipsn32
 	mipsn32el
+	nios2
 	or1k
 	ppc
 	ppc64
 	ppc64abi32
 	ppc64le
+	riscv32
+	riscv64
 	s390x
 	sh4
 	sh4eb
@@ -83,7 +86,9 @@ _user_subsystems="
 	sparc32plus
 	sparc64
 	tilegx
-	x86_64"
+	x86_64
+	xtensa
+	xtensaeb"
 _system_subsystems="
 	system-aarch64
 	system-alpha
@@ -209,6 +214,7 @@ _compile_common() {
 		--disable-werror \
 		--disable-sdl \
 		--disable-xen \
+		--disable-gcrypt \
 		--cc="${CC:-gcc}" \
 		--python="/usr/bin/python3" \
 		"$@"
@@ -285,7 +291,6 @@ package() {
 
 	cd "$builddir"/build
 	make DESTDIR="$pkgdir" install
-	paxmark -m "$pkgdir"/usr/bin/qemu-system-*
 
 	install -Dm640 -g qemu "$srcdir"/bridge.conf \
 		"$pkgdir"/etc/qemu/bridge.conf
diff --git a/user/qemu/debug.patch b/user/qemu/debug.patch
deleted file mode 100644
index 930ae11c1..000000000
--- a/user/qemu/debug.patch
+++ /dev/null
@@ -1,136 +0,0 @@
-diff --git a/user/qemu/APKBUILD b/user/qemu/APKBUILD
-index 3e0be56..27ed920 100644
---- a/user/qemu/APKBUILD
-+++ b/user/qemu/APKBUILD
-@@ -5,7 +5,7 @@
- # Maintainer: A. Wilcox <awilfox@adelielinux.org>
- pkgname=qemu
- pkgver=2.12.1
--pkgrel=0
-+pkgrel=95
- pkgdesc="Machine emulator and virtualisation software"
- url="https://www.qemu.org/"
- arch="all"
-@@ -56,68 +56,10 @@ subpackages="$pkgname-doc $pkgname-lang $pkgname-guest-agent:guest
- 	$pkgname-user $pkgname-system"
- 
- _user_subsystems="
--	aarch64
--	alpha
--	arm
--	armeb
--	cris
--	hppa
- 	i386
--	m68k
--	microblaze
--	microblazeel
--	mips
--	mips64
--	mips64el
--	mipsel
--	mipsn32
--	mipsn32el
--	or1k
--	ppc
--	ppc64
--	ppc64abi32
--	ppc64le
--	s390x
--	sh4
--	sh4eb
--	sparc
--	sparc32plus
--	sparc64
--	tilegx
- 	x86_64"
- _system_subsystems="
--	system-aarch64
--	system-alpha
--	system-arm
--	system-cris
--	system-hppa
- 	system-i386
--	system-lm32
--	system-m68k
--	system-microblaze
--	system-microblazeel
--	system-mips
--	system-mips64
--	system-mips64el
--	system-mipsel
--	system-moxie
--	system-nios2
--	system-or1k
--	system-ppc
--	system-ppc64
--	system-ppcemb
--	system-riscv32
--	system-riscv64
--	system-s390x
--	system-sh4
--	system-sh4eb
--	system-sparc
--	system-sparc64
--	system-tricore
--	system-unicore32
--	system-x86_64
--	system-xtensa
--	system-xtensaeb
- 	"
- _subsystems="$_user_subsystems $_system_subsystems"
- for _sub in $_subsystems; do
-@@ -152,6 +94,7 @@ source="https://download.qemu.org/$pkgname-$pkgver.tar.xz
- 	ppc32-musl-support.patch
- 	sysinfo-header.patch
- 	fix-lm32-underlinking.patch
-+	debug.patch
- 
- 	$pkgname-guest-agent.confd
- 	$pkgname-guest-agent.initd
-@@ -203,7 +146,8 @@ _compile_common() {
- 		--sysconfdir=/etc \
- 		--libexecdir=/usr/lib/qemu \
- 		--disable-glusterfs \
--		--disable-debug-info \
-+		--enable-debug-info \
-+		--disable-strip \
- 		--disable-bsd-user \
- 		--disable-werror \
- 		--disable-sdl \
-@@ -217,6 +161,7 @@ _compile_common() {
- _compile_system() {
- 	_compile_common \
- 		--audio-drv-list=oss,alsa \
-+		--enable-debug-tcg \
- 		--enable-kvm \
- 		--enable-vde \
- 		--enable-virtfs \
-@@ -247,7 +192,8 @@ build() {
- 	_compile_common \
- 		--enable-linux-user \
- 		--disable-system \
--		--static
-+		--static \
-+		--target-list="i386-linux-user,x86_64-linux-user"
- 
- 	cd "$builddir"/build
- 	_compile_system \
-@@ -256,7 +202,8 @@ build() {
- 		--enable-vnc-jpeg \
- 		--enable-spice \
- 		--enable-guest-agent \
--		--disable-gtk
-+		--disable-gtk \
-+		--target-list="i386-softmmu"
- 
- 	if [ -n "$_arch" ]; then
- 		cd "$builddir"/build-gtk
-@@ -403,6 +350,7 @@ a4cbb020d6a839b5a129964027169babff2c1455170c5fec855232d999481eea2cae186fa66ceaa5
- fb0130fa4e8771b23ae337ea3e5e29fd5f7dcfe7f9f7a68968f5b059bb4dd1336b0d04c118840d55885bc784a96a99b28aeacbc6a5549b2e6750c9d3099a897c  ppc32-musl-support.patch
- 698f6b134f4ca87f4de62caf7a656841a40a451b8686ca95928f67a296e58a7493d432d9baa5f6360917865aa4929600baf1699993b0600923a066ca9d45d1da  sysinfo-header.patch
- 2828cc612539aa93b5789de7de6d4f85d3cf82311484c0fe91fdd3efeb972057e2baa2a3809ed633d6caa1785642d49196cb282b095d7553c510c47ce7d6a702  fix-lm32-underlinking.patch
-+cfa0bc3c10d64060bf2ad46fc056060527a9ab68ab36ed012eab85db8a6053a2aa81199c6850c097f56ff3d4ea8fb23ee66aec62c33117ccf7518d64105b7e30  debug.patch
- d90c034cae3f9097466854ed1a9f32ab4b02089fcdf7320e8f4da13b2b1ff65067233f48809911485e4431d7ec1a22448b934121bc9522a2dc489009e87e2b1f  qemu-guest-agent.confd
- 1cd24c2444c5935a763c501af2b0da31635aad9cf62e55416d6477fcec153cddbe7de205d99616def11b085e0dd366ba22463d2270f831d884edbc307c7864a6  qemu-guest-agent.initd
- 9b7a89b20fcf737832cb7b4d5dc7d8301dd88169cbe5339eda69fbb51c2e537d8cb9ec7cf37600899e734209e63410d50d0821bce97e401421db39c294d97be2  80-kvm.rules
diff --git a/user/qemu/spapr-page-size.patch b/user/qemu/spapr-page-size.patch
deleted file mode 100644
index 2ea81ab80..000000000
--- a/user/qemu/spapr-page-size.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 3a9eba6700a9f6fc307bb08b9fe672cc36804fb5 Mon Sep 17 00:00:00 2001
-From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
-Date: Sun, 9 Sep 2018 19:58:37 -0500
-Subject: [PATCH] =?UTF-8?q?spapr:=20Default=20to=204=20KiB=20page=20size?=
- =?UTF-8?q?=20for=20Ad=C3=A9lie?=
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Not upstream eligible, most likely.
----
- hw/ppc/spapr.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
-index 4edb6c7d16..8628673994 100644
---- a/hw/ppc/spapr.c
-+++ b/hw/ppc/spapr.c
-@@ -3882,7 +3882,7 @@ static void spapr_machine_class_init(ObjectClass *oc, void *data)
-     smc->default_caps.caps[SPAPR_CAP_CFPC] = SPAPR_CAP_BROKEN;
-     smc->default_caps.caps[SPAPR_CAP_SBBC] = SPAPR_CAP_BROKEN;
-     smc->default_caps.caps[SPAPR_CAP_IBS] = SPAPR_CAP_BROKEN;
--    smc->default_caps.caps[SPAPR_CAP_HPT_MAXPAGESIZE] = 16; /* 64kiB */
-+    smc->default_caps.caps[SPAPR_CAP_HPT_MAXPAGESIZE] = 12; /* 4kiB */
-     spapr_caps_add_properties(smc, &error_abort);
-     smc->irq = &spapr_irq_xics;
- }
--- 
-2.18.0
-