From: Jason Wang <jasowang@redhat.com>
To: mst@redhat.com, jasowang@redhat.com
Cc: virtualization@lists.linux-foundation.org,
linux-kernel@vger.kernel.org, maz@kernel.org, tglx@linutronix.de,
peterz@infradead.org, sgarzare@redhat.com, keirf@google.com
Subject: [PATCH 1/3] virtio: use virtio_device_ready() in virtio_device_restore()
Date: Thu, 24 Mar 2022 16:40:02 +0800 [thread overview]
Message-ID: <20220324084004.14349-2-jasowang@redhat.com> (raw)
In-Reply-To: <20220324084004.14349-1-jasowang@redhat.com>
From: Stefano Garzarella <sgarzare@redhat.com>
This avoids setting DRIVER_OK twice for those drivers that call
virtio_device_ready() in the .restore and it will allows us to do
extension on virtio_device_ready() without duplicating codes.
Signed-off-by: Stefano Garzarella <sgarzare@redhat.com>
Signed-off-by: Jason Wang <jasowang@redhat.com>
---
drivers/virtio/virtio.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/drivers/virtio/virtio.c b/drivers/virtio/virtio.c
index 22f15f444f75..75c8d560bbd3 100644
--- a/drivers/virtio/virtio.c
+++ b/drivers/virtio/virtio.c
@@ -526,8 +526,9 @@ int virtio_device_restore(struct virtio_device *dev)
goto err;
}
- /* Finally, tell the device we're all set */
- virtio_add_status(dev, VIRTIO_CONFIG_S_DRIVER_OK);
+ /* If restore didn't do it, mark device DRIVER_OK ourselves. */
+ if (!(dev->config->get_status(dev) & VIRTIO_CONFIG_S_DRIVER_OK))
+ virtio_device_ready(dev);
virtio_config_enable(dev);
--
2.25.1
next prev parent reply other threads:[~2022-03-24 8:40 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-24 8:40 [PATCH 0/3] rework on the IRQ hardening of virtio Jason Wang
2022-03-24 8:40 ` Jason Wang [this message]
2022-03-24 10:48 ` [PATCH 1/3] virtio: use virtio_device_ready() in virtio_device_restore() Michael S. Tsirkin
2022-03-24 11:03 ` Stefano Garzarella
2022-03-24 11:07 ` Michael S. Tsirkin
2022-03-24 11:31 ` Stefano Garzarella
2022-03-25 3:05 ` Jason Wang
2022-03-30 5:22 ` Michael S. Tsirkin
2022-03-24 8:40 ` [PATCH 2/3] virtio: use virtio_reset_device() when possible Jason Wang
2022-03-24 11:04 ` Stefano Garzarella
2022-03-24 8:40 ` [PATCH 3/3] virtio: harden vring IRQ Jason Wang
2022-03-24 11:03 ` Michael S. Tsirkin
2022-03-25 3:04 ` Jason Wang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220324084004.14349-2-jasowang@redhat.com \
--to=jasowang@redhat.com \
--cc=keirf@google.com \
--cc=linux-kernel@vger.kernel.org \
--cc=maz@kernel.org \
--cc=mst@redhat.com \
--cc=peterz@infradead.org \
--cc=sgarzare@redhat.com \
--cc=tglx@linutronix.de \
--cc=virtualization@lists.linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).