From patchwork Wed Jul 3 21:07:58 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Eduardo Habkost X-Patchwork-Id: 168443 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp1399409ilk; Wed, 3 Jul 2019 14:25:35 -0700 (PDT) X-Google-Smtp-Source: APXvYqxRC44dFqeXpk4S14W/PLElJlnJuis1+KOKiXhIVcJeuwdG/IRQOi2r1jO3Hyou1v+g8hgI X-Received: by 2002:a50:9f4e:: with SMTP id b72mr25573094edf.252.1562189135353; Wed, 03 Jul 2019 14:25:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1562189135; cv=none; d=google.com; s=arc-20160816; b=DXE9Bs/6CWc8D27GV3pXqPBelBBRveV6Df/1ke1PXOvtb6nTeiQNFlYEae9oJ+49GY rz4lqwuZL3WHec0zN3IA9vXMvT/B852xsipA5EbcxEhtkjrBxGXEMCc2kQkL3BridMbu 0VZUXO65+fQud0gwU0+CeVxoRbCCO5sBV5/TCFXDB4oUu0bSeEPGXXBRHgw2sQVUZIAD XLfg/c0XfP/4ZdFFKkV3ciGyekC5GCBeaSrrEvc6rO06q8wS9NFzxDrV59/e9SI/nIHT EqXNvmcO7RM4KWN5dcj38J6uMham0Lz1ELBu1N/dBMaloONSO4B1tK/8LnJYzSOwl6ut z9WA== 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=HQcbBHheb72WlISjmw9qgEjAbvq/FZkd8vnNg+yClWGmZUjFMw9jkCBWSy7h9XIdq4 vO8UETbNGb0K8SSOfgOpSK0H144+eDFVru667dNUVHuDdR83K9NXhezGZ5Z/hLlJeS+a xV3qVCSIEZMpq7cBNSySpLMsmZjCZRt3vjoacjXAZW0mczKI8d/xlgcEAN4Od8HuxjQE M31QfijNFLrFkE/6CvUQbNYpUCcYtP87TX48Ccdb7bZbCvQhwROWpcJZyLwbEYxPh+Jg PJ+Jsf6S+NeSBmMTHCm9KwSEkYjKfWUhJVtMpBSoVANQPcvu8A11GLLihezomeZxKfJP nq6g== 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 w58si3445961edw.316.2019.07.03.14.25.35 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 03 Jul 2019 14:25:35 -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]:40784 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1himkw-0005uL-C7 for patch@linaro.org; Wed, 03 Jul 2019 17:25:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38160) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1himVI-00068F-5k for qemu-devel@nongnu.org; Wed, 03 Jul 2019 17:09:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1himVG-0006zp-S2 for qemu-devel@nongnu.org; Wed, 03 Jul 2019 17:09:24 -0400 Received: from mx1.redhat.com ([209.132.183.28]:35122) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1himVG-0006wM-Lx for qemu-devel@nongnu.org; Wed, 03 Jul 2019 17:09:22 -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 0E2B02F8BDC; Wed, 3 Jul 2019 21:09:17 +0000 (UTC) Received: from localhost (ovpn-116-30.gru2.redhat.com [10.97.116.30]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5363C6013C; Wed, 3 Jul 2019 21:09:15 +0000 (UTC) From: Eduardo Habkost To: Peter Maydell , Paolo Bonzini , qemu-devel@nongnu.org, Marcel Apfelbaum , Richard Henderson Date: Wed, 3 Jul 2019 18:07:58 -0300 Message-Id: <20190703210821.27550-21-ehabkost@redhat.com> In-Reply-To: <20190703210821.27550-1-ehabkost@redhat.com> References: <20190703210821.27550-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.38]); Wed, 03 Jul 2019 21:09: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 v5 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; }