From nobody Mon Feb 9 18:44:40 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=1593705537; cv=none; d=zohomail.com; s=zohoarc; b=QsS3XOrzqjBcC2pVA5uzkcY4j/8jwNDoODOvakV/OT4E9kYA0sj6rVQ5Uuc3FvA0lEIZONn/E5o3DRJXKT2dwDe7jiFv+U3goJ0FD7bN8CsD9HjJ5r6zarTfhRTjpTELlrg8lO7AdVZj+wkOVFJTfPg+dhcOfv90O0Z2VFkJRPY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1593705537; 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=PHPrf4CoEIah77RobW83ZCh8oZf0jzMGgZFjhqN1hME=; b=BXjx/G/eXh6zRxTaeKE+Njdx4V7yRmKlx6+515vrv8GH7sppFBaNW1R6NfZeWPKuQxPPqp96uZpa26ex9YxMGrqKX+9kZyHseHf2oenOgqRPGf28Hhx23tcNZbBXgY+esRayj8OqIZnSZtUG3fme/w5yrki9q2JkcO6f3EihB78= 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 1593705537147279.5152113108279; Thu, 2 Jul 2020 08:58:57 -0700 (PDT) Received: from localhost ([::1]:33360 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jr1bz-0006R0-LB for importer@patchew.org; Thu, 02 Jul 2020 11:58:55 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49888) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jr1Tj-0008MZ-G3 for qemu-devel@nongnu.org; Thu, 02 Jul 2020 11:50:23 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:24071 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 1jr1TY-0004r5-4D for qemu-devel@nongnu.org; Thu, 02 Jul 2020 11:50:23 -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-29-g4nFTp9sOyCC_2ZzecDRjQ-1; Thu, 02 Jul 2020 11:50:07 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 11F2E80183C; Thu, 2 Jul 2020 15:50:06 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-112-143.ams2.redhat.com [10.36.112.143]) by smtp.corp.redhat.com (Postfix) with ESMTPS id D00EC5DC1E; Thu, 2 Jul 2020 15:50:05 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id D713211358DB; Thu, 2 Jul 2020 17:50:00 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1593705010; 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=PHPrf4CoEIah77RobW83ZCh8oZf0jzMGgZFjhqN1hME=; b=gmI7qkWHsHLksTgM3HQYFqThoBWV6ayP/nMutR9u/mGrPft8fIlO4CkBOBnfYVrCMgeA93 u/kmItnhxpFkVhTrYhNhmX/UvkbN8zaL6VFFx6cyA9X3VmMFI+P5hysPD68/cnjWkKVTaC HtwhkHcet21zxmHyweLtheFkPTzqdx0= X-MC-Unique: g4nFTp9sOyCC_2ZzecDRjQ-1 From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PATCH v2 20/44] s390x/pci: Fix harmless mistake in zpci's property fid's setter Date: Thu, 2 Jul 2020 17:49:36 +0200 Message-Id: <20200702155000.3455325-21-armbru@redhat.com> In-Reply-To: <20200702155000.3455325-1-armbru@redhat.com> References: <20200702155000.3455325-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=armbru@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=207.211.31.120; envelope-from=armbru@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/07/02 03:23:40 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1, 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.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=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, vsementsov@virtuozzo.com, berrange@redhat.com, ehabkost@redhat.com, qemu-block@nongnu.org, Cornelia Huck , pbonzini@redhat.com, Matthew Rosato 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" s390_pci_set_fid() sets zpci->fid_defined to true even when visit_type_uint32() failed. Reproducer: "-device zpci,fid=3Djunk". Harmless in practice, because qdev_device_add() then fails, throwing away @zpci. Fix it anyway. Cc: Matthew Rosato Cc: Cornelia Huck Signed-off-by: Markus Armbruster Reviewed-by: Matthew Rosato Reviewed-by: Cornelia Huck --- hw/s390x/s390-pci-bus.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/hw/s390x/s390-pci-bus.c b/hw/s390x/s390-pci-bus.c index 0517901024..07e1e4d7a3 100644 --- a/hw/s390x/s390-pci-bus.c +++ b/hw/s390x/s390-pci-bus.c @@ -1267,7 +1267,9 @@ static void s390_pci_set_fid(Object *obj, Visitor *v,= const char *name, return; } =20 - visit_type_uint32(v, name, ptr, errp); + if (!visit_type_uint32(v, name, ptr, errp)) { + return; + } zpci->fid_defined =3D true; } =20 --=20 2.26.2