From patchwork Sun Dec 9 19:45:50 2012 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: 204776 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id BF4202C0172 for ; Mon, 10 Dec 2012 06:46:28 +1100 (EST) Received: from localhost ([::1]:46420 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ThmpW-0003ij-EY for incoming@patchwork.ozlabs.org; Sun, 09 Dec 2012 14:46:26 -0500 Received: from eggs.gnu.org ([208.118.235.92]:50908) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ThmpF-0003f4-Rk for qemu-devel@nongnu.org; Sun, 09 Dec 2012 14:46:10 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ThmpC-00052y-HQ for qemu-devel@nongnu.org; Sun, 09 Dec 2012 14:46:09 -0500 Received: from cantor2.suse.de ([195.135.220.15]:49229 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ThmpC-00052f-AZ for qemu-devel@nongnu.org; Sun, 09 Dec 2012 14:46:06 -0500 Received: from relay2.suse.de (unknown [195.135.220.254]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx2.suse.de (Postfix) with ESMTP id A38ACA4386; Sun, 9 Dec 2012 20:46:05 +0100 (CET) From: =?UTF-8?q?Andreas=20F=C3=A4rber?= To: qemu-devel@nongnu.org Date: Sun, 9 Dec 2012 20:45:50 +0100 Message-Id: <1355082353-322-2-git-send-email-afaerber@suse.de> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1355082353-322-1-git-send-email-afaerber@suse.de> References: <1354645978-17362-1-git-send-email-ehabkost@redhat.com> <1355082353-322-1-git-send-email-afaerber@suse.de> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x X-Received-From: 195.135.220.15 Cc: blauwirbel@gmail.com, imammedo@redhat.com, ehabkost@redhat.com, =?UTF-8?q?Andreas=20F=C3=A4rber?= Subject: [Qemu-devel] [PATCH qom-cpu 1/4] target-i386: Inline -cpu host check into cpu_x86_register() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Simplifies the upcoming cleanup of cpu_x86_find_by_name(). Signed-off-by: Andreas Färber --- target-i386/cpu.c | 12 +++++++----- 1 Datei geändert, 7 Zeilen hinzugefügt(+), 5 Zeilen entfernt(-) diff --git a/target-i386/cpu.c b/target-i386/cpu.c index 7be3ad8..a46faa2 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -1217,9 +1217,7 @@ static int cpu_x86_find_by_name(x86_def_t *x86_cpu_def, const char *name) break; } } - if (kvm_enabled() && name && strcmp(name, "host") == 0) { - kvm_cpu_fill_host(x86_cpu_def); - } else if (!def) { + if (!def) { return -1; } else { memcpy(x86_cpu_def, def, sizeof(*def)); @@ -1505,8 +1503,12 @@ int cpu_x86_register(X86CPU *cpu, const char *cpu_model) name = model_pieces[0]; features = model_pieces[1]; - if (cpu_x86_find_by_name(def, name) < 0) { - goto error; + if (kvm_enabled() && strcmp(name, "host") == 0) { + kvm_cpu_fill_host(def); + } else { + if (cpu_x86_find_by_name(def, name) < 0) { + goto error; + } } if (cpu_x86_parse_featurestr(def, features) < 0) {