From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42525) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZNDiK-0001f5-MX for qemu-devel@nongnu.org; Thu, 06 Aug 2015 01:27:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZNDiE-0007rT-6L for qemu-devel@nongnu.org; Thu, 06 Aug 2015 01:27:36 -0400 Received: from e28smtp01.in.ibm.com ([122.248.162.1]:54219) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZNDiD-0007q7-Ja for qemu-devel@nongnu.org; Thu, 06 Aug 2015 01:27:30 -0400 Received: from /spool/local by e28smtp01.in.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Thu, 6 Aug 2015 10:57:27 +0530 From: Bharata B Rao Date: Thu, 6 Aug 2015 10:57:10 +0530 Message-Id: <1438838837-28504-5-git-send-email-bharata@linux.vnet.ibm.com> In-Reply-To: <1438838837-28504-1-git-send-email-bharata@linux.vnet.ibm.com> References: <1438838837-28504-1-git-send-email-bharata@linux.vnet.ibm.com> Subject: [Qemu-devel] [RFC PATCH v4 04/11] cpus: Add a sync version of cpu_remove() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: aik@ozlabs.ru, Bharata B Rao , mdroth@linux.vnet.ibm.com, agraf@suse.de, qemu-ppc@nongnu.org, tyreld@linux.vnet.ibm.com, nfont@linux.vnet.ibm.com, imammedo@redhat.com, afaerber@suse.de, david@gibson.dropbear.id.au This sync API will be used by the CPU hotplug code to wait for the CPU to completely get removed before flagging the failure to the device_add command. Sync version of this call is needed to correctly recover from CPU realization failures when ->plug() handler fails. Signed-off-by: Bharata B Rao --- cpus.c | 14 ++++++++++++++ include/qom/cpu.h | 8 ++++++++ 2 files changed, 22 insertions(+) diff --git a/cpus.c b/cpus.c index 73ae2e7..9d9644e 100644 --- a/cpus.c +++ b/cpus.c @@ -999,6 +999,8 @@ 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); + cpu->created = false; + qemu_cond_signal(&qemu_cpu_cond); qemu_mutex_unlock(&qemu_global_mutex); return NULL; } @@ -1104,6 +1106,8 @@ static void *qemu_tcg_cpu_thread_fn(void *arg) } if (remove_cpu) { qemu_tcg_destroy_vcpu(remove_cpu); + cpu->created = false; + qemu_cond_signal(&qemu_cpu_cond); remove_cpu = NULL; } } @@ -1283,6 +1287,16 @@ void cpu_remove(CPUState *cpu) qemu_cpu_kick(cpu); } +void cpu_remove_sync(CPUState *cpu) +{ + cpu->stop = true; + cpu->exit = true; + qemu_cpu_kick(cpu); + while (cpu->created) { + qemu_cond_wait(&qemu_cpu_cond, &qemu_global_mutex); + } +} + /* For temporary buffers for forming a name */ #define VCPU_THREAD_NAME_SIZE 16 diff --git a/include/qom/cpu.h b/include/qom/cpu.h index 136d9fe..65c6852 100644 --- a/include/qom/cpu.h +++ b/include/qom/cpu.h @@ -655,6 +655,14 @@ void cpu_resume(CPUState *cpu); */ void cpu_remove(CPUState *cpu); + /** + * cpu_remove_sync: + * @cpu: The CPU to remove. + * + * Requests the CPU to be removed and waits till it is removed. + */ +void cpu_remove_sync(CPUState *cpu); + /** * qemu_init_vcpu: * @cpu: The vCPU to initialize. -- 2.1.0