Change in vdsm[master]: hostdev: remove rom, file and bar settings from API

mpolednik at redhat.com mpolednik at redhat.com
Tue Mar 10 16:15:54 UTC 2015


Martin Polednik has uploaded a new change for review.

Change subject: hostdev: remove rom, file and bar settings from API
......................................................................

hostdev: remove rom, file and bar settings from API

Those settings require a specific file to be present on every host
that would use these parameters. This patch removes their exposure
because no such mechanism was introduced.

Change-Id: I6afd9cfbe010f1156a947524968e6bc96c09cfe8
Signed-off-by: Martin Polednik <mpolednik at redhat.com>
---
M vdsm/rpc/vdsmapi-schema.json
M vdsm/virt/vmdevices/hostdevice.py
2 files changed, 1 insertion(+), 35 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/51/38551/1

diff --git a/vdsm/rpc/vdsmapi-schema.json b/vdsm/rpc/vdsmapi-schema.json
index e866c16..9b02280 100644
--- a/vdsm/rpc/vdsmapi-schema.json
+++ b/vdsm/rpc/vdsmapi-schema.json
@@ -3386,23 +3386,6 @@
 
 
 ##
-# @VmHostDeviceSpecParams:
-#
-# Additional VM host device parameters.
-#
-# @bar:         #optional ROM visibility in the guest's
-#               memory map (for pci)
-#
-# @file:        #optional Binary file to be used as
-#               device's ROM (for pci)
-#
-# Since: 4.17.0
-##
-{'type': 'VmHostDeviceSpecParams',
- 'data': {'*bar': 'bool',
-          '*file': 'str'}}
-
-##
 # @VmHostDevice:
 #
 # Properties of a VM host device.
@@ -3422,16 +3405,12 @@
 #               by libvirt generated address.
 #
 # @alias:       Alias used to identify this device in commands
-#
-# @specParams:  #optional Additional device parameters
-#
 # Since: 4.17.0
 ##
 {'type': 'VmHostDevice',
  'data': {'deviceType': 'VmDeviceType', 'deviceId': 'UUID',
           'device': 'str', 'bootOrder': 'int',
-          'address': 'VmDeviceAddress', 'alias': 'str',
-          '*specParams': 'VmHostDeviceSpecParams'}}
+          'address': 'VmDeviceAddress', 'alias': 'str'}}
 
 ##
 # @VmDevice:
diff --git a/vdsm/virt/vmdevices/hostdevice.py b/vdsm/virt/vmdevices/hostdevice.py
index 4916dcd..e6a1238 100644
--- a/vdsm/virt/vmdevices/hostdevice.py
+++ b/vdsm/virt/vmdevices/hostdevice.py
@@ -49,7 +49,6 @@
                 function='0x0'/>
             </source>
             <boot order='1'/>
-            <rom bar='on' file='/etc/fake/boot.bin'/>
             </hostdev>
         </devices>
         """
@@ -65,18 +64,6 @@
         if self._deviceParams['capability'] == 'pci':
             source.appendChildWithArgs('address', None,
                                        **self._deviceParams['address'])
-            rom = hostdev.appendChildWithArgs('rom')
-            romAttrs = {}
-
-            if 'bar' in self.specParams:
-                if self.specParams['bar']:
-                    romAttrs['bar'] = 'on'
-                else:
-                    romAttrs['bar'] = 'off'
-                if 'file' in self.specParams:
-                    romAttrs['file'] = self.specParams['file']
-
-            rom.setAttrs(**romAttrs)
 
         if hasattr(self, 'address'):
             hostdev.appendChildWithArgs('address', None, **self.address)


-- 
To view, visit https://gerrit.ovirt.org/38551
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6afd9cfbe010f1156a947524968e6bc96c09cfe8
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Martin Polednik <mpolednik at redhat.com>


More information about the vdsm-patches mailing list