From patchwork Tue May 22 10:39:56 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 136527 Delivered-To: patches@linaro.org Received: by 2002:a2e:9706:0:0:0:0:0 with SMTP id r6-v6csp1443666lji; Tue, 22 May 2018 03:40:09 -0700 (PDT) X-Google-Smtp-Source: AB8JxZoPNH8cyD91amSIJQ5y+xnXpFY7MT2wcZQGISGYO46MtRB02fZ1gSJTdw5Spiu23GN85TD9 X-Received: by 2002:a65:578b:: with SMTP id b11-v6mr5348529pgr.57.1526985609086; Tue, 22 May 2018 03:40:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1526985609; cv=none; d=google.com; s=arc-20160816; b=deABTTrtfGlZEF8+v5r0OxpSFBv8sj/FF7t8F5V381jOleddpfjjj5J6UjY29dI83L nnahiwDEU46TOP9Oo9xzNeD2kkEGyOW6ErqJUnnh8owB2335RDKA2vM/hs9/FmnL9wY3 75XJrhUNgP93aHN+fCHQyQPscoHwqure8suVT5DQdDK4CXMEbQcYpb6RTdofmlZy1O4v DqkX1FtHkS5CaTb0Yolks+di7butL6gZeT3u5RoMyV1DSi4jO8FjfA8zb9btpxUdbGK7 jSbe2c1A1oLU6ATECi9PeKYF0swk2RIKqNj8D4xZ9BqwKDB5dLdY2QV3wg0vQOSLCWBY kaYA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :arc-authentication-results; bh=2kPVF6Cqfjd89gGqw2tOLZSuvqd2I+QtwYh8/6k8TYI=; b=lHbmDTKeleRSHYfPbIxfnbLxuzPhlwLzRrruTEyjiqdJ3LfE2qlGKr4D4HSHzZjcRg 0FWQa5iJStVxPYMzQ6V5sfynb9XvNKGvPJ19O+fdnbrwq+RCAKMMtts2guqygTKve0SR OfstXHirRTsyBvVn36YyQWNjsHS7iQ0p3AVfGt999UILvWQUxBB4lcqzwgqFsrj9bzGX iPzv2y/ZdeBy7F3Z2Lk3GJSHoqCr7kD7zSgcBXakSOMNgJA6GY8hD5FsR66jimzxqllX fEFqixUwYAufFVcD+DKMfefYm5ULTWavkw8zamiqXiugSScIQ30LVl3gBv5qkuUGlsX6 DZDg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of pm215@archaic.org.uk designates 2001:8b0:1d0::2 as permitted sender) smtp.mailfrom=pm215@archaic.org.uk; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by mx.google.com with ESMTPS id o9-v6si16541011pfk.276.2018.05.22.03.40.08 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 22 May 2018 03:40:09 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of pm215@archaic.org.uk designates 2001:8b0:1d0::2 as permitted sender) client-ip=2001:8b0:1d0::2; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of pm215@archaic.org.uk designates 2001:8b0:1d0::2 as permitted sender) smtp.mailfrom=pm215@archaic.org.uk; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from pm215 by orth.archaic.org.uk with local (Exim 4.89) (envelope-from ) id 1fL4i2-0000jx-Rx; Tue, 22 May 2018 11:40:02 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Cc: patches@linaro.org, "Michael S. Tsirkin" , Marcel Apfelbaum , Paolo Bonzini , Eduardo Habkost , David Gibson , Cornelia Huck , Christian Borntraeger , Eric Blake , Markus Armbruster , qemu-ppc@nongnu.org, qemu-s390x@nongnu.org Subject: [PATCH 1/5] qapi: Change "since 2.13" annotations to "since 3.0" Date: Tue, 22 May 2018 11:39:56 +0100 Message-Id: <20180522104000.9044-2-peter.maydell@linaro.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180522104000.9044-1-peter.maydell@linaro.org> References: <20180522104000.9044-1-peter.maydell@linaro.org> 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 --- qapi/block-core.json | 4 ++-- qapi/common.json | 2 +- qapi/migration.json | 16 ++++++++-------- qapi/misc.json | 4 ++-- qapi/net.json | 2 +- qapi/ui.json | 2 +- 6 files changed, 15 insertions(+), 15 deletions(-) -- 2.17.0 Reviewed-by: Cornelia Huck Reviewed-by: Thomas Huth diff --git a/qapi/block-core.json b/qapi/block-core.json index 55728cb823..b5ce98856b 100644 --- a/qapi/block-core.json +++ b/qapi/block-core.json @@ -2510,7 +2510,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 ## @@ -2538,7 +2538,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', From patchwork Tue May 22 10:39:57 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 136523 Delivered-To: patches@linaro.org Received: by 2002:a2e:9706:0:0:0:0:0 with SMTP id r6-v6csp1443600lji; Tue, 22 May 2018 03:40:05 -0700 (PDT) X-Google-Smtp-Source: AB8JxZqeAKnaE35JMv3JQPYjpIKYnpOaMKPwIjfbMinDfUavGKaj1iyEJVxJMysGVTbj3voISqJr X-Received: by 2002:a19:3b0e:: with SMTP id i14-v6mr2958252lfa.48.1526985605355; Tue, 22 May 2018 03:40:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1526985605; cv=none; d=google.com; s=arc-20160816; b=m9bZ06LOGlm4tlwQPXrpt51sErrgGparP1wdqpVwDeVYZFxjkBH6J6R91fd9t0E07U ov8QAVMeVmWggveGH38b9A805rNsy8TzFtb1AIR/lRWtOjn1aG4TnsoXgJXCv/by3w6L JxeNTdAca39DZ/vW4QeET6m813h7aQHQEpfEfn9HVdrWBaxUrrkfKEIsIZCRaw7k8aD8 9YNEo5YO5Fg5llPErZ5FbqPiDU6ylPesfc+4wapzr63233IiTEmd+jEsjiXFEsFouJEc xrSdZ/gmLizwoU79H85AnDZmPO35NATiz8QS3xAVjaJsmuh6gW94esicCMn2dQbBTykd 3T+g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :arc-authentication-results; bh=NSPkIW/xye4w0E+3Wm0zRvQy7nY48So8r0tHeLECIrs=; b=rl0PF5EYemACBMSG4K1EdIQ5G06cyxA7tc5VaZyzmEH8W/teg0qy/XS77B8KMB+1+O vwBBBBHwIMewG1R6aP5FjJSfBTv6gNUHx9Gm8bFKnv++qh6GEMvcWC/Ak9PD7aTQu+BX YvatCdMRDiAbfLitc2jLHl4FX06T00CD3BQXmusrTedvxnwiiBVDRfGQgLmteIfYyEux DkXGQHDZPBz2iincXR+5up7iKJJsl618/rJjZfU6NGpk8CzGUVKu744Rt165L6rw27xd sQ4k4KLC0joxCu9yel4RIHhkc3YySam+Sr9CnfL2RToxRCUDhABXY43dBxIUWq0n6luw 3HQA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of pm215@archaic.org.uk designates 2001:8b0:1d0::2 as permitted sender) smtp.mailfrom=pm215@archaic.org.uk; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by mx.google.com with ESMTPS id i23-v6si7234043ljh.368.2018.05.22.03.40.05 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 22 May 2018 03:40:05 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of pm215@archaic.org.uk designates 2001:8b0:1d0::2 as permitted sender) client-ip=2001:8b0:1d0::2; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of pm215@archaic.org.uk designates 2001:8b0:1d0::2 as permitted sender) smtp.mailfrom=pm215@archaic.org.uk; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from pm215 by orth.archaic.org.uk with local (Exim 4.89) (envelope-from ) id 1fL4i3-0000kD-I8; Tue, 22 May 2018 11:40:03 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Cc: patches@linaro.org, "Michael S. Tsirkin" , Marcel Apfelbaum , Paolo Bonzini , Eduardo Habkost , David Gibson , Cornelia Huck , Christian Borntraeger , Eric Blake , Markus Armbruster , qemu-ppc@nongnu.org, qemu-s390x@nongnu.org Subject: [PATCH 2/5] hw/i386: Rename 2.13 machine types to 3.0 Date: Tue, 22 May 2018 11:39:57 +0100 Message-Id: <20180522104000.9044-3-peter.maydell@linaro.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180522104000.9044-1-peter.maydell@linaro.org> References: <20180522104000.9044-1-peter.maydell@linaro.org> Rename the 2.13 machine types to match what we're going to use as our next release number. Signed-off-by: Peter Maydell --- hw/i386/pc_piix.c | 8 ++++---- hw/i386/pc_q35.c | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) -- 2.17.0 Reviewed-by: Cornelia Huck Reviewed-by: Thomas Huth Reviewed-by: Eduardo Habkost diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index e36c7bbb40..b4c5b03274 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -425,19 +425,19 @@ static void pc_i440fx_machine_options(MachineClass *m) m->default_display = "std"; } -static void pc_i440fx_2_13_machine_options(MachineClass *m) +static void pc_i440fx_3_0_machine_options(MachineClass *m) { pc_i440fx_machine_options(m); m->alias = "pc"; m->is_default = 1; } -DEFINE_I440FX_MACHINE(v2_13, "pc-i440fx-2.13", NULL, - pc_i440fx_2_13_machine_options); +DEFINE_I440FX_MACHINE(v3_0, "pc-i440fx-3.0", NULL, + pc_i440fx_3_0_machine_options); static void pc_i440fx_2_12_machine_options(MachineClass *m) { - pc_i440fx_2_13_machine_options(m); + pc_i440fx_3_0_machine_options(m); m->is_default = 0; m->alias = NULL; SET_MACHINE_COMPAT(m, PC_COMPAT_2_12); diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c index 2372457c6a..83d6d75efa 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -308,18 +308,18 @@ static void pc_q35_machine_options(MachineClass *m) m->max_cpus = 288; } -static void pc_q35_2_13_machine_options(MachineClass *m) +static void pc_q35_3_0_machine_options(MachineClass *m) { pc_q35_machine_options(m); m->alias = "q35"; } -DEFINE_Q35_MACHINE(v2_13, "pc-q35-2.13", NULL, - pc_q35_2_13_machine_options); +DEFINE_Q35_MACHINE(v3_0, "pc-q35-3.0", NULL, + pc_q35_3_0_machine_options); static void pc_q35_2_12_machine_options(MachineClass *m) { - pc_q35_2_13_machine_options(m); + pc_q35_3_0_machine_options(m); m->alias = NULL; SET_MACHINE_COMPAT(m, PC_COMPAT_2_12); } From patchwork Tue May 22 10:39:58 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 136522 Delivered-To: patches@linaro.org Received: by 2002:a2e:9706:0:0:0:0:0 with SMTP id r6-v6csp1443599lji; Tue, 22 May 2018 03:40:05 -0700 (PDT) X-Google-Smtp-Source: AB8JxZrVWNvIt7cSMCE65bbmm9le3PG8wlmYupgvuuLTwjQWmcDVkaWv/3rBlRPIuIBbAlXpTR34 X-Received: by 2002:a2e:5f0f:: with SMTP id t15-v6mr15285296ljb.2.1526985605354; Tue, 22 May 2018 03:40:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1526985605; cv=none; d=google.com; s=arc-20160816; b=V9ov42f1xPN85nWMz0eoUQtcGOWiNNYdGBGTtB4/ls2B6mma+cRbAXKrLGstXjPssI tMMS/jcex87nwxJQ++mF8bQPEg451kmCS4oVGNl6h2L69CrYYkK0xj8XPY+QvpP/L66y UtTHLOmKsiXGdsANXWdaCNKbmSSmCYv3B1vJ62nKljcp5A+6feRx/aDF1Sv2azuqqVC1 rqFfYRkCD7wuY5j+wucBSk94JyX7rEm86A6AGw4YozDoPsMhmQjaAC20F2y7E5BQcWnQ R8G4IldBMeUIDDFC2RDpHv3cJD0cxctjg9bdfVYJfeGMuaADf2rb81PtqkSr1nITHE3E iv4g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :arc-authentication-results; bh=xwiory9EUdprpE6WWfOZI6kt3tGuKCwj7nDqnTe0gk0=; b=knoDx++3cvy9krKhD0s9GPJ7K0FLsRBtdGwiV8dkFYuHOPMSkSvFBjSsk1lNQyrkfG wpCg3wR+DrUhHIDMviA7kQa2b91zgt1iHrea7H0vrlcZ14OtKuNyYmrHyRs2xCG7aq71 aBTzZK17FPZ9gUDHKcTszrqjcUNwcqkDO6dLd46ltZgJDGgMvByBxlq3W5VFBfkd0SFI LzZMRaBX+sQ0uM1b4JWYi15weSFCM/5DnD5E7jm0vqaQ5pgX9510m5LOE+sX2oBucMEA j877tBafKdUREgdzygNJB89wXCMD0qn+tbChjgImfB2pXIqzDheZIhH2s/mzeIeu9VjC coLA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of pm215@archaic.org.uk designates 2001:8b0:1d0::2 as permitted sender) smtp.mailfrom=pm215@archaic.org.uk; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by mx.google.com with ESMTPS id z21-v6si6915823ljg.390.2018.05.22.03.40.05 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 22 May 2018 03:40:05 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of pm215@archaic.org.uk designates 2001:8b0:1d0::2 as permitted sender) client-ip=2001:8b0:1d0::2; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of pm215@archaic.org.uk designates 2001:8b0:1d0::2 as permitted sender) smtp.mailfrom=pm215@archaic.org.uk; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from pm215 by orth.archaic.org.uk with local (Exim 4.89) (envelope-from ) id 1fL4i4-0000kQ-7i; Tue, 22 May 2018 11:40:04 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Cc: patches@linaro.org, "Michael S. Tsirkin" , Marcel Apfelbaum , Paolo Bonzini , Eduardo Habkost , David Gibson , Cornelia Huck , Christian Borntraeger , Eric Blake , Markus Armbruster , qemu-ppc@nongnu.org, qemu-s390x@nongnu.org Subject: [PATCH 3/5] hw/s390x: Rename 2.13 machines to 3.0 Date: Tue, 22 May 2018 11:39:58 +0100 Message-Id: <20180522104000.9044-4-peter.maydell@linaro.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180522104000.9044-1-peter.maydell@linaro.org> References: <20180522104000.9044-1-peter.maydell@linaro.org> Rename the 2.13 machines to match the number we're going to use for the next release. Signed-off-by: Peter Maydell --- hw/s390x/s390-virtio-ccw.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) -- 2.17.0 Reviewed-by: Cornelia Huck Reviewed-by: Thomas Huth diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c index e548d341a0..7ae5fb38dd 100644 --- a/hw/s390x/s390-virtio-ccw.c +++ b/hw/s390x/s390-virtio-ccw.c @@ -812,23 +812,23 @@ bool css_migration_enabled(void) .value = "0",\ }, -static void ccw_machine_2_13_instance_options(MachineState *machine) +static void ccw_machine_3_0_instance_options(MachineState *machine) { } -static void ccw_machine_2_13_class_options(MachineClass *mc) +static void ccw_machine_3_0_class_options(MachineClass *mc) { } -DEFINE_CCW_MACHINE(2_13, "2.13", true); +DEFINE_CCW_MACHINE(3_0, "3.0", true); static void ccw_machine_2_12_instance_options(MachineState *machine) { - ccw_machine_2_13_instance_options(machine); + ccw_machine_3_0_instance_options(machine); } static void ccw_machine_2_12_class_options(MachineClass *mc) { - ccw_machine_2_13_class_options(mc); + ccw_machine_3_0_class_options(mc); SET_MACHINE_COMPAT(mc, CCW_COMPAT_2_12); } DEFINE_CCW_MACHINE(2_12, "2.12", false); From patchwork Tue May 22 10:39:59 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 136526 Delivered-To: patches@linaro.org Received: by 2002:a2e:9706:0:0:0:0:0 with SMTP id r6-v6csp1443657lji; Tue, 22 May 2018 03:40:08 -0700 (PDT) X-Google-Smtp-Source: AB8JxZoncM67By1bNaoYzFULvKGXFTMXiOu8dAF8Thg9bb0uRg7M10dG+yQezmweLyUrBDRv2xCJ X-Received: by 2002:a65:6354:: with SMTP id p20-v6mr18885569pgv.437.1526985608490; Tue, 22 May 2018 03:40:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1526985608; cv=none; d=google.com; s=arc-20160816; b=vi1XJufxBfOlrHCrePlnUSKhlM0bnU+9sb2fmneG85yvpoxKKbYzQ4pcwD+LQuZyo3 RR1NVsKsNlzD1v0FeeUHwUMHQ6NuLgQLdA+pT1KhaB+gpHAiZo2NHHIh384xGU+RYGJ+ vPXcrGFwYEiEuk/VPYNMjeOEOwr6WvORqWeWVl8ZzgqKg+CZI4Am/NJfSuJIBIfw7fMR pcuPydupI905YMqmF2hqDmIZHT3EQvjSHKSNCmG11t2hMP6MBb8Xs3xP32vudcK1IOXg SZQxQ9Fkc4JG9rztev8dVUOVtrTJHx9/O40q4BCbLQ2lCR0Q6QObwIZDKks/CeV9KCGP /zmA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :arc-authentication-results; bh=qAxpmwBNxobZCH9z9swHo7H5A0cRHhFu8zFxltozzeg=; b=xCs8QtEQ3Wgegt3feEc0LuhqUlljTFIvU22s8lxy9MFzLfVWd/qLZRvfyZyb1M/Gxn kFKd2u0F3mZLc2+xOtdWXtGneFmE8CP7tBlXTKAbU/7NcgOsJvNI/T1ZYOaqbWU++68H 4lQPNqgeE7sPXyEXs8nJvFqBAqmGwhhrnIDCvt97AHwh7lJ4nAIdRCH4VJn5u8aP9Wdq Bqsmo5rocIJ0CW9kEau0K5AVSq3Uc6g79MSgYUwKOAdwr9t6F0MchHl1+Rg4Y1CLSd7j ksggHqNm4F4f7bQ+ZFGGVpWLPBexsXE4xlCnxX41ijwrEGNnrStf07s5YOtsrHzCPukL s4Gw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of pm215@archaic.org.uk designates 2001:8b0:1d0::2 as permitted sender) smtp.mailfrom=pm215@archaic.org.uk; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by mx.google.com with ESMTPS id u3-v6si16443342plb.2.2018.05.22.03.40.07 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 22 May 2018 03:40:08 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of pm215@archaic.org.uk designates 2001:8b0:1d0::2 as permitted sender) client-ip=2001:8b0:1d0::2; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of pm215@archaic.org.uk designates 2001:8b0:1d0::2 as permitted sender) smtp.mailfrom=pm215@archaic.org.uk; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from pm215 by orth.archaic.org.uk with local (Exim 4.89) (envelope-from ) id 1fL4i4-0000ko-UN; Tue, 22 May 2018 11:40:04 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Cc: patches@linaro.org, "Michael S. Tsirkin" , Marcel Apfelbaum , Paolo Bonzini , Eduardo Habkost , David Gibson , Cornelia Huck , Christian Borntraeger , Eric Blake , Markus Armbruster , qemu-ppc@nongnu.org, qemu-s390x@nongnu.org Subject: [PATCH 4/5] ppc: Rename 2.13 machines to 3.0 Date: Tue, 22 May 2018 11:39:59 +0100 Message-Id: <20180522104000.9044-5-peter.maydell@linaro.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180522104000.9044-1-peter.maydell@linaro.org> References: <20180522104000.9044-1-peter.maydell@linaro.org> Rename the 2.13 machines to match the number we're going to use for the next release. Signed-off-by: Peter Maydell --- target/ppc/cpu.h | 2 +- hw/ppc/spapr.c | 14 +++++++------- target/ppc/machine.c | 8 ++++---- target/ppc/translate_init.inc.c | 2 +- 4 files changed, 13 insertions(+), 13 deletions(-) -- 2.17.0 Reviewed-by: Cornelia Huck Reviewed-by: Thomas Huth Reviewed-by: Greg Kurz diff --git a/target/ppc/cpu.h b/target/ppc/cpu.h index 7ccd2f460e..0247c1f04c 100644 --- a/target/ppc/cpu.h +++ b/target/ppc/cpu.h @@ -1215,7 +1215,7 @@ struct PowerPCCPU { uint64_t mig_insns_flags2; uint32_t mig_nb_BATs; bool pre_2_10_migration; - bool pre_2_13_migration; + bool pre_3_0_migration; int32_t mig_slb_nr; }; diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index ebf30dd60b..213f6f9599 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -4071,18 +4071,18 @@ static const TypeInfo spapr_machine_info = { type_init(spapr_machine_register_##suffix) /* - * pseries-2.13 + * pseries-3.0 */ -static void spapr_machine_2_13_instance_options(MachineState *machine) +static void spapr_machine_3_0_instance_options(MachineState *machine) { } -static void spapr_machine_2_13_class_options(MachineClass *mc) +static void spapr_machine_3_0_class_options(MachineClass *mc) { /* Defaults for the latest behaviour inherited from the base class */ } -DEFINE_SPAPR_MACHINE(2_13, "2.13", true); +DEFINE_SPAPR_MACHINE(3_0, "3.0", true); /* * pseries-2.12 @@ -4091,18 +4091,18 @@ DEFINE_SPAPR_MACHINE(2_13, "2.13", true); HW_COMPAT_2_12 \ { \ .driver = TYPE_POWERPC_CPU, \ - .property = "pre-2.13-migration", \ + .property = "pre-3.0-migration", \ .value = "on", \ }, static void spapr_machine_2_12_instance_options(MachineState *machine) { - spapr_machine_2_13_instance_options(machine); + spapr_machine_3_0_instance_options(machine); } static void spapr_machine_2_12_class_options(MachineClass *mc) { - spapr_machine_2_13_class_options(mc); + spapr_machine_3_0_class_options(mc); SET_MACHINE_COMPAT(mc, SPAPR_COMPAT_2_12); } diff --git a/target/ppc/machine.c b/target/ppc/machine.c index ba1b9e531f..b2745ec4e5 100644 --- a/target/ppc/machine.c +++ b/target/ppc/machine.c @@ -150,11 +150,11 @@ static bool cpu_pre_2_8_migration(void *opaque, int version_id) } #if defined(TARGET_PPC64) -static bool cpu_pre_2_13_migration(void *opaque, int version_id) +static bool cpu_pre_3_0_migration(void *opaque, int version_id) { PowerPCCPU *cpu = opaque; - return cpu->pre_2_13_migration; + return cpu->pre_3_0_migration; } #endif @@ -220,7 +220,7 @@ static int cpu_pre_save(void *opaque) cpu->mig_insns_flags2 = env->insns_flags2 & insns_compat_mask2; cpu->mig_nb_BATs = env->nb_BATs; } - if (cpu->pre_2_13_migration) { + if (cpu->pre_3_0_migration) { if (cpu->hash64_opts) { cpu->mig_slb_nr = cpu->hash64_opts->slb_size; } @@ -517,7 +517,7 @@ static const VMStateDescription vmstate_slb = { .needed = slb_needed, .post_load = slb_post_load, .fields = (VMStateField[]) { - VMSTATE_INT32_TEST(mig_slb_nr, PowerPCCPU, cpu_pre_2_13_migration), + VMSTATE_INT32_TEST(mig_slb_nr, PowerPCCPU, cpu_pre_3_0_migration), VMSTATE_SLB_ARRAY(env.slb, PowerPCCPU, MAX_SLB_ENTRIES), VMSTATE_END_OF_LIST() } diff --git a/target/ppc/translate_init.inc.c b/target/ppc/translate_init.inc.c index a0b3f184b2..ab782cb32a 100644 --- a/target/ppc/translate_init.inc.c +++ b/target/ppc/translate_init.inc.c @@ -10427,7 +10427,7 @@ static Property ppc_cpu_properties[] = { DEFINE_PROP_BOOL("pre-2.8-migration", PowerPCCPU, pre_2_8_migration, false), DEFINE_PROP_BOOL("pre-2.10-migration", PowerPCCPU, pre_2_10_migration, false), - DEFINE_PROP_BOOL("pre-2.13-migration", PowerPCCPU, pre_2_13_migration, + DEFINE_PROP_BOOL("pre-3.0-migration", PowerPCCPU, pre_3_0_migration, false), DEFINE_PROP_END_OF_LIST(), }; From patchwork Tue May 22 10:40:00 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 136525 Delivered-To: patches@linaro.org Received: by 2002:a2e:9706:0:0:0:0:0 with SMTP id r6-v6csp1443618lji; Tue, 22 May 2018 03:40:06 -0700 (PDT) X-Google-Smtp-Source: AB8JxZrSE0YuZX0lCHJz4DN5dEsIzEnGwLhXWfLxPw0bhjfKIWk9AWeQZzVbI0HZv7cCpL7Gca0l X-Received: by 2002:a2e:9b4a:: with SMTP id o10-v6mr14344958ljj.49.1526985606433; Tue, 22 May 2018 03:40:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1526985606; cv=none; d=google.com; s=arc-20160816; b=SaLEEbvSJCzWRRb5v/0FrGen2HHEumE32jMoPQJakaLnZH1+KQ8Wxs5yj33CxLKCjZ C+ALXAHflUHuD9vvXD1FfxfbPGzK0JutpMFHr4Tu89ritkRuzPUEl8gnZDmMQQeVaK5y NVtPjHxsnTxnskz22mD1h8M84CiCEhvdTFCfV8DRmV9aiyPQQUO6vy3QcKoXoYiY6ViB R6W7CBYg1x5j0sjybihF3Kz/q5LntECGQ0LZd676wOyyu+IgsRDywTWu8BM7mUo4aqPN H8LZ8gkrgZJkYmdPB4vNd8IgcvB8apM8IOAcYsay2OS5CX6O7+PmWpx1LWjs8er273eB 9QgQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :arc-authentication-results; bh=ZDDmjgCNvQJqIH0R8dCgMx4gvMZUflv113gYYAp8PEc=; b=llzr4Rc7UwvCBefSj0soCI1v5ooSjHBRqqSQEGrk8lBmQaTggeA659VYrdSP+T1+p5 r0kDFirkVEvL9B9sa0T6ozvNPaNwXfFhs5lbjD8GMhTgpwUlsWO4L5YLZXl3VN4E+qBA hIg9vZJ11n4i+BwH0qzihR7nX4iyH89qIRCRz/MxDOjfipRtWTqPNMEb3i/r5yNpjoPM bjORp9VcoiQKUq9O1z8VAZaLta0KPc2I1fK/hEPSGJ049H2JEZpKCC6EQnWwUtPpwZKu TLSVljeRP9q6F84bZuZhFHMX8sFyTP4dVC25dv7pKaDWpGH7x5RhvjLud3pywJ35Icap 9jsw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of pm215@archaic.org.uk designates 2001:8b0:1d0::2 as permitted sender) smtp.mailfrom=pm215@archaic.org.uk; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by mx.google.com with ESMTPS id p65-v6si6687833lja.185.2018.05.22.03.40.06 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 22 May 2018 03:40:06 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of pm215@archaic.org.uk designates 2001:8b0:1d0::2 as permitted sender) client-ip=2001:8b0:1d0::2; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of pm215@archaic.org.uk designates 2001:8b0:1d0::2 as permitted sender) smtp.mailfrom=pm215@archaic.org.uk; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from pm215 by orth.archaic.org.uk with local (Exim 4.89) (envelope-from ) id 1fL4i5-0000l7-M9; Tue, 22 May 2018 11:40:05 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Cc: patches@linaro.org, "Michael S. Tsirkin" , Marcel Apfelbaum , Paolo Bonzini , Eduardo Habkost , David Gibson , Cornelia Huck , Christian Borntraeger , Eric Blake , Markus Armbruster , qemu-ppc@nongnu.org, qemu-s390x@nongnu.org Subject: [PATCH 5/5] qemu-doc.texi: Rename references to 2.13 to 3.0 Date: Tue, 22 May 2018 11:40:00 +0100 Message-Id: <20180522104000.9044-6-peter.maydell@linaro.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180522104000.9044-1-peter.maydell@linaro.org> References: <20180522104000.9044-1-peter.maydell@linaro.org> Update references to 2.13 to read 3.0, since that's the number we're using for the next release. Signed-off-by: Peter Maydell --- qemu-doc.texi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.17.0 Reviewed-by: Cornelia Huck Reviewed-by: Thomas Huth diff --git a/qemu-doc.texi b/qemu-doc.texi index 0e0e0ae72b..cac1c3b39e 100644 --- a/qemu-doc.texi +++ b/qemu-doc.texi @@ -2917,7 +2917,7 @@ The @code{-localtime} option has been replaced by @code{-rtc base=localtime}. The @code{-startdate} option has been replaced by @code{-rtc base=@var{date}}. -@subsection -virtioconsole (since 2.13.0) +@subsection -virtioconsole (since 3.0.0) Option @option{-virtioconsole} has been replaced by @option{-device virtconsole}. @@ -2940,7 +2940,7 @@ from qcow2 images. The ``query-cpus'' command is replaced by the ``query-cpus-fast'' command. -@subsection query-cpus-fast "arch" output member (since 2.13.0) +@subsection query-cpus-fast "arch" output member (since 3.0.0) The ``arch'' output member of the ``query-cpus-fast'' command is replaced by the ``target'' output member.