From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:41283) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tlb6d-0004qN-HO for qemu-devel@nongnu.org; Thu, 20 Dec 2012 03:03:53 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Tlb6c-000380-AE for qemu-devel@nongnu.org; Thu, 20 Dec 2012 03:03:51 -0500 Received: from greensocs.com ([87.106.252.221]:38296 helo=s15328186.onlinehome-server.info) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tlb6c-00037v-0X for qemu-devel@nongnu.org; Thu, 20 Dec 2012 03:03:50 -0500 Message-ID: <50D2C661.50108@greensocs.com> Date: Thu, 20 Dec 2012 09:03:45 +0100 From: =?ISO-8859-1?Q?KONRAD_Fr=E9d=E9ric?= MIME-Version: 1.0 References: <1355910821-21302-1-git-send-email-fred.konrad@greensocs.com> <1355910821-21302-7-git-send-email-fred.konrad@greensocs.com> <20121219190918.18133e01@gondolin> In-Reply-To: <20121219190918.18133e01@gondolin> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [RFC PATCH V8 06/15] virtio-s390-bus : Add virtio-s390-bus. List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Cornelia Huck Cc: peter.maydell@linaro.org, aliguori@us.ibm.com, e.voevodin@samsung.com, mark.burton@greensocs.com, qemu-devel@nongnu.org, agraf@suse.de, stefanha@redhat.com, afaerber@suse.de On 19/12/2012 19:09, Cornelia Huck wrote: > On Wed, 19 Dec 2012 10:53:32 +0100 > fred.konrad@greensocs.com wrote: > >> From: KONRAD Frederic >> >> Introduce virtio-s390-bus, which extends virtio-bus. It is used with s390 >> transport device. >> >> Signed-off-by: KONRAD Frederic >> --- >> hw/s390-virtio-bus.c | 28 ++++++++++++++++++++++++++++ >> hw/s390-virtio-bus.h | 13 +++++++++++++ >> 2 files changed, 41 insertions(+) >> >> diff --git a/hw/s390-virtio-bus.c b/hw/s390-virtio-bus.c >> index e0ac2d1..720dbb9 100644 >> --- a/hw/s390-virtio-bus.c >> +++ b/hw/s390-virtio-bus.c >> @@ -33,6 +33,7 @@ >> #include "kvm.h" >> >> #include "hw/s390-virtio-bus.h" >> +#include "hw/virtio-bus.h" >> >> /* #define DEBUG_S390 */ >> >> @@ -556,8 +557,35 @@ static TypeInfo s390_virtio_bridge_info = { >> .class_init = s390_virtio_bridge_class_init, >> }; >> >> +/* virtio-s390-bus */ >> + >> +VirtioBusState *virtio_s390_bus_new(VirtIOS390Device *dev) >> +{ >> + DeviceState *qdev = DEVICE(dev); >> + BusState *qbus = qbus_create(TYPE_VIRTIO_S390_BUS, qdev, NULL); >> + VirtioBusState *bus = VIRTIO_BUS(qbus); >> + qbus->allow_hotplug = 0; >> + qbus->max_dev = 1; >> + return bus; >> +} >> + >> +static void virtio_s390_bus_class_init(ObjectClass *klass, void *data) >> +{ >> + VirtioBusClass *k = VIRTIO_BUS_CLASS(klass); >> + k->notify = virtio_s390_notify; >> + k->get_features = virtio_s390_get_features; >> +} >> + >> +static const TypeInfo virtio_s390_bus_info = { >> + .name = TYPE_VIRTIO_S390_BUS, >> + .parent = TYPE_VIRTIO_BUS, >> + .instance_size = sizeof(VirtioBusState), >> + .class_init = virtio_s390_bus_class_init, >> +}; >> + >> static void s390_virtio_register_types(void) >> { >> + type_register_static(&virtio_s390_bus_info); >> type_register_static(&s390_virtio_bus_info); >> type_register_static(&virtio_s390_device_info); >> type_register_static(&s390_virtio_serial); >> diff --git a/hw/s390-virtio-bus.h b/hw/s390-virtio-bus.h >> index a83afe7..7c5a945 100644 >> --- a/hw/s390-virtio-bus.h >> +++ b/hw/s390-virtio-bus.h >> @@ -22,6 +22,7 @@ >> #include "virtio-rng.h" >> #include "virtio-serial.h" >> #include "virtio-scsi.h" >> +#include "virtio-bus.h" >> >> #define VIRTIO_DEV_OFFS_TYPE 0 /* 8 bits */ >> #define VIRTIO_DEV_OFFS_NUM_VQ 1 /* 8 bits */ >> @@ -57,8 +58,20 @@ >> #define S390_VIRTIO_BUS(obj) \ >> OBJECT_CHECK(VirtIOS390Bus, (obj), TYPE_S390_VIRTIO_BUS) >> >> +/* virtio-s390-bus */ >> + >> +#define TYPE_VIRTIO_S390_BUS "virtio-s390-bus" >> +#define VIRTIO_S390_BUS_GET_CLASS(obj) \ >> + OBJECT_GET_CLASS(VirtioBusClass, obj, TYPE_VIRTIO_S390_BUS) >> +#define VIRTIO_PCI_BUS_CLASS(klass) \ >> + OBJECT_CLASS_CHECK(VirtioBusClass, klass, TYPE_VIRTIO_S390_BUS) >> +#define VIRTIO_PCI_BUS(obj) \ >> + OBJECT_CHECK(VirtioBusState, (obj), TYPE_VIRTIO_S390_BUS) > PCI? This looks wrong. oops, yes sorry for that. It didn't complain as I don't use the VirtioBusClass for the moment. I fixed it. Thanks. > >> + >> typedef struct VirtIOS390Device VirtIOS390Device; >> >> +VirtioBusState *virtio_s390_bus_new(VirtIOS390Device *dev); >> + >> typedef struct VirtIOS390DeviceClass { >> DeviceClass qdev; >> int (*init)(VirtIOS390Device *dev);