[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 2/9] virtio-scsi: Make virtio_scsi_acquire/release pu
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PULL 2/9] virtio-scsi: Make virtio_scsi_acquire/release public |
Date: |
Mon, 27 Mar 2017 18:16:08 +0200 |
From: Fam Zheng <address@hidden>
They will be used in virtio-scsi-dataplane.c as well, so move them to
header.
Signed-off-by: Fam Zheng <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
---
hw/scsi/virtio-scsi.c | 14 --------------
include/hw/virtio/virtio-scsi.h | 14 ++++++++++++++
2 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/hw/scsi/virtio-scsi.c b/hw/scsi/virtio-scsi.c
index 1dbc4bc..e7466d3 100644
--- a/hw/scsi/virtio-scsi.c
+++ b/hw/scsi/virtio-scsi.c
@@ -422,20 +422,6 @@ static void virtio_scsi_handle_ctrl_req(VirtIOSCSI *s,
VirtIOSCSIReq *req)
}
}
-static inline void virtio_scsi_acquire(VirtIOSCSI *s)
-{
- if (s->ctx) {
- aio_context_acquire(s->ctx);
- }
-}
-
-static inline void virtio_scsi_release(VirtIOSCSI *s)
-{
- if (s->ctx) {
- aio_context_release(s->ctx);
- }
-}
-
bool virtio_scsi_handle_ctrl_vq(VirtIOSCSI *s, VirtQueue *vq)
{
VirtIOSCSIReq *req;
diff --git a/include/hw/virtio/virtio-scsi.h b/include/hw/virtio/virtio-scsi.h
index f536f77..8ae0aca 100644
--- a/include/hw/virtio/virtio-scsi.h
+++ b/include/hw/virtio/virtio-scsi.h
@@ -121,6 +121,20 @@ typedef struct VirtIOSCSIReq {
} req;
} VirtIOSCSIReq;
+static inline void virtio_scsi_acquire(VirtIOSCSI *s)
+{
+ if (s->ctx) {
+ aio_context_acquire(s->ctx);
+ }
+}
+
+static inline void virtio_scsi_release(VirtIOSCSI *s)
+{
+ if (s->ctx) {
+ aio_context_release(s->ctx);
+ }
+}
+
void virtio_scsi_common_realize(DeviceState *dev, Error **errp,
VirtIOHandleOutput ctrl, VirtIOHandleOutput
evt,
VirtIOHandleOutput cmd);
--
2.9.3
- [Qemu-devel] [PULL 0/9] Misc fixes for QEMU 2.9.0-rc2, Paolo Bonzini, 2017/03/27
- [Qemu-devel] [PULL 2/9] virtio-scsi: Make virtio_scsi_acquire/release public,
Paolo Bonzini <=
- [Qemu-devel] [PULL 3/9] virtio-scsi: Fix acquire/release in dataplane handlers, Paolo Bonzini, 2017/03/27
- [Qemu-devel] [PULL 4/9] tcg/i386: Check the size of instruction being translated, Paolo Bonzini, 2017/03/27
- [Qemu-devel] [PULL 1/9] clear pending status before calling memory commit, Paolo Bonzini, 2017/03/27
- [Qemu-devel] [PULL 5/9] mem-prealloc: fix sysconf(_SC_NPROCESSORS_ONLN) failure case., Paolo Bonzini, 2017/03/27
- [Qemu-devel] [PULL 6/9] win32: replace custom mutex and condition variable with native primitives, Paolo Bonzini, 2017/03/27
- [Qemu-devel] [PULL 7/9] nbd: drop unused NBDClientSession.is_unix field, Paolo Bonzini, 2017/03/27
- [Qemu-devel] [PULL 8/9] Revert "apic: save apic_delivered flag", Paolo Bonzini, 2017/03/27
- [Qemu-devel] [PULL 9/9] scsi-generic: Fill in opt_xfer_len in INQUIRY reply if it is zero, Paolo Bonzini, 2017/03/27
- Re: [Qemu-devel] [PULL 0/9] Misc fixes for QEMU 2.9.0-rc2, Peter Maydell, 2017/03/28