From patchwork Wed Jun 4 01:10:06 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jidong Xiao X-Patchwork-Id: 4291871 Return-Path: X-Original-To: patchwork-kvm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id C7279BEEA7 for ; Wed, 4 Jun 2014 01:10:14 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 15309201D5 for ; Wed, 4 Jun 2014 01:10:14 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id EFF4720160 for ; Wed, 4 Jun 2014 01:10:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752742AbaFDBKH (ORCPT ); Tue, 3 Jun 2014 21:10:07 -0400 Received: from mail-oa0-f49.google.com ([209.85.219.49]:61554 "EHLO mail-oa0-f49.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751487AbaFDBKG (ORCPT ); Tue, 3 Jun 2014 21:10:06 -0400 Received: by mail-oa0-f49.google.com with SMTP id eb12so7060275oac.22 for ; Tue, 03 Jun 2014 18:10:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:date:message-id:subject:from:to:content-type; bh=M+GXJ8/sFKrBI19zaQIVZSJ6tKtBdh6RFim2brbj7jA=; b=GYSiL5wgyeNtxNq+BSzTlOnmWNKQ85l5+jBh+WjNq+a/v2v8H/sC92jH5hpGPdhjNn NgiYxz6iS3eITbLdt3t6aruU3z/c11wizOqNPqjDFvG90bvpWKwDBqiVme/XuyCJ7sQG RFyUZCuJ4I7qkwsJvZcvJDAQdGuezLz6hTl/DkjtbaXPkTaCLt2EKb3SoSAEUS/E8s+y WwjRieCQREU5JUADHWjpgzk5xH9OkFHlgglU+ZqKQQn5aMvqy8IqRe0FQ3O1A1XQGbiQ 1PyaZqi2DZsO/R3kwRTEf4ffDLlqY3GSkrHNUP9MCOX/ozYro07yFJ5KfaadkuhfmbR1 bYxQ== MIME-Version: 1.0 X-Received: by 10.60.47.77 with SMTP id b13mr51969542oen.40.1401844206195; Tue, 03 Jun 2014 18:10:06 -0700 (PDT) Received: by 10.60.61.9 with HTTP; Tue, 3 Jun 2014 18:10:06 -0700 (PDT) Date: Tue, 3 Jun 2014 21:10:06 -0400 Message-ID: Subject: [PATCH] Qemu: Fix eax for cpuid leaf 0x40000000 From: Jidong Xiao To: qemu-devel@nongnu.org, KVM Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Hi, Since Linux kernel 3.5, KVM has set eax to KVM_CPUID_FEATURES, for leaf 0x40000000, see this: https://github.com/torvalds/linux/commit/57c22e5f35aa4b9b2fe11f73f3e62bbf9ef36190 But qemu still tries to set it to 0. It would be better to make qemu and kvm consistent. This patch just fixes this issue. Signed-off-by: Jidong Xiao --- -- To unsubscribe from this list: send the line "unsubscribe kvm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/qemu-2.0.0/target-i386/kvm.c.orig b/qemu-2.0.0/target-i386/kvm.c index 4389959..b8b282d 100644 --- a/qemu-2.0.0/target-i386/kvm.c.orig +++ b/qemu-2.0.0/target-i386/kvm.c @@ -530,7 +530,7 @@ int kvm_arch_init_vcpu(CPUState *cs) memcpy(signature, "KVMKVMKVM\0\0\0", 12); c = &cpuid_data.entries[cpuid_i++]; c->function = KVM_CPUID_SIGNATURE | kvm_base; - c->eax = 0; + c->eax = KVM_CPUID_FEATURES; c->ebx = signature[0]; c->ecx = signature[1]; c->edx = signature[2];