diff mbox

[4/4] qdev: put all devices under /machine

Message ID 1332866328-25443-5-git-send-email-pbonzini@redhat.com
State New
Headers show

Commit Message

Paolo Bonzini March 27, 2012, 4:38 p.m. UTC 
Avoid cluttering too much the QOM root.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 hw/piix_pci.c     |    2 +-
 hw/ppc_prep.c     |    2 +-
 hw/qdev-monitor.c |    4 ++--
 hw/qdev.c         |    2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

Comments

Anthony Liguori March 27, 2012, 9:11 p.m. UTC | #1 
On 03/27/2012 11:38 AM, Paolo Bonzini wrote:
> Avoid cluttering too much the QOM root.
>
> Signed-off-by: Paolo Bonzini<pbonzini@redhat.com>

Reviewed-by: Anthony Liguori <aliguori@us.ibm.com>

Regards,

Anthony Liguori

> ---
>   hw/piix_pci.c     |    2 +-
>   hw/ppc_prep.c     |    2 +-
>   hw/qdev-monitor.c |    4 ++--
>   hw/qdev.c         |    2 +-
>   4 files changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/hw/piix_pci.c b/hw/piix_pci.c
> index 9017565..bd20a16 100644
> --- a/hw/piix_pci.c
> +++ b/hw/piix_pci.c
> @@ -276,7 +276,7 @@ static PCIBus *i440fx_common_init(const char *device_name,
>       b = pci_bus_new(&s->busdev.qdev, NULL, pci_address_space,
>                       address_space_io, 0);
>       s->bus = b;
> -    object_property_add_child(object_get_root(), "i440fx", OBJECT(dev), NULL);
> +    object_property_add_child(container_get("/machine"), "i440fx", OBJECT(dev), NULL);
>       qdev_init_nofail(dev);
>
>       d = pci_create_simple(b, 0, device_name);
> diff --git a/hw/ppc_prep.c b/hw/ppc_prep.c
> index 86c9336..d06fc5e 100644
> --- a/hw/ppc_prep.c
> +++ b/hw/ppc_prep.c
> @@ -615,7 +615,7 @@ static void ppc_prep_init (ram_addr_t ram_size,
>       sys = sysbus_from_qdev(dev);
>       pcihost = DO_UPCAST(PCIHostState, busdev, sys);
>       pcihost->address_space = get_system_memory();
> -    object_property_add_child(object_get_root(), "raven", OBJECT(dev), NULL);
> +    object_property_add_child(container_get("/machine", "raven", OBJECT(dev), NULL);
>       qdev_init_nofail(dev);
>       pci_bus = (PCIBus *)qdev_get_child_bus(dev, "pci.0");
>       if (pci_bus == NULL) {
> diff --git a/hw/qdev-monitor.c b/hw/qdev-monitor.c
> index 031cb83..4783366 100644
> --- a/hw/qdev-monitor.c
> +++ b/hw/qdev-monitor.c
> @@ -180,7 +180,7 @@ static Object *qdev_get_peripheral(void)
>       static Object *dev;
>
>       if (dev == NULL) {
> -        dev = container_get("/peripheral");
> +        dev = container_get("/machine/peripheral");
>       }
>
>       return dev;
> @@ -191,7 +191,7 @@ static Object *qdev_get_peripheral_anon(void)
>       static Object *dev;
>
>       if (dev == NULL) {
> -        dev = container_get("/peripheral-anon");
> +        dev = container_get("/machine/peripheral-anon");
>       }
>
>       return dev;
> diff --git a/hw/qdev.c b/hw/qdev.c
> index f5c716e..60e5081 100644
> --- a/hw/qdev.c
> +++ b/hw/qdev.c
> @@ -157,7 +157,7 @@ int qdev_init(DeviceState *dev)
>           static int unattached_count = 0;
>           gchar *name = g_strdup_printf("device[%d]", unattached_count++);
>
> -        object_property_add_child(container_get("/unattached"), name,
> +        object_property_add_child(container_get("/machine/unattached"), name,
>                                     OBJECT(dev), NULL);
>           g_free(name);
>       }
Andreas Färber March 28, 2012, 2:01 p.m. UTC | #2 
Am 27.03.2012 23:11, schrieb Anthony Liguori:
> On 03/27/2012 11:38 AM, Paolo Bonzini wrote:
>> Avoid cluttering too much the QOM root.
>>
>> Signed-off-by: Paolo Bonzini<pbonzini@redhat.com>
> 
> Reviewed-by: Anthony Liguori <aliguori@us.ibm.com>

Not terribly convinced, but no better suggestion.

Could you please not hardcode this everywhere but supply a machine_get()
helper? My idea would be that what is now just a container gets replaced
by the future QOM machine object.

I.e. object_get_root() -> machine_get() or whatever we want to call it,
calling container_get("/machine").

Andreas

> 
> Regards,
> 
> Anthony Liguori
> 
>> ---
>>   hw/piix_pci.c     |    2 +-
>>   hw/ppc_prep.c     |    2 +-
>>   hw/qdev-monitor.c |    4 ++--
>>   hw/qdev.c         |    2 +-
>>   4 files changed, 5 insertions(+), 5 deletions(-)
>>
>> diff --git a/hw/piix_pci.c b/hw/piix_pci.c
>> index 9017565..bd20a16 100644
>> --- a/hw/piix_pci.c
>> +++ b/hw/piix_pci.c
>> @@ -276,7 +276,7 @@ static PCIBus *i440fx_common_init(const char
>> *device_name,
>>       b = pci_bus_new(&s->busdev.qdev, NULL, pci_address_space,
>>                       address_space_io, 0);
>>       s->bus = b;
>> -    object_property_add_child(object_get_root(), "i440fx",
>> OBJECT(dev), NULL);
>> +    object_property_add_child(container_get("/machine"), "i440fx",
>> OBJECT(dev), NULL);
>>       qdev_init_nofail(dev);
>>
>>       d = pci_create_simple(b, 0, device_name);
>> diff --git a/hw/ppc_prep.c b/hw/ppc_prep.c
>> index 86c9336..d06fc5e 100644
>> --- a/hw/ppc_prep.c
>> +++ b/hw/ppc_prep.c
>> @@ -615,7 +615,7 @@ static void ppc_prep_init (ram_addr_t ram_size,
>>       sys = sysbus_from_qdev(dev);
>>       pcihost = DO_UPCAST(PCIHostState, busdev, sys);
>>       pcihost->address_space = get_system_memory();
>> -    object_property_add_child(object_get_root(), "raven",
>> OBJECT(dev), NULL);
>> +    object_property_add_child(container_get("/machine", "raven",
>> OBJECT(dev), NULL);
>>       qdev_init_nofail(dev);
>>       pci_bus = (PCIBus *)qdev_get_child_bus(dev, "pci.0");
>>       if (pci_bus == NULL) {
>> diff --git a/hw/qdev-monitor.c b/hw/qdev-monitor.c
>> index 031cb83..4783366 100644
>> --- a/hw/qdev-monitor.c
>> +++ b/hw/qdev-monitor.c
>> @@ -180,7 +180,7 @@ static Object *qdev_get_peripheral(void)
>>       static Object *dev;
>>
>>       if (dev == NULL) {
>> -        dev = container_get("/peripheral");
>> +        dev = container_get("/machine/peripheral");
>>       }
>>
>>       return dev;
>> @@ -191,7 +191,7 @@ static Object *qdev_get_peripheral_anon(void)
>>       static Object *dev;
>>
>>       if (dev == NULL) {
>> -        dev = container_get("/peripheral-anon");
>> +        dev = container_get("/machine/peripheral-anon");
>>       }
>>
>>       return dev;
>> diff --git a/hw/qdev.c b/hw/qdev.c
>> index f5c716e..60e5081 100644
>> --- a/hw/qdev.c
>> +++ b/hw/qdev.c
>> @@ -157,7 +157,7 @@ int qdev_init(DeviceState *dev)
>>           static int unattached_count = 0;
>>           gchar *name = g_strdup_printf("device[%d]",
>> unattached_count++);
>>
>> -        object_property_add_child(container_get("/unattached"), name,
>> +       
>> object_property_add_child(container_get("/machine/unattached"), name,
>>                                     OBJECT(dev), NULL);
>>           g_free(name);
>>       }
>
diff mbox

Patch

diff --git a/hw/piix_pci.c b/hw/piix_pci.c
index 9017565..bd20a16 100644
--- a/hw/piix_pci.c
+++ b/hw/piix_pci.c
@@ -276,7 +276,7 @@  static PCIBus *i440fx_common_init(const char *device_name,
     b = pci_bus_new(&s->busdev.qdev, NULL, pci_address_space,
                     address_space_io, 0);
     s->bus = b;
-    object_property_add_child(object_get_root(), "i440fx", OBJECT(dev), NULL);
+    object_property_add_child(container_get("/machine"), "i440fx", OBJECT(dev), NULL);
     qdev_init_nofail(dev);
 
     d = pci_create_simple(b, 0, device_name);
diff --git a/hw/ppc_prep.c b/hw/ppc_prep.c
index 86c9336..d06fc5e 100644
--- a/hw/ppc_prep.c
+++ b/hw/ppc_prep.c
@@ -615,7 +615,7 @@  static void ppc_prep_init (ram_addr_t ram_size,
     sys = sysbus_from_qdev(dev);
     pcihost = DO_UPCAST(PCIHostState, busdev, sys);
     pcihost->address_space = get_system_memory();
-    object_property_add_child(object_get_root(), "raven", OBJECT(dev), NULL);
+    object_property_add_child(container_get("/machine", "raven", OBJECT(dev), NULL);
     qdev_init_nofail(dev);
     pci_bus = (PCIBus *)qdev_get_child_bus(dev, "pci.0");
     if (pci_bus == NULL) {
diff --git a/hw/qdev-monitor.c b/hw/qdev-monitor.c
index 031cb83..4783366 100644
--- a/hw/qdev-monitor.c
+++ b/hw/qdev-monitor.c
@@ -180,7 +180,7 @@  static Object *qdev_get_peripheral(void)
     static Object *dev;
 
     if (dev == NULL) {
-        dev = container_get("/peripheral");
+        dev = container_get("/machine/peripheral");
     }
 
     return dev;
@@ -191,7 +191,7 @@  static Object *qdev_get_peripheral_anon(void)
     static Object *dev;
 
     if (dev == NULL) {
-        dev = container_get("/peripheral-anon");
+        dev = container_get("/machine/peripheral-anon");
     }
 
     return dev;
diff --git a/hw/qdev.c b/hw/qdev.c
index f5c716e..60e5081 100644
--- a/hw/qdev.c
+++ b/hw/qdev.c
@@ -157,7 +157,7 @@  int qdev_init(DeviceState *dev)
         static int unattached_count = 0;
         gchar *name = g_strdup_printf("device[%d]", unattached_count++);
 
-        object_property_add_child(container_get("/unattached"), name,
+        object_property_add_child(container_get("/machine/unattached"), name,
                                   OBJECT(dev), NULL);
         g_free(name);
     }