rpm/qemu
SHA256
1
0
Fork 0
forked from pool/qemu
Code Pull Requests Activity

Accepting request 292450 from home:a_faerber:branches:Virtualization

Browse Source 
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
This commit is contained in:
Andreas Färber 2015-03-23 13:30:40 +00:00 committed by Git OBS Bridge
parent 3aefde8241
commit 7c8d2db2f2
7 changed files with 57 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
0045-linux-user-fix-broken-cpu_copy.patch Normal file
View File

@ -0,0 +1,30 @@
From 14537bb8faabb603627e1b0845be0870d4cef8ba Mon Sep 17 00:00:00 2001
From: Leon Alrae <leon.alrae@imgtec.com>
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 <leon.alrae@imgtec.com>
Signed-off-by: Andreas Färber <afaerber@suse.de>
---
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;

7
libcacard.changes
View File

@ -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 Sat Mar 21 18:32:17 UTC 2015 - afaerber@suse.de

2
libcacard.spec
View File

@ -69,6 +69,7 @@ Patch0041: 0041-ahci-Fix-sglist-offset-manipulation.patch
Patch0042: 0042-ahci-test-improve-rw-buffer-pattern.patch Patch0042: 0042-ahci-test-improve-rw-buffer-pattern.patch
Patch0043: 0043-fw_cfg-test-Fix-test-path-to-includ.patch Patch0043: 0043-fw_cfg-test-Fix-test-path-to-includ.patch
Patch0044: 0044-rcu-tests-fix-compilation-on-32-bit.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. # Please do not add patches manually here, run update_git.sh.
# this is to make lint happy # this is to make lint happy
Source300: qemu-rpmlintrc Source300: qemu-rpmlintrc
@ -172,6 +173,7 @@ This sub-package contains development files for the Smartcard library.
%patch0042 -p1 %patch0042 -p1
%patch0043 -p1 %patch0043 -p1
%patch0044 -p1 %patch0044 -p1
%patch0045 -p1
%build %build
./configure --prefix=%_prefix --sysconfdir=%_sysconfdir \ ./configure --prefix=%_prefix --sysconfdir=%_sysconfdir \

7
qemu-linux-user.changes
View File

@ -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 Sat Mar 21 18:32:13 UTC 2015 - afaerber@suse.de

2
qemu-linux-user.spec
View File

@ -69,6 +69,7 @@ Patch0041: 0041-ahci-Fix-sglist-offset-manipulation.patch
Patch0042: 0042-ahci-test-improve-rw-buffer-pattern.patch Patch0042: 0042-ahci-test-improve-rw-buffer-pattern.patch
Patch0043: 0043-fw_cfg-test-Fix-test-path-to-includ.patch Patch0043: 0043-fw_cfg-test-Fix-test-path-to-includ.patch
Patch0044: 0044-rcu-tests-fix-compilation-on-32-bit.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. # Please do not add patches manually here, run update_git.sh.
# this is to make lint happy # this is to make lint happy
Source300: qemu-rpmlintrc Source300: qemu-rpmlintrc
@ -166,6 +167,7 @@ run cross-architecture builds.
%patch0042 -p1 %patch0042 -p1
%patch0043 -p1 %patch0043 -p1
%patch0044 -p1 %patch0044 -p1
%patch0045 -p1
%build %build
./configure --prefix=%_prefix --sysconfdir=%_sysconfdir \ ./configure --prefix=%_prefix --sysconfdir=%_sysconfdir \

7
qemu.changes
View File

@ -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 Sat Mar 21 16:07:28 UTC 2015 - afaerber@suse.de

2
qemu.spec
View File

@ -100,6 +100,7 @@ Patch0041: 0041-ahci-Fix-sglist-offset-manipulation.patch
Patch0042: 0042-ahci-test-improve-rw-buffer-pattern.patch Patch0042: 0042-ahci-test-improve-rw-buffer-pattern.patch
Patch0043: 0043-fw_cfg-test-Fix-test-path-to-includ.patch Patch0043: 0043-fw_cfg-test-Fix-test-path-to-includ.patch
Patch0044: 0044-rcu-tests-fix-compilation-on-32-bit.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. # Please do not add QEMU patches manually here.
# Run update_git.sh to regenerate this queue. # 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 %patch0042 -p1
%patch0043 -p1 %patch0043 -p1
%patch0044 -p1 %patch0044 -p1
%patch0045 -p1
%if %{build_x86_fw_from_source} %if %{build_x86_fw_from_source}
pushd roms/seabios pushd roms/seabios