Commit 0cb70ee4 authored by Jason Wang's avatar Jason Wang Committed by Jakub Kicinski
Browse files

virtio: rename virtio_config_enabled to virtio_config_core_enabled 



Following patch will allow the config interrupt to be disabled by a
specific driver via another boolean. So this patch renames
virtio_config_enabled and relevant helpers to
virtio_config_core_enabled.

Cc: Venkat Venkatsubra <venkat.x.venkatsubra@oracle.com>
Cc: Gia-Khanh Nguyen <gia-khanh.nguyen@oracle.com>
Acked-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: default avatarJason Wang <jasowang@redhat.com>
Link: https://patch.msgid.link/20240814052228.4654-2-jasowang@redhat.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent d440af37

drivers/virtio/virtio.c

+11 −11
Original line number Diff line number Diff line
@@ -127,7 +127,7 @@ static void __virtio_config_changed(struct virtio_device *dev) 
{

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



	if (!dev->config_enabled)

	if (!dev->config_core_enabled)

		dev->config_change_pending = true;

	else if (drv && drv->config_changed)

		drv->config_changed(dev);
@@ -143,17 +143,17 @@ void virtio_config_changed(struct virtio_device *dev) 
}

EXPORT_SYMBOL_GPL(virtio_config_changed);



static void virtio_config_disable(struct virtio_device *dev)

static void virtio_config_core_disable(struct virtio_device *dev)

{

	spin_lock_irq(&dev->config_lock);

	dev->config_enabled = false;

	dev->config_core_enabled = false;

	spin_unlock_irq(&dev->config_lock);

}



static void virtio_config_enable(struct virtio_device *dev)

static void virtio_config_core_enable(struct virtio_device *dev)

{

	spin_lock_irq(&dev->config_lock);

	dev->config_enabled = true;

	dev->config_core_enabled = true;

	if (dev->config_change_pending)

		__virtio_config_changed(dev);

	dev->config_change_pending = false;
@@ -316,7 +316,7 @@ static int virtio_dev_probe(struct device *_d) 
	if (drv->scan)

		drv->scan(dev);



	virtio_config_enable(dev);

	virtio_config_core_enable(dev);



	return 0;
@@ -331,7 +331,7 @@ static void virtio_dev_remove(struct device *_d) 
	struct virtio_device *dev = dev_to_virtio(_d);

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



	virtio_config_disable(dev);

	virtio_config_core_disable(dev);



	drv->remove(dev);
@@ -443,7 +443,7 @@ int register_virtio_device(struct virtio_device *dev) 
		goto out_ida_remove;



	spin_lock_init(&dev->config_lock);

	dev->config_enabled = false;

	dev->config_core_enabled = false;

	dev->config_change_pending = false;



	INIT_LIST_HEAD(&dev->vqs);
@@ -500,14 +500,14 @@ int virtio_device_freeze(struct virtio_device *dev) 
	struct virtio_driver *drv = drv_to_virtio(dev->dev.driver);

	int ret;



	virtio_config_disable(dev);

	virtio_config_core_disable(dev);



	dev->failed = dev->config->get_status(dev) & VIRTIO_CONFIG_S_FAILED;



	if (drv && drv->freeze) {

		ret = drv->freeze(dev);

		if (ret) {

			virtio_config_enable(dev);

			virtio_config_core_enable(dev);

			return ret;

		}

	}
@@ -557,7 +557,7 @@ int virtio_device_restore(struct virtio_device *dev) 
	if (!(dev->config->get_status(dev) & VIRTIO_CONFIG_S_DRIVER_OK))

		virtio_device_ready(dev);



	virtio_config_enable(dev);

	virtio_config_core_enable(dev);



	return 0;

include/linux/virtio.h

+2 −2
Original line number Diff line number Diff line
@@ -118,7 +118,7 @@ struct virtio_admin_cmd { 
 * struct virtio_device - representation of a device using virtio

 * @index: unique position on the virtio bus

 * @failed: saved value for VIRTIO_CONFIG_S_FAILED bit (for restore)

 * @config_enabled: configuration change reporting enabled

 * @config_core_enabled: configuration change reporting enabled by core

 * @config_change_pending: configuration change reported while disabled

 * @config_lock: protects configuration change reporting

 * @vqs_list_lock: protects @vqs.
@@ -135,7 +135,7 @@ struct virtio_admin_cmd { 
struct virtio_device {

	int index;

	bool failed;

	bool config_enabled;

	bool config_core_enabled;

	bool config_change_pending;

	spinlock_t config_lock;

	spinlock_t vqs_list_lock;