From patchwork Wed May 24 09:37:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 685315 Delivered-To: patch@linaro.org Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp149865wrt; Wed, 24 May 2023 02:38:38 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4WIRtA2rKM1+Vd3ZXlqWWjq6cxDRstPoQQlyVzdcNmTe5pFh/+dZqJCm8/GkLuCnI2kZ7Z X-Received: by 2002:a05:620a:c17:b0:75b:23a1:475 with SMTP id l23-20020a05620a0c1700b0075b23a10475mr5418064qki.59.1684921118013; Wed, 24 May 2023 02:38:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684921117; cv=none; d=google.com; s=arc-20160816; b=wa6twUg1KlV9YeMawzI+QOaYhisgyjZS/yAUHneUdgq8U9xHnpAOk1S9kxLTjn6BMe ponpnuamwcJxRgdei+5tdCuC1Q7xm6PqtegCBLyYx7Ko/EYZ+VBksBz+EGwXpw3N370I Jf4VU+YfCvCHC4sigUkkO2RV5IfpGa0vTbPJ4Obs9HCAhONGw9WUaLyntWGwTo2Oq58H AwkvGXEESyobgR27ygzFQq5vaA2zAtVfkd0BA8ioINDXfBwIOdp2+aB6t7XO26VA+b5c Hcls8SxD22V35ix28OeSvM9SWc/yu1qNBhzn89wqrqg6k7hIr5gLxLs/phxIfJbEXUFv JEAg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=mwQD6JYFIZC5qczhg65V50jxbUCRyR+PfLPe0OmMdzU=; b=b/trnyot3FpsflKjq6va/ID4MptxV5I0/ojOScK76ciymv8102s4+NXX8YDI7tEv4R 4U1CpdKCMkbAHkb22t9JAdRrRiNXYWulejyXTcJ70kzgpTBsNiOKy3tXs9cqCeFmUMhm aH9/BQVwyDSCG3nG45NFPAs1e4MZGSPXE6/H7OYIzXg2Mv/jvoYTkhVOao4u5WfL54fj qjcU1s9dcW2AnmwT2iGoSNBcppZ+oecwvU0vh04wMOLyB89xKJzcyLYWPJ86JBFqD6sJ xOY4hjs3GbQJYwdOBtEi65kPtSYlt8PZanC0rUaCqOysXDggEgIJ1SPbBZLFg7/8jjga Hlvg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=TPpxTlxe; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id op51-20020a05620a537300b0075b0744fe70si4635647qkn.295.2023.05.24.02.38.37 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 24 May 2023 02:38:37 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=TPpxTlxe; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q1kwh-0005IO-5f; Wed, 24 May 2023 05:38:15 -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 1q1kwe-0005C3-Rq for qemu-devel@nongnu.org; Wed, 24 May 2023 05:38:12 -0400 Received: from mail-wr1-x430.google.com ([2a00:1450:4864:20::430]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q1kwd-0006lC-7u for qemu-devel@nongnu.org; Wed, 24 May 2023 05:38:12 -0400 Received: by mail-wr1-x430.google.com with SMTP id ffacd0b85a97d-3078cc99232so543053f8f.3 for ; Wed, 24 May 2023 02:38:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1684921090; x=1687513090; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=mwQD6JYFIZC5qczhg65V50jxbUCRyR+PfLPe0OmMdzU=; b=TPpxTlxeGhpTurw1nq/ZP/IRQ59dn1cbib5105WbXOHl2kAjHI8DSJoSR4ViDX+6IA ePCszzVAF8TR/GgPD13fwdmFUuN1jpAIwXeIF6BpFGM6KMTWMCAW4FGEtytizfFRM5W0 NNiUJYULWuBbVkN82ca7Nt36J1ETvPRB0uJl/Eqph7JTHRQrp56Uk5Twmm2Fmij+Dg5d f0ral41h9m43kQxyiWqrBcnl9s5FVUfJV5VXNDN1TzWdwzyQgCuRKaqtAbUTSbYUdJcP RRzw+NzM1lj2ZybY1Ge6inNi+xjNnZWFR2/NI6pIXFOqoTaNuSrl1p8wpnRsRsVPB9+s Mlig== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684921090; x=1687513090; 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=mwQD6JYFIZC5qczhg65V50jxbUCRyR+PfLPe0OmMdzU=; b=Enu9mNviqHRTHOJjfwqM/AgZXxRgWgpX+MtmCKEMpUQpoZ3+qlV/6tEkeTACcUZoPg WWL9eHe1GR2qkMIJNDjuxKAXWvOsMUqZeSGi2zZ0S4tadAjvkW5ggHHQl7ahdNgTJBuw oSaGFhGEybm0d3PBmlGt8peOPDdy95X2NM2RrejHkrp88TgKWxbbxbtkRYwwzKVYwgyy QJYjtrzW+A5MT5An0L4KkrAhRm0fozpYRsLLtJEZRL8wxdvYQtbjWdDzqILApTsUGAMz zWJ31qnSfs384IRSjJUJywYXYUqW7f8x4jlLnzTmPPmilqQZGu/vbswS5nU6qP1A0rlM 97Qg== X-Gm-Message-State: AC+VfDwNTXWSSQ26NHEUkORvTP0SYvbw52R+zgD46CT7KzxgXt2VnaTP bNQj3f7M89FtNKh9vtfuWxMx0pR495ImoPkdUmZ52w== X-Received: by 2002:adf:fc47:0:b0:307:7fa4:527d with SMTP id e7-20020adffc47000000b003077fa4527dmr12093289wrs.58.1684921090123; Wed, 24 May 2023 02:38:10 -0700 (PDT) Received: from localhost.localdomain (fac34-h02-176-184-31-246.dsl.sta.abo.bbox.fr. [176.184.31.246]) by smtp.gmail.com with ESMTPSA id a2-20020a056000100200b0030903d44dbcsm13881751wrx.33.2023.05.24.02.38.07 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 24 May 2023 02:38:09 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Fam Zheng , Thomas Huth , Paolo Bonzini , Eric Farman , Peter Xu , Hanna Reitz , Christian Borntraeger , "Michael S. Tsirkin" , Raphael Norwitz , Ilya Leoshkevich , Richard Henderson , =?utf-8?q?Philippe_Mathie?= =?utf-8?q?u-Daud=C3=A9?= , Eric Auger , "Gonglei (Arei)" , David Hildenbrand , Stefan Hajnoczi , qemu-s390x@nongnu.org, Cornelia Huck , Halil Pasic , qemu-block@nongnu.org, Kevin Wolf Subject: [PATCH v2 03/10] hw/scsi: Rearrange meson.build Date: Wed, 24 May 2023 11:37:37 +0200 Message-Id: <20230524093744.88442-4-philmd@linaro.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230524093744.88442-1-philmd@linaro.org> References: <20230524093744.88442-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::430; envelope-from=philmd@linaro.org; helo=mail-wr1-x430.google.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, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=unavailable 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org We will modify this file shortly. Re-arrange it slightly first, declaring source sets first. No logical change. Reviewed-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Thomas Huth Reviewed-by: Alex Bennée --- hw/scsi/meson.build | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/hw/scsi/meson.build b/hw/scsi/meson.build index fa9198e69f..f2da0bc5ae 100644 --- a/hw/scsi/meson.build +++ b/hw/scsi/meson.build @@ -1,4 +1,7 @@ scsi_ss = ss.source_set() +specific_scsi_ss = ss.source_set() +virtio_scsi_ss = ss.source_set() + scsi_ss.add(files( 'emulation.c', 'scsi-bus.c', @@ -11,18 +14,15 @@ scsi_ss.add(when: 'CONFIG_LSI_SCSI_PCI', if_true: files('lsi53c895a.c')) scsi_ss.add(when: 'CONFIG_MEGASAS_SCSI_PCI', if_true: files('megasas.c')) scsi_ss.add(when: 'CONFIG_MPTSAS_SCSI_PCI', if_true: files('mptsas.c', 'mptconfig.c', 'mptendian.c')) scsi_ss.add(when: 'CONFIG_VMW_PVSCSI_SCSI_PCI', if_true: files('vmw_pvscsi.c')) -softmmu_ss.add_all(when: 'CONFIG_SCSI', if_true: scsi_ss) -specific_scsi_ss = ss.source_set() - -virtio_scsi_ss = ss.source_set() virtio_scsi_ss.add(files('virtio-scsi.c', 'virtio-scsi-dataplane.c')) - virtio_scsi_ss.add(when: 'CONFIG_VHOST_SCSI_COMMON', if_true: files('vhost-scsi-common.c')) virtio_scsi_ss.add(when: 'CONFIG_VHOST_SCSI', if_true: files('vhost-scsi.c')) virtio_scsi_ss.add(when: 'CONFIG_VHOST_USER_SCSI', if_true: files('vhost-user-scsi.c')) + specific_scsi_ss.add_all(when: 'CONFIG_VIRTIO_SCSI', if_true: virtio_scsi_ss) specific_scsi_ss.add(when: 'CONFIG_SPAPR_VSCSI', if_true: files('spapr_vscsi.c')) +softmmu_ss.add_all(when: 'CONFIG_SCSI', if_true: scsi_ss) specific_ss.add_all(when: 'CONFIG_SCSI', if_true: specific_scsi_ss)