From patchwork Fri Jul 5 20:23:17 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 168587 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp4000324ilk; Fri, 5 Jul 2019 13:37:05 -0700 (PDT) X-Google-Smtp-Source: APXvYqwYagK+bZCbULVKzZ8IPAiE04V1/EqvFmNwPvtVMRoszguKzQX2QqnY2rPr3pkuVJ3fv5E+ X-Received: by 2002:a17:906:4552:: with SMTP id s18mr5188962ejq.271.1562359025433; Fri, 05 Jul 2019 13:37:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1562359025; cv=none; d=google.com; s=arc-20160816; b=MiMDDPWK6DFaBlj16F9W9NXFkQ8n38/qzl1FlCGjVVeQtBV20JbfUPywX5IJypPNMB 99UCCT8r4L0+9GGwUS8xiepFmFdA0N+Ahxg6UbOipn9oS98BkSQCCn9cL02wLllzppUG uMea1Q8Gmjq7Kstuo6XPxC6+t/azO8P0H049zklbvw5rv2cE563PuW8MjUfU8VgAPmZv wEnxN+OCuoEbt9OjRokoEMjM9NTYNtfA5bTGzKxZj798A5DjJuVLvbF096KMsBhsGnEI 7VtpjzcT35TwMsYDJrlSupgu7DzB/FPPIYcSkahnJ4Tld6BG2K0CK8MyyQrYvcC39ECC bPJg== 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=JSrqD3lFz2qrisghJqWCWQ4JqBLM0syo0SD+jCYARqifuUjOzcobLeUE+ZOH8D7lMl pWu/m6xllcxqRNUqRDowVvzTK1bfiBIx6hF74YUga6IRAlJB6hFccJewQjL7SQG+HEjF XcbEf2vvyDb8Zb3AVogg2Plrtrbp//UTfc4mGvCe8Oib/aF7BvPvUs398jadEXGZsMjY aaQufoVsdD2mZjU99kmDR9OnjRAzTloqHjBAGmb2cC8uk8nAjQ5zlqD+UYH25PhxPQh0 CVwtjshiDI/UAF6K86M+EgqN2Yr3vecuryFeFK9Y6o7FnCzTu7ytOxZU1e6+7uTasNbb Za5Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@gmail.com header.s=20161025 header.b=Nd+YlPvY; 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 k42si7357189eda.162.2019.07.05.13.37.05 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 05 Jul 2019 13:37:05 -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=Nd+YlPvY; 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]:55940 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hjUx6-0000wl-Dt for patch@linaro.org; Fri, 05 Jul 2019 16:37:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34168) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hjUk8-0004LB-HX for qemu-devel@nongnu.org; Fri, 05 Jul 2019 16:23:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hjUk3-0002mw-A2 for qemu-devel@nongnu.org; Fri, 05 Jul 2019 16:23:37 -0400 Received: from mail-wm1-x341.google.com ([2a00:1450:4864:20::341]:33052) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hjUjz-0002jC-R2 for qemu-devel@nongnu.org; Fri, 05 Jul 2019 16:23:32 -0400 Received: by mail-wm1-x341.google.com with SMTP id h19so8294606wme.0 for ; Fri, 05 Jul 2019 13:23:31 -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=Nd+YlPvYNskjnp2NN5XY0QePTM253d0iLZfXER0olQ8TFtJt0zWB8nO/vin0waW/RJ RNhAUriBDt8gzQydZHbd4ii8CRjTLrooceH1GGAARkD5eOQFk/+TRcjOFdP0qTSCcBOj 1UBK9Ls6krJQSBH5uotnqZLuwLbPfSEuQFw/4BhKGJZVIn9Qlf2ud1s03EidXTVIFb4v giMdepo8oIqx8RZb6wRe/KWv0nu4reQ2JYB8DNJbzMHzcKJYj5IGqV3ci7SrLm7Jzy/x P4SfOjVrWvYd8kbWn6wFfirqNY+1v2VSylWhgi6JKoovUeJ9Ml9ut5flW5XH8ZmhtuPB ObGQ== 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=DrBvo4XlMFuwQZJz7h3wXc2q5Vb4MmeL7Jwn1UNFvZeQuMjjZ+Z5zI3bz/gsK0PDJa neowKdx/gG1zXJlPw7Z6flcvcBGIeVd8sXt6pxOoeypkKe8fIfcdSIXJYzJqzAOhSs6b QbSCqtnQfY3a7npDizt2hy9i+2fHPo0Mb3AsGu+QbIArObeaqkD1H0U78Dd+RSL4reoh LWrSC50fpgWZQ/pB86yTuMEM/4Bjj4UGX0kCg9ZpsUa8BdUzBnYaahCC0F2npdznFoS1 5y4hcIPmUt6X4IHrYXoHfb7bbvcI50JoZ28tiCf2D1q5Y9vRAvVOpghG9XQmDBAP8OYL 3utQ== X-Gm-Message-State: APjAAAXoUIwdpjUk6w2NvmeBiAWN7eE0szc8sbLHCgbNuHOlpFbJ+gtu aMoV/hHvt//S8MHxJ9sK1Tk6rXZngCc= X-Received: by 2002:a05:600c:2056:: with SMTP id p22mr4453308wmg.155.1562358210084; Fri, 05 Jul 2019 13:23:30 -0700 (PDT) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id v23sm3035875wmj.32.2019.07.05.13.23.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 05 Jul 2019 13:23:29 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Fri, 5 Jul 2019 22:23:17 +0200 Message-Id: <1562358202-28008-8-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1562358202-28008-1-git-send-email-pbonzini@redhat.com> References: <1562358202-28008-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::341 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; }