Commit cb3f6d9d authored by Michael S. Tsirkin's avatar Michael S. Tsirkin
Browse files

virtio: set FEATURES_OK 



set FEATURES_OK as per virtio 1.0 spec

Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Reviewed-by: default avatarCornelia Huck <cornelia.huck@de.ibm.com>
parent 89062652

drivers/virtio/virtio.c

+22 −7
Original line number Diff line number Diff line
@@ -160,6 +160,7 @@ static int virtio_dev_probe(struct device *_d) 
	struct virtio_device *dev = dev_to_virtio(_d);

	struct virtio_driver *drv = drv_to_virtio(dev->dev.driver);

	u64 device_features;

	unsigned status;



	/* We have a driver! */

	add_status(dev, VIRTIO_CONFIG_S_DRIVER);
@@ -183,18 +184,32 @@ static int virtio_dev_probe(struct device *_d) 


	dev->config->finalize_features(dev);



	if (virtio_has_feature(dev, VIRTIO_F_VERSION_1)) {

		add_status(dev, VIRTIO_CONFIG_S_FEATURES_OK);

		status = dev->config->get_status(dev);

		if (!(status & VIRTIO_CONFIG_S_FEATURES_OK)) {

			dev_err(_d, "virtio: device refuses features: %x\n",

			       status);

			err = -ENODEV;

			goto err;

		}

	}



	err = drv->probe(dev);

	if (err)

		add_status(dev, VIRTIO_CONFIG_S_FAILED);

	else {

		goto err;



	add_status(dev, VIRTIO_CONFIG_S_DRIVER_OK);

	if (drv->scan)

		drv->scan(dev);



	virtio_config_enable(dev);

	}



	return 0;

err:

	add_status(dev, VIRTIO_CONFIG_S_FAILED);

	return err;



}



static int virtio_dev_remove(struct device *_d)

include/uapi/linux/virtio_config.h

+2 −0
Original line number Diff line number Diff line
@@ -38,6 +38,8 @@ 
#define VIRTIO_CONFIG_S_DRIVER		2

/* Driver has used its parts of the config, and is happy */

#define VIRTIO_CONFIG_S_DRIVER_OK	4

/* Driver has finished configuring features */

#define VIRTIO_CONFIG_S_FEATURES_OK	8

/* We've given up on this device. */

#define VIRTIO_CONFIG_S_FAILED		0x80