New subject: Change in vdsm[master]: vdsm: add support for hot(un)plug of host devices

18 Dec 2013

Martin Polednik has uploaded a new change for review.
Change subject: vdsm: add support for hot(un)plug of pci-passthrough devices
......................................................................
vdsm: add support for hot(un)plug of pci-passthrough devices
Hot(un)plug ability for pci-passthrough devices is extremely important
in order to allow for hotunplugging/migrating/hotplugging workflow as VM
cannot be migrated with pci device attached.
This patch implements the ability adding new API verbs: hotplugHostdev
and hotunplugHostdev, which attempts to append/remove the device from
domain XML and reports back the state.
Change-Id: I8fbf4a1d62789d9404e5977eb7eb01b17a1a43fb
Signed-off-by: Martin Polednik mpoledni@redhat.com
---
M client/vdsClient.py
M vdsm/API.py
M vdsm/BindingXMLRPC.py
M vdsm/vm.py
M vdsm_api/vdsmapi-schema.json
5 files changed, 166 insertions(+), 0 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/23/22523/1

diff --git a/client/vdsClient.py b/client/vdsClient.py
index d549500..f00180e 100644
--- a/client/vdsClient.py
+++ b/client/vdsClient.py
@@ -245,6 +245,14 @@
         params = {'vmId': args[0], 'drive': drive}
         return self.ExecAndExit(self.s.hotunplugDisk(params))
+    def hotplugHostdev(self, args):
+        params = {'vmId': args[0], 'hostdevName': args[1]}
+        return self.ExecAndExit(self.s.hotplugNic(params))
+
+    def hotunplugHostdev(self, args):
+        params = {'vmId': args[0], 'hostdevName': args[2]}
+        return self.ExecAndExit(self.s.hotunplugNic(params))
+
     def do_changeCD(self, args):
         vmId = args[0]
         file = self._parseDriveSpec(args[1])
