i386: add cpu hot remove support
v5 cover i386: add cpu hot remove support
Via implementing ACPI standard methods _EJ0 in ACPI table, after Guest OS remove one vCPU online, the fireware will store removed bitmap to QEMU, then QEMU could know to notify the assigned vCPU of exiting. meanwhile, intruduce the QOM command 'cpu-del' to remove vCPU from QEMU itself. currently, this patches only support the cpu deleted sequentially from the last one, and command 'cpu-del' would always delete the last cpu every time. in libvirt, command 'virsh set-vcpus' always add/delete vcpu sequentially, so I think this patches will be OK.
this work is based on Andreas Färber's qom-next branch tree.
git://github.com/afaerber/qemu-next.git
this series patches must be used with KVM patch together.
for KVM patches:
http://comments.gmane.org/gmane.comp.emulators.kvm.devel/114347
v4-v5: delete command 'cpu-del' argument to remove cpu from the last one rather than specify vcpuid and fix migration bug.
Chen Fan (8):
x86: move apic_state field from CPUX86State to X86CPU
x86: add x86_cpu_unrealizefn() for cpu apic remove
qmp: add 'cpu-del' command support
qom cpu: rename variable 'cpu_added_notifier' to
'cpu_hotplug_notifier'
qom cpu: add UNPLUG cpu notifier support
i386: implement pc interface cpu_common_unrealizefn() in qom/cpu.c
piix4: implement function cpu_status_write() for vcpu ejection
cpus: reclaim allocated vCPU objects
cpu-exec.c | 2 +- cpus.c | 51 ++++++++++++++++++++++++++++-- hw/acpi/piix4.c | 66 ++++++++++++++++++++++++++++++++------- hw/i386/acpi-dsdt-cpu-hotplug.dsl | 6 +++- hw/i386/kvm/apic.c | 8 +++++ hw/i386/kvmvapic.c | 8 ++--- hw/i386/pc.c | 38 ++++++++++++++++------ hw/i386/pc_piix.c | 3 +- hw/intc/apic.c | 10 ++++++ hw/intc/apic_common.c | 23 +++++++++++++- hw/xen/xen_apic.c | 8 +++++ include/hw/boards.h | 2 ++ include/hw/cpu/icc_bus.h | 1 + include/hw/i386/apic_internal.h | 1 + include/hw/i386/pc.h | 1 + include/qom/cpu.h | 21 +++++++++++++ include/sysemu/kvm.h | 1 + include/sysemu/sysemu.h | 2 +- kvm-all.c | 25 +++++++++++++++ qapi-schema.json | 10 ++++++ qmp-commands.hx | 21 +++++++++++++ qmp.c | 9 ++++++ qom/cpu.c | 26 ++++++++++++--- target-i386/cpu-qom.h | 5 +++ target-i386/cpu.c | 66 ++++++++++++++++++++++++++++++++------- target-i386/cpu.h | 4 --- target-i386/helper.c | 9 +++--- target-i386/kvm.c | 23 ++++++-------- target-i386/misc_helper.c | 8 ++--- 29 files changed, 380 insertions(+), 78 deletions(-)
Signature · 1 line
1.8.1.4
RFC v5 1/8 x86: move apic_state field from CPUX86State to X86CPU
This motion is preparing for refactoring vCPU apic subsequently.
--- cpu-exec.c | 2 +- cpus.c | 5 ++--- hw/i386/kvmvapic.c | 8 +++----- hw/i386/pc.c | 17 ++++++++--------- target-i386/cpu-qom.h | 4 ++++ target-i386/cpu.c | 22 ++++++++++------------ target-i386/cpu.h | 4 ---- target-i386/helper.c | 9 ++++----- target-i386/kvm.c | 23 ++++++++++------------- target-i386/misc_helper.c | 8 ++++---- 10 files changed, 46 insertions(+), 56 deletions(-)
cpu-exec.c +1 -1
@@ -320,7 +320,7 @@ int cpu_exec(CPUArchState *env)#if !defined(CONFIG_USER_ONLY )if (interrupt_request &CPU_INTERRUPT_POLL ) { cpu->interrupt_request &= ~CPU_INTERRUPT_POLL ; -apic_poll_irq (env->apic_state); +apic_poll_irq (x86_env_get_cpu (env)->apic_state); }#endif if (interrupt_request &CPU_INTERRUPT_INIT ) {
cpus.c +2 -3
@@ -1458,12 +1458,11 @@ void qmp_inject_nmi(Error **errp)CPU_FOREACH (cs) {X86CPU *cpu =X86_CPU (cs); -CPUX86State *env = &cpu->env; -if (!env->apic_state) { +if (!cpu->apic_state) {cpu_interrupt (cs,CPU_INTERRUPT_NMI ); }else { -apic_deliver_nmi (env->apic_state); +apic_deliver_nmi (cpu->apic_state); } }#elif defined(TARGET_S390X )
hw/i386/kvmvapic.c +3 -5
@@ -366,7 +366,7 @@ static int vapic_enable(VAPICROMState *s, X86CPU *cpu) (((hwaddr )cpu_number) <<VAPIC_CPU_SHIFT );cpu_physical_memory_rw (vapic_paddr + offsetof(VAPICState , enabled), (void *)&enabled,sizeof (enabled),1 ); -apic_enable_vapic (cpu->env.apic_state, vapic_paddr); +apic_enable_vapic (cpu->apic_state, vapic_paddr); s->state =VAPIC_ACTIVE ;
@@ -496,12 +496,10 @@ static void vapic_enable_tpr_reporting(bool enable) };CPUState *cs;X86CPU *cpu; -CPUX86State *env;CPU_FOREACH (cs) { cpu =X86_CPU (cs); - env = &cpu->env; - info.apic = env->apic_state; + info.apic = cpu->apic_state;run_on_cpu (cs, vapic_do_enable_tpr_reporting, &info); } }
@@ -700,7 +698,7 @@ static void vapic_write(void *opaque, hwaddr addr, uint64_t data,default :case 4 :if (!kvm_irqchip_in_kernel ()) { -apic_poll_irq (env->apic_state); +apic_poll_irq (cpu->apic_state); }break ; }
hw/i386/pc.c +8 -9
@@ -172,13 +172,14 @@ void cpu_smm_update(CPUX86State *env)int cpu_get_pic_interrupt (CPUX86State *env) {int intno; +X86CPU *cpu =x86_env_get_cpu (env); - intno =apic_get_interrupt (env->apic_state); + intno =apic_get_interrupt (cpu->apic_state);if (intno >=0 ) {return intno; }/* read the irq from the PIC */ -if (!apic_accept_pic_intr (env->apic_state)) { +if (!apic_accept_pic_intr (cpu->apic_state)) {return -1 ; }
@@ -190,15 +191,13 @@ static void pic_irq_request(void *opaque, int irq, int level) {CPUState *cs = first_cpu;X86CPU *cpu =X86_CPU (cs); -CPUX86State *env = &cpu->env;DPRINTF ("pic_irqs: %s irq %d\n" , level?"raise" :"lower" , irq); -if (env->apic_state) { +if (cpu->apic_state) {CPU_FOREACH (cs) { cpu =X86_CPU (cs); - env = &cpu->env; -if (apic_accept_pic_intr (env->apic_state)) { -apic_deliver_pic_intr (env->apic_state, level); +if (apic_accept_pic_intr (cpu->apic_state)) { +apic_deliver_pic_intr (cpu->apic_state, level); } } }else {
@@ -913,7 +912,7 @@ DeviceState *cpu_get_current_apic(void) {if (current_cpu) {X86CPU *cpu =X86_CPU (current_cpu); -return cpu->env.apic_state; +return cpu->apic_state; }else {return NULL ; }
@@ -1007,7 +1006,7 @@ 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) { +if (cpu && cpu->apic_state) {/* XXX: what if the base changes? */ sysbus_mmio_map_overlap (SYS_BUS_DEVICE (icc_bridge),0 ,APIC_DEFAULT_ADDRESS ,0x1000 );
target-i386/cpu-qom.h +4 -0
@@ -66,6 +66,10 @@ typedef struct X86CPU {CPUX86State env; +/* in order to simplify APIC support, we leave this pointer to the +user */ +struct DeviceState *apic_state; +bool hyperv_vapic;bool hyperv_relaxed_timing;int hyperv_spinlock_attempts;
target-i386/cpu.c +10 -12
@@ -2449,7 +2449,7 @@ static void x86_cpu_reset(CPUState *s)#if !defined(CONFIG_USER_ONLY )/* We hard-wire the BSP to the first CPU. */ if (s->cpu_index ==0 ) { -apic_designate_bsp (env->apic_state); +apic_designate_bsp (cpu->apic_state); } s->halted = !cpu_is_bsp (cpu);
@@ -2459,7 +2459,7 @@ static void x86_cpu_reset(CPUState *s)#ifndef CONFIG_USER_ONLY bool cpu_is_bsp (X86CPU *cpu) { -return cpu_get_apic_base (cpu->env.apic_state) &MSR_IA32_APICBASE_BSP ; +return cpu_get_apic_base (cpu->apic_state) &MSR_IA32_APICBASE_BSP ; }/* TODO: remove me, when reset over QOM tree is implemented */
@@ -2500,31 +2500,29 @@ static void x86_cpu_apic_create(X86CPU *cpu, Error **errp) apic_type ="xen-apic" ; } - env->apic_state =qdev_try_create (qdev_get_parent_bus (dev), apic_type); -if (env->apic_state ==NULL ) { + cpu->apic_state =qdev_try_create (qdev_get_parent_bus (dev), apic_type); +if (cpu->apic_state ==NULL ) {error_setg (errp,"APIC device '%s' could not be created" , apic_type);return ; }object_property_add_child (OBJECT (cpu),"apic" , -OBJECT (env->apic_state),NULL ); -qdev_prop_set_uint8 (env->apic_state,"id" , env->cpuid_apic_id); +OBJECT (cpu->apic_state),NULL ); +qdev_prop_set_uint8 (cpu->apic_state,"id" , env->cpuid_apic_id);/* TODO: convert to link<> */ - apic =APIC_COMMON (env->apic_state); + apic =APIC_COMMON (cpu->apic_state); apic->cpu = cpu; }static void x86_cpu_apic_realize (X86CPU *cpu,Error **errp) { -CPUX86State *env = &cpu->env; - -if (env->apic_state ==NULL ) { +if (cpu->apic_state ==NULL ) {return ; } -if (qdev_init (env->apic_state)) { +if (qdev_init (cpu->apic_state)) {error_setg (errp,"APIC device '%s' could not be initialized" , -object_get_typename (OBJECT (env->apic_state))); +object_get_typename (OBJECT (cpu->apic_state)));return ; } }
target-i386/cpu.h +0 -4
@@ -895,10 +895,6 @@ typedef struct CPUX86State {int tsc_khz;void *kvm_xsave_buf; -/* in order to simplify APIC support, we leave this pointer to the -user */ -struct DeviceState *apic_state; -uint64_t mcg_cap;uint64_t mcg_ctl;uint64_t mce_banks[MCE_BANKS_DEF *4 ];
target-i386/helper.c +4 -5
@@ -1248,7 +1248,8 @@ void cpu_report_tpr_access(CPUX86State *env, TPRAccess access) } else {cpu_restore_state (env, env->mem_io_pc); -apic_handle_tpr_access_report (env->apic_state, env->eip, access); +apic_handle_tpr_access_report (x86_env_get_cpu (env)->apic_state, + env->eip, access); } }#endif /* !CONFIG_USER_ONLY */
@@ -1295,14 +1296,12 @@ void do_cpu_init(X86CPU *cpu)cpu_reset (cs); cs->interrupt_request = sipi; env->pat = pat; - apic_init_reset(env->apic_state); + apic_init_reset(cpu->apic_state); }void do_cpu_sipi (X86CPU *cpu) { -CPUX86State *env = &cpu->env; - -apic_sipi (env->apic_state); +apic_sipi (cpu->apic_state); }#else void do_cpu_init (X86CPU *cpu)
target-i386/kvm.c +10 -13
@@ -1069,8 +1069,8 @@ static int kvm_put_sregs(X86CPU *cpu) sregs.cr3 = env->cr[3 ]; sregs.cr4 = env->cr[4 ]; - sregs.cr8 =cpu_get_apic_tpr (env->apic_state); - sregs.apic_base =cpu_get_apic_base (env->apic_state); + sregs.cr8 =cpu_get_apic_tpr (cpu->apic_state); + sregs.apic_base =cpu_get_apic_base (cpu->apic_state); sregs.efer = env->efer;
@@ -1619,8 +1619,7 @@ static int kvm_get_mp_state(X86CPU *cpu)static int kvm_get_apic (X86CPU *cpu) { -CPUX86State *env = &cpu->env; -DeviceState *apic = env->apic_state; +DeviceState *apic = cpu->apic_state;struct kvm_lapic_state kapic;int ret;
@@ -1637,8 +1636,7 @@ static int kvm_get_apic(X86CPU *cpu)static int kvm_put_apic (X86CPU *cpu) { -CPUX86State *env = &cpu->env; -DeviceState *apic = env->apic_state; +DeviceState *apic = cpu->apic_state;struct kvm_lapic_state kapic;if (apic &&kvm_irqchip_in_kernel ()) {
@@ -1962,7 +1960,7 @@ void kvm_arch_pre_run(CPUState *cpu, struct kvm_run *run) }DPRINTF ("setting tpr\n" ); - run->cr8 =cpu_get_apic_tpr (env->apic_state); + run->cr8 =cpu_get_apic_tpr (x86_cpu->apic_state); } }
@@ -1976,8 +1974,8 @@ void kvm_arch_post_run(CPUState *cpu, struct kvm_run *run) }else { env->eflags &= ~IF_MASK ; } -cpu_set_apic_tpr (env->apic_state, run->cr8); -cpu_set_apic_base (env->apic_state, run->apic_base); +cpu_set_apic_tpr (x86_cpu->apic_state, run->cr8); +cpu_set_apic_base (x86_cpu->apic_state, run->apic_base); }int kvm_arch_process_async_events (CPUState *cs)
@@ -2014,7 +2012,7 @@ int kvm_arch_process_async_events(CPUState *cs)if (cs->interrupt_request &CPU_INTERRUPT_POLL ) { cs->interrupt_request &= ~CPU_INTERRUPT_POLL ; -apic_poll_irq (env->apic_state); +apic_poll_irq (cpu->apic_state); } if (((cs->interrupt_request & CPU_INTERRUPT_HARD) && (env->eflags & IF_MASK)) ||
@@ -2032,7 +2030,7 @@ int kvm_arch_process_async_events(CPUState *cs)if (cs->interrupt_request &CPU_INTERRUPT_TPR ) { cs->interrupt_request &= ~CPU_INTERRUPT_TPR ;kvm_cpu_synchronize_state (cs); -apic_handle_tpr_access_report (env->apic_state, env->eip, +apic_handle_tpr_access_report (cpu->apic_state, env->eip, env->tpr_access_type); }
@@ -2056,11 +2054,10 @@ static int kvm_handle_halt(X86CPU *cpu)static int kvm_handle_tpr_access (X86CPU *cpu) { -CPUX86State *env = &cpu->env;CPUState *cs =CPU (cpu);struct kvm_run *run = cs->kvm_run; -apic_handle_tpr_access_report (env->apic_state, run->tpr_access.rip, +apic_handle_tpr_access_report (cpu->apic_state, run->tpr_access.rip, run->tpr_access.is_write ?TPR_ACCESS_WRITE :TPR_ACCESS_READ );return 1 ;
target-i386/misc_helper.c +4 -4
@@ -155,7 +155,7 @@ target_ulong helper_read_crN(CPUX86State *env, int reg)break ;case 8 :if (!(env->hflags2 &HF2_VINTR_MASK )) { - val =cpu_get_apic_tpr (env->apic_state); + val =cpu_get_apic_tpr (x86_env_get_cpu (env)->apic_state); }else { val = env->v_tpr; }
@@ -179,7 +179,7 @@ void helper_write_crN(CPUX86State *env, int reg, target_ulong t0)break ;case 8 :if (!(env->hflags2 &HF2_VINTR_MASK )) { -cpu_set_apic_tpr (env->apic_state, t0); +cpu_set_apic_tpr (x86_env_get_cpu (env)->apic_state, t0); } env->v_tpr = t0 &0x0f ;break ;
@@ -286,7 +286,7 @@ void helper_wrmsr(CPUX86State *env) env->sysenter_eip = val;break ;case MSR_IA32_APICBASE : -cpu_set_apic_base (env->apic_state, val); +cpu_set_apic_base (x86_env_get_cpu (env)->apic_state, val);break ;case MSR_EFER : {
@@ -437,7 +437,7 @@ void helper_rdmsr(CPUX86State *env) val = env->sysenter_eip;break ;case MSR_IA32_APICBASE : - val =cpu_get_apic_base (env->apic_state); + val =cpu_get_apic_base (x86_env_get_cpu (env)->apic_state);break ;case MSR_EFER : val = env->efer;
Signature · 1 line
1.8.1.4
Re: [Qemu-devel] [RFC qom-next v5 1/8] x86: move apic_state field from CPUX86State to X86CPU
Am 23.12.2013 10:04, schrieb Chen Fan:
Quoted 21 lines
This motion is preparing for refactoring vCPU apic subsequently.
Signed-off-by Chen Fan <[email protected]>--- cpu-exec.c | 2 +- cpus.c | 5 ++--- hw/i386/kvmvapic.c | 8 +++----- hw/i386/pc.c | 17 ++++++++--------- target-i386/cpu-qom.h | 4 ++++ target-i386/cpu.c | 22 ++++++++++------------ target-i386/cpu.h | 4 ---- target-i386/helper.c | 9 ++++----- target-i386/kvm.c | 23 ++++++++++------------- target-i386/misc_helper.c | 8 ++++---- 10 files changed, 46 insertions(+), 56 deletions(-)cpu-exec.c +0
-0
cpu-exec.c int cpu_exec(CPUArchState *env) · line 323
Quoted 5 lines
cpu-exec.c +1
-1@@ -320,7 +320,7 @@ int cpu_exec(CPUArchState *env)#if !defined(CONFIG_USER_ONLY )if (interrupt_request &CPU_INTERRUPT_POLL ) { cpu->interrupt_request &= ~CPU_INTERRUPT_POLL ; -apic_poll_irq (env->apic_state); +apic_poll_irq (x86_env_get_cpu (env)->apic_state);
These are starting to become too many inline usages inside that double loop, I'll look into providing a follow-up patch to clean this up.
Quoted 3 lines
cpu-exec.c +0
-0}#endif if (interrupt_request &CPU_INTERRUPT_INIT ) {
[...]
hw/i386/pc.c void cpu_smm_update(CPUX86State *env) · line 175
Quoted 9 lines
hw/i386/pc.c +1
-0@@ -172,13 +172,14 @@ void cpu_smm_update(CPUX86State *env)int cpu_get_pic_interrupt (CPUX86State *env) {int intno; +X86CPU *cpu =x86_env_get_cpu (env);
I've swapped these two lines to keep cpu and env close together, with a view to a function argument type change.
Quoted 12 lines
hw/i386/pc.c +2
-2- intno =apic_get_interrupt (env->apic_state); + intno =apic_get_interrupt (cpu->apic_state);if (intno >=0 ) {return intno; }/* read the irq from the PIC */ -if (!apic_accept_pic_intr (env->apic_state)) { +if (!apic_accept_pic_intr (cpu->apic_state)) {return -1 ; }
[...]
target-i386/cpu-qom.h typedef struct X86CPU { · line 71
Quoted 11 lines
target-i386/cpu-qom.h +3
-0@@ -66,6 +66,10 @@ typedef struct X86CPU {CPUX86State env; +/* in order to simplify APIC support, we leave this pointer to the +user */ +struct DeviceState *apic_state;
Moving this further down since used as a child<> property, with a view to refactoring this further into a non-pointer field.
Quoted 4 lines
target-i386/cpu-qom.h +1
-0+bool hyperv_vapic;bool hyperv_relaxed_timing;int hyperv_spinlock_attempts;
[...]
Quoted 5 lines
target-i386/helper.c +0
-0
target-i386/helper.c void cpu_report_tpr_access(CPUX86State *env, TPRAccess access) · line 1255
Quoted 9 lines
target-i386/helper.c +2
-1@@ -1248,7 +1248,8 @@ void cpu_report_tpr_access(CPUX86State *env, TPRAccess access) } else {cpu_restore_state (env, env->mem_io_pc); -apic_handle_tpr_access_report (env->apic_state, env->eip, access); +apic_handle_tpr_access_report (x86_env_get_cpu (env)->apic_state, + env->eip, access); } }#endif /* !CONFIG_USER_ONLY */
[snip]
Since we would now be using x86_env_get_cpu() in both arms of 'if' (and tpr_access_type being another candidate for a field movement), I'm changing this as follows:
target-i386/helper.c +0 -0
@@ -1241,15 +1241,16 @@ void cpu_x86_inject_mce(Monitor *mon, X86CPU
*cpu, int bank,
void cpu_report_tpr_access(CPUX86State *env, TPRAccess access) {
+ X86CPU *cpu = x86_env_get_cpu(env);
+
if (kvm_enabled()) {
env->tpr_access_type = access;- cpu_interrupt(CPU(x86_env_get_cpu(env)), CPU_INTERRUPT_TPR);
+ cpu_interrupt(CPU(cpu), CPU_INTERRUPT_TPR);
} else {
cpu_restore_state(env, env->mem_io_pc);- apic_handle_tpr_access_report(x86_env_get_cpu(env)->apic_state,
- env->eip, access);
+ apic_handle_tpr_access_report(cpu->apic_state, env->eip, access);
} }
#endif /* !CONFIG_USER_ONLY */
Despite this still being an RFC, this patch is a really nice cleanup contribution, so I'm applying this to qom-cpu already with the above-mentioned modifications:
https://github.com/afaerber/qemu-cpu/commits/qom-cpu
Thanks,
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
Re: [Qemu-devel] [RFC qom-next v5 1/8] x86: move apic_state field from CPUX86State to X86CPU
Quoted 128 lines · Andreas Färber
Am 23.12.2013 10:04, schrieb Chen Fan:
Quoted 21 lines
This motion is preparing for refactoring vCPU apic subsequently.
Signed-off-by Chen Fan <[email protected]>--- cpu-exec.c | 2 +- cpus.c | 5 ++--- hw/i386/kvmvapic.c | 8 +++----- hw/i386/pc.c | 17 ++++++++--------- target-i386/cpu-qom.h | 4 ++++ target-i386/cpu.c | 22 ++++++++++------------ target-i386/cpu.h | 4 ---- target-i386/helper.c | 9 ++++----- target-i386/kvm.c | 23 ++++++++++------------- target-i386/misc_helper.c | 8 ++++---- 10 files changed, 46 insertions(+), 56 deletions(-)cpu-exec.c +0
-0cpu-exec.c int cpu_exec(CPUArchState *env) · line 323
Quoted 5 lines
cpu-exec.c +1
-1@@ -320,7 +320,7 @@ int cpu_exec(CPUArchState *env)#if !defined(CONFIG_USER_ONLY )if (interrupt_request &CPU_INTERRUPT_POLL ) { cpu->interrupt_request &= ~CPU_INTERRUPT_POLL ; -apic_poll_irq (env->apic_state); +apic_poll_irq (x86_env_get_cpu (env)->apic_state);These are starting to become too many inline usages inside that double loop, I'll look into providing a follow-up patch to clean this up.
Quoted 3 lines
cpu-exec.c +0
-0}#endif if (interrupt_request &CPU_INTERRUPT_INIT ) {[...]
hw/i386/pc.c void cpu_smm_update(CPUX86State *env) · line 175
Quoted 9 lines
hw/i386/pc.c +1
-0@@ -172,13 +172,14 @@ void cpu_smm_update(CPUX86State *env)int cpu_get_pic_interrupt (CPUX86State *env) {int intno; +X86CPU *cpu =x86_env_get_cpu (env);I've swapped these two lines to keep cpu and env close together, with a view to a function argument type change.
Quoted 12 lines
hw/i386/pc.c +2
-2- intno =apic_get_interrupt (env->apic_state); + intno =apic_get_interrupt (cpu->apic_state);if (intno >=0 ) {return intno; }/* read the irq from the PIC */ -if (!apic_accept_pic_intr (env->apic_state)) { +if (!apic_accept_pic_intr (cpu->apic_state)) {return -1 ; }[...]
target-i386/cpu-qom.h typedef struct X86CPU { · line 71
Quoted 11 lines
target-i386/cpu-qom.h +3
-0@@ -66,6 +66,10 @@ typedef struct X86CPU {CPUX86State env; +/* in order to simplify APIC support, we leave this pointer to the +user */ +struct DeviceState *apic_state;Moving this further down since used as a child<> property, with a view to refactoring this further into a non-pointer field.
Quoted 4 lines
target-i386/cpu-qom.h +1
-0+bool hyperv_vapic;bool hyperv_relaxed_timing;int hyperv_spinlock_attempts;[...]
Quoted 5 lines
target-i386/helper.c +0
-0target-i386/helper.c void cpu_report_tpr_access(CPUX86State *env, TPRAccess access) · line 1255
Quoted 9 lines
target-i386/helper.c +2
-1@@ -1248,7 +1248,8 @@ void cpu_report_tpr_access(CPUX86State *env, TPRAccess access) } else {cpu_restore_state (env, env->mem_io_pc); -apic_handle_tpr_access_report (env->apic_state, env->eip, access); +apic_handle_tpr_access_report (x86_env_get_cpu (env)->apic_state, + env->eip, access); } }#endif /* !CONFIG_USER_ONLY */ [snip]
Since we would now be using
x86_env_get_cpu()in both arms of 'if' (andtpr_access_typebeing another candidate for a field movement), I'm changing this as follows:target-i386/helper.c +4
-3@@ -1241,15 +1241,16 @@ void cpu_x86_inject_mce(Monitor *mon, X86CPU *cpu, int bank, void cpu_report_tpr_access(CPUX86State *env, TPRAccess access) { +X86CPU *cpu =x86_env_get_cpu (env); +if (kvm_enabled ()) { env->tpr_access_type = access; -cpu_interrupt (CPU (x86_env_get_cpu (env)),CPU_INTERRUPT_TPR ); +cpu_interrupt (CPU (cpu),CPU_INTERRUPT_TPR ); }else {cpu_restore_state (env, env->mem_io_pc); -apic_handle_tpr_access_report (x86_env_get_cpu (env)->apic_state, - env->eip, access); +apic_handle_tpr_access_report (cpu->apic_state, env->eip, access); } }#endif /* !CONFIG_USER_ONLY */
Quoted 4 lines
Despite this still being an RFC, this patch is a really nice cleanup contribution, so I'm applying this to qom-cpu already with the above-mentioned modifications:
https://github.com/afaerber/qemu-cpu/commits/qom-cpu
looks nice, Thanks.
Chen
Quoted 3 lines
Thanks,
Andreas
RFC v5 2/8 x86: add x86_cpu_unrealizefn() for cpu apic remove
In reply to Chen FanImplement x86_cpu_unrealizefn() for corresponding x86_cpu_realizefn(), which is mostly used to clean the apic related allocation and vmstates at here.
--- hw/i386/kvm/apic.c | 8 ++++++++ hw/intc/apic.c | 10 ++++++++++ hw/intc/apic_common.c | 23 ++++++++++++++++++++- hw/xen/xen_apic.c | 8 ++++++++ include/hw/cpu/icc_bus.h | 1 + include/hw/i386/apic_internal.h | 1 + target-i386/cpu-qom.h | 1 + target-i386/cpu.c | 44 +++++++++++++++++++++++++++++++++++++++++ 8 files changed, 95 insertions(+), 1 deletion(-)
hw/i386/kvm/apic.c +8 -0
@@ -183,11 +183,19 @@ static void kvm_apic_realize(DeviceState *dev, Error **errp) } } +static void kvm_apic_unrealize (DeviceState *dev,Error **errp) +{ +APICCommonState *s =APIC_COMMON (dev); + +memory_region_destroy (&s->io_memory); +} +static void kvm_apic_class_init (ObjectClass *klass,void *data) {APICCommonClass *k =APIC_COMMON_CLASS (klass); k->realize = kvm_apic_realize; + k->unrealize = kvm_apic_unrealize; k->set_base = kvm_apic_set_base; k->set_tpr = kvm_apic_set_tpr; k->get_tpr = kvm_apic_get_tpr;
hw/intc/apic.c +10 -0
@@ -884,11 +884,21 @@ static void apic_realize(DeviceState *dev, Error **errp) msi_supported = true; } +static void apic_unrealize (DeviceState *dev,Error **errp) +{ +APICCommonState *s =APIC_COMMON (dev); + +memory_region_destroy (&s->io_memory); +timer_free (s->timer); + local_apics[s->idx] =NULL ; +} +static void apic_class_init (ObjectClass *klass,void *data) {APICCommonClass *k =APIC_COMMON_CLASS (klass); k->realize = apic_realize; + k->unrealize = apic_unrealize; k->set_base = apic_set_base; k->set_tpr = apic_set_tpr; k->get_tpr = apic_get_tpr;
hw/intc/apic_common.c +22 -1
@@ -284,12 +284,13 @@ static int apic_load_old(QEMUFile *f, void *opaque, int version_id)return 0 ; } +static int apic_no; +static void apic_common_realize (DeviceState *dev,Error **errp) {APICCommonState *s =APIC_COMMON (dev);APICCommonClass *info;static DeviceState *vapic; -static int apic_no;static bool mmio_registered;if (apic_no >=MAX_APICS ) {
@@ -319,6 +320,25 @@ static void apic_common_realize(DeviceState *dev, Error **errp) } +static void apic_common_unrealize (DeviceState *dev,Error **errp) +{ +APICCommonState *s =APIC_COMMON (dev); +APICCommonClass *info =APIC_COMMON_GET_CLASS (s); + +if (apic_no <=0 ) { +error_setg (errp,"%s exit failed." , +object_get_typename (OBJECT (dev))); +return ; + } + apic_no--; + + info->unrealize (dev, errp); + +if (apic_report_tpr_access && info->enable_tpr_reporting) { + info->enable_tpr_reporting (s, false); + } +} +static void apic_dispatch_pre_save (void *opaque) {APICCommonState *s =APIC_COMMON (opaque);
@@ -389,6 +409,7 @@ static void apic_common_class_init(ObjectClass *klass, void *data) dc->reset = apic_reset_common; dc->props = apic_properties_common; idc->realize = apic_common_realize; + idc->unrealize = apic_common_unrealize;/* * Reason: APIC and CPU need to be wired up by * x86_cpu_apic_create()
hw/xen/xen_apic.c +8 -0
@@ -49,6 +49,13 @@ static void xen_apic_realize(DeviceState *dev, Error **errp)#endif } +static void xen_apic_unrealize (DeviceState *dev,Error **errp) +{ +APICCommonState *s =APIC_COMMON (dev); + +memory_region_destroy (&s->io_memory); +} +static void xen_apic_set_base (APICCommonState *s,uint64_t val) { }
@@ -75,6 +82,7 @@ static void xen_apic_class_init(ObjectClass *klass, void *data)APICCommonClass *k =APIC_COMMON_CLASS (klass); k->realize = xen_apic_realize; + k->unrealize = xen_apic_unrealize; k->set_base = xen_apic_set_base; k->set_tpr = xen_apic_set_tpr; k->get_tpr = xen_apic_get_tpr;
include/hw/cpu/icc_bus.h +1 -0
@@ -67,6 +67,7 @@ typedef struct ICCDeviceClass {/*< public >*/ DeviceRealize realize; +DeviceUnrealize unrealize; } ICCDeviceClass;#define TYPE_ICC_DEVICE "icc-device"
include/hw/i386/apic_internal.h +1 -0
@@ -81,6 +81,7 @@ typedef struct APICCommonClassICCDeviceClass parent_class;DeviceRealize realize; +DeviceUnrealize unrealize;void (*set_base)(APICCommonState *s,uint64_t val);void (*set_tpr)(APICCommonState *s,uint8_t val);uint8_t (*get_tpr)(APICCommonState *s);
target-i386/cpu-qom.h +1 -0
@@ -50,6 +50,7 @@ typedef struct X86CPUClass {/*< public >*/ DeviceRealize parent_realize; +DeviceUnrealize parent_unrealize;void (*parent_reset)(CPUState *cpu); } X86CPUClass;
target-i386/cpu.c +44 -0
67 lines not on this page · raw message
Signature · 1 line
1.8.1.4
RFC v5 3/8 qmp: add 'cpu-del' command support
In reply to Chen Fanadd cpu hot-remove interface pc_hot_del_cpu() for unrealizing vcpu device. when using 'cpu-del' command, not need to specify vcpuid, the last one cpu will be removed.
--- hw/i386/pc.c | 19 +++++++++++++++++++ hw/i386/pc_piix.c | 3 ++- include/hw/boards.h | 2 ++ include/hw/i386/pc.h | 1 + qapi-schema.json | 10 ++++++++++ qmp-commands.hx | 21 +++++++++++++++++++++ qmp.c | 9 +++++++++ 7 files changed, 64 insertions(+), 1 deletion(-)
hw/i386/pc.c +19 -0
@@ -979,6 +979,25 @@ void pc_hot_add_cpu(const int64_t id, Error **errp)pc_new_cpu (current_cpu_model, apic_id, icc_bridge, errp); } +void pc_hot_del_cpu (Error **errp) +{ +CPUState *cpu = first_cpu; +X86CPUClass *xcc; + +while (CPU_NEXT (cpu)) { + cpu =CPU_NEXT (cpu); + } + +if (cpu == first_cpu) { +error_setg (errp,"Unable to delete the last " +"one cpu." ); +return ; + } + + xcc =X86_CPU_GET_CLASS (DEVICE (cpu)); + xcc->parent_unrealize (DEVICE (cpu), errp); +} +void pc_cpus_init (const char *cpu_model,DeviceState *icc_bridge) {int i;
hw/i386/pc_piix.c +2 -1
@@ -362,7 +362,8 @@ static void pc_xen_hvm_init(QEMUMachineInitArgs *args)#define PC_I440FX_2_0_MACHINE_OPTIONS \ PC_I440FX_MACHINE_OPTIONS, \ - .default_machine_opts = "firmware=bios-256k.bin" + .default_machine_opts = "firmware=bios-256k.bin", \ + .hot_del_cpu = pc_hot_del_cpustatic QEMUMachine pc_i440fx_machine_v2_0 = {PC_I440FX_2_0_MACHINE_OPTIONS ,
include/hw/boards.h +2 -0
@@ -23,6 +23,7 @@ typedef void QEMUMachineInitFunc(QEMUMachineInitArgs *args);typedef void QEMUMachineResetFunc (void );typedef void QEMUMachineHotAddCPUFunc (const int64_t id,Error **errp); +typedef void QEMUMachineHotDelCPUFunc (Error **errp);struct QEMUMachine {const char *name;
@@ -31,6 +32,7 @@ struct QEMUMachine {QEMUMachineInitFunc *init;QEMUMachineResetFunc *reset;QEMUMachineHotAddCPUFunc *hot_add_cpu; +QEMUMachineHotDelCPUFunc *hot_del_cpu;BlockInterfaceType block_default_type;int max_cpus; unsigned int no_serial:1,
include/hw/i386/pc.h +1 -0
@@ -118,6 +118,7 @@ void pc_acpi_smi_interrupt(void *opaque, int irq, int level);void pc_cpus_init (const char *cpu_model,DeviceState *icc_bridge);void pc_hot_add_cpu (const int64_t id,Error **errp); +void pc_hot_del_cpu (Error **errp);void pc_acpi_init (const char *default_dsdt); PcGuestInfo *pc_guest_info_init(ram_addr_t below_4g_mem_size,
qapi-schema.json +10 -0
@@ -1553,6 +1553,16 @@ ## { 'command': 'cpu-add', 'data': {'id': 'int'} } +# @cpu-del + +# Deletes CPU from the last ID +# +# Returns: Nothing on success +# +# Since 2.0 +## +{ 'command': 'cpu-del' } + ## # @memsave: #
qmp-commands.hx +21 -0
@@ -411,6 +411,27 @@ Example: EQMP { + .name = "cpu-del", + .args_type = "", + .mhandler.cmd_new = qmp_marshal_input_cpu_del, + }, + +SQMP +cpu-del +------- + +Deletes virtual cpu + +Arguments: None. + +Example: + +-> { "execute": "cpu-del" } +<- { "return": {} } + +EQMP + + { .name = "memsave", .args_type = "val:l,size:i,filename:s,cpu:i?", .mhandler.cmd_new = qmp_marshal_input_memsave,
qmp.c +9 -0
@@ -118,6 +118,15 @@ void qmp_cpu_add(int64_t id, Error **errp) } } +void qmp_cpu_del (Error **errp) +{ +if (current_machine->hot_del_cpu) { + current_machine->hot_del_cpu (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.1.4
RFC v5 4/8 qom cpu: rename variable 'cpu_added_notifier' to 'cpu_hotplug_notifier'
In reply to Chen FanRename variable 'cpu_added_notifier' to 'cpu_hotplug_notifier' for adding remove vcpu notifier support.
--- hw/acpi/piix4.c | 10 +++++----- hw/i386/pc.c | 2 +- include/sysemu/sysemu.h | 2 +- qom/cpu.c | 10 +++++----- 4 files changed, 12 insertions(+), 12 deletions(-)
hw/acpi/piix4.c +5 -5
@@ -98,7 +98,7 @@ typedef struct PIIX4PMState {uint8_t s4_val;CPUStatus gpe_cpu; -Notifier cpu_added_notifier; +Notifier cpu_hotplug_notifier; } PIIX4PMState;#define TYPE_PIIX4_PM "PIIX4_PM"
@@ -701,9 +701,9 @@ static void piix4_cpu_hotplug_req(PIIX4PMState *s, CPUState *cpu,pm_update_sci (s); } -static void piix4_cpu_added_req (Notifier *n,void *opaque) +static void piix4_cpu_hotplug (Notifier *n,void *opaque) { -PIIX4PMState *s =container_of (n, PIIX4PMState, cpu_added_notifier); +PIIX4PMState *s =container_of (n, PIIX4PMState, cpu_hotplug_notifier);piix4_cpu_hotplug_req (s,CPU (opaque),PLUG ); }
@@ -736,8 +736,8 @@ static void piix4_acpi_system_hot_add_init(MemoryRegion *parent,memory_region_init_io (&s->io_cpu,OBJECT (s), &cpu_hotplug_ops, s,"acpi-cpu-hotplug" ,PIIX4_PROC_LEN );memory_region_add_subregion (parent,PIIX4_PROC_BASE , &s->io_cpu); - s->cpu_added_notifier.notify = piix4_cpu_added_req; -qemu_register_cpu_added_notifier (&s->cpu_added_notifier); + s->cpu_hotplug_notifier.notify = piix4_cpu_hotplug; +qemu_register_cpu_hotplug_notifier (&s->cpu_hotplug_notifier); }static void enable_device (PIIX4PMState *s,int slot)
hw/i386/pc.c +1 -1
@@ -409,7 +409,7 @@ void pc_cmos_init(ram_addr_t ram_size, ram_addr_t above_4g_mem_size,/* init CPU hotplug notifier */ cpu_hotplug_cb.rtc_state = s; cpu_hotplug_cb.cpu_added_notifier.notify = rtc_notify_cpu_added; -qemu_register_cpu_added_notifier (&cpu_hotplug_cb.cpu_added_notifier); +qemu_register_cpu_hotplug_notifier (&cpu_hotplug_cb.cpu_added_notifier);if (set_boot_dev (s, boot_device)) {exit (1 );
include/sysemu/sysemu.h +1 -1
@@ -158,7 +158,7 @@ void do_pci_device_hot_remove(Monitor *mon, const QDict *qdict);void drive_hot_add (Monitor *mon,const QDict *qdict);/* CPU hotplug */ -void qemu_register_cpu_added_notifier (Notifier *notifier); +void qemu_register_cpu_hotplug_notifier (Notifier *notifier);/* pcie aer error injection */ void pcie_aer_inject_error_print (Monitor *mon,const QObject *data);
qom/cpu.c +5 -5
@@ -67,12 +67,12 @@ static void cpu_common_get_memory_mapping(CPUState *cpu, }/* CPU hot-plug notifiers */ -static NotifierList cpu_added_notifiers = -NOTIFIER_LIST_INITIALIZER (cpu_add_notifiers); +static NotifierList cpu_hotplug_notifiers = +NOTIFIER_LIST_INITIALIZER (cpu_hotplug_notifiers); -void qemu_register_cpu_added_notifier (Notifier *notifier) +void qemu_register_cpu_hotplug_notifier (Notifier *notifier) { -notifier_list_add (&cpu_added_notifiers, notifier); +notifier_list_add (&cpu_hotplug_notifiers, notifier); }void cpu_reset_interrupt (CPUState *cpu,int mask)
@@ -219,7 +219,7 @@ static void cpu_common_realizefn(DeviceState *dev, Error **errp)if (dev->hotplugged) {cpu_synchronize_post_init (cpu); -notifier_list_notify (&cpu_added_notifiers, dev); +notifier_list_notify (&cpu_hotplug_notifiers, dev);cpu_resume (cpu); } }
Signature · 1 line
1.8.1.4
RFC v5 5/8 qom cpu: add UNPLUG cpu notifier support
In reply to Chen FanMove struct HotplugEventType from file piix4.c to file qom/cpu.c, and add struct CPUNotifier for supporting UNPLUG cpu notifier.
--- hw/acpi/piix4.c | 8 ++------ include/qom/cpu.h | 10 ++++++++++ qom/cpu.c | 6 +++++- 3 files changed, 17 insertions(+), 7 deletions(-)
hw/acpi/piix4.c +2 -6
@@ -676,11 +676,6 @@ static const MemoryRegionOps cpu_hotplug_ops = { }, }; -typedef enum { -PLUG , -UNPLUG , -}HotplugEventType ; -static void piix4_cpu_hotplug_req (PIIX4PMState *s,CPUState *cpu,HotplugEventType action) {
@@ -704,8 +699,9 @@ static void piix4_cpu_hotplug_req(PIIX4PMState *s, CPUState *cpu,static void piix4_cpu_hotplug (Notifier *n,void *opaque) {PIIX4PMState *s =container_of (n, PIIX4PMState, cpu_hotplug_notifier); +CPUNotifier *notifier = opaque; -piix4_cpu_hotplug_req (s,CPU (opaque),PLUG ); +piix4_cpu_hotplug_req (s,CPU (notifier->dev), notifier->type); } static int piix4_device_hotplug(DeviceState *qdev, PCIDevice *dev,
include/qom/cpu.h +10 -0
@@ -507,6 +507,16 @@ void qemu_init_vcpu(CPUState *cpu);*/ void cpu_single_step (CPUState *cpu,int enabled); +typedef enum { +PLUG , +UNPLUG , +}HotplugEventType ; + +typedef struct CPUNotifier { +DeviceState *dev; +HotplugEventType type; +}CPUNotifier ; +#ifdef CONFIG_SOFTMMU extern const struct VMStateDescription vmstate_cpu_common;#else
qom/cpu.c +5 -1
@@ -216,10 +216,14 @@ static ObjectClass *cpu_common_class_by_name(const char *cpu_model)static void cpu_common_realizefn (DeviceState *dev,Error **errp) {CPUState *cpu =CPU (dev); +CPUNotifier notifier; + + notifier.dev = dev; + notifier.type =PLUG ;if (dev->hotplugged) {cpu_synchronize_post_init (cpu); -notifier_list_notify (&cpu_hotplug_notifiers, dev); +notifier_list_notify (&cpu_hotplug_notifiers, ¬ifier);cpu_resume (cpu); } }
Signature · 1 line
1.8.1.4
RFC v5 6/8 i386: implement pc interface cpu_common_unrealizefn() in qom/cpu.c
In reply to Chen Fanadd interface cpu_common_unrealizefn() for emiting vcpu unplug notifier to ACPI, then ACPI could send sci interrupt to OS for hot-remove vcpu.
--- qom/cpu.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)
qom/cpu.c +12 -0
@@ -228,6 +228,17 @@ static void cpu_common_realizefn(DeviceState *dev, Error **errp) } } +static void cpu_common_unrealizefn (DeviceState *dev,Error **errp) +{ +CPUNotifier notifier; + + notifier.dev = dev; + notifier.type =UNPLUG ; + +notifier_list_notify (&cpu_hotplug_notifiers, ¬ifier); +} + +static void cpu_common_initfn (Object *obj) {CPUState *cpu =CPU (obj);
@@ -258,6 +269,7 @@ static void cpu_class_init(ObjectClass *klass, void *data) k->gdb_read_register = cpu_common_gdb_read_register; k->gdb_write_register = cpu_common_gdb_write_register; dc->realize = cpu_common_realizefn; + dc->unrealize = cpu_common_unrealizefn;/* * Reason: CPUs still need special care by board code: wiring up * IRQs, adding reset handlers, halting non-first CPUs, ...
Signature · 1 line
1.8.1.4
RFC v5 7/8 piix4: implement function cpu_status_write() for vcpu ejection
In reply to Chen FanWhen OS ejected a vcpu (like: echo 1 > /sys/bus/acpi/devices/LNXCPUXX/eject), it would call acpi EJ0 method, the firmware need to write the new cpumap, QEMU would know which vcpu need to be ejected.
TODO: for now QEMU only supported that cpu was deleted sequentially from the last one in OS, in the further OS should reject vcpu arbitrarily.
--- cpus.c | 7 ++++++ hw/acpi/piix4.c | 48 ++++++++++++++++++++++++++++++++++++++- hw/i386/acpi-dsdt-cpu-hotplug.dsl | 6 ++++- include/qom/cpu.h | 10 ++++++++ 4 files changed, 69 insertions(+), 2 deletions(-)
cpus.c +7 -0
@@ -1117,6 +1117,13 @@ void resume_all_vcpus(void) } } +void cpu_remove (CPUState *cpu) +{ + cpu->stop = true; + cpu->exit = true; +qemu_cpu_kick (cpu); +} +static void qemu_tcg_init_vcpu (CPUState *cpu) {/* share a single thread for all cpus with TCG */
hw/acpi/piix4.c +47 -1
85 lines not on this page · raw message
hw/i386/acpi-dsdt-cpu-hotplug.dsl +5 -1
@@ -49,7 +49,11 @@ Scope(\_SB) { } Method(CPEJ, 2, NotSerialized) { // _EJ0 method - eject callback - Sleep(200) + Store(Zero, Index(CPON, ToInteger(Arg0))) + Store(One, Local0) + ShiftLeft(Local0, Arg0, Local0) + Not(Local0, Local0) + And(PRS, Local0, PRS) } /* CPU hotplug notify method */
include/qom/cpu.h +10 -0
@@ -146,6 +146,7 @@ struct kvm_run;* @halted: Nonzero if the CPU is in suspended state. * @stop: Indicates a pending stop request. * @stopped: Indicates the CPU has been artificially stopped. +* @exit: Indicates the CPU is in impending exit state. * @tcg_exit_req: Set to force TCG to stop executing linked TBs for this * CPU and return to its top level loop. * @singlestep_enabled: Flags for single-stepping.
@@ -181,6 +182,7 @@ struct CPUState {bool created;bool stop;bool stopped; +bool exit;volatile sig_atomic_t exit_request;volatile sig_atomic_t tcg_exit_req;uint32_t interrupt_request;
@@ -487,6 +489,14 @@ void cpu_exit(CPUState *cpu);void cpu_resume (CPUState *cpu);/** +* qemu_remove_vcpu: +* @cpu: The vCPU to remove. +* +* Requests the CPU @cpu to be removed. +*/ +void cpu_remove (CPUState *cpu); + +/** * qemu_init_vcpu: * @cpu: The vCPU to initialize. *
Signature · 1 line
1.8.1.4
RFC v5 8/8 cpus: reclaim allocated vCPU objects
In reply to Chen FanAfter ACPI get a signal to eject a vCPU, then it will notify
the vCPU thread to exit in KVM, and the vCPU must be removed from CPU list, before the vCPU really removed, there will release the all related vCPU objects.
--- cpus.c | 39 +++++++++++++++++++++++++++++++++++++++ include/qom/cpu.h | 1 + include/sysemu/kvm.h | 1 + kvm-all.c | 25 +++++++++++++++++++++++++ 4 files changed, 66 insertions(+)
cpus.c +39 -0
@@ -786,6 +786,26 @@ void async_run_on_cpu(CPUState *cpu, void (*func)(void *data), void *data)qemu_cpu_kick (cpu); } +static void qemu_kvm_destroy_vcpu (CPUState *cpu) +{ +CPU_REMOVE (cpu); + +if (kvm_destroy_vcpu (cpu) <0 ) { +fprintf (stderr,"kvm_destroy_vcpu failed.\n" ); +exit (1 ); + } + +object_property_set_bool (OBJECT (cpu), false,"realized" ,NULL ); +object_unparent (OBJECT (cpu)); +} + +static void qemu_tcg_destroy_vcpu (CPUState *cpu) +{ +CPU_REMOVE (cpu); +object_property_set_bool (OBJECT (cpu), false,"realized" ,NULL ); +object_unparent (OBJECT (cpu)); +} +static void flush_queued_work (CPUState *cpu) {struct qemu_work_item *wi;
@@ -877,6 +897,11 @@ static void *qemu_kvm_cpu_thread_fn(void *arg) } }qemu_kvm_wait_io_event (cpu); +if (cpu->exit && !cpu_can_run (cpu)) { +qemu_kvm_destroy_vcpu (cpu); +qemu_mutex_unlock (&qemu_global_mutex); +return NULL ; + } }return NULL ;
@@ -929,6 +954,7 @@ static void tcg_exec_all(void);static void *qemu_tcg_cpu_thread_fn (void *arg) {CPUState *cpu = arg; +CPUState *remove_cpu =NULL ;qemu_tcg_init_cpu_signals ();qemu_thread_get_self (cpu->thread);
@@ -961,6 +987,16 @@ static void *qemu_tcg_cpu_thread_fn(void *arg) } }qemu_tcg_wait_io_event (); +CPU_FOREACH (cpu) { +if (cpu->exit && !cpu_can_run (cpu)) { + remove_cpu = cpu; +break ; + } + } +if (remove_cpu) { +qemu_tcg_destroy_vcpu (remove_cpu); + remove_cpu =NULL ; + } }return NULL ;
@@ -1298,6 +1334,9 @@ static void tcg_exec_all(void)break ; } }else if (cpu->stop || cpu->stopped) { +if (cpu->exit) { + next_cpu =CPU_NEXT (cpu); + }break ; } }
include/qom/cpu.h +1 -0
@@ -208,6 +208,7 @@ struct CPUState {QTAILQ_HEAD (CPUTailQ, CPUState);extern struct CPUTailQ cpus;#define CPU_NEXT (cpu) QTAILQ_NEXT(cpu, node) +#define CPU_REMOVE (cpu) QTAILQ_REMOVE(&cpus, cpu, node)#define CPU_FOREACH (cpu) QTAILQ_FOREACH(cpu, &cpus, node)#define CPU_FOREACH_SAFE (cpu, next_cpu) \ QTAILQ_FOREACH_SAFE(cpu, &cpus, node, next_cpu)
include/sysemu/kvm.h +1 -0
@@ -167,6 +167,7 @@ int kvm_has_intx_set_mask(void);int kvm_init_vcpu (CPUState *cpu);int kvm_cpu_exec (CPUState *cpu); +int kvm_destroy_vcpu (CPUState *cpu);#ifdef NEED_CPU_H
kvm-all.c +25 -0
@@ -227,6 +227,31 @@ static void kvm_reset_vcpu(void *opaque)kvm_arch_reset_vcpu (cpu); } +int kvm_destroy_vcpu (CPUState *cpu) +{ +KVMState *s = kvm_state; +long mmap_size; +int ret =0 ; + +DPRINTF ("kvm_destroy_vcpu\n" ); + + mmap_size =kvm_ioctl (s,KVM_GET_VCPU_MMAP_SIZE ,0 ); +if (mmap_size <0 ) { + ret = mmap_size; +DPRINTF ("KVM_GET_VCPU_MMAP_SIZE failed\n" ); + goto err; + } + + ret =munmap (cpu->kvm_run, mmap_size); +if (ret <0 ) { + goto err; + } + +close (cpu->kvm_fd); +err: +return ret; +} +int kvm_init_vcpu (CPUState *cpu) {KVMState *s = kvm_state;
Signature · 1 line
1.8.1.4