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

Accepting request 228957 from home:a_faerber:branches:Virtualization

Browse Source 
Update to v2.0.0-rc1

OBS-URL: https://build.opensuse.org/request/show/228957
OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=200
This commit is contained in:
Andreas Färber 2014-04-03 22:50:11 +00:00 committed by Git OBS Bridge
parent 0e7dd46c01
commit 678bd2896d
48 changed files with 204 additions and 232 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
From c405d94cadd2702967b7640c292dba4235be31bc Mon Sep 17 00:00:00 2001
From 1b612b3ceda7894b96834fc92721776d94cb20eb 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,10 +8,10 @@ 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 24c91f3..847fa7c 100644
index 7d6246f..1bcf16f 100644
--- a/linux-user/signal.c
+++ b/linux-user/signal.c
@@ -399,6 +399,10 @@ static void QEMU_NORETURN force_sig(int target_sig)
@@ -448,6 +448,10 @@ static void QEMU_NORETURN force_sig(int target_sig)
host_sig = target_to_host_signal(target_sig);
gdb_signalled(env, target_sig);
@ -22,7 +22,7 @@ index 24c91f3..847fa7c 100644
/* dump core if supported by target binary format */
if (core_dump_signal(target_sig) && (ts->bprm->core_dump != NULL)) {
stop_all_tasks();
@@ -416,6 +420,8 @@ static void QEMU_NORETURN force_sig(int target_sig)
@@ -465,6 +469,8 @@ static void QEMU_NORETURN force_sig(int target_sig)
target_sig, strsignal(host_sig), "core dumped" );
}

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

