From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52331) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aHQxU-00080D-5M for qemu-devel@nongnu.org; Fri, 08 Jan 2016 01:55:37 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aHQxP-00088I-H5 for qemu-devel@nongnu.org; Fri, 08 Jan 2016 01:55:36 -0500 Received: from e28smtp04.in.ibm.com ([125.16.236.4]:41085) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aHQxO-00084k-R0 for qemu-devel@nongnu.org; Fri, 08 Jan 2016 01:55:31 -0500 Received: from localhost by e28smtp04.in.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Fri, 8 Jan 2016 12:25:26 +0530 From: Bharata B Rao Date: Fri, 8 Jan 2016 12:25:14 +0530 Message-Id: <1452236119-24452-7-git-send-email-bharata@linux.vnet.ibm.com> In-Reply-To: <1452236119-24452-1-git-send-email-bharata@linux.vnet.ibm.com> References: <1452236119-24452-1-git-send-email-bharata@linux.vnet.ibm.com> Subject: [Qemu-devel] [PATCH v6 06/11] cpu: 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: ehabkost@redhat.com, aik@ozlabs.ru, Bharata B Rao , mdroth@linux.vnet.ibm.com, agraf@suse.de, pbonzini@redhat.com, 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 Reviewed-by: David Gibson --- cpus.c | 12 ++++++++++++ include/qom/cpu.h | 8 ++++++++ 2 files changed, 20 insertions(+) diff --git a/cpus.c b/cpus.c index 12374af..c829bd6 100644 --- a/cpus.c +++ b/cpus.c @@ -1067,6 +1067,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_iothread(); return NULL; } @@ -1171,6 +1173,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; } } @@ -1336,6 +1340,14 @@ void cpu_remove(CPUState *cpu) qemu_cpu_kick(cpu); } +void cpu_remove_sync(CPUState *cpu) +{ + cpu_remove(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 67e05b0..7fc6696 100644 --- a/include/qom/cpu.h +++ b/include/qom/cpu.h @@ -705,6 +705,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