Accepting request 121369 from home:a_faerber:branches:Virtualization

Update qemu to v1.1.0-rc2 for 12.2. OBS-URL: https://build.opensuse.org/request/show/121369 OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=68
2012-05-18 08:36:15 +00:00 · 2012-05-18 08:36:15 +00:00 · 02ab0e5e49
commit 02ab0e5e49
parent cbf3904adc
25 changed files with 47 additions and 40 deletions
--- a/0001-Handle-CPU-interrupts-by-inline-che.patch
+++ b/0001-Handle-CPU-interrupts-by-inline-che.patch
@ -1,4 +1,4 @@
-From 68f2d99027d69029f20714134d0dc0e29751ba1c Mon Sep 17 00:00:00 2001
+From 002c26350cbb05845cd06a8100309a1076da14fd 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 191b750..dd340b2 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 a169792..c50c3d9 100644
+index 8b66264..6d66113 100644
 --- a/qemu-options.hx
 +++ b/qemu-options.hx
@@ -1176,6 +1176,15 @@ STEXI
@ -187,7 +187,7 @@ index a169792..c50c3d9 100644
     "-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"
     "                ACPI table description\n", QEMU_ARCH_I386)
 diff --git a/vl.c b/vl.c
-index 5e0080b..7388894 100644
+index 23ab3a3..a33c28e 100644
 --- a/vl.c
 +++ b/vl.c
@@ -175,6 +175,8 @@ int main(int argc, char **argv)
@ -199,7 +199,7 @@ index 5e0080b..7388894 100644
 static const char *data_dir;
 const char *bios_name = NULL;
 enum vga_retrace_method vga_retrace_method = VGA_RETRACE_DUMB;
-@@ -2952,6 +2954,9 @@ int main(int argc, char **argv, char **envp)
+@@ -2958,6 +2960,9 @@ int main(int argc, char **argv, char **envp)
                 qdev_prop_register_global_list(slew_lost_ticks);
                 break;
             }
