From patchwork Fri Jun 28 01:55:57 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Eduardo Habkost X-Patchwork-Id: 167997 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp3098610ilk; Thu, 27 Jun 2019 19:18:19 -0700 (PDT) X-Google-Smtp-Source: APXvYqz3rp+HVSEicHAw/dR7IRHdM6pCvrWHc1m7z4j+7GfdsEmP3UrckK7f2JZshtveDI4sicqV X-Received: by 2002:a17:906:9144:: with SMTP id y4mr6350203ejw.16.1561688299748; Thu, 27 Jun 2019 19:18:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1561688299; cv=none; d=google.com; s=arc-20160816; b=AFCgHN7+w7hajSp3Zhjpor4VaW1LoIrOnosoHQ5SaUC8MIihW95vEJH26eOSpwmknO SodL0hiwEJXizAWGB9AN8mjmCZWVP3VwF0IziifHK13onkpMXiX491lyn7QYZ0L9Q4O8 WU4dUpWv4wYSYMeAf6ULXbF841K5FCZjSR7+Gflbr4+yDCXuRL1CqUZFGpHdb7GXdQmg LjB0DWfQ3bYWPgXTyZh5CTL+Ef+NYo6nqSKRyhKlmffQ55rd9p9tc5uXWxlF+JWdB6RB xXqpyFoBdWKzEyc0GXldeV+5Do+XR38AqLQTm8B5h04SAdEGijcp94PbqrrZFDqEv+H+ D79Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from; bh=LByaWuEsXdBwxEnu19XEi/XO5aCj/66zNDea4gXshYY=; b=f3FSKgwOv2XNq/rvzStpeaOIAtHcYsO6hQPRBG4lVEA8alYkruLfHc5Eh3m5m88ahi RN8q9zRucJK8c1v0Tp7IzGWVQFsa0uqaFdj6gNAIt7OJwALTo3fJJzVO44kEYNOOBfM8 G+T3fYal/U2/lRJBmy8GTvnXuV01+HsECodOwZzkeYuQ6HhOo2NTusi8VwEP/Elc4G9/ /ToLM6D8VFyl8bv4UhVgwdDI63rUIGKnqNJvw89TLd0+/WKFSDxjXECgEvlBc+/e9jMU GyTE0CFz8+28t+vv/5uG9HJb4SYeAVCbVoNbPbQFEpxuOntjO5BiNzPncnfnDp3Uop5X aYag== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id k8si832822edd.67.2019.06.27.19.18.19 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 27 Jun 2019 19:18:19 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from localhost ([::1]:55736 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hggSw-0006nd-OJ for patch@linaro.org; Thu, 27 Jun 2019 22:18:18 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50048) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hgg8N-0000lf-HF for qemu-devel@nongnu.org; Thu, 27 Jun 2019 21:57:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hgg8L-0000gK-OK for qemu-devel@nongnu.org; Thu, 27 Jun 2019 21:57:03 -0400 Received: from mx1.redhat.com ([209.132.183.28]:45357) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hgg8L-0000eJ-I7 for qemu-devel@nongnu.org; Thu, 27 Jun 2019 21:57:01 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id CCAB13084266; Fri, 28 Jun 2019 01:57:00 +0000 (UTC) Received: from localhost (ovpn-116-7.gru2.redhat.com [10.97.116.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id 09F0B60126; Fri, 28 Jun 2019 01:56:59 +0000 (UTC) From: Eduardo Habkost To: Peter Maydell , qemu-devel@nongnu.org, Marcel Apfelbaum Date: Thu, 27 Jun 2019 22:55:57 -0300 Message-Id: <20190628015606.32107-21-ehabkost@redhat.com> In-Reply-To: <20190628015606.32107-1-ehabkost@redhat.com> References: <20190628015606.32107-1-ehabkost@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.40]); Fri, 28 Jun 2019 01:57:00 +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] [PULL 20/29] target/i386: fix feature check in hyperv-stub.c X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paolo Bonzini , Vitaly Kuznetsov , =?utf-8?q?Alex_Benn=C3=A9e?= , Roman Kagan , Richard Henderson Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Alex Bennée Commit 2d384d7c8 broken the build when built with: configure --without-default-devices --disable-user The reason was the conversion of cpu->hyperv_synic to cpu->hyperv_synic_kvm_only although the rest of the patch introduces a feature checking mechanism. So I've fixed the KVM_EXIT_HYPERV_SYNIC in hyperv-stub to do the same feature check as in the real hyperv.c Signed-off-by: Alex Bennée Cc: Vitaly Kuznetsov Cc: Paolo Bonzini Cc: Roman Kagan Message-Id: <20190624123835.28869-1-alex.bennee@linaro.org> Reviewed-by: Vitaly Kuznetsov Acked-by: Paolo Bonzini Reviewed-by: Roman Kagan Signed-off-by: Eduardo Habkost --- target/i386/hyperv-stub.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.18.0.rc1.1.g3f1ff2140 diff --git a/target/i386/hyperv-stub.c b/target/i386/hyperv-stub.c index fe548cbae2..0028527e79 100644 --- a/target/i386/hyperv-stub.c +++ b/target/i386/hyperv-stub.c @@ -15,7 +15,7 @@ int kvm_hv_handle_exit(X86CPU *cpu, struct kvm_hyperv_exit *exit) { switch (exit->type) { case KVM_EXIT_HYPERV_SYNIC: - if (!cpu->hyperv_synic) { + if (!hyperv_feat_enabled(cpu, HYPERV_FEAT_SYNIC)) { return -1; }