Message ID | 1534870966-9287-71-git-send-email-pbonzini@redhat.com |
---|---|
State | New |
Headers | show
Return-Path: <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org> X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=<UNKNOWN>) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="PQ0BftrZ"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 41vyrF4bDlz9s47 for <incoming@patchwork.ozlabs.org>; Wed, 22 Aug 2018 03:50:21 +1000 (AEST) Received: from localhost ([::1]:55185 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>) id 1fsAnL-0006PY-7g for incoming@patchwork.ozlabs.org; Tue, 21 Aug 2018 13:50:19 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33964) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <paolo.bonzini@gmail.com>) id 1fsA4y-0002SW-4T for qemu-devel@nongnu.org; Tue, 21 Aug 2018 13:04:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from <paolo.bonzini@gmail.com>) id 1fsA4p-0007F4-Cf for qemu-devel@nongnu.org; Tue, 21 Aug 2018 13:04:25 -0400 Received: from mail-wr1-x443.google.com ([2a00:1450:4864:20::443]:34306) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from <paolo.bonzini@gmail.com>) id 1fsA4p-0007D1-4P for qemu-devel@nongnu.org; Tue, 21 Aug 2018 13:04:19 -0400 Received: by mail-wr1-x443.google.com with SMTP id g33-v6so6432702wrd.1 for <qemu-devel@nongnu.org>; Tue, 21 Aug 2018 10:04:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:subject:date:message-id:in-reply-to:references; bh=pflPQ7X9ykcETPZ7hawFpx72JOkid8riW23Q2mcbPfg=; b=PQ0BftrZrDuDMQb4sFEQJFHyAaPsSOtYbElO1gd+EhXzPEju/NABqeyuA+D4WKuTtx oHOOy6LFvfabgNJlclh96AJkSlSsH4Axy1iAH1z0XgtikLf/KUjyD1lFiivK+k4OuYmC +HqvHyD/vUBaUZy/X1YeGa5/ids9Qux7KSKKkae2mlVNLGS6tMOyCvBRxPZwxS8qRxM+ U79xkHSY3igGlqdVkR/FTthsMoJoCfWjJj9OfI0PPYCsY0WRGRAic5JvVCg1ptYgIF3H LMdpU43Ono5rxUYABBB/UuAGWC5tgzzloqeFbdiPryWZTgh7b74Id7v+jZrLFQMN7bKW ZhNg== 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:subject:date:message-id :in-reply-to:references; bh=pflPQ7X9ykcETPZ7hawFpx72JOkid8riW23Q2mcbPfg=; b=WVOryAePKjlCDif5Y6hhBUsB53v0tgdzLpkJpBb45XX9hYoWEYJ3P2aJh2msMvySGx c6xgt/ozjlU4KjjJhAdP6uO6C/VjwJSRweqMeAxe4yL4a5BwregTmwoGIZzceg2wP+6m H3JC4hf4cTGLExz/EUEDYrQDm0lrO9a2gl/REKKg+04dTqEFHNLltf1Z+YJ5LYqRu76x sCojeLwt7jKdDF4M6Izzx43LFrxnjwDZATLIp8RNCt4DylBYs1wjhwJBvppu/YIr13WZ O3+wVL5zjGA1urpOIjm+lqIHzkH8ilb8fkO8PyQIsjZeZnH6FTuxb5kBrn256TzJAsK+ RrTA== X-Gm-Message-State: AOUpUlGpnQaA3Ay06pdd4CyuNC9i9HE3YQM3xTH38NYPfagIsbsoZvlM q3jnvFPte0flN/Jq4b5aIhBs50Ig X-Google-Smtp-Source: AA+uWPwS7eEM//1ctLSxWNSnxLXlZ3/296GG7BsZz6/v+us9KAUjv5Qp7txNDO3oKYHYZ0gZO5yqyw== X-Received: by 2002:adf:9b11:: with SMTP id b17-v6mr34780008wrc.119.1534871057808; Tue, 21 Aug 2018 10:04:17 -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 v6-v6sm2608955wmc.43.2018.08.21.10.04.16 for <qemu-devel@nongnu.org> (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 21 Aug 2018 10:04:16 -0700 (PDT) From: Paolo Bonzini <pbonzini@redhat.com> To: qemu-devel@nongnu.org Date: Tue, 21 Aug 2018 19:02:42 +0200 Message-Id: <1534870966-9287-71-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1534870966-9287-1-git-send-email-pbonzini@redhat.com> References: <1534870966-9287-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 70/74] KVM: cleanup unnecessary #ifdef KVM_CAP_... X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: <qemu-devel.nongnu.org> List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=unsubscribe> List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel/> List-Post: <mailto:qemu-devel@nongnu.org> List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help> List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=subscribe> Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org> |
Series |
[PULL,01/74] tests: virtio: separate ccw tests from libqos
|
expand
|
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 = KVM_IRQ_LINE_STATUS; } -#ifdef KVM_CAP_READONLY_MEM kvm_readonly_mem_allowed = (kvm_check_extension(s, KVM_CAP_READONLY_MEM) > 0); -#endif kvm_eventfds_allowed = (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; -#ifdef KVM_CAP_XSAVE has_xsave = kvm_check_extension(s, KVM_CAP_XSAVE); -#endif - -#ifdef KVM_CAP_XCRS has_xcrs = kvm_check_extension(s, KVM_CAP_XCRS); -#endif - -#ifdef KVM_CAP_PIT_STATE2 has_pit_state2 = kvm_check_extension(s, KVM_CAP_PIT_STATE2); -#endif hv_vpindex_settable = kvm_check_extension(s, KVM_CAP_HYPERV_VP_INDEX);
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 <pbonzini@redhat.com> --- accel/kvm/kvm-all.c | 2 -- target/i386/kvm.c | 8 -------- 2 files changed, 10 deletions(-)