Accepting request 186604 from home:a_faerber:branches:Virtualization
Update to v1.6.0-rc2 OBS-URL: https://build.opensuse.org/request/show/186604 OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=152
This commit is contained in:
parent
769a86ca3e
commit
981aa4fbe1
@ -1,4 +1,4 @@
|
||||
From 9f1853edb153748ce050a5b4047f93de94be2301 Mon Sep 17 00:00:00 2001
|
||||
From 15747f905f756334a1898ec5a2a9d891435e1586 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
|
||||
|
@ -1,4 +1,4 @@
|
||||
From e1e6fe39f1d4836d3e2e4e3ceb1e3858794b7c0b Mon Sep 17 00:00:00 2001
|
||||
From 30872a812140d17adb162472d1e7fb1c13354b2a 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)
|
||||
|
@ -1,4 +1,4 @@
|
||||
From 6a99fbb5bbd29e9400f1bc1c786dde45cdb134e2 Mon Sep 17 00:00:00 2001
|
||||
From 0f41a2f86d428484850ec7cb1c0a19269b6b1345 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
|
||||
|
@ -1,4 +1,4 @@
|
||||
From d14258bb910817937b8e26222dc8c591cdb8e67e Mon Sep 17 00:00:00 2001
|
||||
From 08143d389678017212214ef0048db0f91f08f3c8 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
|
||||
|
@ -1,4 +1,4 @@
|
||||
From 605167887b9dc25a519479a79b8f05d16f27b20b Mon Sep 17 00:00:00 2001
|
||||
From 66b605b3293cec787097e8633273e8cb71798200 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
|
||||
|
@ -1,4 +1,4 @@
|
||||
From 0ffef5eff15c39e4a1a34755193d236866778ab5 Mon Sep 17 00:00:00 2001
|
||||
From f8f751567651a4ae8329fb5b47bbaf8d94ef66ca 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
|
||||
|
@ -1,4 +1,4 @@
|
||||
From 706d959ced0fb6b80fe8f5611f3123b1224b027f Mon Sep 17 00:00:00 2001
|
||||
From 8baef29567f71f99bb9cda63b6c3476a23bb5131 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
|
||||
|
@ -1,4 +1,4 @@
|
||||
From 52723b24e0587bdacacc3a99245c894eb8faa026 Mon Sep 17 00:00:00 2001
|
||||
From 84ce9ae18a11edf789d491b25568779f6eb58656 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
|
||||
|
@ -1,4 +1,4 @@
|
||||
From 4c12be7a5453109907d37b179547a06b81a17050 Mon Sep 17 00:00:00 2001
|
||||
From 7171ae86b017a66532d147a72fc45d13058c8c5e 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
|
||||
|
@ -1,4 +1,4 @@
|
||||
From 39be5fabccb25aefd02cfb75f6bfc62aa1456fd7 Mon Sep 17 00:00:00 2001
|
||||
From 03df0c9d692c80a71609d7f31a43fb22253ca969 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
|
||||
@ -42,10 +42,10 @@ index 01b66d8..35a07a5 100644
|
||||
}
|
||||
ret = bdrv_create(drv, filename, param);
|
||||
diff --git a/block/vmdk.c b/block/vmdk.c
|
||||
index 3756333..c67bfbf 100644
|
||||
index 346bb5c..c45558c 100644
|
||||
--- a/block/vmdk.c
|
||||
+++ b/block/vmdk.c
|
||||
@@ -1543,6 +1543,8 @@ static int vmdk_create(const char *filename, QEMUOptionParameter *options)
|
||||
@@ -1588,6 +1588,8 @@ static int vmdk_create(const char *filename, QEMUOptionParameter *options)
|
||||
fmt = options->value.s;
|
||||
} else if (!strcmp(options->name, BLOCK_OPT_ZEROED_GRAIN)) {
|
||||
zeroed_grain |= options->value.n;
|
||||
@ -54,7 +54,7 @@ index 3756333..c67bfbf 100644
|
||||
}
|
||||
options++;
|
||||
}
|
||||
@@ -1646,7 +1648,7 @@ static int vmdk_create(const char *filename, QEMUOptionParameter *options)
|
||||
@@ -1691,7 +1693,7 @@ static int vmdk_create(const char *filename, QEMUOptionParameter *options)
|
||||
ext_desc_lines,
|
||||
(flags & BLOCK_FLAG_COMPAT6 ? 6 : 4),
|
||||
total_size / (int64_t)(63 * number_heads * 512), number_heads,
|
||||
@ -63,7 +63,7 @@ index 3756333..c67bfbf 100644
|
||||
if (split || flat) {
|
||||
fd = qemu_open(filename,
|
||||
O_WRONLY | O_CREAT | O_TRUNC | O_BINARY | O_LARGEFILE,
|
||||
@@ -1775,6 +1777,11 @@ static QEMUOptionParameter vmdk_create_options[] = {
|
||||
@@ -1820,6 +1822,11 @@ static QEMUOptionParameter vmdk_create_options[] = {
|
||||
.type = OPT_FLAG,
|
||||
.help = "Enable efficient zero writes using the zeroed-grain GTE feature"
|
||||
},
|
||||
@ -96,10 +96,10 @@ index e45f2a0..74f71ba 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 c55ca5c..d7cc9a1 100644
|
||||
index b9a848d..abf345e 100644
|
||||
--- a/qemu-img.c
|
||||
+++ b/qemu-img.c
|
||||
@@ -1124,7 +1124,7 @@ static int img_convert(int argc, char **argv)
|
||||
@@ -1127,7 +1127,7 @@ static int img_convert(int argc, char **argv)
|
||||
const uint8_t *buf1;
|
||||
BlockDriverInfo bdi;
|
||||
QEMUOptionParameter *param = NULL, *create_options = NULL;
|
||||
@ -108,7 +108,7 @@ index c55ca5c..d7cc9a1 100644
|
||||
char *options = NULL;
|
||||
const char *snapshot_name = NULL;
|
||||
float local_progress = 0;
|
||||
@@ -1326,6 +1326,12 @@ static int img_convert(int argc, char **argv)
|
||||
@@ -1329,6 +1329,12 @@ static int img_convert(int argc, char **argv)
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
From a3b13339ab616989609245a3df2e384637e31071 Mon Sep 17 00:00:00 2001
|
||||
From 0695edba4d788dbe1d67bc115bc907d9d0e09782 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
|
||||
|
@ -1,4 +1,4 @@
|
||||
From 5fedfd6683fef19ab4b3274776ea9904b7b4f83d Mon Sep 17 00:00:00 2001
|
||||
From 97a80319f04b484237b606aef062cd92e287cbf7 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
|
||||
|
@ -1,4 +1,4 @@
|
||||
From 7dd0dcabc75e4bf188b443b45d66c2b7dda6d01f Mon Sep 17 00:00:00 2001
|
||||
From e3b81f1c8f34960b4e2555afc58f88eef90ef17f 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
|
||||
|
@ -1,4 +1,4 @@
|
||||
From cf3f0601f3eeaf71b756643fa8df639177f0c388 Mon Sep 17 00:00:00 2001
|
||||
From 134bb59be7c782e92a214b1b13cf8f7c24ad6efc 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
|
||||
@ -13,10 +13,10 @@ KVM guests work there, even if possibly racy in some odd circumstances.
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/exec.c b/exec.c
|
||||
index c4f2894..b8a41ad 100644
|
||||
index 3ca9381..e4d92d7 100644
|
||||
--- a/exec.c
|
||||
+++ b/exec.c
|
||||
@@ -941,10 +941,12 @@ static void *file_ram_alloc(RAMBlock *block,
|
||||
@@ -944,10 +944,12 @@ static void *file_ram_alloc(RAMBlock *block,
|
||||
return NULL;
|
||||
}
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
From db8bcb578f0ff062b207cf37f00c654fe31a57b1 Mon Sep 17 00:00:00 2001
|
||||
From 49eda97ba76e5ce710116dd6cedd4fffa91f15b7 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
|
||||
|
@ -1,4 +1,4 @@
|
||||
From 4c8c79dcadc2ae2029dedc477ecbca0751d8d0c0 Mon Sep 17 00:00:00 2001
|
||||
From 810c7cd3a2660c33cc0608be19f9fca80579194a 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
|
||||
|
@ -1,4 +1,4 @@
|
||||
From 0de2a590e33c630f2cfef28112396a6d131e5575 Mon Sep 17 00:00:00 2001
|
||||
From 4ab6a287da9ddab9854bef9c0db4d1895e958031 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
|
||||
|
@ -1,4 +1,4 @@
|
||||
From 4fd93de1f83b40e2c8f57dc298c20fe3183271e8 Mon Sep 17 00:00:00 2001
|
||||
From 683a4ced1a0d35dec7bf77b06d34ed15ff7d024b 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
|
||||
|
@ -1,43 +0,0 @@
|
||||
From fe51d474086e98a87732b693c5a715691d03a42d 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
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
When forwarding a segmentation fault into the guest process, we were passing
|
||||
the host's address directly into the guest process's signal descriptor.
|
||||
|
||||
That obviously confused the guest process, since it didn't know what to make
|
||||
of the (usually 32-bit truncated) address. Passing in g2h(address) makes the
|
||||
guest process a lot happier.
|
||||
|
||||
This fixes java running in arm-linux-user for me.
|
||||
|
||||
Signed-off-by: Alexander Graf <agraf@suse.de>
|
||||
[AF: Rebased onto AREG0 fix for v1.2, squashed fixup by agraf]
|
||||
Signed-off-by: Andreas Färber <afaerber@suse.de>
|
||||
---
|
||||
user-exec.c | 8 +++++---
|
||||
1 file changed, 5 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/user-exec.c b/user-exec.c
|
||||
index dd46019..1e8d3f1 100644
|
||||
--- a/user-exec.c
|
||||
+++ b/user-exec.c
|
||||
@@ -99,9 +99,11 @@ static inline int handle_cpu_signal(uintptr_t pc, unsigned long address,
|
||||
return 1;
|
||||
}
|
||||
|
||||
- /* Convert forcefully to guest address space, invalid addresses
|
||||
- are still valid segv ones */
|
||||
- address = h2g_nocheck(address);
|
||||
+ if (RESERVED_VA) {
|
||||
+ /* Convert forcefully to guest address space, invalid addresses
|
||||
+ are still valid segv ones */
|
||||
+ address = address - GUEST_BASE;
|
||||
+ }
|
||||
|
||||
env = current_cpu->env_ptr;
|
||||
/* see if it is an MMU fault */
|
@ -1,4 +1,4 @@
|
||||
From 7e63642df2d60a8ca6ac77c939ca0fdf67e2fee4 Mon Sep 17 00:00:00 2001
|
||||
From 1f7c6a5e9a6881be020461e851ed42ae2af26144 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
|
@ -1,4 +1,4 @@
|
||||
From 90872d7a115d8d9d7c6c8ae417709d8ab6a08a27 Mon Sep 17 00:00:00 2001
|
||||
From 708f1e8b58be28fa324de40c6945373ec9204ef2 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
|
@ -1,4 +1,4 @@
|
||||
From 543b81c561f8119de1f1bb0fbdac34471a3ffa08 Mon Sep 17 00:00:00 2001
|
||||
From f3320ee5898e6569e7ba2e780d17808d8b5b2bc2 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
|
@ -1,4 +1,4 @@
|
||||
From 3a6cd0d2be91d9b19f6b88eebfdc26c486708b9d Mon Sep 17 00:00:00 2001
|
||||
From 1cc737f25e15c229334b2501ffaddeb39c92b1bc 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
|
@ -1,4 +1,4 @@
|
||||
From 5a8ec3fa5ee51ac654a9082a7b26e5ded2975bdd Mon Sep 17 00:00:00 2001
|
||||
From 781bcf83c5e26f743b2de098693ddf16ea7ab88a 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
|
@ -1,4 +1,4 @@
|
||||
From 49f8e5a203440ff31c9fa3af4b9757fb78034ae0 Mon Sep 17 00:00:00 2001
|
||||
From 95f1c3ec964b93a5c50c20bd0e706eaa6511912f 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
|
@ -1,4 +1,4 @@
|
||||
From 670404e76a2847f8f331894e448b69fc429a6b26 Mon Sep 17 00:00:00 2001
|
||||
From 9f43a4f301b3a6a83fef3ff9a8aaca425dbc1e24 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
|
@ -1,4 +1,4 @@
|
||||
From 450bb65522f7143ad426075f948618d4383f31eb Mon Sep 17 00:00:00 2001
|
||||
From 4e5235247d9d53341914f2d7d45845c5f275666b 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
|
@ -1,4 +1,4 @@
|
||||
From a64b4afd410746f86312ae1ac5a8aae5a96107a1 Mon Sep 17 00:00:00 2001
|
||||
From a954023b81833e277cba2a4daa220e61276f307b 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=
|
@ -1,4 +1,4 @@
|
||||
From cb85f9a1f5281d21af23c9119f2b2ed8f9bbedfe Mon Sep 17 00:00:00 2001
|
||||
From 9369522306551b7f7d01cbbe3093c59e1689c58a 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
|
@ -1,4 +1,4 @@
|
||||
From b6adbb7fda2b6a45a52585a17cb86faef315ba42 Mon Sep 17 00:00:00 2001
|
||||
From 2d8d74e7fde654a73d263ef36318105e55db76e9 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
|
@ -1,4 +1,4 @@
|
||||
From 68194ada39d366d18818e5cb335c8160cc94eaf2 Mon Sep 17 00:00:00 2001
|
||||
From f5b8f21e2fa71bd497a9ab0aa461c28ed20dd8ba Mon Sep 17 00:00:00 2001
|
||||
From: Alexander Graf <agraf@suse.de>
|
||||
Date: Wed, 5 Aug 2009 09:49:37 +0200
|
||||
Subject: [PATCH] Add support for DictZip enabled gzip files
|
@ -1,4 +1,4 @@
|
||||
From cbe998fed14cb71081aa3c3332e43c474e9e995c Mon Sep 17 00:00:00 2001
|
||||
From 9e036273ba2e9b12d72f6287bf1a7b7cf7c99e56 Mon Sep 17 00:00:00 2001
|
||||
From: Alexander Graf <agraf@suse.de>
|
||||
Date: Wed, 5 Aug 2009 17:28:38 +0200
|
||||
Subject: [PATCH] Add tar container format
|
@ -1,4 +1,4 @@
|
||||
From 497fc859da77c6a49b41f9347640bb597e78e8b3 Mon Sep 17 00:00:00 2001
|
||||
From c6b5f8d5660b1e54d4e5f6134df6e68523b75b48 Mon Sep 17 00:00:00 2001
|
||||
From: Alexander Graf <agraf@suse.de>
|
||||
Date: Wed, 12 Dec 2012 19:11:30 +0100
|
||||
Subject: [PATCH] Legacy Patch kvm-qemu-preXX-dictzip3.patch
|
@ -1,4 +1,4 @@
|
||||
From b555dac6af355ef4abc5a721e6d49ea23e85df1c Mon Sep 17 00:00:00 2001
|
||||
From b3db9eb2ca039554628d3067590e9fa851b91994 Mon Sep 17 00:00:00 2001
|
||||
From: Alexander Graf <agraf@suse.de>
|
||||
Date: Wed, 12 Dec 2012 19:11:31 +0100
|
||||
Subject: [PATCH] Legacy Patch kvm-qemu-preXX-report-default-mac-used.patch
|
@ -1,4 +1,4 @@
|
||||
From 3b7892f20389c03e27575cf4f32e14b9d6998197 Mon Sep 17 00:00:00 2001
|
||||
From 8ed69948d6c72b8f3ac06927aa8da36344e09314 Mon Sep 17 00:00:00 2001
|
||||
From: Alexander Graf <agraf@suse.de>
|
||||
Date: Mon, 6 Jun 2011 06:53:52 +0200
|
||||
Subject: [PATCH] console: add question-mark escape operator
|
@ -1,4 +1,4 @@
|
||||
From 616d7f747eadb0325e8b65d34021941359f245a0 Mon Sep 17 00:00:00 2001
|
||||
From 8597819aa87120cd7d65f42e706e6171edae8480 Mon Sep 17 00:00:00 2001
|
||||
From: Alexander Graf <agraf@suse.de>
|
||||
Date: Thu, 1 Apr 2010 17:36:23 +0200
|
||||
Subject: [PATCH] Make char muxer more robust wrt small FIFOs
|
@ -1,4 +1,4 @@
|
||||
From 09a79f520d55fa5ba1f04747ac706f4ea9d772b8 Mon Sep 17 00:00:00 2001
|
||||
From b806c901eb4c6fb68b62c3df7f9cc5e065caad92 Mon Sep 17 00:00:00 2001
|
||||
From: Alexander Graf <agraf@suse.de>
|
||||
Date: Thu, 13 Dec 2012 14:29:22 +0100
|
||||
Subject: [PATCH] linux-user: lseek: explicitly cast non-set offsets to signed
|
@ -1,4 +1,4 @@
|
||||
From f8bce47d57f5515d95f1b4c0b72f150acae31a11 Mon Sep 17 00:00:00 2001
|
||||
From 887d667fcd100c3122f2a6d672a29b0a24816ba5 Mon Sep 17 00:00:00 2001
|
||||
From: Bruce Rogers <brogers@suse.com>
|
||||
Date: Thu, 16 May 2013 12:39:10 +0200
|
||||
Subject: [PATCH] virtfs-proxy-helper: Provide __u64 for broken
|
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:7482bff71bbae165c646c17fd57401d2dba23fe3b8cb37dbe78ac20e2a82309b
|
||||
size 12036772
|
3
qemu-1.6.0-rc2.tar.bz2
Normal file
3
qemu-1.6.0-rc2.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:f25bdb7e0acb639cce8f4b47b46bb46bd015b6154fe40ef4e3c7f74f08820216
|
||||
size 12040035
|
@ -1,3 +1,13 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Aug 9 13:55:46 UTC 2013 - afaerber@suse.de
|
||||
|
||||
- Update to v1.6.0-rc2: cf. http://wiki.qemu.org/ChangeLog/1.6
|
||||
* Adapt update_git.sh script accordingly
|
||||
- Changed version from 1.6.0rcX to 1.5.9X (reported by lnussel)
|
||||
- Drop patch "fix segmentation fault passing with g2h(x) != x"
|
||||
It was a mismerge (pointed out by Peter Maydell), cf.
|
||||
http://git.qemu.org/?p=qemu.git;a=commit;h=732f9e89a1c737f738c445ff24929a1bc137d1a9
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Aug 2 12:43:52 UTC 2013 - afaerber@suse.de
|
||||
|
||||
|
@ -21,9 +21,9 @@ Url: http://www.qemu.org/
|
||||
Summary: Universal CPU emulator
|
||||
License: BSD-3-Clause and GPL-2.0 and GPL-2.0+ and LGPL-2.1+ and MIT
|
||||
Group: System/Emulators/PC
|
||||
Version: 1.6.0rc1
|
||||
Version: 1.5.92
|
||||
Release: 0
|
||||
Source: qemu-1.6.0-rc1.tar.bz2
|
||||
Source: qemu-1.6.0-rc2.tar.bz2
|
||||
# This patch queue is auto-generated from https://github.com/openSUSE/qemu
|
||||
Patch0001: 0001-XXX-dont-dump-core-on-sigabort.patc.patch
|
||||
Patch0002: 0002-XXX-work-around-SA_RESTART-race-wit.patch
|
||||
@ -43,26 +43,25 @@ Patch0015: 0015-linux-user-fix-segfault-deadlock.pa.patch
|
||||
Patch0016: 0016-linux-user-binfmt-support-host-bina.patch
|
||||
Patch0017: 0017-linux-user-arm-no-tb_flush-on-reset.patch
|
||||
Patch0018: 0018-linux-user-Ignore-broken-loop-ioctl.patch
|
||||
Patch0019: 0019-linux-user-fix-segmentation-fault-p.patch
|
||||
Patch0020: 0020-linux-user-lock-tcg.patch.patch
|
||||
Patch0021: 0021-linux-user-Run-multi-threaded-code-.patch
|
||||
Patch0022: 0022-linux-user-lock-tb-flushing-too.pat.patch
|
||||
Patch0023: 0023-linux-user-Fake-proc-cpuinfo.patch.patch
|
||||
Patch0024: 0024-linux-user-implement-FS_IOC_GETFLAG.patch
|
||||
Patch0025: 0025-linux-user-implement-FS_IOC_SETFLAG.patch
|
||||
Patch0026: 0026-linux-user-XXX-disable-fiemap.patch.patch
|
||||
Patch0027: 0027-slirp-nooutgoing.patch.patch
|
||||
Patch0028: 0028-vnc-password-file-and-incoming-conn.patch
|
||||
Patch0029: 0029-linux-user-add-more-blk-ioctls.patc.patch
|
||||
Patch0030: 0030-linux-user-use-target_ulong.patch.patch
|
||||
Patch0031: 0031-Add-support-for-DictZip-enabled-gzi.patch
|
||||
Patch0032: 0032-Add-tar-container-format.patch.patch
|
||||
Patch0033: 0033-Legacy-Patch-kvm-qemu-preXX-dictzip.patch
|
||||
Patch0034: 0034-Legacy-Patch-kvm-qemu-preXX-report-.patch
|
||||
Patch0035: 0035-console-add-question-mark-escape-op.patch
|
||||
Patch0036: 0036-Make-char-muxer-more-robust-wrt-sma.patch
|
||||
Patch0037: 0037-linux-user-lseek-explicitly-cast-no.patch
|
||||
Patch0038: 0038-virtfs-proxy-helper-Provide-__u64-f.patch
|
||||
Patch0019: 0019-linux-user-lock-tcg.patch.patch
|
||||
Patch0020: 0020-linux-user-Run-multi-threaded-code-.patch
|
||||
Patch0021: 0021-linux-user-lock-tb-flushing-too.pat.patch
|
||||
Patch0022: 0022-linux-user-Fake-proc-cpuinfo.patch.patch
|
||||
Patch0023: 0023-linux-user-implement-FS_IOC_GETFLAG.patch
|
||||
Patch0024: 0024-linux-user-implement-FS_IOC_SETFLAG.patch
|
||||
Patch0025: 0025-linux-user-XXX-disable-fiemap.patch.patch
|
||||
Patch0026: 0026-slirp-nooutgoing.patch.patch
|
||||
Patch0027: 0027-vnc-password-file-and-incoming-conn.patch
|
||||
Patch0028: 0028-linux-user-add-more-blk-ioctls.patc.patch
|
||||
Patch0029: 0029-linux-user-use-target_ulong.patch.patch
|
||||
Patch0030: 0030-Add-support-for-DictZip-enabled-gzi.patch
|
||||
Patch0031: 0031-Add-tar-container-format.patch.patch
|
||||
Patch0032: 0032-Legacy-Patch-kvm-qemu-preXX-dictzip.patch
|
||||
Patch0033: 0033-Legacy-Patch-kvm-qemu-preXX-report-.patch
|
||||
Patch0034: 0034-console-add-question-mark-escape-op.patch
|
||||
Patch0035: 0035-Make-char-muxer-more-robust-wrt-sma.patch
|
||||
Patch0036: 0036-linux-user-lseek-explicitly-cast-no.patch
|
||||
Patch0037: 0037-virtfs-proxy-helper-Provide-__u64-f.patch
|
||||
# Please do not add patches manually here, run update_git.sh.
|
||||
# this is to make lint happy
|
||||
Source300: rpmlintrc
|
||||
@ -114,7 +113,7 @@ emulations. This can be used together with the OBS build script to
|
||||
run cross-architecture builds.
|
||||
|
||||
%prep
|
||||
%setup -q -n qemu-1.6.0-rc1
|
||||
%setup -q -n qemu-1.6.0-rc2
|
||||
%patch0001 -p1
|
||||
%patch0002 -p1
|
||||
%patch0003 -p1
|
||||
@ -152,7 +151,6 @@ run cross-architecture builds.
|
||||
%patch0035 -p1
|
||||
%patch0036 -p1
|
||||
%patch0037 -p1
|
||||
%patch0038 -p1
|
||||
|
||||
%build
|
||||
./configure --prefix=%_prefix --sysconfdir=%_sysconfdir \
|
||||
|
@ -21,9 +21,9 @@ Url: http://www.qemu.org/
|
||||
Summary: Universal CPU emulator
|
||||
License: BSD-3-Clause and GPL-2.0 and GPL-2.0+ and LGPL-2.1+ and MIT
|
||||
Group: System/Emulators/PC
|
||||
Version: 1.6.0rc1
|
||||
Version: 1.5.92
|
||||
Release: 0
|
||||
Source: qemu-1.6.0-rc1.tar.bz2
|
||||
Source: qemu-1.6.0-rc2.tar.bz2
|
||||
# This patch queue is auto-generated from https://github.com/openSUSE/qemu
|
||||
PATCH_FILES
|
||||
# Please do not add patches manually here, run update_git.sh.
|
||||
@ -77,7 +77,7 @@ emulations. This can be used together with the OBS build script to
|
||||
run cross-architecture builds.
|
||||
|
||||
%prep
|
||||
%setup -q -n qemu-1.6.0-rc1
|
||||
%setup -q -n qemu-1.6.0-rc2
|
||||
PATCH_EXEC
|
||||
|
||||
%build
|
||||
|
@ -1,3 +1,10 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Aug 9 13:55:46 UTC 2013 - afaerber@suse.de
|
||||
|
||||
- Update to v1.6.0-rc2: cf. http://wiki.qemu.org/ChangeLog/1.6
|
||||
* Adapt update_git.sh script accordingly
|
||||
- Changed version from 1.6.0rcX to 1.5.9X (reported by lnussel)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Aug 2 12:43:52 UTC 2013 - afaerber@suse.de
|
||||
|
||||
|
46
qemu.spec
46
qemu.spec
@ -21,9 +21,9 @@ Url: http://www.qemu.org/
|
||||
Summary: Universal CPU emulator
|
||||
License: BSD-3-Clause and GPL-2.0 and GPL-2.0+ and LGPL-2.1+ and MIT
|
||||
Group: System/Emulators/PC
|
||||
Version: 1.6.0rc1
|
||||
Version: 1.5.92
|
||||
Release: 0
|
||||
Source: %name-1.6.0-rc1.tar.bz2
|
||||
Source: %name-1.6.0-rc2.tar.bz2
|
||||
# This patch queue is auto-generated from https://github.com/openSUSE/qemu
|
||||
Patch0001: 0001-XXX-dont-dump-core-on-sigabort.patc.patch
|
||||
Patch0002: 0002-XXX-work-around-SA_RESTART-race-wit.patch
|
||||
@ -43,26 +43,25 @@ Patch0015: 0015-linux-user-fix-segfault-deadlock.pa.patch
|
||||
Patch0016: 0016-linux-user-binfmt-support-host-bina.patch
|
||||
Patch0017: 0017-linux-user-arm-no-tb_flush-on-reset.patch
|
||||
Patch0018: 0018-linux-user-Ignore-broken-loop-ioctl.patch
|
||||
Patch0019: 0019-linux-user-fix-segmentation-fault-p.patch
|
||||
Patch0020: 0020-linux-user-lock-tcg.patch.patch
|
||||
Patch0021: 0021-linux-user-Run-multi-threaded-code-.patch
|
||||
Patch0022: 0022-linux-user-lock-tb-flushing-too.pat.patch
|
||||
Patch0023: 0023-linux-user-Fake-proc-cpuinfo.patch.patch
|
||||
Patch0024: 0024-linux-user-implement-FS_IOC_GETFLAG.patch
|
||||
Patch0025: 0025-linux-user-implement-FS_IOC_SETFLAG.patch
|
||||
Patch0026: 0026-linux-user-XXX-disable-fiemap.patch.patch
|
||||
Patch0027: 0027-slirp-nooutgoing.patch.patch
|
||||
Patch0028: 0028-vnc-password-file-and-incoming-conn.patch
|
||||
Patch0029: 0029-linux-user-add-more-blk-ioctls.patc.patch
|
||||
Patch0030: 0030-linux-user-use-target_ulong.patch.patch
|
||||
Patch0031: 0031-Add-support-for-DictZip-enabled-gzi.patch
|
||||
Patch0032: 0032-Add-tar-container-format.patch.patch
|
||||
Patch0033: 0033-Legacy-Patch-kvm-qemu-preXX-dictzip.patch
|
||||
Patch0034: 0034-Legacy-Patch-kvm-qemu-preXX-report-.patch
|
||||
Patch0035: 0035-console-add-question-mark-escape-op.patch
|
||||
Patch0036: 0036-Make-char-muxer-more-robust-wrt-sma.patch
|
||||
Patch0037: 0037-linux-user-lseek-explicitly-cast-no.patch
|
||||
Patch0038: 0038-virtfs-proxy-helper-Provide-__u64-f.patch
|
||||
Patch0019: 0019-linux-user-lock-tcg.patch.patch
|
||||
Patch0020: 0020-linux-user-Run-multi-threaded-code-.patch
|
||||
Patch0021: 0021-linux-user-lock-tb-flushing-too.pat.patch
|
||||
Patch0022: 0022-linux-user-Fake-proc-cpuinfo.patch.patch
|
||||
Patch0023: 0023-linux-user-implement-FS_IOC_GETFLAG.patch
|
||||
Patch0024: 0024-linux-user-implement-FS_IOC_SETFLAG.patch
|
||||
Patch0025: 0025-linux-user-XXX-disable-fiemap.patch.patch
|
||||
Patch0026: 0026-slirp-nooutgoing.patch.patch
|
||||
Patch0027: 0027-vnc-password-file-and-incoming-conn.patch
|
||||
Patch0028: 0028-linux-user-add-more-blk-ioctls.patc.patch
|
||||
Patch0029: 0029-linux-user-use-target_ulong.patch.patch
|
||||
Patch0030: 0030-Add-support-for-DictZip-enabled-gzi.patch
|
||||
Patch0031: 0031-Add-tar-container-format.patch.patch
|
||||
Patch0032: 0032-Legacy-Patch-kvm-qemu-preXX-dictzip.patch
|
||||
Patch0033: 0033-Legacy-Patch-kvm-qemu-preXX-report-.patch
|
||||
Patch0034: 0034-console-add-question-mark-escape-op.patch
|
||||
Patch0035: 0035-Make-char-muxer-more-robust-wrt-sma.patch
|
||||
Patch0036: 0036-linux-user-lseek-explicitly-cast-no.patch
|
||||
Patch0037: 0037-virtfs-proxy-helper-Provide-__u64-f.patch
|
||||
# Please do not add patches manually here, run update_git.sh.
|
||||
# this is to make lint happy
|
||||
Source300: rpmlintrc
|
||||
@ -174,7 +173,7 @@ as PC and PowerMac systems.
|
||||
This sub-package contains the guest agent.
|
||||
|
||||
%prep
|
||||
%setup -q -n %name-1.6.0-rc1
|
||||
%setup -q -n %name-1.6.0-rc2
|
||||
%patch0001 -p1
|
||||
%patch0002 -p1
|
||||
%patch0003 -p1
|
||||
@ -212,7 +211,6 @@ This sub-package contains the guest agent.
|
||||
%patch0035 -p1
|
||||
%patch0036 -p1
|
||||
%patch0037 -p1
|
||||
%patch0038 -p1
|
||||
|
||||
%build
|
||||
./configure --prefix=%_prefix --sysconfdir=%_sysconfdir \
|
||||
|
@ -21,9 +21,9 @@ Url: http://www.qemu.org/
|
||||
Summary: Universal CPU emulator
|
||||
License: BSD-3-Clause and GPL-2.0 and GPL-2.0+ and LGPL-2.1+ and MIT
|
||||
Group: System/Emulators/PC
|
||||
Version: 1.6.0rc1
|
||||
Version: 1.5.92
|
||||
Release: 0
|
||||
Source: %name-1.6.0-rc1.tar.bz2
|
||||
Source: %name-1.6.0-rc2.tar.bz2
|
||||
# This patch queue is auto-generated from https://github.com/openSUSE/qemu
|
||||
PATCH_FILES
|
||||
# Please do not add patches manually here, run update_git.sh.
|
||||
@ -137,7 +137,7 @@ as PC and PowerMac systems.
|
||||
This sub-package contains the guest agent.
|
||||
|
||||
%prep
|
||||
%setup -q -n %name-1.6.0-rc1
|
||||
%setup -q -n %name-1.6.0-rc2
|
||||
PATCH_EXEC
|
||||
|
||||
%build
|
||||
|
@ -13,7 +13,7 @@
|
||||
GIT_TREE=git://github.com/openSUSE/qemu.git
|
||||
GIT_LOCAL_TREE=/home/andreas/QEMU/qemu-opensuse
|
||||
GIT_BRANCH=opensuse-1.6
|
||||
GIT_UPSTREAM_TAG=v1.6.0-rc1
|
||||
GIT_UPSTREAM_TAG=v1.6.0-rc2
|
||||
QEMU_TMP=/dev/shm/qemu-tmp
|
||||
|
||||
# clean up
|
||||
|
Loading…
Reference in New Issue
Block a user