[Qemu-devel] [PULL for-2.0-rc1 0/1] QOM CPUState patch queue 2014-03-19

[Qemu-devel] [PULL for-2.0-rc1 0/1] QOM CPUState patch queue 2014-03-19

[Andreas Färber]

Hello Peter,

This is my current QOM CPU patch queue. Please pull.

Regards,
Andreas

Cc: Peter Maydell <peter.maydell@linaro.org>
Cc: Anthony Liguori <anthony@codemonkey.ws>

Cc: Eduardo Habkost <ehabkost@redhat.com>
Cc: Igor Mammedov <imammedo@redhat.com>

The following changes since commit ec864874bd1c1e13c82f4096fd3957d26c70a680:

  linux-user: Fix build if headers don't define _LINUX_CAPABILITY_VERSION_1 (2014-03-19 18:19:57 +0000)

are available in the git repository at:

  git://github.com/afaerber/qemu-cpu.git tags/qom-cpu-for-2.0

for you to fetch changes up to c01a71c1a56fa27f43449ff59e5d03b2483658a2:

  exec: Fix CPU rework fallout (2014-03-19 19:47:15 +0100)

----------------------------------------------------------------
QOM CPUState refactorings / X86CPU

* Fix pointer type mismatch

----------------------------------------------------------------
Christian Borntraeger (1):
      exec: Fix CPU rework fallout

 exec.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

[Qemu-devel] [PULL for-2.0 1/1] exec: Fix CPU rework fallout

[Andreas Färber]

From: Christian Borntraeger <borntraeger@de.ibm.com>

Commit 259186a7d2f7184efc96ae99bc5658e6159f53ad (cpu: Move halted and
interrupt_request fields to CPUState) passed CPUState::env_ptr to
tlb_flush() directory rather than through a typed variable.

Commit 00c8cb0a36f51a6866a83c08962d12a0eb21864b (cputlb: Change
tlb_flush() argument to CPUState) now changed the argument type.
This was unnoticed by gcc because env_ptr is a void pointer.

Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
Signed-off-by: Andreas Färber <afaerber@suse.de>
---
 exec.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/exec.c b/exec.c
index 6a0bc94..91513c6 100644
--- a/exec.c
+++ b/exec.c
@@ -420,7 +420,7 @@ static int cpu_common_post_load(void *opaque, int version_id)
     /* 0x01 was CPU_INTERRUPT_EXIT. This line can be removed when the
        version_id is increased. */
     cpu->interrupt_request &= ~0x01;
-    tlb_flush(cpu->env_ptr, 1);
+    tlb_flush(cpu, 1);
 
     return 0;
 }
-- 
1.8.4.5

Re: [Qemu-devel] [PULL for-2.0-rc1 0/1] QOM CPUState patch queue 2014-03-19

[Peter Maydell]

On 19 March 2014 18:52, Andreas Färber <afaerber@suse.de> wrote:
> Hello Peter,
>
> This is my current QOM CPU patch queue. Please pull.
>
> Regards,
> Andreas
>
> Cc: Peter Maydell <peter.maydell@linaro.org>
> Cc: Anthony Liguori <anthony@codemonkey.ws>
>
> Cc: Eduardo Habkost <ehabkost@redhat.com>
> Cc: Igor Mammedov <imammedo@redhat.com>
>
> The following changes since commit ec864874bd1c1e13c82f4096fd3957d26c70a680:
>
>   linux-user: Fix build if headers don't define _LINUX_CAPABILITY_VERSION_1 (2014-03-19 18:19:57 +0000)
>
> are available in the git repository at:
>
>   git://github.com/afaerber/qemu-cpu.git tags/qom-cpu-for-2.0
>
> for you to fetch changes up to c01a71c1a56fa27f43449ff59e5d03b2483658a2:
>
>   exec: Fix CPU rework fallout (2014-03-19 19:47:15 +0100)

Applied, thanks.

-- PMM