[Qemu-devel] [PATCH 0/5] Make the next release be 3.0

[Qemu-devel] [PATCH 0/5] Make the next release be 3.0

[Peter Maydell]

I think that we should number the next release 3.0
(3.0.0, in long form). We already have a few places that
have used "2.13", in machine-versions or in "feature
exists since release X" annotations; update those.

thanks
-- PMM

Peter Maydell (5):
  qapi: Change "since 2.13" annotations to "since 3.0"
  hw/i386: Rename 2.13 machine types to 3.0
  hw/s390x: Rename 2.13 machines to 3.0
  ppc: Rename 2.13 machines to 3.0
  qemu-doc.texi: Rename references to 2.13 to 3.0

 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 +-
 target/ppc/cpu.h                |  2 +-
 hw/i386/pc_piix.c               |  8 ++++----
 hw/i386/pc_q35.c                |  8 ++++----
 hw/ppc/spapr.c                  | 14 +++++++-------
 hw/s390x/s390-virtio-ccw.c      | 10 +++++-----
 target/ppc/machine.c            |  8 ++++----
 target/ppc/translate_init.inc.c |  2 +-
 qemu-doc.texi                   |  4 ++--
 14 files changed, 43 insertions(+), 43 deletions(-)

-- 
2.17.0

[Qemu-devel] [PATCH 1/5] qapi: Change "since 2.13" annotations to "since 3.0"

[Peter Maydell]

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>
---
 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(-)

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',
-- 
2.17.0

Re: [Qemu-devel] [PATCH 1/5] qapi: Change "since 2.13" annotations to "since 3.0"

[Cornelia Huck]

On Tue, 22 May 2018 11:39:56 +0100
Peter Maydell <peter.maydell@linaro.org> wrote:

> 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>
> ---
>  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(-)
> 

> 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

Should this one use 3.0 instead of 3.0.0?

>  #        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
>  #

Anyway,

Reviewed-by: Cornelia Huck <cohuck@redhat.com>

Re: [Qemu-devel] [Qemu-ppc] [PATCH 1/5] qapi: Change "since 2.13" annotations to "since 3.0"

[Thomas Huth]

On 22.05.2018 12:39, Peter Maydell wrote:
> 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>
> ---
>  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(-)

Reviewed-by: Thomas Huth <thuth@redhat.com>

[Qemu-devel] [PATCH 2/5] hw/i386: Rename 2.13 machine types to 3.0

[Peter Maydell]

Rename the 2.13 machine types to match what we're going to
use as our next release number.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
 hw/i386/pc_piix.c | 8 ++++----
 hw/i386/pc_q35.c  | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

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);
 }
-- 
2.17.0

Re: [Qemu-devel] [PATCH 2/5] hw/i386: Rename 2.13 machine types to 3.0

[Cornelia Huck]

On Tue, 22 May 2018 11:39:57 +0100
Peter Maydell <peter.maydell@linaro.org> wrote:

> Rename the 2.13 machine types to match what we're going to
> use as our next release number.
> 
> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
> ---
>  hw/i386/pc_piix.c | 8 ++++----
>  hw/i386/pc_q35.c  | 8 ++++----
>  2 files changed, 8 insertions(+), 8 deletions(-)

Reviewed-by: Cornelia Huck <cohuck@redhat.com>

Re: [Qemu-devel] [Qemu-ppc] [PATCH 2/5] hw/i386: Rename 2.13 machine types to 3.0

[Thomas Huth]

On 22.05.2018 12:39, Peter Maydell wrote:
> Rename the 2.13 machine types to match what we're going to
> use as our next release number.
> 
> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
> ---
>  hw/i386/pc_piix.c | 8 ++++----
>  hw/i386/pc_q35.c  | 8 ++++----
>  2 files changed, 8 insertions(+), 8 deletions(-)

Reviewed-by: Thomas Huth <thuth@redhat.com>

Re: [Qemu-devel] [PATCH 2/5] hw/i386: Rename 2.13 machine types to 3.0

[Eduardo Habkost]

On Tue, May 22, 2018 at 11:39:57AM +0100, Peter Maydell wrote:
> Rename the 2.13 machine types to match what we're going to
> use as our next release number.
> 
> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>

Reviewed-by: Eduardo Habkost <ehabkost@redhat.com>

-- 
Eduardo

Re: [Qemu-devel] [PATCH 2/5] hw/i386: Rename 2.13 machine types to 3.0

