From nobody Sat May 18 05:34:39 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=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1684921114; cv=none; d=zohomail.com; s=zohoarc; b=L4aaJksD03nk1uM/Gb4Zv4Z9w8CC/ibEXW08JMCJGZqiit6nnZciByTFlYLRga87ZsFbWxMrSC/IfwMgUBHzPa1xUfuTZZGeYIXX46jo1nPradlsADhP2wrDr4Gzi6omvJoV+B0ANjEuw1F+8OQ/t25C9bkYjEna+dxxMdtbnhA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1684921114; h=Content-Type: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=NIcA0PvZwprADJczJqLbuRMLXgSZuvk7SexYJ3+yvxo=; b=Ihh1IWP04jl0H36vAdoyhQBB87YDuvhxT/5/bpvZoiO/JrQ0j0DltTK4yMceJrzIInbZXyKpeF7V3dsbm0vsrYZ6rqsuoDdCE/zwRYpAReeCb69VpxkkmZ0f++MQJqYVkkb8y9S5fphWl+ex1nuEuYXZFep4eznMzOQbYcoNLmc= 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 1684921114735336.068645205494; Wed, 24 May 2023 02:38:34 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q1kwV-0004hJ-If; Wed, 24 May 2023 05:38:03 -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 1q1kwT-0004S0-2n for qemu-devel@nongnu.org; Wed, 24 May 2023 05:38:01 -0400 Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q1kwQ-0006mf-JD for qemu-devel@nongnu.org; Wed, 24 May 2023 05:38:00 -0400 Received: by mail-wm1-x32c.google.com with SMTP id 5b1f17b1804b1-3f42ba32e24so6287065e9.3 for ; Wed, 24 May 2023 02:37:58 -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 b15-20020a5d4b8f000000b00306344eaebfsm13882355wrt.28.2023.05.24.02.37.53 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 24 May 2023 02:37:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1684921077; x=1687513077; 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=NIcA0PvZwprADJczJqLbuRMLXgSZuvk7SexYJ3+yvxo=; b=en5yceAZyLoK2aO/2T9Bnfvl5rgwZ49K3a6wWlI9mnaRFxqKIFZbxkNPzH+5UD2TlC yGshVDcVMTUEqdsWqsWXRDHtkTw//aFnDEcq5+LVmYgGyvWoylIPFzvHWwtraQ3BE4O7 w6iD5CLQfN5o9V325ZDO6oY4fsqIZDcj4Bf7s9sQoG1c22Xk14LinrB/wa23zWaquDCT D4ETy0ok8QvBHQZrYUj6H5aISQ8wIt2pE/ql7mOVyxPYP0yTpX+p1YyMXheEVU5QuC+g fANZV8T+riIrpoidczy1SO4zQSe5mNO4wMgo64LHv83zdPLq1bnhVxm+6Cx/ULt+aY/6 90iA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684921077; x=1687513077; 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=NIcA0PvZwprADJczJqLbuRMLXgSZuvk7SexYJ3+yvxo=; b=AhgxGRP3PjLBbAm/uYJ9BWF5Pw7vnGy/TKIACuzqLBy/UH+QsqOVfCofqN2RuwR815 MWWwkzhyHZL0QL0jOulWAaJs7bDJce0i3pig2atid+UoXiphCzi9mL7I7Wg5vxWIJ4G+ 2DKBJKujeEInaCSdOr5AEjctlJizYpLcOGOET1ZEwLLPCm1YZTVMLQeBbT1/O27JFyPN A0WJMwJGkQ1ktZyK6ueDpW+bmxdrJRXo5bQUNeUiLG3cNaO0PhiUYtxbRqZ9Yq3h0TeS yvFGD/iJL9lDRNJ1BfRndhMAk7UxqAIPQCxFSG7dDjsn288FpVRZR6bZHoyFaxeLST0F hStA== X-Gm-Message-State: AC+VfDyLLj4XtCHrMCgJZiq2DI08CatLZBJlj6Uje/SPcq+UF7chdJFd 3kPvkqlJjf4X/kwZESe3Y/VTuwINONdWGAy2t1ViFQ== X-Google-Smtp-Source: ACHHUZ7YhUt2Hr+g1TURD5z4FcGhjhi4JlpHkcV3PHm1xTU5qxWpPmha7XFyWaN2LNCz/BrW7R1SvQ== X-Received: by 2002:adf:f683:0:b0:304:8149:239b with SMTP id v3-20020adff683000000b003048149239bmr13080694wrp.50.1684921076839; Wed, 24 May 2023 02:37:56 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-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=20Mathieu-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 01/10] softmmu: Introduce qemu_target_page_mask() helper Date: Wed, 24 May 2023 11:37:35 +0200 Message-Id: <20230524093744.88442-2-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 Content-Type: text/plain; charset="utf-8" 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=2a00:1450:4864:20::32c; envelope-from=philmd@linaro.org; helo=mail-wm1-x32c.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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1684921116453100003 Since TARGET_PAGE_MASK is poisoned in target-agnostic code, introduce the qemu_target_page_mask() helper to get this value from target-agnostic code at runtime. Reviewed-by: Thomas Huth Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Alex Benn=C3=A9e Reviewed-by: Richard Henderson --- include/exec/target_page.h | 1 + softmmu/physmem.c | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/include/exec/target_page.h b/include/exec/target_page.h index bbf37aea17..98ffbb5c23 100644 --- a/include/exec/target_page.h +++ b/include/exec/target_page.h @@ -15,6 +15,7 @@ #define EXEC_TARGET_PAGE_H =20 size_t qemu_target_page_size(void); +int qemu_target_page_mask(void); int qemu_target_page_bits(void); int qemu_target_page_bits_min(void); =20 diff --git a/softmmu/physmem.c b/softmmu/physmem.c index 9d7e172260..8067742df0 100644 --- a/softmmu/physmem.c +++ b/softmmu/physmem.c @@ -3354,6 +3354,11 @@ size_t qemu_target_page_size(void) return TARGET_PAGE_SIZE; } =20 +int qemu_target_page_mask(void) +{ + return TARGET_PAGE_MASK; +} + int qemu_target_page_bits(void) { return TARGET_PAGE_BITS; --=20 2.38.1 From nobody Sat May 18 05:34:39 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=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1684921115; cv=none; d=zohomail.com; s=zohoarc; b=Se3I4+OUFNclN4kjZzYpuzCjwy0CkNgdEly6f93BoocyrMURUvCevdjnFhnDBUtUyuNPB6UFoitBTbTwdkryktTSryqQAQ6MHzr3ZHN4hDw0wUg67Hbnupgb3EZaQ1Nx/xcjWm76+C3D1duILeDsvkck/wdBJBlgOgTMPQLepnM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1684921115; h=Content-Type: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=lnZlj3i7pDAPQ4/SoUu9ZpheF+HMfcfUHEdU+g8AbV4=; b=Ozo7kgLNstHwV/YJWu4F86uNBMgIhoUh0ZrpwPYyDh8xoFVChNjXf8mk1cQPssJD97Q9GG52YMZtBEzsDh5sD6XIjF1w47xvxWSrWIeDaz/62cRscuenJw7NpXn1o5iKgQSXRrqEVocNZP5gayx1O706Byim8Dal6T726YyP5Oo= 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 1684921115879697.638996052618; Wed, 24 May 2023 02:38:35 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q1kwd-00059T-B2; Wed, 24 May 2023 05:38:11 -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 1q1kwZ-00056c-Tr for qemu-devel@nongnu.org; Wed, 24 May 2023 05:38:07 -0400 Received: from mail-wm1-x334.google.com ([2a00:1450:4864:20::334]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q1kwY-0006o1-4u for qemu-devel@nongnu.org; Wed, 24 May 2023 05:38:07 -0400 Received: by mail-wm1-x334.google.com with SMTP id 5b1f17b1804b1-3f623adec61so3116945e9.0 for ; Wed, 24 May 2023 02:38:04 -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 2-20020a05600c028200b003f42cc3262asm1652892wmk.34.2023.05.24.02.38.01 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 24 May 2023 02:38:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1684921083; x=1687513083; 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=lnZlj3i7pDAPQ4/SoUu9ZpheF+HMfcfUHEdU+g8AbV4=; b=OZZU2QTSCg/8tbuBctWLi/qUL4Fm9Hohcz2y6Mbv4cs32moaLIIlCOjFuwD/5rJJLX Tjeam4+GQEI/FoZRcVOXjTKvB/bJReZn73SIO398kXdcDvQh6pHEg9s1pjQgYLjOjhf2 xZzbh/zE6LUxJc+iP7yElzmW5UA3z7ZU1cdx8rrvMSBvShTLkXG48gXD+QafVLh5BG6G MO5XzYcCqEnA1CADu2L17JhrDU5uDOyILDfulZOk6OKjEMA6HLvdalAXFxZV74JND08d k4bt8BAgFABG0Z2z1T+7PLiG5lkjJ1lN74/6Ex5WLE/MWHESHgWRMuifPRAUHkCv6/h7 TO5Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684921083; x=1687513083; 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=lnZlj3i7pDAPQ4/SoUu9ZpheF+HMfcfUHEdU+g8AbV4=; b=GAkdbwwztj2SvBAoIAh1854eg7dPF/qDdQh76ZpmHY8ipMpytpfnBkgNz9BsMcUGQj U+5RiikWvGJT8SfNaTZp55WgkAB1+7sSxg0S+xiiT9tX8jw4oAHNp1AABgADQANJhY6F nJ8W0ppm5E2tRAv0FSoac/JLhB82wmvNl+iYJCsGj7YFrOqhqQ5w7G6r4Ari6ERu6F2R eLJIhNoDs2YSLMkqR83MP9qSllc1TgABD9TBEm8jyyEte1wXK0n3f+2QpAPjZlv8ToxP FG/Fi15jEDzEyEBAOeHVQ7m8EUcAvYeWO4D8W7ufosj4eMIL7MYGSEmNLmJ5Bevb4k8m 6oFw== X-Gm-Message-State: AC+VfDyrgeMms4B6lLhBReQhTe+kdjbhEbDSKhs7pqf5AzKK+kmVNDQs MxOFNqUMzcauUMZqyUD4XSaa3cB4Rf/Rxpp+i1dyuA== X-Google-Smtp-Source: ACHHUZ4hqzJfIXuj4E6k+El0K6W9ffO351mLM9orpTMPhzVXhkIIPudCWNaT/TNPO2gT+zbtj+mDiQ== X-Received: by 2002:a05:600c:2185:b0:3f6:459:eba3 with SMTP id e5-20020a05600c218500b003f60459eba3mr6773029wme.0.1684921083386; Wed, 24 May 2023 02:38:03 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-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=20Mathieu-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 02/10] hw/scsi: Introduce VHOST_SCSI_COMMON symbol in Kconfig Date: Wed, 24 May 2023 11:37:36 +0200 Message-Id: <20230524093744.88442-3-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 Content-Type: text/plain; charset="utf-8" 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=2a00:1450:4864:20::334; envelope-from=philmd@linaro.org; helo=mail-wm1-x334.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=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 @linaro.org) X-ZM-MESSAGEID: 1684921117735100007 Instead of adding 'vhost-scsi-common.c' twice (for VHOST_SCSI and VHOST_USER_SCSI), have it depend on VHOST_SCSI_COMMON, selected by both symbols. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Thomas Huth Reviewed-by: Richard Henderson Reviewed-by: Alex Benn=C3=A9e --- hw/scsi/Kconfig | 6 ++++++ hw/scsi/meson.build | 6 ++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/hw/scsi/Kconfig b/hw/scsi/Kconfig index e7b34dc8e2..1feab84c4c 100644 --- a/hw/scsi/Kconfig +++ b/hw/scsi/Kconfig @@ -48,13 +48,19 @@ config VIRTIO_SCSI depends on VIRTIO select SCSI =20 +config VHOST_SCSI_COMMON + bool + depends on VIRTIO + config VHOST_SCSI bool default y + select VHOST_SCSI_COMMON depends on VIRTIO && VHOST_KERNEL =20 config VHOST_USER_SCSI bool # Only PCI devices are provided for now default y if VIRTIO_PCI + select VHOST_SCSI_COMMON depends on VIRTIO && VHOST_USER && LINUX diff --git a/hw/scsi/meson.build b/hw/scsi/meson.build index 923a34f344..fa9198e69f 100644 --- a/hw/scsi/meson.build +++ b/hw/scsi/meson.build @@ -17,8 +17,10 @@ specific_scsi_ss =3D ss.source_set() =20 virtio_scsi_ss =3D ss.source_set() virtio_scsi_ss.add(files('virtio-scsi.c', 'virtio-scsi-dataplane.c')) -virtio_scsi_ss.add(when: 'CONFIG_VHOST_SCSI', if_true: files('vhost-scsi-c= ommon.c', 'vhost-scsi.c')) -virtio_scsi_ss.add(when: 'CONFIG_VHOST_USER_SCSI', if_true: files('vhost-s= csi-common.c', 'vhost-user-scsi.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-u= ser-scsi.c')) specific_scsi_ss.add_all(when: 'CONFIG_VIRTIO_SCSI', if_true: virtio_scsi_= ss) =20 specific_scsi_ss.add(when: 'CONFIG_SPAPR_VSCSI', if_true: files('spapr_vsc= si.c')) --=20 2.38.1 From nobody Sat May 18 05:34:39 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=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1684921118; cv=none; d=zohomail.com; s=zohoarc; b=mlOOxmFznBMvLHNYpneBiurLAKB869Gqatyjt9cV2Ccg1KEBozGFsUDN/S1THEUuiMS15x3st0FuUAo54i6b/j68xoVxw3Cgh6nnYYT04MGsOlrJDqLx9cuAwJSN4KalzO+3bMktPZJdhcfkplgC9neiO4vqYipkCBjdjcNdkBA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1684921118; h=Content-Type: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=mwQD6JYFIZC5qczhg65V50jxbUCRyR+PfLPe0OmMdzU=; b=HSHhGgi4PaY/l6bpn4GhyDV0kccA2WbW3jyKFqRg/sDjgCK+q1GcXxzkb974viY75CokLyd2F7l2DV4YQJgYVUEUVZUvxqrq61GoHtvx722xRw39k+G+EhW9uP8R3jsSjhPpksWDN0B8hYPBTX70utb8uUak+IUx/3Bkl8aQ/s0= 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 1684921118486141.62522515085163; Wed, 24 May 2023 02:38:38 -0700 (PDT) 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) 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) 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-Google-Smtp-Source: ACHHUZ5hz6IlMu9MCZrGCtSrrF2zQLXtkmChS4pTamf2DCZSzAdsK2C+8vt/osNLugk20BFzfNC51g== 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) From: =?UTF-8?q?Philippe=20Mathieu-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=20Mathieu-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 Content-Type: text/plain; charset="utf-8" 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=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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1684921119756100009 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=C3=A9 Reviewed-by: Alex Benn=C3=A9e Reviewed-by: Thomas Huth --- 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 =3D ss.source_set() +specific_scsi_ss =3D ss.source_set() +virtio_scsi_ss =3D 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', 'mp= tconfig.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) =20 -specific_scsi_ss =3D ss.source_set() - -virtio_scsi_ss =3D 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-u= ser-scsi.c')) + specific_scsi_ss.add_all(when: 'CONFIG_VIRTIO_SCSI', if_true: virtio_scsi_= ss) =20 specific_scsi_ss.add(when: 'CONFIG_SPAPR_VSCSI', if_true: files('spapr_vsc= si.c')) =20 +softmmu_ss.add_all(when: 'CONFIG_SCSI', if_true: scsi_ss) specific_ss.add_all(when: 'CONFIG_SCSI', if_true: specific_scsi_ss) --=20 2.38.1 From nobody Sat May 18 05:34:39 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=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1684921111; cv=none; d=zohomail.com; s=zohoarc; b=RQMPKll28FxdJQDcAzNwxsjpZ+QtKOBmpvqaoiLvuOvxQyx9lBVGDPBfouvihe9VheKQajp79QlcrMCcidQho2KhYo9Fx5Ny8Z6x7/NN/u1zbLTLRNeVjxEDAAXINZljR+HgoHvwTp4zq2FOfcDioqUNUCJn/f73Bsr15VkIJ90= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1684921111; h=Content-Type: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=F64YgIxEgVdDKFKSPKxj4a8a5AWO26EEsIqp9A+2/F4=; b=Od/CEZqCs/d8KvTqOQ3jCVSG0tvaL3BmT1PyVmrRslIfAH15uM4VVO5TQp3mfnTI2neqsqdqJUo3LUM9DSuDWecwhYWF3aOiFk0ilQ15Qj8Y4Hcr5ywad0ksaklma3ihKG4noWj1qUIvpKW7DTAjnqvWL4s4PcuhOXIqNXP+kYM= 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 1684921111407877.0581014265694; Wed, 24 May 2023 02:38:31 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q1kwp-0005wn-El; Wed, 24 May 2023 05:38:23 -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 1q1kwn-0005sT-9j for qemu-devel@nongnu.org; Wed, 24 May 2023 05:38:21 -0400 Received: from mail-wr1-x434.google.com ([2a00:1450:4864:20::434]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q1kwk-0006qI-Pj for qemu-devel@nongnu.org; Wed, 24 May 2023 05:38:21 -0400 Received: by mail-wr1-x434.google.com with SMTP id ffacd0b85a97d-3095557dd99so532252f8f.1 for ; Wed, 24 May 2023 02:38:18 -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 o2-20020a056000010200b002ca864b807csm14155965wrx.0.2023.05.24.02.38.14 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 24 May 2023 02:38:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1684921097; x=1687513097; 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=F64YgIxEgVdDKFKSPKxj4a8a5AWO26EEsIqp9A+2/F4=; b=NZ9jIWAtS2nS/bGVVaEE/gxWMRfc0ChqxVhLh6QeZPwgSvKSAPkyI8CopQfviUKl8a 0PlzbYBBo8ciaQhOXGf+wTF0Zf7IPQwUMAhHB2r3AtnQqXvNVoWSfVp7a9Bmprv0SH5C lwBVQ0bpINRAvPRUP/CLR5it5b220cGb/Cc7Kt9sjia6gk3QtyBv8KwysyTzkAzpZk9c NAN+MuD27AqvZ6dwPWmGKjGHVYbBlaOYnU0v91/q9waevijSfdVRZGcghdBs0doJhGR3 G766jZYwdFZ00ojqssoDDtq2EnyT/zDZ4TRi2kZX7/uugbA98lQyBqyWFBfXelTScFLp SDfg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684921097; x=1687513097; 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=F64YgIxEgVdDKFKSPKxj4a8a5AWO26EEsIqp9A+2/F4=; b=fiHM5LRYHYlVnE8Kbp/yrIkb28NTANVQPMHumXPWzkC8si7jo4ZyqHmzGZR7MxkgMc fwfE6EwwdVoZV2HyWlsdPDDUGLl15QNMB+mC8e8o5hV3bW6l2bnheZSzoYdow0q2i+QV ++4aSInlHOJm3mBOIiAODk9D+ie0x1StfTQ5+eUWlRSLWRptXuC78M36fTR7Np35d6XA lWJtWryRt5sfZ8J1MEtZsbA3EknADbtJ4szNd3jQ2cefekq8zvzd4Gfd483FL5BvePy5 BRMkG9NKZYalYuZGryE1Sl7dcephcT8XTnMG5qz43AnF69E9+DNAJxG8NsJKy6ps6K/s vfag== X-Gm-Message-State: AC+VfDx9H6tjNNRWTEQzE4SXssyTAAM0VZnRFiIXN9VZwkZRZWObF23m 2FUW9RJfr5avv88ny70tPvNoVgmN+j9xNcetYKoBrA== X-Google-Smtp-Source: ACHHUZ6QFUORH3vZejjJK4zwk83xvBP40cLwYNUzj7rChzOW/yOnrqt70YtcoHQlnaP/PKrU1+D+YQ== X-Received: by 2002:adf:f74d:0:b0:306:2b2b:8c56 with SMTP id z13-20020adff74d000000b003062b2b8c56mr11979140wrp.37.1684921096852; Wed, 24 May 2023 02:38:16 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-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=20Mathieu-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 04/10] hw/scsi: Rename target-specific source set as 'specific_virtio_scsi_ss' Date: Wed, 24 May 2023 11:37:38 +0200 Message-Id: <20230524093744.88442-5-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 Content-Type: text/plain; charset="utf-8" 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=2a00:1450:4864:20::434; envelope-from=philmd@linaro.org; helo=mail-wr1-x434.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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1684921112555100003 Following the SCSI variable named '[specific_]scsi_ss', rename the target-specific VirtIO/SCSI set prefixed with 'specific_'. This will help when adding target-agnostic VirtIO/SCSI set in few commits. No logical change. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Reviewed-by: Thomas Huth --- hw/scsi/meson.build | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/hw/scsi/meson.build b/hw/scsi/meson.build index f2da0bc5ae..bde72df19c 100644 --- a/hw/scsi/meson.build +++ b/hw/scsi/meson.build @@ -1,6 +1,6 @@ scsi_ss =3D ss.source_set() specific_scsi_ss =3D ss.source_set() -virtio_scsi_ss =3D ss.source_set() +specific_virtio_scsi_ss =3D ss.source_set() =20 scsi_ss.add(files( 'emulation.c', @@ -15,12 +15,12 @@ scsi_ss.add(when: 'CONFIG_MEGASAS_SCSI_PCI', if_true: f= iles('megasas.c')) scsi_ss.add(when: 'CONFIG_MPTSAS_SCSI_PCI', if_true: files('mptsas.c', 'mp= tconfig.c', 'mptendian.c')) scsi_ss.add(when: 'CONFIG_VMW_PVSCSI_SCSI_PCI', if_true: files('vmw_pvscsi= .c')) =20 -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-u= ser-scsi.c')) +specific_virtio_scsi_ss.add(files('virtio-scsi.c', 'virtio-scsi-dataplane.= c')) +specific_virtio_scsi_ss.add(when: 'CONFIG_VHOST_SCSI_COMMON', if_true: fil= es('vhost-scsi-common.c')) +specific_virtio_scsi_ss.add(when: 'CONFIG_VHOST_SCSI', if_true: files('vho= st-scsi.c')) +specific_virtio_scsi_ss.add(when: 'CONFIG_VHOST_USER_SCSI', if_true: files= ('vhost-user-scsi.c')) =20 -specific_scsi_ss.add_all(when: 'CONFIG_VIRTIO_SCSI', if_true: virtio_scsi_= ss) +specific_scsi_ss.add_all(when: 'CONFIG_VIRTIO_SCSI', if_true: specific_vir= tio_scsi_ss) =20 specific_scsi_ss.add(when: 'CONFIG_SPAPR_VSCSI', if_true: files('spapr_vsc= si.c')) =20 --=20 2.38.1 From nobody Sat May 18 05:34:39 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=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1684921153; cv=none; d=zohomail.com; s=zohoarc; b=MPYxnxQfZJx9QAUcYwbFIDyLVSH/QOZgN92Z5EOKaTIFBDKZ0szWviKCfskU025gdfEzuNwfkXu9y68kAXV5Ku25p8XD626Uj/D0igVtCRAF4LedwbTythRpSs8xAPf5Lc1zqEgMs626nmy8kfpknGjx5R+NIvQeRKwMb1kq5ds= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1684921153; h=Content-Type: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=wU1WpV67IYL3BYTiEXvsZGAK6CKVN9GrbnEP+5A6mow=; b=JBvrbdEfPi1CqBOALpVqxzS1rrpELoFhsJiWslqWOSvN1q3Ihdlgx8dpTvCskAa7wMkZpKoxEgPqDbMvZqavN7TQqMJd2YbtCbLnXSIhOJIz1+kljrRUiUzrUpWJ7W33DyURGkSsOJYjMeWAS5B/Qo7h7i5VOw0LCpVIRHhH2+E= 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 16849211536551023.6858104822668; Wed, 24 May 2023 02:39:13 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q1kwx-0006UV-KK; Wed, 24 May 2023 05:38:31 -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 1q1kwv-0006BC-9l for qemu-devel@nongnu.org; Wed, 24 May 2023 05:38:29 -0400 Received: from mail-wm1-x32f.google.com ([2a00:1450:4864:20::32f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q1kws-0006rS-C7 for qemu-devel@nongnu.org; Wed, 24 May 2023 05:38:28 -0400 Received: by mail-wm1-x32f.google.com with SMTP id 5b1f17b1804b1-3f607839b89so6273495e9.3 for ; Wed, 24 May 2023 02:38:25 -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 k16-20020a5d5190000000b003078c535277sm13766984wrv.91.2023.05.24.02.38.21 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 24 May 2023 02:38:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1684921104; x=1687513104; 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=wU1WpV67IYL3BYTiEXvsZGAK6CKVN9GrbnEP+5A6mow=; b=K/8Moi5dWE1duPrGDhW6dB+k0c1N+pKp8ldP/tKrPO8rws9weB9QWcclS22pQ5ORuj t9a0u9MHQbhdRn4eAWNZVShyQS1nIKB0UBOYU+P7LNf/OEP1/YtXxnulhPn021W/Jg0L 7CDD2LaRfUUv01XS5yIL3DJYOOKHR3C8cmg9dO8fN0cSv8KFBMYdYFjGKa9Qt8FrS+f6 VXC9Y2pOh7GgDHFQglAj4zc7lWT8OY6zi4e2kgFiuNfwrBlY1/l0cD9yaxRPDg8iYjvp 0/e1R6BLYHs2TG6v5Gle+8SNKBQaBvUjlLkQI4OFUjL85F9KoGEdhkoAj4pvhlPwAg6F 3RDw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684921104; x=1687513104; 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=wU1WpV67IYL3BYTiEXvsZGAK6CKVN9GrbnEP+5A6mow=; b=bnHtdfdDtkrHIq87w7tvOZkpCwQUSD20AEiz5MUrBQehP0OnPEL640Jo14A1i77KGK Z1uoaaQa0eYXqjZC234KrTft/T6OHxkEALwaq1/hjik8Pqf9YxGHPMitjIOYuLS+uIBT sK/STSbWCFzT6MGU9AEec7pZCTEkTztqXsHXcPreQtRuLBoiZNuF5pF/PyrANY+6XVPC AbbR2KKxh+iYL5E0ptr7rrCEJSu2CZOSjHX+jS4g5WRZAqoLucwAY5ETeIruQDTzf2J6 4m0QQzR/9aDKnsi+T4gUwWbJJ40aZXUgUcvswB8TXh7ZdN69ShpsxsezCRg0Pe16O5xm 8wxw== X-Gm-Message-State: AC+VfDzBwq3kjiyRlt0UnMWeKG/1NQ3LauaXlLoPavfwIv6GLZvDHaeE WkFyZwuabuwC40OdEmYtj1P1hXkG/zWgoy+QTaj6KQ== X-Google-Smtp-Source: ACHHUZ5+zFKvgYUMUc3LbcHXjC8s8bMB5kDhPfmGe8HFUo3v7qhumskRGMZguvtWQoHmgtygLljRJg== X-Received: by 2002:adf:d092:0:b0:307:c471:7b38 with SMTP id y18-20020adfd092000000b00307c4717b38mr11216415wrh.59.1684921104399; Wed, 24 May 2023 02:38:24 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-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=20Mathieu-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 05/10] hw/virtio: Introduce VHOST_VSOCK_COMMON symbol in Kconfig Date: Wed, 24 May 2023 11:37:39 +0200 Message-Id: <20230524093744.88442-6-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 Content-Type: text/plain; charset="utf-8" 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=2a00:1450:4864:20::32f; envelope-from=philmd@linaro.org; helo=mail-wm1-x32f.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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1684921154004100001 Instead of adding 'vhost-vsock-common.c' twice (for VHOST_VSOCK and VHOST_USER_VSOCK), have it depend on VHOST_VSOCK_COMMON, selected by both symbols. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Reviewed-by: Thomas Huth Reviewed-by: Alex Benn=C3=A9e Reviewed-by: Stefano Garzarella --- hw/virtio/Kconfig | 6 ++++++ hw/virtio/meson.build | 5 +++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/hw/virtio/Kconfig b/hw/virtio/Kconfig index 89e9e426d8..de7a35429a 100644 --- a/hw/virtio/Kconfig +++ b/hw/virtio/Kconfig @@ -56,14 +56,20 @@ config VIRTIO_MEM depends on VIRTIO_MEM_SUPPORTED select MEM_DEVICE =20 +config VHOST_VSOCK_COMMON + bool + depends on VIRTIO + config VHOST_VSOCK bool default y + select VHOST_VSOCK_COMMON depends on VIRTIO && VHOST_KERNEL =20 config VHOST_USER_VSOCK bool default y + select VHOST_VSOCK_COMMON depends on VIRTIO && VHOST_USER =20 config VHOST_USER_I2C diff --git a/hw/virtio/meson.build b/hw/virtio/meson.build index bdec78bfc6..54c90c24fb 100644 --- a/hw/virtio/meson.build +++ b/hw/virtio/meson.build @@ -23,8 +23,9 @@ specific_virtio_ss.add(when: 'CONFIG_VIRTIO_BALLOON', if_= true: files('virtio-bal specific_virtio_ss.add(when: 'CONFIG_VIRTIO_CRYPTO', if_true: files('virti= o-crypto.c')) specific_virtio_ss.add(when: 'CONFIG_VHOST_USER_FS', if_true: files('vhost= -user-fs.c')) specific_virtio_ss.add(when: 'CONFIG_VIRTIO_PMEM', if_true: files('virtio-= pmem.c')) -specific_virtio_ss.add(when: 'CONFIG_VHOST_VSOCK', if_true: files('vhost-v= sock.c', 'vhost-vsock-common.c')) -specific_virtio_ss.add(when: 'CONFIG_VHOST_USER_VSOCK', if_true: files('vh= ost-user-vsock.c', 'vhost-vsock-common.c')) +specific_virtio_ss.add(when: 'CONFIG_VHOST_VSOCK_COMMON', if_true: files('= vhost-vsock-common.c')) +specific_virtio_ss.add(when: 'CONFIG_VHOST_VSOCK', if_true: files('vhost-v= sock.c')) +specific_virtio_ss.add(when: 'CONFIG_VHOST_USER_VSOCK', if_true: files('vh= ost-user-vsock.c')) specific_virtio_ss.add(when: 'CONFIG_VIRTIO_RNG', if_true: files('virtio-r= ng.c')) specific_virtio_ss.add(when: 'CONFIG_VIRTIO_IOMMU', if_true: files('virtio= -iommu.c')) specific_virtio_ss.add(when: 'CONFIG_VIRTIO_MEM', if_true: files('virtio-m= em.c')) --=20 2.38.1 From nobody Sat May 18 05:34:39 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=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1684921155; cv=none; d=zohomail.com; s=zohoarc; b=OZvCLkAmMy9iL7gOaC7KJfy7xnS+rxEIWZQe1JQUJvxX5sxZzIgbHPUw6zCggOnzTHPD2nfuZPGsK0WCYmBGsLoOnkg44OERc1X8BEJJ3IC1oB55KTkh1HdmdwYxKpTI24fBtsylQ+oGo8Pw1Jhlz+N4n9VEmXxSQV2SDIlXTIU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1684921155; h=Content-Type: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=sD8LkN6PYocK+4LFobiH3Rbgv5aMaPCfkIOTcADWQcM=; b=Luh9LhcW9vxed+siUc+p6hoSvvyj6nCEfty1wowgbv5auq7IELu7IG71rnTkg6uTI59Y+cZS5USh+ag3MjPJCepoEUT8cfWAmWzoK17AacaWRUXxXMIaThbke5WKCakeFSFf/SSKQ6IkNHrXyjtNN7NSWcxOpKltjQnTf4/4VJk= 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 1684921155161532.3300595520113; Wed, 24 May 2023 02:39:15 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q1kx3-00071u-K8; Wed, 24 May 2023 05:38:37 -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 1q1kx1-0006tN-U5 for qemu-devel@nongnu.org; Wed, 24 May 2023 05:38:35 -0400 Received: from mail-wm1-x329.google.com ([2a00:1450:4864:20::329]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q1kwz-0006sr-G7 for qemu-devel@nongnu.org; Wed, 24 May 2023 05:38:35 -0400 Received: by mail-wm1-x329.google.com with SMTP id 5b1f17b1804b1-3f603d4bc5bso8702035e9.3 for ; Wed, 24 May 2023 02:38:33 -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 l5-20020a1c7905000000b003f4289b18a7sm1753181wme.5.2023.05.24.02.38.28 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 24 May 2023 02:38:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1684921111; x=1687513111; 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=sD8LkN6PYocK+4LFobiH3Rbgv5aMaPCfkIOTcADWQcM=; b=t5ZS5eHH7Za4n9Bz14C1Zm4CppR4RqeHROlfglbpyICimhk6WaMmXbjJo10duj+nXA 3wN1DafWuiueCU5T59SQG4DDMuzjw2/MAqDO/fRIVr5cbQ9Gge9P5prg0dZyIDsna8AZ oSZSHyqX10vODrzBcoDKgggcnum5jpBNtuGlA1RDKn86DDt3jlwJpGzjON+fXq/e/ZO0 8uYzHuyHKzlS+B4Tg30TcMUOhL+NPV+SCWVRAnG4DDKJ7PTyUSt0G1/T/KwEqNI6DyMw rlN2oW120/Y9VbujjsxT9iAPmIbLnIfQVK1jf5q1H7pMNQUj36I3wWltInZX5KDwHPOS fsiQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684921111; x=1687513111; 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=sD8LkN6PYocK+4LFobiH3Rbgv5aMaPCfkIOTcADWQcM=; b=TSf+R3tNSNxywEst3OmMzvnv24IAc2xC+FwYH7V35fy6S928cojNaSzJEwopysGxDE GDixDQs9bDm3mFmqsk3SOuEcAhzJTXjsX2o5fqU5JpmM6XYb2qErajtYklx5Opk8nLS6 1P7LWumCXwwPX/iTrxuhAhjg84ta9xg0r5L3fRE/FrDo1HRejw/r17ZJnQ/4rXYeqXro 9f0RkOKFRnbLmWJScB0HxfwzZ3U+/IiBOM5kcGmEGbncUFtpzSJgj+wgHz9MLHCCUq6V NYBiMGezobXSmWxWLdy98IqJ2P5iyDjbcyl4NO7caCW6wrvEXJnMQbjcmVT8rT/KA44n kxag== X-Gm-Message-State: AC+VfDzxg1SiflDTnmZ5dHSfB6q4d4OVDCM2bfIVMPvkPizdtG0SooMd t43iIzd6RNX9kugqhW5gPp2PjuLNX5O/wxfCiZtgbg== X-Google-Smtp-Source: ACHHUZ6TBRoEpUcZdsCb3+afqZEto6OBOPDZjVRhqXM21djblChTBXV4PKd+gWdR3x8iES/37Rm9zg== X-Received: by 2002:a05:600c:3655:b0:3f3:f7f0:2203 with SMTP id y21-20020a05600c365500b003f3f7f02203mr11925911wmq.12.1684921111471; Wed, 24 May 2023 02:38:31 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-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=20Mathieu-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 06/10] hw/virtio/virtio-mem: Use qemu_ram_get_fd() helper Date: Wed, 24 May 2023 11:37:40 +0200 Message-Id: <20230524093744.88442-7-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 Content-Type: text/plain; charset="utf-8" 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=2a00:1450:4864:20::329; envelope-from=philmd@linaro.org; helo=mail-wm1-x329.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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1684921156021100005 Avoid accessing RAMBlock internals, use the provided qemu_ram_get_fd() getter to get the file descriptor. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: David Hildenbrand Reviewed-by: Richard Henderson Reviewed-by: Alex Benn=C3=A9e --- hw/virtio/virtio-mem.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/virtio/virtio-mem.c b/hw/virtio/virtio-mem.c index 538b695c29..74e63bd47a 100644 --- a/hw/virtio/virtio-mem.c +++ b/hw/virtio/virtio-mem.c @@ -135,7 +135,7 @@ static bool virtio_mem_has_shared_zeropage(RAMBlock *rb) * anonymous RAM. In any other case, reading unplugged *can* populate a * fresh page, consuming actual memory. */ - return !qemu_ram_is_shared(rb) && rb->fd < 0 && + return !qemu_ram_is_shared(rb) && qemu_ram_get_fd(rb) < 0 && qemu_ram_pagesize(rb) =3D=3D qemu_real_host_page_size(); } #endif /* VIRTIO_MEM_HAS_LEGACY_GUESTS */ --=20 2.38.1 From nobody Sat May 18 05:34:39 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=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1684921137; cv=none; d=zohomail.com; s=zohoarc; b=ZSgtOZDAo7Kp8gMZrxb0piuoIB9eIcO8SMB0P18pk6+dBd6RIMto04SZYBmy4c9KJrTWvM647YPeEDaKsmwRGYtBYASV85d/sBMOQa3nckqcvZS2J5MkyGtPw2oMAr7mVdumFqOe8Vv6J2WlY9V5WEWB0ntxjw8on+5nnlPgTSQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1684921137; h=Content-Type: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=Y71HOv/BFUZkHdZXVOBhlaxJVZQ7sC8HQC7IQ2KJf9Q=; b=Px6BGDsDsu6RgDCsOKVq9o3YxdjkUy559/6/4au8MFLP21AGpU5UVwmLPDJQksgPwwLcHlvZz59AIvrI3gdOvkn5oG8YVZV7ONUDzmyVq/+MsUCvjcy4qtgUbaLrQ6eO5KZzQHWm30yXrtUE+KYamPNDlwWYuUXn5Oy7rbckCcg= 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 1684921137875801.9050523997272; Wed, 24 May 2023 02:38:57 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q1kx9-0007OC-Ht; Wed, 24 May 2023 05:38:43 -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 1q1kx8-0007KY-5y for qemu-devel@nongnu.org; Wed, 24 May 2023 05:38:42 -0400 Received: from mail-wm1-x330.google.com ([2a00:1450:4864:20::330]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q1kx6-0006us-90 for qemu-devel@nongnu.org; Wed, 24 May 2023 05:38:41 -0400 Received: by mail-wm1-x330.google.com with SMTP id 5b1f17b1804b1-3f607059b4eso6495055e9.0 for ; Wed, 24 May 2023 02:38:39 -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 s15-20020a7bc38f000000b003f6028a4c85sm1699924wmj.16.2023.05.24.02.38.35 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 24 May 2023 02:38:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1684921118; x=1687513118; 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=Y71HOv/BFUZkHdZXVOBhlaxJVZQ7sC8HQC7IQ2KJf9Q=; b=YGZTM+c7sLE0JiKyq7AgHGt+phLWINb+zVpdHtMaN+WBJJmBi3qaj91c1HH/Qba+dz pftvqQTTP1321ruQch2JqfUkO0gnDHk/16Lhh4Ljo/ZveaHAqnl6bMfE04TOJZy13+8g cEy2pGTYCjcjJBnWudC6KlprwdBcZRGcO7qocJJWymAA751/o1lIrMC/8O7/jMu+vPQb 9cGfkfJt5S0RtxSmyNCUWdw7aqbGchlsU7XnP47RkIJKq4p5EW7qtasPgAnl3E8cvkm4 LiyeEfG0Xi0QrVw6MvZWTs8wajhJUkVTcHEk8C0tOSZEP2aNW9X341UijcY+xit+p00Z eIvQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684921118; x=1687513118; 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=Y71HOv/BFUZkHdZXVOBhlaxJVZQ7sC8HQC7IQ2KJf9Q=; b=Hbg/MHIi1YhMoJ99IqkfNmrazNpCWsLDWyzpisyQvGaXPamdAyM9l5f69GZ+3OH+C0 JnBvaoGyJWEGH7wOd2IBsFiJLGOy+66q7MBU+BN6rLgR8Ed/8QOAz6ijplbA3JAxwkXG sz0gaKGKWxC/yRdgkXwVGO/9jHLAQF6qyotf0jJQhPTpQZzSBt0+CiAH9+lAEFfuO461 +UoHn+cTOlkaaSveNtLPpzu+e0MSpQg3QuNYy8FoLYs8q0kZbRqhcIBjcTfc8yBUsHuk LOphLi53z8NBkTAxPkdwt3AKwgs0CGcB/S2lfnfWYCvD3tYkRSzkA5nDVXOvS3RMw+2c jwaQ== X-Gm-Message-State: AC+VfDw75nfI26CYgW7lEna/FNT7bpFdvNRRF1yEjVFeyNDHBPVy4XEU Cs3aWtsxaxxnjiRnSeEyOim4zX1aYZlAOiLARfu4yw== X-Google-Smtp-Source: ACHHUZ4InGUVxY496ApUzCVRzRcf31lN/0Po/KZlQp0oYEGy/KA/fSZME899G9nLPt1uw9slJjjGOQ== X-Received: by 2002:a1c:7503:0:b0:3f4:fffc:cd74 with SMTP id o3-20020a1c7503000000b003f4fffccd74mr12493082wmc.16.1684921118195; Wed, 24 May 2023 02:38:38 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-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=20Mathieu-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 07/10] hw/virtio/vhost-vsock: Include missing 'virtio/virtio-bus.h' header Date: Wed, 24 May 2023 11:37:41 +0200 Message-Id: <20230524093744.88442-8-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 Content-Type: text/plain; charset="utf-8" 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=2a00:1450:4864:20::330; envelope-from=philmd@linaro.org; helo=mail-wm1-x330.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=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 @linaro.org) X-ZM-MESSAGEID: 1684921139821100003 Instead of having "virtio/virtio-bus.h" implicitly included, explicitly include it, to avoid when rearranging headers: hw/virtio/vhost-vsock-common.c: In function =E2=80=98vhost_vsock_common_s= tart=E2=80=99: hw/virtio/vhost-vsock-common.c:51:5: error: unknown type name =E2=80=98Vi= rtioBusClass=E2=80=99; did you mean =E2=80=98VirtioDeviceClass=E2=80=99? 51 | VirtioBusClass *k =3D VIRTIO_BUS_GET_CLASS(qbus); | ^~~~~~~~~~~~~~ | VirtioDeviceClass hw/virtio/vhost-vsock-common.c:51:25: error: implicit declaration of func= tion =E2=80=98VIRTIO_BUS_GET_CLASS=E2=80=99; did you mean =E2=80=98VIRTIO_D= EVICE_CLASS=E2=80=99? [-Werror=3Dimplicit-function-declaration] 51 | VirtioBusClass *k =3D VIRTIO_BUS_GET_CLASS(qbus); | ^~~~~~~~~~~~~~~~~~~~ | VIRTIO_DEVICE_CLASS Reviewed-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Thomas Huth Reviewed-by: Alex Benn=C3=A9e Reviewed-by: Stefano Garzarella --- hw/virtio/vhost-vsock-common.c | 1 + 1 file changed, 1 insertion(+) diff --git a/hw/virtio/vhost-vsock-common.c b/hw/virtio/vhost-vsock-common.c index d2b5519d5a..e89af9b329 100644 --- a/hw/virtio/vhost-vsock-common.c +++ b/hw/virtio/vhost-vsock-common.c @@ -11,6 +11,7 @@ #include "qemu/osdep.h" #include "standard-headers/linux/virtio_vsock.h" #include "qapi/error.h" +#include "hw/virtio/virtio-bus.h" #include "hw/virtio/virtio-access.h" #include "qemu/error-report.h" #include "hw/qdev-properties.h" --=20 2.38.1 From nobody Sat May 18 05:34:39 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=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1684921162; cv=none; d=zohomail.com; s=zohoarc; b=bFCzchnl3QM52ADTQFcd2qOQ/1yT0Xk4linRgFb06ANZB+0dRQcy3B9/hGC7kCAvMHIKYiy/gA2OC4yVIzJPgV0gg2bMPJZ9nZNT9kwcMoxumyGmCV26d9fQzOtiOKISMWdXstURKOYm2ZWrJ/VCbW4qWhsXG+WD32LQ1XuYUZ4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1684921162; h=Content-Type: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=rA2E0VH092ZQeXxfwZplt9KPxzZ4le7EuV+DMB+BMgk=; b=M3dh8cOIdTJB/341DhBx4HMj+QFOIM4PUZhqsD7EmWsj2xiTMqWieFEpusbneYz0jEBJ57wjr+0Y8hO0Wz+tW4HejI19C4481qZGr4RCpJ/WTCk0KWtkR0wb2dq81CTkbPutO/B0AdZH3gy5ucP3UD1S6/pttk2aI8AhbAc0U9Q= 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 1684921162861397.368306473365; Wed, 24 May 2023 02:39:22 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q1kxH-0007tO-3s; Wed, 24 May 2023 05:38: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 1q1kxF-0007oY-NK for qemu-devel@nongnu.org; Wed, 24 May 2023 05:38:49 -0400 Received: from mail-wr1-x42b.google.com ([2a00:1450:4864:20::42b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q1kxD-0006xf-AF for qemu-devel@nongnu.org; Wed, 24 May 2023 05:38:49 -0400 Received: by mail-wr1-x42b.google.com with SMTP id ffacd0b85a97d-309550263e0so547523f8f.2 for ; Wed, 24 May 2023 02:38:46 -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 n1-20020a5d4001000000b003062ad45243sm13930442wrp.14.2023.05.24.02.38.42 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 24 May 2023 02:38:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1684921125; x=1687513125; 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=rA2E0VH092ZQeXxfwZplt9KPxzZ4le7EuV+DMB+BMgk=; b=bzdCTHDsrFLbd4FeluP1rhAMBAe2glkBNYTtOouvC2Ix8rLijsTEWUSChBgsJTrl1a XBQDoXcB0BfwcN2hQaHEpjBuXmd/XlkIGbtoGjpn3/PIq5VV9jdSFD40Eex7fstf0KE1 Cg2aOFbO4sN0WtF4Jol8j9HMPZmsyYuFLpn46+ILTpKvGS4ExuYQLykA4cqBGlvbz1IZ 9Z7SAj3zV6ECrmcI+9ZVCa7WDjJYX2lJ2z2POjjbiZvhpJuGhQDBdvb9hrg7dgob2Yrs FahIT5loF6cdmkhEWHww8gdwLiA0why4oM6DEWd11pWfCLWlM1zfwsgwcmsOvn3qRUrl PUQg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684921125; x=1687513125; 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=rA2E0VH092ZQeXxfwZplt9KPxzZ4le7EuV+DMB+BMgk=; b=A/+2svSm0LhVjzDyq7fbJ7rJHyCBtPLKGnrHQvAkBsPa74IWFjB9cdUq04wZlHDYT7 H1TCFZk3U3BXYn+iIWF7vOM2pmcNT6QGnDGPcXzmtyL/7/azHzy++VnPYAon9+6VPXEm GBZTanaqa71Xbd5S3+XV84HuSDD/WZayC89zfgAcsFEuKuFtkAzm/jtjWCOxkIZxRJGs WFFY4/oaVPLnS+QyrOP1R96TOghCDFIqiJ2VE321pm8E5H3dfRWckKD2YIZ7xpvKR7Up PeDTV2F3TrCFioR5XXyMLuCChjctHukdfagnP+Aun0Q53QhH+AzQ+JFgNfFwjWdUuSKS tCZw== X-Gm-Message-State: AC+VfDyKWLDaDSQqTYQkfpNozKNslyShO5Wt+mht64dGJxvEGO04NqDa YRG76eV6bcrPw+xbxf8M7Xlb0mcnKt+5TvxXl5PjrQ== X-Google-Smtp-Source: ACHHUZ6TYI0DOmuhsVAEhHLB5hzw3penXJFGd/CLW6IZ6v5pLoUxmF8Sxkq1uYjmWqDHz3nXh43zhw== X-Received: by 2002:adf:ee44:0:b0:309:421a:192c with SMTP id w4-20020adfee44000000b00309421a192cmr11263859wro.7.1684921125488; Wed, 24 May 2023 02:38:45 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-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=20Mathieu-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 08/10] hw/virtio/virtio-iommu: Use target-agnostic qemu_target_page_mask() Date: Wed, 24 May 2023 11:37:42 +0200 Message-Id: <20230524093744.88442-9-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 Content-Type: text/plain; charset="utf-8" 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=2a00:1450:4864:20::42b; envelope-from=philmd@linaro.org; helo=mail-wr1-x42b.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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1684921164704100003 In order to have virtio-iommu.c become target-agnostic, we need to avoid using TARGET_PAGE_MASK. Get it with the qemu_target_page_mask() helper. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Reviewed-by: Eric Auger Reviewed-by: Alex Benn=C3=A9e --- hw/virtio/virtio-iommu.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hw/virtio/virtio-iommu.c b/hw/virtio/virtio-iommu.c index 1cd258135d..85905a9e3d 100644 --- a/hw/virtio/virtio-iommu.c +++ b/hw/virtio/virtio-iommu.c @@ -20,6 +20,7 @@ #include "qemu/osdep.h" #include "qemu/log.h" #include "qemu/iov.h" +#include "exec/target_page.h" #include "hw/qdev-properties.h" #include "hw/virtio/virtio.h" #include "sysemu/kvm.h" @@ -1164,7 +1165,7 @@ static void virtio_iommu_device_realize(DeviceState *= dev, Error **errp) * in vfio realize */ s->config.bypass =3D s->boot_bypass; - s->config.page_size_mask =3D TARGET_PAGE_MASK; + s->config.page_size_mask =3D qemu_target_page_mask(); s->config.input_range.end =3D UINT64_MAX; s->config.domain_range.end =3D UINT32_MAX; s->config.probe_size =3D VIOMMU_PROBE_SIZE; --=20 2.38.1 From nobody Sat May 18 05:34:39 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=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1684921157; cv=none; d=zohomail.com; s=zohoarc; b=EAhu6fHZpj95RBtzAB9tIsU3R0vp9ZJA0TelUh9e9cJZtxa5mcoGsGibMXqBC/TVYJk79UqF5vRtyFczcz+I9uy8rJu3C2oNNmbMimX5WnmNRIZSvqpnoT2V6bFNbNg5RUylRR+EOOueze6k/xlkLGdoXq1yoDELRL6ByUJpGS8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1684921157; h=Content-Type: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=L/JwS6FTcZAmFyGBOIMDJAjNiVsKo6s2wZtG1yzHHqw=; b=g2S/HQTRVhSx3G1WD1f9+t07AuBmXG4GkAQVx7o7689Lqy1CTKNweW00gACX+iLK6u2p3nzA17Bp3/QKYfpDioYBjPn8f3BlzsJgcZVotRPL+O01AyTUQuspGCoZdIhtWSGAchd+z4SKT5kK30rraTo26HufqfsXWLDGaomuHzM= 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 16849211574011022.445106377644; Wed, 24 May 2023 02:39:17 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q1kxb-0001pl-VU; Wed, 24 May 2023 05:39:13 -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 1q1kxa-0001cm-8p for qemu-devel@nongnu.org; Wed, 24 May 2023 05:39:10 -0400 Received: from mail-wr1-x42d.google.com ([2a00:1450:4864:20::42d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q1kxK-0006yp-Jy for qemu-devel@nongnu.org; Wed, 24 May 2023 05:39:09 -0400 Received: by mail-wr1-x42d.google.com with SMTP id ffacd0b85a97d-30957dd7640so380658f8f.3 for ; Wed, 24 May 2023 02:38:54 -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 j16-20020adff550000000b0030aa9e4fda3sm1768532wrp.12.2023.05.24.02.38.50 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 24 May 2023 02:38:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1684921132; x=1687513132; 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=L/JwS6FTcZAmFyGBOIMDJAjNiVsKo6s2wZtG1yzHHqw=; b=QM3vZeIe6leYAJm5DeIPrWHTxipcM8aYEAUvaIIDc+sxYZy9UIcF9PixOmpuvNMHNt 2buVQhTnX04izYYSDvGv18R8rKoF26AFBxYbms3gSrD8foSGps3JjHG8vqztbxsMy52p AP+avTn6pYm+fyW+CHVEtOYUPNG2Us2qv8FpPoqc2LxOitxsGEAu6IOwWWBCTB8+KsRg HIEgkLj+0QsLooI5/AsDtzOI/LUxGsqWF1w0IaRool33mOruwE8ZN+hY8N7uvhQb2mHw TE3vaJuqaDXwS5npJD5AYdU/JQ2onKwJRxrkPK+tGqDVIj2Q03Z4s0iOg2yF1rssd8Xn vV5g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684921132; x=1687513132; 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=L/JwS6FTcZAmFyGBOIMDJAjNiVsKo6s2wZtG1yzHHqw=; b=VCHmfMKI49sjsSl6aP8RjgMPzbS6bWqCUBSKyDTCoaFC5ivgwpK3wJ4RYrGGZmWj9e 3HXPFVZE6oUTdPfu7aNbN/jXOL21ErDISqRsrhhgtrMrEn2X+gXAvdkEGWM6Jvnmi3bP Fe+73IBz+W2k41tRgF8mA2njfKF2LsXantyN0njPd+8VsSjeMoShYlH9d/fZZ8I4g70G g/6qJ5EWrpT8P0VeU20Wcd1nXwoCHan/wsrdpFFWeLQArGLUA3gKpDhWmbRKA8AYLFn0 oT/NahKl19o3FmWf33jGjqFY5WSiVkjZNzP6FqnS5MCzlpLFpWLzu9Bz9bi3pZUIrS23 dmVw== X-Gm-Message-State: AC+VfDwrhmyd8dE8djXu0J1pvnbXBsm2cHUvP7y1dm5fedYUZjuQiovX W1DWex404TmaT5ZKYnWHRIITSbDd+t4k0PPnARImaA== X-Google-Smtp-Source: ACHHUZ6mAGDUHOmJ0FnzLm44Bcwq9f0OTmyF7lGkNTnlcI8Y9Y48973dJ8ntk1jVYaV5yPzNHA5krQ== X-Received: by 2002:adf:e60b:0:b0:309:a4e:52d3 with SMTP id p11-20020adfe60b000000b003090a4e52d3mr13323734wrm.5.1684921132727; Wed, 24 May 2023 02:38:52 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-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=20Mathieu-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 09/10] hw/virtio: Remove unnecessary 'virtio-access.h' header Date: Wed, 24 May 2023 11:37:43 +0200 Message-Id: <20230524093744.88442-10-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 Content-Type: text/plain; charset="utf-8" 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=2a00:1450:4864:20::42d; envelope-from=philmd@linaro.org; helo=mail-wr1-x42d.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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1684921158746100011 None of these files use the VirtIO Load/Store API declared by "hw/virtio/virtio-access.h". This header probably crept in via copy/pasting, remove it. Note, "virtio-access.h" is target-specific, so any file including it also become tainted as target-specific. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Acked-by: Richard Henderson Tested-by: Thomas Huth Reviewed-by: Alex Benn=C3=A9e --- hw/block/dataplane/virtio-blk.c | 1 - hw/s390x/virtio-ccw.c | 1 - hw/scsi/vhost-scsi.c | 1 - hw/scsi/vhost-user-scsi.c | 1 - hw/scsi/virtio-scsi-dataplane.c | 1 - hw/virtio/vdpa-dev.c | 1 - hw/virtio/vhost-vdpa.c | 1 - hw/virtio/vhost-vsock-common.c | 1 - hw/virtio/vhost.c | 1 - hw/virtio/virtio-crypto.c | 1 - hw/virtio/virtio-iommu.c | 1 - hw/virtio/virtio-mem.c | 1 - 12 files changed, 12 deletions(-) diff --git a/hw/block/dataplane/virtio-blk.c b/hw/block/dataplane/virtio-bl= k.c index af1c24c40c..03ecb51664 100644 --- a/hw/block/dataplane/virtio-blk.c +++ b/hw/block/dataplane/virtio-blk.c @@ -19,7 +19,6 @@ #include "qemu/main-loop.h" #include "qemu/thread.h" #include "qemu/error-report.h" -#include "hw/virtio/virtio-access.h" #include "hw/virtio/virtio-blk.h" #include "virtio-blk.h" #include "block/aio.h" diff --git a/hw/s390x/virtio-ccw.c b/hw/s390x/virtio-ccw.c index f44de1a8c1..17c548b84f 100644 --- a/hw/s390x/virtio-ccw.c +++ b/hw/s390x/virtio-ccw.c @@ -22,7 +22,6 @@ #include "qemu/error-report.h" #include "qemu/log.h" #include "qemu/module.h" -#include "hw/virtio/virtio-access.h" #include "hw/virtio/virtio-bus.h" #include "hw/s390x/adapter.h" #include "hw/s390x/s390_flic.h" diff --git a/hw/scsi/vhost-scsi.c b/hw/scsi/vhost-scsi.c index 6a0fd0dfb1..443f67daa4 100644 --- a/hw/scsi/vhost-scsi.c +++ b/hw/scsi/vhost-scsi.c @@ -26,7 +26,6 @@ #include "hw/virtio/vhost.h" #include "hw/virtio/virtio-scsi.h" #include "hw/virtio/virtio-bus.h" -#include "hw/virtio/virtio-access.h" #include "hw/fw-path-provider.h" #include "hw/qdev-properties.h" #include "qemu/cutils.h" diff --git a/hw/scsi/vhost-user-scsi.c b/hw/scsi/vhost-user-scsi.c index b7a71a802c..ee99b19e7a 100644 --- a/hw/scsi/vhost-user-scsi.c +++ b/hw/scsi/vhost-user-scsi.c @@ -26,7 +26,6 @@ #include "hw/virtio/vhost-backend.h" #include "hw/virtio/vhost-user-scsi.h" #include "hw/virtio/virtio.h" -#include "hw/virtio/virtio-access.h" #include "chardev/char-fe.h" #include "sysemu/sysemu.h" =20 diff --git a/hw/scsi/virtio-scsi-dataplane.c b/hw/scsi/virtio-scsi-dataplan= e.c index f3214e1c57..21344c7cfe 100644 --- a/hw/scsi/virtio-scsi-dataplane.c +++ b/hw/scsi/virtio-scsi-dataplane.c @@ -19,7 +19,6 @@ #include "hw/scsi/scsi.h" #include "scsi/constants.h" #include "hw/virtio/virtio-bus.h" -#include "hw/virtio/virtio-access.h" =20 /* Context: QEMU global mutex held */ void virtio_scsi_dataplane_setup(VirtIOSCSI *s, Error **errp) diff --git a/hw/virtio/vdpa-dev.c b/hw/virtio/vdpa-dev.c index 01b41eb0f1..e08e830006 100644 --- a/hw/virtio/vdpa-dev.c +++ b/hw/virtio/vdpa-dev.c @@ -25,7 +25,6 @@ #include "hw/virtio/vhost.h" #include "hw/virtio/virtio.h" #include "hw/virtio/virtio-bus.h" -#include "hw/virtio/virtio-access.h" #include "hw/virtio/vdpa-dev.h" #include "sysemu/sysemu.h" #include "sysemu/runstate.h" diff --git a/hw/virtio/vhost-vdpa.c b/hw/virtio/vhost-vdpa.c index b3094e8a8b..3c575a9a6e 100644 --- a/hw/virtio/vhost-vdpa.c +++ b/hw/virtio/vhost-vdpa.c @@ -26,7 +26,6 @@ #include "cpu.h" #include "trace.h" #include "qapi/error.h" -#include "hw/virtio/virtio-access.h" =20 /* * Return one past the end of the end of section. Be careful with uint64_t diff --git a/hw/virtio/vhost-vsock-common.c b/hw/virtio/vhost-vsock-common.c index e89af9b329..321262f6b3 100644 --- a/hw/virtio/vhost-vsock-common.c +++ b/hw/virtio/vhost-vsock-common.c @@ -12,7 +12,6 @@ #include "standard-headers/linux/virtio_vsock.h" #include "qapi/error.h" #include "hw/virtio/virtio-bus.h" -#include "hw/virtio/virtio-access.h" #include "qemu/error-report.h" #include "hw/qdev-properties.h" #include "hw/virtio/vhost.h" diff --git a/hw/virtio/vhost.c b/hw/virtio/vhost.c index 23da579ce2..7f3c727777 100644 --- a/hw/virtio/vhost.c +++ b/hw/virtio/vhost.c @@ -23,7 +23,6 @@ #include "qemu/log.h" #include "standard-headers/linux/vhost_types.h" #include "hw/virtio/virtio-bus.h" -#include "hw/virtio/virtio-access.h" #include "migration/blocker.h" #include "migration/qemu-file-types.h" #include "sysemu/dma.h" diff --git a/hw/virtio/virtio-crypto.c b/hw/virtio/virtio-crypto.c index c729a1f79e..a6d7e1e8ec 100644 --- a/hw/virtio/virtio-crypto.c +++ b/hw/virtio/virtio-crypto.c @@ -21,7 +21,6 @@ #include "hw/virtio/virtio.h" #include "hw/virtio/virtio-crypto.h" #include "hw/qdev-properties.h" -#include "hw/virtio/virtio-access.h" #include "standard-headers/linux/virtio_ids.h" #include "sysemu/cryptodev-vhost.h" =20 diff --git a/hw/virtio/virtio-iommu.c b/hw/virtio/virtio-iommu.c index 85905a9e3d..1bbad23f4a 100644 --- a/hw/virtio/virtio-iommu.c +++ b/hw/virtio/virtio-iommu.c @@ -32,7 +32,6 @@ #include "standard-headers/linux/virtio_ids.h" =20 #include "hw/virtio/virtio-bus.h" -#include "hw/virtio/virtio-access.h" #include "hw/virtio/virtio-iommu.h" #include "hw/pci/pci_bus.h" #include "hw/pci/pci.h" diff --git a/hw/virtio/virtio-mem.c b/hw/virtio/virtio-mem.c index 74e63bd47a..12ea58d5ad 100644 --- a/hw/virtio/virtio-mem.c +++ b/hw/virtio/virtio-mem.c @@ -20,7 +20,6 @@ #include "sysemu/reset.h" #include "hw/virtio/virtio.h" #include "hw/virtio/virtio-bus.h" -#include "hw/virtio/virtio-access.h" #include "hw/virtio/virtio-mem.h" #include "qapi/error.h" #include "qapi/visitor.h" --=20 2.38.1 From nobody Sat May 18 05:34:39 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=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1684921164; cv=none; d=zohomail.com; s=zohoarc; b=CVSzo3Kgzn64nr1N3RNU8VpwRWtGe9dpfwOHXX8EhhiRbeX9QqMQXuYyBrxvT3QEEyIyViA8mlitod2LwV3P0mm7ueVPb4lSKwD07ty7OiVQ8JsuOTezVIzB6xrzY7KKZ938Fe/q3B+IrQ6bamNxMTZ7yRKUD0D7IYqR9ljHyD0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1684921164; h=Content-Type: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=Mq4YpeTTGgX3+hW0ZwEiJf3J4kjmHxbt+ccYiWbLpbg=; b=S8dufnZYGy4BXgz/H1x7I0gbl7Ke6M3z7ukYh1vMkhAEorCb6lPbqd3D7UAFwBY2QmIEL+l3sbpk/x0gSrn0OQM6jiimO9+L5ultJEgaR6v3PtMKzEtJ4vOYOt0f9jy5WOYhtlCPzUF8Lj5qffQQSwpbm67RxK1x62/xPD5+yHU= 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 168492116475792.60716115201126; Wed, 24 May 2023 02:39:24 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q1kxW-00014N-5f; Wed, 24 May 2023 05:39:06 -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 1q1kxV-0000yD-2A for qemu-devel@nongnu.org; Wed, 24 May 2023 05:39:05 -0400 Received: from mail-wr1-x436.google.com ([2a00:1450:4864:20::436]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q1kxR-0006zu-Sy for qemu-devel@nongnu.org; Wed, 24 May 2023 05:39:04 -0400 Received: by mail-wr1-x436.google.com with SMTP id ffacd0b85a97d-3095557dd99so532986f8f.1 for ; Wed, 24 May 2023 02:39:01 -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 c12-20020adfe70c000000b003078cd719ffsm13824436wrm.95.2023.05.24.02.38.57 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 24 May 2023 02:38:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1684921140; x=1687513140; 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=Mq4YpeTTGgX3+hW0ZwEiJf3J4kjmHxbt+ccYiWbLpbg=; b=HyxCj8+KfTT7qH8JyGXM1WCSmjGlPtqr3zhnUarUPcMGKOddeKk/dv4z292dLAegVa IRGMpIhkntvAZ5w5xBS9JKXRhx3fNN8XsLkqkYRGgGSOzM9qTT0tKSYTemY9uHEKigwH aMIawwkKzVc+xKkc/0n5USZC2/vc4LfdVSglSs5QVmMxy2yUCdUbqfr8bEsm4Zs4b1VN TqB1nmATTE9WQPaEXNu8BTNuRre+2qs9jyta/g516tJduLsYsWdUeF1xPZIJ2fQ6bion J3hZlu/7+iRSGtCsdDEJqIr3/2Roi1gS8wykwjlxxM1KAKXE+OjQTsnTE/hTyhlRyJkn /9OQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684921140; x=1687513140; 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=Mq4YpeTTGgX3+hW0ZwEiJf3J4kjmHxbt+ccYiWbLpbg=; b=PDg5Fm6L1SLLUwM3jxJEBf/FPBP2MArfIq6HfV88isP0fc4H4kA9u8Rs3rdm/wjrTb fkg5ls5ecLqeHAgEBacn7beWCsUIT0SYsr8DGff1tjtbl046uS19A0Y0Ktib7O/nTEzw anz9QY9fqlUyILwfBjZ4QWhPXUeA2FUigLKM8Z+wulzKLdK9WFnUPfgsvQVtxZZ5b3pI ymPZP8ARd4TmgJs+SU1PYm41ipkGaUSiPG2TCnnMTY5EVP9XtDDCY4S6acylWqfT9SX7 CThu+iLzgIZF0kL++bO4jNLcxIzccHh3a/ZRFkEUUQuhJ/hj2f2nUuBcTBhQ0FFSwx9M 5AnA== X-Gm-Message-State: AC+VfDzyJRFbCgPGA+ASNqvXGfruavAgIJXyzcpNWOGiRwrTMrJMFQnx DBvFy7aK/atsKCusM+H3edIh4R0tI4uUgk5iUq7bAA== X-Google-Smtp-Source: ACHHUZ4AvGOukVHn/+bZ5TAoNO5IaqzrTM9lmUdH6Iifw2s2UGq0hsOmyrnupIiXuIOqmUbg9m+N/A== X-Received: by 2002:a5d:4109:0:b0:309:4ba8:f76e with SMTP id l9-20020a5d4109000000b003094ba8f76emr10834680wrp.26.1684921139882; Wed, 24 May 2023 02:38:59 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-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=20Mathieu-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 10/10] hw/virtio: Build various target-agnostic objects just once Date: Wed, 24 May 2023 11:37:44 +0200 Message-Id: <20230524093744.88442-11-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 Content-Type: text/plain; charset="utf-8" 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=2a00:1450:4864:20::436; envelope-from=philmd@linaro.org; helo=mail-wr1-x436.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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1684921166100100005 The previous commit remove the unnecessary "virtio-access.h" header. These files no longer have target-specific dependency. Move them to the generic 'softmmu_ss' source set. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Reviewed-by: Thomas Huth --- hw/block/dataplane/meson.build | 2 +- hw/scsi/meson.build | 10 +++++++--- hw/virtio/meson.build | 11 ++++++----- 3 files changed, 14 insertions(+), 9 deletions(-) diff --git a/hw/block/dataplane/meson.build b/hw/block/dataplane/meson.build index 78d7ac1a11..dec73e7486 100644 --- a/hw/block/dataplane/meson.build +++ b/hw/block/dataplane/meson.build @@ -1,2 +1,2 @@ -specific_ss.add(when: 'CONFIG_VIRTIO_BLK', if_true: files('virtio-blk.c')) +softmmu_ss.add(when: 'CONFIG_VIRTIO_BLK', if_true: files('virtio-blk.c')) specific_ss.add(when: 'CONFIG_XEN_BUS', if_true: files('xen-block.c')) diff --git a/hw/scsi/meson.build b/hw/scsi/meson.build index bde72df19c..4c8fa50783 100644 --- a/hw/scsi/meson.build +++ b/hw/scsi/meson.build @@ -1,5 +1,6 @@ scsi_ss =3D ss.source_set() specific_scsi_ss =3D ss.source_set() +virtio_scsi_ss =3D ss.source_set() specific_virtio_scsi_ss =3D ss.source_set() =20 scsi_ss.add(files( @@ -15,12 +16,15 @@ scsi_ss.add(when: 'CONFIG_MEGASAS_SCSI_PCI', if_true: f= iles('megasas.c')) scsi_ss.add(when: 'CONFIG_MPTSAS_SCSI_PCI', if_true: files('mptsas.c', 'mp= tconfig.c', 'mptendian.c')) scsi_ss.add(when: 'CONFIG_VMW_PVSCSI_SCSI_PCI', if_true: files('vmw_pvscsi= .c')) =20 -specific_virtio_scsi_ss.add(files('virtio-scsi.c', 'virtio-scsi-dataplane.= c')) +virtio_scsi_ss.add(files('virtio-scsi-dataplane.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-u= ser-scsi.c')) + +specific_virtio_scsi_ss.add(files('virtio-scsi.c')) specific_virtio_scsi_ss.add(when: 'CONFIG_VHOST_SCSI_COMMON', if_true: fil= es('vhost-scsi-common.c')) -specific_virtio_scsi_ss.add(when: 'CONFIG_VHOST_SCSI', if_true: files('vho= st-scsi.c')) -specific_virtio_scsi_ss.add(when: 'CONFIG_VHOST_USER_SCSI', if_true: files= ('vhost-user-scsi.c')) =20 specific_scsi_ss.add_all(when: 'CONFIG_VIRTIO_SCSI', if_true: specific_vir= tio_scsi_ss) +scsi_ss.add_all(when: 'CONFIG_VIRTIO_SCSI', if_true: virtio_scsi_ss) =20 specific_scsi_ss.add(when: 'CONFIG_SPAPR_VSCSI', if_true: files('spapr_vsc= si.c')) =20 diff --git a/hw/virtio/meson.build b/hw/virtio/meson.build index 54c90c24fb..16e64e1cf1 100644 --- a/hw/virtio/meson.build +++ b/hw/virtio/meson.build @@ -2,13 +2,18 @@ softmmu_virtio_ss =3D ss.source_set() softmmu_virtio_ss.add(files('virtio-bus.c')) softmmu_virtio_ss.add(when: 'CONFIG_VIRTIO_PCI', if_true: files('virtio-pc= i.c')) softmmu_virtio_ss.add(when: 'CONFIG_VIRTIO_MMIO', if_true: files('virtio-m= mio.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('v= host-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')) =20 specific_virtio_ss =3D ss.source_set() specific_virtio_ss.add(files('virtio.c')) specific_virtio_ss.add(files('virtio-config-io.c', 'virtio-qmp.c')) =20 if have_vhost - specific_virtio_ss.add(files('vhost.c', 'vhost-backend.c', 'vhost-iova-t= ree.c')) + softmmu_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 @@ -20,20 +25,16 @@ else endif =20 specific_virtio_ss.add(when: 'CONFIG_VIRTIO_BALLOON', if_true: files('virt= io-balloon.c')) -specific_virtio_ss.add(when: 'CONFIG_VIRTIO_CRYPTO', if_true: files('virti= o-crypto.c')) specific_virtio_ss.add(when: 'CONFIG_VHOST_USER_FS', if_true: files('vhost= -user-fs.c')) specific_virtio_ss.add(when: 'CONFIG_VIRTIO_PMEM', if_true: files('virtio-= pmem.c')) -specific_virtio_ss.add(when: 'CONFIG_VHOST_VSOCK_COMMON', if_true: files('= vhost-vsock-common.c')) specific_virtio_ss.add(when: 'CONFIG_VHOST_VSOCK', if_true: files('vhost-v= sock.c')) specific_virtio_ss.add(when: 'CONFIG_VHOST_USER_VSOCK', if_true: files('vh= ost-user-vsock.c')) specific_virtio_ss.add(when: 'CONFIG_VIRTIO_RNG', if_true: files('virtio-r= ng.c')) -specific_virtio_ss.add(when: 'CONFIG_VIRTIO_IOMMU', if_true: files('virtio= -iommu.c')) specific_virtio_ss.add(when: 'CONFIG_VIRTIO_MEM', if_true: files('virtio-m= em.c')) specific_virtio_ss.add(when: 'CONFIG_VHOST_USER_I2C', if_true: files('vhos= t-user-i2c.c')) specific_virtio_ss.add(when: 'CONFIG_VHOST_USER_RNG', if_true: files('vhos= t-user-rng.c')) specific_virtio_ss.add(when: 'CONFIG_VHOST_USER_GPIO', if_true: files('vho= st-user-gpio.c')) specific_virtio_ss.add(when: ['CONFIG_VIRTIO_PCI', 'CONFIG_VHOST_USER_GPIO= '], if_true: files('vhost-user-gpio-pci.c')) -specific_virtio_ss.add(when: 'CONFIG_VHOST_VDPA_DEV', if_true: files('vdpa= -dev.c')) =20 virtio_pci_ss =3D ss.source_set() virtio_pci_ss.add(when: 'CONFIG_VHOST_VSOCK', if_true: files('vhost-vsock-= pci.c')) --=20 2.38.1