From patchwork Sat Feb 23 21:00:05 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Andreas_F=C3=A4rber?= X-Patchwork-Id: 2178731 Return-Path: X-Original-To: patchwork-kvm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id 0418D3FCF6 for ; Sat, 23 Feb 2013 21:00:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758449Ab3BWVAL (ORCPT ); Sat, 23 Feb 2013 16:00:11 -0500 Received: from cantor2.suse.de ([195.135.220.15]:48682 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757698Ab3BWVAK (ORCPT ); Sat, 23 Feb 2013 16:00:10 -0500 Received: from relay1.suse.de (unknown [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 2E624A520C; Sat, 23 Feb 2013 22:00:09 +0100 (CET) Message-ID: <51292DD5.8020300@suse.de> Date: Sat, 23 Feb 2013 22:00:05 +0100 From: =?UTF-8?B?QW5kcmVhcyBGw6RyYmVy?= Organization: SUSE LINUX Products GmbH User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20130105 Thunderbird/17.0.2 MIME-Version: 1.0 To: Alexander Graf Cc: qemu-devel@nongnu.org, ehabkost@redhat.com, Gleb Natapov , Marcelo Tosatti , PowerPC , Overall , imammedo@redhat.com Subject: Re: [Qemu-devel] [PATCH RFT ppc-next] target-ppc: Make host CPU a subclass of the host's CPU model References: <1361635219-13353-1-git-send-email-afaerber@suse.de> In-Reply-To: <1361635219-13353-1-git-send-email-afaerber@suse.de> X-Enigmail-Version: 1.5 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org Am 23.02.2013 17:00, schrieb Andreas Färber: > This avoids assigning individual class fields and contributors > forgetting to add field assignments in KVM-only code. > > ppc_cpu_class_find_by_pvr() requires the CPU model classes to be > registered, so defer host CPU type registration to kvm_arch_init(). > > Only register the host CPU type if there is a class with matching PVR. > This lets us drop error handling from instance_init. > > Signed-off-by: Andreas Färber > --- > target-ppc/kvm.c | 64 ++++++++++++++++--------------------------- > target-ppc/translate_init.c | 15 +++++----- > 2 Dateien geändert, 31 Zeilen hinzugefügt(+), 48 Zeilen entfernt(-) > > diff --git a/target-ppc/kvm.c b/target-ppc/kvm.c > index e601059..0e892d0 100644 > --- a/target-ppc/kvm.c > +++ b/target-ppc/kvm.c [...] > @@ -1262,41 +1266,14 @@ static void kvmppc_host_cpu_initfn(Object *obj) > PowerPCCPUClass *pcc = POWERPC_CPU_GET_CLASS(obj); > > assert(kvm_enabled()); > - > - if (pcc->pvr != mfpvr()) { > - fprintf(stderr, "Your host CPU is unsupported.\n" > - "Please choose a supported model instead, see -cpu ?.\n"); > - exit(1); > - } > } [snip] Managed to screw this one up by last minute cleanup: Andreas diff --git a/target-ppc/kvm.c b/target-ppc/kvm.c index 0e892d0..994bf6d 100644 --- a/target-ppc/kvm.c +++ b/target-ppc/kvm.c @@ -1263,8 +1263,6 @@ static void alter_insns(uint64_t *word, uint64_t flags, bool on) static void kvmppc_host_cpu_initfn(Object *obj) { - PowerPCCPUClass *pcc = POWERPC_CPU_GET_CLASS(obj); - assert(kvm_enabled()); }