From 1c819449836b926d6f9db860127211ef092da88e Mon Sep 17 00:00:00 2001 From: KONRAD Frederic Date: Wed, 24 Apr 2013 10:21:21 +0200 Subject: virtio: remove virtiobindings. This remove virtio-bindings, and use class instead. Signed-off-by: KONRAD Frederic Message-id: 1366791683-5350-6-git-send-email-fred.konrad@greensocs.com Signed-off-by: Anthony Liguori --- hw/s390x/s390-virtio-bus.c | 8 -------- hw/s390x/virtio-ccw.c | 8 -------- 2 files changed, 16 deletions(-) (limited to 'hw/s390x') diff --git a/hw/s390x/s390-virtio-bus.c b/hw/s390x/s390-virtio-bus.c index f7a2f4bafe..cf51a85fcf 100644 --- a/hw/s390x/s390-virtio-bus.c +++ b/hw/s390x/s390-virtio-bus.c @@ -55,8 +55,6 @@ static const TypeInfo s390_virtio_bus_info = { .instance_size = sizeof(VirtIOS390Bus), }; -static const VirtIOBindings virtio_s390_bindings; - static ram_addr_t s390_virtio_device_num_vq(VirtIOS390Device *dev); /* length of VirtIO device pages */ @@ -140,7 +138,6 @@ static int s390_virtio_device_init(VirtIOS390Device *dev, VirtIODevice *vdev) bus->dev_offs += dev_len; - virtio_bind_device(vdev, &virtio_s390_bindings, DEVICE(dev)); dev->host_features = virtio_bus_get_vdev_features(&dev->bus, dev->host_features); s390_virtio_device_sync(dev); @@ -466,11 +463,6 @@ static unsigned virtio_s390_get_features(DeviceState *d) /**************** S390 Virtio Bus Device Descriptions *******************/ -static const VirtIOBindings virtio_s390_bindings = { - .notify = virtio_s390_notify, - .get_features = virtio_s390_get_features, -}; - static Property s390_virtio_net_properties[] = { DEFINE_NIC_PROPERTIES(VirtIONetS390, vdev.nic_conf), DEFINE_VIRTIO_NET_FEATURES(VirtIOS390Device, host_features), diff --git a/hw/s390x/virtio-ccw.c b/hw/s390x/virtio-ccw.c index e14351cc4e..56e4872e11 100644 --- a/hw/s390x/virtio-ccw.c +++ b/hw/s390x/virtio-ccw.c @@ -53,8 +53,6 @@ static const TypeInfo virtual_css_bus_info = { .class_init = virtual_css_bus_class_init, }; -static const VirtIOBindings virtio_ccw_bindings; - VirtIODevice *virtio_ccw_get_vdev(SubchDev *sch) { VirtIODevice *vdev = NULL; @@ -521,7 +519,6 @@ static int virtio_ccw_device_init(VirtioCcwDevice *dev, VirtIODevice *vdev) sch->id.cu_type = VIRTIO_CCW_CU_TYPE; sch->id.cu_model = dev->vdev->device_id; - virtio_bind_device(vdev, &virtio_ccw_bindings, DEVICE(dev)); /* Only the first 32 feature bits are used. */ dev->host_features[0] = virtio_bus_get_vdev_features(&dev->bus, dev->host_features[0]); @@ -777,11 +774,6 @@ static void virtio_ccw_reset(DeviceState *d) /**************** Virtio-ccw Bus Device Descriptions *******************/ -static const VirtIOBindings virtio_ccw_bindings = { - .notify = virtio_ccw_notify, - .get_features = virtio_ccw_get_features, -}; - static Property virtio_ccw_net_properties[] = { DEFINE_PROP_STRING("devno", VirtioCcwDevice, bus_id), DEFINE_VIRTIO_NET_FEATURES(VirtioCcwDevice, host_features[0]), -- cgit v1.2.1