diff mbox

[V5,1/5] hw/ppc: realize the PCI root bus as part of mac99 init

Message ID 1467041915-19784-2-git-send-email-marcel@redhat.com
State New
Headers show

Commit Message

Marcel Apfelbaum June 27, 2016, 3:38 p.m. UTC
Mac99's PCI root bus is not part of a host bridge,
realize it manually.

Signed-off-by: Marcel Apfelbaum <marcel@redhat.com>
---
 hw/ppc/mac_newworld.c | 1 +
 1 file changed, 1 insertion(+)

Comments

David Gibson June 28, 2016, 2:56 a.m. UTC | #1
On Mon, Jun 27, 2016 at 06:38:31PM +0300, Marcel Apfelbaum wrote:
> Mac99's PCI root bus is not part of a host bridge,
> realize it manually.

Um.. how did this ever work?

> 
> Signed-off-by: Marcel Apfelbaum <marcel@redhat.com>
> ---
>  hw/ppc/mac_newworld.c | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/hw/ppc/mac_newworld.c b/hw/ppc/mac_newworld.c
> index 32e88b3..7d25106 100644
> --- a/hw/ppc/mac_newworld.c
> +++ b/hw/ppc/mac_newworld.c
> @@ -380,6 +380,7 @@ static void ppc_core99_init(MachineState *machine)
>          pci_bus = pci_pmac_init(pic, get_system_memory(), get_system_io());
>          machine_arch = ARCH_MAC99;
>      }
> +    object_property_set_bool(OBJECT(pci_bus), true, "realized", &error_abort);
>  
>      machine->usb |= defaults_enabled() && !machine->usb_disabled;
>
Marcel Apfelbaum June 28, 2016, 8 a.m. UTC | #2
On 06/28/2016 05:56 AM, David Gibson wrote:
> On Mon, Jun 27, 2016 at 06:38:31PM +0300, Marcel Apfelbaum wrote:
>> Mac99's PCI root bus is not part of a host bridge,
>> realize it manually.
>
> Um.. how did this ever work?

Well, the only thing the PCI bus realize does is
to register the VM migration state, so only migration was affected.

However, patch 2/5 adds to the realize function bus_master initialization code
for all devices attached to the bridge.

Thanks,
Marcel

>
>>
>> Signed-off-by: Marcel Apfelbaum <marcel@redhat.com>
>> ---
>>   hw/ppc/mac_newworld.c | 1 +
>>   1 file changed, 1 insertion(+)
>>
>> diff --git a/hw/ppc/mac_newworld.c b/hw/ppc/mac_newworld.c
>> index 32e88b3..7d25106 100644
>> --- a/hw/ppc/mac_newworld.c
>> +++ b/hw/ppc/mac_newworld.c
>> @@ -380,6 +380,7 @@ static void ppc_core99_init(MachineState *machine)
>>           pci_bus = pci_pmac_init(pic, get_system_memory(), get_system_io());
>>           machine_arch = ARCH_MAC99;
>>       }
>> +    object_property_set_bool(OBJECT(pci_bus), true, "realized", &error_abort);
>>
>>       machine->usb |= defaults_enabled() && !machine->usb_disabled;
>>
>
David Gibson June 29, 2016, 1:42 a.m. UTC | #3
On Tue, Jun 28, 2016 at 11:00:18AM +0300, Marcel Apfelbaum wrote:
> On 06/28/2016 05:56 AM, David Gibson wrote:
> > On Mon, Jun 27, 2016 at 06:38:31PM +0300, Marcel Apfelbaum wrote:
> > > Mac99's PCI root bus is not part of a host bridge,
> > > realize it manually.
> > 
> > Um.. how did this ever work?
> 
> Well, the only thing the PCI bus realize does is
> to register the VM migration state, so only migration was affected.
> 
> However, patch 2/5 adds to the realize function bus_master initialization code
> for all devices attached to the bridge.

Ah, ok.  In that case, ppc portions are

Acked-by: David Gibson <david@gibson.dropbear.id.au>

> 
> Thanks,
> Marcel
> 
> > 
> > > 
> > > Signed-off-by: Marcel Apfelbaum <marcel@redhat.com>
> > > ---
> > >   hw/ppc/mac_newworld.c | 1 +
> > >   1 file changed, 1 insertion(+)
> > > 
> > > diff --git a/hw/ppc/mac_newworld.c b/hw/ppc/mac_newworld.c
> > > index 32e88b3..7d25106 100644
> > > --- a/hw/ppc/mac_newworld.c
> > > +++ b/hw/ppc/mac_newworld.c
> > > @@ -380,6 +380,7 @@ static void ppc_core99_init(MachineState *machine)
> > >           pci_bus = pci_pmac_init(pic, get_system_memory(), get_system_io());
> > >           machine_arch = ARCH_MAC99;
> > >       }
> > > +    object_property_set_bool(OBJECT(pci_bus), true, "realized", &error_abort);
> > > 
> > >       machine->usb |= defaults_enabled() && !machine->usb_disabled;
> > > 
> > 
>
diff mbox

Patch

diff --git a/hw/ppc/mac_newworld.c b/hw/ppc/mac_newworld.c
index 32e88b3..7d25106 100644
--- a/hw/ppc/mac_newworld.c
+++ b/hw/ppc/mac_newworld.c
@@ -380,6 +380,7 @@  static void ppc_core99_init(MachineState *machine)
         pci_bus = pci_pmac_init(pic, get_system_memory(), get_system_io());
         machine_arch = ARCH_MAC99;
     }
+    object_property_set_bool(OBJECT(pci_bus), true, "realized", &error_abort);
 
     machine->usb |= defaults_enabled() && !machine->usb_disabled;