summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2018-05-22 11:39:56 +0100
committerPeter Maydell <peter.maydell@linaro.org>2018-05-29 11:28:46 +0100
commit51f63ec7da4ed0a26168e57fea322cbbcaae6064 (patch)
treedb10f7d3174df6e3dd73a7196601e71cb8f568f9
parentb706ec24f1ea0b3f4fcc9f0a8ee7be51bd5a9ac3 (diff)
qapi: Change "since 2.13" annotations to "since 3.0"
We're going to make the next release be 3.0, not 2.13; change the annotations in our json appropriately. Changes produced with sed -i -e 's/2\.13/3.0/g' qapi/*.json Signed-off-by: Peter Maydell <peter.maydell@linaro.org> Reviewed-by: Cornelia Huck <cohuck@redhat.com> Reviewed-by: Thomas Huth <thuth@redhat.com> Message-id: 20180522104000.9044-2-peter.maydell@linaro.org
-rw-r--r--qapi/block-core.json4
-rw-r--r--qapi/common.json2
-rw-r--r--qapi/migration.json16
-rw-r--r--qapi/misc.json4
-rw-r--r--qapi/net.json2
-rw-r--r--qapi/ui.json2
6 files changed, 15 insertions, 15 deletions
diff --git a/qapi/block-core.json b/qapi/block-core.json
index 7dfa77a05c..ad66ad6f80 100644
--- a/qapi/block-core.json
+++ b/qapi/block-core.json
@@ -2424,7 +2424,7 @@
# @vxhs: Since 2.10
# @throttle: Since 2.11
# @nvme: Since 2.12
-# @copy-on-read: Since 2.13
+# @copy-on-read: Since 3.0
#
# Since: 2.9
##
@@ -2452,7 +2452,7 @@
# @x-check-cache-dropped: whether to check that page cache was dropped on live
# migration. May cause noticeable delays if the image
# file is large, do not use in production.
-# (default: off) (since: 2.13)
+# (default: off) (since: 3.0)
#
# Since: 2.9
##
diff --git a/qapi/common.json b/qapi/common.json
index c811d04984..c367adc4b6 100644
--- a/qapi/common.json
+++ b/qapi/common.json
@@ -140,7 +140,7 @@
# prefix to produce the corresponding QEMU executable name. This
# is true even for "qemu-system-x86_64".
#
-# Since: 2.13
+# Since: 3.0
##
{ 'enum' : 'SysEmuTarget',
'data' : [ 'aarch64', 'alpha', 'arm', 'cris', 'hppa', 'i386', 'lm32',
diff --git a/qapi/migration.json b/qapi/migration.json
index 3ec418dabf..dc9cc85545 100644
--- a/qapi/migration.json
+++ b/qapi/migration.json
@@ -89,9 +89,9 @@
#
# @postcopy-active: like active, but now in postcopy mode. (since 2.5)
#
-# @postcopy-paused: during postcopy but paused. (since 2.13)
+# @postcopy-paused: during postcopy but paused. (since 3.0)
#
-# @postcopy-recover: trying to recover from a paused postcopy. (since 2.13)
+# @postcopy-recover: trying to recover from a paused postcopy. (since 3.0)
#
# @completed: migration is finished.
#
@@ -163,11 +163,11 @@
#
# @postcopy-blocktime: total time when all vCPU were blocked during postcopy
# live migration. This is only present when the postcopy-blocktime
-# migration capability is enabled. (Since 2.13)
+# migration capability is enabled. (Since 3.0)
#
# @postcopy-vcpu-blocktime: list of the postcopy blocktime per vCPU. This is
# only present when the postcopy-blocktime migration capability
-# is enabled. (Since 2.13)
+# is enabled. (Since 3.0)
#
#
# Since: 0.14.0
@@ -374,7 +374,7 @@
# (since 2.12)
#
# @postcopy-blocktime: Calculate downtime for postcopy live migration
-# (since 2.13)
+# (since 3.0)
#
# Since: 1.2
##
@@ -1034,7 +1034,7 @@
# @detach: this argument exists only for compatibility reasons and
# is ignored by QEMU
#
-# @resume: resume one paused migration, default "off". (since 2.13)
+# @resume: resume one paused migration, default "off". (since 3.0)
#
# Returns: nothing on success
#
@@ -1208,7 +1208,7 @@
# "arguments": { "uri": "tcp:192.168.1.200:12345" } }
# <- { "return": {} }
#
-# Since: 2.13
+# Since: 3.0
##
{ 'command': 'migrate-recover', 'data': { 'uri': 'str' },
'allow-oob': true }
@@ -1225,6 +1225,6 @@
# -> { "execute": "migrate-pause" }
# <- { "return": {} }
#
-# Since: 2.13
+# Since: 3.0
##
{ 'command': 'migrate-pause', 'allow-oob': true }
diff --git a/qapi/misc.json b/qapi/misc.json
index f5988cc0b5..99bcaacd62 100644
--- a/qapi/misc.json
+++ b/qapi/misc.json
@@ -558,11 +558,11 @@
# @props: properties describing to which node/socket/core/thread
# virtual CPU belongs to, provided if supported by board
#
-# @arch: base architecture of the cpu; deprecated since 2.13.0 in favor
+# @arch: base architecture of the cpu; deprecated since 3.0.0 in favor
# of @target
#
# @target: the QEMU system emulation target, which determines which
-# additional fields will be listed (since 2.13)
+# additional fields will be listed (since 3.0)
#
# Since: 2.12
#
diff --git a/qapi/net.json b/qapi/net.json
index b8adf1f03f..5c1dc48890 100644
--- a/qapi/net.json
+++ b/qapi/net.json
@@ -498,7 +498,7 @@
#
# Since: 1.2
#
-# 'vlan': dropped in 2.13
+# 'vlan': dropped in 3.0
##
{ 'struct': 'NetLegacy',
'data': {
diff --git a/qapi/ui.json b/qapi/ui.json
index 3ad7835992..fc18a05f0f 100644
--- a/qapi/ui.json
+++ b/qapi/ui.json
@@ -1031,7 +1031,7 @@
# @core: Use OpenGL with Core (desktop) Context.
# @es: Use OpenGL with ES (embedded systems) Context.
#
- # Since: 2.13
+ # Since: 3.0
#
##
{ 'enum' : 'DisplayGLMode',