From patchwork Fri Jul 5 19:50:34 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 168586 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp3969494ilk; Fri, 5 Jul 2019 12:58:35 -0700 (PDT) X-Google-Smtp-Source: APXvYqxbdPGHPihq/6RDoL4NfNn+0E1k7wsAAYCrs2FWA2DDAvqFk9m+70b8q/78ObbT6iAPzLpI X-Received: by 2002:a17:906:f43:: with SMTP id h3mr5263059ejj.143.1562356715238; Fri, 05 Jul 2019 12:58:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1562356715; cv=none; d=google.com; s=arc-20160816; b=xShVFi1LmdNLRul6MMvIbo9Uw48dNGNf9ARnEtfT05Vi84sAWVCkH/gG+jocEh0931 x0pHZ9zd6jJOWYsbJCBaNyJHg41NI5aVk9GlYQ5UksipxuPep1/dDVGmCbhPuj8t6v/X sufekWsbUF7A8IjGsAJUSJllI8dBrD3k+ea+Q9FgTHbtly6EyFiW/Q+LCTPrVnBwbZHD DO3ZHi+DTta3Jm5KIsLkB2cb703ylaCF5E8QHY/WPTf8Kj+kMX28LPjADIxKPNeweFPj dSGbGR4X8y97GCNeT5H3XCUdVpeOhyoVLzdKChC5U7v0GFqziiY/oNoOr5V5SBtWKHia lCwA== 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:dkim-signature; bh=NL1qamEi1SWCxCZDQ+Ft1vPKiyaKCd/QL3Bjak1vxXQ=; b=b8V013q+mxbAO61bEAzUaQrnlnOGU6bxh5leC1Lip9GUApf1rb55x5eQSPI1NYEFUY mCtIUrlL4+mx9vWR+PDUVV3bLXoZmYOttqV4GUUE8GW/LBaJr2qQqSbpnsFalj44r29w 6Soodu7685NGufPBpW7g24+cQNQGVktQbL20/X1rt0IBVkViAL9KVodP48QBif49uXvx 7lStpxps95KkzI1NrCKpUIBNaZvv+mN6nvZlnRy2Qb0biLO7cD2Ib/N9RqEN9dTSIFSA xhlcZBfxVc2ZR5AkKO7OcWVNsWEmQGwptjXa5X6M+NVntkbVJH5UmSdZrqWAlQB4MWfI doJw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@gmail.com header.s=20161025 header.b=fxJZ3Yoq; 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 q19si6022381ejt.48.2019.07.05.12.58.35 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 05 Jul 2019 12:58: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; dkim=fail header.i=@gmail.com header.s=20161025 header.b=fxJZ3Yoq; 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]:55666 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hjULq-0006yg-7u for patch@linaro.org; Fri, 05 Jul 2019 15:58:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55652) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hjUEO-0005Ur-Ja for qemu-devel@nongnu.org; Fri, 05 Jul 2019 15:50:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hjUEN-0004By-Iz for qemu-devel@nongnu.org; Fri, 05 Jul 2019 15:50:52 -0400 Received: from mail-wm1-x342.google.com ([2a00:1450:4864:20::342]:39196) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hjUEN-0004BO-CY for qemu-devel@nongnu.org; Fri, 05 Jul 2019 15:50:51 -0400 Received: by mail-wm1-x342.google.com with SMTP id z23so10740108wma.4 for ; Fri, 05 Jul 2019 12:50:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=NL1qamEi1SWCxCZDQ+Ft1vPKiyaKCd/QL3Bjak1vxXQ=; b=fxJZ3Yoqg8OHwz53erMfDvAHc5CGSxdzOcMQ+kT3NQyCpD5BmplEnSVWGgJZs5hSEc 15tBoG21dneEE+K24cQQ/qEdkEqqBicBHf46O+IeR9wzgdWKsJe0D7nIF5/g67Ze2DV1 OUbfVUdHbPXuBfWN70bKvNYMs3jlPL9TdBaw1ntdB2+Vb2sXPurSg9NlGrOlc7jc/Wgr if0nnkHUT2RDd5W16earw6sPNlUKA+IhZoCJNF4IN/2ihD3T7w9kSt7+EhqLxIZfj68B tI2Q5/5Up+XNQP8PWbK5fmztDkOcCAtlBxkiAIwkLG7lcqDWPtjZV6xiHYNt/vvJudSz 21GA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=NL1qamEi1SWCxCZDQ+Ft1vPKiyaKCd/QL3Bjak1vxXQ=; b=kI9ta6WI1N/yFrElgb9KJCebyAiDBlIS2tjpv9udTSvLwbJ4L7DMOro21hA29198S4 5edQo+Xo+/xLWhf9MbHEGy3wH2V3HTFJtihqK4J4BGK3wQQZFM7siEmB9ZFpzKQi5oS9 sRDfQ8HHLTmwVdTHVhd2lER1ZHDRTAuKs7snUqkFP5jY/yDhurbNdAtQZxMiaRjHqvT/ t0PVbY9Kbo0GZQQZci2KOjCW7QDCrLC8JfL9pBx/HTfTWfFqdGSxHMvL3IL36fWhCUw3 UVhxbYGG/PVqCeiOEdDM5WLC8PKaQPf1V5QcqQUI/ZCE+PtQ9FPedu6mqo6e6wqWuE9w QFnA== X-Gm-Message-State: APjAAAXmASaqhwLWV0CIiimY5gSat9WLucZdysQFJ7ewr9hE1wdae6CT koMSLRndG8YKLJgPRIddZMQS4tDkm1k= X-Received: by 2002:a1c:9dc5:: with SMTP id g188mr4670924wme.93.1562356250131; Fri, 05 Jul 2019 12:50:50 -0700 (PDT) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id d10sm11478625wro.18.2019.07.05.12.50.49 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 05 Jul 2019 12:50:49 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Fri, 5 Jul 2019 21:50:34 +0200 Message-Id: <1562356239-19391-8-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1562356239-19391-1-git-send-email-pbonzini@redhat.com> References: <1562356239-19391-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::342 Subject: [Qemu-devel] [PULL 07/12] 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 Signed-off-by: Paolo Bonzini --- target/i386/hyperv-stub.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 1.8.3.1 diff --git a/target/i386/hyperv-stub.c b/target/i386/hyperv-stub.c index fe548cb..0028527 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; }