From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51205) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aihpt-0004xl-1D for qemu-devel@nongnu.org; Wed, 23 Mar 2016 08:24:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aihpr-000172-SC for qemu-devel@nongnu.org; Wed, 23 Mar 2016 08:24:28 -0400 References: <1458711153-15988-1-git-send-email-peterx@redhat.com> <1458711153-15988-3-git-send-email-peterx@redhat.com> From: Sergey Fedorov Message-ID: <56F28AF0.8010506@gmail.com> Date: Wed, 23 Mar 2016 15:24:16 +0300 MIME-Version: 1.0 In-Reply-To: <1458711153-15988-3-git-send-email-peterx@redhat.com> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [Qemu-arm] [PATCH v6 2/4] arm: enhance kvm_arm_create_scratch_host_vcpu List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Peter Xu , qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, drjones@redhat.com, libvir-list@redhat.com, armbru@redhat.com, mdroth@linux.vnet.ibm.com, abologna@redhat.com, qemu-arm@nongnu.org On 23/03/16 08:32, Peter Xu wrote: > diff --git a/target-arm/kvm.c b/target-arm/kvm.c > index 969ab0b..0a7f9a6 100644 > --- a/target-arm/kvm.c > +++ b/target-arm/kvm.c > @@ -62,13 +62,17 @@ bool kvm_arm_create_scratch_host_vcpu(const uint32_t *cpus_to_try, > goto err; > } > > + if (!init) { > + goto finish; > + } > + > ret = ioctl(vmfd, KVM_ARM_PREFERRED_TARGET, init); > if (ret >= 0) { > ret = ioctl(cpufd, KVM_ARM_VCPU_INIT, init); > if (ret < 0) { > goto err; > } > - } else { > + } else if (cpus_to_try) { > /* Old kernel which doesn't know about the > * PREFERRED_TARGET ioctl: we know it will only support > * creating one kind of guest CPU which is its preferred > @@ -85,8 +89,12 @@ bool kvm_arm_create_scratch_host_vcpu(const uint32_t *cpus_to_try, > if (ret < 0) { > goto err; > } > + } else { > + /* Not providing cpus_to_try, do nothing. */ > + ; I think it's probably not the best idea to skip CPU initialization here. I'd rather raise an error in such case. If we supplied non-NULL init argument then we need VCPU been initialized, don't we? If we pass NULL as init then we actually skip this code. Kind regards, Sergey > } > > +finish: > fdarray[0] = kvmfd; > fdarray[1] = vmfd; > fdarray[2] = cpufd;