diff mbox

[v2,2/7] ppc: simplify max_smt initialization in ppc_cpu_realizefn()

Message ID 146741289262.948.5461692071180511385.stgit@bahia.lan
State New
Headers show

Commit Message

Greg Kurz July 1, 2016, 10:41 p.m. UTC 
kvmppc_smt_threads() returns 1 if KVM is not enabled.

Signed-off-by: Greg Kurz <groug@kaod.org>
---
 target-ppc/translate_init.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

David Gibson July 4, 2016, 3:53 a.m. UTC | #1 
On Sat, Jul 02, 2016 at 12:41:32AM +0200, Greg Kurz wrote:
> kvmppc_smt_threads() returns 1 if KVM is not enabled.
> 
> Signed-off-by: Greg Kurz <groug@kaod.org>

Applied to ppc-for-2.7

> ---
>  target-ppc/translate_init.c |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/target-ppc/translate_init.c b/target-ppc/translate_init.c
> index 843f19b748fb..a06bf50b65d4 100644
> --- a/target-ppc/translate_init.c
> +++ b/target-ppc/translate_init.c
> @@ -9516,7 +9516,7 @@ static void ppc_cpu_realizefn(DeviceState *dev, Error **errp)
>      PowerPCCPUClass *pcc = POWERPC_CPU_GET_CLASS(cpu);
>      Error *local_err = NULL;
>  #if !defined(CONFIG_USER_ONLY)
> -    int max_smt = kvm_enabled() ? kvmppc_smt_threads() : 1;
> +    int max_smt = kvmppc_smt_threads();
>  #endif
>  
>  #if !defined(CONFIG_USER_ONLY)
>
diff mbox

Patch

diff --git a/target-ppc/translate_init.c b/target-ppc/translate_init.c
index 843f19b748fb..a06bf50b65d4 100644
--- a/target-ppc/translate_init.c
+++ b/target-ppc/translate_init.c
@@ -9516,7 +9516,7 @@  static void ppc_cpu_realizefn(DeviceState *dev, Error **errp)
     PowerPCCPUClass *pcc = POWERPC_CPU_GET_CLASS(cpu);
     Error *local_err = NULL;
 #if !defined(CONFIG_USER_ONLY)
-    int max_smt = kvm_enabled() ? kvmppc_smt_threads() : 1;
+    int max_smt = kvmppc_smt_threads();
 #endif
 
 #if !defined(CONFIG_USER_ONLY)