From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36230) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z20Vm-0005H6-0Z for qemu-devel@nongnu.org; Mon, 08 Jun 2015 13:06:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Z20Vk-00032z-Kd for qemu-devel@nongnu.org; Mon, 08 Jun 2015 13:06:57 -0400 Received: from mx1.redhat.com ([209.132.183.28]:51128) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z20Vk-00032m-Dv for qemu-devel@nongnu.org; Mon, 08 Jun 2015 13:06:56 -0400 From: Alex Williamson Date: Mon, 08 Jun 2015 11:06:55 -0600 Message-ID: <20150608170655.5497.68407.stgit@gimli.home> In-Reply-To: <20150608170543.5497.53497.stgit@gimli.home> References: <20150608170543.5497.53497.stgit@gimli.home> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL 3/3] hw/vfio/platform: calxeda xgmac device List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: alex.williamson@redhat.com, eric.auger@linaro.org From: Eric Auger The platform device class has become abstract. This patch introduces a calxeda xgmac device that derives from it. Signed-off-by: Eric Auger Reviewed-by: Alex Benn=C3=A9e Signed-off-by: Alex Williamson --- hw/vfio/Makefile.objs | 1 + hw/vfio/calxeda-xgmac.c | 54 ++++++++++++++++++++++++++++= ++++++ include/hw/vfio/vfio-calxeda-xgmac.h | 46 ++++++++++++++++++++++++++++= + 3 files changed, 101 insertions(+) create mode 100644 hw/vfio/calxeda-xgmac.c create mode 100644 include/hw/vfio/vfio-calxeda-xgmac.h diff --git a/hw/vfio/Makefile.objs b/hw/vfio/Makefile.objs index c5c76fe..d540c9d 100644 --- a/hw/vfio/Makefile.objs +++ b/hw/vfio/Makefile.objs @@ -2,4 +2,5 @@ ifeq ($(CONFIG_LINUX), y) obj-$(CONFIG_SOFTMMU) +=3D common.o obj-$(CONFIG_PCI) +=3D pci.o obj-$(CONFIG_SOFTMMU) +=3D platform.o +obj-$(CONFIG_SOFTMMU) +=3D calxeda-xgmac.o endif diff --git a/hw/vfio/calxeda-xgmac.c b/hw/vfio/calxeda-xgmac.c new file mode 100644 index 0000000..c4b8fef --- /dev/null +++ b/hw/vfio/calxeda-xgmac.c @@ -0,0 +1,54 @@ +/* + * calxeda xgmac VFIO device + * + * Copyright Linaro Limited, 2014 + * + * Authors: + * Eric Auger + * + * This work is licensed under the terms of the GNU GPL, version 2. See + * the COPYING file in the top-level directory. + * + */ + +#include "hw/vfio/vfio-calxeda-xgmac.h" + +static void calxeda_xgmac_realize(DeviceState *dev, Error **errp) +{ + VFIOPlatformDevice *vdev =3D VFIO_PLATFORM_DEVICE(dev); + VFIOCalxedaXgmacDeviceClass *k =3D VFIO_CALXEDA_XGMAC_DEVICE_GET_CLA= SS(dev); + + vdev->compat =3D g_strdup("calxeda,hb-xgmac"); + + k->parent_realize(dev, errp); +} + +static const VMStateDescription vfio_platform_vmstate =3D { + .name =3D TYPE_VFIO_CALXEDA_XGMAC, + .unmigratable =3D 1, +}; + +static void vfio_calxeda_xgmac_class_init(ObjectClass *klass, void *data= ) +{ + DeviceClass *dc =3D DEVICE_CLASS(klass); + VFIOCalxedaXgmacDeviceClass *vcxc =3D + VFIO_CALXEDA_XGMAC_DEVICE_CLASS(klass); + vcxc->parent_realize =3D dc->realize; + dc->realize =3D calxeda_xgmac_realize; + dc->desc =3D "VFIO Calxeda XGMAC"; +} + +static const TypeInfo vfio_calxeda_xgmac_dev_info =3D { + .name =3D TYPE_VFIO_CALXEDA_XGMAC, + .parent =3D TYPE_VFIO_PLATFORM, + .instance_size =3D sizeof(VFIOCalxedaXgmacDevice), + .class_init =3D vfio_calxeda_xgmac_class_init, + .class_size =3D sizeof(VFIOCalxedaXgmacDeviceClass), +}; + +static void register_calxeda_xgmac_dev_type(void) +{ + type_register_static(&vfio_calxeda_xgmac_dev_info); +} + +type_init(register_calxeda_xgmac_dev_type) diff --git a/include/hw/vfio/vfio-calxeda-xgmac.h b/include/hw/vfio/vfio-= calxeda-xgmac.h new file mode 100644 index 0000000..f994775 --- /dev/null +++ b/include/hw/vfio/vfio-calxeda-xgmac.h @@ -0,0 +1,46 @@ +/* + * VFIO calxeda xgmac device + * + * Copyright Linaro Limited, 2014 + * + * Authors: + * Eric Auger + * + * This work is licensed under the terms of the GNU GPL, version 2. See + * the COPYING file in the top-level directory. + * + */ + +#ifndef HW_VFIO_VFIO_CALXEDA_XGMAC_H +#define HW_VFIO_VFIO_CALXEDA_XGMAC_H + +#include "hw/vfio/vfio-platform.h" + +#define TYPE_VFIO_CALXEDA_XGMAC "vfio-calxeda-xgmac" + +/** + * This device exposes: + * - a single MMIO region corresponding to its register space + * - 3 IRQS (main and 2 power related IRQs) + */ +typedef struct VFIOCalxedaXgmacDevice { + VFIOPlatformDevice vdev; +} VFIOCalxedaXgmacDevice; + +typedef struct VFIOCalxedaXgmacDeviceClass { + /*< private >*/ + VFIOPlatformDeviceClass parent_class; + /*< public >*/ + DeviceRealize parent_realize; +} VFIOCalxedaXgmacDeviceClass; + +#define VFIO_CALXEDA_XGMAC_DEVICE(obj) \ + OBJECT_CHECK(VFIOCalxedaXgmacDevice, (obj), TYPE_VFIO_CALXEDA_XGMAC= ) +#define VFIO_CALXEDA_XGMAC_DEVICE_CLASS(klass) \ + OBJECT_CLASS_CHECK(VFIOCalxedaXgmacDeviceClass, (klass), \ + TYPE_VFIO_CALXEDA_XGMAC) +#define VFIO_CALXEDA_XGMAC_DEVICE_GET_CLASS(obj) \ + OBJECT_GET_CLASS(VFIOCalxedaXgmacDeviceClass, (obj), \ + TYPE_VFIO_CALXEDA_XGMAC) + +#endif