From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.5 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8C9ECC433E0 for ; Mon, 25 May 2020 05:44:49 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 5832B207DA for ; Mon, 25 May 2020 05:44:49 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="aueuaFmr" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5832B207DA Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:58986 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jd5uq-0004QG-C5 for qemu-devel@archiver.kernel.org; Mon, 25 May 2020 01:44:48 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55372) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jd5uI-0003z6-IJ for qemu-devel@nongnu.org; Mon, 25 May 2020 01:44:14 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:36811 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jd5uH-0001lW-3P for qemu-devel@nongnu.org; Mon, 25 May 2020 01:44:13 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1590385450; 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: in-reply-to:in-reply-to:references:references; bh=SwmgmjR9T1Eov4E2v+HgFgjd2i22ejNGZfiYBhpf3YU=; b=aueuaFmrYVm1zNhZI/0/bQZNU3mqXtkIxkXKE50OAtjFJjZ41/H7cNCczJOwcG7ztp6vLF K/3Z/MuZEiedKk9BRUJdaanftsgKis5jMJDTaKyMbIyZF09FKgKD0YJxAWfg4d1A7oT+1c h6Jsx73yyzeAVk9XxNRa1n7Pp7APcR0= 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-412-KcMJxBjtMvebF2sS_TgMiQ-1; Mon, 25 May 2020 01:44:08 -0400 X-MC-Unique: KcMJxBjtMvebF2sS_TgMiQ-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id C6C4E18B9FA7; Mon, 25 May 2020 05:44:07 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-112-32.ams2.redhat.com [10.36.112.32]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 80C1919D7B; Mon, 25 May 2020 05:44:07 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 092ED113864A; Mon, 25 May 2020 07:44:06 +0200 (CEST) From: Markus Armbruster To: Paolo Bonzini Subject: Re: [PATCH] cpus: Fix botched configure_icount() error API violation fix References: <20200508104933.19051-1-armbru@redhat.com> <28c289f3-eb3f-eb1a-f79b-b339437bef8a@redhat.com> Date: Mon, 25 May 2020 07:44:06 +0200 In-Reply-To: <28c289f3-eb3f-eb1a-f79b-b339437bef8a@redhat.com> (Paolo Bonzini's message of "Thu, 21 May 2020 16:43:14 +0200") Message-ID: <87d06sh8m1.fsf@dusky.pond.sub.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain Received-SPF: pass client-ip=205.139.110.120; envelope-from=armbru@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/05/25 01:44:10 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] 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, DKIMWL_WL_HIGH=0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Paolo Bonzini writes: > On 08/05/20 12:49, Markus Armbruster wrote: >> Fixes: abc9bf69a66a11499a801ff545b8fe7adbb3a04c >> Fixes: Coverity CID 1428754 >> Signed-off-by: Markus Armbruster >> --- >> cpus.c | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/cpus.c b/cpus.c >> index 5670c96bcf..b9275c672d 100644 >> --- a/cpus.c >> +++ b/cpus.c >> @@ -813,7 +813,7 @@ void configure_icount(QemuOpts *opts, Error **errp) >> return; >> } >> >> - if (strcmp(option, "auto") != 0) { >> + if (option && !strcmp(option, "auto")) { >> if (qemu_strtol(option, NULL, 0, &time_shift) < 0 >> || time_shift < 0 || time_shift > MAX_ICOUNT_SHIFT) { >> error_setg(errp, "icount: Invalid shift value"); >> > > Queued, thanks. This one's wrong, please queue v2 instead.