From nobody Wed Nov 5 12:52:41 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.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 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1534863207740373.47215685846675; Tue, 21 Aug 2018 07:53:27 -0700 (PDT) Received: from localhost ([::1]:54093 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fs82A-0006oB-Gw for importer@patchew.org; Tue, 21 Aug 2018 10:53:26 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35010) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fs6nb-0002g1-N0 for qemu-devel@nongnu.org; Tue, 21 Aug 2018 09:34:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fs6nX-0000Lq-MV for qemu-devel@nongnu.org; Tue, 21 Aug 2018 09:34:19 -0400 Received: from mail-wm0-x243.google.com ([2a00:1450:400c:c09::243]:37009) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fs6nX-0000L9-EQ for qemu-devel@nongnu.org; Tue, 21 Aug 2018 09:34:15 -0400 Received: by mail-wm0-x243.google.com with SMTP id n11-v6so2878713wmc.2 for ; Tue, 21 Aug 2018 06:34:15 -0700 (PDT) Received: from 640k.lan (dynamic-adsl-78-12-184-244.clienti.tiscali.it. [78.12.184.244]) by smtp.gmail.com with ESMTPSA id m129-v6sm20288310wma.1.2018.08.21.06.34.13 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 21 Aug 2018 06:34:13 -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; bh=pflPQ7X9ykcETPZ7hawFpx72JOkid8riW23Q2mcbPfg=; b=fMLPhe/fp0w5UA2QPj6w+qzTLPyxWJEtHlCbw0+sRicVAFAYtbjOQJ9P44y8w0EyxU BEEtRGR0FRHCUHAwK/sSi+wYD4xkYbf1tu5SNiVgvWjA29YJAfDzOU1/Zv3QEn1oCMEO SVPvdCZxCITfm+sCIukwWx3qdbxB4P7r67IogHcoIqcyR26li+ggSd8hGeHtRAhFtsSs EU0/s2fIKHY47KHSai3zNhFZmf9h0PJl6AxaKVANCvS8DS2JHiAHtp0c5aG+94fOShUe BM76mcTf9A1uR5jk+hHb0JbY8yieEfayloc0pqQOnz+X7FGyra2moNoIEEzgOZLCYGCO SltA== 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; bh=pflPQ7X9ykcETPZ7hawFpx72JOkid8riW23Q2mcbPfg=; b=jTFRMrrulFCT0WqhIO1DQK6ZG7bWGRv1i2U5Aw/vtxsjq6OUcJ9LjMuz7wtNKA+mD0 Ig4MvtXAs5CjzqaJaH9XUNbc+Kb8nev7c4i8ItFrcSDq/xecJuSKUG+7Gqzj6R3UCoAk KNArcDORFyBu3oh09gvG70ilNT6cv38vkWpJvlZhz1nZAcDlemuoRRNpzSB9fK+BXF3k P4MLWqLPh3rab+a1NCvo2pFaQkRvpZlVtqjLD+fyeNBsmfpP6+r5p6+pW9ukjXbZW5ew 23wtx5Uuctzt1Sn8SemfCwuLChNC2foo0xCkLtOTQ9OeE8JopAsAWXCluoB05RXGUa5/ uq3w== X-Gm-Message-State: APzg51BgMcXvtBhf+A6oxNoecnEH5rkRvr4EFM5/VEqayV1UYADs5mGh GgMWHviXA+CUL1GpOarg4PYi3123 X-Google-Smtp-Source: ANB0VdZ1Cxh3e9nnsQCdWKmXQCC984JnOtt293URoDmMYWPuyHI1Bs8S423FPqt6G1ODhP8g+juPwQ== X-Received: by 2002:a1c:eccc:: with SMTP id h73-v6mr1981856wmi.94.1534858454166; Tue, 21 Aug 2018 06:34:14 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Tue, 21 Aug 2018 15:34:12 +0200 Message-Id: <1534858452-37519-1-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c09::243 Subject: [Qemu-devel] [PATCH] KVM: cleanup unnecessary #ifdef KVM_CAP_... X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: david@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDMRC_1 RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" The capability macros are always defined, since they come from kernel headers that are copied into the QEMU tree. Remove the unnecessary #ifdefs. Signed-off-by: Paolo Bonzini Reviewed-by: David Hildenbrand --- accel/kvm/kvm-all.c | 2 -- target/i386/kvm.c | 8 -------- 2 files changed, 10 deletions(-) diff --git a/accel/kvm/kvm-all.c b/accel/kvm/kvm-all.c index 38f468d..de12f78 100644 --- a/accel/kvm/kvm-all.c +++ b/accel/kvm/kvm-all.c @@ -1639,10 +1639,8 @@ static int kvm_init(MachineState *ms) s->irq_set_ioctl =3D KVM_IRQ_LINE_STATUS; } =20 -#ifdef KVM_CAP_READONLY_MEM kvm_readonly_mem_allowed =3D (kvm_check_extension(s, KVM_CAP_READONLY_MEM) > 0); -#endif =20 kvm_eventfds_allowed =3D (kvm_check_extension(s, KVM_CAP_IOEVENTFD) > 0); diff --git a/target/i386/kvm.c b/target/i386/kvm.c index 9313602..0b2a07d 100644 --- a/target/i386/kvm.c +++ b/target/i386/kvm.c @@ -1381,17 +1381,9 @@ int kvm_arch_init(MachineState *ms, KVMState *s) int ret; struct utsname utsname; =20 -#ifdef KVM_CAP_XSAVE has_xsave =3D kvm_check_extension(s, KVM_CAP_XSAVE); -#endif - -#ifdef KVM_CAP_XCRS has_xcrs =3D kvm_check_extension(s, KVM_CAP_XCRS); -#endif - -#ifdef KVM_CAP_PIT_STATE2 has_pit_state2 =3D kvm_check_extension(s, KVM_CAP_PIT_STATE2); -#endif =20 hv_vpindex_settable =3D kvm_check_extension(s, KVM_CAP_HYPERV_VP_INDEX= ); =20 --=20 1.8.3.1