Message ID | 1517858941-5538-34-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="l7KbnCoD"; 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 3zZyxf3bPNz9sRV for <incoming@patchwork.ozlabs.org>; Tue, 6 Feb 2018 06:55:34 +1100 (AEDT) Received: from localhost ([::1]:54943 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 1eimrU-0003EK-EV for incoming@patchwork.ozlabs.org; Mon, 05 Feb 2018 14:55:32 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45000) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <paolo.bonzini@gmail.com>) id 1eimSb-0004np-0Z for qemu-devel@nongnu.org; Mon, 05 Feb 2018 14:29:49 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from <paolo.bonzini@gmail.com>) id 1eimSX-00057S-2I for qemu-devel@nongnu.org; Mon, 05 Feb 2018 14:29:49 -0500 Received: from mail-wm0-x243.google.com ([2a00:1450:400c:c09::243]:38692) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from <paolo.bonzini@gmail.com>) id 1eimSW-000579-QX for qemu-devel@nongnu.org; Mon, 05 Feb 2018 14:29:44 -0500 Received: by mail-wm0-x243.google.com with SMTP id 141so27959789wme.3 for <qemu-devel@nongnu.org>; Mon, 05 Feb 2018 11:29:44 -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=q6dT5ZEbYgVMr5DUowL6yhGthRWsCbbzKOArewmM3rE=; b=l7KbnCoDh5XSKBguDav2BEyatJ9jitoUq8sZUunp8Gt4eDpMLP5HYdRZsgFGCKm7RD tDH0bGTjHF2CJrDSK76NJtcYi49k0MSLfjVrldwe7aM0XM1hfuXGqHKnnYVTu7y16GWB +IZiboyC4TM58QxOBW9mclDh4N2NNCNtqW8yCulid0hfjuHuxEdb7v+5/zjiyfQHr6zr xCu5gvJOFO/gRdaym0K43Gf57Amg2dr3jRMbnjFzEL031nPWMm771vQrb371o1IJ2UBA 4GMMftI17uFHRrW1g7g6kxE/QHjIDWrz6dhhIdlCae5j/k+oHkS0O6kpcUO6PPHCLf1/ TeIg== 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=q6dT5ZEbYgVMr5DUowL6yhGthRWsCbbzKOArewmM3rE=; b=Zck6QguZqCts5fb9uu3zlGdxpjomDORKC0S4dNJzSdWD9KlaT4XPiAvr4rKsYQ8l7f sp4Nqrrra24vj0lZa6IzI7ImjvNznWAw+A9QmZvDf9RHP/VTaoc5nw/W3CjPI9OpMQQQ lziB3v8nmveh5hQ9n4HUQimzGTzVRtLsNVgjgMlYut+SChXT3BCFW5VztJuhZD0STfzi x/jy+A7tUhN7fgoOzZYDqjlJiXhPFpXHsv8GsNkURykJBfIEUaM/m6n/fFxZNIq86d68 TFsmtZnpJiJtWe/JE5pcFNFa9IsINmXJBAgtysCtSkKRAfg/Na7vxZM/c2NKnUY0lRPk mTQA== X-Gm-Message-State: APf1xPARuELIkogk/va6vmJuwbWL8BqS9bILvvfkEeqgyWwsWUAlSjjp fx2ZKCoF5jnBllsC4PlwEq1a2iui X-Google-Smtp-Source: AH8x224NsMoWZW+0xbKgVEfN9lOnh8Ayu9yIDuzk7V3rgm9HS7JgI1Y5ewV4Nu7/Y6ShfGntfu89Qw== X-Received: by 10.28.22.201 with SMTP id 192mr295710wmw.45.1517858983485; Mon, 05 Feb 2018 11:29:43 -0800 (PST) Received: from 640k.lan ([82.84.122.246]) by smtp.gmail.com with ESMTPSA id g8sm20029891wra.18.2018.02.05.11.29.42 for <qemu-devel@nongnu.org> (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 05 Feb 2018 11:29:42 -0800 (PST) From: Paolo Bonzini <pbonzini@redhat.com> To: qemu-devel@nongnu.org Date: Mon, 5 Feb 2018 20:28:47 +0100 Message-Id: <1517858941-5538-34-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:c09::243 Subject: [Qemu-devel] [PULL 33/47] cpus: tcg: unregister thread with RCU, fix exiting of loop on unplug 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 190ad5a..269d527 100644 --- a/cpus.c +++ b/cpus.c @@ -1467,6 +1467,7 @@ static void *qemu_tcg_rr_cpu_thread_fn(void *arg) deal_with_unplugged_cpus(); } + rcu_unregister_thread(); return NULL; } @@ -1603,18 +1604,17 @@ static void *qemu_tcg_cpu_thread_fn(void *arg) /* Ignore everything else? */ break; } - } else if (cpu->unplug) { - qemu_tcg_destroy_vcpu(cpu); - cpu->created = false; - qemu_cond_signal(&qemu_cpu_cond); - qemu_mutex_unlock_iothread(); - return NULL; } atomic_mb_set(&cpu->exit_request, 0); qemu_wait_io_event(cpu); - } + } while (!cpu->unplug || cpu_can_run(cpu)); + qemu_tcg_destroy_vcpu(cpu); + cpu->created = false; + qemu_cond_signal(&qemu_cpu_cond); + qemu_mutex_unlock_iothread(); + rcu_unregister_thread(); return NULL; }
Keep running until cpu_can_run(cpu) becomes false, for consistency with other acceslerators. Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> --- cpus.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)