From patchwork Mon Jun 26 12:43:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ani Sinha X-Patchwork-Id: 1799932 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=K3T3NQPT; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4QqSMQ29PPz20Xr for ; Mon, 26 Jun 2023 22:48:50 +1000 (AEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qDlZI-0007dw-NW; Mon, 26 Jun 2023 08:43:44 -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 1qDlZ6-0007L3-N9 for qemu-devel@nongnu.org; Mon, 26 Jun 2023 08:43:32 -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 1qDlZ5-0006rM-5c for qemu-devel@nongnu.org; Mon, 26 Jun 2023 08:43:32 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1687783410; 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=XEZcgPReFyzDcO9cLJl1A0SSdm0joHIvq6RFVgYxRzg=; b=K3T3NQPTy9zcmgGBcagQiyrVNNx+5YBva+6wp6eO12taM4BISLyfcc6dSL3B1vlC97wj2X noyDxOm8M+shv3tmEXn/RsgJNdnRa56AQRoaDDhBjeG13NmA3Cssckl8TwSCkL/EDunw03 os0D5zldAjmsp7aTAhe5kbYcdVSzk7s= Received: from mail-pl1-f199.google.com (mail-pl1-f199.google.com [209.85.214.199]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-29-SMWyY5MUM6yKtMx08QlTpA-1; Mon, 26 Jun 2023 08:43:29 -0400 X-MC-Unique: SMWyY5MUM6yKtMx08QlTpA-1 Received: by mail-pl1-f199.google.com with SMTP id d9443c01a7336-1b7fad414cdso5390355ad.2 for ; Mon, 26 Jun 2023 05:43:28 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687783407; x=1690375407; 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=XEZcgPReFyzDcO9cLJl1A0SSdm0joHIvq6RFVgYxRzg=; b=CaPqA+b8Iz8E6QBubJMAkSF8IhmNoafHL2I1NVd5EdZsfCZYg7N78oxhcdxlD7Hf5+ gT5nOGmda7haUOy+iiGd3CXFUX88RfRPtJmFrKce7tLET42HvqkN9CW09oNp9llgHFTN 8yRmGrkiwBz55BvcGFqaHSSnFNhOJGLYSUDEZKa9Z0SVb1cxvrlbk98PKF+i8QJb32to pxi6plokxJyzkk9jcncuc5OS2wNzf7EMQgldxIU0Oie2jSXDHemAbp1Hq4OeWfmMPIR4 1a67XBxYvTcBQwW3N3+e3suiYRwunTrQTCQsqPzyrlTJbX2o0Zjvtqb+z0uct30PvHGz ZHEA== X-Gm-Message-State: AC+VfDzLBKo5MF2LaMpb2pORz5hC2lVoirqqFixvhhbi0ZnvKhN1j/zP HJvIjDsMDt8PUf+Nv76oZbynU0lGiahOa95r4zFmUin5Ib+OIgm+t1HQ9saqMancqn2HXasK6wP n3B7tbxc2/frDdWtewSeM1XyE7u0ibBy8lDYanSFyRyrZuWcjTio9rTxNn3HW6YV8i8911g2t5t 0= X-Received: by 2002:a17:903:189:b0:1b6:649b:92de with SMTP id z9-20020a170903018900b001b6649b92demr3787873plg.65.1687783407502; Mon, 26 Jun 2023 05:43:27 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5/SeWmtsDoeh67uGpJHwWf/J4Fl+7tfw9i8zEQSRhYf66bJOO7UZUPQJD4piPmJU3qi7PGtw== X-Received: by 2002:a17:903:189:b0:1b6:649b:92de with SMTP id z9-20020a170903018900b001b6649b92demr3787859plg.65.1687783407148; Mon, 26 Jun 2023 05:43:27 -0700 (PDT) Received: from localhost.localdomain ([115.96.139.77]) by smtp.googlemail.com with ESMTPSA id j22-20020a170902759600b001b3c892c367sm4111671pll.63.2023.06.26.05.43.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Jun 2023 05:43:26 -0700 (PDT) From: Ani Sinha To: qemu-devel@nongnu.org, "Michael S. Tsirkin" , Igor Mammedov , Ani Sinha Subject: [PATCH v3 1/5] tests/acpi: allow changes in DSDT.noacpihp table blob Date: Mon, 26 Jun 2023 18:13:02 +0530 Message-Id: <20230626124306.4572-2-anisinha@redhat.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230626124306.4572-1-anisinha@redhat.com> References: <20230626124306.4572-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+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.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 Acked-by: Igor Mammedov --- 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 Mon Jun 26 12:43:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ani Sinha X-Patchwork-Id: 1799945 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=BYNr9k5A; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4QqSPm1Z5Dz20ZP for ; Mon, 26 Jun 2023 22:50:52 +1000 (AEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qDlZV-0008Pj-JZ; Mon, 26 Jun 2023 08:43: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 1qDlZ9-0007WX-I6 for qemu-devel@nongnu.org; Mon, 26 Jun 2023 08:43: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 1qDlZ8-0006s4-2Q for qemu-devel@nongnu.org; Mon, 26 Jun 2023 08:43:35 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1687783413; 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=YQi5DNpBee1TXBxFEGyYLPk0MTnw7h1zNgmbfk3WRkU=; b=BYNr9k5AQtunYuwKNL2M7EH4mNhBnrfZECmqijl8uzhmM+GV46Jlr3c+lrlCn9ZQ8JlEXt 7n+ro/6kMHB1WjQX+wX6AR8l1izj+zMEenm+3ghg+TQZxCB0cydiaSDYnEylBtdrHtAzvE 5bZuQfAHHmKGQqOHyaq+XSXFAxzheZY= Received: from mail-pg1-f198.google.com (mail-pg1-f198.google.com [209.85.215.198]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-538-csMAADPMNla7faJdQdiXoQ-1; Mon, 26 Jun 2023 08:43:31 -0400 X-MC-Unique: csMAADPMNla7faJdQdiXoQ-1 Received: by mail-pg1-f198.google.com with SMTP id 41be03b00d2f7-553d42a7069so2761533a12.1 for ; Mon, 26 Jun 2023 05:43:31 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687783410; x=1690375410; 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=YQi5DNpBee1TXBxFEGyYLPk0MTnw7h1zNgmbfk3WRkU=; b=fcMIZdwCCXtzdUFAbRS+rbXwX7YB+VXAtNAmpftr0lky+/FRkI02H/tHcT7Df6tz7o DzGtWonf9525/P3SoHuzwHTPMlZZ9rjuy3Ac70AiAxTSOVDI26wHr3Np8Wls2mpqJFLW XmWRKijMORHkjEIP9hJthjWXx1sUPmkqr4MraReotbEqnm8HmVOSKNmyT0E9FhEjCU9r QzwssqKUPt82opwp72oJIA6x9bLwbJlccBFDmupEUOiyLxTNMuh/9wLzFM1F+0ae5xAx UY3WuNH4/lyQDjEuIQ0d4Pvg8WSrJQxKOlHMbFymNbvrqEdh27FRlq0L4AVuf1zD3UWY 9Qqw== X-Gm-Message-State: AC+VfDyDRaKLfeUCofyclLlKjnmtNVcVGkN3Y9DCzDoQUpwHBlnwJGL8 TxQsgpC/FYA4KhY2Nr1GMmOW/YmEtu7rEKD8ou1PneI0e8fyUWcPBNO/QiMrWJ3mrONdYMAYyqi tJgj/nWhy51MHhdrp5qxjbeVRdbwmRm4jK49fppN8H1FZCTID0taH3rHkHaUjRjXmnDxcnhFx9T 8= X-Received: by 2002:a17:902:da81:b0:1b7:fae4:9867 with SMTP id j1-20020a170902da8100b001b7fae49867mr4582983plx.10.1687783410050; Mon, 26 Jun 2023 05:43:30 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ41rXoJk/lXTgSQt3HRfv3WItXn2X7U9g/NHM5lOl2v4vQq50dFke3Rw2Sqe4Co0vCQlq8MUQ== X-Received: by 2002:a17:902:da81:b0:1b7:fae4:9867 with SMTP id j1-20020a170902da8100b001b7fae49867mr4582967plx.10.1687783409769; Mon, 26 Jun 2023 05:43:29 -0700 (PDT) Received: from localhost.localdomain ([115.96.139.77]) by smtp.googlemail.com with ESMTPSA id j22-20020a170902759600b001b3c892c367sm4111671pll.63.2023.06.26.05.43.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Jun 2023 05:43:29 -0700 (PDT) From: Ani Sinha To: qemu-devel@nongnu.org, "Michael S. Tsirkin" , Igor Mammedov , Ani Sinha Subject: [PATCH v3 2/5] tests/acpi/bios-tables-test: use the correct slot on the pcie-root-port Date: Mon, 26 Jun 2023 18:13:03 +0530 Message-Id: <20230626124306.4572-3-anisinha@redhat.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230626124306.4572-1-anisinha@redhat.com> References: <20230626124306.4572-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+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.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 Reviewed-by: Igor Mammedov --- 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 Mon Jun 26 12:43:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ani Sinha X-Patchwork-Id: 1799940 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=hgiwqHTG; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4QqSNd24D5z20Xr for ; Mon, 26 Jun 2023 22:49:53 +1000 (AEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qDlZV-0008Ne-6Q; Mon, 26 Jun 2023 08:43: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 1qDlZC-0007e5-Au for qemu-devel@nongnu.org; Mon, 26 Jun 2023 08:43:44 -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 1qDlZA-0006sK-6c for qemu-devel@nongnu.org; Mon, 26 Jun 2023 08:43:37 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1687783415; 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=UVrMQo5OTuj/Z/ArUoRLIJdd/O7g0cHC9ea86NhATqc=; b=hgiwqHTGeuXUu+RU2BQCLVuOitTDk4U0sgZv+J971MGAisvEQD0WyVCbz+vhzaSiUp3/35 RmBX4bOAK7uNshXnCdBeA27BI8PQ31zLYXpfSg3WfXRLTHwQ4dS1RBiZmUaOXP/vcTSxIT E/6krunqIp4q6KWbWN7/Bqc0ikUZFqQ= Received: from mail-pl1-f200.google.com (mail-pl1-f200.google.com [209.85.214.200]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-301-tjCoUZGgM7eSsp-A4sHH6A-1; Mon, 26 Jun 2023 08:43:34 -0400 X-MC-Unique: tjCoUZGgM7eSsp-A4sHH6A-1 Received: by mail-pl1-f200.google.com with SMTP id d9443c01a7336-1b666374d36so10371575ad.2 for ; Mon, 26 Jun 2023 05:43:33 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687783412; x=1690375412; 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=UVrMQo5OTuj/Z/ArUoRLIJdd/O7g0cHC9ea86NhATqc=; b=jzXY6GQjwXir1gyRsDzGz5agZdQAAfhZx/kTEnW2AyUrBWw6QjTO+tReagkqH5ujMc EBULOqc75sfZm4Ed6qP00ty3vlk/HS16Z5J2wCglEsBnz/OpQAT5kw/InveG5KmZU7O3 YJJYa+Ack66rwmSPo0iUtWB5r0/KAYXr/WGjVbAnDPAbZNR7L+MTfOsV3tC9VXDjjJ07 rsAohA3ndcykUToF7t3ZTDF5nO8rtDQeFP2puiinpfMmKuOQN364znlIknTQwU9kmvGR lhXm3SWDpKJiXMIwNhYAXPgL7y8qpHS5KsDiChGMEs0afYGDdggs7wpndjyRwWJ/QUrU JIUQ== X-Gm-Message-State: AC+VfDzHGt+xfXJBISG8qp7vkFOmRZmRTMZWfL9iqSWqJLZpFF4ogMkH H5zRhxeZqYaf9Yi9gIFAmEsp3OakCQ0WWDyU9jOdJfVwt+ATz6xzNQMRMci+v5AqxWyfFi8McFx Hsybm48AMonQ6qOtt/LFmlLKyTbh2XVxRnakPZkncAMrrI1S4ATOfsDQPM+Ti+9RoTfX5zDl0Fp U= X-Received: by 2002:a17:902:eccf:b0:1b3:e6ba:1573 with SMTP id a15-20020a170902eccf00b001b3e6ba1573mr3204011plh.6.1687783412516; Mon, 26 Jun 2023 05:43:32 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5x/7HZC2Oi0/GaoKJoHaXUEpTARuOT0F7+4pPa/MByuXRakyXFaaooidal5YxzvHFPnb1kJQ== X-Received: by 2002:a17:902:eccf:b0:1b3:e6ba:1573 with SMTP id a15-20020a170902eccf00b001b3e6ba1573mr3203992plh.6.1687783412129; Mon, 26 Jun 2023 05:43:32 -0700 (PDT) Received: from localhost.localdomain ([115.96.139.77]) by smtp.googlemail.com with ESMTPSA id j22-20020a170902759600b001b3c892c367sm4111671pll.63.2023.06.26.05.43.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Jun 2023 05:43:31 -0700 (PDT) From: Ani Sinha To: qemu-devel@nongnu.org, "Michael S. Tsirkin" , Igor Mammedov , Ani Sinha Subject: [PATCH v3 3/5] tests/acpi/bios-tables-test: update acpi blob q35/DSDT.noacpihp Date: Mon, 26 Jun 2023 18:13:04 +0530 Message-Id: <20230626124306.4572-4-anisinha@redhat.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230626124306.4572-1-anisinha@redhat.com> References: <20230626124306.4572-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+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.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 Acked-by: Igor Mammedov --- 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: 1799939 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=VXuYxmsp; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4QqSNH2dfGz20Xr for ; Mon, 26 Jun 2023 22:49:35 +1000 (AEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qDlZL-0007sL-RL; Mon, 26 Jun 2023 08:43:47 -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 1qDlZG-0007er-So for qemu-devel@nongnu.org; Mon, 26 Jun 2023 08:43:44 -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 1qDlZD-0006tC-3w for qemu-devel@nongnu.org; Mon, 26 Jun 2023 08:43:40 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1687783418; 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=FQhkOmJ+EuGVRCjI6qvvRWFSS8sApRL0pPI2JdIsZxs=; b=VXuYxmspcVHd4/PUVbdyvPsiLfO/VkkbbGokDsxWWBf1bUhF/qswuWEij5Q04Mqf9rp/G3 GSBAOOSIwd3WUKfFtvHWEJAMQu/AIwC+gI17n1PtCUaNZyG/2J61wwtDW6sVf7mqqwdSyG dYu8qaOeyjF19nWIAsbHICI2N+JRx84= Received: from mail-pl1-f198.google.com (mail-pl1-f198.google.com [209.85.214.198]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-74-U1Fz-wJNPauo6w0D6d7wXA-1; Mon, 26 Jun 2023 08:43:37 -0400 X-MC-Unique: U1Fz-wJNPauo6w0D6d7wXA-1 Received: by mail-pl1-f198.google.com with SMTP id d9443c01a7336-1b7dd5bca25so7865235ad.1 for ; Mon, 26 Jun 2023 05:43:37 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687783416; x=1690375416; 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=FQhkOmJ+EuGVRCjI6qvvRWFSS8sApRL0pPI2JdIsZxs=; b=ZJuN3ue9Evjd7Mib6k0avPMgfM9JrmDqLxHZzI6RnfBKfAzESpJDARmynsuZIzDDEH 30bKscxpZz/5ni4M3lhEzbI5aQUqnOMp7uRdeNhJQeqTANzwHQi9iBS+pLviIhEJLjDX 1NT+ndo1uX5Kd2qIlvHaWiXvu8SGn5lg8ZAEVrWIF223v0afmeHqjUNzOL7pHXl90izA yd9IWnlu2K1pSLXgvuKJXLN/3xyKztemMmEcfmc7D5BWEOGsJroVZ6vjJDU+QkKaHhGZ 9UTu88rZDv3tRsc9tTgBqnJ+NDzNMD+MpBRiWm+mWLLSbmxqQSz5VWQhV3zCfqtGXutk Modg== X-Gm-Message-State: AC+VfDziynfBXumF2nIfOzmeB4+XNhxEDKTbdVtPfsXvBPDfmf+R8huZ XIwfaS3yH1X0DbTbrQMR9cagm+oCfhtcrYP/4uHeYDrCnHAer5ke47GaadnbXszhil8c+z+G4/L XbbsSmpaxWE0lq7steyvIONmq25jz3Wb62Jd/VYMFp/T9Q59Es3yuMo53dKxecyDGe1kn+kugwJ M= X-Received: by 2002:a17:902:daca:b0:1b6:822e:2bd4 with SMTP id q10-20020a170902daca00b001b6822e2bd4mr5020254plx.60.1687783415779; Mon, 26 Jun 2023 05:43:35 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7ZfUIAY0irEnXuzelZ9IFC1UL7cOj/zqWZhUpcVhJFbsSyfzWMU1Dw2GySfXw7CpXcoLamhg== X-Received: by 2002:a17:902:daca:b0:1b6:822e:2bd4 with SMTP id q10-20020a170902daca00b001b6822e2bd4mr5020230plx.60.1687783415437; Mon, 26 Jun 2023 05:43:35 -0700 (PDT) Received: from localhost.localdomain ([115.96.139.77]) by smtp.googlemail.com with ESMTPSA id j22-20020a170902759600b001b3c892c367sm4111671pll.63.2023.06.26.05.43.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Jun 2023 05:43:35 -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 v3 4/5] tests/qtest/hd-geo-test: fix test by removing unnecessary pcie-root-port Date: Mon, 26 Jun 2023 18:13:05 +0530 Message-Id: <20230626124306.4572-5-anisinha@redhat.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230626124306.4572-1-anisinha@redhat.com> References: <20230626124306.4572-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+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org The test attaches both a SCSI controller and a pcie-to-pci bridge on the same pcie-root-port. This is incorrect since only one downstream device can be attached to a pcie-root-port. Further, in the test scenario, there is no need to attach a pcie-root-port to the root complex. A SCSI controller can be attached to a pcie-to-pci bridge which in turn can be directly attached to the root bus (peie.0). Fix the test and simplify 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 Mon Jun 26 12:43:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ani Sinha X-Patchwork-Id: 1799915 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=QFzM/kWG; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4QqSGs4tWBz20XS for ; Mon, 26 Jun 2023 22:44:53 +1000 (AEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qDlZo-0000FD-CN; Mon, 26 Jun 2023 08:44:18 -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 1qDlZI-0007fH-Ex for qemu-devel@nongnu.org; Mon, 26 Jun 2023 08:43:44 -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 1qDlZG-0006tU-MW for qemu-devel@nongnu.org; Mon, 26 Jun 2023 08:43:44 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1687783421; 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=HFaGSHVuQ/MJdrogUY2Zw/pcgRXL686O5bdoo9qhITc=; b=QFzM/kWGQwqQU2GnCATxEnsxpzHIeNYE3dpuf9J/REzYFafpL58ZGMayrsBT8Rg++ZYr7D 8mOVzKswuJ8l8aVu9FVxh96vLAN+4bNKQswDsOd71zd9ezIcA+PaxeucFg/nOKdlu7BU9Z wYkqDgdZSAgJQkbK1HPlENrsTAVPSC4= Received: from mail-pl1-f199.google.com (mail-pl1-f199.google.com [209.85.214.199]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-617-yRDWorS2N7uoDxNIbWnTug-1; Mon, 26 Jun 2023 08:43:40 -0400 X-MC-Unique: yRDWorS2N7uoDxNIbWnTug-1 Received: by mail-pl1-f199.google.com with SMTP id d9443c01a7336-1b508a0873eso14367865ad.3 for ; Mon, 26 Jun 2023 05:43:40 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687783418; x=1690375418; 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=HFaGSHVuQ/MJdrogUY2Zw/pcgRXL686O5bdoo9qhITc=; b=EqdsGeObnBR1tTA2BkPStha2gKJjSSGgiNvFh6YD08J3DacZ6AaagTCYfQRoFYdmq2 Jj7dwkfb/YILUfmjxHG0XzuezrjldjXZcSTIuRCpZgqIs4rYIpZem8pGvStfolcuhEsK 55qx35+FeNtye67mMOhJTgL8h/m4nYp8KSXU34BvcAE1kRXY1EvgeYnjwJ9uFG7kv1/L ORBuiVj1WmkjS7oJRFUe59pa53SNCUouLJ96mg3yAW+H4bc2lKf1mlJ6Lc1zzh7fMJhD IkgWUmaXlzTbc8CssQPlyhm3qXQgd6eiEpWDdFYOx1KAkFuo4o09EQlSKeIdZ5oyEq8u dNIQ== X-Gm-Message-State: AC+VfDwPGhain8gbcg3S/KgM6YRjQBc9XKvYJVP06AsukagRDbx2nxJq tMTbSsvyQVillg8GiV4JH4SaaVw+z3Ii00mK5LxQTnQTj34SNslIIqHF9E0IW+hg6iex6Jb2MRG q9AHVt8/P3iVUAdEV0VLJpf6tUxgkm9PKSQrvwnLn7P4wJtGg9RJBQjxMYKyGvGwv9H6bmQoh1j I= X-Received: by 2002:a17:902:bb87:b0:1b8:535:57e2 with SMTP id m7-20020a170902bb8700b001b8053557e2mr1717526pls.69.1687783418632; Mon, 26 Jun 2023 05:43:38 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5pxuHABGpn0cq0FCVDk6frUup04N3Qt7m7OKPdpV4EIKQiXeBDOZfr9j962nwv4G2pkMOPGQ== X-Received: by 2002:a17:902:bb87:b0:1b8:535:57e2 with SMTP id m7-20020a170902bb8700b001b8053557e2mr1717512pls.69.1687783418288; Mon, 26 Jun 2023 05:43:38 -0700 (PDT) Received: from localhost.localdomain ([115.96.139.77]) by smtp.googlemail.com with ESMTPSA id j22-20020a170902759600b001b3c892c367sm4111671pll.63.2023.06.26.05.43.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Jun 2023 05:43:37 -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 v3 5/5] hw/pci: ensure PCIE devices are plugged into only slot 0 of PCIE port Date: Mon, 26 Jun 2023 18:13:06 +0530 Message-Id: <20230626124306.4572-6-anisinha@redhat.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230626124306.4572-1-anisinha@redhat.com> References: <20230626124306.4572-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+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.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..426af133b0 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," + " parent device only allows plugging into slot 0.", + PCI_SLOT(devfn), name); + return NULL; } pci_dev->devfn = devfn;