From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54438) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bBGfc-0003t6-6L for qemu-devel@nongnu.org; Fri, 10 Jun 2016 03:15:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bBGfa-0000st-5X for qemu-devel@nongnu.org; Fri, 10 Jun 2016 03:15:55 -0400 Date: Fri, 10 Jun 2016 09:15:44 +0200 From: Igor Mammedov Message-ID: <20160610091544.67b6a69a@nial.brq.redhat.com> In-Reply-To: <20160609183430.GC17952@thinpad.lan.raisama.net> References: <1465226212-254093-1-git-send-email-imammedo@redhat.com> <1465226212-254093-4-git-send-email-imammedo@redhat.com> <20160609183430.GC17952@thinpad.lan.raisama.net> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH 03/10] target-i386: cpu: move xcc->kvm_required check to realize time List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Eduardo Habkost Cc: qemu-devel@nongnu.org, peter.maydell@linaro.org, mark.cave-ayland@ilande.co.uk, blauwirbel@gmail.com, qemu-arm@nongnu.org, pbonzini@redhat.com, rth@twiddle.net On Thu, 9 Jun 2016 15:34:30 -0300 Eduardo Habkost wrote: > On Mon, Jun 06, 2016 at 05:16:45PM +0200, Igor Mammedov wrote: > > it will allow to drop custom cpu_x86_init() and use > > cpu_generic_init() insteadi, reducing cpu_x86_create() > > to a simple 3-liner. > > > > Signed-off-by: Igor Mammedov > > Eduardo Habkost > > This triggers an assert when trying to use -cpu host with TCG: > > # ./x86_64-softmmu/qemu-system-x86_64 -machine accel=tcg -cpu host -nographic > qemu-system-x86_64: /root/qemu/target-i386/cpu.c:1558: host_x86_cpu_initfn: Assertion `(kvm_allowed)' failed. > Aborted This is not related to this patch and it was there before. Maybe a separate patch saying that it replaces assert() in host_x86_cpu_initfn() with error check and user friendly error message at later stage. > > I will squash the following fix in it: > > diff --git a/target-i386/cpu.c b/target-i386/cpu.c > index 3f886a5..dcbfa0b 100644 > --- a/target-i386/cpu.c > +++ b/target-i386/cpu.c > @@ -1555,16 +1555,17 @@ static void host_x86_cpu_initfn(Object *obj) > CPUX86State *env = &cpu->env; > KVMState *s = kvm_state; > > - assert(kvm_enabled()); > - > /* We can't fill the features array here because we don't know yet if > * "migratable" is true or false. > */ > cpu->host_features = true; > > - env->cpuid_level = kvm_arch_get_supported_cpuid(s, 0x0, 0, R_EAX); > - env->cpuid_xlevel = kvm_arch_get_supported_cpuid(s, 0x80000000, 0, R_EAX); > - env->cpuid_xlevel2 = kvm_arch_get_supported_cpuid(s, 0xC0000000, 0, R_EAX); > + /* If KVM is disabled, x86_cpu_realizefn() will report an error later */ > + if (kvm_enabled()) { > + env->cpuid_level = kvm_arch_get_supported_cpuid(s, 0x0, 0, R_EAX); > + env->cpuid_xlevel = kvm_arch_get_supported_cpuid(s, 0x80000000, 0, R_EAX); > + env->cpuid_xlevel2 = kvm_arch_get_supported_cpuid(s, 0xC0000000, 0, R_EAX); > + } > > object_property_set_bool(OBJECT(cpu), true, "pmu", &error_abort); > } >