]> git.proxmox.com Git - mirror_qemu.git/commit - block.c
qapi: adjust existing defines
authorWenchao Xia <wenchaoqemu@gmail.com>
Wed, 18 Jun 2014 06:43:30 +0000 (08:43 +0200)
committerLuiz Capitulino <lcapitulino@redhat.com>
Mon, 23 Jun 2014 15:01:25 +0000 (11:01 -0400)
commita589569f2f40a0454b52398035cfe7fbe44ab1e9
tree4051a6ec079d736c41ea1ee07e903e0b9abf36a9
parentf6dadb0242029e11640d9434efd39ec8211ea868
qapi: adjust existing defines

In order to let event defines use existing types later, instead of
redefine new ones, some old type defines for spice and vnc are changed,
and BlockErrorAction is moved from block.h to qapi schema. Note that
BlockErrorAction is not merged with BlockdevOnError.

At this point, VncInfo is not made a child of VncBasicInfo, because
VncBasicInfo has mandatory fields where VncInfo makes them optional.

Signed-off-by: Wenchao Xia <wenchaoqemu@gmail.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
16 files changed:
block.c
block/backup.c
block/mirror.c
block/stream.c
blockjob.c
hmp.c
hw/block/virtio-blk.c
hw/ide/core.c
hw/scsi/scsi-disk.c
include/block/block.h
include/qemu/sockets.h
qapi-schema.json
qapi/block-core.json
ui/spice-core.c
ui/vnc.c
util/qemu-sockets.c