[PATCH v3 3/6] virtio_ccw: support non-legacy balloon devices

[PATCH v3 3/6] virtio_ccw: support non-legacy balloon devices

[Michael S. Tsirkin]

virtio_device_is_legacy_only is always false now,
drop the test from virtio ccw.

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
 drivers/s390/kvm/virtio_ccw.c | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/drivers/s390/kvm/virtio_ccw.c b/drivers/s390/kvm/virtio_ccw.c
index 71d7802..6f1fa17 100644
--- a/drivers/s390/kvm/virtio_ccw.c
+++ b/drivers/s390/kvm/virtio_ccw.c
@@ -1201,13 +1201,9 @@ static int virtio_ccw_online(struct ccw_device *cdev)
 	vcdev->vdev.id.vendor = cdev->id.cu_type;
 	vcdev->vdev.id.device = cdev->id.cu_model;
 
-	if (virtio_device_is_legacy_only(vcdev->vdev.id)) {
-		vcdev->revision = 0;
-	} else {
-		ret = virtio_ccw_set_transport_rev(vcdev);
-		if (ret)
-			goto out_free;
-	}
+	ret = virtio_ccw_set_transport_rev(vcdev);
+	if (ret)
+		goto out_free;
 
 	ret = register_virtio_device(&vcdev->vdev);
 	if (ret) {
-- 
MST

Re: [virtio-dev] [PATCH v3 3/6] virtio_ccw: support non-legacy balloon devices

[Christian Borntraeger]

Am 01.04.2015 um 12:35 schrieb Michael S. Tsirkin:
> virtio_device_is_legacy_only is always false now,
> drop the test from virtio ccw.

Can you add the commit subject of patch2 here as a
prereq for this patch? This will hopefully avoid 
backport issues on distros that want to take this
patch but not the other for whatever reasons.


this patch is then.
Reviewed-by: Christian Borntraeger <borntraeger@de.ibm.com>


> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
> ---
>  drivers/s390/kvm/virtio_ccw.c | 10 +++-------
>  1 file changed, 3 insertions(+), 7 deletions(-)
> 
> diff --git a/drivers/s390/kvm/virtio_ccw.c b/drivers/s390/kvm/virtio_ccw.c
> index 71d7802..6f1fa17 100644
> --- a/drivers/s390/kvm/virtio_ccw.c
> +++ b/drivers/s390/kvm/virtio_ccw.c
> @@ -1201,13 +1201,9 @@ static int virtio_ccw_online(struct ccw_device *cdev)
>  	vcdev->vdev.id.vendor = cdev->id.cu_type;
>  	vcdev->vdev.id.device = cdev->id.cu_model;
> 
> -	if (virtio_device_is_legacy_only(vcdev->vdev.id)) {
> -		vcdev->revision = 0;
> -	} else {
> -		ret = virtio_ccw_set_transport_rev(vcdev);
> -		if (ret)
> -			goto out_free;
> -	}
> +	ret = virtio_ccw_set_transport_rev(vcdev);
> +	if (ret)
> +		goto out_free;
> 
>  	ret = register_virtio_device(&vcdev->vdev);
>  	if (ret) {
> 

Re: [virtio-dev] [PATCH v3 3/6] virtio_ccw: support non-legacy balloon devices

[Cornelia Huck]

On Wed, 01 Apr 2015 12:40:10 +0200
Christian Borntraeger <borntraeger@de.ibm.com> wrote:

> Am 01.04.2015 um 12:35 schrieb Michael S. Tsirkin:
> > virtio_device_is_legacy_only is always false now,
> > drop the test from virtio ccw.
> 
> Can you add the commit subject of patch2 here as a
> prereq for this patch? This will hopefully avoid 
> backport issues on distros that want to take this
> patch but not the other for whatever reasons.

Seconded.

> 
> 
> this patch is then.
> Reviewed-by: Christian Borntraeger <borntraeger@de.ibm.com>

Reviewed-by: Cornelia Huck <cornelia.huck@de.ibm.com>

> 
> 
> > Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
> > ---
> >  drivers/s390/kvm/virtio_ccw.c | 10 +++-------
> >  1 file changed, 3 insertions(+), 7 deletions(-)

Michael, I assume you would take this patch through your tree?

Re: [virtio-dev] [PATCH v3 3/6] virtio_ccw: support non-legacy balloon devices

[Rusty Russell]

Christian Borntraeger <borntraeger@de.ibm.com> writes:
> Am 01.04.2015 um 12:35 schrieb Michael S. Tsirkin:
>> virtio_device_is_legacy_only is always false now,
>> drop the test from virtio ccw.
>
> Can you add the commit subject of patch2 here as a
> prereq for this patch? This will hopefully avoid 
> backport issues on distros that want to take this
> patch but not the other for whatever reasons.

I changed commit wording to:

As of last patch, virtio_device_is_legacy_only is always false,
drop the test from virtio ccw.

That should be clear to anyone seeking -stable patches.

Thanks,
Rusty.