Re: [Qemu-devel] [RFC][PATCH 02/16] kvm: Move kvmclock into hw/kvm folder

[Jan Kiszka <jan.kiszka@web.de>]

[-- Attachment #1: Type: text/plain, Size: 1820 bytes --]

On 2011-12-03 20:00, Andreas Färber wrote:
> Am 03.12.2011 12:17, schrieb Jan Kiszka:
>> From: Jan Kiszka <jan.kiszka@siemens.com>
>>
>> More KVM-specific devices will come, so let's start with moving the
>> kvmclock into a dedicated folder.
>>
>> Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
>> ---
> 
>> diff --git a/Makefile.target b/Makefile.target
>> index 1e90df7..3a9e95d 100644
>> --- a/Makefile.target
>> +++ b/Makefile.target
>> @@ -231,7 +231,7 @@ obj-i386-y += vmport.o
>>  obj-i386-y += device-hotplug.o pci-hotplug.o smbios.o wdt_ib700.o
>>  obj-i386-y += debugcon.o multiboot.o
>>  obj-i386-y += pc_piix.o
>> -obj-i386-$(CONFIG_KVM) += kvmclock.o
>> +obj-i386-$(CONFIG_KVM) += kvm/clock.o
>>  obj-i386-$(CONFIG_SPICE) += qxl.o qxl-logger.o qxl-render.o
>>  
>>  # shared objects
> 
>> diff --git a/hw/kvmclock.c b/hw/kvm/clock.c
>> similarity index 96%
>> rename from hw/kvmclock.c
>> rename to hw/kvm/clock.c
>> index 5388bc4..aa37c5d 100644
>> --- a/hw/kvmclock.c
>> +++ b/hw/kvm/clock.c
>> @@ -11,11 +11,11 @@
>>   *
>>   */
>>  
>> -#include "qemu-common.h"
>> -#include "sysemu.h"
>> -#include "sysbus.h"
>> -#include "kvm.h"
>> -#include "kvmclock.h"
>> +#include <qemu-common.h>
>> +#include <sysemu.h>
>> +#include <kvm.h>
>> +#include <hw/sysbus.h>
>> +#include <hw/kvm/clock.h>
>>  
>>  #include <linux/kvm.h>
>>  #include <linux/kvm_para.h>
> 
> Please don't start using system includes for everything. Rather extend
> QEMU_CFLAGS to contain the right user include path(s).

No problem - and no need to tweak any CFLAGS ("" only adds . to the
header search paths).

Do we have a convention that every include in <> is considered system
header? Should probably be documented then (and code should be converted
gradually).

Jan


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 262 bytes --]