From patchwork Wed Jul 3 18:07:03 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Eduardo Habkost X-Patchwork-Id: 168435 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp1234129ilk; Wed, 3 Jul 2019 11:24:00 -0700 (PDT) X-Google-Smtp-Source: APXvYqx4rPSsqHD5uS4P7BGySWvXfZRK6dr2aAD/t++Ka+okzH3GTdf7Rn3ADwAEao5oISygU9u3 X-Received: by 2002:a50:9451:: with SMTP id q17mr44069405eda.119.1562178239980; Wed, 03 Jul 2019 11:23:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1562178239; cv=none; d=google.com; s=arc-20160816; b=wBpYZtsRsANAwuvsq9e1TneD1QCYJ+WGKmmWNt+HhBzYO0qiWgJdUsrofgMAjzcUYa 30X17JwO3zRXIbfL7H+ime+ZKCl1/7++06Eze6JfattN8iSOoIe7wLDvkPUPWe/ahxjM XTR+vMruX9/U4RTh6S7LwLix9IsidtthfeM4qkpJ4gsNVrN5K7KcpxGdmH+8F9lmIjJs XRWoj0NRlbmnW5fq1MybpNuMMIbxzftSiyRi8Y96CVjS5+WlJiZZfOZ0/DPPj/aY85TP VsQ+vlKjZXD3Ky3e9qyGGT0tvk+wSVdUO9ooEheLDaPI8tGYRybG0o+yFkZywDyiHHf9 6Zew== 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=iOeKIATPSnpmJN0XNBneDZMM6ouL4hbweRFulSZl6cV5b395mvusEHvxfXmPJ6ymuM WOIbQDNX46hYcFIog5aJQO4VGDkoNQagIrfXrCruTKtoiwkvkbWZsnhdcBlOr2C5b/XR 3H6b7Wb49M5uaEHEYLw+ybQvJKlXqGvBypE6N/5kDhMRxPK2U3uzxGT3SdXIgb5oKD6V 8rG2CLyVXKa4Vh/+3rYMrJkSHDcZv+jW7Jm4ajQud5x7Ha+ddIpBDrsIuLf+pbscJnn6 5QnbJO8KwXj1ueI3DenrQ1lla3xwIUR2pOetvv7Ytz5TmOWXSch4VhF4ZBFEKVc9Vi7j m56A== 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 z14si2453315ejq.189.2019.07.03.11.23.59 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 03 Jul 2019 11:23:59 -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]:38380 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hijvC-0003Pr-VQ for patch@linaro.org; Wed, 03 Jul 2019 14:23:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56592) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hijg2-0004cz-Oi for qemu-devel@nongnu.org; Wed, 03 Jul 2019 14:08:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hijg1-0000Z2-PY for qemu-devel@nongnu.org; Wed, 03 Jul 2019 14:08:18 -0400 Received: from mx1.redhat.com ([209.132.183.28]:37328) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hijg1-0000Ya-L3 for qemu-devel@nongnu.org; Wed, 03 Jul 2019 14:08:17 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id E573281F1B; Wed, 3 Jul 2019 18:08:16 +0000 (UTC) Received: from localhost (ovpn-116-30.gru2.redhat.com [10.97.116.30]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6FB5C5877D; Wed, 3 Jul 2019 18:08:16 +0000 (UTC) From: Eduardo Habkost To: Peter Maydell , Paolo Bonzini , qemu-devel@nongnu.org, Marcel Apfelbaum , Richard Henderson Date: Wed, 3 Jul 2019 15:07:03 -0300 Message-Id: <20190703180726.31267-21-ehabkost@redhat.com> In-Reply-To: <20190703180726.31267-1-ehabkost@redhat.com> References: <20190703180726.31267-1-ehabkost@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Wed, 03 Jul 2019 18:08:17 +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 v4 20/43] 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: Vitaly Kuznetsov , =?utf-8?q?Alex_Benn=C3=A9e?= , Roman Kagan 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; }