From patchwork Fri Sep 18 11:47:55 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andre Przywara X-Patchwork-Id: 33830 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id DCF59B7B71 for ; Fri, 18 Sep 2009 22:02:10 +1000 (EST) Received: from localhost ([127.0.0.1]:60013 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MocAB-00013p-Lh for incoming@patchwork.ozlabs.org; Fri, 18 Sep 2009 08:02:07 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Mobzd-0007ph-GI for qemu-devel@nongnu.org; Fri, 18 Sep 2009 07:51:13 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MobzY-0007nQ-9o for qemu-devel@nongnu.org; Fri, 18 Sep 2009 07:51:12 -0400 Received: from [199.232.76.173] (port=38453 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MobzY-0007nN-6S for qemu-devel@nongnu.org; Fri, 18 Sep 2009 07:51:08 -0400 Received: from va3ehsobe003.messaging.microsoft.com ([216.32.180.13]:17762 helo=VA3EHSOBE003.bigfish.com) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_ARCFOUR_MD5:16) (Exim 4.60) (envelope-from ) id 1MobzX-0003K3-Po for qemu-devel@nongnu.org; Fri, 18 Sep 2009 07:51:07 -0400 Received: from mail89-va3-R.bigfish.com (10.7.14.242) by VA3EHSOBE003.bigfish.com (10.7.40.23) with Microsoft SMTP Server id 8.1.340.0; Fri, 18 Sep 2009 11:51:06 +0000 Received: from mail89-va3 (localhost.localdomain [127.0.0.1]) by mail89-va3-R.bigfish.com (Postfix) with ESMTP id 5DDD0C68079 for ; Fri, 18 Sep 2009 11:51:06 +0000 (UTC) X-SpamScore: 6 X-BigFish: VPS6(zz853kzz1202hzzz32i203h43j62h) X-Spam-TCS-SCL: 1:0 Received: by mail89-va3 (MessageSwitch) id 1253274663804762_22884; Fri, 18 Sep 2009 11:51:03 +0000 (UCT) Received: from svlb1extmailp01.amd.com (unknown [139.95.251.8]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail89-va3.bigfish.com (Postfix) with ESMTP id A15D01A5004F for ; Fri, 18 Sep 2009 11:51:03 +0000 (UTC) Received: from svlb1twp01.amd.com ([139.95.250.34]) by svlb1extmailp01.amd.com (Switch-3.2.7/Switch-3.2.7) with ESMTP id n8IBow5O025577 for ; Fri, 18 Sep 2009 04:51:01 -0700 X-WSS-ID: 0KQ60WW-03-3YZ-02 X-M-MSG: Received: from SSVLEXBH1.amd.com (ssvlexbh1.amd.com [139.95.53.182]) by svlb1twp01.amd.com (Tumbleweed MailGate 3.7.0) with ESMTP id 27B8619A0145 for ; Fri, 18 Sep 2009 04:50:56 -0700 (PDT) Received: from SSVLEXMB1.amd.com ([139.95.53.181]) by SSVLEXBH1.amd.com with Microsoft SMTPSVC(6.0.3790.3959); Fri, 18 Sep 2009 04:50:58 -0700 Received: from SF30EXMB1.amd.com ([172.20.6.49]) by SSVLEXMB1.amd.com with Microsoft SMTPSVC(6.0.3790.3959); Fri, 18 Sep 2009 04:50:58 -0700 Received: from seurexmb1.amd.com ([165.204.9.130]) by SF30EXMB1.amd.com with Microsoft SMTPSVC(6.0.3790.3959); Fri, 18 Sep 2009 13:50:51 +0200 Received: from mail.osrc.amd.com ([165.204.16.204]) by seurexmb1.amd.com with Microsoft SMTPSVC(6.0.3790.3959); Fri, 18 Sep 2009 13:50:49 +0200 Received: from localhost.localdomain (hagen.osrc.amd.com [165.204.15.42]) by mail.osrc.amd.com (Postfix) with ESMTP id 7389349C1B3; Fri, 18 Sep 2009 12:50:49 +0100 (BST) From: Andre Przywara To: qemu-devel@nongnu.org Date: Fri, 18 Sep 2009 13:47:55 +0200 Message-ID: <1253274494-13244-3-git-send-email-andre.przywara@amd.com> X-Mailer: git-send-email 1.6.1.3 In-Reply-To: <1253274494-13244-1-git-send-email-andre.przywara@amd.com> References: <1253274494-13244-1-git-send-email-andre.przywara@amd.com> X-OriginalArrivalTime: 18 Sep 2009 11:50:49.0738 (UTC) FILETIME=[4447CEA0:01CA3856] MIME-Version: 1.0 X-detected-operating-system: by monty-python.gnu.org: Windows 2000 SP4, XP SP1+ Cc: Andre Przywara Subject: [Qemu-devel] [PATCH v2 02/21] cpuid: fix over-long lines X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org split lines longer than 80 characters. Only code formatting changed. Signed-off-by: Andre Przywara --- target-i386/cpuid.c | 26 ++++++++++++++++++-------- 1 files changed, 18 insertions(+), 8 deletions(-) diff --git a/target-i386/cpuid.c b/target-i386/cpuid.c index adcd0b6..32d9b82 100644 --- a/target-i386/cpuid.c +++ b/target-i386/cpuid.c @@ -111,6 +111,7 @@ typedef struct x86_def_t { CPUID_MSR | CPUID_MCE | CPUID_CX8 | CPUID_PGE | CPUID_CMOV | \ CPUID_PAT | CPUID_FXSR | CPUID_MMX | CPUID_SSE | CPUID_SSE2 | \ CPUID_PAE | CPUID_SEP | CPUID_APIC) + static x86_def_t x86_defs[] = { #ifdef TARGET_X86_64 { @@ -285,8 +286,10 @@ static x86_def_t x86_defs[] = { .family = 6, .model = 2, .stepping = 3, - .features = PPRO_FEATURES | CPUID_PSE36 | CPUID_VME | CPUID_MTRR | CPUID_MCA, - .ext2_features = (PPRO_FEATURES & 0x0183F3FF) | CPUID_EXT2_MMXEXT | CPUID_EXT2_3DNOW | CPUID_EXT2_3DNOWEXT, + .features = PPRO_FEATURES | CPUID_PSE36 | CPUID_VME | + CPUID_MTRR | CPUID_MCA, + .ext2_features = (PPRO_FEATURES & 0x0183F3FF) | + CPUID_EXT2_MMXEXT | CPUID_EXT2_3DNOW | CPUID_EXT2_3DNOWEXT, .xlevel = 0x80000008, /* XXX: put another string ? */ .model_id = "QEMU Virtual CPU version " QEMU_VERSION, @@ -369,8 +372,10 @@ static int cpu_x86_find_by_name(x86_def_t *x86_cpu_def, const char *cpu_model) char *s = strdup(cpu_model); char *featurestr, *name = strtok(s, ","); - uint32_t plus_features = 0, plus_ext_features = 0, plus_ext2_features = 0, plus_ext3_features = 0; - uint32_t minus_features = 0, minus_ext_features = 0, minus_ext2_features = 0, minus_ext3_features = 0; + uint32_t plus_features = 0, plus_ext_features = 0; + uint32_t plus_ext2_features = 0, plus_ext3_features = 0; + uint32_t minus_features = 0, minus_ext_features = 0; + uint32_t minus_ext2_features = 0, minus_ext3_features = 0; uint32_t numvalue; def = NULL; @@ -396,9 +401,12 @@ static int cpu_x86_find_by_name(x86_def_t *x86_cpu_def, const char *cpu_model) while (featurestr) { char *val; if (featurestr[0] == '+') { - add_flagname_to_bitmaps(featurestr + 1, &plus_features, &plus_ext_features, &plus_ext2_features, &plus_ext3_features); + add_flagname_to_bitmaps(featurestr + 1, &plus_features, + &plus_ext_features, &plus_ext2_features, &plus_ext3_features); } else if (featurestr[0] == '-') { - add_flagname_to_bitmaps(featurestr + 1, &minus_features, &minus_ext_features, &minus_ext2_features, &minus_ext3_features); + add_flagname_to_bitmaps(featurestr + 1, + &minus_features, &minus_ext_features, + &minus_ext2_features, &minus_ext3_features); } else if ((val = strchr(featurestr, '='))) { *val = 0; val++; if (!strcmp(featurestr, "family")) { @@ -466,7 +474,8 @@ static int cpu_x86_find_by_name(x86_def_t *x86_cpu_def, const char *cpu_model) goto error; } } else { - fprintf(stderr, "feature string `%s' not in format (+feature|-feature|feature=xyz)\n", featurestr); + fprintf(stderr, "feature string `%s' not in format " + "(+feature|-feature|feature=xyz)\n", featurestr); goto error; } featurestr = strtok(NULL, ","); @@ -605,7 +614,8 @@ void cpu_x86_cpuid(CPUX86State *env, uint32_t index, uint32_t count, break; case 1: *eax = env->cpuid_version; - *ebx = (env->cpuid_apic_id << 24) | 8 << 8; /* CLFLUSH size in quad words, Linux wants it. */ + /* CLFLUSH size in quad words, Linux wants it. */ + *ebx = (env->cpuid_apic_id << 24) | 8 << 8; *ecx = env->cpuid_ext_features; *edx = env->cpuid_features; if (env->nr_cores * env->nr_threads > 1) {