rpm/qemu
SHA256
1
0
Fork 0
forked from pool/qemu
Code Pull Requests Activity

Accepting request 175977 from home:a_faerber:branches:Virtualization

Browse Source 
Upgrade to v1.5.0-rc2 and fix part of SLE 11 SP2 build failure

OBS-URL: https://build.opensuse.org/request/show/175977
OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=135
This commit is contained in:
Andreas Färber 2013-05-17 12:54:25 +00:00 committed by Git OBS Bridge
parent d7623e2e90
commit 4ab5ad76d6
44 changed files with 93 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
0001-XXX-dont-dump-core-on-sigabort.patc.patch
View File

@ -1,4 +1,4 @@
From 1f095fdb60dcab75258ab6da148e424fdd4da986 Mon Sep 17 00:00:00 2001
From 681803d344ac4e81e5391b3f8e80d07158989376 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

2
0002-XXX-work-around-SA_RESTART-race-wit.patch
View File

@ -1,4 +1,4 @@
From e60551e54f52f76a75a6809b33ff252da44df260 Mon Sep 17 00:00:00 2001
From f719775e8702d51f7ee986db8327aeeaeef42adb 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)

2
0003-qemu-0.9.0.cvs-binfmt.patch.patch
View File

@ -1,4 +1,4 @@
From 60f177c52518ec81e2d2d97e7f8403362bdc5102 Mon Sep 17 00:00:00 2001
From ad52f39fcbf752a0876078c307c0b675184dc826 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

2
0004-qemu-cvs-alsa_bitfield.patch.patch
View File

@ -1,4 +1,4 @@
From b68142d76b38d246d8493a2ad8ebf7c0ca1a1082 Mon Sep 17 00:00:00 2001
From 6957c48e055251fcf9d0a13795d647a0922a17de 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

2
0005-qemu-cvs-alsa_ioctl.patch.patch
View File

@ -1,4 +1,4 @@
From 151ec7ab0cc58f487f06c5fba27bb1779f99beb8 Mon Sep 17 00:00:00 2001
From f31461e8d761295ced956db11ecd658297f64625 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

2
0006-qemu-cvs-alsa_mmap.patch.patch
View File

@ -1,4 +1,4 @@
From fb816518ff3bb5feeb6ee3c781ccba608db625bc Mon Sep 17 00:00:00 2001
From accae82e0aad0021e8db2a450917e256fab85d5f 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

2
0007-qemu-cvs-gettimeofday.patch.patch
View File

@ -1,4 +1,4 @@
From f0c2b05e40606a04891dc720436462631a8d7771 Mon Sep 17 00:00:00 2001
From 0a366ce5d8cb1fe160becdede4420fc4a73417ed 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

2
0008-qemu-cvs-ioctl_debug.patch.patch
View File

@ -1,4 +1,4 @@
From 29a48c1892ec4869ec8771c423ec2ba92433ad41 Mon Sep 17 00:00:00 2001
From aff3bcca70eeb57bc2ba60230faca8e2e82dd341 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

2
0009-qemu-cvs-ioctl_nodirection.patch.patch
View File

@ -1,4 +1,4 @@
From d7feb52521785e77af4f2e26d63e28bd0fc9ec48 Mon Sep 17 00:00:00 2001
From f8662cd8fc550199601d242cf019cdcc360ebc53 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

4
0010-block-vmdk-Support-creation-of-SCSI.patch
View File

