diff --git a/0001-XXX-dont-dump-core-on-sigabort.patch b/0001-XXX-dont-dump-core-on-sigabort.patch index c9677724..01d7b5bf 100644 --- a/0001-XXX-dont-dump-core-on-sigabort.patch +++ b/0001-XXX-dont-dump-core-on-sigabort.patch @@ -1,4 +1,4 @@ -From d8e4a08b170081417c17700d2e6c8b671d28f147 Mon Sep 17 00:00:00 2001 +From 9d12fa380ea51761fa5ebbbdc0d0f35857386b1f 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 b7b07085..ec363a2c 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 6e1a8104187462b58f198e10d8bfeb83c28843e2 Mon Sep 17 00:00:00 2001 +From 22405b72847554fc6b6bdbd638c268ace80d7ce6 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) diff --git a/0003-qemu-0.9.0.cvs-binfmt.patch b/0003-qemu-0.9.0.cvs-binfmt.patch index 45abf1e5..5d2b610f 100644 --- a/0003-qemu-0.9.0.cvs-binfmt.patch +++ b/0003-qemu-0.9.0.cvs-binfmt.patch @@ -1,4 +1,4 @@ -From 4a0043142e4070577c527127e37f8089f106ab86 Mon Sep 17 00:00:00 2001 +From 1e506ce87e3b551204e7c8556744cf8cfa92cb85 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 d8444757..98f89c3a 100644 --- a/0004-qemu-cvs-alsa_bitfield.patch +++ b/0004-qemu-cvs-alsa_bitfield.patch @@ -1,4 +1,4 @@ -From 9d1c64649cd88fa69584d7e0d7a1cadbba6f5cdb Mon Sep 17 00:00:00 2001 +From a04ffd68a5b5b199ea541c9da5fc3859d93c3818 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 f8530224..0399d653 100644 --- a/0005-qemu-cvs-alsa_ioctl.patch +++ b/0005-qemu-cvs-alsa_ioctl.patch @@ -1,4 +1,4 @@ -From 4024c561d3dbaec57af394a24f7a2ac0c126aa84 Mon Sep 17 00:00:00 2001 +From a378ff5370f6042713599a80a9abf60911c3b663 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 73b0a593..3ce5a2a6 100644 --- a/0006-qemu-cvs-alsa_mmap.patch +++ b/0006-qemu-cvs-alsa_mmap.patch @@ -1,4 +1,4 @@ -From fe1f8ed0fc7bf19bb25ee0d9ac3db94e1263bc0b Mon Sep 17 00:00:00 2001 +From 9054622c8f9f227773bc32403859e0072a1630a1 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 aa089aeb..5b1dd13c 100644 --- a/0007-qemu-cvs-gettimeofday.patch +++ b/0007-qemu-cvs-gettimeofday.patch @@ -1,4 +1,4 @@ -From 4566701ac911b84fb54399e85e9698e3855ef76d Mon Sep 17 00:00:00 2001 +From 6433c7791241a69fb875e9612f8ebd181ad1b2a8 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 2a6636ee..0cce024b 100644 --- a/0008-qemu-cvs-ioctl_debug.patch +++ b/0008-qemu-cvs-ioctl_debug.patch @@ -1,4 +1,4 @@ -From 37000c31d5975ea6cdacb8cd98b48c476597518c Mon Sep 17 00:00:00 2001 +From 2cfde90a43d75901198213a1620c44b62b915a48 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 9a59f98d..7feeee92 100644 --- a/0009-qemu-cvs-ioctl_nodirection.patch +++ b/0009-qemu-cvs-ioctl_nodirection.patch @@ -1,4 +1,4 @@ -From 729167ca9a62beda6d657e7368144f58ad004968 Mon Sep 17 00:00:00 2001 +From 5d65a63a5305e42187bb61595bd34ce67916e00b 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 d5940af9..96d26854 100644 --- a/0010-block-vmdk-Support-creation-of-SCSI.patch +++ b/0010-block-vmdk-Support-creation-of-SCSI.patch @@ -1,4 +1,4 @@ -From dbe5cadd67745ed4116d49c3987c847bc9bf450c Mon Sep 17 00:00:00 2001 +From a11d2097bce7374843220a31c94186a73b1aa969 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 3e252a2..c09f6df 100644 +index 8cf519b..0e23958 100644 --- a/block.c +++ b/block.c -@@ -5611,6 +5611,9 @@ void bdrv_img_create(const char *filename, const char *fmt, +@@ -5624,6 +5624,9 @@ void bdrv_img_create(const char *filename, const char *fmt, if (!quiet) { printf("Formatting '%s', fmt=%s ", filename, fmt); qemu_opts_print(opts); @@ -35,10 +35,10 @@ index 3e252a2..c09f6df 100644 } diff --git a/block/vmdk.c b/block/vmdk.c -index 27a78da..b26fdb2 100644 +index 0517bba..3eeb7bd 100644 --- a/block/vmdk.c +++ b/block/vmdk.c -@@ -1754,9 +1754,12 @@ static int vmdk_create(const char *filename, QemuOpts *opts, Error **errp) +@@ -1752,9 +1752,12 @@ static int vmdk_create(const char *filename, QemuOpts *opts, Error **errp) if (qemu_opt_get_bool_del(opts, BLOCK_OPT_ZEROED_GRAIN, false)) { zeroed_grain = true; } @@ -52,7 +52,7 @@ index 27a78da..b26fdb2 100644 } else if (strcmp(adapter_type, "ide") && strcmp(adapter_type, "buslogic") && strcmp(adapter_type, "lsilogic") && -@@ -2153,6 +2156,11 @@ static QemuOptsList vmdk_create_opts = { +@@ -2151,6 +2154,11 @@ static QemuOptsList vmdk_create_opts = { .help = "Enable efficient zero writes " "using the zeroed-grain GTE feature" }, @@ -65,7 +65,7 @@ index 27a78da..b26fdb2 100644 } }; diff --git a/include/block/block_int.h b/include/block/block_int.h -index f6c3bef..138c102 100644 +index 7b541a0..a4e1a97 100644 --- a/include/block/block_int.h +++ b/include/block/block_int.h @@ -40,10 +40,12 @@ @@ -82,10 +82,10 @@ index f6c3bef..138c102 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 c98896b..1608434 100644 +index d4518e7..629cd80 100644 --- a/qemu-img.c +++ b/qemu-img.c -@@ -1431,6 +1431,13 @@ static int img_convert(int argc, char **argv) +@@ -1430,6 +1430,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 089fe6b3..5119978d 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 10a63f0ce5025cf5d777c578ffafd70ebbef495d Mon Sep 17 00:00:00 2001 +From 7e3816a7a96dc7fa2f699b1929a027f9587b110d 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 23d3e4ed..5d39f473 100644 --- a/0012-PPC-KVM-Disable-mmu-notifier-check.patch +++ b/0012-PPC-KVM-Disable-mmu-notifier-check.patch @@ -1,4 +1,4 @@ -From 8483f3bf7b9770eff3e9a41382c36c93aba6360f Mon Sep 17 00:00:00 2001 +From 62b7da9ebf01803de3768e425ec4742269c0e0ee 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 5a2a25e..c942e6a 100644 +index 765bd94..33818c1 100644 --- a/exec.c +++ b/exec.c @@ -1037,11 +1037,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 2ec0c798..0189b46a 100644 --- a/0013-linux-user-fix-segfault-deadlock.patch +++ b/0013-linux-user-fix-segfault-deadlock.patch @@ -1,4 +1,4 @@ -From 8c7fb1aeedbdecbd2ccc0af9c21389a2a7e02b96 Mon Sep 17 00:00:00 2001 +From d4fd71138a97db96f423d44144633637f62f298a 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 5b3b528a..61ffeacd 100644 --- a/0014-linux-user-binfmt-support-host-bina.patch +++ b/0014-linux-user-binfmt-support-host-bina.patch @@ -1,4 +1,4 @@ -From d16bba8ec34f1f46f32b6e8ffe7ff46e581624f7 Mon Sep 17 00:00:00 2001 +From 2dba4056236a9f41b0de729713ba11f9a428d26c 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-target-arm-linux-user-no-tb_flush-o.patch b/0015-target-arm-linux-user-no-tb_flush-o.patch index 8350c5b7..a0ffdbd3 100644 --- a/0015-target-arm-linux-user-no-tb_flush-o.patch +++ b/0015-target-arm-linux-user-no-tb_flush-o.patch @@ -1,4 +1,4 @@ -From 28160600838f66097fd0beb639372e22cb2751cd Mon Sep 17 00:00:00 2001 +From 56191c08ebab2895ce7362517901ddbdceff3e78 Mon Sep 17 00:00:00 2001 From: Alexander Graf Date: Tue, 29 May 2012 15:30:01 +0200 Subject: [PATCH] target-arm: linux-user: no tb_flush on reset diff --git a/0016-linux-user-Ignore-broken-loop-ioctl.patch b/0016-linux-user-Ignore-broken-loop-ioctl.patch index a45d23dc..23ecf4d2 100644 --- a/0016-linux-user-Ignore-broken-loop-ioctl.patch +++ b/0016-linux-user-Ignore-broken-loop-ioctl.patch @@ -1,4 +1,4 @@ -From 70d72897f46f7ca7089e784caa4ac8eaa8c24287 Mon Sep 17 00:00:00 2001 +From dfb36bf2a5654aed53311fe79be72f236bd5e821 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/0017-linux-user-lock-tcg.patch b/0017-linux-user-lock-tcg.patch index 0b7df917..6f5026f9 100644 --- a/0017-linux-user-lock-tcg.patch +++ b/0017-linux-user-lock-tcg.patch @@ -1,4 +1,4 @@ -From 70ae12474a1d85550cabe64f60e8b0c52055fe17 Mon Sep 17 00:00:00 2001 +From 3c7976dbd6b551d7c0c503f54f6056515159d48d 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 diff --git a/0018-linux-user-Run-multi-threaded-code-.patch b/0018-linux-user-Run-multi-threaded-code-.patch index bd19e7b8..af9b7fce 100644 --- a/0018-linux-user-Run-multi-threaded-code-.patch +++ b/0018-linux-user-Run-multi-threaded-code-.patch @@ -1,4 +1,4 @@ -From f9d767a0740f88f9470166e6cba43d459a7abc1b Mon Sep 17 00:00:00 2001 +From 6e6f95d867e2722f952fe4b7cd4e6fcdc5e2f3cf 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/0019-linux-user-lock-tb-flushing-too.patch b/0019-linux-user-lock-tb-flushing-too.patch index d2bde994..35ee1f5c 100644 --- a/0019-linux-user-lock-tb-flushing-too.patch +++ b/0019-linux-user-lock-tb-flushing-too.patch @@ -1,4 +1,4 @@ -From c9a1457d91e8d5e8e51d92d7a7f5bfe1352f39aa Mon Sep 17 00:00:00 2001 +From cbbf0779a6cf50f973982760792f357b77d91835 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 diff --git a/0020-linux-user-Fake-proc-cpuinfo.patch b/0020-linux-user-Fake-proc-cpuinfo.patch index b5a7152b..1a6d5c33 100644 --- a/0020-linux-user-Fake-proc-cpuinfo.patch +++ b/0020-linux-user-Fake-proc-cpuinfo.patch @@ -1,4 +1,4 @@ -From 6738c77cc99a63b6dde22445d9c511ea84aa8019 Mon Sep 17 00:00:00 2001 +From 0ce92834dd3a55e232de8097245f5e51f03af497 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/0021-linux-user-implement-FS_IOC_GETFLAG.patch b/0021-linux-user-implement-FS_IOC_GETFLAG.patch index 46d3682b..d872f481 100644 --- a/0021-linux-user-implement-FS_IOC_GETFLAG.patch +++ b/0021-linux-user-implement-FS_IOC_GETFLAG.patch @@ -1,4 +1,4 @@ -From 5e7cb7945afdf65b337010caef88e80013afef75 Mon Sep 17 00:00:00 2001 +From ec0dc12708f5cd1a1880ebe165c8e4b2a0876d86 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/0022-linux-user-implement-FS_IOC_SETFLAG.patch b/0022-linux-user-implement-FS_IOC_SETFLAG.patch index 207a2f85..8d4a0a9b 100644 --- a/0022-linux-user-implement-FS_IOC_SETFLAG.patch +++ b/0022-linux-user-implement-FS_IOC_SETFLAG.patch @@ -1,4 +1,4 @@ -From c0591abdf987079362c1e8a5452260e247ab33e0 Mon Sep 17 00:00:00 2001 +From 549adde44ee4762253aab35c4b72bf3fb9b9eb94 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/0023-linux-user-XXX-disable-fiemap.patch b/0023-linux-user-XXX-disable-fiemap.patch index a533de69..3d751523 100644 --- a/0023-linux-user-XXX-disable-fiemap.patch +++ b/0023-linux-user-XXX-disable-fiemap.patch @@ -1,4 +1,4 @@ -From cae4b35f0f81c0bfff339675f58e0eb252e60a7c Mon Sep 17 00:00:00 2001 +From 6d699789b883d02ca2b5cf762a1a496cb1d294fa 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/0024-slirp-nooutgoing.patch b/0024-slirp-nooutgoing.patch index 61efa7be..7fc405d6 100644 --- a/0024-slirp-nooutgoing.patch +++ b/0024-slirp-nooutgoing.patch @@ -1,4 +1,4 @@ -From 8e3a25586a5ce8a771c6b85db26a45d2034117cc Mon Sep 17 00:00:00 2001 +From 2386ed38a5203b175f5d225d7693f9f3019b1b2f 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 @@ -97,7 +97,7 @@ index 7571c5a..0555e18 100644 socket_set_fast_reuse(s); opt = 1; diff --git a/vl.c b/vl.c -index 6e084c2..0e34d53 100644 +index fe451aa..988a1fd 100644 --- a/vl.c +++ b/vl.c @@ -163,6 +163,7 @@ const char *vnc_display; @@ -108,7 +108,7 @@ index 6e084c2..0e34d53 100644 static int no_reboot; int no_shutdown = 0; int cursor_hide = 1; -@@ -3391,6 +3392,14 @@ int main(int argc, char **argv, char **envp) +@@ -3402,6 +3403,14 @@ int main(int argc, char **argv, char **envp) case QEMU_OPTION_singlestep: singlestep = 1; break; diff --git a/0025-vnc-password-file-and-incoming-conn.patch b/0025-vnc-password-file-and-incoming-conn.patch index 69ef2df3..c675f38c 100644 --- a/0025-vnc-password-file-and-incoming-conn.patch +++ b/0025-vnc-password-file-and-incoming-conn.patch @@ -1,4 +1,4 @@ -From 44b04f8570d6abff9c43b27ed4d83d9dae15dd90 Mon Sep 17 00:00:00 2001 +From 568c674a7dcedee67b067a79ca4a680dd5d8dffd 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/0026-linux-user-add-more-blk-ioctls.patch b/0026-linux-user-add-more-blk-ioctls.patch index 6857b8fb..b1ee9fa1 100644 --- a/0026-linux-user-add-more-blk-ioctls.patch +++ b/0026-linux-user-add-more-blk-ioctls.patch @@ -1,4 +1,4 @@ -From fc47b8d0579752369bff5f39fa1e57e40b88adf8 Mon Sep 17 00:00:00 2001 +From 9c4aad2cda60ee3d0ca7a4fabdf3decc3392b2ae 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/0027-linux-user-use-target_ulong.patch b/0027-linux-user-use-target_ulong.patch index f99a415f..474ed2c6 100644 --- a/0027-linux-user-use-target_ulong.patch +++ b/0027-linux-user-use-target_ulong.patch @@ -1,4 +1,4 @@ -From 84f86270b2e76cf99bf78084722e5d95532d6f91 Mon Sep 17 00:00:00 2001 +From 5710d6cf91f323779e6f80432b5e383eb3bb96f0 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/0028-block-Add-support-for-DictZip-enabl.patch b/0028-block-Add-support-for-DictZip-enabl.patch index 13054e5a..823d6435 100644 --- a/0028-block-Add-support-for-DictZip-enabl.patch +++ b/0028-block-Add-support-for-DictZip-enabl.patch @@ -1,4 +1,4 @@ -From 74b3a58f1eb01de57d230a928b7b556add2ec519 Mon Sep 17 00:00:00 2001 +From 3b259aafe15356db62e11ffd28bb49e608fc9f25 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/0029-block-Add-tar-container-format.patch b/0029-block-Add-tar-container-format.patch index a2ff17ce..77c18491 100644 --- a/0029-block-Add-tar-container-format.patch +++ b/0029-block-Add-tar-container-format.patch @@ -1,4 +1,4 @@ -From 39a66fff01637db1cf182bbcc44197e6b9350813 Mon Sep 17 00:00:00 2001 +From 7ae392839701cf9de9d232b030de5de78b399b11 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/0030-Legacy-Patch-kvm-qemu-preXX-dictzip.patch b/0030-Legacy-Patch-kvm-qemu-preXX-dictzip.patch index d5de5c41..f0fbf033 100644 --- a/0030-Legacy-Patch-kvm-qemu-preXX-dictzip.patch +++ b/0030-Legacy-Patch-kvm-qemu-preXX-dictzip.patch @@ -1,4 +1,4 @@ -From aa8ba1fc7b57a6274b99b6f28201a971fd3a71ff Mon Sep 17 00:00:00 2001 +From d73a78b03f5a2ecdd9324691f54802988c448eb2 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/0031-Legacy-Patch-kvm-qemu-preXX-report-.patch b/0031-Legacy-Patch-kvm-qemu-preXX-report-.patch index 86fee08c..a43fe40c 100644 --- a/0031-Legacy-Patch-kvm-qemu-preXX-report-.patch +++ b/0031-Legacy-Patch-kvm-qemu-preXX-report-.patch @@ -1,4 +1,4 @@ -From 68d77cd24817148f59530990459db4aa627d21f5 Mon Sep 17 00:00:00 2001 +From 066ff7b47f0d6ed60c5cc2314a6cdb3b46e701fe Mon Sep 17 00:00:00 2001 From: Alexander Graf Date: Wed, 12 Dec 2012 19:11:31 +0100 Subject: [PATCH] Legacy Patch kvm-qemu-preXX-report-default-mac-used.patch diff --git a/0032-console-add-question-mark-escape-op.patch b/0032-console-add-question-mark-escape-op.patch index d3618c1f..af24e773 100644 --- a/0032-console-add-question-mark-escape-op.patch +++ b/0032-console-add-question-mark-escape-op.patch @@ -1,4 +1,4 @@ -From 591b1eadc28bf8e4efc7fa208e447463bd8262eb Mon Sep 17 00:00:00 2001 +From d50517d9fe72cbd9e9a26615c0ef288763003be4 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 diff --git a/0033-Make-char-muxer-more-robust-wrt-sma.patch b/0033-Make-char-muxer-more-robust-wrt-sma.patch index 2caeb0d3..7a3c6039 100644 --- a/0033-Make-char-muxer-more-robust-wrt-sma.patch +++ b/0033-Make-char-muxer-more-robust-wrt-sma.patch @@ -1,4 +1,4 @@ -From 6bcb48aaa09b73c9c0c30f8404eb4b3fd3b50eff Mon Sep 17 00:00:00 2001 +From 4f764327a74213eb54b0a9fe7019644df95a6d5a 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 diff --git a/0034-linux-user-lseek-explicitly-cast-no.patch b/0034-linux-user-lseek-explicitly-cast-no.patch index 69f03010..ac76310b 100644 --- a/0034-linux-user-lseek-explicitly-cast-no.patch +++ b/0034-linux-user-lseek-explicitly-cast-no.patch @@ -1,4 +1,4 @@ -From 04f9510a380afce8eb3b146e3429d27bebd1a37d Mon Sep 17 00:00:00 2001 +From 9de42598d5f5117d1fb2a13f36da01e946b0f43f 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/0035-virtfs-proxy-helper-Provide-__u64-f.patch b/0035-virtfs-proxy-helper-Provide-__u64-f.patch index 1c034895..f752058f 100644 --- a/0035-virtfs-proxy-helper-Provide-__u64-f.patch +++ b/0035-virtfs-proxy-helper-Provide-__u64-f.patch @@ -1,4 +1,4 @@ -From 52029c3b079c59f52fe2d0242d660807657f85e2 Mon Sep 17 00:00:00 2001 +From 393ae753b3a72824994b6e58e38437b41baa56c7 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/0036-configure-Enable-PIE-for-ppc-and-pp.patch b/0036-configure-Enable-PIE-for-ppc-and-pp.patch index 34228465..b83bc156 100644 --- a/0036-configure-Enable-PIE-for-ppc-and-pp.patch +++ b/0036-configure-Enable-PIE-for-ppc-and-pp.patch @@ -1,4 +1,4 @@ -From 74b427c02d609c0ec4387fd32806351156a54513 Mon Sep 17 00:00:00 2001 +From 5d53831a6dd2c69e284319860212fb6f3bf7af15 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 diff --git a/0037-tests-Don-t-run-qom-test-twice.patch b/0037-tests-Don-t-run-qom-test-twice.patch index 211ddaa1..f8ae23ac 100644 --- a/0037-tests-Don-t-run-qom-test-twice.patch +++ b/0037-tests-Don-t-run-qom-test-twice.patch @@ -1,4 +1,4 @@ -From 0c5ba28c398f9ccdbd951a4caa5c5bdfbb5e4787 Mon Sep 17 00:00:00 2001 +From 6bcc0297f33189667a882fa2db3a7c7f064fe52b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Mon, 7 Apr 2014 16:03:08 +0200 Subject: [PATCH] tests: Don't run qom-test twice @@ -19,10 +19,10 @@ Signed-off-by: Andreas Färber 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/Makefile b/tests/Makefile -index fa25c70..f7fa66e 100644 +index 4b2e1bb..db6cbc1 100644 --- a/tests/Makefile +++ b/tests/Makefile -@@ -184,7 +184,9 @@ check-qtest-microblazeel-y = $(check-qtest-microblaze-y) +@@ -186,7 +186,9 @@ check-qtest-microblazeel-y = $(check-qtest-microblaze-y) check-qtest-xtensaeb-y = $(check-qtest-xtensa-y) # qom-test works for all sysemu architectures: diff --git a/0038-qtest-Increase-socket-timeout.patch b/0038-qtest-Increase-socket-timeout.patch index 42986936..7357bf74 100644 --- a/0038-qtest-Increase-socket-timeout.patch +++ b/0038-qtest-Increase-socket-timeout.patch @@ -1,4 +1,4 @@ -From 8ed9074630b2095beef49b0ace3e2d97e6fb02de Mon Sep 17 00:00:00 2001 +From 0cf035b2443562953c3e731b9feed4365553d1f2 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/0039-module-Simplify-module_load.patch b/0039-module-Simplify-module_load.patch deleted file mode 100644 index b7a4fc75..00000000 --- a/0039-module-Simplify-module_load.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 1a85e2c901850791cd5accc1cd727666d5ce2aae Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20F=C3=A4rber?= -Date: Fri, 20 Jun 2014 16:46:50 +0200 -Subject: [PATCH] module: Simplify module_load() -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -The file path is not used for error reporting, so we can free it -directly after use. - -Signed-off-by: Andreas Färber ---- - util/module.c | 6 ++---- - 1 file changed, 2 insertions(+), 4 deletions(-) - -diff --git a/util/module.c b/util/module.c -index 214effb..9fd3030 100644 ---- a/util/module.c -+++ b/util/module.c -@@ -202,18 +202,16 @@ static void module_load(module_init_type type) - for (i = 0; i < ARRAY_SIZE(dirs); i++) { - fname = g_strdup_printf("%s/%s%s", dirs[i], *mp, HOST_DSOSUF); - ret = module_load_file(fname); -+ g_free(fname); -+ fname = NULL; - /* Try loading until loaded a module file */ - if (!ret) { - break; - } -- g_free(fname); -- fname = NULL; - } - if (ret == -ENOENT) { - fprintf(stderr, "Can't find module: %s\n", *mp); - } -- -- g_free(fname); - } - - for (i = 0; i < ARRAY_SIZE(dirs); i++) { diff --git a/0040-module-Don-t-complain-when-a-module.patch b/0040-module-Don-t-complain-when-a-module.patch deleted file mode 100644 index 9bda1838..00000000 --- a/0040-module-Don-t-complain-when-a-module.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 97f7b5e684771087691d509573492aeb059443de Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20F=C3=A4rber?= -Date: Fri, 20 Jun 2014 17:54:51 +0200 -Subject: [PATCH] module: Don't complain when a module is absent -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -The current implementation depends on a configure-time generated list of -block modules. When any of them is absent, module_load() emits a warning. - -This is suboptimal because extracting code to modules was mainly done to -allow separate packaging of modules with intrusive dependencies. Absence -of optional packages then leads to absence of modules and an error -message, which users may recognize as new and report as error. - -Cc: Fam Zheng -Cc: Paolo Bonzini -Cc: Michael Tokarev -Signed-off-by: Andreas Färber ---- - util/module.c | 3 --- - 1 file changed, 3 deletions(-) - -diff --git a/util/module.c b/util/module.c -index 9fd3030..4bd4a94 100644 ---- a/util/module.c -+++ b/util/module.c -@@ -209,9 +209,6 @@ static void module_load(module_init_type type) - break; - } - } -- if (ret == -ENOENT) { -- fprintf(stderr, "Can't find module: %s\n", *mp); -- } - } - - for (i = 0; i < ARRAY_SIZE(dirs); i++) { diff --git a/qemu-2.1.0-rc2.tar.bz2 b/qemu-2.1.0-rc2.tar.bz2 deleted file mode 100644 index ba33057b..00000000 --- a/qemu-2.1.0-rc2.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d29729e798f311c24f1e6b513ccaaab83162ae4b919849c2898a4584efc2faf1 -size 23551394 diff --git a/qemu-2.1.0-rc3.tar.bz2 b/qemu-2.1.0-rc3.tar.bz2 new file mode 100644 index 00000000..0239ae6b --- /dev/null +++ b/qemu-2.1.0-rc3.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4d946e253da7fa481bb928eb1dcf9236032e89633621e014cb8e42313e2a054d +size 23550174 diff --git a/qemu-linux-user.changes b/qemu-linux-user.changes index 23a35447..7fb501b5 100644 --- a/qemu-linux-user.changes +++ b/qemu-linux-user.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Jul 23 12:36:41 UTC 2014 - afaerber@suse.de + +- Update to v2.1.0-rc3: http://wiki.qemu-project.org/ChangeLog/2.1 +* Patch queue updated from git://github.com/openSUSE/qemu.git opensuse-2.1 +* Updated update_git.sh script accordingly + ------------------------------------------------------------------- Wed Jul 16 17:31:54 UTC 2014 - afaerber@suse.de diff --git a/qemu-linux-user.spec b/qemu-linux-user.spec index e807ae67..9c71744f 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.0.92 +Version: 2.0.93 Release: 0 -Source: qemu-2.1.0-rc2.tar.bz2 +Source: qemu-2.1.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 @@ -63,8 +63,6 @@ Patch0035: 0035-virtfs-proxy-helper-Provide-__u64-f.patch Patch0036: 0036-configure-Enable-PIE-for-ppc-and-pp.patch Patch0037: 0037-tests-Don-t-run-qom-test-twice.patch Patch0038: 0038-qtest-Increase-socket-timeout.patch -Patch0039: 0039-module-Simplify-module_load.patch -Patch0040: 0040-module-Don-t-complain-when-a-module.patch # Please do not add patches manually here, run update_git.sh. # this is to make lint happy Source300: rpmlintrc @@ -117,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.1.0-rc2 +%setup -q -n qemu-2.1.0-rc3 %patch0001 -p1 %patch0002 -p1 %patch0003 -p1 @@ -156,8 +154,6 @@ run cross-architecture builds. %patch0036 -p1 %patch0037 -p1 %patch0038 -p1 -%patch0039 -p1 -%patch0040 -p1 %build ./configure --prefix=%_prefix --sysconfdir=%_sysconfdir \ diff --git a/qemu-linux-user.spec.in b/qemu-linux-user.spec.in index f022563e..07385cc1 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: qemu-2.1.0-rc2.tar.bz2 +Source: qemu-2.1.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.1.0-rc2 +%setup -q -n qemu-2.1.0-rc3 PATCH_EXEC %build diff --git a/qemu.changes b/qemu.changes index ef30c1ef..2a3f5296 100644 --- a/qemu.changes +++ b/qemu.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Wed Jul 23 12:36:37 UTC 2014 - afaerber@suse.de + +- Update to v2.1.0-rc3: http://wiki.qemu-project.org/ChangeLog/2.1 +* Patch queue updated from git://github.com/openSUSE/qemu.git opensuse-2.1 +* Patches dropped: + 0039-module-Simplify-module_load.patch + 0040-module-Don-t-complain-when-a-module.patch +* Updated update_git.sh script accordingly + ------------------------------------------------------------------- Wed Jul 16 17:31:54 UTC 2014 - afaerber@suse.de diff --git a/qemu.spec b/qemu.spec index b12993f2..b49964e2 100644 --- a/qemu.spec +++ b/qemu.spec @@ -43,9 +43,9 @@ Url: http://www.qemu.org/ Summary: Universal CPU emulator License: BSD-3-Clause and GPL-2.0 and GPL-2.0+ and LGPL-2.1+ and MIT Group: System/Emulators/PC -Version: 2.0.92 +Version: 2.0.93 Release: 0 -Source: %name-2.1.0-rc2.tar.bz2 +Source: %name-2.1.0-rc3.tar.bz2 Source1: 80-kvm.rules Source2: qemu-ifup Source3: kvm_stat @@ -92,8 +92,6 @@ Patch0035: 0035-virtfs-proxy-helper-Provide-__u64-f.patch Patch0036: 0036-configure-Enable-PIE-for-ppc-and-pp.patch Patch0037: 0037-tests-Don-t-run-qom-test-twice.patch Patch0038: 0038-qtest-Increase-socket-timeout.patch -Patch0039: 0039-module-Simplify-module_load.patch -Patch0040: 0040-module-Don-t-complain-when-a-module.patch # Please do not add patches manually here, run update_git.sh. # this is to make lint happy @@ -487,7 +485,7 @@ This package provides a service file for starting and stopping KSM. %endif %prep -%setup -q -n %name-2.1.0-rc2 +%setup -q -n %name-2.1.0-rc3 %patch0001 -p1 %patch0002 -p1 %patch0003 -p1 @@ -526,8 +524,6 @@ This package provides a service file for starting and stopping KSM. %patch0036 -p1 %patch0037 -p1 %patch0038 -p1 -%patch0039 -p1 -%patch0040 -p1 %if %{build_x86_fw_from_source} # as a safeguard, delete the firmware files that we intend to build diff --git a/qemu.spec.in b/qemu.spec.in index 63f66436..020561b0 100644 --- a/qemu.spec.in +++ b/qemu.spec.in @@ -45,7 +45,7 @@ License: BSD-3-Clause and GPL-2.0 and GPL-2.0+ and LGPL-2.1+ and MIT Group: System/Emulators/PC QEMU_VERSION Release: 0 -Source: %name-2.1.0-rc2.tar.bz2 +Source: %name-2.1.0-rc3.tar.bz2 Source1: 80-kvm.rules Source2: qemu-ifup Source3: kvm_stat @@ -448,7 +448,7 @@ This package provides a service file for starting and stopping KSM. %endif %prep -%setup -q -n %name-2.1.0-rc2 +%setup -q -n %name-2.1.0-rc3 PATCH_EXEC %if %{build_x86_fw_from_source} diff --git a/update_git.sh b/update_git.sh index 4447d1dc..90e97ca2 100644 --- a/update_git.sh +++ b/update_git.sh @@ -12,7 +12,7 @@ GIT_TREE=git://github.com/openSUSE/qemu.git GIT_LOCAL_TREE=~/git/qemu-opensuse GIT_BRANCH=opensuse-2.1 -GIT_UPSTREAM_TAG=v2.1.0-rc2 +GIT_UPSTREAM_TAG=v2.1.0-rc3 GIT_DIR=/dev/shm/qemu-factory-git-dir CMP_DIR=/dev/shm/qemu-factory-cmp-dir