[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH v2 06/21] pc: Move ioapic_init() from pc_piix.c
From: |
Paolo Bonzini |
Subject: |
Re: [Qemu-devel] [PATCH v2 06/21] pc: Move ioapic_init() from pc_piix.c to pc.c |
Date: |
Tue, 09 Oct 2012 09:44:13 +0200 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:15.0) Gecko/20120911 Thunderbird/15.0.1 |
Il 09/10/2012 05:30, Jason Baron ha scritto:
> From: Jason Baron <address@hidden>
>
> Move ioapic_init from pc_piix.c to pc.c, to make it a common function.
> Rename ioapic_init -> ioapic_init_gsi.
>
> Signed-off-by: Jason Baron <address@hidden>
Reviewed-by: Paolo Bonzini <address@hidden>
> ---
> hw/pc.c | 24 ++++++++++++++++++++++++
> hw/pc.h | 2 ++
> hw/pc_piix.c | 25 +------------------------
> 3 files changed, 27 insertions(+), 24 deletions(-)
>
> diff --git a/hw/pc.c b/hw/pc.c
> index fef39ba..f5fbd0c 100644
> --- a/hw/pc.c
> +++ b/hw/pc.c
> @@ -1148,3 +1148,27 @@ void pc_pci_device_init(PCIBus *pci_bus)
> pci_create_simple(pci_bus, -1, "lsi53c895a");
> }
> }
> +
> +void ioapic_init_gsi(GSIState *gsi_state, const char *parent_name)
> +{
> + DeviceState *dev;
> + SysBusDevice *d;
> + unsigned int i;
> +
> + if (kvm_irqchip_in_kernel()) {
> + dev = qdev_create(NULL, "kvm-ioapic");
> + } else {
> + dev = qdev_create(NULL, "ioapic");
> + }
> + if (parent_name) {
> + object_property_add_child(object_resolve_path(parent_name, NULL),
> + "ioapic", OBJECT(dev), NULL);
> + }
> + qdev_init_nofail(dev);
> + d = sysbus_from_qdev(dev);
> + sysbus_mmio_map(d, 0, 0xfec00000);
> +
> + for (i = 0; i < IOAPIC_NUM_PINS; i++) {
> + gsi_state->ioapic_irq[i] = qdev_get_gpio_in(dev, i);
> + }
> +}
> diff --git a/hw/pc.h b/hw/pc.h
> index d0feb20..c78923c 100644
> --- a/hw/pc.h
> +++ b/hw/pc.h
> @@ -131,6 +131,8 @@ void pc_pci_device_init(PCIBus *pci_bus);
> typedef void (*cpu_set_smm_t)(int smm, void *arg);
> void cpu_smm_register(cpu_set_smm_t callback, void *arg);
>
> +void ioapic_init_gsi(GSIState *gsi_state, const char *parent_name);
> +
> /* acpi.c */
> extern int acpi_enabled;
> extern char *acpi_tables;
> diff --git a/hw/pc_piix.c b/hw/pc_piix.c
> index 87ca60b..668dccf 100644
> --- a/hw/pc_piix.c
> +++ b/hw/pc_piix.c
> @@ -94,29 +94,6 @@ static void kvm_piix3_gsi_handler(void *opaque, int n, int
> level)
> }
> }
>
> -static void ioapic_init(GSIState *gsi_state)
> -{
> - DeviceState *dev;
> - SysBusDevice *d;
> - unsigned int i;
> -
> - if (kvm_irqchip_in_kernel()) {
> - dev = qdev_create(NULL, "kvm-ioapic");
> - } else {
> - dev = qdev_create(NULL, "ioapic");
> - }
> - /* FIXME: this should be under the piix3. */
> - object_property_add_child(object_resolve_path("i440fx", NULL),
> - "ioapic", OBJECT(dev), NULL);
> - qdev_init_nofail(dev);
> - d = sysbus_from_qdev(dev);
> - sysbus_mmio_map(d, 0, 0xfec00000);
> -
> - for (i = 0; i < IOAPIC_NUM_PINS; i++) {
> - gsi_state->ioapic_irq[i] = qdev_get_gpio_in(dev, i);
> - }
> -}
> -
> /* PC hardware initialisation */
> static void pc_init1(MemoryRegion *system_memory,
> MemoryRegion *system_io,
> @@ -220,7 +197,7 @@ static void pc_init1(MemoryRegion *system_memory,
> gsi_state->i8259_irq[i] = i8259[i];
> }
> if (pci_enabled) {
> - ioapic_init(gsi_state);
> + ioapic_init_gsi(gsi_state, "i440fx");
> }
>
> pc_register_ferr_irq(gsi[13]);
>
- [Qemu-devel] [PATCH v2 03/21] pci: pci capability must be in PCI space, (continued)
- [Qemu-devel] [PATCH v2 03/21] pci: pci capability must be in PCI space, Jason Baron, 2012/10/08
- [Qemu-devel] [PATCH v2 05/21] pc, pc_piix: split out pc nic initialization, Jason Baron, 2012/10/08
- [Qemu-devel] [PATCH v2 04/21] pci: introduce pci_swizzle_map_irq_fn() for standardized interrupt pin swizzle, Jason Baron, 2012/10/08
- [Qemu-devel] [PATCH v2 02/21] blockdev: Introduce IF_AHCI, Jason Baron, 2012/10/08
- [Qemu-devel] [PATCH v2 06/21] pc: Move ioapic_init() from pc_piix.c to pc.c, Jason Baron, 2012/10/08
- Re: [Qemu-devel] [PATCH v2 06/21] pc: Move ioapic_init() from pc_piix.c to pc.c,
Paolo Bonzini <=
- [Qemu-devel] [PATCH v2 01/21] blockdev: Introduce a default machine blockdev interface field, QEMUMachine->mach_if, Jason Baron, 2012/10/08
- [Qemu-devel] [PATCH v2 09/21] pci: Add class 0xc05 as 'SMBus', Jason Baron, 2012/10/08
- [Qemu-devel] [PATCH v2 10/21] pcie: pass pcie window size to pcie_host_mmcfg_update(), Jason Baron, 2012/10/08
- [Qemu-devel] [PATCH v2 08/21] pci_ids: add intel 82801BA pci-to-pci bridge id and PCI_CLASS_SERIAL_SMBUS, Jason Baron, 2012/10/08
- [Qemu-devel] [PATCH v2 11/21] pcie: Convert PCIExpressHost to use the QOM., Jason Baron, 2012/10/08