[v2] qemu-kvm: x86: Fix CPU initialization

Commit Message

Jan Kiszka June 19, 2009, 5:17 p.m. UTC

Jan Kiszka wrote:
> Fix regression in CPU initialization caused by merge a5b526135d and try
> to avoid this in the future by dropping qemu-kvm specific pc_new_cpu. If
> such refactoring is desired, it should go through upstream first.

F...ine. I'll write a hundred times: "Don't post while still compiling."
Here is a version that only fixes the regression.

----------->

Fix regression in CPU initialization caused by merge a5b526135d.

Signed-off-by: Jan Kiszka <[e-mail]>
---

 hw/pc.c |    3 ---
 1 files changed, 0 insertions(+), 3 deletions(-)

--
To unsubscribe from this list: send the line "unsubscribe kvm" in
the body of a message to [e-mail]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Comments

Avi Kivity June 21, 2009, 12:38 p.m. UTC | #1

On 06/19/2009 08:17 PM, Jan Kiszka wrote:
> Jan Kiszka wrote:
>    
>> Fix regression in CPU initialization caused by merge a5b526135d and try
>> to avoid this in the future by dropping qemu-kvm specific pc_new_cpu. If
>> such refactoring is desired, it should go through upstream first.
>>      
>
> F...ine. I'll write a hundred times: "Don't post while still compiling."
> Here is a version that only fixes the regression.
>    

Applied, thanks.

This has bitten us more than once.  Care to upstream pc_new_cpu()?  
we'll need it anyway when we upstream cpu hotplug, and this will make 
life easier for us here downstream.

Patch

diff --git a/hw/pc.c b/hw/pc.c
index 6c19f55..cb5b4d0 100644
--- a/hw/pc.c
+++ b/hw/pc.c
@@ -853,9 +853,6 @@  CPUState *pc_new_cpu(int cpu, const char *cpu_model, int pci_enabled)
             apic_init(env);
         }
         qemu_register_reset(main_cpu_reset, 0, env);
-        if (pci_enabled) {
-            apic_init(env);
-        }
 
     /* kvm needs this to run after the apic is initialized. Otherwise,
      * it can access invalid state and crash.