@ -1,4 +1,4 @@
From cd46303ab0b8bfe23f73bb14880d8e6c57e66080 Mon Sep 17 00:00:00 2001
From a3272edebe9cdbc68983b90ea01c16464ef0ce69 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)
@ -49,10 +49,10 @@ index af924dc..c7423e6 100644
} else {
goto error;
diff --git a/linux-user/qemu.h b/linux-user/qemu.h
index c2f74f3..c6366c2 100644
index 36d4a73..a2c4e35 100644
--- a/linux-user/qemu.h
+++ b/linux-user/qemu.h
@@ -133,6 +133,8 @@ typedef struct TaskState {
@@ -134,6 +134,8 @@ typedef struct TaskState {
struct sigqueue sigqueue_table[MAX_SIGQUEUE_SIZE]; /* siginfo queue */
struct sigqueue *first_free; /* first free siginfo queue entry */
int signal_pending; /* non zero if a signal may be pending */
@ -61,7 +61,7 @@ index c2f74f3..c6366c2 100644
} __attribute__((aligned(16))) TaskState;
extern char *exec_path;
@@ -198,6 +200,7 @@ int get_osversion(void);
@@ -199,6 +201,7 @@ int get_osversion(void);
void init_qemu_uname_release(void);
void fork_start(void);
void fork_end(int child);
@ -70,7 +70,7 @@ index c2f74f3..c6366c2 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 847fa7c..fef10bc 100644
index 1bcf16f..cfaf501 100644
--- a/linux-user/signal.c
+++ b/linux-user/signal.c
@@ -25,6 +25,7 @@
@ -81,7 +81,7 @@ index 847fa7c..fef10bc 100644
#include "qemu.h"
#include "qemu-common.h"
@@ -509,6 +510,11 @@ int queue_signal(CPUArchState *env, int sig, target_siginfo_t *info)
@@ -571,6 +572,11 @@ int queue_signal(CPUArchState *env, int sig, target_siginfo_t *info)
k->pending = 1;
/* signal that a new signal is pending */
ts->signal_pending = 1;
@ -93,7 +93,7 @@ index 847fa7c..fef10bc 100644
return 1; /* indicates that the signal was queued */
}
}
@@ -644,8 +650,24 @@ int do_sigaction(int sig, const struct target_sigaction *act,
@@ -706,8 +712,24 @@ int do_sigaction(int sig, const struct target_sigaction *act,
if (host_sig != SIGSEGV && host_sig != SIGBUS) {
sigfillset(&act1.sa_mask);
act1.sa_flags = SA_SIGINFO;
@ -119,10 +119,10 @@ index 847fa7c..fef10bc 100644
ignore state to avoid getting unexpected interrupted
syscalls */
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index ffc11de..c193397 100644
index 9864813..1d791a3 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -5215,6 +5215,87 @@ static int do_open(void *cpu_env, const char *pathname, int flags, mode_t mode)
@@ -5259,6 +5259,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 ffc11de..c193397 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>. */
@@ -5228,6 +5309,12 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1,
@@ -5272,6 +5353,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 ffc11de..c193397 100644
#ifdef DEBUG
gemu_log("syscall %d", num);
@@ -8347,7 +8434,7 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1,
@@ -8457,7 +8544,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 ffc11de..c193397 100644
}
switch(arg2) {
@@ -9284,6 +9371,7 @@ fail:
@@ -9395,6 +9482,7 @@ fail:
#endif
if(do_strace)
print_syscall_ret(num, ret);

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

@ -1,7 +1,10 @@
From 357a1297e68bd36fc75d1c7d0cdd0f7293bba4e0 Mon Sep 17 00:00:00 2001
From 5571904357badabced24a03c7264ba4865c28357 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
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Fixes binfmt_misc setup script:
- x86_64 is i386-compatible
@ -9,15 +12,17 @@ Fixes binfmt_misc setup script:
- path to QEMU
Signed-off-by: Ulrich Hecht <uli@suse.de>
[AF: Update path for qemu-aarch64 for v2.0.0-rc1]
Signed-off-by: Andreas Färber <afaerber@suse.de>
---
scripts/qemu-binfmt-conf.sh | 37 ++++++++++++++++++++-----------------
1 file changed, 20 insertions(+), 17 deletions(-)
scripts/qemu-binfmt-conf.sh | 39 +++++++++++++++++++++------------------
1 file changed, 21 insertions(+), 18 deletions(-)
diff --git a/scripts/qemu-binfmt-conf.sh b/scripts/qemu-binfmt-conf.sh
index 0da2618..dc652f0 100644
index 289b1a3..75e0526 100644
--- a/scripts/qemu-binfmt-conf.sh
+++ b/scripts/qemu-binfmt-conf.sh
@@ -27,43 +27,46 @@ case "$cpu" in
@@ -27,46 +27,49 @@ case "$cpu" in
armv[4-9]*)
cpu="arm"
;;
@ -42,6 +47,10 @@ index 0da2618..dc652f0 100644
- echo ':armeb:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x28:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/local/bin/qemu-armeb:' > /proc/sys/fs/binfmt_misc/register
+ echo ':arm:M::\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x28\x00:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-arm:' > /proc/sys/fs/binfmt_misc/register
+ echo ':armeb:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x28:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-armeb:' > /proc/sys/fs/binfmt_misc/register
fi
if [ $cpu != "aarch64" ] ; then
- echo ':aarch64:M::\x7fELF\x02\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\xb7\x00:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/local/bin/qemu-aarch64:' > /proc/sys/fs/binfmt_misc/register
+ echo ':aarch64:M::\x7fELF\x02\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\xb7\x00:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-aarch64:' > /proc/sys/fs/binfmt_misc/register
fi
if [ $cpu != "sparc" ] ; then
- echo ':sparc:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x02:\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/local/bin/qemu-sparc:' > /proc/sys/fs/binfmt_misc/register

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

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

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

@ -1,4 +1,4 @@
From bcfb81675b318fa9a83d49be6e194894d2bb1131 Mon Sep 17 00:00:00 2001
From e6a20b3638dcb466c50f88aa221e5a13ea748905 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
@ -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 732c9e3..84094ab 100644
index fdf9a47..a2ac23e 100644
--- a/linux-user/syscall_defs.h
+++ b/linux-user/syscall_defs.h
@@ -2538,6 +2538,8 @@ struct target_ucred {
@@ -2545,6 +2545,8 @@ struct target_ucred {
uint32_t gid;
};

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

@ -1,4 +1,4 @@
From 6767f4a5d5336071a032e7aeec1b07d4dc412225 Mon Sep 17 00:00:00 2001
From c0d91ef119df8689150f4f7c5c384847430d423b 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 2ab8ba594caa75e869d684576cb76b7cf47d3a4e Mon Sep 17 00:00:00 2001
From f033ff840b60964e920769cb9f6bf547c7baabf3 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 c193397..98c12bb 100644
index 1d791a3..206dd12 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -6359,6 +6359,8 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1,
@@ -6403,6 +6403,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 ecb044a5ede319e8aea9b95e2a32f04bc9842602 Mon Sep 17 00:00:00 2001
From 88347c7fe008bd3d91b4e6ea9042fa793bf2668d 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 98c12bb..312b7d6 100644
index 206dd12..3407fd7 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -3646,7 +3646,12 @@ static abi_long do_ioctl(int fd, abi_long cmd, abi_long arg)
@@ -3654,7 +3654,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 021f44a22b1c6121805fe175d97da6d4d43abd45 Mon Sep 17 00:00:00 2001
From 10775090c84d121d60a059ee11500096adcbd0b3 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 312b7d6..78a2fe7 100644
index 3407fd7..7d7d700 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -3680,6 +3680,11 @@ static abi_long do_ioctl(int fd, abi_long cmd, abi_long arg)
@@ -3688,6 +3688,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 312b7d6..78a2fe7 100644
case IOC_R:
ret = get_errno(ioctl(fd, ie->host_cmd, buf_temp));
if (!is_error(ret)) {
@@ -3698,6 +3703,7 @@ static abi_long do_ioctl(int fd, abi_long cmd, abi_long arg)
@@ -3706,6 +3711,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;

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

@ -1,4 +1,4 @@
From f22c4c2cc220f6b074ac6a4d6c6d8911b6148ed8 Mon Sep 17 00:00:00 2001
From 0f87f16e3b0de57a46c8648a81473c8be718d0d5 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
@ -20,10 +20,10 @@ 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 fae50c9..7cb6098 100644
index 7a90a1b..0578f0a 100644
--- a/block.c
+++ b/block.c
@@ -5237,7 +5237,7 @@ void bdrv_img_create(const char *filename, const char *fmt,
@@ -5264,7 +5264,7 @@ void bdrv_img_create(const char *filename, const char *fmt,
Error **errp, bool quiet)
{
QEMUOptionParameter *param = NULL, *create_options = NULL;
@ -32,7 +32,7 @@ index fae50c9..7cb6098 100644
BlockDriver *drv, *proto_drv;
BlockDriver *backing_drv = NULL;
Error *local_err = NULL;
@@ -5352,6 +5352,10 @@ void bdrv_img_create(const char *filename, const char *fmt,
@@ -5379,6 +5379,10 @@ void bdrv_img_create(const char *filename, const char *fmt,
if (!quiet) {
printf("Formatting '%s', fmt=%s ", filename, fmt);
print_option_parameters(param);
@ -75,7 +75,7 @@ index b69988d..59c468d 100644
};
diff --git a/include/block/block_int.h b/include/block/block_int.h
index 4fc5ea8..ae28f01 100644
index cd5bc73..0d4208f 100644
--- a/include/block/block_int.h
+++ b/include/block/block_int.h
@@ -40,10 +40,12 @@
@ -92,7 +92,7 @@ index 4fc5ea8..ae28f01 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 2e40cc1..fc4888d 100644
index 8455994..a8545b7 100644
--- a/qemu-img.c
+++ b/qemu-img.c
@@ -1154,7 +1154,7 @@ static int img_convert(int argc, char **argv)

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

@ -1,4 +1,4 @@
From ef95f78ca9897bcc1bfcad76698344c2845afdfb Mon Sep 17 00:00:00 2001
From 37b2e32425a781d3b01f0ee286ff099d3193807e 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
@ -25,13 +25,14 @@ we're currently creating a new binary for each target archictecture.
CC: Reinhard Max <max@suse.de>
Signed-off-by: Alexander Graf <agraf@suse.de>
[AF: Rebased onto new Makefile infrastructure, twice]
[AF: Updated for aarch64 for v2.0.0-rc1]
Signed-off-by: Andreas Färber <afaerber@suse.de>
---
Makefile.target | 13 +++++++++++++
linux-user/Makefile.objs | 2 ++
linux-user/binfmt.c | 42 ++++++++++++++++++++++++++++++++++++++++++
scripts/qemu-binfmt-conf.sh | 34 +++++++++++++++++-----------------
4 files changed, 74 insertions(+), 17 deletions(-)
scripts/qemu-binfmt-conf.sh | 36 ++++++++++++++++++------------------
4 files changed, 75 insertions(+), 18 deletions(-)
create mode 100644 linux-user/binfmt.c
diff --git a/Makefile.target b/Makefile.target
@ -139,10 +140,10 @@ index 0000000..cd1f513
+ return execve(new_argv[0], new_argv, envp);
+}
diff --git a/scripts/qemu-binfmt-conf.sh b/scripts/qemu-binfmt-conf.sh
index dc652f0..37d03f3 100644
index 75e0526..557dd2c 100644
--- a/scripts/qemu-binfmt-conf.sh
+++ b/scripts/qemu-binfmt-conf.sh
@@ -34,39 +34,39 @@ esac
@@ -34,42 +34,42 @@ esac
# register the interpreter for each cpu except for the native one
if [ $cpu != "i386" ] ; then
@ -160,6 +161,10 @@ index dc652f0..37d03f3 100644
- echo ':armeb:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x28:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-armeb:' > /proc/sys/fs/binfmt_misc/register
+ echo ':arm:M::\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x28\x00:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-arm-binfmt:P' > /proc/sys/fs/binfmt_misc/register
+ echo ':armeb:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x28:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-armeb-binfmt:P' > /proc/sys/fs/binfmt_misc/register
fi
if [ $cpu != "aarch64" ] ; then
- echo ':aarch64:M::\x7fELF\x02\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\xb7\x00:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-aarch64:' > /proc/sys/fs/binfmt_misc/register
+ echo ':aarch64:M::\x7fELF\x02\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\xb7\x00:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-aarch64-binfmt:P' > /proc/sys/fs/binfmt_misc/register
fi
if [ $cpu != "sparc" ] ; then
- echo ':sparc:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x02:\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-sparc:' > /proc/sys/fs/binfmt_misc/register

4
0013-PPC-KVM-Disable-mmu-notifier-check.patch → 0012-PPC-KVM-Disable-mmu-notifier-check.patch
View File

@ -1,4 +1,4 @@
From 97b1499528c524628f0b0fe03917abb58e41f067 Mon Sep 17 00:00:00 2001
From 4c1771509fd9e36aa1758d02df0068bb17b83758 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 6a0bc94..6c2af34 100644
index 91513c6..36b5ef6 100644
--- a/exec.c
+++ b/exec.c
@@ -1039,10 +1039,12 @@ static void *file_ram_alloc(RAMBlock *block,

27
0012-linux-user-be-silent-about-capget-f.patch
View File

@ -1,27 +0,0 @@
From 55bc5fffdd6bc6333591c87f73a32cd2d615765a 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
Complaining about capget doesn't buy us anything, but makes %check
fail in certain builds. So better not complain about its missing
implementation and go on with life :)
Signed-off-by: Alexander Graf <agraf@suse.de>
---
linux-user/syscall.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index 78a2fe7..aa9fd3a 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -7741,7 +7741,7 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1,
unlock_user(p, arg1, ret);
break;
case TARGET_NR_capget:
- goto unimplemented;
+ goto unimplemented_nowarn;
case TARGET_NR_capset:
goto unimplemented;
case TARGET_NR_sigaltstack:

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

@ -1,4 +1,4 @@
From 0e23bd461d077e553b7be5e8d192ca400f4ffbdf Mon Sep 17 00:00:00 2001
From 75185a5ca8d815f90b9d064349e97f9b1d94d7fa 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
0015-linux-user-binfmt-support-host-bina.patch → 0014-linux-user-binfmt-support-host-bina.patch
View File

@ -1,4 +1,4 @@
From 88203441776c0269c998530c3322ba3827e66e57 Mon Sep 17 00:00:00 2001
From cc730097552e4379f13d7265dab33dbbca706e9f 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
0016-linux-user-arm-no-tb_flush-on-reset.patch → 0015-linux-user-arm-no-tb_flush-on-reset.patch
View File

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

8
0017-linux-user-Ignore-broken-loop-ioctl.patch → 0016-linux-user-Ignore-broken-loop-ioctl.patch
View File

@ -1,4 +1,4 @@
From 1a62d47ce18d5798fcfc9d576ac4805015806299 Mon Sep 17 00:00:00 2001
From fdfc103ed9018958ec78076293c1c3ce5ed44596 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
@ -41,10 +41,10 @@ index 8974caa..810ae61 100644
#endif
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index aa9fd3a..32bbd5d 100644
index 7d7d700..4823aa0 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -3623,6 +3623,13 @@ static abi_long do_ioctl_rt(const IOCTLEntry *ie, uint8_t *buf_temp,
@@ -3631,6 +3631,13 @@ static abi_long do_ioctl_rt(const IOCTLEntry *ie, uint8_t *buf_temp,
return ret;
}
@ -59,7 +59,7 @@ index aa9fd3a..32bbd5d 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 84094ab..668076f 100644
index a2ac23e..dd6d041 100644
--- a/linux-user/syscall_defs.h
+++ b/linux-user/syscall_defs.h
@@ -1044,6 +1044,7 @@ struct target_pollfd {

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

@ -1,4 +1,4 @@
From 24525af3bf864f4849101f4506c896d5703aadec Mon Sep 17 00:00:00 2001
From d3945243c006f92d5b2363de14908b8d5d129bc4 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
0019-linux-user-Run-multi-threaded-code-.patch → 0018-linux-user-Run-multi-threaded-code-.patch
View File

@ -1,4 +1,4 @@
From 6744a839307d7553ef959d564ae820eb8a400a48 Mon Sep 17 00:00:00 2001
From 5f4d22c4199df50505163baaf7c249f699571640 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 32bbd5d..15ac71c 100644
index 4823aa0..ff5ed06 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -4326,6 +4326,15 @@ static int do_fork(CPUArchState *env, unsigned int flags, abi_ulong newsp,
@@ -4334,6 +4334,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
0020-linux-user-lock-tb-flushing-too.patch → 0019-linux-user-lock-tb-flushing-too.patch
View File

@ -1,4 +1,4 @@
From c4a6baf3d9eaa1d62daf4e3ab69f46f7fce9f294 Mon Sep 17 00:00:00 2001
From b52f13397d83ea9aaca5fff2a6160b46a0d47250 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
0021-linux-user-Fake-proc-cpuinfo.patch → 0020-linux-user-Fake-proc-cpuinfo.patch
View File

@ -1,4 +1,4 @@
From 54ace443d26657c878600a9e028240cb65ecfc2d Mon Sep 17 00:00:00 2001
From 6ed197ca9a81a70e7cc8c4fe7aaf50884dd51558 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 15ac71c..f8cbacc 100644
index ff5ed06..8a78348 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -5092,6 +5092,25 @@ static int open_self_stat(void *cpu_env, int fd)
@@ -5136,6 +5136,25 @@ static int open_self_stat(void *cpu_env, int fd)
return 0;
}
@ -51,7 +51,7 @@ index 15ac71c..f8cbacc 100644
static int open_self_auxv(void *cpu_env, int fd)
{
CPUState *cpu = ENV_GET_CPU((CPUArchState *)cpu_env);
@@ -5205,6 +5224,7 @@ static int do_open(void *cpu_env, const char *pathname, int flags, mode_t mode)
@@ -5249,6 +5268,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

6
0022-linux-user-implement-FS_IOC_GETFLAG.patch → 0021-linux-user-implement-FS_IOC_GETFLAG.patch
View File

@ -1,4 +1,4 @@
From 87cf8193d86c579ac8a0546f3645e6e2162f2d84 Mon Sep 17 00:00:00 2001
From 44a39379b4d302f4f3b58c8a0a9ed66239713fd2 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
@ -28,10 +28,10 @@ index 2181ea3..a329fb0 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 668076f..6d7a7cf 100644
index dd6d041..2456d5b 100644
--- a/linux-user/syscall_defs.h
+++ b/linux-user/syscall_defs.h
@@ -2453,6 +2453,8 @@ struct target_eabi_flock64 {
@@ -2460,6 +2460,8 @@ struct target_f_owner_ex {
#define TARGET_MTIOCGET TARGET_IOR('m', 2, struct mtget)
#define TARGET_MTIOCPOS TARGET_IOR('m', 3, struct mtpos)

6
0023-linux-user-implement-FS_IOC_SETFLAG.patch → 0022-linux-user-implement-FS_IOC_SETFLAG.patch
View File

@ -1,4 +1,4 @@
From 3f9f234c01de236ec8f4ae2879142e7bc7f236fa Mon Sep 17 00:00:00 2001
From 2b54c2c2b9deec22108c8c1f94e31ad34c459203 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
@ -28,10 +28,10 @@ index a329fb0..d76575c 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 6d7a7cf..15827bf 100644
index 2456d5b..03863a6 100644
--- a/linux-user/syscall_defs.h
+++ b/linux-user/syscall_defs.h
@@ -2454,6 +2454,7 @@ struct target_eabi_flock64 {
@@ -2461,6 +2461,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
0024-linux-user-XXX-disable-fiemap.patch → 0023-linux-user-XXX-disable-fiemap.patch
View File

@ -1,4 +1,4 @@
From 890d2d99454300c53ca6776d097362f186777043 Mon Sep 17 00:00:00 2001
From c35068af13570346552f6f17ebf54665e692d8e3 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 f8cbacc..1f80002 100644
index 8a78348..28a3d74 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -3180,6 +3180,11 @@ static abi_long do_ioctl_fs_ioc_fiemap(const IOCTLEntry *ie, uint8_t *buf_temp,
@@ -3188,6 +3188,11 @@ static abi_long do_ioctl_fs_ioc_fiemap(const IOCTLEntry *ie, uint8_t *buf_temp,
uint32_t outbufsz;
int free_fm = 0;

12
0025-slirp-nooutgoing.patch → 0024-slirp-nooutgoing.patch
View File

@ -1,4 +1,4 @@
From 80c43c4b1cb9a0f1e25bdbf993a882a38af85a1d Mon Sep 17 00:00:00 2001
From e88018836708b0b55399452baa6c5323c27f83b4 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
@ -12,10 +12,10 @@ TBD (from SUSE Studio team)
4 files changed, 40 insertions(+)
diff --git a/qemu-options.hx b/qemu-options.hx
index 068da2d..b40da6c 100644
index 2d33815..62a1cfc 100644
--- a/qemu-options.hx
+++ b/qemu-options.hx
@@ -2590,6 +2590,16 @@ Store the QEMU process PID in @var{file}. It is useful if you launch QEMU
@@ -2603,6 +2603,16 @@ Store the QEMU process PID in @var{file}. It is useful if you launch QEMU
from a script.
ETEXI
@ -97,10 +97,10 @@ index 7571c5a..0555e18 100644
socket_set_fast_reuse(s);
opt = 1;
diff --git a/vl.c b/vl.c
index 842e897..192aa7b 100644
index 9975e5a..b18c815 100644
--- a/vl.c
+++ b/vl.c
@@ -159,6 +159,7 @@ const char *vnc_display;
@@ -162,6 +162,7 @@ const char *vnc_display;
int acpi_enabled = 1;
int no_hpet = 0;
int fd_bootchk = 1;
@ -108,7 +108,7 @@ index 842e897..192aa7b 100644
static int no_reboot;
int no_shutdown = 0;
int cursor_hide = 1;
@@ -3328,6 +3329,14 @@ int main(int argc, char **argv, char **envp)
@@ -3351,6 +3352,14 @@ int main(int argc, char **argv, char **envp)
case QEMU_OPTION_singlestep:
singlestep = 1;
break;

14
0026-vnc-password-file-and-incoming-conn.patch → 0025-vnc-password-file-and-incoming-conn.patch
View File

@ -1,4 +1,4 @@
From 0587986e55f3bf9263fa62bd21425fd30405f2dc Mon Sep 17 00:00:00 2001
From d4ce3e8db75401d2960769d09a8609b67771b585 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 9c84b3e..d596d25 100644
index 5925774..8445dd6 100644
--- a/ui/vnc.c
+++ b/ui/vnc.c
@@ -45,6 +45,7 @@ static const struct timeval VNC_REFRESH_LOSSY = { 2, 0 };
@ -20,7 +20,7 @@ index 9c84b3e..d596d25 100644
static int vnc_cursor_define(VncState *vs);
static void vnc_release_modifiers(VncState *vs);
@@ -1027,6 +1028,7 @@ static void vnc_disconnect_start(VncState *vs)
@@ -1031,6 +1032,7 @@ static void vnc_disconnect_start(VncState *vs)
void vnc_disconnect_finish(VncState *vs)
{
int i;
@ -28,7 +28,7 @@ index 9c84b3e..d596d25 100644
vnc_jobs_join(vs); /* Wait encoding jobs */
@@ -1075,6 +1077,13 @@ void vnc_disconnect_finish(VncState *vs)
@@ -1079,6 +1081,13 @@ void vnc_disconnect_finish(VncState *vs)
}
g_free(vs->lossy_rect);
g_free(vs);
@ -42,7 +42,7 @@ index 9c84b3e..d596d25 100644
}
int vnc_client_io_error(VncState *vs, int ret, int last_errno)
@@ -3037,6 +3046,39 @@ char *vnc_display_local_addr(DisplayState *ds)
@@ -3041,6 +3050,39 @@ char *vnc_display_local_addr(DisplayState *ds)
return vnc_socket_local_addr("%s:%s", vs->lsock);
}
@ -82,7 +82,7 @@ index 9c84b3e..d596d25 100644
void vnc_display_open(DisplayState *ds, const char *display, Error **errp)
{
VncDisplay *vs = vnc_display;
@@ -3070,6 +3112,9 @@ void vnc_display_open(DisplayState *ds, const char *display, Error **errp)
@@ -3074,6 +3116,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 9c84b3e..d596d25 100644
if (fips_get_state()) {
error_setg(errp,
"VNC password auth disabled due to FIPS mode, "
@@ -3078,6 +3123,32 @@ void vnc_display_open(DisplayState *ds, const char *display, Error **errp)
@@ -3082,6 +3127,32 @@ void vnc_display_open(DisplayState *ds, const char *display, Error **errp)
goto fail;
}
password = 1; /* Require password auth */

4
0027-linux-user-add-more-blk-ioctls.patch → 0026-linux-user-add-more-blk-ioctls.patch
View File

@ -1,4 +1,4 @@
From 811f9aaa6560561860d90fea353f5832a50e5467 Mon Sep 17 00:00:00 2001
From 9cb631a82210fd7b0d1689bdcb5ae60324b97f1d 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
@ -42,7 +42,7 @@ index d76575c..ffd6d09 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 15827bf..40c8900 100644
index 03863a6..2271d5f 100644
--- a/linux-user/syscall_defs.h
+++ b/linux-user/syscall_defs.h
@@ -913,6 +913,12 @@ struct target_pollfd {

10
0028-linux-user-use-target_ulong.patch → 0027-linux-user-use-target_ulong.patch
View File

@ -1,4 +1,4 @@
From 076210cc06b65ebebef8d181ec74106eb6c5d198 Mon Sep 17 00:00:00 2001
From 0aa92dd3965b65af986eaaf0721b8024a5dc5412 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
@ -17,10 +17,10 @@ Signed-off-by: Alexander Graf <agraf@suse.de>
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/linux-user/qemu.h b/linux-user/qemu.h
index c6366c2..151d09d 100644
index a2c4e35..6fd5e0c 100644
--- a/linux-user/qemu.h
+++ b/linux-user/qemu.h
@@ -188,10 +188,10 @@ abi_long memcpy_to_target(abi_ulong dest, const void *src,
@@ -189,10 +189,10 @@ abi_long memcpy_to_target(abi_ulong dest, const void *src,
void target_set_brk(abi_ulong new_brk);
abi_long do_brk(abi_ulong new_brk);
void syscall_init(void);
@ -36,10 +36,10 @@ index c6366c2..151d09d 100644
extern THREAD CPUState *thread_cpu;
void cpu_loop(CPUArchState *env);
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index 1f80002..aacc224 100644
index 28a3d74..a12a722 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -5351,10 +5351,10 @@ int syscall_restartable(int syscall_nr)
@@ -5395,10 +5395,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
0029-block-Add-support-for-DictZip-enabl.patch → 0028-block-Add-support-for-DictZip-enabl.patch
View File

@ -1,4 +1,4 @@
From 122051dc2fc438473aa17cd7847cb597e1d8a804 Mon Sep 17 00:00:00 2001
From 4a02a5d6e94a211a8198651e4304e956ba30c9e2 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
0030-block-Add-tar-container-format.patch → 0029-block-Add-tar-container-format.patch
View File

@ -1,4 +1,4 @@
From 96fd8c590b6f1e38e2d28a4b37792162de0f73ca Mon Sep 17 00:00:00 2001
From c2a25a473348d2251a2de22c9c01610e647f6180 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
0031-Legacy-Patch-kvm-qemu-preXX-dictzip.patch → 0030-Legacy-Patch-kvm-qemu-preXX-dictzip.patch
View File

@ -1,4 +1,4 @@
From 4056851c208c99dd3f00845871599539e928e47f Mon Sep 17 00:00:00 2001
From 420af226aaf0cd021fea49bf64ec64c53766bd47 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
0032-Legacy-Patch-kvm-qemu-preXX-report-.patch → 0031-Legacy-Patch-kvm-qemu-preXX-report-.patch
View File

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

4
0033-console-add-question-mark-escape-op.patch → 0032-console-add-question-mark-escape-op.patch
View File

@ -1,4 +1,4 @@
From 62e5e21a8022c87d48e2419c47b7b4dbf897fe81 Mon Sep 17 00:00:00 2001
From f71f945048e5e4bb2536d072196575cb5d472700 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
@ -16,7 +16,7 @@ Signed-off-by: Alexander Graf <agraf@suse.de>
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/ui/console.c b/ui/console.c
index 4df251d..9d6b3b3 100644
index e057755..24413e8 100644
--- a/ui/console.c
+++ b/ui/console.c
@@ -866,7 +866,7 @@ static void console_putchar(QemuConsole *s, int ch)

2
0034-Make-char-muxer-more-robust-wrt-sma.patch → 0033-Make-char-muxer-more-robust-wrt-sma.patch
View File

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

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

@ -1,4 +1,4 @@
From 1f62de84675c5c3cd14a59a8070c2bb47d494cc0 Mon Sep 17 00:00:00 2001
From 2de2fb830bf34f5e5cba14487c1ec35f46a343a4 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 aacc224..67f8c25 100644
index a12a722..d1f8b3d 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -5665,9 +5665,14 @@ abi_long do_syscall(void *cpu_env, int num, abi_ulong arg1,
@@ -5709,9 +5709,14 @@ abi_long do_syscall(void *cpu_env, int num, abi_ulong arg1,
case TARGET_NR_oldstat:
goto unimplemented;
#endif

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

@ -1,4 +1,4 @@
From 862047d71a3d245a5709a75cc3c109b94f6019ac Mon Sep 17 00:00:00 2001
From 90dca6bde4a8f7b0d10853397184d2658ed6e8d8 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
0038-configure-Enable-PIE-for-ppc-and-pp.patch → 0036-configure-Enable-PIE-for-ppc-and-pp.patch
View File

@ -1,4 +1,4 @@
From 53969fce3b20e0bb592675503b8bade77c1cea3f Mon Sep 17 00:00:00 2001
From 777d69b2c17ff67ab349395dbd4ceb0a44348761 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 8c2838e..530a10d 100755
index eb0e7bb..518d3c4 100755
--- a/configure
+++ b/configure
@@ -1467,7 +1467,7 @@ fi
@@ -1484,7 +1484,7 @@ fi
if test "$pie" = ""; then
case "$cpu-$targetos" in

22
0037-roms-Build-vgabios.bin.patch
View File

@ -1,22 +0,0 @@
From 07638968e7aa90fc80aaf7dac9cfda6fa27b03fd Mon Sep 17 00:00:00 2001
From: Bruce Rogers <brogers@suse.com>
Date: Wed, 2 Oct 2013 17:51:46 +0200
Subject: [PATCH] roms: Build vgabios.bin
---
roms/Makefile | 2 ++
1 file changed, 2 insertions(+)
diff --git a/roms/Makefile b/roms/Makefile
index 2721b02..44ccdda 100644
--- a/roms/Makefile
+++ b/roms/Makefile
@@ -83,6 +83,8 @@ build-seabios-config-%: config.%
lgplvgabios: $(patsubst %,lgplvgabios-%,$(vgabios_variants))
+ make -C vgabios vgabios.bin
+ cp vgabios/VGABIOS-lgpl-latest.bin ../pc-bios/vgabios.bin
lgplvgabios-isavga: build-lgplvgabios
cp vgabios/VGABIOS-lgpl-latest.bin ../pc-bios/vgabios.bin

2
0039-xen_disk-add-discard-support.patch → 0037-xen_disk-add-discard-support.patch
View File

@ -1,4 +1,4 @@
From 3ffc91748021ceebd6ea0de8cbf29b0117e8bcb3 Mon Sep 17 00:00:00 2001
From 4399b8b300153938e44e9b58ea4aa5b9e1a9b7e9 Mon Sep 17 00:00:00 2001
From: Olaf Hering <olaf@aepfle.de>
Date: Thu, 30 Jan 2014 16:02:18 +0100
Subject: [PATCH] xen_disk: add discard support

3
qemu-2.0.0-rc0.tar.bz2
View File

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

3
qemu-2.0.0-rc1.tar.bz2 Normal file
View File

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

8
qemu-linux-user.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Thu Apr 3 15:59:32 UTC 2014 - afaerber@suse.de
- Updated to v2.0.0-rc1: cf. http://wiki.qemu-project.org/ChangeLog/2.0
* Update update_git.sh script accordingly
* Drop 0012-linux-user-be-silent-about-capget-f.patch (implemented)
* Update qemu-config-binfmt.sh for aarch64
-------------------------------------------------------------------
Tue Apr 1 14:52:02 UTC 2014 - afaerber@suse.de

62
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: 1.7.90
Version: 1.7.91
Release: 0
Source: qemu-2.0.0-rc0.tar.bz2
Source: qemu-2.0.0-rc1.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
@ -36,34 +36,32 @@ Patch0008: 0008-qemu-cvs-ioctl_debug.patch
Patch0009: 0009-qemu-cvs-ioctl_nodirection.patch
Patch0010: 0010-block-vmdk-Support-creation-of-SCSI.patch
Patch0011: 0011-linux-user-add-binfmt-wrapper-for-a.patch
Patch0012: 0012-linux-user-be-silent-about-capget-f.patch
Patch0013: 0013-PPC-KVM-Disable-mmu-notifier-check.patch
Patch0014: 0014-linux-user-fix-segfault-deadlock.patch
Patch0015: 0015-linux-user-binfmt-support-host-bina.patch
Patch0016: 0016-linux-user-arm-no-tb_flush-on-reset.patch
Patch0017: 0017-linux-user-Ignore-broken-loop-ioctl.patch
Patch0018: 0018-linux-user-lock-tcg.patch
Patch0019: 0019-linux-user-Run-multi-threaded-code-.patch
Patch0020: 0020-linux-user-lock-tb-flushing-too.patch
Patch0021: 0021-linux-user-Fake-proc-cpuinfo.patch
Patch0022: 0022-linux-user-implement-FS_IOC_GETFLAG.patch
Patch0023: 0023-linux-user-implement-FS_IOC_SETFLAG.patch
Patch0024: 0024-linux-user-XXX-disable-fiemap.patch
Patch0025: 0025-slirp-nooutgoing.patch
Patch0026: 0026-vnc-password-file-and-incoming-conn.patch
Patch0027: 0027-linux-user-add-more-blk-ioctls.patch
Patch0028: 0028-linux-user-use-target_ulong.patch
Patch0029: 0029-block-Add-support-for-DictZip-enabl.patch
Patch0030: 0030-block-Add-tar-container-format.patch
Patch0031: 0031-Legacy-Patch-kvm-qemu-preXX-dictzip.patch
Patch0032: 0032-Legacy-Patch-kvm-qemu-preXX-report-.patch
Patch0033: 0033-console-add-question-mark-escape-op.patch
Patch0034: 0034-Make-char-muxer-more-robust-wrt-sma.patch
Patch0035: 0035-linux-user-lseek-explicitly-cast-no.patch
Patch0036: 0036-virtfs-proxy-helper-Provide-__u64-f.patch
Patch0037: 0037-roms-Build-vgabios.bin.patch
Patch0038: 0038-configure-Enable-PIE-for-ppc-and-pp.patch
Patch0039: 0039-xen_disk-add-discard-support.patch
Patch0012: 0012-PPC-KVM-Disable-mmu-notifier-check.patch
Patch0013: 0013-linux-user-fix-segfault-deadlock.patch
Patch0014: 0014-linux-user-binfmt-support-host-bina.patch
Patch0015: 0015-linux-user-arm-no-tb_flush-on-reset.patch
Patch0016: 0016-linux-user-Ignore-broken-loop-ioctl.patch
Patch0017: 0017-linux-user-lock-tcg.patch
Patch0018: 0018-linux-user-Run-multi-threaded-code-.patch
Patch0019: 0019-linux-user-lock-tb-flushing-too.patch
Patch0020: 0020-linux-user-Fake-proc-cpuinfo.patch
Patch0021: 0021-linux-user-implement-FS_IOC_GETFLAG.patch
Patch0022: 0022-linux-user-implement-FS_IOC_SETFLAG.patch
Patch0023: 0023-linux-user-XXX-disable-fiemap.patch
Patch0024: 0024-slirp-nooutgoing.patch
Patch0025: 0025-vnc-password-file-and-incoming-conn.patch
Patch0026: 0026-linux-user-add-more-blk-ioctls.patch
Patch0027: 0027-linux-user-use-target_ulong.patch
Patch0028: 0028-block-Add-support-for-DictZip-enabl.patch
Patch0029: 0029-block-Add-tar-container-format.patch
Patch0030: 0030-Legacy-Patch-kvm-qemu-preXX-dictzip.patch
Patch0031: 0031-Legacy-Patch-kvm-qemu-preXX-report-.patch
Patch0032: 0032-console-add-question-mark-escape-op.patch
Patch0033: 0033-Make-char-muxer-more-robust-wrt-sma.patch
Patch0034: 0034-linux-user-lseek-explicitly-cast-no.patch
Patch0035: 0035-virtfs-proxy-helper-Provide-__u64-f.patch
Patch0036: 0036-configure-Enable-PIE-for-ppc-and-pp.patch
Patch0037: 0037-xen_disk-add-discard-support.patch
# Please do not add patches manually here, run update_git.sh.
# this is to make lint happy
Source300: rpmlintrc
@ -116,7 +114,7 @@ emulations. This can be used together with the OBS build script to
run cross-architecture builds.
%prep
%setup -q -n qemu-2.0.0-rc0
%setup -q -n qemu-2.0.0-rc1
%patch0001 -p1
%patch0002 -p1
%patch0003 -p1
@ -154,8 +152,6 @@ run cross-architecture builds.
%patch0035 -p1
%patch0036 -p1
%patch0037 -p1
%patch0038 -p1
%patch0039 -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.0.0-rc0.tar.bz2
Source: qemu-2.0.0-rc1.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.0.0-rc0
%setup -q -n qemu-2.0.0-rc1
PATCH_EXEC
%build

7
qemu.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Thu Apr 3 15:59:32 UTC 2014 - afaerber@suse.de
- Updated to v2.0.0-rc1: cf. http://wiki.qemu-project.org/ChangeLog/2.0
* Update update_git.sh script accordingly
* Drop 0037-roms-Build-vgabios.bin.patch (unneeded)
-------------------------------------------------------------------
Tue Apr 1 14:50:37 UTC 2014 - afaerber@suse.de

62
qemu.spec
View File

@ -28,9 +28,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.7.90
Version: 1.7.91
Release: 0
Source: %name-2.0.0-rc0.tar.bz2
Source: %name-2.0.0-rc1.tar.bz2
Source1: 80-kvm.rules
Source2: qemu-ifup
Source3: kvm_stat
@ -49,34 +49,32 @@ Patch0008: 0008-qemu-cvs-ioctl_debug.patch
Patch0009: 0009-qemu-cvs-ioctl_nodirection.patch
Patch0010: 0010-block-vmdk-Support-creation-of-SCSI.patch
Patch0011: 0011-linux-user-add-binfmt-wrapper-for-a.patch
Patch0012: 0012-linux-user-be-silent-about-capget-f.patch
Patch0013: 0013-PPC-KVM-Disable-mmu-notifier-check.patch
Patch0014: 0014-linux-user-fix-segfault-deadlock.patch
Patch0015: 0015-linux-user-binfmt-support-host-bina.patch
Patch0016: 0016-linux-user-arm-no-tb_flush-on-reset.patch
Patch0017: 0017-linux-user-Ignore-broken-loop-ioctl.patch
Patch0018: 0018-linux-user-lock-tcg.patch
Patch0019: 0019-linux-user-Run-multi-threaded-code-.patch
Patch0020: 0020-linux-user-lock-tb-flushing-too.patch
Patch0021: 0021-linux-user-Fake-proc-cpuinfo.patch
Patch0022: 0022-linux-user-implement-FS_IOC_GETFLAG.patch
Patch0023: 0023-linux-user-implement-FS_IOC_SETFLAG.patch
Patch0024: 0024-linux-user-XXX-disable-fiemap.patch
Patch0025: 0025-slirp-nooutgoing.patch
Patch0026: 0026-vnc-password-file-and-incoming-conn.patch
Patch0027: 0027-linux-user-add-more-blk-ioctls.patch
Patch0028: 0028-linux-user-use-target_ulong.patch
Patch0029: 0029-block-Add-support-for-DictZip-enabl.patch
Patch0030: 0030-block-Add-tar-container-format.patch
Patch0031: 0031-Legacy-Patch-kvm-qemu-preXX-dictzip.patch
Patch0032: 0032-Legacy-Patch-kvm-qemu-preXX-report-.patch
Patch0033: 0033-console-add-question-mark-escape-op.patch
Patch0034: 0034-Make-char-muxer-more-robust-wrt-sma.patch
Patch0035: 0035-linux-user-lseek-explicitly-cast-no.patch
Patch0036: 0036-virtfs-proxy-helper-Provide-__u64-f.patch
Patch0037: 0037-roms-Build-vgabios.bin.patch
Patch0038: 0038-configure-Enable-PIE-for-ppc-and-pp.patch
Patch0039: 0039-xen_disk-add-discard-support.patch
Patch0012: 0012-PPC-KVM-Disable-mmu-notifier-check.patch
Patch0013: 0013-linux-user-fix-segfault-deadlock.patch
Patch0014: 0014-linux-user-binfmt-support-host-bina.patch
Patch0015: 0015-linux-user-arm-no-tb_flush-on-reset.patch
Patch0016: 0016-linux-user-Ignore-broken-loop-ioctl.patch
Patch0017: 0017-linux-user-lock-tcg.patch
Patch0018: 0018-linux-user-Run-multi-threaded-code-.patch
Patch0019: 0019-linux-user-lock-tb-flushing-too.patch
Patch0020: 0020-linux-user-Fake-proc-cpuinfo.patch
Patch0021: 0021-linux-user-implement-FS_IOC_GETFLAG.patch
Patch0022: 0022-linux-user-implement-FS_IOC_SETFLAG.patch
Patch0023: 0023-linux-user-XXX-disable-fiemap.patch
Patch0024: 0024-slirp-nooutgoing.patch
Patch0025: 0025-vnc-password-file-and-incoming-conn.patch
Patch0026: 0026-linux-user-add-more-blk-ioctls.patch
Patch0027: 0027-linux-user-use-target_ulong.patch
Patch0028: 0028-block-Add-support-for-DictZip-enabl.patch
Patch0029: 0029-block-Add-tar-container-format.patch
Patch0030: 0030-Legacy-Patch-kvm-qemu-preXX-dictzip.patch
Patch0031: 0031-Legacy-Patch-kvm-qemu-preXX-report-.patch
Patch0032: 0032-console-add-question-mark-escape-op.patch
Patch0033: 0033-Make-char-muxer-more-robust-wrt-sma.patch
Patch0034: 0034-linux-user-lseek-explicitly-cast-no.patch
Patch0035: 0035-virtfs-proxy-helper-Provide-__u64-f.patch
Patch0036: 0036-configure-Enable-PIE-for-ppc-and-pp.patch
Patch0037: 0037-xen_disk-add-discard-support.patch
# Please do not add patches manually here, run update_git.sh.
# roms/ipxe patches
@ -448,7 +446,7 @@ This package provides a service file for starting and stopping KSM.
%endif
%prep
%setup -q -n %name-2.0.0-rc0
%setup -q -n %name-2.0.0-rc1
%patch0001 -p1
%patch0002 -p1
%patch0003 -p1
@ -486,8 +484,6 @@ This package provides a service file for starting and stopping KSM.
%patch0035 -p1
%patch0036 -p1
%patch0037 -p1
%patch0038 -p1
%patch0039 -p1
%patch1000 -p1
%patch1001 -p1

4
qemu.spec.in
View File

@ -30,7 +30,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.0.0-rc0.tar.bz2
Source: %name-2.0.0-rc1.tar.bz2
Source1: 80-kvm.rules
Source2: qemu-ifup
Source3: kvm_stat
@ -410,7 +410,7 @@ This package provides a service file for starting and stopping KSM.
%endif
%prep
%setup -q -n %name-2.0.0-rc0
%setup -q -n %name-2.0.0-rc1
PATCH_EXEC
%patch1000 -p1

2
update_git.sh
View File

@ -13,7 +13,7 @@
GIT_TREE=git://github.com/openSUSE/qemu.git
GIT_LOCAL_TREE=~/git/qemu-opensuse
GIT_BRANCH=opensuse-2.0
GIT_UPSTREAM_TAG=v2.0.0-rc0
GIT_UPSTREAM_TAG=v2.0.0-rc1
QEMU_TMP=/dev/shm/qemu-tmp
restore_file_to_package() {