@ -1,4 +1,4 @@
From 1a4fd3dcd12982416b8c22c758e7e6bd9cef7b0b Mon Sep 17 00:00:00 2001
From 8f2e9d5b9f0281b042d71861b6f4f477f070306f 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
@ -18,7 +18,7 @@ Signed-off-by: Andreas Färber <afaerber@suse.de>
4 files changed, 22 insertions(+), 3 deletions(-)
diff --git a/block.c b/block.c
index aa9a533..f6bb061 100644
index 3f87489..34a332f 100644
--- a/block.c
+++ b/block.c
@@ -4739,7 +4739,7 @@ void bdrv_img_create(const char *filename, const char *fmt,

2
0011-linux-user-add-binfmt-wrapper-for-a.patch
View File

@ -1,4 +1,4 @@
From cbd80be4182a79fa966cf7f3d747f088066e59dd Mon Sep 17 00:00:00 2001
From 95bce4fac86bb09d910d58a18446b003a4dd6e69 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

2
0012-linux-user-Ignore-timer_create-sysc.patch
View File

@ -1,4 +1,4 @@
From efdf17b4fa5054f0e5ba2117867ee1ccde81b700 Mon Sep 17 00:00:00 2001
From e007889391a0d3d47627b7282a50ccaeb3be7ee2 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

2
0013-linux-user-be-silent-about-capget-f.patch
View File

@ -1,4 +1,4 @@
From d77fd1aa772fa9d9048c5cf000764d7348df017e Mon Sep 17 00:00:00 2001
From f32b84b6f245500bd66087370314f2f69f9d328d 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

4
0014-PPC-KVM-Disable-mmu-notifier-check..patch
View File

@ -1,4 +1,4 @@
From 5ebb282613d02e38e5f380b2f54b81b5b4102360 Mon Sep 17 00:00:00 2001
From 35cc232beb6f11fe0e4994cd9fea0386e8e10e92 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,7 +13,7 @@ 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 19725db..d1f151f 100644
index aec65c5..53c937d 100644
--- a/exec.c
+++ b/exec.c
@@ -874,10 +874,12 @@ static void *file_ram_alloc(RAMBlock *block,

2
0015-linux-user-fix-segfault-deadlock.pa.patch
View File

@ -1,4 +1,4 @@
From 3e1ddf2ba13b9998d98ee450b7ea88d966796ed4 Mon Sep 17 00:00:00 2001
From a54b43d2a6a1bb3e56c014d828feeb1abe117ee2 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

2
0016-linux-user-binfmt-support-host-bina.patch
View File

@ -1,4 +1,4 @@
From b45af411a0680ca399ff8b0b65c38971ea04904d Mon Sep 17 00:00:00 2001
From 192e94235372b08d31f8c0c68b89e6b858ca6207 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

2
0017-linux-user-arm-no-tb_flush-on-reset.patch
View File

@ -1,4 +1,4 @@
From 5393a9d388a81893832ed04084d0a0335c4005ef Mon Sep 17 00:00:00 2001
From 5195a60f34bd0315bef418d8a295caebc1a41fef 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

2
0018-linux-user-Ignore-broken-loop-ioctl.patch
View File

@ -1,4 +1,4 @@
From 3792ed25bb3bef6710dbce20a86ccc40ce58a7b1 Mon Sep 17 00:00:00 2001
From 17ef27b9b0f355b296b8819d2cfc463f16e28d15 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

2
0019-linux-user-fix-segmentation-fault-p.patch
View File

@ -1,4 +1,4 @@
From dc73e9aecb754e39ca51bb5636842e6f0f3d7fc1 Mon Sep 17 00:00:00 2001
From 614e0fdeab27a5171784758344859a2e18ae2f0b 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

2
0020-linux-user-lock-tcg.patch.patch
View File

@ -1,4 +1,4 @@
From deec99e294d9bac46901369a50b693170548d5b9 Mon Sep 17 00:00:00 2001
From d3fb2ab5ec13b012adfe0a0c7f3ee432355d47f7 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

2
0021-linux-user-Run-multi-threaded-code-.patch
View File

@ -1,4 +1,4 @@
From e08016b4b3af23f8d796bf0adf258670bc92a5da Mon Sep 17 00:00:00 2001
From 17de5873ae801c26b3f2d6de681d0a5a41710759 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

2
0022-linux-user-lock-tb-flushing-too.pat.patch
View File

@ -1,4 +1,4 @@
From 5f1e423a2a86ac9528fe2b8ce86ede4d1a23e4bf Mon Sep 17 00:00:00 2001
From 64d8e41427b8a90aa9946ec27ebdd06a6b9f3ea9 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

2
0023-linux-user-Fake-proc-cpuinfo.patch.patch
View File

@ -1,4 +1,4 @@
From c13343d84ec6fb19d390e1ea32e0271991c2eb75 Mon Sep 17 00:00:00 2001
From fda316ff7dca5b12201a2138436cafc1c7d45caf 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

2
0024-linux-user-implement-FS_IOC_GETFLAG.patch
View File

@ -1,4 +1,4 @@
From 592844c8f941623156be44813cfd8f66e3ec0e6b Mon Sep 17 00:00:00 2001
From 55e815019cdef8fd5757148acaeb89585cfc8765 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

2
0025-linux-user-implement-FS_IOC_SETFLAG.patch
View File

@ -1,4 +1,4 @@
From 933d6e7a60329429009a59d7b47c8481eeb9e247 Mon Sep 17 00:00:00 2001
From bbad99b3fd38b05fe107ae92666146362d2d2a97 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

2
0026-linux-user-XXX-disable-fiemap.patch.patch
View File

@ -1,4 +1,4 @@
From 35c7135a88b55ecb267455e79af13f5a43bd4289 Mon Sep 17 00:00:00 2001
From 39efef864747ef7eaa603037c482cd2b72db1a6d 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

4
0027-slirp-nooutgoing.patch.patch
View File

@ -1,4 +1,4 @@
From 842d9c285712839c2b6873725a497d4e56517d40 Mon Sep 17 00:00:00 2001
From 8c222b5f901dfa0e9550b693a7fe3710ff354cf4 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
@ -97,7 +97,7 @@ index e98ce1a..b56bf35 100644
opt = 1;
qemu_setsockopt(s, SOL_SOCKET, SO_REUSEADDR, &opt, sizeof(int));
diff --git a/vl.c b/vl.c
index 6e6225f..174df5a 100644
index be0a93c..5305a6d 100644
--- a/vl.c
+++ b/vl.c
@@ -219,6 +219,7 @@ const char *vnc_display;

10
0028-vnc-password-file-and-incoming-conn.patch
View File

@ -1,4 +1,4 @@
From e55f9426d326546088069afd5d6175d994202aff Mon Sep 17 00:00:00 2001
From 9902e8075acba3e5c72ca4323f32eb83c2fb8089 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=
@ -9,7 +9,7 @@ TBD (from SUSE Studio team)
1 file changed, 71 insertions(+)
diff --git a/ui/vnc.c b/ui/vnc.c
index 89108de..9d3d7d6 100644
index dfc7459..b3ca308 100644
--- a/ui/vnc.c
+++ b/ui/vnc.c
@@ -44,6 +44,7 @@ static const struct timeval VNC_REFRESH_LOSSY = { 2, 0 };
@ -42,7 +42,7 @@ index 89108de..9d3d7d6 100644
}
int vnc_client_io_error(VncState *vs, int ret, int last_errno)
@@ -3034,6 +3043,39 @@ char *vnc_display_local_addr(DisplayState *ds)
@@ -3035,6 +3044,39 @@ char *vnc_display_local_addr(DisplayState *ds)
return vnc_socket_local_addr("%s:%s", vs->lsock);
}
@ -82,7 +82,7 @@ index 89108de..9d3d7d6 100644
void vnc_display_open(DisplayState *ds, const char *display, Error **errp)
{
VncDisplay *vs = vnc_display;
@@ -3067,6 +3109,9 @@ void vnc_display_open(DisplayState *ds, const char *display, Error **errp)
@@ -3068,6 +3110,9 @@ void vnc_display_open(DisplayState *ds, const char *display, Error **errp)
while ((options = strchr(options, ','))) {
options++;
if (strncmp(options, "password", 8) == 0) {
@ -92,7 +92,7 @@ index 89108de..9d3d7d6 100644
if (fips_get_state()) {
error_setg(errp,
"VNC password auth disabled due to FIPS mode, "
@@ -3075,6 +3120,32 @@ void vnc_display_open(DisplayState *ds, const char *display, Error **errp)
@@ -3076,6 +3121,32 @@ void vnc_display_open(DisplayState *ds, const char *display, Error **errp)
goto fail;
}
password = 1; /* Require password auth */

2
0029-linux-user-add-more-blk-ioctls.patc.patch
View File

@ -1,4 +1,4 @@
From 168c2d896d82bc7568cc91bbea596faf60f23450 Mon Sep 17 00:00:00 2001
From 84352c5d04bb482f40bdb177fa174e50ea4f701f 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

2
0030-linux-user-use-target_ulong.patch.patch
View File

@ -1,4 +1,4 @@
From 1748852df5a01ac29ca08d0f52586b763983ebef Mon Sep 17 00:00:00 2001
From 425ab5a739bf46180cea670f84c3f1f192d565e8 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

2
0031-Add-support-for-DictZip-enabled-gzi.patch
View File

@ -1,4 +1,4 @@
From 98f5a645d99776ca67f77414bb0db36c7fe8534c Mon Sep 17 00:00:00 2001
From 7325abcf33248bb24403b55c39f126f7831933f6 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

2
0032-Add-tar-container-format.patch.patch
View File

@ -1,4 +1,4 @@
From d2e3792b847a0ddfb7eb05ba24f8ca971b04dc36 Mon Sep 17 00:00:00 2001
From 79fcfab471a27a999fc0a6449f1f756bf535cf66 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

2
0033-Legacy-Patch-kvm-qemu-preXX-dictzip.patch
View File

@ -1,4 +1,4 @@
From e6b5df35d547382b84f886382dcf4e8e55f7ae5f Mon Sep 17 00:00:00 2001
From 5bda6c46318586d3aa713be59bfbc47dcd5430f0 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

2
0034-Legacy-Patch-kvm-qemu-preXX-report-.patch
View File

@ -1,4 +1,4 @@
From 99b43e0450060382e4c748d17a97eb51c6462fbd Mon Sep 17 00:00:00 2001
From 38394a9f4343c4a21000b682f28c9e2cd29a9fd8 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

2
0035-console-add-question-mark-escape-op.patch
View File

@ -1,4 +1,4 @@
From d1215a930822d99101a574d8d77da00ec34eac52 Mon Sep 17 00:00:00 2001
From b6af0376c5a6db3ee33b1669e4b62575a20490e5 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

10
0036-Make-char-muxer-more-robust-wrt-sma.patch
View File

@ -1,4 +1,4 @@
From d5436a2d1d30383ae565346ff5dd5f1e53effa38 Mon Sep 17 00:00:00 2001
From f85044340db052c92385f9c7fb0f41d747eb879a 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
@ -22,10 +22,10 @@ This patch fixes input when using -nographic on s390 for me.
1 file changed, 16 insertions(+)
diff --git a/qemu-char.c b/qemu-char.c
index 64e824d..dc1c440 100644
index 30a2ddf..351a44b 100644
--- a/qemu-char.c
+++ b/qemu-char.c
@@ -270,6 +270,9 @@ typedef struct {
@@ -260,6 +260,9 @@ typedef struct {
IOEventHandler *chr_event[MAX_MUX];
void *ext_opaque[MAX_MUX];
CharDriverState *drv;
@ -35,7 +35,7 @@ index 64e824d..dc1c440 100644
int focus;
int mux_cnt;
int term_got_escape;
@@ -426,6 +429,15 @@ static void mux_chr_accept_input(CharDriverState *chr)
@@ -416,6 +419,15 @@ static void mux_chr_accept_input(CharDriverState *chr)
d->chr_read[m](d->ext_opaque[m],
&d->buffer[m][d->cons[m]++ & MUX_BUFFER_MASK], 1);
}
@ -51,7 +51,7 @@ index 64e824d..dc1c440 100644
}
static int mux_chr_can_read(void *opaque)
@@ -508,6 +520,10 @@ static CharDriverState *qemu_chr_open_mux(CharDriverState *drv)
@@ -498,6 +510,10 @@ static CharDriverState *qemu_chr_open_mux(CharDriverState *drv)
chr->opaque = d;
d->drv = drv;
d->focus = -1;

2
0037-linux-user-lseek-explicitly-cast-en.patch
View File

@ -1,4 +1,4 @@
From f793d437a1d1b27f8ab326000cedc249f82153ba Mon Sep 17 00:00:00 2001
From a57e1b7aafc2a859e79a6818b30360094c047b47 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 end offsets to signed

26
0038-virtfs-proxy-helper-Provide-__u64-f.patch Normal file
View File

@ -0,0 +1,26 @@
From ab956babd052f8d3c68b9f90426553d6794c2473 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
sys/capability.h
Fixes the build on SLE 11 SP2.
---
fsdev/virtfs-proxy-helper.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/fsdev/virtfs-proxy-helper.c b/fsdev/virtfs-proxy-helper.c
index 713a7b2..0459bdf 100644
--- a/fsdev/virtfs-proxy-helper.c
+++ b/fsdev/virtfs-proxy-helper.c
@@ -9,6 +9,10 @@
* the COPYING file in the top-level directory.
*/
+/* work around a broken sys/capability.h */
+#if defined(__i386__)
+typedef unsigned long long __u64;
+#endif
#include <sys/resource.h>
#include <getopt.h>
#include <syslog.h>

3
qemu-1.5.0-rc1.tar.bz2
View File

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

3
qemu-1.5.0-rc2.tar.bz2 Normal file
View File

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

7
qemu.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Thu May 16 10:34:08 UTC 2013 - afaerber@suse.de
- Update to v1.5.0-rc2: Cf. http://wiki.qemu.org/ChangeLog/1.5
* Adapt update_git.sh accordingly
- Add patch by brogers to fix SLE 11 SP2 build (from kvm package)
-------------------------------------------------------------------
Tue May 14 13:02:18 UTC 2013 - afaerber@suse.de

8
qemu.spec
View File

@ -21,9 +21,9 @@ Url: http://www.qemu.org/
Summary: Universal CPU emulator
License: BSD-3-Clause and GPL-2.0+ and LGPL-2.1+ and MIT
Group: System/Emulators/PC
Version: 1.5.0rc1
Version: 1.5.0rc2
Release: 0
Source: %name-1.5.0-rc1.tar.bz2
Source: %name-1.5.0-rc2.tar.bz2
Patch0001: 0001-XXX-dont-dump-core-on-sigabort.patc.patch
Patch0002: 0002-XXX-work-around-SA_RESTART-race-wit.patch
Patch0003: 0003-qemu-0.9.0.cvs-binfmt.patch.patch
@ -61,6 +61,7 @@ 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-en.patch
Patch0038: 0038-virtfs-proxy-helper-Provide-__u64-f.patch
# this is to make lint happy
Source300: rpmlintrc
Source302: bridge.conf
@ -179,7 +180,7 @@ emulations. This can be used together with the OBS build script to
run cross-architecture builds.
%prep
%setup -q -n %name-1.5.0-rc1
%setup -q -n %name-1.5.0-rc2
%patch0001 -p1
%patch0002 -p1
%patch0003 -p1
@ -217,6 +218,7 @@ run cross-architecture builds.
%patch0035 -p1
%patch0036 -p1
%patch0037 -p1
%patch0038 -p1
%build
# build QEMU

6
qemu.spec.in
View File

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

2
update_git.sh
View File

@ -13,7 +13,7 @@
GIT_TREE=git://github.com/openSUSE/qemu.git
GIT_LOCAL_TREE=/suse/agraf/git/qemu
GIT_BRANCH=opensuse-1.5
GIT_UPSTREAM_TAG=v1.5.0-rc1
GIT_UPSTREAM_TAG=v1.5.0-rc2
QEMU_TMP=/dev/shm/qemu-tmp
# clean up