aboutsummaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorMarc-André Lureau <marcandre.lureau@redhat.com>2017-08-16 20:50:52 +0200
committerMarc-André Lureau <marcandre.lureau@redhat.com>2017-10-10 23:31:09 +0200
commit4309251a8c67c0893489dea18b30cc48f859c9fd (patch)
tree6ee5e89ba7a735dc52ec1bd1e3a04792a6e59a81 /contrib
parent9a6903dbe3bf809d9a8333d39b9171a3701a5ff2 (diff)
downloadqemu-4309251a8c67c0893489dea18b30cc48f859c9fd.zip
qemu-4309251a8c67c0893489dea18b30cc48f859c9fd.tar.gz
qemu-4309251a8c67c0893489dea18b30cc48f859c9fd.tar.bz2
vhost-user-scsi: remove vdev_scsi_find_by_vu()
The *dev pointer belongs to the vhost_scsi_dev_t parent. Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'contrib')
-rw-r--r--contrib/vhost-user-scsi/vhost-user-scsi.c47
1 files changed, 4 insertions, 43 deletions
diff --git a/contrib/vhost-user-scsi/vhost-user-scsi.c b/contrib/vhost-user-scsi/vhost-user-scsi.c
index 17f676b..82624a0 100644
--- a/contrib/vhost-user-scsi/vhost-user-scsi.c
+++ b/contrib/vhost-user-scsi/vhost-user-scsi.c
@@ -55,8 +55,6 @@
/* Only 1 LUN and device supported today */
#define VUS_MAX_LUNS 1
-#define VUS_MAX_DEVS 1
-
#define VUS_ISCSI_INITIATOR "iqn.2016-11.com.nutanix:vhost-user-scsi"
typedef struct iscsi_lun {
@@ -72,8 +70,6 @@ typedef struct vhost_scsi_dev {
iscsi_lun_t luns[VUS_MAX_LUNS];
} vhost_scsi_dev_t;
-static vhost_scsi_dev_t *vhost_scsi_devs[VUS_MAX_DEVS];
-
/** glib event loop integration for libvhost-user and misc callbacks **/
QEMU_BUILD_BUG_ON((int)G_IO_IN != (int)VU_WATCH_IN);
@@ -420,16 +416,13 @@ static int handle_cmd_sync(struct iscsi_context *ctx,
/** libvhost-user callbacks **/
-static vhost_scsi_dev_t *vdev_scsi_find_by_vu(VuDev *vu_dev);
-
static void vus_panic_cb(VuDev *vu_dev, const char *buf)
{
vhost_scsi_dev_t *vdev_scsi;
assert(vu_dev);
- vdev_scsi = vdev_scsi_find_by_vu(vu_dev);
-
+ vdev_scsi = container_of(vu_dev, vhost_scsi_dev_t, vu_dev);
if (buf) {
PERR("vu_panic: %s", buf);
}
@@ -447,12 +440,7 @@ static void vus_add_watch_cb(VuDev *vu_dev, int fd, int vu_evt, vu_watch_cb cb,
assert(fd >= 0);
assert(cb);
- vdev_scsi = vdev_scsi_find_by_vu(vu_dev);
- if (!vdev_scsi) {
- vus_panic_cb(vu_dev, NULL);
- return;
- }
-
+ vdev_scsi = container_of(vu_dev, vhost_scsi_dev_t, vu_dev);
id = (guint)(uintptr_t)g_tree_lookup(vdev_scsi->fdmap,
(gpointer)(uintptr_t)fd);
if (id) {
@@ -473,12 +461,7 @@ static void vus_del_watch_cb(VuDev *vu_dev, int fd)
assert(vu_dev);
assert(fd >= 0);
- vdev_scsi = vdev_scsi_find_by_vu(vu_dev);
- if (!vdev_scsi) {
- vus_panic_cb(vu_dev, NULL);
- return;
- }
-
+ vdev_scsi = container_of(vu_dev, vhost_scsi_dev_t, vu_dev);
id = (guint)(uintptr_t)g_tree_lookup(vdev_scsi->fdmap,
(gpointer)(uintptr_t)fd);
if (id) {
@@ -506,12 +489,7 @@ static void vus_proc_req(VuDev *vu_dev, int idx)
assert(vu_dev);
- vdev_scsi = vdev_scsi_find_by_vu(vu_dev);
- if (!vdev_scsi) {
- vus_panic_cb(vu_dev, NULL);
- return;
- }
-
+ vdev_scsi = container_of(vu_dev, vhost_scsi_dev_t, vu_dev);
if (idx < 0 || idx >= VHOST_MAX_NR_VIRTQUEUE) {
PERR("VQ Index out of range: %d", idx);
vus_panic_cb(vu_dev, NULL);
@@ -656,22 +634,6 @@ fail:
/** vhost-user-scsi **/
-static vhost_scsi_dev_t *vdev_scsi_find_by_vu(VuDev *vu_dev)
-{
- int i;
-
- assert(vu_dev);
-
- for (i = 0; i < VUS_MAX_DEVS; i++) {
- if (&vhost_scsi_devs[i]->vu_dev == vu_dev) {
- return vhost_scsi_devs[i];
- }
- }
-
- PERR("Unknown VuDev %p", vu_dev);
- return NULL;
-}
-
static void vdev_scsi_free(vhost_scsi_dev_t *vdev_scsi)
{
if (!vdev_scsi) {
@@ -790,7 +752,6 @@ int main(int argc, char **argv)
goto err;
}
vdev_scsi = vdev_scsi_new(sock);
- vhost_scsi_devs[0] = vdev_scsi;
if (vdev_scsi_add_iscsi_lun(vdev_scsi, iscsi_uri, 0) != 0) {
goto err;