[Qemu-devel] [PATCH] qapi-schema: fix QEMU 1.8 references

[Qemu-devel] [PATCH] qapi-schema: fix QEMU 1.8 references

[Stefan Hajnoczi]

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': {
-- 
1.8.4.2

Re: [Qemu-devel] [PATCH] qapi-schema: fix QEMU 1.8 references

[Fam Zheng]

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>

Re: [Qemu-devel] [PATCH] qapi-schema: fix QEMU 1.8 references

[Eric Blake]

[-- Attachment #1: Type: text/plain, Size: 650 bytes --]

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

-- 
Eric Blake   eblake redhat com    +1-919-301-3266
Libvirt virtualization library http://libvirt.org


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 621 bytes --]

Re: [Qemu-devel] [PATCH] qapi-schema: fix QEMU 1.8 references

[Fam Zheng]

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

Re: [Qemu-devel] [PATCH] qapi-schema: fix QEMU 1.8 references

[Stefan Hajnoczi]

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