[v6] hw/i386: separate isapc out from pc_piix

[PATCH v6 13/19] hw/i386/pc_piix.c: assume pcmc->pci_enabled is always false in pc_init_isa()

Posted by Mark Cave-Ayland 2 months, 3 weeks ago

By definition PCI can never be enabled on an isapc machine so hardcode the relevant values
set via pcmc->pci_enabled.

Signed-off-by: Mark Cave-Ayland <mark.caveayland@nutanix.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
 hw/i386/pc_piix.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
index 924888b59d..e8603b585a 100644
--- a/hw/i386/pc_piix.c
+++ b/hw/i386/pc_piix.c
@@ -492,7 +492,7 @@ static void pc_init_isa(MachineState *machine)
         }
     }
 
-    gsi_state = pc_gsi_create(&x86ms->gsi, pcmc->pci_enabled);
+    gsi_state = pc_gsi_create(&x86ms->gsi, false);
 
     isa_bus = isa_bus_new(NULL, system_memory, system_io,
                             &error_abort);
@@ -513,7 +513,7 @@ static void pc_init_isa(MachineState *machine)
         x86_register_ferr_irq(x86ms->gsi[13]);
     }
 
-    pc_vga_init(isa_bus, pcmc->pci_enabled ? pcms->pcibus : NULL);
+    pc_vga_init(isa_bus, NULL);
 
     /* init basic PC hardware */
     pc_basic_device_init(pcms, isa_bus, x86ms->gsi, x86ms->rtc,
-- 
2.43.0

Re: [PATCH v6 13/19] hw/i386/pc_piix.c: assume pcmc->pci_enabled is always false in pc_init_isa()

Posted by Xiaoyao Li 2 months, 2 weeks ago

On 8/22/2025 8:11 PM, Mark Cave-Ayland wrote:
> By definition PCI can never be enabled on an isapc machine so hardcode the relevant values
> set via pcmc->pci_enabled.
> 
> Signed-off-by: Mark Cave-Ayland <mark.caveayland@nutanix.com>
> Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>

Reviewed-by: Xiaoyao Li <xiaoyao.li@intel.com>

It seems to me that this patch can be squashed into patch 05

> ---
>   hw/i386/pc_piix.c | 4 ++--
>   1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
> index 924888b59d..e8603b585a 100644
> --- a/hw/i386/pc_piix.c
> +++ b/hw/i386/pc_piix.c
> @@ -492,7 +492,7 @@ static void pc_init_isa(MachineState *machine)
>           }
>       }
>   
> -    gsi_state = pc_gsi_create(&x86ms->gsi, pcmc->pci_enabled);
> +    gsi_state = pc_gsi_create(&x86ms->gsi, false);
>   
>       isa_bus = isa_bus_new(NULL, system_memory, system_io,
>                               &error_abort);
> @@ -513,7 +513,7 @@ static void pc_init_isa(MachineState *machine)
>           x86_register_ferr_irq(x86ms->gsi[13]);
>       }
>   
> -    pc_vga_init(isa_bus, pcmc->pci_enabled ? pcms->pcibus : NULL);
> +    pc_vga_init(isa_bus, NULL);
>   
>       /* init basic PC hardware */
>       pc_basic_device_init(pcms, isa_bus, x86ms->gsi, x86ms->rtc,

Re: [PATCH v6 13/19] hw/i386/pc_piix.c: assume pcmc->pci_enabled is always false in pc_init_isa()

Posted by Mark Cave-Ayland 2 months, 2 weeks ago

On 26/08/2025 10:50, Xiaoyao Li wrote:

> On 8/22/2025 8:11 PM, Mark Cave-Ayland wrote:
>> By definition PCI can never be enabled on an isapc machine so hardcode 
>> the relevant values
>> set via pcmc->pci_enabled.
>>
>> Signed-off-by: Mark Cave-Ayland <mark.caveayland@nutanix.com>
>> Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> 
> Reviewed-by: Xiaoyao Li <xiaoyao.li@intel.com>
> 
> It seems to me that this patch can be squashed into patch 05
> 
>> ---
>>   hw/i386/pc_piix.c | 4 ++--
>>   1 file changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
>> index 924888b59d..e8603b585a 100644
>> --- a/hw/i386/pc_piix.c
>> +++ b/hw/i386/pc_piix.c
>> @@ -492,7 +492,7 @@ static void pc_init_isa(MachineState *machine)
>>           }
>>       }
>> -    gsi_state = pc_gsi_create(&x86ms->gsi, pcmc->pci_enabled);
>> +    gsi_state = pc_gsi_create(&x86ms->gsi, false);
>>       isa_bus = isa_bus_new(NULL, system_memory, system_io,
>>                               &error_abort);
>> @@ -513,7 +513,7 @@ static void pc_init_isa(MachineState *machine)
>>           x86_register_ferr_irq(x86ms->gsi[13]);
>>       }
>> -    pc_vga_init(isa_bus, pcmc->pci_enabled ? pcms->pcibus : NULL);
>> +    pc_vga_init(isa_bus, NULL);
>>       /* init basic PC hardware */
>>       pc_basic_device_init(pcms, isa_bus, x86ms->gsi, x86ms->rtc,

Indeed, that seems to work fine so I will make this change in the next 
version.


ATB,

Mark.