diff --git a/0001-XXX-dont-dump-core-on-sigabort.patch b/0001-XXX-dont-dump-core-on-sigabort.patch index 18e468a..53ccc16 100644 --- a/0001-XXX-dont-dump-core-on-sigabort.patch +++ b/0001-XXX-dont-dump-core-on-sigabort.patch @@ -1,4 +1,4 @@ -From 7261f498a3b0b99180d09faaf73dc3af06d18fbe Mon Sep 17 00:00:00 2001 +From 0cc25b3cd019821123bb03e031787b885694c563 Mon Sep 17 00:00:00 2001 From: Alexander Graf Date: Mon, 21 Nov 2011 23:50:36 +0100 Subject: [PATCH] XXX dont dump core on sigabort diff --git a/0002-XXX-work-around-SA_RESTART-race-wit.patch b/0002-XXX-work-around-SA_RESTART-race-wit.patch index 92bad03..2815778 100644 --- a/0002-XXX-work-around-SA_RESTART-race-wit.patch +++ b/0002-XXX-work-around-SA_RESTART-race-wit.patch @@ -1,4 +1,4 @@ -From fb897f92be5a2b144fe4f3f7f2ddb1386dd3a677 Mon Sep 17 00:00:00 2001 +From b70c1de50710a307563b51b92996b5d0ce2687cc Mon Sep 17 00:00:00 2001 From: Alexander Graf Date: Thu, 1 Dec 2011 19:00:01 +0100 Subject: [PATCH] XXX work around SA_RESTART race with boehm-gc (ARM only) @@ -13,7 +13,7 @@ Subject: [PATCH] XXX work around SA_RESTART race with boehm-gc (ARM only) 4 files changed, 130 insertions(+), 10 deletions(-) diff --git a/linux-user/main.c b/linux-user/main.c -index b432bf2..119331f 100644 +index 5f3ec97..7b28d93 100644 --- a/linux-user/main.c +++ b/linux-user/main.c @@ -853,15 +853,22 @@ void cpu_loop(CPUARMState *env) diff --git a/0003-qemu-0.9.0.cvs-binfmt.patch b/0003-qemu-0.9.0.cvs-binfmt.patch index 2187ca5..e8cfdb2 100644 --- a/0003-qemu-0.9.0.cvs-binfmt.patch +++ b/0003-qemu-0.9.0.cvs-binfmt.patch @@ -1,4 +1,4 @@ -From 65b3bf4a8d92ecb5f0ab4e89d20d8dd0a08d433a Mon Sep 17 00:00:00 2001 +From 1b2df489a2809e1e8bef5f8cf846373c95934aa1 Mon Sep 17 00:00:00 2001 From: Ulrich Hecht Date: Tue, 14 Apr 2009 16:18:44 +0200 Subject: [PATCH] qemu-0.9.0.cvs-binfmt diff --git a/0004-qemu-cvs-alsa_bitfield.patch b/0004-qemu-cvs-alsa_bitfield.patch index 76ac6d9..7565bc8 100644 --- a/0004-qemu-cvs-alsa_bitfield.patch +++ b/0004-qemu-cvs-alsa_bitfield.patch @@ -1,4 +1,4 @@ -From d2c9637b77ebbc03478f6d1a911bc01561161daa Mon Sep 17 00:00:00 2001 +From 86f0e5770aa18b28d0f43f514dc3f4c563b73ce2 Mon Sep 17 00:00:00 2001 From: Alexander Graf Date: Tue, 14 Apr 2009 16:20:50 +0200 Subject: [PATCH] qemu-cvs-alsa_bitfield diff --git a/0005-qemu-cvs-alsa_ioctl.patch b/0005-qemu-cvs-alsa_ioctl.patch index c284bd4..d3b54a3 100644 --- a/0005-qemu-cvs-alsa_ioctl.patch +++ b/0005-qemu-cvs-alsa_ioctl.patch @@ -1,4 +1,4 @@ -From 7315601fc9b07a4cbbf3126fb846eb6796b79f11 Mon Sep 17 00:00:00 2001 +From e8f69a4b03d1892bcc63fe686857e66da9bbe5eb Mon Sep 17 00:00:00 2001 From: Alexander Graf Date: Tue, 14 Apr 2009 16:23:27 +0200 Subject: [PATCH] qemu-cvs-alsa_ioctl diff --git a/0006-qemu-cvs-alsa_mmap.patch b/0006-qemu-cvs-alsa_mmap.patch index 2027f19..05e582d 100644 --- a/0006-qemu-cvs-alsa_mmap.patch +++ b/0006-qemu-cvs-alsa_mmap.patch @@ -1,4 +1,4 @@ -From 31795a01d7db34560e09b67723f66c9b56e4bfe0 Mon Sep 17 00:00:00 2001 +From 8cce17b453f1c48d6cb476bda4c775c859b8be12 Mon Sep 17 00:00:00 2001 From: Alexander Graf Date: Tue, 14 Apr 2009 16:24:15 +0200 Subject: [PATCH] qemu-cvs-alsa_mmap diff --git a/0007-qemu-cvs-gettimeofday.patch b/0007-qemu-cvs-gettimeofday.patch index 71a2bfa..0bd6384 100644 --- a/0007-qemu-cvs-gettimeofday.patch +++ b/0007-qemu-cvs-gettimeofday.patch @@ -1,4 +1,4 @@ -From 6851a047d5ee3598e23add8661f6a72911048279 Mon Sep 17 00:00:00 2001 +From 6a9bb134ff9465b1c85f52aef40a3be5d41230d0 Mon Sep 17 00:00:00 2001 From: Ulrich Hecht Date: Tue, 14 Apr 2009 16:25:41 +0200 Subject: [PATCH] qemu-cvs-gettimeofday diff --git a/0008-qemu-cvs-ioctl_debug.patch b/0008-qemu-cvs-ioctl_debug.patch index 0f52e5c..e6d0356 100644 --- a/0008-qemu-cvs-ioctl_debug.patch +++ b/0008-qemu-cvs-ioctl_debug.patch @@ -1,4 +1,4 @@ -From eda771ddbebc65e250ea6ee55915b57f8a987a1d Mon Sep 17 00:00:00 2001 +From f947d45896b9eed4bc54837653d3920a5a46e5e6 Mon Sep 17 00:00:00 2001 From: Alexander Graf Date: Tue, 14 Apr 2009 16:26:33 +0200 Subject: [PATCH] qemu-cvs-ioctl_debug diff --git a/0009-qemu-cvs-ioctl_nodirection.patch b/0009-qemu-cvs-ioctl_nodirection.patch index 952b2b8..90bfe52 100644 --- a/0009-qemu-cvs-ioctl_nodirection.patch +++ b/0009-qemu-cvs-ioctl_nodirection.patch @@ -1,4 +1,4 @@ -From 2139ef68f00f2f273ab464aacf8108a857adea1d Mon Sep 17 00:00:00 2001 +From 52fb54142b48ac628585b64abaff7317a6d87cff Mon Sep 17 00:00:00 2001 From: Alexander Graf Date: Tue, 14 Apr 2009 16:27:36 +0200 Subject: [PATCH] qemu-cvs-ioctl_nodirection diff --git a/0010-block-vmdk-Support-creation-of-SCSI.patch b/0010-block-vmdk-Support-creation-of-SCSI.patch index fee4cce..91dacd1 100644 --- a/0010-block-vmdk-Support-creation-of-SCSI.patch +++ b/0010-block-vmdk-Support-creation-of-SCSI.patch @@ -1,4 +1,4 @@ -From 32bb17da57ea63a355a777339b227b4da7f09825 Mon Sep 17 00:00:00 2001 +From 6d9dd264d6ac4687fafb7555fcffa1c83d9485e5 Mon Sep 17 00:00:00 2001 From: Ulrich Hecht 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 4 files changed, 21 insertions(+), 1 deletion(-) diff --git a/block.c b/block.c -index d36eb75..be962ec 100644 +index d4939b4..b10e0fe 100644 --- a/block.c +++ b/block.c -@@ -3581,6 +3581,9 @@ void bdrv_img_create(const char *filename, const char *fmt, +@@ -3588,6 +3588,9 @@ void bdrv_img_create(const char *filename, const char *fmt, if (!quiet) { printf("Formatting '%s', fmt=%s ", filename, fmt); qemu_opts_print(opts, " "); @@ -82,10 +82,10 @@ index 10d8759..7c0b99c 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 06264d9..6ab8eaf 100644 +index 1697762..72c2863 100644 --- a/qemu-img.c +++ b/qemu-img.c -@@ -2033,6 +2033,13 @@ static int img_convert(int argc, char **argv) +@@ -2034,6 +2034,13 @@ static int img_convert(int argc, char **argv) } } diff --git a/0011-linux-user-add-binfmt-wrapper-for-a.patch b/0011-linux-user-add-binfmt-wrapper-for-a.patch index 2918670..9c5dfa5 100644 --- a/0011-linux-user-add-binfmt-wrapper-for-a.patch +++ b/0011-linux-user-add-binfmt-wrapper-for-a.patch @@ -1,4 +1,4 @@ -From 825a67827cc7546b538de736ccb349926803eb0a Mon Sep 17 00:00:00 2001 +From 3017006a56470c5e4cc273b3189fc6e12557d5a5 Mon Sep 17 00:00:00 2001 From: Alexander Graf Date: Fri, 30 Sep 2011 19:40:36 +0200 Subject: [PATCH] linux-user: add binfmt wrapper for argv[0] handling diff --git a/0012-PPC-KVM-Disable-mmu-notifier-check.patch b/0012-PPC-KVM-Disable-mmu-notifier-check.patch index 5d40897..9b8adaa 100644 --- a/0012-PPC-KVM-Disable-mmu-notifier-check.patch +++ b/0012-PPC-KVM-Disable-mmu-notifier-check.patch @@ -1,4 +1,4 @@ -From bf5f6764c515fa8bf60937ef3db0a550c4c622ba Mon Sep 17 00:00:00 2001 +From c362d4d7e4337bd4a1fcf1f5c6143e09e9bbdb61 Mon Sep 17 00:00:00 2001 From: Alexander Graf 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 f46e596..fc2073b 100644 +index c4f9036..52232dc 100644 --- a/exec.c +++ b/exec.c @@ -1242,11 +1242,13 @@ static void *file_ram_alloc(RAMBlock *block, diff --git a/0013-linux-user-fix-segfault-deadlock.patch b/0013-linux-user-fix-segfault-deadlock.patch index cebee16..2e5f499 100644 --- a/0013-linux-user-fix-segfault-deadlock.patch +++ b/0013-linux-user-fix-segfault-deadlock.patch @@ -1,4 +1,4 @@ -From ea757d5a85a7e218d34f95f21923dfa979d52fa2 Mon Sep 17 00:00:00 2001 +From 0c366b537171e56990a88570ab9fa3ccfab85f82 Mon Sep 17 00:00:00 2001 From: Alexander Graf Date: Fri, 13 Jan 2012 17:05:41 +0100 Subject: [PATCH] linux-user: fix segfault deadlock diff --git a/0014-linux-user-binfmt-support-host-bina.patch b/0014-linux-user-binfmt-support-host-bina.patch index 22eca61..cfa5ed9 100644 --- a/0014-linux-user-binfmt-support-host-bina.patch +++ b/0014-linux-user-binfmt-support-host-bina.patch @@ -1,4 +1,4 @@ -From 113df7dc50d8b973347bf1b1c38437b455f3d431 Mon Sep 17 00:00:00 2001 +From 9ad6846ed12aff64816568b2b906caf64186be0c Mon Sep 17 00:00:00 2001 From: Alexander Graf Date: Thu, 2 Feb 2012 18:02:33 +0100 Subject: [PATCH] linux-user: binfmt: support host binaries diff --git a/0015-linux-user-Ignore-broken-loop-ioctl.patch b/0015-linux-user-Ignore-broken-loop-ioctl.patch index 9e3d272..566506d 100644 --- a/0015-linux-user-Ignore-broken-loop-ioctl.patch +++ b/0015-linux-user-Ignore-broken-loop-ioctl.patch @@ -1,4 +1,4 @@ -From 492281e8992a45e83c58f65dc977415b547e5898 Mon Sep 17 00:00:00 2001 +From 47c09c52eeba52e67e2e60b8e2a920f182de8144 Mon Sep 17 00:00:00 2001 From: Alexander Graf Date: Tue, 12 Jun 2012 04:41:10 +0200 Subject: [PATCH] linux-user: Ignore broken loop ioctl diff --git a/0016-linux-user-lock-tcg.patch b/0016-linux-user-lock-tcg.patch index 885f45c..36c3d5c 100644 --- a/0016-linux-user-lock-tcg.patch +++ b/0016-linux-user-lock-tcg.patch @@ -1,4 +1,4 @@ -From 35d1d48a4dd871b0c77c785f7ccb6e8c5e7f6de8 Mon Sep 17 00:00:00 2001 +From 7b4e229d286e5c4081a78d55bbab068a17fddcbf Mon Sep 17 00:00:00 2001 From: Alexander Graf Date: Thu, 5 Jul 2012 17:31:39 +0200 Subject: [PATCH] linux-user: lock tcg @@ -49,10 +49,10 @@ index 671889b..b85905c 100644 } diff --git a/tcg/tcg.c b/tcg/tcg.c -index b46bf1a..aed34d1 100644 +index 796addd..8c511bf 100644 --- a/tcg/tcg.c +++ b/tcg/tcg.c -@@ -39,6 +39,8 @@ +@@ -34,6 +34,8 @@ #include "qemu/cutils.h" #include "qemu/host-utils.h" #include "qemu/timer.h" @@ -61,7 +61,7 @@ index b46bf1a..aed34d1 100644 /* Note: the long term plan is to reduce the dependencies on the QEMU CPU definitions. Currently they are used for qemu_ld/st -@@ -119,6 +121,29 @@ static bool tcg_out_tb_finalize(TCGContext *s); +@@ -114,6 +116,29 @@ static bool tcg_out_tb_finalize(TCGContext *s); static TCGRegSet tcg_target_available_regs[2]; static TCGRegSet tcg_target_call_clobber_regs; @@ -91,7 +91,7 @@ index b46bf1a..aed34d1 100644 #if TCG_TARGET_INSN_UNIT_SIZE == 1 static __attribute__((unused)) inline void tcg_out8(TCGContext *s, uint8_t v) { -@@ -331,7 +356,8 @@ void tcg_context_init(TCGContext *s) +@@ -326,7 +351,8 @@ void tcg_context_init(TCGContext *s) memset(s, 0, sizeof(*s)); s->nb_globals = 0; @@ -101,7 +101,7 @@ index b46bf1a..aed34d1 100644 /* Count total number of arguments and allocate the corresponding space */ total_args = 0; -@@ -2358,6 +2384,7 @@ int tcg_gen_code(TCGContext *s, TranslationBlock *tb) +@@ -2353,6 +2379,7 @@ int tcg_gen_code(TCGContext *s, TranslationBlock *tb) qemu_log("\n"); } #endif @@ -109,7 +109,7 @@ index b46bf1a..aed34d1 100644 #ifdef CONFIG_PROFILER s->opt_time -= profile_getclock(); -@@ -2462,6 +2489,7 @@ int tcg_gen_code(TCGContext *s, TranslationBlock *tb) +@@ -2457,6 +2484,7 @@ int tcg_gen_code(TCGContext *s, TranslationBlock *tb) the buffer completely. Thus we can test for overflow after generating code without having to check during generation. */ if (unlikely((void *)s->code_ptr > s->code_gen_highwater)) { @@ -117,7 +117,7 @@ index b46bf1a..aed34d1 100644 return -1; } } -@@ -2475,6 +2503,7 @@ int tcg_gen_code(TCGContext *s, TranslationBlock *tb) +@@ -2470,6 +2498,7 @@ int tcg_gen_code(TCGContext *s, TranslationBlock *tb) /* flush instruction cache */ flush_icache_range((uintptr_t)s->code_buf, (uintptr_t)s->code_ptr); diff --git a/0017-linux-user-Run-multi-threaded-code-.patch b/0017-linux-user-Run-multi-threaded-code-.patch index 60fac32..1695fc7 100644 --- a/0017-linux-user-Run-multi-threaded-code-.patch +++ b/0017-linux-user-Run-multi-threaded-code-.patch @@ -1,4 +1,4 @@ -From 259ab3bbe5c7cb51258ab1a4f7d1e1a8bbd4678e Mon Sep 17 00:00:00 2001 +From 52a87acece5dc608eb05cfe35368e6dcb63ed21c Mon Sep 17 00:00:00 2001 From: Alexander Graf Date: Tue, 10 Jul 2012 20:40:55 +0200 Subject: [PATCH] linux-user: Run multi-threaded code on a single core diff --git a/0018-linux-user-lock-tb-flushing-too.patch b/0018-linux-user-lock-tb-flushing-too.patch index bcb0b47..62eb1e9 100644 --- a/0018-linux-user-lock-tb-flushing-too.patch +++ b/0018-linux-user-lock-tb-flushing-too.patch @@ -1,4 +1,4 @@ -From 88a56d7effef51c4f98fa0be1dd0f98ffe59c42f Mon Sep 17 00:00:00 2001 +From 59fee72689eddc2ada6307ed855828bb762b4a8c Mon Sep 17 00:00:00 2001 From: Alexander Graf Date: Wed, 11 Jul 2012 16:47:42 +0200 Subject: [PATCH] linux-user: lock tb flushing too @@ -15,7 +15,7 @@ Signed-off-by: Andreas Färber 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/translate-all.c b/translate-all.c -index b4df1ec..747ebd0 100644 +index 8329ea6..12a48c2 100644 --- a/translate-all.c +++ b/translate-all.c @@ -761,17 +761,21 @@ static TranslationBlock *tb_alloc(target_ulong pc) @@ -64,7 +64,7 @@ index b4df1ec..747ebd0 100644 } #ifdef DEBUG_TB_CHECK -@@ -1207,8 +1214,10 @@ void tb_invalidate_phys_page_range(tb_page_addr_t start, tb_page_addr_t end, +@@ -1208,8 +1215,10 @@ void tb_invalidate_phys_page_range(tb_page_addr_t start, tb_page_addr_t end, int current_flags = 0; #endif /* TARGET_HAS_PRECISE_SMC */ @@ -75,7 +75,7 @@ index b4df1ec..747ebd0 100644 return; } #if defined(TARGET_HAS_PRECISE_SMC) -@@ -1293,6 +1302,7 @@ void tb_invalidate_phys_page_range(tb_page_addr_t start, tb_page_addr_t end, +@@ -1294,6 +1303,7 @@ void tb_invalidate_phys_page_range(tb_page_addr_t start, tb_page_addr_t end, cpu_resume_from_signal(cpu, NULL); } #endif @@ -83,7 +83,7 @@ index b4df1ec..747ebd0 100644 } /* len must be <= 8 and start must be a multiple of len */ -@@ -1510,13 +1520,16 @@ static TranslationBlock *tb_find_pc(uintptr_t tc_ptr) +@@ -1511,13 +1521,16 @@ static TranslationBlock *tb_find_pc(uintptr_t tc_ptr) { int m_min, m_max, m; uintptr_t v; @@ -101,7 +101,7 @@ index b4df1ec..747ebd0 100644 return NULL; } /* binary search (cf Knuth) */ -@@ -1527,6 +1540,7 @@ static TranslationBlock *tb_find_pc(uintptr_t tc_ptr) +@@ -1528,6 +1541,7 @@ static TranslationBlock *tb_find_pc(uintptr_t tc_ptr) tb = &tcg_ctx.tb_ctx.tbs[m]; v = (uintptr_t)tb->tc_ptr; if (v == tc_ptr) { @@ -109,7 +109,7 @@ index b4df1ec..747ebd0 100644 return tb; } else if (tc_ptr < v) { m_max = m - 1; -@@ -1534,7 +1548,9 @@ static TranslationBlock *tb_find_pc(uintptr_t tc_ptr) +@@ -1535,7 +1549,9 @@ static TranslationBlock *tb_find_pc(uintptr_t tc_ptr) m_min = m + 1; } } diff --git a/0019-linux-user-Fake-proc-cpuinfo.patch b/0019-linux-user-Fake-proc-cpuinfo.patch index 0336745..276cfa3 100644 --- a/0019-linux-user-Fake-proc-cpuinfo.patch +++ b/0019-linux-user-Fake-proc-cpuinfo.patch @@ -1,4 +1,4 @@ -From 5f725ce31e36fe7fdef6cfb2b10418513225acbb Mon Sep 17 00:00:00 2001 +From ce9b4d41b0828783ce84fe814e5fd863cfb351ba Mon Sep 17 00:00:00 2001 From: Alexander Graf Date: Mon, 23 Jul 2012 10:24:14 +0200 Subject: [PATCH] linux-user: Fake /proc/cpuinfo diff --git a/0020-linux-user-implement-FS_IOC_GETFLAG.patch b/0020-linux-user-implement-FS_IOC_GETFLAG.patch index 0c9dd1e..37666ba 100644 --- a/0020-linux-user-implement-FS_IOC_GETFLAG.patch +++ b/0020-linux-user-implement-FS_IOC_GETFLAG.patch @@ -1,4 +1,4 @@ -From e5d9e56c734de021526273921f9ce7ba5b8a8b0a Mon Sep 17 00:00:00 2001 +From 66b365a0e2355febe34cf84d95251405aec6f708 Mon Sep 17 00:00:00 2001 From: Alexander Graf Date: Mon, 20 Aug 2012 00:02:52 +0200 Subject: [PATCH] linux-user: implement FS_IOC_GETFLAGS ioctl diff --git a/0021-linux-user-implement-FS_IOC_SETFLAG.patch b/0021-linux-user-implement-FS_IOC_SETFLAG.patch index 0f51171..4a3f774 100644 --- a/0021-linux-user-implement-FS_IOC_SETFLAG.patch +++ b/0021-linux-user-implement-FS_IOC_SETFLAG.patch @@ -1,4 +1,4 @@ -From cf06139ea39a52419e4a5c51b89b33a3d0f2036d Mon Sep 17 00:00:00 2001 +From 59e184c9df705e8abc72a57e89f14ebc58544768 Mon Sep 17 00:00:00 2001 From: Alexander Graf Date: Mon, 20 Aug 2012 00:07:13 +0200 Subject: [PATCH] linux-user: implement FS_IOC_SETFLAGS ioctl diff --git a/0022-linux-user-XXX-disable-fiemap.patch b/0022-linux-user-XXX-disable-fiemap.patch index 0106ac5..1d80147 100644 --- a/0022-linux-user-XXX-disable-fiemap.patch +++ b/0022-linux-user-XXX-disable-fiemap.patch @@ -1,4 +1,4 @@ -From 6b90b44583771ab6822240baf3e1d3830490cbd2 Mon Sep 17 00:00:00 2001 +From 75832d69b3684fa6222a500c9b8676629d4e1e25 Mon Sep 17 00:00:00 2001 From: Alexander Graf Date: Tue, 21 Aug 2012 14:20:40 +0200 Subject: [PATCH] linux-user: XXX disable fiemap diff --git a/0023-slirp-nooutgoing.patch b/0023-slirp-nooutgoing.patch index 08bc62a..980077e 100644 --- a/0023-slirp-nooutgoing.patch +++ b/0023-slirp-nooutgoing.patch @@ -1,4 +1,4 @@ -From 12cbdd512787707b791787b93f5c5af677d9b571 Mon Sep 17 00:00:00 2001 +From c25692dda0ab777bc1634dfbb42eae412d1fdd50 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= 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, 39 insertions(+) diff --git a/qemu-options.hx b/qemu-options.hx -index a770086..df60351 100644 +index 6106520..32b25a5 100644 --- a/qemu-options.hx +++ b/qemu-options.hx -@@ -3084,6 +3084,16 @@ Store the QEMU process PID in @var{file}. It is useful if you launch QEMU +@@ -3102,6 +3102,16 @@ Store the QEMU process PID in @var{file}. It is useful if you launch QEMU from a script. ETEXI @@ -33,10 +33,10 @@ index a770086..df60351 100644 "-singlestep always run in singlestep mode\n", QEMU_ARCH_ALL) STEXI diff --git a/slirp/socket.c b/slirp/socket.c -index b836c42..13ec0c0 100644 +index bd97b2d..6cbd829 100644 --- a/slirp/socket.c +++ b/slirp/socket.c -@@ -588,6 +588,8 @@ sorecvfrom(struct socket *so) +@@ -608,6 +608,8 @@ sorecvfrom(struct socket *so) } /* if ping packet */ } @@ -45,7 +45,7 @@ index b836c42..13ec0c0 100644 /* * sendto() a socket */ -@@ -605,6 +607,12 @@ sosendto(struct socket *so, struct mbuf *m) +@@ -625,6 +627,12 @@ sosendto(struct socket *so, struct mbuf *m) DEBUG_CALL(" sendto()ing)"); sotranslate_out(so, &addr); @@ -59,10 +59,10 @@ index b836c42..13ec0c0 100644 ret = sendto(so->s, m->m_data, m->m_len, 0, (struct sockaddr *)&addr, sizeof(addr)); diff --git a/slirp/tcp_subr.c b/slirp/tcp_subr.c -index dbfd2c6..94126bd 100644 +index 32ff452..9a3850d 100644 --- a/slirp/tcp_subr.c +++ b/slirp/tcp_subr.c -@@ -388,6 +388,8 @@ tcp_sockclosed(struct tcpcb *tp) +@@ -391,6 +391,8 @@ tcp_sockclosed(struct tcpcb *tp) * nonblocking. Connect returns after the SYN is sent, and does * not wait for ACK+SYN. */ @@ -71,7 +71,7 @@ index dbfd2c6..94126bd 100644 int tcp_fconnect(struct socket *so, unsigned short af) { int ret=0; -@@ -395,6 +397,11 @@ int tcp_fconnect(struct socket *so, unsigned short af) +@@ -398,6 +400,11 @@ int tcp_fconnect(struct socket *so, unsigned short af) DEBUG_CALL("tcp_fconnect"); DEBUG_ARG("so = %p", so); @@ -83,7 +83,7 @@ index dbfd2c6..94126bd 100644 ret = so->s = qemu_socket(af, SOCK_STREAM, 0); if (ret >= 0) { int opt, s=so->s; -@@ -475,6 +482,11 @@ void tcp_connect(struct socket *inso) +@@ -478,6 +485,11 @@ void tcp_connect(struct socket *inso) tcp_close(sototcpcb(so)); /* This will sofree() as well */ return; } @@ -96,7 +96,7 @@ index dbfd2c6..94126bd 100644 socket_set_fast_reuse(s); opt = 1; diff --git a/vl.c b/vl.c -index bd81ea9..a8f1338 100644 +index 9df534f..3c36fe9 100644 --- a/vl.c +++ b/vl.c @@ -162,6 +162,7 @@ int smp_threads = 1; @@ -107,7 +107,7 @@ index bd81ea9..a8f1338 100644 static int no_reboot; int no_shutdown = 0; int cursor_hide = 1; -@@ -3378,6 +3379,14 @@ int main(int argc, char **argv, char **envp) +@@ -3382,6 +3383,14 @@ int main(int argc, char **argv, char **envp) case QEMU_OPTION_singlestep: singlestep = 1; break; diff --git a/0024-vnc-password-file-and-incoming-conn.patch b/0024-vnc-password-file-and-incoming-conn.patch index 34d53ed..db036c4 100644 --- a/0024-vnc-password-file-and-incoming-conn.patch +++ b/0024-vnc-password-file-and-incoming-conn.patch @@ -1,4 +1,4 @@ -From 1c744e643260e5a557cbc9a6140f362ccdc6c6b3 Mon Sep 17 00:00:00 2001 +From 586df5db147b17cc8d70eff145745912a56ed7b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Wed, 29 Aug 2012 20:06:01 +0200 Subject: [PATCH] vnc: password-file= and incoming-connections= diff --git a/0025-linux-user-add-more-blk-ioctls.patch b/0025-linux-user-add-more-blk-ioctls.patch index d969292..5784c76 100644 --- a/0025-linux-user-add-more-blk-ioctls.patch +++ b/0025-linux-user-add-more-blk-ioctls.patch @@ -1,4 +1,4 @@ -From 2be5a4993f98e5a4af0d2c388eba6e08955d7e14 Mon Sep 17 00:00:00 2001 +From df3c67d7a83d9f2bc4914425c7000a08c27e686f Mon Sep 17 00:00:00 2001 From: Alexander Graf Date: Wed, 10 Oct 2012 10:21:20 +0200 Subject: [PATCH] linux-user: add more blk ioctls diff --git a/0026-linux-user-use-target_ulong.patch b/0026-linux-user-use-target_ulong.patch index fa6d204..6ceaf40 100644 --- a/0026-linux-user-use-target_ulong.patch +++ b/0026-linux-user-use-target_ulong.patch @@ -1,4 +1,4 @@ -From 90ede05e9c7502bf620bf027d660634636723407 Mon Sep 17 00:00:00 2001 +From 34a8db65f986af5c3744a5b030492fbe34b37b4d Mon Sep 17 00:00:00 2001 From: Alexander Graf Date: Tue, 9 Oct 2012 09:06:49 +0200 Subject: [PATCH] linux-user: use target_ulong diff --git a/0027-block-Add-support-for-DictZip-enabl.patch b/0027-block-Add-support-for-DictZip-enabl.patch index 2ea9ba0..cabd39c 100644 --- a/0027-block-Add-support-for-DictZip-enabl.patch +++ b/0027-block-Add-support-for-DictZip-enabl.patch @@ -1,4 +1,4 @@ -From 86ba74de946602754a7e624dd5f2be833abc50a4 Mon Sep 17 00:00:00 2001 +From c2257cd730ae7cc445118cee261600318aa0f148 Mon Sep 17 00:00:00 2001 From: Alexander Graf Date: Wed, 5 Aug 2009 09:49:37 +0200 Subject: [PATCH] block: Add support for DictZip enabled gzip files diff --git a/0028-block-Add-tar-container-format.patch b/0028-block-Add-tar-container-format.patch index 2240a23..0ff01ee 100644 --- a/0028-block-Add-tar-container-format.patch +++ b/0028-block-Add-tar-container-format.patch @@ -1,4 +1,4 @@ -From 57fd47a937941ca3bd3762a68e6e3dad0d4992da Mon Sep 17 00:00:00 2001 +From e7f37824f310f22f81d3aa8e0643583309ea8ea7 Mon Sep 17 00:00:00 2001 From: Alexander Graf Date: Wed, 5 Aug 2009 17:28:38 +0200 Subject: [PATCH] block: Add tar container format diff --git a/0029-Legacy-Patch-kvm-qemu-preXX-dictzip.patch b/0029-Legacy-Patch-kvm-qemu-preXX-dictzip.patch index e36b108..29cfa0e 100644 --- a/0029-Legacy-Patch-kvm-qemu-preXX-dictzip.patch +++ b/0029-Legacy-Patch-kvm-qemu-preXX-dictzip.patch @@ -1,4 +1,4 @@ -From 767cd48b2238291256b2cdf7ae7ba1112b256071 Mon Sep 17 00:00:00 2001 +From 9635817a5b678f8e77e02eb9ca693a77433e3045 Mon Sep 17 00:00:00 2001 From: Alexander Graf Date: Wed, 12 Dec 2012 19:11:30 +0100 Subject: [PATCH] Legacy Patch kvm-qemu-preXX-dictzip3.patch diff --git a/0030-console-add-question-mark-escape-op.patch b/0030-console-add-question-mark-escape-op.patch index b4bf4da..b68ed01 100644 --- a/0030-console-add-question-mark-escape-op.patch +++ b/0030-console-add-question-mark-escape-op.patch @@ -1,4 +1,4 @@ -From e4f5122f79d8570c5e6e42b4207ae1b761e48901 Mon Sep 17 00:00:00 2001 +From a42dd03acbea98cbf11f841a78ddf7830fd6d783 Mon Sep 17 00:00:00 2001 From: Alexander Graf 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 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/console.c b/ui/console.c -index 1fd4ea4..fd3254a 100644 +index bf38579..0c1b4a3 100644 --- a/ui/console.c +++ b/ui/console.c @@ -868,7 +868,7 @@ static void console_putchar(QemuConsole *s, int ch) diff --git a/0031-Make-char-muxer-more-robust-wrt-sma.patch b/0031-Make-char-muxer-more-robust-wrt-sma.patch index 180cf8a..1193dca 100644 --- a/0031-Make-char-muxer-more-robust-wrt-sma.patch +++ b/0031-Make-char-muxer-more-robust-wrt-sma.patch @@ -1,4 +1,4 @@ -From c744f774b8399d42063b206a6f52a2450f6d7ed1 Mon Sep 17 00:00:00 2001 +From feca29c048619c102c385e2150a67c62d78435eb Mon Sep 17 00:00:00 2001 From: Alexander Graf 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 270819a..4a550c1 100644 +index b597ee1..eedae4f 100644 --- a/qemu-char.c +++ b/qemu-char.c @@ -512,6 +512,9 @@ typedef struct { diff --git a/0032-linux-user-lseek-explicitly-cast-no.patch b/0032-linux-user-lseek-explicitly-cast-no.patch index fe12fc5..c4371ff 100644 --- a/0032-linux-user-lseek-explicitly-cast-no.patch +++ b/0032-linux-user-lseek-explicitly-cast-no.patch @@ -1,4 +1,4 @@ -From 559e01a1b23a661ba9bf9da313018059e06d727a Mon Sep 17 00:00:00 2001 +From 6d422ead57671b98efbee2da0b3a606de976b8f5 Mon Sep 17 00:00:00 2001 From: Alexander Graf Date: Thu, 13 Dec 2012 14:29:22 +0100 Subject: [PATCH] linux-user: lseek: explicitly cast non-set offsets to signed diff --git a/0033-virtfs-proxy-helper-Provide-__u64-f.patch b/0033-virtfs-proxy-helper-Provide-__u64-f.patch index a8560c4..ae8d56e 100644 --- a/0033-virtfs-proxy-helper-Provide-__u64-f.patch +++ b/0033-virtfs-proxy-helper-Provide-__u64-f.patch @@ -1,4 +1,4 @@ -From 9327ff8f826f2edfe6f06f710155f7ed78d0f120 Mon Sep 17 00:00:00 2001 +From 09a9fc2bd1066ed9b5ddbeb4f975461bd93a7b57 Mon Sep 17 00:00:00 2001 From: Bruce Rogers Date: Thu, 16 May 2013 12:39:10 +0200 Subject: [PATCH] virtfs-proxy-helper: Provide __u64 for broken diff --git a/0034-configure-Enable-PIE-for-ppc-and-pp.patch b/0034-configure-Enable-PIE-for-ppc-and-pp.patch index 76767db..dd47b02 100644 --- a/0034-configure-Enable-PIE-for-ppc-and-pp.patch +++ b/0034-configure-Enable-PIE-for-ppc-and-pp.patch @@ -1,4 +1,4 @@ -From 85122b0b5a7da0999de9f49d2fbce71c53a936ab Mon Sep 17 00:00:00 2001 +From 5676fd4e9e421b4400124629916d8e761c62d00d Mon Sep 17 00:00:00 2001 From: Dinar Valeev 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 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure b/configure -index 5db29f0..0df3fc0 100755 +index ab54f3c..f8b8391 100755 --- a/configure +++ b/configure -@@ -1536,7 +1536,7 @@ fi +@@ -1537,7 +1537,7 @@ fi if test "$pie" = ""; then case "$cpu-$targetos" in diff --git a/0035-qtest-Increase-socket-timeout.patch b/0035-qtest-Increase-socket-timeout.patch index 117021a..7ff4cf3 100644 --- a/0035-qtest-Increase-socket-timeout.patch +++ b/0035-qtest-Increase-socket-timeout.patch @@ -1,4 +1,4 @@ -From 9cbbe949157593297780361313478da4690bc35d Mon Sep 17 00:00:00 2001 +From 79c0f63ce2a8ebfb9a32fd05845ec439756c6a86 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Thu, 17 Apr 2014 18:39:10 +0200 Subject: [PATCH] qtest: Increase socket timeout diff --git a/0036-AIO-Reduce-number-of-threads-for-32.patch b/0036-AIO-Reduce-number-of-threads-for-32.patch index c126d16..b17e9b7 100644 --- a/0036-AIO-Reduce-number-of-threads-for-32.patch +++ b/0036-AIO-Reduce-number-of-threads-for-32.patch @@ -1,4 +1,4 @@ -From f3e402fec7044aa773f5f6ced1381d6eed7ed2ca Mon Sep 17 00:00:00 2001 +From 8afc9f3a0bac1b63c6cf1da4e1abb680bd3127e6 Mon Sep 17 00:00:00 2001 From: Alexander Graf Date: Wed, 14 Jan 2015 01:32:11 +0100 Subject: [PATCH] AIO: Reduce number of threads for 32bit hosts diff --git a/0037-configure-Enable-libseccomp-for-ppc.patch b/0037-configure-Enable-libseccomp-for-ppc.patch index 94d839d..62106d4 100644 --- a/0037-configure-Enable-libseccomp-for-ppc.patch +++ b/0037-configure-Enable-libseccomp-for-ppc.patch @@ -1,4 +1,4 @@ -From dca270d601b43fe181da48f6b38b63f485634705 Mon Sep 17 00:00:00 2001 +From de7e0973fc8fe7f097999135fcb65b0a830a1eff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Tue, 14 Apr 2015 18:42:06 +0200 Subject: [PATCH] configure: Enable libseccomp for ppc @@ -14,10 +14,10 @@ Signed-off-by: Andreas Färber 1 file changed, 3 insertions(+) diff --git a/configure b/configure -index 0df3fc0..81caff6 100755 +index f8b8391..593e865 100755 --- a/configure +++ b/configure -@@ -1875,6 +1875,9 @@ if test "$seccomp" != "no" ; then +@@ -1879,6 +1879,9 @@ if test "$seccomp" != "no" ; then arm|aarch64) libseccomp_minver="2.2.3" ;; diff --git a/0038-dictzip-Fix-on-big-endian-systems.patch b/0038-dictzip-Fix-on-big-endian-systems.patch index 886afd8..0a8eb4f 100644 --- a/0038-dictzip-Fix-on-big-endian-systems.patch +++ b/0038-dictzip-Fix-on-big-endian-systems.patch @@ -1,4 +1,4 @@ -From 368cb4908724b4e855cb9bda37cb04284a39b116 Mon Sep 17 00:00:00 2001 +From cce7d2ee8a4d6dd434b7a28a9edd59ff504b53ae Mon Sep 17 00:00:00 2001 From: Alexander Graf Date: Mon, 15 Jun 2015 17:36:32 +0200 Subject: [PATCH] dictzip: Fix on big endian systems diff --git a/0039-block-split-large-discard-requests-.patch b/0039-block-split-large-discard-requests-.patch index 79bccb4..57247a9 100644 --- a/0039-block-split-large-discard-requests-.patch +++ b/0039-block-split-large-discard-requests-.patch @@ -1,4 +1,4 @@ -From 88f6de6e8b1f91c71e56fa8125cc6fae2b53e725 Mon Sep 17 00:00:00 2001 +From 328eda4d196550c8dab103cd9ff7a45888834111 Mon Sep 17 00:00:00 2001 From: Olaf Hering Date: Thu, 24 Mar 2016 14:32:39 +0100 Subject: [PATCH] block: split large discard requests from block frontend @@ -15,10 +15,10 @@ Signed-off-by: Olaf Hering 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/block/io.c b/block/io.c -index c4869b9..5b6ed58 100644 +index a7dbf85..560fa4c 100644 --- a/block/io.c +++ b/block/io.c -@@ -2442,7 +2442,7 @@ static void coroutine_fn bdrv_discard_co_entry(void *opaque) +@@ -2487,7 +2487,7 @@ static void coroutine_fn bdrv_discard_co_entry(void *opaque) rwco->ret = bdrv_co_discard(rwco->bs, rwco->sector_num, rwco->nb_sectors); } @@ -27,7 +27,7 @@ index c4869b9..5b6ed58 100644 int nb_sectors) { BdrvTrackedRequest req; -@@ -2524,6 +2524,26 @@ out: +@@ -2569,6 +2569,26 @@ out: return ret; } diff --git a/0040-xen_disk-Add-suse-specific-flush-di.patch b/0040-xen_disk-Add-suse-specific-flush-di.patch index f4ff691..370af37 100644 --- a/0040-xen_disk-Add-suse-specific-flush-di.patch +++ b/0040-xen_disk-Add-suse-specific-flush-di.patch @@ -1,4 +1,4 @@ -From 60d2b636c7dda2b2161ea963836b91b4af47021a Mon Sep 17 00:00:00 2001 +From 903848e6ee598edb5303a8ad8bea38aee0eb5883 Mon Sep 17 00:00:00 2001 From: Bruce Rogers Date: Wed, 9 Mar 2016 15:18:11 -0700 Subject: [PATCH] xen_disk: Add suse specific flush disable handling and map to diff --git a/0042-build-link-with-libatomic-on-powerp.patch b/0041-build-link-with-libatomic-on-powerp.patch similarity index 89% rename from 0042-build-link-with-libatomic-on-powerp.patch rename to 0041-build-link-with-libatomic-on-powerp.patch index 7b899d4..34c9f10 100644 --- a/0042-build-link-with-libatomic-on-powerp.patch +++ b/0041-build-link-with-libatomic-on-powerp.patch @@ -1,4 +1,4 @@ -From 014f615b4a8e48ab8b9630b297e1e4283c9de623 Mon Sep 17 00:00:00 2001 +From 7e1f77646a047c0c160274c2c6bf5440ea1856d2 Mon Sep 17 00:00:00 2001 From: Olaf Hering Date: Fri, 1 Apr 2016 12:27:16 +0200 Subject: [PATCH] build: link with libatomic on powerpc-linux @@ -14,10 +14,10 @@ Signed-off-by: Olaf Hering 1 file changed, 27 insertions(+) diff --git a/configure b/configure -index 81caff6..2589044 100755 +index 593e865..478631e 100755 --- a/configure +++ b/configure -@@ -4025,6 +4025,33 @@ if test "$usb_redir" != "no" ; then +@@ -4032,6 +4032,33 @@ if test "$usb_redir" != "no" ; then fi fi diff --git a/0041-tests-Use-correct-config-param-for-.patch b/0041-tests-Use-correct-config-param-for-.patch deleted file mode 100644 index 998afab..0000000 --- a/0041-tests-Use-correct-config-param-for-.patch +++ /dev/null @@ -1,27 +0,0 @@ -From e226abc9168f54fb53edcc1537ce77fc92b9ff26 Mon Sep 17 00:00:00 2001 -From: Bruce Rogers -Date: Thu, 31 Mar 2016 06:43:03 -0600 -Subject: [PATCH] tests: Use correct config param for inclusion of - test-crypto-pbkdf test - -It appears we have the wrong criteria for inclusion of the test-crypto-pbkdf -test. Fix to use CONFIG_NETTLE_KDF instead of CONFIG_NETTLE. - -Signed-off-by: Bruce Rogers ---- - tests/Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tests/Makefile b/tests/Makefile -index 45b9048..651d8b2 100644 ---- a/tests/Makefile -+++ b/tests/Makefile -@@ -92,7 +92,7 @@ check-unit-$(CONFIG_GNUTLS) += tests/test-io-channel-tls$(EXESUF) - check-unit-y += tests/test-io-channel-command$(EXESUF) - check-unit-y += tests/test-io-channel-buffer$(EXESUF) - check-unit-y += tests/test-base64$(EXESUF) --check-unit-$(if $(CONFIG_NETTLE),y,$(CONFIG_GCRYPT_KDF)) += tests/test-crypto-pbkdf$(EXESUF) -+check-unit-$(if $(CONFIG_NETTLE_KDF),y,$(CONFIG_GCRYPT_KDF)) += tests/test-crypto-pbkdf$(EXESUF) - check-unit-y += tests/test-crypto-ivgen$(EXESUF) - check-unit-y += tests/test-crypto-afsplit$(EXESUF) - check-unit-y += tests/test-crypto-xts$(EXESUF) diff --git a/qemu-2.6.0-rc0.tar.bz2 b/qemu-2.6.0-rc0.tar.bz2 deleted file mode 100644 index 3b94e95..0000000 --- a/qemu-2.6.0-rc0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9eb223cb01207e8f1130f05af627e2708311db8322fec066b97d94c749c2315c -size 25761212 diff --git a/qemu-2.6.0-rc0.tar.bz2.sig b/qemu-2.6.0-rc0.tar.bz2.sig deleted file mode 100644 index d3ada81..0000000 Binary files a/qemu-2.6.0-rc0.tar.bz2.sig and /dev/null differ diff --git a/qemu-2.6.0-rc3.tar.bz2 b/qemu-2.6.0-rc3.tar.bz2 new file mode 100644 index 0000000..6ab7e65 --- /dev/null +++ b/qemu-2.6.0-rc3.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1fd2d10ef0e1775017827bd5d34c59c604a340263c9347c86ec70215d2bc36d8 +size 25790061 diff --git a/qemu-2.6.0-rc3.tar.bz2.sig b/qemu-2.6.0-rc3.tar.bz2.sig new file mode 100644 index 0000000..68a9678 Binary files /dev/null and b/qemu-2.6.0-rc3.tar.bz2.sig differ diff --git a/qemu-linux-user.changes b/qemu-linux-user.changes index c3a3fbf..f2d935a 100644 --- a/qemu-linux-user.changes +++ b/qemu-linux-user.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Fri Apr 22 16:37:37 UTC 2016 - afaerber@suse.de + +- Update to v2.6.0-rc3: See http://wiki.qemu-project.org/ChangeLog/2.6 +* Patch queue updated from git://github.com/openSUSE/qemu.git opensuse-2.6 +* Patches dropped: + 0041-tests-Use-correct-config-param-for-.patch +* Patches renamed: + 0042-build-link-with-libatomic-on-powerp.patch -> 0041-build-link-with-libatomic-on-powerp.patch + ------------------------------------------------------------------- Fri Apr 1 11:13:07 UTC 2016 - olaf@aepfle.de diff --git a/qemu-linux-user.spec b/qemu-linux-user.spec index 1b55e2f..c9ee409 100644 --- a/qemu-linux-user.spec +++ b/qemu-linux-user.spec @@ -21,9 +21,9 @@ Url: http://www.qemu.org/ Summary: Universal CPU emulator License: BSD-3-Clause and GPL-2.0 and GPL-2.0+ and LGPL-2.1+ and MIT Group: System/Emulators/PC -Version: 2.5.90 +Version: 2.5.93 Release: 0 -Source: http://wiki.qemu.org/download/qemu-2.6.0-rc0.tar.bz2 +Source: http://wiki.qemu.org/download/qemu-2.6.0-rc3.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,8 +65,7 @@ Patch0037: 0037-configure-Enable-libseccomp-for-ppc.patch Patch0038: 0038-dictzip-Fix-on-big-endian-systems.patch Patch0039: 0039-block-split-large-discard-requests-.patch Patch0040: 0040-xen_disk-Add-suse-specific-flush-di.patch -Patch0041: 0041-tests-Use-correct-config-param-for-.patch -Patch0042: 0042-build-link-with-libatomic-on-powerp.patch +Patch0041: 0041-build-link-with-libatomic-on-powerp.patch # Please do not add patches manually here, run update_git.sh. # this is to make lint happy Source300: qemu-rpmlintrc @@ -119,7 +118,7 @@ emulations. This can be used together with the OBS build script to run cross-architecture builds. %prep -%setup -q -n qemu-2.6.0-rc0 +%setup -q -n qemu-2.6.0-rc3 %patch0001 -p1 %patch0002 -p1 %patch0003 -p1 @@ -161,7 +160,6 @@ run cross-architecture builds. %patch0039 -p1 %patch0040 -p1 %patch0041 -p1 -%patch0042 -p1 %build ./configure --prefix=%_prefix --sysconfdir=%_sysconfdir \ diff --git a/qemu-linux-user.spec.in b/qemu-linux-user.spec.in index 4349513..c19a927 100644 --- a/qemu-linux-user.spec.in +++ b/qemu-linux-user.spec.in @@ -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.6.0-rc0.tar.bz2 +Source: http://wiki.qemu.org/download/qemu-2.6.0-rc3.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.6.0-rc0 +%setup -q -n qemu-2.6.0-rc3 PATCH_EXEC %build diff --git a/qemu-testsuite.changes b/qemu-testsuite.changes index 216ea40..92e93ea 100644 --- a/qemu-testsuite.changes +++ b/qemu-testsuite.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Fri Apr 22 16:37:33 UTC 2016 - afaerber@suse.de + +- Update to v2.6.0-rc3: See http://wiki.qemu-project.org/ChangeLog/2.6 +* Patch queue updated from git://github.com/openSUSE/qemu.git opensuse-2.6 +* Patches dropped (upstreamed): + 0041-tests-Use-correct-config-param-for-.patch +* Patches renamed: + 0042-build-link-with-libatomic-on-powerp.patch -> 0041-build-link-with-libatomic-on-powerp.patch + ------------------------------------------------------------------- Wed Apr 20 16:38:00 UTC 2016 - afaerber@suse.de diff --git a/qemu-testsuite.spec b/qemu-testsuite.spec index 079c675..2b28862 100644 --- a/qemu-testsuite.spec +++ b/qemu-testsuite.spec @@ -51,10 +51,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.5.90 +Version: 2.5.93 Release: 0 -Source: http://wiki.qemu.org/download/qemu-2.6.0-rc0.tar.bz2 -Source99: http://wiki.qemu.org/download/qemu-2.6.0-rc0.tar.bz2.sig +Source: http://wiki.qemu.org/download/qemu-2.6.0-rc3.tar.bz2 +Source99: http://wiki.qemu.org/download/qemu-2.6.0-rc3.tar.bz2.sig Source1: 80-kvm.rules Source2: qemu-ifup Source3: kvm_stat @@ -106,8 +106,7 @@ Patch0037: 0037-configure-Enable-libseccomp-for-ppc.patch Patch0038: 0038-dictzip-Fix-on-big-endian-systems.patch Patch0039: 0039-block-split-large-discard-requests-.patch Patch0040: 0040-xen_disk-Add-suse-specific-flush-di.patch -Patch0041: 0041-tests-Use-correct-config-param-for-.patch -Patch0042: 0042-build-link-with-libatomic-on-powerp.patch +Patch0041: 0041-build-link-with-libatomic-on-powerp.patch # Please do not add QEMU patches manually here. # Run update_git.sh to regenerate this queue. @@ -590,7 +589,7 @@ This package provides a service file for starting and stopping KSM. %endif # !qemu-testsuite %prep -%setup -q -n qemu-2.6.0-rc0 +%setup -q -n qemu-2.6.0-rc3 %patch0001 -p1 %patch0002 -p1 %patch0003 -p1 @@ -632,7 +631,6 @@ This package provides a service file for starting and stopping KSM. %patch0039 -p1 %patch0040 -p1 %patch0041 -p1 -%patch0042 -p1 %if %{build_x86_fw_from_source} pushd roms/seabios diff --git a/qemu.changes b/qemu.changes index 216ea40..92e93ea 100644 --- a/qemu.changes +++ b/qemu.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Fri Apr 22 16:37:33 UTC 2016 - afaerber@suse.de + +- Update to v2.6.0-rc3: See http://wiki.qemu-project.org/ChangeLog/2.6 +* Patch queue updated from git://github.com/openSUSE/qemu.git opensuse-2.6 +* Patches dropped (upstreamed): + 0041-tests-Use-correct-config-param-for-.patch +* Patches renamed: + 0042-build-link-with-libatomic-on-powerp.patch -> 0041-build-link-with-libatomic-on-powerp.patch + ------------------------------------------------------------------- Wed Apr 20 16:38:00 UTC 2016 - afaerber@suse.de diff --git a/qemu.spec b/qemu.spec index 911d55f..f00d4ad 100644 --- a/qemu.spec +++ b/qemu.spec @@ -51,10 +51,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.5.90 +Version: 2.5.93 Release: 0 -Source: http://wiki.qemu.org/download/qemu-2.6.0-rc0.tar.bz2 -Source99: http://wiki.qemu.org/download/qemu-2.6.0-rc0.tar.bz2.sig +Source: http://wiki.qemu.org/download/qemu-2.6.0-rc3.tar.bz2 +Source99: http://wiki.qemu.org/download/qemu-2.6.0-rc3.tar.bz2.sig Source1: 80-kvm.rules Source2: qemu-ifup Source3: kvm_stat @@ -106,8 +106,7 @@ Patch0037: 0037-configure-Enable-libseccomp-for-ppc.patch Patch0038: 0038-dictzip-Fix-on-big-endian-systems.patch Patch0039: 0039-block-split-large-discard-requests-.patch Patch0040: 0040-xen_disk-Add-suse-specific-flush-di.patch -Patch0041: 0041-tests-Use-correct-config-param-for-.patch -Patch0042: 0042-build-link-with-libatomic-on-powerp.patch +Patch0041: 0041-build-link-with-libatomic-on-powerp.patch # Please do not add QEMU patches manually here. # Run update_git.sh to regenerate this queue. @@ -590,7 +589,7 @@ This package provides a service file for starting and stopping KSM. %endif # !qemu-testsuite %prep -%setup -q -n qemu-2.6.0-rc0 +%setup -q -n qemu-2.6.0-rc3 %patch0001 -p1 %patch0002 -p1 %patch0003 -p1 @@ -632,7 +631,6 @@ This package provides a service file for starting and stopping KSM. %patch0039 -p1 %patch0040 -p1 %patch0041 -p1 -%patch0042 -p1 %if %{build_x86_fw_from_source} pushd roms/seabios diff --git a/qemu.spec.in b/qemu.spec.in index 800288a..9ceec30 100644 --- a/qemu.spec.in +++ b/qemu.spec.in @@ -53,8 +53,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.6.0-rc0.tar.bz2 -Source99: http://wiki.qemu.org/download/qemu-2.6.0-rc0.tar.bz2.sig +Source: http://wiki.qemu.org/download/qemu-2.6.0-rc3.tar.bz2 +Source99: http://wiki.qemu.org/download/qemu-2.6.0-rc3.tar.bz2.sig Source1: 80-kvm.rules Source2: qemu-ifup Source3: kvm_stat @@ -549,7 +549,7 @@ This package provides a service file for starting and stopping KSM. %endif # !qemu-testsuite %prep -%setup -q -n qemu-2.6.0-rc0 +%setup -q -n qemu-2.6.0-rc3 PATCH_EXEC %if %{build_x86_fw_from_source} diff --git a/update_git.sh b/update_git.sh index c8ddfb6..2db5520 100644 --- a/update_git.sh +++ b/update_git.sh @@ -1,4 +1,4 @@ -#!/bin/bash -e +#!/bin/bash # # Instead of a quilt workflow, we use a git tree that contains # all the commits on top of a stable tarball. @@ -9,10 +9,12 @@ # That way we can easily rebase against the next stable release # when it comes. +set -e + GIT_TREE=git://github.com/openSUSE/qemu.git GIT_LOCAL_TREE=~/git/qemu-opensuse GIT_BRANCH=opensuse-2.6 -GIT_UPSTREAM_TAG=v2.6.0-rc0 +GIT_UPSTREAM_TAG=v2.6.0-rc3 GIT_DIR=/dev/shm/qemu-factory-git-dir CMP_DIR=/dev/shm/qemu-factory-cmp-dir