search for: virtio_set_features

...tio_set_status() in that case and update virtio-ccw to post an > > > error to the guest. > > > > > > Signed-off-by: Cornelia Huck <cornelia.huck at de.ibm.com> > > > > Right but a separate validate_features call is awkward. > > How about we defer virtio_set_features until FEATURES_OK, > > and teach virtio_set_features that it can fail? > > Hm. But we would need to keep virtio_set_features() where it is called > now for legacy devices, as they will never see FEATURES_OK, right? > So > we need to make this depending on revisions (or whateve...

...tio_set_status() in that case and update virtio-ccw to post an > > > error to the guest. > > > > > > Signed-off-by: Cornelia Huck <cornelia.huck at de.ibm.com> > > > > Right but a separate validate_features call is awkward. > > How about we defer virtio_set_features until FEATURES_OK, > > and teach virtio_set_features that it can fail? > > Hm. But we would need to keep virtio_set_features() where it is called > now for legacy devices, as they will never see FEATURES_OK, right? > So > we need to make this depending on revisions (or whateve...

...iated feature bits are inconsistent: let's fail > virtio_set_status() in that case and update virtio-ccw to post an > error to the guest. > > Signed-off-by: Cornelia Huck <cornelia.huck at de.ibm.com> Right but a separate validate_features call is awkward. How about we defer virtio_set_features until FEATURES_OK, and teach virtio_set_features that it can fail? > --- > hw/s390x/virtio-ccw.c | 20 ++++++++++++-------- > hw/virtio/virtio.c | 24 +++++++++++++++++++++++- > include/hw/virtio/virtio.h | 3 ++- > 3 files changed, 37 insertions(+), 10 deletio...

...iated feature bits are inconsistent: let's fail > virtio_set_status() in that case and update virtio-ccw to post an > error to the guest. > > Signed-off-by: Cornelia Huck <cornelia.huck at de.ibm.com> Right but a separate validate_features call is awkward. How about we defer virtio_set_features until FEATURES_OK, and teach virtio_set_features that it can fail? > --- > hw/s390x/virtio-ccw.c | 20 ++++++++++++-------- > hw/virtio/virtio.c | 24 +++++++++++++++++++++++- > include/hw/virtio/virtio.h | 3 ++- > 3 files changed, 37 insertions(+), 10 deletio...

...git a/hw/virtio/virtio.c b/hw/virtio/virtio.c > index 57190ba..a3dd67b 100644 > --- a/hw/virtio/virtio.c > +++ b/hw/virtio/virtio.c > @@ -978,7 +978,7 @@ void virtio_save(VirtIODevice *vdev, QEMUFile *f) > vmstate_save_state(f, &vmstate_virtio, vdev); > } > > -int virtio_set_features(VirtIODevice *vdev, uint64_t val) > +static int __virtio_set_features(VirtIODevice *vdev, uint64_t val) Maybe avoid the double underscores here? But unfortunately, I also fail to come up with a better suggestion for a name here ... > { > BusState *qbus = qdev_get_parent_bus(DEVICE(...

...git a/hw/virtio/virtio.c b/hw/virtio/virtio.c > index 57190ba..a3dd67b 100644 > --- a/hw/virtio/virtio.c > +++ b/hw/virtio/virtio.c > @@ -978,7 +978,7 @@ void virtio_save(VirtIODevice *vdev, QEMUFile *f) > vmstate_save_state(f, &vmstate_virtio, vdev); > } > > -int virtio_set_features(VirtIODevice *vdev, uint64_t val) > +static int __virtio_set_features(VirtIODevice *vdev, uint64_t val) Maybe avoid the double underscores here? But unfortunately, I also fail to come up with a better suggestion for a name here ... > { > BusState *qbus = qdev_get_parent_bus(DEVICE(...

...features); s390_virtio_device_sync(dev); s390_virtio_reset_idx(dev); @@ -417,7 +417,7 @@ void s390_virtio_device_update_status(VirtIOS390Device *dev) /* Update guest supported feature bitmap */ features = bswap32(ldl_be_phys(&address_space_memory, dev->feat_offs)); - virtio_set_features(vdev, features); + virtio_set_features(vdev, 0, features); } VirtIOS390Device *s390_virtio_bus_console(VirtIOS390Bus *bus) @@ -488,10 +488,11 @@ static void virtio_s390_notify(DeviceState *d, uint16_t vector) s390_virtio_irq(0, token); } -static unsigned virtio_s390_get_features(Devi...

...features); s390_virtio_device_sync(dev); s390_virtio_reset_idx(dev); @@ -417,7 +417,7 @@ void s390_virtio_device_update_status(VirtIOS390Device *dev) /* Update guest supported feature bitmap */ features = bswap32(ldl_be_phys(&address_space_memory, dev->feat_offs)); - virtio_set_features(vdev, features); + virtio_set_features(vdev, 0, features); } VirtIOS390Device *s390_virtio_bus_console(VirtIOS390Bus *bus) @@ -488,10 +488,11 @@ static void virtio_s390_notify(DeviceState *d, uint16_t vector) s390_virtio_irq(0, token); } -static unsigned virtio_s390_get_features(Devi...

...insertions(+), 2 deletions(-) diff --git a/hw/virtio/virtio.c b/hw/virtio/virtio.c index 57190ba..a3dd67b 100644 --- a/hw/virtio/virtio.c +++ b/hw/virtio/virtio.c @@ -978,7 +978,7 @@ void virtio_save(VirtIODevice *vdev, QEMUFile *f) vmstate_save_state(f, &vmstate_virtio, vdev); } -int virtio_set_features(VirtIODevice *vdev, uint64_t val) +static int __virtio_set_features(VirtIODevice *vdev, uint64_t val) { BusState *qbus = qdev_get_parent_bus(DEVICE(vdev)); VirtioBusClass *vbusk = VIRTIO_BUS_GET_CLASS(qbus); @@ -994,6 +994,18 @@ int virtio_set_features(VirtIODevice *vdev, uint64_t val)...

...insertions(+), 2 deletions(-) diff --git a/hw/virtio/virtio.c b/hw/virtio/virtio.c index 57190ba..a3dd67b 100644 --- a/hw/virtio/virtio.c +++ b/hw/virtio/virtio.c @@ -978,7 +978,7 @@ void virtio_save(VirtIODevice *vdev, QEMUFile *f) vmstate_save_state(f, &vmstate_virtio, vdev); } -int virtio_set_features(VirtIODevice *vdev, uint64_t val) +static int __virtio_set_features(VirtIODevice *vdev, uint64_t val) { BusState *qbus = qdev_get_parent_bus(DEVICE(vdev)); VirtioBusClass *vbusk = VIRTIO_BUS_GET_CLASS(qbus); @@ -994,6 +994,18 @@ int virtio_set_features(VirtIODevice *vdev, uint64_t val)...

...features); s390_virtio_device_sync(dev); s390_virtio_reset_idx(dev); @@ -419,7 +419,7 @@ void s390_virtio_device_update_status(VirtIOS390Device *dev) /* Update guest supported feature bitmap */ features = bswap32(ldl_be_phys(&address_space_memory, dev->feat_offs)); - virtio_set_features(vdev, features); + virtio_set_features(vdev, 0, features); } VirtIOS390Device *s390_virtio_bus_console(VirtIOS390Bus *bus) @@ -490,10 +490,11 @@ static void virtio_s390_notify(DeviceState *d, uint16_t vector) s390_virtio_irq(0, token); } -static unsigned virtio_s390_get_features(Devi...

...features); s390_virtio_device_sync(dev); s390_virtio_reset_idx(dev); @@ -419,7 +419,7 @@ void s390_virtio_device_update_status(VirtIOS390Device *dev) /* Update guest supported feature bitmap */ features = bswap32(ldl_be_phys(&address_space_memory, dev->feat_offs)); - virtio_set_features(vdev, features); + virtio_set_features(vdev, 0, features); } VirtIOS390Device *s390_virtio_bus_console(VirtIOS390Bus *bus) @@ -490,10 +490,11 @@ static void virtio_s390_notify(DeviceState *d, uint16_t vector) s390_virtio_irq(0, token); } -static unsigned virtio_s390_get_features(Devi...

...s(&address_space_memory, > ccw.cda + sizeof(features.features)); > features.features = ldl_le_phys(&address_space_memory, ccw.cda); > - if (features.index < ARRAY_SIZE(dev->host_features)) { > - virtio_set_features(vdev, features.features); > + if (features.index == 0) { > + virtio_set_features(vdev, > + (vdev->guest_features & 0xffffffff00000000) | > + features.features); > + } els...

...s(&address_space_memory, > ccw.cda + sizeof(features.features)); > features.features = ldl_le_phys(&address_space_memory, ccw.cda); > - if (features.index < ARRAY_SIZE(dev->host_features)) { > - virtio_set_features(vdev, features.features); > + if (features.index == 0) { > + virtio_set_features(vdev, > + (vdev->guest_features & 0xffffffff00000000) | > + features.features); > + } els...

...67b 100644 > > > --- a/hw/virtio/virtio.c > > > +++ b/hw/virtio/virtio.c > > > @@ -978,7 +978,7 @@ void virtio_save(VirtIODevice *vdev, QEMUFile *f) > > > vmstate_save_state(f, &vmstate_virtio, vdev); > > > } > > > > > > -int virtio_set_features(VirtIODevice *vdev, uint64_t val) > > > +static int __virtio_set_features(VirtIODevice *vdev, uint64_t val) > > > > Maybe avoid the double underscores here? But unfortunately, I also fail > > to come up with a better suggestion for a name here ... > > virtio_set_f...

...67b 100644 > > > --- a/hw/virtio/virtio.c > > > +++ b/hw/virtio/virtio.c > > > @@ -978,7 +978,7 @@ void virtio_save(VirtIODevice *vdev, QEMUFile *f) > > > vmstate_save_state(f, &vmstate_virtio, vdev); > > > } > > > > > > -int virtio_set_features(VirtIODevice *vdev, uint64_t val) > > > +static int __virtio_set_features(VirtIODevice *vdev, uint64_t val) > > > > Maybe avoid the double underscores here? But unfortunately, I also fail > > to come up with a better suggestion for a name here ... > > virtio_set_f...

...tio.c > > index 57190ba..a3dd67b 100644 > > --- a/hw/virtio/virtio.c > > +++ b/hw/virtio/virtio.c > > @@ -978,7 +978,7 @@ void virtio_save(VirtIODevice *vdev, QEMUFile *f) > > vmstate_save_state(f, &vmstate_virtio, vdev); > > } > > > > -int virtio_set_features(VirtIODevice *vdev, uint64_t val) > > +static int __virtio_set_features(VirtIODevice *vdev, uint64_t val) > > Maybe avoid the double underscores here? But unfortunately, I also fail > to come up with a better suggestion for a name here ... virtio_set_features_nocheck()? This funct...

