From patchwork Wed Oct 4 08:43:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "Michael S. Tsirkin" X-Patchwork-Id: 729262 Delivered-To: patch@linaro.org Received: by 2002:a5d:4a4e:0:b0:31d:da82:a3b4 with SMTP id v14csp231970wrs; Wed, 4 Oct 2023 01:49:26 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHlsO7aytbunvkJ6QmxmuzM4emWqAxZXaRISAmSVPerGQhiIIPL/vLNdVjKZlHY2mB2J0zg X-Received: by 2002:a05:600c:2a4e:b0:3fe:fc0f:52e2 with SMTP id x14-20020a05600c2a4e00b003fefc0f52e2mr1621341wme.37.1696409366641; Wed, 04 Oct 2023 01:49:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696409366; cv=none; d=google.com; s=arc-20160816; b=HKmq3ZYhdOjAW52nvuaUw8Y3J5feM08V7q80FsbTOLM3gyXEZeBW+EL93zy2XbVACV g0rYvSpUuUFUYyL209fggN9pSXqKoSBINKBmsfHhwPYbm7sDp+YNBxyymzxN9NmyFRK9 avfzLHpRzdsrVXrkeSOs35N9NFFqAM8bcAwl9EsZsH81nB6i2yb2tCEs3yDLSnmyidSP F02/kbkKDEz5xXLd3i/j25gfXlwB1E2AWzSllYXgZHL2GCq3a/blSVwKrzPlmUlZwIVy XBBEJcKtPTbeEl8Bh7L+ELOYpJecpHOlicO4fVhndD2FKc7GsLrpWNkbx8k5yyew6sec Of+g== 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:in-reply-to :content-transfer-encoding:content-disposition:mime-version :references:message-id:subject:cc:to:from:date:dkim-signature; bh=3t8WNSkxqBpAo+9P1uf7C/JabXh9XbItEnrkHWLRDt4=; fh=Kpn8NUdv7wKUydTeMx58meD3bhQtHIgecefqqY6gi54=; b=J3o43m8Oxy1Rqb9OO7Z+JuBf253E0/ZDt0RjvYiJAiE+8cVcm1xrVgemICXAQYG8s3 4Vmk0R0FbqU4eYBazHmVUYjeCJm+H6bCGAf8fLjPT9uNtyfKHnC+q2Z8tbaK7K9ljYsg ecrbvHdT27Xmm8JI4JUMCQj3y6iZX1e7xC1nylSxOOr8QijDhhcX9zLzyCw9HROGjMUK +H6C8POCTmB6GQU/T4xTxoDRIhNStItX3C2ZEH8pMZMUWTndFI/9IhnoMpde+jG39HXM t5OSISFBEKBhOOimiu/8HZh6CPNlm259jZFerpFHCLlvy/jqPhrm/fVPtVKJ/tO6hT7m te8Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b="bIj2oem/"; 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=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id ay34-20020a05600c1e2200b003fe9eb22077si589627wmb.110.2023.10.04.01.49.26 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 04 Oct 2023 01:49:26 -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=@redhat.com header.s=mimecast20190719 header.b="bIj2oem/"; 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=redhat.com Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qnxTu-0002Wb-AN; Wed, 04 Oct 2023 04:43:46 -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 1qnxTs-0002Up-Ll for qemu-devel@nongnu.org; Wed, 04 Oct 2023 04: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 1qnxTk-0000vM-OP for qemu-devel@nongnu.org; Wed, 04 Oct 2023 04:43:43 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1696409016; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=3t8WNSkxqBpAo+9P1uf7C/JabXh9XbItEnrkHWLRDt4=; b=bIj2oem/9ecK0SQm0er8YiUviINECY+KUT+P9OxVXOsVlRjgmt0+YHwJeEhgEkJdC5noPL /Ll2XfN+V6BFDLq84zkF/zyWGQUKByTx/iu2WAvALLckHENr4JegSodLOyJ8dFmb+XrnXO MLFfBHznvC+WvqcGEPXhhS4b2PWtv44= Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-612-Ly1weHnyMJ-FduMSBTJ23w-1; Wed, 04 Oct 2023 04:43:34 -0400 X-MC-Unique: Ly1weHnyMJ-FduMSBTJ23w-1 Received: by mail-wr1-f69.google.com with SMTP id ffacd0b85a97d-32320b3ee93so1406342f8f.3 for ; Wed, 04 Oct 2023 01:43:34 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696409013; x=1697013813; h=in-reply-to:content-transfer-encoding:content-disposition :mime-version:references:message-id:subject:cc:to:from:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=3t8WNSkxqBpAo+9P1uf7C/JabXh9XbItEnrkHWLRDt4=; b=o1jlDSxRl9bOFpOP0uqI6OS9VnNSTt1zcJg2b7pob22N62FyZOasCCxKoyw23o41pD exTN3k2m+UiVVJ4/V2l9kGuA5FQNrXoSRLaVtpW5UyoQtQ546VMPQy3Po6u5CNObn5JN mltkqvbCPFtZvZrnlUxxVVI/ysZ0SnGC3kuBQu8z6/vxlfkqv0ncY+iryeqI2kjCyR8r fZWYK6OHrQWIK4pTsSfTXGrBA5xM2Dfuu24p46M5XVahRGB4KSNhqhBdb7ypboYwWf9i iZL1PprrTjj2OGlPTuzny9gad22L8LysVTelvz++JArmKly7irBAYgISYUtpTbJZadVt Srvg== X-Gm-Message-State: AOJu0YxJnOC6XPiMPv943Q+wx+G3wbBctyJkoWTJKVUgI0kgeYa5PTWc pWSOA28uj5TIqw5FE1CqM72+ycXVBZVe3E4ywndJ+RoN598YXIeQOXlkoZ9sg53DdgaMn++quns zq7+Of7ENvNoPrRG9v6ZrXLwEXtTtQXgmykM8v59pEVcIf0VAh9QETXmZNZJouHenbuU7 X-Received: by 2002:a5d:494f:0:b0:31a:d266:3d62 with SMTP id r15-20020a5d494f000000b0031ad2663d62mr1479509wrs.54.1696409012807; Wed, 04 Oct 2023 01:43:32 -0700 (PDT) X-Received: by 2002:a5d:494f:0:b0:31a:d266:3d62 with SMTP id r15-20020a5d494f000000b0031ad2663d62mr1479490wrs.54.1696409012456; Wed, 04 Oct 2023 01:43:32 -0700 (PDT) Received: from redhat.com ([2.52.137.96]) by smtp.gmail.com with ESMTPSA id e31-20020a5d595f000000b0031fbbe347e1sm3456960wri.65.2023.10.04.01.43.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Oct 2023 01:43:31 -0700 (PDT) Date: Wed, 4 Oct 2023 04:43:29 -0400 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Cc: Peter Maydell , Philippe =?utf-8?q?Mathieu-Dau?= =?utf-8?q?d=C3=A9?= , Richard Henderson , Alex =?utf-8?q?Benn=C3=A9?= =?utf-8?q?e?= , Stefano Garzarella Subject: [PULL 07/63] hw/virtio/meson: Rename softmmu_virtio_ss[] -> system_virtio_ss[] Message-ID: References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: X-Mailer: git-send-email 2.27.0.106.g8ac3dc51b1 X-Mutt-Fcc: =sent Received-SPF: pass client-ip=170.10.133.124; envelope-from=mst@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_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Philippe Mathieu-Daudé Similarly to commit de6cd7599b ("meson: Replace softmmu_ss -> system_ss"), rename the virtio source set common to all system emulation as 'system_virtio_ss[]'. This is clearer because softmmu can be used for user emulation. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson Message-Id: <20230710100510.84862-1-philmd@linaro.org> Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- hw/virtio/meson.build | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/hw/virtio/meson.build b/hw/virtio/meson.build index 9737450afd..4e81d10834 100644 --- a/hw/virtio/meson.build +++ b/hw/virtio/meson.build @@ -1,28 +1,28 @@ -softmmu_virtio_ss = ss.source_set() -softmmu_virtio_ss.add(files('virtio-bus.c')) -softmmu_virtio_ss.add(when: 'CONFIG_VIRTIO_PCI', if_true: files('virtio-pci.c')) -softmmu_virtio_ss.add(when: 'CONFIG_VIRTIO_MMIO', if_true: files('virtio-mmio.c')) -softmmu_virtio_ss.add(when: 'CONFIG_VIRTIO_CRYPTO', if_true: files('virtio-crypto.c')) -softmmu_virtio_ss.add(when: 'CONFIG_VHOST_VSOCK_COMMON', if_true: files('vhost-vsock-common.c')) -softmmu_virtio_ss.add(when: 'CONFIG_VIRTIO_IOMMU', if_true: files('virtio-iommu.c')) -softmmu_virtio_ss.add(when: 'CONFIG_VHOST_VDPA_DEV', if_true: files('vdpa-dev.c')) +system_virtio_ss = ss.source_set() +system_virtio_ss.add(files('virtio-bus.c')) +system_virtio_ss.add(when: 'CONFIG_VIRTIO_PCI', if_true: files('virtio-pci.c')) +system_virtio_ss.add(when: 'CONFIG_VIRTIO_MMIO', if_true: files('virtio-mmio.c')) +system_virtio_ss.add(when: 'CONFIG_VIRTIO_CRYPTO', if_true: files('virtio-crypto.c')) +system_virtio_ss.add(when: 'CONFIG_VHOST_VSOCK_COMMON', if_true: files('vhost-vsock-common.c')) +system_virtio_ss.add(when: 'CONFIG_VIRTIO_IOMMU', if_true: files('virtio-iommu.c')) +system_virtio_ss.add(when: 'CONFIG_VHOST_VDPA_DEV', if_true: files('vdpa-dev.c')) specific_virtio_ss = ss.source_set() specific_virtio_ss.add(files('virtio.c')) specific_virtio_ss.add(files('virtio-config-io.c', 'virtio-qmp.c')) if have_vhost - softmmu_virtio_ss.add(files('vhost.c')) + system_virtio_ss.add(files('vhost.c')) specific_virtio_ss.add(files('vhost-backend.c', 'vhost-iova-tree.c')) if have_vhost_user specific_virtio_ss.add(files('vhost-user.c')) endif if have_vhost_vdpa - softmmu_virtio_ss.add(files('vhost-vdpa.c')) + system_virtio_ss.add(files('vhost-vdpa.c')) specific_virtio_ss.add(files('vhost-shadow-virtqueue.c')) endif else - softmmu_virtio_ss.add(files('vhost-stub.c')) + system_virtio_ss.add(files('vhost-stub.c')) endif specific_virtio_ss.add(when: 'CONFIG_VIRTIO_BALLOON', if_true: files('virtio-balloon.c')) @@ -68,7 +68,7 @@ virtio_pci_ss.add(when: 'CONFIG_VIRTIO_MD', if_true: files('virtio-md-pci.c')) specific_virtio_ss.add_all(when: 'CONFIG_VIRTIO_PCI', if_true: virtio_pci_ss) -system_ss.add_all(when: 'CONFIG_VIRTIO', if_true: softmmu_virtio_ss) +system_ss.add_all(when: 'CONFIG_VIRTIO', if_true: system_virtio_ss) system_ss.add(when: 'CONFIG_VIRTIO', if_false: files('vhost-stub.c')) system_ss.add(when: 'CONFIG_VIRTIO', if_false: files('virtio-stub.c')) system_ss.add(when: 'CONFIG_ALL', if_true: files('vhost-stub.c'))