From nobody Fri Nov 14 13:37:54 2025 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=1587756117; cv=none; d=zohomail.com; s=zohoarc; b=UjNu5n9/qycd9qML4+zMjUCCCg6rIg/abgrUL4nz/mOiqrop0C836sZWac6fxfs/VLoyOALinCp/cNFmYeZkf9WTw1F/KdPreAR335RTpbKl0G8+E1hTzN714+Tq+zPK+J8r5FvRebLt6DEHhW3KDwN5kHGEQvlmQkYTFJq52hc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1587756117; 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=D1BLmcfF9t5WFrwAI8NggmLFoG9Kltff0YkgQ4xcOAs=; b=bXKNLV5DGe+mzwjqpdITOwMYS6ctnDN/P/dgrSi6BgN4SSAH08pcRJrOqRi5LvDQqJ01IcPu3S1JGTyrhSRJr5+ydR8ae6xkS9Dp8AVQZPDherd0C78i8m9eBgR+P/BUkLN46HftUQnGKVO0HYJRtObmI8nm+hHgEuoQFAwGn2g= 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 1587756117719103.492868734549; Fri, 24 Apr 2020 12:21:57 -0700 (PDT) Received: from localhost ([::1]:49654 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jS3tb-0005T7-K1 for importer@patchew.org; Fri, 24 Apr 2020 15:21:55 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52942) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jS3sJ-0003ON-2J for qemu-devel@nongnu.org; Fri, 24 Apr 2020 15:20:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.90_1) (envelope-from ) id 1jS3sI-00041k-EV for qemu-devel@nongnu.org; Fri, 24 Apr 2020 15:20:34 -0400 Received: from us-smtp-2.mimecast.com ([207.211.31.81]:49867 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 1jS3sH-00040f-UR for qemu-devel@nongnu.org; Fri, 24 Apr 2020 15:20:34 -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-359-4SVaCpbxOt-1tpMUrvcpNg-1; Fri, 24 Apr 2020 15:20:30 -0400 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 D22001899525; Fri, 24 Apr 2020 19:20:29 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-113-6.ams2.redhat.com [10.36.113.6]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 78085397; Fri, 24 Apr 2020 19:20:29 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 3447311358C0; Fri, 24 Apr 2020 21:20:27 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1587756032; 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=D1BLmcfF9t5WFrwAI8NggmLFoG9Kltff0YkgQ4xcOAs=; b=CXLG3uK/X48Vy6ER9O3oy23h+CFdp7OyslftrnLZ6KPmCz5pQ17Ene8wnfGi2iTCOxMd1X 9+23BOW1oCtkrJCAV252WIXVlDh1T/kZJpaTPKh9bE0PtfrazTDH280pxAlN9B8o6quOfF gnbgyKrNYIYL02Xa5kNvdU/y8qwjS+s= X-MC-Unique: 4SVaCpbxOt-1tpMUrvcpNg-1 From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PATCH 04/11] s390x/pci: Fix harmless mistake in zpci's property fid's setter Date: Fri, 24 Apr 2020 21:20:20 +0200 Message-Id: <20200424192027.11404-5-armbru@redhat.com> In-Reply-To: <20200424192027.11404-1-armbru@redhat.com> References: <20200424192027.11404-1-armbru@redhat.com> 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-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.81; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/04/24 13:45:13 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 207.211.31.81 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: Cornelia Huck , 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 --- 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 ed8be124da..19ee1f02bb 100644 --- a/hw/s390x/s390-pci-bus.c +++ b/hw/s390x/s390-pci-bus.c @@ -1276,7 +1276,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.21.1