From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id EB3F5C10F14 for ; Tue, 15 Oct 2019 16:31:16 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id C91272086A for ; Tue, 15 Oct 2019 16:31:16 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C91272086A Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1iKPj1-0005Ba-8O; Tue, 15 Oct 2019 16:31:07 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1iKPj0-0005Ar-5V for xen-devel@lists.xenproject.org; Tue, 15 Oct 2019 16:31:06 +0000 X-Inumbo-ID: 2eb7643a-ef69-11e9-a531-bc764e2007e4 Received: from mx1.redhat.com (unknown [209.132.183.28]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 2eb7643a-ef69-11e9-a531-bc764e2007e4; Tue, 15 Oct 2019 16:31:04 +0000 (UTC) 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 mx1.redhat.com (Postfix) with ESMTPS id 51DDC3090FC6; Tue, 15 Oct 2019 16:31:04 +0000 (UTC) Received: from x1w.redhat.com (ovpn-204-35.brq.redhat.com [10.40.204.35]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 1B2C319C58; Tue, 15 Oct 2019 16:30:55 +0000 (UTC) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Date: Tue, 15 Oct 2019 18:26:53 +0200 Message-Id: <20191015162705.28087-21-philmd@redhat.com> In-Reply-To: <20191015162705.28087-1-philmd@redhat.com> References: <20191015162705.28087-1-philmd@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.43]); Tue, 15 Oct 2019 16:31:04 +0000 (UTC) Subject: [Xen-devel] [PATCH 20/32] hw/i386/pc: Extract pc_gsi_create() 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: Laurent Vivier , Thomas Huth , Stefano Stabellini , Eduardo Habkost , kvm@vger.kernel.org, Paul Durrant , "Michael S. Tsirkin" , Marcel Apfelbaum , Paolo Bonzini , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Aleksandar Markovic , xen-devel@lists.xenproject.org, Anthony Perard , Igor Mammedov , Aleksandar Rikalo , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Aurelien Jarno , Richard Henderson Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" VGhlIEdTSSBjcmVhdGlvbiBjb2RlIGlzIGNvbW1vbiB0byBhbGwgUEMgbWFjaGluZXMsIGV4dHJh Y3QgdGhlCmNvbW1vbiBjb2RlLgoKU2lnbmVkLW9mZi1ieTogUGhpbGlwcGUgTWF0aGlldS1EYXVk w6kgPHBoaWxtZEByZWRoYXQuY29tPgotLS0KIGh3L2kzODYvcGMuYyAgICAgICAgIHwgMTUgKysr KysrKysrKysrKysrCiBody9pMzg2L3BjX3BpaXguYyAgICB8ICA5ICstLS0tLS0tLQogaHcvaTM4 Ni9wY19xMzUuYyAgICAgfCAgOSArLS0tLS0tLS0KIGluY2x1ZGUvaHcvaTM4Ni9wYy5oIHwgIDIg KysKIDQgZmlsZXMgY2hhbmdlZCwgMTkgaW5zZXJ0aW9ucygrKSwgMTYgZGVsZXRpb25zKC0pCgpk aWZmIC0tZ2l0IGEvaHcvaTM4Ni9wYy5jIGIvaHcvaTM4Ni9wYy5jCmluZGV4IGJjZGE1MGVmY2Mu LmE3NTk3YzZjNDQgMTAwNjQ0Ci0tLSBhL2h3L2kzODYvcGMuYworKysgYi9ody9pMzg2L3BjLmMK QEAgLTM1Nyw2ICszNTcsMjEgQEAgdm9pZCBnc2lfaGFuZGxlcih2b2lkICpvcGFxdWUsIGludCBu LCBpbnQgbGV2ZWwpCiAgICAgcWVtdV9zZXRfaXJxKHMtPmlvYXBpY19pcnFbbl0sIGxldmVsKTsK IH0KIAorR1NJU3RhdGUgKnBjX2dzaV9jcmVhdGUocWVtdV9pcnEgKippcnFzLCBib29sIHBjaV9l bmFibGVkKQoreworICAgIEdTSVN0YXRlICpzOworCisgICAgcyA9IGdfbmV3MChHU0lTdGF0ZSwg MSk7CisgICAgaWYgKGt2bV9pb2FwaWNfaW5fa2VybmVsKCkpIHsKKyAgICAgICAga3ZtX3BjX3Nl dHVwX2lycV9yb3V0aW5nKHBjaV9lbmFibGVkKTsKKyAgICAgICAgKmlycXMgPSBxZW11X2FsbG9j YXRlX2lycXMoa3ZtX3BjX2dzaV9oYW5kbGVyLCBzLCBHU0lfTlVNX1BJTlMpOworICAgIH0gZWxz ZSB7CisgICAgICAgICppcnFzID0gcWVtdV9hbGxvY2F0ZV9pcnFzKGdzaV9oYW5kbGVyLCBzLCBH U0lfTlVNX1BJTlMpOworICAgIH0KKworICAgIHJldHVybiBzOworfQorCiBzdGF0aWMgdm9pZCBp b3BvcnQ4MF93cml0ZSh2b2lkICpvcGFxdWUsIGh3YWRkciBhZGRyLCB1aW50NjRfdCBkYXRhLAog ICAgICAgICAgICAgICAgICAgICAgICAgICAgdW5zaWduZWQgc2l6ZSkKIHsKZGlmZiAtLWdpdCBh L2h3L2kzODYvcGNfcGlpeC5jIGIvaHcvaTM4Ni9wY19waWl4LmMKaW5kZXggNDMxOTY1ZDkyMS4u NDUyYjEwN2UxYiAxMDA2NDQKLS0tIGEvaHcvaTM4Ni9wY19waWl4LmMKKysrIGIvaHcvaTM4Ni9w Y19waWl4LmMKQEAgLTE4OCwxNCArMTg4LDcgQEAgc3RhdGljIHZvaWQgcGNfaW5pdDEoTWFjaGlu ZVN0YXRlICptYWNoaW5lLAogICAgICAgICB4ZW5fbG9hZF9saW51eChwY21zKTsKICAgICB9CiAK LSAgICBnc2lfc3RhdGUgPSBnX21hbGxvYzAoc2l6ZW9mKCpnc2lfc3RhdGUpKTsKLSAgICBpZiAo a3ZtX2lvYXBpY19pbl9rZXJuZWwoKSkgewotICAgICAgICBrdm1fcGNfc2V0dXBfaXJxX3JvdXRp bmcocGNtYy0+cGNpX2VuYWJsZWQpOwotICAgICAgICBwY21zLT5nc2kgPSBxZW11X2FsbG9jYXRl X2lycXMoa3ZtX3BjX2dzaV9oYW5kbGVyLCBnc2lfc3RhdGUsCi0gICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICBHU0lfTlVNX1BJTlMpOwotICAgIH0gZWxzZSB7Ci0gICAgICAg IHBjbXMtPmdzaSA9IHFlbXVfYWxsb2NhdGVfaXJxcyhnc2lfaGFuZGxlciwgZ3NpX3N0YXRlLCBH U0lfTlVNX1BJTlMpOwotICAgIH0KKyAgICBnc2lfc3RhdGUgPSBwY19nc2lfY3JlYXRlKCZwY21z LT5nc2ksIHBjbWMtPnBjaV9lbmFibGVkKTsKIAogICAgIGlmIChwY21jLT5wY2lfZW5hYmxlZCkg ewogICAgICAgICBwY2lfYnVzID0gaTQ0MGZ4X2luaXQoaG9zdF90eXBlLApkaWZmIC0tZ2l0IGEv aHcvaTM4Ni9wY19xMzUuYyBiL2h3L2kzODYvcGNfcTM1LmMKaW5kZXggOGZhZDIwZjMxNC4uNTIy NjE5NjJiOCAxMDA2NDQKLS0tIGEvaHcvaTM4Ni9wY19xMzUuYworKysgYi9ody9pMzg2L3BjX3Ez NS5jCkBAIC0yMTAsMTQgKzIxMCw3IEBAIHN0YXRpYyB2b2lkIHBjX3EzNV9pbml0KE1hY2hpbmVT dGF0ZSAqbWFjaGluZSkKICAgICB9CiAKICAgICAvKiBpcnEgbGluZXMgKi8KLSAgICBnc2lfc3Rh dGUgPSBnX21hbGxvYzAoc2l6ZW9mKCpnc2lfc3RhdGUpKTsKLSAgICBpZiAoa3ZtX2lvYXBpY19p bl9rZXJuZWwoKSkgewotICAgICAgICBrdm1fcGNfc2V0dXBfaXJxX3JvdXRpbmcocGNtYy0+cGNp X2VuYWJsZWQpOwotICAgICAgICBwY21zLT5nc2kgPSBxZW11X2FsbG9jYXRlX2lycXMoa3ZtX3Bj X2dzaV9oYW5kbGVyLCBnc2lfc3RhdGUsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICBHU0lfTlVNX1BJTlMpOwotICAgIH0gZWxzZSB7Ci0gICAgICAgIHBjbXMtPmdzaSA9 IHFlbXVfYWxsb2NhdGVfaXJxcyhnc2lfaGFuZGxlciwgZ3NpX3N0YXRlLCBHU0lfTlVNX1BJTlMp OwotICAgIH0KKyAgICBnc2lfc3RhdGUgPSBwY19nc2lfY3JlYXRlKCZwY21zLT5nc2ksIHBjbWMt PnBjaV9lbmFibGVkKTsKIAogICAgIC8qIGNyZWF0ZSBwY2kgaG9zdCBidXMgKi8KICAgICBxMzVf aG9zdCA9IFEzNV9IT1NUX0RFVklDRShxZGV2X2NyZWF0ZShOVUxMLCBUWVBFX1EzNV9IT1NUX0RF VklDRSkpOwpkaWZmIC0tZ2l0IGEvaW5jbHVkZS9ody9pMzg2L3BjLmggYi9pbmNsdWRlL2h3L2kz ODYvcGMuaAppbmRleCBiNjNmYzc2MzFlLi5kMGM2YjlkNDY5IDEwMDY0NAotLS0gYS9pbmNsdWRl L2h3L2kzODYvcGMuaAorKysgYi9pbmNsdWRlL2h3L2kzODYvcGMuaApAQCAtMTc0LDYgKzE3NCw4 IEBAIHR5cGVkZWYgc3RydWN0IEdTSVN0YXRlIHsKIAogdm9pZCBnc2lfaGFuZGxlcih2b2lkICpv cGFxdWUsIGludCBuLCBpbnQgbGV2ZWwpOwogCitHU0lTdGF0ZSAqcGNfZ3NpX2NyZWF0ZShxZW11 X2lycSAqKmlycXMsIGJvb2wgcGNpX2VuYWJsZWQpOworCiAvKiB2bXBvcnQuYyAqLwogI2RlZmlu ZSBUWVBFX1ZNUE9SVCAidm1wb3J0IgogdHlwZWRlZiB1aW50MzJfdCAoVk1Qb3J0UmVhZEZ1bmMp KHZvaWQgKm9wYXF1ZSwgdWludDMyX3QgYWRkcmVzcyk7Ci0tIAoyLjIxLjAKCgpfX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpYZW4tZGV2ZWwgbWFpbGluZyBs aXN0Clhlbi1kZXZlbEBsaXN0cy54ZW5wcm9qZWN0Lm9yZwpodHRwczovL2xpc3RzLnhlbnByb2pl Y3Qub3JnL21haWxtYW4vbGlzdGluZm8veGVuLWRldmVs From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 18AA6ECE588 for ; Tue, 15 Oct 2019 16:31:06 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id EC4322086A for ; Tue, 15 Oct 2019 16:31:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388072AbfJOQbF (ORCPT ); Tue, 15 Oct 2019 12:31:05 -0400 Received: from mx1.redhat.com ([209.132.183.28]:44198 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388085AbfJOQbE (ORCPT ); Tue, 15 Oct 2019 12:31:04 -0400 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 mx1.redhat.com (Postfix) with ESMTPS id 51DDC3090FC6; Tue, 15 Oct 2019 16:31:04 +0000 (UTC) Received: from x1w.redhat.com (ovpn-204-35.brq.redhat.com [10.40.204.35]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 1B2C319C58; Tue, 15 Oct 2019 16:30:55 +0000 (UTC) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Aleksandar Markovic , Aurelien Jarno , Eduardo Habkost , Thomas Huth , Igor Mammedov , Anthony Perard , Stefano Stabellini , Paul Durrant , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Aleksandar Rikalo , xen-devel@lists.xenproject.org, Laurent Vivier , "Michael S. Tsirkin" , Marcel Apfelbaum , Paolo Bonzini , Richard Henderson , kvm@vger.kernel.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 20/32] hw/i386/pc: Extract pc_gsi_create() Date: Tue, 15 Oct 2019 18:26:53 +0200 Message-Id: <20191015162705.28087-21-philmd@redhat.com> In-Reply-To: <20191015162705.28087-1-philmd@redhat.com> References: <20191015162705.28087-1-philmd@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.43]); Tue, 15 Oct 2019 16:31:04 +0000 (UTC) Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org The GSI creation code is common to all PC machines, extract the common code. Signed-off-by: Philippe Mathieu-Daudé --- hw/i386/pc.c | 15 +++++++++++++++ hw/i386/pc_piix.c | 9 +-------- hw/i386/pc_q35.c | 9 +-------- include/hw/i386/pc.h | 2 ++ 4 files changed, 19 insertions(+), 16 deletions(-) diff --git a/hw/i386/pc.c b/hw/i386/pc.c index bcda50efcc..a7597c6c44 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -357,6 +357,21 @@ void gsi_handler(void *opaque, int n, int level) qemu_set_irq(s->ioapic_irq[n], level); } +GSIState *pc_gsi_create(qemu_irq **irqs, bool pci_enabled) +{ + GSIState *s; + + s = g_new0(GSIState, 1); + if (kvm_ioapic_in_kernel()) { + kvm_pc_setup_irq_routing(pci_enabled); + *irqs = qemu_allocate_irqs(kvm_pc_gsi_handler, s, GSI_NUM_PINS); + } else { + *irqs = qemu_allocate_irqs(gsi_handler, s, GSI_NUM_PINS); + } + + return s; +} + static void ioport80_write(void *opaque, hwaddr addr, uint64_t data, unsigned size) { diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index 431965d921..452b107e1b 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -188,14 +188,7 @@ static void pc_init1(MachineState *machine, xen_load_linux(pcms); } - gsi_state = g_malloc0(sizeof(*gsi_state)); - if (kvm_ioapic_in_kernel()) { - kvm_pc_setup_irq_routing(pcmc->pci_enabled); - pcms->gsi = qemu_allocate_irqs(kvm_pc_gsi_handler, gsi_state, - GSI_NUM_PINS); - } else { - pcms->gsi = qemu_allocate_irqs(gsi_handler, gsi_state, GSI_NUM_PINS); - } + gsi_state = pc_gsi_create(&pcms->gsi, pcmc->pci_enabled); if (pcmc->pci_enabled) { pci_bus = i440fx_init(host_type, diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c index 8fad20f314..52261962b8 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -210,14 +210,7 @@ static void pc_q35_init(MachineState *machine) } /* irq lines */ - gsi_state = g_malloc0(sizeof(*gsi_state)); - if (kvm_ioapic_in_kernel()) { - kvm_pc_setup_irq_routing(pcmc->pci_enabled); - pcms->gsi = qemu_allocate_irqs(kvm_pc_gsi_handler, gsi_state, - GSI_NUM_PINS); - } else { - pcms->gsi = qemu_allocate_irqs(gsi_handler, gsi_state, GSI_NUM_PINS); - } + gsi_state = pc_gsi_create(&pcms->gsi, pcmc->pci_enabled); /* create pci host bus */ q35_host = Q35_HOST_DEVICE(qdev_create(NULL, TYPE_Q35_HOST_DEVICE)); diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index b63fc7631e..d0c6b9d469 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -174,6 +174,8 @@ typedef struct GSIState { void gsi_handler(void *opaque, int n, int level); +GSIState *pc_gsi_create(qemu_irq **irqs, bool pci_enabled); + /* vmport.c */ #define TYPE_VMPORT "vmport" typedef uint32_t (VMPortReadFunc)(void *opaque, uint32_t address); -- 2.21.0 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 67A98ECE596 for ; Tue, 15 Oct 2019 16:47:08 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 3F21E20872 for ; Tue, 15 Oct 2019 16:47:08 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3F21E20872 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:52904 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iKPyU-00063Z-EZ for qemu-devel@archiver.kernel.org; Tue, 15 Oct 2019 12:47:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41760) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iKPj1-0003s5-KE for qemu-devel@nongnu.org; Tue, 15 Oct 2019 12:31:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iKPiz-0006Go-UN for qemu-devel@nongnu.org; Tue, 15 Oct 2019 12:31:07 -0400 Received: from mx1.redhat.com ([209.132.183.28]:57990) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iKPiz-0006Fa-MO for qemu-devel@nongnu.org; Tue, 15 Oct 2019 12:31:05 -0400 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 mx1.redhat.com (Postfix) with ESMTPS id 51DDC3090FC6; Tue, 15 Oct 2019 16:31:04 +0000 (UTC) Received: from x1w.redhat.com (ovpn-204-35.brq.redhat.com [10.40.204.35]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 1B2C319C58; Tue, 15 Oct 2019 16:30:55 +0000 (UTC) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 20/32] hw/i386/pc: Extract pc_gsi_create() Date: Tue, 15 Oct 2019 18:26:53 +0200 Message-Id: <20191015162705.28087-21-philmd@redhat.com> In-Reply-To: <20191015162705.28087-1-philmd@redhat.com> References: <20191015162705.28087-1-philmd@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.43]); Tue, 15 Oct 2019 16:31:04 +0000 (UTC) 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: 209.132.183.28 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: Laurent Vivier , Thomas Huth , Stefano Stabellini , Eduardo Habkost , kvm@vger.kernel.org, Paul Durrant , "Michael S. Tsirkin" , Paolo Bonzini , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Aleksandar Markovic , xen-devel@lists.xenproject.org, Anthony Perard , Igor Mammedov , Aleksandar Rikalo , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Aurelien Jarno , Richard Henderson Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" The GSI creation code is common to all PC machines, extract the common code. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/i386/pc.c | 15 +++++++++++++++ hw/i386/pc_piix.c | 9 +-------- hw/i386/pc_q35.c | 9 +-------- include/hw/i386/pc.h | 2 ++ 4 files changed, 19 insertions(+), 16 deletions(-) diff --git a/hw/i386/pc.c b/hw/i386/pc.c index bcda50efcc..a7597c6c44 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -357,6 +357,21 @@ void gsi_handler(void *opaque, int n, int level) qemu_set_irq(s->ioapic_irq[n], level); } =20 +GSIState *pc_gsi_create(qemu_irq **irqs, bool pci_enabled) +{ + GSIState *s; + + 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); + } + + return s; +} + static void ioport80_write(void *opaque, hwaddr addr, uint64_t data, unsigned size) { diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index 431965d921..452b107e1b 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -188,14 +188,7 @@ static void pc_init1(MachineState *machine, xen_load_linux(pcms); } =20 - gsi_state =3D g_malloc0(sizeof(*gsi_state)); - if (kvm_ioapic_in_kernel()) { - kvm_pc_setup_irq_routing(pcmc->pci_enabled); - pcms->gsi =3D qemu_allocate_irqs(kvm_pc_gsi_handler, gsi_state, - GSI_NUM_PINS); - } else { - pcms->gsi =3D qemu_allocate_irqs(gsi_handler, gsi_state, GSI_NUM= _PINS); - } + gsi_state =3D pc_gsi_create(&pcms->gsi, pcmc->pci_enabled); =20 if (pcmc->pci_enabled) { pci_bus =3D i440fx_init(host_type, diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c index 8fad20f314..52261962b8 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -210,14 +210,7 @@ static void pc_q35_init(MachineState *machine) } =20 /* irq lines */ - gsi_state =3D g_malloc0(sizeof(*gsi_state)); - if (kvm_ioapic_in_kernel()) { - kvm_pc_setup_irq_routing(pcmc->pci_enabled); - pcms->gsi =3D qemu_allocate_irqs(kvm_pc_gsi_handler, gsi_state, - GSI_NUM_PINS); - } else { - pcms->gsi =3D qemu_allocate_irqs(gsi_handler, gsi_state, GSI_NUM= _PINS); - } + gsi_state =3D pc_gsi_create(&pcms->gsi, pcmc->pci_enabled); =20 /* create pci host bus */ q35_host =3D Q35_HOST_DEVICE(qdev_create(NULL, TYPE_Q35_HOST_DEVICE)= ); diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index b63fc7631e..d0c6b9d469 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -174,6 +174,8 @@ typedef struct GSIState { =20 void gsi_handler(void *opaque, int n, int level); =20 +GSIState *pc_gsi_create(qemu_irq **irqs, bool pci_enabled); + /* vmport.c */ #define TYPE_VMPORT "vmport" typedef uint32_t (VMPortReadFunc)(void *opaque, uint32_t address); --=20 2.21.0