From nobody Sun Feb 8 19:44:29 2026 Delivered-To: importer@patchew.org Received-SPF: none (zohomail.com: 192.237.175.120 is neither permitted nor denied by domain of lists.xenproject.org) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=none (zohomail.com: 192.237.175.120 is neither permitted nor denied by domain of lists.xenproject.org) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1576254053; cv=none; d=zohomail.com; s=zohoarc; b=IeBIiYXrUoGnN5Om/PSRWUO+OxT4Xv2pYlPuL8Mj+gAU0Rsyzxpv/soo3ZE5EhnDoNILrvyAfKsRzCxbYg5dedESnrVBeLV508t/guZ2k5hmGNV/w2kxP4O/5EHlj7WPSAjEqHckEx/Ir92u2LatIdCNDWIHKFw/btqiqpVBXiM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1576254053; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=XUeOmj/k6A/JGQHPHmS4jsTJ326+fIU8pIBm5MlbKkE=; b=hSK2Z+psxXeHZaYm/9jXMYtE/yQxsSw8+5HS9vMU+30R+cX1pdFwWrUFPktDw/wMtE1hNk7il1k2iWqaSoq9xho/ba68V3rYVKssdASnpU1DzIHtaZdcJ8pV8kqWXrpeET7fvIolnOmTy8cGK1m7fu1NOQXJBYk0OVi+jGfnYj4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=none (zohomail.com: 192.237.175.120 is neither permitted nor denied by domain of lists.xenproject.org) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1576254053128863.5581902667789; Fri, 13 Dec 2019 08:20:53 -0800 (PST) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1ifng1-0001IK-S0; Fri, 13 Dec 2019 16:20:25 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1ifng0-0001Hp-OP for xen-devel@lists.xenproject.org; Fri, 13 Dec 2019 16:20:24 +0000 Received: from us-smtp-delivery-1.mimecast.com (unknown [205.139.110.120]) by us1-rack-iad1.inumbo.com (Halon) with ESMTP id 7270d36c-1dc4-11ea-a1e1-bc764e2007e4; Fri, 13 Dec 2019 16:20:16 +0000 (UTC) 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-394-rlsJfBc9OvaPIStuNENCNA-1; Fri, 13 Dec 2019 11:20:14 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 7A050800EC0; Fri, 13 Dec 2019 16:20:12 +0000 (UTC) Received: from x1w.redhat.com (ovpn-205-147.brq.redhat.com [10.40.205.147]) by smtp.corp.redhat.com (Postfix) with ESMTPS id B180319C4F; Fri, 13 Dec 2019 16:20:04 +0000 (UTC) X-Inumbo-ID: 7270d36c-1dc4-11ea-a1e1-bc764e2007e4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1576254015; 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: in-reply-to:in-reply-to:references:references; bh=KN6AckxlKUpsLzxakKRr0um+iuOesJrJu7GlUIEw6bQ=; b=MmZQ1LiHb7yd5M4X7q+qCp2C3t93mtfXDF/x8cB6eIBT8rCHDnU0/DVfK0fcYvpRW182ag v1quLewpJc9Ssm5HWeXXxkoa9wFe+ywXBZMj5MH2UbEHAPF7YXeWgeIlxsL4TXXTMbRa8P I7VEcUTf2nHYAYxMUePHNie0Ke0Gc1s= X-MC-Unique: rlsJfBc9OvaPIStuNENCNA-1 From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Date: Fri, 13 Dec 2019 17:17:51 +0100 Message-Id: <20191213161753.8051-11-philmd@redhat.com> In-Reply-To: <20191213161753.8051-1-philmd@redhat.com> References: <20191213161753.8051-1-philmd@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Subject: [Xen-devel] [PATCH 10/12] hw/i386/pc: Rename allocate_cpu_irq from 'pc' to 'x86_machine' X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: Stefano Stabellini , Sergio Lopez , Eduardo Habkost , kvm@vger.kernel.org, Paul Durrant , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , "Michael S. Tsirkin" , Paolo Bonzini , Marcel Apfelbaum , xen-devel@lists.xenproject.org, Anthony Perard , Igor Mammedov , qemu-block@nongnu.org, John Snow , Richard Henderson Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) All the X86 machines use an interrupt controller. Rename the function to something more generic. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- include/hw/i386/pc.h | 2 +- hw/i386/microvm.c | 2 +- hw/i386/pc.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index 743141e107..244dbf2ec0 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -198,7 +198,7 @@ void pc_memory_init(PCMachineState *pcms, MemoryRegion *rom_memory, MemoryRegion **ram_memory); uint64_t pc_pci_hole64_start(void); -qemu_irq pc_allocate_cpu_irq(void); +qemu_irq x86_machine_allocate_cpu_irq(void); DeviceState *pc_vga_init(ISABus *isa_bus, PCIBus *pci_bus); void pc_basic_device_init(ISABus *isa_bus, qemu_irq *gsi, ISADevice **rtc_state, diff --git a/hw/i386/microvm.c b/hw/i386/microvm.c index def37e60f7..7ac008460a 100644 --- a/hw/i386/microvm.c +++ b/hw/i386/microvm.c @@ -132,7 +132,7 @@ static void microvm_devices_init(MicrovmMachineState *m= ms) if (mms->pic =3D=3D ON_OFF_AUTO_ON || mms->pic =3D=3D ON_OFF_AUTO_AUTO= ) { qemu_irq *i8259; =20 - i8259 =3D i8259_init(isa_bus, pc_allocate_cpu_irq()); + i8259 =3D i8259_init(isa_bus, x86_machine_allocate_cpu_irq()); for (i =3D 0; i < ISA_NUM_IRQS; i++) { gsi_state->i8259_irq[i] =3D i8259[i]; } diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 5f8e39c025..4defee274f 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -1282,7 +1282,7 @@ uint64_t pc_pci_hole64_start(void) return ROUND_UP(hole64_start, 1 * GiB); } =20 -qemu_irq pc_allocate_cpu_irq(void) +qemu_irq x86_machine_allocate_cpu_irq(void) { return qemu_allocate_irq(pic_irq_request, NULL, 0); } @@ -1463,7 +1463,7 @@ void pc_i8259_create(ISABus *isa_bus, qemu_irq *i8259= _irqs) } else if (xen_enabled()) { i8259 =3D xen_interrupt_controller_init(); } else { - i8259 =3D i8259_init(isa_bus, pc_allocate_cpu_irq()); + i8259 =3D i8259_init(isa_bus, x86_machine_allocate_cpu_irq()); } =20 for (size_t i =3D 0; i < ISA_NUM_IRQS; i++) { --=20 2.21.0 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xenproject.org https://lists.xenproject.org/mailman/listinfo/xen-devel