From 3d5fb0946fc64cf8ad0cdb2547f345ece80c2517dbced9e7597e451147a15c0d Mon Sep 17 00:00:00 2001 From: Alexander Graf Date: Wed, 7 Mar 2012 15:17:02 +0000 Subject: [PATCH] - cut off patch file names after 40 bytes, support older git versions for update_git.sh OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=62 --- ...-Handle-CPU-interrupts-by-inline-che.patch | 0 ...-linux-user-fix-QEMU_STRACE-1-segfau.patch | 0 ...03-linux-user-save-auxv-length.patch.patch | 0 ...-linux-user-add-open-hijack-infrastr.patch | 0 ...-linux-user-fake-proc-self-maps.patc.patch | 0 ...-linux-user-fake-proc-self-stat.patc.patch | 0 ...-linux-user-fake-proc-self-auxv.patc.patch | 0 ...-XXX-dont-dump-core-on-sigabort.patc.patch | 0 ...-linux-user-fix-wait-syscall-status-.patch | 0 ...-Revert-linux-user-fix-wait-syscall-.patch | 0 ...-linux-user-fix-wait-syscall-status-.patch | 0 ...-XXX-linux-user-fake-proc-self-maps-.patch | 0 ...-XXX-work-around-SA_RESTART-race-wit.patch | 0 ...-XXX-move-qemu-binary-lower-in-addre.patch | 3 +- ...-linux-user-map-lower-in-address-spa.patch | 0 ...-XXX-fake-proc-self-maps-also-fclose.patch | 0 ...-XXX-map-qemu-higher-again-so-we-hav.patch | 0 ... => 0018-qemu-0.9.0.cvs-binfmt.patch.patch | 0 ...=> 0019-qemu-cvs-alsa_bitfield.patch.patch | 0 ...ch => 0020-qemu-cvs-alsa_ioctl.patch.patch | 0 ...tch => 0021-qemu-cvs-alsa_mmap.patch.patch | 0 ... => 0022-qemu-cvs-gettimeofday.patch.patch | 0 ...h => 0023-qemu-cvs-ioctl_debug.patch.patch | 0 ...024-qemu-cvs-ioctl_nodirection.patch.patch | 0 ...tch => 0025-qemu-img-vmdk-scsi.patch.patch | 0 ...ch => 0026-qemu-nonvoid_return.patch.patch | 0 ...-fix-mipsn32-linux-user-builds.patch.patch | 0 ...-Integrating-Dynamips-and-GNS3-UDP-t.patch | 0 ...-linux-user-add-binfmt-wrapper-for-a.patch | 0 ...-linux-user-Ignore-timer_create-sysc.patch | 0 ...-linux-user-be-silent-about-capget-f.patch | 0 ...-linux-user-reserve-4GB-of-vmem-for-.patch | 0 ...-PPC-KVM-Disable-mmu-notifier-check..patch | 0 ...-linux-user-improve-fake-proc-self-s.patch | 3 +- ...-linux-user-target_argv-is-placed-on.patch | 3 +- ...-PPC-KVM-Ignore-SET_ONE_REG-failures.patch | 30 ------ ...-PPC-KVM-Ignore-ENABLE_PAPR-to-suppo.patch | 3 +- ...-linux-user-fix-segfault-deadlock.pa.patch | 0 ...-linux-user-implement-device-mapper-.patch | 0 ...-linux-user-add-struct-old_dev_t-com.patch | 0 ...-linux-user-fix-BLK-ioctl-arguments..patch | 0 ...-linux-user-add-BLKSSZGET-ioctl-wrap.patch | 0 ...-linux-user-Add-ioctl-for-BLKBSZGET..patch | 0 ...-linux-user-take-RESERVED_VA-into-ac.patch | 0 ...-linux-user-binfmt-support-host-bina.patch | 0 ... 0046-linux-user-fix-fallocate.patch.patch | 0 ...-linux-user-resolve-reserved_va-vma-.patch | 0 qemu.changes | 6 ++ qemu.spec | 94 +++++++++---------- update_git.sh | 11 ++- 50 files changed, 66 insertions(+), 87 deletions(-) rename 0001-Handle-CPU-interrupts-by-inline-checking-of-a-flag.patch => 0001-Handle-CPU-interrupts-by-inline-che.patch (100%) rename 0002-linux-user-fix-QEMU_STRACE-1-segfault.patch => 0002-linux-user-fix-QEMU_STRACE-1-segfau.patch (100%) rename 0003-linux-user-save-auxv-length.patch => 0003-linux-user-save-auxv-length.patch.patch (100%) rename 0004-linux-user-add-open-hijack-infrastructure.patch => 0004-linux-user-add-open-hijack-infrastr.patch (100%) rename 0005-linux-user-fake-proc-self-maps.patch => 0005-linux-user-fake-proc-self-maps.patc.patch (100%) rename 0006-linux-user-fake-proc-self-stat.patch => 0006-linux-user-fake-proc-self-stat.patc.patch (100%) rename 0007-linux-user-fake-proc-self-auxv.patch => 0007-linux-user-fake-proc-self-auxv.patc.patch (100%) rename 0008-XXX-dont-dump-core-on-sigabort.patch => 0008-XXX-dont-dump-core-on-sigabort.patc.patch (100%) rename 0009-linux-user-fix-wait-syscall-status-returns.patch => 0009-linux-user-fix-wait-syscall-status-.patch (100%) rename 0010-Revert-linux-user-fix-wait-syscall-status-returns.patch => 0010-Revert-linux-user-fix-wait-syscall-.patch (100%) rename 0011-linux-user-fix-wait-syscall-status-returns.patch => 0011-linux-user-fix-wait-syscall-status-.patch (100%) rename 0012-XXX-linux-user-fake-proc-self-maps-even-more.patch => 0012-XXX-linux-user-fake-proc-self-maps-.patch (100%) rename 0013-XXX-work-around-SA_RESTART-race-with-boehm-gc-ARM-on.patch => 0013-XXX-work-around-SA_RESTART-race-wit.patch (100%) rename 0014-XXX-move-qemu-binary-lower-in-address-space-so-we-ha.patch => 0014-XXX-move-qemu-binary-lower-in-addre.patch (95%) rename 0015-linux-user-map-lower-in-address-space.patch => 0015-linux-user-map-lower-in-address-spa.patch (100%) rename 0016-XXX-fake-proc-self-maps-also-fclose-real-file.patch => 0016-XXX-fake-proc-self-maps-also-fclose.patch (100%) rename 0017-XXX-map-qemu-higher-again-so-we-have-space-for-brk.patch => 0017-XXX-map-qemu-higher-again-so-we-hav.patch (100%) rename 0018-qemu-0.9.0.cvs-binfmt.patch => 0018-qemu-0.9.0.cvs-binfmt.patch.patch (100%) rename 0019-qemu-cvs-alsa_bitfield.patch => 0019-qemu-cvs-alsa_bitfield.patch.patch (100%) rename 0020-qemu-cvs-alsa_ioctl.patch => 0020-qemu-cvs-alsa_ioctl.patch.patch (100%) rename 0021-qemu-cvs-alsa_mmap.patch => 0021-qemu-cvs-alsa_mmap.patch.patch (100%) rename 0022-qemu-cvs-gettimeofday.patch => 0022-qemu-cvs-gettimeofday.patch.patch (100%) rename 0023-qemu-cvs-ioctl_debug.patch => 0023-qemu-cvs-ioctl_debug.patch.patch (100%) rename 0024-qemu-cvs-ioctl_nodirection.patch => 0024-qemu-cvs-ioctl_nodirection.patch.patch (100%) rename 0025-qemu-img-vmdk-scsi.patch => 0025-qemu-img-vmdk-scsi.patch.patch (100%) rename 0026-qemu-nonvoid_return.patch => 0026-qemu-nonvoid_return.patch.patch (100%) rename 0027-fix-mipsn32-linux-user-builds.patch => 0027-fix-mipsn32-linux-user-builds.patch.patch (100%) rename 0028-Integrating-Dynamips-and-GNS3-UDP-tunnels-Patches.patch => 0028-Integrating-Dynamips-and-GNS3-UDP-t.patch (100%) rename 0029-linux-user-add-binfmt-wrapper-for-argv-0-handling.patch => 0029-linux-user-add-binfmt-wrapper-for-a.patch (100%) rename 0030-linux-user-Ignore-timer_create-syscall.patch => 0030-linux-user-Ignore-timer_create-sysc.patch (100%) rename 0031-linux-user-be-silent-about-capget-failures.patch => 0031-linux-user-be-silent-about-capget-f.patch (100%) rename 0032-linux-user-reserve-4GB-of-vmem-for-32-on-64.patch => 0032-linux-user-reserve-4GB-of-vmem-for-.patch (100%) rename 0033-PPC-KVM-Disable-mmu-notifier-check.patch => 0033-PPC-KVM-Disable-mmu-notifier-check..patch (100%) rename 0034-linux-user-improve-fake-proc-self-stat-making-ps-not.patch => 0034-linux-user-improve-fake-proc-self-s.patch (98%) rename 0035-linux-user-target_argv-is-placed-on-ts-bprm-argv-and.patch => 0035-linux-user-target_argv-is-placed-on.patch (97%) delete mode 100644 0036-PPC-KVM-Ignore-SET_ONE_REG-failures.patch rename 0037-PPC-KVM-Ignore-ENABLE_PAPR-to-support-very-old-HV-KV.patch => 0037-PPC-KVM-Ignore-ENABLE_PAPR-to-suppo.patch (97%) rename 0038-linux-user-fix-segfault-deadlock.patch => 0038-linux-user-fix-segfault-deadlock.pa.patch (100%) rename 0039-linux-user-implement-device-mapper-ioctls.patch => 0039-linux-user-implement-device-mapper-.patch (100%) rename 0040-linux-user-add-struct-old_dev_t-compat.patch => 0040-linux-user-add-struct-old_dev_t-com.patch (100%) rename 0041-linux-user-fix-BLK-ioctl-arguments.patch => 0041-linux-user-fix-BLK-ioctl-arguments..patch (100%) rename 0042-linux-user-add-BLKSSZGET-ioctl-wrapper.patch => 0042-linux-user-add-BLKSSZGET-ioctl-wrap.patch (100%) rename 0043-linux-user-Add-ioctl-for-BLKBSZGET.patch => 0043-linux-user-Add-ioctl-for-BLKBSZGET..patch (100%) rename 0044-linux-user-take-RESERVED_VA-into-account-for-g2h_val.patch => 0044-linux-user-take-RESERVED_VA-into-ac.patch (100%) rename 0045-linux-user-binfmt-support-host-binaries.patch => 0045-linux-user-binfmt-support-host-bina.patch (100%) rename 0046-linux-user-fix-fallocate.patch => 0046-linux-user-fix-fallocate.patch.patch (100%) rename 0047-linux-user-resolve-reserved_va-vma-downwards.patch => 0047-linux-user-resolve-reserved_va-vma-.patch (100%) diff --git a/0001-Handle-CPU-interrupts-by-inline-checking-of-a-flag.patch b/0001-Handle-CPU-interrupts-by-inline-che.patch similarity index 100% rename from 0001-Handle-CPU-interrupts-by-inline-checking-of-a-flag.patch rename to 0001-Handle-CPU-interrupts-by-inline-che.patch diff --git a/0002-linux-user-fix-QEMU_STRACE-1-segfault.patch b/0002-linux-user-fix-QEMU_STRACE-1-segfau.patch similarity index 100% rename from 0002-linux-user-fix-QEMU_STRACE-1-segfault.patch rename to 0002-linux-user-fix-QEMU_STRACE-1-segfau.patch diff --git a/0003-linux-user-save-auxv-length.patch b/0003-linux-user-save-auxv-length.patch.patch similarity index 100% rename from 0003-linux-user-save-auxv-length.patch rename to 0003-linux-user-save-auxv-length.patch.patch diff --git a/0004-linux-user-add-open-hijack-infrastructure.patch b/0004-linux-user-add-open-hijack-infrastr.patch similarity index 100% rename from 0004-linux-user-add-open-hijack-infrastructure.patch rename to 0004-linux-user-add-open-hijack-infrastr.patch diff --git a/0005-linux-user-fake-proc-self-maps.patch b/0005-linux-user-fake-proc-self-maps.patc.patch similarity index 100% rename from 0005-linux-user-fake-proc-self-maps.patch rename to 0005-linux-user-fake-proc-self-maps.patc.patch diff --git a/0006-linux-user-fake-proc-self-stat.patch b/0006-linux-user-fake-proc-self-stat.patc.patch similarity index 100% rename from 0006-linux-user-fake-proc-self-stat.patch rename to 0006-linux-user-fake-proc-self-stat.patc.patch diff --git a/0007-linux-user-fake-proc-self-auxv.patch b/0007-linux-user-fake-proc-self-auxv.patc.patch similarity index 100% rename from 0007-linux-user-fake-proc-self-auxv.patch rename to 0007-linux-user-fake-proc-self-auxv.patc.patch diff --git a/0008-XXX-dont-dump-core-on-sigabort.patch b/0008-XXX-dont-dump-core-on-sigabort.patc.patch similarity index 100% rename from 0008-XXX-dont-dump-core-on-sigabort.patch rename to 0008-XXX-dont-dump-core-on-sigabort.patc.patch diff --git a/0009-linux-user-fix-wait-syscall-status-returns.patch b/0009-linux-user-fix-wait-syscall-status-.patch similarity index 100% rename from 0009-linux-user-fix-wait-syscall-status-returns.patch rename to 0009-linux-user-fix-wait-syscall-status-.patch diff --git a/0010-Revert-linux-user-fix-wait-syscall-status-returns.patch b/0010-Revert-linux-user-fix-wait-syscall-.patch similarity index 100% rename from 0010-Revert-linux-user-fix-wait-syscall-status-returns.patch rename to 0010-Revert-linux-user-fix-wait-syscall-.patch diff --git a/0011-linux-user-fix-wait-syscall-status-returns.patch b/0011-linux-user-fix-wait-syscall-status-.patch similarity index 100% rename from 0011-linux-user-fix-wait-syscall-status-returns.patch rename to 0011-linux-user-fix-wait-syscall-status-.patch diff --git a/0012-XXX-linux-user-fake-proc-self-maps-even-more.patch b/0012-XXX-linux-user-fake-proc-self-maps-.patch similarity index 100% rename from 0012-XXX-linux-user-fake-proc-self-maps-even-more.patch rename to 0012-XXX-linux-user-fake-proc-self-maps-.patch diff --git a/0013-XXX-work-around-SA_RESTART-race-with-boehm-gc-ARM-on.patch b/0013-XXX-work-around-SA_RESTART-race-wit.patch similarity index 100% rename from 0013-XXX-work-around-SA_RESTART-race-with-boehm-gc-ARM-on.patch rename to 0013-XXX-work-around-SA_RESTART-race-wit.patch diff --git a/0014-XXX-move-qemu-binary-lower-in-address-space-so-we-ha.patch b/0014-XXX-move-qemu-binary-lower-in-addre.patch similarity index 95% rename from 0014-XXX-move-qemu-binary-lower-in-address-space-so-we-ha.patch rename to 0014-XXX-move-qemu-binary-lower-in-addre.patch index c90fe763..d7f86f79 100644 --- a/0014-XXX-move-qemu-binary-lower-in-address-space-so-we-ha.patch +++ b/0014-XXX-move-qemu-binary-lower-in-addre.patch @@ -1,8 +1,7 @@ From 4c1134246f3bd0af9b9b512a2094010ed12e7895 Mon Sep 17 00:00:00 2001 From: Alexander Graf Date: Mon, 5 Dec 2011 23:37:52 +0100 -Subject: [PATCH] XXX move qemu binary lower in address space so we have space - for guest stuff +Subject: [PATCH] XXX move qemu binary lower in address space so we have space for guest stuff --- x86_64.ld | 2 +- diff --git a/0015-linux-user-map-lower-in-address-space.patch b/0015-linux-user-map-lower-in-address-spa.patch similarity index 100% rename from 0015-linux-user-map-lower-in-address-space.patch rename to 0015-linux-user-map-lower-in-address-spa.patch diff --git a/0016-XXX-fake-proc-self-maps-also-fclose-real-file.patch b/0016-XXX-fake-proc-self-maps-also-fclose.patch similarity index 100% rename from 0016-XXX-fake-proc-self-maps-also-fclose-real-file.patch rename to 0016-XXX-fake-proc-self-maps-also-fclose.patch diff --git a/0017-XXX-map-qemu-higher-again-so-we-have-space-for-brk.patch b/0017-XXX-map-qemu-higher-again-so-we-hav.patch similarity index 100% rename from 0017-XXX-map-qemu-higher-again-so-we-have-space-for-brk.patch rename to 0017-XXX-map-qemu-higher-again-so-we-hav.patch diff --git a/0018-qemu-0.9.0.cvs-binfmt.patch b/0018-qemu-0.9.0.cvs-binfmt.patch.patch similarity index 100% rename from 0018-qemu-0.9.0.cvs-binfmt.patch rename to 0018-qemu-0.9.0.cvs-binfmt.patch.patch diff --git a/0019-qemu-cvs-alsa_bitfield.patch b/0019-qemu-cvs-alsa_bitfield.patch.patch similarity index 100% rename from 0019-qemu-cvs-alsa_bitfield.patch rename to 0019-qemu-cvs-alsa_bitfield.patch.patch diff --git a/0020-qemu-cvs-alsa_ioctl.patch b/0020-qemu-cvs-alsa_ioctl.patch.patch similarity index 100% rename from 0020-qemu-cvs-alsa_ioctl.patch rename to 0020-qemu-cvs-alsa_ioctl.patch.patch diff --git a/0021-qemu-cvs-alsa_mmap.patch b/0021-qemu-cvs-alsa_mmap.patch.patch similarity index 100% rename from 0021-qemu-cvs-alsa_mmap.patch rename to 0021-qemu-cvs-alsa_mmap.patch.patch diff --git a/0022-qemu-cvs-gettimeofday.patch b/0022-qemu-cvs-gettimeofday.patch.patch similarity index 100% rename from 0022-qemu-cvs-gettimeofday.patch rename to 0022-qemu-cvs-gettimeofday.patch.patch diff --git a/0023-qemu-cvs-ioctl_debug.patch b/0023-qemu-cvs-ioctl_debug.patch.patch similarity index 100% rename from 0023-qemu-cvs-ioctl_debug.patch rename to 0023-qemu-cvs-ioctl_debug.patch.patch diff --git a/0024-qemu-cvs-ioctl_nodirection.patch b/0024-qemu-cvs-ioctl_nodirection.patch.patch similarity index 100% rename from 0024-qemu-cvs-ioctl_nodirection.patch rename to 0024-qemu-cvs-ioctl_nodirection.patch.patch diff --git a/0025-qemu-img-vmdk-scsi.patch b/0025-qemu-img-vmdk-scsi.patch.patch similarity index 100% rename from 0025-qemu-img-vmdk-scsi.patch rename to 0025-qemu-img-vmdk-scsi.patch.patch diff --git a/0026-qemu-nonvoid_return.patch b/0026-qemu-nonvoid_return.patch.patch similarity index 100% rename from 0026-qemu-nonvoid_return.patch rename to 0026-qemu-nonvoid_return.patch.patch diff --git a/0027-fix-mipsn32-linux-user-builds.patch b/0027-fix-mipsn32-linux-user-builds.patch.patch similarity index 100% rename from 0027-fix-mipsn32-linux-user-builds.patch rename to 0027-fix-mipsn32-linux-user-builds.patch.patch diff --git a/0028-Integrating-Dynamips-and-GNS3-UDP-tunnels-Patches.patch b/0028-Integrating-Dynamips-and-GNS3-UDP-t.patch similarity index 100% rename from 0028-Integrating-Dynamips-and-GNS3-UDP-tunnels-Patches.patch rename to 0028-Integrating-Dynamips-and-GNS3-UDP-t.patch diff --git a/0029-linux-user-add-binfmt-wrapper-for-argv-0-handling.patch b/0029-linux-user-add-binfmt-wrapper-for-a.patch similarity index 100% rename from 0029-linux-user-add-binfmt-wrapper-for-argv-0-handling.patch rename to 0029-linux-user-add-binfmt-wrapper-for-a.patch diff --git a/0030-linux-user-Ignore-timer_create-syscall.patch b/0030-linux-user-Ignore-timer_create-sysc.patch similarity index 100% rename from 0030-linux-user-Ignore-timer_create-syscall.patch rename to 0030-linux-user-Ignore-timer_create-sysc.patch diff --git a/0031-linux-user-be-silent-about-capget-failures.patch b/0031-linux-user-be-silent-about-capget-f.patch similarity index 100% rename from 0031-linux-user-be-silent-about-capget-failures.patch rename to 0031-linux-user-be-silent-about-capget-f.patch diff --git a/0032-linux-user-reserve-4GB-of-vmem-for-32-on-64.patch b/0032-linux-user-reserve-4GB-of-vmem-for-.patch similarity index 100% rename from 0032-linux-user-reserve-4GB-of-vmem-for-32-on-64.patch rename to 0032-linux-user-reserve-4GB-of-vmem-for-.patch diff --git a/0033-PPC-KVM-Disable-mmu-notifier-check.patch b/0033-PPC-KVM-Disable-mmu-notifier-check..patch similarity index 100% rename from 0033-PPC-KVM-Disable-mmu-notifier-check.patch rename to 0033-PPC-KVM-Disable-mmu-notifier-check..patch diff --git a/0034-linux-user-improve-fake-proc-self-stat-making-ps-not.patch b/0034-linux-user-improve-fake-proc-self-s.patch similarity index 98% rename from 0034-linux-user-improve-fake-proc-self-stat-making-ps-not.patch rename to 0034-linux-user-improve-fake-proc-self-s.patch index a648ee4b..2d812617 100644 --- a/0034-linux-user-improve-fake-proc-self-stat-making-ps-not.patch +++ b/0034-linux-user-improve-fake-proc-self-s.patch @@ -1,8 +1,7 @@ From 9a72708a58d7bcbc1ba036a44cea920a238b0312 Mon Sep 17 00:00:00 2001 From: Fabio Erculiani Date: Tue, 3 Jan 2012 09:38:34 +0000 -Subject: [PATCH] linux-user: improve fake /proc/self/stat making `ps` not - segfault. +Subject: [PATCH] linux-user: improve fake /proc/self/stat making `ps` not segfault. With the current fake /proc/self/stat implementation `ps` is segfaulting because it expects to read PID and argv[0] as first and diff --git a/0035-linux-user-target_argv-is-placed-on-ts-bprm-argv-and.patch b/0035-linux-user-target_argv-is-placed-on.patch similarity index 97% rename from 0035-linux-user-target_argv-is-placed-on-ts-bprm-argv-and.patch rename to 0035-linux-user-target_argv-is-placed-on.patch index cb0776d1..7632bd8f 100644 --- a/0035-linux-user-target_argv-is-placed-on-ts-bprm-argv-and.patch +++ b/0035-linux-user-target_argv-is-placed-on.patch @@ -1,8 +1,7 @@ From e8171f6d129e129fe632721ab603f800385b0609 Mon Sep 17 00:00:00 2001 From: Fabio Erculiani Date: Tue, 3 Jan 2012 09:38:35 +0000 -Subject: [PATCH] linux-user: target_argv is placed on ts->bprm->argv and - can't be freed() +Subject: [PATCH] linux-user: target_argv is placed on ts->bprm->argv and can't be freed() TaskState contains linux_bprm struct which encapsulates argv among other things. diff --git a/0036-PPC-KVM-Ignore-SET_ONE_REG-failures.patch b/0036-PPC-KVM-Ignore-SET_ONE_REG-failures.patch deleted file mode 100644 index d54c2f65..00000000 --- a/0036-PPC-KVM-Ignore-SET_ONE_REG-failures.patch +++ /dev/null @@ -1,30 +0,0 @@ -From f0fd80de8f15efc091751f2e9bf4c2276ba058b3 Mon Sep 17 00:00:00 2001 -From: Alexander Graf -Date: Tue, 10 Jan 2012 16:25:27 +0100 -Subject: [PATCH] PPC: KVM: Ignore SET_ONE_REG failures - -The SET_ONE_REG interface didn't make it upstream in the form that is used -in qemu-1.0, so the code won't work. Make the error a warning, so we can -at least use the HV target. - -Signed-off-by: Alexander Graf ---- - target-ppc/kvm.c | 5 ++++- - 1 files changed, 4 insertions(+), 1 deletions(-) - -diff --git a/target-ppc/kvm.c b/target-ppc/kvm.c -index 0410901..6c6278a 100644 ---- a/target-ppc/kvm.c -+++ b/target-ppc/kvm.c -@@ -759,7 +759,10 @@ void kvmppc_set_papr(CPUState *env) - reg.u.reg64 = env->spr[SPR_HIOR]; - ret = kvm_vcpu_ioctl(env, KVM_SET_ONE_REG, ®); - if (ret) { -- goto fail; -+ fprintf(stderr, "Couldn't set HIOR. Maybe you're running an old \n" -+ "kernel with support for HV KVM but no PAPR PR \n" -+ "KVM in which case things will work. If they don't \n" -+ "please update your host kernel!\n"); - } - - /* Set SDR1 so kernel space finds the HTAB */ diff --git a/0037-PPC-KVM-Ignore-ENABLE_PAPR-to-support-very-old-HV-KV.patch b/0037-PPC-KVM-Ignore-ENABLE_PAPR-to-suppo.patch similarity index 97% rename from 0037-PPC-KVM-Ignore-ENABLE_PAPR-to-support-very-old-HV-KV.patch rename to 0037-PPC-KVM-Ignore-ENABLE_PAPR-to-suppo.patch index 997edad4..e1789689 100644 --- a/0037-PPC-KVM-Ignore-ENABLE_PAPR-to-support-very-old-HV-KV.patch +++ b/0037-PPC-KVM-Ignore-ENABLE_PAPR-to-suppo.patch @@ -1,8 +1,7 @@ From 351142c287c874f959828c6360cda977306dfa47 Mon Sep 17 00:00:00 2001 From: Alexander Graf Date: Tue, 10 Jan 2012 17:03:02 +0100 -Subject: [PATCH] PPC: KVM: Ignore ENABLE_PAPR to support very old HV KVM - kernels +Subject: [PATCH] PPC: KVM: Ignore ENABLE_PAPR to support very old HV KVM kernels Very old kernels (3.1) didn't expose the PAPR capability yet, but still did work with HV KVM. Make the error a warning so we can work on them. diff --git a/0038-linux-user-fix-segfault-deadlock.patch b/0038-linux-user-fix-segfault-deadlock.pa.patch similarity index 100% rename from 0038-linux-user-fix-segfault-deadlock.patch rename to 0038-linux-user-fix-segfault-deadlock.pa.patch diff --git a/0039-linux-user-implement-device-mapper-ioctls.patch b/0039-linux-user-implement-device-mapper-.patch similarity index 100% rename from 0039-linux-user-implement-device-mapper-ioctls.patch rename to 0039-linux-user-implement-device-mapper-.patch diff --git a/0040-linux-user-add-struct-old_dev_t-compat.patch b/0040-linux-user-add-struct-old_dev_t-com.patch similarity index 100% rename from 0040-linux-user-add-struct-old_dev_t-compat.patch rename to 0040-linux-user-add-struct-old_dev_t-com.patch diff --git a/0041-linux-user-fix-BLK-ioctl-arguments.patch b/0041-linux-user-fix-BLK-ioctl-arguments..patch similarity index 100% rename from 0041-linux-user-fix-BLK-ioctl-arguments.patch rename to 0041-linux-user-fix-BLK-ioctl-arguments..patch diff --git a/0042-linux-user-add-BLKSSZGET-ioctl-wrapper.patch b/0042-linux-user-add-BLKSSZGET-ioctl-wrap.patch similarity index 100% rename from 0042-linux-user-add-BLKSSZGET-ioctl-wrapper.patch rename to 0042-linux-user-add-BLKSSZGET-ioctl-wrap.patch diff --git a/0043-linux-user-Add-ioctl-for-BLKBSZGET.patch b/0043-linux-user-Add-ioctl-for-BLKBSZGET..patch similarity index 100% rename from 0043-linux-user-Add-ioctl-for-BLKBSZGET.patch rename to 0043-linux-user-Add-ioctl-for-BLKBSZGET..patch diff --git a/0044-linux-user-take-RESERVED_VA-into-account-for-g2h_val.patch b/0044-linux-user-take-RESERVED_VA-into-ac.patch similarity index 100% rename from 0044-linux-user-take-RESERVED_VA-into-account-for-g2h_val.patch rename to 0044-linux-user-take-RESERVED_VA-into-ac.patch diff --git a/0045-linux-user-binfmt-support-host-binaries.patch b/0045-linux-user-binfmt-support-host-bina.patch similarity index 100% rename from 0045-linux-user-binfmt-support-host-binaries.patch rename to 0045-linux-user-binfmt-support-host-bina.patch diff --git a/0046-linux-user-fix-fallocate.patch b/0046-linux-user-fix-fallocate.patch.patch similarity index 100% rename from 0046-linux-user-fix-fallocate.patch rename to 0046-linux-user-fix-fallocate.patch.patch diff --git a/0047-linux-user-resolve-reserved_va-vma-downwards.patch b/0047-linux-user-resolve-reserved_va-vma-.patch similarity index 100% rename from 0047-linux-user-resolve-reserved_va-vma-downwards.patch rename to 0047-linux-user-resolve-reserved_va-vma-.patch diff --git a/qemu.changes b/qemu.changes index c57a36fd..8778814d 100644 --- a/qemu.changes +++ b/qemu.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Mar 7 15:16:16 UTC 2012 - agraf@suse.com + +- cut off patch file names after 40 bytes, support older git versions + for update_git.sh + ------------------------------------------------------------------- Mon Mar 5 01:31:42 UTC 2012 - agraf@suse.com diff --git a/qemu.spec b/qemu.spec index cedda708..94276b39 100644 --- a/qemu.spec +++ b/qemu.spec @@ -25,53 +25,52 @@ Group: System/Emulators/PC Version: 1.0.1 Release: 0 Source: %name-%version.tar.bz2 -Patch0001: 0001-Handle-CPU-interrupts-by-inline-checking-of-a-flag.patch -Patch0002: 0002-linux-user-fix-QEMU_STRACE-1-segfault.patch -Patch0003: 0003-linux-user-save-auxv-length.patch -Patch0004: 0004-linux-user-add-open-hijack-infrastructure.patch -Patch0005: 0005-linux-user-fake-proc-self-maps.patch -Patch0006: 0006-linux-user-fake-proc-self-stat.patch -Patch0007: 0007-linux-user-fake-proc-self-auxv.patch -Patch0008: 0008-XXX-dont-dump-core-on-sigabort.patch -Patch0009: 0009-linux-user-fix-wait-syscall-status-returns.patch -Patch0010: 0010-Revert-linux-user-fix-wait-syscall-status-returns.patch -Patch0011: 0011-linux-user-fix-wait-syscall-status-returns.patch -Patch0012: 0012-XXX-linux-user-fake-proc-self-maps-even-more.patch -Patch0013: 0013-XXX-work-around-SA_RESTART-race-with-boehm-gc-ARM-on.patch -Patch0014: 0014-XXX-move-qemu-binary-lower-in-address-space-so-we-ha.patch -Patch0015: 0015-linux-user-map-lower-in-address-space.patch -Patch0016: 0016-XXX-fake-proc-self-maps-also-fclose-real-file.patch -Patch0017: 0017-XXX-map-qemu-higher-again-so-we-have-space-for-brk.patch -Patch0018: 0018-qemu-0.9.0.cvs-binfmt.patch -Patch0019: 0019-qemu-cvs-alsa_bitfield.patch -Patch0020: 0020-qemu-cvs-alsa_ioctl.patch -Patch0021: 0021-qemu-cvs-alsa_mmap.patch -Patch0022: 0022-qemu-cvs-gettimeofday.patch -Patch0023: 0023-qemu-cvs-ioctl_debug.patch -Patch0024: 0024-qemu-cvs-ioctl_nodirection.patch -Patch0025: 0025-qemu-img-vmdk-scsi.patch -Patch0026: 0026-qemu-nonvoid_return.patch -Patch0027: 0027-fix-mipsn32-linux-user-builds.patch -Patch0028: 0028-Integrating-Dynamips-and-GNS3-UDP-tunnels-Patches.patch -Patch0029: 0029-linux-user-add-binfmt-wrapper-for-argv-0-handling.patch -Patch0030: 0030-linux-user-Ignore-timer_create-syscall.patch -Patch0031: 0031-linux-user-be-silent-about-capget-failures.patch -Patch0032: 0032-linux-user-reserve-4GB-of-vmem-for-32-on-64.patch -Patch0033: 0033-PPC-KVM-Disable-mmu-notifier-check.patch -Patch0034: 0034-linux-user-improve-fake-proc-self-stat-making-ps-not.patch -Patch0035: 0035-linux-user-target_argv-is-placed-on-ts-bprm-argv-and.patch -Patch0036: 0036-PPC-KVM-Ignore-SET_ONE_REG-failures.patch -Patch0037: 0037-PPC-KVM-Ignore-ENABLE_PAPR-to-support-very-old-HV-KV.patch -Patch0038: 0038-linux-user-fix-segfault-deadlock.patch -Patch0039: 0039-linux-user-implement-device-mapper-ioctls.patch -Patch0040: 0040-linux-user-add-struct-old_dev_t-compat.patch -Patch0041: 0041-linux-user-fix-BLK-ioctl-arguments.patch -Patch0042: 0042-linux-user-add-BLKSSZGET-ioctl-wrapper.patch -Patch0043: 0043-linux-user-Add-ioctl-for-BLKBSZGET.patch -Patch0044: 0044-linux-user-take-RESERVED_VA-into-account-for-g2h_val.patch -Patch0045: 0045-linux-user-binfmt-support-host-binaries.patch -Patch0046: 0046-linux-user-fix-fallocate.patch -Patch0047: 0047-linux-user-resolve-reserved_va-vma-downwards.patch +Patch0001: 0001-Handle-CPU-interrupts-by-inline-che.patch +Patch0002: 0002-linux-user-fix-QEMU_STRACE-1-segfau.patch +Patch0003: 0003-linux-user-save-auxv-length.patch.patch +Patch0004: 0004-linux-user-add-open-hijack-infrastr.patch +Patch0005: 0005-linux-user-fake-proc-self-maps.patc.patch +Patch0006: 0006-linux-user-fake-proc-self-stat.patc.patch +Patch0007: 0007-linux-user-fake-proc-self-auxv.patc.patch +Patch0008: 0008-XXX-dont-dump-core-on-sigabort.patc.patch +Patch0009: 0009-linux-user-fix-wait-syscall-status-.patch +Patch0010: 0010-Revert-linux-user-fix-wait-syscall-.patch +Patch0011: 0011-linux-user-fix-wait-syscall-status-.patch +Patch0012: 0012-XXX-linux-user-fake-proc-self-maps-.patch +Patch0013: 0013-XXX-work-around-SA_RESTART-race-wit.patch +Patch0014: 0014-XXX-move-qemu-binary-lower-in-addre.patch +Patch0015: 0015-linux-user-map-lower-in-address-spa.patch +Patch0016: 0016-XXX-fake-proc-self-maps-also-fclose.patch +Patch0017: 0017-XXX-map-qemu-higher-again-so-we-hav.patch +Patch0018: 0018-qemu-0.9.0.cvs-binfmt.patch.patch +Patch0019: 0019-qemu-cvs-alsa_bitfield.patch.patch +Patch0020: 0020-qemu-cvs-alsa_ioctl.patch.patch +Patch0021: 0021-qemu-cvs-alsa_mmap.patch.patch +Patch0022: 0022-qemu-cvs-gettimeofday.patch.patch +Patch0023: 0023-qemu-cvs-ioctl_debug.patch.patch +Patch0024: 0024-qemu-cvs-ioctl_nodirection.patch.patch +Patch0025: 0025-qemu-img-vmdk-scsi.patch.patch +Patch0026: 0026-qemu-nonvoid_return.patch.patch +Patch0027: 0027-fix-mipsn32-linux-user-builds.patch.patch +Patch0028: 0028-Integrating-Dynamips-and-GNS3-UDP-t.patch +Patch0029: 0029-linux-user-add-binfmt-wrapper-for-a.patch +Patch0030: 0030-linux-user-Ignore-timer_create-sysc.patch +Patch0031: 0031-linux-user-be-silent-about-capget-f.patch +Patch0032: 0032-linux-user-reserve-4GB-of-vmem-for-.patch +Patch0033: 0033-PPC-KVM-Disable-mmu-notifier-check..patch +Patch0034: 0034-linux-user-improve-fake-proc-self-s.patch +Patch0035: 0035-linux-user-target_argv-is-placed-on.patch +Patch0037: 0037-PPC-KVM-Ignore-ENABLE_PAPR-to-suppo.patch +Patch0038: 0038-linux-user-fix-segfault-deadlock.pa.patch +Patch0039: 0039-linux-user-implement-device-mapper-.patch +Patch0040: 0040-linux-user-add-struct-old_dev_t-com.patch +Patch0041: 0041-linux-user-fix-BLK-ioctl-arguments..patch +Patch0042: 0042-linux-user-add-BLKSSZGET-ioctl-wrap.patch +Patch0043: 0043-linux-user-Add-ioctl-for-BLKBSZGET..patch +Patch0044: 0044-linux-user-take-RESERVED_VA-into-ac.patch +Patch0045: 0045-linux-user-binfmt-support-host-bina.patch +Patch0046: 0046-linux-user-fix-fallocate.patch.patch +Patch0047: 0047-linux-user-resolve-reserved_va-vma-.patch # this is to make lint happy Source300: rpmlintrc Source400: update_git.sh @@ -174,7 +173,6 @@ run cross architectures builds %patch0033 -p1 %patch0034 -p1 %patch0035 -p1 -%patch0036 -p1 %patch0037 -p1 %patch0038 -p1 %patch0039 -p1 diff --git a/update_git.sh b/update_git.sh index 7bbe7a91..81ddc511 100644 --- a/update_git.sh +++ b/update_git.sh @@ -33,10 +33,19 @@ else git remote update fi git checkout $GIT_BRANCH -git format-patch -N --no-signature $GIT_UPSTREAM_TAG -o .. +git format-patch -N $GIT_UPSTREAM_TAG -o .. cd .. rm -rf qemu-tmp +# cut off file name after 40 bytes, so we work around git version differences +# while at it, also remove the signature +for i in 0*; do + PATCHNAME=${i%.patch} + PATCHNAME=${i:0:40}.patch + head -n $(expr $(wc -l $i | cut -d ' ' -f 1) - 3) $i > "$PATCHNAME" + rm "$i" +done + # we have all patches as files now - generate the spec file! while IFS= read -r line; do if [ "$line" = "PATCH_FILES" ]; then