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

Accepting request 241284 from home:a_faerber:branches:Virtualization

Browse Source 
Update to v2.1.0-rc2 and mention automatically dropped/renamed patches

OBS-URL: https://build.opensuse.org/request/show/241284
OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=218
This commit is contained in:
Andreas Färber 2014-07-16 22:56:01 +00:00 committed by Git OBS Bridge
parent c08c3d8fd2
commit 4079080687
52 changed files with 189 additions and 286 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
From 96d07382a32a794a4aaa56afd3a067fd72cc1158 Mon Sep 17 00:00:00 2001
From d8e4a08b170081417c17700d2e6c8b671d28f147 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
@ -8,7 +8,7 @@ Subject: [PATCH] XXX dont dump core on sigabort
1 file changed, 6 insertions(+)
diff --git a/linux-user/signal.c b/linux-user/signal.c
index f3b4378..dd21475 100644
index 1141054..b7a88f4 100644
--- a/linux-user/signal.c
+++ b/linux-user/signal.c
@@ -448,6 +448,10 @@ static void QEMU_NORETURN force_sig(int target_sig)

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

@ -1,4 +1,4 @@
From 8448fdb25ea828ec1c0359a5ede533b0fab92f99 Mon Sep 17 00:00:00 2001
From 6e1a8104187462b58f198e10d8bfeb83c28843e2 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)
@ -70,7 +70,7 @@ index 8012cc2..e29c7f3 100644
/* Creates the initial guest address space in the host memory space using
* the given host start address hint and size. The guest_start parameter
diff --git a/linux-user/signal.c b/linux-user/signal.c
index dd21475..13affa3 100644
index b7a88f4..5982a88 100644
--- a/linux-user/signal.c
+++ b/linux-user/signal.c
@@ -25,6 +25,7 @@
@ -119,10 +119,10 @@ index dd21475..13affa3 100644
ignore state to avoid getting unexpected interrupted
syscalls */
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index 5a272d3..00f9165 100644
index a50229d..4673f28 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -5311,6 +5311,87 @@ static int do_open(void *cpu_env, const char *pathname, int flags, mode_t mode)
@@ -5337,6 +5337,87 @@ static int do_open(void *cpu_env, const char *pathname, int flags, mode_t mode)
return get_errno(open(path(pathname), flags, mode));
}
@ -210,7 +210,7 @@ index 5a272d3..00f9165 100644
/* do_syscall() should always have a single exit point at the end so
that actions, such as logging of syscall results, can be performed.
All errnos that do_syscall() returns must be -TARGET_<errcode>. */
@@ -5324,6 +5405,12 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1,
@@ -5350,6 +5431,12 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1,
struct stat st;
struct statfs stfs;
void *p;
@ -223,7 +223,7 @@ index 5a272d3..00f9165 100644
#ifdef DEBUG
gemu_log("syscall %d", num);
@@ -8575,7 +8662,7 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1,
@@ -8601,7 +8688,7 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1,
cmd = target_to_host_fcntl_cmd(arg2);
if (cmd == -TARGET_EINVAL) {
ret = cmd;
@ -232,7 +232,7 @@ index 5a272d3..00f9165 100644
}
switch(arg2) {
@@ -9513,6 +9600,7 @@ fail:
@@ -9539,6 +9626,7 @@ fail:
#endif
if(do_strace)
print_syscall_ret(num, ret);

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

@ -1,4 +1,4 @@
From 503851537efa06d26e32efefd669d26a6f73d4f6 Mon Sep 17 00:00:00 2001
From 4a0043142e4070577c527127e37f8089f106ab86 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
View File

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

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

@ -1,4 +1,4 @@
From 664ebaf05570f05f38b87552d4186294b5d4d442 Mon Sep 17 00:00:00 2001
From 4024c561d3dbaec57af394a24f7a2ac0c126aa84 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
@ -20,7 +20,7 @@ Signed-off-by: Ulrich Hecht <uli@suse.de>
create mode 100644 linux-user/syscall_types_alsa.h
diff --git a/linux-user/ioctls.h b/linux-user/ioctls.h
index 07a00da..762779e 100644
index 609b27c..d2b7a50 100644
--- a/linux-user/ioctls.h
+++ b/linux-user/ioctls.h
@@ -318,6 +318,11 @@
@ -2255,10 +2255,10 @@ index 0000000..e09a30d
+ unsigned char *code;
+};
diff --git a/linux-user/syscall_defs.h b/linux-user/syscall_defs.h
index 8563027..52691fb 100644
index c9e6323..e4ae769 100644
--- a/linux-user/syscall_defs.h
+++ b/linux-user/syscall_defs.h
@@ -2552,6 +2552,8 @@ struct target_ucred {
@@ -2562,6 +2562,8 @@ struct target_ucred {
uint32_t gid;
};

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

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

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

@ -1,4 +1,4 @@
From 879e98e20a1010c5067bf0947c6ff788404da5b8 Mon Sep 17 00:00:00 2001
From 4566701ac911b84fb54399e85e9698e3855ef76d 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
@ -9,10 +9,10 @@ No clue what this is for.
1 file changed, 2 insertions(+)
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index 00f9165..f3b02f0 100644
index 4673f28..9575346 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -6486,6 +6486,8 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1,
@@ -6512,6 +6512,8 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1,
case TARGET_NR_gettimeofday:
{
struct timeval tv;

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

@ -1,4 +1,4 @@
From 641ca10f4b28d9012f8a7c2aee9726d6747e4f23 Mon Sep 17 00:00:00 2001
From 37000c31d5975ea6cdacb8cd98b48c476597518c 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
@ -12,10 +12,10 @@ Signed-off-by: Ulrich Hecht <uli@suse.de>
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index f3b02f0..8d96462 100644
index 9575346..82a794f 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -3719,7 +3719,12 @@ static abi_long do_ioctl(int fd, abi_long cmd, abi_long arg)
@@ -3745,7 +3745,12 @@ static abi_long do_ioctl(int fd, abi_long cmd, abi_long arg)
ie = ioctl_entries;
for(;;) {
if (ie->target_cmd == 0) {

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

@ -1,4 +1,4 @@
From 5487b8e2361b102d668d4e4cf5eba350f0dc5a62 Mon Sep 17 00:00:00 2001
From 729167ca9a62beda6d657e7368144f58ad004968 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
@ -15,10 +15,10 @@ Signed-off-by: Ulrich Hecht <uli@suse.de>
1 file changed, 6 insertions(+)
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index 8d96462..576ad77 100644
index 82a794f..701809e 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -3753,6 +3753,11 @@ static abi_long do_ioctl(int fd, abi_long cmd, abi_long arg)
@@ -3779,6 +3779,11 @@ static abi_long do_ioctl(int fd, abi_long cmd, abi_long arg)
arg_type++;
target_size = thunk_type_size(arg_type, 0);
switch(ie->access) {
@ -30,7 +30,7 @@ index 8d96462..576ad77 100644
case IOC_R:
ret = get_errno(ioctl(fd, ie->host_cmd, buf_temp));
if (!is_error(ret)) {
@@ -3771,6 +3776,7 @@ static abi_long do_ioctl(int fd, abi_long cmd, abi_long arg)
@@ -3797,6 +3802,7 @@ static abi_long do_ioctl(int fd, abi_long cmd, abi_long arg)
unlock_user(argptr, arg, 0);
ret = get_errno(ioctl(fd, ie->host_cmd, buf_temp));
break;

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

@ -1,4 +1,4 @@
From a95bbe675538b7229a681000c4712e8a67b37c37 Mon Sep 17 00:00:00 2001
From dbe5cadd67745ed4116d49c3987c847bc9bf450c 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
@ -21,10 +21,10 @@ Signed-off-by: Andreas Färber <afaerber@suse.de>
4 files changed, 21 insertions(+), 1 deletion(-)
diff --git a/block.c b/block.c
index 8800a6b..a456134 100644
index 3e252a2..c09f6df 100644
--- a/block.c
+++ b/block.c
@@ -5597,6 +5597,9 @@ void bdrv_img_create(const char *filename, const char *fmt,
@@ -5611,6 +5611,9 @@ void bdrv_img_create(const char *filename, const char *fmt,
if (!quiet) {
printf("Formatting '%s', fmt=%s ", filename, fmt);
qemu_opts_print(opts);

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

@ -1,4 +1,4 @@
From ec805d63aae6d64cca97882a7b6ecb1e29569e18 Mon Sep 17 00:00:00 2001
From 10a63f0ce5025cf5d777c578ffafd70ebbef495d 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-PPC-KVM-Disable-mmu-notifier-check.patch
View File

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

2
0013-linux-user-fix-segfault-deadlock.patch
View File

@ -1,4 +1,4 @@
From 90a3fe97f57d72fce339c68ee418fe173f3929ab Mon Sep 17 00:00:00 2001
From 8c7fb1aeedbdecbd2ccc0af9c21389a2a7e02b96 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
0014-linux-user-binfmt-support-host-bina.patch
View File

@ -1,4 +1,4 @@
From d3b6e9bdc03c61bf460b636482080ec11684ba51 Mon Sep 17 00:00:00 2001
From d16bba8ec34f1f46f32b6e8ffe7ff46e581624f7 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
0015-target-arm-linux-user-no-tb_flush-o.patch
View File

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

12
0016-linux-user-Ignore-broken-loop-ioctl.patch
View File

@ -1,4 +1,4 @@
From 032edaaeb5bd9fdc718820a79c1820592b63ffef Mon Sep 17 00:00:00 2001
From 70d72897f46f7ca7089e784caa4ac8eaa8c24287 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
@ -23,7 +23,7 @@ Signed-off-by: Andreas Färber <afaerber@suse.de>
4 files changed, 10 insertions(+)
diff --git a/linux-user/ioctls.h b/linux-user/ioctls.h
index 762779e..038a799 100644
index d2b7a50..0680dc4 100644
--- a/linux-user/ioctls.h
+++ b/linux-user/ioctls.h
@@ -330,6 +330,7 @@
@ -46,10 +46,10 @@ index 8974caa..810ae61 100644
#endif
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index 576ad77..af0479e 100644
index 701809e..4ce7b84 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -3696,6 +3696,13 @@ static abi_long do_ioctl_kdsigaccept(const IOCTLEntry *ie, uint8_t *buf_temp,
@@ -3722,6 +3722,13 @@ static abi_long do_ioctl_kdsigaccept(const IOCTLEntry *ie, uint8_t *buf_temp,
return get_errno(ioctl(fd, ie->host_cmd, sig));
}
@ -64,10 +64,10 @@ index 576ad77..af0479e 100644
#define IOCTL(cmd, access, ...) \
{ TARGET_ ## cmd, cmd, #cmd, access, 0, { __VA_ARGS__ } },
diff --git a/linux-user/syscall_defs.h b/linux-user/syscall_defs.h
index 52691fb..794215e 100644
index e4ae769..a6aa6b5 100644
--- a/linux-user/syscall_defs.h
+++ b/linux-user/syscall_defs.h
@@ -1051,6 +1051,7 @@ struct target_pollfd {
@@ -1061,6 +1061,7 @@ struct target_pollfd {
#define TARGET_LOOP_SET_STATUS64 0x4C04
#define TARGET_LOOP_GET_STATUS64 0x4C05
#define TARGET_LOOP_CHANGE_FD 0x4C06

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

@ -1,4 +1,4 @@
From 56ad45f04c594535e2428ab6efbb2ceb36946e9f Mon Sep 17 00:00:00 2001
From 70ae12474a1d85550cabe64f60e8b0c52055fe17 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

6
0018-linux-user-Run-multi-threaded-code-.patch
View File

@ -1,4 +1,4 @@
From 47197d2a2652f532971bba5fcfa9f51e7611f610 Mon Sep 17 00:00:00 2001
From f9d767a0740f88f9470166e6cba43d459a7abc1b 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
@ -19,10 +19,10 @@ Signed-off-by: Alexander Graf <agraf@suse.de>
1 file changed, 9 insertions(+)
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index af0479e..0e0916d 100644
index 4ce7b84..9218392 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -4401,6 +4401,15 @@ static int do_fork(CPUArchState *env, unsigned int flags, abi_ulong newsp,
@@ -4427,6 +4427,15 @@ static int do_fork(CPUArchState *env, unsigned int flags, abi_ulong newsp,
if (nptl_flags & CLONE_SETTLS)
cpu_set_tls (new_env, newtls);

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

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

8
0020-linux-user-Fake-proc-cpuinfo.patch
View File

@ -1,4 +1,4 @@
From c9e29d5cb3a6559b4a0b79905cd6c62835d21fdf Mon Sep 17 00:00:00 2001
From 6738c77cc99a63b6dde22445d9c511ea84aa8019 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
@ -22,10 +22,10 @@ Signed-off-by: Andreas Färber <afaerber@suse.de>
1 file changed, 20 insertions(+)
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index 0e0916d..573ea5f 100644
index 9218392..ce1054c 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -5182,6 +5182,25 @@ static int open_self_stat(void *cpu_env, int fd)
@@ -5208,6 +5208,25 @@ static int open_self_stat(void *cpu_env, int fd)
return 0;
}
@ -51,7 +51,7 @@ index 0e0916d..573ea5f 100644
static int open_self_auxv(void *cpu_env, int fd)
{
CPUState *cpu = ENV_GET_CPU((CPUArchState *)cpu_env);
@@ -5296,6 +5315,7 @@ static int do_open(void *cpu_env, const char *pathname, int flags, mode_t mode)
@@ -5322,6 +5341,7 @@ static int do_open(void *cpu_env, const char *pathname, int flags, mode_t mode)
#if defined(HOST_WORDS_BIGENDIAN) != defined(TARGET_WORDS_BIGENDIAN)
{ "/proc/net/route", open_net_route, is_proc },
#endif

8
0021-linux-user-implement-FS_IOC_GETFLAG.patch
View File

@ -1,4 +1,4 @@
From 57f28f99146803cd0c5d388e61889a83ec12b33f Mon Sep 17 00:00:00 2001
From 5e7cb7945afdf65b337010caef88e80013afef75 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
@ -16,7 +16,7 @@ v1 -> v2:
2 files changed, 3 insertions(+)
diff --git a/linux-user/ioctls.h b/linux-user/ioctls.h
index 038a799..efbc970 100644
index 0680dc4..4db9651 100644
--- a/linux-user/ioctls.h
+++ b/linux-user/ioctls.h
@@ -89,6 +89,7 @@
@ -28,10 +28,10 @@ index 038a799..efbc970 100644
IOCTL(SIOCATMARK, 0, TYPE_NULL)
IOCTL(SIOCGIFNAME, IOC_RW, MK_PTR(TYPE_INT))
diff --git a/linux-user/syscall_defs.h b/linux-user/syscall_defs.h
index 794215e..6146d79 100644
index a6aa6b5..863cfb4 100644
--- a/linux-user/syscall_defs.h
+++ b/linux-user/syscall_defs.h
@@ -2467,6 +2467,8 @@ struct target_f_owner_ex {
@@ -2477,6 +2477,8 @@ struct target_f_owner_ex {
#define TARGET_MTIOCGET TARGET_IOR('m', 2, struct mtget)
#define TARGET_MTIOCPOS TARGET_IOR('m', 3, struct mtpos)

8
0022-linux-user-implement-FS_IOC_SETFLAG.patch
View File

@ -1,4 +1,4 @@
From f89d1f32b6b97db2abda653a72d00a45c512d220 Mon Sep 17 00:00:00 2001
From c0591abdf987079362c1e8a5452260e247ab33e0 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
@ -16,7 +16,7 @@ v1 -> v2
2 files changed, 2 insertions(+)
diff --git a/linux-user/ioctls.h b/linux-user/ioctls.h
index efbc970..6be0048 100644
index 4db9651..46bad50 100644
--- a/linux-user/ioctls.h
+++ b/linux-user/ioctls.h
@@ -90,6 +90,7 @@
@ -28,10 +28,10 @@ index efbc970..6be0048 100644
IOCTL(SIOCATMARK, 0, TYPE_NULL)
IOCTL(SIOCGIFNAME, IOC_RW, MK_PTR(TYPE_INT))
diff --git a/linux-user/syscall_defs.h b/linux-user/syscall_defs.h
index 6146d79..fc326dd 100644
index 863cfb4..14023c9 100644
--- a/linux-user/syscall_defs.h
+++ b/linux-user/syscall_defs.h
@@ -2468,6 +2468,7 @@ struct target_f_owner_ex {
@@ -2478,6 +2478,7 @@ struct target_f_owner_ex {
#define TARGET_MTIOCPOS TARGET_IOR('m', 3, struct mtpos)
#define TARGET_FS_IOC_GETFLAGS TARGET_IORU('f', 1)

6
0023-linux-user-XXX-disable-fiemap.patch
View File

@ -1,4 +1,4 @@
From 3a9a8a733b3e394ead8a453705ed151e87bb743c Mon Sep 17 00:00:00 2001
From cae4b35f0f81c0bfff339675f58e0eb252e60a7c 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
@ -9,10 +9,10 @@ agraf: fiemap breaks in libarchive. Disable it for now.
1 file changed, 5 insertions(+)
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index 573ea5f..28039c7 100644
index ce1054c..f00b082 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -3246,6 +3246,11 @@ static abi_long do_ioctl_fs_ioc_fiemap(const IOCTLEntry *ie, uint8_t *buf_temp,
@@ -3272,6 +3272,11 @@ static abi_long do_ioctl_fs_ioc_fiemap(const IOCTLEntry *ie, uint8_t *buf_temp,
uint32_t outbufsz;
int free_fm = 0;

2
0024-slirp-nooutgoing.patch
View File

@ -1,4 +1,4 @@
From 84fe61a504718a0b4dbdd66a9275dcf5b4427026 Mon Sep 17 00:00:00 2001
From 8e3a25586a5ce8a771c6b85db26a45d2034117cc 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

2
0025-vnc-password-file-and-incoming-conn.patch
View File

@ -1,4 +1,4 @@
From 5ac0412380823745654010b067fbce609efa4aa7 Mon Sep 17 00:00:00 2001
From 44b04f8570d6abff9c43b27ed4d83d9dae15dd90 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=

8
0026-linux-user-add-more-blk-ioctls.patch
View File

@ -1,4 +1,4 @@
From 9abeb48be0c332c84f379455bd424f0fd58e79e0 Mon Sep 17 00:00:00 2001
From fc47b8d0579752369bff5f39fa1e57e40b88adf8 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
@ -13,7 +13,7 @@ Signed-off-by: Alexander Graf <agraf@suse.de>
3 files changed, 27 insertions(+)
diff --git a/linux-user/ioctls.h b/linux-user/ioctls.h
index 6be0048..369224f 100644
index 46bad50..9b6cacb 100644
--- a/linux-user/ioctls.h
+++ b/linux-user/ioctls.h
@@ -73,6 +73,24 @@
@ -42,10 +42,10 @@ index 6be0048..369224f 100644
IOCTL(BLKRASET, 0, TYPE_INT)
IOCTL(BLKRAGET, IOC_R, MK_PTR(TYPE_LONG))
diff --git a/linux-user/syscall_defs.h b/linux-user/syscall_defs.h
index fc326dd..853b903 100644
index 14023c9..e48481e 100644
--- a/linux-user/syscall_defs.h
+++ b/linux-user/syscall_defs.h
@@ -920,6 +920,12 @@ struct target_pollfd {
@@ -930,6 +930,12 @@ struct target_pollfd {
#define TARGET_BLKGETSIZE64 TARGET_IOR(0x12,114,abi_ulong)
/* return device size in bytes
(u64 *arg) */

6
0027-linux-user-use-target_ulong.patch
View File

@ -1,4 +1,4 @@
From 48296463c92ea6afe7eaaabc88ba8d75e910afae Mon Sep 17 00:00:00 2001
From 84f86270b2e76cf99bf78084722e5d95532d6f91 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
@ -36,10 +36,10 @@ index e29c7f3..75b6558 100644
extern THREAD CPUState *thread_cpu;
void cpu_loop(CPUArchState *env);
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index 28039c7..0c49a67 100644
index f00b082..08df03f 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -5447,10 +5447,10 @@ int syscall_restartable(int syscall_nr)
@@ -5473,10 +5473,10 @@ int syscall_restartable(int syscall_nr)
/* do_syscall() should always have a single exit point at the end so
that actions, such as logging of syscall results, can be performed.
All errnos that do_syscall() returns must be -TARGET_<errcode>. */

2
0028-block-Add-support-for-DictZip-enabl.patch
View File

@ -1,4 +1,4 @@
From 6e08bfbccc8263bc5c9b619d19864723760e17dc Mon Sep 17 00:00:00 2001
From 74b3a58f1eb01de57d230a928b7b556add2ec519 Mon Sep 17 00:00:00 2001
From: Alexander Graf <agraf@suse.de>
Date: Wed, 5 Aug 2009 09:49:37 +0200
Subject: [PATCH] block: Add support for DictZip enabled gzip files

2
0029-block-Add-tar-container-format.patch
View File

@ -1,4 +1,4 @@
From 448b9b9a09a26b30cdbc6afd9472ce07efc06e8c Mon Sep 17 00:00:00 2001
From 39a66fff01637db1cf182bbcc44197e6b9350813 Mon Sep 17 00:00:00 2001
From: Alexander Graf <agraf@suse.de>
Date: Wed, 5 Aug 2009 17:28:38 +0200
Subject: [PATCH] block: Add tar container format

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

@ -1,4 +1,4 @@
From ccc7274accdbd66a581777e0dae3865ba86c2eed Mon Sep 17 00:00:00 2001
From aa8ba1fc7b57a6274b99b6f28201a971fd3a71ff 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
0031-Legacy-Patch-kvm-qemu-preXX-report-.patch
View File

@ -1,4 +1,4 @@
From 7a6f8226cb5dd3540c80f852917b118a6b88d791 Mon Sep 17 00:00:00 2001
From 68d77cd24817148f59530990459db4aa627d21f5 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
0032-console-add-question-mark-escape-op.patch
View File

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

4
0033-Make-char-muxer-more-robust-wrt-sma.patch
View File

@ -1,4 +1,4 @@
From 111abb7150e0eaadfb338c82b86d4b65a171f9c6 Mon Sep 17 00:00:00 2001
From 6bcb48aaa09b73c9c0c30f8404eb4b3fd3b50eff 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,7 +22,7 @@ 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 55e372c..d562dae 100644
index 7acc03f..c0ab288 100644
--- a/qemu-char.c
+++ b/qemu-char.c
@@ -311,6 +311,9 @@ typedef struct {

6
0034-linux-user-lseek-explicitly-cast-no.patch
View File

@ -1,4 +1,4 @@
From d7412d16a40cda2130de7e9b041bff4553ef493a Mon Sep 17 00:00:00 2001
From 04f9510a380afce8eb3b146e3429d27bebd1a37d 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
@ -16,10 +16,10 @@ Signed-off-by: Alexander Graf <agraf@suse.de>
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index 0c49a67..c69f724 100644
index 08df03f..0b4668d 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -5761,9 +5761,14 @@ abi_long do_syscall(void *cpu_env, int num, abi_ulong arg1,
@@ -5787,9 +5787,14 @@ abi_long do_syscall(void *cpu_env, int num, abi_ulong arg1,
case TARGET_NR_oldstat:
goto unimplemented;
#endif

2
0035-virtfs-proxy-helper-Provide-__u64-f.patch
View File

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

6
0036-configure-Enable-PIE-for-ppc-and-pp.patch
View File

@ -1,4 +1,4 @@
From 1e35b0409716fd2364ca25889801ea28299eeff1 Mon Sep 17 00:00:00 2001
From 74b427c02d609c0ec4387fd32806351156a54513 Mon Sep 17 00:00:00 2001
From: Dinar Valeev <k0da@opensuse.org>
Date: Wed, 2 Oct 2013 17:56:03 +0200
Subject: [PATCH] configure: Enable PIE for ppc and ppc64 hosts
@ -14,10 +14,10 @@ Signed-off-by: Andreas Färber <afaerber@suse.de>
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/configure b/configure
index 7dd43fd..99f8a37 100755
index f7685b5..7c07772 100755
--- a/configure
+++ b/configure
@@ -1531,7 +1531,7 @@ fi
@@ -1538,7 +1538,7 @@ fi
if test "$pie" = ""; then
case "$cpu-$targetos" in

4
0037-tests-Don-t-run-qom-test-twice.patch
View File

@ -1,4 +1,4 @@
From d78b797a58584419bdfabaebe79322a246790dff Mon Sep 17 00:00:00 2001
From 0c5ba28c398f9ccdbd951a4caa5c5bdfbb5e4787 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20F=C3=A4rber?= <afaerber@suse.de>
Date: Mon, 7 Apr 2014 16:03:08 +0200
Subject: [PATCH] tests: Don't run qom-test twice
@ -19,7 +19,7 @@ Signed-off-by: Andreas Färber <afaerber@suse.de>
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/tests/Makefile b/tests/Makefile
index 1fcd633..7c0253b 100644
index fa25c70..f7fa66e 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -184,7 +184,9 @@ check-qtest-microblazeel-y = $(check-qtest-microblaze-y)

2
0038-qtest-Increase-socket-timeout.patch
View File

@ -1,4 +1,4 @@
From c71486ca826cfb0455aed9df5f298d3ea163cf7d Mon Sep 17 00:00:00 2001
From 8ed9074630b2095beef49b0ace3e2d97e6fb02de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20F=C3=A4rber?= <afaerber@suse.de>
Date: Thu, 17 Apr 2014 18:39:10 +0200
Subject: [PATCH] qtest: Increase socket timeout

2
0039-module-Simplify-module_load.patch
View File

@ -1,4 +1,4 @@
From d0fb6e15c8620851d728e67e1cb3b02b9ba07c1e Mon Sep 17 00:00:00 2001
From 1a85e2c901850791cd5accc1cd727666d5ce2aae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20F=C3=A4rber?= <afaerber@suse.de>
Date: Fri, 20 Jun 2014 16:46:50 +0200
Subject: [PATCH] module: Simplify module_load()

2
0040-module-Don-t-complain-when-a-module.patch
View File

@ -1,4 +1,4 @@
From 6b2580c25ef053a053af27b393a128ec552a4081 Mon Sep 17 00:00:00 2001
From 97f7b5e684771087691d509573492aeb059443de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20F=C3=A4rber?= <afaerber@suse.de>
Date: Fri, 20 Jun 2014 17:54:51 +0200
Subject: [PATCH] module: Don't complain when a module is absent

50
0041-tests-Fix-unterminated-string-outpu.patch
View File

@ -1,50 +0,0 @@
From 8dea7848783572c41b08817d269305ddec5d0dc7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20F=C3=A4rber?= <afaerber@suse.de>
Date: Wed, 9 Jul 2014 21:21:00 +0200
Subject: [PATCH] tests: Fix unterminated string output visitor enum human
string
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
The buffer was being allocated of size string length plus two.
Around the string two quotes were being added, but no terminating NUL.
It was then compared using g_assert_cmpstr(), resulting in fairly random
assertion failures:
ERROR:tests/test-string-output-visitor.c:213:test_visitor_out_enum: assertion failed (str == str_human): ("\"value1\"" == "\"value1\"\001EEEEEEEEEEEEEE\0171")
There is no g_assert_cmpnstr() counterpart, so use g_strdup_printf()
for safely assembling the string in the first place.
Cc: Hu Tao <hutao@cn.fujitsu.com>
Cc: Michael S. Tsirkin <mst@redhat.com>
Suggested-by: Eric Blake <eblake@redhat.com>
Fixes: b4900c0 tests: add human format test for string output visitor
Signed-off-by: Andreas Färber <afaerber@suse.de>
---
tests/test-string-output-visitor.c | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/tests/test-string-output-visitor.c b/tests/test-string-output-visitor.c
index e89e43c..101fb27 100644
--- a/tests/test-string-output-visitor.c
+++ b/tests/test-string-output-visitor.c
@@ -196,16 +196,11 @@ static void test_visitor_out_enum(TestOutputVisitorData *data,
for (i = 0; i < ENUM_ONE_MAX; i++) {
char *str_human;
- int len;
visit_type_EnumOne(data->ov, &i, "unused", &err);
g_assert(!err);
- len = strlen(EnumOne_lookup[i]) + 2;
- str_human = g_malloc0(len);
- str_human[0] = '"';
- strncpy(str_human + 1, EnumOne_lookup[i], strlen(EnumOne_lookup[i]));
- str_human[len - 1] = '"';
+ str_human = g_strdup_printf("\"%s\"", EnumOne_lookup[i]);
str = string_output_get_string(data->sov);
g_assert(str != NULL);

89
0042-libqos-Fix-PC-PCI-endianness-glitch.patch
View File

@ -1,89 +0,0 @@
From 135f7b84cae0986aa804933f18c4e1f9ab34fe63 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20F=C3=A4rber?= <afaerber@suse.de>
Date: Thu, 10 Jul 2014 15:55:04 +0200
Subject: [PATCH] libqos: Fix PC PCI endianness glitches
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
The libqos implementation of io_read{b,w,l} and io_write{b,w,l} hooks
was relying on qtest_mem{read,write}() respectively. With d81d410 (usb:
improve ehci/uhci test) this resulted in assertion failures on ppc hosts:
ERROR:tests/usb-hcd-ehci-test.c:78:ehci_port_test: assertion failed: ((value & mask) == (expect & mask))
ERROR:tests/usb-hcd-ehci-test.c:128:pci_uhci_port_2: assertion failed: (pcibus != NULL)
ERROR:tests/usb-hcd-ehci-test.c:150:pci_ehci_port_2: assertion failed: (pcibus != NULL)
qtest_read{b,w,l,q}() and qtest_write{b,w,l,q}() had been introduced
as endian-safe replacement for qtest_mem{read,write}() in I2C in
872536b (qtest: Add MMIO support). Use them for PCI as well.
Cc: Anthony Liguori <aliguori@amazon.com>
Cc: Gerd Hoffmann <kraxel@redhat.com>
Fixes: c4efe1c qtest: add libqos including PCI support
Fixes: d81d410 usb: improve ehci/uhci test
Signed-off-by: Andreas Färber <afaerber@suse.de>
---
tests/libqos/pci-pc.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/tests/libqos/pci-pc.c b/tests/libqos/pci-pc.c
index bf741a4..4adf400 100644
--- a/tests/libqos/pci-pc.c
+++ b/tests/libqos/pci-pc.c
@@ -41,7 +41,7 @@ static uint8_t qpci_pc_io_readb(QPCIBus *bus, void *addr)
if (port < 0x10000) {
value = inb(port);
} else {
- memread(port, &value, sizeof(value));
+ value = readb(port);
}
return value;
@@ -55,7 +55,7 @@ static uint16_t qpci_pc_io_readw(QPCIBus *bus, void *addr)
if (port < 0x10000) {
value = inw(port);
} else {
- memread(port, &value, sizeof(value));
+ value = readw(port);
}
return value;
@@ -69,7 +69,7 @@ static uint32_t qpci_pc_io_readl(QPCIBus *bus, void *addr)
if (port < 0x10000) {
value = inl(port);
} else {
- memread(port, &value, sizeof(value));
+ value = readl(port);
}
return value;
@@ -82,7 +82,7 @@ static void qpci_pc_io_writeb(QPCIBus *bus, void *addr, uint8_t value)
if (port < 0x10000) {
outb(port, value);
} else {
- memwrite(port, &value, sizeof(value));
+ writeb(port, value);
}
}
@@ -93,7 +93,7 @@ static void qpci_pc_io_writew(QPCIBus *bus, void *addr, uint16_t value)
if (port < 0x10000) {
outw(port, value);
} else {
- memwrite(port, &value, sizeof(value));
+ writew(port, value);
}
}
@@ -104,7 +104,7 @@ static void qpci_pc_io_writel(QPCIBus *bus, void *addr, uint32_t value)
if (port < 0x10000) {
outl(port, value);
} else {
- memwrite(port, &value, sizeof(value));
+ writel(port, value);
}
}

33
0043-qtest-fix-vhost-user-test-compilati.patch
View File

@ -1,33 +0,0 @@
From 97f277e21ed2aa01d23a960ec499f3b12ec18ed5 Mon Sep 17 00:00:00 2001
From: Nikolay Nikolaev <n.nikolaev@virtualopensystems.com>
Date: Wed, 9 Jul 2014 18:06:32 +0300
Subject: [PATCH] qtest: fix vhost-user-test compilation with old GLib
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Mising G_TIME_SPAN_SECOND definition breaks the RHEL6 compilation as GLib
version before 2.26 does not have it. In such case just define it.
Reported-by: Kevin Wolf <kwolf@redhat.com>
Signed-off-by: Nikolay Nikolaev <n.nikolaev@virtualopensystems.com>
Signed-off-by: Andreas Färber <afaerber@suse.de>
---
tests/vhost-user-test.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/tests/vhost-user-test.c b/tests/vhost-user-test.c
index 2af2381..406ba70 100644
--- a/tests/vhost-user-test.c
+++ b/tests/vhost-user-test.c
@@ -22,6 +22,10 @@
#include <qemu/sockets.h>
/* GLIB version compatibility flags */
+#if !GLIB_CHECK_VERSION(2, 26, 0)
+#define G_TIME_SPAN_SECOND (G_GINT64_CONSTANT(1000000))
+#endif
+
#if GLIB_CHECK_VERSION(2, 28, 0)
#define HAVE_MONOTONIC_TIME
#endif

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

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

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

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

11
qemu-linux-user.changes
View File

@ -1,9 +1,20 @@
-------------------------------------------------------------------
Wed Jul 16 17:31:54 UTC 2014 - afaerber@suse.de
- Update to v2.1.0-rc2: http://wiki.qemu-project.org/ChangeLog/2.1
* Patch queue updated from git://github.com/openSUSE/qemu.git opensuse-2.1
* Updated update_git.sh accordingly
-------------------------------------------------------------------
Wed Jul 9 17:34:55 UTC 2014 - afaerber@suse.de
- Update to v2.1.0-rc0: http://wiki.qemu-project.org/ChangeLog/2.1
* Dropped patches on rebase:
0043-arm-translate.c-Fix-smlald-Instruct.patch
0044-target-arm-A64-fix-unallocated-test.patch
* Package qemu-ppc64le binary
* Modified update_git.sh accordingly
- Update to v2.1.0-rc1: http://wiki.qemu-project.org/ChangeLog/2.1
* Modified update_git.sh accordingly

12
qemu-linux-user.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 GPL-2.0+ and LGPL-2.1+ and MIT
Group: System/Emulators/PC
Version: 2.0.91
Version: 2.0.92
Release: 0
Source: qemu-2.1.0-rc1.tar.bz2
Source: qemu-2.1.0-rc2.tar.bz2
# This patch queue is auto-generated from https://github.com/openSUSE/qemu
Patch0001: 0001-XXX-dont-dump-core-on-sigabort.patch
Patch0002: 0002-XXX-work-around-SA_RESTART-race-wit.patch
@ -65,9 +65,6 @@ Patch0037: 0037-tests-Don-t-run-qom-test-twice.patch
Patch0038: 0038-qtest-Increase-socket-timeout.patch
Patch0039: 0039-module-Simplify-module_load.patch
Patch0040: 0040-module-Don-t-complain-when-a-module.patch
Patch0041: 0041-tests-Fix-unterminated-string-outpu.patch
Patch0042: 0042-libqos-Fix-PC-PCI-endianness-glitch.patch
Patch0043: 0043-qtest-fix-vhost-user-test-compilati.patch
# Please do not add patches manually here, run update_git.sh.
# this is to make lint happy
Source300: rpmlintrc
@ -120,7 +117,7 @@ emulations. This can be used together with the OBS build script to
run cross-architecture builds.
%prep
%setup -q -n qemu-2.1.0-rc1
%setup -q -n qemu-2.1.0-rc2
%patch0001 -p1
%patch0002 -p1
%patch0003 -p1
@ -161,9 +158,6 @@ run cross-architecture builds.
%patch0038 -p1
%patch0039 -p1
%patch0040 -p1
%patch0041 -p1
%patch0042 -p1
%patch0043 -p1
%build
./configure --prefix=%_prefix --sysconfdir=%_sysconfdir \

4
qemu-linux-user.spec.in
View File

@ -23,7 +23,7 @@ License: BSD-3-Clause and GPL-2.0 and GPL-2.0+ and LGPL-2.1+ and MIT
Group: System/Emulators/PC
QEMU_VERSION
Release: 0
Source: qemu-2.1.0-rc1.tar.bz2
Source: qemu-2.1.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.
@ -78,7 +78,7 @@ emulations. This can be used together with the OBS build script to
run cross-architecture builds.
%prep
%setup -q -n qemu-2.1.0-rc1
%setup -q -n qemu-2.1.0-rc2
PATCH_EXEC
%build

51
qemu.changes
View File

@ -1,3 +1,15 @@
-------------------------------------------------------------------
Wed Jul 16 17:31:54 UTC 2014 - afaerber@suse.de
- Update to v2.1.0-rc2: http://wiki.qemu-project.org/ChangeLog/2.1
* Patch queue updated from git://github.com/openSUSE/qemu.git opensuse-2.1
* Patches dropped:
0041-tests-Fix-unterminated-string-outpu.patch
0042-libqos-Fix-PC-PCI-endianness-glitch.patch
0043-qtest-fix-vhost-user-test-compilati.patch
* Updated update_git.sh accordingly
* Extended update_git.sh to add generated patch names to change log
-------------------------------------------------------------------
Wed Jul 9 17:34:55 UTC 2014 - afaerber@suse.de
@ -6,6 +18,44 @@ Wed Jul 9 17:34:55 UTC 2014 - afaerber@suse.de
0037-xen_disk-add-discard-support.patch dropped
* PowerPC ELF v2 support now upstream
0045-tcg-ppc64-Support-the-ELFv2-ABI.patch dropped
* Patches renamed during rebase:
0015-linux-user-arm-no-tb_flush-on-reset.patch -> 0015-target-arm-linux-user-no-tb_flush-o.patch
* Patches reordered due to rebase:
0038-tests-Don-t-run-qom-test-twice.patch -> 0037-tests-Don-t-run-qom-test-twice.patch
0041-qtest-Increase-socket-timeout.patch -> 0038-qtest-Increase-socket-timeout.patch
0071-module-Simplify-module_load.patch -> 0039-module-Simplify-module_load.patch
0072-module-Don-t-complain-when-a-module.patch -> 0040-module-Don-t-complain-when-a-module.patch
* Patches automatically dropped on rebase:
0039-qtest-Assure-that-init_socket-s-lis.patch
0040-qtest-Add-error-reporting-to-socket.patch
0042-qtest-Be-paranoid-about-accept-addr.patch
0043-arm-translate.c-Fix-smlald-Instruct.patch
0044-target-arm-A64-fix-unallocated-test.patch
0046-vmstate-add-VMS_MUST_EXIST.patch
0047-vmstate-add-VMSTATE_VALIDATE.patch
0048-virtio-net-fix-buffer-overflow-on-i.patch
0049-virtio-net-out-of-bounds-buffer-wri.patch
0050-virtio-out-of-bounds-buffer-write-o.patch
0051-ahci-fix-buffer-overrun-on-invalid-.patch
0052-hpet-fix-buffer-overrun-on-invalid-.patch
0053-hw-pci-pcie_aer.c-fix-buffer-overru.patch
0054-pl022-fix-buffer-overun-on-invalid-.patch
0055-vmstate-fix-buffer-overflow-in-targ.patch
0056-virtio-avoid-buffer-overrun-on-inco.patch
0057-virtio-validate-num_sg-when-mapping.patch
0058-pxa2xx-avoid-buffer-overrun-on-inco.patch
0059-ssd0323-fix-buffer-overun-on-invali.patch
0060-tsc210x-fix-buffer-overrun-on-inval.patch
0061-zaurus-fix-buffer-overrun-on-invali.patch
0062-virtio-scsi-fix-buffer-overrun-on-i.patch
0063-vmstate-s-VMSTATE_INT32_LE-VMSTATE_.patch
0064-usb-sanity-check-setup_index-setup_.patch
0065-savevm-Ignore-minimum_version_id_ol.patch
0066-ssi-sd-fix-buffer-overrun-on-invali.patch
0067-openpic-avoid-buffer-overrun-on-inc.patch
0068-virtio-net-out-of-bounds-buffer-wri.patch
0069-virtio-validate-config_len-on-load.patch
0070-virtio-allow-mapping-up-to-max-queu.patch
* iPXE fixes now included
ipxe-build-Work-around-bug-in-gcc-4.8.patch dropped
ipxe-build-Avoid-strict-aliasing-warning.patch dropped
@ -13,6 +63,7 @@ Wed Jul 9 17:34:55 UTC 2014 - afaerber@suse.de
* SeaVGABIOS fix now included
vgabios-Make-sure-stdvga_list_modes-doesn-t-overrun-.patch dropped
* Modified update_git.sh accordingly
- Update to v2.1.0-rc1: http://wiki.qemu-project.org/ChangeLog/2.1
* 0041-tests-Fix-unterminated-string-outpu.patch: Test fix
* 0042-libqos-Fix-PC-PCI-endianness-glitch.patch: Test fix for ppc

12
qemu.spec
View File

@ -43,9 +43,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: 2.0.91
Version: 2.0.92
Release: 0
Source: %name-2.1.0-rc1.tar.bz2
Source: %name-2.1.0-rc2.tar.bz2
Source1: 80-kvm.rules
Source2: qemu-ifup
Source3: kvm_stat
@ -94,9 +94,6 @@ Patch0037: 0037-tests-Don-t-run-qom-test-twice.patch
Patch0038: 0038-qtest-Increase-socket-timeout.patch
Patch0039: 0039-module-Simplify-module_load.patch
Patch0040: 0040-module-Don-t-complain-when-a-module.patch
Patch0041: 0041-tests-Fix-unterminated-string-outpu.patch
Patch0042: 0042-libqos-Fix-PC-PCI-endianness-glitch.patch
Patch0043: 0043-qtest-fix-vhost-user-test-compilati.patch
# Please do not add patches manually here, run update_git.sh.
# this is to make lint happy
@ -490,7 +487,7 @@ This package provides a service file for starting and stopping KSM.
%endif
%prep
%setup -q -n %name-2.1.0-rc1
%setup -q -n %name-2.1.0-rc2
%patch0001 -p1
%patch0002 -p1
%patch0003 -p1
@ -531,9 +528,6 @@ This package provides a service file for starting and stopping KSM.
%patch0038 -p1
%patch0039 -p1
%patch0040 -p1
%patch0041 -p1
%patch0042 -p1
%patch0043 -p1
%if %{build_x86_fw_from_source}
# as a safeguard, delete the firmware files that we intend to build

4
qemu.spec.in
View File

@ -45,7 +45,7 @@ License: BSD-3-Clause and GPL-2.0 and GPL-2.0+ and LGPL-2.1+ and MIT
Group: System/Emulators/PC
QEMU_VERSION
Release: 0
Source: %name-2.1.0-rc1.tar.bz2
Source: %name-2.1.0-rc2.tar.bz2
Source1: 80-kvm.rules
Source2: qemu-ifup
Source3: kvm_stat
@ -448,7 +448,7 @@ This package provides a service file for starting and stopping KSM.
%endif
%prep
%setup -q -n %name-2.1.0-rc1
%setup -q -n %name-2.1.0-rc2
PATCH_EXEC
%if %{build_x86_fw_from_source}

27
update_git.sh
View File

@ -12,7 +12,7 @@
GIT_TREE=git://github.com/openSUSE/qemu.git
GIT_LOCAL_TREE=~/git/qemu-opensuse
GIT_BRANCH=opensuse-2.1
GIT_UPSTREAM_TAG=v2.1.0-rc1
GIT_UPSTREAM_TAG=v2.1.0-rc2
GIT_DIR=/dev/shm/qemu-factory-git-dir
CMP_DIR=/dev/shm/qemu-factory-cmp-dir
@ -76,6 +76,7 @@ rm -rf $GIT_DIR
else
osc rm --force $i
let DELETED_COUNT+=1
echo " ${i##*/}" >> qemu.changes.deleted
fi
done
@ -83,6 +84,7 @@ rm -rf $GIT_DIR
mv $i .
osc add ${i##*/}
let ADDED_COUNT+=1
echo " ${i##*/}" >> qemu.changes.added
done
for package in qemu qemu-linux-user; do
@ -111,7 +113,30 @@ rm -rf $GIT_DIR
echo "$line"
fi
done < $package.spec.in > $package.spec
# Factory requires all deleted and added patches to be mentioned
if [ -e qemu.changes.deleted ] || [ -e qemu.changes.added ]; then
echo "Patch queue updated from ${GIT_TREE} ${GIT_BRANCH}" > $package.changes.proposed
fi
if [ -e qemu.changes.deleted ]; then
echo "* Patches dropped:" >> $package.changes.proposed
cat qemu.changes.deleted >> $package.changes.proposed
fi
if [ -e qemu.changes.added ]; then
echo "* Patches added:" >> $package.changes.proposed
cat qemu.changes.added >> $package.changes.proposed
fi
if [ -e $package.changes.proposed ]; then
osc vc --file=$package.changes.proposed $package
rm -f $package.changes.proposed
fi
done
if [ -e qemu.changes.deleted ]; then
rm -f qemu.changes.deleted
fi
if [ -e qemu.changes.added ]; then
rm -f qemu.changes.added
fi
echo "git patch summary"
echo " unchanged: $UNCHANGED_COUNT"
echo " changed: $CHANGED_COUNT"