From nobody Mon Feb 9 22:02:49 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1621374989; cv=none; d=zohomail.com; s=zohoarc; b=Fydz25+1ZhM6sCPqd5dHjqtxv+Dws50oaqNfwQ1zynW5Y5iCuL9VeUQoxg5C1fEXmH0S82vmeVsdG0kLuuZIxjbKrvIOWwoDa3DOvM4L6dVru7tZtTgv4K8i2W6nkMOHxpCuZcufebT3QF+AEAwaGCK7a5tRQzjrliFa73Hpre4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1621374989; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=GNOnqYtJWtXTtX74dMfNOzHIoPFRBVKHzI5qhATwsig=; b=eGxBIKVUO3aqP8qNhTr96tPlBQzFygpHhLrm5DQ7QiJ1gLQWwn/ciie6rTy5jq2yHFb+oGTqyLIcHQOJ5ytMTXaX+DdpjgMmzSJn62uAOUvclxPAbviVd+8hSwN866I7m37+CrihHgrKsUhxGgEOFNv16iXy3lN+l9MsTyKXILY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1621374989826117.25233902454227; Tue, 18 May 2021 14:56:29 -0700 (PDT) Received: from mail-ed1-f69.google.com (mail-ed1-f69.google.com [209.85.208.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-564-uPa5QnPRNhaSDn9ZVsCjwQ-1; Tue, 18 May 2021 17:56:27 -0400 Received: by mail-ed1-f69.google.com with SMTP id cy15-20020a0564021c8fb029038d26976787so5062839edb.0 for ; Tue, 18 May 2021 14:56:27 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.redhat.com (31.red-83-51-215.dynamicip.rima-tde.net. [83.51.215.31]) by smtp.gmail.com with ESMTPSA id d7sm10749316ejk.55.2021.05.18.14.56.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 May 2021 14:56:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1621374988; 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=GNOnqYtJWtXTtX74dMfNOzHIoPFRBVKHzI5qhATwsig=; b=ahZhrIQd3INvycY9/0H8MRDRkaMKlZNaVZz4Wv/MJvZVd6GPWAB+IiwP4nqV0oCmSLpaCm Eksr8B3ACz+AQzIdk3qP9Qf1egQ0DfNTIkuix+21ylNyMD/jxA8R2KuCcFbuFYRqobkKHa S+jwG+sPVghw8V/gMluzwTOnQ2IlPQ4= X-MC-Unique: uPa5QnPRNhaSDn9ZVsCjwQ-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=GNOnqYtJWtXTtX74dMfNOzHIoPFRBVKHzI5qhATwsig=; b=LON7FtajdQan7ijVGEAgn2hK3wHctBkYwDgDZlyHZ1gmoioyxcHNtekCEkRZ79KFTF kNee20eAum3ziIhLOwgEkPRDT3n4vi5ZfTVR/1tgF0FVNP62x9mPZeDuRu4HZHxFOEPg 0wMiYOExufbTCxPyf+zGu/+/xZk9zGrOmStQRjXautIYBDm0Z92LcrKU60nvbl8z+Wwk bPiru7roj++HnxvvlBhjHyJpxmCx+1nKDuKHWbc45VJucN6CCSLDrxiLqkHv6d7ClJoI H1YBYTp1OUzC/X8d1XmmNHwuKETVCo/z6Heywm0UCtaZz3gvekNCyLUn4aZYHW7vfF0p h7/g== X-Gm-Message-State: AOAM532CmMSMGJ8NDURjZPqiKnfPFXykB61wJUbt6H+14jn1BnnT4Wp5 4icQLewzIg/zoQ7TcC57pc5yV+01peuEdr9qKQsVgn5I+sDeVPjn1UqNNZkR/LthhONUNJTLSOE 21MeddmXL1bOeAw== X-Received: by 2002:aa7:dbcd:: with SMTP id v13mr9329791edt.59.1621374986148; Tue, 18 May 2021 14:56:26 -0700 (PDT) X-Google-Smtp-Source: ABdhPJycDQIdlwnflwljCWCxllNAFXAvl5/fabwXWSdRlQnCIMbSqaVwIeFwKRJodiJ7NyxHq/PY2Q== X-Received: by 2002:aa7:dbcd:: with SMTP id v13mr9329775edt.59.1621374985985; Tue, 18 May 2021 14:56:25 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: John Snow , qemu-devel@nongnu.org Cc: Elena Ufimtseva , Markus Armbruster , Mark Cave-Ayland , Stefan Hajnoczi , Jagannathan Raman , Thomas Huth , John G Johnson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [RFC PATCH 08/11] hw/isa: Extract bus part from isa_register_portio_list() Date: Tue, 18 May 2021 23:55:42 +0200 Message-Id: <20210518215545.1793947-9-philmd@redhat.com> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210518215545.1793947-1-philmd@redhat.com> References: <20210518215545.1793947-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) isa_register_portio_list() takes an ISADevice argument mostly to resolve the ISA bus. Extract the bus logic to a new function: isa_bus_register_portio_list(). Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- include/hw/isa/isa.h | 4 ++++ hw/isa/isa-bus.c | 17 +++++++++++++---- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/include/hw/isa/isa.h b/include/hw/isa/isa.h index fd8b84d8007..ce31eef8858 100644 --- a/include/hw/isa/isa.h +++ b/include/hw/isa/isa.h @@ -139,6 +139,10 @@ void isa_register_portio_list(ISADevice *dev, uint16_t start, const MemoryRegionPortio *portio, void *opaque, const char *name); +void isa_bus_register_portio_list(ISABus *isabus, Object *owner, + PortioList *piolist, uint16_t start, + const MemoryRegionPortio *portio, + void *opaque, const char *name); =20 static inline ISABus *isa_bus_from_device(ISADevice *d) { diff --git a/hw/isa/isa-bus.c b/hw/isa/isa-bus.c index 65a26ac6c2c..c79d7e338b0 100644 --- a/hw/isa/isa-bus.c +++ b/hw/isa/isa-bus.c @@ -140,20 +140,29 @@ void isa_register_ioport(ISADevice *dev, MemoryRegion= *io, uint16_t start) isa_init_ioport(dev, start); } =20 +void isa_bus_register_portio_list(ISABus *isabus, Object *owner, + PortioList *piolist, uint16_t start, + const MemoryRegionPortio *portio, + void *opaque, const char *name) +{ + assert(piolist && !piolist->owner); + + portio_list_init(piolist, owner, portio, opaque, name); + portio_list_add(piolist, isabus->address_space_io, start); +} + void isa_register_portio_list(ISADevice *dev, PortioList *piolist, uint16_t start, const MemoryRegionPortio *pio_start, void *opaque, const char *name) { - assert(piolist && !piolist->owner); - /* START is how we should treat DEV, regardless of the actual contents of the portio array. This is how the old code actually handled e.g. the FDC device. */ isa_init_ioport(dev, start); =20 - portio_list_init(piolist, OBJECT(dev), pio_start, opaque, name); - portio_list_add(piolist, isabus->address_space_io, start); + isa_bus_register_portio_list(isabus, OBJECT(dev), piolist, start, + pio_start, opaque, name); } =20 static void isa_device_init(Object *obj) --=20 2.26.3