Re: [PATCH 07/11] kvm tools: Provide per arch macro to specify type for KVM_CREATE_VM

James Hogan
2014-05-09T21:34:33Z

Hi Andreas,

On 06/05/14 16:51, Andreas Herrmann wrote:
> This is is usually 0 for most archs. On mips we have two types.
> TE (type 0) and MIPS-VZ (type 1). Default to 1 on mips.
>
> Signed-off-by: Andreas Herrmann <andreas.herrmann@caviumnetworks.com>
> ---
> tools/kvm/arm/include/arm-common/kvm-arch.h | 2 ++
> tools/kvm/kvm.c | 2 +-
> tools/kvm/mips/include/kvm/kvm-arch.h | 2 ++
> tools/kvm/powerpc/include/kvm/kvm-arch.h | 2 ++
> tools/kvm/x86/include/kvm/kvm-arch.h | 2 ++
> 5 files changed, 9 insertions(+), 1 deletion(-)
>
> diff --git a/tools/kvm/arm/include/arm-common/kvm-arch.h b/tools/kvm/arm/include/arm-common/kvm-arch.h
> index b6c4bf8..a552163 100644
> --- a/tools/kvm/arm/include/arm-common/kvm-arch.h
> +++ b/tools/kvm/arm/include/arm-common/kvm-arch.h
> @@ -32,6 +32,8 @@
>
> #define KVM_IRQ_OFFSET GIC_SPI_IRQ_BASE
>
> +#define KVM_VM_TYPE 0
> +
> #define VIRTIO_DEFAULT_TRANS(kvm) \
> ((kvm)->cfg.arch.virtio_trans_pci ? VIRTIO_PCI : VIRTIO_MMIO)
>
> diff --git a/tools/kvm/kvm.c b/tools/kvm/kvm.c
> index cfc0693..278b915 100644
> --- a/tools/kvm/kvm.c
> +++ b/tools/kvm/kvm.c
> @@ -284,7 +284,7 @@ int kvm__init(struct kvm *kvm)
> goto err_sys_fd;
> }
>
> - kvm->vm_fd = ioctl(kvm->sys_fd, KVM_CREATE_VM, 0);
> + kvm->vm_fd = ioctl(kvm->sys_fd, KVM_CREATE_VM, KVM_VM_TYPE);
> if (kvm->vm_fd < 0) {
> pr_err("KVM_CREATE_VM ioctl");
> ret = kvm->vm_fd;
> diff --git a/tools/kvm/mips/include/kvm/kvm-arch.h b/tools/kvm/mips/include/kvm/kvm-arch.h
> index 4a8407b..0210f0b 100644
> --- a/tools/kvm/mips/include/kvm/kvm-arch.h
> +++ b/tools/kvm/mips/include/kvm/kvm-arch.h
> @@ -17,6 +17,8 @@
>
> #define KVM_IRQ_OFFSET 1
>
> +#define KVM_VM_TYPE 1

A comment or define to clarify this wouldn't hurt.

Cheers
James