diff --git a/0001-Handle-CPU-interrupts-by-inline-che.patch b/0001-Handle-CPU-interrupts-by-inline-che.patch index dafc7ea3..37cb6889 100644 --- a/0001-Handle-CPU-interrupts-by-inline-che.patch +++ b/0001-Handle-CPU-interrupts-by-inline-che.patch @@ -1,4 +1,4 @@ -From 9763d20d318638573f7633637f1c5ff96a0e62a3 Mon Sep 17 00:00:00 2001 +From 066d4a227a3f0a46c390cad24f4d2fc02b1868e2 Mon Sep 17 00:00:00 2001 From: Peter Maydell Date: Wed, 5 Oct 2011 10:04:02 +0100 Subject: [PATCH] Handle CPU interrupts by inline checking of a flag @@ -134,7 +134,7 @@ index 430cb44..65a75d9 100644 *icount_arg = num_insns; gen_set_label(icount_label); diff --git a/linux-user/main.c b/linux-user/main.c -index 7dea084..d9814bc 100644 +index 7dea084..d9814bc4 100644 --- a/linux-user/main.c +++ b/linux-user/main.c @@ -64,6 +64,7 @@ unsigned long reserved_va; @@ -187,7 +187,7 @@ index 3c411c4..af614bf 100644 "-acpitable [sig=str][,rev=n][,oem_id=str][,oem_table_id=str][,oem_rev=n][,asl_compiler_id=str][,asl_compiler_rev=n][,{data|file}=file1[:file2]...]\n" " ACPI table description\n", QEMU_ARCH_I386) diff --git a/vl.c b/vl.c -index 67f5813..322fea0 100644 +index 7c577fa..fdf755f 100644 --- a/vl.c +++ b/vl.c @@ -176,6 +176,8 @@ int main(int argc, char **argv) @@ -199,7 +199,7 @@ index 67f5813..322fea0 100644 static const char *data_dir; const char *bios_name = NULL; enum vga_retrace_method vga_retrace_method = VGA_RETRACE_DUMB; -@@ -3038,6 +3040,9 @@ int main(int argc, char **argv, char **envp) +@@ -3039,6 +3041,9 @@ int main(int argc, char **argv, char **envp) qdev_prop_register_global_list(slew_lost_ticks); break; } diff --git a/0002-XXX-dont-dump-core-on-sigabort.patc.patch b/0002-XXX-dont-dump-core-on-sigabort.patc.patch index 3502ce6d..2d151cc6 100644 --- a/0002-XXX-dont-dump-core-on-sigabort.patc.patch +++ b/0002-XXX-dont-dump-core-on-sigabort.patc.patch @@ -1,4 +1,4 @@ -From a5d4463daeb0ff29a3d17cf410b1c81b6f910875 Mon Sep 17 00:00:00 2001 +From bc44bc4ec5dd49776e5bdf89f3ec4712d286a221 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/0003-XXX-work-around-SA_RESTART-race-wit.patch b/0003-XXX-work-around-SA_RESTART-race-wit.patch index 089f73ac..a29fc368 100644 --- a/0003-XXX-work-around-SA_RESTART-race-wit.patch +++ b/0003-XXX-work-around-SA_RESTART-race-wit.patch @@ -1,4 +1,4 @@ -From 6a72014de6a88964f9d3d88ec5bf1a7fd1f44e98 Mon Sep 17 00:00:00 2001 +From ce3dd80bae810b1c3a5a327928a32ec92dd082c6 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) @@ -12,7 +12,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 d9814bc..587f421 100644 +index d9814bc4..587f421 100644 --- a/linux-user/main.c +++ b/linux-user/main.c @@ -847,15 +847,22 @@ void cpu_loop(CPUARMState *env) @@ -118,7 +118,7 @@ index 0078b32..4a637f4 100644 ignore state to avoid getting unexpected interrupted syscalls */ diff --git a/linux-user/syscall.c b/linux-user/syscall.c -index 41c869b..60ed4be 100644 +index 1174306..066bc54 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -5086,6 +5086,87 @@ static int do_open(void *cpu_env, const char *pathname, int flags, mode_t mode) diff --git a/0004-qemu-0.9.0.cvs-binfmt.patch.patch b/0004-qemu-0.9.0.cvs-binfmt.patch.patch index 0c6ad4db..099c8ea8 100644 --- a/0004-qemu-0.9.0.cvs-binfmt.patch.patch +++ b/0004-qemu-0.9.0.cvs-binfmt.patch.patch @@ -1,4 +1,4 @@ -From 8ced0f08f09a6588a73b15feada94e063692ab35 Mon Sep 17 00:00:00 2001 +From 73eb91b6c3900fd479240f8c2e8d2c52fbd784ee 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/0005-qemu-cvs-alsa_bitfield.patch.patch b/0005-qemu-cvs-alsa_bitfield.patch.patch index 74a13eea..be80e113 100644 --- a/0005-qemu-cvs-alsa_bitfield.patch.patch +++ b/0005-qemu-cvs-alsa_bitfield.patch.patch @@ -1,4 +1,4 @@ -From c48e5ad811706d9a3ffc5a80085c820c6f845377 Mon Sep 17 00:00:00 2001 +From 6e4a1a38e639ade0f184a74058fd22ec577925a8 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/0006-qemu-cvs-alsa_ioctl.patch.patch b/0006-qemu-cvs-alsa_ioctl.patch.patch index 3fd8ae25..1c568d17 100644 --- a/0006-qemu-cvs-alsa_ioctl.patch.patch +++ b/0006-qemu-cvs-alsa_ioctl.patch.patch @@ -1,4 +1,4 @@ -From fe0fcbcbec05584ff7b9dd1bdc60deedd14b70e1 Mon Sep 17 00:00:00 2001 +From 89629ceaf475b0caa0767a82a8b7715983b4e2f9 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/0007-qemu-cvs-alsa_mmap.patch.patch b/0007-qemu-cvs-alsa_mmap.patch.patch index 5fc771fd..cea9017c 100644 --- a/0007-qemu-cvs-alsa_mmap.patch.patch +++ b/0007-qemu-cvs-alsa_mmap.patch.patch @@ -1,4 +1,4 @@ -From 7fbdb3f4610eb31f6692e4919593ffe861d05e97 Mon Sep 17 00:00:00 2001 +From 18f6f4e256d44ce09a5b6368ca9b57b6b201070d 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/0008-qemu-cvs-gettimeofday.patch.patch b/0008-qemu-cvs-gettimeofday.patch.patch index c2ebb080..3980b790 100644 --- a/0008-qemu-cvs-gettimeofday.patch.patch +++ b/0008-qemu-cvs-gettimeofday.patch.patch @@ -1,4 +1,4 @@ -From e4983bb8eb29727b89ddc5d4964c07854ecec4f3 Mon Sep 17 00:00:00 2001 +From de4bd22f7b65380399cafb4ffac771c0edf6f8ac Mon Sep 17 00:00:00 2001 From: Ulrich Hecht Date: Tue, 14 Apr 2009 16:25:41 +0200 Subject: [PATCH] qemu-cvs-gettimeofday @@ -9,7 +9,7 @@ No clue what this is for. 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/linux-user/syscall.c b/linux-user/syscall.c -index 60ed4be..a929639 100644 +index 066bc54..20bff30 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -6237,6 +6237,8 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1, diff --git a/0009-qemu-cvs-ioctl_debug.patch.patch b/0009-qemu-cvs-ioctl_debug.patch.patch index a8f18d36..05c735ea 100644 --- a/0009-qemu-cvs-ioctl_debug.patch.patch +++ b/0009-qemu-cvs-ioctl_debug.patch.patch @@ -1,4 +1,4 @@ -From d4f7c54f0117083c74fdd25ca6efdb0f90a3223b Mon Sep 17 00:00:00 2001 +From 9dfc4531a07971bcc2636491f1520bc60f1c167c 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 @@ -12,7 +12,7 @@ Signed-off-by: Ulrich Hecht 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/linux-user/syscall.c b/linux-user/syscall.c -index a929639..ac387a4 100644 +index 20bff30..0d295c1 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -3657,7 +3657,12 @@ static abi_long do_ioctl(int fd, abi_long cmd, abi_long arg) diff --git a/0010-qemu-cvs-ioctl_nodirection.patch.patch b/0010-qemu-cvs-ioctl_nodirection.patch.patch index d2b01518..eabeb898 100644 --- a/0010-qemu-cvs-ioctl_nodirection.patch.patch +++ b/0010-qemu-cvs-ioctl_nodirection.patch.patch @@ -1,4 +1,4 @@ -From 2fed0dbdfebf7cdd1a4fad426c51ae315e1e5f39 Mon Sep 17 00:00:00 2001 +From 20b1adf1ffd1bc0eb82a01be2eea32608f4ddc39 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 @@ -15,7 +15,7 @@ Signed-off-by: Ulrich Hecht 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/linux-user/syscall.c b/linux-user/syscall.c -index ac387a4..53feee5 100644 +index 0d295c1..ae3ebd9 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -3691,6 +3691,11 @@ static abi_long do_ioctl(int fd, abi_long cmd, abi_long arg) diff --git a/0011-block-vmdk-Support-creation-of-SCSI.patch b/0011-block-vmdk-Support-creation-of-SCSI.patch index 2fcd3aeb..0ce6333c 100644 --- a/0011-block-vmdk-Support-creation-of-SCSI.patch +++ b/0011-block-vmdk-Support-creation-of-SCSI.patch @@ -1,9 +1,9 @@ -From e76344b62f6365b61520345e00f89b80b6570fe0 Mon Sep 17 00:00:00 2001 +From 4ad8ed2cfa124ed9473a8491f13f9ac01260468a 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 MIME-Version: 1.0 -Content-Type: text/plain; charset=utf-8 +Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Ulrich Hecht @@ -40,10 +40,10 @@ index 470bdcc..b27622b 100644 ret = bdrv_create(drv, filename, param); diff --git a/block/vmdk.c b/block/vmdk.c -index daee426..1eb3e60 100644 +index bba4c61..7db59b0 100644 --- a/block/vmdk.c +++ b/block/vmdk.c -@@ -1376,7 +1376,7 @@ static int vmdk_create(const char *filename, QEMUOptionParameter *options) +@@ -1432,7 +1432,7 @@ static int vmdk_create(const char *filename, QEMUOptionParameter *options) "ddb.geometry.cylinders = \"%" PRId64 "\"\n" "ddb.geometry.heads = \"16\"\n" "ddb.geometry.sectors = \"63\"\n" @@ -52,7 +52,7 @@ index daee426..1eb3e60 100644 if (filename_decompose(filename, path, prefix, postfix, PATH_MAX)) { return -EINVAL; -@@ -1391,6 +1391,8 @@ static int vmdk_create(const char *filename, QEMUOptionParameter *options) +@@ -1447,6 +1447,8 @@ static int vmdk_create(const char *filename, QEMUOptionParameter *options) flags |= options->value.n ? BLOCK_FLAG_COMPAT6 : 0; } else if (!strcmp(options->name, BLOCK_OPT_SUBFMT)) { fmt = options->value.s; @@ -61,7 +61,7 @@ index daee426..1eb3e60 100644 } options++; } -@@ -1481,7 +1483,8 @@ static int vmdk_create(const char *filename, QEMUOptionParameter *options) +@@ -1537,7 +1539,8 @@ static int vmdk_create(const char *filename, QEMUOptionParameter *options) parent_desc_line, ext_desc_lines, (flags & BLOCK_FLAG_COMPAT6 ? 6 : 4), @@ -71,7 +71,7 @@ index daee426..1eb3e60 100644 if (split || flat) { fd = qemu_open(filename, O_WRONLY | O_CREAT | O_TRUNC | O_BINARY | O_LARGEFILE, -@@ -1582,6 +1585,11 @@ static QEMUOptionParameter vmdk_create_options[] = { +@@ -1638,6 +1641,11 @@ static QEMUOptionParameter vmdk_create_options[] = { "VMDK flat extent format, can be one of " "{monolithicSparse (default) | monolithicFlat | twoGbMaxExtentSparse | twoGbMaxExtentFlat | streamOptimized} " }, diff --git a/0012-configure-Enable-mipsn32-linux-user.patch b/0012-configure-Enable-mipsn32-linux-user.patch index 7de567e5..69906836 100644 --- a/0012-configure-Enable-mipsn32-linux-user.patch +++ b/0012-configure-Enable-mipsn32-linux-user.patch @@ -1,9 +1,9 @@ -From d374dbebe347831449ecb6f16e62fe22d67a5273 Mon Sep 17 00:00:00 2001 +From 327813b988fa491123f744214323b7b7d2c17ce0 Mon Sep 17 00:00:00 2001 From: Ulrich Hecht Date: Wed, 25 Aug 2010 14:23:43 +0200 Subject: [PATCH] configure: Enable mipsn32*-linux-user builds MIME-Version: 1.0 -Content-Type: text/plain; charset=utf-8 +Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Ulrich Hecht @@ -15,7 +15,7 @@ Signed-off-by: Andreas Färber 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/configure b/configure -index 60d266f..352239f 100755 +index d97fd81..ebf7a6b 100755 --- a/configure +++ b/configure @@ -997,6 +997,8 @@ microblaze-linux-user \ diff --git a/0013-linux-user-add-binfmt-wrapper-for-a.patch b/0013-linux-user-add-binfmt-wrapper-for-a.patch index 50dd6650..23e136d1 100644 --- a/0013-linux-user-add-binfmt-wrapper-for-a.patch +++ b/0013-linux-user-add-binfmt-wrapper-for-a.patch @@ -1,9 +1,9 @@ -From 22844fc327d80f9ff4d484fd5a2af8b6a6c52200 Mon Sep 17 00:00:00 2001 +From 666785d46bae0df3b504b68bc9098178f6840aaa 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 MIME-Version: 1.0 -Content-Type: text/plain; charset=utf-8 +Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When using qemu's linux-user binaries through binfmt, argv[0] gets lost diff --git a/0014-linux-user-Ignore-timer_create-sysc.patch b/0014-linux-user-Ignore-timer_create-sysc.patch index 9917c390..bc739c6c 100644 --- a/0014-linux-user-Ignore-timer_create-sysc.patch +++ b/0014-linux-user-Ignore-timer_create-sysc.patch @@ -1,4 +1,4 @@ -From 7fd1db51229b7b331a8acf3d6ad552d45d902676 Mon Sep 17 00:00:00 2001 +From 505342557ab0e7e27a86b3ff91f851168ed14a36 Mon Sep 17 00:00:00 2001 From: Alexander Graf Date: Sun, 11 Dec 2011 01:19:24 +0100 Subject: [PATCH] linux-user: Ignore timer_create syscall @@ -12,7 +12,7 @@ Signed-off-by: Alexander Graf 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/linux-user/syscall.c b/linux-user/syscall.c -index 53feee5..792c48e 100644 +index ae3ebd9..537a7d3 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -8556,6 +8556,11 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1, diff --git a/0015-linux-user-be-silent-about-capget-f.patch b/0015-linux-user-be-silent-about-capget-f.patch index 0e586c7c..c7273f83 100644 --- a/0015-linux-user-be-silent-about-capget-f.patch +++ b/0015-linux-user-be-silent-about-capget-f.patch @@ -1,4 +1,4 @@ -From 3986078d311f89717c0adf04dde20daae1f3c31b Mon Sep 17 00:00:00 2001 +From 4b5cbc5af6b70ed333d5e6d32a538a3ffbfdf55d Mon Sep 17 00:00:00 2001 From: Alexander Graf Date: Sun, 11 Dec 2011 01:21:51 +0100 Subject: [PATCH] linux-user: be silent about capget failures @@ -13,7 +13,7 @@ Signed-off-by: Alexander Graf 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/linux-user/syscall.c b/linux-user/syscall.c -index 792c48e..af01e15 100644 +index 537a7d3..2a151b8 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -7537,7 +7537,7 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1, diff --git a/0016-PPC-KVM-Disable-mmu-notifier-check..patch b/0016-PPC-KVM-Disable-mmu-notifier-check..patch index 480f945f..9ed54e22 100644 --- a/0016-PPC-KVM-Disable-mmu-notifier-check..patch +++ b/0016-PPC-KVM-Disable-mmu-notifier-check..patch @@ -1,4 +1,4 @@ -From 487bbbcf091c98161aee1f0dffd2dd9f29ae6643 Mon Sep 17 00:00:00 2001 +From 3ba205e2e55ac10e22d71d7a806d3bbb1e3f307f 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 diff --git a/0017-linux-user-fix-segfault-deadlock.pa.patch b/0017-linux-user-fix-segfault-deadlock.pa.patch index 0b78e6b3..6df4f9b0 100644 --- a/0017-linux-user-fix-segfault-deadlock.pa.patch +++ b/0017-linux-user-fix-segfault-deadlock.pa.patch @@ -1,4 +1,4 @@ -From 2232d1071fbf654bcdb04e34cdf2dbf6efd2c073 Mon Sep 17 00:00:00 2001 +From 98c931994104612bf6408cb7a1d7f782592953a8 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/0018-linux-user-binfmt-support-host-bina.patch b/0018-linux-user-binfmt-support-host-bina.patch index f5593377..1eb451b0 100644 --- a/0018-linux-user-binfmt-support-host-bina.patch +++ b/0018-linux-user-binfmt-support-host-bina.patch @@ -1,4 +1,4 @@ -From 1af50e17428a53c3233554f1f03a3958a83f9ace Mon Sep 17 00:00:00 2001 +From 698c855c6a60151974de79a1c8fff71180d18279 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/0019-linux-user-arm-no-tb_flush-on-reset.patch b/0019-linux-user-arm-no-tb_flush-on-reset.patch index a3cfdab7..3e0d8eab 100644 --- a/0019-linux-user-arm-no-tb_flush-on-reset.patch +++ b/0019-linux-user-arm-no-tb_flush-on-reset.patch @@ -1,4 +1,4 @@ -From adad3a28638056a0719c1c75aa54fb76d31b7fac Mon Sep 17 00:00:00 2001 +From 68d4c332e5b0be0fb2dd52c92ed39f160113b585 Mon Sep 17 00:00:00 2001 From: Alexander Graf Date: Tue, 29 May 2012 15:30:01 +0200 Subject: [PATCH] linux-user: arm: no tb_flush on reset diff --git a/0020-linux-user-fix-multi-threaded-proc-.patch b/0020-linux-user-fix-multi-threaded-proc-.patch index 5f8f5de5..bd79c211 100644 --- a/0020-linux-user-fix-multi-threaded-proc-.patch +++ b/0020-linux-user-fix-multi-threaded-proc-.patch @@ -1,4 +1,4 @@ -From 90774301973e03fe90be092e4204e6782db7f41c Mon Sep 17 00:00:00 2001 +From 15c3c89300471761bd901ecb2f1df28827d23b63 Mon Sep 17 00:00:00 2001 From: Alexander Graf Date: Wed, 30 May 2012 14:40:47 +0200 Subject: [PATCH] linux-user: fix multi-threaded /proc/self/maps @@ -16,7 +16,7 @@ Signed-off-by: Alexander Graf 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/linux-user/syscall.c b/linux-user/syscall.c -index af01e15..cda50ae 100644 +index 2a151b8..b3d8bd8 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -4975,8 +4975,8 @@ static int open_self_maps(void *cpu_env, int fd) diff --git a/0021-use-libexecdir-instead-of-ignoring-.patch b/0021-use-libexecdir-instead-of-ignoring-.patch index e1a251d2..878e0720 100644 --- a/0021-use-libexecdir-instead-of-ignoring-.patch +++ b/0021-use-libexecdir-instead-of-ignoring-.patch @@ -1,9 +1,10 @@ -From f2fc46bfbd9a0393e29f45c7470a96074227a911 Mon Sep 17 00:00:00 2001 +From b8d72040c53f4d087bce85bec90fe801f09d6685 Mon Sep 17 00:00:00 2001 From: Michael Tokarev Date: Thu, 7 Jun 2012 01:11:00 +0400 -Subject: [PATCH] use --libexecdir instead of ignoring it first and reinventing it later +Subject: [PATCH] use --libexecdir instead of ignoring it first and + reinventing it later MIME-Version: 1.0 -Content-Type: text/plain; charset=utf-8 +Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Commit 7b93fadf3a38d1ed65ea5536a52efc2772c6e3b8 "Add basic version @@ -26,7 +27,7 @@ Signed-off-by: Andreas Färber 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/configure b/configure -index 352239f..332ff3c 100755 +index ebf7a6b..e39635c 100755 --- a/configure +++ b/configure @@ -183,6 +183,7 @@ datadir="\${prefix}/share" diff --git a/0022-linux-user-Ignore-broken-loop-ioctl.patch b/0022-linux-user-Ignore-broken-loop-ioctl.patch index b9f513bc..82262bf2 100644 --- a/0022-linux-user-Ignore-broken-loop-ioctl.patch +++ b/0022-linux-user-Ignore-broken-loop-ioctl.patch @@ -1,4 +1,4 @@ -From 9f189b36a4c3e5a53e97ef4d820c5465d1dde0a4 Mon Sep 17 00:00:00 2001 +From d174cebc94c91edd45d8a26d47ea4af99154a295 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 @@ -41,7 +41,7 @@ index 8974caa..810ae61 100644 #endif diff --git a/linux-user/syscall.c b/linux-user/syscall.c -index cda50ae..b73c23c 100644 +index b3d8bd8..0c27d31 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -3634,6 +3634,13 @@ out: diff --git a/0023-linux-user-fix-segmentation-fault-p.patch b/0023-linux-user-fix-segmentation-fault-p.patch index 545ab9e8..17a226d9 100644 --- a/0023-linux-user-fix-segmentation-fault-p.patch +++ b/0023-linux-user-fix-segmentation-fault-p.patch @@ -1,9 +1,9 @@ -From c26be2e327b4bc628ce69ea4493d89b76e7c5161 Mon Sep 17 00:00:00 2001 +From e145868d65d5c6c1b6b0e11435cc830a07f4fac2 Mon Sep 17 00:00:00 2001 From: Alexander Graf Date: Mon, 25 Jun 2012 19:02:32 +0200 Subject: [PATCH] linux-user: fix segmentation fault passing with g2h(x) != x MIME-Version: 1.0 -Content-Type: text/plain; charset=utf-8 +Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When forwarding a segmentation fault into the guest process, we were passing diff --git a/0024-linux-user-lock-tcg.patch.patch b/0024-linux-user-lock-tcg.patch.patch index 3bffaf05..002913a8 100644 --- a/0024-linux-user-lock-tcg.patch.patch +++ b/0024-linux-user-lock-tcg.patch.patch @@ -1,4 +1,4 @@ -From be080534c79bad7977c0ca807441bcebe34245b4 Mon Sep 17 00:00:00 2001 +From 4d144a57e91d135c505b47adb50e66f2e2ed13b9 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/0025-linux-user-Run-multi-threaded-code-.patch b/0025-linux-user-Run-multi-threaded-code-.patch index 45cb7e5a..556ba145 100644 --- a/0025-linux-user-Run-multi-threaded-code-.patch +++ b/0025-linux-user-Run-multi-threaded-code-.patch @@ -1,4 +1,4 @@ -From e10fbcf66724e22bf4a2b6a5109538cee21e48fc Mon Sep 17 00:00:00 2001 +From ee625c9596666237f0366f7b9a91f49bf21fb7ae 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 @@ -19,7 +19,7 @@ Signed-off-by: Alexander Graf 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/linux-user/syscall.c b/linux-user/syscall.c -index b73c23c..0c3d4c5 100644 +index 0c27d31..a2dc038 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -4352,6 +4352,15 @@ static int do_fork(CPUArchState *env, unsigned int flags, abi_ulong newsp, diff --git a/0026-linux-user-lock-tb-flushing-too.pat.patch b/0026-linux-user-lock-tb-flushing-too.pat.patch index a4c9fe1a..909b0401 100644 --- a/0026-linux-user-lock-tb-flushing-too.pat.patch +++ b/0026-linux-user-lock-tb-flushing-too.pat.patch @@ -1,4 +1,4 @@ -From 4e526c103457a654a05730709b883c4e9eaa17b4 Mon Sep 17 00:00:00 2001 +From 9f46f8faf593f97d0432bce644dae05b77870d0b 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/0027-linux-user-Fake-proc-cpuinfo.patch.patch b/0027-linux-user-Fake-proc-cpuinfo.patch.patch index a3ed03d3..242a8e58 100644 --- a/0027-linux-user-Fake-proc-cpuinfo.patch.patch +++ b/0027-linux-user-Fake-proc-cpuinfo.patch.patch @@ -1,4 +1,4 @@ -From 4803eca554ee475b50b7a106af1d250a5b525884 Mon Sep 17 00:00:00 2001 +From 2f19b4fb6534d8b5bd17bf7f6f1290fb04cc3ea4 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 @@ -17,7 +17,7 @@ Signed-off-by: Alexander Graf 1 files changed, 20 insertions(+), 0 deletions(-) diff --git a/linux-user/syscall.c b/linux-user/syscall.c -index 0c3d4c5..d19efb8 100644 +index a2dc038..b4ab1d9 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -5035,6 +5035,25 @@ static int open_self_stat(void *cpu_env, int fd) diff --git a/0028-linux-user-implement-FS_IOC_GETFLAG.patch b/0028-linux-user-implement-FS_IOC_GETFLAG.patch index 9bf0df3a..b6c3f315 100644 --- a/0028-linux-user-implement-FS_IOC_GETFLAG.patch +++ b/0028-linux-user-implement-FS_IOC_GETFLAG.patch @@ -1,4 +1,4 @@ -From a3b2002cfb9846a721ab51793c8342ab03e7c593 Mon Sep 17 00:00:00 2001 +From 3e610c449b5dceb84efe8fc7d1bde52428cd7479 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/0029-linux-user-implement-FS_IOC_SETFLAG.patch b/0029-linux-user-implement-FS_IOC_SETFLAG.patch index fae46d69..356e8bfa 100644 --- a/0029-linux-user-implement-FS_IOC_SETFLAG.patch +++ b/0029-linux-user-implement-FS_IOC_SETFLAG.patch @@ -1,4 +1,4 @@ -From 13b665ad3c77d380fdea162870a55bf79d807525 Mon Sep 17 00:00:00 2001 +From cb09219f8b4f0d501dd794fb9b3c7d35d50dcb67 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/0030-linux-user-fix-emulation-of-getdent.patch b/0030-linux-user-fix-emulation-of-getdent.patch index 1045bf3d..e0573c31 100644 --- a/0030-linux-user-fix-emulation-of-getdent.patch +++ b/0030-linux-user-fix-emulation-of-getdent.patch @@ -1,5 +1,5 @@ -From b08f65c466f03820436df6143b1a256f81a5a98a Mon Sep 17 00:00:00 2001 -From: Dmitry V. Levin +From d97740f5cc4e23c5b3fb328eddd2fe409c1dc986 Mon Sep 17 00:00:00 2001 +From: "Dmitry V. Levin" Date: Mon, 20 Aug 2012 12:13:12 +0000 Subject: [PATCH] linux-user: fix emulation of getdents @@ -16,7 +16,7 @@ Signed-off-by: Alexander Graf 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/linux-user/syscall.c b/linux-user/syscall.c -index d19efb8..df4a538 100644 +index b4ab1d9..fc27851 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -7161,15 +7161,14 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1, diff --git a/0031-linux-user-fix-statfs.patch.patch b/0031-linux-user-fix-statfs.patch.patch index 360e8127..94e571ab 100644 --- a/0031-linux-user-fix-statfs.patch.patch +++ b/0031-linux-user-fix-statfs.patch.patch @@ -1,4 +1,4 @@ -From 496ac41ba22b2dcda7eb0a90690dc55ae86c7c50 Mon Sep 17 00:00:00 2001 +From 88b2e6ccf4e6e30b1368937f48fc7eeacaae5de5 Mon Sep 17 00:00:00 2001 From: Alexander Graf Date: Tue, 21 Aug 2012 11:16:06 +0200 Subject: [PATCH] linux-user: fix statfs @@ -17,7 +17,7 @@ Signed-off-by: Alexander Graf 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/linux-user/syscall.c b/linux-user/syscall.c -index df4a538..60cf77f 100644 +index fc27851..9ebc585 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -6667,6 +6667,12 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1, diff --git a/0032-linux-user-XXX-disable-fiemap.patch.patch b/0032-linux-user-XXX-disable-fiemap.patch.patch index 187eff69..adee2e72 100644 --- a/0032-linux-user-XXX-disable-fiemap.patch.patch +++ b/0032-linux-user-XXX-disable-fiemap.patch.patch @@ -1,4 +1,4 @@ -From cb9b53ee9c4277f5b61038b37c1a7ef827652b4a Mon Sep 17 00:00:00 2001 +From d152363fe95b66c3f75e9d47c65e865a70672f8d 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 @@ -9,7 +9,7 @@ agraf: fiemap breaks in libarchive. Disable it for now. 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/linux-user/syscall.c b/linux-user/syscall.c -index 60cf77f..21856f0 100644 +index 9ebc585..f9e7f33 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -3252,6 +3252,11 @@ static abi_long do_ioctl_fs_ioc_fiemap(const IOCTLEntry *ie, uint8_t *buf_temp, diff --git a/qemu-1.2.0-rc0.tar.bz2 b/qemu-1.2.0-rc0.tar.bz2 deleted file mode 100644 index 14d5f2d5..00000000 --- a/qemu-1.2.0-rc0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ce34538df5624bae055979e8b930d3eaa6645e125f0d95fadc92e395b5e9d3f3 -size 9862969 diff --git a/qemu-1.2.0-rc1.tar.bz2 b/qemu-1.2.0-rc1.tar.bz2 new file mode 100644 index 00000000..da44b20f --- /dev/null +++ b/qemu-1.2.0-rc1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1d0d2a4ef8b32d1e7433302edd357351ad83d5798d3fddebc2aab249b463f317 +size 9864774 diff --git a/qemu.changes b/qemu.changes index 3ca33c94..33af4eee 100644 --- a/qemu.changes +++ b/qemu.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Aug 28 15:58:56 UTC 2012 - afaerber@suse.de + +- update to v1.2.0-rc1: http://wiki.qemu.org/ChangeLog/1.2 +* adapt update_git.sh script + ------------------------------------------------------------------- Tue Aug 21 12:21:49 UTC 2012 - agraf@suse.com diff --git a/qemu.spec b/qemu.spec index 0400c221..990e592e 100644 --- a/qemu.spec +++ b/qemu.spec @@ -21,9 +21,9 @@ Url: http://www.qemu.org/ Summary: Universal CPU emulator License: BSD-3-Clause ; GPL-2.0+ ; LGPL-2.1+ ; MIT Group: System/Emulators/PC -Version: 1.2.0rc0 +Version: 1.2.0rc1 Release: 0 -Source: %name-1.2.0-rc0.tar.bz2 +Source: %name-1.2.0-rc1.tar.bz2 Patch0001: 0001-Handle-CPU-interrupts-by-inline-che.patch Patch0002: 0002-XXX-dont-dump-core-on-sigabort.patc.patch Patch0003: 0003-XXX-work-around-SA_RESTART-race-wit.patch @@ -166,7 +166,7 @@ emulations. This can be used together with the OBS build script to run cross-architecture builds. %prep -%setup -q -n qemu-1.2.0-rc0 +%setup -q -n qemu-1.2.0-rc1 %patch0001 -p1 %patch0002 -p1 %patch0003 -p1 diff --git a/qemu.spec.in b/qemu.spec.in index c9535ef9..9e502385 100644 --- a/qemu.spec.in +++ b/qemu.spec.in @@ -21,9 +21,9 @@ Url: http://www.qemu.org/ Summary: Universal CPU emulator License: BSD-3-Clause ; GPL-2.0+ ; LGPL-2.1+ ; MIT Group: System/Emulators/PC -Version: 1.2.0rc0 +Version: 1.2.0rc1 Release: 0 -Source: %name-1.2.0-rc0.tar.bz2 +Source: %name-1.2.0-rc1.tar.bz2 PATCH_FILES # this is to make lint happy Source300: rpmlintrc @@ -135,7 +135,7 @@ emulations. This can be used together with the OBS build script to run cross-architecture builds. %prep -%setup -q -n qemu-1.2.0-rc0 +%setup -q -n qemu-1.2.0-rc1 PATCH_EXEC %build diff --git a/update_git.sh b/update_git.sh index cb2ea22e..202b2c8b 100644 --- a/update_git.sh +++ b/update_git.sh @@ -13,7 +13,7 @@ GIT_TREE=git://repo.or.cz/qemu/agraf.git GIT_LOCAL_TREE=/suse/agraf/git/qemu GIT_BRANCH=suse-1.2 -GIT_UPSTREAM_TAG=v1.2.0-rc0 +GIT_UPSTREAM_TAG=v1.2.0-rc1 QEMU_TMP=/dev/shm/qemu-tmp # clean up