From 01f066cad7ae0ba906f0d6357f3da14af84dccbec6b427dfe29c964217c283d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Fri, 1 Jun 2012 17:01:11 +0000 Subject: [PATCH] Accepting request 123238 from home:a_faerber:branches:Virtualization Update to v1.1.0-rc4 OBS-URL: https://build.opensuse.org/request/show/123238 OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=76 --- 0001-Handle-CPU-interrupts-by-inline-che.patch | 2 +- 0002-XXX-dont-dump-core-on-sigabort.patc.patch | 2 +- 0003-XXX-work-around-SA_RESTART-race-wit.patch | 2 +- 0004-qemu-0.9.0.cvs-binfmt.patch.patch | 2 +- 0005-qemu-cvs-alsa_bitfield.patch.patch | 2 +- 0006-qemu-cvs-alsa_ioctl.patch.patch | 2 +- 0007-qemu-cvs-alsa_mmap.patch.patch | 2 +- 0008-qemu-cvs-gettimeofday.patch.patch | 2 +- 0009-qemu-cvs-ioctl_debug.patch.patch | 2 +- 0010-qemu-cvs-ioctl_nodirection.patch.patch | 2 +- 0011-qemu-img-vmdk-scsi.patch.patch | 10 +++++----- 0012-configure-Enable-mipsn32-linux-user.patch | 4 ++-- 0013-linux-user-add-binfmt-wrapper-for-a.patch | 2 +- 0014-linux-user-Ignore-timer_create-sysc.patch | 2 +- 0015-linux-user-be-silent-about-capget-f.patch | 2 +- 0016-PPC-KVM-Disable-mmu-notifier-check..patch | 2 +- 0017-linux-user-fix-segfault-deadlock.pa.patch | 2 +- 0018-linux-user-binfmt-support-host-bina.patch | 2 +- 0019-linux-user-ARM-Ignore-immediate-val.patch | 5 +++-- 0020-linux-user-arm-no-tb_flush-on-reset.patch | 2 +- 0021-linux-user-fix-multi-threaded-proc-.patch | 2 +- qemu-1.1.0-rc3.tar.bz2 | 3 --- qemu-1.1.0-rc4.tar.bz2 | 3 +++ qemu.changes | 6 ++++++ qemu.spec | 6 +++--- qemu.spec.in | 6 +++--- update_git.sh | 2 +- 27 files changed, 44 insertions(+), 37 deletions(-) delete mode 100644 qemu-1.1.0-rc3.tar.bz2 create mode 100644 qemu-1.1.0-rc4.tar.bz2 diff --git a/0001-Handle-CPU-interrupts-by-inline-che.patch b/0001-Handle-CPU-interrupts-by-inline-che.patch index 8dcb0a45..fdbdc0a8 100644 --- a/0001-Handle-CPU-interrupts-by-inline-che.patch +++ b/0001-Handle-CPU-interrupts-by-inline-che.patch @@ -1,4 +1,4 @@ -From aa21387b7e43d3aca4a3111502eff7d50e6f5944 Mon Sep 17 00:00:00 2001 +From b4ff079b57be6d450e4373500e1c042bc1c781b6 Mon Sep 17 00:00:00 2001 From: Peter Maydell Date: Wed, 5 Oct 2011 10:04:02 +0100 Subject: [PATCH] Handle CPU interrupts by inline checking of a flag diff --git a/0002-XXX-dont-dump-core-on-sigabort.patc.patch b/0002-XXX-dont-dump-core-on-sigabort.patc.patch index 935f0bac..6ccd378e 100644 --- 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 57a19d136179d433b20ca977c5db54156a4959a3 Mon Sep 17 00:00:00 2001 +From ac5911aa43d91101e493aeab0d32de462e9fbf71 Mon Sep 17 00:00:00 2001 From: Alexander Graf Date: Mon, 21 Nov 2011 23:50:36 +0100 Subject: [PATCH] XXX dont dump core on sigabort diff --git a/0003-XXX-work-around-SA_RESTART-race-wit.patch b/0003-XXX-work-around-SA_RESTART-race-wit.patch index a8fb95c0..6d9e38cc 100644 --- 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 ecdca756dc912d0fb26c28bff701cc2b2b4402d6 Mon Sep 17 00:00:00 2001 +From 473e1cb5e0edaedcbbde70b6db5b67efee755fec Mon Sep 17 00:00:00 2001 From: Alexander Graf Date: Thu, 1 Dec 2011 19:00:01 +0100 Subject: [PATCH] XXX work around SA_RESTART race with boehm-gc (ARM only) diff --git a/0004-qemu-0.9.0.cvs-binfmt.patch.patch b/0004-qemu-0.9.0.cvs-binfmt.patch.patch index 0fbe5f72..8be3cfe8 100644 --- 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 81905e73a67bfd1427c17a7047d6ab89a51fe3e2 Mon Sep 17 00:00:00 2001 +From e810fadc66c4dee2781781cd152e6456b552ed3a Mon Sep 17 00:00:00 2001 From: Ulrich Hecht Date: Tue, 14 Apr 2009 16:18:44 +0200 Subject: [PATCH] qemu-0.9.0.cvs-binfmt diff --git a/0005-qemu-cvs-alsa_bitfield.patch.patch b/0005-qemu-cvs-alsa_bitfield.patch.patch index 84a0e7e4..427f0488 100644 --- a/0005-qemu-cvs-alsa_bitfield.patch.patch +++ b/0005-qemu-cvs-alsa_bitfield.patch.patch @@ -1,4 +1,4 @@ -From c288ae94b668f69e51a118f4a4bf40cd3a34420c Mon Sep 17 00:00:00 2001 +From bcf021390a99fa6cba78d6b8334174e909b414e3 Mon Sep 17 00:00:00 2001 From: Alexander Graf Date: Tue, 14 Apr 2009 16:20:50 +0200 Subject: [PATCH] qemu-cvs-alsa_bitfield diff --git a/0006-qemu-cvs-alsa_ioctl.patch.patch b/0006-qemu-cvs-alsa_ioctl.patch.patch index cc3d57ee..4a8d8623 100644 --- a/0006-qemu-cvs-alsa_ioctl.patch.patch +++ b/0006-qemu-cvs-alsa_ioctl.patch.patch @@ -1,4 +1,4 @@ -From 67adcc55cb9043b1ad83821ed4ac937c5c642e9f Mon Sep 17 00:00:00 2001 +From ca6e3990affefff3a2e1049a46ee43f36615d764 Mon Sep 17 00:00:00 2001 From: Alexander Graf Date: Tue, 14 Apr 2009 16:23:27 +0200 Subject: [PATCH] qemu-cvs-alsa_ioctl diff --git a/0007-qemu-cvs-alsa_mmap.patch.patch b/0007-qemu-cvs-alsa_mmap.patch.patch index c38f8671..4fffbfe2 100644 --- a/0007-qemu-cvs-alsa_mmap.patch.patch +++ b/0007-qemu-cvs-alsa_mmap.patch.patch @@ -1,4 +1,4 @@ -From 4ebd8783b71189cd041058171c2fc21c2283c3c6 Mon Sep 17 00:00:00 2001 +From 0726fe25ef2c60855774b205a0558a04b16c110b Mon Sep 17 00:00:00 2001 From: Alexander Graf Date: Tue, 14 Apr 2009 16:24:15 +0200 Subject: [PATCH] qemu-cvs-alsa_mmap diff --git a/0008-qemu-cvs-gettimeofday.patch.patch b/0008-qemu-cvs-gettimeofday.patch.patch index 86b54d05..c8eda2f6 100644 --- a/0008-qemu-cvs-gettimeofday.patch.patch +++ b/0008-qemu-cvs-gettimeofday.patch.patch @@ -1,4 +1,4 @@ -From a59d2c83f7fbbbf06964c68d411c3876164451e2 Mon Sep 17 00:00:00 2001 +From 580cab745dcbaec7235f674f9fbabccdaebb8a3b Mon Sep 17 00:00:00 2001 From: Ulrich Hecht Date: Tue, 14 Apr 2009 16:25:41 +0200 Subject: [PATCH] qemu-cvs-gettimeofday diff --git a/0009-qemu-cvs-ioctl_debug.patch.patch b/0009-qemu-cvs-ioctl_debug.patch.patch index f480271f..bdbbf4ad 100644 --- a/0009-qemu-cvs-ioctl_debug.patch.patch +++ b/0009-qemu-cvs-ioctl_debug.patch.patch @@ -1,4 +1,4 @@ -From 32368637cf35ce3495b1e834e116f561b4ba50ee Mon Sep 17 00:00:00 2001 +From 09922bf7854275573fbdbf6d464ad5636dc983fa Mon Sep 17 00:00:00 2001 From: Alexander Graf Date: Tue, 14 Apr 2009 16:26:33 +0200 Subject: [PATCH] qemu-cvs-ioctl_debug diff --git a/0010-qemu-cvs-ioctl_nodirection.patch.patch b/0010-qemu-cvs-ioctl_nodirection.patch.patch index c4494446..22de5674 100644 --- a/0010-qemu-cvs-ioctl_nodirection.patch.patch +++ b/0010-qemu-cvs-ioctl_nodirection.patch.patch @@ -1,4 +1,4 @@ -From 8cf7f450f84e39841daefcbe1e7d2c2b586da423 Mon Sep 17 00:00:00 2001 +From db9cefd81e7978e63b09b41c5ce26bb96bf2491f Mon Sep 17 00:00:00 2001 From: Alexander Graf Date: Tue, 14 Apr 2009 16:27:36 +0200 Subject: [PATCH] qemu-cvs-ioctl_nodirection diff --git a/0011-qemu-img-vmdk-scsi.patch.patch b/0011-qemu-img-vmdk-scsi.patch.patch index 0bca5a62..5bf7cf74 100644 --- a/0011-qemu-img-vmdk-scsi.patch.patch +++ b/0011-qemu-img-vmdk-scsi.patch.patch @@ -1,4 +1,4 @@ -From a54f38f19edeca1a17a97d70f892fc5f5c0dec4a Mon Sep 17 00:00:00 2001 +From 93c98c433f5cf084032888d32dc13efcfc5227bd Mon Sep 17 00:00:00 2001 From: Ulrich Hecht Date: Tue, 14 Apr 2009 16:37:42 +0200 Subject: [PATCH] qemu-img-vmdk-scsi @@ -14,10 +14,10 @@ Signed-off-by: Ulrich Hecht 4 files changed, 23 insertions(+), 4 deletions(-) diff --git a/block.c b/block.c -index af2ab4f..185a9d4 100644 +index 7547051..6a68221 100644 --- a/block.c +++ b/block.c -@@ -4028,7 +4028,7 @@ int bdrv_img_create(const char *filename, const char *fmt, +@@ -4039,7 +4039,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 af2ab4f..185a9d4 100644 BlockDriverState *bs = NULL; BlockDriver *drv, *proto_drv; BlockDriver *backing_drv = NULL; -@@ -4143,6 +4143,9 @@ int bdrv_img_create(const char *filename, const char *fmt, +@@ -4154,6 +4154,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 b80e66d..e1c436f 100644 +index 3d4abc6..3d5a855 100644 --- a/block_int.h +++ b/block_int.h @@ -33,6 +33,7 @@ diff --git a/0012-configure-Enable-mipsn32-linux-user.patch b/0012-configure-Enable-mipsn32-linux-user.patch index baf1199f..8a70ebc1 100644 --- a/0012-configure-Enable-mipsn32-linux-user.patch +++ b/0012-configure-Enable-mipsn32-linux-user.patch @@ -1,4 +1,4 @@ -From b8b5443e2536b424f19f129aab01b314629cf71c Mon Sep 17 00:00:00 2001 +From bff8ce4f5827e994a74f376bf46d5a58e5821b71 Mon Sep 17 00:00:00 2001 From: Ulrich Hecht 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 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/configure b/configure -index b55a792..ba4e6ef 100755 +index 1f338f8..de92ac2 100755 --- a/configure +++ b/configure @@ -950,6 +950,8 @@ microblaze-linux-user \ diff --git a/0013-linux-user-add-binfmt-wrapper-for-a.patch b/0013-linux-user-add-binfmt-wrapper-for-a.patch index cfc758dc..bebcab43 100644 --- 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 c0ec70b085b57e2381c49a82f9f7f3ff0f20ef34 Mon Sep 17 00:00:00 2001 +From a795b137b7aa571d81c691392cf6a249a7b1c33f Mon Sep 17 00:00:00 2001 From: Alexander Graf Date: Fri, 30 Sep 2011 19:40:36 +0200 Subject: [PATCH] linux-user: add binfmt wrapper for argv[0] handling diff --git a/0014-linux-user-Ignore-timer_create-sysc.patch b/0014-linux-user-Ignore-timer_create-sysc.patch index c6035b01..19410d12 100644 --- a/0014-linux-user-Ignore-timer_create-sysc.patch +++ b/0014-linux-user-Ignore-timer_create-sysc.patch @@ -1,4 +1,4 @@ -From 29ad679d9dd393b11ec4fcc6a3cd727f940c0f9a Mon Sep 17 00:00:00 2001 +From 038680d6e3fe7fed37eaf7f6f0d669bd744e00cf Mon Sep 17 00:00:00 2001 From: Alexander Graf Date: Sun, 11 Dec 2011 01:19:24 +0100 Subject: [PATCH] linux-user: Ignore timer_create syscall diff --git a/0015-linux-user-be-silent-about-capget-f.patch b/0015-linux-user-be-silent-about-capget-f.patch index f6735ca4..bbcdb75e 100644 --- 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 5b4c584e124e65986327b21632704e6fca215b16 Mon Sep 17 00:00:00 2001 +From abfddfbe9105de3fa1c66d9f57fb7877ba81a7b0 Mon Sep 17 00:00:00 2001 From: Alexander Graf Date: Sun, 11 Dec 2011 01:21:51 +0100 Subject: [PATCH] linux-user: be silent about capget failures diff --git a/0016-PPC-KVM-Disable-mmu-notifier-check..patch b/0016-PPC-KVM-Disable-mmu-notifier-check..patch index 71bd72a7..3afdeeb8 100644 --- a/0016-PPC-KVM-Disable-mmu-notifier-check..patch +++ b/0016-PPC-KVM-Disable-mmu-notifier-check..patch @@ -1,4 +1,4 @@ -From de50438d31a9932762c2c5d0903ad13c8d55687c Mon Sep 17 00:00:00 2001 +From 53145c17ce102c6af036c7b8bd39223a4d2dcd30 Mon Sep 17 00:00:00 2001 From: Alexander Graf Date: Fri, 6 Jan 2012 01:05:55 +0100 Subject: [PATCH] PPC: KVM: Disable mmu notifier check diff --git a/0017-linux-user-fix-segfault-deadlock.pa.patch b/0017-linux-user-fix-segfault-deadlock.pa.patch index 26588ca4..15efae0e 100644 --- a/0017-linux-user-fix-segfault-deadlock.pa.patch +++ b/0017-linux-user-fix-segfault-deadlock.pa.patch @@ -1,4 +1,4 @@ -From de5f7df26151409673c7bdeb575b10f445484ba8 Mon Sep 17 00:00:00 2001 +From 5f7a79a61617f28af048f9f15fd6afc708f96014 Mon Sep 17 00:00:00 2001 From: Alexander Graf Date: Fri, 13 Jan 2012 17:05:41 +0100 Subject: [PATCH] linux-user: fix segfault deadlock diff --git a/0018-linux-user-binfmt-support-host-bina.patch b/0018-linux-user-binfmt-support-host-bina.patch index bba16d3b..94421e12 100644 --- a/0018-linux-user-binfmt-support-host-bina.patch +++ b/0018-linux-user-binfmt-support-host-bina.patch @@ -1,4 +1,4 @@ -From 4df8827ec139f55465022210a0d28e65538134cc Mon Sep 17 00:00:00 2001 +From 509297d25e3f13ba048bffd5ec9fd0c1ee35d490 Mon Sep 17 00:00:00 2001 From: Alexander Graf Date: Thu, 2 Feb 2012 18:02:33 +0100 Subject: [PATCH] linux-user: binfmt: support host binaries diff --git a/0019-linux-user-ARM-Ignore-immediate-val.patch b/0019-linux-user-ARM-Ignore-immediate-val.patch index b860b26b..fa0ce3e1 100644 --- a/0019-linux-user-ARM-Ignore-immediate-val.patch +++ b/0019-linux-user-ARM-Ignore-immediate-val.patch @@ -1,7 +1,8 @@ -From af0dbc540b4acc54ec9f4d1064402f75edb5a7ca Mon Sep 17 00:00:00 2001 +From fe0e160212358a726be7ea98a99d889352489de6 Mon Sep 17 00:00:00 2001 From: Alexander Graf Date: Tue, 29 May 2012 17:28:07 +0200 -Subject: [PATCH] linux-user: ARM: Ignore immediate value for svc in thumb mode +Subject: [PATCH] linux-user: ARM: Ignore immediate value for svc in thumb + mode When running in thumb mode, Linux doesn't evaluate the immediate value of the svc instruction, but instead just always assumes the syscall number diff --git a/0020-linux-user-arm-no-tb_flush-on-reset.patch b/0020-linux-user-arm-no-tb_flush-on-reset.patch index 553dc358..e687eab3 100644 --- a/0020-linux-user-arm-no-tb_flush-on-reset.patch +++ b/0020-linux-user-arm-no-tb_flush-on-reset.patch @@ -1,4 +1,4 @@ -From dd7f9e4fea6ca5444233f75e7329738e08e773af Mon Sep 17 00:00:00 2001 +From ff80c98ea2d617bfd88ac6c611b584eaf0240f3b Mon Sep 17 00:00:00 2001 From: Alexander Graf Date: Tue, 29 May 2012 15:30:01 +0200 Subject: [PATCH] linux-user: arm: no tb_flush on reset diff --git a/0021-linux-user-fix-multi-threaded-proc-.patch b/0021-linux-user-fix-multi-threaded-proc-.patch index 29e051e5..6dd6fd70 100644 --- a/0021-linux-user-fix-multi-threaded-proc-.patch +++ b/0021-linux-user-fix-multi-threaded-proc-.patch @@ -1,4 +1,4 @@ -From 3f4da458294fda52c7595bbb1fb9ca3d50e5b887 Mon Sep 17 00:00:00 2001 +From 1cb769b4b1de47efe04fe50bb351a6367eb0a477 Mon Sep 17 00:00:00 2001 From: Alexander Graf Date: Wed, 30 May 2012 14:40:47 +0200 Subject: [PATCH] linux-user: fix multi-threaded /proc/self/maps diff --git a/qemu-1.1.0-rc3.tar.bz2 b/qemu-1.1.0-rc3.tar.bz2 deleted file mode 100644 index 80adaf60..00000000 --- a/qemu-1.1.0-rc3.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:be2ed9f6bc8b34ea8911c99441aa9340caa48d3f711e54e5852485f72d9cc95e -size 9629810 diff --git a/qemu-1.1.0-rc4.tar.bz2 b/qemu-1.1.0-rc4.tar.bz2 new file mode 100644 index 00000000..7da8231c --- /dev/null +++ b/qemu-1.1.0-rc4.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a169284fd393853981d3060787671903737101f3f366e922e5a593328799f71d +size 9637922 diff --git a/qemu.changes b/qemu.changes index 7c953623..c845ff4a 100644 --- a/qemu.changes +++ b/qemu.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Jun 1 13:22:09 UTC 2012 - afaerber@suse.de + +- Update to v1.1.0-rc4: see http://wiki.qemu.org/ChangeLog/1.1 +* Adapt update_git.sh script to new tag + ------------------------------------------------------------------- Thu May 31 17:37:26 UTC 2012 - agraf@suse.com diff --git a/qemu.spec b/qemu.spec index 40fa6c8d..76439db8 100644 --- 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.1.0rc3 +Version: 1.1.0rc4 Release: 0 -Source: %name-1.1.0-rc3.tar.bz2 +Source: %name-1.1.0-rc4.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 @@ -114,7 +114,7 @@ emulations. This can be used together with the OBS build script to run cross architectures builds %prep -%setup -q -n qemu-1.1.0-rc3 +%setup -q -n qemu-1.1.0-rc4 %patch0001 -p1 %patch0002 -p1 %patch0003 -p1 diff --git a/qemu.spec.in b/qemu.spec.in index fa895854..5fb57539 100644 --- 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.1.0rc3 +Version: 1.1.0rc4 Release: 0 -Source: %name-1.1.0-rc3.tar.bz2 +Source: %name-1.1.0-rc4.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.0-rc3 +%setup -q -n qemu-1.1.0-rc4 PATCH_EXEC %build diff --git a/update_git.sh b/update_git.sh index 4ffe314f..b1840917 100644 --- 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.0-rc3 +GIT_UPSTREAM_TAG=v1.1.0-rc4 QEMU_TMP=/dev/shm/qemu-tmp # clean up