From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60063) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bHuAs-0005e6-Rj for qemu-devel@nongnu.org; Tue, 28 Jun 2016 10:39:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bHuAo-0001yx-KU for qemu-devel@nongnu.org; Tue, 28 Jun 2016 10:39:37 -0400 Received: from mx1.redhat.com ([209.132.183.28]:42613) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bHuAo-0001yg-Bq for qemu-devel@nongnu.org; Tue, 28 Jun 2016 10:39:34 -0400 References: <20160624132906.14446-1-cornelia.huck@de.ibm.com> <20160624132906.14446-8-cornelia.huck@de.ibm.com> From: Marcel Apfelbaum Message-ID: <57728C22.7010909@redhat.com> Date: Tue, 28 Jun 2016 17:39:30 +0300 MIME-Version: 1.0 In-Reply-To: <20160624132906.14446-8-cornelia.huck@de.ibm.com> Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH 07/17] s390x/pci: introduce S390PCIBus List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Cornelia Huck , qemu-devel@nongnu.org Cc: mst@redhat.com, borntraeger@de.ibm.com, agraf@suse.de, jfrei@linux.vnet.ibm.com, zyimin@linux.vnet.ibm.com On 06/24/2016 04:28 PM, Cornelia Huck wrote: > From: Yi Min Zhao > > To enable S390PCIBusDevice as qdev, there should be a new bus to > plug and manage all instances of S390PCIBusDevice. Due to this, > S390PCIBus is introduced. > > Signed-off-by: Yi Min Zhao > Reviewed-by: Pierre Morel > Signed-off-by: Cornelia Huck > --- > hw/s390x/s390-pci-bus.c | 10 ++++++++++ > hw/s390x/s390-pci-bus.h | 8 ++++++++ > 2 files changed, 18 insertions(+) > > diff --git a/hw/s390x/s390-pci-bus.c b/hw/s390x/s390-pci-bus.c > index 0f6fcef..0c67c1e 100644 > --- a/hw/s390x/s390-pci-bus.c > +++ b/hw/s390x/s390-pci-bus.c > @@ -527,6 +527,9 @@ static int s390_pcihost_init(SysBusDevice *dev) > bus = BUS(b); > qbus_set_hotplug_handler(bus, DEVICE(dev), NULL); > phb->bus = b; > + > + s->bus = S390_PCI_BUS(qbus_create(TYPE_S390_PCI_BUS, DEVICE(s), NULL)); > + > QTAILQ_INIT(&s->pending_sei); > return 0; > } > @@ -636,9 +639,16 @@ static const TypeInfo s390_pcihost_info = { > } > }; > > +static const TypeInfo s390_pcibus_info = { > + .name = TYPE_S390_PCI_BUS, > + .parent = TYPE_BUS, Hi, The type is named TYPE_S390_PCI_BUS, but does not derive from PCI_BUS. I find it a little confusing, anyway is just a thought. Maybe you should go with TYPE_S390_BUS. Thanks, Marcel > + .instance_size = sizeof(S390PCIBus), > +}; > + > static void s390_pci_register_types(void) > { > type_register_static(&s390_pcihost_info); > + type_register_static(&s390_pcibus_info); > } > > type_init(s390_pci_register_types) > diff --git a/hw/s390x/s390-pci-bus.h b/hw/s390x/s390-pci-bus.h > index e332f6a..c4d4079 100644 > --- a/hw/s390x/s390-pci-bus.h > +++ b/hw/s390x/s390-pci-bus.h > @@ -21,6 +21,7 @@ > #include "hw/s390x/css.h" > > #define TYPE_S390_PCI_HOST_BRIDGE "s390-pcihost" > +#define TYPE_S390_PCI_BUS "s390-pcibus" > #define FH_MASK_ENABLE 0x80000000 > #define FH_MASK_INSTANCE 0x7f000000 > #define FH_MASK_SHM 0x00ff0000 > @@ -31,6 +32,8 @@ > > #define S390_PCI_HOST_BRIDGE(obj) \ > OBJECT_CHECK(S390pciState, (obj), TYPE_S390_PCI_HOST_BRIDGE) > +#define S390_PCI_BUS(obj) \ > + OBJECT_CHECK(S390PCIBus, (obj), TYPE_S390_PCI_BUS) > > #define HP_EVENT_TO_CONFIGURED 0x0301 > #define HP_EVENT_RESERVED_TO_STANDBY 0x0302 > @@ -267,8 +270,13 @@ typedef struct S390PCIBusDevice { > IndAddr *indicator; > } S390PCIBusDevice; > > +typedef struct S390PCIBus { > + BusState qbus; > +} S390PCIBus; > + > typedef struct S390pciState { > PCIHostState parent_obj; > + S390PCIBus *bus; > S390PCIBusDevice pbdev[PCI_SLOT_MAX]; > AddressSpace msix_notify_as; > MemoryRegion msix_notify_mr; >