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 D2FE9C43603 for ; Sat, 7 Dec 2019 16:59: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 98C2A20637 for ; Sat, 7 Dec 2019 16:59:49 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="XxNbHq4Y" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 98C2A20637 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]:51462 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iddQq-0003DU-OP for qemu-devel@archiver.kernel.org; Sat, 07 Dec 2019 11:59:48 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:51742) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iddPA-0001gn-Aq for qemu-devel@nongnu.org; Sat, 07 Dec 2019 11:58:05 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iddP8-0000C5-Ht for qemu-devel@nongnu.org; Sat, 07 Dec 2019 11:58:03 -0500 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:33437 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iddP8-0000BZ-Dq for qemu-devel@nongnu.org; Sat, 07 Dec 2019 11:58:02 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1575737881; h=from:from:reply-to: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=yoniSQ7PzioDkTm54il5Y3CTNou5cKHn4U4lqH6BvsY=; b=XxNbHq4YwD9S0h1ZPPxQfuh/unYF+QHuIzGDDWN0wOWl/3r9l7IaSF9fxwWpOL3b+pAI+0 XWoVg06HwYnNim2gnbygAfRlEYBwytQgBc41VvBzJvyn9WVNvuix4J/NNTYbwRsrH2+1IM eO1D/ZYVk9ZwDKNPFpNpTD8qMGpoQJ4= 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-251-Cpf7sY0kOj20fiKbtwIKJA-1; Sat, 07 Dec 2019 07:57:00 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 484C3180369F; Sat, 7 Dec 2019 12:56:59 +0000 (UTC) Received: from localhost.localdomain (vpn2-54-34.bne.redhat.com [10.64.54.34]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 672B4694A3; Sat, 7 Dec 2019 12:56:58 +0000 (UTC) Subject: Re: [PATCH] exec: Remove the duplicated check in parse_cpu_option() To: Greg Kurz References: <20191206063337.39764-1-gshan@redhat.com> <20191206175840.06507c32@bahia.w3ibm.bluemix.net> From: Gavin Shan Message-ID: Date: Sat, 7 Dec 2019 23:56:55 +1100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.2.0 MIME-Version: 1.0 In-Reply-To: <20191206175840.06507c32@bahia.w3ibm.bluemix.net> Content-Language: en-US X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-MC-Unique: Cpf7sY0kOj20fiKbtwIKJA-1 X-Mimecast-Spam-Score: 0 Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 205.139.110.120 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: , Reply-To: Gavin Shan Cc: qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On 12/7/19 3:58 AM, Greg Kurz wrote: > On Fri, 6 Dec 2019 17:33:37 +1100 > Gavin Shan wrote: > >> The @cpu_option shouldn't be NULL, otherwise assertion from g_strsplit() >> should be raised as below message indicates. So it's meaningless to validate >> @model_pices[0] in parse_cpu_option() as it shouldn't be NULL either. >> >> qemu-system-aarch64: GLib: g_strsplit: assertion 'string != NULL' failed >> >> This just removes the check and unused message. >> > > Hrm... the check isn't about @cpu_option being NULL. It is about filtering out > invalid syntaxes like: > > -cpu '' > > or > > -cpu ,some-prop > Greg, Thanks for your review on this trivial patch. @cpu_option[0] is NULL when we have "-cpu ''". We run into assertion raised by subsequent cpu_class_by_name(). However, @cpu_option[0] isn't NULL with something like "-cpu ,xxx", but the CPU model specific class can't be found at last. So the validation mostly relies on cpu_class_by_name() if I'm correct. It's fine to remove the check. However, it provides explicit error message, which isn't bad though: error_report("-cpu option cannot be empty"); >> Signed-off-by: Gavin Shan >> --- >> exec.c | 5 ----- >> 1 file changed, 5 deletions(-) >> >> diff --git a/exec.c b/exec.c >> index ffdb518535..3cff459e43 100644 >> --- a/exec.c >> +++ b/exec.c >> @@ -963,11 +963,6 @@ const char *parse_cpu_option(const char *cpu_option) >> const char *cpu_type; >> >> model_pieces = g_strsplit(cpu_option, ",", 2); >> - if (!model_pieces[0]) { >> - error_report("-cpu option cannot be empty"); >> - exit(1); >> - } >> - >> oc = cpu_class_by_name(CPU_RESOLVING_TYPE, model_pieces[0]); >> if (oc == NULL) { >> error_report("unable to find CPU model '%s'", model_pieces[0]); > Regards, Gavin