From patchwork Thu Sep 8 19:52:30 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Corey Minyard X-Patchwork-Id: 75823 Delivered-To: patch@linaro.org Received: by 10.140.106.11 with SMTP id d11csp12546qgf; Thu, 8 Sep 2016 13:08:24 -0700 (PDT) X-Received: by 10.55.166.81 with SMTP id p78mr1871109qke.18.1473365304615; Thu, 08 Sep 2016 13:08:24 -0700 (PDT) Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id i66si17342757qke.14.2016.09.08.13.08.24 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 08 Sep 2016 13:08:24 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@gmail.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org Received: from localhost ([::1]:53740 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bi5cV-0008Ez-Vt for patch@linaro.org; Thu, 08 Sep 2016 16:08:24 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36338) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bi5NS-0002TH-JW for qemu-devel@nongnu.org; Thu, 08 Sep 2016 15:52:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bi5NM-0006jf-HC for qemu-devel@nongnu.org; Thu, 08 Sep 2016 15:52:49 -0400 Received: from mail-pf0-x242.google.com ([2607:f8b0:400e:c00::242]:35741) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bi5NM-0006j9-AE for qemu-devel@nongnu.org; Thu, 08 Sep 2016 15:52:44 -0400 Received: by mail-pf0-x242.google.com with SMTP id n24so2897361pfb.2 for ; Thu, 08 Sep 2016 12:52:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=CE3i+2tFRJjYehUSyl+TViNSNNHsWc6UoA3qgcA+zdw=; b=HvmdiK7w6abd2PJQvFBqGksvawX/HinDtyu39PQ1NQWQjJyvojqFkmE3yZS18+plp3 mNz6Jjk4GlfhWr8C9WZqGBqKg14RDvcIxmHht9aBf+6NCQMeTIDyWpMKVH5BlM3hFLvy TVjagIX71rGMGy+Coc6HflvlnQT5/j9SfQ82kms2xgz3nk+mtr15BsnqiTSA7PpcbiUF 4A9JpJPMf/nrtMMuTLpSo4sd3GFkEaYbzHsQBaAq17aWpWvnOEEea0cWl4BmeezitLeg eH1hD/FjFRHABaBCpkVX7NMeJJlBHhxhNHe+RKzzSu5vUNa1F4OpYMWFBypDEAC88JEr q0gA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=CE3i+2tFRJjYehUSyl+TViNSNNHsWc6UoA3qgcA+zdw=; b=YOSuw60Q6Z63tRsldStrDdykeXtY4wDP6inEfIY/8erj9+shLB0kEe2eVMCsSV/d53 s5If2rxVlIluekuTkf+ZKE/7K4T6E+YjIyukZuOX5YbeQ9RYN5UkDkbzIZtX8obJsuLn 3DsZdDveXRFGqGL4nerGfKIR3QLZ8v6kqlo4RMm6GB+yslFbGK1hV80tCntXE3DX9DwI PpCsk+v/y/src5H/F3aykHnWF7XxgHwFEIuSdwvIDAq1EKyudwjJLhV5TvW3MH2TMiIh R608XzPeh+lqE4/aVZkDv8MjTYMjCdnCWSD+A7kxggyBXNM9oej77oICT/wZvqHlJSmI A4tQ== X-Gm-Message-State: AE9vXwPy7oazfhzKOBc/swZTOeaTQ2+IhymZoldbjDEdQoEVKOcepdSq7IM8YnmIrFO0DA== X-Received: by 10.98.85.134 with SMTP id j128mr2579510pfb.6.1473364363295; Thu, 08 Sep 2016 12:52:43 -0700 (PDT) Received: from serve.minyard.net (serve.minyard.net. [2001:470:b8f6:1b::1]) by smtp.gmail.com with ESMTPSA id z187sm58171439pfz.39.2016.09.08.12.52.42 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 08 Sep 2016 12:52:42 -0700 (PDT) Received: from t430.minyard.net (50-233-148-156-static.hfc.comcastbusiness.net [50.233.148.156]) by serve.minyard.net (Postfix) with ESMTPA id E7CD6CD8; Thu, 8 Sep 2016 14:52:40 -0500 (CDT) Received: by t430.minyard.net (Postfix, from userid 1000) id 15CC8300073; Thu, 8 Sep 2016 14:52:35 -0500 (CDT) From: minyard@acm.org To: qemu-devel@nongnu.org, cminyard@mvista.com Date: Thu, 8 Sep 2016 14:52:30 -0500 Message-Id: <1473364353-23775-3-git-send-email-minyard@acm.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1473364353-23775-1-git-send-email-minyard@acm.org> References: <1473364353-23775-1-git-send-email-minyard@acm.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2607:f8b0:400e:c00::242 Subject: [Qemu-devel] [PATCH 2/5] ipmi_bmc_sim: Remove an unnecessary mutex X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Corey Minyard Get rid of the unnecessary mutex, it was a vestige of something else that was not done. That way we don't have to free it. Signed-off-by: Corey Minyard Reviewed-by: Marc-André Lureau --- hw/ipmi/ipmi_bmc_sim.c | 6 ------ 1 file changed, 6 deletions(-) -- 2.7.4 diff --git a/hw/ipmi/ipmi_bmc_sim.c b/hw/ipmi/ipmi_bmc_sim.c index 190e169..b38f4f0 100644 --- a/hw/ipmi/ipmi_bmc_sim.c +++ b/hw/ipmi/ipmi_bmc_sim.c @@ -217,7 +217,6 @@ struct IPMIBmcSim { /* Odd netfns are for responses, so we only need the even ones. */ const IPMINetfn *netfns[MAX_NETFNS / 2]; - QemuMutex lock; /* We allow one event in the buffer */ uint8_t evtbuf[16]; @@ -940,7 +939,6 @@ static void get_msg(IPMIBmcSim *ibs, { IPMIRcvBufEntry *msg; - qemu_mutex_lock(&ibs->lock); if (QTAILQ_EMPTY(&ibs->rcvbufs)) { rsp_buffer_set_error(rsp, 0x80); /* Queue empty */ goto out; @@ -960,7 +958,6 @@ static void get_msg(IPMIBmcSim *ibs, } out: - qemu_mutex_unlock(&ibs->lock); return; } @@ -1055,11 +1052,9 @@ static void send_msg(IPMIBmcSim *ibs, end_msg: msg->buf[msg->len] = ipmb_checksum(msg->buf, msg->len, 0); msg->len++; - qemu_mutex_lock(&ibs->lock); QTAILQ_INSERT_TAIL(&ibs->rcvbufs, msg, entry); ibs->msg_flags |= IPMI_BMC_MSG_FLAG_RCV_MSG_QUEUE; k->set_atn(s, 1, attn_irq_enabled(ibs)); - qemu_mutex_unlock(&ibs->lock); } static void do_watchdog_reset(IPMIBmcSim *ibs) @@ -1753,7 +1748,6 @@ static void ipmi_sim_realize(DeviceState *dev, Error **errp) unsigned int i; IPMIBmcSim *ibs = IPMI_BMC_SIMULATOR(b); - qemu_mutex_init(&ibs->lock); QTAILQ_INIT(&ibs->rcvbufs); ibs->bmc_global_enables = (1 << IPMI_BMC_EVENT_LOG_BIT);