[PATCH v2 00/11] ppc/spapr: remove deprecated machines specific code

[PATCH v2 00/11] ppc/spapr: remove deprecated machines specific code

[Harsh Prateek Bora]

Commit 1392617d3576 intended to tag pseries-2.1 - 2.11 machines as
deprecated with reasons mentioned in its commit log.
Removing the arch specific code for the now deprecated machine types.

v2: Addressed review comments from Cedric
v1: <20240917060300.943496-1-harshpb@linux.ibm.com>
 
Harsh Prateek Bora (11):
  ppc/spapr: remove deprecated machine pseries-2.1
  ppc/spapr: remove deprecated machine pseries-2.2
  ppc/spapr: remove deprecated machine pseries-2.3
  ppc/spapr: remove deprecated machine pseries-2.4
  ppc/spapr: remove deprecated machine pseries-2.5
  ppc/spapr: remove deprecated machine pseries-2.6
  ppc/spapr: remove deprecated machine pseries-2.7
  ppc/spapr: remove deprecated machine pseries-2.8
  ppc/spapr: remove deprecated machine pseries-2.9
  ppc/spapr: remove deprecated machine pseries-2.10
  ppc/spapr: remove deprecated machine pseries-2.11

 include/hw/pci-host/spapr.h |   4 -
 target/ppc/cpu.h            |   6 -
 hw/ppc/spapr.c              | 235 ------------------------------------
 hw/ppc/spapr_pci.c          |  28 -----
 target/ppc/cpu_init.c       |   3 -
 target/ppc/machine.c        |  54 +--------
 6 files changed, 1 insertion(+), 329 deletions(-)

-- 
2.45.2

[PATCH v2 01/11] ppc/spapr: remove deprecated machine pseries-2.1

[Harsh Prateek Bora]

Commit 1392617d3576 intended to tag pseries-2.1 - 2.11 machines as
deprecated with reasons mentioned in its commit log.
Removing pseries-2.1 specific code with this patch for now.

Suggested-by: Cédric Le Goater <clg@kaod.org>
Signed-off-by: Harsh Prateek Bora <harshpb@linux.ibm.com>
---
 hw/ppc/spapr.c | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
index 8aa3ce7449..ec906e1d77 100644
--- a/hw/ppc/spapr.c
+++ b/hw/ppc/spapr.c
@@ -5381,17 +5381,6 @@ static void spapr_machine_2_2_class_options(MachineClass *mc)
 }
 DEFINE_SPAPR_MACHINE(2, 2);
 
-/*
- * pseries-2.1
- */
-
-static void spapr_machine_2_1_class_options(MachineClass *mc)
-{
-    spapr_machine_2_2_class_options(mc);
-    compat_props_add(mc->compat_props, hw_compat_2_1, hw_compat_2_1_len);
-}
-DEFINE_SPAPR_MACHINE(2, 1);
-
 static void spapr_machine_register_types(void)
 {
     type_register_static(&spapr_machine_info);
-- 
2.45.2

Re: [PATCH v2 01/11] ppc/spapr: remove deprecated machine pseries-2.1

[Cédric Le Goater]

On 10/1/24 11:29, Harsh Prateek Bora wrote:
> Commit 1392617d3576 intended to tag pseries-2.1 - 2.11 machines as
> deprecated with reasons mentioned in its commit log.
> Removing pseries-2.1 specific code with this patch for now.
> 
> Suggested-by: Cédric Le Goater <clg@kaod.org>
> Signed-off-by: Harsh Prateek Bora <harshpb@linux.ibm.com>


Reviewed-by: Cédric Le Goater <clg@redhat.com>

Thanks,

C.


> ---
>   hw/ppc/spapr.c | 11 -----------
>   1 file changed, 11 deletions(-)
> 
> diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
> index 8aa3ce7449..ec906e1d77 100644
> --- a/hw/ppc/spapr.c
> +++ b/hw/ppc/spapr.c
> @@ -5381,17 +5381,6 @@ static void spapr_machine_2_2_class_options(MachineClass *mc)
>   }
>   DEFINE_SPAPR_MACHINE(2, 2);
>   
> -/*
> - * pseries-2.1
> - */
> -
> -static void spapr_machine_2_1_class_options(MachineClass *mc)
> -{
> -    spapr_machine_2_2_class_options(mc);
> -    compat_props_add(mc->compat_props, hw_compat_2_1, hw_compat_2_1_len);
> -}
> -DEFINE_SPAPR_MACHINE(2, 1);
> -
>   static void spapr_machine_register_types(void)
>   {
>       type_register_static(&spapr_machine_info);

[PATCH v2 02/11] ppc/spapr: remove deprecated machine pseries-2.2

[Harsh Prateek Bora]

Commit 1392617d3576 intended to tag pseries-2.1 - 2.11 machines as
deprecated with reasons mentioned in its commit log.
Removing pseries-2.2 specific code with this patch for now.

Suggested-by: Cédric Le Goater <clg@kaod.org>
Signed-off-by: Harsh Prateek Bora <harshpb@linux.ibm.com>
---
 hw/ppc/spapr.c | 17 -----------------
 1 file changed, 17 deletions(-)

diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
index ec906e1d77..3c7d251356 100644
--- a/hw/ppc/spapr.c
+++ b/hw/ppc/spapr.c
@@ -5364,23 +5364,6 @@ static void spapr_machine_2_3_class_options(MachineClass *mc)
 }
 DEFINE_SPAPR_MACHINE(2, 3);
 
