On 03/26/2012 04:06 AM, Wanpeng Li wrote:
> From: Anthony Liguori <aligu...@us.ibm.com>
>
> @@ -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()) {
> dev = qdev_create(NULL, "kvm-apic");
> } else {
> dev = qdev_create(NULL, "apic");
> @@ -908,7 +919,7 @@ static DeviceState *apic_init(void *env, uint8_t apic_id)
> }
>
> /* KVM does not support MSI yet. */
> - if (!kvm_irqchip_in_kernel()) {
> + if (!kvm_enabled() || !kvm_irqchip_in_kernel()) {
> msi_supported = true;
Why these changes?
--
error compiling committee.c: too many arguments to function
