Re: [Qemu-devel] [PATCH 5/6] merge pc_piix.c to pc.c

2012-03-26 Thread Anthony Liguori
On 03/26/2012 07:47 AM, Jan Kiszka wrote: On 2012-03-26 14:42, Avi Kivity wrote: On 03/26/2012 04:06 AM, Wanpeng Li wrote: From: Anthony Liguori @@ -889,7 +900,7 @@ static DeviceState *apic_init(void *env, uint8_t apic_id) DeviceState *dev; static int apic_mapped; -if (kvm_irq

Re: [Qemu-devel] [PATCH 5/6] merge pc_piix.c to pc.c

2012-03-26 Thread Jan Kiszka
On 2012-03-26 14:42, Avi Kivity wrote: > On 03/26/2012 04:06 AM, Wanpeng Li wrote: >> From: Anthony Liguori >> >> @@ -889,7 +900,7 @@ static DeviceState *apic_init(void *env, uint8_t apic_id) >> DeviceState *dev; >> static int apic_mapped; >> >> -if (kvm_irqchip_in_kernel()) { >> +

Re: [Qemu-devel] [PATCH 5/6] merge pc_piix.c to pc.c

2012-03-26 Thread Avi Kivity
On 03/26/2012 04:06 AM, Wanpeng Li wrote: > From: Anthony Liguori > > @@ -889,7 +900,7 @@ static DeviceState *apic_init(void *env, uint8_t apic_id) > DeviceState *dev; > static int apic_mapped; > > -if (kvm_irqchip_in_kernel()) { > +if (kvm_enabled() && kvm_irqchip_in_kernel())

[Qemu-devel] [PATCH 5/6] merge pc_piix.c to pc.c

2012-03-25 Thread Wanpeng Li
From: Anthony Liguori Signed-off-by: Anthony Liguori Signed-off-by: Wanpeng Li --- Makefile.target |1 - hw/pc.c | 816 +-- hw/pc.h | 20 +- hw/pc_piix.c| 762 ---