[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v6 02/20] hw/qdev: introduce qdev_is_realized() helper
From: |
Stefan Hajnoczi |
Subject: |
[PATCH v6 02/20] hw/qdev: introduce qdev_is_realized() helper |
Date: |
Tue, 16 May 2023 15:02:20 -0400 |
Add a helper function to check whether the device is realized without
requiring the Big QEMU Lock. The next patch adds a second caller. The
goal is to avoid spreading DeviceState field accesses throughout the
code.
Suggested-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
---
include/hw/qdev-core.h | 17 ++++++++++++++---
hw/scsi/scsi-bus.c | 3 +--
2 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/include/hw/qdev-core.h b/include/hw/qdev-core.h
index 7623703943..f1070d6dc7 100644
--- a/include/hw/qdev-core.h
+++ b/include/hw/qdev-core.h
@@ -1,6 +1,7 @@
#ifndef QDEV_CORE_H
#define QDEV_CORE_H
+#include "qemu/atomic.h"
#include "qemu/queue.h"
#include "qemu/bitmap.h"
#include "qemu/rcu.h"
@@ -168,9 +169,6 @@ typedef struct {
/**
* DeviceState:
- * @realized: Indicates whether the device has been fully constructed.
- * When accessed outside big qemu lock, must be accessed with
- * qatomic_load_acquire()
* @reset: ResettableState for the device; handled by Resettable interface.
*
* This structure should not be accessed directly. We declare it here
@@ -339,6 +337,19 @@ DeviceState *qdev_new(const char *name);
*/
DeviceState *qdev_try_new(const char *name);
+/**
+ * qdev_is_realized:
+ * @dev: The device to check.
+ *
+ * May be called outside big qemu lock.
+ *
+ * Returns: %true% if the device has been fully constructed, %false% otherwise.
+ */
+static inline bool qdev_is_realized(DeviceState *dev)
+{
+ return qatomic_load_acquire(&dev->realized);
+}
+
/**
* qdev_realize: Realize @dev.
* @dev: device to realize
diff --git a/hw/scsi/scsi-bus.c b/hw/scsi/scsi-bus.c
index 3c20b47ad0..8857ff41f6 100644
--- a/hw/scsi/scsi-bus.c
+++ b/hw/scsi/scsi-bus.c
@@ -60,8 +60,7 @@ static SCSIDevice *do_scsi_device_find(SCSIBus *bus,
* the user access the device.
*/
- if (retval && !include_unrealized &&
- !qatomic_load_acquire(&retval->qdev.realized)) {
+ if (retval && !include_unrealized && !qdev_is_realized(&retval->qdev)) {
retval = NULL;
}
--
2.40.1
- [PATCH v6 00/20] block: remove aio_disable_external() API, Stefan Hajnoczi, 2023/05/16
- [PATCH v6 01/20] block-backend: split blk_do_set_aio_context(), Stefan Hajnoczi, 2023/05/16
- [PATCH v6 02/20] hw/qdev: introduce qdev_is_realized() helper,
Stefan Hajnoczi <=
- [PATCH v6 03/20] virtio-scsi: avoid race between unplug and transport event, Stefan Hajnoczi, 2023/05/16
- [PATCH v6 04/20] virtio-scsi: stop using aio_disable_external() during unplug, Stefan Hajnoczi, 2023/05/16
- [PATCH v6 05/20] util/vhost-user-server: rename refcount to in_flight counter, Stefan Hajnoczi, 2023/05/16
- [PATCH v6 07/20] block/export: stop using is_external in vhost-user-blk server, Stefan Hajnoczi, 2023/05/16
- [PATCH v6 06/20] block/export: wait for vhost-user-blk requests when draining, Stefan Hajnoczi, 2023/05/16
- [PATCH v6 08/20] hw/xen: do not use aio_set_fd_handler(is_external=true) in xen_xenstore, Stefan Hajnoczi, 2023/05/16
- [PATCH v6 09/20] block: add blk_in_drain() API, Stefan Hajnoczi, 2023/05/16
- [PATCH v6 10/20] block: drain from main loop thread in bdrv_co_yield_to_drain(), Stefan Hajnoczi, 2023/05/16
- [PATCH v6 11/20] xen-block: implement BlockDevOps->drained_begin(), Stefan Hajnoczi, 2023/05/16
- [PATCH v6 12/20] hw/xen: do not set is_external=true on evtchn fds, Stefan Hajnoczi, 2023/05/16