block: Remove BB options from blockdev-add
werror/rerror are now available as qdev options. The stats-* options are removed without an existing replacement; they should probably be configurable with a separate QMP command like I/O throttling settings. Removing id is left for another day because this involves updating qemu-iotests cases to use node-name for everything. Before we can do that, however, all QMP commands must support node-name. Signed-off-by: Kevin Wolf <kwolf@redhat.com> Reviewed-by: Max Reitz <mreitz@redhat.com>
This commit is contained in:
		
							parent
							
								
									62ed9fa991
								
							
						
					
					
						commit
						35fedb7b0e
					
				@ -2081,20 +2081,8 @@
 | 
			
		||||
# @discard:       #optional discard-related options (default: ignore)
 | 
			
		||||
# @cache:         #optional cache-related options
 | 
			
		||||
# @aio:           #optional AIO backend (default: threads)
 | 
			
		||||
# @rerror:        #optional how to handle read errors on the device
 | 
			
		||||
#                 (default: report)
 | 
			
		||||
# @werror:        #optional how to handle write errors on the device
 | 
			
		||||
#                 (default: enospc)
 | 
			
		||||
# @read-only:     #optional whether the block device should be read-only
 | 
			
		||||
#                 (default: false)
 | 
			
		||||
# @stats-account-invalid: #optional whether to include invalid
 | 
			
		||||
#                         operations when computing last access statistics
 | 
			
		||||
#                         (default: true) (Since 2.5)
 | 
			
		||||
# @stats-account-failed: #optional whether to include failed
 | 
			
		||||
#                         operations when computing latency and last
 | 
			
		||||
#                         access statistics (default: true) (Since 2.5)
 | 
			
		||||
# @stats-intervals: #optional list of intervals for collecting I/O
 | 
			
		||||
#                   statistics, in seconds (default: none) (Since 2.5)
 | 
			
		||||
# @detect-zeroes: #optional detect and optimize zero writes (Since 2.1)
 | 
			
		||||
#                 (default: off)
 | 
			
		||||
#
 | 
			
		||||
@ -2104,17 +2092,13 @@
 | 
			
		||||
##
 | 
			
		||||
{ 'union': 'BlockdevOptions',
 | 
			
		||||
  'base': { 'driver': 'BlockdevDriver',
 | 
			
		||||
# TODO 'id' is a BB-level option, remove it
 | 
			
		||||
            '*id': 'str',
 | 
			
		||||
            '*node-name': 'str',
 | 
			
		||||
            '*discard': 'BlockdevDiscardOptions',
 | 
			
		||||
            '*cache': 'BlockdevCacheOptions',
 | 
			
		||||
            '*aio': 'BlockdevAioOptions',
 | 
			
		||||
            '*rerror': 'BlockdevOnError',
 | 
			
		||||
            '*werror': 'BlockdevOnError',
 | 
			
		||||
            '*read-only': 'bool',
 | 
			
		||||
            '*stats-account-invalid': 'bool',
 | 
			
		||||
            '*stats-account-failed': 'bool',
 | 
			
		||||
            '*stats-intervals': ['int'],
 | 
			
		||||
            '*detect-zeroes': 'BlockdevDetectZeroesOptions' },
 | 
			
		||||
  'discriminator': 'driver',
 | 
			
		||||
  'data': {
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user