From nobody Mon Feb 9 15:27:25 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1562360620; cv=none; d=zoho.com; s=zohoarc; b=Wkv0JyALcbYTm2jrrXNyVEQxcUOl5lcon8gM9uJFeQBgy6g+gRqcney8nPfNSk046iM//C7WED/TouoL03cu7B491kA1JVIUAoI2z8CFM5VscH7Un8C+5pdQg2ioqTFVo4jnsJtEtO34wEy0anQ+Svl10mkcTWifBRNDRd6nOzQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1562360620; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=wzOpofdcurA5wsLNGyb10WqGKKid4Jy5IfhsoibOXrE=; b=QA2RPDVNMw36aZrPRRaA/NS8nS/oNSP1V9yTvFvBxz+oanqgD1stP3ay+0ysk+zI4uN8iE8kgnYXHNA0tl20BkjDv5fuNoJC8S9gEJqjWh6aFIfseCKfrPlDLdD3TsXFeAojkiKfF6zUx9ojN1OpqexCfQrFuP0GHRWSWJGr/IM= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 15623606205575.662474473301927; Fri, 5 Jul 2019 14:03:40 -0700 (PDT) Received: from localhost ([::1]:56126 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hjVMp-0006N9-DG for importer@patchew.org; Fri, 05 Jul 2019 17:03:39 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34270) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hjUkS-0004Yk-M9 for qemu-devel@nongnu.org; Fri, 05 Jul 2019 16:24:02 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hjUkR-00034V-Eu for qemu-devel@nongnu.org; Fri, 05 Jul 2019 16:24:00 -0400 Received: from mail-wr1-x443.google.com ([2a00:1450:4864:20::443]:47082) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hjUkQ-0002gi-NQ for qemu-devel@nongnu.org; Fri, 05 Jul 2019 16:23:59 -0400 Received: by mail-wr1-x443.google.com with SMTP id z1so6392901wru.13 for ; Fri, 05 Jul 2019 13:23:27 -0700 (PDT) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id v23sm3035875wmj.32.2019.07.05.13.23.25 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 05 Jul 2019 13:23:25 -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; bh=wzOpofdcurA5wsLNGyb10WqGKKid4Jy5IfhsoibOXrE=; b=DKyJRbEy18ZuxnVwrFYwij/hUBPHQFs+eLH81D2+OLJm6Lc4O1N7Ka7gP5hp9Kp0Dn blHm3xxR9lB89/uQZZHkhWoyKeeJZigr/0d1ESjD+NDw+gXrgyFsNWg19v/QJC7qiJnT x+sKOkYqkRJDcG/kFUrOz0efF2ZNTKGdSuHoa6GLbDZeMwGuVrFab3hk6k0FXMJ1Gw7k t9zUck5qkEKbpXyKDKTOwLTKiek/TUZ7cIghtugOYxASa88iESXLb4FHKPV3aQ6rwobS /m/oEzJlgwqaUCo6xzPdHSn5hvsukjjRaFevxRs9qtv4cWaMluPqOMUvvWIaDJLugGoo /khA== 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; bh=wzOpofdcurA5wsLNGyb10WqGKKid4Jy5IfhsoibOXrE=; b=LbO1p3sWNbc3bdHXWOedVd9DirdVRj2BzuoOl9BFeOIwLKoxbiGFBZuqB3kUsP/c/8 nILEiYkzrYS2RPuZJxa7qQ9dZI+WzRoVa9LVRGkcKGTyHfT/T9Wvipc5DIfilMLCvkgD O/lGoWS8B5PzzAkjmafDwRje/gPuwJ9QMFPaosnELdCUb6/UjKPxVwrFKZDrzj5e42Ys keO/QTtGnSkwyN17zYOnc7GfISTgoqA72hyrA/x7jKozqnFpSLTdktKGNVt5lm+tNdDp oC6NiThnYuhSUYoRLoiIJciuFzmpMMVG9PhzlImElhkKDSDG0nK87M5ufvCyx5ghRqo8 APTg== X-Gm-Message-State: APjAAAV/w1rsZZtjReKxWA5fZU/Ie0Q/3vwRMpxeUJBRYJTXjEE7BJK1 iX8gYKCDsPq2l9P5LXEdntEqX4hVgMs= X-Google-Smtp-Source: APXvYqwbScvg06K9GOeh0UAuMC5Jp6uHLlTBh7UDryM1cWfw1LeQStZUjOPuXmMI2Gvwgjk0b9S7Eg== X-Received: by 2002:adf:ed04:: with SMTP id a4mr4880872wro.86.1562358206572; Fri, 05 Jul 2019 13:23:26 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Fri, 5 Jul 2019 22:23:13 +0200 Message-Id: <1562358202-28008-4-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> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::443 Subject: [Qemu-devel] [PULL 03/12] i386/kvm: Fix build with -m32 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: Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Max Reitz find_next_bit() takes a pointer of type "const unsigned long *", but the first argument passed here is a "uint64_t *". These types are incompatible when compiling qemu with -m32. Just use ctz64() instead. Fixes: c686193072a47032d83cb4e131dc49ae30f9e5d Signed-off-by: Max Reitz Reviewed-by: Eduardo Habkost Message-Id: <20190624193913.28343-1-mreitz@redhat.com> Signed-off-by: Paolo Bonzini --- target/i386/kvm.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/target/i386/kvm.c b/target/i386/kvm.c index e4b4f57..31490bf 100644 --- a/target/i386/kvm.c +++ b/target/i386/kvm.c @@ -1043,14 +1043,15 @@ static int hv_cpuid_check_and_set(CPUState *cs, str= uct kvm_cpuid2 *cpuid, CPUX86State *env =3D &cpu->env; uint32_t r, fw, bits; uint64_t deps; - int i, dep_feat =3D 0; + int i, dep_feat; =20 if (!hyperv_feat_enabled(cpu, feature) && !cpu->hyperv_passthrough) { return 0; } =20 deps =3D kvm_hyperv_properties[feature].dependencies; - while ((dep_feat =3D find_next_bit(&deps, 64, dep_feat)) < 64) { + while (deps) { + dep_feat =3D ctz64(deps); if (!(hyperv_feat_enabled(cpu, dep_feat))) { fprintf(stderr, "Hyper-V %s requires Hyper-V %s\n", @@ -1058,7 +1059,7 @@ static int hv_cpuid_check_and_set(CPUState *cs, struc= t kvm_cpuid2 *cpuid, kvm_hyperv_properties[dep_feat].desc); return 1; } - dep_feat++; + deps &=3D ~(1ull << dep_feat); } =20 for (i =3D 0; i < ARRAY_SIZE(kvm_hyperv_properties[feature].flags); i+= +) { --=20 1.8.3.1