From 4772dbd9b905b7b304f24fe3d2e4ca8ba0a18816 Mon Sep 17 00:00:00 2001

From: Cornelia Huck <cohuck@redhat.com>

Date: Tue, 15 May 2018 07:33:46 +0000

Subject: virtio-ccw: common reset handler

All the different virtio ccw devices use the same reset handler,

so let's move setting it into the base virtio ccw device class.

CC: qemu-stable@nongnu.org

Reviewed-by: Thomas Huth <thuth@redhat.com>

Reviewed-by: David Hildenbrand <david@redhat.com>

Reviewed-by: Halil Pasic <pasic@linux.ibm.com>

Signed-off-by: Cornelia Huck <cohuck@redhat.com>

(cherry picked from commit 0c53057adb04d254bc09511880670c92ab185fc6)

---

 hw/s390x/virtio-ccw.c | 13 +------------

 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/hw/s390x/virtio-ccw.c b/hw/s390x/virtio-ccw.c

index 8720e46..2db8cc6 100644

--- a/hw/s390x/virtio-ccw.c

+++ b/hw/s390x/virtio-ccw.c

@@ -1348,7 +1348,6 @@ static void virtio_ccw_net_class_init(ObjectClass *klass, void *data)

     k->realize = virtio_ccw_net_realize;

     k->unrealize = virtio_ccw_unrealize;

-    dc->reset = virtio_ccw_reset;

     dc->props = virtio_ccw_net_properties;

     set_bit(DEVICE_CATEGORY_NETWORK, dc->categories);

 }

@@ -1376,7 +1375,6 @@ static void virtio_ccw_blk_class_init(ObjectClass *klass, void *data)

     k->realize = virtio_ccw_blk_realize;

     k->unrealize = virtio_ccw_unrealize;

-    dc->reset = virtio_ccw_reset;

     dc->props = virtio_ccw_blk_properties;

     set_bit(DEVICE_CATEGORY_STORAGE, dc->categories);

 }

@@ -1404,7 +1402,6 @@ static void virtio_ccw_serial_class_init(ObjectClass *klass, void *data)

     k->realize = virtio_ccw_serial_realize;

     k->unrealize = virtio_ccw_unrealize;

-    dc->reset = virtio_ccw_reset;

     dc->props = virtio_ccw_serial_properties;

     set_bit(DEVICE_CATEGORY_INPUT, dc->categories);

 }

@@ -1432,7 +1429,6 @@ static void virtio_ccw_balloon_class_init(ObjectClass *klass, void *data)

     k->realize = virtio_ccw_balloon_realize;

     k->unrealize = virtio_ccw_unrealize;

-    dc->reset = virtio_ccw_reset;

     dc->props = virtio_ccw_balloon_properties;

     set_bit(DEVICE_CATEGORY_MISC, dc->categories);

 }

@@ -1460,7 +1456,6 @@ static void virtio_ccw_scsi_class_init(ObjectClass *klass, void *data)

     k->realize = virtio_ccw_scsi_realize;

     k->unrealize = virtio_ccw_unrealize;

-    dc->reset = virtio_ccw_reset;

     dc->props = virtio_ccw_scsi_properties;

     set_bit(DEVICE_CATEGORY_STORAGE, dc->categories);

 }

@@ -1487,7 +1482,6 @@ static void vhost_ccw_scsi_class_init(ObjectClass *klass, void *data)

     k->realize = vhost_ccw_scsi_realize;

     k->unrealize = virtio_ccw_unrealize;

-    dc->reset = virtio_ccw_reset;

     dc->props = vhost_ccw_scsi_properties;

     set_bit(DEVICE_CATEGORY_STORAGE, dc->categories);

 }

@@ -1524,7 +1518,6 @@ static void virtio_ccw_rng_class_init(ObjectClass *klass, void *data)

     k->realize = virtio_ccw_rng_realize;

     k->unrealize = virtio_ccw_unrealize;

-    dc->reset = virtio_ccw_reset;

     dc->props = virtio_ccw_rng_properties;

     set_bit(DEVICE_CATEGORY_MISC, dc->categories);

 }

@@ -1564,7 +1557,6 @@ static void virtio_ccw_crypto_class_init(ObjectClass *klass, void *data)

     k->realize = virtio_ccw_crypto_realize;

     k->unrealize = virtio_ccw_unrealize;

-    dc->reset = virtio_ccw_reset;

     dc->props = virtio_ccw_crypto_properties;

     set_bit(DEVICE_CATEGORY_MISC, dc->categories);

 }

@@ -1603,7 +1595,6 @@ static void virtio_ccw_gpu_class_init(ObjectClass *klass, void *data)

     k->realize = virtio_ccw_gpu_realize;

     k->unrealize = virtio_ccw_unrealize;

-    dc->reset = virtio_ccw_reset;

     dc->props = virtio_ccw_gpu_properties;

     dc->hotpluggable = false;

     set_bit(DEVICE_CATEGORY_DISPLAY, dc->categories);

@@ -1632,7 +1623,6 @@ static void virtio_ccw_input_class_init(ObjectClass *klass, void *data)

     k->realize = virtio_ccw_input_realize;

     k->unrealize = virtio_ccw_unrealize;

-    dc->reset = virtio_ccw_reset;

     dc->props = virtio_ccw_input_properties;

     set_bit(DEVICE_CATEGORY_INPUT, dc->categories);

 }

@@ -1736,6 +1726,7 @@ static void virtio_ccw_device_class_init(ObjectClass *klass, void *data)

     dc->realize = virtio_ccw_busdev_realize;

     dc->unrealize = virtio_ccw_busdev_unrealize;

     dc->bus_type = TYPE_VIRTUAL_CSS_BUS;

+    dc->reset = virtio_ccw_reset;

 }

 static const TypeInfo virtio_ccw_device_info = {

@@ -1812,7 +1803,6 @@ static void virtio_ccw_9p_class_init(ObjectClass *klass, void *data)

     k->unrealize = virtio_ccw_unrealize;

     k->realize = virtio_ccw_9p_realize;

-    dc->reset = virtio_ccw_reset;

     dc->props = virtio_ccw_9p_properties;

     set_bit(DEVICE_CATEGORY_STORAGE, dc->categories);

 }

@@ -1862,7 +1852,6 @@ static void vhost_vsock_ccw_class_init(ObjectClass *klass, void *data)

     k->unrealize = virtio_ccw_unrealize;

     set_bit(DEVICE_CATEGORY_MISC, dc->categories);

     dc->props = vhost_vsock_ccw_properties;

-    dc->reset = virtio_ccw_reset;

 }

 static void vhost_vsock_ccw_instance_init(Object *obj)

-- 

1.8.3.1