Message ID | 1517858941-5538-36-git-send-email-pbonzini@redhat.com |
---|---|
State | New |
Headers | show
Return-Path: <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org> X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=<UNKNOWN>) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="EeXuhem/"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zZz0p6YKRz9s7v for <incoming@patchwork.ozlabs.org>; Tue, 6 Feb 2018 06:58:18 +1100 (AEDT) Received: from localhost ([::1]:54970 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>) id 1eimu8-0005hu-Vb for incoming@patchwork.ozlabs.org; Mon, 05 Feb 2018 14:58:17 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44999) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <paolo.bonzini@gmail.com>) id 1eimSb-0004no-0B for qemu-devel@nongnu.org; Mon, 05 Feb 2018 14:29:50 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from <paolo.bonzini@gmail.com>) id 1eimSZ-000586-83 for qemu-devel@nongnu.org; Mon, 05 Feb 2018 14:29:49 -0500 Received: from mail-wr0-x242.google.com ([2a00:1450:400c:c0c::242]:40267) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from <paolo.bonzini@gmail.com>) id 1eimSZ-00057w-0U for qemu-devel@nongnu.org; Mon, 05 Feb 2018 14:29:47 -0500 Received: by mail-wr0-x242.google.com with SMTP id i56so30829121wra.7 for <qemu-devel@nongnu.org>; Mon, 05 Feb 2018 11:29:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:subject:date:message-id:in-reply-to:references; bh=x5MYHsc7NtHgb7srTO4LKsshNaqbEndMQs6j3A3SvY8=; b=EeXuhem/l40tZysXtCE6Syu0Z84IaA01GqhnWXWbNn6ByGWEKWEmWkhg13qzt3ySwf TR3p5y+pEady1Dquiz6Zsro1fMdGHk6txTt69LH0QQaSjRFc0+Lvr2WOvQJsqz8j3kMx jBRsK/NFW+xdqC6E1ioIG8huOri++Ji2uoGtN88w+QvfckhMCZozOATSg94nzuZAnwy+ NK0xnywEa6OCVcfb6eCKBScpjVgAiNWQL8q/zasbWA+4j8iwyilUR0CvfhuO7vGinPLB LHBoD4vmhpzgqTPjxRL0gfovyVsTMenkQaQTLbdzeg1ffy6oCftA/Y/X+vFuLX/LKquD Cblg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references; bh=x5MYHsc7NtHgb7srTO4LKsshNaqbEndMQs6j3A3SvY8=; b=F/+hOreRWB3nvAZrtex+67P+/SEpfH4Y48vx5wNOLDoopzurQ7NqjZVukkDenDXo0E iJ32IMCTRXwMHDJtZWhH6hkZ9x3UAOgmuT595FFBIMAr5/idESLQGIhQSegzSaKECyov 7z6pILlFN6+nnS+dSf6yPFRCrgQUvAZFnQ4vboBwBWps00zUodvce2DknitHrDLU2Q9C HnQeXra3hDYF47O823VgWmvB3aIPQrQ4ayMFiRLTHVXqoyAfiIz6aRXHo9v2tRfkv0Sr sG8yiYgceTfzFFP1X4xDwMKrqwbNNJmg4Ylp/P2DLHd5JRL1zUWDOGaf+BBgv/8Naq6F 4Qgw== X-Gm-Message-State: AKwxytdjwM4+e2I8pVhBYc8k4i3vkqBypARJo0YFLeS7YRmuC3hi0+l8 hXo+muG86haISEzPWplROnrUgCDz X-Google-Smtp-Source: AH8x226bcHOCTSv1fonGuVqL4Q9QMiR8QZWWx4sJosG2g3LwaNU4kxhv36JlG6raxybL4B2ot6fZfg== X-Received: by 10.223.176.174 with SMTP id i43mr29130937wra.77.1517858985653; Mon, 05 Feb 2018 11:29:45 -0800 (PST) Received: from 640k.lan ([82.84.122.246]) by smtp.gmail.com with ESMTPSA id g8sm20029891wra.18.2018.02.05.11.29.44 for <qemu-devel@nongnu.org> (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 05 Feb 2018 11:29:44 -0800 (PST) From: Paolo Bonzini <pbonzini@redhat.com> To: qemu-devel@nongnu.org Date: Mon, 5 Feb 2018 20:28:49 +0100 Message-Id: <1517858941-5538-36-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1517858941-5538-1-git-send-email-pbonzini@redhat.com> References: <1517858941-5538-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c0c::242 Subject: [Qemu-devel] [PULL 35/47] cpus: join thread when removing a vCPU X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: <qemu-devel.nongnu.org> List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=unsubscribe> List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel/> List-Post: <mailto:qemu-devel@nongnu.org> List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help> List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=subscribe> Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org> |
Series |
[PULL,01/47] memory: update comments and fix some typos
|
expand
|
diff --git a/cpus.c b/cpus.c index fe127ac..8d8bb7c 100644 --- a/cpus.c +++ b/cpus.c @@ -1752,19 +1752,14 @@ void resume_all_vcpus(void) } } -void cpu_remove(CPUState *cpu) +void cpu_remove_sync(CPUState *cpu) { cpu->stop = true; cpu->unplug = true; 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); - } + qemu_mutex_unlock_iothread(); + qemu_thread_join(cpu->thread); + qemu_mutex_lock_iothread(); } /* For temporary buffers for forming a name */
If no one joins the thread, its associated memory is leaked. Reported-by: CheneyLin <linzc@zju.edu.cn> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> --- cpus.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-)