From patchwork Thu Jul 7 16:49:04 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eduardo Habkost X-Patchwork-Id: 9219189 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 30D3E607D9 for ; Thu, 7 Jul 2016 16:56:31 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1E35D283EB for ; Thu, 7 Jul 2016 16:56:31 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 12627283EE; Thu, 7 Jul 2016 16:56:31 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 9ABD4283EB for ; Thu, 7 Jul 2016 16:56:30 +0000 (UTC) Received: from localhost ([::1]:41286 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bLCbF-0001ET-R7 for patchwork-qemu-devel@patchwork.kernel.org; Thu, 07 Jul 2016 12:56:29 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60283) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bLCUB-0001Jb-9q for qemu-devel@nongnu.org; Thu, 07 Jul 2016 12:49:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bLCU8-0003aP-6H for qemu-devel@nongnu.org; Thu, 07 Jul 2016 12:49:11 -0400 Received: from mx1.redhat.com ([209.132.183.28]:45030) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bLCU8-0003aE-09 for qemu-devel@nongnu.org; Thu, 07 Jul 2016 12:49:08 -0400 Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 6B99781117; Thu, 7 Jul 2016 16:49:07 +0000 (UTC) Received: from localhost (vpn1-4-171.gru2.redhat.com [10.97.4.171]) by int-mx14.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u67Gn6lp020056; Thu, 7 Jul 2016 12:49:06 -0400 Date: Thu, 7 Jul 2016 13:49:04 -0300 From: Eduardo Habkost To: "Denis V. Lunev" Message-ID: <20160707164904.GF4131@thinpad.lan.raisama.net> References: <1466765376-25722-1-git-send-email-den@openvz.org> <20160707164448.GE4131@thinpad.lan.raisama.net> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20160707164448.GE4131@thinpad.lan.raisama.net> X-Fnord: you can see the fnord User-Agent: Mutt/1.6.1 (2016-04-27) X-Scanned-By: MIMEDefang 2.68 on 10.5.11.27 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Thu, 07 Jul 2016 16:49:07 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH] fixup! cpu: report hyperv feature words through qom X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paolo Bonzini , Marcelo Tosatti , Evgeny Yakovlev , qemu-devel@nongnu.org, Richard Henderson Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP On Thu, Jul 07, 2016 at 01:44:48PM -0300, Eduardo Habkost wrote: > Hi, > > Sorry for taking so long to review it. > > The patch in general looks good, except for: > > On Fri, Jun 24, 2016 at 01:49:36PM +0300, Denis V. Lunev wrote: > [...] > > + if (MACHINE_GET_CLASS(current_machine)->hot_add_cpu != NULL) { > > + env->features[FEAT_HYPERV_EDX] |= HV_X64_CPU_DYNAMIC_PARTITIONING_AVAILABLE; > > + } > [...] > > +} > > + > [...] > > - c->edx |= HV_X64_CPU_DYNAMIC_PARTITIONING_AVAILABLE; > > If you want to change the rules for setting > HV_X64_CPU_DYNAMIC_PARTITIONING_AVAILABLE, please do it in a > separate patch. I will apply the patch, but with the following fixup: Signed-off-by: Eduardo Habkost Reviewed-by: Denis V. Lunev --- target-i386/kvm.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/target-i386/kvm.c b/target-i386/kvm.c index 5df4b48..4193fe1 100644 --- a/target-i386/kvm.c +++ b/target-i386/kvm.c @@ -599,6 +599,7 @@ static int hyperv_handle_properties(CPUState *cs) if (cpu->hyperv_crash && has_msr_hv_crash) { env->features[FEAT_HYPERV_EDX] |= HV_X64_GUEST_CRASH_MSR_AVAILABLE; } + env->features[FEAT_HYPERV_EDX] |= HV_X64_CPU_DYNAMIC_PARTITIONING_AVAILABLE; if (cpu->hyperv_reset && has_msr_hv_reset) { env->features[FEAT_HYPERV_EAX] |= HV_X64_MSR_RESET_AVAILABLE; } @@ -630,9 +631,6 @@ static int hyperv_handle_properties(CPUState *cs) } env->features[FEAT_HYPERV_EAX] |= HV_X64_MSR_SYNTIMER_AVAILABLE; } - if (MACHINE_GET_CLASS(current_machine)->hot_add_cpu != NULL) { - env->features[FEAT_HYPERV_EDX] |= HV_X64_CPU_DYNAMIC_PARTITIONING_AVAILABLE; - } return 0; }