Re: 5.0 vmt0 kernel panic in Linux KVM

[Brynet]

On Tue, Nov 08, 2011 at 01:27:37PM -0500, Brynet wrote:
> @@ -190,7 +190,7 @@ k1x_init(struct cpu_info *ci)
>  
>  #if NACPICPU > 0
>       msr = rdmsr(MSR_K1X_STATUS);
> -     k1x_acpi_init(cstate, msr);
> +     k1x_acpi_init(cstate);

Whoops, fixed patch for amd64.

-Bryan.

Index: amd64/amd64/k1x-pstate.c
===================================================================
RCS file: /cvs/src/sys/arch/amd64/amd64/k1x-pstate.c,v
retrieving revision 1.2
diff -u -p -u -r1.2 k1x-pstate.c
--- amd64/amd64/k1x-pstate.c    29 May 2011 12:29:28 -0000      1.2
+++ amd64/amd64/k1x-pstate.c    8 Nov 2011 18:30:59 -0000
@@ -75,7 +75,7 @@ struct k1x_cpu_state *k1x_current_state;
 void k1x_transition(struct k1x_cpu_state *, int);
 
 #if NACPICPU > 0
-void k1x_acpi_init(struct k1x_cpu_state *, u_int64_t);
+void k1x_acpi_init(struct k1x_cpu_state *);
 void k1x_acpi_states(struct k1x_cpu_state *, struct acpicpu_pss *, int,
     u_int64_t);
 #endif
@@ -154,14 +154,17 @@ k1x_acpi_states(struct k1x_cpu_state *cs
 }
 
 void
-k1x_acpi_init(struct k1x_cpu_state *cstate, u_int64_t msr)
+k1x_acpi_init(struct k1x_cpu_state *cstate)
 {
        struct acpicpu_pss *pss;
+       u_int64_t msr;
 
        cstate->n_states = acpicpu_fetch_pss(&pss);
        if (cstate->n_states == 0)
                return;
 
+       msr = rdmsr(MSR_K1X_STATUS);
+
        k1x_acpi_states(cstate, pss, cstate->n_states, msr);
 
        return;
@@ -172,12 +175,9 @@ k1x_acpi_init(struct k1x_cpu_state *csta
 void
 k1x_init(struct cpu_info *ci)
 {
-#if NACPICPU > 0
-       u_int64_t msr;
-#endif
-       u_int i;
        struct k1x_cpu_state *cstate;
        struct k1x_state *state;
+       u_int i;
 
        if (setperf_prio > 1)
                return;
@@ -189,8 +189,7 @@ k1x_init(struct cpu_info *ci)
        cstate->n_states = 0;
 
 #if NACPICPU > 0
-       msr = rdmsr(MSR_K1X_STATUS);
-       k1x_acpi_init(cstate, msr);
+       k1x_acpi_init(cstate);
 #endif
        if (cstate->n_states) {
                printf("%s: %d MHz: speeds:",