From nobody Sun May 5 18:25:33 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.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 (zohomail.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=1576235312; cv=none; d=zohomail.com; s=zohoarc; b=Z7T67Q7b65NqVMG6iHWuryki0d8+2afUfyri7CY/BQk2rmI7tJSgJafIrU1EcSYN0qRerBg3/hqIvbwqgC96pfXUE05zLWiwKoWrlCIDRUjwQdCNI3ksMhA1CI8pcsoyDvbmnIoDeXlN6F4NHWzNx88rncqjH/Nin9/xlDOQVwk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1576235312; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=9YVwxsrA7bHU0ZxobUQ7B9E7z5AaZfc5ooyfIz7vtGg=; b=G+hFjrI0/s+8UXt1kvxe6QCKIpYm6R3Y5UZ50f/ujEwcv0+tFub3WuovLe0TrKNA5nVWCApQHvXBho55sE8iOnX/gSgo23RXCodZso7EHYSEw65SZ8rq2kF2ESEYhCnoPE8O+1W6VGs8i2Fa+/Cm++A9/yB2YOEAo0qJB8PG1G8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.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 157623531241253.484723331293594; Fri, 13 Dec 2019 03:08:32 -0800 (PST) Received: from localhost ([::1]:46698 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifioB-0000wX-1F for importer@patchew.org; Fri, 13 Dec 2019 06:08:31 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:51232) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifina-0000Wd-1D for qemu-devel@nongnu.org; Fri, 13 Dec 2019 06:07:55 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ifinW-0003Bb-R0 for qemu-devel@nongnu.org; Fri, 13 Dec 2019 06:07:51 -0500 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:30300 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ifinW-0003A1-Ly for qemu-devel@nongnu.org; Fri, 13 Dec 2019 06:07:50 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-297-S5e_EUE5MiSWKFOHK0hUeA-1; Fri, 13 Dec 2019 06:07:48 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 52FA6107ACC7; Fri, 13 Dec 2019 11:07:47 +0000 (UTC) Received: from x1w.redhat.com (ovpn-204-134.brq.redhat.com [10.40.204.134]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 814145D6BE; Fri, 13 Dec 2019 11:07:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1576235269; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9YVwxsrA7bHU0ZxobUQ7B9E7z5AaZfc5ooyfIz7vtGg=; b=AC1y87w2JjQDb94mQxvye37nJ6TRi02WuodYhTxpIxKpwbo4SzdeIxuU8hkVC4S10eGhKl 5W9Tc05ICP57ICFvaelUqAYHtm6QPkpfVKa6KnKs5iltUmw/qxfc5kELdN5Y/7iMurfujf yiYzkhKcrSjaSe4Lt4VMPaR5HjrxDxo= X-MC-Unique: S5e_EUE5MiSWKFOHK0hUeA-1 From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH] hw/i386: De-duplicate gsi_handler() to remove kvm_pc_gsi_handler() Date: Fri, 13 Dec 2019 12:07:36 +0100 Message-Id: <20191213110736.10767-1-philmd@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 207.211.31.120 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: Eduardo Habkost , kvm@vger.kernel.org, "Michael S. Tsirkin" , Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Both gsi_handler() and kvm_pc_gsi_handler() have the same content, except one comment. Move the comment, and de-duplicate the code. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- include/sysemu/kvm.h | 1 - hw/i386/kvm/ioapic.c | 12 ------------ hw/i386/pc.c | 5 ++--- 3 files changed, 2 insertions(+), 16 deletions(-) diff --git a/include/sysemu/kvm.h b/include/sysemu/kvm.h index 9fe233b9bf..f5d0d0d710 100644 --- a/include/sysemu/kvm.h +++ b/include/sysemu/kvm.h @@ -515,7 +515,6 @@ int kvm_irqchip_add_irqfd_notifier(KVMState *s, EventNo= tifier *n, int kvm_irqchip_remove_irqfd_notifier(KVMState *s, EventNotifier *n, qemu_irq irq); void kvm_irqchip_set_qemuirq_gsi(KVMState *s, qemu_irq irq, int gsi); -void kvm_pc_gsi_handler(void *opaque, int n, int level); void kvm_pc_setup_irq_routing(bool pci_enabled); void kvm_init_irq_routing(KVMState *s); =20 diff --git a/hw/i386/kvm/ioapic.c b/hw/i386/kvm/ioapic.c index f94729c565..bae7413a39 100644 --- a/hw/i386/kvm/ioapic.c +++ b/hw/i386/kvm/ioapic.c @@ -48,18 +48,6 @@ void kvm_pc_setup_irq_routing(bool pci_enabled) } } =20 -void kvm_pc_gsi_handler(void *opaque, int n, int level) -{ - GSIState *s =3D opaque; - - if (n < ISA_NUM_IRQS) { - /* Kernel will forward to both PIC and IOAPIC */ - qemu_set_irq(s->i8259_irq[n], level); - } else { - qemu_set_irq(s->ioapic_irq[n], level); - } -} - typedef struct KVMIOAPICState KVMIOAPICState; =20 struct KVMIOAPICState { diff --git a/hw/i386/pc.c b/hw/i386/pc.c index ac08e63604..97e9049b71 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -350,6 +350,7 @@ void gsi_handler(void *opaque, int n, int level) =20 DPRINTF("pc: %s GSI %d\n", level ? "raising" : "lowering", n); if (n < ISA_NUM_IRQS) { + /* Under KVM, Kernel will forward to both PIC and IOAPIC */ qemu_set_irq(s->i8259_irq[n], level); } qemu_set_irq(s->ioapic_irq[n], level); @@ -362,10 +363,8 @@ GSIState *pc_gsi_create(qemu_irq **irqs, bool pci_enab= led) s =3D g_new0(GSIState, 1); if (kvm_ioapic_in_kernel()) { kvm_pc_setup_irq_routing(pci_enabled); - *irqs =3D qemu_allocate_irqs(kvm_pc_gsi_handler, s, GSI_NUM_PINS); - } else { - *irqs =3D qemu_allocate_irqs(gsi_handler, s, GSI_NUM_PINS); } + *irqs =3D qemu_allocate_irqs(gsi_handler, s, GSI_NUM_PINS); =20 return s; } --=20 2.21.0