From patchwork Mon Jun 26 13:53:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ani Sinha X-Patchwork-Id: 13292950 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 21D6FEB64D7 for ; Mon, 26 Jun 2023 13:54:27 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qDmf9-0004yW-RL; Mon, 26 Jun 2023 09:53:51 -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 1qDmf8-0004wR-MV for qemu-devel@nongnu.org; Mon, 26 Jun 2023 09:53:50 -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 1qDmf6-00061T-05 for qemu-devel@nongnu.org; Mon, 26 Jun 2023 09:53:50 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1687787627; 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=/XOHBhIyfRJVE2rgJN6Caf1as5otkHTPFSPIm4+Yeaw=; b=U+mCldd8T9KHxNXFoc7vEQY/G+MiIqlNQ/MY+qYQGrpcut+Cr9mnebGF8Dze0pwYFBwjwG WAhzS+zYU/kTVVI/O/NYG1lRvtUkckmxW+L2ERA1EjOSMP5hcb9QyQCuChgQW+fuAfIDYF SnET1nfy/dStathEBvos24uj92adrjQ= 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-241-CmSQz2BvM8eKztQaJLcpSA-1; Mon, 26 Jun 2023 09:53:45 -0400 X-MC-Unique: CmSQz2BvM8eKztQaJLcpSA-1 Received: by mail-pl1-f200.google.com with SMTP id d9443c01a7336-1b80c1966d4so4963695ad.1 for ; Mon, 26 Jun 2023 06:53:45 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687787624; x=1690379624; 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=/XOHBhIyfRJVE2rgJN6Caf1as5otkHTPFSPIm4+Yeaw=; b=jGLjFXzq5yS1Mh3wXSI7fhIYcx5FMLMqIrZpPbdXUwRemLqbyji1vVBirbWODvEzGF mciSVNBUwrvyVnT2Xpl738KQqzoccdm50FaPyPFNPLGwAs+kj+poU04eW9oIoP6CFYIo yjJkGXjO95rPSFun2S9/mpsnbrIcBalpCw/cAC4XSwA04kWZjgRyo2nd36x4vcvswMIW iSGR+fe9dlzSYND62a356phw+MKYYso2JmqGj35ivkRSlrP5uHaPWv8/SQENkDftL9q9 PX7KJO1/jqfvUsOmpSbG6nWU8WZKy/gG5hCj3ETH2XeLl+zfNmv/1ALd/g2E8V5UkIIJ sTlg== X-Gm-Message-State: AC+VfDyt9T+mFuoHegRd43PS7MhOb5HtL7iDwQMgZma/BU83avH83S1c 7/3aSM2hP9238nMfvVZvrcZVTerKXypcr8JJNvPXgIh0A7GbaGFVqSxp6cnJR9vZUztUnJHkwM7 5fwNwlAcNPK8cboFuJiAKIiuPz7asgXnCwB4ZeZUDXSiUGqQjprlthep5u7arXLJEGHmcSCC2hd o= X-Received: by 2002:a17:902:e5c2:b0:1b5:5162:53bd with SMTP id u2-20020a170902e5c200b001b5516253bdmr8953238plf.33.1687787623988; Mon, 26 Jun 2023 06:53:43 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4WV7UVKWP06VYOOt+xARamBnArrb2Etbxnw4pPcrMrfCtw1pXJ+KdVfCuCaDs/wX4ntX6Vmw== X-Received: by 2002:a17:902:e5c2:b0:1b5:5162:53bd with SMTP id u2-20020a170902e5c200b001b5516253bdmr8953213plf.33.1687787623534; Mon, 26 Jun 2023 06:53:43 -0700 (PDT) Received: from localhost.localdomain ([115.96.139.77]) by smtp.googlemail.com with ESMTPSA id w7-20020a170902904700b001b809082a69sm1559621plz.235.2023.06.26.06.53.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Jun 2023 06:53:43 -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 v4 4/5] tests/qtest/hd-geo-test: fix incorrect pcie-root-port usage and simplify test Date: Mon, 26 Jun 2023 19:23:23 +0530 Message-Id: <20230626135324.10687-5-anisinha@redhat.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230626135324.10687-1-anisinha@redhat.com> References: <20230626135324.10687-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 The test attaches both a SCSI controller and a pcie-to-pci bridge on the same pcie-root-port on slot 0. This is incorrect since a single downstream device can be attached to a non-multifunction pcie-root-port on slot 0. Additionally using pcie.0 as id for pcie-root-port is incorrect as that id is reserved only for the root bus. 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 can then be directly attached to the root bus (pcie.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); }