[Igor Mammedov]

On Tue, 22 May 2018 11:39:57 +0100
Peter Maydell <peter.maydell@linaro.org> wrote:

> Rename the 2.13 machine types to match what we're going to
> use as our next release number.
> 
> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
> ---
[...]
q35 hunk of this patch for no apparent reasons causes
change of the NVDIMM's DSM page allocated by Seabios.

@ -5,13 +5,13 @@
  * 
  * Disassembling to symbolic ASL+ operators
  *
- * Disassembly of tests/acpi-test-data/q35/SSDT.dimmpxm, Wed May 30 11:20:51 2018
+ * Disassembly of /tmp/aml-3XMAJZ, Wed May 30 11:20:51 2018
  *
  * Original Table Header:
  *     Signature        "SSDT"
  *     Length           0x000002AD (685)
  *     Revision         0x01
- *     Checksum         0x50
+ *     Checksum         0x40
  *     OEM ID           "BOCHS "
  *     OEM Table ID     "NVDIMM"
  *     OEM Revision     0x00000001 (1)
@@ -183,6 +183,6 @@ DefinitionBlock ("", "SSDT", 1, "BOCHS ", "NVDIMM", 0x00000001)
         }
     }
 
-    Name (MEMA, 0x07FFE000)
+    Name (MEMA, 0x07FFF000)
 }

As far as I see it should safe wrt NVDIMMs,
but the question is what in this commit forced Seabios
to change allocated address?

Offending commit aa78a16d86:
Testcase to reproduce:
 QTEST_QEMU_BINARY=x86_64-softmmu/qemu-system-x86_64 tests/bios-tables-test

CLI to reproduce manually:
x86_64-softmmu/qemu-system-x86_64 -M q35 -machine nvdimm=on -smp 4,sockets=4  -m 128M,slots=3,maxmem=1G  -numa node,mem=32M,nodeid=0  -numa node,mem=32M,nodeid=1  -numa node,mem=32M,nodeid=2 -numa node,mem=32M,nodeid=3 -numa cpu,node-id=0,socket-id=0 -numa cpu,node-id=1,socket-id=1 -numa cpu,node-id=2,socket-id=2 -numa cpu,node-id=3,socket-id=3 -object memory-backend-ram,id=ram0,size=128M -object memory-backend-ram,id=nvm0,size=128M -device pc-dimm,id=dimm0,memdev=ram0,node=1  -device nvdimm,id=dimm1,memdev=nvm0,node=2 

> 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);
>  }

Re: [Qemu-devel] [PATCH 2/5] hw/i386: Rename 2.13 machine types to 3.0

[Paolo Bonzini]

On 30/05/2018 12:11, Igor Mammedov wrote:
> -    Name (MEMA, 0x07FFE000)
> +    Name (MEMA, 0x07FFF000)
>  }
> 
> As far as I see it should safe wrt NVDIMMs,
> but the question is what in this commit forced Seabios
> to change allocated address?

Probably 2.13 is longer than 3.0 or something like that (and the planets
aligned in the right way).

Paolo

Re: [Qemu-devel] [PATCH 2/5] hw/i386: Rename 2.13 machine types to 3.0

[Igor Mammedov]

On Wed, 30 May 2018 12:19:59 +0200
Paolo Bonzini <pbonzini@redhat.com> wrote:

> On 30/05/2018 12:11, Igor Mammedov wrote:
> > -    Name (MEMA, 0x07FFE000)
> > +    Name (MEMA, 0x07FFF000)
> >  }
Michael, could you update ACPI test blobs in your next pull request please?


> > As far as I see it should safe wrt NVDIMMs,
> > but the question is what in this commit forced Seabios
> > to change allocated address?  
> 
> Probably 2.13 is longer than 3.0 or something like that
looks like it's other way around (2.13 is shorter than 3.0)
since address went up.

> (and the planets aligned in the right way).
probably not the case considering that warning reproduces
the same regardless of day and time changes. :)

> 
> Paolo

[Qemu-devel] [PATCH 3/5] hw/s390x: Rename 2.13 machines to 3.0

[Peter Maydell]

Rename the 2.13 machines to match the number we're going to
use for the next release.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
 hw/s390x/s390-virtio-ccw.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

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);
-- 
2.17.0

Re: [Qemu-devel] [PATCH 3/5] hw/s390x: Rename 2.13 machines to 3.0

[Cornelia Huck]