--- a/0002-XXX-dont-dump-core-on-sigabort.patc.patch
+++ b/0002-XXX-dont-dump-core-on-sigabort.patc.patch
@ -1,4 +1,4 @@
-From f13c82700bcd83f761f26cce053bb28645d911da Mon Sep 17 00:00:00 2001
+From 3ed6f69a55bc64d4bb170b4c70311db88f6dc825 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
--- a/0003-XXX-work-around-SA_RESTART-race-wit.patch
+++ b/0003-XXX-work-around-SA_RESTART-race-wit.patch
@ -1,4 +1,4 @@
-From 9c71705a2b6a9158395d4fe7ffa1f01f96147853 Mon Sep 17 00:00:00 2001
+From 5420c1c9ad6917bd1b47cf376a54c971fe050235 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)
--- a/0004-qemu-0.9.0.cvs-binfmt.patch.patch
+++ b/0004-qemu-0.9.0.cvs-binfmt.patch.patch
@ -1,4 +1,4 @@
-From 9fd07e26c8f291c88767bb87554fd87dd8a25cef Mon Sep 17 00:00:00 2001
+From a43a64a7b306d5b4ad082f869b96bfb2c5da7bd8 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
--- a/0005-qemu-cvs-alsa_bitfield.patch.patch
+++ b/0005-qemu-cvs-alsa_bitfield.patch.patch
@ -1,4 +1,4 @@
-From 9d68e3cb751e959153d871dcec5ad1f886310fbb Mon Sep 17 00:00:00 2001
+From 9b28a18ac98e51d95ae144a8e582e289d30a04c6 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
--- a/0006-qemu-cvs-alsa_ioctl.patch.patch
+++ b/0006-qemu-cvs-alsa_ioctl.patch.patch
@ -1,4 +1,4 @@
-From 7e7282a1d286a0f74ec68aa71045d38bc621d432 Mon Sep 17 00:00:00 2001
+From b0d5253d25c721d59c8b65173b0ef34764ae2b9a 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
--- a/0007-qemu-cvs-alsa_mmap.patch.patch
+++ b/0007-qemu-cvs-alsa_mmap.patch.patch
@ -1,4 +1,4 @@
-From 4fd0317f52777ae9aa0e8a4014dda2b865bd4fea Mon Sep 17 00:00:00 2001
+From 7d8d450f8bda6d15dd4b8383cfe26dd129565523 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
--- a/0008-qemu-cvs-gettimeofday.patch.patch
+++ b/0008-qemu-cvs-gettimeofday.patch.patch
@ -1,4 +1,4 @@
-From c458eaeb60abb6559db9d8bfbe094971465f8e7f Mon Sep 17 00:00:00 2001
+From 3951c2933151d9e8fc10263d84d88e4ca5c50227 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
--- a/0009-qemu-cvs-ioctl_debug.patch.patch
+++ b/0009-qemu-cvs-ioctl_debug.patch.patch
@ -1,4 +1,4 @@
-From 4926e0a44e1792a71affae93a4d2c09e4142730f Mon Sep 17 00:00:00 2001
+From ff78ff3488efc926c745068402079d0ab1ad7631 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
--- a/0010-qemu-cvs-ioctl_nodirection.patch.patch
+++ b/0010-qemu-cvs-ioctl_nodirection.patch.patch
@ -1,4 +1,4 @@
-From 39a37ac06abbe3a4e4e9156d2ec2c39034bf0979 Mon Sep 17 00:00:00 2001
+From d0e2270eed1ce0d1ba056f367901890085fadc38 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
--- a/0011-qemu-img-vmdk-scsi.patch.patch
+++ b/0011-qemu-img-vmdk-scsi.patch.patch
@ -1,4 +1,4 @@
-From fa76f1e59154356590a2a6250ea83426523efff5 Mon Sep 17 00:00:00 2001
+From cb02c392f4b137aab475f9d7e1f00a52c5fc2540 Mon Sep 17 00:00:00 2001
 From: Ulrich Hecht <uli@suse.de>
 Date: Tue, 14 Apr 2009 16:37:42 +0200
 Subject: [PATCH] qemu-img-vmdk-scsi
@ -14,10 +14,10 @@ Signed-off-by: Ulrich Hecht <uli@suse.de>
 4 files changed, 23 insertions(+), 4 deletions(-)

 diff --git a/block.c b/block.c
-index ee7d8f2..72d0d83 100644
+index af2ab4f..185a9d4 100644
 --- a/block.c
 +++ b/block.c