-/*
- * pseries-2.2
- */
-
-static void spapr_machine_2_2_class_options(MachineClass *mc)
-{
-    static GlobalProperty compat[] = {
-        { TYPE_SPAPR_PCI_HOST_BRIDGE, "mem_win_size", "0x20000000" },
-    };
-
-    spapr_machine_2_3_class_options(mc);
-    compat_props_add(mc->compat_props, hw_compat_2_2, hw_compat_2_2_len);
-    compat_props_add(mc->compat_props, compat, G_N_ELEMENTS(compat));
-    mc->default_machine_opts = "modern-hotplug-events=off,suppress-vmdesc=on";
-}
-DEFINE_SPAPR_MACHINE(2, 2);
-
 static void spapr_machine_register_types(void)
 {
     type_register_static(&spapr_machine_info);
-- 
2.45.2

Re: [PATCH v2 02/11] ppc/spapr: remove deprecated machine pseries-2.2

[Cédric Le Goater]

On 10/1/24 11:29, Harsh Prateek Bora wrote:
> Commit 1392617d3576 intended to tag pseries-2.1 - 2.11 machines as
> deprecated with reasons mentioned in its commit log.
> Removing pseries-2.2 specific code with this patch for now.
> 
> Suggested-by: Cédric Le Goater <clg@kaod.org>
> Signed-off-by: Harsh Prateek Bora <harshpb@linux.ibm.com>


Reviewed-by: Cédric Le Goater <clg@redhat.com>

Thanks,

C.


> ---
>   hw/ppc/spapr.c | 17 -----------------
>   1 file changed, 17 deletions(-)
> 
> diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
> index ec906e1d77..3c7d251356 100644
> --- a/hw/ppc/spapr.c
> +++ b/hw/ppc/spapr.c
> @@ -5364,23 +5364,6 @@ static void spapr_machine_2_3_class_options(MachineClass *mc)
>   }
>   DEFINE_SPAPR_MACHINE(2, 3);
>   
> -/*
> - * pseries-2.2
> - */
> -
> -static void spapr_machine_2_2_class_options(MachineClass *mc)
> -{
> -    static GlobalProperty compat[] = {
> -        { TYPE_SPAPR_PCI_HOST_BRIDGE, "mem_win_size", "0x20000000" },


Keep in mind that when the pseries-2.7 machine will be removed later in
this patchset, more cleanup could be done in spapr_phb_realize().


Thanks,

C.


> -    };
> -
> -    spapr_machine_2_3_class_options(mc);
> -    compat_props_add(mc->compat_props, hw_compat_2_2, hw_compat_2_2_len);
> -    compat_props_add(mc->compat_props, compat, G_N_ELEMENTS(compat));
> -    mc->default_machine_opts = "modern-hotplug-events=off,suppress-vmdesc=on";
> -}
> -DEFINE_SPAPR_MACHINE(2, 2);
> -
>   static void spapr_machine_register_types(void)
>   {
>       type_register_static(&spapr_machine_info);

[PATCH v2 03/11] ppc/spapr: remove deprecated machine pseries-2.3

[Harsh Prateek Bora]

Commit 1392617d3576 intended to tag pseries-2.1 - 2.11 machines as
deprecated with reasons mentioned in its commit log.
Removing pseries-2.3 specific code with this patch for now.

Suggested-by: Cédric Le Goater <clg@kaod.org>
Signed-off-by: Harsh Prateek Bora <harshpb@linux.ibm.com>
---
 hw/ppc/spapr.c | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
index 3c7d251356..f2f20aa5b5 100644
--- a/hw/ppc/spapr.c
+++ b/hw/ppc/spapr.c
@@ -5349,21 +5349,6 @@ static void spapr_machine_2_4_class_options(MachineClass *mc)
 
 DEFINE_SPAPR_MACHINE(2, 4);
 
-/*
- * pseries-2.3
- */
-
-static void spapr_machine_2_3_class_options(MachineClass *mc)
-{
-    static GlobalProperty compat[] = {
-        { "spapr-pci-host-bridge", "dynamic-reconfiguration", "off" },
-    };
-    spapr_machine_2_4_class_options(mc);
-    compat_props_add(mc->compat_props, hw_compat_2_3, hw_compat_2_3_len);
-    compat_props_add(mc->compat_props, compat, G_N_ELEMENTS(compat));
-}
-DEFINE_SPAPR_MACHINE(2, 3);
-
 static void spapr_machine_register_types(void)
 {
     type_register_static(&spapr_machine_info);
-- 
2.45.2

Re: [PATCH v2 03/11] ppc/spapr: remove deprecated machine pseries-2.3

[Cédric Le Goater]

On 10/1/24 11:29, Harsh Prateek Bora wrote:
> Commit 1392617d3576 intended to tag pseries-2.1 - 2.11 machines as
> deprecated with reasons mentioned in its commit log.
> Removing pseries-2.3 specific code with this patch for now.
> 
> Suggested-by: Cédric Le Goater <clg@kaod.org>
> Signed-off-by: Harsh Prateek Bora <harshpb@linux.ibm.com>
> ---
>   hw/ppc/spapr.c | 15 ---------------
>   1 file changed, 15 deletions(-)
> 
> diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
> index 3c7d251356..f2f20aa5b5 100644
> --- a/hw/ppc/spapr.c
> +++ b/hw/ppc/spapr.c
> @@ -5349,21 +5349,6 @@ static void spapr_machine_2_4_class_options(MachineClass *mc)
>   
>   DEFINE_SPAPR_MACHINE(2, 4);
>   
> -/*
> - * pseries-2.3
> - */
> -
> -static void spapr_machine_2_3_class_options(MachineClass *mc)
> -{
> -    static GlobalProperty compat[] = {
> -        { "spapr-pci-host-bridge", "dynamic-reconfiguration", "off" },

Shouldn't we remove SpaprPhbState::dr_enabled also ?

Thanks,

C.



> -    };
> -    spapr_machine_2_4_class_options(mc);
> -    compat_props_add(mc->compat_props, hw_compat_2_3, hw_compat_2_3_len);
> -    compat_props_add(mc->compat_props, compat, G_N_ELEMENTS(compat));
> -}
> -DEFINE_SPAPR_MACHINE(2, 3);
> -
>   static void spapr_machine_register_types(void)
>   {
>       type_register_static(&spapr_machine_info);

[PATCH v2 04/11] ppc/spapr: remove deprecated machine pseries-2.4

[Harsh Prateek Bora]

Commit 1392617d3576 intended to tag pseries-2.1 - 2.11 machines as
deprecated with reasons mentioned in its commit log.
Removing pseries-2.4 specific code with this patch for now.

Suggested-by: Cédric Le Goater <clg@kaod.org>
Signed-off-by: Harsh Prateek Bora <harshpb@linux.ibm.com>
---
 hw/ppc/spapr.c | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
index f2f20aa5b5..9e78f94ec2 100644
--- a/hw/ppc/spapr.c
+++ b/hw/ppc/spapr.c
@@ -5334,21 +5334,6 @@ static void spapr_machine_2_5_class_options(MachineClass *mc)
 
 DEFINE_SPAPR_MACHINE(2, 5);
 
-/*
- * pseries-2.4
- */
-
-static void spapr_machine_2_4_class_options(MachineClass *mc)
-{
-    SpaprMachineClass *smc = SPAPR_MACHINE_CLASS(mc);
-
-    spapr_machine_2_5_class_options(mc);
-    smc->dr_lmb_enabled = false;
-    compat_props_add(mc->compat_props, hw_compat_2_4, hw_compat_2_4_len);
-}
-
-DEFINE_SPAPR_MACHINE(2, 4);
-
 static void spapr_machine_register_types(void)
 {
     type_register_static(&spapr_machine_info);
-- 
2.45.2

Re: [PATCH v2 04/11] ppc/spapr: remove deprecated machine pseries-2.4

[Cédric Le Goater]

On 10/1/24 11:29, Harsh Prateek Bora wrote:
> Commit 1392617d3576 intended to tag pseries-2.1 - 2.11 machines as
> deprecated with reasons mentioned in its commit log.
> Removing pseries-2.4 specific code with this patch for now.
> 
> Suggested-by: Cédric Le Goater <clg@kaod.org>
> Signed-off-by: Harsh Prateek Bora <harshpb@linux.ibm.com>
> ---
>   hw/ppc/spapr.c | 15 ---------------
>   1 file changed, 15 deletions(-)
> 
> diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
> index f2f20aa5b5..9e78f94ec2 100644
> --- a/hw/ppc/spapr.c
> +++ b/hw/ppc/spapr.c
> @@ -5334,21 +5334,6 @@ static void spapr_machine_2_5_class_options(MachineClass *mc)
>   
>   DEFINE_SPAPR_MACHINE(2, 5);
>   
> -/*
> - * pseries-2.4
> - */
> -
> -static void spapr_machine_2_4_class_options(MachineClass *mc)
> -{
> -    SpaprMachineClass *smc = SPAPR_MACHINE_CLASS(mc);
> -
> -    spapr_machine_2_5_class_options(mc);
> -    smc->dr_lmb_enabled = false;

smc->dr_lmb_enabled is now useless.


Thanks,

C.


> -    compat_props_add(mc->compat_props, hw_compat_2_4, hw_compat_2_4_len);
> -}
> -
> -DEFINE_SPAPR_MACHINE(2, 4);
> -
>   static void spapr_machine_register_types(void)
>   {
>       type_register_static(&spapr_machine_info);

[PATCH v2 05/11] ppc/spapr: remove deprecated machine pseries-2.5

[Harsh Prateek Bora]

Commit 1392617d3576 intended to tag pseries-2.1 - 2.11 machines as
deprecated with reasons mentioned in its commit log.
Removing pseries-2.5 specific code with this patch for now.

Suggested-by: Cédric Le Goater <clg@kaod.org>
Signed-off-by: Harsh Prateek Bora <harshpb@linux.ibm.com>
---
 hw/ppc/spapr.c | 19 -------------------
 1 file changed, 19 deletions(-)

diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
index 9e78f94ec2..a38d4e098a 100644
--- a/hw/ppc/spapr.c
+++ b/hw/ppc/spapr.c
@@ -5315,25 +5315,6 @@ static void spapr_machine_2_6_class_options(MachineClass *mc)
 
 DEFINE_SPAPR_MACHINE(2, 6);
 
-/*
- * pseries-2.5
- */
-
-static void spapr_machine_2_5_class_options(MachineClass *mc)
-{
-    SpaprMachineClass *smc = SPAPR_MACHINE_CLASS(mc);
-    static GlobalProperty compat[] = {
-        { "spapr-vlan", "use-rx-buffer-pools", "off" },
-    };
-
-    spapr_machine_2_6_class_options(mc);
-    smc->use_ohci_by_default = true;
-    compat_props_add(mc->compat_props, hw_compat_2_5, hw_compat_2_5_len);
-    compat_props_add(mc->compat_props, compat, G_N_ELEMENTS(compat));
-}
-
-DEFINE_SPAPR_MACHINE(2, 5);
-
 static void spapr_machine_register_types(void)
 {
     type_register_static(&spapr_machine_info);
-- 
2.45.2

Re: [PATCH v2 05/11] ppc/spapr: remove deprecated machine pseries-2.5

[Cédric Le Goater]

On 10/1/24 11:29, Harsh Prateek Bora wrote:
> Commit 1392617d3576 intended to tag pseries-2.1 - 2.11 machines as
> deprecated with reasons mentioned in its commit log.
> Removing pseries-2.5 specific code with this patch for now.
> 
> Suggested-by: Cédric Le Goater <clg@kaod.org>
> Signed-off-by: Harsh Prateek Bora <harshpb@linux.ibm.com>
> ---
>   hw/ppc/spapr.c | 19 -------------------
>   1 file changed, 19 deletions(-)
> 
> diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
> index 9e78f94ec2..a38d4e098a 100644
> --- a/hw/ppc/spapr.c
> +++ b/hw/ppc/spapr.c
> @@ -5315,25 +5315,6 @@ static void spapr_machine_2_6_class_options(MachineClass *mc)
>   
>   DEFINE_SPAPR_MACHINE(2, 6);
>   
> -/*
> - * pseries-2.5
> - */
> -
> -static void spapr_machine_2_5_class_options(MachineClass *mc)
> -{
> -    SpaprMachineClass *smc = SPAPR_MACHINE_CLASS(mc);
> -    static GlobalProperty compat[] = {
> -        { "spapr-vlan", "use-rx-buffer-pools", "off" },
> -    };
> -
> -    spapr_machine_2_6_class_options(mc);
> -    smc->use_ohci_by_default = true;

I would drop use_ohci_by_default also.


Thanks,

C.


> -    compat_props_add(mc->compat_props, hw_compat_2_5, hw_compat_2_5_len);
> -    compat_props_add(mc->compat_props, compat, G_N_ELEMENTS(compat));
> -}
> -
> -DEFINE_SPAPR_MACHINE(2, 5);
> -
>   static void spapr_machine_register_types(void)
>   {
>       type_register_static(&spapr_machine_info);

[PATCH v2 06/11] ppc/spapr: remove deprecated machine pseries-2.6

[Harsh Prateek Bora]

Commit 1392617d3576 intended to tag pseries-2.1 - 2.11 machines as
deprecated with reasons mentioned in its commit log.
Removing pseries-2.6 specific code with this patch for now.

Suggested-by: Cédric Le Goater <clg@kaod.org>
Signed-off-by: Harsh Prateek Bora <harshpb@linux.ibm.com>
---
 hw/ppc/spapr.c | 18 ------------------
 1 file changed, 18 deletions(-)

diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
index a38d4e098a..d317387b7f 100644
--- a/hw/ppc/spapr.c
+++ b/hw/ppc/spapr.c
@@ -5297,24 +5297,6 @@ static void spapr_machine_2_7_class_options(MachineClass *mc)
 
 DEFINE_SPAPR_MACHINE(2, 7);
 
-/*
- * pseries-2.6
- */
-
-static void spapr_machine_2_6_class_options(MachineClass *mc)
-{
-    static GlobalProperty compat[] = {
-        { TYPE_SPAPR_PCI_HOST_BRIDGE, "ddw", "off" },
-    };
-
-    spapr_machine_2_7_class_options(mc);
-    mc->has_hotpluggable_cpus = false;
-    compat_props_add(mc->compat_props, hw_compat_2_6, hw_compat_2_6_len);
-    compat_props_add(mc->compat_props, compat, G_N_ELEMENTS(compat));
-}
-
-DEFINE_SPAPR_MACHINE(2, 6);
-
 static void spapr_machine_register_types(void)
 {
     type_register_static(&spapr_machine_info);
-- 
2.45.2

Re: [PATCH v2 06/11] ppc/spapr: remove deprecated machine pseries-2.6

[Cédric Le Goater]

On 10/1/24 11:29, Harsh Prateek Bora wrote:
> Commit 1392617d3576 intended to tag pseries-2.1 - 2.11 machines as
> deprecated with reasons mentioned in its commit log.
> Removing pseries-2.6 specific code with this patch for now.
> 
> Suggested-by: Cédric Le Goater <clg@kaod.org>
> Signed-off-by: Harsh Prateek Bora <harshpb@linux.ibm.com>


Reviewed-by: Cédric Le Goater <clg@redhat.com>

Thanks,

C.


> ---
>   hw/ppc/spapr.c | 18 ------------------
>   1 file changed, 18 deletions(-)
> 
> diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
> index a38d4e098a..d317387b7f 100644
> --- a/hw/ppc/spapr.c
> +++ b/hw/ppc/spapr.c
> @@ -5297,24 +5297,6 @@ static void spapr_machine_2_7_class_options(MachineClass *mc)
>   
>   DEFINE_SPAPR_MACHINE(2, 7);
>   
> -/*
> - * pseries-2.6
> - */
> -
> -static void spapr_machine_2_6_class_options(MachineClass *mc)
> -{
> -    static GlobalProperty compat[] = {
> -        { TYPE_SPAPR_PCI_HOST_BRIDGE, "ddw", "off" },
> -    };
> -    spapr_machine_2_7_class_options(mc);> -    mc->has_hotpluggable_cpus = false;
> -    compat_props_add(mc->compat_props, hw_compat_2_6, hw_compat_2_6_len);
> -    compat_props_add(mc->compat_props, compat, G_N_ELEMENTS(compat));
> -}
> -
> -DEFINE_SPAPR_MACHINE(2, 6);
> -
>   static void spapr_machine_register_types(void)
>   {
>       type_register_static(&spapr_machine_info);

[PATCH v2 07/11] ppc/spapr: remove deprecated machine pseries-2.7

[Harsh Prateek Bora]

Commit 1392617d3576 intended to tag pseries-2.1 - 2.11 machines as
deprecated with reasons mentioned in its commit log.
Removing pseries-2.7 specific code with this patch for now.

While at it, also remove pre-2.8-migration hacks introduced for backward
migration compatibility.

Suggested-by: Cédric Le Goater <clg@kaod.org>
Signed-off-by: Harsh Prateek Bora <harshpb@linux.ibm.com>
---
 include/hw/pci-host/spapr.h |  4 --
 target/ppc/cpu.h            |  5 ---
 hw/ppc/spapr.c              | 75 -------------------------------------
 hw/ppc/spapr_pci.c          | 28 --------------
 target/ppc/cpu_init.c       |  1 -
 target/ppc/machine.c        | 52 -------------------------
 6 files changed, 165 deletions(-)

diff --git a/include/hw/pci-host/spapr.h b/include/hw/pci-host/spapr.h
index 3778aac27b..0d40bf48f6 100644
--- a/include/hw/pci-host/spapr.h
+++ b/include/hw/pci-host/spapr.h
@@ -84,10 +84,6 @@ struct SpaprPhbState {
     bool pcie_ecs; /* Allow access to PCIe extended config space? */
 
     /* Fields for migration compatibility hacks */
-    bool pre_2_8_migration;
-    uint32_t mig_liobn;
-    hwaddr mig_mem_win_addr, mig_mem_win_size;
-    hwaddr mig_io_win_addr, mig_io_win_size;
     bool pre_5_1_assoc;
 };
 
diff --git a/target/ppc/cpu.h b/target/ppc/cpu.h
index 321ed2da75..cab4a46fc1 100644
--- a/target/ppc/cpu.h
+++ b/target/ppc/cpu.h
@@ -1456,11 +1456,6 @@ struct ArchCPU {
     opc_handler_t *opcodes[PPC_CPU_OPCODES_LEN];
 
     /* Fields related to migration compatibility hacks */
-    bool pre_2_8_migration;
-    target_ulong mig_msr_mask;
-    uint64_t mig_insns_flags;
-    uint64_t mig_insns_flags2;
-    uint32_t mig_nb_BATs;
     bool pre_2_10_migration;
     bool pre_3_0_migration;
     int32_t mig_slb_nr;
diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
index d317387b7f..4e8f2a5d8e 100644
--- a/hw/ppc/spapr.c
+++ b/hw/ppc/spapr.c
@@ -5222,81 +5222,6 @@ static void spapr_machine_2_8_class_options(MachineClass *mc)
 
 DEFINE_SPAPR_MACHINE(2, 8);
 
-/*
- * pseries-2.7
- */
-
-static bool phb_placement_2_7(SpaprMachineState *spapr, uint32_t index,
-                              uint64_t *buid, hwaddr *pio,
-                              hwaddr *mmio32, hwaddr *mmio64,
-                              unsigned n_dma, uint32_t *liobns, Error **errp)
-{
-    /* Legacy PHB placement for pseries-2.7 and earlier machine types */
-    const uint64_t base_buid = 0x800000020000000ULL;
-    const hwaddr phb_spacing = 0x1000000000ULL; /* 64 GiB */
-    const hwaddr mmio_offset = 0xa0000000; /* 2 GiB + 512 MiB */
-    const hwaddr pio_offset = 0x80000000; /* 2 GiB */
-    const uint32_t max_index = 255;
-    const hwaddr phb0_alignment = 0x10000000000ULL; /* 1 TiB */
-
-    uint64_t ram_top = MACHINE(spapr)->ram_size;
-    hwaddr phb0_base, phb_base;
-    int i;
-
-    /* Do we have device memory? */
-    if (MACHINE(spapr)->device_memory) {
-        /* Can't just use maxram_size, because there may be an
-         * alignment gap between normal and device memory regions
-         */
-        ram_top = MACHINE(spapr)->device_memory->base +
-            memory_region_size(&MACHINE(spapr)->device_memory->mr);
-    }
-
-    phb0_base = QEMU_ALIGN_UP(ram_top, phb0_alignment);
-
-    if (index > max_index) {
-        error_setg(errp, "\"index\" for PAPR PHB is too large (max %u)",
-                   max_index);
-        return false;
-    }
-
-    *buid = base_buid + index;
-    for (i = 0; i < n_dma; ++i) {
-        liobns[i] = SPAPR_PCI_LIOBN(index, i);
-    }
-
-    phb_base = phb0_base + index * phb_spacing;
-    *pio = phb_base + pio_offset;
-    *mmio32 = phb_base + mmio_offset;
-    /*
-     * We don't set the 64-bit MMIO window, relying on the PHB's
-     * fallback behaviour of automatically splitting a large "32-bit"
-     * window into contiguous 32-bit and 64-bit windows
-     */
-
-    return true;
-}
-
-static void spapr_machine_2_7_class_options(MachineClass *mc)
-{
-    SpaprMachineClass *smc = SPAPR_MACHINE_CLASS(mc);
-    static GlobalProperty compat[] = {
-        { TYPE_SPAPR_PCI_HOST_BRIDGE, "mem_win_size", "0xf80000000", },
-        { TYPE_SPAPR_PCI_HOST_BRIDGE, "mem64_win_size", "0", },
-        { TYPE_POWERPC_CPU, "pre-2.8-migration", "on", },
-        { TYPE_SPAPR_PCI_HOST_BRIDGE, "pre-2.8-migration", "on", },
-    };
-
-    spapr_machine_2_8_class_options(mc);
-    mc->default_cpu_type = POWERPC_CPU_TYPE_NAME("power7_v2.3");
-    mc->default_machine_opts = "modern-hotplug-events=off";
-    compat_props_add(mc->compat_props, hw_compat_2_7, hw_compat_2_7_len);
-    compat_props_add(mc->compat_props, compat, G_N_ELEMENTS(compat));
-    smc->phb_placement = phb_placement_2_7;
-}
-
-DEFINE_SPAPR_MACHINE(2, 7);
-
 static void spapr_machine_register_types(void)
 {
     type_register_static(&spapr_machine_info);
diff --git a/hw/ppc/spapr_pci.c b/hw/ppc/spapr_pci.c
index 5c0024bef9..a83dc1375b 100644
--- a/hw/ppc/spapr_pci.c
+++ b/hw/ppc/spapr_pci.c
@@ -2101,8 +2101,6 @@ static Property spapr_phb_properties[] = {
                        (1ULL << 12) | (1ULL << 16)
                        | (1ULL << 21) | (1ULL << 24)),
     DEFINE_PROP_UINT32("numa_node", SpaprPhbState, numa_node, -1),
-    DEFINE_PROP_BOOL("pre-2.8-migration", SpaprPhbState,
-                     pre_2_8_migration, false),
     DEFINE_PROP_BOOL("pcie-extended-configuration-space", SpaprPhbState,
                      pcie_ecs, true),
     DEFINE_PROP_BOOL("pre-5.1-associativity", SpaprPhbState,
@@ -2140,20 +2138,6 @@ static int spapr_pci_pre_save(void *opaque)
     gpointer key, value;
     int i;
 
-    if (sphb->pre_2_8_migration) {
-        sphb->mig_liobn = sphb->dma_liobn[0];
-        sphb->mig_mem_win_addr = sphb->mem_win_addr;
-        sphb->mig_mem_win_size = sphb->mem_win_size;
-        sphb->mig_io_win_addr = sphb->io_win_addr;
-        sphb->mig_io_win_size = sphb->io_win_size;
-
-        if ((sphb->mem64_win_size != 0)
-            && (sphb->mem64_win_addr
-                == (sphb->mem_win_addr + sphb->mem_win_size))) {
-            sphb->mig_mem_win_size += sphb->mem64_win_size;
-        }
-    }
-
     g_free(sphb->msi_devs);
     sphb->msi_devs = NULL;
     sphb->msi_devs_num = g_hash_table_size(sphb->msi);
@@ -2200,13 +2184,6 @@ static int spapr_pci_post_load(void *opaque, int version_id)
     return 0;
 }
 
-static bool pre_2_8_migration(void *opaque, int version_id)
-{
-    SpaprPhbState *sphb = opaque;
-
-    return sphb->pre_2_8_migration;
-}
-
 static const VMStateDescription vmstate_spapr_pci = {
     .name = "spapr_pci",
     .version_id = 2,
@@ -2216,11 +2193,6 @@ static const VMStateDescription vmstate_spapr_pci = {
     .post_load = spapr_pci_post_load,
     .fields = (const VMStateField[]) {
         VMSTATE_UINT64_EQUAL(buid, SpaprPhbState, NULL),
-        VMSTATE_UINT32_TEST(mig_liobn, SpaprPhbState, pre_2_8_migration),
-        VMSTATE_UINT64_TEST(mig_mem_win_addr, SpaprPhbState, pre_2_8_migration),
-        VMSTATE_UINT64_TEST(mig_mem_win_size, SpaprPhbState, pre_2_8_migration),
-        VMSTATE_UINT64_TEST(mig_io_win_addr, SpaprPhbState, pre_2_8_migration),
-        VMSTATE_UINT64_TEST(mig_io_win_size, SpaprPhbState, pre_2_8_migration),
         VMSTATE_STRUCT_ARRAY(lsi_table, SpaprPhbState, PCI_NUM_PINS, 0,
                              vmstate_spapr_pci_lsi, SpaprPciLsi),
         VMSTATE_INT32(msi_devs_num, SpaprPhbState),
diff --git a/target/ppc/cpu_init.c b/target/ppc/cpu_init.c
index 23881d09e9..7768392986 100644
--- a/target/ppc/cpu_init.c
+++ b/target/ppc/cpu_init.c
@@ -7452,7 +7452,6 @@ static void ppc_disas_set_info(CPUState *cs, disassemble_info *info)
 }
 
 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-3.0-migration", PowerPCCPU, pre_3_0_migration,
diff --git a/target/ppc/machine.c b/target/ppc/machine.c
index d433fd45fc..21bed7c7c8 100644
--- a/target/ppc/machine.c
+++ b/target/ppc/machine.c
@@ -118,13 +118,6 @@ static const VMStateInfo vmstate_info_vsr = {
 #define VMSTATE_VSR_ARRAY(_f, _s, _n)                             \
     VMSTATE_VSR_ARRAY_V(_f, _s, _n, 0)
 
-static bool cpu_pre_2_8_migration(void *opaque, int version_id)
-{
-    PowerPCCPU *cpu = opaque;
-
-    return cpu->pre_2_8_migration;
-}
-
 #if defined(TARGET_PPC64)
 static bool cpu_pre_3_0_migration(void *opaque, int version_id)
 {
@@ -139,22 +132,6 @@ static int cpu_pre_save(void *opaque)
     PowerPCCPU *cpu = opaque;
     CPUPPCState *env = &cpu->env;
     int i;
-    uint64_t insns_compat_mask =
-        PPC_INSNS_BASE | PPC_ISEL | PPC_STRING | PPC_MFTB
-        | PPC_FLOAT | PPC_FLOAT_FSEL | PPC_FLOAT_FRES
-        | PPC_FLOAT_FSQRT | PPC_FLOAT_FRSQRTE | PPC_FLOAT_FRSQRTES
-        | PPC_FLOAT_STFIWX | PPC_FLOAT_EXT
-        | PPC_CACHE | PPC_CACHE_ICBI | PPC_CACHE_DCBZ
-        | PPC_MEM_SYNC | PPC_MEM_EIEIO | PPC_MEM_TLBIE | PPC_MEM_TLBSYNC
-        | PPC_64B | PPC_64BX | PPC_ALTIVEC
-        | PPC_SEGMENT_64B | PPC_SLBI | PPC_POPCNTB | PPC_POPCNTWD;
-    uint64_t insns_compat_mask2 = PPC2_VSX | PPC2_VSX207 | PPC2_DFP | PPC2_DBRX
-        | PPC2_PERM_ISA206 | PPC2_DIVE_ISA206
-        | PPC2_ATOMIC_ISA206 | PPC2_FP_CVT_ISA206
-        | PPC2_FP_TST_ISA206 | PPC2_BCTAR_ISA207
-        | PPC2_LSQ_ISA207 | PPC2_ALTIVEC_207
-        | PPC2_ISA205 | PPC2_ISA207S | PPC2_FP_CVT_S64 | PPC2_TM
-        | PPC2_MEM_LWSYNC;
 
     env->spr[SPR_LR] = env->lr;
     env->spr[SPR_CTR] = env->ctr;
@@ -177,29 +154,6 @@ static int cpu_pre_save(void *opaque)
         env->spr[SPR_IBAT4U + 2 * i + 1] = env->IBAT[1][i + 4];
     }
 
-    /* Hacks for migration compatibility between 2.6, 2.7 & 2.8 */
-    if (cpu->pre_2_8_migration) {
-        /*
-         * Mask out bits that got added to msr_mask since the versions
-         * which stupidly included it in the migration stream.
-         */
-        target_ulong metamask = 0
-#if defined(TARGET_PPC64)
-            | (1ULL << MSR_TS0)
-            | (1ULL << MSR_TS1)
-#endif
-            ;
-        cpu->mig_msr_mask = env->msr_mask & ~metamask;
-        cpu->mig_insns_flags = env->insns_flags & insns_compat_mask;
-        /*
-         * CPU models supported by old machines all have
-         * PPC_MEM_TLBIE, so we set it unconditionally to allow
-         * backward migration from a POWER9 host to a POWER8 host.
-         */
-        cpu->mig_insns_flags |= PPC_MEM_TLBIE;
-        cpu->mig_insns_flags2 = env->insns_flags2 & insns_compat_mask2;
-        cpu->mig_nb_BATs = env->nb_BATs;
-    }
     if (cpu->pre_3_0_migration) {
         if (cpu->hash64_opts) {
             cpu->mig_slb_nr = cpu->hash64_opts->slb_size;
@@ -760,12 +714,6 @@ const VMStateDescription vmstate_ppc_cpu = {
         /* Backward compatible internal state */
         VMSTATE_UINTTL(env.hflags_compat_nmsr, PowerPCCPU),
 
-        /* Sanity checking */
-        VMSTATE_UINTTL_TEST(mig_msr_mask, PowerPCCPU, cpu_pre_2_8_migration),
-        VMSTATE_UINT64_TEST(mig_insns_flags, PowerPCCPU, cpu_pre_2_8_migration),
-        VMSTATE_UINT64_TEST(mig_insns_flags2, PowerPCCPU,
-                            cpu_pre_2_8_migration),
-        VMSTATE_UINT32_TEST(mig_nb_BATs, PowerPCCPU, cpu_pre_2_8_migration),
         VMSTATE_END_OF_LIST()
     },
     .subsections = (const VMStateDescription * const []) {
-- 
2.45.2

Re: [PATCH v2 07/11] ppc/spapr: remove deprecated machine pseries-2.7

[Cédric Le Goater]

On 10/1/24 11:29, Harsh Prateek Bora wrote:
> Commit 1392617d3576 intended to tag pseries-2.1 - 2.11 machines as
> deprecated with reasons mentioned in its commit log.
> Removing pseries-2.7 specific code with this patch for now.
> 
> While at it, also remove pre-2.8-migration hacks introduced for backward
> migration compatibility.
> 
> Suggested-by: Cédric Le Goater <clg@kaod.org>
> Signed-off-by: Harsh Prateek Bora <harshpb@linux.ibm.com>

Nice !

Acked-by: Cédric Le Goater <clg@redhat.com>

Thanks,

C.


> ---
>   include/hw/pci-host/spapr.h |  4 --
>   target/ppc/cpu.h            |  5 ---
>   hw/ppc/spapr.c              | 75 -------------------------------------
>   hw/ppc/spapr_pci.c          | 28 --------------
>   target/ppc/cpu_init.c       |  1 -
>   target/ppc/machine.c        | 52 -------------------------
>   6 files changed, 165 deletions(-)
> 
> diff --git a/include/hw/pci-host/spapr.h b/include/hw/pci-host/spapr.h
> index 3778aac27b..0d40bf48f6 100644
> --- a/include/hw/pci-host/spapr.h
> +++ b/include/hw/pci-host/spapr.h
> @@ -84,10 +84,6 @@ struct SpaprPhbState {
>       bool pcie_ecs; /* Allow access to PCIe extended config space? */
>   
>       /* Fields for migration compatibility hacks */
> -    bool pre_2_8_migration;
> -    uint32_t mig_liobn;
> -    hwaddr mig_mem_win_addr, mig_mem_win_size;
> -    hwaddr mig_io_win_addr, mig_io_win_size;
>       bool pre_5_1_assoc;
>   };
>   
> diff --git a/target/ppc/cpu.h b/target/ppc/cpu.h
> index 321ed2da75..cab4a46fc1 100644
> --- a/target/ppc/cpu.h
> +++ b/target/ppc/cpu.h
> @@ -1456,11 +1456,6 @@ struct ArchCPU {
>       opc_handler_t *opcodes[PPC_CPU_OPCODES_LEN];
>   
>       /* Fields related to migration compatibility hacks */
> -    bool pre_2_8_migration;
> -    target_ulong mig_msr_mask;
> -    uint64_t mig_insns_flags;
> -    uint64_t mig_insns_flags2;
> -    uint32_t mig_nb_BATs;
>       bool pre_2_10_migration;
>       bool pre_3_0_migration;
>       int32_t mig_slb_nr;
> diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
> index d317387b7f..4e8f2a5d8e 100644
> --- a/hw/ppc/spapr.c
> +++ b/hw/ppc/spapr.c
> @@ -5222,81 +5222,6 @@ static void spapr_machine_2_8_class_options(MachineClass *mc)
>   
>   DEFINE_SPAPR_MACHINE(2, 8);
>   
> -/*
> - * pseries-2.7
> - */
> -
> -static bool phb_placement_2_7(SpaprMachineState *spapr, uint32_t index,
> -                              uint64_t *buid, hwaddr *pio,
> -                              hwaddr *mmio32, hwaddr *mmio64,
> -                              unsigned n_dma, uint32_t *liobns, Error **errp)
> -{
> -    /* Legacy PHB placement for pseries-2.7 and earlier machine types */
> -    const uint64_t base_buid = 0x800000020000000ULL;
> -    const hwaddr phb_spacing = 0x1000000000ULL; /* 64 GiB */
> -    const hwaddr mmio_offset = 0xa0000000; /* 2 GiB + 512 MiB */
> -    const hwaddr pio_offset = 0x80000000; /* 2 GiB */
> -    const uint32_t max_index = 255;
> -    const hwaddr phb0_alignment = 0x10000000000ULL; /* 1 TiB */
> -
> -    uint64_t ram_top = MACHINE(spapr)->ram_size;
> -    hwaddr phb0_base, phb_base;
> -    int i;
> -
> -    /* Do we have device memory? */
> -    if (MACHINE(spapr)->device_memory) {
> -        /* Can't just use maxram_size, because there may be an
> -         * alignment gap between normal and device memory regions
> -         */
> -        ram_top = MACHINE(spapr)->device_memory->base +
> -            memory_region_size(&MACHINE(spapr)->device_memory->mr);
> -    }
> -
> -    phb0_base = QEMU_ALIGN_UP(ram_top, phb0_alignment);
> -
> -    if (index > max_index) {
> -        error_setg(errp, "\"index\" for PAPR PHB is too large (max %u)",
> -                   max_index);
> -        return false;
> -    }
> -
> -    *buid = base_buid + index;
> -    for (i = 0; i < n_dma; ++i) {
> -        liobns[i] = SPAPR_PCI_LIOBN(index, i);
> -    }
> -
> -    phb_base = phb0_base + index * phb_spacing;
> -    *pio = phb_base + pio_offset;
> -    *mmio32 = phb_base + mmio_offset;
> -    /*
> -     * We don't set the 64-bit MMIO window, relying on the PHB's
> -     * fallback behaviour of automatically splitting a large "32-bit"
> -     * window into contiguous 32-bit and 64-bit windows
> -     */
> -
> -    return true;
> -}
> -
> -static void spapr_machine_2_7_class_options(MachineClass *mc)
> -{
> -    SpaprMachineClass *smc = SPAPR_MACHINE_CLASS(mc);
> -    static GlobalProperty compat[] = {
> -        { TYPE_SPAPR_PCI_HOST_BRIDGE, "mem_win_size", "0xf80000000", },
> -        { TYPE_SPAPR_PCI_HOST_BRIDGE, "mem64_win_size", "0", },
> -        { TYPE_POWERPC_CPU, "pre-2.8-migration", "on", },
> -        { TYPE_SPAPR_PCI_HOST_BRIDGE, "pre-2.8-migration", "on", },
> -    };
> -
> -    spapr_machine_2_8_class_options(mc);
> -    mc->default_cpu_type = POWERPC_CPU_TYPE_NAME("power7_v2.3");
> -    mc->default_machine_opts = "modern-hotplug-events=off";
> -    compat_props_add(mc->compat_props, hw_compat_2_7, hw_compat_2_7_len);
> -    compat_props_add(mc->compat_props, compat, G_N_ELEMENTS(compat));
> -    smc->phb_placement = phb_placement_2_7;
> -}
> -
> -DEFINE_SPAPR_MACHINE(2, 7);
> -
>   static void spapr_machine_register_types(void)
>   {
>       type_register_static(&spapr_machine_info);
> diff --git a/hw/ppc/spapr_pci.c b/hw/ppc/spapr_pci.c
> index 5c0024bef9..a83dc1375b 100644
> --- a/hw/ppc/spapr_pci.c
> +++ b/hw/ppc/spapr_pci.c
> @@ -2101,8 +2101,6 @@ static Property spapr_phb_properties[] = {
>                          (1ULL << 12) | (1ULL << 16)
>                          | (1ULL << 21) | (1ULL << 24)),
>       DEFINE_PROP_UINT32("numa_node", SpaprPhbState, numa_node, -1),
> -    DEFINE_PROP_BOOL("pre-2.8-migration", SpaprPhbState,
> -                     pre_2_8_migration, false),
>       DEFINE_PROP_BOOL("pcie-extended-configuration-space", SpaprPhbState,
>                        pcie_ecs, true),
>       DEFINE_PROP_BOOL("pre-5.1-associativity", SpaprPhbState,
> @@ -2140,20 +2138,6 @@ static int spapr_pci_pre_save(void *opaque)
>       gpointer key, value;
>       int i;
>   
> -    if (sphb->pre_2_8_migration) {
> -        sphb->mig_liobn = sphb->dma_liobn[0];
> -        sphb->mig_mem_win_addr = sphb->mem_win_addr;
> -        sphb->mig_mem_win_size = sphb->mem_win_size;
> -        sphb->mig_io_win_addr = sphb->io_win_addr;
> -        sphb->mig_io_win_size = sphb->io_win_size;
> -
> -        if ((sphb->mem64_win_size != 0)
> -            && (sphb->mem64_win_addr
> -                == (sphb->mem_win_addr + sphb->mem_win_size))) {
> -            sphb->mig_mem_win_size += sphb->mem64_win_size;
> -        }
> -    }
> -
>       g_free(sphb->msi_devs);
>       sphb->msi_devs = NULL;
>       sphb->msi_devs_num = g_hash_table_size(sphb->msi);
> @@ -2200,13 +2184,6 @@ static int spapr_pci_post_load(void *opaque, int version_id)
>       return 0;
>   }
>   
> -static bool pre_2_8_migration(void *opaque, int version_id)
> -{
> -    SpaprPhbState *sphb = opaque;
> -
> -    return sphb->pre_2_8_migration;
> -}
> -
>   static const VMStateDescription vmstate_spapr_pci = {
>       .name = "spapr_pci",
>       .version_id = 2,
> @@ -2216,11 +2193,6 @@ static const VMStateDescription vmstate_spapr_pci = {
>       .post_load = spapr_pci_post_load,
>       .fields = (const VMStateField[]) {
>           VMSTATE_UINT64_EQUAL(buid, SpaprPhbState, NULL),
> -        VMSTATE_UINT32_TEST(mig_liobn, SpaprPhbState, pre_2_8_migration),
> -        VMSTATE_UINT64_TEST(mig_mem_win_addr, SpaprPhbState, pre_2_8_migration),
> -        VMSTATE_UINT64_TEST(mig_mem_win_size, SpaprPhbState, pre_2_8_migration),
> -        VMSTATE_UINT64_TEST(mig_io_win_addr, SpaprPhbState, pre_2_8_migration),
> -        VMSTATE_UINT64_TEST(mig_io_win_size, SpaprPhbState, pre_2_8_migration),
>           VMSTATE_STRUCT_ARRAY(lsi_table, SpaprPhbState, PCI_NUM_PINS, 0,
>                                vmstate_spapr_pci_lsi, SpaprPciLsi),
>           VMSTATE_INT32(msi_devs_num, SpaprPhbState),
> diff --git a/target/ppc/cpu_init.c b/target/ppc/cpu_init.c
> index 23881d09e9..7768392986 100644
> --- a/target/ppc/cpu_init.c
> +++ b/target/ppc/cpu_init.c
> @@ -7452,7 +7452,6 @@ static void ppc_disas_set_info(CPUState *cs, disassemble_info *info)
>   }
>   
>   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-3.0-migration", PowerPCCPU, pre_3_0_migration,
> diff --git a/target/ppc/machine.c b/target/ppc/machine.c
> index d433fd45fc..21bed7c7c8 100644
> --- a/target/ppc/machine.c
> +++ b/target/ppc/machine.c
> @@ -118,13 +118,6 @@ static const VMStateInfo vmstate_info_vsr = {
>   #define VMSTATE_VSR_ARRAY(_f, _s, _n)                             \
>       VMSTATE_VSR_ARRAY_V(_f, _s, _n, 0)
>   
> -static bool cpu_pre_2_8_migration(void *opaque, int version_id)
> -{
> -    PowerPCCPU *cpu = opaque;
> -
> -    return cpu->pre_2_8_migration;
> -}
> -
>   #if defined(TARGET_PPC64)
>   static bool cpu_pre_3_0_migration(void *opaque, int version_id)
>   {
> @@ -139,22 +132,6 @@ static int cpu_pre_save(void *opaque)
>       PowerPCCPU *cpu = opaque;
>       CPUPPCState *env = &cpu->env;
>       int i;
> -    uint64_t insns_compat_mask =
> -        PPC_INSNS_BASE | PPC_ISEL | PPC_STRING | PPC_MFTB
> -        | PPC_FLOAT | PPC_FLOAT_FSEL | PPC_FLOAT_FRES
> -        | PPC_FLOAT_FSQRT | PPC_FLOAT_FRSQRTE | PPC_FLOAT_FRSQRTES
> -        | PPC_FLOAT_STFIWX | PPC_FLOAT_EXT
> -        | PPC_CACHE | PPC_CACHE_ICBI | PPC_CACHE_DCBZ
> -        | PPC_MEM_SYNC | PPC_MEM_EIEIO | PPC_MEM_TLBIE | PPC_MEM_TLBSYNC
> -        | PPC_64B | PPC_64BX | PPC_ALTIVEC
> -        | PPC_SEGMENT_64B | PPC_SLBI | PPC_POPCNTB | PPC_POPCNTWD;
> -    uint64_t insns_compat_mask2 = PPC2_VSX | PPC2_VSX207 | PPC2_DFP | PPC2_DBRX
> -        | PPC2_PERM_ISA206 | PPC2_DIVE_ISA206
> -        | PPC2_ATOMIC_ISA206 | PPC2_FP_CVT_ISA206
> -        | PPC2_FP_TST_ISA206 | PPC2_BCTAR_ISA207
> -        | PPC2_LSQ_ISA207 | PPC2_ALTIVEC_207
> -        | PPC2_ISA205 | PPC2_ISA207S | PPC2_FP_CVT_S64 | PPC2_TM
> -        | PPC2_MEM_LWSYNC;
>   
>       env->spr[SPR_LR] = env->lr;
>       env->spr[SPR_CTR] = env->ctr;
> @@ -177,29 +154,6 @@ static int cpu_pre_save(void *opaque)
>           env->spr[SPR_IBAT4U + 2 * i + 1] = env->IBAT[1][i + 4];
>       }
>   
> -    /* Hacks for migration compatibility between 2.6, 2.7 & 2.8 */
> -    if (cpu->pre_2_8_migration) {
> -        /*
> -         * Mask out bits that got added to msr_mask since the versions
> -         * which stupidly included it in the migration stream.
> -         */
> -        target_ulong metamask = 0
> -#if defined(TARGET_PPC64)
> -            | (1ULL << MSR_TS0)
> -            | (1ULL << MSR_TS1)
> -#endif
> -            ;
> -        cpu->mig_msr_mask = env->msr_mask & ~metamask;
> -        cpu->mig_insns_flags = env->insns_flags & insns_compat_mask;
> -        /*
> -         * CPU models supported by old machines all have
> -         * PPC_MEM_TLBIE, so we set it unconditionally to allow
> -         * backward migration from a POWER9 host to a POWER8 host.
> -         */
> -        cpu->mig_insns_flags |= PPC_MEM_TLBIE;
> -        cpu->mig_insns_flags2 = env->insns_flags2 & insns_compat_mask2;
> -        cpu->mig_nb_BATs = env->nb_BATs;
> -    }
>       if (cpu->pre_3_0_migration) {
>           if (cpu->hash64_opts) {
>               cpu->mig_slb_nr = cpu->hash64_opts->slb_size;
> @@ -760,12 +714,6 @@ const VMStateDescription vmstate_ppc_cpu = {
>           /* Backward compatible internal state */
>           VMSTATE_UINTTL(env.hflags_compat_nmsr, PowerPCCPU),
>   
> -        /* Sanity checking */
> -        VMSTATE_UINTTL_TEST(mig_msr_mask, PowerPCCPU, cpu_pre_2_8_migration),
> -        VMSTATE_UINT64_TEST(mig_insns_flags, PowerPCCPU, cpu_pre_2_8_migration),
> -        VMSTATE_UINT64_TEST(mig_insns_flags2, PowerPCCPU,
> -                            cpu_pre_2_8_migration),
> -        VMSTATE_UINT32_TEST(mig_nb_BATs, PowerPCCPU, cpu_pre_2_8_migration),
>           VMSTATE_END_OF_LIST()
>       },
>       .subsections = (const VMStateDescription * const []) {

[PATCH v2 08/11] ppc/spapr: remove deprecated machine pseries-2.8

[Harsh Prateek Bora]

Commit 1392617d3576 intended to tag pseries-2.1 - 2.11 machines as
deprecated with reasons mentioned in its commit log.
Removing pseries-2.8 specific code with this patch for now.

Suggested-by: Cédric Le Goater <clg@kaod.org>
Signed-off-by: Harsh Prateek Bora <harshpb@linux.ibm.com>
---
 hw/ppc/spapr.c | 18 ------------------
 1 file changed, 18 deletions(-)

diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
index 4e8f2a5d8e..97ab253fcc 100644
--- a/hw/ppc/spapr.c
+++ b/hw/ppc/spapr.c
@@ -5204,24 +5204,6 @@ static void spapr_machine_2_9_class_options(MachineClass *mc)
 
 DEFINE_SPAPR_MACHINE(2, 9);
 
-/*
- * pseries-2.8
- */
-
-static void spapr_machine_2_8_class_options(MachineClass *mc)
-{
-    static GlobalProperty compat[] = {
-        { TYPE_SPAPR_PCI_HOST_BRIDGE, "pcie-extended-configuration-space", "off" },
-    };
-
-    spapr_machine_2_9_class_options(mc);
-    compat_props_add(mc->compat_props, hw_compat_2_8, hw_compat_2_8_len);
-    compat_props_add(mc->compat_props, compat, G_N_ELEMENTS(compat));
-    mc->numa_mem_align_shift = 23;
-}
-
-DEFINE_SPAPR_MACHINE(2, 8);
-
 static void spapr_machine_register_types(void)
 {
     type_register_static(&spapr_machine_info);
-- 
2.45.2

Re: [PATCH v2 08/11] ppc/spapr: remove deprecated machine pseries-2.8

[Cédric Le Goater]

On 10/1/24 11:29, Harsh Prateek Bora wrote:
> Commit 1392617d3576 intended to tag pseries-2.1 - 2.11 machines as
> deprecated with reasons mentioned in its commit log.
> Removing pseries-2.8 specific code with this patch for now.
> 
> Suggested-by: Cédric Le Goater <clg@kaod.org>
> Signed-off-by: Harsh Prateek Bora <harshpb@linux.ibm.com>


Reviewed-by: Cédric Le Goater <clg@redhat.com>

Thanks,

C.


> ---
>   hw/ppc/spapr.c | 18 ------------------
>   1 file changed, 18 deletions(-)
> 
> diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
> index 4e8f2a5d8e..97ab253fcc 100644
> --- a/hw/ppc/spapr.c
> +++ b/hw/ppc/spapr.c
> @@ -5204,24 +5204,6 @@ static void spapr_machine_2_9_class_options(MachineClass *mc)
>   
>   DEFINE_SPAPR_MACHINE(2, 9);
>   
> -/*
> - * pseries-2.8
> - */
> -
> -static void spapr_machine_2_8_class_options(MachineClass *mc)
> -{
> -    static GlobalProperty compat[] = {
> -        { TYPE_SPAPR_PCI_HOST_BRIDGE, "pcie-extended-configuration-space", "off" },
> -    };
> -
> -    spapr_machine_2_9_class_options(mc);
> -    compat_props_add(mc->compat_props, hw_compat_2_8, hw_compat_2_8_len);
> -    compat_props_add(mc->compat_props, compat, G_N_ELEMENTS(compat));
> -    mc->numa_mem_align_shift = 23;
> -}
> -
> -DEFINE_SPAPR_MACHINE(2, 8);
> -
>   static void spapr_machine_register_types(void)
>   {
>       type_register_static(&spapr_machine_info);

[PATCH v2 09/11] ppc/spapr: remove deprecated machine pseries-2.9

[Harsh Prateek Bora]

Commit 1392617d3576 intended to tag pseries-2.1 - 2.11 machines as
deprecated with reasons mentioned in its commit log.
Removing pseries-2.9 specific code with this patch for now.

Suggested-by: Cédric Le Goater <clg@kaod.org>
Signed-off-by: Harsh Prateek Bora <harshpb@linux.ibm.com>
---
 target/ppc/cpu.h      |  1 -
 hw/ppc/spapr.c        | 20 --------------------
 target/ppc/cpu_init.c |  2 --
 target/ppc/machine.c  |  2 +-
 4 files changed, 1 insertion(+), 24 deletions(-)

diff --git a/target/ppc/cpu.h b/target/ppc/cpu.h
index cab4a46fc1..74a0ab768d 100644
--- a/target/ppc/cpu.h
+++ b/target/ppc/cpu.h
@@ -1456,7 +1456,6 @@ struct ArchCPU {
     opc_handler_t *opcodes[PPC_CPU_OPCODES_LEN];
 
     /* Fields related to migration compatibility hacks */
-    bool pre_2_10_migration;
     bool pre_3_0_migration;
     int32_t mig_slb_nr;
 };
diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
index 97ab253fcc..84da4ece77 100644
--- a/hw/ppc/spapr.c
+++ b/hw/ppc/spapr.c
@@ -5184,26 +5184,6 @@ static void spapr_machine_2_10_class_options(MachineClass *mc)
 
 DEFINE_SPAPR_MACHINE(2, 10);
 
-/*
- * pseries-2.9
- */
-
-static void spapr_machine_2_9_class_options(MachineClass *mc)
-{
-    SpaprMachineClass *smc = SPAPR_MACHINE_CLASS(mc);
-    static GlobalProperty compat[] = {
-        { TYPE_POWERPC_CPU, "pre-2.10-migration", "on" },
-    };
-
-    spapr_machine_2_10_class_options(mc);
-    compat_props_add(mc->compat_props, hw_compat_2_9, hw_compat_2_9_len);
-    compat_props_add(mc->compat_props, compat, G_N_ELEMENTS(compat));
-    smc->pre_2_10_has_unused_icps = true;
-    smc->resize_hpt_default = SPAPR_RESIZE_HPT_DISABLED;
-}
-
-DEFINE_SPAPR_MACHINE(2, 9);
-
 static void spapr_machine_register_types(void)
 {
     type_register_static(&spapr_machine_info);
diff --git a/target/ppc/cpu_init.c b/target/ppc/cpu_init.c
index 7768392986..39c19e6674 100644
--- a/target/ppc/cpu_init.c
+++ b/target/ppc/cpu_init.c
@@ -7452,8 +7452,6 @@ static void ppc_disas_set_info(CPUState *cs, disassemble_info *info)
 }
 
 static Property ppc_cpu_properties[] = {
-    DEFINE_PROP_BOOL("pre-2.10-migration", PowerPCCPU, pre_2_10_migration,
-                     false),
     DEFINE_PROP_BOOL("pre-3.0-migration", PowerPCCPU, pre_3_0_migration,
                      false),
     DEFINE_PROP_END_OF_LIST(),
diff --git a/target/ppc/machine.c b/target/ppc/machine.c
index 21bed7c7c8..47495b68b1 100644
--- a/target/ppc/machine.c
+++ b/target/ppc/machine.c
@@ -630,7 +630,7 @@ static bool compat_needed(void *opaque)
     PowerPCCPU *cpu = opaque;
 
     assert(!(cpu->compat_pvr && !cpu->vhyp));
-    return !cpu->pre_2_10_migration && cpu->compat_pvr != 0;
+    return cpu->compat_pvr != 0;
 }
 
 static const VMStateDescription vmstate_compat = {
-- 
2.45.2

Re: [PATCH v2 09/11] ppc/spapr: remove deprecated machine pseries-2.9

[Cédric Le Goater]

On 10/1/24 11:29, Harsh Prateek Bora wrote:
> Commit 1392617d3576 intended to tag pseries-2.1 - 2.11 machines as
> deprecated with reasons mentioned in its commit log.
> Removing pseries-2.9 specific code with this patch for now.
> 
> Suggested-by: Cédric Le Goater <clg@kaod.org>
> Signed-off-by: Harsh Prateek Bora <harshpb@linux.ibm.com>


Reviewed-by: Cédric Le Goater <clg@redhat.com>

Thanks,

C.


> ---
>   target/ppc/cpu.h      |  1 -
>   hw/ppc/spapr.c        | 20 --------------------
>   target/ppc/cpu_init.c |  2 --
>   target/ppc/machine.c  |  2 +-
>   4 files changed, 1 insertion(+), 24 deletions(-)
> 
> diff --git a/target/ppc/cpu.h b/target/ppc/cpu.h
> index cab4a46fc1..74a0ab768d 100644
> --- a/target/ppc/cpu.h
> +++ b/target/ppc/cpu.h
> @@ -1456,7 +1456,6 @@ struct ArchCPU {
>       opc_handler_t *opcodes[PPC_CPU_OPCODES_LEN];
>   
>       /* Fields related to migration compatibility hacks */
> -    bool pre_2_10_migration;
>       bool pre_3_0_migration;
>       int32_t mig_slb_nr;
>   };
> diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
> index 97ab253fcc..84da4ece77 100644
> --- a/hw/ppc/spapr.c
> +++ b/hw/ppc/spapr.c
> @@ -5184,26 +5184,6 @@ static void spapr_machine_2_10_class_options(MachineClass *mc)
>   
>   DEFINE_SPAPR_MACHINE(2, 10);
>   
> -/*
> - * pseries-2.9
> - */
> -
> -static void spapr_machine_2_9_class_options(MachineClass *mc)
> -{
> -    SpaprMachineClass *smc = SPAPR_MACHINE_CLASS(mc);
> -    static GlobalProperty compat[] = {
> -        { TYPE_POWERPC_CPU, "pre-2.10-migration", "on" },
> -    };
> -
> -    spapr_machine_2_10_class_options(mc);
> -    compat_props_add(mc->compat_props, hw_compat_2_9, hw_compat_2_9_len);
> -    compat_props_add(mc->compat_props, compat, G_N_ELEMENTS(compat));
> -    smc->pre_2_10_has_unused_icps = true;
> -    smc->resize_hpt_default = SPAPR_RESIZE_HPT_DISABLED;
> -}> -
> -DEFINE_SPAPR_MACHINE(2, 9);
> -
>   static void spapr_machine_register_types(void)
>   {
>       type_register_static(&spapr_machine_info);
> diff --git a/target/ppc/cpu_init.c b/target/ppc/cpu_init.c
> index 7768392986..39c19e6674 100644
> --- a/target/ppc/cpu_init.c
> +++ b/target/ppc/cpu_init.c
> @@ -7452,8 +7452,6 @@ static void ppc_disas_set_info(CPUState *cs, disassemble_info *info)
>   }
>   
>   static Property ppc_cpu_properties[] = {
> -    DEFINE_PROP_BOOL("pre-2.10-migration", PowerPCCPU, pre_2_10_migration,
> -                     false),
>       DEFINE_PROP_BOOL("pre-3.0-migration", PowerPCCPU, pre_3_0_migration,
>                        false),
>       DEFINE_PROP_END_OF_LIST(),
> diff --git a/target/ppc/machine.c b/target/ppc/machine.c
> index 21bed7c7c8..47495b68b1 100644
> --- a/target/ppc/machine.c
> +++ b/target/ppc/machine.c
> @@ -630,7 +630,7 @@ static bool compat_needed(void *opaque)
>       PowerPCCPU *cpu = opaque;
>   
>       assert(!(cpu->compat_pvr && !cpu->vhyp));
> -    return !cpu->pre_2_10_migration && cpu->compat_pvr != 0;
> +    return cpu->compat_pvr != 0;
>   }
>   
>   static const VMStateDescription vmstate_compat = {

[PATCH v2 10/11] ppc/spapr: remove deprecated machine pseries-2.10

[Harsh Prateek Bora]

Commit 1392617d3576 intended to tag pseries-2.1 - 2.11 machines as
deprecated with reasons mentioned in its commit log.
Removing pseries-2.10 specific code with this patch for now.

Suggested-by: Cédric Le Goater <clg@kaod.org>
Signed-off-by: Harsh Prateek Bora <harshpb@linux.ibm.com>
---
 hw/ppc/spapr.c | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
index 84da4ece77..cb6bf219bf 100644
--- a/hw/ppc/spapr.c
+++ b/hw/ppc/spapr.c
@@ -5172,18 +5172,6 @@ static void spapr_machine_2_11_class_options(MachineClass *mc)
 
 DEFINE_SPAPR_MACHINE(2, 11);
 
-/*
- * pseries-2.10
- */
-
-static void spapr_machine_2_10_class_options(MachineClass *mc)
-{
-    spapr_machine_2_11_class_options(mc);
-    compat_props_add(mc->compat_props, hw_compat_2_10, hw_compat_2_10_len);
-}
-
-DEFINE_SPAPR_MACHINE(2, 10);
-
 static void spapr_machine_register_types(void)
 {
     type_register_static(&spapr_machine_info);
-- 
2.45.2

Re: [PATCH v2 10/11] ppc/spapr: remove deprecated machine pseries-2.10

[Cédric Le Goater]

On 10/1/24 11:29, Harsh Prateek Bora wrote:
> Commit 1392617d3576 intended to tag pseries-2.1 - 2.11 machines as
> deprecated with reasons mentioned in its commit log.
> Removing pseries-2.10 specific code with this patch for now.
> 
> Suggested-by: Cédric Le Goater <clg@kaod.org>
> Signed-off-by: Harsh Prateek Bora <harshpb@linux.ibm.com>


Reviewed-by: Cédric Le Goater <clg@redhat.com>

Thanks,

C.


> ---
>   hw/ppc/spapr.c | 12 ------------
>   1 file changed, 12 deletions(-)
> 
> diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
> index 84da4ece77..cb6bf219bf 100644
> --- a/hw/ppc/spapr.c
> +++ b/hw/ppc/spapr.c
> @@ -5172,18 +5172,6 @@ static void spapr_machine_2_11_class_options(MachineClass *mc)
>   
>   DEFINE_SPAPR_MACHINE(2, 11);
>   
> -/*
> - * pseries-2.10
> - */
> -
> -static void spapr_machine_2_10_class_options(MachineClass *mc)
> -{
> -    spapr_machine_2_11_class_options(mc);
> -    compat_props_add(mc->compat_props, hw_compat_2_10, hw_compat_2_10_len);
> -}
> -
> -DEFINE_SPAPR_MACHINE(2, 10);
> -
>   static void spapr_machine_register_types(void)
>   {
>       type_register_static(&spapr_machine_info);

[PATCH v2 11/11] ppc/spapr: remove deprecated machine pseries-2.11

[Harsh Prateek Bora]

Commit 1392617d3576 intended to tag pseries-2.1 - 2.11 machines as
deprecated with reasons mentioned in its commit log.
Removing pseries-2.11 specific code with this patch.

Suggested-by: Cédric Le Goater <clg@kaod.org>
Signed-off-by: Harsh Prateek Bora <harshpb@linux.ibm.com>
---
 hw/ppc/spapr.c | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
index cb6bf219bf..04f06377b4 100644
--- a/hw/ppc/spapr.c
+++ b/hw/ppc/spapr.c
@@ -5157,21 +5157,6 @@ static void spapr_machine_2_12_sxxm_class_options(MachineClass *mc)
 
 DEFINE_SPAPR_MACHINE_TAGGED(2, 12, sxxm);
 
-/*
- * pseries-2.11
- */
-
-static void spapr_machine_2_11_class_options(MachineClass *mc)
-{
-    SpaprMachineClass *smc = SPAPR_MACHINE_CLASS(mc);
-
-    spapr_machine_2_12_class_options(mc);
-    smc->default_caps.caps[SPAPR_CAP_HTM] = SPAPR_CAP_ON;
-    compat_props_add(mc->compat_props, hw_compat_2_11, hw_compat_2_11_len);
-}
-
-DEFINE_SPAPR_MACHINE(2, 11);
-
 static void spapr_machine_register_types(void)
 {
     type_register_static(&spapr_machine_info);
-- 
2.45.2

Re: [PATCH v2 11/11] ppc/spapr: remove deprecated machine pseries-2.11

[Cédric Le Goater]

On 10/1/24 11:29, Harsh Prateek Bora wrote:
> Commit 1392617d3576 intended to tag pseries-2.1 - 2.11 machines as
> deprecated with reasons mentioned in its commit log.
> Removing pseries-2.11 specific code with this patch.
> 
> Suggested-by: Cédric Le Goater <clg@kaod.org>
> Signed-off-by: Harsh Prateek Bora <harshpb@linux.ibm.com>


Reviewed-by: Cédric Le Goater <clg@redhat.com>

Thanks,

C.


> ---
>   hw/ppc/spapr.c | 15 ---------------
>   1 file changed, 15 deletions(-)
> 
> diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
> index cb6bf219bf..04f06377b4 100644
> --- a/hw/ppc/spapr.c
> +++ b/hw/ppc/spapr.c
> @@ -5157,21 +5157,6 @@ static void spapr_machine_2_12_sxxm_class_options(MachineClass *mc)
>   
>   DEFINE_SPAPR_MACHINE_TAGGED(2, 12, sxxm);
>   
> -/*
> - * pseries-2.11
> - */
> -
> -static void spapr_machine_2_11_class_options(MachineClass *mc)
> -{
> -    SpaprMachineClass *smc = SPAPR_MACHINE_CLASS(mc);
> -
> -    spapr_machine_2_12_class_options(mc);
> -    smc->default_caps.caps[SPAPR_CAP_HTM] = SPAPR_CAP_ON;
> -    compat_props_add(mc->compat_props, hw_compat_2_11, hw_compat_2_11_len);
> -}
> -
> -DEFINE_SPAPR_MACHINE(2, 11);
> -
>   static void spapr_machine_register_types(void)
>   {
>       type_register_static(&spapr_machine_info);

Re: [PATCH v2 00/11] ppc/spapr: remove deprecated machines specific code

[Cédric Le Goater]

Hello Harsh,

On 10/1/24 11:28, Harsh Prateek Bora wrote:
> Commit 1392617d3576 intended to tag pseries-2.1 - 2.11 machines as
> deprecated with reasons mentioned in its commit log.
> Removing the arch specific code for the now deprecated machine types.
> 
> v2: Addressed review comments from Cedric
> v1: <20240917060300.943496-1-harshpb@linux.ibm.com>
>   
> Harsh Prateek Bora (11):
>    ppc/spapr: remove deprecated machine pseries-2.1
>    ppc/spapr: remove deprecated machine pseries-2.2
>    ppc/spapr: remove deprecated machine pseries-2.3
>    ppc/spapr: remove deprecated machine pseries-2.4
>    ppc/spapr: remove deprecated machine pseries-2.5
>    ppc/spapr: remove deprecated machine pseries-2.6
>    ppc/spapr: remove deprecated machine pseries-2.7
>    ppc/spapr: remove deprecated machine pseries-2.8
>    ppc/spapr: remove deprecated machine pseries-2.9
>    ppc/spapr: remove deprecated machine pseries-2.10
>    ppc/spapr: remove deprecated machine pseries-2.11

LGTM, I had a few questions.

Please be aware that the next QEMU cycle will have more machines
to deprecate.

pseries-2.1          pSeries Logical Partition (PAPR compliant) (deprecated)
pseries-2.10         pSeries Logical Partition (PAPR compliant) (deprecated)
pseries-2.11         pSeries Logical Partition (PAPR compliant) (deprecated)
pseries-2.12         pSeries Logical Partition (PAPR compliant) (deprecated)
pseries-2.12-sxxm    pSeries Logical Partition (PAPR compliant) (deprecated)
pseries-2.2          pSeries Logical Partition (PAPR compliant) (deprecated)
pseries-2.3          pSeries Logical Partition (PAPR compliant) (deprecated)
pseries-2.4          pSeries Logical Partition (PAPR compliant) (deprecated)
pseries-2.5          pSeries Logical Partition (PAPR compliant) (deprecated)
pseries-2.6          pSeries Logical Partition (PAPR compliant) (deprecated)
pseries-2.7          pSeries Logical Partition (PAPR compliant) (deprecated)
pseries-2.8          pSeries Logical Partition (PAPR compliant) (deprecated)
pseries-2.9          pSeries Logical Partition (PAPR compliant) (deprecated)
pseries-3.0          pSeries Logical Partition (PAPR compliant) (deprecated)
pseries-3.1          pSeries Logical Partition (PAPR compliant) (deprecated)
pseries-4.0          pSeries Logical Partition (PAPR compliant) (deprecated)
pseries-4.1          pSeries Logical Partition (PAPR compliant) (deprecated)
pseries-4.2          pSeries Logical Partition (PAPR compliant) (deprecated)
pseries-5.0          pSeries Logical Partition (PAPR compliant) (deprecated)
pseries-5.1          pSeries Logical Partition (PAPR compliant) (deprecated)
pseries-5.2          pSeries Logical Partition (PAPR compliant) (deprecated)
pseries-6.0          pSeries Logical Partition (PAPR compliant) (deprecated)
pseries-6.1          pSeries Logical Partition (PAPR compliant) (deprecated)

Thanks,

C.

Re: [PATCH v2 00/11] ppc/spapr: remove deprecated machines specific code

[Harsh Prateek Bora]

Hi Cedric,

On 10/2/24 12:26, Cédric Le Goater wrote:
> Hello Harsh,
> 
> On 10/1/24 11:28, Harsh Prateek Bora wrote:
>> Commit 1392617d3576 intended to tag pseries-2.1 - 2.11 machines as
>> deprecated with reasons mentioned in its commit log.
>> Removing the arch specific code for the now deprecated machine types.
>>
>> v2: Addressed review comments from Cedric
>> v1: <20240917060300.943496-1-harshpb@linux.ibm.com>
>> Harsh Prateek Bora (11):
>>    ppc/spapr: remove deprecated machine pseries-2.1
>>    ppc/spapr: remove deprecated machine pseries-2.2
>>    ppc/spapr: remove deprecated machine pseries-2.3
>>    ppc/spapr: remove deprecated machine pseries-2.4
>>    ppc/spapr: remove deprecated machine pseries-2.5
>>    ppc/spapr: remove deprecated machine pseries-2.6
>>    ppc/spapr: remove deprecated machine pseries-2.7
>>    ppc/spapr: remove deprecated machine pseries-2.8
>>    ppc/spapr: remove deprecated machine pseries-2.9
>>    ppc/spapr: remove deprecated machine pseries-2.10
>>    ppc/spapr: remove deprecated machine pseries-2.11
> 
> LGTM, I had a few questions.
> 

Thanks, I shall address the review comments in next iteration.

> Please be aware that the next QEMU cycle will have more machines
> to deprecate.
> 

I realized that 2.12 had also been marked as deprecated earlier which I
can include in v3, however would like to understand the rationale behind
choosing the remaining until pseries-6.1 for deprecating in next release
cycle. Please enlighten.

regards,
Harsh

> pseries-2.1          pSeries Logical Partition (PAPR compliant) 
> (deprecated)
> pseries-2.10         pSeries Logical Partition (PAPR compliant) 
> (deprecated)
> pseries-2.11         pSeries Logical Partition (PAPR compliant) 
> (deprecated)
> pseries-2.12         pSeries Logical Partition (PAPR compliant) 
> (deprecated)
> pseries-2.12-sxxm    pSeries Logical Partition (PAPR compliant) 
> (deprecated)
> pseries-2.2          pSeries Logical Partition (PAPR compliant) 
> (deprecated)
> pseries-2.3          pSeries Logical Partition (PAPR compliant) 
> (deprecated)
> pseries-2.4          pSeries Logical Partition (PAPR compliant) 
> (deprecated)
> pseries-2.5          pSeries Logical Partition (PAPR compliant) 
> (deprecated)
> pseries-2.6          pSeries Logical Partition (PAPR compliant) 
> (deprecated)
> pseries-2.7          pSeries Logical Partition (PAPR compliant) 
> (deprecated)
> pseries-2.8          pSeries Logical Partition (PAPR compliant) 
> (deprecated)
> pseries-2.9          pSeries Logical Partition (PAPR compliant) 
> (deprecated)
> pseries-3.0          pSeries Logical Partition (PAPR compliant) 
> (deprecated)
> pseries-3.1          pSeries Logical Partition (PAPR compliant) 
> (deprecated)
> pseries-4.0          pSeries Logical Partition (PAPR compliant) 
> (deprecated)
> pseries-4.1          pSeries Logical Partition (PAPR compliant) 
> (deprecated)
> pseries-4.2          pSeries Logical Partition (PAPR compliant) 
> (deprecated)
> pseries-5.0          pSeries Logical Partition (PAPR compliant) 
> (deprecated)
> pseries-5.1          pSeries Logical Partition (PAPR compliant) 
> (deprecated)
> pseries-5.2          pSeries Logical Partition (PAPR compliant) 
> (deprecated)
> pseries-6.0          pSeries Logical Partition (PAPR compliant) 
> (deprecated)
> pseries-6.1          pSeries Logical Partition (PAPR compliant) 
> (deprecated)
> 
> Thanks,
> 
> C.
> 

Re: [PATCH v2 00/11] ppc/spapr: remove deprecated machines specific code

[Cédric Le Goater]

Hello Harsh

On 10/3/24 07:16, Harsh Prateek Bora wrote:
> Hi Cedric,
> 
> On 10/2/24 12:26, Cédric Le Goater wrote:
>> Hello Harsh,
>>
>> On 10/1/24 11:28, Harsh Prateek Bora wrote:
>>> Commit 1392617d3576 intended to tag pseries-2.1 - 2.11 machines as
>>> deprecated with reasons mentioned in its commit log.
>>> Removing the arch specific code for the now deprecated machine types.
>>>
>>> v2: Addressed review comments from Cedric
>>> v1: <20240917060300.943496-1-harshpb@linux.ibm.com>
>>> Harsh Prateek Bora (11):
>>>    ppc/spapr: remove deprecated machine pseries-2.1
>>>    ppc/spapr: remove deprecated machine pseries-2.2
>>>    ppc/spapr: remove deprecated machine pseries-2.3
>>>    ppc/spapr: remove deprecated machine pseries-2.4
>>>    ppc/spapr: remove deprecated machine pseries-2.5
>>>    ppc/spapr: remove deprecated machine pseries-2.6
>>>    ppc/spapr: remove deprecated machine pseries-2.7
>>>    ppc/spapr: remove deprecated machine pseries-2.8
>>>    ppc/spapr: remove deprecated machine pseries-2.9
>>>    ppc/spapr: remove deprecated machine pseries-2.10
>>>    ppc/spapr: remove deprecated machine pseries-2.11
>>
>> LGTM, I had a few questions.
>>
> 
> Thanks, I shall address the review comments in next iteration.

While at it, could you please also remove the pseries paragraph in
the 'docs/about/deprecated.rst' file  ?

>> Please be aware that the next QEMU cycle will have more machines
>> to deprecate.
>>
> 
> I realized that 2.12 had also been marked as deprecated earlier which I
> can include in v3, however would like to understand the rationale behind
> choosing the remaining until pseries-6.1 for deprecating in next release
> cycle. 

pseries-6.1 is not for this release.

> Please enlighten.

It's in the docs :

   https://www.qemu.org/docs/master/about/deprecated.html
   
   As a special exception to this general timeframe, rather than have an
   indefinite lifetime, versioned machine types are only intended to be
   supported for a period of 6 years, equivalent to 18 QEMU releases. All
   versioned machine types will be automatically marked deprecated after
   an initial 3 years (9 QEMU releases) has passed, and will then be
   deleted after a further 3 year period has passed. It is recommended
   that a deprecated machine type is only used for incoming migrations
   and restore of saved state, for pre-existing VM deployments. They
   should be scheduled for updating to a newer machine type during an
   appropriate service window. Newly deployed VMs should exclusively use
   a non-deprecated machine type, with use of the most recent version
   highly recommended. Non-versioned machine types follow the general
   feature deprecation policy.

So, since the tags date are :

   refs/tags/v2.0.0 Thu Apr 17 13:41:45 2014 +0100
   refs/tags/v2.1.0 Fri Aug 1 13:31:29 2014 +0100
   refs/tags/v2.2.0 Tue Dec 9 12:13:37 2014 +0000
   refs/tags/v2.3.0 Fri Apr 24 15:05:06 2015 +0100
   refs/tags/v2.4.0 Tue Aug 11 15:30:34 2015 +0100
   refs/tags/v2.5.0 Wed Dec 16 16:10:14 2015 +0000
   refs/tags/v2.6.0 Wed May 11 16:44:26 2016 +0100
   refs/tags/v2.7.0 Fri Sep 2 13:44:11 2016 +0100
   refs/tags/v2.8.0 Tue Dec 20 16:17:01 2016 +0000
   refs/tags/v2.9.0 Thu Apr 20 15:31:34 2017 +0100
   refs/tags/v2.10.0 Wed Aug 30 17:02:54 2017 +0100
   refs/tags/v2.11.0 Wed Dec 13 14:31:09 2017 +0000
   refs/tags/v2.12.0 Tue Apr 24 16:44:55 2018 +0100
   refs/tags/v3.0.0 Tue Aug 14 16:38:43 2018 +0100
                                                    <--- ~6y
   refs/tags/v3.1.0 Tue Dec 11 17:18:37 2018 +0000
   refs/tags/v4.0.0 Tue Apr 23 17:32:17 2019 +0100
   refs/tags/v4.1.0 Thu Aug 15 13:03:37 2019 +0100
   refs/tags/v4.2.0 Thu Dec 12 16:45:57 2019 +0000
   refs/tags/v5.0.0 Tue Apr 28 17:46:57 2020 +0100
   refs/tags/v5.1.0 Tue Aug 11 17:07:03 2020 +0100
   refs/tags/v5.2.0 Tue Dec 8 15:55:19 2020 +0000
   refs/tags/v6.0.0 Thu Apr 29 18:05:29 2021 +0100
   refs/tags/v6.1.0 Tue Aug 24 17:59:52 2021 +0100
   refs/tags/v6.2.0 Tue Dec 14 12:35:02 2021 -0800
   refs/tags/v7.0.0 Tue Apr 19 18:44:36 2022 +0100
   refs/tags/v7.1.0 Tue Aug 30 09:40:11 2022 -0700
   refs/tags/v7.2.0 Tue Dec 13 15:54:59 2022 -0500
   refs/tags/v8.0.0 Wed Apr 19 17:27:13 2023 +0100
   refs/tags/v8.1.0 Tue Aug 22 07:13:44 2023 -0700
   refs/tags/v8.2.0 Tue Dec 19 09:45:04 2023 -0500
   refs/tags/v9.0.0 Tue Apr 23 19:14:06 2024 +0100
   refs/tags/v9.1.0 Tue Sep 3 09:18:26 2024 -0700
   
We can remove up to v3.0.0. v3.1.0 could be a candidate too,
I will check.

Thanks,

C.