Patchwork [9/9] Move mp_state to CPU_COMMON

login
register
mail settings
Submitter Alexander Graf
Date Oct. 21, 2009, 7:17 p.m.
Message ID <1256152621-18863-10-git-send-email-agraf@suse.de>
Download mbox | patch
Permalink /patch/36622/
State New
Headers show

Comments

Alexander Graf - Oct. 21, 2009, 7:17 p.m.
MP State is implemented in the generic code, so let's move the variable
it accesses to generic code as well.

Still unbreaks PPC and now even S390x w/ KVM.

Signed-off-by: Alexander Graf <agraf@suse.de>
---
 cpu-defs.h        |    1 +
 target-i386/cpu.h |    1 -
 2 files changed, 1 insertions(+), 1 deletions(-)
Hollis Blanchard - Oct. 29, 2009, 9:39 p.m.
On Wed, 2009-10-21 at 21:17 +0200, Alexander Graf wrote:
> MP State is implemented in the generic code, so let's move the variable
> it accesses to generic code as well.
> 
> Still unbreaks PPC and now even S390x w/ KVM.
> 
> Signed-off-by: Alexander Graf <agraf@suse.de>

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

Anthony, this patch fixes a build break in PowerPC KVM. Arguably it
should not be patch 9/9 in an S390 series, but in any case please apply
it. :)
Alexander Graf - Nov. 5, 2009, 10:16 a.m.
On 29.10.2009, at 22:39, Hollis Blanchard wrote:

> On Wed, 2009-10-21 at 21:17 +0200, Alexander Graf wrote:
>> MP State is implemented in the generic code, so let's move the  
>> variable
>> it accesses to generic code as well.
>>
>> Still unbreaks PPC and now even S390x w/ KVM.
>>
>> Signed-off-by: Alexander Graf <agraf@suse.de>
>
> Acked-by: Hollis Blanchard <hollisb@us.ibm.com>
>
> Anthony, this patch fixes a build break in PowerPC KVM. Arguably it
> should not be patch 9/9 in an S390 series, but in any case please  
> apply
> it. :)

Anthony, could you please apply it? Not having S390 support is  
pitiful, but having PPC break too is even worse!

Alex
Anthony Liguori - Nov. 9, 2009, 7:44 p.m.
Alexander Graf wrote:
>
> On 29.10.2009, at 22:39, Hollis Blanchard wrote:
>
>> On Wed, 2009-10-21 at 21:17 +0200, Alexander Graf wrote:
>>> MP State is implemented in the generic code, so let's move the variable
>>> it accesses to generic code as well.
>>>
>>> Still unbreaks PPC and now even S390x w/ KVM.
>>>
>>> Signed-off-by: Alexander Graf <agraf@suse.de>
>>
>> Acked-by: Hollis Blanchard <hollisb@us.ibm.com>
>>
>> Anthony, this patch fixes a build break in PowerPC KVM. Arguably it
>> should not be patch 9/9 in an S390 series, but in any case please apply
>> it. :)
>
> Anthony, could you please apply it? Not having S390 support is 
> pitiful, but having PPC break too is even worse!

 mp_state does not belong in CPU_COMMON.

Regards,

Anthony Liguori

> Alex
>
Alexander Graf - Nov. 9, 2009, 7:45 p.m.
On 09.11.2009, at 20:44, Anthony Liguori wrote:

> Alexander Graf wrote:
>>
>> On 29.10.2009, at 22:39, Hollis Blanchard wrote:
>>
>>> On Wed, 2009-10-21 at 21:17 +0200, Alexander Graf wrote:
>>>> MP State is implemented in the generic code, so let's move the  
>>>> variable
>>>> it accesses to generic code as well.
>>>>
>>>> Still unbreaks PPC and now even S390x w/ KVM.
>>>>
>>>> Signed-off-by: Alexander Graf <agraf@suse.de>
>>>
>>> Acked-by: Hollis Blanchard <hollisb@us.ibm.com>
>>>
>>> Anthony, this patch fixes a build break in PowerPC KVM. Arguably it
>>> should not be patch 9/9 in an S390 series, but in any case please  
>>> apply
>>> it. :)
>>
>> Anthony, could you please apply it? Not having S390 support is  
>> pitiful, but having PPC break too is even worse!
>
> mp_state does not belong in CPU_COMMON.

So you'd rather like a patch #ifdef'ing out the mp code to x86 only?  
Or move it to target-i386/kvm.c?

Alex

Patch

diff --git a/cpu-defs.h b/cpu-defs.h
index 95068b5..ad804e6 100644
--- a/cpu-defs.h
+++ b/cpu-defs.h
@@ -197,6 +197,7 @@  typedef struct CPUWatchpoint {
     const char *cpu_model_str;                                          \
     struct KVMState *kvm_state;                                         \
     struct kvm_run *kvm_run;                                            \
+    uint32_t mp_state;                                                  \
     int kvm_fd;
 
 #endif
diff --git a/target-i386/cpu.h b/target-i386/cpu.h
index 5929d28..8d0c2a9 100644
--- a/target-i386/cpu.h
+++ b/target-i386/cpu.h
@@ -692,7 +692,6 @@  typedef struct CPUX86State {
 
     /* For KVM */
     uint64_t interrupt_bitmap[256 / 64];
-    uint32_t mp_state;
 
     /* in order to simplify APIC support, we leave this pointer to the
        user */