On 25.07.2016 22:48, Eric Farman wrote:
Add some vhost definitions, in preparation for a new protocol that
will allow vhost-scsi devices to be specified on a hostdev tag.
Signed-off-by: Eric Farman <farman(a)linux.vnet.ibm.com>
Reviewed-by: Bjoern Walk <bwalk(a)linux.vnet.ibm.com>
Reviewed-by: Marc Hartmayer <mhartmay(a)linux.vnet.ibm.com>
Reviewed-by: Boris Fiuczynski <fiuczy(a)linux.vnet.ibm.com>
---
src/conf/domain_conf.c | 3 ++-
src/conf/domain_conf.h | 8 ++++++++
2 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 6dfcf81..9681d6c 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -655,7 +655,8 @@ VIR_ENUM_IMPL(virDomainHostdevSubsysPCIBackend,
VIR_ENUM_IMPL(virDomainHostdevSubsysSCSIProtocol,
VIR_DOMAIN_HOSTDEV_SCSI_PROTOCOL_TYPE_LAST,
"adapter",
- "iscsi")
+ "iscsi",
+ "vhost")
VIR_ENUM_IMPL(virDomainHostdevCaps, VIR_DOMAIN_HOSTDEV_CAPS_TYPE_LAST,
"storage",
diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index 00041c9..1956bdc 100644
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -313,6 +313,7 @@ VIR_ENUM_DECL(virDomainHostdevSubsysPCIBackend)
typedef enum {
VIR_DOMAIN_HOSTDEV_SCSI_PROTOCOL_TYPE_NONE,
VIR_DOMAIN_HOSTDEV_SCSI_PROTOCOL_TYPE_ISCSI,
+ VIR_DOMAIN_HOSTDEV_SCSI_PROTOCOL_TYPE_VHOST,
VIR_DOMAIN_HOSTDEV_SCSI_PROTOCOL_TYPE_LAST,
} virDomainHostdevSCSIProtocolType;
@@ -356,6 +357,12 @@ struct _virDomainHostdevSubsysSCSIiSCSI {
virStorageAuthDefPtr auth;
};
+typedef struct _virDomainHostdevSubsysSCSIVhost virDomainHostdevSubsysSCSIVhost;
+typedef virDomainHostdevSubsysSCSIVhost *virDomainHostdevSubsysSCSIVhostPtr;
+struct _virDomainHostdevSubsysSCSIVhost {
+ char *wwpn;
+};
+
typedef struct _virDomainHostdevSubsysSCSI virDomainHostdevSubsysSCSI;
typedef virDomainHostdevSubsysSCSI *virDomainHostdevSubsysSCSIPtr;
struct _virDomainHostdevSubsysSCSI {
@@ -365,6 +372,7 @@ struct _virDomainHostdevSubsysSCSI {
union {
virDomainHostdevSubsysSCSIHost host;
virDomainHostdevSubsysSCSIiSCSI iscsi;
+ virDomainHostdevSubsysSCSIVhost vhost;
} u;
};
I think this change should be squashed into 06/19. I understand you need
these declarations here, so you can do the opposite and squash 06/19
into this one.
Michal