diff --git a/vdsm/API.py b/vdsm/API.py
index 44d5817..51eb506 100644
--- a/vdsm/API.py
+++ b/vdsm/API.py
@@ -456,6 +456,40 @@
return curVm.hotunplugDisk(params)
+    def hotplugHostdev(self, params):
+        try:
+            utils.validateMinimalKeySet(params, ('vmId', 'hostdevName'))
+        except ValueError:
+            self.log.error('Missing one of required parameters: vmId, '
+                           'hostdevName')
+            return {'status': {'code': errCode['MissParam']['status']['code'],
+                               'message': 'Missing one of required '
+                                          'parameters: vmId, hostdevName'}}
+        try:
+            curVm = self._cif.vmContainer[self._UUID]
+        except KeyError:
+            self.log.warning("vm %s doesn't exist", self._UUID)
+            return errCode['noVM']
+
+        return curVm.hotplugHostdev(params)
+
+    def hotunplugHostdev(self, params):
+        try:
+            utils.validateMinimalKeySet(params, ('vmId', 'hostdevName'))
+        except ValueError:
+            self.log.error('Missing one of required parameters: vmId, '
+                           'hostdevName')
+            return {'status': {'code': errCode['MissParam']['status']['code'],
+                               'message': 'Missing one of required '
+                                          'parameters: vmId, hostdevName'}}
+        try:
+            curVm = self._cif.vmContainer[self._UUID]
+        except KeyError:
+            self.log.warning("vm %s doesn't exist", self._UUID)
+            return errCode['noVM']
+
+        return curVm.hotunplugHostdev(params)
+
     def migrate(self, params):
         """
         Migrate a VM to a remote host.
diff --git a/vdsm/BindingXMLRPC.py b/vdsm/BindingXMLRPC.py
index 5bcd84c..847ceaf 100644
--- a/vdsm/BindingXMLRPC.py
+++ b/vdsm/BindingXMLRPC.py
@@ -279,6 +279,14 @@
         vm = API.VM(params['vmId'])
         return vm.hotunplugNic(params)
+    def vmHotplugHostdev(self, params):
+        vm = API.VM(params['vmId'])
+        return vm.hotplugHostdev(params)
+
+    def vmHotunplugHostdev(self, params):
+        vm = API.VM(params['vmId'])
+        return vm.hotunplugHostdev(params)
+
     def vmUpdateDevice(self, vmId, params):
         vm = API.VM(vmId)
         return vm.vmUpdateDevice(params)
@@ -861,6 +869,8 @@
                 (self.vmHotunplugDisk, 'hotunplugDisk'),
                 (self.vmHotplugNic, 'hotplugNic'),
                 (self.vmHotunplugNic, 'hotunplugNic'),
+                (self.vmHotplugHostdev, 'hotplugHostdev'),
+                (self.vmHotunplugHostdev, 'hotunplugHostdev'),
                 (self.vmUpdateDevice, 'vmUpdateDevice'))
def getIrsMethods(self):
diff --git a/vdsm/vm.py b/vdsm/vm.py
index 90a6c0d..224bf7b 100644
--- a/vdsm/vm.py
+++ b/vdsm/vm.py
@@ -3183,6 +3183,84 @@
return {'status': doneCode, 'vmList': self.status()}
+    def hotplugHostdev(self, params):
+        hostdevName = params['hostdevName']
+        hostdev = HostDevice(self.conf, self.log, **hostdevName)
+        hostdevXML = hostdev.getXML().toprettyxml(encoding='utf-8')
+        hostdev._deviceXML = hostdevXML
+        self.log.debug("Hotplug hostdev xml: %s", hostdevXML)
+
+        try:
+            self._dom.attachDevice(hostdevXML)
+        except libvirt.libvirtError as e:
+            self.log.error("Hotplug failed", exc_info=True)
+            if e.get_error_code() == libvirt.VIR_ERR_NO_DOMAIN:
+                return errCode['noVM']
+            return {'status': {'code': errCode['hotplugNic']['status']['code'],
+                               'message': e.message}}
+        else:
+            # FIXME!  We may have a problem here if vdsm dies right after
+            # we sent command to libvirt and before save conf. In this case
+            # we will gather almost all needed info about this NIC from
+            # the libvirt during recovery process.
+            self._devices[HOSTDEV_DEVICES].append(hostdev)
+            with self._confLock:
+                self.conf['devices'].append(hostdev)
+            self.saveState()
+
+        return {'status': doneCode, 'vmList': self.status()}
+
+    def hotunplugHostdev(self, params):
+        hostdevName = params['hostdevName']
+
+        # Find hostdev object in vm's hostdev list
+        hostdev = None
+        for dev in self._devices[HOSTDEV_DEVICES][:]:
+            if dev.name == hostdevName:
+                hostdev = dev
+                break
+
+        if hostdev:
+            hostdevXML = hostdev.getXML().toprettyxml(encoding='utf-8')
+            self.log.debug("Hotunplug hostdev xml: %s", hostdevXML)
+            self._devices[HOSTDEV_DEVICES].remove(hostdev)
+        else:
+            self.log.error("Hotunplug hostdev failed - hostdev not found: %s",
+                           hostdevName)
+            return {'status': {'code': errCode['hotunplugNic']
+                                              ['status']['code'],
+                               'message': "NIC not found"}}
+
+        hostdevDev = None
+        for dev in self.conf['devices'][:]:
+            if (dev['type'] == HOSTDEV_DEVICES and
+                    dev['name'] == hostdevName):
+                hostdevDev = dev
+                with self._confLock:
+                    self.conf['devices'].remove(dev)
+                break
+
+        self.saveState()
+
+        try:
+            self._dom.detachDevice(hostdevXML)
+        except libvirt.libvirtError as e:
+            self.log.error("Hotunplug failed", exc_info=True)
+            if e.get_error_code() == libvirt.VIR_ERR_NO_DOMAIN:
+                return errCode['noVM']
+            # Restore hostdev device in vm's conf and _devices
+            if hostdevDev:
+                with self._confLock:
+                    self.conf['devices'].append(hostdevDev)
+            if hostdev:
+                self._devices[HOSTDEV_DEVICES].append(hostdev)
+            self.saveState()
+            return {
+                'status': {'code': errCode['hotunplugNic']['status']['code'],
+                           'message': e.message}}
+
+        return {'status': doneCode, 'vmList': self.status()}
+
     def _lookupDeviceByAlias(self, devType, alias):
         for dev in self._devices[devType][:]:
             if dev.alias == alias:
diff --git a/vdsm_api/vdsmapi-schema.json b/vdsm_api/vdsmapi-schema.json
index 1d4e499..85f2b28 100644
--- a/vdsm_api/vdsmapi-schema.json
+++ b/vdsm_api/vdsmapi-schema.json
@@ -5793,6 +5793,42 @@
  'returns': 'VmDefinition'}
##
+# @VM.hotplugHostdev:
+#
+# Add a new host device to a running VM.
+#
+# @vmID:    The UUID of the VM
+#
+# @hostdevName:  The name of host's device
+#
+# Returns:
+# The VM definition, as updated
+#
+# Since: 4.14.0
+##
+{'command': {'class': 'VM', 'name': 'hotplugHostdev'},
+ 'data': {'vmID': 'UUID', 'hostdevName': 'str'},
+ 'returns': 'VmDefinition'}
+
+##
+# @VM.hotunplugHostdev:
+#
+# Remove a host device from a running VM.
+#
+# @vmID:    The UUID of the VM
+#
+# @hostdevName:  The name of host's device
+#
+# Returns:
+# The VM definition, as updated
+#
+# Since: 4.14.0
+##
+{'command': {'class': 'VM', 'name': 'hotunplugHostdev'},
+ 'data': {'vmID': 'UUID', 'hostdevName': 'str'},
+ 'returns': 'VmDefinition'}
+
+##
 # @MigrateMode:
 #
 # An enumeration of VM migration modes.
-- 
To view, visit http://gerrit.ovirt.org/22523
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8fbf4a1d62789d9404e5977eb7eb01b17a1a43fb
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Martin Polednik mpoledni@redhat.com

    

Change in vdsm[master]: vdsm: add support for hot(un)plug of pci-passthrough devices