From mboxrd@z Thu Jan 1 00:00:00 1970 Received: with ECARTIS (v1.0.0; list linux-mips); Tue, 20 May 2014 13:29:12 +0200 (CEST) Received: from mailapp01.imgtec.com ([195.59.15.196]:17167 "EHLO mailapp01.imgtec.com" rhost-flags-OK-OK-OK-OK) by eddie.linux-mips.org with ESMTP id S6822185AbaETL3JqxNf4 (ORCPT ); Tue, 20 May 2014 13:29:09 +0200 Received: from KLMAIL01.kl.imgtec.org (unknown [192.168.5.35]) by Websense Email Security Gateway with ESMTPS id 279047AE8E3F9; Tue, 20 May 2014 12:29:00 +0100 (IST) Received: from KLMAIL02.kl.imgtec.org (192.168.5.97) by KLMAIL01.kl.imgtec.org (192.168.5.35) with Microsoft SMTP Server (TLS) id 14.3.181.6; Tue, 20 May 2014 12:29:02 +0100 Received: from LEMAIL01.le.imgtec.org (192.168.152.62) by klmail02.kl.imgtec.org (192.168.5.97) with Microsoft SMTP Server (TLS) id 14.3.181.6; Tue, 20 May 2014 12:29:02 +0100 Received: from [192.168.154.101] (192.168.154.101) by LEMAIL01.le.imgtec.org (192.168.152.62) with Microsoft SMTP Server (TLS) id 14.3.174.1; Tue, 20 May 2014 12:29:02 +0100 Message-ID: <537B3B8A.5000600@imgtec.com> Date: Tue, 20 May 2014 12:24:58 +0100 From: James Hogan User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:24.0) Gecko/20100101 Thunderbird/24.5.0 MIME-Version: 1.0 To: Andreas Herrmann , Pekka Enberg CC: David Daney , , Subject: Re: [PATCH v2 08/12] kvm tools: Provide per arch macro to specify type for KVM_CREATE_VM References: <1400518411-9759-1-git-send-email-andreas.herrmann@caviumnetworks.com> <1400518411-9759-9-git-send-email-andreas.herrmann@caviumnetworks.com> In-Reply-To: <1400518411-9759-9-git-send-email-andreas.herrmann@caviumnetworks.com> X-Enigmail-Version: 1.6 Content-Type: text/plain; charset="ISO-8859-1" Content-Transfer-Encoding: 7bit X-Originating-IP: [192.168.154.101] Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 40166 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: james.hogan@imgtec.com Precedence: bulk List-help: List-unsubscribe: List-software: Ecartis version 1.0.0 List-Id: linux-mips X-List-ID: linux-mips List-subscribe: List-owner: List-post: List-archive: X-list: linux-mips On 19/05/14 17:53, 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. Minor thing I didn't spot with v1 (sorry). I think this patch should probably be moved before patch 6 with the mips part squashed into patch 6, otherwise AFAICT the mips support in patch 6/7 is broken out of the box until this patch fixes it. Cheers James > > Signed-off-by: Andreas Herrmann > --- > 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 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 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 > 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 { > From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailapp01.imgtec.com ([195.59.15.196]:17167 "EHLO mailapp01.imgtec.com" rhost-flags-OK-OK-OK-OK) by eddie.linux-mips.org with ESMTP id S6822185AbaETL3JqxNf4 (ORCPT ); Tue, 20 May 2014 13:29:09 +0200 Message-ID: <537B3B8A.5000600@imgtec.com> Date: Tue, 20 May 2014 12:24:58 +0100 From: James Hogan MIME-Version: 1.0 Subject: Re: [PATCH v2 08/12] kvm tools: Provide per arch macro to specify type for KVM_CREATE_VM References: <1400518411-9759-1-git-send-email-andreas.herrmann@caviumnetworks.com> <1400518411-9759-9-git-send-email-andreas.herrmann@caviumnetworks.com> In-Reply-To: <1400518411-9759-9-git-send-email-andreas.herrmann@caviumnetworks.com> Content-Type: text/plain; charset="ISO-8859-1" Content-Transfer-Encoding: 7bit Return-Path: Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org List-help: List-unsubscribe: List-software: Ecartis version 1.0.0 List-subscribe: List-owner: List-post: List-archive: To: Andreas Herrmann , Pekka Enberg Cc: David Daney , kvm@vger.kernel.org, linux-mips@linux-mips.org Message-ID: <20140520112458.enqvVB0MHbbGmWAPXfMaU6L-w3eEMbh9vo2lflIzuck@z> On 19/05/14 17:53, 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. Minor thing I didn't spot with v1 (sorry). I think this patch should probably be moved before patch 6 with the mips part squashed into patch 6, otherwise AFAICT the mips support in patch 6/7 is broken out of the box until this patch fixes it. Cheers James > > Signed-off-by: Andreas Herrmann > --- > 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 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 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 > 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 { >