From nobody Sun May 4 02:58:34 2025
Delivered-To: importer@patchew.org
Authentication-Results: mx.zohomail.com;
dkim=fail;
spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as
permitted sender)
smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org;
dmarc=fail(p=none dis=none) header.from=redhat.com
ARC-Seal: i=1; a=rsa-sha256; t=1621861508; cv=none;
d=zohomail.com; s=zohoarc;
b=BYU8H1uczLGp2KywL9lMAGh2QfoPJMMhOc8gtoklE90YrYFsHdiJ7coSpJutPh/pp0JPPtwvD1O+Qy/C4kDSwB1Hq1s5mbLPxWqsXbiyXNCtdfapD0viKiFZNZgm1mjXfqgRk6TQ2r6GA7vqqZgafqxpjHTfXreHi94vwyhnZ1w=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com;
s=zohoarc;
t=1621861508;
h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To;
bh=wueI4YIUFKoP/IMc9SYoE+f7CgGDrWwlSxzrNW4O1Mo=;
b=D1mZ8Me1IukPXN3y3yW4pIFmYsY+iGpNzcUzIzd+JRQgbrXMbsbpsuu0nyopK5Tq61eM/FSppQm2bd2xpGSFK0Pch6h5tWliB5yD1OusAcjrTNUbH6qGk54p63GdPVT4ohwzdY6eu6RG62guqcNKyV8CsY5gr78fV0h/A4m7RsU=
ARC-Authentication-Results: i=1; mx.zohomail.com;
dkim=fail;
spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as
permitted sender)
smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org;
dmarc=fail header.from=<stefanha@redhat.com> (p=none dis=none)
header.from=<stefanha@redhat.com>
Return-Path: <qemu-devel-bounces+importer=patchew.org@nongnu.org>
Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by
mx.zohomail.com
with SMTPS id 1621861508578276.9597170587523;
Mon, 24 May 2021 06:05:08 -0700 (PDT)
Received: from localhost ([::1]:37364 helo=lists1p.gnu.org)
by lists.gnu.org with esmtp (Exim 4.90_1)
(envelope-from <qemu-devel-bounces+importer=patchew.org@nongnu.org>)
id 1llAGZ-0006ZZ-Ra
for importer@patchew.org; Mon, 24 May 2021 09:05:07 -0400
Received: from eggs.gnu.org ([2001:470:142:3::10]:51436)
by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.90_1) (envelope-from <stefanha@redhat.com>)
id 1llADw-0002cP-Qa
for qemu-devel@nongnu.org; Mon, 24 May 2021 09:02:24 -0400
Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:22674)
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.90_1) (envelope-from <stefanha@redhat.com>)
id 1llADt-0007iT-Ay
for qemu-devel@nongnu.org; Mon, 24 May 2021 09:02:24 -0400
Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com
[209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id
us-mta-515-uj8ma0Q6O2iHFQp_wCxPwA-1; Mon, 24 May 2021 09:02:18 -0400
Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com
[10.5.11.15])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 231BC1966323;
Mon, 24 May 2021 13:02:17 +0000 (UTC)
Received: from localhost (ovpn-113-244.ams2.redhat.com [10.36.113.244])
by smtp.corp.redhat.com (Postfix) with ESMTP id 63FAF5D71D;
Mon, 24 May 2021 13:02:13 +0000 (UTC)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;
s=mimecast20190719; t=1621861340;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding:
in-reply-to:in-reply-to:references:references;
bh=wueI4YIUFKoP/IMc9SYoE+f7CgGDrWwlSxzrNW4O1Mo=;
b=HWQ2BrTOEMdJfLfK74vXz/fjZhBx5+waqTFPkSDwrVnpvXTaxLNz2U6O5ihXdy5LnH9xXk
/WQfU0G7n6y1f+JViEPtjLCx+HnFdXloKbeMMpLAUmGxZR/wwtH3j2S5G+TsNM7rpGHPmr
Xx5Ad+7evg0QQWWTRAJFhV2OKBjNczA=
X-MC-Unique: uj8ma0Q6O2iHFQp_wCxPwA-1
From: Stefan Hajnoczi <stefanha@redhat.com>
To: Peter Maydell <peter.maydell@linaro.org>,
qemu-devel@nongnu.org
Subject: [PULL 4/8] coroutine-sleep: disallow NULL QemuCoSleepState** argument
Date: Mon, 24 May 2021 14:01:46 +0100
Message-Id: <20210524130150.50998-5-stefanha@redhat.com>
In-Reply-To: <20210524130150.50998-1-stefanha@redhat.com>
References: <20210524130150.50998-1-stefanha@redhat.com>
MIME-Version: 1.0
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15
Authentication-Results: relay.mimecast.com;
auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=stefanha@redhat.com
X-Mimecast-Spam-Score: 0
X-Mimecast-Originator: redhat.com
Content-Transfer-Encoding: quoted-printable
Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17
as permitted sender) client-ip=209.51.188.17;
envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org;
helo=lists.gnu.org;
Received-SPF: pass client-ip=216.205.24.124;
envelope-from=stefanha@redhat.com;
helo=us-smtp-delivery-124.mimecast.com
X-Spam_score_int: -13
X-Spam_score: -1.4
X-Spam_bar: -
X-Spam_report: (-1.4 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.371,
DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1,
MIME_BASE64_TEXT=1.741, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001,
RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001,
SPF_PASS=-0.001 autolearn=ham autolearn_force=no
X-Spam_action: no action
X-BeenThere: qemu-devel@nongnu.org
X-Mailman-Version: 2.1.23
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: <https://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>
Cc: Kevin Wolf <kwolf@redhat.com>,
Elena Ufimtseva <elena.ufimtseva@oracle.com>,
Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>,
Jagannathan Raman <jag.raman@oracle.com>, qemu-block@nongnu.org,
John G Johnson <john.g.johnson@oracle.com>, John Snow <jsnow@redhat.com>,
Max Reitz <mreitz@redhat.com>, Stefan Hajnoczi <stefanha@redhat.com>,
Paolo Bonzini <pbonzini@redhat.com>
Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org
Sender: "Qemu-devel" <qemu-devel-bounces+importer=patchew.org@nongnu.org>
X-ZohoMail-DKIM: fail (Header signature does not verify)
Content-Type: text/plain; charset="utf-8"
From: Paolo Bonzini <pbonzini@redhat.com>
Simplify the code by removing conditionals. qemu_co_sleep_ns
can simply point the argument to an on-stack temporary.
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Message-id: 20210517100548.28806-3-pbonzini@redhat.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
include/qemu/coroutine.h | 5 +++--
util/qemu-coroutine-sleep.c | 18 +++++-------------
2 files changed, 8 insertions(+), 15 deletions(-)
diff --git a/include/qemu/coroutine.h b/include/qemu/coroutine.h
index ce5b9c6851..c5d7742989 100644
--- a/include/qemu/coroutine.h
+++ b/include/qemu/coroutine.h
@@ -295,7 +295,7 @@ typedef struct QemuCoSleepState QemuCoSleepState;
=20
/**
* Yield the coroutine for a given duration. During this yield, @sleep_sta=
te
- * (if not NULL) is set to an opaque pointer, which may be used for
+ * is set to an opaque pointer, which may be used for
* qemu_co_sleep_wake(). Be careful, the pointer is set back to zero when =
the
* timer fires. Don't save the obtained value to other variables and don't=
call
* qemu_co_sleep_wake from another aio context.
@@ -304,7 +304,8 @@ void coroutine_fn qemu_co_sleep_ns_wakeable(QEMUClockTy=
pe type, int64_t ns,
QemuCoSleepState **sleep_state=
);
static inline void coroutine_fn qemu_co_sleep_ns(QEMUClockType type, int64=
_t ns)
{
- qemu_co_sleep_ns_wakeable(type, ns, NULL);
+ QemuCoSleepState *unused =3D NULL;
+ qemu_co_sleep_ns_wakeable(type, ns, &unused);
}
=20
/**
diff --git a/util/qemu-coroutine-sleep.c b/util/qemu-coroutine-sleep.c
index eec6e81f3f..3f6f637e81 100644
--- a/util/qemu-coroutine-sleep.c
+++ b/util/qemu-coroutine-sleep.c
@@ -32,9 +32,7 @@ void qemu_co_sleep_wake(QemuCoSleepState *sleep_state)
qemu_co_sleep_ns__scheduled, NU=
LL);
=20
assert(scheduled =3D=3D qemu_co_sleep_ns__scheduled);
- if (sleep_state->user_state_pointer) {
- *sleep_state->user_state_pointer =3D NULL;
- }
+ *sleep_state->user_state_pointer =3D NULL;
timer_del(&sleep_state->ts);
aio_co_wake(sleep_state->co);
}
@@ -63,16 +61,10 @@ void coroutine_fn qemu_co_sleep_ns_wakeable(QEMUClockTy=
pe type, int64_t ns,
}
=20
aio_timer_init(ctx, &state.ts, type, SCALE_NS, co_sleep_cb, &state);
- if (sleep_state) {
- *sleep_state =3D &state;
- }
+ *sleep_state =3D &state;
timer_mod(&state.ts, qemu_clock_get_ns(type) + ns);
qemu_coroutine_yield();
- if (sleep_state) {
- /*
- * Note that *sleep_state is cleared during qemu_co_sleep_wake
- * before resuming this coroutine.
- */
- assert(*sleep_state =3D=3D NULL);
- }
+
+ /* qemu_co_sleep_wake clears *sleep_state before resuming this corouti=
ne. */
+ assert(*sleep_state =3D=3D NULL);
}
--=20
2.31.1