Hello community,
here is the log from the commit of package qemu for openSUSE:Factory checked in at 2014-07-18 06:40:21
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/qemu (Old)
and /work/SRC/openSUSE:Factory/.qemu.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qemu"
Changes:
--------
--- /work/SRC/openSUSE:Factory/qemu/qemu-linux-user.changes 2014-05-17 22:01:30.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.qemu.new/qemu-linux-user.changes 2014-07-18 06:40:40.000000000 +0200
@@ -1,0 +2,20 @@
+Wed Jul 16 17:31:54 UTC 2014 - afaerber@suse.de
+
+- Update to v2.1.0-rc2: 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 accordingly
+
+-------------------------------------------------------------------
+Wed Jul 9 17:34:55 UTC 2014 - afaerber@suse.de
+
+- Update to v2.1.0-rc0: http://wiki.qemu-project.org/ChangeLog/2.1
+* Dropped patches on rebase:
+ 0043-arm-translate.c-Fix-smlald-Instruct.patch
+ 0044-target-arm-A64-fix-unallocated-test.patch
+* Package qemu-ppc64le binary
+* Modified update_git.sh accordingly
+
+- Update to v2.1.0-rc1: http://wiki.qemu-project.org/ChangeLog/2.1
+* Modified update_git.sh accordingly
+
+-------------------------------------------------------------------
--- /work/SRC/openSUSE:Factory/qemu/qemu.changes 2014-07-11 20:05:27.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.qemu.new/qemu.changes 2014-07-18 06:40:40.000000000 +0200
@@ -1,0 +2,72 @@
+Wed Jul 16 17:31:54 UTC 2014 - afaerber@suse.de
+
+- Update to v2.1.0-rc2: http://wiki.qemu-project.org/ChangeLog/2.1
+* Patch queue updated from git://github.com/openSUSE/qemu.git opensuse-2.1
+* Patches dropped:
+ 0041-tests-Fix-unterminated-string-outpu.patch
+ 0042-libqos-Fix-PC-PCI-endianness-glitch.patch
+ 0043-qtest-fix-vhost-user-test-compilati.patch
+* Updated update_git.sh accordingly
+* Extended update_git.sh to add generated patch names to change log
+
+-------------------------------------------------------------------
+Wed Jul 9 17:34:55 UTC 2014 - afaerber@suse.de
+
+- Update to v2.1.0-rc0: http://wiki.qemu-project.org/ChangeLog/2.1
+* xen_disk discard support now upstream
+ 0037-xen_disk-add-discard-support.patch dropped
+* PowerPC ELF v2 support now upstream
+ 0045-tcg-ppc64-Support-the-ELFv2-ABI.patch dropped
+* Patches renamed during rebase:
+ 0015-linux-user-arm-no-tb_flush-on-reset.patch -> 0015-target-arm-linux-user-no-tb_flush-o.patch
+* Patches reordered due to rebase:
+ 0038-tests-Don-t-run-qom-test-twice.patch -> 0037-tests-Don-t-run-qom-test-twice.patch
+ 0041-qtest-Increase-socket-timeout.patch -> 0038-qtest-Increase-socket-timeout.patch
+ 0071-module-Simplify-module_load.patch -> 0039-module-Simplify-module_load.patch
+ 0072-module-Don-t-complain-when-a-module.patch -> 0040-module-Don-t-complain-when-a-module.patch
+* Patches automatically dropped on rebase:
+ 0039-qtest-Assure-that-init_socket-s-lis.patch
+ 0040-qtest-Add-error-reporting-to-socket.patch
+ 0042-qtest-Be-paranoid-about-accept-addr.patch
+ 0043-arm-translate.c-Fix-smlald-Instruct.patch
+ 0044-target-arm-A64-fix-unallocated-test.patch
+ 0046-vmstate-add-VMS_MUST_EXIST.patch
+ 0047-vmstate-add-VMSTATE_VALIDATE.patch
+ 0048-virtio-net-fix-buffer-overflow-on-i.patch
+ 0049-virtio-net-out-of-bounds-buffer-wri.patch
+ 0050-virtio-out-of-bounds-buffer-write-o.patch
+ 0051-ahci-fix-buffer-overrun-on-invalid-.patch
+ 0052-hpet-fix-buffer-overrun-on-invalid-.patch
+ 0053-hw-pci-pcie_aer.c-fix-buffer-overru.patch
+ 0054-pl022-fix-buffer-overun-on-invalid-.patch
+ 0055-vmstate-fix-buffer-overflow-in-targ.patch
+ 0056-virtio-avoid-buffer-overrun-on-inco.patch
+ 0057-virtio-validate-num_sg-when-mapping.patch
+ 0058-pxa2xx-avoid-buffer-overrun-on-inco.patch
+ 0059-ssd0323-fix-buffer-overun-on-invali.patch
+ 0060-tsc210x-fix-buffer-overrun-on-inval.patch
+ 0061-zaurus-fix-buffer-overrun-on-invali.patch
+ 0062-virtio-scsi-fix-buffer-overrun-on-i.patch
+ 0063-vmstate-s-VMSTATE_INT32_LE-VMSTATE_.patch
+ 0064-usb-sanity-check-setup_index-setup_.patch
+ 0065-savevm-Ignore-minimum_version_id_ol.patch
+ 0066-ssi-sd-fix-buffer-overrun-on-invali.patch
+ 0067-openpic-avoid-buffer-overrun-on-inc.patch
+ 0068-virtio-net-out-of-bounds-buffer-wri.patch
+ 0069-virtio-validate-config_len-on-load.patch
+ 0070-virtio-allow-mapping-up-to-max-queu.patch
+* iPXE fixes now included
+ ipxe-build-Work-around-bug-in-gcc-4.8.patch dropped
+ ipxe-build-Avoid-strict-aliasing-warning.patch dropped
+ ipxe-zbin-Fix-size-used-for-memset-in-al.patch dropped
+* SeaVGABIOS fix now included
+ vgabios-Make-sure-stdvga_list_modes-doesn-t-overrun-.patch dropped
+* Modified update_git.sh accordingly
+
+- Update to v2.1.0-rc1: http://wiki.qemu-project.org/ChangeLog/2.1
+* 0041-tests-Fix-unterminated-string-outpu.patch: Test fix
+* 0042-libqos-Fix-PC-PCI-endianness-glitch.patch: Test fix for ppc
+* 0043-qtest-fix-vhost-user-test-compilati.patch: Test fix for SP3
+* Modified update_git.sh accordingly
+
+-------------------------------------------------------------------
Old:
----
0015-linux-user-arm-no-tb_flush-on-reset.patch
0037-xen_disk-add-discard-support.patch
0038-tests-Don-t-run-qom-test-twice.patch
0039-qtest-Assure-that-init_socket-s-lis.patch
0040-qtest-Add-error-reporting-to-socket.patch
0041-qtest-Increase-socket-timeout.patch
0042-qtest-Be-paranoid-about-accept-addr.patch
0043-arm-translate.c-Fix-smlald-Instruct.patch
0044-target-arm-A64-fix-unallocated-test.patch
0045-tcg-ppc64-Support-the-ELFv2-ABI.patch
0046-vmstate-add-VMS_MUST_EXIST.patch
0047-vmstate-add-VMSTATE_VALIDATE.patch
0048-virtio-net-fix-buffer-overflow-on-i.patch
0049-virtio-net-out-of-bounds-buffer-wri.patch
0050-virtio-out-of-bounds-buffer-write-o.patch
0051-ahci-fix-buffer-overrun-on-invalid-.patch
0052-hpet-fix-buffer-overrun-on-invalid-.patch
0053-hw-pci-pcie_aer.c-fix-buffer-overru.patch
0054-pl022-fix-buffer-overun-on-invalid-.patch
0055-vmstate-fix-buffer-overflow-in-targ.patch
0056-virtio-avoid-buffer-overrun-on-inco.patch
0057-virtio-validate-num_sg-when-mapping.patch
0058-pxa2xx-avoid-buffer-overrun-on-inco.patch
0059-ssd0323-fix-buffer-overun-on-invali.patch
0060-tsc210x-fix-buffer-overrun-on-inval.patch
0061-zaurus-fix-buffer-overrun-on-invali.patch
0062-virtio-scsi-fix-buffer-overrun-on-i.patch
0063-vmstate-s-VMSTATE_INT32_LE-VMSTATE_.patch
0064-usb-sanity-check-setup_index-setup_.patch
0065-savevm-Ignore-minimum_version_id_ol.patch
0066-ssi-sd-fix-buffer-overrun-on-invali.patch
0067-openpic-avoid-buffer-overrun-on-inc.patch
0068-virtio-net-out-of-bounds-buffer-wri.patch
0069-virtio-validate-config_len-on-load.patch
0070-virtio-allow-mapping-up-to-max-queu.patch
0071-module-Simplify-module_load.patch
0072-module-Don-t-complain-when-a-module.patch
ipxe-build-Avoid-strict-aliasing-warning.patch
ipxe-build-Work-around-bug-in-gcc-4.8.patch
ipxe-zbin-Fix-size-used-for-memset-in-al.patch
qemu-2.0.0.tar.bz2
vgabios-Make-sure-stdvga_list_modes-doesn-t-overrun-.patch
New:
----
0015-target-arm-linux-user-no-tb_flush-o.patch
0037-tests-Don-t-run-qom-test-twice.patch
0038-qtest-Increase-socket-timeout.patch
0039-module-Simplify-module_load.patch
0040-module-Don-t-complain-when-a-module.patch
qemu-2.1.0-rc2.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ qemu-linux-user.spec ++++++
--- /var/tmp/diff_new_pack.2fPZv3/_old 2014-07-18 06:40:56.000000000 +0200
+++ /var/tmp/diff_new_pack.2fPZv3/_new 2014-07-18 06:40:56.000000000 +0200
@@ -21,9 +21,9 @@
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.0
+Version: 2.0.92
Release: 0
-Source: qemu-2.0.0.tar.bz2
+Source: qemu-2.1.0-rc2.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
@@ -39,7 +39,7 @@
Patch0012: 0012-PPC-KVM-Disable-mmu-notifier-check.patch
Patch0013: 0013-linux-user-fix-segfault-deadlock.patch
Patch0014: 0014-linux-user-binfmt-support-host-bina.patch
-Patch0015: 0015-linux-user-arm-no-tb_flush-on-reset.patch
+Patch0015: 0015-target-arm-linux-user-no-tb_flush-o.patch
Patch0016: 0016-linux-user-Ignore-broken-loop-ioctl.patch
Patch0017: 0017-linux-user-lock-tcg.patch
Patch0018: 0018-linux-user-Run-multi-threaded-code-.patch
@@ -61,42 +61,10 @@
Patch0034: 0034-linux-user-lseek-explicitly-cast-no.patch
Patch0035: 0035-virtfs-proxy-helper-Provide-__u64-f.patch
Patch0036: 0036-configure-Enable-PIE-for-ppc-and-pp.patch
-Patch0037: 0037-xen_disk-add-discard-support.patch
-Patch0038: 0038-tests-Don-t-run-qom-test-twice.patch
-Patch0039: 0039-qtest-Assure-that-init_socket-s-lis.patch
-Patch0040: 0040-qtest-Add-error-reporting-to-socket.patch
-Patch0041: 0041-qtest-Increase-socket-timeout.patch
-Patch0042: 0042-qtest-Be-paranoid-about-accept-addr.patch
-Patch0043: 0043-arm-translate.c-Fix-smlald-Instruct.patch
-Patch0044: 0044-target-arm-A64-fix-unallocated-test.patch
-Patch0045: 0045-tcg-ppc64-Support-the-ELFv2-ABI.patch
-Patch0046: 0046-vmstate-add-VMS_MUST_EXIST.patch
-Patch0047: 0047-vmstate-add-VMSTATE_VALIDATE.patch
-Patch0048: 0048-virtio-net-fix-buffer-overflow-on-i.patch
-Patch0049: 0049-virtio-net-out-of-bounds-buffer-wri.patch
-Patch0050: 0050-virtio-out-of-bounds-buffer-write-o.patch
-Patch0051: 0051-ahci-fix-buffer-overrun-on-invalid-.patch
-Patch0052: 0052-hpet-fix-buffer-overrun-on-invalid-.patch
-Patch0053: 0053-hw-pci-pcie_aer.c-fix-buffer-overru.patch
-Patch0054: 0054-pl022-fix-buffer-overun-on-invalid-.patch
-Patch0055: 0055-vmstate-fix-buffer-overflow-in-targ.patch
-Patch0056: 0056-virtio-avoid-buffer-overrun-on-inco.patch
-Patch0057: 0057-virtio-validate-num_sg-when-mapping.patch
-Patch0058: 0058-pxa2xx-avoid-buffer-overrun-on-inco.patch
-Patch0059: 0059-ssd0323-fix-buffer-overun-on-invali.patch
-Patch0060: 0060-tsc210x-fix-buffer-overrun-on-inval.patch
-Patch0061: 0061-zaurus-fix-buffer-overrun-on-invali.patch
-Patch0062: 0062-virtio-scsi-fix-buffer-overrun-on-i.patch
-Patch0063: 0063-vmstate-s-VMSTATE_INT32_LE-VMSTATE_.patch
-Patch0064: 0064-usb-sanity-check-setup_index-setup_.patch
-Patch0065: 0065-savevm-Ignore-minimum_version_id_ol.patch
-Patch0066: 0066-ssi-sd-fix-buffer-overrun-on-invali.patch
-Patch0067: 0067-openpic-avoid-buffer-overrun-on-inc.patch
-Patch0068: 0068-virtio-net-out-of-bounds-buffer-wri.patch
-Patch0069: 0069-virtio-validate-config_len-on-load.patch
-Patch0070: 0070-virtio-allow-mapping-up-to-max-queu.patch
-Patch0071: 0071-module-Simplify-module_load.patch
-Patch0072: 0072-module-Don-t-complain-when-a-module.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
@@ -149,7 +117,7 @@
run cross-architecture builds.
%prep
-%setup -q -n qemu-2.0.0
+%setup -q -n qemu-2.1.0-rc2
%patch0001 -p1
%patch0002 -p1
%patch0003 -p1
@@ -190,38 +158,6 @@
%patch0038 -p1
%patch0039 -p1
%patch0040 -p1
-%patch0041 -p1
-%patch0042 -p1
-%patch0043 -p1
-%patch0044 -p1
-%patch0045 -p1
-%patch0046 -p1
-%patch0047 -p1
-%patch0048 -p1
-%patch0049 -p1
-%patch0050 -p1
-%patch0051 -p1
-%patch0052 -p1
-%patch0053 -p1
-%patch0054 -p1
-%patch0055 -p1
-%patch0056 -p1
-%patch0057 -p1
-%patch0058 -p1
-%patch0059 -p1
-%patch0060 -p1
-%patch0061 -p1
-%patch0062 -p1
-%patch0063 -p1
-%patch0064 -p1
-%patch0065 -p1
-%patch0066 -p1
-%patch0067 -p1
-%patch0068 -p1
-%patch0069 -p1
-%patch0070 -p1
-%patch0071 -p1
-%patch0072 -p1
%build
./configure --prefix=%_prefix --sysconfdir=%_sysconfdir \
@@ -284,6 +220,7 @@
%_bindir/qemu-or32
%_bindir/qemu-ppc64abi32
%_bindir/qemu-ppc64
+%_bindir/qemu-ppc64le
%_bindir/qemu-ppc
%_bindir/qemu-s390x
%_bindir/qemu-sh4
++++++ qemu.spec ++++++
--- /var/tmp/diff_new_pack.2fPZv3/_old 2014-07-18 06:40:56.000000000 +0200
+++ /var/tmp/diff_new_pack.2fPZv3/_new 2014-07-18 06:40:56.000000000 +0200
@@ -43,9 +43,9 @@
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.0
+Version: 2.0.92
Release: 0
-Source: %name-2.0.0.tar.bz2
+Source: %name-2.1.0-rc2.tar.bz2
Source1: 80-kvm.rules
Source2: qemu-ifup
Source3: kvm_stat
@@ -68,7 +68,7 @@
Patch0012: 0012-PPC-KVM-Disable-mmu-notifier-check.patch
Patch0013: 0013-linux-user-fix-segfault-deadlock.patch
Patch0014: 0014-linux-user-binfmt-support-host-bina.patch
-Patch0015: 0015-linux-user-arm-no-tb_flush-on-reset.patch
+Patch0015: 0015-target-arm-linux-user-no-tb_flush-o.patch
Patch0016: 0016-linux-user-Ignore-broken-loop-ioctl.patch
Patch0017: 0017-linux-user-lock-tcg.patch
Patch0018: 0018-linux-user-Run-multi-threaded-code-.patch
@@ -90,51 +90,12 @@
Patch0034: 0034-linux-user-lseek-explicitly-cast-no.patch
Patch0035: 0035-virtfs-proxy-helper-Provide-__u64-f.patch
Patch0036: 0036-configure-Enable-PIE-for-ppc-and-pp.patch
-Patch0037: 0037-xen_disk-add-discard-support.patch
-Patch0038: 0038-tests-Don-t-run-qom-test-twice.patch
-Patch0039: 0039-qtest-Assure-that-init_socket-s-lis.patch
-Patch0040: 0040-qtest-Add-error-reporting-to-socket.patch
-Patch0041: 0041-qtest-Increase-socket-timeout.patch
-Patch0042: 0042-qtest-Be-paranoid-about-accept-addr.patch
-Patch0043: 0043-arm-translate.c-Fix-smlald-Instruct.patch
-Patch0044: 0044-target-arm-A64-fix-unallocated-test.patch
-Patch0045: 0045-tcg-ppc64-Support-the-ELFv2-ABI.patch
-Patch0046: 0046-vmstate-add-VMS_MUST_EXIST.patch
-Patch0047: 0047-vmstate-add-VMSTATE_VALIDATE.patch
-Patch0048: 0048-virtio-net-fix-buffer-overflow-on-i.patch
-Patch0049: 0049-virtio-net-out-of-bounds-buffer-wri.patch
-Patch0050: 0050-virtio-out-of-bounds-buffer-write-o.patch
-Patch0051: 0051-ahci-fix-buffer-overrun-on-invalid-.patch
-Patch0052: 0052-hpet-fix-buffer-overrun-on-invalid-.patch
-Patch0053: 0053-hw-pci-pcie_aer.c-fix-buffer-overru.patch
-Patch0054: 0054-pl022-fix-buffer-overun-on-invalid-.patch
-Patch0055: 0055-vmstate-fix-buffer-overflow-in-targ.patch
-Patch0056: 0056-virtio-avoid-buffer-overrun-on-inco.patch
-Patch0057: 0057-virtio-validate-num_sg-when-mapping.patch
-Patch0058: 0058-pxa2xx-avoid-buffer-overrun-on-inco.patch
-Patch0059: 0059-ssd0323-fix-buffer-overun-on-invali.patch
-Patch0060: 0060-tsc210x-fix-buffer-overrun-on-inval.patch
-Patch0061: 0061-zaurus-fix-buffer-overrun-on-invali.patch
-Patch0062: 0062-virtio-scsi-fix-buffer-overrun-on-i.patch
-Patch0063: 0063-vmstate-s-VMSTATE_INT32_LE-VMSTATE_.patch
-Patch0064: 0064-usb-sanity-check-setup_index-setup_.patch
-Patch0065: 0065-savevm-Ignore-minimum_version_id_ol.patch
-Patch0066: 0066-ssi-sd-fix-buffer-overrun-on-invali.patch
-Patch0067: 0067-openpic-avoid-buffer-overrun-on-inc.patch
-Patch0068: 0068-virtio-net-out-of-bounds-buffer-wri.patch
-Patch0069: 0069-virtio-validate-config_len-on-load.patch
-Patch0070: 0070-virtio-allow-mapping-up-to-max-queu.patch
-Patch0071: 0071-module-Simplify-module_load.patch
-Patch0072: 0072-module-Don-t-complain-when-a-module.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.
-# roms/ipxe patches
-Patch1000: ipxe-build-Work-around-bug-in-gcc-4.8.patch
-Patch1001: ipxe-zbin-Fix-size-used-for-memset-in-al.patch
-Patch1002: ipxe-build-Avoid-strict-aliasing-warning.patch
-Patch1003: vgabios-Make-sure-stdvga_list_modes-doesn-t-overrun-.patch
-# end roms/ipxe patches
-
# this is to make lint happy
Source300: rpmlintrc
Source302: bridge.conf
@@ -457,7 +418,7 @@
%package seabios
Summary: X86 BIOS for QEMU
Group: System/Emulators/PC
-Version: 1.7.4
+Version: 1.7.5
Release: 0
%if 0%{?suse_version} > %{noarch_supported}
BuildArch: noarch
@@ -471,7 +432,7 @@
%package vgabios
Summary: VGA BIOSes for QEMU
Group: System/Emulators/PC
-Version: 1.7.4
+Version: 1.7.5
Release: 0
%if 0%{?suse_version} > %{noarch_supported}
BuildArch: noarch
@@ -526,7 +487,7 @@
%endif
%prep
-%setup -q #-n %name-2.0.0-rc3
+%setup -q -n %name-2.1.0-rc2
%patch0001 -p1
%patch0002 -p1
%patch0003 -p1
@@ -567,43 +528,6 @@
%patch0038 -p1
%patch0039 -p1
%patch0040 -p1
-%patch0041 -p1
-%patch0042 -p1
-%patch0043 -p1
-%patch0044 -p1
-%patch0045 -p1
-%patch0046 -p1
-%patch0047 -p1
-%patch0048 -p1
-%patch0049 -p1
-%patch0050 -p1
-%patch0051 -p1
-%patch0052 -p1
-%patch0053 -p1
-%patch0054 -p1
-%patch0055 -p1
-%patch0056 -p1
-%patch0057 -p1
-%patch0058 -p1
-%patch0059 -p1
-%patch0060 -p1
-%patch0061 -p1
-%patch0062 -p1
-%patch0063 -p1
-%patch0064 -p1
-%patch0065 -p1
-%patch0066 -p1
-%patch0067 -p1
-%patch0068 -p1
-%patch0069 -p1
-%patch0070 -p1
-%patch0071 -p1
-%patch0072 -p1
-
-%patch1000 -p1
-%patch1001 -p1
-%patch1002 -p1
-%patch1003 -p1
%if %{build_x86_fw_from_source}
# as a safeguard, delete the firmware files that we intend to build
++++++ 0001-XXX-dont-dump-core-on-sigabort.patch ++++++
--- /var/tmp/diff_new_pack.2fPZv3/_old 2014-07-18 06:40:56.000000000 +0200
+++ /var/tmp/diff_new_pack.2fPZv3/_new 2014-07-18 06:40:56.000000000 +0200
@@ -1,4 +1,4 @@
-From afd1df16c2e7b2dd5d4478f2ba6e29a1296c8cfa Mon Sep 17 00:00:00 2001
+From d8e4a08b170081417c17700d2e6c8b671d28f147 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
@@ -8,7 +8,7 @@
1 file changed, 6 insertions(+)
diff --git a/linux-user/signal.c b/linux-user/signal.c
-index 7d6246f..1bcf16f 100644
+index 1141054..b7a88f4 100644
--- a/linux-user/signal.c
+++ b/linux-user/signal.c
@@ -448,6 +448,10 @@ static void QEMU_NORETURN force_sig(int target_sig)
++++++ 0002-XXX-work-around-SA_RESTART-race-wit.patch ++++++
--- /var/tmp/diff_new_pack.2fPZv3/_old 2014-07-18 06:40:56.000000000 +0200
+++ /var/tmp/diff_new_pack.2fPZv3/_new 2014-07-18 06:40:57.000000000 +0200
@@ -1,4 +1,4 @@
-From e9ce5f593385ed16e456058d1f873e381c9d053d Mon Sep 17 00:00:00 2001
+From 6e1a8104187462b58f198e10d8bfeb83c28843e2 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,10 +13,10 @@
4 files changed, 130 insertions(+), 10 deletions(-)
diff --git a/linux-user/main.c b/linux-user/main.c
-index af924dc..c7423e6 100644
+index b453a39..9df92da 100644
--- a/linux-user/main.c
+++ b/linux-user/main.c
-@@ -814,15 +814,22 @@ void cpu_loop(CPUARMState *env)
+@@ -816,15 +816,22 @@ void cpu_loop(CPUARMState *env)
break;
}
} else {
@@ -49,10 +49,10 @@
} else {
goto error;
diff --git a/linux-user/qemu.h b/linux-user/qemu.h
-index 36d4a73..a2c4e35 100644
+index 8012cc2..e29c7f3 100644
--- a/linux-user/qemu.h
+++ b/linux-user/qemu.h
-@@ -134,6 +134,8 @@ typedef struct TaskState {
+@@ -135,6 +135,8 @@ typedef struct TaskState {
struct sigqueue sigqueue_table[MAX_SIGQUEUE_SIZE]; /* siginfo queue */
struct sigqueue *first_free; /* first free siginfo queue entry */
int signal_pending; /* non zero if a signal may be pending */
@@ -61,7 +61,7 @@
} __attribute__((aligned(16))) TaskState;
extern char *exec_path;
-@@ -199,6 +201,7 @@ int get_osversion(void);
+@@ -200,6 +202,7 @@ int get_osversion(void);
void init_qemu_uname_release(void);
void fork_start(void);
void fork_end(int child);
@@ -70,7 +70,7 @@
/* Creates the initial guest address space in the host memory space using
* the given host start address hint and size. The guest_start parameter
diff --git a/linux-user/signal.c b/linux-user/signal.c
-index 1bcf16f..cfaf501 100644
+index b7a88f4..5982a88 100644
--- a/linux-user/signal.c
+++ b/linux-user/signal.c
@@ -25,6 +25,7 @@
@@ -93,7 +93,7 @@
return 1; /* indicates that the signal was queued */
}
}
-@@ -706,8 +712,24 @@ int do_sigaction(int sig, const struct target_sigaction *act,
+@@ -707,8 +713,24 @@ int do_sigaction(int sig, const struct target_sigaction *act,
if (host_sig != SIGSEGV && host_sig != SIGBUS) {
sigfillset(&act1.sa_mask);
act1.sa_flags = SA_SIGINFO;
@@ -119,10 +119,10 @@
ignore state to avoid getting unexpected interrupted
syscalls */
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
-index 9864813..1d791a3 100644
+index a50229d..4673f28 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
-@@ -5259,6 +5259,87 @@ static int do_open(void *cpu_env, const char *pathname, int flags, mode_t mode)
+@@ -5337,6 +5337,87 @@ static int do_open(void *cpu_env, const char *pathname, int flags, mode_t mode)
return get_errno(open(path(pathname), flags, mode));
}
@@ -210,7 +210,7 @@
/* do_syscall() should always have a single exit point at the end so
that actions, such as logging of syscall results, can be performed.
All errnos that do_syscall() returns must be -TARGET_<errcode>. */
-@@ -5272,6 +5353,12 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1,
+@@ -5350,6 +5431,12 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1,
struct stat st;
struct statfs stfs;
void *p;
@@ -223,7 +223,7 @@
#ifdef DEBUG
gemu_log("syscall %d", num);
-@@ -8457,7 +8544,7 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1,
+@@ -8601,7 +8688,7 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1,
cmd = target_to_host_fcntl_cmd(arg2);
if (cmd == -TARGET_EINVAL) {
ret = cmd;
@@ -232,7 +232,7 @@
}
switch(arg2) {
-@@ -9395,6 +9482,7 @@ fail:
+@@ -9539,6 +9626,7 @@ fail:
#endif
if(do_strace)
print_syscall_ret(num, ret);
++++++ 0003-qemu-0.9.0.cvs-binfmt.patch ++++++
--- /var/tmp/diff_new_pack.2fPZv3/_old 2014-07-18 06:40:57.000000000 +0200
+++ /var/tmp/diff_new_pack.2fPZv3/_new 2014-07-18 06:40:57.000000000 +0200
@@ -1,4 +1,4 @@
-From b34c0c408d3f08110ccb980d4ca0ef58a1a03c86 Mon Sep 17 00:00:00 2001
+From 4a0043142e4070577c527127e37f8089f106ab86 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
++++++ 0004-qemu-cvs-alsa_bitfield.patch ++++++
--- /var/tmp/diff_new_pack.2fPZv3/_old 2014-07-18 06:40:57.000000000 +0200
+++ /var/tmp/diff_new_pack.2fPZv3/_new 2014-07-18 06:40:57.000000000 +0200
@@ -1,4 +1,4 @@
-From 08da583bd034109d09bfa6fedaa19bd0bdbc6c3a Mon Sep 17 00:00:00 2001
+From 9d1c64649cd88fa69584d7e0d7a1cadbba6f5cdb 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
++++++ 0005-qemu-cvs-alsa_ioctl.patch ++++++
--- /var/tmp/diff_new_pack.2fPZv3/_old 2014-07-18 06:40:57.000000000 +0200
+++ /var/tmp/diff_new_pack.2fPZv3/_new 2014-07-18 06:40:57.000000000 +0200
@@ -1,4 +1,4 @@
-From 4820daf43dce7bbafc27ab1102a6eb52a17e4da9 Mon Sep 17 00:00:00 2001
+From 4024c561d3dbaec57af394a24f7a2ac0c126aa84 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
@@ -20,10 +20,10 @@
create mode 100644 linux-user/syscall_types_alsa.h
diff --git a/linux-user/ioctls.h b/linux-user/ioctls.h
-index 309fb21..d35f072 100644
+index 609b27c..d2b7a50 100644
--- a/linux-user/ioctls.h
+++ b/linux-user/ioctls.h
-@@ -316,6 +316,11 @@
+@@ -318,6 +318,11 @@
IOCTL(VFAT_IOCTL_READDIR_BOTH, IOC_R, MK_PTR(MK_ARRAY(MK_STRUCT(STRUCT_dirent), 2)))
IOCTL(VFAT_IOCTL_READDIR_SHORT, IOC_R, MK_PTR(MK_ARRAY(MK_STRUCT(STRUCT_dirent), 2)))
@@ -2255,10 +2255,10 @@
+ unsigned char *code;
+};
diff --git a/linux-user/syscall_defs.h b/linux-user/syscall_defs.h
-index fdf9a47..a2ac23e 100644
+index c9e6323..e4ae769 100644
--- a/linux-user/syscall_defs.h
+++ b/linux-user/syscall_defs.h
-@@ -2545,6 +2545,8 @@ struct target_ucred {
+@@ -2562,6 +2562,8 @@ struct target_ucred {
uint32_t gid;
};
++++++ 0006-qemu-cvs-alsa_mmap.patch ++++++
--- /var/tmp/diff_new_pack.2fPZv3/_old 2014-07-18 06:40:57.000000000 +0200
+++ /var/tmp/diff_new_pack.2fPZv3/_new 2014-07-18 06:40:57.000000000 +0200
@@ -1,4 +1,4 @@
-From b1f94337048b56d240420c0d0a37ad061084904c Mon Sep 17 00:00:00 2001
+From fe1f8ed0fc7bf19bb25ee0d9ac3db94e1263bc0b 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
++++++ 0007-qemu-cvs-gettimeofday.patch ++++++
--- /var/tmp/diff_new_pack.2fPZv3/_old 2014-07-18 06:40:57.000000000 +0200
+++ /var/tmp/diff_new_pack.2fPZv3/_new 2014-07-18 06:40:57.000000000 +0200
@@ -1,4 +1,4 @@
-From 2a9ed81b68696702c3dfab0e3635ca1a7afe1ea4 Mon Sep 17 00:00:00 2001
+From 4566701ac911b84fb54399e85e9698e3855ef76d 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,10 +9,10 @@
1 file changed, 2 insertions(+)
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
-index 1d791a3..206dd12 100644
+index 4673f28..9575346 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
-@@ -6403,6 +6403,8 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1,
+@@ -6512,6 +6512,8 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1,
case TARGET_NR_gettimeofday:
{
struct timeval tv;
++++++ 0008-qemu-cvs-ioctl_debug.patch ++++++
--- /var/tmp/diff_new_pack.2fPZv3/_old 2014-07-18 06:40:57.000000000 +0200
+++ /var/tmp/diff_new_pack.2fPZv3/_new 2014-07-18 06:40:57.000000000 +0200
@@ -1,4 +1,4 @@
-From 9671d1a0e8e53a44513131d105c0f543c181cc0f Mon Sep 17 00:00:00 2001
+From 37000c31d5975ea6cdacb8cd98b48c476597518c 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,10 +12,10 @@
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
-index 206dd12..3407fd7 100644
+index 9575346..82a794f 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
-@@ -3654,7 +3654,12 @@ static abi_long do_ioctl(int fd, abi_long cmd, abi_long arg)
+@@ -3745,7 +3745,12 @@ static abi_long do_ioctl(int fd, abi_long cmd, abi_long arg)
ie = ioctl_entries;
for(;;) {
if (ie->target_cmd == 0) {
++++++ 0009-qemu-cvs-ioctl_nodirection.patch ++++++
--- /var/tmp/diff_new_pack.2fPZv3/_old 2014-07-18 06:40:57.000000000 +0200
+++ /var/tmp/diff_new_pack.2fPZv3/_new 2014-07-18 06:40:57.000000000 +0200
@@ -1,4 +1,4 @@
-From a535f471a344608107dce681f66a75b38f9e8441 Mon Sep 17 00:00:00 2001
+From 729167ca9a62beda6d657e7368144f58ad004968 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,10 +15,10 @@
1 file changed, 6 insertions(+)
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
-index 3407fd7..7d7d700 100644
+index 82a794f..701809e 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
-@@ -3688,6 +3688,11 @@ static abi_long do_ioctl(int fd, abi_long cmd, abi_long arg)
+@@ -3779,6 +3779,11 @@ static abi_long do_ioctl(int fd, abi_long cmd, abi_long arg)
arg_type++;
target_size = thunk_type_size(arg_type, 0);
switch(ie->access) {
@@ -30,7 +30,7 @@
case IOC_R:
ret = get_errno(ioctl(fd, ie->host_cmd, buf_temp));
if (!is_error(ret)) {
-@@ -3706,6 +3711,7 @@ static abi_long do_ioctl(int fd, abi_long cmd, abi_long arg)
+@@ -3797,6 +3802,7 @@ static abi_long do_ioctl(int fd, abi_long cmd, abi_long arg)
unlock_user(argptr, arg, 0);
ret = get_errno(ioctl(fd, ie->host_cmd, buf_temp));
break;
++++++ 0010-block-vmdk-Support-creation-of-SCSI.patch ++++++
--- /var/tmp/diff_new_pack.2fPZv3/_old 2014-07-18 06:40:57.000000000 +0200
+++ /var/tmp/diff_new_pack.2fPZv3/_new 2014-07-18 06:40:57.000000000 +0200
@@ -1,4 +1,4 @@
-From a96062c693f9fa9ce4d0dd23c9cfc8816b0eacce Mon Sep 17 00:00:00 2001
+From dbe5cadd67745ed4116d49c3987c847bc9bf450c 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
@@ -11,71 +11,61 @@
[AF: Rebased onto upstream VMDK SCSI support]
[AF: Rebased onto skipping of image creation in v1.7]
[AF: Simplified in preparation for v1.7.1/v2.0]
+[AF: Rebased onto QemuOpts conversion for v2.1]
Signed-off-by: Andreas Färber
---
- block.c | 6 +++++-
- block/vmdk.c | 9 ++++++++-
- include/block/block_int.h | 2 ++
- qemu-img.c | 8 +++++++-
- 4 files changed, 22 insertions(+), 3 deletions(-)
+ block.c | 3 +++
+ block/vmdk.c | 10 +++++++++-
+ include/block/block_int.h | 2 ++
+ qemu-img.c | 7 +++++++
+ 4 files changed, 21 insertions(+), 1 deletion(-)
diff --git a/block.c b/block.c
-index 990a754..40c5c84 100644
+index 3e252a2..c09f6df 100644
--- a/block.c
+++ b/block.c
-@@ -5277,7 +5277,7 @@ void bdrv_img_create(const char *filename, const char *fmt,
- Error **errp, bool quiet)
- {
- QEMUOptionParameter *param = NULL, *create_options = NULL;
-- QEMUOptionParameter *backing_fmt, *backing_file, *size;
-+ QEMUOptionParameter *backing_fmt, *backing_file, *size, *scsi;
- BlockDriver *drv, *proto_drv;
- BlockDriver *backing_drv = NULL;
- Error *local_err = NULL;
-@@ -5392,6 +5392,10 @@ void bdrv_img_create(const char *filename, const char *fmt,
+@@ -5611,6 +5611,9 @@ void bdrv_img_create(const char *filename, const char *fmt,
if (!quiet) {
printf("Formatting '%s', fmt=%s ", filename, fmt);
- print_option_parameters(param);
-+ scsi = get_option_parameter(param, BLOCK_OPT_SCSI);
-+ if (scsi && scsi->value.n) {
+ qemu_opts_print(opts);
++ if (qemu_opt_get_bool(opts, BLOCK_OPT_SCSI, false)) {
+ printf(", SCSI");
+ }
puts("");
}
- ret = bdrv_create(drv, filename, param, &local_err);
+
diff --git a/block/vmdk.c b/block/vmdk.c
-index b69988d..59c468d 100644
+index 27a78da..b26fdb2 100644
--- a/block/vmdk.c
+++ b/block/vmdk.c
-@@ -1744,11 +1744,13 @@ static int vmdk_create(const char *filename, QEMUOptionParameter *options,
- fmt = options->value.s;
- } else if (!strcmp(options->name, BLOCK_OPT_ZEROED_GRAIN)) {
- zeroed_grain |= options->value.n;
-+ } else if (!strcmp(options->name, BLOCK_OPT_SCSI)) {
-+ flags |= options->value.n ? BLOCK_FLAG_SCSI: 0;
- }
- options++;
+@@ -1754,9 +1754,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;
}
++ if (qemu_opt_get_bool_del(opts, BLOCK_OPT_SCSI, false)) {
++ flags |= BLOCK_FLAG_SCSI;
++ }
+
if (!adapter_type) {
-- adapter_type = "ide";
-+ adapter_type = flags & BLOCK_FLAG_SCSI ? "lsilogic" : "ide";
+- adapter_type = g_strdup("ide");
++ adapter_type = g_strdup(flags & BLOCK_FLAG_SCSI ? "lsilogic" : "ide");
} else if (strcmp(adapter_type, "ide") &&
strcmp(adapter_type, "buslogic") &&
strcmp(adapter_type, "lsilogic") &&
-@@ -2096,6 +2098,11 @@ static QEMUOptionParameter vmdk_create_options[] = {
- .type = OPT_FLAG,
- .help = "Enable efficient zero writes using the zeroed-grain GTE feature"
- },
-+ {
-+ .name = BLOCK_OPT_SCSI,
-+ .type = OPT_FLAG,
-+ .help = "SCSI image"
-+ },
- { NULL }
+@@ -2153,6 +2156,11 @@ static QemuOptsList vmdk_create_opts = {
+ .help = "Enable efficient zero writes "
+ "using the zeroed-grain GTE feature"
+ },
++ {
++ .name = BLOCK_OPT_SCSI,
++ .type = QEMU_OPT_BOOL,
++ .help = "SCSI image"
++ },
+ { /* end of list */ }
+ }
};
-
diff --git a/include/block/block_int.h b/include/block/block_int.h
-index cd5bc73..0d4208f 100644
+index f6c3bef..138c102 100644
--- a/include/block/block_int.h
+++ b/include/block/block_int.h
@@ -40,10 +40,12 @@
@@ -92,23 +82,15 @@
#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 8455994..a8545b7 100644
+index c98896b..1608434 100644
--- a/qemu-img.c
+++ b/qemu-img.c
-@@ -1154,7 +1154,7 @@ static int img_convert(int argc, char **argv)
- const uint8_t *buf1;
- BlockDriverInfo bdi;
- QEMUOptionParameter *param = NULL, *create_options = NULL;
-- QEMUOptionParameter *out_baseimg_param;
-+ QEMUOptionParameter *out_baseimg_param, *scsi;
- char *options = NULL;
- const char *snapshot_name = NULL;
- int min_sparse = 8; /* Need at least 4k of zeros for sparse detection */
-@@ -1398,6 +1398,12 @@ static int img_convert(int argc, char **argv)
+@@ -1431,6 +1431,13 @@ static int img_convert(int argc, char **argv)
}
}
-+ if ((scsi = get_option_parameter(param, BLOCK_OPT_SCSI)) && scsi->value.n && strcmp(drv->format_name, "vmdk")) {
++ if (qemu_opt_get_bool(opts, BLOCK_OPT_SCSI, false)
++ && strcmp(drv->format_name, "vmdk")) {
+ error_report("SCSI devices not supported for this file format");
+ ret = -1;
+ goto out;
@@ -116,4 +98,4 @@
+
if (!skip_create) {
/* Create the new image */
- ret = bdrv_create(drv, out_filename, param, &local_err);
+ ret = bdrv_create(drv, out_filename, opts, &local_err);
++++++ 0011-linux-user-add-binfmt-wrapper-for-a.patch ++++++
--- /var/tmp/diff_new_pack.2fPZv3/_old 2014-07-18 06:40:57.000000000 +0200
+++ /var/tmp/diff_new_pack.2fPZv3/_new 2014-07-18 06:40:57.000000000 +0200
@@ -1,4 +1,4 @@
-From 99a52830916b325a52d7eac1abb979d525229fc4 Mon Sep 17 00:00:00 2001
+From 10a63f0ce5025cf5d777c578ffafd70ebbef495d 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
@@ -26,6 +26,7 @@
Signed-off-by: Alexander Graf
[AF: Rebased onto new Makefile infrastructure, twice]
[AF: Updated for aarch64 for v2.0.0-rc1]
+[AF: Rebased onto Makefile changes for v2.1.0-rc0]
Signed-off-by: Andreas Färber
---
Makefile.target | 13 +++++++++++++
@@ -36,11 +37,11 @@
create mode 100644 linux-user/binfmt.c
diff --git a/Makefile.target b/Makefile.target
-index ba12340..87d5724 100644
+index 137d0b0..57181a4 100644
--- a/Makefile.target
+++ b/Makefile.target
-@@ -31,6 +31,10 @@ PROGS+=$(QEMU_PROGW)
- endif
+@@ -34,6 +34,10 @@ endif
+ PROGS=$(QEMU_PROG) $(QEMU_PROGW)
STPFILES=
+ifdef CONFIG_LINUX_USER
@@ -50,7 +51,7 @@
config-target.h: config-target.h-timestamp
config-target.h-timestamp: config-target.mak
-@@ -92,6 +96,8 @@ QEMU_CFLAGS+=-I$(SRC_PATH)/linux-user/$(TARGET_ABI_DIR) -I$(SRC_PATH)/linux-user
+@@ -101,6 +105,8 @@ QEMU_CFLAGS+=-I$(SRC_PATH)/linux-user/$(TARGET_ABI_DIR) -I$(SRC_PATH)/linux-user
obj-y += linux-user/
obj-y += gdbstub.o thunk.o user-exec.o
@@ -59,7 +60,7 @@
endif #CONFIG_LINUX_USER
#########################################################
-@@ -137,7 +143,11 @@ endif # CONFIG_SOFTMMU
+@@ -149,7 +155,11 @@ endif # CONFIG_SOFTMMU
# Workaround for http://gcc.gnu.org/PR55489, see configure.
%/translate.o: QEMU_CFLAGS += $(TRANSLATE_OPT_CFLAGS)
@@ -68,12 +69,12 @@
+else
dummy := $(call unnest-vars,,obj-y)
+endif
+ all-obj-y := $(obj-y)
- # we are making another call to unnest-vars with different vars, protect obj-y,
- # it can be overriden in subdir Makefile.objs
-@@ -173,6 +183,9 @@ $(QEMU_PROG): $(all-obj-y) ../libqemuutil.a ../libqemustub.a
+ block-obj-y :=
+@@ -167,6 +177,9 @@ all-obj-$(CONFIG_SOFTMMU) += $(block-obj-y)
+ $(QEMU_PROG_BUILD): $(all-obj-y) ../libqemuutil.a ../libqemustub.a
$(call LINK,$^)
- endif
+$(QEMU_PROG)-binfmt: $(obj-binfmt-y)
+ $(call LINK,$^)
@@ -82,7 +83,7 @@
$(call quiet-command,rm -f $@ && $(SHELL) $(SRC_PATH)/scripts/feature_to_c.sh $@ $(TARGET_XML_FILES)," GEN $(TARGET_DIR)$@")
diff --git a/linux-user/Makefile.objs b/linux-user/Makefile.objs
-index 5899d72..18212a2 100644
+index fd50217..446aca7 100644
--- a/linux-user/Makefile.objs
+++ b/linux-user/Makefile.objs
@@ -5,3 +5,5 @@ obj-$(TARGET_HAS_BFLT) += flatload.o
++++++ 0012-PPC-KVM-Disable-mmu-notifier-check.patch ++++++
--- /var/tmp/diff_new_pack.2fPZv3/_old 2014-07-18 06:40:57.000000000 +0200
+++ /var/tmp/diff_new_pack.2fPZv3/_new 2014-07-18 06:40:57.000000000 +0200
@@ -1,4 +1,4 @@
-From 9ceca2f2c25c99e930d31ab11c7ff46dd9d43da6 Mon Sep 17 00:00:00 2001
+From 8483f3bf7b9770eff3e9a41382c36c93aba6360f 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,16 +13,17 @@
1 file changed, 2 insertions(+)
diff --git a/exec.c b/exec.c
-index 91513c6..36b5ef6 100644
+index 5a2a25e..c942e6a 100644
--- a/exec.c
+++ b/exec.c
-@@ -1039,10 +1039,12 @@ static void *file_ram_alloc(RAMBlock *block,
+@@ -1037,11 +1037,13 @@ static void *file_ram_alloc(RAMBlock *block,
return NULL;
}
+#ifndef TARGET_PPC
if (kvm_enabled() && !kvm_has_sync_mmu()) {
- fprintf(stderr, "host lacks kvm mmu notifiers, -mem-path unsupported\n");
+ error_setg(errp,
+ "host lacks kvm mmu notifiers, -mem-path unsupported");
goto error;
}
+#endif
++++++ 0013-linux-user-fix-segfault-deadlock.patch ++++++
--- /var/tmp/diff_new_pack.2fPZv3/_old 2014-07-18 06:40:57.000000000 +0200
+++ /var/tmp/diff_new_pack.2fPZv3/_new 2014-07-18 06:40:57.000000000 +0200
@@ -1,4 +1,4 @@
-From c8bac440eee7d3377d27c676dfa6034ea059451c Mon Sep 17 00:00:00 2001
+From 8c7fb1aeedbdecbd2ccc0af9c21389a2a7e02b96 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
@@ -52,10 +52,10 @@
+
#endif
diff --git a/user-exec.c b/user-exec.c
-index bc58056..63b3b3d 100644
+index 1ff8673..22f9692 100644
--- a/user-exec.c
+++ b/user-exec.c
-@@ -93,6 +93,10 @@ static inline int handle_cpu_signal(uintptr_t pc, unsigned long address,
+@@ -94,6 +94,10 @@ static inline int handle_cpu_signal(uintptr_t pc, unsigned long address,
qemu_printf("qemu: SIGSEGV pc=0x%08lx address=%08lx w=%d oldset=0x%08lx\n",
pc, address, is_write, *(unsigned long *)old_set);
#endif
++++++ 0014-linux-user-binfmt-support-host-bina.patch ++++++
--- /var/tmp/diff_new_pack.2fPZv3/_old 2014-07-18 06:40:57.000000000 +0200
+++ /var/tmp/diff_new_pack.2fPZv3/_new 2014-07-18 06:40:57.000000000 +0200
@@ -1,4 +1,4 @@
-From ae7b4452a263d662035eb35c14fe84590bfff364 Mon Sep 17 00:00:00 2001
+From d16bba8ec34f1f46f32b6e8ffe7ff46e581624f7 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
++++++ 0015-target-arm-linux-user-no-tb_flush-o.patch ++++++
From 28160600838f66097fd0beb639372e22cb2751cd 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
When running automoc4 as linux-user guest program, it segfaults right after
it creates a thread. Bisecting pointed to commit a84fac1426 which introduces
tb_flush on reset.
So something in our thread creation is broken. But for now, let's revert the
change to at least get a working build again.
[AF: Rebased, fixed typo]
---
target-arm/cpu.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/target-arm/cpu.c b/target-arm/cpu.c
index 05e52e0..96f8cca 100644
--- a/target-arm/cpu.c
+++ b/target-arm/cpu.c
@@ -165,7 +165,11 @@ static void arm_cpu_reset(CPUState *s)
* bake assumptions about into translated code, so we need to
* tb_flush().
*/
+#if !defined(CONFIG_USER_ONLY)
+ /* XXX hack alert! automoc4 segfaults after spawning a new thread with
+ * this flush enabled */
tb_flush(env);
+#endif
#ifndef CONFIG_USER_ONLY
if (kvm_enabled()) {
++++++ 0016-linux-user-Ignore-broken-loop-ioctl.patch ++++++
--- /var/tmp/diff_new_pack.2fPZv3/_old 2014-07-18 06:40:57.000000000 +0200
+++ /var/tmp/diff_new_pack.2fPZv3/_new 2014-07-18 06:40:57.000000000 +0200
@@ -1,7 +1,10 @@
-From 9414e435edf0bdf2341c8e69e81e6f42cd73aca4 Mon Sep 17 00:00:00 2001
+From 70d72897f46f7ca7089e784caa4ac8eaa8c24287 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
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
During invocations of losetup, we run into an ioctl that doesn't
exist. However, because of that we output an error, which then
@@ -10,6 +13,8 @@
So let's silently ignore that bogus ioctl.
Signed-off-by: Alexander Graf
+[AF: Rebased for v2.1.0-rc0]
+Signed-off-by: Andreas Färber
---
linux-user/ioctls.h | 1 +
linux-user/linux_loop.h | 1 +
@@ -18,10 +23,10 @@
4 files changed, 10 insertions(+)
diff --git a/linux-user/ioctls.h b/linux-user/ioctls.h
-index d35f072..2181ea3 100644
+index d2b7a50..0680dc4 100644
--- a/linux-user/ioctls.h
+++ b/linux-user/ioctls.h
-@@ -328,6 +328,7 @@
+@@ -330,6 +330,7 @@
IOCTL(LOOP_SET_STATUS64, IOC_W, MK_PTR(MK_STRUCT(STRUCT_loop_info64)))
IOCTL(LOOP_GET_STATUS64, IOC_W, MK_PTR(MK_STRUCT(STRUCT_loop_info64)))
IOCTL(LOOP_CHANGE_FD, 0, TYPE_INT)
@@ -41,11 +46,11 @@
#endif
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
-index 7d7d700..4823aa0 100644
+index 701809e..4ce7b84 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
-@@ -3631,6 +3631,13 @@ static abi_long do_ioctl_rt(const IOCTLEntry *ie, uint8_t *buf_temp,
- return ret;
+@@ -3722,6 +3722,13 @@ static abi_long do_ioctl_kdsigaccept(const IOCTLEntry *ie, uint8_t *buf_temp,
+ return get_errno(ioctl(fd, ie->host_cmd, sig));
}
+static abi_long do_ioctl_fail(const IOCTLEntry *ie, uint8_t *buf_temp, int fd,
@@ -59,10 +64,10 @@
#define IOCTL(cmd, access, ...) \
{ TARGET_ ## cmd, cmd, #cmd, access, 0, { __VA_ARGS__ } },
diff --git a/linux-user/syscall_defs.h b/linux-user/syscall_defs.h
-index a2ac23e..dd6d041 100644
+index e4ae769..a6aa6b5 100644
--- a/linux-user/syscall_defs.h
+++ b/linux-user/syscall_defs.h
-@@ -1044,6 +1044,7 @@ struct target_pollfd {
+@@ -1061,6 +1061,7 @@ struct target_pollfd {
#define TARGET_LOOP_SET_STATUS64 0x4C04
#define TARGET_LOOP_GET_STATUS64 0x4C05
#define TARGET_LOOP_CHANGE_FD 0x4C06
++++++ 0017-linux-user-lock-tcg.patch ++++++
--- /var/tmp/diff_new_pack.2fPZv3/_old 2014-07-18 06:40:57.000000000 +0200
+++ /var/tmp/diff_new_pack.2fPZv3/_new 2014-07-18 06:40:57.000000000 +0200
@@ -1,4 +1,4 @@
-From c06014909fc303dffb38e62943d88c4ba9f8da31 Mon Sep 17 00:00:00 2001
+From 70ae12474a1d85550cabe64f60e8b0c52055fe17 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
@@ -11,12 +11,13 @@
Signed-off-by: Alexander Graf
[AF: Rebased onto exec.c/translate-all.c split for 1.4]
+[AF: Rebased for v2.1.0-rc0]
Signed-off-by: Andreas Färber
---
linux-user/mmap.c | 3 +++
tcg/tcg.c | 36 ++++++++++++++++++++++++++++++++++--
- tcg/tcg.h | 6 ++++++
- 3 files changed, 43 insertions(+), 2 deletions(-)
+ tcg/tcg.h | 5 +++++
+ 3 files changed, 42 insertions(+), 2 deletions(-)
diff --git a/linux-user/mmap.c b/linux-user/mmap.c
index 34a5615..7ebf953 100644
@@ -47,11 +48,11 @@
}
diff --git a/tcg/tcg.c b/tcg/tcg.c
-index f1e0763..4f36b40 100644
+index c068990..e404655 100644
--- a/tcg/tcg.c
+++ b/tcg/tcg.c
-@@ -40,6 +40,8 @@
- #include "qemu/cache-utils.h"
+@@ -39,6 +39,8 @@
+ #include "qemu-common.h"
#include "qemu/host-utils.h"
#include "qemu/timer.h"
+#include "config-host.h"
@@ -59,7 +60,7 @@
/* Note: the long term plan is to reduce the dependencies on the QEMU
CPU definitions. Currently they are used for qemu_ld/st
-@@ -117,6 +119,29 @@ const size_t tcg_op_defs_max = ARRAY_SIZE(tcg_op_defs);
+@@ -123,6 +125,29 @@ const size_t tcg_op_defs_max = ARRAY_SIZE(tcg_op_defs);
static TCGRegSet tcg_target_available_regs[2];
static TCGRegSet tcg_target_call_clobber_regs;
@@ -86,10 +87,10 @@
+#endif
+}
+
- static inline void tcg_out8(TCGContext *s, uint8_t v)
+ #if TCG_TARGET_INSN_UNIT_SIZE == 1
+ static __attribute__((unused)) inline void tcg_out8(TCGContext *s, uint8_t v)
{
- *s->code_ptr++ = v;
-@@ -295,7 +320,8 @@ void tcg_context_init(TCGContext *s)
+@@ -339,7 +364,8 @@ void tcg_context_init(TCGContext *s)
memset(s, 0, sizeof(*s));
s->nb_globals = 0;
@@ -99,7 +100,7 @@
/* Count total number of arguments and allocate the corresponding
space */
total_args = 0;
-@@ -2597,10 +2623,12 @@ int tcg_gen_code(TCGContext *s, uint8_t *gen_code_buf)
+@@ -2560,10 +2586,12 @@ int tcg_gen_code(TCGContext *s, tcg_insn_unit *gen_code_buf)
}
#endif
@@ -107,14 +108,14 @@
tcg_gen_code_common(s, gen_code_buf, -1);
/* flush instruction cache */
- flush_icache_range((uintptr_t)gen_code_buf, (uintptr_t)s->code_ptr);
+ flush_icache_range((uintptr_t)s->code_buf, (uintptr_t)s->code_ptr);
+ tcg_unlock();
- return s->code_ptr - gen_code_buf;
+ return tcg_current_code_size(s);
}
-@@ -2611,7 +2639,11 @@ int tcg_gen_code(TCGContext *s, uint8_t *gen_code_buf)
- Return -1 if not found. */
- int tcg_gen_code_search_pc(TCGContext *s, uint8_t *gen_code_buf, long offset)
+@@ -2575,7 +2603,11 @@ int tcg_gen_code(TCGContext *s, tcg_insn_unit *gen_code_buf)
+ int tcg_gen_code_search_pc(TCGContext *s, tcg_insn_unit *gen_code_buf,
+ long offset)
{
- return tcg_gen_code_common(s, gen_code_buf, offset);
+ int r;
@@ -126,19 +127,18 @@
#ifdef CONFIG_PROFILER
diff --git a/tcg/tcg.h b/tcg/tcg.h
-index f7efcb4..27a72f9 100644
+index 997a704..1815965 100644
--- a/tcg/tcg.h
+++ b/tcg/tcg.h
-@@ -54,6 +54,8 @@ typedef uint64_t tcg_target_ulong;
- #error unsupported
- #endif
+@@ -27,6 +27,7 @@
-+#include "config-host.h"
+ #include "qemu-common.h"
+ #include "qemu/bitops.h"
+#include "qemu/thread.h"
- #include "tcg-runtime.h"
+ #include "tcg-target.h"
- #if TCG_TARGET_NB_REGS <= 32
-@@ -530,6 +532,7 @@ struct TCGContext {
+ /* Default target word size to pointer size. */
+@@ -554,6 +555,7 @@ struct TCGContext {
/* The TCGBackendData structure is private to tcg-target.c. */
struct TCGBackendData *be;
@@ -146,7 +146,7 @@
};
extern TCGContext tcg_ctx;
-@@ -707,6 +710,9 @@ void tcg_gen_shifti_i64(TCGv_i64 ret, TCGv_i64 arg1,
+@@ -732,6 +734,9 @@ void tcg_gen_shifti_i64(TCGv_i64 ret, TCGv_i64 arg1,
TCGArg *tcg_optimize(TCGContext *s, uint16_t *tcg_opc_ptr, TCGArg *args,
TCGOpDef *tcg_op_def);
++++++ 0018-linux-user-Run-multi-threaded-code-.patch ++++++
--- /var/tmp/diff_new_pack.2fPZv3/_old 2014-07-18 06:40:57.000000000 +0200
+++ /var/tmp/diff_new_pack.2fPZv3/_new 2014-07-18 06:40:57.000000000 +0200
@@ -1,4 +1,4 @@
-From ca45f1d446ca88675e85bf80f133d3d8d955dbf0 Mon Sep 17 00:00:00 2001
+From f9d767a0740f88f9470166e6cba43d459a7abc1b 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,10 +19,10 @@
1 file changed, 9 insertions(+)
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
-index 4823aa0..ff5ed06 100644
+index 4ce7b84..9218392 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
-@@ -4334,6 +4334,15 @@ static int do_fork(CPUArchState *env, unsigned int flags, abi_ulong newsp,
+@@ -4427,6 +4427,15 @@ static int do_fork(CPUArchState *env, unsigned int flags, abi_ulong newsp,
if (nptl_flags & CLONE_SETTLS)
cpu_set_tls (new_env, newtls);
++++++ 0019-linux-user-lock-tb-flushing-too.patch ++++++
--- /var/tmp/diff_new_pack.2fPZv3/_old 2014-07-18 06:40:57.000000000 +0200
+++ /var/tmp/diff_new_pack.2fPZv3/_new 2014-07-18 06:40:57.000000000 +0200
@@ -1,4 +1,4 @@
-From cba80a9dc1f00c65320122f6a9afe95cbf12fbab Mon Sep 17 00:00:00 2001
+From c9a1457d91e8d5e8e51d92d7a7f5bfe1352f39aa 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
@@ -14,10 +14,10 @@
1 file changed, 18 insertions(+), 2 deletions(-)
diff --git a/translate-all.c b/translate-all.c
-index 5759974..1abb87d 100644
+index 8f7e11b..9b46934 100644
--- a/translate-all.c
+++ b/translate-all.c
-@@ -619,19 +619,23 @@ static TranslationBlock *tb_alloc(target_ulong pc)
+@@ -706,19 +706,23 @@ static TranslationBlock *tb_alloc(target_ulong pc)
{
TranslationBlock *tb;
@@ -41,7 +41,7 @@
/* In practice this is mostly used for single use temporary TB
Ignore the hard cases and just back up if this TB happens to
be the last one generated. */
-@@ -640,6 +644,7 @@ void tb_free(TranslationBlock *tb)
+@@ -727,6 +731,7 @@ void tb_free(TranslationBlock *tb)
tcg_ctx.code_gen_ptr = tb->tc_ptr;
tcg_ctx.tb_ctx.nb_tbs--;
}
@@ -49,7 +49,7 @@
}
static inline void invalidate_page_bitmap(PageDesc *p)
-@@ -697,6 +702,7 @@ void tb_flush(CPUArchState *env1)
+@@ -784,6 +789,7 @@ void tb_flush(CPUArchState *env1)
((unsigned long)(tcg_ctx.code_gen_ptr - tcg_ctx.code_gen_buffer)) /
tcg_ctx.tb_ctx.nb_tbs : 0);
#endif
@@ -57,7 +57,7 @@
if ((unsigned long)(tcg_ctx.code_gen_ptr - tcg_ctx.code_gen_buffer)
> tcg_ctx.code_gen_buffer_size) {
cpu_abort(cpu, "Internal error: code buffer overflow\n");
-@@ -714,6 +720,7 @@ void tb_flush(CPUArchState *env1)
+@@ -801,6 +807,7 @@ void tb_flush(CPUArchState *env1)
/* XXX: flush processor icache at this point if cache flush is
expensive */
tcg_ctx.tb_ctx.tb_flush_count++;
@@ -65,7 +65,7 @@
}
#ifdef DEBUG_TB_CHECK
-@@ -1022,8 +1029,10 @@ void tb_invalidate_phys_page_range(tb_page_addr_t start, tb_page_addr_t end,
+@@ -1107,8 +1114,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 */
@@ -76,7 +76,7 @@
return;
}
if (!p->code_bitmap &&
-@@ -1116,6 +1125,7 @@ void tb_invalidate_phys_page_range(tb_page_addr_t start, tb_page_addr_t end,
+@@ -1201,6 +1210,7 @@ void tb_invalidate_phys_page_range(tb_page_addr_t start, tb_page_addr_t end,
cpu_resume_from_signal(cpu, NULL);
}
#endif
@@ -84,7 +84,7 @@
}
/* len must be <= 8 and start must be a multiple of len */
-@@ -1327,13 +1337,16 @@ static TranslationBlock *tb_find_pc(uintptr_t tc_ptr)
+@@ -1412,13 +1422,16 @@ static TranslationBlock *tb_find_pc(uintptr_t tc_ptr)
{
int m_min, m_max, m;
uintptr_t v;
@@ -102,7 +102,7 @@
return NULL;
}
/* binary search (cf Knuth) */
-@@ -1344,6 +1357,7 @@ static TranslationBlock *tb_find_pc(uintptr_t tc_ptr)
+@@ -1429,6 +1442,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) {
@@ -110,7 +110,7 @@
return tb;
} else if (tc_ptr < v) {
m_max = m - 1;
-@@ -1351,7 +1365,9 @@ static TranslationBlock *tb_find_pc(uintptr_t tc_ptr)
+@@ -1436,7 +1450,9 @@ static TranslationBlock *tb_find_pc(uintptr_t tc_ptr)
m_min = m + 1;
}
}
++++++ 0020-linux-user-Fake-proc-cpuinfo.patch ++++++
--- /var/tmp/diff_new_pack.2fPZv3/_old 2014-07-18 06:40:57.000000000 +0200
+++ /var/tmp/diff_new_pack.2fPZv3/_new 2014-07-18 06:40:57.000000000 +0200
@@ -1,4 +1,4 @@
-From 761b115c27a0f900f519422e4a79573da3632f4a Mon Sep 17 00:00:00 2001
+From 6738c77cc99a63b6dde22445d9c511ea84aa8019 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
@@ -22,10 +22,10 @@
1 file changed, 20 insertions(+)
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
-index ff5ed06..8a78348 100644
+index 9218392..ce1054c 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
-@@ -5136,6 +5136,25 @@ static int open_self_stat(void *cpu_env, int fd)
+@@ -5208,6 +5208,25 @@ static int open_self_stat(void *cpu_env, int fd)
return 0;
}
@@ -51,7 +51,7 @@
static int open_self_auxv(void *cpu_env, int fd)
{
CPUState *cpu = ENV_GET_CPU((CPUArchState *)cpu_env);
-@@ -5249,6 +5268,7 @@ static int do_open(void *cpu_env, const char *pathname, int flags, mode_t mode)
+@@ -5322,6 +5341,7 @@ static int do_open(void *cpu_env, const char *pathname, int flags, mode_t mode)
#if defined(HOST_WORDS_BIGENDIAN) != defined(TARGET_WORDS_BIGENDIAN)
{ "/proc/net/route", open_net_route, is_proc },
#endif
++++++ 0021-linux-user-implement-FS_IOC_GETFLAG.patch ++++++
--- /var/tmp/diff_new_pack.2fPZv3/_old 2014-07-18 06:40:57.000000000 +0200
+++ /var/tmp/diff_new_pack.2fPZv3/_new 2014-07-18 06:40:57.000000000 +0200
@@ -1,4 +1,4 @@
-From 36fc0fea8b44e3993088c6b9cab42db36fe1da76 Mon Sep 17 00:00:00 2001
+From 5e7cb7945afdf65b337010caef88e80013afef75 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
@@ -16,10 +16,10 @@
2 files changed, 3 insertions(+)
diff --git a/linux-user/ioctls.h b/linux-user/ioctls.h
-index 2181ea3..a329fb0 100644
+index 0680dc4..4db9651 100644
--- a/linux-user/ioctls.h
+++ b/linux-user/ioctls.h
-@@ -88,6 +88,7 @@
+@@ -89,6 +89,7 @@
IOCTL_SPECIAL(FS_IOC_FIEMAP, IOC_W | IOC_R, do_ioctl_fs_ioc_fiemap,
MK_PTR(MK_STRUCT(STRUCT_fiemap)))
#endif
@@ -28,10 +28,10 @@
IOCTL(SIOCATMARK, 0, TYPE_NULL)
IOCTL(SIOCGIFNAME, IOC_RW, MK_PTR(TYPE_INT))
diff --git a/linux-user/syscall_defs.h b/linux-user/syscall_defs.h
-index dd6d041..2456d5b 100644
+index a6aa6b5..863cfb4 100644
--- a/linux-user/syscall_defs.h
+++ b/linux-user/syscall_defs.h
-@@ -2460,6 +2460,8 @@ struct target_f_owner_ex {
+@@ -2477,6 +2477,8 @@ struct target_f_owner_ex {
#define TARGET_MTIOCGET TARGET_IOR('m', 2, struct mtget)
#define TARGET_MTIOCPOS TARGET_IOR('m', 3, struct mtpos)
++++++ 0022-linux-user-implement-FS_IOC_SETFLAG.patch ++++++
--- /var/tmp/diff_new_pack.2fPZv3/_old 2014-07-18 06:40:57.000000000 +0200
+++ /var/tmp/diff_new_pack.2fPZv3/_new 2014-07-18 06:40:57.000000000 +0200
@@ -1,4 +1,4 @@
-From 8c00316b2996d0c2171032e58d7e21fd8af9bee1 Mon Sep 17 00:00:00 2001
+From c0591abdf987079362c1e8a5452260e247ab33e0 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
@@ -16,10 +16,10 @@
2 files changed, 2 insertions(+)
diff --git a/linux-user/ioctls.h b/linux-user/ioctls.h
-index a329fb0..d76575c 100644
+index 4db9651..46bad50 100644
--- a/linux-user/ioctls.h
+++ b/linux-user/ioctls.h
-@@ -89,6 +89,7 @@
+@@ -90,6 +90,7 @@
MK_PTR(MK_STRUCT(STRUCT_fiemap)))
#endif
IOCTL(FS_IOC_GETFLAGS, IOC_R, MK_PTR(TYPE_LONG))
@@ -28,10 +28,10 @@
IOCTL(SIOCATMARK, 0, TYPE_NULL)
IOCTL(SIOCGIFNAME, IOC_RW, MK_PTR(TYPE_INT))
diff --git a/linux-user/syscall_defs.h b/linux-user/syscall_defs.h
-index 2456d5b..03863a6 100644
+index 863cfb4..14023c9 100644
--- a/linux-user/syscall_defs.h
+++ b/linux-user/syscall_defs.h
-@@ -2461,6 +2461,7 @@ struct target_f_owner_ex {
+@@ -2478,6 +2478,7 @@ struct target_f_owner_ex {
#define TARGET_MTIOCPOS TARGET_IOR('m', 3, struct mtpos)
#define TARGET_FS_IOC_GETFLAGS TARGET_IORU('f', 1)
++++++ 0023-linux-user-XXX-disable-fiemap.patch ++++++
--- /var/tmp/diff_new_pack.2fPZv3/_old 2014-07-18 06:40:57.000000000 +0200
+++ /var/tmp/diff_new_pack.2fPZv3/_new 2014-07-18 06:40:57.000000000 +0200
@@ -1,4 +1,4 @@
-From fac2c74e7593b04a4fc45e0d40c06036f60ae75d Mon Sep 17 00:00:00 2001
+From cae4b35f0f81c0bfff339675f58e0eb252e60a7c 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,10 +9,10 @@
1 file changed, 5 insertions(+)
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
-index 8a78348..28a3d74 100644
+index ce1054c..f00b082 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
-@@ -3188,6 +3188,11 @@ static abi_long do_ioctl_fs_ioc_fiemap(const IOCTLEntry *ie, uint8_t *buf_temp,
+@@ -3272,6 +3272,11 @@ static abi_long do_ioctl_fs_ioc_fiemap(const IOCTLEntry *ie, uint8_t *buf_temp,
uint32_t outbufsz;
int free_fm = 0;
++++++ 0024-slirp-nooutgoing.patch ++++++
--- /var/tmp/diff_new_pack.2fPZv3/_old 2014-07-18 06:40:57.000000000 +0200
+++ /var/tmp/diff_new_pack.2fPZv3/_new 2014-07-18 06:40:57.000000000 +0200
@@ -1,4 +1,4 @@
-From 871d3d13b54c6ba223b09953c50b762d0404cbec Mon Sep 17 00:00:00 2001
+From 8e3a25586a5ce8a771c6b85db26a45d2034117cc 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 @@
4 files changed, 40 insertions(+)
diff --git a/qemu-options.hx b/qemu-options.hx
-index 2d33815..62a1cfc 100644
+index 9e54686..0a7247d 100644
--- a/qemu-options.hx
+++ b/qemu-options.hx
-@@ -2603,6 +2603,16 @@ Store the QEMU process PID in @var{file}. It is useful if you launch QEMU
+@@ -2795,6 +2795,16 @@ Store the QEMU process PID in @var{file}. It is useful if you launch QEMU
from a script.
ETEXI
@@ -97,10 +97,10 @@
socket_set_fast_reuse(s);
opt = 1;
diff --git a/vl.c b/vl.c
-index 9975e5a..b18c815 100644
+index 6e084c2..0e34d53 100644
--- a/vl.c
+++ b/vl.c
-@@ -162,6 +162,7 @@ const char *vnc_display;
+@@ -163,6 +163,7 @@ const char *vnc_display;
int acpi_enabled = 1;
int no_hpet = 0;
int fd_bootchk = 1;
@@ -108,7 +108,7 @@
static int no_reboot;
int no_shutdown = 0;
int cursor_hide = 1;
-@@ -3351,6 +3352,14 @@ int main(int argc, char **argv, char **envp)
+@@ -3391,6 +3392,14 @@ int main(int argc, char **argv, char **envp)
case QEMU_OPTION_singlestep:
singlestep = 1;
break;
++++++ 0025-vnc-password-file-and-incoming-conn.patch ++++++
--- /var/tmp/diff_new_pack.2fPZv3/_old 2014-07-18 06:40:57.000000000 +0200
+++ /var/tmp/diff_new_pack.2fPZv3/_new 2014-07-18 06:40:57.000000000 +0200
@@ -1,4 +1,4 @@
-From 955ef0968a268bcb6ef68b8788952546aed3a1dc Mon Sep 17 00:00:00 2001
+From 44b04f8570d6abff9c43b27ed4d83d9dae15dd90 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=
@@ -9,10 +9,10 @@
1 file changed, 71 insertions(+)
diff --git a/ui/vnc.c b/ui/vnc.c
-index 5925774..8445dd6 100644
+index 548588a..ab03ee3 100644
--- a/ui/vnc.c
+++ b/ui/vnc.c
-@@ -45,6 +45,7 @@ static const struct timeval VNC_REFRESH_LOSSY = { 2, 0 };
+@@ -47,6 +47,7 @@ static const struct timeval VNC_REFRESH_LOSSY = { 2, 0 };
#include "d3des.h"
static VncDisplay *vnc_display; /* needed for info vnc */
@@ -20,7 +20,7 @@
static int vnc_cursor_define(VncState *vs);
static void vnc_release_modifiers(VncState *vs);
-@@ -1031,6 +1032,7 @@ static void vnc_disconnect_start(VncState *vs)
+@@ -1037,6 +1038,7 @@ static void vnc_disconnect_start(VncState *vs)
void vnc_disconnect_finish(VncState *vs)
{
int i;
@@ -28,7 +28,7 @@
vnc_jobs_join(vs); /* Wait encoding jobs */
-@@ -1079,6 +1081,13 @@ void vnc_disconnect_finish(VncState *vs)
+@@ -1085,6 +1087,13 @@ void vnc_disconnect_finish(VncState *vs)
}
g_free(vs->lossy_rect);
g_free(vs);
@@ -42,7 +42,7 @@
}
int vnc_client_io_error(VncState *vs, int ret, int last_errno)
-@@ -3041,6 +3050,39 @@ char *vnc_display_local_addr(DisplayState *ds)
+@@ -3036,6 +3045,39 @@ char *vnc_display_local_addr(DisplayState *ds)
return vnc_socket_local_addr("%s:%s", vs->lsock);
}
@@ -82,7 +82,7 @@
void vnc_display_open(DisplayState *ds, const char *display, Error **errp)
{
VncDisplay *vs = vnc_display;
-@@ -3074,6 +3116,9 @@ void vnc_display_open(DisplayState *ds, const char *display, Error **errp)
+@@ -3069,6 +3111,9 @@ void vnc_display_open(DisplayState *ds, const char *display, Error **errp)
while ((options = strchr(options, ','))) {
options++;
if (strncmp(options, "password", 8) == 0) {
@@ -92,7 +92,7 @@
if (fips_get_state()) {
error_setg(errp,
"VNC password auth disabled due to FIPS mode, "
-@@ -3082,6 +3127,32 @@ void vnc_display_open(DisplayState *ds, const char *display, Error **errp)
+@@ -3077,6 +3122,32 @@ void vnc_display_open(DisplayState *ds, const char *display, Error **errp)
goto fail;
}
password = 1; /* Require password auth */
++++++ 0026-linux-user-add-more-blk-ioctls.patch ++++++
--- /var/tmp/diff_new_pack.2fPZv3/_old 2014-07-18 06:40:57.000000000 +0200
+++ /var/tmp/diff_new_pack.2fPZv3/_new 2014-07-18 06:40:57.000000000 +0200
@@ -1,4 +1,4 @@
-From 6b62214c4bd34a4480814ac47449fab7c34305ed Mon Sep 17 00:00:00 2001
+From fc47b8d0579752369bff5f39fa1e57e40b88adf8 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
@@ -13,10 +13,10 @@
3 files changed, 27 insertions(+)
diff --git a/linux-user/ioctls.h b/linux-user/ioctls.h
-index d76575c..ffd6d09 100644
+index 46bad50..9b6cacb 100644
--- a/linux-user/ioctls.h
+++ b/linux-user/ioctls.h
-@@ -72,6 +72,24 @@
+@@ -73,6 +73,24 @@
#ifdef BLKGETSIZE64
IOCTL(BLKGETSIZE64, IOC_R, MK_PTR(TYPE_ULONGLONG))
#endif
@@ -42,10 +42,10 @@
IOCTL(BLKRASET, 0, TYPE_INT)
IOCTL(BLKRAGET, IOC_R, MK_PTR(TYPE_LONG))
diff --git a/linux-user/syscall_defs.h b/linux-user/syscall_defs.h
-index 03863a6..2271d5f 100644
+index 14023c9..e48481e 100644
--- a/linux-user/syscall_defs.h
+++ b/linux-user/syscall_defs.h
-@@ -913,6 +913,12 @@ struct target_pollfd {
+@@ -930,6 +930,12 @@ struct target_pollfd {
#define TARGET_BLKGETSIZE64 TARGET_IOR(0x12,114,abi_ulong)
/* return device size in bytes
(u64 *arg) */
++++++ 0027-linux-user-use-target_ulong.patch ++++++
--- /var/tmp/diff_new_pack.2fPZv3/_old 2014-07-18 06:40:57.000000000 +0200
+++ /var/tmp/diff_new_pack.2fPZv3/_new 2014-07-18 06:40:57.000000000 +0200
@@ -1,4 +1,4 @@
-From 9f8f18dc792d6c9e3fb661cb8543d0c09b342ac4 Mon Sep 17 00:00:00 2001
+From 84f86270b2e76cf99bf78084722e5d95532d6f91 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
@@ -17,10 +17,10 @@
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/linux-user/qemu.h b/linux-user/qemu.h
-index a2c4e35..6fd5e0c 100644
+index e29c7f3..75b6558 100644
--- a/linux-user/qemu.h
+++ b/linux-user/qemu.h
-@@ -189,10 +189,10 @@ abi_long memcpy_to_target(abi_ulong dest, const void *src,
+@@ -190,10 +190,10 @@ abi_long memcpy_to_target(abi_ulong dest, const void *src,
void target_set_brk(abi_ulong new_brk);
abi_long do_brk(abi_ulong new_brk);
void syscall_init(void);
@@ -36,10 +36,10 @@
extern THREAD CPUState *thread_cpu;
void cpu_loop(CPUArchState *env);
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
-index 28a3d74..a12a722 100644
+index f00b082..08df03f 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
-@@ -5395,10 +5395,10 @@ int syscall_restartable(int syscall_nr)
+@@ -5473,10 +5473,10 @@ int syscall_restartable(int syscall_nr)
/* do_syscall() should always have a single exit point at the end so
that actions, such as logging of syscall results, can be performed.
All errnos that do_syscall() returns must be -TARGET_<errcode>. */
++++++ 0028-block-Add-support-for-DictZip-enabl.patch ++++++
--- /var/tmp/diff_new_pack.2fPZv3/_old 2014-07-18 06:40:57.000000000 +0200
+++ /var/tmp/diff_new_pack.2fPZv3/_new 2014-07-18 06:40:57.000000000 +0200
@@ -1,4 +1,4 @@
-From 8b201b80c7957d04876330c37857b1ac4d8df21e Mon Sep 17 00:00:00 2001
+From 74b3a58f1eb01de57d230a928b7b556add2ec519 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
@@ -28,6 +28,7 @@
[AF: Error **errp added for bdrv_file_open, bdrv_delete -> bdrv_unref]
[AF: qemu_opts_create_nofail() -> qemu_opts_create(),
bdrv_file_open() -> bdrv_open(), based on work by brogers]
+[AF: error_is_set() dropped for v2.1.0-rc0]
Signed-off-by: Andreas Färber
---
block/Makefile.objs | 1 +
@@ -49,7 +50,7 @@
iscsi.o-libs := $(LIBISCSI_LIBS)
diff --git a/block/dictzip.c b/block/dictzip.c
new file mode 100644
-index 0000000..a3629ab
+index 0000000..36f1df0
--- /dev/null
+++ b/block/dictzip.c
@@ -0,0 +1,596 @@
@@ -235,7 +236,7 @@
+
+ opts = qemu_opts_create(&runtime_opts, NULL, 0, &error_abort);
+ qemu_opts_absorb_qdict(opts, options, &local_err);
-+ if (error_is_set(&local_err)) {
++ if (local_err != NULL) {
+ error_propagate(errp, local_err);
+ ret = -EINVAL;
+ goto fail;
++++++ 0029-block-Add-tar-container-format.patch ++++++
--- /var/tmp/diff_new_pack.2fPZv3/_old 2014-07-18 06:40:57.000000000 +0200
+++ /var/tmp/diff_new_pack.2fPZv3/_new 2014-07-18 06:40:57.000000000 +0200
@@ -1,4 +1,4 @@
-From 9faf6837f5e436c6d2003e64cb4b44b90d234c72 Mon Sep 17 00:00:00 2001
+From 39a66fff01637db1cf182bbcc44197e6b9350813 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
@@ -29,6 +29,7 @@
[AF: bdrv_file_open got an Error **errp argument, bdrv_delete -> brd_unref]
[AF: qemu_opts_create_nofail() -> qemu_opts_create(),
bdrv_file_open() -> bdrv_open(), based on work by brogers]
+[AF: error_is_set() dropped for v2.1.0-rc0]
Signed-off-by: Andreas Färber
---
block/Makefile.objs | 1 +
@@ -50,7 +51,7 @@
iscsi.o-libs := $(LIBISCSI_LIBS)
diff --git a/block/tar.c b/block/tar.c
new file mode 100644
-index 0000000..a79cf5e
+index 0000000..c2ab5fa
--- /dev/null
+++ b/block/tar.c
@@ -0,0 +1,386 @@
@@ -234,7 +235,7 @@
+
+ opts = qemu_opts_create(&runtime_opts, NULL, 0, &error_abort);
+ qemu_opts_absorb_qdict(opts, options, &local_err);
-+ if (error_is_set(&local_err)) {
++ if (local_err != NULL) {
+ error_propagate(errp, local_err);
+ ret = -EINVAL;
+ goto fail;
++++++ 0030-Legacy-Patch-kvm-qemu-preXX-dictzip.patch ++++++
--- /var/tmp/diff_new_pack.2fPZv3/_old 2014-07-18 06:40:57.000000000 +0200
+++ /var/tmp/diff_new_pack.2fPZv3/_new 2014-07-18 06:40:57.000000000 +0200
@@ -1,4 +1,4 @@
-From e26cff5986190a24dcc53d658da1fc8e7772338c Mon Sep 17 00:00:00 2001
+From aa8ba1fc7b57a6274b99b6f28201a971fd3a71ff 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
@@ -8,7 +8,7 @@
1 file changed, 11 insertions(+), 2 deletions(-)
diff --git a/block/tar.c b/block/tar.c
-index a79cf5e..09fe1a6 100644
+index c2ab5fa..ea2075d 100644
--- a/block/tar.c
+++ b/block/tar.c
@@ -83,7 +83,8 @@ static int str_ends(char *str, const char *end)
++++++ 0031-Legacy-Patch-kvm-qemu-preXX-report-.patch ++++++
--- /var/tmp/diff_new_pack.2fPZv3/_old 2014-07-18 06:40:57.000000000 +0200
+++ /var/tmp/diff_new_pack.2fPZv3/_new 2014-07-18 06:40:57.000000000 +0200
@@ -1,4 +1,4 @@
-From e828d54e5b1ef01c620e1c761340cd73af785b6b Mon Sep 17 00:00:00 2001
+From 68d77cd24817148f59530990459db4aa627d21f5 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
@@ -8,10 +8,10 @@
1 file changed, 22 insertions(+)
diff --git a/net/net.c b/net/net.c
-index e3ef1e4..67396e7 100644
+index 6d930ea..9656f3e 100644
--- a/net/net.c
+++ b/net/net.c
-@@ -141,6 +141,27 @@ void qemu_format_nic_info_str(NetClientState *nc, uint8_t macaddr[6])
+@@ -158,6 +158,27 @@ void qemu_format_nic_info_str(NetClientState *nc, uint8_t macaddr[6])
macaddr[3], macaddr[4], macaddr[5]);
}
@@ -39,7 +39,7 @@
void qemu_macaddr_default_if_unset(MACAddr *macaddr)
{
static int index = 0;
-@@ -1251,6 +1272,7 @@ int net_init_clients(void)
+@@ -1276,6 +1297,7 @@ int net_init_clients(void)
if (qemu_opts_foreach(net, net_init_client, NULL, 1) == -1) {
return -1;
}
++++++ 0032-console-add-question-mark-escape-op.patch ++++++
--- /var/tmp/diff_new_pack.2fPZv3/_old 2014-07-18 06:40:57.000000000 +0200
+++ /var/tmp/diff_new_pack.2fPZv3/_new 2014-07-18 06:40:57.000000000 +0200
@@ -1,4 +1,4 @@
-From 1f6cee23194037e7c2601e7a728b7fa824f4d66f Mon Sep 17 00:00:00 2001
+From 591b1eadc28bf8e4efc7fa208e447463bd8262eb 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,10 +16,10 @@
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/ui/console.c b/ui/console.c
-index e057755..24413e8 100644
+index ab84549..5d1f074 100644
--- a/ui/console.c
+++ b/ui/console.c
-@@ -866,7 +866,7 @@ static void console_putchar(QemuConsole *s, int ch)
+@@ -852,7 +852,7 @@ static void console_putchar(QemuConsole *s, int ch)
} else {
if (s->nb_esc_params < MAX_ESC_PARAMS)
s->nb_esc_params++;
++++++ 0033-Make-char-muxer-more-robust-wrt-sma.patch ++++++
--- /var/tmp/diff_new_pack.2fPZv3/_old 2014-07-18 06:40:57.000000000 +0200
+++ /var/tmp/diff_new_pack.2fPZv3/_new 2014-07-18 06:40:57.000000000 +0200
@@ -1,4 +1,4 @@
-From e30f0e39abb8e5ad453333ac3dd0f6d7b270e045 Mon Sep 17 00:00:00 2001
+From 6bcb48aaa09b73c9c0c30f8404eb4b3fd3b50eff 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,10 +22,10 @@
1 file changed, 16 insertions(+)
diff --git a/qemu-char.c b/qemu-char.c
-index 54ed244..cc6bfe8 100644
+index 7acc03f..c0ab288 100644
--- a/qemu-char.c
+++ b/qemu-char.c
-@@ -252,6 +252,9 @@ typedef struct {
+@@ -311,6 +311,9 @@ typedef struct {
IOEventHandler *chr_event[MAX_MUX];
void *ext_opaque[MAX_MUX];
CharDriverState *drv;
@@ -35,7 +35,7 @@
int focus;
int mux_cnt;
int term_got_escape;
-@@ -408,6 +411,15 @@ static void mux_chr_accept_input(CharDriverState *chr)
+@@ -470,6 +473,15 @@ static void mux_chr_accept_input(CharDriverState *chr)
d->chr_read[m](d->ext_opaque[m],
&d->buffer[m][d->cons[m]++ & MUX_BUFFER_MASK], 1);
}
@@ -51,7 +51,7 @@
}
static int mux_chr_can_read(void *opaque)
-@@ -530,6 +542,10 @@ static CharDriverState *qemu_chr_open_mux(CharDriverState *drv)
+@@ -598,6 +610,10 @@ static CharDriverState *qemu_chr_open_mux(CharDriverState *drv)
chr->opaque = d;
d->drv = drv;
d->focus = -1;
++++++ 0034-linux-user-lseek-explicitly-cast-no.patch ++++++
--- /var/tmp/diff_new_pack.2fPZv3/_old 2014-07-18 06:40:57.000000000 +0200
+++ /var/tmp/diff_new_pack.2fPZv3/_new 2014-07-18 06:40:57.000000000 +0200
@@ -1,4 +1,4 @@
-From f222ce0d5af1eb8258e84d6fcd8ab89a85131a21 Mon Sep 17 00:00:00 2001
+From 04f9510a380afce8eb3b146e3429d27bebd1a37d 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
@@ -16,10 +16,10 @@
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
-index a12a722..d1f8b3d 100644
+index 08df03f..0b4668d 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
-@@ -5709,9 +5709,14 @@ abi_long do_syscall(void *cpu_env, int num, abi_ulong arg1,
+@@ -5787,9 +5787,14 @@ abi_long do_syscall(void *cpu_env, int num, abi_ulong arg1,
case TARGET_NR_oldstat:
goto unimplemented;
#endif
++++++ 0035-virtfs-proxy-helper-Provide-__u64-f.patch ++++++
--- /var/tmp/diff_new_pack.2fPZv3/_old 2014-07-18 06:40:57.000000000 +0200
+++ /var/tmp/diff_new_pack.2fPZv3/_new 2014-07-18 06:40:57.000000000 +0200
@@ -1,4 +1,4 @@
-From 52b3782f6ec265abbd8704d4999940e2161819d5 Mon Sep 17 00:00:00 2001
+From 52029c3b079c59f52fe2d0242d660807657f85e2 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
@@ -12,7 +12,7 @@
1 file changed, 7 insertions(+)
diff --git a/fsdev/virtfs-proxy-helper.c b/fsdev/virtfs-proxy-helper.c
-index bfecb87..79ab9c8 100644
+index cd291d3..7d7aa67 100644
--- a/fsdev/virtfs-proxy-helper.c
+++ b/fsdev/virtfs-proxy-helper.c
@@ -9,6 +9,13 @@
++++++ 0036-configure-Enable-PIE-for-ppc-and-pp.patch ++++++
--- /var/tmp/diff_new_pack.2fPZv3/_old 2014-07-18 06:40:57.000000000 +0200
+++ /var/tmp/diff_new_pack.2fPZv3/_new 2014-07-18 06:40:57.000000000 +0200
@@ -1,4 +1,4 @@
-From c5ce0620bff591f2c344771e75447d602212c6f0 Mon Sep 17 00:00:00 2001
+From 74b427c02d609c0ec4387fd32806351156a54513 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 @@
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/configure b/configure
-index 69b9f56..21523908 100755
+index f7685b5..7c07772 100755
--- a/configure
+++ b/configure
-@@ -1487,7 +1487,7 @@ fi
+@@ -1538,7 +1538,7 @@ fi
if test "$pie" = ""; then
case "$cpu-$targetos" in
++++++ 0038-tests-Don-t-run-qom-test-twice.patch -> 0037-tests-Don-t-run-qom-test-twice.patch ++++++
--- /work/SRC/openSUSE:Factory/qemu/0038-tests-Don-t-run-qom-test-twice.patch 2014-04-22 10:06:17.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.qemu.new/0037-tests-Don-t-run-qom-test-twice.patch 2014-07-18 06:40:37.000000000 +0200
@@ -1,4 +1,4 @@
-From 857545e61d741cc4f439f98c5e93210b7fa09577 Mon Sep 17 00:00:00 2001
+From 0c5ba28c398f9ccdbd951a4caa5c5bdfbb5e4787 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 @@
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/tests/Makefile b/tests/Makefile
-index 88f7105..8f2b018 100644
+index fa25c70..f7fa66e 100644
--- a/tests/Makefile
+++ b/tests/Makefile
-@@ -162,7 +162,9 @@ check-qtest-microblazeel-y = $(check-qtest-microblaze-y)
+@@ -184,7 +184,9 @@ check-qtest-microblazeel-y = $(check-qtest-microblaze-y)
check-qtest-xtensaeb-y = $(check-qtest-xtensa-y)
# qom-test works for all sysemu architectures:
++++++ 0041-qtest-Increase-socket-timeout.patch -> 0038-qtest-Increase-socket-timeout.patch ++++++
--- /work/SRC/openSUSE:Factory/qemu/0041-qtest-Increase-socket-timeout.patch 2014-04-22 10:06:17.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.qemu.new/0038-qtest-Increase-socket-timeout.patch 2014-07-18 06:40:37.000000000 +0200
@@ -1,4 +1,4 @@
-From 1126af0e6664e58a5e6e2280f6d61bb829099444 Mon Sep 17 00:00:00 2001
+From 8ed9074630b2095beef49b0ace3e2d97e6fb02de 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
@@ -14,11 +14,11 @@
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tests/libqtest.c b/tests/libqtest.c
-index 4b90d91..18efcf2 100644
+index 98e8f4b..393e99e 100644
--- a/tests/libqtest.c
+++ b/tests/libqtest.c
-@@ -34,7 +34,7 @@
- #include "qapi/qmp/json-parser.h"
+@@ -35,7 +35,7 @@
+ #include "qapi/qmp/qjson.h"
#define MAX_IRQ 256
-#define SOCKET_TIMEOUT 5
++++++ 0071-module-Simplify-module_load.patch -> 0039-module-Simplify-module_load.patch ++++++
--- /work/SRC/openSUSE:Factory/qemu/0071-module-Simplify-module_load.patch 2014-07-11 20:05:27.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.qemu.new/0039-module-Simplify-module_load.patch 2014-07-18 06:40:37.000000000 +0200
@@ -1,4 +1,4 @@
-From 212b80fa19390023a809068c5d282e2994bd98bc Mon Sep 17 00:00:00 2001
+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()
++++++ 0072-module-Don-t-complain-when-a-module.patch -> 0040-module-Don-t-complain-when-a-module.patch ++++++
--- /work/SRC/openSUSE:Factory/qemu/0072-module-Don-t-complain-when-a-module.patch 2014-07-11 20:05:27.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.qemu.new/0040-module-Don-t-complain-when-a-module.patch 2014-07-18 06:40:37.000000000 +0200
@@ -1,4 +1,4 @@
-From 14cd25c73de420d01acd3f0691e1d663dcf3eca9 Mon Sep 17 00:00:00 2001
+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
++++++ qemu-linux-user.spec.in ++++++
--- /var/tmp/diff_new_pack.2fPZv3/_old 2014-07-18 06:40:57.000000000 +0200
+++ /var/tmp/diff_new_pack.2fPZv3/_new 2014-07-18 06:40:57.000000000 +0200
@@ -23,7 +23,7 @@
Group: System/Emulators/PC
QEMU_VERSION
Release: 0
-Source: qemu-2.0.0.tar.bz2
+Source: qemu-2.1.0-rc2.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 @@
run cross-architecture builds.
%prep
-%setup -q -n qemu-2.0.0
+%setup -q -n qemu-2.1.0-rc2
PATCH_EXEC
%build
@@ -142,6 +142,7 @@
%_bindir/qemu-or32
%_bindir/qemu-ppc64abi32
%_bindir/qemu-ppc64
+%_bindir/qemu-ppc64le
%_bindir/qemu-ppc
%_bindir/qemu-s390x
%_bindir/qemu-sh4
++++++ qemu.spec.in ++++++
--- /var/tmp/diff_new_pack.2fPZv3/_old 2014-07-18 06:40:57.000000000 +0200
+++ /var/tmp/diff_new_pack.2fPZv3/_new 2014-07-18 06:40:57.000000000 +0200
@@ -45,7 +45,7 @@
Group: System/Emulators/PC
QEMU_VERSION
Release: 0
-Source: %name-2.0.0.tar.bz2
+Source: %name-2.1.0-rc2.tar.bz2
Source1: 80-kvm.rules
Source2: qemu-ifup
Source3: kvm_stat
@@ -57,13 +57,6 @@
PATCH_FILES
# Please do not add patches manually here, run update_git.sh.
-# roms/ipxe patches
-Patch1000: ipxe-build-Work-around-bug-in-gcc-4.8.patch
-Patch1001: ipxe-zbin-Fix-size-used-for-memset-in-al.patch
-Patch1002: ipxe-build-Avoid-strict-aliasing-warning.patch
-Patch1003: vgabios-Make-sure-stdvga_list_modes-doesn-t-overrun-.patch
-# end roms/ipxe patches
-
# this is to make lint happy
Source300: rpmlintrc
Source302: bridge.conf
@@ -455,14 +448,9 @@
%endif
%prep
-%setup -q #-n %name-2.0.0-rc3
+%setup -q -n %name-2.1.0-rc2
PATCH_EXEC
-%patch1000 -p1
-%patch1001 -p1
-%patch1002 -p1
-%patch1003 -p1
-
%if %{build_x86_fw_from_source}
# as a safeguard, delete the firmware files that we intend to build
for i in %built_firmware_files
++++++ update_git.sh ++++++
--- /var/tmp/diff_new_pack.2fPZv3/_old 2014-07-18 06:40:58.000000000 +0200
+++ /var/tmp/diff_new_pack.2fPZv3/_new 2014-07-18 06:40:58.000000000 +0200
@@ -11,8 +11,8 @@
GIT_TREE=git://github.com/openSUSE/qemu.git
GIT_LOCAL_TREE=~/git/qemu-opensuse
-GIT_BRANCH=opensuse-2.0
-GIT_UPSTREAM_TAG=v2.0.0
+GIT_BRANCH=opensuse-2.1
+GIT_UPSTREAM_TAG=v2.1.0-rc2
GIT_DIR=/dev/shm/qemu-factory-git-dir
CMP_DIR=/dev/shm/qemu-factory-cmp-dir
@@ -76,6 +76,7 @@
else
osc rm --force $i
let DELETED_COUNT+=1
+ echo " ${i##*/}" >> qemu.changes.deleted
fi
done
@@ -83,6 +84,7 @@
mv $i .
osc add ${i##*/}
let ADDED_COUNT+=1
+ echo " ${i##*/}" >> qemu.changes.added
done
for package in qemu qemu-linux-user; do
@@ -111,7 +113,30 @@
echo "$line"
fi
done < $package.spec.in > $package.spec
+
+ # Factory requires all deleted and added patches to be mentioned
+ if [ -e qemu.changes.deleted ] || [ -e qemu.changes.added ]; then
+ echo "Patch queue updated from ${GIT_TREE} ${GIT_BRANCH}" > $package.changes.proposed
+ fi
+ if [ -e qemu.changes.deleted ]; then
+ echo "* Patches dropped:" >> $package.changes.proposed
+ cat qemu.changes.deleted >> $package.changes.proposed
+ fi
+ if [ -e qemu.changes.added ]; then
+ echo "* Patches added:" >> $package.changes.proposed
+ cat qemu.changes.added >> $package.changes.proposed
+ fi
+ if [ -e $package.changes.proposed ]; then
+ osc vc --file=$package.changes.proposed $package
+ rm -f $package.changes.proposed
+ fi
done
+ if [ -e qemu.changes.deleted ]; then
+ rm -f qemu.changes.deleted
+ fi
+ if [ -e qemu.changes.added ]; then
+ rm -f qemu.changes.added
+ fi
echo "git patch summary"
echo " unchanged: $UNCHANGED_COUNT"
echo " changed: $CHANGED_COUNT"
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org