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@xxxxxxxxxxxxxxxxxx> --- tools/kvm/arm/include/arm-common/kvm-arch.h | 2 ++ tools/kvm/kvm.c | 2 +- tools/kvm/mips/include/kvm/kvm-arch.h | 5 +++++ tools/kvm/powerpc/include/kvm/kvm-arch.h | 2 ++ tools/kvm/x86/include/kvm/kvm-arch.h | 2 ++ 5 files changed, 12 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 5d2fab2..082131d 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 6046434..e1b9f6c 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..7eadbf4 100644 --- a/tools/kvm/mips/include/kvm/kvm-arch.h +++ b/tools/kvm/mips/include/kvm/kvm-arch.h @@ -17,6 +17,11 @@ #define KVM_IRQ_OFFSET 1 +/* + * MIPS-VZ (trap and emulate is 0) + */ +#define KVM_VM_TYPE 1 + #define VIRTIO_DEFAULT_TRANS(kvm) VIRTIO_PCI #include <stdbool.h> diff --git a/tools/kvm/powerpc/include/kvm/kvm-arch.h b/tools/kvm/powerpc/include/kvm/kvm-arch.h index f8627a2..fdd518f 100644 --- a/tools/kvm/powerpc/include/kvm/kvm-arch.h +++ b/tools/kvm/powerpc/include/kvm/kvm-arch.h @@ -44,6 +44,8 @@ #define KVM_IRQ_OFFSET 16 +#define KVM_VM_TYPE 0 + #define VIRTIO_DEFAULT_TRANS(kvm) VIRTIO_PCI struct spapr_phb; diff --git a/tools/kvm/x86/include/kvm/kvm-arch.h b/tools/kvm/x86/include/kvm/kvm-arch.h index a9f23b8..673bdf1 100644 --- a/tools/kvm/x86/include/kvm/kvm-arch.h +++ b/tools/kvm/x86/include/kvm/kvm-arch.h @@ -27,6 +27,8 @@ #define KVM_IRQ_OFFSET 5 +#define KVM_VM_TYPE 0 + #define VIRTIO_DEFAULT_TRANS(kvm) VIRTIO_PCI struct kvm_arch { -- 1.7.9.5 -- To unsubscribe from this list: send the line "unsubscribe kvm" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html