| Message ID | 1470662013-19785-3-git-send-email-famz@redhat.com |
|---|---|
| State | New |
| Headers | show |
Am 08.08.2016 um 15:13 hat Fam Zheng geschrieben: > To allow overriding the default locking behavior when opening the image. > > Signed-off-by: Fam Zheng <famz@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 > +## > +{ 'enum': 'BlockdevLockMode', > + 'data': [ 'off', 'shared', 'auto' ] } You decided to drop 'exclusive'? Didn't we agree last time that we should have both a real 'exclusive' and 'auto'? Kevin
On Tue, 09/06 18:18, Kevin Wolf wrote: > Am 08.08.2016 um 15:13 hat Fam Zheng geschrieben: > > To allow overriding the default locking behavior when opening the image. > > > > Signed-off-by: Fam Zheng <famz@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 > > +## > > +{ 'enum': 'BlockdevLockMode', > > + 'data': [ 'off', 'shared', 'auto' ] } > > You decided to drop 'exclusive'? Didn't we agree last time that we > should have both a real 'exclusive' and 'auto'? I must have misunderstood it. I can add exclusive back. Fam
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 <famz@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). > @@ -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?
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 <famz@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
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 +## +{ 'enum': 'BlockdevLockMode', + 'data': [ 'off', 'shared', 'auto' ] } + +## # @BlockdevOptions # # Options for creating a block device. Many options are available for all @@ -2172,6 +2186,8 @@ # @detect-zeroes: #optional detect and optimize zero writes (Since 2.1) # (default: off) # +# @lock-mode: #optional how to lock the image. (default: auto) (Since 2.7) +# # Remaining options are determined by the block driver. # # Since: 1.7 @@ -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',
To allow overriding the default locking behavior when opening the image. Signed-off-by: Fam Zheng <famz@redhat.com> --- qapi/block-core.json | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-)