motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2026-03-04 09:04:39 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

vhost-scsi: create a vhost-scsi-common abstraction

Browse source 
In order to introduce a new vhost-user-scsi host device type, it makes
sense to abstract part of vhost-scsi into a common parent class. This
commit does exactly that.

Signed-off-by: Felipe Franciosi <felipe@nutanix.com>
Message-Id: <1488479153-21203-3-git-send-email-felipe@nutanix.com>
This commit is contained in:
Felipe Franciosi 2017-03-02 10:25:51 -08:00 • committed by Paolo Bonzini
parent eae0f54334
commit 95615ce5a1
6 changed files with 252 additions and 148 deletions
Download patch file Download diff file Expand all files Collapse all files

48
include/hw/virtio/vhost-scsi-common.h Normal file
View file

@ -0,0 +1,48 @@
/*
* vhost_scsi host device
*
* Copyright (c) 2016 Nutanix Inc. All rights reserved.
*
* Author:
* Felipe Franciosi <felipe@nutanix.com>
*
* This work is licensed under the terms of the GNU LGPL, version 2 or later.
* See the COPYING.LIB file in the top-level directory.
*
*/
#ifndef VHOST_SCSI_COMMON_H
#define VHOST_SCSI_COMMON_H
#include "qemu-common.h"
#include "hw/qdev.h"
#include "hw/virtio/virtio-scsi.h"
#include "hw/virtio/vhost.h"
#include "hw/fw-path-provider.h"
#define TYPE_VHOST_SCSI_COMMON "vhost-scsi-common"
#define VHOST_SCSI_COMMON(obj) \
OBJECT_CHECK(VHostSCSICommon, (obj), TYPE_VHOST_SCSI_COMMON)
typedef struct VHostSCSICommon {
VirtIOSCSICommon parent_obj;
Error *migration_blocker;
struct vhost_dev dev;
const int *feature_bits;
int32_t bootindex;
int channel;
int target;
int lun;
} VHostSCSICommon;
int vhost_scsi_common_start(VHostSCSICommon *vsc);
void vhost_scsi_common_stop(VHostSCSICommon *vsc);
char *vhost_scsi_common_get_fw_dev_path(FWPathProvider *p, BusState *bus,
DeviceState *dev);
void vhost_scsi_common_set_config(VirtIODevice *vdev, const uint8_t *config);
uint64_t vhost_scsi_common_get_features(VirtIODevice *vdev, uint64_t features,
Error **errp);
#endif /* VHOST_SCSI_COMMON_H */

11
include/hw/virtio/vhost-scsi.h
View file

@ -18,6 +18,7 @@
#include "hw/qdev.h"
#include "hw/virtio/virtio-scsi.h"
#include "hw/virtio/vhost.h"
#include "hw/virtio/vhost-scsi-common.h"
enum vhost_scsi_vq_list {
VHOST_SCSI_VQ_CONTROL = 0,
@ -30,15 +31,7 @@ enum vhost_scsi_vq_list {
OBJECT_CHECK(VHostSCSI, (obj), TYPE_VHOST_SCSI)
typedef struct VHostSCSI {
VirtIOSCSICommon parent_obj;
Error *migration_blocker;
struct vhost_dev dev;
int32_t bootindex;
int channel;
int target;
int lun;
VHostSCSICommon parent_obj;
} VHostSCSI;
#endif

2
include/hw/virtio/virtio-scsi.h
View file

@ -49,8 +49,10 @@ struct VirtIOSCSIConf {
uint32_t num_queues;
uint32_t max_sectors;
uint32_t cmd_per_lun;
#ifdef CONFIG_VHOST_SCSI
char *vhostfd;
char *wwpn;
#endif
uint32_t boot_tpgt;
IOThread *iothread;
};