Re: [Qemu-devel] [PATCH 1/8] ppc: QOMify g3beige machine

[David Gibson]

On Sun, Sep 17, 2017 at 06:15:41PM +0100, Mark Cave-Ayland wrote:
> Signed-off-by: Mark Cave-Ayland 

Applied to ppc-for-2.11.

> ---
>  hw/ppc/mac_oldworld.c |   17 +++--
>  1 file changed, 15 insertions(+), 2 deletions(-)
> 
> diff --git a/hw/ppc/mac_oldworld.c b/hw/ppc/mac_oldworld.c
> index fcac399..5d1171d 100644
> --- a/hw/ppc/mac_oldworld.c
> +++ b/hw/ppc/mac_oldworld.c
> @@ -380,8 +380,10 @@ static int heathrow_kvm_type(const char *arg)
>  return 2;
>  }
>  
> -static void heathrow_machine_init(MachineClass *mc)
> +static void heathrow_class_init(ObjectClass *oc, void *data)
>  {
> +MachineClass *mc = MACHINE_CLASS(oc);
> +
>  mc->desc = "Heathrow based PowerMAC";
>  mc->init = ppc_heathrow_init;
>  mc->block_default_type = IF_IDE;
> @@ -394,4 +396,15 @@ static void heathrow_machine_init(MachineClass *mc)
>  mc->kvm_type = heathrow_kvm_type;
>  }
>  
> -DEFINE_MACHINE("g3beige", heathrow_machine_init)
> +static const TypeInfo ppc_heathrow_machine_info = {
> +.name  = MACHINE_TYPE_NAME("g3beige"),
> +.parent= TYPE_MACHINE,
> +.class_init= heathrow_class_init
> +};
> +
> +static void ppc_heathrow_register_types(void)
> +{
> +type_register_static(_heathrow_machine_info);
> +}
> +
> +type_init(ppc_heathrow_register_types);

-- 
David Gibson| I'll have my music baroque, and my code
david AT gibson.dropbear.id.au  | minimalist, thank you.  NOT _the_ _other_
| _way_ _around_!
http://www.ozlabs.org/~dgibson


signature.asc
Description: PGP signature

Re: [Qemu-devel] [PATCH 1/8] ppc: QOMify g3beige machine

[Philippe Mathieu-Daudé]

On 09/17/2017 02:15 PM, Mark Cave-Ayland wrote:

Signed-off-by: Mark Cave-Ayland 


Reviewed-by: Philippe Mathieu-Daudé 


---
  hw/ppc/mac_oldworld.c |   17 +++--
  1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/hw/ppc/mac_oldworld.c b/hw/ppc/mac_oldworld.c
index fcac399..5d1171d 100644
--- a/hw/ppc/mac_oldworld.c
+++ b/hw/ppc/mac_oldworld.c
@@ -380,8 +380,10 @@ static int heathrow_kvm_type(const char *arg)
  return 2;
  }
  
-static void heathrow_machine_init(MachineClass *mc)

+static void heathrow_class_init(ObjectClass *oc, void *data)
  {
+MachineClass *mc = MACHINE_CLASS(oc);
+
  mc->desc = "Heathrow based PowerMAC";
  mc->init = ppc_heathrow_init;
  mc->block_default_type = IF_IDE;
@@ -394,4 +396,15 @@ static void heathrow_machine_init(MachineClass *mc)
  mc->kvm_type = heathrow_kvm_type;
  }
  
-DEFINE_MACHINE("g3beige", heathrow_machine_init)

+static const TypeInfo ppc_heathrow_machine_info = {
+.name  = MACHINE_TYPE_NAME("g3beige"),
+.parent= TYPE_MACHINE,
+.class_init= heathrow_class_init
+};
+
+static void ppc_heathrow_register_types(void)
+{
+type_register_static(_heathrow_machine_info);
+}
+
+type_init(ppc_heathrow_register_types);