Accepting request 329598 from home:a_faerber:branches:Virtualization
Update to v2.4.0 OBS-URL: https://build.opensuse.org/request/show/329598 OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=271
This commit is contained in:
parent
70e3276406
commit
bdaf61259a
@ -1,4 +1,4 @@
|
||||
From cf6d5245570b5d60824008d0c98649e97568c1c7 Mon Sep 17 00:00:00 2001
|
||||
From 1e556e72ef1334533b0a6ed652c7b00b0382949a Mon Sep 17 00:00:00 2001
|
||||
From: Alexander Graf <agraf@suse.de>
|
||||
Date: Mon, 21 Nov 2011 23:50:36 +0100
|
||||
Subject: [PATCH] XXX dont dump core on sigabort
|
||||
|
@ -1,4 +1,4 @@
|
||||
From 781ea709edb276d4d3a4352d984857719fac8a39 Mon Sep 17 00:00:00 2001
|
||||
From 5a7aa97bf33ef868052ee97fb8078af791859a5c Mon Sep 17 00:00:00 2001
|
||||
From: Alexander Graf <agraf@suse.de>
|
||||
Date: Thu, 1 Dec 2011 19:00:01 +0100
|
||||
Subject: [PATCH] XXX work around SA_RESTART race with boehm-gc (ARM only)
|
||||
|
@ -1,4 +1,4 @@
|
||||
From fc804b17315876665d1a6008115536aa2ee63e21 Mon Sep 17 00:00:00 2001
|
||||
From 46a229c08679d4ba67bdf5f43568b08594c2ba8e Mon Sep 17 00:00:00 2001
|
||||
From: Ulrich Hecht <uli@suse.de>
|
||||
Date: Tue, 14 Apr 2009 16:18:44 +0200
|
||||
Subject: [PATCH] qemu-0.9.0.cvs-binfmt
|
||||
|
@ -1,4 +1,4 @@
|
||||
From 3a7dfd3f40d92092597e8f7c4f32887fa032a317 Mon Sep 17 00:00:00 2001
|
||||
From 30757b11ba37493290f9df04e4f2fdc095463ada Mon Sep 17 00:00:00 2001
|
||||
From: Alexander Graf <agraf@suse.de>
|
||||
Date: Tue, 14 Apr 2009 16:20:50 +0200
|
||||
Subject: [PATCH] qemu-cvs-alsa_bitfield
|
||||
|
@ -1,4 +1,4 @@
|
||||
From 64ff982be8d707a2cd105e42f4c434826451f042 Mon Sep 17 00:00:00 2001
|
||||
From 706f125ff6cb4940199af13de0040df33827326d Mon Sep 17 00:00:00 2001
|
||||
From: Alexander Graf <agraf@suse.de>
|
||||
Date: Tue, 14 Apr 2009 16:23:27 +0200
|
||||
Subject: [PATCH] qemu-cvs-alsa_ioctl
|
||||
|
@ -1,4 +1,4 @@
|
||||
From 00e65df825c9850d7adb3ecb4d41a971ccf18077 Mon Sep 17 00:00:00 2001
|
||||
From e467d93b8c067719e5f240096d85a2c72f025d8d Mon Sep 17 00:00:00 2001
|
||||
From: Alexander Graf <agraf@suse.de>
|
||||
Date: Tue, 14 Apr 2009 16:24:15 +0200
|
||||
Subject: [PATCH] qemu-cvs-alsa_mmap
|
||||
|
@ -1,4 +1,4 @@
|
||||
From 44f94bad0bf9f7fcfa91818549f6af2d93080d0a Mon Sep 17 00:00:00 2001
|
||||
From 33a0ebb46acf6693587ad719646bce324973a1b7 Mon Sep 17 00:00:00 2001
|
||||
From: Ulrich Hecht <uli@suse.de>
|
||||
Date: Tue, 14 Apr 2009 16:25:41 +0200
|
||||
Subject: [PATCH] qemu-cvs-gettimeofday
|
||||
|
@ -1,4 +1,4 @@
|
||||
From 7888404be1ed347d3d9ae29f1cfa83217c2928bd Mon Sep 17 00:00:00 2001
|
||||
From ea09ea340eecc844351b3f645f4ab1bc83a30209 Mon Sep 17 00:00:00 2001
|
||||
From: Alexander Graf <agraf@suse.de>
|
||||
Date: Tue, 14 Apr 2009 16:26:33 +0200
|
||||
Subject: [PATCH] qemu-cvs-ioctl_debug
|
||||
|
@ -1,4 +1,4 @@
|
||||
From ce2f2aa9f9785c06d69f78ebc6d33c298bad7318 Mon Sep 17 00:00:00 2001
|
||||
From 578468f720038a99ae3a0cb8fec3c032aad77f63 Mon Sep 17 00:00:00 2001
|
||||
From: Alexander Graf <agraf@suse.de>
|
||||
Date: Tue, 14 Apr 2009 16:27:36 +0200
|
||||
Subject: [PATCH] qemu-cvs-ioctl_nodirection
|
||||
|
@ -1,4 +1,4 @@
|
||||
From 676193f701940aafa973deeb4d387e0e899f97ba Mon Sep 17 00:00:00 2001
|
||||
From dd09a1efb9aaa88ea67b087046dda700fcc6fd78 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
|
||||
|
@ -1,4 +1,4 @@
|
||||
From bb54233290f2173961f43bbee59277dda84ec920 Mon Sep 17 00:00:00 2001
|
||||
From 3e9916744db0c1ed9d1a7f63c5d473b98db861ab Mon Sep 17 00:00:00 2001
|
||||
From: Alexander Graf <agraf@suse.de>
|
||||
Date: Fri, 30 Sep 2011 19:40:36 +0200
|
||||
Subject: [PATCH] linux-user: add binfmt wrapper for argv[0] handling
|
||||
|
@ -1,4 +1,4 @@
|
||||
From 47d5cd1142c71d392aa528e87719539aa4b8a212 Mon Sep 17 00:00:00 2001
|
||||
From 2fc3bebad0110c2578f4db9e0f4dae1613000843 Mon Sep 17 00:00:00 2001
|
||||
From: Alexander Graf <agraf@suse.de>
|
||||
Date: Fri, 6 Jan 2012 01:05:55 +0100
|
||||
Subject: [PATCH] PPC: KVM: Disable mmu notifier check
|
||||
@ -13,10 +13,10 @@ KVM guests work there, even if possibly racy in some odd circumstances.
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/exec.c b/exec.c
|
||||
index 7d60e15..fd504b9 100644
|
||||
index 0a4a0c5..03054a8 100644
|
||||
--- a/exec.c
|
||||
+++ b/exec.c
|
||||
@@ -1180,11 +1180,13 @@ static void *file_ram_alloc(RAMBlock *block,
|
||||
@@ -1183,11 +1183,13 @@ static void *file_ram_alloc(RAMBlock *block,
|
||||
goto error;
|
||||
}
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
From 6aa7444acd8cf15aa164040e5af778e890a94fc9 Mon Sep 17 00:00:00 2001
|
||||
From b3086c4600cb1e8aef85977566df8fee6a20a6a1 Mon Sep 17 00:00:00 2001
|
||||
From: Alexander Graf <agraf@suse.de>
|
||||
Date: Fri, 13 Jan 2012 17:05:41 +0100
|
||||
Subject: [PATCH] linux-user: fix segfault deadlock
|
||||
|
@ -1,4 +1,4 @@
|
||||
From 39928000f08c6f72424d0da57b33c66e5387003c Mon Sep 17 00:00:00 2001
|
||||
From 9d108fe88813ed9b5c04f27229c335e88d1ee0b5 Mon Sep 17 00:00:00 2001
|
||||
From: Alexander Graf <agraf@suse.de>
|
||||
Date: Thu, 2 Feb 2012 18:02:33 +0100
|
||||
Subject: [PATCH] linux-user: binfmt: support host binaries
|
||||
|
@ -1,4 +1,4 @@
|
||||
From 76d020651c11c05848299b460b246273a69f7275 Mon Sep 17 00:00:00 2001
|
||||
From c09e4874d845ac6783be16bb560ef4a69f4e24bb Mon Sep 17 00:00:00 2001
|
||||
From: Alexander Graf <agraf@suse.de>
|
||||
Date: Tue, 12 Jun 2012 04:41:10 +0200
|
||||
Subject: [PATCH] linux-user: Ignore broken loop ioctl
|
||||
|
@ -1,4 +1,4 @@
|
||||
From ecc5b618ee6deebe09d2ced341e34018fdad90db Mon Sep 17 00:00:00 2001
|
||||
From 66d948dc1ca00cf95af18a77f0db061f657956a9 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
|
||||
@ -48,7 +48,7 @@ index 5fd32f1..38f1cdd 100644
|
||||
}
|
||||
|
||||
diff --git a/tcg/tcg.c b/tcg/tcg.c
|
||||
index 7e088b1..fd4e764 100644
|
||||
index 0892a9b..f67c38c 100644
|
||||
--- a/tcg/tcg.c
|
||||
+++ b/tcg/tcg.c
|
||||
@@ -39,6 +39,8 @@
|
||||
@ -100,7 +100,7 @@ index 7e088b1..fd4e764 100644
|
||||
/* Count total number of arguments and allocate the corresponding
|
||||
space */
|
||||
total_args = 0;
|
||||
@@ -2418,10 +2444,12 @@ int tcg_gen_code(TCGContext *s, tcg_insn_unit *gen_code_buf)
|
||||
@@ -2422,10 +2448,12 @@ int tcg_gen_code(TCGContext *s, tcg_insn_unit *gen_code_buf)
|
||||
}
|
||||
#endif
|
||||
|
||||
@ -113,7 +113,7 @@ index 7e088b1..fd4e764 100644
|
||||
|
||||
return tcg_current_code_size(s);
|
||||
}
|
||||
@@ -2433,7 +2461,11 @@ int tcg_gen_code(TCGContext *s, tcg_insn_unit *gen_code_buf)
|
||||
@@ -2437,7 +2465,11 @@ int tcg_gen_code(TCGContext *s, tcg_insn_unit *gen_code_buf)
|
||||
int tcg_gen_code_search_pc(TCGContext *s, tcg_insn_unit *gen_code_buf,
|
||||
long offset)
|
||||
{
|
||||
|
@ -1,4 +1,4 @@
|
||||
From ef1239bb2792265ebf0b54a10e80c2196a1a8eca Mon Sep 17 00:00:00 2001
|
||||
From bb2c2983421cc2b39cd7174f9bfdbb0376d5fcb9 Mon Sep 17 00:00:00 2001
|
||||
From: Alexander Graf <agraf@suse.de>
|
||||
Date: Tue, 10 Jul 2012 20:40:55 +0200
|
||||
Subject: [PATCH] linux-user: Run multi-threaded code on a single core
|
||||
|
@ -1,4 +1,4 @@
|
||||
From e1e0da726d1ac207518481109f2a62443caff430 Mon Sep 17 00:00:00 2001
|
||||
From 996083e51b49804d7d9b6fa8c0daa6b2a68fbfee Mon Sep 17 00:00:00 2001
|
||||
From: Alexander Graf <agraf@suse.de>
|
||||
Date: Wed, 11 Jul 2012 16:47:42 +0200
|
||||
Subject: [PATCH] linux-user: lock tb flushing too
|
||||
|
@ -1,4 +1,4 @@
|
||||
From 787779e7cd38d4cb3787db99f5f589c1becde4c7 Mon Sep 17 00:00:00 2001
|
||||
From a592905fec06b408000a34046a6e70095214d955 Mon Sep 17 00:00:00 2001
|
||||
From: Alexander Graf <agraf@suse.de>
|
||||
Date: Mon, 23 Jul 2012 10:24:14 +0200
|
||||
Subject: [PATCH] linux-user: Fake /proc/cpuinfo
|
||||
|
@ -1,4 +1,4 @@
|
||||
From 9e701636e5647576de6d23850b1d7efa336c948f Mon Sep 17 00:00:00 2001
|
||||
From e5e97946c33a9f96bf2690ef725879412d40b57d Mon Sep 17 00:00:00 2001
|
||||
From: Alexander Graf <agraf@suse.de>
|
||||
Date: Mon, 20 Aug 2012 00:02:52 +0200
|
||||
Subject: [PATCH] linux-user: implement FS_IOC_GETFLAGS ioctl
|
||||
|
@ -1,4 +1,4 @@
|
||||
From 7bb60fca5ba001b00dacc4f79840f4214434e4d7 Mon Sep 17 00:00:00 2001
|
||||
From 11b3d0e15103565ed1f80e31033f4b8e2ebb456f Mon Sep 17 00:00:00 2001
|
||||
From: Alexander Graf <agraf@suse.de>
|
||||
Date: Mon, 20 Aug 2012 00:07:13 +0200
|
||||
Subject: [PATCH] linux-user: implement FS_IOC_SETFLAGS ioctl
|
||||
|
@ -1,4 +1,4 @@
|
||||
From 7b8d7c6b185bcab62ceeeb45ba7aefa9437c99cc Mon Sep 17 00:00:00 2001
|
||||
From 12eee45e1110866da047697a46425754c77b2039 Mon Sep 17 00:00:00 2001
|
||||
From: Alexander Graf <agraf@suse.de>
|
||||
Date: Tue, 21 Aug 2012 14:20:40 +0200
|
||||
Subject: [PATCH] linux-user: XXX disable fiemap
|
||||
|
@ -1,4 +1,4 @@
|
||||
From d15b314ffa1cc0f09605a372e879957b3709f0cd Mon Sep 17 00:00:00 2001
|
||||
From 872dda04d480ab7c04830ae7297319ae52d03f65 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,7 +12,7 @@ TBD (from SUSE Studio team)
|
||||
4 files changed, 40 insertions(+)
|
||||
|
||||
diff --git a/qemu-options.hx b/qemu-options.hx
|
||||
index 8c9add9..3e208a1 100644
|
||||
index 77f5853..fed72b0 100644
|
||||
--- a/qemu-options.hx
|
||||
+++ b/qemu-options.hx
|
||||
@@ -2915,6 +2915,16 @@ Store the QEMU process PID in @var{file}. It is useful if you launch QEMU
|
||||
@ -97,7 +97,7 @@ index 7571c5a..0555e18 100644
|
||||
socket_set_fast_reuse(s);
|
||||
opt = 1;
|
||||
diff --git a/vl.c b/vl.c
|
||||
index 5856396..6cd9256 100644
|
||||
index 0adbbd6..f876c0b 100644
|
||||
--- a/vl.c
|
||||
+++ b/vl.c
|
||||
@@ -165,6 +165,7 @@ int smp_threads = 1;
|
||||
|
@ -1,4 +1,4 @@
|
||||
From a72d0ea65e8771778fec75b154e7b2fed69cf3a4 Mon Sep 17 00:00:00 2001
|
||||
From e6f0d75af33e57a766e9d21333a55b981f374d4d 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, 55 insertions(+)
|
||||
|
||||
diff --git a/ui/vnc.c b/ui/vnc.c
|
||||
index 1483958..27ddab1 100644
|
||||
index e26973a..1545e9b 100644
|
||||
--- a/ui/vnc.c
|
||||
+++ b/ui/vnc.c
|
||||
@@ -54,6 +54,8 @@ static const struct timeval VNC_REFRESH_LOSSY = { 2, 0 };
|
||||
@ -43,7 +43,7 @@ index 1483958..27ddab1 100644
|
||||
}
|
||||
|
||||
int vnc_client_io_error(VncState *vs, int ret, int last_errno)
|
||||
@@ -3230,6 +3240,39 @@ char *vnc_display_local_addr(const char *id)
|
||||
@@ -3233,6 +3243,39 @@ char *vnc_display_local_addr(const char *id)
|
||||
return vnc_socket_local_addr("%s:%s", vs->lsock);
|
||||
}
|
||||
|
||||
@ -83,7 +83,7 @@ index 1483958..27ddab1 100644
|
||||
static QemuOptsList qemu_vnc_opts = {
|
||||
.name = "vnc",
|
||||
.head = QTAILQ_HEAD_INITIALIZER(qemu_vnc_opts.head),
|
||||
@@ -3257,6 +3300,9 @@ static QemuOptsList qemu_vnc_opts = {
|
||||
@@ -3260,6 +3303,9 @@ static QemuOptsList qemu_vnc_opts = {
|
||||
.name = "connections",
|
||||
.type = QEMU_OPT_NUMBER,
|
||||
},{
|
||||
@ -93,7 +93,7 @@ index 1483958..27ddab1 100644
|
||||
.name = "to",
|
||||
.type = QEMU_OPT_NUMBER,
|
||||
},{
|
||||
@@ -3269,6 +3315,9 @@ static QemuOptsList qemu_vnc_opts = {
|
||||
@@ -3272,6 +3318,9 @@ static QemuOptsList qemu_vnc_opts = {
|
||||
.name = "password",
|
||||
.type = QEMU_OPT_BOOL,
|
||||
},{
|
||||
@ -103,7 +103,7 @@ index 1483958..27ddab1 100644
|
||||
.name = "reverse",
|
||||
.type = QEMU_OPT_BOOL,
|
||||
},{
|
||||
@@ -3433,6 +3482,7 @@ void vnc_display_open(const char *id, Error **errp)
|
||||
@@ -3436,6 +3485,7 @@ void vnc_display_open(const char *id, Error **errp)
|
||||
const char *share, *device_id;
|
||||
QemuConsole *con;
|
||||
bool password = false;
|
||||
@ -111,7 +111,7 @@ index 1483958..27ddab1 100644
|
||||
bool reverse = false;
|
||||
const char *vnc;
|
||||
const char *has_to;
|
||||
@@ -3521,6 +3571,10 @@ void vnc_display_open(const char *id, Error **errp)
|
||||
@@ -3524,6 +3574,10 @@ void vnc_display_open(const char *id, Error **errp)
|
||||
goto fail;
|
||||
}
|
||||
}
|
||||
@ -122,7 +122,7 @@ index 1483958..27ddab1 100644
|
||||
|
||||
reverse = qemu_opt_get_bool(opts, "reverse", false);
|
||||
lock_key_sync = qemu_opt_get_bool(opts, "lock-key-sync", true);
|
||||
@@ -3574,6 +3628,7 @@ void vnc_display_open(const char *id, Error **errp)
|
||||
@@ -3577,6 +3631,7 @@ void vnc_display_open(const char *id, Error **errp)
|
||||
vs->share_policy = VNC_SHARE_POLICY_ALLOW_EXCLUSIVE;
|
||||
}
|
||||
vs->connections_limit = qemu_opt_get_number(opts, "connections", 32);
|
||||
|
@ -1,4 +1,4 @@
|
||||
From f542d111b0ed23cec2e066821e49d28b3f961ad5 Mon Sep 17 00:00:00 2001
|
||||
From 41e679783a244ca0ea1963e55bd3da5b9a966f24 Mon Sep 17 00:00:00 2001
|
||||
From: Alexander Graf <agraf@suse.de>
|
||||
Date: Wed, 10 Oct 2012 10:21:20 +0200
|
||||
Subject: [PATCH] linux-user: add more blk ioctls
|
||||
|
@ -1,4 +1,4 @@
|
||||
From e482b906241c74cf3bcd3355e01ffb8f58a02067 Mon Sep 17 00:00:00 2001
|
||||
From 72d795a02ff3fac05afef692938ab2ec12176795 Mon Sep 17 00:00:00 2001
|
||||
From: Alexander Graf <agraf@suse.de>
|
||||
Date: Tue, 9 Oct 2012 09:06:49 +0200
|
||||
Subject: [PATCH] linux-user: use target_ulong
|
||||
|
@ -1,4 +1,4 @@
|
||||
From bc287f6086a7e92abc9eabc325b0e7f6f0342a63 Mon Sep 17 00:00:00 2001
|
||||
From 22e3f94ab2885d9618711a9eac9d751fb2543028 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
|
||||
|
@ -1,4 +1,4 @@
|
||||
From 67d7241fd849d4e0f0fefe571507720bd62a7285 Mon Sep 17 00:00:00 2001
|
||||
From be6c4a9c1ee466c5b6d6f0e7e78eab322f722232 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
|
||||
|
@ -1,4 +1,4 @@
|
||||
From cb1f9bea31e1c6b6bbe40d75a13a29e39890ac31 Mon Sep 17 00:00:00 2001
|
||||
From 1d5befaff3c2b4dfdc3b23589f2f92f2d288dcf1 Mon Sep 17 00:00:00 2001
|
||||
From: Alexander Graf <agraf@suse.de>
|
||||
Date: Wed, 12 Dec 2012 19:11:30 +0100
|
||||
Subject: [PATCH] Legacy Patch kvm-qemu-preXX-dictzip3.patch
|
||||
|
@ -1,4 +1,4 @@
|
||||
From f12eb4650069436337bb35f8b13cf417e84066f5 Mon Sep 17 00:00:00 2001
|
||||
From 602e012b10d06c4d25212a452d3066f087350289 Mon Sep 17 00:00:00 2001
|
||||
From: Alexander Graf <agraf@suse.de>
|
||||
Date: Mon, 6 Jun 2011 06:53:52 +0200
|
||||
Subject: [PATCH] console: add question-mark escape operator
|
||||
|
@ -1,4 +1,4 @@
|
||||
From 0d4854d1247eaf9f4724bf90fecafcf7322cca18 Mon Sep 17 00:00:00 2001
|
||||
From 8035717a00918d5c84c7c1fa326c6409431ece9e 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 617e034..9bc7010 100644
|
||||
index d956f8d..cd301ba 100644
|
||||
--- a/qemu-char.c
|
||||
+++ b/qemu-char.c
|
||||
@@ -404,6 +404,9 @@ typedef struct {
|
||||
|
@ -1,4 +1,4 @@
|
||||
From 3e6c50be545907807fc1294c26d65011f51386f5 Mon Sep 17 00:00:00 2001
|
||||
From fee765c70a2e52b093a529fc78c7d2838c95fab5 Mon Sep 17 00:00:00 2001
|
||||
From: Alexander Graf <agraf@suse.de>
|
||||
Date: Thu, 13 Dec 2012 14:29:22 +0100
|
||||
Subject: [PATCH] linux-user: lseek: explicitly cast non-set offsets to signed
|
||||
|
@ -1,4 +1,4 @@
|
||||
From fc0c23aa1dbcc6c0a0146a2679626bbf1e90e2b3 Mon Sep 17 00:00:00 2001
|
||||
From 059de120405eea44ff389bed7a94aca9f32f4591 Mon Sep 17 00:00:00 2001
|
||||
From: Bruce Rogers <brogers@suse.com>
|
||||
Date: Thu, 16 May 2013 12:39:10 +0200
|
||||
Subject: [PATCH] virtfs-proxy-helper: Provide __u64 for broken
|
||||
|
@ -1,4 +1,4 @@
|
||||
From ad613ef4235da1d8fb565d74e3a46b2d155f6552 Mon Sep 17 00:00:00 2001
|
||||
From 691fc4414be4b35aca29dbebca08192f91c69bf5 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 cc0338d..733698f 100755
|
||||
index cd219d8..6ab01bc 100755
|
||||
--- a/configure
|
||||
+++ b/configure
|
||||
@@ -1531,7 +1531,7 @@ fi
|
||||
@@ -1530,7 +1530,7 @@ fi
|
||||
|
||||
if test "$pie" = ""; then
|
||||
case "$cpu-$targetos" in
|
||||
|
@ -1,4 +1,4 @@
|
||||
From 76b55ce3358039c8b6644b2d9312a4694479aec0 Mon Sep 17 00:00:00 2001
|
||||
From c4bd3ee614365b7343fd570907901bdd11141f49 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
|
||||
|
@ -1,4 +1,4 @@
|
||||
From 4967ebd0cc3c33ae6a88a90ea4702b17d3bd1050 Mon Sep 17 00:00:00 2001
|
||||
From 849aa878fa4bc283531d005bc2d6a5496af4cde1 Mon Sep 17 00:00:00 2001
|
||||
From: Alexander Graf <agraf@suse.de>
|
||||
Date: Wed, 14 Jan 2015 01:32:11 +0100
|
||||
Subject: [PATCH] AIO: Reduce number of threads for 32bit hosts
|
||||
|
@ -1,4 +1,4 @@
|
||||
From ac83b8b2c72cbe56fcafef046d83e3d074cdd88b Mon Sep 17 00:00:00 2001
|
||||
From 5d4f5c0bb2304239ef1bc47cf5eb211c576d2342 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Andreas=20F=C3=A4rber?= <afaerber@suse.de>
|
||||
Date: Tue, 14 Apr 2015 18:42:06 +0200
|
||||
Subject: [PATCH] Revert "Revert seccomp tests that allow it to be used on
|
||||
@ -18,10 +18,10 @@ Signed-off-by: Andreas Färber <afaerber@suse.de>
|
||||
1 file changed, 7 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/configure b/configure
|
||||
index 733698f..492c87b 100755
|
||||
index 6ab01bc..b1ed2a2 100755
|
||||
--- a/configure
|
||||
+++ b/configure
|
||||
@@ -1828,14 +1828,19 @@ fi
|
||||
@@ -1827,14 +1827,19 @@ fi
|
||||
# libseccomp check
|
||||
|
||||
if test "$seccomp" != "no" ; then
|
||||
|
83
0038-tcg-aarch64-Fix-tcg_out_qemu_-ld-st.patch
Normal file
83
0038-tcg-aarch64-Fix-tcg_out_qemu_-ld-st.patch
Normal file
@ -0,0 +1,83 @@
|
||||
From df632501e0417ab9814f2a69d7e2859c22b74010 Mon Sep 17 00:00:00 2001
|
||||
From: Richard Henderson <rth@twiddle.net>
|
||||
Date: Tue, 1 Sep 2015 15:58:02 -0400
|
||||
Subject: [PATCH] tcg/aarch64: Fix tcg_out_qemu_{ld, st} for guest_base == 0
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
In ffc6372851d8631a9f9fa56ec613b3244dc635b9, we swapped the guest
|
||||
base to the address base register from the address index register.
|
||||
Except that 31 in the base slot is SP not XZR, so we need to be
|
||||
more intelligent about which reg gets placed in which slot.
|
||||
|
||||
Cc: qemu-stable@nongnu.org (v2.4.0)
|
||||
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
|
||||
Reported-by: Andreas Färber <afaerber@suse.de>
|
||||
Signed-off-by: Richard Henderson <rth@twiddle.net>
|
||||
(cherry picked from commit 352bcb0a2b816ff9ab9d75d0f2384650d9e9ab19)
|
||||
[AF: Backported to GUEST_BASE and CONFIG_USE_GUEST_BASE]
|
||||
Signed-off-by: Andreas Färber <afaerber@suse.de>
|
||||
---
|
||||
tcg/aarch64/tcg-target.c | 27 ++++++++++++++++++++-------
|
||||
1 file changed, 20 insertions(+), 7 deletions(-)
|
||||
|
||||
diff --git a/tcg/aarch64/tcg-target.c b/tcg/aarch64/tcg-target.c
|
||||
index b7ec4f5..354c89d 100644
|
||||
--- a/tcg/aarch64/tcg-target.c
|
||||
+++ b/tcg/aarch64/tcg-target.c
|
||||
@@ -56,6 +56,11 @@ static const int tcg_target_call_oarg_regs[1] = {
|
||||
#define TCG_REG_TMP TCG_REG_X30
|
||||
|
||||
#ifndef CONFIG_SOFTMMU
|
||||
+/* Note that XZR cannot be encoded in the address base register slot,
|
||||
+ as that actaully encodes SP. So if we need to zero-extend the guest
|
||||
+ address, via the address index register slot, we need to load even
|
||||
+ a zero guest base into a register. */
|
||||
+# define USE_GUEST_BASE (GUEST_BASE != 0 || TARGET_LONG_BITS == 32)
|
||||
# ifdef CONFIG_USE_GUEST_BASE
|
||||
# define TCG_REG_GUEST_BASE TCG_REG_X28
|
||||
# else
|
||||
@@ -1216,9 +1221,13 @@ static void tcg_out_qemu_ld(TCGContext *s, TCGReg data_reg, TCGReg addr_reg,
|
||||
add_qemu_ldst_label(s, true, oi, ext, data_reg, addr_reg,
|
||||
s->code_ptr, label_ptr);
|
||||
#else /* !CONFIG_SOFTMMU */
|
||||
- tcg_out_qemu_ld_direct(s, memop, ext, data_reg,
|
||||
- GUEST_BASE ? TCG_REG_GUEST_BASE : TCG_REG_XZR,
|
||||
- otype, addr_reg);
|
||||
+ if (USE_GUEST_BASE) {
|
||||
+ tcg_out_qemu_ld_direct(s, memop, ext, data_reg,
|
||||
+ TCG_REG_GUEST_BASE, otype, addr_reg);
|
||||
+ } else {
|
||||
+ tcg_out_qemu_ld_direct(s, memop, ext, data_reg,
|
||||
+ addr_reg, TCG_TYPE_I64, TCG_REG_XZR);
|
||||
+ }
|
||||
#endif /* CONFIG_SOFTMMU */
|
||||
}
|
||||
|
||||
@@ -1238,9 +1247,13 @@ static void tcg_out_qemu_st(TCGContext *s, TCGReg data_reg, TCGReg addr_reg,
|
||||
add_qemu_ldst_label(s, false, oi, s_bits == MO_64, data_reg, addr_reg,
|
||||
s->code_ptr, label_ptr);
|
||||
#else /* !CONFIG_SOFTMMU */
|
||||
- tcg_out_qemu_st_direct(s, memop, data_reg,
|
||||
- GUEST_BASE ? TCG_REG_GUEST_BASE : TCG_REG_XZR,
|
||||
- otype, addr_reg);
|
||||
+ if (USE_GUEST_BASE) {
|
||||
+ tcg_out_qemu_st_direct(s, memop, data_reg,
|
||||
+ TCG_REG_GUEST_BASE, otype, addr_reg);
|
||||
+ } else {
|
||||
+ tcg_out_qemu_st_direct(s, memop, data_reg,
|
||||
+ addr_reg, TCG_TYPE_I64, TCG_REG_XZR);
|
||||
+ }
|
||||
#endif /* CONFIG_SOFTMMU */
|
||||
}
|
||||
|
||||
@@ -1795,7 +1808,7 @@ static void tcg_target_qemu_prologue(TCGContext *s)
|
||||
CPU_TEMP_BUF_NLONGS * sizeof(long));
|
||||
|
||||
#if defined(CONFIG_USE_GUEST_BASE)
|
||||
- if (GUEST_BASE) {
|
||||
+ if (USE_GUEST_BASE) {
|
||||
tcg_out_movi(s, TCG_TYPE_PTR, TCG_REG_GUEST_BASE, GUEST_BASE);
|
||||
tcg_regset_set_reg(s->reserved_regs, TCG_REG_GUEST_BASE);
|
||||
}
|
@ -1,3 +1,15 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu Sep 3 16:57:33 UTC 2015 - afaerber@suse.de
|
||||
|
||||
- Patch queue updated from git://github.com/openSUSE/qemu.git opensuse-2.4
|
||||
* Patches added:
|
||||
0038-tcg-aarch64-Fix-tcg_out_qemu_-ld-st.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Aug 12 16:41:25 UTC 2015 - afaerber@suse.de
|
||||
|
||||
- Update to v2.4.0: See http://wiki.qemu-project.org/ChangeLog/2.4
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Jul 24 15:19:06 UTC 2015 - afaerber@suse.de
|
||||
|
||||
|
@ -21,9 +21,9 @@ Url: http://www.qemu.org/
|
||||
Summary: Universal CPU emulator
|
||||
License: BSD-3-Clause and GPL-2.0 and GPL-2.0+ and LGPL-2.1+ and MIT
|
||||
Group: System/Emulators/PC
|
||||
Version: 2.3.92
|
||||
Version: 2.4.0
|
||||
Release: 0
|
||||
Source: http://wiki.qemu.org/download/qemu-2.4.0-rc2.tar.bz2
|
||||
Source: http://wiki.qemu.org/download/qemu-2.4.0.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
|
||||
@ -62,6 +62,7 @@ Patch0034: 0034-configure-Enable-PIE-for-ppc-and-pp.patch
|
||||
Patch0035: 0035-qtest-Increase-socket-timeout.patch
|
||||
Patch0036: 0036-AIO-Reduce-number-of-threads-for-32.patch
|
||||
Patch0037: 0037-Revert-Revert-seccomp-tests-that-al.patch
|
||||
Patch0038: 0038-tcg-aarch64-Fix-tcg_out_qemu_-ld-st.patch
|
||||
# Please do not add patches manually here, run update_git.sh.
|
||||
# this is to make lint happy
|
||||
Source300: qemu-rpmlintrc
|
||||
@ -120,7 +121,7 @@ the cards could be pure software constructs.
|
||||
This sub-package contains development files for the Smartcard library.
|
||||
|
||||
%prep
|
||||
%setup -q -n qemu-2.4.0-rc2
|
||||
%setup -q -n qemu-2.4.0
|
||||
%patch0001 -p1
|
||||
%patch0002 -p1
|
||||
%patch0003 -p1
|
||||
@ -158,6 +159,7 @@ This sub-package contains development files for the Smartcard library.
|
||||
%patch0035 -p1
|
||||
%patch0036 -p1
|
||||
%patch0037 -p1
|
||||
%patch0038 -p1
|
||||
|
||||
%build
|
||||
./configure --prefix=%_prefix --sysconfdir=%_sysconfdir \
|
||||
|
@ -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: http://wiki.qemu.org/download/qemu-2.4.0-rc2.tar.bz2
|
||||
Source: http://wiki.qemu.org/download/qemu-2.4.0.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.
|
||||
@ -84,7 +84,7 @@ the cards could be pure software constructs.
|
||||
This sub-package contains development files for the Smartcard library.
|
||||
|
||||
%prep
|
||||
%setup -q -n qemu-2.4.0-rc2
|
||||
%setup -q -n qemu-2.4.0
|
||||
PATCH_EXEC
|
||||
|
||||
%build
|
||||
|
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:ad86df38f10ad8b5fc03a7ec32b0080c0a5ab9e01fdaa7d5ba26f8591dd9b2fe
|
||||
size 25053664
|
Binary file not shown.
3
qemu-2.4.0.tar.bz2
Normal file
3
qemu-2.4.0.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:72b0b991bbcc540663a019e1e8c4f714053b691dda32c9b9ee80b25f367e6620
|
||||
size 25070979
|
BIN
qemu-2.4.0.tar.bz2.sig
Normal file
BIN
qemu-2.4.0.tar.bz2.sig
Normal file
Binary file not shown.
@ -1,3 +1,15 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu Sep 3 16:57:29 UTC 2015 - afaerber@suse.de
|
||||
|
||||
- Patch queue updated from git://github.com/openSUSE/qemu.git opensuse-2.4
|
||||
* Fix aarch64 TCG:
|
||||
0038-tcg-aarch64-Fix-tcg_out_qemu_-ld-st.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Aug 12 16:41:25 UTC 2015 - afaerber@suse.de
|
||||
|
||||
- Update to v2.4.0: See http://wiki.qemu-project.org/ChangeLog/2.4
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Jul 24 15:19:06 UTC 2015 - afaerber@suse.de
|
||||
|
||||
|
@ -21,9 +21,9 @@ Url: http://www.qemu.org/
|
||||
Summary: Universal CPU emulator
|
||||
License: BSD-3-Clause and GPL-2.0 and GPL-2.0+ and LGPL-2.1+ and MIT
|
||||
Group: System/Emulators/PC
|
||||
Version: 2.3.92
|
||||
Version: 2.4.0
|
||||
Release: 0
|
||||
Source: http://wiki.qemu.org/download/qemu-2.4.0-rc2.tar.bz2
|
||||
Source: http://wiki.qemu.org/download/qemu-2.4.0.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
|
||||
@ -62,6 +62,7 @@ Patch0034: 0034-configure-Enable-PIE-for-ppc-and-pp.patch
|
||||
Patch0035: 0035-qtest-Increase-socket-timeout.patch
|
||||
Patch0036: 0036-AIO-Reduce-number-of-threads-for-32.patch
|
||||
Patch0037: 0037-Revert-Revert-seccomp-tests-that-al.patch
|
||||
Patch0038: 0038-tcg-aarch64-Fix-tcg_out_qemu_-ld-st.patch
|
||||
# Please do not add patches manually here, run update_git.sh.
|
||||
# this is to make lint happy
|
||||
Source300: qemu-rpmlintrc
|
||||
@ -114,7 +115,7 @@ emulations. This can be used together with the OBS build script to
|
||||
run cross-architecture builds.
|
||||
|
||||
%prep
|
||||
%setup -q -n qemu-2.4.0-rc2
|
||||
%setup -q -n qemu-2.4.0
|
||||
%patch0001 -p1
|
||||
%patch0002 -p1
|
||||
%patch0003 -p1
|
||||
@ -152,6 +153,7 @@ run cross-architecture builds.
|
||||
%patch0035 -p1
|
||||
%patch0036 -p1
|
||||
%patch0037 -p1
|
||||
%patch0038 -p1
|
||||
|
||||
%build
|
||||
./configure --prefix=%_prefix --sysconfdir=%_sysconfdir \
|
||||
|
@ -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: http://wiki.qemu.org/download/qemu-2.4.0-rc2.tar.bz2
|
||||
Source: http://wiki.qemu.org/download/qemu-2.4.0.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.4.0-rc2
|
||||
%setup -q -n qemu-2.4.0
|
||||
PATCH_EXEC
|
||||
|
||||
%build
|
||||
|
@ -1,3 +1,15 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu Sep 3 16:57:25 UTC 2015 - afaerber@suse.de
|
||||
|
||||
- Patch queue updated from git://github.com/openSUSE/qemu.git opensuse-2.4
|
||||
* Fix aarch64 TCG:
|
||||
0038-tcg-aarch64-Fix-tcg_out_qemu_-ld-st.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Aug 12 16:41:25 UTC 2015 - afaerber@suse.de
|
||||
|
||||
- Update to v2.4.0: See http://wiki.qemu-project.org/ChangeLog/2.4
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Jul 24 15:19:06 UTC 2015 - afaerber@suse.de
|
||||
|
||||
|
@ -43,10 +43,10 @@ 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.3.92
|
||||
Version: 2.4.0
|
||||
Release: 0
|
||||
Source: http://wiki.qemu.org/download/qemu-2.4.0-rc2.tar.bz2
|
||||
Source99: http://wiki.qemu.org/download/qemu-2.4.0-rc2.tar.bz2.sig
|
||||
Source: http://wiki.qemu.org/download/qemu-2.4.0.tar.bz2
|
||||
Source99: http://wiki.qemu.org/download/qemu-2.4.0.tar.bz2.sig
|
||||
Source1: 80-kvm.rules
|
||||
Source2: qemu-ifup
|
||||
Source3: kvm_stat
|
||||
@ -93,6 +93,7 @@ Patch0034: 0034-configure-Enable-PIE-for-ppc-and-pp.patch
|
||||
Patch0035: 0035-qtest-Increase-socket-timeout.patch
|
||||
Patch0036: 0036-AIO-Reduce-number-of-threads-for-32.patch
|
||||
Patch0037: 0037-Revert-Revert-seccomp-tests-that-al.patch
|
||||
Patch0038: 0038-tcg-aarch64-Fix-tcg_out_qemu_-ld-st.patch
|
||||
# Please do not add QEMU patches manually here.
|
||||
# Run update_git.sh to regenerate this queue.
|
||||
|
||||
@ -570,7 +571,7 @@ This package provides a service file for starting and stopping KSM.
|
||||
%endif # !qemu-testsuite
|
||||
|
||||
%prep
|
||||
%setup -q -n qemu-2.4.0-rc2
|
||||
%setup -q -n qemu-2.4.0
|
||||
%patch0001 -p1
|
||||
%patch0002 -p1
|
||||
%patch0003 -p1
|
||||
@ -608,6 +609,7 @@ This package provides a service file for starting and stopping KSM.
|
||||
%patch0035 -p1
|
||||
%patch0036 -p1
|
||||
%patch0037 -p1
|
||||
%patch0038 -p1
|
||||
|
||||
%if %{build_x86_fw_from_source}
|
||||
pushd roms/seabios
|
||||
|
12
qemu.changes
12
qemu.changes
@ -1,3 +1,15 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu Sep 3 16:57:25 UTC 2015 - afaerber@suse.de
|
||||
|
||||
- Patch queue updated from git://github.com/openSUSE/qemu.git opensuse-2.4
|
||||
* Fix aarch64 TCG:
|
||||
0038-tcg-aarch64-Fix-tcg_out_qemu_-ld-st.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Aug 12 16:41:25 UTC 2015 - afaerber@suse.de
|
||||
|
||||
- Update to v2.4.0: See http://wiki.qemu-project.org/ChangeLog/2.4
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Jul 24 15:19:06 UTC 2015 - afaerber@suse.de
|
||||
|
||||
|
10
qemu.spec
10
qemu.spec
@ -43,10 +43,10 @@ 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.3.92
|
||||
Version: 2.4.0
|
||||
Release: 0
|
||||
Source: http://wiki.qemu.org/download/qemu-2.4.0-rc2.tar.bz2
|
||||
Source99: http://wiki.qemu.org/download/qemu-2.4.0-rc2.tar.bz2.sig
|
||||
Source: http://wiki.qemu.org/download/qemu-2.4.0.tar.bz2
|
||||
Source99: http://wiki.qemu.org/download/qemu-2.4.0.tar.bz2.sig
|
||||
Source1: 80-kvm.rules
|
||||
Source2: qemu-ifup
|
||||
Source3: kvm_stat
|
||||
@ -93,6 +93,7 @@ Patch0034: 0034-configure-Enable-PIE-for-ppc-and-pp.patch
|
||||
Patch0035: 0035-qtest-Increase-socket-timeout.patch
|
||||
Patch0036: 0036-AIO-Reduce-number-of-threads-for-32.patch
|
||||
Patch0037: 0037-Revert-Revert-seccomp-tests-that-al.patch
|
||||
Patch0038: 0038-tcg-aarch64-Fix-tcg_out_qemu_-ld-st.patch
|
||||
# Please do not add QEMU patches manually here.
|
||||
# Run update_git.sh to regenerate this queue.
|
||||
|
||||
@ -570,7 +571,7 @@ This package provides a service file for starting and stopping KSM.
|
||||
%endif # !qemu-testsuite
|
||||
|
||||
%prep
|
||||
%setup -q -n qemu-2.4.0-rc2
|
||||
%setup -q -n qemu-2.4.0
|
||||
%patch0001 -p1
|
||||
%patch0002 -p1
|
||||
%patch0003 -p1
|
||||
@ -608,6 +609,7 @@ This package provides a service file for starting and stopping KSM.
|
||||
%patch0035 -p1
|
||||
%patch0036 -p1
|
||||
%patch0037 -p1
|
||||
%patch0038 -p1
|
||||
|
||||
%if %{build_x86_fw_from_source}
|
||||
pushd roms/seabios
|
||||
|
@ -45,8 +45,8 @@ 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: http://wiki.qemu.org/download/qemu-2.4.0-rc2.tar.bz2
|
||||
Source99: http://wiki.qemu.org/download/qemu-2.4.0-rc2.tar.bz2.sig
|
||||
Source: http://wiki.qemu.org/download/qemu-2.4.0.tar.bz2
|
||||
Source99: http://wiki.qemu.org/download/qemu-2.4.0.tar.bz2.sig
|
||||
Source1: 80-kvm.rules
|
||||
Source2: qemu-ifup
|
||||
Source3: kvm_stat
|
||||
@ -534,7 +534,7 @@ This package provides a service file for starting and stopping KSM.
|
||||
%endif # !qemu-testsuite
|
||||
|
||||
%prep
|
||||
%setup -q -n qemu-2.4.0-rc2
|
||||
%setup -q -n qemu-2.4.0
|
||||
PATCH_EXEC
|
||||
|
||||
%if %{build_x86_fw_from_source}
|
||||
|
@ -12,7 +12,7 @@
|
||||
GIT_TREE=git://github.com/openSUSE/qemu.git
|
||||
GIT_LOCAL_TREE=~/git/qemu-opensuse
|
||||
GIT_BRANCH=opensuse-2.4
|
||||
GIT_UPSTREAM_TAG=v2.4.0-rc2
|
||||
GIT_UPSTREAM_TAG=v2.4.0
|
||||
GIT_DIR=/dev/shm/qemu-factory-git-dir
|
||||
CMP_DIR=/dev/shm/qemu-factory-cmp-dir
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user