[PATCH] [PATCH] kvm-userspace: gdb: fix new gdb function types

[PATCH] [PATCH] kvm-userspace: gdb: fix new gdb function types

[Christian Ehrhardt]

# HG changeset patch
# User Christian Ehrhardt <ehrhardt@linux.vnet.ibm.com>
# Date 1229085659 -3600
# Node ID 37967a80a2757505488685aac135681945e6da91
# Parent  f0ed33f14658fe91a14ec02501cb42d26e32f01f
[PATCH] kvm-userspace: gdb: fix new gdb function types

From: Christian Ehrhardt <ehrhardt@linux.vnet.ibm.com>

The types changed in the header but not in the powerpc and ia64 implementation.
This patch fix that build error by changing the stubs to the right prototype.

Signed-off-by: Christian Ehrhardt <ehrhardt@linux.vnet.ibm.com>
---

[diffstat]
 qemu-kvm-ia64.c    |    6 ++++--
 qemu-kvm-powerpc.c |    6 ++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

[diff]

diff --git a/qemu/qemu-kvm-ia64.c b/qemu/qemu-kvm-ia64.c
--- a/qemu/qemu-kvm-ia64.c
+++ b/qemu/qemu-kvm-ia64.c
@@ -65,12 +65,14 @@ void kvm_arch_update_regs_for_sipi(CPUSt
 {
 }
 
-int kvm_arch_insert_sw_breakpoint(struct kvm_sw_breakpoint *bp)
+int kvm_arch_insert_sw_breakpoint(CPUState *current_env,
+                                  struct kvm_sw_breakpoint *bp)
 {
     return -EINVAL;
 }
 
-int kvm_arch_remove_sw_breakpoint(struct kvm_sw_breakpoint *bp)
+int kvm_arch_remove_sw_breakpoint(CPUState *current_env,
+                                  struct kvm_sw_breakpoint *bp)
 {
     return -EINVAL;
 }
diff --git a/qemu/qemu-kvm-powerpc.c b/qemu/qemu-kvm-powerpc.c
--- a/qemu/qemu-kvm-powerpc.c
+++ b/qemu/qemu-kvm-powerpc.c
@@ -223,12 +223,14 @@ void kvm_arch_cpu_reset(CPUState *env)
 {
 }
 
-int kvm_arch_insert_sw_breakpoint(struct kvm_sw_breakpoint *bp)
+int kvm_arch_insert_sw_breakpoint(CPUState *current_env,
+                                  struct kvm_sw_breakpoint *bp)
 {
     return -EINVAL;
 }
 
-int kvm_arch_remove_sw_breakpoint(struct kvm_sw_breakpoint *bp)
+int kvm_arch_remove_sw_breakpoint(CPUState *current_env,
+                                  struct kvm_sw_breakpoint *bp)
 {
     return -EINVAL;
 }

Re: [PATCH] [PATCH] kvm-userspace: gdb: fix new gdb function types

[Jan Kiszka]

[-- Attachment #1: Type: text/plain, Size: 714 bytes --]

Christian Ehrhardt wrote:
> # HG changeset patch
> # User Christian Ehrhardt <ehrhardt-23VcF4HTsmIX0ybBhKVfKdBPR1lH4CV8@public.gmane.org>
> # Date 1229085659 -3600
> # Node ID 37967a80a2757505488685aac135681945e6da91
> # Parent  f0ed33f14658fe91a14ec02501cb42d26e32f01f
> [PATCH] kvm-userspace: gdb: fix new gdb function types
> 
> From: Christian Ehrhardt <ehrhardt-23VcF4HTsmIX0ybBhKVfKdBPR1lH4CV8@public.gmane.org>
> 
> The types changed in the header but not in the powerpc and ia64 implementation.
> This patch fix that build error by changing the stubs to the right prototype.

Thanks for the fix! Will merge it into the master patch, adding your
signed-off - if that's fine for you.

Jan


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 257 bytes --]