[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 10/12] hw/i386/pc: Rename allocate_cpu_irq from 'pc' to 'x86_mach
From: |
Philippe Mathieu-Daudé |
Subject: |
[PATCH 10/12] hw/i386/pc: Rename allocate_cpu_irq from 'pc' to 'x86_machine' |
Date: |
Fri, 13 Dec 2019 17:17:51 +0100 |
All the X86 machines use an interrupt controller.
Rename the function to something more generic.
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
---
include/hw/i386/pc.h | 2 +-
hw/i386/microvm.c | 2 +-
hw/i386/pc.c | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h
index 743141e107..244dbf2ec0 100644
--- a/include/hw/i386/pc.h
+++ b/include/hw/i386/pc.h
@@ -198,7 +198,7 @@ void pc_memory_init(PCMachineState *pcms,
MemoryRegion *rom_memory,
MemoryRegion **ram_memory);
uint64_t pc_pci_hole64_start(void);
-qemu_irq pc_allocate_cpu_irq(void);
+qemu_irq x86_machine_allocate_cpu_irq(void);
DeviceState *pc_vga_init(ISABus *isa_bus, PCIBus *pci_bus);
void pc_basic_device_init(ISABus *isa_bus, qemu_irq *gsi,
ISADevice **rtc_state,
diff --git a/hw/i386/microvm.c b/hw/i386/microvm.c
index def37e60f7..7ac008460a 100644
--- a/hw/i386/microvm.c
+++ b/hw/i386/microvm.c
@@ -132,7 +132,7 @@ static void microvm_devices_init(MicrovmMachineState *mms)
if (mms->pic == ON_OFF_AUTO_ON || mms->pic == ON_OFF_AUTO_AUTO) {
qemu_irq *i8259;
- i8259 = i8259_init(isa_bus, pc_allocate_cpu_irq());
+ i8259 = i8259_init(isa_bus, x86_machine_allocate_cpu_irq());
for (i = 0; i < ISA_NUM_IRQS; i++) {
gsi_state->i8259_irq[i] = i8259[i];
}
diff --git a/hw/i386/pc.c b/hw/i386/pc.c
index 5f8e39c025..4defee274f 100644
--- a/hw/i386/pc.c
+++ b/hw/i386/pc.c
@@ -1282,7 +1282,7 @@ uint64_t pc_pci_hole64_start(void)
return ROUND_UP(hole64_start, 1 * GiB);
}
-qemu_irq pc_allocate_cpu_irq(void)
+qemu_irq x86_machine_allocate_cpu_irq(void)
{
return qemu_allocate_irq(pic_irq_request, NULL, 0);
}
@@ -1463,7 +1463,7 @@ void pc_i8259_create(ISABus *isa_bus, qemu_irq
*i8259_irqs)
} else if (xen_enabled()) {
i8259 = xen_interrupt_controller_init();
} else {
- i8259 = i8259_init(isa_bus, pc_allocate_cpu_irq());
+ i8259 = i8259_init(isa_bus, x86_machine_allocate_cpu_irq());
}
for (size_t i = 0; i < ISA_NUM_IRQS; i++) {
--
2.21.0
- [PATCH 05/12] hw/i386/ich9: Remove unused include, (continued)
- [PATCH 05/12] hw/i386/ich9: Remove unused include, Philippe Mathieu-Daudé, 2019/12/13
- [PATCH 06/12] hw/i386/ich9: Move unnecessary "pci_bridge.h" include, Philippe Mathieu-Daudé, 2019/12/13
- [PATCH 07/12] hw/ide/piix: Remove superfluous DEVICE() cast, Philippe Mathieu-Daudé, 2019/12/13
- [PATCH 08/12] hw/ide/piix: Use ARRAY_SIZE() instead of magic numbers, Philippe Mathieu-Daudé, 2019/12/13
- [PATCH 09/12] hw/intc/ioapic: Make ioapic_print_redtbl() static, Philippe Mathieu-Daudé, 2019/12/13
- [PATCH 10/12] hw/i386/pc: Rename allocate_cpu_irq from 'pc' to 'x86_machine',
Philippe Mathieu-Daudé <=
- [PATCH 11/12] hw/i386/pc: Move x86_machine_allocate_cpu_irq() to 'hw/i386/x86.c', Philippe Mathieu-Daudé, 2019/12/13
- [PATCH 12/12] hw/i386/pc: Move PC-machine specific declarations to 'pc_internal.h', Philippe Mathieu-Daudé, 2019/12/13