...: let's fail > > virtio_set_status() in that case and update virtio-ccw to post an > > error to the guest. > > > > Signed-off-by: Cornelia Huck <cornelia.huck at de.ibm.com> > > Right but a separate validate_features call is awkward. > How about we defer virtio_set_features until FEATURES_OK, > and teach virtio_set_features that it can fail? Hm. But we would need to keep virtio_set_features() where it is called now for legacy devices, as they will never see FEATURES_OK, right? So we need to make this depending on revisions (or whatever the equivalent is for pci/mm...

...and update virtio-ccw to post an > > > > error to the guest. > > > > > > > > Signed-off-by: Cornelia Huck <cornelia.huck at de.ibm.com> > > > > > > Right but a separate validate_features call is awkward. > > > How about we defer virtio_set_features until FEATURES_OK, > > > and teach virtio_set_features that it can fail? > > > > Hm. But we would need to keep virtio_set_features() where it is called > > now for legacy devices, as they will never see FEATURES_OK, right? > > So > > we need to make this depe...

...tio.c > > index 57190ba..a3dd67b 100644 > > --- a/hw/virtio/virtio.c > > +++ b/hw/virtio/virtio.c > > @@ -978,7 +978,7 @@ void virtio_save(VirtIODevice *vdev, QEMUFile *f) > > vmstate_save_state(f, &vmstate_virtio, vdev); > > } > > > > -int virtio_set_features(VirtIODevice *vdev, uint64_t val) > > +static int __virtio_set_features(VirtIODevice *vdev, uint64_t val) > > Maybe avoid the double underscores here? But unfortunately, I also fail > to come up with a better suggestion for a name here ... virtio_set_features_nocheck()? This funct...