-@@ -3984,7 +3984,7 @@ int bdrv_img_create(const char *filename, const char *fmt,
+@@ -4028,7 +4028,7 @@ int bdrv_img_create(const char *filename, const char *fmt,
                     char *options, uint64_t img_size, int flags)
 {
     QEMUOptionParameter *param = NULL, *create_options = NULL;
@ -26,7 +26,7 @@ index ee7d8f2..72d0d83 100644
     BlockDriverState *bs = NULL;
     BlockDriver *drv, *proto_drv;
     BlockDriver *backing_drv = NULL;
-@@ -4094,6 +4094,9 @@ int bdrv_img_create(const char *filename, const char *fmt,
+@@ -4143,6 +4143,9 @@ int bdrv_img_create(const char *filename, const char *fmt,
 
     printf("Formatting '%s', fmt=%s ", filename, fmt);
     print_option_parameters(param);
@ -81,7 +81,7 @@ index 18e9b4c..c153617 100644
 };
 
 diff --git a/block_int.h b/block_int.h
-index 086832a..446a89b 100644
+index b80e66d..e1c436f 100644
 --- a/block_int.h
 +++ b/block_int.h
@@ -33,6 +33,7 @@
@ -101,7 +101,7 @@ index 086832a..446a89b 100644
 #define BLOCK_OPT_BACKING_FMT   "backing_fmt"
 #define BLOCK_OPT_CLUSTER_SIZE  "cluster_size"
 diff --git a/qemu-img.c b/qemu-img.c
-index 0ae543c..f781e74 100644
+index c8a70ff..00e3471 100644
 --- a/qemu-img.c
 +++ b/qemu-img.c
@@ -636,7 +636,7 @@ static int img_convert(int argc, char **argv)
@ -113,7 +113,7 @@ index 0ae543c..f781e74 100644
     char *options = NULL;
     const char *snapshot_name = NULL;
     float local_progress;
-@@ -827,6 +827,12 @@ static int img_convert(int argc, char **argv)
+@@ -829,6 +829,12 @@ static int img_convert(int argc, char **argv)
         }
     }
 
--- a/0012-configure-Enable-mipsn32-linux-user.patch
+++ b/0012-configure-Enable-mipsn32-linux-user.patch
@ -1,4 +1,4 @@
-From 21649a6fc2f9587ecdd517f1b56534e1c8d2c991 Mon Sep 17 00:00:00 2001
+From d9382548ac4cd00fc291ff3a68771b22a7c109f3 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
@ -10,7 +10,7 @@ Signed-off-by: Ulrich Hecht <uli@suse.de>
 1 files changed, 2 insertions(+), 0 deletions(-)

 diff --git a/configure b/configure
-index 491109d..179f5a4 100755
+index b55a792..ba4e6ef 100755
 --- a/configure
 +++ b/configure
@@ -950,6 +950,8 @@ microblaze-linux-user \
--- a/0013-linux-user-add-binfmt-wrapper-for-a.patch
+++ b/0013-linux-user-add-binfmt-wrapper-for-a.patch
@ -1,4 +1,4 @@
-From 00ecaa54b1109b0b1cc3107e853b17010904a3c2 Mon Sep 17 00:00:00 2001
+From f70ff782209a8c427a8abc26869fdd7a397713da 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
--- a/0014-linux-user-Ignore-timer_create-sysc.patch
+++ b/0014-linux-user-Ignore-timer_create-sysc.patch
@ -1,4 +1,4 @@
-From f2eab091930486a05e28182d1df48d660139106d Mon Sep 17 00:00:00 2001
+From e3357e33c9ab4a3c99866b8b4c0f87090b3b7924 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
--- a/0015-linux-user-be-silent-about-capget-f.patch
+++ b/0015-linux-user-be-silent-about-capget-f.patch
@ -1,4 +1,4 @@
-From 54d3ffeae985c6a3b3d1a309793fb11ed3fc6f69 Mon Sep 17 00:00:00 2001
+From d571bef24f31f4304c458c344914eb781aaea720 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
--- a/0016-PPC-KVM-Disable-mmu-notifier-check..patch
+++ b/0016-PPC-KVM-Disable-mmu-notifier-check..patch
@ -1,4 +1,4 @@
-From 77c18bad3637faeae838e920d94a4c84df2d8fbc Mon Sep 17 00:00:00 2001
+From 886cad0ebe89b31347ae5f99b113d8e006e44422 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
--- a/0017-linux-user-fix-segfault-deadlock.pa.patch
+++ b/0017-linux-user-fix-segfault-deadlock.pa.patch
@ -1,4 +1,4 @@
-From 0760e24b52ff20a328f168ed23b52c9b9c0fd28f Mon Sep 17 00:00:00 2001
+From ee04ae5831a4bfb0afb15f21639e9af9232ba21d 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
--- a/0018-linux-user-binfmt-support-host-bina.patch
+++ b/0018-linux-user-binfmt-support-host-bina.patch
@ -1,4 +1,4 @@
-From 67fe8224f47230a5392e7653c7362ac5035cdd3f Mon Sep 17 00:00:00 2001
+From 7e85618275c666be709dd25c8305b2611368101f 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
--- a/0019-linux-user-Fix-stale-tbs-after-mmap.patch
+++ b/0019-linux-user-Fix-stale-tbs-after-mmap.patch
@ -1,4 +1,4 @@
-From 5e2f7416ec737a581f861a9799b8aa5a75235b25 Mon Sep 17 00:00:00 2001
+From 99eac32372c3bee2d801f20e377de23d09e7a25e Mon Sep 17 00:00:00 2001
 From: Alexander Graf <agraf@suse.de>
 Date: Mon, 7 May 2012 11:23:02 +0200
 Subject: [PATCH] linux-user: Fix stale tbs after mmap
--- a/qemu-1.1-rc1.tar.gz
+++ b/qemu-1.1-rc1.tar.gz
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1a74306217925077d32788916f9b65d2cc2b24b00e5bb3bbaf0edb0eb494e824
-size 11702330
--- a/qemu-1.1.0-rc2.tar.bz2
+++ b/qemu-1.1.0-rc2.tar.bz2
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3b3ef767944a8f03d3d2ee6f463af17a29cf0dabf8bc782c9c8eeedfc56fa58c
+size 9627250
--- a/qemu.changes
+++ b/qemu.changes
@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu May 17 17:40:19 UTC 2012 - afaerber@suse.de
+
+- Update to v1.1.0-rc2; see http://wiki.qemu.org/ChangeLog/1.1
+* Adapt update_git.sh script to new tag
+
 -------------------------------------------------------------------
 Wed May 16 01:29:02 UTC 2012 - afaerber@suse.de

--- a/qemu.spec
+++ b/qemu.spec
@ -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.1rc1
+Version:        1.1.0rc2
 Release:        0
-Source:         %name-1.1-rc1.tar.gz
+Source:         %name-1.1.0-rc2.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
@ -112,7 +112,7 @@ emulations. This can be used together with the OBS build script to
 run cross architectures builds

 %prep
-%setup -q -n qemu-1.1-rc1
+%setup -q -n qemu-1.1.0-rc2
 %patch0001 -p1
 %patch0002 -p1
 %patch0003 -p1
@ -141,8 +141,8 @@ mkdir -p dynamic
 	--interp-prefix=%_datadir/%name/qemu-i386 \
 	--audio-card-list="ac97 es1370 sb16 cs4231a adlib gus" \
 	--audio-drv-list="alsa sdl" --enable-mixemu --enable-vde \
+	--enable-curl \
 	--extra-cflags="$QEMU_OPT_FLAGS" --enable-system --disable-linux-user \
-        --enable-curl \
 %if 0%{?suse_version} >= 1130
 %ifarch %ix86 x86_64
 	--enable-spice
--- a/qemu.spec.in
+++ b/qemu.spec.in
@ -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.1rc1
+Version:        1.1.0rc2
 Release:        0
-Source:         %name-1.1-rc1.tar.gz
+Source:         %name-1.1.0-rc2.tar.bz2
 PATCH_FILES
 # this is to make lint happy
 Source300:      rpmlintrc
@ -94,7 +94,7 @@ emulations. This can be used together with the OBS build script to
 run cross architectures builds

 %prep
-%setup -q -n qemu-1.1-rc1
+%setup -q -n qemu-1.1.0-rc2
 PATCH_EXEC

 %build
@ -105,6 +105,7 @@ mkdir -p dynamic
 	--interp-prefix=%_datadir/%name/qemu-i386 \
 	--audio-card-list="ac97 es1370 sb16 cs4231a adlib gus" \
 	--audio-drv-list="alsa sdl" --enable-mixemu --enable-vde \
+	--enable-curl \
 	--extra-cflags="$QEMU_OPT_FLAGS" --enable-system --disable-linux-user \
 %if 0%{?suse_version} >= 1130
 %ifarch %ix86 x86_64
--- a/update_git.sh
+++ b/update_git.sh
@ -13,7 +13,7 @@
 GIT_TREE=git://repo.or.cz/qemu/agraf.git
 GIT_LOCAL_TREE=/suse/agraf/git/qemu
 GIT_BRANCH=suse-1.1
-GIT_UPSTREAM_TAG=v1.1-rc1
+GIT_UPSTREAM_TAG=v1.1.0-rc2
 QEMU_TMP=/dev/shm/qemu-tmp

 # clean up