From nobody Mon Feb 9 09:22:46 2026 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=1604089911; cv=none; d=zohomail.com; s=zohoarc; b=JJggDHZGTi11a5arX9DF0u2EY3i4OToIQ6KX2an39KGeF0Niw2786bq7wyk4EImb/zKbfd1T87if1+19RjuPlzg+XVctUhETmtSzGyEiqMeLS8HZGrEx/Eb8lxUqkNqWleAk87cgnT5zoqZE9l44Yyb78usB0WIh24xNZh12PfQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1604089911; 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=/jnic1NLVi3yOaelWu2Ae/wYwDuJiLbjp5nCA3Fl1x4=; b=CLzal+cV9tl7wXEP6qrzPq3cB9TsOx9EmjhZVSHu2+S4vIJj7oRqzW1PAZqCbmrtyQLr68lz32RnrGsHYO4Udbc+xObD5fodeBKw3hzoRpgMcsHHdAmlTBwCgWeuC2Qwa+mfBzjk25sptVMaU5kdqkY6W3Ew3gpknlSRS0QlkIA= 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= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 160408991157783.12984885584126; Fri, 30 Oct 2020 13:31:51 -0700 (PDT) Received: from localhost ([::1]:47006 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kYb3u-0006CX-C6 for importer@patchew.org; Fri, 30 Oct 2020 16:31:50 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53066) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kYauF-0000by-8E for qemu-devel@nongnu.org; Fri, 30 Oct 2020 16:21:51 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:59383) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kYauD-0007ib-N5 for qemu-devel@nongnu.org; Fri, 30 Oct 2020 16:21:50 -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-525-NSLM91z4N6OuFujU9Tn1YQ-1; Fri, 30 Oct 2020 16:21:45 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id E2D6B108597F; Fri, 30 Oct 2020 20:21:43 +0000 (UTC) Received: from localhost (ovpn-114-68.rdu2.redhat.com [10.10.114.68]) by smtp.corp.redhat.com (Postfix) with ESMTP id A55301002C01; Fri, 30 Oct 2020 20:21:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1604089309; 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=/jnic1NLVi3yOaelWu2Ae/wYwDuJiLbjp5nCA3Fl1x4=; b=M+F6cwqJXA7oDgSYl+Ut09K3y+wa98PaUiz+lICkfipWkUt5MDD9P8k2ig/l1zJR4SvoG2 LiVbbQQXoHrhbAw4uHd3h6ihSXkRRC37afIK+X2Mewh8ft1i6XEWMvyveuSQWHPEyR127T yGBn+Dv4+mBJMGGR0pWXrvpQ7OIShv0= X-MC-Unique: NSLM91z4N6OuFujU9Tn1YQ-1 From: Eduardo Habkost To: qemu-devel@nongnu.org Subject: [PATCH 07/20] qdev: Stop using error_set_from_qdev_prop_error() for css devno property Date: Fri, 30 Oct 2020 16:21:18 -0400 Message-Id: <20201030202131.796967-8-ehabkost@redhat.com> In-Reply-To: <20201030202131.796967-1-ehabkost@redhat.com> References: <20201030202131.796967-1-ehabkost@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ehabkost@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=ehabkost@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/10/30 16:21:37 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_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no 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: Thomas Huth , David Hildenbrand , Cornelia Huck , Markus Armbruster , Halil Pasic , Christian Borntraeger , qemu-s390x@nongnu.org, Richard Henderson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Just setting a reasonable error string using error_setg() is simpler and makes error messages clearer. Before: $ qemu-system-s390x -device x-terminal3270,devno=3Dx qemu-system-s390x: -device x-terminal3270,devno=3Dx: Property 'x-terminal= 3270.devno' doesn't take value 'x' After: $ qemu-system-s390x -device x-terminal3270,devno=3Dx qemu-system-s390x: -device x-terminal3270,devno=3Dx: Property 'x-terminal= 3270.devno' can't take value 'x': invalid devno Signed-off-by: Eduardo Habkost --- Cc: Cornelia Huck Cc: Thomas Huth Cc: Richard Henderson Cc: David Hildenbrand Cc: Halil Pasic Cc: Christian Borntraeger Cc: qemu-s390x@nongnu.org Cc: qemu-devel@nongnu.org --- hw/s390x/css.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/s390x/css.c b/hw/s390x/css.c index c8e7ce232a..ad631bad29 100644 --- a/hw/s390x/css.c +++ b/hw/s390x/css.c @@ -2384,7 +2384,7 @@ static void set_css_devid(Object *obj, Visitor *v, co= nst char *name, =20 num =3D sscanf(str, "%2x.%1x%n.%4x%n", &cssid, &ssid, &n1, &devid, &n2= ); if (num !=3D 3 || (n2 - n1) !=3D 5 || strlen(str) !=3D n2) { - error_set_from_qdev_prop_error(errp, EINVAL, obj, prop, str); + error_setg(errp, "invalid devno"); goto out; } if ((cssid > MAX_CSSID) || (ssid > MAX_SSID)) { --=20 2.28.0