From nobody Sun Nov 16 14:03:26 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=1600854226; cv=none; d=zohomail.com; s=zohoarc; b=TWxMEyfQsK6BLupPlPMCJJ02zKdXbJ8aYcdBgOWCYSpjarkE3ZafgAVmowTzfmPjKuMd+HRjZdDpf4I9/Pxs2eVH7pWf5t5blqQf7PjOqX4ktOfHAf6GB3BVjaPHxXmldlIhyUJLyNcmNi1O33QYMVUpr1ljbuGr0HQOFMYBaws= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1600854226; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=SFAK7WteoeXzXBXrDOJOzfp/yyC/wJajervDx7s4FWo=; b=hL8fuuO/vYaX3/PhsLzfojDj0Z2KJ0/pjob8o9RN2eVKXNwsiCspIEbrK7kG9iP+UAGNfi6ZPpduMgCAn07eL+/NZwb8R4IYJgs3J5kbJpOPtigr9cc6Ewcje2D3eq45Tq6ZXBkAdWeSF3Ugm9X3mfEdkx2u2joxs6aGHy+MYFY= 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 1600854226148608.3337381877485; Wed, 23 Sep 2020 02:43:46 -0700 (PDT) Received: from localhost ([::1]:50680 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kL1JQ-0003dB-Ao for importer@patchew.org; Wed, 23 Sep 2020 05:43:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57488) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kL13A-0003EV-0b for qemu-devel@nongnu.org; Wed, 23 Sep 2020 05:26:56 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:59680) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kL135-0004cL-2b for qemu-devel@nongnu.org; Wed, 23 Sep 2020 05:26:55 -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-147-bLHg8gKXPjmiMN1tIjgFFA-1; Wed, 23 Sep 2020 05:26:48 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 95613AD680; Wed, 23 Sep 2020 09:26:47 +0000 (UTC) Received: from pc-72.home.com (unknown [10.40.194.91]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 7E4FA702E7; Wed, 23 Sep 2020 09:26:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1600853210; 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; bh=SFAK7WteoeXzXBXrDOJOzfp/yyC/wJajervDx7s4FWo=; b=ELvi+zjnxAM68oMAtVCtSe77PdoNxo4XAo8/xWPuk0z/BjoSj3dQlB+untSQ/gku+5N9SA JoilhF+Nu5lwd1z0lbpu5r6tmNqSrtGG0SHccSg2jZDsIYWqImBccRtOi4/wpKaD5K3TBm +9iYinNO+riU9h5jtlzYvINjv3Ygqkg= X-MC-Unique: bLHg8gKXPjmiMN1tIjgFFA-1 From: Julia Suvorova To: qemu-devel@nongnu.org Subject: [PATCH] hw/pci/pci: Fix slot check for plugged devices Date: Wed, 23 Sep 2020 11:26:36 +0200 Message-Id: <20200923092636.118676-1-jusual@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=jusual@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=jusual@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/22 23:02:20 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -35 X-Spam_score: -3.6 X-Spam_bar: --- X-Spam_report: (-3.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1.455, 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_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham 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: Igor Mammedov , Julia Suvorova , "Michael S. Tsirkin" 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" If devfn is assigned automatically, 'else' clauses will never be executed. And if it does not matter for the reserved and available devfn, because we have already checked it, the check for function0 needs to be done again. Signed-off-by: Julia Suvorova --- hw/pci/pci.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/hw/pci/pci.c b/hw/pci/pci.c index de0fae10ab..ae132b0b52 100644 --- a/hw/pci/pci.c +++ b/hw/pci/pci.c @@ -1034,8 +1034,9 @@ static PCIDevice *do_pci_register_device(PCIDevice *p= ci_dev, PCI_SLOT(devfn), PCI_FUNC(devfn), name, bus->devices[devfn]->name); return NULL; - } else if (dev->hotplugged && - pci_get_function_0(pci_dev)) { + }; + + if (dev->hotplugged && pci_get_function_0(pci_dev)) { error_setg(errp, "PCI: slot %d function 0 already ocuppied by %s," " new func %s cannot be exposed to guest.", PCI_SLOT(pci_get_function_0(pci_dev)->devfn), --=20 2.25.4