Commit f54b9705 authored May 27, 2022 by Jason Wang Committed by Pengyuan Zhao Dec 13, 2022

virtio: use virtio_reset_device() when possible

mainline inclusion
from mainline-v5.19-rc1
commit 0aa96837
category: feature
bugzilla: https://gitee.com/openeuler/kernel/issues/I5WXCZ
CVE: NA

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=0aa96837c3ded5de58782a07b88176f2f1d01404



----------------------------------------------------------------------

This allows us to do common extension without duplicating code.

Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: "Paul E. McKenney" <paulmck@kernel.org>
Cc: Marc Zyngier <maz@kernel.org>
Cc: Halil Pasic <pasic@linux.ibm.com>
Cc: Cornelia Huck <cohuck@redhat.com>
Cc: Vineeth Vijayan <vneethv@linux.ibm.com>
Cc: Peter Oberparleiter <oberpar@linux.ibm.com>
Cc: linux-s390@vger.kernel.org
Reviewed-by: Cornelia Huck <cohuck@redhat.com>
Signed-off-by: Jason Wang <jasowang@redhat.com>
Message-Id: <20220527060120.20964-3-jasowang@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Reviewed-by: Xuan Zhuo <xuanzhuo@linux.alibaba.com>
Reviewed-by: Eugenio Pérez <eperezma@redhat.com>
Signed-off-by: Pengyuan Zhao <zhaopengyuan@hisilicon.com>

parent 47e5b32b

drivers/virtio/virtio.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -384,7 +384,7 @@ int register_virtio_device(struct virtio_device *dev)

		/* We always start by resetting the device, in case a previous
		* driver messed it up. This also tests that code path a little. */
		dev->config->reset(dev);
		virtio_reset_device(dev);

		/* Acknowledge that we've seen the device. */
		virtio_add_status(dev, VIRTIO_CONFIG_S_ACKNOWLEDGE);
		@@ -444,7 +444,7 @@ int virtio_device_restore(struct virtio_device *dev)

		/* We always start by resetting the device, in case a previous
		* driver messed it up. */
		dev->config->reset(dev);
		virtio_reset_device(dev);

		/* Acknowledge that we've seen the device. */
		virtio_add_status(dev, VIRTIO_CONFIG_S_ACKNOWLEDGE);