From nobody Sat Sep 21 03:10:43 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1687783774; cv=none; d=zohomail.com; s=zohoarc; b=nAv3XRaRg7JUYHU/JDqnMtvHlFJLcx3jwIJD7kZFiXf+JAaj7eoASTqEJwAHUXF4Fj2xjag2k1T8X7ibnbvRDsNyJsHF2dBxIlv9Ws/DxSiEnqNDtTrOAYH08uR7E1ITU6nkZNAG4XggCEW5HThBNwg3j2HrQPd1Z4cf6sFWW6k= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1687783774; h=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=FQhkOmJ+EuGVRCjI6qvvRWFSS8sApRL0pPI2JdIsZxs=; b=BjMGBPQbCgI8oawYa2wNWBurFhyMcsU7DqXcrEEBuea4BvAyokFfliuJj9/HVFx69KjZQMsVadXmGiCT36B2agTWMgakR37qRCqbkNomBHwUBPdskmZ3rJBUakxQklm9pPM5wC783uD79mxR4uaMrq+HFBFVe7q6ac6IzJU9lts= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1687783774293552.145230872809; Mon, 26 Jun 2023 05:49:34 -0700 (PDT) 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 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 Received: by mail-pl1-f198.google.com with SMTP id d9443c01a7336-1b7dd5bca25so7865235ad.1 for ; Mon, 26 Jun 2023 05:43:37 -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) 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= X-MC-Unique: U1Fz-wJNPauo6w0D6d7wXA-1 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) 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 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=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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1687783776278100003 Content-Type: text/plain; charset="utf-8" The test attaches both a SCSI controller and a pcie-to-pci bridge on the sa= me 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 ne= ed 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); } =20 -static void setup_pci_bridge(TestArgs *args, const char *id, const char *r= ootid) +static void setup_pci_bridge(TestArgs *args, const char *id) { =20 - char *root, *br; - root =3D g_strdup_printf("-device pcie-root-port,id=3D%s", rootid); - br =3D g_strdup_printf("-device pcie-pci-bridge,bus=3D%s,id=3D%s", roo= tid, id); + char *br; + br =3D g_strdup_printf("-device pcie-pci-bridge,bus=3Dpcie.0,id=3D%s",= id); =20 - args->argc =3D append_arg(args->argc, args->argv, ARGV_SIZE, root); args->argc =3D append_arg(args->argc, args->argv, ARGV_SIZE, br); } =20 @@ -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); } =20 --=20 2.39.1