From patchwork Thu Jun 22 10:32:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ani Sinha X-Patchwork-Id: 13288971 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id DE706EB64DA for ; Thu, 22 Jun 2023 10:34:12 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qCHdE-0002yj-Fk; Thu, 22 Jun 2023 06:33:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qCHdA-0002y7-2w for qemu-devel@nongnu.org; Thu, 22 Jun 2023 06:33:36 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qCHd8-0006ur-Hp for qemu-devel@nongnu.org; Thu, 22 Jun 2023 06:33:35 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1687430013; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=/N6PTQEbMIEn1dKaYWGWb1K9ljZmMm888p1OQh5X59Q=; b=cWHVdMyt8Zza3uq3+BVkKGTCrRh+psCaGFKGUow1Su69LOVkckeC/T8Nu9I1rLqcV+WNe9 /PKmbBwkLzXK4VA9QVPk1OuEG6nlQ1RCCyuas0uPOVDz/mneDPKab/GPlniee95QQrOcdN 7mVmQtuOmdb2dgwlyKPhW9PR8jbHwvU= Received: from mail-oi1-f200.google.com (mail-oi1-f200.google.com [209.85.167.200]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-498-E0lxWEKTMOOLbXe4I3ZJlw-1; Thu, 22 Jun 2023 06:33:31 -0400 X-MC-Unique: E0lxWEKTMOOLbXe4I3ZJlw-1 Received: by mail-oi1-f200.google.com with SMTP id 5614622812f47-3a034580b21so3020533b6e.3 for ; Thu, 22 Jun 2023 03:33:31 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687430010; x=1690022010; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=/N6PTQEbMIEn1dKaYWGWb1K9ljZmMm888p1OQh5X59Q=; b=Kj4dpdIvuY6p88G72MnR/sYUdx0lw73xJxv/kMDPJbEQQm8Pifo2gug2uWICDcOuoJ 2NVtHwzP4AhZ2nB0M5tBOb/On4VeosT4b8weVS4ot0TE87osPVrY1MyXJ5N9AI2LAJ0C slyNd52t/CvPhI0YKqLy4lDeJll46sxyN6yhX6PVB4da56ICr89L5Tpr7jDX/b8WXSZL Piaib/9Bsfesyz8SuQGbdx5vZVWawFnkfyal24lOPq6Pv4w27M5cKOrPfH89Jrm5cZ+/ 3E5Y4DhzAZ2akACJPX8FmDAq8XjDxuOSllLBvuEq7g9nplZPyzmEXTocAeb1CBG5TYe6 48WQ== X-Gm-Message-State: AC+VfDwHYcBBnuvFpXvgku2W+2IbuODo8MLhoUMJY02KhDDbPZBe6ht2 0S45ajqQhTZc/3tD/U7QJ5uogHAVtOmXkM3iA8jNhW7Bbiy7cm4A5g/bVdxSgli6kbLTrPc35xu zSqf+iKBvxQ4U2/5qg35cHM9R90ewlvbRMgEvVLPZtnOOaACnv01lvZDdU107/51mHPLbwTFybI w= X-Received: by 2002:a05:6808:1412:b0:3a0:83cf:1d82 with SMTP id w18-20020a056808141200b003a083cf1d82mr290594oiv.22.1687430010744; Thu, 22 Jun 2023 03:33:30 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7CKinhspOsoFy9GsXiIqCUubb5Xz9oxjYoBn7JmyVilcuwE2mXQOOJ20uOMCMbtyBj5RhhTA== X-Received: by 2002:a05:6808:1412:b0:3a0:83cf:1d82 with SMTP id w18-20020a056808141200b003a083cf1d82mr290566oiv.22.1687430010433; Thu, 22 Jun 2023 03:33:30 -0700 (PDT) Received: from localhost.localdomain ([115.96.105.213]) by smtp.googlemail.com with ESMTPSA id 29-20020a17090a035d00b0025eb3b237b4sm11004872pjf.44.2023.06.22.03.33.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Jun 2023 03:33:29 -0700 (PDT) From: Ani Sinha To: qemu-devel@nongnu.org, "Michael S. Tsirkin" , Igor Mammedov , Ani Sinha Subject: [PATCH v2 1/5] tests/acpi: allow changes in DSDT.noacpihp table blob Date: Thu, 22 Jun 2023 16:02:51 +0530 Message-Id: <20230622103255.267289-2-anisinha@redhat.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230622103255.267289-1-anisinha@redhat.com> References: <20230622103255.267289-1-anisinha@redhat.com> MIME-Version: 1.0 Received-SPF: pass client-ip=170.10.133.124; envelope-from=anisinha@redhat.com; helo=us-smtp-delivery-124.mimecast.com 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_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org We are going to fix bio-tables-test in the next patch and hence need to make sure the acpi tests continue to pass. Signed-off-by: Ani Sinha --- tests/qtest/bios-tables-test-allowed-diff.h | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/qtest/bios-tables-test-allowed-diff.h b/tests/qtest/bios-tables-test-allowed-diff.h index dfb8523c8b..31df9c6187 100644 --- a/tests/qtest/bios-tables-test-allowed-diff.h +++ b/tests/qtest/bios-tables-test-allowed-diff.h @@ -1 +1,2 @@ /* List of comma-separated changed AML files to ignore */ +"tests/data/acpi/q35/DSDT.noacpihp", From patchwork Thu Jun 22 10:32:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ani Sinha X-Patchwork-Id: 13288973 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 6B30EEB64D8 for ; Thu, 22 Jun 2023 10:34:34 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qCHdH-0002zA-AH; Thu, 22 Jun 2023 06:33:43 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qCHdG-0002z2-G3 for qemu-devel@nongnu.org; Thu, 22 Jun 2023 06:33:42 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qCHdD-0007Hs-Re for qemu-devel@nongnu.org; Thu, 22 Jun 2023 06:33:41 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1687430018; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=u9lBo45iBOx3ROsD8+uccm1MTNpEHRYqfkqJn9ffz3Y=; b=AlyPGrbSUfF3AK21VIphGegqlGfyj1q6JZr1nMrpPWNz3o+fMcE+mRC9xobhQztTnDHw/I +KvJA6cBZcbncir9O9qd7EaEhT8mXt8Z34p1kjLn3IDlCeyiIzW78NekdcKzhOAv5YZqTf K4Krg1s6k47K2KjZv/eYLNNA/m2ks9c= Received: from mail-oo1-f70.google.com (mail-oo1-f70.google.com [209.85.161.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-665-wfCVJT-2MmyZLOia_8WzPw-1; Thu, 22 Jun 2023 06:33:37 -0400 X-MC-Unique: wfCVJT-2MmyZLOia_8WzPw-1 Received: by mail-oo1-f70.google.com with SMTP id 006d021491bc7-5609a6c4145so2241403eaf.1 for ; Thu, 22 Jun 2023 03:33:37 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687430016; x=1690022016; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=u9lBo45iBOx3ROsD8+uccm1MTNpEHRYqfkqJn9ffz3Y=; b=FRVNYSrg/WVX5MqWDvYnmKyUoDZG3PdswK2dRkBCNwxMCrSjhawTxwoyby+aygVLJ1 rm3kV/c8NZMjx3+HW/aDQ7AETh1tv/YG3nTwx195wZh+iN9++JNhGB9XSV3ykQgZCjfD abSwchlV0KimxUeyMhgrwiNV8CMq3G2XhXJgTKhKPuo85l6xalpDgujH2ksDxBtsBTEP F+adUJeFw8ljjYv53RZxv7f/RqTxxKRZnh2EdzWVUNBPYkDJ7Xyt1jD121S5l37Njqwl UOHCxSjkvle/JjJNx9UXE/UpwC2iEqciFSuESF877eQld5EODI9GY3/Wis8DMkGUtzrs zinQ== X-Gm-Message-State: AC+VfDz5q0x/bIiAJam3P2VzjQE80TmF7ToxwywcJHZEIxnJ07tWNO6L /mTCY7HTQHIpfNjV1SZzsL+Lezxr4pIQrkdj75didQw66XVo45pSvlYOQ2MRZnoNz1Ne/8udctT Up4fyqoUzwWWlcULFHb+wYiXcB2ghGWGuIOqLi/ymn/8wS33nJvzm5IUAA6lLjZ1aOVgmLS6T2L 4= X-Received: by 2002:a05:6808:618:b0:39a:a521:383e with SMTP id y24-20020a056808061800b0039aa521383emr15420393oih.51.1687430016596; Thu, 22 Jun 2023 03:33:36 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7SYQyWF0iq4I99UsM1x1ShSnw9RV7x8aAduZ7OIo7HvoriR7V1lI0LRZH5ziVeeix3niE9tw== X-Received: by 2002:a05:6808:618:b0:39a:a521:383e with SMTP id y24-20020a056808061800b0039aa521383emr15420379oih.51.1687430016353; Thu, 22 Jun 2023 03:33:36 -0700 (PDT) Received: from localhost.localdomain ([115.96.105.213]) by smtp.googlemail.com with ESMTPSA id 29-20020a17090a035d00b0025eb3b237b4sm11004872pjf.44.2023.06.22.03.33.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Jun 2023 03:33:35 -0700 (PDT) From: Ani Sinha To: qemu-devel@nongnu.org, "Michael S. Tsirkin" , Igor Mammedov , Ani Sinha Subject: [PATCH v2 2/5] tests/acpi/bios-tables-test: use the correct slot on the pcie-root-port Date: Thu, 22 Jun 2023 16:02:52 +0530 Message-Id: <20230622103255.267289-3-anisinha@redhat.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230622103255.267289-1-anisinha@redhat.com> References: <20230622103255.267289-1-anisinha@redhat.com> MIME-Version: 1.0 Received-SPF: pass client-ip=170.10.129.124; envelope-from=anisinha@redhat.com; helo=us-smtp-delivery-124.mimecast.com 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_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org PCIE ports only have one slot, slot 0. Hence, non-zero slots are not available for PCIE devices on PCIE root ports. Fix test_acpi_q35_tcg_no_acpi_hotplug() so that the test does not use them. Signed-off-by: Ani Sinha --- tests/qtest/bios-tables-test.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/qtest/bios-tables-test.c b/tests/qtest/bios-tables-test.c index ed1c69cf01..47ba20b957 100644 --- a/tests/qtest/bios-tables-test.c +++ b/tests/qtest/bios-tables-test.c @@ -1020,9 +1020,9 @@ static void test_acpi_q35_tcg_no_acpi_hotplug(void) " -device pci-testdev,bus=nohprp,acpi-index=501" " -device pcie-root-port,id=nohprpint,port=0x0,chassis=3,hotplug=off," "multifunction=on,addr=8.0" - " -device pci-testdev,bus=nohprpint,acpi-index=601,addr=8.1" + " -device pci-testdev,bus=nohprpint,acpi-index=601,addr=0.1" " -device pcie-root-port,id=hprp2,port=0x0,chassis=4,bus=nohprpint," - "addr=9.0" + "addr=0.2" " -device pci-testdev,bus=hprp2,acpi-index=602" , &data); free_test_data(&data); From patchwork Thu Jun 22 10:32:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ani Sinha X-Patchwork-Id: 13288970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 1C629EB64D8 for ; Thu, 22 Jun 2023 10:34:13 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qCHdK-0002zn-Uf; Thu, 22 Jun 2023 06:33:46 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qCHdJ-0002za-LM for qemu-devel@nongnu.org; Thu, 22 Jun 2023 06:33:45 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qCHdI-0007Wv-2X for qemu-devel@nongnu.org; Thu, 22 Jun 2023 06:33:45 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1687430023; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=S7IUm9nDj0mwjHgvbdeVxQ5wEqkV4UtqePO/Ykqyr/0=; b=gjNMLgDNWlDY8kkBtrn/6kbj/UftpBQUOBwiz8luJasUA+motiSRgtsomPRV4IldPH6fz1 yBKZTaiekxFXD9dQDXy3JzxT96DLpr8MONyjTMSbndxtG539pu0PVvSUaRA5YHaWkeFLeq yABe4LSRLPJ9aMq4pkwaN7DnpmrmBtw= Received: from mail-oi1-f199.google.com (mail-oi1-f199.google.com [209.85.167.199]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-96-hhG2G5E2NLKfrFNCbbrg3A-1; Thu, 22 Jun 2023 06:33:42 -0400 X-MC-Unique: hhG2G5E2NLKfrFNCbbrg3A-1 Received: by mail-oi1-f199.google.com with SMTP id 5614622812f47-39eaf330648so5240993b6e.2 for ; Thu, 22 Jun 2023 03:33:42 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687430021; x=1690022021; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=S7IUm9nDj0mwjHgvbdeVxQ5wEqkV4UtqePO/Ykqyr/0=; b=H9c21bwaWjEQG4W2X5tykVo4snvWh2uzqKN7ugKZzG8FP4UZUF62FWUY/4vqDIqW51 L7Oi6NAzkxkC+rPolrLSCHd4x/y/2nCEkQMTRfQGSjcxPSIuBBrJX1kZ5hzXtmc5XrT1 X1mdsRNMcas+9Bq8ubw2aeWJ1e9s/ct6ZgUIf8SSSL87KnaPe4F2aFO5xBBLD1Xs0fVn EOrX1dXj3V6IVG/Xq6F/3jE5Drr4QWqa4kMJIkaP4fJ2qVeeNbR/N/WIK3tuPGNphyRO X5idalLOMMCBzz15m/IECeK5G0PWBlREqmeVNCW0VVnAtxsh4JsWSjNsYOkQM7BAAfSS sZRg== X-Gm-Message-State: AC+VfDw3ieRkLmjBKFqpux0RN7QAjJ1bxgU2Q4N8kqgVdV7kgEKOf9b3 mh9qwP2+3uOvxNxWzbvxiuEPJ0OMvD2PUKxFoa79LMehM13hvBAhCiI+cF7aFoJztK0qWV5woHX sSgGDunL5FxCkttl7KzbAqzywfJQrodpLBbEwWIKnS6eqz5TY7T1e1hFjUTE214GZTR3LFUj8sz U= X-Received: by 2002:a05:6808:130c:b0:3a0:4636:d095 with SMTP id y12-20020a056808130c00b003a04636d095mr6133515oiv.59.1687430021349; Thu, 22 Jun 2023 03:33:41 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4vc+1eMGDo7yCfGqth97J98vo1SVEVhz6hu19MEGR4mJ6H/FQXyPvhihuHa4Nj2yxF70EZ3A== X-Received: by 2002:a05:6808:130c:b0:3a0:4636:d095 with SMTP id y12-20020a056808130c00b003a04636d095mr6133492oiv.59.1687430021070; Thu, 22 Jun 2023 03:33:41 -0700 (PDT) Received: from localhost.localdomain ([115.96.105.213]) by smtp.googlemail.com with ESMTPSA id 29-20020a17090a035d00b0025eb3b237b4sm11004872pjf.44.2023.06.22.03.33.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Jun 2023 03:33:40 -0700 (PDT) From: Ani Sinha To: qemu-devel@nongnu.org, "Michael S. Tsirkin" , Igor Mammedov , Ani Sinha Subject: [PATCH v2 3/5] tests/acpi/bios-tables-test: update acpi blob q35/DSDT.noacpihp Date: Thu, 22 Jun 2023 16:02:53 +0530 Message-Id: <20230622103255.267289-4-anisinha@redhat.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230622103255.267289-1-anisinha@redhat.com> References: <20230622103255.267289-1-anisinha@redhat.com> MIME-Version: 1.0 Received-SPF: pass client-ip=170.10.133.124; envelope-from=anisinha@redhat.com; helo=us-smtp-delivery-124.mimecast.com 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_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Some fixes were committed in bios-tables-test in the previous commit. Update the acpi blob and clear bios-tables-test-allowed-diff.h so that the test continues to pass with the changes in the bios-tables-test. Following is the asl diff between the old and the newly updated blob: @@ -1,30 +1,30 @@ /* * Intel ACPI Component Architecture * AML/ASL+ Disassembler version 20210604 (64-bit version) * Copyright (c) 2000 - 2021 Intel Corporation * * Disassembling to symbolic ASL+ operators * - * Disassembly of tests/data/acpi/q35/DSDT.noacpihp, Wed Jun 21 18:26:52 2023 + * Disassembly of /tmp/aml-O8SU61, Wed Jun 21 18:26:52 2023 * * Original Table Header: * Signature "DSDT" - * Length 0x00002038 (8248) + * Length 0x00002031 (8241) * Revision 0x01 **** 32-bit table (V1), no 64-bit math support - * Checksum 0x4A + * Checksum 0x89 * OEM ID "BOCHS " * OEM Table ID "BXPC " * OEM Revision 0x00000001 (1) * Compiler ID "BXPC" * Compiler Version 0x00000001 (1) */ DefinitionBlock ("", "DSDT", 1, "BOCHS ", "BXPC ", 0x00000001) { Scope (\) { OperationRegion (DBG, SystemIO, 0x0402, One) Field (DBG, ByteAcc, NoLock, Preserve) { DBGB, 8 } @@ -3148,48 +3148,48 @@ { Name (_ADR, Zero) // _ADR: Address Method (_DSM, 4, Serialized) // _DSM: Device-Specific Method { Local0 = Package (0x01) { 0x01F5 } Return (EDSM (Arg0, Arg1, Arg2, Arg3, Local0)) } } } Device (S40) { Name (_ADR, 0x00080000) // _ADR: Address - Device (S41) + Device (S01) { - Name (_ADR, 0x00080001) // _ADR: Address + Name (_ADR, One) // _ADR: Address Method (_DSM, 4, Serialized) // _DSM: Device-Specific Method { Local0 = Package (0x01) { 0x0259 } Return (EDSM (Arg0, Arg1, Arg2, Arg3, Local0)) } } - Device (S48) + Device (S02) { - Name (_ADR, 0x00090000) // _ADR: Address + Name (_ADR, 0x02) // _ADR: Address Device (S00) { Name (_ADR, Zero) // _ADR: Address } } } Device (SF8) { Name (_ADR, 0x001F0000) // _ADR: Address OperationRegion (PIRQ, PCI_Config, 0x60, 0x0C) Scope (\_SB) { Field (PCI0.SF8.PIRQ, ByteAcc, NoLock, Preserve) { PRQA, 8, Signed-off-by: Ani Sinha --- tests/data/acpi/q35/DSDT.noacpihp | Bin 8248 -> 8241 bytes tests/qtest/bios-tables-test-allowed-diff.h | 1 - 2 files changed, 1 deletion(-) diff --git a/tests/data/acpi/q35/DSDT.noacpihp b/tests/data/acpi/q35/DSDT.noacpihp index 6ab1f0e52543fcb7f84a7fd1327fe5aa42010565..8cab2f8eb9ae94e0165f3f17857ec7d080fb0e13 100644 GIT binary patch delta 109 zcmdntu+f3bCDi)r&-xoSoL DyqFtK delta 94 zcmdn!u)~4NCD X-Patchwork-Id: 13288975 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 646C0EB64D8 for ; Thu, 22 Jun 2023 10:34:59 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qCHdV-00030h-9p; Thu, 22 Jun 2023 06:33:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qCHdT-00030J-Uf for qemu-devel@nongnu.org; Thu, 22 Jun 2023 06:33:55 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qCHdS-00084V-FB for qemu-devel@nongnu.org; Thu, 22 Jun 2023 06:33:55 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1687430033; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=pyQyRKdFEQ4EC5eNXAMXjDISjG8P020ZAbI1pYzbLyU=; b=SKrqK6locbhejdsBtJ0NhEU0Lfv4661rmHzd183ppoa3TE6K4UsR5Uh/UE4CJDsLjmXk+Q OSj2L3PGICvysNSJZ5Yc3ClKiY0gRMK2Ayg8NezvaJDrzE960S5gg5H/xXPiyf+3d6SGl4 wCdfIc2nY+EQo9qwr/W2AbRau+t4srY= Received: from mail-pj1-f72.google.com (mail-pj1-f72.google.com [209.85.216.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-507-F48S63UMMZeYThDViVrL6Q-1; Thu, 22 Jun 2023 06:33:52 -0400 X-MC-Unique: F48S63UMMZeYThDViVrL6Q-1 Received: by mail-pj1-f72.google.com with SMTP id 98e67ed59e1d1-25ea8a43649so5228225a91.3 for ; Thu, 22 Jun 2023 03:33:52 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687430031; x=1690022031; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=pyQyRKdFEQ4EC5eNXAMXjDISjG8P020ZAbI1pYzbLyU=; b=G8lnl44colAfaU+CNt6i0VqQhqUsPIW+IX8OteFUswgyj1e0XtzE+vIm0c4Vfg3T3H ploU6w1n1tV5dVA2A+mYdV6VUP7Ox+u/J37Sw1xEADiD65wL8KLNzYjvnkdjIyUTWdR9 sF4jomktoK6hsidqxp9PKazJXJye54rT3gmyUJdnUOfJYOq2EYZo+vj0A5vCVySEj8cv 72X2h7RQoOn4ZeS6hhjxRLwE/UOvG3DWmx8yMQlVx/Tszbw7XAIZjUkQ+HmSoJBiCUD+ cDfL5NvEjFIBOKQaDPm7iQ4CE8F1gVO9sHrNq1zAtuhmvwx7RSD+OoBZVJVPgHfh/J44 JbNg== X-Gm-Message-State: AC+VfDxQpLlT9kqCTfaqJxopZYmA3YDmA1CwDh67DDpFbjkbzNYDvEic 5XV7ctjEUkiKUQNetull6obCfiapioszOAtvbDInle47ItScZooFPLL/bWLHjR3WDB9pS86Q1NY B0Zi2UZKKx+rUVu8LiLfoLOTxEGUo++DZ9gOmoEawmAWsXKbud0DqbKRuZFm7RM9oseLxepfHlJ c= X-Received: by 2002:a17:90a:8a82:b0:25b:e0fb:1b22 with SMTP id x2-20020a17090a8a8200b0025be0fb1b22mr16273031pjn.33.1687430031236; Thu, 22 Jun 2023 03:33:51 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5kcdvDVK/YyJT0/DwMlEbVfFN0OYagRWrsx7c2E+nw3aoNuFZ6n3ASMkcq3S9XC826Mxww7Q== X-Received: by 2002:a17:90a:8a82:b0:25b:e0fb:1b22 with SMTP id x2-20020a17090a8a8200b0025be0fb1b22mr16273009pjn.33.1687430030848; Thu, 22 Jun 2023 03:33:50 -0700 (PDT) Received: from localhost.localdomain ([115.96.105.213]) by smtp.googlemail.com with ESMTPSA id 29-20020a17090a035d00b0025eb3b237b4sm11004872pjf.44.2023.06.22.03.33.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Jun 2023 03:33:50 -0700 (PDT) From: Ani Sinha To: qemu-devel@nongnu.org, Thomas Huth , Laurent Vivier , Paolo Bonzini Cc: Ani Sinha , mst@redhat.com, imammedo@redhat.com, Michael Labiuk Subject: [PATCH v2 4/5] tests/qtest/hd-geo-test: fix test by removing unnecessary pcie-root-port Date: Thu, 22 Jun 2023 16:02:54 +0530 Message-Id: <20230622103255.267289-5-anisinha@redhat.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230622103255.267289-1-anisinha@redhat.com> References: <20230622103255.267289-1-anisinha@redhat.com> MIME-Version: 1.0 Received-SPF: pass client-ip=170.10.129.124; envelope-from=anisinha@redhat.com; helo=us-smtp-delivery-124.mimecast.com 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_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org A SCSI controller can be attached to a pcie-to-pci bridge which in turn can be attached directly to the root bus (peie.0). There is no need to attach a pcie-root-port on the root bus in order to attach the pcie-ro-pci bridge. Fix it. CC: mst@redhat.com CC: imammedo@redhat.com CC: Michael Labiuk Signed-off-by: Ani Sinha --- tests/qtest/hd-geo-test.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/tests/qtest/hd-geo-test.c b/tests/qtest/hd-geo-test.c index 5aa258a2b3..d08bffad91 100644 --- a/tests/qtest/hd-geo-test.c +++ b/tests/qtest/hd-geo-test.c @@ -784,14 +784,12 @@ static void test_override_scsi(void) test_override(args, "pc", expected); } -static void setup_pci_bridge(TestArgs *args, const char *id, const char *rootid) +static void setup_pci_bridge(TestArgs *args, const char *id) { - char *root, *br; - root = g_strdup_printf("-device pcie-root-port,id=%s", rootid); - br = g_strdup_printf("-device pcie-pci-bridge,bus=%s,id=%s", rootid, id); + char *br; + br = g_strdup_printf("-device pcie-pci-bridge,bus=pcie.0,id=%s", id); - args->argc = append_arg(args->argc, args->argv, ARGV_SIZE, root); args->argc = append_arg(args->argc, args->argv, ARGV_SIZE, br); } @@ -811,8 +809,8 @@ static void test_override_scsi_q35(void) add_drive_with_mbr(args, empty_mbr, 1); add_drive_with_mbr(args, empty_mbr, 1); add_drive_with_mbr(args, empty_mbr, 1); - setup_pci_bridge(args, "pcie.0", "br"); - add_scsi_controller(args, "lsi53c895a", "br", 3); + setup_pci_bridge(args, "pcie-pci-br"); + add_scsi_controller(args, "lsi53c895a", "pcie-pci-br", 3); add_scsi_disk(args, 0, 0, 0, 0, 0, 10000, 120, 30); add_scsi_disk(args, 1, 0, 0, 1, 0, 9000, 120, 30); add_scsi_disk(args, 2, 0, 0, 2, 0, 1, 0, 0); @@ -868,9 +866,9 @@ static void test_override_virtio_blk_q35(void) }; add_drive_with_mbr(args, empty_mbr, 1); add_drive_with_mbr(args, empty_mbr, 1); - setup_pci_bridge(args, "pcie.0", "br"); - add_virtio_disk(args, 0, "br", 3, 10000, 120, 30); - add_virtio_disk(args, 1, "br", 4, 9000, 120, 30); + setup_pci_bridge(args, "pcie-pci-br"); + add_virtio_disk(args, 0, "pcie-pci-br", 3, 10000, 120, 30); + add_virtio_disk(args, 1, "pcie-pci-br", 4, 9000, 120, 30); test_override(args, "q35", expected); } From patchwork Thu Jun 22 10:32:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ani Sinha X-Patchwork-Id: 13288974 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id A9912EB64D8 for ; Thu, 22 Jun 2023 10:34:53 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qCHdf-00031i-Jz; Thu, 22 Jun 2023 06:34:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qCHdb-00030z-Hq for qemu-devel@nongnu.org; Thu, 22 Jun 2023 06:34:05 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qCHda-0008Ir-0X for qemu-devel@nongnu.org; Thu, 22 Jun 2023 06:34:03 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1687430041; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=jOMtOW9aGVkJgeNXBS62ZUidbXLWxpBbe4rWHMT6PRs=; b=KCpbQEIHNT5U6kR7yAvLTGSqZxyj9BajsYo0DUesWcBwZf1LsonbLbjnHruRlcIKkwO7Ba 4lcgQInFXIukXmeRCOd1ikYh3cSuTOPVHwSp1GaHEuI5qZjtzKPGTDsU6XW8/Zmhd6NfPw 3NbTrBoE/SPbHdzFyiDWVcTXLWz4G5w= Received: from mail-pj1-f70.google.com (mail-pj1-f70.google.com [209.85.216.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-540-P-1zOxpvPKOzvZrX38DFOw-1; Thu, 22 Jun 2023 06:34:00 -0400 X-MC-Unique: P-1zOxpvPKOzvZrX38DFOw-1 Received: by mail-pj1-f70.google.com with SMTP id 98e67ed59e1d1-25efb82179dso2438435a91.1 for ; Thu, 22 Jun 2023 03:34:00 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687430039; x=1690022039; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=jOMtOW9aGVkJgeNXBS62ZUidbXLWxpBbe4rWHMT6PRs=; b=WrpgzXKqe67+tAWPpTkA6KTO3Xt21WZBUGdmtWd/J8K2H6vawjJePAy6Dxey7w0lB4 F/NTJJYD9Q799Pz5iX3cpuMz5EZVbH8haLwCVv6fW5et6cv2iyQyvY+PX9UO9tNiVbh+ KdxcdEIIq9aE2Fg53C1oM8680uIcnPkNjoCEE5IWz1zQSJKUT79GfrIMSbOmaTKaDcb5 KKsRQx14sqZh7VyG6P8cCDsRLqJzmYW2xy4aGUeW+cXxCzkpaCSyW/MwPVfgSsKpIAb1 LEzPFGpDkNtXBpRIyb7d0RCKWvK2ncGFV2pDSk4moEgRV2zdCjgtHGRs7mt9cBOqbVoD f1yQ== X-Gm-Message-State: AC+VfDz97IX0FWeSGrNY0cgHf2ZjBjbymaMxKLBWmVp+LeucIJYZOMdG lAtCoqgXR52ln/86ETP5P+pD8m5rvQkqjOua01olB+Gr3MHGISGTff6mpidhXV8MKcj3slUAAx4 B43kC06y5LHoeQZ7ICmPpVaH2PcslPLzKykVJJwywmKpxJDIWwvj5hS/si55p1eSqEHddSvS6c2 U= X-Received: by 2002:a17:90a:d908:b0:260:afef:7b6d with SMTP id c8-20020a17090ad90800b00260afef7b6dmr7503622pjv.39.1687430038797; Thu, 22 Jun 2023 03:33:58 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5oVV3+ccHUqlABGtyk7LqNKSHIdiGX+rgX3yOVzPBvzyOSXqr4DJyvhuif0XY77WK7SPaRcg== X-Received: by 2002:a17:90a:d908:b0:260:afef:7b6d with SMTP id c8-20020a17090ad90800b00260afef7b6dmr7503600pjv.39.1687430038411; Thu, 22 Jun 2023 03:33:58 -0700 (PDT) Received: from localhost.localdomain ([115.96.105.213]) by smtp.googlemail.com with ESMTPSA id 29-20020a17090a035d00b0025eb3b237b4sm11004872pjf.44.2023.06.22.03.33.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Jun 2023 03:33:57 -0700 (PDT) From: Ani Sinha To: qemu-devel@nongnu.org, "Michael S. Tsirkin" , Marcel Apfelbaum Cc: Ani Sinha , jusual@redhat.com, imammedo@redhat.com Subject: [PATCH v2 5/5] hw/pci: ensure PCIE devices are plugged into only slot 0 of PCIE port Date: Thu, 22 Jun 2023 16:02:55 +0530 Message-Id: <20230622103255.267289-6-anisinha@redhat.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230622103255.267289-1-anisinha@redhat.com> References: <20230622103255.267289-1-anisinha@redhat.com> MIME-Version: 1.0 Received-SPF: pass client-ip=170.10.133.124; envelope-from=anisinha@redhat.com; helo=us-smtp-delivery-124.mimecast.com 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_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org PCI Express ports only have one slot, so PCI Express devices can only be plugged into slot 0 on a PCIE port. Enforce it. CC: jusual@redhat.com CC: imammedo@redhat.com Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=2128929 Signed-off-by: Ani Sinha Reviewed-by: Julia Suvorova --- hw/pci/pci.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/hw/pci/pci.c b/hw/pci/pci.c index bf38905b7d..5f25ab9f5e 100644 --- a/hw/pci/pci.c +++ b/hw/pci/pci.c @@ -64,6 +64,7 @@ bool pci_available = true; static char *pcibus_get_dev_path(DeviceState *dev); static char *pcibus_get_fw_dev_path(DeviceState *dev); static void pcibus_reset(BusState *qbus); +static bool pcie_has_upstream_port(PCIDevice *dev); static Property pci_props[] = { DEFINE_PROP_PCI_DEVFN("addr", PCIDevice, devfn, -1), @@ -1189,6 +1190,11 @@ static PCIDevice *do_pci_register_device(PCIDevice *pci_dev, name); return NULL; + } else if (pcie_has_upstream_port(pci_dev) && PCI_SLOT(devfn)) { + error_setg(errp, "PCI: slot %d is not valid for %s," + " PCI express devices can only be plugged into slot 0.", + PCI_SLOT(devfn), name); + return NULL; } pci_dev->devfn = devfn;