From patchwork Wed Jan 31 23:30:56 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 195095 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:693c:2685:b0:106:209c:c626 with SMTP id mn5csp110390dyc; Wed, 31 Jan 2024 16:16:19 -0800 (PST) X-Google-Smtp-Source: AGHT+IFhOk1X6DgZ2pEqzzFGfoXWEXjjQ/hhQ4TMrgNJflml2BLgTHcB3j9pfvLcGnsFIztl6uIK X-Received: by 2002:a05:6a20:24a2:b0:19c:9d09:957 with SMTP id m34-20020a056a2024a200b0019c9d090957mr3234365pzd.7.1706746579146; Wed, 31 Jan 2024 16:16:19 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1706746579; cv=pass; d=google.com; s=arc-20160816; b=xcWvYEjAhw8ERBic3/pkNo/fQZ1LCgysJOAPPVsUr3U4DX17zvE6+ES4ndPFznDaMt tBH84WgYZFA/F7h/LQzsGzEx6zjCLfXCOuNSbeLKjoATZoDFOuujOxAQ/NCk/0TEMIj/ cchW8zjolFBTzz9Ycs0nNvRt524/xBDWmagN7TLa8Z6DoFpWVoRrv0Hz8Q36UQMEIL+H nBKM69KXsMnccdKLQssvQ3JlS+kT0C7UQeef6fcLRdL8wz26hENkHpHxObolqm5C74K1 XG70qikw2KoMmCOWBk67aOmcF0bWKDpxlchiFlB5o/2hwrRiZkCpUq0WITN9EyXIJT4u N72g== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:to:from:dkim-signature; bh=9QNgMG1V+sShKZyZWPsvsaqKoL4Gh/7stnAPwzAP7cc=; fh=/KdCAsqEeEnvlGeNyxZxU+iOEnD0jGWoMDCNenOOxvo=; b=pGCj+mnc4Zua2GhLu9zIqj1AFl7Qpv5jbqoqahnbTgqQ8XiS8HdYPbncawctIMOH/5 UHyVF4KjYpZP8uAlFWY8M8NsAw7UkA9m2l0cUfoI8RzgvW0OhH1q6o7I8ZS5owY+zkU4 0Croif269LJUg2uBO6S8jv0ZZcrZ7uko5ALXjlQKEM9LTZAY5C1vRgQ30d+6kL2gR96C YVo+NLu8jViGkrkFSfMQY3yQj7o3YuVH57Dbq2+IPVa957DxVmyuFNiVRmz7d/bGDDrG xpp9C2XOQzOcjB4CxnJBQzHOVbhu2TnWfC+C8QW3q4W/JBOjnGCC8YcUoNMxqFlvNS6X R5FQ==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=WWimYWUP; arc=pass (i=1 spf=pass spfdomain=redhat.com dkim=pass dkdomain=redhat.com dmarc=pass fromdomain=redhat.com); spf=pass (google.com: domain of linux-kernel+bounces-47382-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-47382-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com X-Forwarded-Encrypted: i=1; AJvYcCWVHsuLpGxIjJVb9oVl7hVPu4Q+B/2NBIokCa/9cuoX0aJtYf9EstvpVLdkem9hZCdZkMDAhk6NntipXwytZgx67zr2jg== Received: from sy.mirrors.kernel.org (sy.mirrors.kernel.org. [2604:1380:40f1:3f00::1]) by mx.google.com with ESMTPS id p28-20020a63741c000000b005c279da45f1si10257617pgc.566.2024.01.31.16.16.18 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 31 Jan 2024 16:16:19 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-47382-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) client-ip=2604:1380:40f1:3f00::1; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=WWimYWUP; arc=pass (i=1 spf=pass spfdomain=redhat.com dkim=pass dkdomain=redhat.com dmarc=pass fromdomain=redhat.com); spf=pass (google.com: domain of linux-kernel+bounces-47382-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-47382-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sy.mirrors.kernel.org (Postfix) with ESMTPS id 425F3B317C5 for ; Wed, 31 Jan 2024 23:41:23 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 229F5495CB; Wed, 31 Jan 2024 23:31:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="WWimYWUP" Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B525841206 for ; Wed, 31 Jan 2024 23:31:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706743865; cv=none; b=H3u7pHWgd7Dhq7T+SMAp2JrxqW5eGYLycxW7HOFJnhxSbRbO4V8/htoqUhAYNoX9/ZATiUf8llSc09mziEdSiErDYmNvk0xY3+5pROzQFJw2hxHf0LA6RWAPJie2KJApX8bPDjZIL9os3OPtGq50oxwwar7KNtXEORlBj87iSfY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706743865; c=relaxed/simple; bh=xtXUWbFA5RhV5p2JPvTvy0REVEPRTKEXEP3AJq7jDQk=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version:Content-Type; b=JJE9guW6Qg9/n6VLR+O7yshcpF6lrQxXtNe6PEStsj2TAqyN/vZy6fB1oNu982Bj8qdfczPLCZBPfPe314icVTdkNw+t+SCmrRazIUYQMHnnr+HUOJUfUfbaMIPTw73qzgaCfx5mM7IjyJn15oUTRBefLmtduy9aznFjRftfzIU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=WWimYWUP; arc=none smtp.client-ip=170.10.133.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1706743861; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=9QNgMG1V+sShKZyZWPsvsaqKoL4Gh/7stnAPwzAP7cc=; b=WWimYWUPlw8kK2Kh2McbC/1dswStMwdYAf7RgfCM+2ZAo3TdzJDwQjDpuL4sCI3ukuduLA CTVFRix9LRRaZIRmXmePeF76o4FmzIKmpjKBguUo6xOWzmUUDQE99X1J+nW9cxlGvCxKRS p03u010ib6vXZjsNDDtkWT2ILG/q9yI= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-686-Ub6N-GuYMlS0zu0_pDbJ1Q-1; Wed, 31 Jan 2024 18:30:58 -0500 X-MC-Unique: Ub6N-GuYMlS0zu0_pDbJ1Q-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id BCA85185A780; Wed, 31 Jan 2024 23:30:57 +0000 (UTC) Received: from virtlab511.virt.lab.eng.bos.redhat.com (virtlab511.virt.lab.eng.bos.redhat.com [10.19.152.198]) by smtp.corp.redhat.com (Postfix) with ESMTP id A4870C2590D; Wed, 31 Jan 2024 23:30:57 +0000 (UTC) From: Paolo Bonzini To: linux-kernel@vger.kernel.org, kvm@vger.kernel.org Subject: [PATCH 8/8] KVM: remove unnecessary #ifdef Date: Wed, 31 Jan 2024 18:30:56 -0500 Message-Id: <20240131233056.10845-9-pbonzini@redhat.com> In-Reply-To: <20240131233056.10845-1-pbonzini@redhat.com> References: <20240131233056.10845-1-pbonzini@redhat.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.8 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1789653501155796239 X-GMAIL-MSGID: 1789653501155796239 KVM_CAP_IRQ_ROUTING is always defined, so there is no need to check if it is. Signed-off-by: Paolo Bonzini --- include/uapi/linux/kvm.h | 4 ---- 1 file changed, 4 deletions(-) diff --git a/include/uapi/linux/kvm.h b/include/uapi/linux/kvm.h index 589aba934c51..9fb9dd9a8fd5 100644 --- a/include/uapi/linux/kvm.h +++ b/include/uapi/linux/kvm.h @@ -921,8 +921,6 @@ struct kvm_enable_cap { #define KVM_CAP_GUEST_MEMFD 234 #define KVM_CAP_VM_TYPES 235 -#ifdef KVM_CAP_IRQ_ROUTING - struct kvm_irq_routing_irqchip { __u32 irqchip; __u32 pin; @@ -987,8 +985,6 @@ struct kvm_irq_routing { struct kvm_irq_routing_entry entries[]; }; -#endif - #define KVM_IRQFD_FLAG_DEASSIGN (1 << 0) /* * Available with KVM_CAP_IRQFD_RESAMPLE