PPC: e500: advertise 4.2 MPIC only if KVM supports EPR

Submitted by Stuart Yoder on March 30, 2013, 4:40 p.m.

Details

Message ID 1364661649-2399-1-git-send-email-stuart.yoder@freescale.com
State New
Headers show

Commit Message

Stuart Yoder March 30, 2013, 4:40 p.m.
From: Stuart Yoder <stuart.yoder@freescale.com>

Signed-off-by: Stuart Yoder <stuart.yoder@freescale.com>
---
 hw/ppc/e500plat.c |    5 +++++
 1 file changed, 5 insertions(+)

Comments

Alexander Graf April 2, 2013, 7:47 a.m.
On 30.03.2013, at 17:40, Stuart Yoder wrote:

> From: Stuart Yoder <stuart.yoder@freescale.com>

Missing patch description

> 
> Signed-off-by: Stuart Yoder <stuart.yoder@freescale.com>
> ---
> hw/ppc/e500plat.c |    5 +++++
> 1 file changed, 5 insertions(+)
> 
> diff --git a/hw/ppc/e500plat.c b/hw/ppc/e500plat.c
> index 25ac4b1..2cd7cad 100644
> --- a/hw/ppc/e500plat.c
> +++ b/hw/ppc/e500plat.c
> @@ -16,6 +16,7 @@
> #include "sysemu/device_tree.h"
> #include "hw/pci/pci.h"
> #include "hw/openpic.h"
> +#include "sysemu/kvm.h"
> 
> static void e500plat_fixup_devtree(PPCE500Params *params, void *fdt)
> {
> @@ -48,6 +49,10 @@ static void e500plat_init(QEMUMachineInitArgs *args)
>         .mpic_version = OPENPIC_MODEL_FSL_MPIC_42,
>     };
> 

Missing comment

> +    if (kvm_enabled() && !kvm_check_extension(kvm_state, KVM_CAP_PPC_EPR)) {

This should go through target-ppc/kvm_ppc.c. That way we don't need to have any kvm specific headers included here and guarantee that everything compiles just fine without kvm enabled.

I've fixed those up for you and applied the patch to ppc-next.


Alex

> +        params.mpic_version = OPENPIC_MODEL_FSL_MPIC_20;
> +    }
> +
>     ppce500_init(&params);
> }
> 
> -- 
> 1.7.9.7
> 
>

Patch hide | download patch | download mbox

diff --git a/hw/ppc/e500plat.c b/hw/ppc/e500plat.c
index 25ac4b1..2cd7cad 100644
--- a/hw/ppc/e500plat.c
+++ b/hw/ppc/e500plat.c
@@ -16,6 +16,7 @@ 
 #include "sysemu/device_tree.h"
 #include "hw/pci/pci.h"
 #include "hw/openpic.h"
+#include "sysemu/kvm.h"
 
 static void e500plat_fixup_devtree(PPCE500Params *params, void *fdt)
 {
@@ -48,6 +49,10 @@  static void e500plat_init(QEMUMachineInitArgs *args)
         .mpic_version = OPENPIC_MODEL_FSL_MPIC_42,
     };
 
+    if (kvm_enabled() && !kvm_check_extension(kvm_state, KVM_CAP_PPC_EPR)) {
+        params.mpic_version = OPENPIC_MODEL_FSL_MPIC_20;
+    }
+
     ppce500_init(&params);
 }