[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH 5/6] merge pc_piix.c to pc.c
From: |
Jan Kiszka |
Subject: |
Re: [Qemu-devel] [PATCH 5/6] merge pc_piix.c to pc.c |
Date: |
Mon, 26 Mar 2012 14:47:23 +0200 |
User-agent: |
Mozilla/5.0 (X11; U; Linux i686 (x86_64); de; rv:1.8.1.12) Gecko/20080226 SUSE/2.0.0.12-1.1 Thunderbird/2.0.0.12 Mnenhy/0.7.5.666 |
On 2012-03-26 14:42, Avi Kivity wrote:
> On 03/26/2012 04:06 AM, Wanpeng Li wrote:
>> From: Anthony Liguori <address@hidden>
>>
>> @@ -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?
>
Yep, they are obsolete, likely related to the rebase of the original
patch. A lot of code is moved around here, and I bet there are more
artifacts...
Jan
--
Siemens AG, Corporate Technology, CT T DE IT 1
Corporate Competence Center Embedded Linux
- [Qemu-devel] [PATCH 0/6] refactor PC machine, i440fx and piix3 to take advantage of QOM, Wanpeng Li, 2012/03/25
- [Qemu-devel] [PATCH 2/6] convert MemoryRegion to QOM, Wanpeng Li, 2012/03/25
- [Qemu-devel] [PATCH 4/6] prepare to create HPET, RTC and i8254 through composition, Wanpeng Li, 2012/03/25
- [Qemu-devel] [PATCH 6/6] make some functions static, Wanpeng Li, 2012/03/25
- [Qemu-devel] [PATCH 3/6] convert pci-host to QOM, Wanpeng Li, 2012/03/25
- [Qemu-devel] [PATCH 5/6] merge pc_piix.c to pc.c, Wanpeng Li, 2012/03/25
- [Qemu-devel] [PATCH 1/6] eliminate piix_pci.c and module i440fx and piix3, Wanpeng Li, 2012/03/25
- Re: [Qemu-devel] [PATCH 0/6] refactor PC machine, i440fx and piix3 to take advantage of QOM, Jan Kiszka, 2012/03/26
- Re: [Qemu-devel] [PATCH 0/6] refactor PC machine, i440fx and piix3 to take advantage of QOM, Isaku Yamahata, 2012/03/26
- Re: [Qemu-devel] [PATCH 0/6] refactor PC machine, i440fx and piix3 to take advantage of QOM, Anthony Liguori, 2012/03/26
- Re: [Qemu-devel] [PATCH 0/6] refactor PC machine, i440fx and piix3 to take advantage of QOM, Avi Kivity, 2012/03/27
- Re: [Qemu-devel] [PATCH 0/6] refactor PC machine, i440fx and piix3 to take advantage of QOM, Anthony Liguori, 2012/03/27
- Re: [Qemu-devel] [PATCH 0/6] refactor PC machine, i440fx and piix3 to take advantage of QOM, Avi Kivity, 2012/03/27
Re: [Qemu-devel] [PATCH 0/6] refactor PC machine, i440fx and piix3 to take advantage of QOM, Blue Swirl, 2012/03/26
Re: [Qemu-devel] [PATCH 0/6] refactor PC machine, i440fx and piix3 to take advantage of QOM, Anthony Liguori, 2012/03/26