block: Declare blockdev-add and blockdev-del supported

    bs = bdrv_find_node(id);

    if (bs) {

        qmp_x_blockdev_del(id, &local_err);

        qmp_blockdev_del(id, &local_err);

        if (local_err) {

            error_report_err(local_err);

        }

    visit_free(v);

}

void qmp_x_blockdev_del(const char *node_name, Error **errp)

void qmp_blockdev_del(const char *node_name, Error **errp)

{

    AioContext *aio_context;

    BlockDriverState *bs;

# @ignore:      Ignore the request

# @unmap:       Forward as an unmap request

#

# Since: 1.7

# Since: 2.9

##

{ 'enum': 'BlockdevDiscardOptions',

  'data': [ 'ignore', 'unmap' ] }

# @threads:     Use qemu's thread pool

# @native:      Use native AIO backend (only Linux and Windows)

#

# Since: 1.7

# Since: 2.9

##

{ 'enum': 'BlockdevAioOptions',

  'data': [ 'threads', 'native' ] }

# @no-flush:    ignore any flush requests for the device (default:

#               false)

#

# Since: 1.7

# Since: 2.9

##

{ 'struct': 'BlockdevCacheOptions',

  'data': { '*direct': 'bool',

#

# Drivers that are supported in block device operations.

#

# @host_device: Since 2.1

# @host_cdrom: Since 2.1

# @gluster: Since 2.7

# @nbd: Since 2.8

# @nfs: Since 2.8

# @replication: Since 2.8

# @ssh: Since 2.8

# @iscsi: Since 2.9

# @rbd: Since 2.9

# @sheepdog: Since 2.9

#

# Since: 2.0

# Since: 2.9

##

{ 'enum': 'BlockdevDriver',

  'data': [ 'blkdebug', 'blkverify', 'bochs', 'cloop',

# @filename:    path to the image file

# @aio:         AIO backend (default: threads) (since: 2.8)

#

# Since: 1.7

# Since: 2.9

##

{ 'struct': 'BlockdevOptionsFile',

  'data': { 'filename': 'str',

#              requests. Default to zero which completes requests immediately.

#              (Since 2.4)

#

# Since: 2.2

# Since: 2.9

##

{ 'struct': 'BlockdevOptionsNull',

  'data': { '*size': 'int', '*latency-ns': 'uint64' } }

#               (since 2.4)

# @rw:          whether to allow write operations (default: false)

#

# Since: 1.7

# Since: 2.9

##

{ 'struct': 'BlockdevOptionsVVFAT',

  'data': { 'dir': 'str', '*fat-type': 'int', '*floppy': 'bool',

#

# @file:        reference to or definition of the data source block device

#

# Since: 1.7

# Since: 2.9

##

{ 'struct': 'BlockdevOptionsGenericFormat',

  'data': { 'file': 'BlockdevRef' } }

#              the decryption key (since 2.6). Mandatory except when

#              doing a metadata-only probe of the image.

#

# Since: 2.6

# Since: 2.9

##

{ 'struct': 'BlockdevOptionsLUKS',

  'base': 'BlockdevOptionsGenericFormat',

#               allowed to pass an empty string here in order to disable the

#               default backing file.

#

# Since: 1.7

# Since: 2.9

##

{ 'struct': 'BlockdevOptionsGenericCOWFormat',

  'base': 'BlockdevOptionsGenericFormat',

#

# @all:         Perform all available overlap checks

#

# Since: 2.2

# Since: 2.9

##

{ 'enum': 'Qcow2OverlapCheckMode',

  'data': [ 'none', 'constant', 'cached', 'all' ] }

# @template: Specifies a template mode which can be adjusted using the other

#            flags, defaults to 'cached'

#

# Since: 2.2

# Since: 2.9

##

{ 'struct': 'Qcow2OverlapCheckFlags',

  'data': { '*template':       'Qcow2OverlapCheckMode',

#

# @mode:    named mode which chooses a specific set of flags

#

# Since: 2.2

# Since: 2.9

##

{ 'alternate': 'Qcow2OverlapChecks',

  'data': { 'flags': 'Qcow2OverlapCheckFlags',

#                         caches. The interval is in seconds. The default value

#                         is 0 and it disables this feature (since 2.5)

#

# Since: 1.7

# Since: 2.9

##

{ 'struct': 'BlockdevOptionsQcow2',

  'base': 'BlockdevOptionsGenericCOWFormat',

#

# TODO: Expose the host_key_check option in QMP

#

# Since: 2.8

# Since: 2.9

##

{ 'struct': 'BlockdevOptionsSsh',

  'data': { 'server': 'InetSocketAddress',

#

# Trigger events supported by blkdebug.

#

# Since: 2.0

# Since: 2.9

##

{ 'enum': 'BlkdebugEvent', 'prefix': 'BLKDBG',

  'data': [ 'l1_update', 'l1_grow_alloc_table', 'l1_grow_write_table',

#

# @immediately: fail immediately; defaults to false

#

# Since: 2.0

# Since: 2.9

##

{ 'struct': 'BlkdebugInjectErrorOptions',

  'data': { 'event': 'BlkdebugEvent',

# @new_state:   the state identifier blkdebug is supposed to assume if

#               this event is triggered

#

# Since: 2.0

# Since: 2.9

##

{ 'struct': 'BlkdebugSetStateOptions',

  'data': { 'event': 'BlkdebugEvent',

#

# @set-state:       array of state-change descriptions

#

# Since: 2.0

# Since: 2.9

##

{ 'struct': 'BlockdevOptionsBlkdebug',

  'data': { 'image': 'BlockdevRef',

#

# @raw:     raw image used for verification

#

# Since: 2.0

# Since: 2.9

##

{ 'struct': 'BlockdevOptionsBlkverify',

  'data': { 'test': 'BlockdevRef',

#

# @fifo: read only from the first child that has not failed

#

# Since: 2.2

# Since: 2.9

##

{ 'enum': 'QuorumReadPattern', 'data': [ 'quorum', 'fifo' ] }

# @read-pattern: choose read pattern and set to quorum by default

#                (Since 2.2)

#

# Since: 2.0

# Since: 2.9

##

{ 'struct': 'BlockdevOptionsQuorum',

  'data': { '*blkverify': 'bool',

#

# @logfile:     libgfapi log file (default /dev/stderr) (Since 2.8)

#

# Since: 2.7

# Since: 2.9

##

{ 'struct': 'BlockdevOptionsGluster',

  'data': { 'volume': 'str',

#

# @secondary: Secondary mode, receive the vm's state from primary QEMU.

#

# Since: 2.8

# Since: 2.9

##

{ 'enum' : 'ReplicationMode', 'data' : [ 'primary', 'secondary' ] }

#          node who owns the replication node chain. Must not be given in

#          primary mode.

#

# Since: 2.8

# Since: 2.9

##

{ 'struct': 'BlockdevOptionsReplication',

  'base': 'BlockdevOptionsGenericFormat',

#

# @inet:        TCP transport

#

# Since: 2.8

# Since: 2.9

##

{ 'enum': 'NFSTransport',

  'data': [ 'inet' ] }

#

# @host:        host address for NFS server

#

# Since: 2.8

# Since: 2.9

##

{ 'struct': 'NFSServer',

  'data': { 'type': 'NFSTransport',

# @debug:                   set the NFS debug level (max 2) (defaults

#                           to libnfs default)

#

# Since: 2.8

# Since: 2.9

##

{ 'struct': 'BlockdevOptionsNfs',

  'data': { 'server': 'NFSServer',

#

# @filename:    path to the image file

#

# Since: 1.7

# Since: 2.9

##

{ 'struct': 'BlockdevOptionsCurl',

  'data': { 'filename': 'str' } }

#

# @tls-creds:   TLS credentials ID

#

# Since: 2.8

# Since: 2.9

##

{ 'struct': 'BlockdevOptionsNbd',

  'data': { 'server': 'SocketAddress',

# @offset:      position where the block device starts

# @size:        the assumed size of the device

#

# Since: 2.8

# Since: 2.9

##

{ 'struct': 'BlockdevOptionsRaw',

  'base': 'BlockdevOptionsGenericFormat',

#

# Remaining options are determined by the block driver.

#

# Since: 1.7

# Since: 2.9

##

{ 'union': 'BlockdevOptions',

  'base': { 'driver': 'BlockdevDriver',

#                   empty string means that no block device should be

#                   referenced.

#

# Since: 1.7

# Since: 2.9

##

{ 'alternate': 'BlockdevRef',

  'data': { 'definition': 'BlockdevOptions',

# BlockBackend will be created; otherwise, @node-name is mandatory at the top

# level and no BlockBackend will be created.

#

# Note: This command is still a work in progress.  It doesn't support all

# block drivers among other things.  Stay away from it unless you want

# to help with its development.

#

# Since: 1.7

# Since: 2.9

#

# Example:

#

{ 'command': 'blockdev-add', 'data': 'BlockdevOptions', 'boxed': true }

##

# @x-blockdev-del:

# @blockdev-del:

#

# Deletes a block device that has been added using blockdev-add.

# The command will fail if the node is attached to a device or is

#

# @node-name: Name of the graph node to delete.

#

# Note: This command is still a work in progress and is considered

# experimental. Stay away from it unless you want to help with its

# development.

#

# Since: 2.5

# Since: 2.9

#

# Example:

#

#    }

# <- { "return": {} }

#

# -> { "execute": "x-blockdev-del",

# -> { "execute": "blockdev-del",

#      "arguments": { "node-name": "node0" }

#    }

# <- { "return": {} }

#

##

{ 'command': 'x-blockdev-del', 'data': { 'node-name': 'str' } }

{ 'command': 'blockdev-del', 'data': { 'node-name': 'str' } }

##

# @blockdev-open-tray:

#!/usr/bin/env python

#

# Test cases for the QMP 'x-blockdev-del' command

# Test cases for the QMP 'blockdev-del' command

#

# Copyright (C) 2015 Igalia, S.L.

# Author: Alberto Garcia <berto@igalia.com>

    # Delete a BlockDriverState

    def delBlockDriverState(self, node, expect_error = False):

        self.checkBlockDriverState(node)

        result = self.vm.qmp('x-blockdev-del', node_name = node)

        result = self.vm.qmp('blockdev-del', node_name = node)

        if expect_error:

            self.assert_qmp(result, 'error/class', 'GenericError')

        else:

        self.wait_until_completed(id)

    # Add a BlkDebug node

    # Note that the purpose of this is to test the x-blockdev-del

    # Note that the purpose of this is to test the blockdev-del

    # sanity checks, not to create a usable blkdebug drive

    def addBlkDebug(self, debug, node):

        self.checkBlockDriverState(node, False)

        self.checkBlockDriverState(debug)

    # Add a BlkVerify node

    # Note that the purpose of this is to test the x-blockdev-del

    # Note that the purpose of this is to test the blockdev-del

    # sanity checks, not to create a usable blkverify drive

    def addBlkVerify(self, blkverify, test, raw):

        self.checkBlockDriverState(test, False)

    # We want this to return an error because the block job is still running

    _send_qemu_cmd $QEMU_HANDLE \

        "{'execute': 'x-blockdev-del',

        "{'execute': 'blockdev-del',

          'arguments': {'node-name': 'drv0'}}" \

        'error' | _filter_generated_node_ids

        "$3"

    _send_qemu_cmd $QEMU_HANDLE \

        "{'execute': 'x-blockdev-del',

        "{'execute': 'blockdev-del',

          'arguments': {'node-name': 'drv0'}}" \

        'return'

}

                                                    filename)

                break

        result = self.vm.qmp('x-blockdev-del', node_name='nbd-blockdev')

        result = self.vm.qmp('blockdev-del', node_name='nbd-blockdev')

        self.assert_qmp(result, 'return', {})