Am 16.01.2014 11:03, schrieb Kevin Wolf: > Am 15.01.2014 um 16:19 hat Eric Blake geschrieben: >> On 01/15/2014 03:22 AM, Kevin Wolf wrote: >>> From: Max Reitz <mre...@redhat.com> >>> >>> Add structures to support blkdebug and blkverify in blockdev-add. >>> >>> Signed-off-by: Max Reitz <mre...@redhat.com> >>> Signed-off-by: Kevin Wolf <kw...@redhat.com> >>> --- >>> qapi-schema.json | 113 >>> +++++++++++++++++++++++++++++++++++++++++++++++++++++-- >>> 1 file changed, 109 insertions(+), 4 deletions(-) >> >> Sorry for not noticing this sooner, but we still have some interface >> problems that need to be ironed out. > > Nothing that should hold up this pull request, there are just a few > improvements that can be done in a follow-up. > >>> diff --git a/qapi-schema.json b/qapi-schema.json >>> index f27c48a..35f7b34 100644 >>> --- a/qapi-schema.json >>> +++ b/qapi-schema.json >>> @@ -4201,6 +4201,113 @@ >>> '*pass-discard-other': 'bool' } } >>> >>> ## >>> +# @BlkdebugEvent >>> +# >>> +# Trigger events supported by blkdebug. >>> +## >>> +{ 'enum': 'BlkdebugEvent', >> >> Missing a 'Since: 2.0' designation; would be worth adding that in a >> followup patch. > > Ack. > >>> + 'data': [ 'l1_update', 'l1_grow.alloc_table', 'l1_grow.write_table', >>> + 'l1_grow.activate_table', 'l2_load', 'l2_update', >>> + 'l2_update_compressed', 'l2_alloc.cow_read', 'l2_alloc.write', >>> + 'read_aio', 'read_backing_aio', 'read_compressed', 'write_aio', >>> + 'write_compressed', 'vmstate_load', 'vmstate_save', 'cow_read', >>> + 'cow_write', 'reftable_load', 'reftable_grow', >>> 'reftable_update', >>> + 'refblock_load', 'refblock_update', 'refblock_update_part', >>> + 'refblock_alloc', 'refblock_alloc.hookup', >>> 'refblock_alloc.write', >>> + 'refblock_alloc.write_blocks', 'refblock_alloc.write_table', >>> + 'refblock_alloc.switch_table', 'cluster_alloc', >>> + 'cluster_alloc_bytes', 'cluster_free', 'flush_to_os', >>> + 'flush_to_disk' ] } >> >> Do we want to prefer '-' over '_' in all these names? > > These are existing names from the blkdebug configuration file. If we > wanted to have '-' in QMP and '_' in the config file, we'd have to have > some conversion somewhere. Uglier than having underscores here, imho. [snip]
FWIW for -cpu we added code to do an automatic conversion from '_' to '-' so that we could name QOM properties the new way while keeping command line compatibility. As a side-effect, both became possible IIUC. Andreas -- SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg