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=-8.4 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 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 A9B76C47247 for ; Fri, 8 May 2020 13:47:19 +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 779D0208DB for ; Fri, 8 May 2020 13:47:19 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="Pfl+XXQs" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 779D0208DB 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]:47942 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jX3LS-0003Eu-9k for qemu-devel@archiver.kernel.org; Fri, 08 May 2020 09:47:18 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36782) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jX3Jk-0000UI-4m for qemu-devel@nongnu.org; Fri, 08 May 2020 09:45:32 -0400 Received: from us-smtp-1.mimecast.com ([207.211.31.81]:50674 helo=us-smtp-delivery-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 1jX3Ji-00006L-0w for qemu-devel@nongnu.org; Fri, 08 May 2020 09:45:31 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1588945528; 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=89TaezP2YGhTAfal+R/4/ZywYldKM30CgPY5KjVJK8k=; b=Pfl+XXQsD7MKl9KahiwSFRmjbDXW48R5ju1s3e2NH6gO9piAI44emwBuqRzEvYjcjVMkJY 8lHipkQEYa8f7FQcz5x1//ffgR/ERrW+o2Ldswnc6llT6/WknmDyakrnm45LLSFlZcVhcT v9DLKnCJCVmnuuY1wLTgAfRiU7/DdlI= 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-261-5L6QjSMTN8COSImvquFvDA-1; Fri, 08 May 2020 09:45:22 -0400 X-MC-Unique: 5L6QjSMTN8COSImvquFvDA-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 6B44156B29; Fri, 8 May 2020 13:45:21 +0000 (UTC) Received: from [10.3.114.73] (ovpn-114-73.phx2.redhat.com [10.3.114.73]) by smtp.corp.redhat.com (Postfix) with ESMTPS id F19E860BE2; Fri, 8 May 2020 13:45:20 +0000 (UTC) Subject: Re: [PATCH] cpus: Fix botched configure_icount() error API violation fix To: Markus Armbruster , qemu-devel@nongnu.org References: <20200508104933.19051-1-armbru@redhat.com> From: Eric Blake Organization: Red Hat, Inc. Message-ID: <85ab3d39-0916-3637-6568-70166436e7f8@redhat.com> Date: Fri, 8 May 2020 08:45:20 -0500 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.7.0 MIME-Version: 1.0 In-Reply-To: <20200508104933.19051-1-armbru@redhat.com> Content-Language: en-US X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Received-SPF: pass client-ip=207.211.31.81; envelope-from=eblake@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/05/08 01:34:54 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_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=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: pbonzini@redhat.com, peter.maydell@linaro.org Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On 5/8/20 5:49 AM, Markus Armbruster wrote: > Fixes: abc9bf69a66a11499a801ff545b8fe7adbb3a04c > Fixes: Coverity CID 1428754 > Signed-off-by: Markus Armbruster > --- > cpus.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) Reviewed-by: Eric Blake > > 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")) { Another alternative would be using g_strcmp0, but this form is fine. > if (qemu_strtol(option, NULL, 0, &time_shift) < 0 > || time_shift < 0 || time_shift > MAX_ICOUNT_SHIFT) { > error_setg(errp, "icount: Invalid shift value"); > -- Eric Blake, Principal Software Engineer Red Hat, Inc. +1-919-301-3226 Virtualization: qemu.org | libvirt.org