[PATCH 1 of 3] user: ppc: add stub nmi handler

[PATCH 1 of 3] user: ppc: add stub nmi handler

[Hollis Blanchard]

# HG changeset patch
# User Hollis Blanchard <hollisb@us.ibm.com>
# Date 1224281124 18000
# Node ID eed92f318ffa8a2e036a5bd9727f45c59dda5b12
# Parent  1ad6978ab8a1d0278126b9dd315745842d746986
user: ppc: add stub nmi handler

Signed-off-by: Hollis Blanchard <hollisb@us.ibm.com>

diff --git a/user/main-ppc.c b/user/main-ppc.c
--- a/user/main-ppc.c
+++ b/user/main-ppc.c
@@ -83,6 +83,11 @@ static int test_io_window(void *opaque)
 }
 
 static int test_try_push_interrupts(void *opaque)
+{
+	return 0;
+}
+
+static int test_try_push_nmi(void *opaque)
 {
 	return 0;
 }
@@ -175,6 +180,7 @@ static struct kvm_callbacks test_callbac
 	.halt        = test_halt,
 	.io_window = test_io_window,
 	.try_push_interrupts = test_try_push_interrupts,
+	.try_push_nmi = test_try_push_nmi,
 	.post_kvm_run = test_post_kvm_run,
 	.pre_kvm_run = test_pre_kvm_run,
 	.powerpc_dcr_read = test_dcr_read,

Re: [PATCH 1 of 3] user: ppc: add stub nmi handler

[Christian Ehrhardt]

I already wrote and brought that one upstream.
It is in the repo as kvmppc-add-kvm_arch_try_push_nmi.diff and as of 
today I guard it with "+upstream"

Hollis Blanchard wrote:
> # HG changeset patch
> # User Hollis Blanchard <hollisb@us.ibm.com>
> # Date 1224281124 18000
> # Node ID eed92f318ffa8a2e036a5bd9727f45c59dda5b12
> # Parent  1ad6978ab8a1d0278126b9dd315745842d746986
> user: ppc: add stub nmi handler
>
> Signed-off-by: Hollis Blanchard <hollisb@us.ibm.com>
>
> diff --git a/user/main-ppc.c b/user/main-ppc.c
> --- a/user/main-ppc.c
> +++ b/user/main-ppc.c
> @@ -83,6 +83,11 @@ static int test_io_window(void *opaque)
>  }
>
>  static int test_try_push_interrupts(void *opaque)
> +{
> +	return 0;
> +}
> +
> +static int test_try_push_nmi(void *opaque)
>  {
>  	return 0;
>  }
> @@ -175,6 +180,7 @@ static struct kvm_callbacks test_callbac
>  	.halt        = test_halt,
>  	.io_window = test_io_window,
>  	.try_push_interrupts = test_try_push_interrupts,
> +	.try_push_nmi = test_try_push_nmi,
>  	.post_kvm_run = test_post_kvm_run,
>  	.pre_kvm_run = test_pre_kvm_run,
>  	.powerpc_dcr_read = test_dcr_read,
>   


-- 

Grüsse / regards, 
Christian Ehrhardt
IBM Linux Technology Center, Open Virtualization

Re: [PATCH 1 of 3] user: ppc: add stub nmi handler

[Christian Ehrhardt]

Further checks later - it was in our repo with a different name not 
upstream.
I'll submit it together with the rest of the backlog we have in our queue.

Christian Ehrhardt wrote:
> I already wrote and brought that one upstream.
> It is in the repo as kvmppc-add-kvm_arch_try_push_nmi.diff and as of 
> today I guard it with "+upstream"
>
> Hollis Blanchard wrote:
>> # HG changeset patch
>> # User Hollis Blanchard <hollisb@us.ibm.com>
>> # Date 1224281124 18000
>> # Node ID eed92f318ffa8a2e036a5bd9727f45c59dda5b12
>> # Parent  1ad6978ab8a1d0278126b9dd315745842d746986
>> user: ppc: add stub nmi handler
>>
>> Signed-off-by: Hollis Blanchard <hollisb@us.ibm.com>
>>
>> diff --git a/user/main-ppc.c b/user/main-ppc.c
>> --- a/user/main-ppc.c
>> +++ b/user/main-ppc.c
>> @@ -83,6 +83,11 @@ static int test_io_window(void *opaque)
>>  }
>>
>>  static int test_try_push_interrupts(void *opaque)
>> +{
>> +    return 0;
>> +}
>> +
>> +static int test_try_push_nmi(void *opaque)
>>  {
>>      return 0;
>>  }
>> @@ -175,6 +180,7 @@ static struct kvm_callbacks test_callbac
>>      .halt        = test_halt,
>>      .io_window = test_io_window,
>>      .try_push_interrupts = test_try_push_interrupts,
>> +    .try_push_nmi = test_try_push_nmi,
>>      .post_kvm_run = test_post_kvm_run,
>>      .pre_kvm_run = test_pre_kvm_run,
>>      .powerpc_dcr_read = test_dcr_read,
>>   
>
>


-- 

Grüsse / regards, 
Christian Ehrhardt
IBM Linux Technology Center, Open Virtualization