pvSCSI driver
PATCH 7/7 pvSCSI driver
Modify xend.
Signed-off-by Tomonari Horikoshi <[email protected]>
Signed-off-by Jun Kamada <[email protected]>
Signed-off-by Akira Hayakawa <[email protected]>
-----
Jun Kamada
# HG changeset patch
# User [email protected]
# Date 1202955191 -32400
# Node ID 7f65e239478558ced59874498a846d29b9a4fa02 # Parent 3e69998233546e0e8fc520759c8785bd542078f4 [XEND] add vscsi interface
Signed-off-by Tomonari Horikoshi <[email protected]>
Signed-off-by Jun Kamada <[email protected]>
Signed-off-by Akira Hayakawa <[email protected]>
tools/examples/Makefile +1 -0
@@ -28,6 +28,7 @@ XEN_SCRIPTS += block-enbd block-nbd XEN_SCRIPTS += block-enbd block-nbd XEN_SCRIPTS += blktap XEN_SCRIPTS += vtpm vtpm-delete +XEN_SCRIPTS += vscsi XEN_SCRIPTS += xen-hotplug-cleanup XEN_SCRIPTS += external-device-migrate XEN_SCRIPT_DATA = xen-script-common.sh locking.sh logging.sh
tools/examples/vscsi new file +59 -0
59 lines not on this page · raw message
tools/examples/xen-backend.agent +3 -0
@@ -19,6 +19,9 @@ case "$XENBUS_TYPE" in vif) [ -n "$script" ] && $script "$ACTION" ;; + vscsi) + /etc/xen/scripts/vscsi "$ACTION" + ;; esac case "$ACTION" in
tools/examples/xen-backend.rules +1 -0
@@ -1,6 +1,7 @@ SUBSYSTEM=="xen-backend", KERNEL=="tap*" SUBSYSTEM=="xen-backend", KERNEL=="tap*", RUN+="/etc/xen/scripts/blktap $env{ACTION}" SUBSYSTEM=="xen-backend", KERNEL=="vbd*", RUN+="/etc/xen/scripts/block $env{ACTION}" SUBSYSTEM=="xen-backend", KERNEL=="vtpm*", RUN+="/etc/xen/scripts/vtpm $env{ACTION}" +SUBSYSTEM=="xen-backend", KERNEL=="vscsi*", RUN+="/etc/xen/scripts/vscsi $env{ACTION}" SUBSYSTEM=="xen-backend", KERNEL=="vif*", ACTION=="online", RUN+="$env{script} online" SUBSYSTEM=="xen-backend", KERNEL=="vif*", ACTION=="offline", RUN+="$env{script} offline" SUBSYSTEM=="xen-backend", ACTION=="remove", RUN+="/etc/xen/scripts/xen-hotplug-cleanup"
tools/python/xen/util/vscsi_util.py new file +134 -0
134 lines not on this page · raw message
tools/python/xen/xend/XendConfig.py +17 -3
@@ -337,6 +337,7 @@ class XendConfig(dict): 'vif_refs': [], 'vbd_refs': [], 'vtpm_refs': [], + 'vscsi_refs': [], 'other_config': {}, 'platform': {}, 'target': 0,
@@ -723,6 +724,7 @@ class XendConfig(dict): self['vif_refs'] = cfg.get('vif_refs', []) self['vbd_refs'] = cfg.get('vbd_refs', []) self['vtpm_refs'] = cfg.get('vtpm_refs', []) + self['vscsi_refs'] = cfg.get('vscsi_refs', []) # coalesce hvm vnc frame buffer with vfb config if self.is_hvm() and int(self['platform'].get('vnc', 0)) != 0:
@@ -1023,6 +1025,17 @@ class XendConfig(dict): raise XendConfigError('The mac "%s" is already defined' % dev_mac) + elif dev_type == 'vscsi': + dev_scsi = dev_info.get('dev') + + for o_dev_type, o_dev_info in defined_devices_sxpr: + if dev_type == o_dev_type: + o_dev_scsi = sxp.child_value(o_dev_info, 'dev') + if dev_scsi == o_dev_scsi: + raise XendConfigError('The SCSIdevice "%s" is already defined' % + dev_scsi) + + def device_add(self, dev_type, cfg_sxp = None, cfg_xenapi = None, target = None): """Add a device configuration in SXP format or XenAPI struct format.
@@ -1146,7 +1159,7 @@ class XendConfig(dict): # store dev references by uuid for certain device types target['devices'][dev_uuid] = (dev_type, dev_info) - if dev_type in ('vif', 'vbd', 'vtpm'): + if dev_type in ('vif', 'vbd', 'vtpm', 'vscsi'): param = '%s_refs' % dev_type if param not in target: target[param] = []
@@ -1473,7 +1486,8 @@ class XendConfig(dict): result.extend(target.get('console_refs', []) + target.get('vbd_refs', []) + target.get('vif_refs', []) + - target.get('vtpm_refs', [])) + target.get('vtpm_refs', []) + + target.get('vscsi_refs', [])) result.extend([u for u in target['devices'].keys() if u not in result]) return result
@@ -1598,7 +1612,7 @@ class XendConfig(dict): return self['HVM_boot_policy'] != '' def target(self): - return self['target'] + return self['target'] def image_type(self): stored_type = self['platform'].get('image_type')
tools/python/xen/xend/XendDevices.py +2 -1
@@ -19,7 +19,7 @@ # A collection of DevControllers # -from xen.xend.server import blkif, netif, tpmif, pciif, iopif, irqif, vfbif +from xen.xend.server import blkif, netif, tpmif, pciif, iopif, irqif, vfbif, vscsiif from xen.xend.server.BlktapController import BlktapController from xen.xend.server.ConsoleController import ConsoleController
@@ -45,6 +45,7 @@ class XendDevices: 'vfb': vfbif.VfbifController, 'vkbd': vfbif.VkbdifController, 'console': ConsoleController, + 'vscsi': vscsiif.VSCSIController, } #@classmethod
tools/python/xen/xend/XendDomainInfo.py +1 -0
@@ -1989,6 +1989,7 @@ class XendDomainInfo: self._removeDom('control/shutdown') self._removeDom('device-misc/vif/nextDeviceID') + self._removeDom('device-misc/vscsi/nextDeviceID') self._createChannels() self._introduceDomain()
tools/python/xen/xend/server/vscsiif.py new file +89 -0
89 lines not on this page · raw message
tools/python/xen/xm/create.py +44 -0
80 lines not on this page · raw message
tools/python/xen/xm/main.py +70 -0
118 lines not on this page · raw message
xen/include/public/io/vscsiif.h new file +73 -0
73 lines not on this page · raw message
_______________________________________________
Xen-devel mailing list
[email protected]
http://lists.xensource.com/xen-devel