Commit 2a78ac66 authored by Dong Jia Shi's avatar Dong Jia Shi Committed by Cornelia Huck
Browse files

s390x/css: consolidate the devno property for ccw devices 



'devno' should rather be a property of the ccw device, instead of a
property of a specific virtio-ccw device. Let's consolidate it.

While we are at here, also rename CcwDevice.bus_id to CcwDevice.devno to
make things clearer.

Signed-off-by: default avatarDong Jia Shi <bjsdjshi@linux.vnet.ibm.com>
Signed-off-by: default avatarCornelia Huck <cornelia.huck@de.ibm.com>
parent d8d98db5

hw/s390x/ccw-device.c

+1 −0
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ static void ccw_device_realize(CcwDevice *dev, Error **errp) 
}



static Property ccw_device_properties[] = {

    DEFINE_PROP_CSS_DEV_ID("devno", CcwDevice, devno),

    DEFINE_PROP_CSS_DEV_ID_RO("dev_id", CcwDevice, dev_id),

    DEFINE_PROP_CSS_DEV_ID_RO("subch_id", CcwDevice, subch_id),

    DEFINE_PROP_END_OF_LIST(),

hw/s390x/ccw-device.h

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ typedef struct CcwDevice { 
    SubchDev *sch;

    /* <cssid>.<ssid>.<device number> */

    /* The user-set busid of the virtual ccw device. */

    CssDevId bus_id;

    CssDevId devno;

    /* The actual busid of the virtual ccw device. */

    CssDevId dev_id;

    /* The actual busid of the virtual subchannel. */

hw/s390x/virtio-ccw.c

+2 −12
Original line number Diff line number Diff line
@@ -681,7 +681,7 @@ static void virtio_ccw_device_realize(VirtioCcwDevice *dev, Error **errp) 
    VirtIOCCWDeviceClass *k = VIRTIO_CCW_DEVICE_GET_CLASS(dev);

    CcwDevice *ccw_dev = CCW_DEVICE(dev);

    CCWDeviceClass *ck = CCW_DEVICE_GET_CLASS(ccw_dev);

    SubchDev *sch = css_create_virtual_sch(ccw_dev->bus_id, errp);

    SubchDev *sch = css_create_virtual_sch(ccw_dev->devno, errp);

    Error *err = NULL;



    if (!sch) {
@@ -705,7 +705,7 @@ static void virtio_ccw_device_realize(VirtioCcwDevice *dev, Error **errp) 


    trace_virtio_ccw_new_device(

        sch->cssid, sch->ssid, sch->schid, sch->devno,

        ccw_dev->bus_id.valid ? "user-configured" : "auto-configured");

        ccw_dev->devno.valid ? "user-configured" : "auto-configured");



    if (!kvm_eventfds_enabled()) {

        dev->flags &= ~VIRTIO_CCW_FLAG_USE_IOEVENTFD;
@@ -1369,7 +1369,6 @@ static void virtio_ccw_device_unplugged(DeviceState *d) 
/**************** Virtio-ccw Bus Device Descriptions *******************/



static Property virtio_ccw_net_properties[] = {

    DEFINE_PROP_CSS_DEV_ID("devno", VirtioCcwDevice, parent_obj.bus_id),

    DEFINE_PROP_BIT("ioeventfd", VirtioCcwDevice, flags,

                    VIRTIO_CCW_FLAG_USE_IOEVENTFD_BIT, true),

    DEFINE_PROP_UINT32("max_revision", VirtioCcwDevice, max_rev,
@@ -1398,7 +1397,6 @@ static const TypeInfo virtio_ccw_net = { 
};



static Property virtio_ccw_blk_properties[] = {

    DEFINE_PROP_CSS_DEV_ID("devno", VirtioCcwDevice, parent_obj.bus_id),

    DEFINE_PROP_BIT("ioeventfd", VirtioCcwDevice, flags,

                    VIRTIO_CCW_FLAG_USE_IOEVENTFD_BIT, true),

    DEFINE_PROP_UINT32("max_revision", VirtioCcwDevice, max_rev,
@@ -1427,7 +1425,6 @@ static const TypeInfo virtio_ccw_blk = { 
};



static Property virtio_ccw_serial_properties[] = {

    DEFINE_PROP_CSS_DEV_ID("devno", VirtioCcwDevice, parent_obj.bus_id),

    DEFINE_PROP_BIT("ioeventfd", VirtioCcwDevice, flags,

                    VIRTIO_CCW_FLAG_USE_IOEVENTFD_BIT, true),

    DEFINE_PROP_UINT32("max_revision", VirtioCcwDevice, max_rev,
@@ -1456,7 +1453,6 @@ static const TypeInfo virtio_ccw_serial = { 
};



static Property virtio_ccw_balloon_properties[] = {

    DEFINE_PROP_CSS_DEV_ID("devno", VirtioCcwDevice, parent_obj.bus_id),

    DEFINE_PROP_BIT("ioeventfd", VirtioCcwDevice, flags,

                    VIRTIO_CCW_FLAG_USE_IOEVENTFD_BIT, true),

    DEFINE_PROP_UINT32("max_revision", VirtioCcwDevice, max_rev,
@@ -1485,7 +1481,6 @@ static const TypeInfo virtio_ccw_balloon = { 
};



static Property virtio_ccw_scsi_properties[] = {

    DEFINE_PROP_CSS_DEV_ID("devno", VirtioCcwDevice, parent_obj.bus_id),

    DEFINE_PROP_BIT("ioeventfd", VirtioCcwDevice, flags,

                    VIRTIO_CCW_FLAG_USE_IOEVENTFD_BIT, true),

    DEFINE_PROP_UINT32("max_revision", VirtioCcwDevice, max_rev,
@@ -1515,7 +1510,6 @@ static const TypeInfo virtio_ccw_scsi = { 


#ifdef CONFIG_VHOST_SCSI

static Property vhost_ccw_scsi_properties[] = {

    DEFINE_PROP_CSS_DEV_ID("devno", VirtioCcwDevice, parent_obj.bus_id),

    DEFINE_PROP_UINT32("max_revision", VirtioCcwDevice, max_rev,

                       VIRTIO_CCW_MAX_REV),

    DEFINE_PROP_END_OF_LIST(),
@@ -1553,7 +1547,6 @@ static void virtio_ccw_rng_instance_init(Object *obj) 
}



static Property virtio_ccw_rng_properties[] = {

    DEFINE_PROP_CSS_DEV_ID("devno", VirtioCcwDevice, parent_obj.bus_id),

    DEFINE_PROP_BIT("ioeventfd", VirtioCcwDevice, flags,

                    VIRTIO_CCW_FLAG_USE_IOEVENTFD_BIT, true),

    DEFINE_PROP_UINT32("max_revision", VirtioCcwDevice, max_rev,
@@ -1582,7 +1575,6 @@ static const TypeInfo virtio_ccw_rng = { 
};



static Property virtio_ccw_crypto_properties[] = {

    DEFINE_PROP_CSS_DEV_ID("devno", VirtioCcwDevice, parent_obj.bus_id),

    DEFINE_PROP_BIT("ioeventfd", VirtioCcwDevice, flags,

                    VIRTIO_CCW_FLAG_USE_IOEVENTFD_BIT, true),

    DEFINE_PROP_UINT32("max_revision", VirtioCcwDevice, max_rev,
@@ -1709,7 +1701,6 @@ static const TypeInfo virtio_ccw_bus_info = { 


#ifdef CONFIG_VIRTFS

static Property virtio_ccw_9p_properties[] = {

    DEFINE_PROP_CSS_DEV_ID("devno", VirtioCcwDevice, parent_obj.bus_id),

    DEFINE_PROP_BIT("ioeventfd", VirtioCcwDevice, flags,

            VIRTIO_CCW_FLAG_USE_IOEVENTFD_BIT, true),

    DEFINE_PROP_UINT32("max_revision", VirtioCcwDevice, max_rev,
@@ -1758,7 +1749,6 @@ static const TypeInfo virtio_ccw_9p_info = { 
#ifdef CONFIG_VHOST_VSOCK



static Property vhost_vsock_ccw_properties[] = {

    DEFINE_PROP_CSS_DEV_ID("devno", VirtioCcwDevice, parent_obj.bus_id),

    DEFINE_PROP_UINT32("max_revision", VirtioCcwDevice, max_rev,

                       VIRTIO_CCW_MAX_REV),

    DEFINE_PROP_END_OF_LIST(),