|
 |
218e99 |
From d9c7fbe85bdeec60e97ba0c484dd9a88c0ba4994 Mon Sep 17 00:00:00 2001
|
|
|
218e99 |
From: Max Reitz <mreitz@redhat.com>
|
|
|
218e99 |
Date: Wed, 6 Nov 2013 16:53:34 +0100
|
|
|
218e99 |
Subject: [PATCH 77/87] qapi: Add ImageInfoSpecific type
|
|
|
218e99 |
|
|
|
218e99 |
RH-Author: Max Reitz <mreitz@redhat.com>
|
|
|
218e99 |
Message-id: <1383756824-6921-12-git-send-email-mreitz@redhat.com>
|
|
|
218e99 |
Patchwork-id: 55566
|
|
|
218e99 |
O-Subject: [RHEL-7.0 qemu-kvm PATCH v2 11/21] qapi: Add ImageInfoSpecific type
|
|
|
218e99 |
Bugzilla: 980771
|
|
|
218e99 |
RH-Acked-by: Kevin Wolf <kwolf@redhat.com>
|
|
|
218e99 |
RH-Acked-by: Fam Zheng <famz@redhat.com>
|
|
|
218e99 |
RH-Acked-by: Jeffrey Cody <jcody@redhat.com>
|
|
|
218e99 |
|
|
|
218e99 |
BZ: 980771
|
|
|
218e99 |
|
|
|
218e99 |
Add a new type ImageInfoSpecific as a union for image format specific
|
|
|
218e99 |
information in ImageInfo.
|
|
|
218e99 |
|
|
|
218e99 |
Signed-off-by: Max Reitz <mreitz@redhat.com>
|
|
|
218e99 |
Reviewed-by: Eric Blake <eblake@redhat.com>
|
|
|
218e99 |
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
|
|
|
218e99 |
(cherry picked from commit f2bb8a8a47597634b74c161c44b9980c7f4e50ac)
|
|
|
218e99 |
|
|
|
218e99 |
Signed-off-by: Max Reitz <mreitz@redhat.com>
|
|
|
218e99 |
---
|
|
|
218e99 |
qapi-schema.json | 18 +++++++++++++++++-
|
|
|
218e99 |
1 file changed, 17 insertions(+), 1 deletion(-)
|
|
|
218e99 |
|
|
|
218e99 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
218e99 |
---
|
|
|
218e99 |
qapi-schema.json | 18 +++++++++++++++++-
|
|
|
218e99 |
1 files changed, 17 insertions(+), 1 deletions(-)
|
|
|
218e99 |
|
|
|
218e99 |
diff --git a/qapi-schema.json b/qapi-schema.json
|
|
|
218e99 |
index 4091b99..934ac7f 100644
|
|
|
218e99 |
--- a/qapi-schema.json
|
|
|
218e99 |
+++ b/qapi-schema.json
|
|
|
218e99 |
@@ -210,6 +210,18 @@
|
|
|
218e99 |
'vm-clock-sec': 'int', 'vm-clock-nsec': 'int' } }
|
|
|
218e99 |
|
|
|
218e99 |
##
|
|
|
218e99 |
+# @ImageInfoSpecific:
|
|
|
218e99 |
+#
|
|
|
218e99 |
+# A discriminated record of image format specific information structures.
|
|
|
218e99 |
+#
|
|
|
218e99 |
+# Since: 1.7
|
|
|
218e99 |
+##
|
|
|
218e99 |
+
|
|
|
218e99 |
+{ 'union': 'ImageInfoSpecific',
|
|
|
218e99 |
+ 'data': {
|
|
|
218e99 |
+ } }
|
|
|
218e99 |
+
|
|
|
218e99 |
+##
|
|
|
218e99 |
# @ImageInfo:
|
|
|
218e99 |
#
|
|
|
218e99 |
# Information about a QEMU image file
|
|
|
218e99 |
@@ -238,6 +250,9 @@
|
|
|
218e99 |
#
|
|
|
218e99 |
# @backing-image: #optional info of the backing image (since 1.6)
|
|
|
218e99 |
#
|
|
|
218e99 |
+# @format-specific: #optional structure supplying additional format-specific
|
|
|
218e99 |
+# information (since 1.7)
|
|
|
218e99 |
+#
|
|
|
218e99 |
# Since: 1.3
|
|
|
218e99 |
#
|
|
|
218e99 |
##
|
|
|
218e99 |
@@ -248,7 +263,8 @@
|
|
|
218e99 |
'*cluster-size': 'int', '*encrypted': 'bool',
|
|
|
218e99 |
'*backing-filename': 'str', '*full-backing-filename': 'str',
|
|
|
218e99 |
'*backing-filename-format': 'str', '*snapshots': ['SnapshotInfo'],
|
|
|
218e99 |
- '*backing-image': 'ImageInfo' } }
|
|
|
218e99 |
+ '*backing-image': 'ImageInfo',
|
|
|
218e99 |
+ '*format-specific': 'ImageInfoSpecific' } }
|
|
|
218e99 |
|
|
|
218e99 |
##
|
|
|
218e99 |
# @ImageCheck:
|
|
|
218e99 |
--
|
|
|
218e99 |
1.7.1
|
|
|
218e99 |
|