search for: revinfo

On Thu, Dec 11, 2014 at 02:25:12PM +0100, Cornelia Huck wrote: > @@ -608,6 +631,25 @@ static int virtio_ccw_cb(SubchDev *sch, CCW1 ccw) > } > } > break; > + case CCW_CMD_SET_VIRTIO_REV: > + len = sizeof(revinfo); > + if (ccw.count < len || (check_len && ccw.count > len)) { > + ret = -EINVAL; > + break; > + } > + if (!ccw.cda) { > + ret = -EFAULT; > + break; > + } > + cpu_physical_memory_...

On Thu, Dec 11, 2014 at 02:25:12PM +0100, Cornelia Huck wrote: > @@ -608,6 +631,25 @@ static int virtio_ccw_cb(SubchDev *sch, CCW1 ccw) > } > } > break; > + case CCW_CMD_SET_VIRTIO_REV: > + len = sizeof(revinfo); > + if (ccw.count < len || (check_len && ccw.count > len)) { > + ret = -EINVAL; > + break; > + } > + if (!ccw.cda) { > + ret = -EFAULT; > + break; > + } > + cpu_physical_memory_...

...t 02:25:12PM +0100, Cornelia Huck wrote: > > > @@ -608,6 +631,25 @@ static int virtio_ccw_cb(SubchDev *sch, CCW1 ccw) > > > } > > > } > > > break; > > > + case CCW_CMD_SET_VIRTIO_REV: > > > + len = sizeof(revinfo); > > > + if (ccw.count < len || (check_len && ccw.count > len)) { > > > + ret = -EINVAL; > > > + break; > > > + } > > > + if (!ccw.cda) { > > > + ret = -EFAULT; > > >...

...t 02:25:12PM +0100, Cornelia Huck wrote: > > > @@ -608,6 +631,25 @@ static int virtio_ccw_cb(SubchDev *sch, CCW1 ccw) > > > } > > > } > > > break; > > > + case CCW_CMD_SET_VIRTIO_REV: > > > + len = sizeof(revinfo); > > > + if (ccw.count < len || (check_len && ccw.count > len)) { > > > + ret = -EINVAL; > > > + break; > > > + } > > > + if (!ccw.cda) { > > > + ret = -EFAULT; > > >...

...90x/adapter.h" #include "hw/s390x/s390_flic.h" +#include "linux/virtio_config.h" #include "ioinst.h" #include "css.h" @@ -260,6 +262,12 @@ typedef struct VirtioThinintInfo { uint8_t isc; } QEMU_PACKED VirtioThinintInfo; +typedef struct VirtioRevInfo { + uint16_t revision; + uint16_t length; + uint8_t data[0]; +} QEMU_PACKED VirtioRevInfo; + /* Specify where the virtqueues for the subchannel are in guest memory. */ static int virtio_ccw_set_vqs(SubchDev *sch, uint64_t addr, uint32_t align, uint16_t inde...

...90x/adapter.h" #include "hw/s390x/s390_flic.h" +#include "linux/virtio_config.h" #include "ioinst.h" #include "css.h" @@ -260,6 +262,12 @@ typedef struct VirtioThinintInfo { uint8_t isc; } QEMU_PACKED VirtioThinintInfo; +typedef struct VirtioRevInfo { + uint16_t revision; + uint16_t length; + uint8_t data[0]; +} QEMU_PACKED VirtioRevInfo; + /* Specify where the virtqueues for the subchannel are in guest memory. */ static int virtio_ccw_set_vqs(SubchDev *sch, uint64_t addr, uint32_t align, uint16_t inde...

...90x/adapter.h" #include "hw/s390x/s390_flic.h" +#include "linux/virtio_config.h" #include "ioinst.h" #include "css.h" @@ -260,6 +262,12 @@ typedef struct VirtioThinintInfo { uint8_t isc; } QEMU_PACKED VirtioThinintInfo; +typedef struct VirtioRevInfo { + uint16_t revision; + uint16_t length; + uint8_t data[0]; +} QEMU_PACKED VirtioRevInfo; + /* Specify where the virtqueues for the subchannel are in guest memory. */ static int virtio_ccw_set_vqs(SubchDev *sch, uint64_t addr, uint32_t align, uint16_t inde...

...90x/adapter.h" #include "hw/s390x/s390_flic.h" +#include "linux/virtio_config.h" #include "ioinst.h" #include "css.h" @@ -260,6 +262,12 @@ typedef struct VirtioThinintInfo { uint8_t isc; } QEMU_PACKED VirtioThinintInfo; +typedef struct VirtioRevInfo { + uint16_t revision; + uint16_t length; + uint8_t data[0]; +} QEMU_PACKED VirtioRevInfo; + /* Specify where the virtqueues for the subchannel are in guest memory. */ static int virtio_ccw_set_vqs(SubchDev *sch, uint64_t addr, uint32_t align, uint16_t inde...

...s390_flic.h" > +#include "linux/virtio_config.h" > > #include "ioinst.h" > #include "css.h" > @@ -260,6 +262,12 @@ typedef struct VirtioThinintInfo { > uint8_t isc; > } QEMU_PACKED VirtioThinintInfo; > > +typedef struct VirtioRevInfo { > + uint16_t revision; > + uint16_t length; > + uint8_t data[0]; > +} QEMU_PACKED VirtioRevInfo; > + > /* Specify where the virtqueues for the subchannel are in guest memory. */ > static int virtio_ccw_set_vqs(SubchDev *sch, uint64_t addr, uint32_t align, >...

...s390_flic.h" > +#include "linux/virtio_config.h" > > #include "ioinst.h" > #include "css.h" > @@ -260,6 +262,12 @@ typedef struct VirtioThinintInfo { > uint8_t isc; > } QEMU_PACKED VirtioThinintInfo; > > +typedef struct VirtioRevInfo { > + uint16_t revision; > + uint16_t length; > + uint8_t data[0]; > +} QEMU_PACKED VirtioRevInfo; > + > /* Specify where the virtqueues for the subchannel are in guest memory. */ > static int virtio_ccw_set_vqs(SubchDev *sch, uint64_t addr, uint32_t align, >...

...: > On Thu, Dec 11, 2014 at 02:25:12PM +0100, Cornelia Huck wrote: > > @@ -608,6 +631,25 @@ static int virtio_ccw_cb(SubchDev *sch, CCW1 ccw) > > } > > } > > break; > > + case CCW_CMD_SET_VIRTIO_REV: > > + len = sizeof(revinfo); > > + if (ccw.count < len || (check_len && ccw.count > len)) { > > + ret = -EINVAL; > > + break; > > + } > > + if (!ccw.cda) { > > + ret = -EFAULT; > > + break; > > +...

...: > On Thu, Dec 11, 2014 at 02:25:12PM +0100, Cornelia Huck wrote: > > @@ -608,6 +631,25 @@ static int virtio_ccw_cb(SubchDev *sch, CCW1 ccw) > > } > > } > > break; > > + case CCW_CMD_SET_VIRTIO_REV: > > + len = sizeof(revinfo); > > + if (ccw.count < len || (check_len && ccw.count > len)) { > > + ret = -EINVAL; > > + break; > > + } > > + if (!ccw.cda) { > > + ret = -EFAULT; > > + break; > > +...

...BusState parent_obj; diff --git a/hw/s390x/virtio-ccw.c b/hw/s390x/virtio-ccw.c index 3826074..922b021 100644 --- a/hw/s390x/virtio-ccw.c +++ b/hw/s390x/virtio-ccw.c @@ -693,7 +693,7 @@ static int virtio_ccw_cb(SubchDev *sch, CCW1 ccw) } cpu_physical_memory_read(ccw.cda, &revinfo, len); if (dev->revision >= 0 || - revinfo.revision > VIRTIO_CCW_REV_MAX) { + revinfo.revision > virtio_ccw_rev_max(dev)) { ret = -ENOSYS; break; }

