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

[Andreas Färber]

Am 03.12.2011 12:17, schrieb Jan Kiszka:
> From: Jan Kiszka <address@hidden>
> 
> More KVM-specific devices will come, so let's start with moving the
> kvmclock into a dedicated folder.
> 
> Signed-off-by: Jan Kiszka <address@hidden>
> ---

> 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).

Andreas

-- 
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg