From patchwork Fri Jun 28 18:47:33 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Eduardo Habkost X-Patchwork-Id: 168132 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp4080598ilk; Fri, 28 Jun 2019 12:29:11 -0700 (PDT) X-Google-Smtp-Source: APXvYqymPomB3HqLwpqYKMms6UH6W3wypMqbwcnF9qsb84BhJuEdyuCxRAZ+PkkCrbij68GIGQo9 X-Received: by 2002:a50:b60a:: with SMTP id b10mr13505652ede.113.1561750151451; Fri, 28 Jun 2019 12:29:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1561750151; cv=none; d=google.com; s=arc-20160816; b=VS7ZXg+bwbgsTAhqu+lu4VF2ZgbP0HvYSXYpN2MxnFrDNMogCJKHw2hMAYBGE4I5FR u1gn+TCdbwv4a3IMTDrhbSv8qc3t51ITbIRGSeKnaWXlg1KfXLD9BNsVrCeuzh/wgSIF okUyJq7IsP+SOCAeD7OP/wsczTxPwjFa6gN+Pa0CFnghMWTkiuOQMCX5+iLed2aO0Rfn McXseD4u5H7OlsBjUaqochL2nqVQom9B/2UpD0IeXySysL+hCrZr/p52wKV0yZEn0eb/ mrBkzKhQkeB98RMBsQFTUAnzH8GbWFMc5dzayjWKLYQZHl1nX5DJLdXVYaavdcZFypTA abYA== 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=UyZ6vtFuB2b5ZiAMe/5VyJdEomktPp0WCqAHZTR1+Y+73umNtiwXxtY5PhecfiOM4p g4W/4o6lfwTmJkX2aVJaOUZGAmbfW2Azu9P16RK0p57ifr9chn3/+bn1t85qRLWf9HMh 3YfN7TMl3kbCBCqWFFzmqjqgOtoflAQCs/amqe7BcsBtk+65654b8NidsZOhExPeqWA0 iQz8bXcT39o0oGjN+wkK1hnlHoLwgBLGZCuAkB6Vta9vnp8En8qIorOuJny8dYtUAx2A OT3IhUTIWQ42UPRqQ6/1fYqv2jOfk+LUeI7wcHLuU+VaJLAIkk7DuuCZa+tNRvj67FZ6 NJdw== 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 e24si1920412eja.280.2019.06.28.12.29.11 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 28 Jun 2019 12:29:11 -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]:35742 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hgwYY-0005m1-EP for patch@linaro.org; Fri, 28 Jun 2019 15:29:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40922) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hgvy4-0004be-2X for qemu-devel@nongnu.org; Fri, 28 Jun 2019 14:51:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hgvy0-00042R-59 for qemu-devel@nongnu.org; Fri, 28 Jun 2019 14:51:26 -0400 Received: from mx1.redhat.com ([209.132.183.28]:32958) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hgvxz-00041n-V0 for qemu-devel@nongnu.org; Fri, 28 Jun 2019 14:51:24 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 1E15C30872C6; Fri, 28 Jun 2019 18:51:23 +0000 (UTC) Received: from localhost (ovpn-116-7.gru2.redhat.com [10.97.116.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6E97A1001B05; Fri, 28 Jun 2019 18:51:22 +0000 (UTC) From: Eduardo Habkost To: Peter Maydell , qemu-devel@nongnu.org, Marcel Apfelbaum Date: Fri, 28 Jun 2019 15:47:33 -0300 Message-Id: <20190628184742.5961-21-ehabkost@redhat.com> In-Reply-To: <20190628184742.5961-1-ehabkost@redhat.com> References: <20190628184742.5961-1-ehabkost@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.47]); Fri, 28 Jun 2019 18:51:23 +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 v2 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: Roman Kagan , Igor Mammedov , Paolo Bonzini , Vitaly Kuznetsov , =?utf-8?q?Alex_Benn=C3=A9e?= , 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; }