...BusState parent_obj; diff --git a/hw/s390x/virtio-ccw.c b/hw/s390x/virtio-ccw.c index 3826074..922b021 100644 --- a/hw/s390x/virtio-ccw.c +++ b/hw/s390x/virtio-ccw.c @@ -693,7 +693,7 @@ static int virtio_ccw_cb(SubchDev *sch, CCW1 ccw) } cpu_physical_memory_read(ccw.cda, &revinfo, len); if (dev->revision >= 0 || - revinfo.revision > VIRTIO_CCW_REV_MAX) { + revinfo.revision > virtio_ccw_rev_max(dev)) { ret = -ENOSYS; break; }

Another iteration of virtio-1 patches for qemu, as always available on git://github.com/cohuck/qemu virtio-1 This one seems to work together with the current vhost-next patches (well, I can ping :) Changes from v4: - add helpers for feature bit manipulation and checking - use 64 bit feature bits instead of 32 bit arrays - infrastructure to allow devices to offer different sets of feature bits

Another iteration of virtio-1 patches for qemu, as always available on git://github.com/cohuck/qemu virtio-1 This one seems to work together with the current vhost-next patches (well, I can ping :) Changes from v4: - add helpers for feature bit manipulation and checking - use 64 bit feature bits instead of 32 bit arrays - infrastructure to allow devices to offer different sets of feature bits

