On Thu, 09/22 09:58, Eric Blake wrote: > On 08/08/2016 08:13 AM, Fam Zheng wrote: > > To allow overriding the default locking behavior when opening the image. > > > > Signed-off-by: Fam Zheng <f...@redhat.com> > > --- > > qapi/block-core.json | 19 ++++++++++++++++++- > > 1 file changed, 18 insertions(+), 1 deletion(-) > > > > diff --git a/qapi/block-core.json b/qapi/block-core.json > > index 5e2d7d7..d1eb197 100644 > > --- a/qapi/block-core.json > > +++ b/qapi/block-core.json > > @@ -2151,6 +2151,20 @@ > > '*debug-level': 'int' } } > > > > ## > > +# @BlockdevLockMode > > +# > > +# Describes how QEMU should lock the image. > > +# > > +# @off: Disabled > > +# @shared: Use shared lock for both RO and RW images. > > +# @auto: Use exclusive lock for RW images, and shared lock for RO > > images. > > +# > > +# Since: 2.7 > > Just a reminder to update this to 2.8 (probably throughout the series).
Good point, thanks! > > > @@ -2185,7 +2201,8 @@ > > '*cache': 'BlockdevCacheOptions', > > '*aio': 'BlockdevAioOptions', > > '*read-only': 'bool', > > - '*detect-zeroes': 'BlockdevDetectZeroesOptions' }, > > + '*detect-zeroes': 'BlockdevDetectZeroesOptions', > > + '*lock-mode': 'BlockdevLockMode' }, > > 'discriminator': 'driver', > > 'data': { > > 'archipelago':'BlockdevOptionsArchipelago', > > > > Will this need (yet another) rebase on top of Kevin's blockdev-add work? Yes, I think so.. Fam