From patchwork Tue Apr 5 05:30:46 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Emilio Cota X-Patchwork-Id: 8747681 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 2E59B9F36E for ; Tue, 5 Apr 2016 05:33:10 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 7DDEB2022A for ; Tue, 5 Apr 2016 05:33:09 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 3DDB7201ED for ; Tue, 5 Apr 2016 05:33:08 +0000 (UTC) Received: from localhost ([::1]:34480 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1anJbv-0005Fy-Ld for patchwork-qemu-devel@patchwork.kernel.org; Tue, 05 Apr 2016 01:33:07 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51887) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1anJa1-0001eJ-8I for qemu-devel@nongnu.org; Tue, 05 Apr 2016 01:31:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1anJZy-0005TI-3x for qemu-devel@nongnu.org; Tue, 05 Apr 2016 01:31:09 -0400 Received: from out5-smtp.messagingengine.com ([66.111.4.29]:58386) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1anJZx-0005Sm-Vr for qemu-devel@nongnu.org; Tue, 05 Apr 2016 01:31:06 -0400 Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailout.nyi.internal (Postfix) with ESMTP id BF6B220D84 for ; Tue, 5 Apr 2016 01:31:04 -0400 (EDT) Received: from frontend2 ([10.202.2.161]) by compute3.internal (MEProxy); Tue, 05 Apr 2016 01:31:04 -0400 DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d=braap.org; h=cc :date:from:in-reply-to:message-id:references:subject:to :x-sasl-enc:x-sasl-enc; s=mesmtp; bh=yWoqeI9QSWxc4m2s9LeLXHFbMWo =; b=UdnPofTHG9y9+yylnuAL++5HuxtmiiAaVKUSWir93Y7rsNHQ59IIciE6t6h oFJ/K+3RspmaZZKum1sibpq0KcJ3ty+wmCQsjPh4JklpdEbBrEuHH5lg4to+5DQW MfssJ84HVhiAmgEaHePhi7t09mRgrKf+591xApHgUeKZ20Tc= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d= messagingengine.com; h=cc:date:from:in-reply-to:message-id :references:subject:to:x-sasl-enc:x-sasl-enc; s=smtpout; bh=yWoq eI9QSWxc4m2s9LeLXHFbMWo=; b=sH8UO3t7+MAr3JBBj4BVhnVSmnnw1irJD8al 2O7BIxFz7/zQwO5hfbPIAv1zzUODCmjQHfjDYq0iwkch+Pqx4VNx7C9AfGUeHrl5 5Xrb3yvNa/p3h57Oo+vTvDKj149xdAaaJELXbO3cYSMUHT48MTAJd4jIxdTkpiBw xTfo8+0= X-Sasl-enc: V8JwwLVJmcILglOtPs+AJczvQhl0u6n02rirE37wApLQ 1459834264 Received: from localhost (flamenco.cs.columbia.edu [128.59.20.216]) by mail.messagingengine.com (Postfix) with ESMTPA id 789966801A1; Tue, 5 Apr 2016 01:31:04 -0400 (EDT) From: "Emilio G. Cota" To: QEMU Developers , MTTCG Devel Date: Tue, 5 Apr 2016 01:30:46 -0400 Message-Id: <1459834253-8291-4-git-send-email-cota@braap.org> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1459834253-8291-1-git-send-email-cota@braap.org> References: <1459834253-8291-1-git-send-email-cota@braap.org> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 66.111.4.29 Cc: Peter Maydell , Peter Crosthwaite , Sergey Fedorov , Paolo Bonzini , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Richard Henderson Subject: [Qemu-devel] [PATCH 03/10] seqlock: remove optional mutex X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This option is unused; besides, it bloats the struct when not needed. Let's just let writers define their own locks elsewhere. Signed-off-by: Emilio G. Cota Reviewed-by: Alex Bennée --- cpus.c | 2 +- include/qemu/seqlock.h | 10 +--------- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/cpus.c b/cpus.c index 8ae4777..7f550b9 100644 --- a/cpus.c +++ b/cpus.c @@ -611,7 +611,7 @@ int cpu_throttle_get_percentage(void) void cpu_ticks_init(void) { - seqlock_init(&timers_state.vm_clock_seqlock, NULL); + seqlock_init(&timers_state.vm_clock_seqlock); vmstate_register(NULL, 0, &vmstate_timers, &timers_state); throttle_timer = timer_new_ns(QEMU_CLOCK_VIRTUAL_RT, cpu_throttle_timer_tick, NULL); diff --git a/include/qemu/seqlock.h b/include/qemu/seqlock.h index 70b01fd..e673482 100644 --- a/include/qemu/seqlock.h +++ b/include/qemu/seqlock.h @@ -19,22 +19,17 @@ typedef struct QemuSeqLock QemuSeqLock; struct QemuSeqLock { - QemuMutex *mutex; unsigned sequence; }; -static inline void seqlock_init(QemuSeqLock *sl, QemuMutex *mutex) +static inline void seqlock_init(QemuSeqLock *sl) { - sl->mutex = mutex; sl->sequence = 0; } /* Lock out other writers and update the count. */ static inline void seqlock_write_lock(QemuSeqLock *sl) { - if (sl->mutex) { - qemu_mutex_lock(sl->mutex); - } ++sl->sequence; /* Write sequence before updating other fields. */ @@ -47,9 +42,6 @@ static inline void seqlock_write_unlock(QemuSeqLock *sl) smp_wmb(); ++sl->sequence; - if (sl->mutex) { - qemu_mutex_unlock(sl->mutex); - } } static inline unsigned seqlock_read_begin(QemuSeqLock *sl)