SHA256
1
0
forked from pool/qemu

Accepting request 144304 from home:a_faerber:branches:Virtualization

Update to v1.3.0

OBS-URL: https://build.opensuse.org/request/show/144304
OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=121
This commit is contained in:
Andreas Färber 2012-12-05 13:18:02 +00:00 committed by Git OBS Bridge
parent b9ff9881a0
commit b69cf6c416
39 changed files with 55 additions and 121 deletions

View File

@ -1,4 +1,4 @@
From 3a3e5eceb1f46808aff5b9d301b708834525c391 Mon Sep 17 00:00:00 2001
From 3538cf4c292b77ef153276a59fe8e914e62cce03 Mon Sep 17 00:00:00 2001
From: Peter Maydell <peter.maydell@linaro.org>
Date: Wed, 5 Oct 2011 10:04:02 +0100
Subject: [PATCH] Handle CPU interrupts by inline checking of a flag
@ -167,7 +167,7 @@ index 25e35cd..c339af8 100644
"pagesize", "set the host page size to 'pagesize'"},
{"singlestep", "QEMU_SINGLESTEP", false, handle_arg_singlestep,
diff --git a/qemu-options.hx b/qemu-options.hx
index fbcf079..d39d0f3 100644
index de43b1b..94a1c50 100644
--- a/qemu-options.hx
+++ b/qemu-options.hx
@@ -1258,6 +1258,15 @@ STEXI

View File

@ -1,4 +1,4 @@
From a4bf95453f77fb392fb6bfcc4607e89d50de1802 Mon Sep 17 00:00:00 2001
From 1c136948d465e16ead3275c02e1cd4cd230ad11e Mon Sep 17 00:00:00 2001
From: Alexander Graf <agraf@suse.de>
Date: Mon, 21 Nov 2011 23:50:36 +0100
Subject: [PATCH] XXX dont dump core on sigabort

View File

@ -1,4 +1,4 @@
From 489924aa0115dc6cfcd4e91b0747da4ff8425d1f Mon Sep 17 00:00:00 2001
From ed3496084d3efb765b899720a39e38a6d87215a2 Mon Sep 17 00:00:00 2001
From: Alexander Graf <agraf@suse.de>
Date: Thu, 1 Dec 2011 19:00:01 +0100
Subject: [PATCH] XXX work around SA_RESTART race with boehm-gc (ARM only)

View File

@ -1,4 +1,4 @@
From 356c3bb04f62ec78f7e8547860a5278af09ecf31 Mon Sep 17 00:00:00 2001
From 9f74f21db9a16aa39543305e866bee65fa3600f3 Mon Sep 17 00:00:00 2001
From: Ulrich Hecht <uli@suse.de>
Date: Tue, 14 Apr 2009 16:18:44 +0200
Subject: [PATCH] qemu-0.9.0.cvs-binfmt

View File

@ -1,4 +1,4 @@
From 3d4f6be5e8c015207cb0eb88b583fe5c7dff5e1b Mon Sep 17 00:00:00 2001
From c4c3a1610d2255897310ebcfec4c67dbbe7bdc04 Mon Sep 17 00:00:00 2001
From: Alexander Graf <agraf@suse.de>
Date: Tue, 14 Apr 2009 16:20:50 +0200
Subject: [PATCH] qemu-cvs-alsa_bitfield

View File

@ -1,4 +1,4 @@
From 2d904fc3b891478a2e5f441ae11ccc6815a691fa Mon Sep 17 00:00:00 2001
From 5f271962cd70d1acee01d90f8e18434f278df151 Mon Sep 17 00:00:00 2001
From: Alexander Graf <agraf@suse.de>
Date: Tue, 14 Apr 2009 16:23:27 +0200
Subject: [PATCH] qemu-cvs-alsa_ioctl

View File

@ -1,4 +1,4 @@
From 8aa372d7222fae8585ad70c1f21dee6b58342b1d Mon Sep 17 00:00:00 2001
From 394efaf58c0588b971b0e1841daec08807e16d8a Mon Sep 17 00:00:00 2001
From: Alexander Graf <agraf@suse.de>
Date: Tue, 14 Apr 2009 16:24:15 +0200
Subject: [PATCH] qemu-cvs-alsa_mmap

View File

@ -1,4 +1,4 @@
From 3ede5ef28d412e67ad69f844462214373ffff070 Mon Sep 17 00:00:00 2001
From c5f7ac6f39aa8ccd9599c860fd1ea29c7de45074 Mon Sep 17 00:00:00 2001
From: Ulrich Hecht <uli@suse.de>
Date: Tue, 14 Apr 2009 16:25:41 +0200
Subject: [PATCH] qemu-cvs-gettimeofday

View File

@ -1,4 +1,4 @@
From cf57bf12cc18d5e3343e58c31d21dda05d1b0d2a Mon Sep 17 00:00:00 2001
From 2a1fa27b05b827ebd398af907462a5d68471e96d Mon Sep 17 00:00:00 2001
From: Alexander Graf <agraf@suse.de>
Date: Tue, 14 Apr 2009 16:26:33 +0200
Subject: [PATCH] qemu-cvs-ioctl_debug

View File

@ -1,4 +1,4 @@
From 05896a51357189170f2e645b09fdf8a6d883c5e6 Mon Sep 17 00:00:00 2001
From 6b28210f9a09e5d3e4daedc7da1a80cece8cdef3 Mon Sep 17 00:00:00 2001
From: Alexander Graf <agraf@suse.de>
Date: Tue, 14 Apr 2009 16:27:36 +0200
Subject: [PATCH] qemu-cvs-ioctl_nodirection

View File

@ -1,4 +1,4 @@
From b1cda166ddfec68baa01b494dec64a2f32d23bd9 Mon Sep 17 00:00:00 2001
From c4310aa4c3f20d29b923eca9e37206c36ef30039 Mon Sep 17 00:00:00 2001
From: Ulrich Hecht <uli@suse.de>
Date: Tue, 14 Apr 2009 16:37:42 +0200
Subject: [PATCH] block/vmdk: Support creation of SCSI VMDK images in qemu-img

View File

@ -1,4 +1,4 @@
From 2fef2d48c6c719ce1adc9164954cc195e8878b48 Mon Sep 17 00:00:00 2001
From 39d021f3946fe2941f3634d59c5dccd8b8f4f686 Mon Sep 17 00:00:00 2001
From: Ulrich Hecht <uli@suse.de>
Date: Wed, 25 Aug 2010 14:23:43 +0200
Subject: [PATCH] configure: Enable mipsn32*-linux-user builds
@ -15,7 +15,7 @@ Signed-off-by: Andreas Färber <afaerber@suse.de>
1 Datei geändert, 2 Zeilen hinzugefügt(+)
diff --git a/configure b/configure
index 780b19a..92c010f 100755
index 994f731..401f369 100755
--- a/configure
+++ b/configure
@@ -952,6 +952,8 @@ microblaze-linux-user \

View File

@ -1,4 +1,4 @@
From 36b66d756ba6639f5bfe6d84c4ec6634ea35708e Mon Sep 17 00:00:00 2001
From d1ec1ef3e5ece7526d73408f0b32a31a1d18017d Mon Sep 17 00:00:00 2001
From: Alexander Graf <agraf@suse.de>
Date: Fri, 30 Sep 2011 19:40:36 +0200
Subject: [PATCH] linux-user: add binfmt wrapper for argv[0] handling
@ -35,7 +35,7 @@ Signed-off-by: Andreas Färber <afaerber@suse.de>
create mode 100644 linux-user/binfmt.c
diff --git a/Makefile.target b/Makefile.target
index 8b658c0..206a232 100644
index 927347b..dc7efe9 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -31,6 +31,10 @@ PROGS+=$(QEMU_PROGW)
@ -58,8 +58,8 @@ index 8b658c0..206a232 100644
endif #CONFIG_LINUX_USER
#########################################################
@@ -144,6 +150,9 @@ GENERATED_HEADERS += hmp-commands.h qmp-commands-old.h
endif # CONFIG_SOFTMMU
@@ -147,6 +153,9 @@ endif # CONFIG_SOFTMMU
%/translate.o: QEMU_CFLAGS += $(TRANSLATE_OPT_CFLAGS)
nested-vars += obj-y
+ifdef CONFIG_LINUX_USER
@ -68,7 +68,7 @@ index 8b658c0..206a232 100644
# This resolves all nested paths, so it must come last
include $(SRC_PATH)/Makefile.objs
@@ -171,6 +180,9 @@ $(QEMU_PROG): $(all-obj-y) ../libqemustub.a
@@ -174,6 +183,9 @@ $(QEMU_PROG): $(all-obj-y) ../libqemustub.a
$(call LINK,$^)
endif

View File

@ -1,4 +1,4 @@
From a0a68011fcb6967b57ed3ab82297a7cd67d1f242 Mon Sep 17 00:00:00 2001
From 467be0678c62e992057a73553f80e6d5a3cbb703 Mon Sep 17 00:00:00 2001
From: Alexander Graf <agraf@suse.de>
Date: Sun, 11 Dec 2011 01:19:24 +0100
Subject: [PATCH] linux-user: Ignore timer_create syscall

View File

@ -1,4 +1,4 @@
From bcdbe11fc32deb887239942dbb937a1364dcf0b5 Mon Sep 17 00:00:00 2001
From f55bb15ac5be15a9179df2a905c1582be3d16443 Mon Sep 17 00:00:00 2001
From: Alexander Graf <agraf@suse.de>
Date: Sun, 11 Dec 2011 01:21:51 +0100
Subject: [PATCH] linux-user: be silent about capget failures

View File

@ -1,4 +1,4 @@
From 62d2afce83ee9e3e3be6d5fdca9881b50ff76335 Mon Sep 17 00:00:00 2001
From 821488854490c91bec4912b95a170fdb1835a22a Mon Sep 17 00:00:00 2001
From: Alexander Graf <agraf@suse.de>
Date: Fri, 6 Jan 2012 01:05:55 +0100
Subject: [PATCH] PPC: KVM: Disable mmu notifier check

View File

@ -1,4 +1,4 @@
From 6e109b9641234cc0fb20bd1aa254de41a5b8d82d Mon Sep 17 00:00:00 2001
From a4ad67884e8b3c45018638dca0906fb492750d66 Mon Sep 17 00:00:00 2001
From: Alexander Graf <agraf@suse.de>
Date: Fri, 13 Jan 2012 17:05:41 +0100
Subject: [PATCH] linux-user: fix segfault deadlock

View File

@ -1,4 +1,4 @@
From 43791bf2575328883edccf7d2dd8c5b8dc08ead3 Mon Sep 17 00:00:00 2001
From b117b0b71cb9db82e92f135c7c2c6019968ee4d2 Mon Sep 17 00:00:00 2001
From: Alexander Graf <agraf@suse.de>
Date: Thu, 2 Feb 2012 18:02:33 +0100
Subject: [PATCH] linux-user: binfmt: support host binaries

View File

@ -1,4 +1,4 @@
From fe632f1782d2b8b98c9e958b33cee9443b0a59b9 Mon Sep 17 00:00:00 2001
From bb8b1492d54777f51e5a6adf003bc62f91175524 Mon Sep 17 00:00:00 2001
From: Alexander Graf <agraf@suse.de>
Date: Tue, 29 May 2012 15:30:01 +0200
Subject: [PATCH] linux-user: arm: no tb_flush on reset

View File

@ -1,4 +1,4 @@
From 0dbc0c5f126ca20f6a8606abf8f7a714fd61788e Mon Sep 17 00:00:00 2001
From 83aeb9653d0cc0c16007eeee9b8e92ff7aca2d12 Mon Sep 17 00:00:00 2001
From: Alexander Graf <agraf@suse.de>
Date: Tue, 12 Jun 2012 04:41:10 +0200
Subject: [PATCH] linux-user: Ignore broken loop ioctl

View File

@ -1,4 +1,4 @@
From d9710a8b8c7a8118d93ae3e8eaa11b66ca68a1b6 Mon Sep 17 00:00:00 2001
From d53d69e169f1b1b7b0f4dc2e62110ffe9fdde0d3 Mon Sep 17 00:00:00 2001
From: Alexander Graf <agraf@suse.de>
Date: Mon, 25 Jun 2012 19:02:32 +0200
Subject: [PATCH] linux-user: fix segmentation fault passing with g2h(x) != x

View File

@ -1,4 +1,4 @@
From b513d3defee96f01751050e5a9c80b64a3703d10 Mon Sep 17 00:00:00 2001
From fd5f1d63b3b05def9f5c02540c1ea3b194bbbac9 Mon Sep 17 00:00:00 2001
From: Alexander Graf <agraf@suse.de>
Date: Thu, 5 Jul 2012 17:31:39 +0200
Subject: [PATCH] linux-user: lock tcg

View File

@ -1,4 +1,4 @@
From 871faba46546dc6779367f54e19cf047109d798b Mon Sep 17 00:00:00 2001
From ffc5a9a892bd9c308317cff9eec6b1dc5cc08bb9 Mon Sep 17 00:00:00 2001
From: Alexander Graf <agraf@suse.de>
Date: Tue, 10 Jul 2012 20:40:55 +0200
Subject: [PATCH] linux-user: Run multi-threaded code on a single core

View File

@ -1,4 +1,4 @@
From 9885e5e4914547201d526a99e4caa8a4fee63af9 Mon Sep 17 00:00:00 2001
From 39b101ab3190d5ebc85e962ae5c4de885623a9f2 Mon Sep 17 00:00:00 2001
From: Alexander Graf <agraf@suse.de>
Date: Wed, 11 Jul 2012 16:47:42 +0200
Subject: [PATCH] linux-user: lock tb flushing too

View File

@ -1,4 +1,4 @@
From 83ca3d1bae2e358de6b61a969fbbfc15f8453593 Mon Sep 17 00:00:00 2001
From d2c0f676f29147107d0650116b9e0d76fa707458 Mon Sep 17 00:00:00 2001
From: Alexander Graf <agraf@suse.de>
Date: Mon, 23 Jul 2012 10:24:14 +0200
Subject: [PATCH] linux-user: Fake /proc/cpuinfo

View File

@ -1,4 +1,4 @@
From 84784064875f20a7fe3a316f345d66e07fac8217 Mon Sep 17 00:00:00 2001
From 8d211b0e9eea14ea4e2934e161d45e1d91250c36 Mon Sep 17 00:00:00 2001
From: Alexander Graf <agraf@suse.de>
Date: Mon, 20 Aug 2012 00:02:52 +0200
Subject: [PATCH] linux-user: implement FS_IOC_GETFLAGS ioctl

View File

@ -1,4 +1,4 @@
From 92409c3abb03697b67ae549180e3c262715c2fb7 Mon Sep 17 00:00:00 2001
From f17ca3834366f90f1c87ff90bc59ee6652d37fa2 Mon Sep 17 00:00:00 2001
From: Alexander Graf <agraf@suse.de>
Date: Mon, 20 Aug 2012 00:07:13 +0200
Subject: [PATCH] linux-user: implement FS_IOC_SETFLAGS ioctl

View File

@ -1,4 +1,4 @@
From 9405a3cad04de0be33cd876f14eb36681dc11f8d Mon Sep 17 00:00:00 2001
From 0270f2ba0e09f6bd0f1bdc57ba38e8acd206ed99 Mon Sep 17 00:00:00 2001
From: Alexander Graf <agraf@suse.de>
Date: Tue, 21 Aug 2012 14:20:40 +0200
Subject: [PATCH] linux-user: XXX disable fiemap

View File

@ -1,4 +1,4 @@
From 1c0ddda02726148363263c18ee3ddef994f930e5 Mon Sep 17 00:00:00 2001
From ce4a86e1d33b1ca4fd3c3bd67a009e74a1dc5636 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20F=C3=A4rber?= <afaerber@suse.de>
Date: Wed, 29 Aug 2012 18:42:56 +0200
Subject: [PATCH] slirp: -nooutgoing
@ -12,7 +12,7 @@ TBD (from SUSE Studio team)
4 Dateien geändert, 43 Zeilen hinzugefügt(+)
diff --git a/qemu-options.hx b/qemu-options.hx
index d39d0f3..809aef0 100644
index 94a1c50..9635327 100644
--- a/qemu-options.hx
+++ b/qemu-options.hx
@@ -2426,6 +2426,16 @@ Store the QEMU process PID in @var{file}. It is useful if you launch QEMU

View File

@ -1,4 +1,4 @@
From 24780396453f9a3097f79cb3824a80091af4effd Mon Sep 17 00:00:00 2001
From 1915e62ecadb41ebd1fcc563afe4f6c0dea8f43b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20F=C3=A4rber?= <afaerber@suse.de>
Date: Wed, 29 Aug 2012 20:06:01 +0200
Subject: [PATCH] vnc: password-file= and incoming-connections=

View File

@ -1,4 +1,4 @@
From 011ee810830f5ea0418292875999f0638c9b94db Mon Sep 17 00:00:00 2001
From e678a299901888d0187fe8c285f5635ddcd256cc Mon Sep 17 00:00:00 2001
From: Alexander Graf <agraf@suse.de>
Date: Wed, 10 Oct 2012 10:21:20 +0200
Subject: [PATCH] linux-user: add more blk ioctls

View File

@ -1,4 +1,4 @@
From ea51d24bb7a79aa26a210ebde243af2e84cdb866 Mon Sep 17 00:00:00 2001
From dd9837df381040d262ffc9278a4d058360641ff9 Mon Sep 17 00:00:00 2001
From: Alexander Graf <agraf@suse.de>
Date: Tue, 9 Oct 2012 09:06:49 +0200
Subject: [PATCH] linux-user: use target_ulong

View File

@ -1,70 +0,0 @@
From 132be91691913225f5541b66463db6e084221a1b Mon Sep 17 00:00:00 2001
From: Paolo Bonzini <pbonzini@redhat.com>
Date: Wed, 28 Nov 2012 09:40:23 +0100
Subject: [PATCH] build: compile translate.o with -fno-gcse option on GCC
4.6.x and 4.7.[012]
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
These versions of GCC require insane (>2GB) amounts of memory to compile
translate.o. As a countermeasure, disable the culprit optimization pass.
This should fix the buildbot failure for default_x86_64_fedora16. Anyway
this is a good thing to do because people will try to compile 1.3 with
less than 2GB of memory and complain.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Andreas Färber <afaerber@suse.de>
---
Makefile.target | 3 +++
configure | 16 ++++++++++++++++
2 Dateien geändert, 19 Zeilen hinzugefügt(+)
diff --git a/Makefile.target b/Makefile.target
index 206a232..dc7efe9 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -149,6 +149,9 @@ GENERATED_HEADERS += hmp-commands.h qmp-commands-old.h
endif # CONFIG_SOFTMMU
+# Workaround for http://gcc.gnu.org/PR55489, see configure.
+%/translate.o: QEMU_CFLAGS += $(TRANSLATE_OPT_CFLAGS)
+
nested-vars += obj-y
ifdef CONFIG_LINUX_USER
nested-vars += obj-binfmt-y
diff --git a/configure b/configure
index 92c010f..401f369 100755
--- a/configure
+++ b/configure
@@ -1185,6 +1185,21 @@ for flag in $gcc_flags; do
fi
done
+# Workaround for http://gcc.gnu.org/PR55489. Happens with -fPIE/-fPIC and
+# large functions that use global variables. The bug is in all releases of
+# GCC, but it became particularly acute in 4.6.x and 4.7.x. It is fixed in
+# 4.7.3 and 4.8.0. We should be able to delete this at the end of 2013.
+cat > $TMPC << EOF
+#if __GNUC__ == 4 && (__GNUC_MINOR__ == 6 || (__GNUC_MINOR__ == 7 && __GNUC_PATCHLEVEL__ <= 2))
+int main(void) { return 0; }
+#else
+#error No bug in this compiler.
+#endif
+EOF
+if compile_prog "-Werror -fno-gcse" "" ; then
+ TRANSLATE_OPT_CFLAGS=-fno-gcse
+fi
+
if test "$static" = "yes" ; then
if test "$pie" = "yes" ; then
echo "static and pie are mutually incompatible"
@@ -3664,6 +3679,7 @@ echo "LIBS_TOOLS+=$libs_tools" >> $config_host_mak
echo "EXESUF=$EXESUF" >> $config_host_mak
echo "LIBS_QGA+=$libs_qga" >> $config_host_mak
echo "POD2MAN=$POD2MAN" >> $config_host_mak
+echo "TRANSLATE_OPT_CFLAGS=$TRANSLATE_OPT_CFLAGS" >> $config_host_mak
# generate list of library paths for linker script

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:09d197e74b6018fa5c3b58a33c62f266d397e7eac40387e9ff3bf245fd59a215
size 10280905

3
qemu-1.3.0.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:878055ec05bc28fecfe2da97eb8bc992e8635575b67cebdfc5ca1ede171140a8
size 10286423

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Wed Dec 5 10:37:14 UTC 2012 - afaerber@suse.de
- Update to v1.3.0: see http://wiki.qemu.org/ChangeLog/1.3
* Update update_git.sh script accordingly
-------------------------------------------------------------------
Wed Nov 28 12:26:39 UTC 2012 - afaerber@suse.de

View File

@ -21,9 +21,9 @@ Url: http://www.qemu.org/
Summary: Universal CPU emulator
License: BSD-3-Clause ; GPL-2.0+ ; LGPL-2.1+ ; MIT
Group: System/Emulators/PC
Version: 1.3.0rc1
Version: 1.3.0
Release: 0
Source: %name-1.3.0-rc1.tar.bz2
Source: %name-%version.tar.bz2
Patch0001: 0001-Handle-CPU-interrupts-by-inline-che.patch
Patch0002: 0002-XXX-dont-dump-core-on-sigabort.patc.patch
Patch0003: 0003-XXX-work-around-SA_RESTART-race-wit.patch
@ -56,7 +56,6 @@ Patch0029: 0029-slirp-nooutgoing.patch.patch
Patch0030: 0030-vnc-password-file-and-incoming-conn.patch
Patch0031: 0031-linux-user-add-more-blk-ioctls.patc.patch
Patch0032: 0032-linux-user-use-target_ulong.patch.patch
Patch0033: 0033-build-compile-translate.o-with-fno-.patch
# this is to make lint happy
Source300: rpmlintrc
Source302: bridge.conf
@ -174,7 +173,7 @@ emulations. This can be used together with the OBS build script to
run cross-architecture builds.
%prep
%setup -q -n %name-1.3.0-rc1
%setup -q #-n %name-1.3.0-rc1
%patch0001 -p1
%patch0002 -p1
%patch0003 -p1
@ -207,7 +206,6 @@ run cross-architecture builds.
%patch0030 -p1
%patch0031 -p1
%patch0032 -p1
%patch0033 -p1
%build
# build QEMU

View File

@ -21,9 +21,9 @@ Url: http://www.qemu.org/
Summary: Universal CPU emulator
License: BSD-3-Clause ; GPL-2.0+ ; LGPL-2.1+ ; MIT
Group: System/Emulators/PC
Version: 1.3.0rc1
Version: 1.3.0
Release: 0
Source: %name-1.3.0-rc1.tar.bz2
Source: %name-%version.tar.bz2
PATCH_FILES
# this is to make lint happy
Source300: rpmlintrc
@ -142,7 +142,7 @@ emulations. This can be used together with the OBS build script to
run cross-architecture builds.
%prep
%setup -q -n %name-1.3.0-rc1
%setup -q #-n %name-1.3.0-rc1
PATCH_EXEC
%build

View File

@ -13,7 +13,7 @@
GIT_TREE=git://repo.or.cz/qemu/agraf.git
GIT_LOCAL_TREE=/suse/agraf/git/qemu
GIT_BRANCH=suse-1.3
GIT_UPSTREAM_TAG=v1.3.0-rc1
GIT_UPSTREAM_TAG=v1.3.0
QEMU_TMP=/dev/shm/qemu-tmp
# clean up