[Qemu-devel] [PULL for-2.4 0/1] qemu-ga: small documentation versioning fix-up

[Qemu-devel] [PULL for-2.4 0/1] qemu-ga: small documentation versioning fix-up

[Michael Roth]

The following changes since commit 774ee4772b6838b78741ea52d4bf26b8922244c5:

  Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20150721' into staging (2015-07-21 12:21:08 +0100)

are available in the git repository at:


  git://github.com/mdroth/qemu.git tags/qga-pull-2015-07-21-tag

for you to fetch changes up to 5f8343d0670e91adadb7898304c8ed4355af05a2:

  qga: fixed versions for guest bus types in qapi-schema (2015-07-21 14:36:06 -0500)

----------------------------------------------------------------
tag for qga-pull-2015-07-21

Small fix to correct schema versioning annotations for recently-added
GuestDiskBusType enum values. Not the end of the world, but ideally
this inconsistency would be corrected prior to 2.4 release.

----------------------------------------------------------------
Olga Krishtal (1):
      qga: fixed versions for guest bus types in qapi-schema

 qga/qapi-schema.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

[Qemu-devel] [PATCH] qga: fixed versions for guest bus types in qapi-schema

[Michael Roth]

From: Olga Krishtal <okrishtal@parallels.com>

Signed-off-by: Olga Krishtal <okrishtal@virtuozzo.com>
Signed-off-by: Denis V. Lunev <den@openvz.org>
CC: Eric Blake <eblake@redhat.com>
CC: Michael Roth <mdroth@linux.vnet.ibm.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
*added semi-colon to better delineate 2.2 vs. 2.4 versioning
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
---
 qga/qapi-schema.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/qga/qapi-schema.json b/qga/qapi-schema.json
index 8a9b818..18e3cc3 100644
--- a/qga/qapi-schema.json
+++ b/qga/qapi-schema.json
@@ -714,7 +714,7 @@
 # @virtual: Win virtual bus type
 # @file-backed virtual: Win file-backed bus type
 #
-# Since: 2.2
+# Since: 2.2; 'Unknown' and all entries below since 2.4
 ##
 { 'enum': 'GuestDiskBusType',
   'data': [ 'ide', 'fdc', 'scsi', 'virtio', 'xen', 'usb', 'uml', 'sata',
-- 
1.9.1

Re: [Qemu-devel] [PULL for-2.4 0/1] qemu-ga: small documentation versioning fix-up

[Peter Maydell]

On 21 July 2015 at 20:51, Michael Roth <mdroth@linux.vnet.ibm.com> wrote:
> The following changes since commit 774ee4772b6838b78741ea52d4bf26b8922244c5:
>
>   Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20150721' into staging (2015-07-21 12:21:08 +0100)
>
> are available in the git repository at:
>
>
>   git://github.com/mdroth/qemu.git tags/qga-pull-2015-07-21-tag
>
> for you to fetch changes up to 5f8343d0670e91adadb7898304c8ed4355af05a2:
>
>   qga: fixed versions for guest bus types in qapi-schema (2015-07-21 14:36:06 -0500)
>
> ----------------------------------------------------------------
> tag for qga-pull-2015-07-21
>
> Small fix to correct schema versioning annotations for recently-added
> GuestDiskBusType enum values. Not the end of the world, but ideally
> this inconsistency would be corrected prior to 2.4 release.
>

Applied, thanks.

-- PMM