| Message ID | 1386751754-5753-1-git-send-email-stefanha@redhat.com |
|---|---|
| State | New |
| Headers | show |
On 2013年12月11日 16:49, Stefan Hajnoczi wrote: > We are moving boldly on to QEMU 2.0 in the next release. Some patches > written at a time where we assumed 1.8 would be the next version number > managed to sneak in. > > s/1.8/2.0/ in qapi-schema.json > > Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com> > --- > qapi-schema.json | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/qapi-schema.json b/qapi-schema.json > index d6f8615..5aa4581 100644 > --- a/qapi-schema.json > +++ b/qapi-schema.json > @@ -949,7 +949,7 @@ > # (only present if removable is true) > # > # @dirty-bitmaps: #optional dirty bitmaps information (only present if the > -# driver has one or more dirty bitmaps) (Since 1.8) > +# driver has one or more dirty bitmaps) (Since 2.0) > # > # @io-status: #optional @BlockDeviceIoStatus. Only present if the device > # supports it and the VM is configured to stop on errors > @@ -3022,7 +3022,7 @@ > # > # @devname: #optional path of the netmap device (default: '/dev/netmap'). > # > -# Since 1.8 > +# Since 2.0 > ## > { 'type': 'NetdevNetmapOptions', > 'data': { > Reviewed-by: Fam Zheng <famz@redhat.com>
On 12/11/2013 01:49 AM, Stefan Hajnoczi wrote: > We are moving boldly on to QEMU 2.0 in the next release. Some patches > written at a time where we assumed 1.8 would be the next version number > managed to sneak in. > > s/1.8/2.0/ in qapi-schema.json > > Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com> > --- > qapi-schema.json | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) Reviewed-by: Eric Blake <eblake@redhat.com> Supercedes: https://lists.gnu.org/archive/html/qemu-devel/2013-12/msg01715.html
On Wed, Dec 11, 2013 at 09:49:14AM +0100, Stefan Hajnoczi wrote: > We are moving boldly on to QEMU 2.0 in the next release. Some patches > written at a time where we assumed 1.8 would be the next version number > managed to sneak in. > > s/1.8/2.0/ in qapi-schema.json > > Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com> > --- > qapi-schema.json | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) Thanks, applied to my block tree: https://github.com/stefanha/qemu/commits/block Stefan
On 2013年12月12日 01:32, Eric Blake wrote: > On 12/11/2013 01:49 AM, Stefan Hajnoczi wrote: >> We are moving boldly on to QEMU 2.0 in the next release. Some patches >> written at a time where we assumed 1.8 would be the next version number >> managed to sneak in. >> >> s/1.8/2.0/ in qapi-schema.json >> >> Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com> >> --- >> qapi-schema.json | 4 ++-- >> 1 file changed, 2 insertions(+), 2 deletions(-) > > Reviewed-by: Eric Blake <eblake@redhat.com> > > Supercedes: > https://lists.gnu.org/archive/html/qemu-devel/2013-12/msg01715.html > Yes, that one is already merged. But it's trivial enough to rebase this onto. Fam
diff --git a/qapi-schema.json b/qapi-schema.json index d6f8615..5aa4581 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -949,7 +949,7 @@ # (only present if removable is true) # # @dirty-bitmaps: #optional dirty bitmaps information (only present if the -# driver has one or more dirty bitmaps) (Since 1.8) +# driver has one or more dirty bitmaps) (Since 2.0) # # @io-status: #optional @BlockDeviceIoStatus. Only present if the device # supports it and the VM is configured to stop on errors @@ -3022,7 +3022,7 @@ # # @devname: #optional path of the netmap device (default: '/dev/netmap'). # -# Since 1.8 +# Since 2.0 ## { 'type': 'NetdevNetmapOptions', 'data': {
We are moving boldly on to QEMU 2.0 in the next release. Some patches written at a time where we assumed 1.8 would be the next version number managed to sneak in. s/1.8/2.0/ in qapi-schema.json Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com> --- qapi-schema.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)