target-i386: CPU hot-add with cpu-add QMP command
v7 cover target-i386: CPU hot-add with cpu-add QMP command
Implements alternative way for hot-adding CPU using cpu-add QMP command, which could be useful until it would be possible to add CPUs via device_add.
To hot-add CPU use following command from qmp-shell:
cpu-add id=[0..max-cpus - 1)
git tree for testing: https://github.com/imammedo/qemu/tree/cpu_add.v7
based on qom-cpu tree
v7->v6:
* skip already applied patches
* rename icc-bus instance name to "icc"
* pass icc_bridge from board as argument down CPU creation call chain, instead of dynamically resolving it for each CPU.
v6->v5:
* override hot_add_cpu hook statically
* extend and use memory_region_find() in IOAPIC
* s/signal_cpu_creation/tcg_signal_cpu_creation/
* add "since 1.5 to cpu-addQAPI schema description
v5->v4:
* style fixes
* new helper qemu_for_each_cpu()
* switch to qemu_for_each_cpu() in cpu_exists()
* "pc: update rtc ..." patch make depend it on "mc146818rtc: QOM'ify" and use QOM cast style
* call CPU added notifier right before CPU becomes runable
* s/resume_vcpu/cpu_resume/
* acpi/piix4: add spec documentation for QEMU<->Seabios CPU hotplug interface
* use error_propagate() in pc_new_cpu()
* skip cpu_exists() check in apic-id property setter if new value is the same as current
* embed icc-bus inside icc-bridge and use qbus_create_inplace()
* move include/hw/i386/icc_bus.h into include/hw/cpu/
* make missing icc-bus fatal error for softmmu target
* split "move APIC to ICC bus" and "move IOAPIC to ICC bus" on smaller patches
* use qdev_get_parent_bus() to get parent bus
* split "add cpu-add command..." on smaller patches
v4->v3:
* 'id' in cpu-add command will be a thread number instead of APIC ID
* split off resume_vcpu() into separate patch
* move notifier from rtc code into pc.c
v2->v3:
* use local error & propagate_error() instead of operating on passed in errp in several places
* replace CPUClass.get_firmware_id() with CPUClass.get_arch_id()
* leave IOAPIC creation to board and just set bus to icc-bus
* include kvm-stub.o in cpu libary if no KVM is configured
* create resume_vcpu() stub and include it in libqemustub, and use it directly instead of CPU method
* acpi_piix4: s/cpu_add_notifier/cpu_added_notifier/
v1->v2:
* generalize cpu sync to KVM, resume and hot-plug notification and invoke them form CPUClass, to make available to all targets.
* introduce cpu_exists() and CPUClass.get_firmware_id() and use the last one in acpi_piix to make code target independent.
* move IOAPIC to ICC bus, it was suggested and easy to convert.
* leave kvmvapic as SysBusDevice, it doesn't affect hot-plug and created only once for all APIC instances. I haven't found yet good/clean enough way to convert it to ICCDevice. May be follow-up though.
* split one big ICC patch into several, one per converted device
* add cpu_hot_add hook to machine and implement it for target-i386, instead of adding stabs. Could be used by other targets to implement cpu-add.
* pre-allocate links<CPU> for all possible CPUs and make them available at /machine/icc-bridge/cpu[0..N] QOM path, so users could find out possible/free CPU IDs to use in cpu-add command.
Igor Mammedov (7):
target-i386: Introduce ICC bus/device/bridge
target-i386: Attach ICC bus to CPU on its creation
target-i386: Move APIC to ICC bus
pc: pass QEMUMachineInitArgs down to pc_cpus_init() add hot_add_cpu hook to QEMUMachine and export machine_args
target-i386: implement machine->hot_add_cpu hook
QMP: add cpu-add command
MAINTAINERS | 6 ++ default-configs/i386-softmmu.mak | 1 + default-configs/x86_64-softmmu.mak | 1 + hw/cpu/Makefile.objs | 1 + hw/cpu/icc_bus.c | 119 +++++++++++++++++++++++++++++++++++++ hw/i386/pc.c | 47 ++++++++++++--- hw/i386/pc_piix.c | 74 ++++++++--------------- hw/i386/pc_q35.c | 31 +++++----- hw/intc/apic_common.c | 18 ++++-- include/hw/boards.h | 3 + include/hw/cpu/icc_bus.h | 82 +++++++++++++++++++++++++ include/hw/i386/apic_internal.h | 6 +- include/hw/i386/pc.h | 4 +- qapi-schema.json | 13 ++++ qmp-commands.hx | 23 +++++++ qmp.c | 10 ++++ target-i386/cpu.c | 27 ++++----- target-i386/cpu.h | 3 +- vl.c | 8 ++- 19 files changed, 378 insertions(+), 99 deletions(-) create mode 100644 hw/cpu/icc_bus.c create mode 100644 include/hw/cpu/icc_bus.h
Signature · 1 line
1.8.2.1
PATCH v7 1/7 target-i386: Introduce ICC bus/device/bridge
Provides a hotpluggable bus for APIC and CPU.
* icc-bridge will serve as a parent for icc-bus and provide mmio mapping services to child icc-devices.
* icc-device will replace SysBusDevice as a parent of APIC and IOAPIC devices.
---
v2:
- rename instance name of icc-bus to "icc"
--- MAINTAINERS | 6 ++ default-configs/i386-softmmu.mak | 1 + default-configs/x86_64-softmmu.mak | 1 + hw/cpu/Makefile.objs | 1 + hw/cpu/icc_bus.c | 109 +++++++++++++++++++++++++++++++++++++ hw/i386/pc_piix.c | 7 +++ hw/i386/pc_q35.c | 7 +++ include/hw/cpu/icc_bus.h | 79 +++++++++++++++++++++++++++ 8 files changed, 211 insertions(+) create mode 100644 hw/cpu/icc_bus.c create mode 100644 include/hw/cpu/icc_bus.h
MAINTAINERS +6 -0
@@ -644,6 +644,12 @@ F: qom/cpu.c F: include/qemu/cpu.h F: target-i386/cpu.c +ICC Bus +M: Igor Mammedov <[email protected]> +S: Supported +F: include/hw/cpu/icc_bus.h +F: hw/cpu/icc_bus.c + Device Tree M: Peter Crosthwaite <[email protected]> M: Alexander Graf <[email protected]>
default-configs/i386-softmmu.mak +1 -0
@@ -44,3 +44,4 @@ CONFIG_LPC_ICH9=y CONFIG_PCI_Q35=y CONFIG_APIC=y CONFIG_IOAPIC=y +CONFIG_ICC_BUS=y
default-configs/x86_64-softmmu.mak +1 -0
@@ -44,3 +44,4 @@ CONFIG_LPC_ICH9=y CONFIG_PCI_Q35=y CONFIG_APIC=y CONFIG_IOAPIC=y +CONFIG_ICC_BUS=y
hw/cpu/Makefile.objs +1 -0
@@ -1,4 +1,5 @@ obj-$(CONFIG_ARM11MPCORE) += arm11mpcore.o obj-$(CONFIG_ARM9MPCORE) += a9mpcore.o obj-$(CONFIG_ARM15MPCORE) += a15mpcore.o +obj-$(CONFIG_ICC_BUS) += icc_bus.o
hw/cpu/icc_bus.c new file +109 -0
109 lines not on this page · raw message
hw/i386/pc_piix.c +7 -0
@@ -37,6 +37,7 @@#include "hw/kvm/clock.h" #include "sysemu/sysemu.h" #include "hw/sysbus.h" +#include "hw/cpu/icc_bus.h" #include "sysemu/arch_init.h" #include "sysemu/blockdev.h" #include "hw/i2c/smbus.h"
@@ -85,8 +86,13 @@ static void pc_init1(MemoryRegion *system_memory,MemoryRegion *ram_memory;MemoryRegion *pci_memory;MemoryRegion *rom_memory; +DeviceState *icc_bridge;void *fw_cfg =NULL ; + icc_bridge =qdev_create (NULL ,TYPE_ICC_BRIDGE ); +object_property_add_child (qdev_get_machine (),"icc-bridge" , +OBJECT (icc_bridge),NULL ); +pc_cpus_init (cpu_model);pc_acpi_init ("acpi-dsdt.aml" );
@@ -161,6 +167,7 @@ static void pc_init1(MemoryRegion *system_memory,if (pci_enabled) {ioapic_init_gsi (gsi_state,"i440fx" ); } +qdev_init_nofail (icc_bridge);pc_register_ferr_irq (gsi[13 ]);
hw/i386/pc_q35.c +7 -0
@@ -41,6 +41,7 @@#include "hw/ide/pci.h" #include "hw/ide/ahci.h" #include "hw/usb.h" +#include "hw/cpu/icc_bus.h" /* ICH9 AHCI has 6 ports */ #define MAX_SATA_PORTS 6
@@ -73,6 +74,11 @@ static void pc_q35_init(QEMUMachineInitArgs *args)int i;ICH9LPCState *ich9_lpc;PCIDevice *ahci; +DeviceState *icc_bridge; + + icc_bridge =qdev_create (NULL ,TYPE_ICC_BRIDGE ); +object_property_add_child (qdev_get_machine (),"icc-bridge" , +OBJECT (icc_bridge),NULL );pc_cpus_init (cpu_model);pc_acpi_init ("q35-acpi-dsdt.aml" );
@@ -156,6 +162,7 @@ static void pc_q35_init(QEMUMachineInitArgs *args)if (pci_enabled) {ioapic_init_gsi (gsi_state,NULL ); } +qdev_init_nofail (icc_bridge);pc_register_ferr_irq (gsi[13 ]);
include/hw/cpu/icc_bus.h new file +79 -0
79 lines not on this page · raw message
Signature · 1 line
1.8.2.1
Andreas Färber
AppliedRe: [Qemu-devel] [PATCH 1/7] target-i386: Introduce ICC bus/device/bridge
Am 29.04.2013 17:02, schrieb Igor Mammedov:
Quoted 7 lines
Provides a hotpluggable bus for APIC and CPU.
* icc-bridge will serve as a parent for icc-bus and provide mmio mapping services to child icc-devices.
* icc-device will replace SysBusDevice as a parent of APIC and IOAPIC devices.
Quoted 8 lines
Signed-off-by Igor Mammedov <[email protected]>[AF: QOM cleanups]Signed-off-by Andreas Färber <[email protected]>---
v2:
- rename instance name of icc-bus to "icc"Signed-off-by Igor Mammedov <[email protected]>
Thanks, applied to qom-cpu (simplifying the SoBs):
https://github.com/afaerber/qemu-cpu/commits/qom-cpu
Andreas
Signature · 2 lines
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg
PATCH v7 2/7 target-i386: Attach ICC bus to CPU on its creation
In reply to Igor MammedovX86CPU should have parent bus so it could provide bus for child APIC.
---
TODO: fix unplug of bus-less devices in device-del
v2:
- pass icc_bridge to cpu_x86_create instead of resolving it each time
--- hw/i386/pc.c | 10 ++++++---- hw/i386/pc_piix.c | 2 +- hw/i386/pc_q35.c | 2 +- include/hw/i386/pc.h | 2 +- target-i386/cpu.c | 11 +++++++++-- target-i386/cpu.h | 3 ++- 6 files changed, 20 insertions(+), 10 deletions(-)
hw/i386/pc.c +6 -4
@@ -890,12 +890,13 @@ void pc_acpi_smi_interrupt(void *opaque, int irq, int level) } } -static X86CPU *pc_new_cpu (const char *cpu_model,int64_t apic_id,Error **errp) +static X86CPU *pc_new_cpu (const char *cpu_model,int64_t apic_id, +DeviceState *icc_bridge,Error **errp) {X86CPU *cpu;Error *local_err =NULL ; - cpu =cpu_x86_create (cpu_model, errp); + cpu =cpu_x86_create (cpu_model, icc_bridge, errp);if (!cpu) {return cpu; }
@@ -913,7 +914,7 @@ static X86CPU *pc_new_cpu(const char *cpu_model, int64_t apic_id, Error **errp)return cpu; } -void pc_cpus_init (const char *cpu_model) +void pc_cpus_init (const char *cpu_model,DeviceState *icc_bridge) {int i;Error *error =NULL ;
@@ -928,7 +929,8 @@ void pc_cpus_init(const char *cpu_model) }for (i =0 ; i < smp_cpus; i++) { -pc_new_cpu (cpu_model,x86_cpu_apic_id_from_index (i), &error); +pc_new_cpu (cpu_model,x86_cpu_apic_id_from_index (i), + icc_bridge, &error);if (error) {fprintf (stderr,"%s\n" ,error_get_pretty (error));error_free (error);
hw/i386/pc_piix.c +1 -1
@@ -93,7 +93,7 @@ static void pc_init1(MemoryRegion *system_memory,object_property_add_child (qdev_get_machine (),"icc-bridge" ,OBJECT (icc_bridge),NULL ); -pc_cpus_init (cpu_model); +pc_cpus_init (cpu_model, icc_bridge);pc_acpi_init ("acpi-dsdt.aml" );if (kvmclock_enabled) {
hw/i386/pc_q35.c +1 -1
@@ -80,7 +80,7 @@ static void pc_q35_init(QEMUMachineInitArgs *args)object_property_add_child (qdev_get_machine (),"icc-bridge" ,OBJECT (icc_bridge),NULL ); -pc_cpus_init (cpu_model); +pc_cpus_init (cpu_model, icc_bridge);pc_acpi_init ("q35-acpi-dsdt.aml" );kvmclock_create ();
include/hw/i386/pc.h +1 -1
@@ -78,7 +78,7 @@ extern int fd_bootchk;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 (const char *cpu_model,DeviceState *icc_bridge);void pc_acpi_init (const char *default_dsdt); void *pc_memory_init(MemoryRegion *system_memory, const char *kernel_filename,
target-i386/cpu.c +9 -2
@@ -41,6 +41,7 @@#endif #include "sysemu/sysemu.h" +#include "hw/cpu/icc_bus.h" #ifndef CONFIG_USER_ONLY #include "hw/xen/xen.h" #include "hw/sysbus.h"
@@ -1618,7 +1619,8 @@ static void cpu_x86_register(X86CPU *cpu, const char *name, Error **errp)object_property_set_str (OBJECT (cpu), def->model_id,"model-id" , errp); } -X86CPU *cpu_x86_create (const char *cpu_model,Error **errp) +X86CPU *cpu_x86_create (const char *cpu_model,DeviceState *icc_bridge, +Error **errp) {X86CPU *cpu =NULL ;CPUX86State *env;
@@ -1635,6 +1637,10 @@ X86CPU *cpu_x86_create(const char *cpu_model, Error **errp) features = model_pieces[1 ]; cpu =X86_CPU (object_new (TYPE_X86_CPU )); +#ifndef CONFIG_USER_ONLY +qdev_set_parent_bus (DEVICE (cpu),qdev_get_child_bus (icc_bridge,"icc" )); +object_unref (OBJECT (cpu)); +#endif env = &cpu->env; env->cpu_model_str = cpu_model;
@@ -1659,7 +1665,7 @@ X86CPU *cpu_x86_init(const char *cpu_model)Error *error =NULL ;X86CPU *cpu; - cpu =cpu_x86_create (cpu_model, &error); + cpu =cpu_x86_create (cpu_model,NULL , &error);if (error) { goto out; }
@@ -2346,6 +2352,7 @@ static void x86_cpu_common_class_init(ObjectClass *oc, void *data) xcc->parent_realize = dc->realize; dc->realize = x86_cpu_realizefn; + dc->bus_type =TYPE_ICC_BUS ; xcc->parent_reset = cc->reset; cc->reset = x86_cpu_reset;
target-i386/cpu.h +2 -1
@@ -897,7 +897,8 @@ typedef struct CPUX86State {#include "cpu-qom.h" X86CPU *cpu_x86_init (const char *cpu_model); -X86CPU *cpu_x86_create (const char *cpu_model,Error **errp); +X86CPU *cpu_x86_create (const char *cpu_model,DeviceState *icc_bridge, +Error **errp);int cpu_x86_exec (CPUX86State *s);void x86_cpu_list (FILE *f,fprintf_function cpu_fprintf);void x86_cpudef_setup (void );
Signature · 1 line
1.8.2.1
Re: [Qemu-devel] [PATCH 2/7] target-i386: Attach ICC bus to CPU on its creation
Am 29.04.2013 17:02, schrieb Igor Mammedov:
Quoted 130 lines
X86CPU should have parent bus so it could provide bus for child APIC.
Signed-off-by Igor Mammedov <[email protected]>Signed-off-by Andreas Färber <[email protected]>---
TODO: fix unplug of bus-less devices in device-delv2:
- passicc_bridgetocpu_x86_createinstead of resolving it each time--- hw/i386/pc.c | 10 ++++++---- hw/i386/pc_piix.c | 2 +- hw/i386/pc_q35.c | 2 +- include/hw/i386/pc.h | 2 +- target-i386/cpu.c | 11 +++++++++-- target-i386/cpu.h | 3 ++- 6 files changed, 20 insertions(+), 10 deletions(-)hw/i386/pc.c +6
-4@@ -890,12 +890,13 @@ void pc_acpi_smi_interrupt(void *opaque, int irq, int level) } } -static X86CPU *pc_new_cpu (const char *cpu_model,int64_t apic_id,Error **errp) +static X86CPU *pc_new_cpu (const char *cpu_model,int64_t apic_id, +DeviceState *icc_bridge,Error **errp) {X86CPU *cpu;Error *local_err =NULL ; - cpu =cpu_x86_create (cpu_model, errp); + cpu =cpu_x86_create (cpu_model, icc_bridge, errp);if (!cpu) {return cpu; }@@ -913,7 +914,7 @@ static X86CPU *pc_new_cpu(const char *cpu_model, int64_t apic_id, Error **errp)return cpu; } -void pc_cpus_init (const char *cpu_model) +void pc_cpus_init (const char *cpu_model,DeviceState *icc_bridge) {int i;Error *error =NULL ;@@ -928,7 +929,8 @@ void pc_cpus_init(const char *cpu_model) }for (i =0 ; i < smp_cpus; i++) { -pc_new_cpu (cpu_model,x86_cpu_apic_id_from_index (i), &error); +pc_new_cpu (cpu_model,x86_cpu_apic_id_from_index (i), + icc_bridge, &error);if (error) {fprintf (stderr,"%s\n" ,error_get_pretty (error));error_free (error);hw/i386/pc_piix.c +1
-1@@ -93,7 +93,7 @@ static void pc_init1(MemoryRegion *system_memory,object_property_add_child (qdev_get_machine (),"icc-bridge" ,OBJECT (icc_bridge),NULL ); -pc_cpus_init (cpu_model); +pc_cpus_init (cpu_model, icc_bridge);pc_acpi_init ("acpi-dsdt.aml" );if (kvmclock_enabled) {hw/i386/pc_q35.c +1
-1@@ -80,7 +80,7 @@ static void pc_q35_init(QEMUMachineInitArgs *args)object_property_add_child (qdev_get_machine (),"icc-bridge" ,OBJECT (icc_bridge),NULL ); -pc_cpus_init (cpu_model); +pc_cpus_init (cpu_model, icc_bridge);pc_acpi_init ("q35-acpi-dsdt.aml" );kvmclock_create ();include/hw/i386/pc.h +1
-1@@ -78,7 +78,7 @@ extern int fd_bootchk;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 (const char *cpu_model,DeviceState *icc_bridge);void pc_acpi_init (const char *default_dsdt); void *pc_memory_init(MemoryRegion *system_memory, const char *kernel_filename,target-i386/cpu.c +7
-1@@ -41,6 +41,7 @@#endif #include "sysemu/sysemu.h" +#include "hw/cpu/icc_bus.h" #ifndef CONFIG_USER_ONLY #include "hw/xen/xen.h" #include "hw/sysbus.h" @@ -1618,7 +1619,8 @@ static void cpu_x86_register(X86CPU *cpu, const char *name, Error **errp)object_property_set_str (OBJECT (cpu), def->model_id,"model-id" , errp); } -X86CPU *cpu_x86_create (const char *cpu_model,Error **errp) +X86CPU *cpu_x86_create (const char *cpu_model,DeviceState *icc_bridge, +Error **errp) {X86CPU *cpu =NULL ;CPUX86State *env;@@ -1635,6 +1637,10 @@ X86CPU *cpu_x86_create(const char *cpu_model, Error **errp) features = model_pieces[1 ]; cpu =X86_CPU (object_new (TYPE_X86_CPU )); +#ifndef CONFIG_USER_ONLY +qdev_set_parent_bus (DEVICE (cpu),qdev_get_child_bus (icc_bridge,"icc" )); +object_unref (OBJECT (cpu)); +#endif env = &cpu->env; env->cpu_model_str = cpu_model;
target-i386/cpu.c X86CPU *cpu_x86_init(const char *cpu_model) · line 1671
Quoted 8 lines
target-i386/cpu.c +1
-1@@ -1659,7 +1665,7 @@ X86CPU *cpu_x86_init(const char *cpu_model)Error *error =NULL ;X86CPU *cpu; - cpu =cpu_x86_create (cpu_model, &error); + cpu =cpu_x86_create (cpu_model,NULL , &error);if (error) { goto out; }
This strikes me as unsafe: It relies on cpu_x86_init() / cpu_init() not being used for softmmu. Could you please send a follow-up to squash adding icc_bridge == NULL error handling in the #ifdef?
Andreas
Quoted 23 lines
target-i386/cpu.c +1
-0@@ -2346,6 +2352,7 @@ static void x86_cpu_common_class_init(ObjectClass *oc, void *data) xcc->parent_realize = dc->realize; dc->realize = x86_cpu_realizefn; + dc->bus_type =TYPE_ICC_BUS ; xcc->parent_reset = cc->reset; cc->reset = x86_cpu_reset;target-i386/cpu.h +2
-1@@ -897,7 +897,8 @@ typedef struct CPUX86State {#include "cpu-qom.h" X86CPU *cpu_x86_init (const char *cpu_model); -X86CPU *cpu_x86_create (const char *cpu_model,Error **errp); +X86CPU *cpu_x86_create (const char *cpu_model,DeviceState *icc_bridge, +Error **errp);int cpu_x86_exec (CPUX86State *s);void x86_cpu_list (FILE *f,fprintf_function cpu_fprintf);void x86_cpudef_setup (void );
Signature · 2 lines
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg
Re: [Qemu-devel] [PATCH 2/7] target-i386: Attach ICC bus to CPU on its creation
Quoted 134 lines · On Mon, 29 Apr 2013 18:24:23 +0200 Andreas Färber <[email protected]> wrote:
Am 29.04.2013 17:02, schrieb Igor Mammedov:
Quoted 133 lines
X86CPU should have parent bus so it could provide bus for child APIC.
Signed-off-by Igor Mammedov <[email protected]>Signed-off-by Andreas Färber <[email protected]>---
TODO: fix unplug of bus-less devices in device-delv2:
- passicc_bridgetocpu_x86_createinstead of resolving it each time--- hw/i386/pc.c | 10 ++++++---- hw/i386/pc_piix.c | 2 +- hw/i386/pc_q35.c | 2 +- include/hw/i386/pc.h | 2 +- target-i386/cpu.c | 11 +++++++++-- target-i386/cpu.h | 3 ++- 6 files changed, 20 insertions(+), 10 deletions(-)hw/i386/pc.c +6
-4@@ -890,12 +890,13 @@ void pc_acpi_smi_interrupt(void *opaque, int irq, int level) } } -static X86CPU *pc_new_cpu (const char *cpu_model,int64_t apic_id,Error **errp) +static X86CPU *pc_new_cpu (const char *cpu_model,int64_t apic_id, +DeviceState *icc_bridge,Error **errp) {X86CPU *cpu;Error *local_err =NULL ; - cpu =cpu_x86_create (cpu_model, errp); + cpu =cpu_x86_create (cpu_model, icc_bridge, errp);if (!cpu) {return cpu; }@@ -913,7 +914,7 @@ static X86CPU *pc_new_cpu(const char *cpu_model, int64_t apic_id, Error **errp)return cpu; } -void pc_cpus_init (const char *cpu_model) +void pc_cpus_init (const char *cpu_model,DeviceState *icc_bridge) {int i;Error *error =NULL ;@@ -928,7 +929,8 @@ void pc_cpus_init(const char *cpu_model) }for (i =0 ; i < smp_cpus; i++) { -pc_new_cpu (cpu_model,x86_cpu_apic_id_from_index (i), &error); +pc_new_cpu (cpu_model,x86_cpu_apic_id_from_index (i), + icc_bridge, &error);if (error) {fprintf (stderr,"%s\n" ,error_get_pretty (error));error_free (error);hw/i386/pc_piix.c +1
-1@@ -93,7 +93,7 @@ static void pc_init1(MemoryRegion *system_memory,object_property_add_child (qdev_get_machine (),"icc-bridge" ,OBJECT (icc_bridge),NULL ); -pc_cpus_init (cpu_model); +pc_cpus_init (cpu_model, icc_bridge);pc_acpi_init ("acpi-dsdt.aml" );if (kvmclock_enabled) {hw/i386/pc_q35.c +1
-1@@ -80,7 +80,7 @@ static void pc_q35_init(QEMUMachineInitArgs *args)object_property_add_child (qdev_get_machine (),"icc-bridge" ,OBJECT (icc_bridge),NULL ); -pc_cpus_init (cpu_model); +pc_cpus_init (cpu_model, icc_bridge);pc_acpi_init ("q35-acpi-dsdt.aml" );kvmclock_create ();include/hw/i386/pc.h +1
-1@@ -78,7 +78,7 @@ extern int fd_bootchk;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 (const char *cpu_model,DeviceState *icc_bridge);void pc_acpi_init (const char *default_dsdt); void *pc_memory_init(MemoryRegion *system_memory, const char *kernel_filename,target-i386/cpu.c +7
-1@@ -41,6 +41,7 @@#endif #include "sysemu/sysemu.h" +#include "hw/cpu/icc_bus.h" #ifndef CONFIG_USER_ONLY #include "hw/xen/xen.h" #include "hw/sysbus.h" @@ -1618,7 +1619,8 @@ static void cpu_x86_register(X86CPU *cpu, const char *name, Error **errp)object_property_set_str (OBJECT (cpu), def->model_id,"model-id" , errp); } -X86CPU *cpu_x86_create (const char *cpu_model,Error **errp) +X86CPU *cpu_x86_create (const char *cpu_model,DeviceState *icc_bridge, +Error **errp) {X86CPU *cpu =NULL ;CPUX86State *env;@@ -1635,6 +1637,10 @@ X86CPU *cpu_x86_create(const char *cpu_model, Error **errp) features = model_pieces[1 ]; cpu =X86_CPU (object_new (TYPE_X86_CPU )); +#ifndef CONFIG_USER_ONLY +qdev_set_parent_bus (DEVICE (cpu),qdev_get_child_bus (icc_bridge,"icc" )); +object_unref (OBJECT (cpu)); +#endif env = &cpu->env; env->cpu_model_str = cpu_model;@@ -1659,7 +1665,7 @@ X86CPU *cpu_x86_init(const char *cpu_model)Error *error =NULL ;X86CPU *cpu;
Quoted 9 lines
target-i386/cpu.c X86CPU *cpu_x86_init(const char *cpu_model) · line 1671
Quoted 5 lines
target-i386/cpu.c +1
-1- cpu =cpu_x86_create (cpu_model, &error); + cpu =cpu_x86_create (cpu_model,NULL , &error);if (error) { goto out; }This strikes me as unsafe: It relies on
cpu_x86_init()/cpu_init()not being used for softmmu. Could you please send a follow-up to squash addingicc_bridge== NULL error handling in the #ifdef?
Intention was to make in unsafe, on target0i386 softmmu there is only one user pc_cpus_init().
But printing nice error instead of NULL deference would be nice, I'll resend it.
Quoted 31 lines
Andreas
Quoted 23 lines
target-i386/cpu.c +1
-0@@ -2346,6 +2352,7 @@ static void x86_cpu_common_class_init(ObjectClass *oc, void *data) xcc->parent_realize = dc->realize; dc->realize = x86_cpu_realizefn; + dc->bus_type =TYPE_ICC_BUS ; xcc->parent_reset = cc->reset; cc->reset = x86_cpu_reset;target-i386/cpu.h +2
-1@@ -897,7 +897,8 @@ typedef struct CPUX86State {#include "cpu-qom.h" X86CPU *cpu_x86_init (const char *cpu_model); -X86CPU *cpu_x86_create (const char *cpu_model,Error **errp); +X86CPU *cpu_x86_create (const char *cpu_model,DeviceState *icc_bridge, +Error **errp);int cpu_x86_exec (CPUX86State *s);void x86_cpu_list (FILE *f,fprintf_function cpu_fprintf);void x86_cpudef_setup (void );Signature · 2 lines
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg
Signature · 2 lines
Regards, Igor
PATCH v8 2/7 target-i386: Attach ICC bus to CPU on its creation
In reply to Igor MammedovX86CPU should have parent bus so it could provide bus for child APIC.
---
TODO: fix unplug of bus-less devices in device-del
v3:
- check icc_bridge for NULL and report error nicely instead of SIGSEGV
v2:
- pass icc_bridge to cpu_x86_create instead of resolving it each time
--- hw/i386/pc.c | 10 ++++++---- hw/i386/pc_piix.c | 2 +- hw/i386/pc_q35.c | 2 +- include/hw/i386/pc.h | 2 +- target-i386/cpu.c | 15 +++++++++++++-- target-i386/cpu.h | 3 ++- 6 files changed, 24 insertions(+), 10 deletions(-)
hw/i386/pc.c +6 -4
@@ -890,12 +890,13 @@ void pc_acpi_smi_interrupt(void *opaque, int irq, int level) } } -static X86CPU *pc_new_cpu (const char *cpu_model,int64_t apic_id,Error **errp) +static X86CPU *pc_new_cpu (const char *cpu_model,int64_t apic_id, +DeviceState *icc_bridge,Error **errp) {X86CPU *cpu;Error *local_err =NULL ; - cpu =cpu_x86_create (cpu_model, errp); + cpu =cpu_x86_create (cpu_model, icc_bridge, errp);if (!cpu) {return cpu; }
@@ -913,7 +914,7 @@ static X86CPU *pc_new_cpu(const char *cpu_model, int64_t apic_id, Error **errp)return cpu; } -void pc_cpus_init (const char *cpu_model) +void pc_cpus_init (const char *cpu_model,DeviceState *icc_bridge) {int i;Error *error =NULL ;
@@ -928,7 +929,8 @@ void pc_cpus_init(const char *cpu_model) }for (i =0 ; i < smp_cpus; i++) { -pc_new_cpu (cpu_model,x86_cpu_apic_id_from_index (i), &error); +pc_new_cpu (cpu_model,x86_cpu_apic_id_from_index (i), + icc_bridge, &error);if (error) {fprintf (stderr,"%s\n" ,error_get_pretty (error));error_free (error);
hw/i386/pc_piix.c +1 -1
@@ -93,7 +93,7 @@ static void pc_init1(MemoryRegion *system_memory,object_property_add_child (qdev_get_machine (),"icc-bridge" ,OBJECT (icc_bridge),NULL ); -pc_cpus_init (cpu_model); +pc_cpus_init (cpu_model, icc_bridge);pc_acpi_init ("acpi-dsdt.aml" );if (kvmclock_enabled) {
hw/i386/pc_q35.c +1 -1
@@ -80,7 +80,7 @@ static void pc_q35_init(QEMUMachineInitArgs *args)object_property_add_child (qdev_get_machine (),"icc-bridge" ,OBJECT (icc_bridge),NULL ); -pc_cpus_init (cpu_model); +pc_cpus_init (cpu_model, icc_bridge);pc_acpi_init ("q35-acpi-dsdt.aml" );kvmclock_create ();
include/hw/i386/pc.h +1 -1
@@ -78,7 +78,7 @@ extern int fd_bootchk;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 (const char *cpu_model,DeviceState *icc_bridge);void pc_acpi_init (const char *default_dsdt); void *pc_memory_init(MemoryRegion *system_memory, const char *kernel_filename,
target-i386/cpu.c +13 -2
@@ -41,6 +41,7 @@#endif #include "sysemu/sysemu.h" +#include "hw/cpu/icc_bus.h" #ifndef CONFIG_USER_ONLY #include "hw/xen/xen.h" #include "hw/sysbus.h"
@@ -1618,7 +1619,8 @@ static void cpu_x86_register(X86CPU *cpu, const char *name, Error **errp)object_property_set_str (OBJECT (cpu), def->model_id,"model-id" , errp); } -X86CPU *cpu_x86_create (const char *cpu_model,Error **errp) +X86CPU *cpu_x86_create (const char *cpu_model,DeviceState *icc_bridge, +Error **errp) {X86CPU *cpu =NULL ;CPUX86State *env;
@@ -1635,6 +1637,14 @@ X86CPU *cpu_x86_create(const char *cpu_model, Error **errp) features = model_pieces[1 ]; cpu =X86_CPU (object_new (TYPE_X86_CPU )); +#ifndef CONFIG_USER_ONLY +if (icc_bridge ==NULL ) { +error_setg (&error,"Invalid icc-bridge value" ); + goto out; + } +qdev_set_parent_bus (DEVICE (cpu),qdev_get_child_bus (icc_bridge,"icc" )); +object_unref (OBJECT (cpu)); +#endif env = &cpu->env; env->cpu_model_str = cpu_model;
@@ -1659,7 +1669,7 @@ X86CPU *cpu_x86_init(const char *cpu_model)Error *error =NULL ;X86CPU *cpu; - cpu =cpu_x86_create (cpu_model, &error); + cpu =cpu_x86_create (cpu_model,NULL , &error);if (error) { goto out; }
@@ -2346,6 +2356,7 @@ static void x86_cpu_common_class_init(ObjectClass *oc, void *data) xcc->parent_realize = dc->realize; dc->realize = x86_cpu_realizefn; + dc->bus_type =TYPE_ICC_BUS ; xcc->parent_reset = cc->reset; cc->reset = x86_cpu_reset;
target-i386/cpu.h +2 -1
@@ -897,7 +897,8 @@ typedef struct CPUX86State {#include "cpu-qom.h" X86CPU *cpu_x86_init (const char *cpu_model); -X86CPU *cpu_x86_create (const char *cpu_model,Error **errp); +X86CPU *cpu_x86_create (const char *cpu_model,DeviceState *icc_bridge, +Error **errp);int cpu_x86_exec (CPUX86State *s);void x86_cpu_list (FILE *f,fprintf_function cpu_fprintf);void x86_cpudef_setup (void );
Signature · 1 line
1.8.2.1
Andreas Färber
AppliedRe: [Qemu-devel] [PATCH 2/7 v8] target-i386: Attach ICC bus to CPU on its creation
Am 29.04.2013 18:54, schrieb Igor Mammedov:
Quoted 11 lines
X86CPU should have parent bus so it could provide bus for child APIC.
Signed-off-by Igor Mammedov <[email protected]>Signed-off-by Andreas Färber <[email protected]>---
TODO: fix unplug of bus-less devices in device-delv3:
- checkicc_bridgefor NULL and report error nicely instead of SIGSEGV
v2:
- passicc_bridgetocpu_x86_createinstead of resolving it each time
Quoted 8 lines
--- hw/i386/pc.c | 10 ++++++---- hw/i386/pc_piix.c | 2 +- hw/i386/pc_q35.c | 2 +- include/hw/i386/pc.h | 2 +- target-i386/cpu.c | 15 +++++++++++++-- target-i386/cpu.h | 3 ++- 6 files changed, 24 insertions(+), 10 deletions(-)
Thanks, applied to qom-cpu:
https://github.com/afaerber/qemu-cpu/commits/qom-cpu
Andreas
Signature · 2 lines
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg
PATCH v7 3/7 target-i386: Move APIC to ICC bus
In reply to Igor MammedovIt allows APIC to be hotplugged.
* map APIC's mmio at board level if it is present
* do not register mmio region for each APIC, since only one is used/mapped
---
v2:
- use icc-bridge from args instead of resolving it
--- hw/cpu/icc_bus.c | 10 ++++++++++ hw/i386/pc.c | 12 ++++++++++-- hw/intc/apic_common.c | 18 ++++++++++++------ include/hw/cpu/icc_bus.h | 3 +++ include/hw/i386/apic_internal.h | 6 +++--- target-i386/cpu.c | 16 +++------------- 6 files changed, 41 insertions(+), 24 deletions(-)
hw/cpu/icc_bus.c +10 -0
@@ -80,6 +80,7 @@ typedef struct ICCBridgeState {/*< public >*/ ICCBus icc_bus; +MemoryRegion apic_container; } ICCBridgeState;#define ICC_BRIGDE (obj) OBJECT_CHECK(ICCBridgeState, (obj), TYPE_ICC_BRIDGE)
@@ -87,8 +88,17 @@ typedef struct ICCBridgeState {static void icc_bridge_init (Object *obj) {ICCBridgeState *s =ICC_BRIGDE (obj); +SysBusDevice *sb =SYS_BUS_DEVICE (obj);qbus_create_inplace (&s->icc_bus,TYPE_ICC_BUS ,DEVICE (s),"icc" ); + +/* Do not change order of registering regions, +* APIC must be first registered region, board maps it by 0 index +*/ +memory_region_init (&s->apic_container,"icc-apic-container" , +APIC_SPACE_SIZE ); +sysbus_init_mmio (sb, &s->apic_container); + s->icc_bus.apic_address_space = &s->apic_container; }static const TypeInfo icc_bridge_info = {
hw/i386/pc.c +10 -2
@@ -53,6 +53,7 @@#include "qemu/bitmap.h" #include "qemu/config-file.h" #include "hw/acpi/acpi.h" +#include "hw/cpu/icc_bus.h" /* debug PC/ISA interrupts */ //#define DEBUG_IRQ
@@ -917,6 +918,7 @@ static X86CPU *pc_new_cpu(const char *cpu_model, int64_t apic_id,void pc_cpus_init (const char *cpu_model,DeviceState *icc_bridge) {int i; +X86CPU *cpu =NULL ;Error *error =NULL ;/* init CPUs */
@@ -929,14 +931,20 @@ void pc_cpus_init(const char *cpu_model, DeviceState *icc_bridge) }for (i =0 ; i < smp_cpus; i++) { -pc_new_cpu (cpu_model,x86_cpu_apic_id_from_index (i), - icc_bridge, &error); + cpu =pc_new_cpu (cpu_model,x86_cpu_apic_id_from_index (i), + icc_bridge, &error);if (error) {fprintf (stderr,"%s\n" ,error_get_pretty (error));error_free (error);exit (1 ); } } + +/* map APIC MMIO area if CPU has APIC */ +if (cpu && cpu->env.apic_state) { +/* XXX: what if the base changes? */ +sysbus_mmio_map_overlap (icc_bridge,0 ,APIC_DEFAULT_ADDRESS ,0x1000 ); + } }void pc_acpi_init (const char *default_dsdt)
hw/intc/apic_common.c +12 -6
@@ -21,6 +21,8 @@#include "hw/i386/apic_internal.h" #include "trace.h" #include "sysemu/kvm.h" +#include "hw/qdev.h" +#include "hw/sysbus.h" static int apic_irq_delivered;bool apic_report_tpr_access;
@@ -282,12 +284,13 @@ static int apic_load_old(QEMUFile *f, void *opaque, int version_id)return 0 ; } -static int apic_init_common (SysBusDevice *dev) +static int apic_init_common (ICCDevice *dev) {APICCommonState *s =APIC_COMMON (dev);APICCommonClass *info;static DeviceState *vapic;static int apic_no; +static bool mmio_registered;if (apic_no >=MAX_APICS ) {return -1 ;
@@ -296,8 +299,11 @@ static int apic_init_common(SysBusDevice *dev) info =APIC_COMMON_GET_CLASS (s); info->init (s); - -sysbus_init_mmio (dev, &s->io_memory); +if (!mmio_registered) { +ICCBus *b =ICC_BUS (qdev_get_parent_bus (DEVICE (dev))); +memory_region_add_subregion (b->apic_address_space,0 , &s->io_memory); + mmio_registered = true; + }/* Note: We need at least 1M to map the VAPIC option ROM */ if (!vapic && s->vapic_control & VAPIC_ENABLE_MASK &&
@@ -375,19 +381,19 @@ static Property apic_properties_common[] = {static void apic_common_class_init (ObjectClass *klass,void *data) { -SysBusDeviceClass *sc =SYS_BUS_DEVICE_CLASS (klass); +ICCDeviceClass *idc =ICC_DEVICE_CLASS (klass);DeviceClass *dc =DEVICE_CLASS (klass); dc->vmsd = &vmstate_apic_common; dc->reset = apic_reset_common; dc->no_user =1 ; dc->props = apic_properties_common; - sc->init = apic_init_common; + idc->init = apic_init_common; }static const TypeInfo apic_common_type = { .name =TYPE_APIC_COMMON , - .parent =TYPE_SYS_BUS_DEVICE , + .parent =TYPE_ICC_DEVICE , .instance_size =sizeof (APICCommonState), .class_size =sizeof (APICCommonClass), .class_init = apic_common_class_init,
include/hw/cpu/icc_bus.h +3 -0
@@ -22,6 +22,7 @@#ifndef ICC_BUS_H #define ICC_BUS_H +#include "exec/memory.h" #include "hw/qdev-core.h" #define TYPE_ICC_BUS "icc-bus"
@@ -37,6 +38,8 @@ typedef struct ICCBus {/*< private >*/ BusState parent_obj;/*< public >*/ + +MemoryRegion *apic_address_space; } ICCBus;#define ICC_BUS (obj) OBJECT_CHECK(ICCBus, (obj), TYPE_ICC_BUS)
include/hw/i386/apic_internal.h +3 -3
@@ -21,7 +21,7 @@#define QEMU_APIC_INTERNAL_H #include "exec/memory.h" -#include "hw/sysbus.h" +#include "hw/cpu/icc_bus.h" #include "qemu/timer.h" /* APIC Local Vector Table */
@@ -78,7 +78,7 @@ typedef struct APICCommonState APICCommonState; typedef struct APICCommonClass { - SysBusDeviceClass parent_class; + ICCDeviceClass parent_class; void (*init)(APICCommonState *s); void (*set_base)(APICCommonState *s, uint64_t val);
@@ -92,7 +92,7 @@ typedef struct APICCommonClass } APICCommonClass;struct APICCommonState { -SysBusDevice busdev; +ICCDevice busdev;MemoryRegion io_memory;X86CPU *cpu;
target-i386/cpu.c +3 -13
@@ -41,10 +41,10 @@#endif #include "sysemu/sysemu.h" +#include "hw/qdev-properties.h" #include "hw/cpu/icc_bus.h" #ifndef CONFIG_USER_ONLY #include "hw/xen/xen.h" -#include "hw/sysbus.h" #include "hw/i386/apic_internal.h" #endif
@@ -2127,6 +2127,7 @@ static void mce_init(X86CPU *cpu)static void x86_cpu_apic_create (X86CPU *cpu,Error **errp) {CPUX86State *env = &cpu->env; +DeviceState *dev =DEVICE (cpu);APICCommonState *apic;const char *apic_type ="apic" ;
@@ -2136,7 +2137,7 @@ static void x86_cpu_apic_create(X86CPU *cpu, Error **errp) apic_type ="xen-apic" ; } - env->apic_state =qdev_try_create (NULL , apic_type); + env->apic_state =qdev_try_create (qdev_get_parent_bus (dev), apic_type);if (env->apic_state ==NULL ) {error_setg (errp,"APIC device '%s' could not be created" , apic_type);return ;
@@ -2153,7 +2154,6 @@ static void x86_cpu_apic_create(X86CPU *cpu, Error **errp)static void x86_cpu_apic_realize (X86CPU *cpu,Error **errp) {CPUX86State *env = &cpu->env; -static int apic_mapped;if (env->apic_state ==NULL ) {return ;
@@ -2164,16 +2164,6 @@ static void x86_cpu_apic_realize(X86CPU *cpu, Error **errp) object_get_typename(OBJECT(env->apic_state))); return; } - -/* XXX: mapping more APICs at the same memory location */ -if (apic_mapped ==0 ) { -/* NOTE: the APIC is directly connected to the CPU - it is not -on the global memory bus. */ -/* XXX: what if the base changes? */ -sysbus_mmio_map_overlap (SYS_BUS_DEVICE (env->apic_state),0 , -APIC_DEFAULT_ADDRESS ,0x1000 ); - apic_mapped =1 ; - } }#else static void x86_cpu_apic_realize (X86CPU *cpu,Error **errp)
Signature · 1 line
1.8.2.1
Re: [Qemu-devel] [PATCH 3/7] target-i386: Move APIC to ICC bus
Quoted 80 lines · On Mon, 29 Apr 2013 17:02:52 +0200 Igor Mammedov <[email protected]> wrote:
It allows APIC to be hotplugged.
* map APIC's mmio at board level if it is present
* do not register mmio region for each APIC, since only one is used/mappedSigned-off-by Igor Mammedov <[email protected]>Signed-off-by Andreas Färber <[email protected]>---
v2:
- use icc-bridge from args instead of resolving it--- hw/cpu/icc_bus.c | 10 ++++++++++ hw/i386/pc.c | 12 ++++++++++-- hw/intc/apic_common.c | 18 ++++++++++++------ include/hw/cpu/icc_bus.h | 3 +++ include/hw/i386/apic_internal.h | 6 +++--- target-i386/cpu.c | 16 +++------------- 6 files changed, 41 insertions(+), 24 deletions(-)hw/cpu/icc_bus.c +10
-0@@ -80,6 +80,7 @@ typedef struct ICCBridgeState {/*< public >*/ ICCBus icc_bus; +MemoryRegion apic_container; } ICCBridgeState;#define ICC_BRIGDE (obj) OBJECT_CHECK(ICCBridgeState, (obj), TYPE_ICC_BRIDGE)@@ -87,8 +88,17 @@ typedef struct ICCBridgeState {static void icc_bridge_init (Object *obj) {ICCBridgeState *s =ICC_BRIGDE (obj); +SysBusDevice *sb =SYS_BUS_DEVICE (obj);qbus_create_inplace (&s->icc_bus,TYPE_ICC_BUS ,DEVICE (s),"icc" ); + +/* Do not change order of registering regions, +* APIC must be first registered region, board maps it by 0 index +*/ +memory_region_init (&s->apic_container,"icc-apic-container" , +APIC_SPACE_SIZE ); +sysbus_init_mmio (sb, &s->apic_container); + s->icc_bus.apic_address_space = &s->apic_container; }static const TypeInfo icc_bridge_info = {hw/i386/pc.c +4
-2@@ -53,6 +53,7 @@#include "qemu/bitmap.h" #include "qemu/config-file.h" #include "hw/acpi/acpi.h" +#include "hw/cpu/icc_bus.h" /* debug PC/ISA interrupts */ //#define DEBUG_IRQ @@ -917,6 +918,7 @@ static X86CPU *pc_new_cpu(const char *cpu_model, int64_t apic_id,void pc_cpus_init (const char *cpu_model,DeviceState *icc_bridge) {int i; +X86CPU *cpu =NULL ;Error *error =NULL ;/* init CPUs */ @@ -929,14 +931,20 @@ void pc_cpus_init(const char *cpu_model, DeviceState *icc_bridge) }for (i =0 ; i < smp_cpus; i++) { -pc_new_cpu (cpu_model,x86_cpu_apic_id_from_index (i), - icc_bridge, &error); + cpu =pc_new_cpu (cpu_model,x86_cpu_apic_id_from_index (i), + icc_bridge, &error);if (error) {fprintf (stderr,"%s\n" ,error_get_pretty (error));
hw/i386/pc.c void pc_cpus_init(const char *cpu_model, DeviceState *icc_bridge) · line 947
Quoted 10 lines
hw/i386/pc.c +6
-0error_free (error);exit (1 ); } } + +/* map APIC MMIO area if CPU has APIC */ +if (cpu && cpu->env.apic_state) { +/* XXX: what if the base changes? */ +sysbus_mmio_map_overlap (icc_bridge,0 ,APIC_DEFAULT_ADDRESS ,0x1000 ); + }
hunk that makes icc_bridge SysBusDevice escaped into next patch, sorry. I'll resend it.
Signature · 2 lines
Regards, Igor
PATCH v8 3/7 target-i386: Move APIC to ICC bus
In reply to Igor MammedovIt allows APIC to be hotplugged.
* map APIC's mmio at board level if it is present
* do not register mmio region for each APIC, since only one is used/mapped
---
v3:
- fix compile error caused by mismerged hunk
v2:
- use icc-bridge from args instead of resolving it
--- hw/cpu/icc_bus.c | 10 ++++++++++ hw/i386/pc.c | 13 +++++++++++-- hw/intc/apic_common.c | 18 ++++++++++++------ include/hw/cpu/icc_bus.h | 3 +++ include/hw/i386/apic_internal.h | 6 +++--- target-i386/cpu.c | 16 +++------------- 6 files changed, 42 insertions(+), 24 deletions(-)
hw/cpu/icc_bus.c +10 -0
@@ -80,6 +80,7 @@ typedef struct ICCBridgeState {/*< public >*/ ICCBus icc_bus; +MemoryRegion apic_container; } ICCBridgeState;#define ICC_BRIGDE (obj) OBJECT_CHECK(ICCBridgeState, (obj), TYPE_ICC_BRIDGE)
@@ -87,8 +88,17 @@ typedef struct ICCBridgeState {static void icc_bridge_init (Object *obj) {ICCBridgeState *s =ICC_BRIGDE (obj); +SysBusDevice *sb =SYS_BUS_DEVICE (obj);qbus_create_inplace (&s->icc_bus,TYPE_ICC_BUS ,DEVICE (s),"icc" ); + +/* Do not change order of registering regions, +* APIC must be first registered region, board maps it by 0 index +*/ +memory_region_init (&s->apic_container,"icc-apic-container" , +APIC_SPACE_SIZE ); +sysbus_init_mmio (sb, &s->apic_container); + s->icc_bus.apic_address_space = &s->apic_container; }static const TypeInfo icc_bridge_info = {
hw/i386/pc.c +11 -2
@@ -53,6 +53,7 @@#include "qemu/bitmap.h" #include "qemu/config-file.h" #include "hw/acpi/acpi.h" +#include "hw/cpu/icc_bus.h" /* debug PC/ISA interrupts */ //#define DEBUG_IRQ
@@ -917,6 +918,7 @@ static X86CPU *pc_new_cpu(const char *cpu_model, int64_t apic_id,void pc_cpus_init (const char *cpu_model,DeviceState *icc_bridge) {int i; +X86CPU *cpu =NULL ;Error *error =NULL ;/* init CPUs */
@@ -929,14 +931,21 @@ void pc_cpus_init(const char *cpu_model, DeviceState *icc_bridge) }for (i =0 ; i < smp_cpus; i++) { -pc_new_cpu (cpu_model,x86_cpu_apic_id_from_index (i), - icc_bridge, &error); + cpu =pc_new_cpu (cpu_model,x86_cpu_apic_id_from_index (i), + icc_bridge, &error);if (error) {fprintf (stderr,"%s\n" ,error_get_pretty (error));error_free (error);exit (1 ); } } + +/* map APIC MMIO area if CPU has APIC */ +if (cpu && cpu->env.apic_state) { +/* XXX: what if the base changes? */ +sysbus_mmio_map_overlap (SYS_BUS_DEVICE (icc_bridge),0 , +APIC_DEFAULT_ADDRESS ,0x1000 ); + } }void pc_acpi_init (const char *default_dsdt)
hw/intc/apic_common.c +12 -6
@@ -21,6 +21,8 @@#include "hw/i386/apic_internal.h" #include "trace.h" #include "sysemu/kvm.h" +#include "hw/qdev.h" +#include "hw/sysbus.h" static int apic_irq_delivered;bool apic_report_tpr_access;
@@ -282,12 +284,13 @@ static int apic_load_old(QEMUFile *f, void *opaque, int version_id)return 0 ; } -static int apic_init_common (SysBusDevice *dev) +static int apic_init_common (ICCDevice *dev) {APICCommonState *s =APIC_COMMON (dev);APICCommonClass *info;static DeviceState *vapic;static int apic_no; +static bool mmio_registered;if (apic_no >=MAX_APICS ) {return -1 ;
@@ -296,8 +299,11 @@ static int apic_init_common(SysBusDevice *dev) info =APIC_COMMON_GET_CLASS (s); info->init (s); - -sysbus_init_mmio (dev, &s->io_memory); +if (!mmio_registered) { +ICCBus *b =ICC_BUS (qdev_get_parent_bus (DEVICE (dev))); +memory_region_add_subregion (b->apic_address_space,0 , &s->io_memory); + mmio_registered = true; + }/* Note: We need at least 1M to map the VAPIC option ROM */ if (!vapic && s->vapic_control & VAPIC_ENABLE_MASK &&
@@ -375,19 +381,19 @@ static Property apic_properties_common[] = {static void apic_common_class_init (ObjectClass *klass,void *data) { -SysBusDeviceClass *sc =SYS_BUS_DEVICE_CLASS (klass); +ICCDeviceClass *idc =ICC_DEVICE_CLASS (klass);DeviceClass *dc =DEVICE_CLASS (klass); dc->vmsd = &vmstate_apic_common; dc->reset = apic_reset_common; dc->no_user =1 ; dc->props = apic_properties_common; - sc->init = apic_init_common; + idc->init = apic_init_common; }static const TypeInfo apic_common_type = { .name =TYPE_APIC_COMMON , - .parent =TYPE_SYS_BUS_DEVICE , + .parent =TYPE_ICC_DEVICE , .instance_size =sizeof (APICCommonState), .class_size =sizeof (APICCommonClass), .class_init = apic_common_class_init,
include/hw/cpu/icc_bus.h +3 -0
@@ -22,6 +22,7 @@#ifndef ICC_BUS_H #define ICC_BUS_H +#include "exec/memory.h" #include "hw/qdev-core.h" #define TYPE_ICC_BUS "icc-bus"
@@ -37,6 +38,8 @@ typedef struct ICCBus {/*< private >*/ BusState parent_obj;/*< public >*/ + +MemoryRegion *apic_address_space; } ICCBus;#define ICC_BUS (obj) OBJECT_CHECK(ICCBus, (obj), TYPE_ICC_BUS)
include/hw/i386/apic_internal.h +3 -3
@@ -21,7 +21,7 @@#define QEMU_APIC_INTERNAL_H #include "exec/memory.h" -#include "hw/sysbus.h" +#include "hw/cpu/icc_bus.h" #include "qemu/timer.h" /* APIC Local Vector Table */
@@ -78,7 +78,7 @@ typedef struct APICCommonState APICCommonState; typedef struct APICCommonClass { - SysBusDeviceClass parent_class; + ICCDeviceClass parent_class; void (*init)(APICCommonState *s); void (*set_base)(APICCommonState *s, uint64_t val);
@@ -92,7 +92,7 @@ typedef struct APICCommonClass } APICCommonClass;struct APICCommonState { -SysBusDevice busdev; +ICCDevice busdev;MemoryRegion io_memory;X86CPU *cpu;
target-i386/cpu.c +3 -13
@@ -41,10 +41,10 @@#endif #include "sysemu/sysemu.h" +#include "hw/qdev-properties.h" #include "hw/cpu/icc_bus.h" #ifndef CONFIG_USER_ONLY #include "hw/xen/xen.h" -#include "hw/sysbus.h" #include "hw/i386/apic_internal.h" #endif
@@ -2131,6 +2131,7 @@ static void mce_init(X86CPU *cpu)static void x86_cpu_apic_create (X86CPU *cpu,Error **errp) {CPUX86State *env = &cpu->env; +DeviceState *dev =DEVICE (cpu);APICCommonState *apic;const char *apic_type ="apic" ;
@@ -2140,7 +2141,7 @@ static void x86_cpu_apic_create(X86CPU *cpu, Error **errp) apic_type ="xen-apic" ; } - env->apic_state =qdev_try_create (NULL , apic_type); + env->apic_state =qdev_try_create (qdev_get_parent_bus (dev), apic_type);if (env->apic_state ==NULL ) {error_setg (errp,"APIC device '%s' could not be created" , apic_type);return ;
@@ -2157,7 +2158,6 @@ static void x86_cpu_apic_create(X86CPU *cpu, Error **errp)static void x86_cpu_apic_realize (X86CPU *cpu,Error **errp) {CPUX86State *env = &cpu->env; -static int apic_mapped;if (env->apic_state ==NULL ) {return ;
@@ -2168,16 +2168,6 @@ static void x86_cpu_apic_realize(X86CPU *cpu, Error **errp) object_get_typename(OBJECT(env->apic_state))); return; } - -/* XXX: mapping more APICs at the same memory location */ -if (apic_mapped ==0 ) { -/* NOTE: the APIC is directly connected to the CPU - it is not -on the global memory bus. */ -/* XXX: what if the base changes? */ -sysbus_mmio_map_overlap (SYS_BUS_DEVICE (env->apic_state),0 , -APIC_DEFAULT_ADDRESS ,0x1000 ); - apic_mapped =1 ; - } }#else static void x86_cpu_apic_realize (X86CPU *cpu,Error **errp)
Signature · 1 line
1.8.2.1
Andreas Färber
AppliedRe: [Qemu-devel] [PATCH 3/7 v8] target-i386: Move APIC to ICC bus
Am 29.04.2013 19:03, schrieb Igor Mammedov:
Quoted 6 lines
It allows APIC to be hotplugged.
* map APIC's mmio at board level if it is present
* do not register mmio region for each APIC, since only one is used/mapped
Quoted 7 lines
Signed-off-by Igor Mammedov <[email protected]>Signed-off-by Andreas Färber <[email protected]>---
v3:
- fix compile error caused by mismerged hunk
v2:
- use icc-bridge from args instead of resolving it
Thanks, applied to qom-cpu:
https://github.com/afaerber/qemu-cpu/commits/qom-cpu
One question though...
[...]
Quoted 4 lines
hw/i386/pc.c +0
-0
[...]
Quoted 7 lines
hw/i386/pc.c +1
-2@@ -929,14 +931,21 @@ void pc_cpus_init(const char *cpu_model, DeviceState *icc_bridge) }for (i =0 ; i < smp_cpus; i++) { -pc_new_cpu (cpu_model,x86_cpu_apic_id_from_index (i), - icc_bridge, &error); + cpu = pc_new_cpu(cpu_model, x86_cpu_apic_id_from_index(i),
hw/i386/pc.c void pc_cpus_init(const char *cpu_model, DeviceState *icc_bridge) · line 944
Quoted 10 lines
hw/i386/pc.c +4
-0+ icc_bridge, &error);if (error) {fprintf (stderr,"%s\n" ,error_get_pretty (error));error_free (error);exit (1 ); } } + +/* map APIC MMIO area if CPU has APIC */ +if (cpu && cpu->env.apic_state) {
Might sysbus_mmio_get_region(SYS_BUS_DEVICE(icc_bridge), 0) != NULL be a more straightforward guard? We're not accessing apic_state at all. :)
Andreas
Quoted 7 lines
hw/i386/pc.c +4
-0+/* XXX: what if the base changes? */ +sysbus_mmio_map_overlap (SYS_BUS_DEVICE (icc_bridge),0 , +APIC_DEFAULT_ADDRESS ,0x1000 ); + } }void pc_acpi_init (const char *default_dsdt)
[snip]
Signature · 2 lines
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg
Re: [Qemu-devel] [PATCH 3/7 v8] target-i386: Move APIC to ICC bus
Quoted 38 lines · On Mon, 29 Apr 2013 19:15:56 +0200 Andreas Färber <[email protected]> wrote:
Am 29.04.2013 19:03, schrieb Igor Mammedov:
Quoted 6 lines
It allows APIC to be hotplugged.
* map APIC's mmio at board level if it is present
* do not register mmio region for each APIC, since only one is used/mappedQuoted 7 lines
Signed-off-by Igor Mammedov <[email protected]>Signed-off-by Andreas Färber <[email protected]>---
v3:
- fix compile error caused by mismerged hunk
v2:
- use icc-bridge from args instead of resolving itThanks, applied to qom-cpu:
https://github.com/afaerber/qemu-cpu/commits/qom-cpuOne question though...
[...]
Quoted 4 lines
hw/i386/pc.c +0
-0[...]
Quoted 12 lines
hw/i386/pc.c +2
-2@@ -929,14 +931,21 @@ void pc_cpus_init(const char *cpu_model, DeviceState *icc_bridge) }for (i =0 ; i < smp_cpus; i++) { -pc_new_cpu (cpu_model,x86_cpu_apic_id_from_index (i), - icc_bridge, &error); + cpu =pc_new_cpu (cpu_model,x86_cpu_apic_id_from_index (i), + icc_bridge, &error);if (error) {fprintf (stderr,"%s\n" ,error_get_pretty (error));error_free (error);exit (1 );
Quoted 8 lines
hw/i386/pc.c void pc_cpus_init(const char *cpu_model, DeviceState *icc_bridge) · line 944
Quoted 5 lines
hw/i386/pc.c +3
-0} } + +/* map APIC MMIO area if CPU has APIC */ +if (cpu && cpu->env.apic_state) {Might
sysbus_mmio_get_region(SYS_BUS_DEVICE(icc_bridge), 0)!= NULL be a more straightforward guard? We're not accessingapic_stateat all. :)
it won't be NULL, it's icc_bridge's region that always exists.
Quoted 16 lines
Andreas
Quoted 7 lines
hw/i386/pc.c +4
-0+/* XXX: what if the base changes? */ +sysbus_mmio_map_overlap (SYS_BUS_DEVICE (icc_bridge),0 , +APIC_DEFAULT_ADDRESS ,0x1000 ); + } }void pc_acpi_init (const char *default_dsdt)[snip]
Signature · 2 lines
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg
Signature · 2 lines
Regards, Igor
PATCH v7 4/7 pc: pass QEMUMachineInitArgs down to pc_cpus_init()
In reply to Igor MammedovIt allows to store default cpu_model if none was specified.
As side effect reduces size of the pc_piix.c code.
--- hw/i386/pc.c | 13 ++++++----- hw/i386/pc_piix.c | 66 +++++++++++++--------------------------------------- hw/i386/pc_q35.c | 23 +++++++----------- include/hw/i386/pc.h | 3 ++- 4 files changed, 34 insertions(+), 71 deletions(-)
hw/i386/pc.c +7 -6
@@ -915,23 +915,23 @@ static X86CPU *pc_new_cpu(const char *cpu_model, int64_t apic_id,return cpu; } -void pc_cpus_init (const char *cpu_model,DeviceState *icc_bridge) +void pc_cpus_init (QEMUMachineInitArgs *args,DeviceState *icc_bridge) {int i;X86CPU *cpu =NULL ;Error *error =NULL ;/* init CPUs */ -if (cpu_model ==NULL ) { +if (args->cpu_model ==NULL ) {#ifdef TARGET_X86_64 - cpu_model ="qemu64" ; + args->cpu_model ="qemu64" ;#else - cpu_model ="qemu32" ; + args->cpu_model ="qemu32" ;#endif }for (i =0 ; i < smp_cpus; i++) { - cpu =pc_new_cpu (cpu_model,x86_cpu_apic_id_from_index (i), + cpu =pc_new_cpu (args->cpu_model,x86_cpu_apic_id_from_index (i), icc_bridge, &error);if (error) {fprintf (stderr,"%s\n" ,error_get_pretty (error));
@@ -943,7 +943,8 @@ void pc_cpus_init(const char *cpu_model, DeviceState *icc_bridge)/* map APIC MMIO area if CPU has APIC */ if (cpu && cpu->env.apic_state) {/* XXX: what if the base changes? */ -sysbus_mmio_map_overlap (icc_bridge,0 ,APIC_DEFAULT_ADDRESS ,0x1000 ); +sysbus_mmio_map_overlap (SYS_BUS_DEVICE (icc_bridge),0 , +APIC_DEFAULT_ADDRESS ,0x1000 ); } }
hw/i386/pc_piix.c +16 -50
125 lines not on this page · raw message
hw/i386/pc_q35.c +9 -14
@@ -49,12 +49,6 @@/* PC hardware initialisation */ static void pc_q35_init (QEMUMachineInitArgs *args) { -ram_addr_t ram_size = args->ram_size; -const char *cpu_model = args->cpu_model; -const char *kernel_filename = args->kernel_filename; -const char *kernel_cmdline = args->kernel_cmdline; -const char *initrd_filename = args->initrd_filename; -const char *boot_device = args->boot_device;ram_addr_t below_4g_mem_size, above_4g_mem_size;Q35PCIHost *q35_host;PCIBus *host_bus;
@@ -80,17 +74,17 @@ static void pc_q35_init(QEMUMachineInitArgs *args)object_property_add_child (qdev_get_machine (),"icc-bridge" ,OBJECT (icc_bridge),NULL ); -pc_cpus_init (cpu_model, icc_bridge); +pc_cpus_init (args, icc_bridge);pc_acpi_init ("q35-acpi-dsdt.aml" );kvmclock_create (); -if (ram_size >=0xb0000000 ) { - above_4g_mem_size = ram_size -0xb0000000 ; +if (args->ram_size >=0xb0000000 ) { + above_4g_mem_size = args->ram_size -0xb0000000 ; below_4g_mem_size =0xb0000000 ; }else { above_4g_mem_size =0 ; - below_4g_mem_size = ram_size; + below_4g_mem_size = args->ram_size; }/* pci enabled */
@@ -105,9 +99,10 @@ static void pc_q35_init(QEMUMachineInitArgs *args)/* allocate ram and load rom/bios */ if (!xen_enabled ()) { -pc_memory_init (get_system_memory (), kernel_filename, kernel_cmdline, - initrd_filename, below_4g_mem_size, above_4g_mem_size, - rom_memory, &ram_memory); +pc_memory_init (get_system_memory (), + args->kernel_filename, args->kernel_cmdline, + args->initrd_filename, below_4g_mem_size, + above_4g_mem_size, rom_memory, &ram_memory); }/* irq lines */
@@ -191,7 +186,7 @@ static void pc_q35_init(QEMUMachineInitArgs *args) 0xb100), 8, NULL, 0); -pc_cmos_init (below_4g_mem_size, above_4g_mem_size, boot_device, +pc_cmos_init (below_4g_mem_size, above_4g_mem_size, args->boot_device, floppy, idebus[0 ], idebus[1 ], rtc_state);/* the rest devices to which pci devfn is automatically assigned */
include/hw/i386/pc.h +2 -1
@@ -9,6 +9,7 @@#include "net/net.h" #include "exec/memory.h" #include "hw/i386/ioapic.h" +#include "hw/boards.h" /* PC-style peripherals (also used by other machines). */
@@ -78,7 +79,7 @@ extern int fd_bootchk;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,DeviceState *icc_bridge); +void pc_cpus_init (QEMUMachineInitArgs *args,DeviceState *icc_bridge);void pc_acpi_init (const char *default_dsdt); void *pc_memory_init(MemoryRegion *system_memory, const char *kernel_filename,
Signature · 1 line
1.8.2.1
Re: [Qemu-devel] [PATCH 4/7] pc: pass QEMUMachineInitArgs down to pc_cpus_init()
Quoted 274 lines · 在 2013-04-29一的 17:02 +0200,Igor Mammedov写道:
It allows to store default
cpu_modelif none was specified.As side effect reduces size of the
pc_piix.ccode.Signed-off-by Igor Mammedov <[email protected]>--- hw/i386/pc.c | 13 ++++++----- hw/i386/pc_piix.c | 66 +++++++++++++--------------------------------------- hw/i386/pc_q35.c | 23 +++++++----------- include/hw/i386/pc.h | 3 ++- 4 files changed, 34 insertions(+), 71 deletions(-)hw/i386/pc.c +7
-6@@ -915,23 +915,23 @@ static X86CPU *pc_new_cpu(const char *cpu_model, int64_t apic_id,return cpu; } -void pc_cpus_init (const char *cpu_model,DeviceState *icc_bridge) +void pc_cpus_init (QEMUMachineInitArgs *args,DeviceState *icc_bridge) {int i;X86CPU *cpu =NULL ;Error *error =NULL ;/* init CPUs */ -if (cpu_model ==NULL ) { +if (args->cpu_model ==NULL ) {#ifdef TARGET_X86_64 - cpu_model ="qemu64" ; + args->cpu_model ="qemu64" ;#else - cpu_model ="qemu32" ; + args->cpu_model ="qemu32" ;#endif }for (i =0 ; i < smp_cpus; i++) { - cpu =pc_new_cpu (cpu_model,x86_cpu_apic_id_from_index (i), + cpu =pc_new_cpu (args->cpu_model,x86_cpu_apic_id_from_index (i), icc_bridge, &error);if (error) {fprintf (stderr,"%s\n" ,error_get_pretty (error));@@ -943,7 +943,8 @@ void pc_cpus_init(const char *cpu_model, DeviceState *icc_bridge)/* map APIC MMIO area if CPU has APIC */ if (cpu && cpu->env.apic_state) {/* XXX: what if the base changes? */ -sysbus_mmio_map_overlap (icc_bridge,0 ,APIC_DEFAULT_ADDRESS ,0x1000 ); +sysbus_mmio_map_overlap (SYS_BUS_DEVICE (icc_bridge),0 , +APIC_DEFAULT_ADDRESS ,0x1000 ); } }hw/i386/pc_piix.c +16
-50@@ -59,12 +59,7 @@ static const int ide_irq[MAX_IDE_BUS] = { 14, 15 };/* PC hardware initialisation */ static void pc_init1 (MemoryRegion *system_memory,MemoryRegion *system_io, -ram_addr_t ram_size, -const char *boot_device, -const char *kernel_filename, -const char *kernel_cmdline, -const char *initrd_filename, -const char *cpu_model, +QEMUMachineInitArgs *args,int pci_enabled,int kvmclock_enabled) {@@ -93,19 +88,19 @@ static void pc_init1(MemoryRegion *system_memory,object_property_add_child (qdev_get_machine (),"icc-bridge" ,OBJECT (icc_bridge),NULL ); -pc_cpus_init (cpu_model, icc_bridge); +pc_cpus_init (args, icc_bridge);pc_acpi_init ("acpi-dsdt.aml" );if (kvmclock_enabled) {kvmclock_create (); } -if (ram_size >=0xe0000000 ) { - above_4g_mem_size = ram_size -0xe0000000 ; +if (args->ram_size >=0xe0000000 ) { + above_4g_mem_size = args->ram_size -0xe0000000 ; below_4g_mem_size =0xe0000000 ; }else { above_4g_mem_size =0 ; - below_4g_mem_size = ram_size; + below_4g_mem_size = args->ram_size; }if (pci_enabled) {@@ -120,9 +115,9 @@ static void pc_init1(MemoryRegion *system_memory,/* allocate ram and load rom/bios */ if (!xen_enabled ()) { fw_cfg =pc_memory_init (system_memory, - kernel_filename, kernel_cmdline, initrd_filename, - below_4g_mem_size, above_4g_mem_size, - rom_memory, &ram_memory); + args->kernel_filename, args->kernel_cmdline, + args->initrd_filename, below_4g_mem_size, + above_4g_mem_size, rom_memory, &ram_memory); } gsi_state =g_malloc0 (sizeof (*gsi_state));@@ -136,7 +131,7 @@ static void pc_init1(MemoryRegion *system_memory,if (pci_enabled) { pci_bus = i440fx_init(&i440fx_state, &piix3_devfn, &isa_bus, gsi, - system_memory, system_io, ram_size, + system_memory, system_io, args->ram_size, below_4g_mem_size, 0x100000000ULL - below_4g_mem_size, 0x100000000ULL + above_4g_mem_size,@@ -203,7 +198,7 @@ static void pc_init1(MemoryRegion *system_memory,audio_init (isa_bus, pci_enabled ? pci_bus :NULL ); -pc_cmos_init (below_4g_mem_size, above_4g_mem_size, boot_device, +pc_cmos_init (below_4g_mem_size, above_4g_mem_size, args->boot_device, floppy, idebus[0 ], idebus[1 ], rtc_state);if (pci_enabled &&usb_enabled (false)) {@@ -229,17 +224,7 @@ static void pc_init1(MemoryRegion *system_memory,static void pc_init_pci (QEMUMachineInitArgs *args) { -ram_addr_t ram_size = args->ram_size; -const char *cpu_model = args->cpu_model; -const char *kernel_filename = args->kernel_filename; -const char *kernel_cmdline = args->kernel_cmdline; -const char *initrd_filename = args->initrd_filename; -const char *boot_device = args->boot_device; -pc_init1 (get_system_memory (), -get_system_io (), - ram_size, boot_device, - kernel_filename, kernel_cmdline, - initrd_filename, cpu_model,1 ,1 ); +pc_init1 (get_system_memory (),get_system_io (), args,1 ,1 ); }static void pc_init_pci_1_4 (QEMUMachineInitArgs *args)@@ -275,38 +260,19 @@ static void pc_init_pci_1_0(QEMUMachineInitArgs *args)/* PC init function for pc-0.10 to pc-0.13, and reused by xenfv */ static void pc_init_pci_no_kvmclock (QEMUMachineInitArgs *args) { -ram_addr_t ram_size = args->ram_size; -const char *cpu_model = args->cpu_model; -const char *kernel_filename = args->kernel_filename; -const char *kernel_cmdline = args->kernel_cmdline; -const char *initrd_filename = args->initrd_filename; -const char *boot_device = args->boot_device;disable_kvm_pv_eoi ();enable_compat_apic_id_mode (); -pc_init1 (get_system_memory (), -get_system_io (), - ram_size, boot_device, - kernel_filename, kernel_cmdline, - initrd_filename, cpu_model,1 ,0 ); +pc_init1 (get_system_memory (),get_system_io (), args,1 ,0 ); }static void pc_init_isa (QEMUMachineInitArgs *args) { -ram_addr_t ram_size = args->ram_size; -const char *cpu_model = args->cpu_model; -const char *kernel_filename = args->kernel_filename; -const char *kernel_cmdline = args->kernel_cmdline; -const char *initrd_filename = args->initrd_filename; -const char *boot_device = args->boot_device; -if (cpu_model ==NULL ) - cpu_model ="486" ; +if (args->cpu_model ==NULL ) { + args->cpu_model ="486" ; + }disable_kvm_pv_eoi ();enable_compat_apic_id_mode (); -pc_init1 (get_system_memory (), -get_system_io (), - ram_size, boot_device, - kernel_filename, kernel_cmdline, - initrd_filename, cpu_model,0 ,1 ); +pc_init1 (get_system_memory (),get_system_io (), args,0 ,1 ); }#ifdef CONFIG_XEN hw/i386/pc_q35.c +9
-14@@ -49,12 +49,6 @@/* PC hardware initialisation */ static void pc_q35_init (QEMUMachineInitArgs *args) { -ram_addr_t ram_size = args->ram_size; -const char *cpu_model = args->cpu_model; -const char *kernel_filename = args->kernel_filename; -const char *kernel_cmdline = args->kernel_cmdline; -const char *initrd_filename = args->initrd_filename; -const char *boot_device = args->boot_device;ram_addr_t below_4g_mem_size, above_4g_mem_size;Q35PCIHost *q35_host;PCIBus *host_bus;@@ -80,17 +74,17 @@ static void pc_q35_init(QEMUMachineInitArgs *args)object_property_add_child (qdev_get_machine (),"icc-bridge" ,OBJECT (icc_bridge),NULL ); -pc_cpus_init (cpu_model, icc_bridge); +pc_cpus_init (args, icc_bridge);pc_acpi_init ("q35-acpi-dsdt.aml" );kvmclock_create (); -if (ram_size >=0xb0000000 ) { - above_4g_mem_size = ram_size -0xb0000000 ; +if (args->ram_size >=0xb0000000 ) { + above_4g_mem_size = args->ram_size -0xb0000000 ; below_4g_mem_size =0xb0000000 ; }else { above_4g_mem_size =0 ; - below_4g_mem_size = ram_size; + below_4g_mem_size = args->ram_size; }/* pci enabled */ @@ -105,9 +99,10 @@ static void pc_q35_init(QEMUMachineInitArgs *args)/* allocate ram and load rom/bios */ if (!xen_enabled ()) { -pc_memory_init (get_system_memory (), kernel_filename, kernel_cmdline, - initrd_filename, below_4g_mem_size, above_4g_mem_size, - rom_memory, &ram_memory); +pc_memory_init (get_system_memory (), + args->kernel_filename, args->kernel_cmdline, + args->initrd_filename, below_4g_mem_size, + above_4g_mem_size, rom_memory, &ram_memory); }/* irq lines */ @@ -191,7 +186,7 @@ static void pc_q35_init(QEMUMachineInitArgs *args) 0xb100), 8, NULL, 0); -pc_cmos_init (below_4g_mem_size, above_4g_mem_size, boot_device, +pc_cmos_init (below_4g_mem_size, above_4g_mem_size, args->boot_device, floppy, idebus[0 ], idebus[1 ], rtc_state);/* the rest devices to which pci devfn is automatically assigned */ include/hw/i386/pc.h +2
-1@@ -9,6 +9,7 @@#include "net/net.h" #include "exec/memory.h" #include "hw/i386/ioapic.h" +#include "hw/boards.h" /* PC-style peripherals (also used by other machines). */ @@ -78,7 +79,7 @@ extern int fd_bootchk;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,DeviceState *icc_bridge); +void pc_cpus_init (QEMUMachineInitArgs *args,DeviceState *icc_bridge);void pc_acpi_init (const char *default_dsdt); void *pc_memory_init(MemoryRegion *system_memory, const char *kernel_filename,
PATCH v7 5/7 add hot_add_cpu hook to QEMUMachine and export machine_args
In reply to Igor Mammedovhot_add_cpu hook should be overriden by target that implements cpu hot-add via cpu-add QMP command.
Make machine_args available globaly, it allows to reuse machine_args->cpu_model during hotplug, instead of adding target specific globals to keep a copy of cpu_model.
---
v2:
* convert stack veriable args to global machine_args
* don't move current_machine before machine->init(), override hot_add_cpu staticaly instead.
--- include/hw/boards.h | 3 +++ vl.c | 8 ++++++-- 2 files changed, 9 insertions(+), 2 deletions(-)
include/hw/boards.h +3 -0
@@ -18,6 +18,8 @@ typedef struct QEMUMachineInitArgs {const char *cpu_model; } QEMUMachineInitArgs; +extern QEMUMachineInitArgs machine_args; +typedef void QEMUMachineInitFunc (QEMUMachineInitArgs *args);typedef void QEMUMachineResetFunc (void );
@@ -43,6 +45,7 @@ typedef struct QEMUMachine {GlobalProperty *compat_props;struct QEMUMachine *next;const char *hw_version; +void (*hot_add_cpu)(const int64_t id,Error **errp); } QEMUMachine;int qemu_register_machine (QEMUMachine *m);
vl.c +6 -2
@@ -179,6 +179,8 @@ int main(int argc, char **argv)#define MAX_VIRTIO_CONSOLES 1#define MAX_SCLP_CONSOLES 1 +QEMUMachineInitArgs machine_args; +static const char *data_dir[16 ];static int data_dir_idx;const char *bios_name =NULL ;
@@ -4291,7 +4293,8 @@ int main(int argc, char **argv, char **envp)qdev_machine_init (); -QEMUMachineInitArgs args = { .ram_size = ram_size, + machine_args = (QEMUMachineInitArgs ){ + .ram_size = ram_size, .boot_device = (boot_devices[0 ] =='\0' ) ? machine->boot_order : boot_devices,
@@ -4299,7 +4302,8 @@ int main(int argc, char **argv, char **envp) .kernel_cmdline = kernel_cmdline, .initrd_filename = initrd_filename, .cpu_model = cpu_model }; - machine->init (&args); + + machine->init (&machine_args);cpu_synchronize_all_post_init ();
Signature · 1 line
1.8.2.1
Re: [Qemu-devel] [PATCH 5/7] add hot_add_cpu hook to QEMUMachine and export machine_args
Quoted 23 lines · 在 2013-04-29一的 17:02 +0200,Igor Mammedov写道:
hot_add_cpuhook should be overriden by target that implements cpu hot-add via cpu-add QMP command.Make
machine_argsavailable globaly, it allows to reusemachine_args->cpu_modelduring hotplug, instead of adding target specific globals to keep a copy ofcpu_model.Signed-off-by Igor Mammedov <[email protected]>---
v2:
* convert stack veriable args to globalmachine_args
* don't movecurrent_machinebeforemachine->init(), overridehot_add_cpustaticaly instead.--- include/hw/boards.h | 3 +++ vl.c | 8 ++++++-- 2 files changed, 9 insertions(+), 2 deletions(-)include/hw/boards.h +0
-0
include/hw/boards.h typedef struct QEMUMachineInitArgs { · line 22
Quoted 5 lines
include/hw/boards.h +2
-0@@ -18,6 +18,8 @@ typedef struct QEMUMachineInitArgs {const char *cpu_model; } QEMUMachineInitArgs; +extern QEMUMachineInitArgs machine_args; +
I'm goint to think whether we can pus machine_args into current_machine, that is add QEMUMachineInitArgs member for QEMUMachine.
by this, we can avoid this global extern.
Quoted 44 lines
include/hw/boards.h +1
-0typedef void QEMUMachineInitFunc (QEMUMachineInitArgs *args);typedef void QEMUMachineResetFunc (void );@@ -43,6 +45,7 @@ typedef struct QEMUMachine {GlobalProperty *compat_props;struct QEMUMachine *next;const char *hw_version; +void (*hot_add_cpu)(const int64_t id,Error **errp); } QEMUMachine;int qemu_register_machine (QEMUMachine *m);vl.c +6
-2@@ -179,6 +179,8 @@ int main(int argc, char **argv)#define MAX_VIRTIO_CONSOLES 1#define MAX_SCLP_CONSOLES 1 +QEMUMachineInitArgs machine_args; +static const char *data_dir[16 ];static int data_dir_idx;const char *bios_name =NULL ;@@ -4291,7 +4293,8 @@ int main(int argc, char **argv, char **envp)qdev_machine_init (); -QEMUMachineInitArgs args = { .ram_size = ram_size, + machine_args = (QEMUMachineInitArgs ){ + .ram_size = ram_size, .boot_device = (boot_devices[0 ] =='\0' ) ? machine->boot_order : boot_devices,@@ -4299,7 +4302,8 @@ int main(int argc, char **argv, char **envp) .kernel_cmdline = kernel_cmdline, .initrd_filename = initrd_filename, .cpu_model = cpu_model }; - machine->init (&args); + + machine->init (&machine_args);cpu_synchronize_all_post_init ();
PATCH v7 6/7 target-i386: implement machine->hot_add_cpu hook
In reply to Igor Mammedov---
v2:
* override .hot_add_cpu staticaly starting with 1.5 machine
--- hw/i386/pc.c | 22 ++++++++++++++++++++++ hw/i386/pc_piix.c | 1 + hw/i386/pc_q35.c | 1 + include/hw/i386/pc.h | 1 + 4 files changed, 25 insertions(+)
hw/i386/pc.c +22 -0
@@ -915,6 +915,28 @@ static X86CPU *pc_new_cpu(const char *cpu_model, int64_t apic_id,return cpu; } +void pc_hot_add_cpu (const int64_t id,Error **errp) +{ +DeviceState *icc_bridge; +int64_t apic_id =x86_cpu_apic_id_from_index (id); + +if (cpu_exists (apic_id)) { +error_setg (errp,"Unable to add CPU: %" PRIi64 +", it already exists" , id); +return ; + } + +if (id >= max_cpus) { +error_setg (errp,"Unable to add CPU: %" PRIi64 +", max allowed: %d" , id, max_cpus -1 ); +return ; + } + + icc_bridge =DEVICE (object_resolve_path_type ("icc-bridge" , +TYPE_ICC_BRIDGE ,NULL )); +pc_new_cpu (machine_args.cpu_model, apic_id, icc_bridge, errp); +} +void pc_cpus_init (QEMUMachineInitArgs *args,DeviceState *icc_bridge) {int i;
hw/i386/pc_piix.c +1 -0
@@ -291,6 +291,7 @@ static QEMUMachine pc_i440fx_machine_v1_5 = { .alias = "pc", .desc = "Standard PC (i440FX + PIIX, 1996)", .init = pc_init_pci, + .hot_add_cpu = pc_hot_add_cpu, .max_cpus = 255, .is_default =1 , DEFAULT_MACHINE_OPTIONS,
hw/i386/pc_q35.c +1 -0
@@ -209,6 +209,7 @@ static QEMUMachine pc_q35_machine_v1_5 = { .alias = "q35", .desc = "Standard PC (Q35 + ICH9, 2009)", .init = pc_q35_init, + .hot_add_cpu = pc_hot_add_cpu, .max_cpus = 255, DEFAULT_MACHINE_OPTIONS, };
include/hw/i386/pc.h +1 -0
@@ -80,6 +80,7 @@ void pc_register_ferr_irq(qemu_irq irq);void pc_acpi_smi_interrupt (void *opaque,int irq,int level);void pc_cpus_init (QEMUMachineInitArgs *args,DeviceState *icc_bridge); +void pc_hot_add_cpu (const int64_t id,Error **errp);void pc_acpi_init (const char *default_dsdt); void *pc_memory_init(MemoryRegion *system_memory, const char *kernel_filename,
Signature · 1 line
1.8.2.1
PATCH v7 7/7 QMP: add cpu-add command
In reply to Igor MammedovAdds "cpu-add id=xxx" QMP command.
cpu-add's "id" argument is a CPU number in a range [0..max-cpus)
Example QMP command:
-> { "execute": "cpu-add", "arguments": { "id": 2 } } <- { "return": {} }
---
v7:
* added "Since 1.5" to cpu-add qapi schema definition
v6:
* added valid values description to qapi schema
* split out cpu_hot_add hooks introduction into separate patch
* split out implementation of cpu_hot_add for target-i386
v5:
* accept id=[0..max_cpus) range in cpu-add command
v4:
* merge "qmp: add cpu-add qmp command" & "target-i386: implement CPU hot-add" patches
* move notifier call to CPUCLass.realize()
* add hook cpu_hot_add to QEMUMachine
* make QEMUMachineInitArgs global and keep default cpu_model there
v3:
* it appears that 'online/offline' in cpu-set are confusing people with what command actually does and users might have to distinguish if 'offline' is not implemented by parsing error message. To simplify things replace cpu-set with cpu-add command to show more clear what command does and just add cpu-del when CPU remove is implemented.
v2:
* s/cpu_set/cpu-set/
* qmp doc style fix
* use bool type instead of opencodding online/offline string
--- qapi-schema.json | 13 +++++++++++++ qmp-commands.hx | 23 +++++++++++++++++++++++ qmp.c | 10 ++++++++++ 3 files changed, 46 insertions(+)
qapi-schema.json +13 -0
@@ -1387,6 +1387,19 @@ { 'command': 'cpu', 'data': {'index': 'int'} } ## +# @cpu-add +# +# Adds CPU with specified ID +# +# @id: ID of CPU to be created, valid values [0..max_cpus) +# +# Returns: Nothing on success +# +# Since 1.5 +## +{ 'command': 'cpu-add', 'data': {'id': 'int'} } + +## # @memsave: # # Save a portion of guest memory to a file.
qmp-commands.hx +23 -0
@@ -385,6 +385,29 @@ Note: CPUs' indexes are obtained with the 'query-cpus' command. EQMP { + .name = "cpu-add", + .args_type = "id:i", + .mhandler.cmd_new = qmp_marshal_input_cpu_add, + }, + +SQMP +cpu-add +------- + +Adds virtual cpu + +Arguments: + +- "id": cpu id (json-int) + +Example: + +-> { "execute": "cpu-add", "arguments": { "id": 2 } } +<- { "return": {} } + +EQMP + + { .name = "memsave", .args_type = "val:l,size:i,filename:s,cpu:i?", .mhandler.cmd_new = qmp_marshal_input_memsave,
qmp.c +10 -0
@@ -24,6 +24,7 @@#include "hw/qdev.h" #include "sysemu/blockdev.h" #include "qom/qom-qobject.h" +#include "hw/boards.h" NameInfo *qmp_query_name (Error **errp) {
@@ -108,6 +109,15 @@ void qmp_cpu(int64_t index, Error **errp)/* Just do nothing */ } +void qmp_cpu_add (int64_t id,Error **errp) +{ +if (current_machine->hot_add_cpu) { + current_machine->hot_add_cpu (id, errp); + }else { +error_setg (errp,"Not supported" ); + } +} +#ifndef CONFIG_VNC /* If VNC support is enabled, the "true" query-vnc command is defined in the VNC subsystem */
Signature · 1 line
1.8.2.1