[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 12/27] pc: add PCInitArgs parameter to pc_cpus_init(
From: |
Eduardo Habkost |
Subject: |
[Qemu-devel] [PATCH 12/27] pc: add PCInitArgs parameter to pc_cpus_init() |
Date: |
Wed, 24 Oct 2012 15:49:46 -0200 |
This will make the code simpler when the CPU initialization code start using
additional initialization parameters.
Signed-off-by: Eduardo Habkost <address@hidden>
---
hw/pc.c | 8 ++++----
hw/pc.h | 2 +-
hw/pc_piix.c | 3 +--
3 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/hw/pc.c b/hw/pc.c
index 67fdbe2..f92c19f 100644
--- a/hw/pc.c
+++ b/hw/pc.c
@@ -859,17 +859,17 @@ void pc_acpi_smi_interrupt(void *opaque, int irq, int
level)
}
}
-void pc_cpus_init(const char *cpu_model)
+void pc_cpus_init(PCInitArgs *args)
{
int i;
/* init CPUs */
- if (cpu_model == NULL) {
- cpu_model = PC_DEFAULT_CPU_MODEL;
+ if (args->qemu_args->cpu_model == NULL) {
+ args->qemu_args->cpu_model = PC_DEFAULT_CPU_MODEL;
}
for (i = 0; i < smp_cpus; i++) {
- if (!cpu_x86_init(cpu_model)) {
+ if (!cpu_x86_init(args->qemu_args->cpu_model)) {
fprintf(stderr, "Unable to find x86 CPU definition\n");
exit(1);
}
diff --git a/hw/pc.h b/hw/pc.h
index 04051ca..26388ba 100644
--- a/hw/pc.h
+++ b/hw/pc.h
@@ -86,7 +86,7 @@ typedef struct PCInitArgs {
void pc_register_ferr_irq(qemu_irq irq);
void pc_acpi_smi_interrupt(void *opaque, int irq, int level);
-void pc_cpus_init(const char *cpu_model);
+void pc_cpus_init(PCInitArgs *args);
void *pc_memory_init(MemoryRegion *system_memory,
const char *kernel_filename,
const char *kernel_cmdline,
diff --git a/hw/pc_piix.c b/hw/pc_piix.c
index 058fd43..57d0c3b 100644
--- a/hw/pc_piix.c
+++ b/hw/pc_piix.c
@@ -143,14 +143,13 @@ static void pc_init1(PCInitArgs *pc_args)
void *fw_cfg = NULL;
QEMUMachineInitArgs *qemu_args = pc_args->qemu_args;
ram_addr_t ram_size = qemu_args->ram_size;
- const char *cpu_model = qemu_args->cpu_model;
const char *kernel_filename = qemu_args->kernel_filename;
const char *kernel_cmdline = qemu_args->kernel_cmdline;
const char *initrd_filename = qemu_args->initrd_filename;
const char *boot_device = qemu_args->boot_device;
bool pci_enabled = pc_args->pci_enabled;
- pc_cpus_init(cpu_model);
+ pc_cpus_init(pc_args);
if (pc_args->kvmclock_enabled) {
kvmclock_create();
--
1.7.11.7
- [Qemu-devel] [PATCH 19/27] cpu_x86_init: check for x86_cpu_realize() errors, (continued)
- [Qemu-devel] [PATCH 19/27] cpu_x86_init: check for x86_cpu_realize() errors, Eduardo Habkost, 2012/10/24
- [Qemu-devel] [PATCH 14/27] pc: use FWCfgState* instead of void* for fw_cfg data, Eduardo Habkost, 2012/10/24
- [Qemu-devel] [PATCH 26/27] pc: create separate init function for pc-1.3, Eduardo Habkost, 2012/10/24
- [Qemu-devel] [PATCH 05/27] kvm: create kvm_arch_vcpu_id() function, Eduardo Habkost, 2012/10/24
- [Qemu-devel] [PATCH 11/27] pc: add PC_DEFAULT_CPU_MODEL #define, Eduardo Habkost, 2012/10/24
- [Qemu-devel] [PATCH 01/27] move I/O-related definitions from qemu-common.h to a new header (qemu-stdio.h), Eduardo Habkost, 2012/10/24
- [Qemu-devel] [PATCH 20/27] target-i386: do not call x86_cpu_realize() on cpu_x86_init(), Eduardo Habkost, 2012/10/24
- [Qemu-devel] [PATCH 23/27] pc: set fw_cfg data based on APIC ID calculation, Eduardo Habkost, 2012/10/24
- [Qemu-devel] [PATCH 02/27] cpus.h: include qemu-stdio.h, Eduardo Habkost, 2012/10/24
- [Qemu-devel] [PATCH 12/27] pc: add PCInitArgs parameter to pc_cpus_init(),
Eduardo Habkost <=
- [Qemu-devel] [PATCH 16/27] pc: pass PCInitArgs struct to pc_bios_init(), Eduardo Habkost, 2012/10/24
- [Qemu-devel] [PATCH 21/27] fw_cfg: remove FW_CFG_MAX_CPUS from fw_cfg_init(), Eduardo Habkost, 2012/10/24
- [Qemu-devel] [PATCH 25/27] target-i386: topology & APIC ID utility functions, Eduardo Habkost, 2012/10/24
- [Qemu-devel] [PATCH 27/27] pc: generate APIC IDs according to CPU topology, Eduardo Habkost, 2012/10/24
- [Qemu-devel] [PATCH 06/27] target-i386: kvm: set vcpu_id to APIC ID instead of CPU index, Eduardo Habkost, 2012/10/24
- [Qemu-devel] [PATCH 22/27] pc: set CPU APIC ID explicitly, Eduardo Habkost, 2012/10/24
- [Qemu-devel] [PATCH 15/27] pc: rename bochs_bios_init() to pc_bios_init(), Eduardo Habkost, 2012/10/24
- [Qemu-devel] [PATCH 08/27] pc: pc_init1(): remove MemoryRegion arguments, Eduardo Habkost, 2012/10/24
- [Qemu-devel] [PATCH 18/27] pc: isolate the code that create CPUs, Eduardo Habkost, 2012/10/24
- [Qemu-devel] [PATCH 10/27] pc: create PCInitArgs struct, Eduardo Habkost, 2012/10/24