From nobody Tue Feb 10 13:34:13 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=yandex-team.ru ARC-Seal: i=1; a=rsa-sha256; t=1710342756; cv=none; d=zohomail.com; s=zohoarc; b=g65qfSDCg6B/ePueNqFCbJPmJI7nXvyPmh5Pzisqtg0FtPdXW60l8geW7ISE7Yt/WxHesUdz9OXOwH4qBx2+LENHk9aXX9ie7NePveTPSaLyMnANqU7AQo/pk13hpepig6Xo30mf9WXh1ZBeb3LEKXSthP3TX28NLubWHIiq7wE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1710342756; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=A1BY/pFcCKjtke681ulBTN+3FD51P3WVGDNwn/IH6Pc=; b=Hbv8hO/TucR7FawodVDkzRIu1pFfFE50IGVzzvFc0n8/CZewtVTCGvpYcv3LDbYel5RMYGJMWgRbWx1L8kZwD28l6ksuvSwVV/77KbSJIyJ0Is5bqENgvID105z5UAp6RVkixQeZnzPQIkoxkQB4aazfilRRWitXTOLErInJ8xc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 17103427564628.416687404324307; Wed, 13 Mar 2024 08:12:36 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rkQF1-0003yo-0i; Wed, 13 Mar 2024 11:10:03 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rkQEd-0003bb-Mc; Wed, 13 Mar 2024 11:09:40 -0400 Received: from forwardcorp1c.mail.yandex.net ([178.154.239.200]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rkQEc-0005v2-2G; Wed, 13 Mar 2024 11:09:39 -0400 Received: from mail-nwsmtp-smtp-corp-main-34.sas.yp-c.yandex.net (mail-nwsmtp-smtp-corp-main-34.sas.yp-c.yandex.net [IPv6:2a02:6b8:c08:8793:0:640:b059:0]) by forwardcorp1c.mail.yandex.net (Yandex) with ESMTPS id 60FBA60DC4; Wed, 13 Mar 2024 18:09:36 +0300 (MSK) Received: from vsementsov-lin.. (unknown [2a02:6b8:b081:7318::1:20]) by mail-nwsmtp-smtp-corp-main-34.sas.yp-c.yandex.net (smtpcorp/Yandex) with ESMTPSA id 99pZB52GZiE0-rCUQI333; Wed, 13 Mar 2024 18:09:35 +0300 X-Yandex-Fwd: 1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yandex-team.ru; s=default; t=1710342575; bh=A1BY/pFcCKjtke681ulBTN+3FD51P3WVGDNwn/IH6Pc=; h=Message-Id:Date:In-Reply-To:Cc:Subject:References:To:From; b=Pvjru6O/RqBrJxwlPSuSV78JeoCs2/omK+0/8axaubsXOsyADuWSoHC4LXBkNTkK6 oBIdr0zFm2MWH0Dx+MNodIWHOB1vMV3Gl1iYIryAtcGu0dOqqHQlKSJ057OsiYdkob wUioMUUGh+z0JUfi+OgxVE7CYuJ/cGUXjbdqPe6Y= Authentication-Results: mail-nwsmtp-smtp-corp-main-34.sas.yp-c.yandex.net; dkim=pass header.i=@yandex-team.ru From: Vladimir Sementsov-Ogievskiy To: qemu-block@nongnu.org Cc: qemu-devel@nongnu.org, jsnow@redhat.com, vsementsov@yandex-team.ru, kwolf@redhat.com, hreitz@redhat.com, devel@lists.libvirt.org, eblake@redhat.com, armbru@redhat.com, michael.roth@amd.com, pbonzini@redhat.com, pkrempa@redhat.com, f.ebner@proxmox.com Subject: [RFC 11/15] job-qmp: job_query_single_locked: add assertion on job ret Date: Wed, 13 Mar 2024 18:09:03 +0300 Message-Id: <20240313150907.623462-12-vsementsov@yandex-team.ru> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240313150907.623462-1-vsementsov@yandex-team.ru> References: <20240313150907.623462-1-vsementsov@yandex-team.ru> MIME-Version: 1.0 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=178.154.239.200; envelope-from=vsementsov@yandex-team.ru; helo=forwardcorp1c.mail.yandex.net X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @yandex-team.ru) X-ZM-MESSAGEID: 1710342757474100002 Content-Type: text/plain; charset="utf-8" job->ret must be always set together with job->err. Let's assert this. Reproting no-error to the user, when job->err is unset and job->ret is somehow set would be a bug. Signed-off-by: Vladimir Sementsov-Ogievskiy --- job-qmp.c | 1 + 1 file changed, 1 insertion(+) diff --git a/job-qmp.c b/job-qmp.c index 9643c5424d..3e2172c26a 100644 --- a/job-qmp.c +++ b/job-qmp.c @@ -163,6 +163,7 @@ static JobInfo *job_query_single_locked(Job *job, Error= **errp) uint64_t progress_total; =20 assert(!job_is_internal(job)); + assert(!job->err =3D=3D !job->ret); progress_get_snapshot(&job->progress, &progress_current, &progress_total); =20 --=20 2.34.1