From patchwork Tue May 23 16:35:52 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: 685009 Delivered-To: patch@linaro.org Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp1825174wrt; Tue, 23 May 2023 09:38:19 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7YH5vKyPJL3d3PbKmNumgnx3gkXvq0OyC+apDqjfTVVn8tI94KV8Wyih4l0+VPbKs9caaZ X-Received: by 2002:ac8:588a:0:b0:3f5:2995:f6c8 with SMTP id t10-20020ac8588a000000b003f52995f6c8mr24443443qta.60.1684859899093; Tue, 23 May 2023 09:38:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684859899; cv=none; d=google.com; s=arc-20160816; b=uZrriL7XGyqfpNyJhRciQdiQ3aY88yh4pYMZUEr78xMtHNjwh8NxMzP2iD39/sBjnu uRU7YIEeMX4KAtDET9fz+5RzTlvb9WU/GaeHO7YdpKvb7KV+aUDLIpNRHfoF1kNaaxFs pYSQWw5hrPF3zoA437mXDUCtRORUPtdAL248NlzG0eUyPO93AS+YOFFqA7qkNNe17/HQ pKyUVaqHNrA4d8SN0yCdzdl54gRxA79L+y6hQzcmIjqe8XJI/XhYiSFqdfzCVFbWCFz8 FgWXVlsPyp/FlW/tw02C4ws6aASiU8iu6K0JuXsBI+me3xBapiZX78UdOk49VZgFspoI HzVA== 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=yhObE3lO9NW7n22ou/6MvOVRIrPs/DPwiwLTQULI9M4=; b=EJEAnJ3BCQ4mUBJdraq0QLY61+83Yo5vyPTNGBGINhviZebIv8JrQjhVP7iA04MJP9 72RHDmxfk4f+gM0xGruWXZw8fUns9I5QPzxGzK6s//TdQ290jrfba2ULkUKNta1tO2IR nA9XFPVsR0/bjXoyLg3x2hLNFDHKvbTmgtVGxuLZ+j0T4VgIqi78sC5kznn3honBQv3U ydu0LDM4RDDRGIroF4CH/9hBGtKSxdO0dpjKorQsQ0yihHRG+3v9eYzp4jzPRKiYuCOF q2LrSmqH1MJCRu9Z44St5jJuFqzBOPMSv+XdG7SmRKRvFkbcnK2mHDM0KoolD/wBhge+ Hg/Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=W3Hwxp3S; 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 s32-20020a05622a1aa000b003f3941c3cb7si5363721qtc.246.2023.05.23.09.38.18 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 23 May 2023 09:38:19 -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=W3Hwxp3S; 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 1q1V02-0000zh-01; Tue, 23 May 2023 12:36:38 -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 1q1V00-0000z1-Te for qemu-devel@nongnu.org; Tue, 23 May 2023 12:36:36 -0400 Received: from mail-wr1-x42e.google.com ([2a00:1450:4864:20::42e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q1Uzp-0001ct-QY for qemu-devel@nongnu.org; Tue, 23 May 2023 12:36:36 -0400 Received: by mail-wr1-x42e.google.com with SMTP id ffacd0b85a97d-3090d3e9c92so7578246f8f.2 for ; Tue, 23 May 2023 09:36:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1684859784; x=1687451784; 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=yhObE3lO9NW7n22ou/6MvOVRIrPs/DPwiwLTQULI9M4=; b=W3Hwxp3S/l+jWxTCqJu/rKV65EhkJH+fbFCdLCDpwR2zyZWgke+JXkQdtFbWH0NkhI XhQXolyll7VhQQlDJtX+XBHKwI2HOicNPQHAfZrKiNamOK/3rwyXRukivBytBrH/U86o r0SstjElRjaQte7kSvCGvqaxXmP99aPO+LYbDoP1+DdsRKbb1f398ac7SMUKXpQECPu8 AwttZaCoHcPB/I+mRgez+YynqozocifqUNeab1u7XIZDA8uocj4u7A/l7riiiStRjU5r VoZjRaRvYO3F9Z+rlW7hPhuncMrY9Ywsa84tlXwG1mrNCbHerhaJ6XWIx8EgZD28q2gj UTag== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684859784; x=1687451784; 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=yhObE3lO9NW7n22ou/6MvOVRIrPs/DPwiwLTQULI9M4=; b=j4u+YhISabpvY9RXoUprNuCEkaokGPPMamwpykBNT9aQdCrATlOtfDWT06typac1Mm 9BkbmrCs0QFCz9OvFZ0ejFiXe/6D01iOxMCD/h8CpdblSEBA+8RJPze+9X6wu6F3EyQA CHXj5S2oT4wIEpNHwZksxUcY3jwXDJEZeuN/U6j/VQQYR+2mQeUsdj87knOYe6SuNWAn Qxdli1J5onP2KdjTmZwTN5q/o8a+I4NHfuHy1sl6iQXi5YaZbEl2G0Vnc6Taz3GQDEth zQGywWxcFB9hBr5NZy4GwA3NLiJuAoxzc9GNsEptVSaNPLw/5ry0l0t0syRZyBTp5p/g jc4g== X-Gm-Message-State: AC+VfDxT/cZcieYF+ygBczyn+/1Lzw70Fw98pcCLDYHLvEhTQk3uPqgy kPSIkmQ2qgAkh8sVAYJgbpFdfj/yKm3ynB2M4Oc= X-Received: by 2002:adf:f711:0:b0:306:35d2:c33a with SMTP id r17-20020adff711000000b0030635d2c33amr11309900wrp.50.1684859783945; Tue, 23 May 2023 09:36:23 -0700 (PDT) Received: from localhost.localdomain (vil69-h02-176-184-48-94.dsl.sta.abo.bbox.fr. [176.184.48.94]) by smtp.gmail.com with ESMTPSA id d6-20020a5d6446000000b00307a83ea722sm11642193wrw.58.2023.05.23.09.36.21 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 23 May 2023 09:36:23 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Raphael Norwitz , Peter Xu , Halil Pasic , Thomas Huth , "Gonglei (Arei)" , David Hildenbrand , Christian Borntraeger , Paolo Bonzini , "Michael S. Tsirkin" , Kevin Wolf , qemu-block@nongnu.org, Eric Farman , Fam Zheng , Richard Henderson , =?utf-8?q?Philippe_Mathie?= =?utf-8?q?u-Daud=C3=A9?= , Stefan Hajnoczi , Hanna Reitz , Cornelia Huck , Eric Auger , Ilya Leoshkevich , qemu-s390x@nongnu.org Subject: [PATCH 03/11] hw/scsi: Rearrange meson.build Date: Tue, 23 May 2023 18:35:52 +0200 Message-Id: <20230523163600.83391-4-philmd@linaro.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230523163600.83391-1-philmd@linaro.org> References: <20230523163600.83391-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42e; envelope-from=philmd@linaro.org; helo=mail-wr1-x42e.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, 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. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson --- hw/scsi/meson.build | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/hw/scsi/meson.build b/hw/scsi/meson.build index fa9198e69f..f3206a4756 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,13 @@ 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(when: 'CONFIG_SPAPR_VSCSI', if_true: files('spapr_vscsi.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)