...rtions(+), 4 deletions(-) diff --git a/hw/s390x/virtio-ccw.c b/hw/s390x/virtio-ccw.c index a55e851..8b6b2ab 100644 --- a/hw/s390x/virtio-ccw.c +++ b/hw/s390x/virtio-ccw.c @@ -699,6 +699,10 @@ static int virtio_ccw_cb(SubchDev *sch, CCW1 ccw) } ret = 0; dev->revision = revinfo.revision; + /* Re-evaluate which features the device wants to offer. */ + dev->host_features = + virtio_bus_get_vdev_features_rev(&dev->bus, dev->host_features, + dev->revision >= 1 ? 1 : 0); break;...

...rtions(+), 4 deletions(-) diff --git a/hw/s390x/virtio-ccw.c b/hw/s390x/virtio-ccw.c index a55e851..8b6b2ab 100644 --- a/hw/s390x/virtio-ccw.c +++ b/hw/s390x/virtio-ccw.c @@ -699,6 +699,10 @@ static int virtio_ccw_cb(SubchDev *sch, CCW1 ccw) } ret = 0; dev->revision = revinfo.revision; + /* Re-evaluate which features the device wants to offer. */ + dev->host_features = + virtio_bus_get_vdev_features_rev(&dev->bus, dev->host_features, + dev->revision >= 1 ? 1 : 0); break;...

...rtions(+), 4 deletions(-) diff --git a/hw/s390x/virtio-ccw.c b/hw/s390x/virtio-ccw.c index ec492b8..3826074 100644 --- a/hw/s390x/virtio-ccw.c +++ b/hw/s390x/virtio-ccw.c @@ -699,6 +699,10 @@ static int virtio_ccw_cb(SubchDev *sch, CCW1 ccw) } ret = 0; dev->revision = revinfo.revision; + /* Re-evaluate which features the device wants to offer. */ + dev->host_features = + virtio_bus_get_vdev_features_rev(&dev->bus, dev->host_features, + dev->revision >= 1 ? 1 : 0); break;...

...rtions(+), 4 deletions(-) diff --git a/hw/s390x/virtio-ccw.c b/hw/s390x/virtio-ccw.c index ec492b8..3826074 100644 --- a/hw/s390x/virtio-ccw.c +++ b/hw/s390x/virtio-ccw.c @@ -699,6 +699,10 @@ static int virtio_ccw_cb(SubchDev *sch, CCW1 ccw) } ret = 0; dev->revision = revinfo.revision; + /* Re-evaluate which features the device wants to offer. */ + dev->host_features = + virtio_bus_get_vdev_features_rev(&dev->bus, dev->host_features, + dev->revision >= 1 ? 1 : 0); break;...