kevin/linux
1
Fork 0
Code

virtio: rename virtio_config_enabled to virtio_config_core_enabled

Browse Source 
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: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Jason Wang <jasowang@redhat.com>
Link: https://patch.msgid.link/20240814052228.4654-2-jasowang@redhat.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
Jason Wang 2024-08-14 13:22:25 +08:00 committed by Jakub Kicinski
parent d440af37ba
commit 0cb70ee4a6
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
drivers/virtio/virtio.c
View File

@ -127,7 +127,7 @@ static void __virtio_config_changed(struct virtio_device *dev)
{ {
struct virtio_driver *drv = drv_to_virtio(dev->dev.driver); struct virtio_driver *drv = drv_to_virtio(dev->dev.driver);
if (!dev->config_enabled) if (!dev->config_core_enabled)
dev->config_change_pending = true; dev->config_change_pending = true;
else if (drv && drv->config_changed) else if (drv && drv->config_changed)
drv->config_changed(dev); drv->config_changed(dev);
@ -143,17 +143,17 @@ void virtio_config_changed(struct virtio_device *dev)
} }
EXPORT_SYMBOL_GPL(virtio_config_changed); 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); spin_lock_irq(&dev->config_lock);
dev->config_enabled = false; dev->config_core_enabled = false;
spin_unlock_irq(&dev->config_lock); 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); spin_lock_irq(&dev->config_lock);
dev->config_enabled = true; dev->config_core_enabled = true;
if (dev->config_change_pending) if (dev->config_change_pending)
__virtio_config_changed(dev); __virtio_config_changed(dev);
dev->config_change_pending = false; dev->config_change_pending = false;
@ -316,7 +316,7 @@ static int virtio_dev_probe(struct device *_d)
if (drv->scan) if (drv->scan)
drv->scan(dev); drv->scan(dev);
virtio_config_enable(dev); virtio_config_core_enable(dev);
return 0; return 0;
@ -331,7 +331,7 @@ static void virtio_dev_remove(struct device *_d)
struct virtio_device *dev = dev_to_virtio(_d); struct virtio_device *dev = dev_to_virtio(_d);
struct virtio_driver *drv = drv_to_virtio(dev->dev.driver); struct virtio_driver *drv = drv_to_virtio(dev->dev.driver);
virtio_config_disable(dev); virtio_config_core_disable(dev);
drv->remove(dev); drv->remove(dev);
@ -443,7 +443,7 @@ int register_virtio_device(struct virtio_device *dev)
goto out_ida_remove; goto out_ida_remove;
spin_lock_init(&dev->config_lock); spin_lock_init(&dev->config_lock);
dev->config_enabled = false; dev->config_core_enabled = false;
dev->config_change_pending = false; dev->config_change_pending = false;
INIT_LIST_HEAD(&dev->vqs); 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); struct virtio_driver *drv = drv_to_virtio(dev->dev.driver);
int ret; int ret;
virtio_config_disable(dev); virtio_config_core_disable(dev);
dev->failed = dev->config->get_status(dev) & VIRTIO_CONFIG_S_FAILED; dev->failed = dev->config->get_status(dev) & VIRTIO_CONFIG_S_FAILED;
if (drv && drv->freeze) { if (drv && drv->freeze) {
ret = drv->freeze(dev); ret = drv->freeze(dev);
if (ret) { if (ret) {
virtio_config_enable(dev); virtio_config_core_enable(dev);
return ret; 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)) if (!(dev->config->get_status(dev) & VIRTIO_CONFIG_S_DRIVER_OK))
virtio_device_ready(dev); virtio_device_ready(dev);
virtio_config_enable(dev); virtio_config_core_enable(dev);
return 0; return 0;

4
include/linux/virtio.h
View File

@ -118,7 +118,7 @@ struct virtio_admin_cmd {
* struct virtio_device - representation of a device using virtio * struct virtio_device - representation of a device using virtio
* @index: unique position on the virtio bus * @index: unique position on the virtio bus
* @failed: saved value for VIRTIO_CONFIG_S_FAILED bit (for restore) * @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_change_pending: configuration change reported while disabled
* @config_lock: protects configuration change reporting * @config_lock: protects configuration change reporting
* @vqs_list_lock: protects @vqs. * @vqs_list_lock: protects @vqs.
@ -135,7 +135,7 @@ struct virtio_admin_cmd {
struct virtio_device { struct virtio_device {
int index; int index;
bool failed; bool failed;
bool config_enabled; bool config_core_enabled;
bool config_change_pending; bool config_change_pending;
spinlock_t config_lock; spinlock_t config_lock;
spinlock_t vqs_list_lock; spinlock_t vqs_list_lock;