From 7c8d2db2f277976560b1b5482ae0aa1a333d01a0fb0f15c284c4f3baa9670f9a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Mon, 23 Mar 2015 13:30:40 +0000 Subject: [PATCH] Accepting request 292450 from home:a_faerber:branches:Virtualization Fix linux-user forking code OBS-URL: https://build.opensuse.org/request/show/292450 OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=240 --- 0045-linux-user-fix-broken-cpu_copy.patch | 30 +++++++++++++++++++++++ libcacard.changes | 7 ++++++ libcacard.spec | 2 ++ qemu-linux-user.changes | 7 ++++++ qemu-linux-user.spec | 2 ++ qemu.changes | 7 ++++++ qemu.spec | 2 ++ 7 files changed, 57 insertions(+) create mode 100644 0045-linux-user-fix-broken-cpu_copy.patch diff --git a/0045-linux-user-fix-broken-cpu_copy.patch b/0045-linux-user-fix-broken-cpu_copy.patch new file mode 100644 index 00000000..6bfacc6c --- /dev/null +++ b/0045-linux-user-fix-broken-cpu_copy.patch @@ -0,0 +1,30 @@ +From 14537bb8faabb603627e1b0845be0870d4cef8ba Mon Sep 17 00:00:00 2001 +From: Leon Alrae +Date: Mon, 23 Mar 2015 12:55:52 +0000 +Subject: [PATCH] linux-user: fix broken cpu_copy() +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +New threads always point at the same env which is incorrect and usually +leads to a crash. + +Signed-off-by: Leon Alrae +Signed-off-by: Andreas Färber +--- + linux-user/main.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/linux-user/main.c b/linux-user/main.c +index 3cb2140..be28e37 100644 +--- a/linux-user/main.c ++++ b/linux-user/main.c +@@ -3460,7 +3460,7 @@ CPUArchState *cpu_copy(CPUArchState *env) + { + CPUState *cpu = ENV_GET_CPU(env); + CPUState *new_cpu = cpu_init(cpu_model); +- CPUArchState *new_env = cpu->env_ptr; ++ CPUArchState *new_env = new_cpu->env_ptr; + CPUBreakpoint *bp; + CPUWatchpoint *wp; + diff --git a/libcacard.changes b/libcacard.changes index 093952ed..8123d82f 100644 --- a/libcacard.changes +++ b/libcacard.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Mar 23 13:20:39 UTC 2015 - afaerber@suse.de + +- Patch queue updated from git://github.com/openSUSE/qemu.git opensuse-2.3 +* Patches added: + 0045-linux-user-fix-broken-cpu_copy.patch + ------------------------------------------------------------------- Sat Mar 21 18:32:17 UTC 2015 - afaerber@suse.de diff --git a/libcacard.spec b/libcacard.spec index ed62c908..7928a663 100644 --- a/libcacard.spec +++ b/libcacard.spec @@ -69,6 +69,7 @@ Patch0041: 0041-ahci-Fix-sglist-offset-manipulation.patch Patch0042: 0042-ahci-test-improve-rw-buffer-pattern.patch Patch0043: 0043-fw_cfg-test-Fix-test-path-to-includ.patch Patch0044: 0044-rcu-tests-fix-compilation-on-32-bit.patch +Patch0045: 0045-linux-user-fix-broken-cpu_copy.patch # Please do not add patches manually here, run update_git.sh. # this is to make lint happy Source300: qemu-rpmlintrc @@ -172,6 +173,7 @@ This sub-package contains development files for the Smartcard library. %patch0042 -p1 %patch0043 -p1 %patch0044 -p1 +%patch0045 -p1 %build ./configure --prefix=%_prefix --sysconfdir=%_sysconfdir \ diff --git a/qemu-linux-user.changes b/qemu-linux-user.changes index f2dbdbf8..55ac1277 100644 --- a/qemu-linux-user.changes +++ b/qemu-linux-user.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Mar 23 13:20:35 UTC 2015 - afaerber@suse.de + +- Patch queue updated from git://github.com/openSUSE/qemu.git opensuse-2.3 +- Fix cpu_copy() not actually copying the CPU state + 0045-linux-user-fix-broken-cpu_copy.patch + ------------------------------------------------------------------- Sat Mar 21 18:32:13 UTC 2015 - afaerber@suse.de diff --git a/qemu-linux-user.spec b/qemu-linux-user.spec index e82167b5..8850d1c2 100644 --- a/qemu-linux-user.spec +++ b/qemu-linux-user.spec @@ -69,6 +69,7 @@ Patch0041: 0041-ahci-Fix-sglist-offset-manipulation.patch Patch0042: 0042-ahci-test-improve-rw-buffer-pattern.patch Patch0043: 0043-fw_cfg-test-Fix-test-path-to-includ.patch Patch0044: 0044-rcu-tests-fix-compilation-on-32-bit.patch +Patch0045: 0045-linux-user-fix-broken-cpu_copy.patch # Please do not add patches manually here, run update_git.sh. # this is to make lint happy Source300: qemu-rpmlintrc @@ -166,6 +167,7 @@ run cross-architecture builds. %patch0042 -p1 %patch0043 -p1 %patch0044 -p1 +%patch0045 -p1 %build ./configure --prefix=%_prefix --sysconfdir=%_sysconfdir \ diff --git a/qemu.changes b/qemu.changes index b2afed35..8e1dfb75 100644 --- a/qemu.changes +++ b/qemu.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Mar 23 13:20:31 UTC 2015 - afaerber@suse.de + +- Patch queue updated from git://github.com/openSUSE/qemu.git opensuse-2.3 +* Patches added: + 0045-linux-user-fix-broken-cpu_copy.patch + ------------------------------------------------------------------- Sat Mar 21 16:07:28 UTC 2015 - afaerber@suse.de diff --git a/qemu.spec b/qemu.spec index 00521e1d..0c77c04c 100644 --- a/qemu.spec +++ b/qemu.spec @@ -100,6 +100,7 @@ Patch0041: 0041-ahci-Fix-sglist-offset-manipulation.patch Patch0042: 0042-ahci-test-improve-rw-buffer-pattern.patch Patch0043: 0043-fw_cfg-test-Fix-test-path-to-includ.patch Patch0044: 0044-rcu-tests-fix-compilation-on-32-bit.patch +Patch0045: 0045-linux-user-fix-broken-cpu_copy.patch # Please do not add QEMU patches manually here. # Run update_git.sh to regenerate this queue. @@ -523,6 +524,7 @@ This package provides a service file for starting and stopping KSM. %patch0042 -p1 %patch0043 -p1 %patch0044 -p1 +%patch0045 -p1 %if %{build_x86_fw_from_source} pushd roms/seabios