On Tue, 22 May 2018 11:39:58 +0100
Peter Maydell <peter.maydell@linaro.org> wrote:

> Rename the 2.13 machines to match the number we're going to
> use for the next release.
> 
> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
> ---
>  hw/s390x/s390-virtio-ccw.c | 10 +++++-----
>  1 file changed, 5 insertions(+), 5 deletions(-)

Reviewed-by: Cornelia Huck <cohuck@redhat.com>

Re: [Qemu-devel] [Qemu-ppc] [PATCH 3/5] hw/s390x: Rename 2.13 machines to 3.0

[Thomas Huth]

On 22.05.2018 12:39, Peter Maydell wrote:
> Rename the 2.13 machines to match the number we're going to
> use for the next release.
> 
> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
> ---
>  hw/s390x/s390-virtio-ccw.c | 10 +++++-----
>  1 file changed, 5 insertions(+), 5 deletions(-)

Reviewed-by: Thomas Huth <thuth@redhat.com>

[Qemu-devel] [PATCH 4/5] ppc: Rename 2.13 machines to 3.0

[Peter Maydell]

Rename the 2.13 machines to match the number we're going to
use for the next release.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
 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(-)

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(),
 };
-- 
2.17.0

Re: [Qemu-devel] [PATCH 4/5] ppc: Rename 2.13 machines to 3.0

[Cornelia Huck]

On Tue, 22 May 2018 11:39:59 +0100
Peter Maydell <peter.maydell@linaro.org> wrote:

> Rename the 2.13 machines to match the number we're going to
> use for the next release.
> 
> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
> ---
>  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(-)

Reviewed-by: Cornelia Huck <cohuck@redhat.com>

Re: [Qemu-devel] [Qemu-ppc] [PATCH 4/5] ppc: Rename 2.13 machines to 3.0

[Thomas Huth]

On 22.05.2018 12:39, Peter Maydell wrote:
> Rename the 2.13 machines to match the number we're going to
> use for the next release.
> 
> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
> ---
>  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(-)

Reviewed-by: Thomas Huth <thuth@redhat.com>

Re: [Qemu-devel] [Qemu-ppc] [PATCH 4/5] ppc: Rename 2.13 machines to 3.0

[Greg Kurz]

On Tue, 22 May 2018 11:39:59 +0100
Peter Maydell <peter.maydell@linaro.org> wrote:

> Rename the 2.13 machines to match the number we're going to
> use for the next release.
> 
> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
> ---

Reviewed-by: Greg Kurz <groug@kaod.org>

>  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(-)
> 
> 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(),
>  };

[Qemu-devel] [PATCH 5/5] qemu-doc.texi: Rename references to 2.13 to 3.0

[Peter Maydell]

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 <peter.maydell@linaro.org>
---
 qemu-doc.texi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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.
-- 
2.17.0

Re: [Qemu-devel] [PATCH 5/5] qemu-doc.texi: Rename references to 2.13 to 3.0

[Cornelia Huck]

On Tue, 22 May 2018 11:40:00 +0100
Peter Maydell <peter.maydell@linaro.org> wrote:

> 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 <peter.maydell@linaro.org>
> ---
>  qemu-doc.texi | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)

Reviewed-by: Cornelia Huck <cohuck@redhat.com>

Re: [Qemu-devel] [Qemu-ppc] [PATCH 5/5] qemu-doc.texi: Rename references to 2.13 to 3.0

[Thomas Huth]

On 22.05.2018 12:40, Peter Maydell wrote:
> 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 <peter.maydell@linaro.org>
> ---
>  qemu-doc.texi | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> 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.

Reviewed-by: Thomas Huth <thuth@redhat.com>

Re: [Qemu-devel] [PATCH 0/5] Make the next release be 3.0

[Peter Maydell]

On 22 May 2018 at 11:39, Peter Maydell <peter.maydell@linaro.org> wrote:
> I think that we should number the next release 3.0
> (3.0.0, in long form). We already have a few places that
> have used "2.13", in machine-versions or in "feature
> exists since release X" annotations; update those.
>
> thanks
> -- PMM
>
> Peter Maydell (5):
>   qapi: Change "since 2.13" annotations to "since 3.0"
>   hw/i386: Rename 2.13 machine types to 3.0
>   hw/s390x: Rename 2.13 machines to 3.0
>   ppc: Rename 2.13 machines to 3.0
>   qemu-doc.texi: Rename references to 2.13 to 3.0

Applied to master; thanks.

-- PMM