[PATCH 2/5] user: ppc: fix build break caused by changes to kvm_callbacks

[Hollis Blanchard]

Signed-off-by: Hollis Blanchard <[EMAIL PROTECTED]>
---
 user/main-ppc.c |   11 +++++------
 1 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/user/main-ppc.c b/user/main-ppc.c
index c4ddcef..5fdf28e 100644
--- a/user/main-ppc.c
+++ b/user/main-ppc.c
@@ -69,7 +69,7 @@ static int test_debug(void *opaque, void *vcpu)
        return 0;
 }
 
-static int test_halt(void *opaque, void *vcpu)
+static int test_halt(void *opaque, int vcpu)
 {
        int n;
 
@@ -87,9 +87,8 @@ static int test_try_push_interrupts(void *opaque)
        return 0;
 }
 
-static int test_try_push_nmi(void *opaque)
+static void test_push_nmi(void *opaque)
 {
-       return 0;
 }
 
 static void test_post_kvm_run(void *opaque, void *vcpu)
@@ -160,14 +159,14 @@ static int test_mem_write(void *opaque, uint64_t addr, 
uint8_t *data, int len)
                              (uint64_t *)data);
 }
 
-static int test_dcr_read(uint32_t dcrn, uint32_t *data)
+static int test_dcr_read(int vcpu, uint32_t dcrn, uint32_t *data)
 {
        printf("%s: dcrn %04X\n", __func__, dcrn);
        *data = 0;
        return 0;
 }
 
-static int test_dcr_write(uint32_t dcrn, uint32_t data)
+static int test_dcr_write(int vcpu, uint32_t dcrn, uint32_t data)
 {
        printf("%s: dcrn %04X data %04X\n", __func__, dcrn, data);
        return 0;
@@ -180,7 +179,7 @@ static struct kvm_callbacks test_callbacks = {
        .halt        = test_halt,
        .io_window = test_io_window,
        .try_push_interrupts = test_try_push_interrupts,
-       .try_push_nmi = test_try_push_nmi,
+       .push_nmi = test_push_nmi,
        .post_kvm_run = test_post_kvm_run,
        .pre_kvm_run = test_pre_kvm_run,
        .powerpc_dcr_read = test_dcr_read,
-- 
1.5.6.5

--
To unsubscribe from this list: send the line "unsubscribe kvm" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html