diff options
| author | Wenchao Xia | 2014-06-18 08:43:30 +0200 |
|---|---|---|
| committer | Luiz Capitulino | 2014-06-23 17:01:25 +0200 |
| commit | a589569f2f40a0454b52398035cfe7fbe44ab1e9 (patch) | |
| tree | 4051a6ec079d736c41ea1ee07e903e0b9abf36a9 /include/block | |
| parent | test: add test cases for qapi event (diff) | |
| download | qemu-a589569f2f40a0454b52398035cfe7fbe44ab1e9.tar.gz qemu-a589569f2f40a0454b52398035cfe7fbe44ab1e9.tar.xz qemu-a589569f2f40a0454b52398035cfe7fbe44ab1e9.zip | |
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>
Diffstat (limited to 'include/block')
| -rw-r--r-- | include/block/block.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/include/block/block.h b/include/block/block.h index f15b99b00b..d0baf4fb83 100644 --- a/include/block/block.h +++ b/include/block/block.h @@ -150,10 +150,6 @@ typedef enum { #define BDRV_BLOCK_ALLOCATED 0x10 #define BDRV_BLOCK_OFFSET_MASK BDRV_SECTOR_MASK -typedef enum { - BDRV_ACTION_REPORT, BDRV_ACTION_IGNORE, BDRV_ACTION_STOP -} BlockErrorAction; - typedef QSIMPLEQ_HEAD(BlockReopenQueue, BlockReopenQueueEntry) BlockReopenQueue; typedef struct BDRVReopenState { |