From patchwork Mon Jun 26 12:28:28 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: 696435 Delivered-To: patch@linaro.org Received: by 2002:adf:e885:0:0:0:0:0 with SMTP id d5csp3197982wrm; Mon, 26 Jun 2023 05:29:50 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ56z8eXTxbK8dNYoyzFT1+Mc2NoKWgs/q4aQzjrzxr0wPIVXjvpy1302ekEi8Z0vh8wmlkq X-Received: by 2002:a05:6214:1cc1:b0:634:87c8:6a3f with SMTP id g1-20020a0562141cc100b0063487c86a3fmr8626747qvd.46.1687782590689; Mon, 26 Jun 2023 05:29:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687782590; cv=none; d=google.com; s=arc-20160816; b=aaF5k7si6tEmgUqrJ844mD/T3vIIZ5GTOs3d82yxtHWww6AcdRWT1WprkQeqBV5krk +oyLeofIhLzpPZigTlx1NuNshCKejGDuj9YiEfZ77BnqOIQHTX4xdnfY/IqQq6+9wUsF K8Dp0vDavdWXJcLie1pRYTHnh3RGotNafg/4tsPl++42sNkLfJwnsBJgz6DWApXHXjmr rhDH/W/qK9TwsRZ8zqavIa44KbwMLQ1nhNyuEZ3xlTS319Qs118py6hrN8ahk25N8reC eC4aekorQyoiRNM6VmFYI57WINdW1WwVIVowvzxU6fQl7V6TQqTnysBcWx1hfidCh/Tj TyqA== 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=2SGHL2LHvwzaWBgCYGtwaYW5rqEUKCoWms25kqlSWFs=; fh=ADigGTJebWHcEiiDBOnUCMAPyQlUiPtSJbY5y0PKjrU=; b=mTIVX4jENb73dkL2+kirFuzx5635AxgD671rn6DkniGVSnvJpd8X3QaALQ+EnZO9t9 gXes2HZS4fI66VBVsRWbDB/U3I1CUzqdkwXfdxFD+HiFHk1FL3partpo7Rf9FFkmkTiz iBXlTlZCPbULU2GCNw9M/utwi8xVWObh+eOyNtRB4rwVPbHaDukuk1df/JHLwIdEjRji isIPtDfw2e+caiKCHVHq59RkU2uw0DRQuG0FrQspK4651rpkdvYcZ6UvbXx67oyOX34X NHW3EV3+oL11e1LEyrr9WxTOB5vuUBtk0F7LPvz18UhNVtBwwYFZIyxCMdYuWTFR1eUv i7Bw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=LQvuRa3a; 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 jr11-20020a0562142a8b00b006237c5646c2si1983331qvb.411.2023.06.26.05.29.50 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 26 Jun 2023 05:29:50 -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=LQvuRa3a; 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 1qDlKr-00027d-QW; Mon, 26 Jun 2023 08:28:50 -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 1qDlKe-0001x2-WB for qemu-devel@nongnu.org; Mon, 26 Jun 2023 08:28:38 -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 1qDlKd-0002pH-9f for qemu-devel@nongnu.org; Mon, 26 Jun 2023 08:28:36 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1687782514; 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=2SGHL2LHvwzaWBgCYGtwaYW5rqEUKCoWms25kqlSWFs=; b=LQvuRa3ao3LiTTya/ajf/dpCuXNlfK/GgXVxO6k5mZjDpBhwUbs/fdR5CMhtcimGS18Zes JCIGBFMemue+oIxVGJ9lTauGfqVvDhuxOAxbe95OIR3mGLVkJvgUYqbvLyQjncXp9A+BV/ jwJUm1bBG+84tRQ8hIhc56Rd3ZFgbn4= Received: from mail-lj1-f197.google.com (mail-lj1-f197.google.com [209.85.208.197]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-316-ghBRY_QQOjupxYMR4jFSAw-1; Mon, 26 Jun 2023 08:28:33 -0400 X-MC-Unique: ghBRY_QQOjupxYMR4jFSAw-1 Received: by mail-lj1-f197.google.com with SMTP id 38308e7fff4ca-2b6a0772b97so7638371fa.1 for ; Mon, 26 Jun 2023 05:28:33 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687782511; x=1690374511; 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=2SGHL2LHvwzaWBgCYGtwaYW5rqEUKCoWms25kqlSWFs=; b=G27Fbh2dAkNlzVYtpmVUIJjXd/dWBgEcylN2Ge8gcApo+IG6EhfaReOdUyHgVuB9eH mx2kfZtw5GOjmp5q2lwtxLJvU/iOzod0ZG7QyODYjpa9OHc1q01KTHiUjGoulrwHqs+Y AubyWTtOZ72arKxbUlQrcPg92ESxnsZTPqi1KEX9pYWSwmw5bZYsFCQAb0crGz6ujAy8 obcDalKJPc5aen0CTEojuZ3QX2c7wT7FkKB4eFcqPDkbvTPWEWtZJj2hu7T3Nn6/Zifs 69I6ooFgi8Gr7jxd4tI3s2mEHMEyrLlFTWheFltJDL1ksnztZ8xCJRnvL4k2Dk+sVpd+ +5Nw== X-Gm-Message-State: AC+VfDzuRdTG0xeeLyyuzhUpEgW1ED2nZ1sieQ/uYHtAL2SiEl0Pj5oV +MR+66IZB9wehAHOzXmdnyCc5mEKh/EVzGWXcsI3f0e8Q2clRIFm2YhJhPRAqG81hXeKVmoCye4 FxAoWSfaFavrFAIP2HC5npm+eZlZPvQAyzag9kTXla2iXhglwc3Y2jBvzDsmO0sRf+6vA X-Received: by 2002:a19:6418:0:b0:4f9:571d:c50e with SMTP id y24-20020a196418000000b004f9571dc50emr9597064lfb.36.1687782511487; Mon, 26 Jun 2023 05:28:31 -0700 (PDT) X-Received: by 2002:a19:6418:0:b0:4f9:571d:c50e with SMTP id y24-20020a196418000000b004f9571dc50emr9597045lfb.36.1687782511183; Mon, 26 Jun 2023 05:28:31 -0700 (PDT) Received: from redhat.com ([2.52.156.102]) by smtp.gmail.com with ESMTPSA id u18-20020a5d6ad2000000b00313e90d1d0dsm5325493wrw.112.2023.06.26.05.28.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Jun 2023 05:28:30 -0700 (PDT) Date: Mon, 26 Jun 2023 08:28:28 -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?= , Thomas Huth , Alex =?utf-8?q?Benn=C3=A9e?= , Paolo Bonzini , Peter Xu , David Hildenbrand Subject: [PULL 13/53] softmmu: Introduce qemu_target_page_mask() helper 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_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Philippe Mathieu-Daudé 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é Message-Id: <20230524093744.88442-2-philmd@linaro.org> Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin Reviewed-by: Alex Bennée --- 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 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); diff --git a/softmmu/physmem.c b/softmmu/physmem.c index 6bdd944fe8..bda475a719 100644 --- a/softmmu/physmem.c +++ b/softmmu/physmem.c @@ -3359,6 +3359,11 @@ size_t qemu_target_page_size(void) return TARGET_PAGE_SIZE; } +int qemu_target_page_mask(void) +{ + return TARGET_PAGE_MASK; +} + int qemu_target_page_bits(void) { return TARGET_PAGE_BITS; From patchwork Mon Jun 26 12:28:31 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: 696443 Delivered-To: patch@linaro.org Received: by 2002:adf:e885:0:0:0:0:0 with SMTP id d5csp3207498wrm; Mon, 26 Jun 2023 05:49:23 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5d4AaIxHdWwnWABleZDwQjY3mPfN+eoM27oAirFwm9HWkwTNTiRmtPvPBewiX5E6BjjU1F X-Received: by 2002:a19:f201:0:b0:4f7:b640:fa40 with SMTP id q1-20020a19f201000000b004f7b640fa40mr14594894lfh.43.1687783763590; Mon, 26 Jun 2023 05:49:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687783763; cv=none; d=google.com; s=arc-20160816; b=AKQumPDdDlHPZ7PAUdw9mpEMCnD0OAu8M5SdDFTA3FtO2gPa1S3VbbzNbadNXh6bOi 9ytLg7+2B52F9s6dlY3gopQMVboOsnDflPDUM4YQgLpTgd5LP4IrmBf2yzOCeUabBllX U6z/JwzneihJxB6b3e0I4bdE3x+CE+8Bih0IRyjblWfyPZZ3dUxx2lBr07BaNgNF1nqs tddcpDe5DLSOOuEgFUUm07FMtWt7/OIKcQw2XfE7eVRmPgTVq7/+XGiM7OUlYJ1Hr3pt zjGwCbV+tfHoM6H7g1gKnoyR4GaUr7qPVsor3IQ7fkiCnJRmdhoYdhrD6ihxzIJ6nSti A9sA== 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=I0c/2TSZTwjPfy5oknVtffw6zqqXBeJNU6cIu4XphFk=; fh=S+O/rfsaejyoB1qsk44kXo9LaXoH6ItSTnaliSlU9Qg=; b=zOo6TllADS9/qT9P1HnKDZhdYIFTJqfDxNxYDIBP9MEF46OoAwDyoKnBbXKxCUJ3X8 b4EyLwl3fe953uLGf8HceTMhA/nR+nLESauUDRoV4uyHyZQ9Aq0qdKe8BTd45UFUdceY juVhsDzu5UxCQqfrHaSAUtcrVWG1ls/YjPzj4T+SjKIQ2s6PFCZWVuj6yQM4zs92ovEp yPEs06hA9VBJLD3EP6JaEuPDfDbyzCfDcKhhc9GkmWYSAo6i6VsK7WVknUlFc+qSmZoc QZ+J/ad8/TIbwU5ea5OYz7FgSq8YjhESPrypzZETBzKVcWPiGL77Ki3GlAXgDpHXx0jx PJ0w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=LN2U5uoD; 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 d11-20020a05600c3acb00b003f7e804e3c1si4891266wms.212.2023.06.26.05.49.23 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 26 Jun 2023 05:49:23 -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=LN2U5uoD; 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 1qDlLs-00038p-2c; Mon, 26 Jun 2023 08:29:52 -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 1qDlKh-00020q-OR for qemu-devel@nongnu.org; Mon, 26 Jun 2023 08:28:45 -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 1qDlKf-0002rS-RH for qemu-devel@nongnu.org; Mon, 26 Jun 2023 08:28:39 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1687782517; 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=I0c/2TSZTwjPfy5oknVtffw6zqqXBeJNU6cIu4XphFk=; b=LN2U5uoDyu53/ZTHfEwNxecoAb/BzWGjx6XN3nUnIcr+l1A0jDwJoHU+a47fkVFX/Vlq05 XPMdzC3Owc9/UNeDnsjtdEyPf/T59bPmA3u7qbv+JxAFGrsBSr627G1KxA91oBXUDPZvNQ KUiFqMMK1le2fuA+2t5781/Q74FYQns= Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-670-cuMu1rp3PcO9JrAuNzkiSA-1; Mon, 26 Jun 2023 08:28:35 -0400 X-MC-Unique: cuMu1rp3PcO9JrAuNzkiSA-1 Received: by mail-wm1-f71.google.com with SMTP id 5b1f17b1804b1-3f9d7ff4b6aso19857675e9.1 for ; Mon, 26 Jun 2023 05:28:35 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687782514; x=1690374514; 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=I0c/2TSZTwjPfy5oknVtffw6zqqXBeJNU6cIu4XphFk=; b=WNHyolQgWOtmlQZB5AhzyHtN7+Q89daom90kfHWB2ubnaX1eOKS1QhXS/tfiyOizX/ 1+UrKPo5CP/GN9BY1IiklrBaIy2dYfR19g4XZvQiDpfx/lrVWasf3MXUlZW8kblWsety PGN2TQIEIsoNYHO+B3IjEe5191iVlsaE2HRniM+wxWNf6AeuoFPldn8hCfuckGliX9HH 8tJuRnmDzzGG+31H6F7AnWCvuyoSR8xum4mNey4QRgpBXnQj1IW8v2xapMg02iKp3uva dmTYNnPQCNbJ6LYh6uURdSOoiMPpEv8kmKaGSYH+rmSxCyZIngKjSGT/txzvNDTxeqts oqkA== X-Gm-Message-State: AC+VfDxgQmE27fmyXLCkpnVqh/YCGKkR13Qk4edj4xbn3J4y08g6pIyi 1OPoogr/dLlczJg8KiH/O7j1eD/gyHcnklJeT/TN+JddQE8/xm9an5BUukXVvfwaG2B7ZoJAYst MDeY4vJkOaoGNr6hXgdZRHwTal2E+fXZlXgiH5bHw3ktlY1ieeJLEcN312U3SsLgWf4OY X-Received: by 2002:a1c:f70d:0:b0:3f7:3685:1e10 with SMTP id v13-20020a1cf70d000000b003f736851e10mr22378325wmh.40.1687782514372; Mon, 26 Jun 2023 05:28:34 -0700 (PDT) X-Received: by 2002:a1c:f70d:0:b0:3f7:3685:1e10 with SMTP id v13-20020a1cf70d000000b003f736851e10mr22378313wmh.40.1687782514119; Mon, 26 Jun 2023 05:28:34 -0700 (PDT) Received: from redhat.com ([2.52.156.102]) by smtp.gmail.com with ESMTPSA id d11-20020a05600c3acb00b003f7f475c3bcsm11415769wms.1.2023.06.26.05.28.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Jun 2023 05:28:33 -0700 (PDT) Date: Mon, 26 Jun 2023 08:28:31 -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?= , Thomas Huth , Richard Henderson , Alex =?utf-8?q?Benn=C3=A9?= =?utf-8?q?e?= , Paolo Bonzini , Fam Zheng Subject: [PULL 14/53] hw/scsi: Introduce VHOST_SCSI_COMMON symbol in Kconfig Message-ID: <8f691f1cb76f0591874e91eb18569a150bb3cfe0.1687782442.git.mst@redhat.com> 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_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Philippe Mathieu-Daudé 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é Reviewed-by: Thomas Huth Reviewed-by: Richard Henderson Message-Id: <20230524093744.88442-3-philmd@linaro.org> Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin Reviewed-by: Alex Bennée --- 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 +config VHOST_SCSI_COMMON + bool + depends on VIRTIO + config VHOST_SCSI bool default y + select VHOST_SCSI_COMMON depends on VIRTIO && VHOST_KERNEL 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 7a1e7f13f0..2a005420d2 100644 --- a/hw/scsi/meson.build +++ b/hw/scsi/meson.build @@ -17,8 +17,10 @@ specific_scsi_ss = ss.source_set() virtio_scsi_ss = ss.source_set() virtio_scsi_ss.add(files('virtio-scsi.c', 'virtio-scsi-dataplane.c')) -virtio_scsi_ss.add(when: 'CONFIG_VHOST_SCSI', if_true: files('vhost-scsi-common.c', 'vhost-scsi.c')) -virtio_scsi_ss.add(when: 'CONFIG_VHOST_USER_SCSI', if_true: files('vhost-scsi-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-user-scsi.c')) specific_scsi_ss.add_all(when: 'CONFIG_VIRTIO_SCSI', if_true: virtio_scsi_ss) specific_scsi_ss.add(when: 'CONFIG_SPAPR_VSCSI', if_true: files('spapr_vscsi.c')) From patchwork Mon Jun 26 12:28:34 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: 696441 Delivered-To: patch@linaro.org Received: by 2002:adf:e885:0:0:0:0:0 with SMTP id d5csp3204243wrm; Mon, 26 Jun 2023 05:41:50 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ66Uz1+6JPuXkYmezpZb0HY3m+foOXYP3Vrh/0/mL/4bR2GrTG4BHDqLMuHOSQX0Gt15si4 X-Received: by 2002:a05:620a:c55:b0:75e:d11d:51ab with SMTP id u21-20020a05620a0c5500b0075ed11d51abmr35765580qki.9.1687783310163; Mon, 26 Jun 2023 05:41:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687783310; cv=none; d=google.com; s=arc-20160816; b=qJ92HWfWfOhrl9srocZFi+QRTSw+E9mOZza+fL0ZrI/D0gcLKy1nZSObrclHL/Vfbd VpJ49JgxSMfEDDAv08VcV19Dd9MgDkMaVBZ6PJ02exXhVFY2pg+HbOyhHXE4hLY+jrn3 GZIu90mPWGIuMBDNQ5dChflbQc1h8DCZPK6n0Vij22csLo3JgbRUTaH1abPJaIBS26oE m0nMIwI9U1+3TNyo6SOfi0i5wdKyMYj3Pvfxq+85X9ZbBum8wF0+j8Igrx8NxY5Czw5y qcfHUfY6olzFMZxZnwNiMge1KXAAIJ+KEYfrKe3m5JLbsz4vAOLLGSP9Jul5YN4i9dh0 Mhpg== 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=nX2b6CW1d8Yj4PrNeXLgA95+PA1EOaqmbtd7Cf9aLUE=; fh=rbugr5OEQB89HxjuQQVgeUIzWYM7BzXbzzKX3exWKlo=; b=QHq17bZx26hCqLM8O7WZeBINMcaYODnyuV0uZbGURd3dGU70lJcODQjTEOX+59jVBj VoC5rNDX4F7kZxZptPGZKtyERJeXHkahjP+ivPV8tY7BfTAiE4LfKYdWKFFl2BL6nyAg 0gGUexQCBSPcXx4fwrL2vw4xa/NmOb5h/cD6ScS5tzN4pGHGGnkjKhH+UctNJgo3S9Dd A2YCI/px4im3PLyIAiIWLz7Q47DTFNXTNclTTmD7TtmteFhZ/DYW2j+tPoZ0AHozwW3K spWgtFuLKFYASt0zlL/zKrdfvM+MyaqwixFKSgPlnwelZ9hhXR4nLjd2ljoVOMsREjJI e10Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b="ix+w/cOz"; 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 u10-20020a37ab0a000000b00762573150f0si1893784qke.688.2023.06.26.05.41.50 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 26 Jun 2023 05:41:50 -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="ix+w/cOz"; 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 1qDlLP-0002Qk-7l; Mon, 26 Jun 2023 08:29:29 -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 1qDlKm-00023E-3a for qemu-devel@nongnu.org; Mon, 26 Jun 2023 08:28:45 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qDlKk-0002un-5O for qemu-devel@nongnu.org; Mon, 26 Jun 2023 08:28:43 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1687782520; 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=nX2b6CW1d8Yj4PrNeXLgA95+PA1EOaqmbtd7Cf9aLUE=; b=ix+w/cOzD+XP/EUrH2jNGMfGuv8Ju8HxZr9i/5DBOtscd6pyTDvOnzoeGE2B3iXfPvziLp xsJDzUZV6sWRjsj2T2em6VRMo6CEwVG9V+tWgB67VuBtmpakC9bAM0YXrdBTWUoR9WifqO 4DJ8oDsCb6MP/Vkk9nVP7jyEhNjJRYI= Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-581-CmsgN05rO1GrSKGSALltAA-1; Mon, 26 Jun 2023 08:28:39 -0400 X-MC-Unique: CmsgN05rO1GrSKGSALltAA-1 Received: by mail-wr1-f70.google.com with SMTP id ffacd0b85a97d-313e6020882so681281f8f.1 for ; Mon, 26 Jun 2023 05:28:38 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687782517; x=1690374517; 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=nX2b6CW1d8Yj4PrNeXLgA95+PA1EOaqmbtd7Cf9aLUE=; b=LX+ywspiq3q2J0LEHcjkCGNtUnX0zN9hvtr56C+OH7o2DoEab5F48sH75mnTC6E7Bb fgoORESq/KFIghz0HiEEidbBua2u583b+8ax/TNWSElOtvLJnqevYlyqquvK+twwvBFf xNO2NXxQzRiYiOriO1ln93WBvCxBXC5D9FXuxQDOhHjDGb2/4a2x5mF35F1eNKLpevTC zXiUDkYTyVMP/gfT6dmLlXdIVpjJg403WvfylFR/QSV4dLpVqMOl1iu9pw1153MEDad8 BQHfnwV8PGv6n7V3X2n7/6Lee44jWuaTBktXS9LWTDpPVZIVPB5M+nX/slsNrjKy9D8F kyIQ== X-Gm-Message-State: AC+VfDwsj/BQynuqPD3cYBo3E863SWYZSXyLSiNQto90d7WQikihbAJT jIBt/rzstUIiGOA1ea30bZuV6Nze8miHngFpWZO5Sk4CGLScNnKiN5fm5YDovvNSbKF4i6xfUka 0wWHKUw7ME6K2PG1RaiDtMISeQECKB/eku0/f3lBCUdcQIM1yzOHEBJY7SpIl5e5Avhq3 X-Received: by 2002:adf:ef10:0:b0:311:ff2:87e4 with SMTP id e16-20020adfef10000000b003110ff287e4mr27024871wro.33.1687782517501; Mon, 26 Jun 2023 05:28:37 -0700 (PDT) X-Received: by 2002:adf:ef10:0:b0:311:ff2:87e4 with SMTP id e16-20020adfef10000000b003110ff287e4mr27024859wro.33.1687782517301; Mon, 26 Jun 2023 05:28:37 -0700 (PDT) Received: from redhat.com ([2.52.156.102]) by smtp.gmail.com with ESMTPSA id u14-20020adfed4e000000b00313f100c2aasm2900472wro.21.2023.06.26.05.28.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Jun 2023 05:28:36 -0700 (PDT) Date: Mon, 26 Jun 2023 08:28:34 -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 , Thomas Huth , Alex =?utf-8?q?Benn=C3=A9e?= , Paolo Bonzini , Fam Zheng Subject: [PULL 15/53] hw/scsi: Rearrange meson.build Message-ID: <04ca164ad3fc5309732e482534410a36b4713b11.1687782442.git.mst@redhat.com> 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.129.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_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Philippe Mathieu-Daudé 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é Message-Id: <20230524093744.88442-4-philmd@linaro.org> Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin Reviewed-by: Thomas Huth Reviewed-by: Alex Bennée --- hw/scsi/meson.build | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/hw/scsi/meson.build b/hw/scsi/meson.build index 2a005420d2..d9b5673c14 100644 --- a/hw/scsi/meson.build +++ b/hw/scsi/meson.build @@ -1,4 +1,7 @@ scsi_ss = ss.source_set() +specific_scsi_ss = ss.source_set() +virtio_scsi_ss = ss.source_set() + scsi_ss.add(files( 'emulation.c', 'scsi-bus.c', @@ -11,18 +14,15 @@ scsi_ss.add(when: 'CONFIG_LSI_SCSI_PCI', if_true: files('lsi53c895a.c')) scsi_ss.add(when: 'CONFIG_MEGASAS_SCSI_PCI', if_true: files('megasas.c')) scsi_ss.add(when: 'CONFIG_MPTSAS_SCSI_PCI', if_true: files('mptsas.c', 'mptconfig.c', 'mptendian.c')) scsi_ss.add(when: 'CONFIG_VMW_PVSCSI_SCSI_PCI', if_true: files('vmw_pvscsi.c')) -system_ss.add_all(when: 'CONFIG_SCSI', if_true: scsi_ss) -specific_scsi_ss = ss.source_set() - -virtio_scsi_ss = ss.source_set() virtio_scsi_ss.add(files('virtio-scsi.c', 'virtio-scsi-dataplane.c')) - virtio_scsi_ss.add(when: 'CONFIG_VHOST_SCSI_COMMON', if_true: files('vhost-scsi-common.c')) virtio_scsi_ss.add(when: 'CONFIG_VHOST_SCSI', if_true: files('vhost-scsi.c')) virtio_scsi_ss.add(when: 'CONFIG_VHOST_USER_SCSI', if_true: files('vhost-user-scsi.c')) + specific_scsi_ss.add_all(when: 'CONFIG_VIRTIO_SCSI', if_true: virtio_scsi_ss) specific_scsi_ss.add(when: 'CONFIG_SPAPR_VSCSI', if_true: files('spapr_vscsi.c')) +system_ss.add_all(when: 'CONFIG_SCSI', if_true: scsi_ss) specific_ss.add_all(when: 'CONFIG_SCSI', if_true: specific_scsi_ss) From patchwork Mon Jun 26 12:28:37 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: 696439 Delivered-To: patch@linaro.org Received: by 2002:adf:e885:0:0:0:0:0 with SMTP id d5csp3203901wrm; Mon, 26 Jun 2023 05:41:07 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5wy8bbKG3/zmEFG+67p4FuOk8GKkwDVtofpP475gWqCrI8yb35MrEqPVyb17XYHDD4HagL X-Received: by 2002:a05:6214:29e6:b0:630:6926:d00e with SMTP id jv6-20020a05621429e600b006306926d00emr28168716qvb.39.1687783267256; Mon, 26 Jun 2023 05:41:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687783267; cv=none; d=google.com; s=arc-20160816; b=DZ42v+s+cBCCKvMq/AVsVverSTDD7JzADeYCYLO9BkxMZTTEJA+FGIU6sKz4GC15XK +T8qGd0tYbxTq8nRue69S7dVqQCwa69XyyDp1YRNB14mzMosrHCXtYJxg+mBa0NMYsou dGixeBZmrAFrwkA1d4zDd/JBCGteYqPlEzynxTiDJMyfxQjXgjZbM4zzPgJDMEMwV6yW BjedjhvbIaLYVIARrhnyjO2ba8WY7cuklC12W88M4mRVd+xq/B+asJNY3qztqm2tBnGV Xz9I16NJb1q55zLsxBGdzq7yr3QuWBoJ2EplvWOLm8kjtSoqKZy/j4GioYwl7X0vNSVm cy3Q== 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=RypNFNxe8nuVR5tzX73KR4W5kbnIlhQSpngct70qAFo=; fh=UXK7at7f8mXCF9L5Ktsq6aeNPgEX8aPcRoWbaF5am0Y=; b=e3dpTNm33F+vJStwym9CxNCCCCtwclQRTOt/yymKDtrfT/CJDHQFijvmWewBIBGD2F +zjQPSPXNgPsKqxcf3cKMDPrSYpfbzudjaotMy0k3S22iio+jjJ10TS1670N5O+oDp/9 UfAmyJGBj0xAqjItXEym9ytRGP8Xp9dZoe/OwqPpHN/CvUi3O7PoHkp2HIFUmbYuSw3b y4k9ZArJPoKKW9fWF2KI8SkJ4IcXG58FEHht8mnz9qOeqyXKmQUoA8CXWMb5IdECcxTd qaqkbGs28ws+igbRyt1x6eQzOiW6nmcJ8QgEklAubiQrB6mxYb1LM46ziSBRuP0QgDM7 bMlg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=biWWlW97; 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 hr5-20020a05621423c500b0062df36bdb9dsi2045682qvb.242.2023.06.26.05.41.07 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 26 Jun 2023 05:41:07 -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=biWWlW97; 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 1qDlMS-0005Vg-41; Mon, 26 Jun 2023 08:30:28 -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 1qDlKn-00026N-Nb for qemu-devel@nongnu.org; Mon, 26 Jun 2023 08:28:45 -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 1qDlKl-0002xK-R1 for qemu-devel@nongnu.org; Mon, 26 Jun 2023 08:28:45 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1687782523; 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=RypNFNxe8nuVR5tzX73KR4W5kbnIlhQSpngct70qAFo=; b=biWWlW97dchV583xq667ZwJ1qYIMofWu94MDqVItA64pzVFJ7IyXU7hnUxKzmIHcoRb7ta rvC7Ym4wkz60w+A/wz8EcN/2JwJtX8tSMDBJ6Y5m8kBPZYv9TGReTk59CKRyEU7yn1anUs yOAWXzNZkvc/mL2DcubM8p4ecOyfgWM= 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-194-aG9EiiGKP9SzvFANNdllow-1; Mon, 26 Jun 2023 08:28:41 -0400 X-MC-Unique: aG9EiiGKP9SzvFANNdllow-1 Received: by mail-wr1-f69.google.com with SMTP id ffacd0b85a97d-313f442806dso379612f8f.3 for ; Mon, 26 Jun 2023 05:28:41 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687782520; x=1690374520; 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=RypNFNxe8nuVR5tzX73KR4W5kbnIlhQSpngct70qAFo=; b=CsWfHOpjmiYUiA2lvoghg0A6mzI9xx4j7YAjro3EoyXLMg+F5QL08zZMofSLgup/hY C7FmVaQukHHP6AtZNSs9ks3R6ysPphqE2zD4c5SPcf8YGyY/8DA+uUFurbtF+FCGpBU5 yxHkIaBKItpf1EnSjTTS3aUuD5UcvfN2tcE1X+tJckJLHyGQpwOeOc0JfxhhugI1zRv4 cOQAMHkP2W4+CNGSlEb67hOXRGbPXLdKPkY1ktWG+AXd7skqm/QjwXkrOiaNmb5KIIod fatBXAjkCv16KiBJGhGFfGglZ82oHjKnNI/0RSGU9l5y9VjJqVvMGyjTrpWkBide9WnZ IM/g== X-Gm-Message-State: AC+VfDzsxW6YBibCwk6enADf7O+DGnBdwymYbSpOQdejEyu/dkLR6cMZ XJLv/pY7In7GRbnATMBdmQhjKD7mNfcVnlZXqi9xXuZFlZ7lUFfpWLvbCgqf6tQeLPNfxsDukeB JRr/FIZtIjzPKO7R8aTU/jE+kxj6Akw96MbwgrZVGcwYVmwc+pUZZLxXAxqy9XhnKjeur X-Received: by 2002:adf:f643:0:b0:313:ee73:cc9a with SMTP id x3-20020adff643000000b00313ee73cc9amr3265752wrp.70.1687782520521; Mon, 26 Jun 2023 05:28:40 -0700 (PDT) X-Received: by 2002:adf:f643:0:b0:313:ee73:cc9a with SMTP id x3-20020adff643000000b00313ee73cc9amr3265735wrp.70.1687782520239; Mon, 26 Jun 2023 05:28:40 -0700 (PDT) Received: from redhat.com ([2.52.156.102]) by smtp.gmail.com with ESMTPSA id v2-20020a5d6102000000b003127a21e986sm7151764wrt.104.2023.06.26.05.28.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Jun 2023 05:28:39 -0700 (PDT) Date: Mon, 26 Jun 2023 08:28:37 -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 , Thomas Huth , Paolo Bonzini , Fam Zheng Subject: [PULL 16/53] hw/scsi: Rename target-specific source set as 'specific_virtio_scsi_ss' Message-ID: <5268f5f5224ed67de63e0b91b05e410a97dbb976.1687782442.git.mst@redhat.com> 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_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Philippe Mathieu-Daudé 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é Reviewed-by: Richard Henderson Message-Id: <20230524093744.88442-5-philmd@linaro.org> Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin 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 d9b5673c14..43746700be 100644 --- a/hw/scsi/meson.build +++ b/hw/scsi/meson.build @@ -1,6 +1,6 @@ scsi_ss = ss.source_set() specific_scsi_ss = ss.source_set() -virtio_scsi_ss = ss.source_set() +specific_virtio_scsi_ss = ss.source_set() scsi_ss.add(files( 'emulation.c', @@ -15,12 +15,12 @@ scsi_ss.add(when: 'CONFIG_MEGASAS_SCSI_PCI', if_true: files('megasas.c')) scsi_ss.add(when: 'CONFIG_MPTSAS_SCSI_PCI', if_true: files('mptsas.c', 'mptconfig.c', 'mptendian.c')) scsi_ss.add(when: 'CONFIG_VMW_PVSCSI_SCSI_PCI', if_true: files('vmw_pvscsi.c')) -virtio_scsi_ss.add(files('virtio-scsi.c', 'virtio-scsi-dataplane.c')) -virtio_scsi_ss.add(when: 'CONFIG_VHOST_SCSI_COMMON', if_true: files('vhost-scsi-common.c')) -virtio_scsi_ss.add(when: 'CONFIG_VHOST_SCSI', if_true: files('vhost-scsi.c')) -virtio_scsi_ss.add(when: 'CONFIG_VHOST_USER_SCSI', if_true: files('vhost-user-scsi.c')) +specific_virtio_scsi_ss.add(files('virtio-scsi.c', 'virtio-scsi-dataplane.c')) +specific_virtio_scsi_ss.add(when: 'CONFIG_VHOST_SCSI_COMMON', if_true: files('vhost-scsi-common.c')) +specific_virtio_scsi_ss.add(when: 'CONFIG_VHOST_SCSI', if_true: files('vhost-scsi.c')) +specific_virtio_scsi_ss.add(when: 'CONFIG_VHOST_USER_SCSI', if_true: files('vhost-user-scsi.c')) -specific_scsi_ss.add_all(when: 'CONFIG_VIRTIO_SCSI', if_true: virtio_scsi_ss) +specific_scsi_ss.add_all(when: 'CONFIG_VIRTIO_SCSI', if_true: specific_virtio_scsi_ss) specific_scsi_ss.add(when: 'CONFIG_SPAPR_VSCSI', if_true: files('spapr_vscsi.c')) From patchwork Mon Jun 26 12:28:40 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: 696442 Delivered-To: patch@linaro.org Received: by 2002:adf:e885:0:0:0:0:0 with SMTP id d5csp3204422wrm; Mon, 26 Jun 2023 05:42:17 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6hKYQARi5vXxbqYPVBCRJYUUbPcdBoq5qL3gbXTyfVIb7fm7mZ7xW0y5odzwi4DboyHZ0W X-Received: by 2002:adf:e408:0:b0:313:ec90:ac23 with SMTP id g8-20020adfe408000000b00313ec90ac23mr3925485wrm.13.1687783337032; Mon, 26 Jun 2023 05:42:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687783337; cv=none; d=google.com; s=arc-20160816; b=nD+yt0HGZ9QBMfGt1kRFH95Cz0YObQafmVRsQqQuqCilc7ijeEs+BMoE3YACjkD3Lu aFt07mV5zUv6mYEe1Ly45K1flvLj7WSn4fbB11uWyzQA+Tx+kMiDuR7Hdg1WS5U00lzv xnNHQQRoIVB8728xT8xdyPM0mbdx9Ggqk4AT76od/RhyNt8BPaZXZcPMKf1wmObYNDtu RcX2FGDVB1Vrp5SkQvhDIDJr2z1UxVmqTaSKP1z/E0xzV2I+1NwSCLRvF6Sj2RnsCf/W 4xJkVrTEZSMAqU4lsP75AtKLyb4WFTFDKtyUFSfH5fVf8zvwMMGSX7mT6r/Os5rQgorf JXaQ== 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=UxG3vkztDABFKvGFJuiCrBUuGxHDzYPIW6GxfE8K+J0=; fh=PE4Ozx9cgVTQCTEz70X0bwdgh0Ur8aBFfKMT4qfNRzk=; b=kuXJlBsouuCmujGPe5oj1AN1ZCGNDxRNX5n/aZRKffQfMYoaz/RGgALha50Eadp5+x paDQb+lzVR73+pF7qluHE4WBYvyMhkZPuVEHdVTUUVSPJPlYYsu+0cuS2atjqbnLneJo GcXq8cefR8b7q8laMRy4fU52tKN4JIvPwl3ckc95M/ZHokohmvEvU74knm5wQTEAoWh/ Ciy4L7EhKfvlcCW2Sab6VmONMCC/trcIIldp9ijqgPkec05ZqHv8fAqHokIDX6oMZwOJ eItAsUzxhpGjogHbwX+WKbdLYpSEdjdMRPOjyxccttLQx5JDhEQvquXrq6YLAs0026Gb Bu6w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=TSddZMnL; 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 a10-20020a5d508a000000b003111a9a8dc0si3462730wrt.796.2023.06.26.05.42.16 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 26 Jun 2023 05:42:17 -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=TSddZMnL; 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 1qDlND-00066D-L5; Mon, 26 Jun 2023 08:31:16 -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 1qDlKr-0002CF-Of for qemu-devel@nongnu.org; Mon, 26 Jun 2023 08:28:50 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qDlKo-0002zV-Se for qemu-devel@nongnu.org; Mon, 26 Jun 2023 08:28:49 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1687782526; 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=UxG3vkztDABFKvGFJuiCrBUuGxHDzYPIW6GxfE8K+J0=; b=TSddZMnLu+YXOfm0ut1JT1NL8EXkJ3etaMr3/9iUvTbueLxo0nfkbH1S8wd0+SYYo6BpCq PLPJZb9zlvk/mqfS3sFvG91K1fa/0Z7gJ9FUt5iOJ7MSlRRDlKYRiPNCvfqJh6vJE6bqyI vYT+t4lBKghNqBvGlxwbVWhXXlUlQWU= Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-635-6TMIWX7CNlqdtwGEamHPFw-1; Mon, 26 Jun 2023 08:28:44 -0400 X-MC-Unique: 6TMIWX7CNlqdtwGEamHPFw-1 Received: by mail-wm1-f69.google.com with SMTP id 5b1f17b1804b1-3f810b4903fso19812955e9.2 for ; Mon, 26 Jun 2023 05:28:44 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687782523; x=1690374523; 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=UxG3vkztDABFKvGFJuiCrBUuGxHDzYPIW6GxfE8K+J0=; b=TZmxz6xNrAaFgGURWi9tyu+uZUM0UtX2bhb1vZKrkaZYnqYgConPxz2EczsxfBu2+h zHV9DXOz8yQmpqAKMIKNGDSvFIMpEiDra6Q8rP64+lyBQ3CZb5318Xb6Q7Sa3gPf9EXj cQH8CK7av9JmB1cbVVu+Zdwx2uIYq5O7tqf5HHTSgHFitCrjXAs4qLXcF8hBZyFv9m3M G4vVDAUhcLRwzOPcNGhDLRIJEQZat5fygqTRujnn5VGziHHU20ulIeTLWQ0B8O5jogeL 0IdhcIMWAnIU05aQdwMGbiZsHd5dLd5a9Jow+ZILP9Xo3ZQRKikTGb8Uz8j7uHfMFeTg XDow== X-Gm-Message-State: AC+VfDzXtT1aKZWvh7W91sMkFmqlmD1kua96Yu6/Gd62csNd9Ic/DMoW vSx5ccQMfPqtcDVAJgtGQbMadmUuq4mLvjUUt0GrawHlyeQif+wpnODQSM1sbeORElj2Z/oUGKg hfnxPqHE1dQmx2cJjJOZvBLOausCQ4N2PYyD4r3qH5LQ1qCadlf9kKXtL/Ql37opq6KWH X-Received: by 2002:a05:600c:21c5:b0:3fa:1af8:6ebf with SMTP id x5-20020a05600c21c500b003fa1af86ebfmr10093464wmj.0.1687782523429; Mon, 26 Jun 2023 05:28:43 -0700 (PDT) X-Received: by 2002:a05:600c:21c5:b0:3fa:1af8:6ebf with SMTP id x5-20020a05600c21c500b003fa1af86ebfmr10093447wmj.0.1687782523203; Mon, 26 Jun 2023 05:28:43 -0700 (PDT) Received: from redhat.com ([2.52.156.102]) by smtp.gmail.com with ESMTPSA id a10-20020a1cf00a000000b003f8fb02c413sm7601442wmb.8.2023.06.26.05.28.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Jun 2023 05:28:42 -0700 (PDT) Date: Mon, 26 Jun 2023 08:28:40 -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 , Thomas Huth , Alex =?utf-8?q?Benn=C3=A9e?= , Stefano Garzarella , Paolo Bonzini Subject: [PULL 17/53] hw/virtio: Introduce VHOST_VSOCK_COMMON symbol in Kconfig Message-ID: <6df956299a751c1eff03a8ea791a0182a688a7cc.1687782442.git.mst@redhat.com> 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.129.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_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Philippe Mathieu-Daudé 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é Reviewed-by: Richard Henderson Reviewed-by: Thomas Huth Message-Id: <20230524093744.88442-6-philmd@linaro.org> Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin Reviewed-by: Alex Bennée 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 +config VHOST_VSOCK_COMMON + bool + depends on VIRTIO + config VHOST_VSOCK bool default y + select VHOST_VSOCK_COMMON depends on VIRTIO && VHOST_KERNEL config VHOST_USER_VSOCK bool default y + select VHOST_VSOCK_COMMON depends on VIRTIO && VHOST_USER config VHOST_USER_I2C diff --git a/hw/virtio/meson.build b/hw/virtio/meson.build index e83c37fffd..a6ea5beae7 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('virtio-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-vsock.c', 'vhost-vsock-common.c')) -specific_virtio_ss.add(when: 'CONFIG_VHOST_USER_VSOCK', if_true: files('vhost-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-vsock.c')) +specific_virtio_ss.add(when: 'CONFIG_VHOST_USER_VSOCK', if_true: files('vhost-user-vsock.c')) specific_virtio_ss.add(when: 'CONFIG_VIRTIO_RNG', if_true: files('virtio-rng.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-mem.c')) From patchwork Mon Jun 26 12:28:43 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: 696436 Delivered-To: patch@linaro.org Received: by 2002:adf:e885:0:0:0:0:0 with SMTP id d5csp3198120wrm; Mon, 26 Jun 2023 05:30:03 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ66UH7Ua5ECXShKC/zA8dtr8VRKlRgamKRzlIM5yNZTtI+xzR/gtmd9QQ7NwQLjdgkjKW/F X-Received: by 2002:ae9:f449:0:b0:765:2887:5fae with SMTP id z9-20020ae9f449000000b0076528875faemr12182807qkl.65.1687782603573; Mon, 26 Jun 2023 05:30:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687782603; cv=none; d=google.com; s=arc-20160816; b=I+6nqHw9qP1TlJCXLlrZaCCUoDiUe35nWiVjfwofxnjnAH52OVtfzCWDj8nYg3eslG D3YWlhAwY6eCktFC9p3yXnfnZwooSnS2SFzeXenTx/FRHrptacO4mgOefP8u+/pUkeDL 4ediJF1/QiH0jgkwy2lkM4XI6cLl1I0JPgfILos9yJUMkJb5JpBNn/fGnmHBnnEEyJ+I 7cbmQlyjAOMeKp7wgPYi5lgZYRZiq83LAyryd8mu64fQCVzM29Eu0XJCoyxFruhpE4dJ 5lq3W7B6qLJb41wbyej05vdlx5kp0sEdX+Cj54q4vQnFInrA1EADiWD4LxlFmESZSRAj PXmw== 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=/lUSJaMnlnz/HAJShdhWd+2sdzRo2ASZhZzrf+rbuEM=; fh=nhrj+6/Dl/zHmdbfB76MNhWaM5dNu1eC8iCw7iUeJd0=; b=yjqKq+vQRKtHRMG0d2r/71NqJ9cwcDCxU6RCQ+i3VT9cozBgLvGRDI0HjXUJRzMIY1 Oux+f4EFPHWL7h6xhpftZe1h2ewtMDNXkfExS4Sm6q5yxKO1U95r5FNLCLNF2LS446ua 9lw8GjruSGc4TPCNr88BYWB88Rn875aOG+8PqecUBQIQjfQV8nBFjpQdxA8jmxU9eph4 YD+Fdt95fWpmdVYQA62nUZEzWefrckYnUqeQ+x5Si6HFYcPVcY/VJouwyTRVeTYSI9mv j5+rYGPhUQHau7YsOITqjM5YDkmcCYC6eWYev1ZkcywTx50H6sM2lisY9yh2tOCxSkeb 3DsA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b="bY+Ob/AF"; 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 to20-20020a05620a4c9400b00766fd2d83edsi36106qkn.454.2023.06.26.05.30.03 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 26 Jun 2023 05:30:03 -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="bY+Ob/AF"; 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 1qDlLq-0002vG-Cg; Mon, 26 Jun 2023 08:29:50 -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 1qDlKu-0002Ht-CG for qemu-devel@nongnu.org; Mon, 26 Jun 2023 08:28:54 -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 1qDlKr-000310-Gc for qemu-devel@nongnu.org; Mon, 26 Jun 2023 08:28:50 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1687782528; 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=/lUSJaMnlnz/HAJShdhWd+2sdzRo2ASZhZzrf+rbuEM=; b=bY+Ob/AFYeiOYRKEUzbNBSBdzsVUK0gXec8m3w6aqSIcOl8dLo5cvd9RIgCIfrOtpQB4Ts i7YFXXtIXTBYxP0lndMLGs9NbgqhHyHK1wgV9ZsPPhi332aXiwrwuiu6yZqcQrUIPAS7oa dd5L/UlxGlzjRNOu/0Ejxgfto8Nqfnk= Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-536-uIW9Ob6PMR2HK3vz-V4YIA-1; Mon, 26 Jun 2023 08:28:47 -0400 X-MC-Unique: uIW9Ob6PMR2HK3vz-V4YIA-1 Received: by mail-wm1-f71.google.com with SMTP id 5b1f17b1804b1-3fb40d90456so1352805e9.0 for ; Mon, 26 Jun 2023 05:28:47 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687782526; x=1690374526; 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=/lUSJaMnlnz/HAJShdhWd+2sdzRo2ASZhZzrf+rbuEM=; b=VMLGgSf7x0UV4RjUP4kvUsdLi88baIMmkfBROIQCLFo758ZrzYNgEWbIpZcL3RbCiF 0d8Stj5trWkHr/CYr495/8fdpVslQmdTYRbXTdKPwb+5b9fhSy4oGVskOBV7nHt6Bw3Z W5snp9p/1afjpfHMYHSOjtGFgjznrdrLkHjxIuG1tLYS68oc4zfppzB3W83bIvsbKCw9 3WAAyTBu2INRGDhHUFJl30cujoPSOfZOkjT3+otAJ2wTRApe9uSr+/gpOgCm+nvTSa5N PpnWEUUcF4eQsPjNQDcHq0P4QMVguzrOhW//8HA396sMtN1xtD1mrzMIj5SHs49dhewf K5Lw== X-Gm-Message-State: AC+VfDxbhw2p1m20PSWKDUbjXLLsMX0B/cFXRrkVlpr7OjsGatiNhPLV 70l3LD6opB29aWWCYpiTQChKaKE0ATdJv4Pw9RjbGb4C8EVJarxS2D8k0mGNelHwuyzONG9Q/kG jvrF5Ip3ZLWI/mpjvCLnYVLU2+XozZGw3vG/JC6YTQVXo6SBVRxczTeWqlVYnrwOGsSdi X-Received: by 2002:a7b:c401:0:b0:3f4:2a69:409 with SMTP id k1-20020a7bc401000000b003f42a690409mr26793062wmi.11.1687782526135; Mon, 26 Jun 2023 05:28:46 -0700 (PDT) X-Received: by 2002:a7b:c401:0:b0:3f4:2a69:409 with SMTP id k1-20020a7bc401000000b003f42a690409mr26793047wmi.11.1687782525911; Mon, 26 Jun 2023 05:28:45 -0700 (PDT) Received: from redhat.com ([2.52.156.102]) by smtp.gmail.com with ESMTPSA id j19-20020a5d4533000000b0030aded83385sm7309811wra.27.2023.06.26.05.28.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Jun 2023 05:28:45 -0700 (PDT) Date: Mon, 26 Jun 2023 08:28:43 -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?= , David Hildenbrand , Richard Henderson , Alex =?utf-8?q?Benn=C3=A9?= =?utf-8?q?e?= Subject: [PULL 18/53] hw/virtio/virtio-mem: Use qemu_ram_get_fd() helper Message-ID: <21e6435066bd3818969b520b69415ba62a85cd24.1687782442.git.mst@redhat.com> 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_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Philippe Mathieu-Daudé Avoid accessing RAMBlock internals, use the provided qemu_ram_get_fd() getter to get the file descriptor. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: David Hildenbrand Reviewed-by: Richard Henderson Message-Id: <20230524093744.88442-7-philmd@linaro.org> Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin Reviewed-by: Alex Bennée --- 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) == qemu_real_host_page_size(); } #endif /* VIRTIO_MEM_HAS_LEGACY_GUESTS */ From patchwork Mon Jun 26 12:28:46 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: 696444 Delivered-To: patch@linaro.org Received: by 2002:adf:e885:0:0:0:0:0 with SMTP id d5csp3208386wrm; Mon, 26 Jun 2023 05:51:33 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ614lMUHrMYsg4WxX/NNhcfzTlOJpu/B0ADLCMTWqvYNfUKRCsg0foD75wd3Zj4xyeD2QYn X-Received: by 2002:a5d:452f:0:b0:313:e12d:b245 with SMTP id j15-20020a5d452f000000b00313e12db245mr4524662wra.29.1687783893202; Mon, 26 Jun 2023 05:51:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687783893; cv=none; d=google.com; s=arc-20160816; b=eS06CQrOKQdm4vVhBoZmAxknleql+WZgzdQwkmQF9VzyHvvH6oumxEZUV/5KKiFRH2 aNFDnQTqs0aB2YYb79EB5GXvycnMTlnGjDHAuiz5dTwpT2cdGtNP1gPd+6maxuiXvF+7 CWscmLDDjuk/3dg3XkRcayyDUjCn1h5e22tneYz18SjxtFbkwbRy/JFM6vQIFOJV03Rv ckTnH3pQFxTFlxMPt0tqFHsSrHpQ6faALSDAvSXoY8AvTP1zZF8Rbdhzs210ASJ4w4Hf ecne/qGfh8Uxw4n1h2esQqGtnr/kQE813JnxQ2iKuu6we9WCZ4kYnrxm/sLvCmP9jp21 DfSw== 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=m/fSQrh3AqOqxqH5X37BkjIgkbSIkWL7nr6LD5BoZqM=; fh=J/Axv6fmgOX3ghfV7oivmyuXvP4NduQuCAjY0yZHHa0=; b=anLWtDZVwJm6C6nPt6YuFk03+/Tb7cVG8H3s+GdzHtMsLt1sHAbA3pDshGQ36jbpJM n/kYrHW5R6P0FlABi8yklPGkghcxX5F6To83lA40EF/kLwJgtY1ZWKiTfovIxfmJxJDq pvg6fzDgxu2oJF71e6pzuDitKGJPIxMWToaHvDjPvG9f6mvw9FwfXttnHsDekCn5RYvr pMdusFez5oVZC3EHPt1cZKwa6tnZyrKxFcU9TGEXHdb5anuYNXzYyDJx4WPXzYYYzTLu pTPsFpIXu+iwCgGC7KiazNbEkxJSWZDiIotxBs1p6/KeEFqNC67HYqIeuLM03ZW3asFW I5Qg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=SoaRlU2S; 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 g4-20020a5d6984000000b0030ae8104df5si3573796wru.600.2023.06.26.05.51.33 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 26 Jun 2023 05:51:33 -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=SoaRlU2S; 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 1qDlMO-00055O-96; Mon, 26 Jun 2023 08:30:24 -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 1qDlKy-0002MU-Qa for qemu-devel@nongnu.org; Mon, 26 Jun 2023 08:29:00 -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 1qDlKw-000324-Ii for qemu-devel@nongnu.org; Mon, 26 Jun 2023 08:28:55 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1687782532; 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=m/fSQrh3AqOqxqH5X37BkjIgkbSIkWL7nr6LD5BoZqM=; b=SoaRlU2STDLk0aoQifscK3BuczGR9J6Hu4t5UkomySGpSb6My0T9xzmw9BnDO4JW8E8P2f v4wnxIFLlQXNMHPduqnjTYz04oE1ax0eKsBGcS4bkPygQ3yfW1EJj2SJxm6SK+VlztfyUH o/HEvEE5kMVPJGwzQ67G2L/dqnRWI+M= Received: from mail-lf1-f72.google.com (mail-lf1-f72.google.com [209.85.167.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-222-DD7622xVPZStV1k54H8f7w-1; Mon, 26 Jun 2023 08:28:51 -0400 X-MC-Unique: DD7622xVPZStV1k54H8f7w-1 Received: by mail-lf1-f72.google.com with SMTP id 2adb3069b0e04-4fb7b4be07bso324198e87.1 for ; Mon, 26 Jun 2023 05:28:50 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687782529; x=1690374529; 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=m/fSQrh3AqOqxqH5X37BkjIgkbSIkWL7nr6LD5BoZqM=; b=ebujaBUp9ATbdglteifVtPotVNhFnmWW4ybOeI3wghx+iN1hnpFPHsUFNKppXQDA7T J2qR40r0Umk5hD9M0OzkqlEkmYLaRS/NuFKX1c7TdEVJPsyODHMckPs42k4AzJscBz2A Ymd9djcKN5PItDvnAHooOtbFJ6gq7dhizJcF2eIMzxlHwEVxFfF3yNVQB8MiM7TKhRKo I9aHejDcaDlGr7oHYstrkeVUhY8ulprdoI/sXuxWobZa6yQp8vy3ShTWlU0R/RxqXEaN QMpi9kZWJeQe7SK4T2LhwBfsXJ684SbKQEp3KOlBgTjhrJh3yZZpakd1SYcnaet+pN0U gadw== X-Gm-Message-State: AC+VfDyCdtXvYcJVQNxYXTqNilbc6SKciiG9nay/Z3LC6dT6KAR7ZUPp nAn/W5I89VJDd38U+V54BoANss6OKmYyekNtcMfxUJBu9CIlqSqnb46nnZzmy4fiHiYFPSBdouR xyPFbfaPuO1jFbXMCrwJ+bAnZX+AhW5Ywh6BD9tPAh2mvhxdKgnPyTPqUu/gOhNZKNVkY X-Received: by 2002:a19:e34a:0:b0:4f8:4263:42f with SMTP id c10-20020a19e34a000000b004f84263042fmr16129645lfk.17.1687782529105; Mon, 26 Jun 2023 05:28:49 -0700 (PDT) X-Received: by 2002:a19:e34a:0:b0:4f8:4263:42f with SMTP id c10-20020a19e34a000000b004f84263042fmr16129634lfk.17.1687782528767; Mon, 26 Jun 2023 05:28:48 -0700 (PDT) Received: from redhat.com ([2.52.156.102]) by smtp.gmail.com with ESMTPSA id r13-20020a05600c284d00b003f733c1129fsm7551958wmb.33.2023.06.26.05.28.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Jun 2023 05:28:48 -0700 (PDT) Date: Mon, 26 Jun 2023 08:28:46 -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 , Thomas Huth , Alex =?utf-8?q?Benn=C3=A9e?= , Stefano Garzarella Subject: [PULL 19/53] hw/virtio/vhost-vsock: Include missing 'virtio/virtio-bus.h' header 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_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Philippe Mathieu-Daudé 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 ‘vhost_vsock_common_start’: hw/virtio/vhost-vsock-common.c:51:5: error: unknown type name ‘VirtioBusClass’; did you mean ‘VirtioDeviceClass’? 51 | VirtioBusClass *k = VIRTIO_BUS_GET_CLASS(qbus); | ^~~~~~~~~~~~~~ | VirtioDeviceClass hw/virtio/vhost-vsock-common.c:51:25: error: implicit declaration of function ‘VIRTIO_BUS_GET_CLASS’; did you mean ‘VIRTIO_DEVICE_CLASS’? [-Werror=implicit-function-declaration] 51 | VirtioBusClass *k = VIRTIO_BUS_GET_CLASS(qbus); | ^~~~~~~~~~~~~~~~~~~~ | VIRTIO_DEVICE_CLASS Reviewed-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Thomas Huth Message-Id: <20230524093744.88442-8-philmd@linaro.org> Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin Reviewed-by: Alex Bennée 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" From patchwork Mon Jun 26 12:28:49 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: 696438 Delivered-To: patch@linaro.org Received: by 2002:adf:e885:0:0:0:0:0 with SMTP id d5csp3203812wrm; Mon, 26 Jun 2023 05:40:56 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5w+NKrClhUAjEeau9ShZrlempC3KYsBEVWNrx70RHWmcZrs79T9mqc720SkSo+HIbvjPc+ X-Received: by 2002:a05:620a:31aa:b0:765:43f0:f049 with SMTP id bi42-20020a05620a31aa00b0076543f0f049mr10952229qkb.56.1687783255891; Mon, 26 Jun 2023 05:40:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687783255; cv=none; d=google.com; s=arc-20160816; b=Vc34xRiBypGggudh3ekC5uLWwWEh+HOZFdlRlZHXW8dR0oXNBHbKkUd79yRkiy3uH7 d884MK6WRRF8G2nQTGDuYruT5InVyeBD1HAoGwmaP2HP8nzaeyFyFaJIp1Eq7fAwZu0n RCkOLIdpAs/sYTLnz8N3/y5eYWHXcJFaTCZYA0UeoADN3ZI/WKybh2mE/HXA/civoCfF Qioy1DDfBtIGKLrlleiKZRrb9rH63iLRtj4FT3uomGABov21bmbl4ktF2fJ1i6BSN2Mw l/oZaJ9fmYD/RmDr1DNkLWO3PAyPM41mW7hdv/F71CZr9bW0W/gNkSRe5KDh1Dt1cKeN 2rww== 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=p3R7bbX1OVcHwyYU8dbH6MaxjId8JlY7Jg13CA3d3Lg=; fh=b0OXIHipuTiLhvESrVB5FcKtQVSMfI4pXaUSbTK3/Jc=; b=e1YvjSmpTsPS0/muAWEplTUGWpeGjlr57rFplME+dUmb0w1iO/wkbKj/E87+l9MHP3 m0EJfmRnSSuZ9NQVzndnq1F5PNdlzkRYfflTAQsUU2dq5BeOETahMUof8ysdkAgLKqF2 sFL+7DWD2FpAjroKKP1vdDL29Y0Guzf1cjez8d3sj5JdAtgnkBLsAISqIpF3QtV5JCO7 ufkavs+r1CWxqr0ZA92aJomFbg5Z5xnOafHBf8JjElf7X6Gim7FcFD3pmAeUI4dgEmCe cOBCKfsKEGx+8IuvT6LY/hNaDgu3N1r3vzqrFqpK8VufJvsA7UwFS8EX/uhtdCyWphGu PIPw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=A+afMQ0U; 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 a3-20020a05620a438300b0073baab85585si1931630qkp.297.2023.06.26.05.40.55 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 26 Jun 2023 05:40:55 -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=A+afMQ0U; 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 1qDlMR-0005S8-98; Mon, 26 Jun 2023 08:30:27 -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 1qDlL0-0002NU-LZ for qemu-devel@nongnu.org; Mon, 26 Jun 2023 08:29:00 -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 1qDlKx-00032E-9a for qemu-devel@nongnu.org; Mon, 26 Jun 2023 08:28:57 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1687782534; 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=p3R7bbX1OVcHwyYU8dbH6MaxjId8JlY7Jg13CA3d3Lg=; b=A+afMQ0UqVRO/Io7gVdV+QfcOxb1Jv7mNq1EiSh+lTdQ1WQdkdqcjzeC1/02oFgiwvIlPm Ly8ZphUx+GIe+JXt8WaGwUpwGn8f0lRb7ds3H9khSlCEeNiqAfJ0cFn4NZuuWr2ywyCVG/ FfgbpDiYsgorTUwBWgYQkE/2HS7to44= Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-324-e7PrP15wP5qFLmZW_dgkbw-1; Mon, 26 Jun 2023 08:28:53 -0400 X-MC-Unique: e7PrP15wP5qFLmZW_dgkbw-1 Received: by mail-wr1-f71.google.com with SMTP id ffacd0b85a97d-313f371b0d9so385488f8f.3 for ; Mon, 26 Jun 2023 05:28:53 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687782532; x=1690374532; 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=p3R7bbX1OVcHwyYU8dbH6MaxjId8JlY7Jg13CA3d3Lg=; b=kXw4CCwjznRnHLJbakA+sB9CkxIne1OPh1ka1AWxv5VF96zCwiMHIZNjMBPuc0JyRc TGuYmpL1/Fbe0SX3N6RSoEmdBP61BP8z1aBpGpOJPfsXM7dPGhU+vQdA86lD31Qj6h4t /5MjSa4uVDBc+/fSyBlYvid3AH6wEn0q2mupPgwZJj8nojJytDQWNrfrssN2QJwDQqkA wXgLv6so8pXbqlYjTRiLMNfEt+vn8twQr5ae+32TAo38mWOXugvV39ntQzNA+8I4Q6wJ IvowcsHAxVWriemk9bKqvDBH4ejMCB0bd+nl/0ytrR9qDX8ICYosQVWoHfZIB8BZEfs1 /sew== X-Gm-Message-State: AC+VfDxKFhUrTBprzKCsJB+dEfPOP0dFOCb0o0tZciUSFy+vxIb4Zs9/ qwxJ92m2GwoaZjKJi47PbjymMHFupi8OSxBIMQoEkQsEfPpsfskwR9Y92WmCEVywb5NFnUhwIVa zBcCJSDpxL7VQnmMKBAS3OoCL7Gw54Lpatgw5Oi+snZsxHI+FW+B+gOW+rQiwYX4MKGo8 X-Received: by 2002:adf:f80e:0:b0:313:f3c5:dac9 with SMTP id s14-20020adff80e000000b00313f3c5dac9mr1227676wrp.41.1687782531995; Mon, 26 Jun 2023 05:28:51 -0700 (PDT) X-Received: by 2002:adf:f80e:0:b0:313:f3c5:dac9 with SMTP id s14-20020adff80e000000b00313f3c5dac9mr1227660wrp.41.1687782531723; Mon, 26 Jun 2023 05:28:51 -0700 (PDT) Received: from redhat.com ([2.52.156.102]) by smtp.gmail.com with ESMTPSA id v11-20020a5d610b000000b00313e2abfb8dsm6719036wrt.92.2023.06.26.05.28.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Jun 2023 05:28:51 -0700 (PDT) Date: Mon, 26 Jun 2023 08:28:49 -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 , Eric Auger , Alex =?utf-8?q?Benn=C3=A9e?= Subject: [PULL 20/53] hw/virtio/virtio-iommu: Use target-agnostic qemu_target_page_mask() 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_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Philippe Mathieu-Daudé 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é Reviewed-by: Richard Henderson Reviewed-by: Eric Auger Message-Id: <20230524093744.88442-9-philmd@linaro.org> Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin Reviewed-by: Alex Bennée --- 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 = s->boot_bypass; - s->config.page_size_mask = TARGET_PAGE_MASK; + s->config.page_size_mask = qemu_target_page_mask(); s->config.input_range.end = UINT64_MAX; s->config.domain_range.end = UINT32_MAX; s->config.probe_size = VIOMMU_PROBE_SIZE; From patchwork Mon Jun 26 12:28:52 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: 696437 Delivered-To: patch@linaro.org Received: by 2002:adf:e885:0:0:0:0:0 with SMTP id d5csp3202537wrm; Mon, 26 Jun 2023 05:38:05 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7b0FWmnsDss745NbCE9Xj7ectu65BmMW0T0nqibXjHnlevcyTnUYklCAlMXR0O9383AIvE X-Received: by 2002:a05:622a:19a2:b0:3e6:3611:46a1 with SMTP id u34-20020a05622a19a200b003e6361146a1mr36228584qtc.9.1687783085162; Mon, 26 Jun 2023 05:38:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687783085; cv=none; d=google.com; s=arc-20160816; b=xdGx7RjrF88NOOwmZ89VF7GgosStIBETHJuUAtq8SG3zrU8pUteSrKatMmYWtBt+G+ 31emHyQDtjPgEKsSHGZYW3qaaMxwRV2VUbTBBpGrUp7Mc2uzpWArdXojI6k2dQXGkhxe ToloNtaIUcKWJ/v/gnVgz3X1G81zD/q0qrzNtlQzhwf0gFGNLuJf6f5QXXwnNCEOW8sx 6dwqmYOJSSXTG5hsvgzNqWVtwNIB+Zx46JQAW79uSg+zounu3JtzO20QjtKyLuUUWWzP jo2aXQ3LUF8i9RWYcHOx+hAiYGFL51I6pxz5HG2wpGyjwSAfOSDNZJTgSV/f84FPyWCb MIhw== 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=cmYTDPAI2xgJjGZMucMrx6UGF1BWykf5qDnfD2qNmBs=; fh=87FdFnKi1mHZhR13ApyBCRXQK1XDSG5EDt7layh6e50=; b=EXbsaQeqIQt3pBySc25Kadqa/lDBqsYms4xS3G4KsmkPDhw9cT+VR2lunWp1lyptlT MVGooPFGm+Pr1csmuq9+bf3sXA1MvW2fZYcEulLaXKsA6zAZ3bDLlgFUlkYvsTRubDH2 nqN2um99N9iih3s7xOKP1wAbqnsNIKrxWvLFJcSKdaAHuCVXlgLBokq7q0f6JV4655G6 llHbqd495oGiitPTJozEJxz0gv3Zn0/WxmBYmvj8tPDBkye8HZm0LMRgqrFGlO/Xr3i2 AVoG2fwxsbLIza7YHIaUk7b/fMnHEfcdQPDVzfLlN/SBMLKpNMZqiWWqPC0fAE+BjeFO mNHg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b="CMdQ7W/l"; 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 c3-20020ac87d83000000b003eca9c6d28csi1783034qtd.650.2023.06.26.05.38.05 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 26 Jun 2023 05:38:05 -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="CMdQ7W/l"; 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 1qDlLv-0003G8-Bv; Mon, 26 Jun 2023 08:29:55 -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 1qDlL5-0002QS-BR for qemu-devel@nongnu.org; Mon, 26 Jun 2023 08:29:11 -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 1qDlL1-00032w-Su for qemu-devel@nongnu.org; Mon, 26 Jun 2023 08:29:01 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1687782539; 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=cmYTDPAI2xgJjGZMucMrx6UGF1BWykf5qDnfD2qNmBs=; b=CMdQ7W/lYiWS//lw17PD3cVnwSPJucXJ41onxsxBXHGLWADJpN+wRc/snDFBRhhccdcjXC K/bJid8p1BxeNbkAjhiaX2045R08thkmfP4yfJ7x2RwsW1Fzf7YjuKN4mQeKnpYDU62t4Q InVMi6vLK4Q7sg1hexy7fGr7YYLsmfk= Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-630-pE9RZE-_NxSM-k5QQK8b3A-1; Mon, 26 Jun 2023 08:28:57 -0400 X-MC-Unique: pE9RZE-_NxSM-k5QQK8b3A-1 Received: by mail-wm1-f71.google.com with SMTP id 5b1f17b1804b1-3fa8f8fb7b3so27935215e9.2 for ; Mon, 26 Jun 2023 05:28:57 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687782536; x=1690374536; 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=cmYTDPAI2xgJjGZMucMrx6UGF1BWykf5qDnfD2qNmBs=; b=DaeNmwY3G7MivMcyJa6Z8/f9oQP0V8ycY3S1Fm792MEpO1+cZM+zvHJpByThPo6j8y cVZNtYjd7PPpT6d+eDPZyh7/HU1zhn6hYTu2qnN7ohw718xyxZyOYxMLp7IBTqprxPlB d7jfGZO9s2k1gJT8niD0L8Q173quMoA7e6IZ4eWZhD+Nj2b2ZnrrkDicvI419kXaAozk CFGegDLmuP8ZLN9BWQZt9Ry3Cef9g42DGLXa25NV3keWpB/Z1HJ0iJbm/6Izm0DHQN+p lTD3FqjwuZhyvFc7jdvNnw5i9kAM2IJAcCRVblo1YW6cMxdaj1O29eMsYrqG7fQuqyAV mhBQ== X-Gm-Message-State: AC+VfDyBuqVF3M39YwCTo1gPIl5YkypVHxpnBiUsNbFXPnliJ6j/TLGN 0A98UclqsvzEWLG5RzzHaPKn1TLHMixvRGELLTzW/jpoKEN7tX/TdIx6rRNPSWxV6gR0qBgFinK d8f2y2NmJfACYq5Eu7psp3YooXpmH/PDjRNXlAc7TBy9s+Coo0GtH949LGcpsIaPo+mBK X-Received: by 2002:a05:600c:28e:b0:3fa:8aed:d57f with SMTP id 14-20020a05600c028e00b003fa8aedd57fmr5192259wmk.24.1687782536270; Mon, 26 Jun 2023 05:28:56 -0700 (PDT) X-Received: by 2002:a05:600c:28e:b0:3fa:8aed:d57f with SMTP id 14-20020a05600c028e00b003fa8aedd57fmr5192229wmk.24.1687782535945; Mon, 26 Jun 2023 05:28:55 -0700 (PDT) Received: from redhat.com ([2.52.156.102]) by smtp.gmail.com with ESMTPSA id c21-20020a7bc855000000b003f8fac0ad4bsm7510243wml.17.2023.06.26.05.28.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Jun 2023 05:28:55 -0700 (PDT) Date: Mon, 26 Jun 2023 08:28:52 -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 , Thomas Huth , Alex =?utf-8?q?Benn=C3=A9e?= , Stefan Hajnoczi , Kevin Wolf , Hanna Reitz , Cornelia Huck , Halil Pasic , Eric Farman , Christian Borntraeger , David Hildenbrand , Ilya Leoshkevich , Paolo Bonzini , Fam Zheng , Raphael Norwitz , "Gonglei (Arei)" , Eric Auger , qemu-block@nongnu.org, qemu-s390x@nongnu.org Subject: [PULL 21/53] hw/virtio: Remove unnecessary 'virtio-access.h' header Message-ID: <4ee4667ded5841ff9278d4e4a4c765a3220023bf.1687782442.git.mst@redhat.com> 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_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Philippe Mathieu-Daudé 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é Acked-by: Richard Henderson Tested-by: Thomas Huth Message-Id: <20230524093744.88442-10-philmd@linaro.org> Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin Reviewed-by: Alex Bennée --- 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-blk.c index b90456c08c..c227b39408 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" diff --git a/hw/scsi/virtio-scsi-dataplane.c b/hw/scsi/virtio-scsi-dataplane.c index d55de4c8ca..1e684beebe 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" /* 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" /* * 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" 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" #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" From patchwork Mon Jun 26 12:28:56 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: 696440 Delivered-To: patch@linaro.org Received: by 2002:adf:e885:0:0:0:0:0 with SMTP id d5csp3203952wrm; Mon, 26 Jun 2023 05:41:14 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6gKXSXB+SPHv6WOAKFuWCJCz0QHM6i2eE71lZPz2A/vCDnBsc7KAtVEdsg9a+9xERq1YIp X-Received: by 2002:ac8:5f90:0:b0:400:7b00:a119 with SMTP id j16-20020ac85f90000000b004007b00a119mr15133011qta.67.1687783273797; Mon, 26 Jun 2023 05:41:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687783273; cv=none; d=google.com; s=arc-20160816; b=IjurnXTYDu431kTk96nbVHTJ+G+LECuJiGK5wCOntLUYQD6ZekIna1269A+solEtAF oC5TqLxQxYE0tMGVP47Z2j23269hcidmlVNCTahbt+0UWOH+sjimbtt5p2pkv3RLuyeF 8Vqjp+EC9FUB4lqQYZTA0oxbrH8MEtRXOvhtBgSi0+cJ+ni+jVNidpssHAo3eDQhc6SI COFon2V0Le5LT52NwBFFsxj2iLRQk4zObnZJelAde44vjGL/qXc3SM7eXDGOwVKL+Wwl VAO1wfhMLN6nZK+CRbDEaih+lOvsWCPEjW5N2GIEfN51f7ihd6PZ+wwrkOhMbTpS+wSa mspQ== 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=H0oeErSXAGqtdLlL9WwcgUJY5/rn+3CrQVAQVjQGGBg=; fh=M4sllbSMXI8HuEaY7KjzCYz/9sObLlVm/IylCa24q6o=; b=o3jlB9m6ZyDBcPtLTyzI0wMXSbCaifx4MeZJsxQ6qQ+nXJnV4f6r9s0scAu5zehtkw oznLQe3EVJO9AM7qcK4XL/InEOWly7df4k9l/gj++TYU0IW2NNZFi9TGJPIzXwVthEzd 3e47SyhCzeiGtBYc6ssrWXm64KZY4rmomj3EWj2KZHIpWm8jhlhiSWBVKRAHC2pQuS90 /tvtoXbIbt0Dkf51IpOZ76T0MceFDjIQ0IFv0WiH+ovwH0KdOOSdaafeNfVohmbY9KeH ytTJmce67vLwmoQfbnK9LVhFpzOjuxBbbrhkmf77Bz8dF9IBubimf49y+2M/IaHFKvwq 5GBw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=TjF6g1Bw; 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 v17-20020ac85791000000b003f9a6f0f0d6si1847777qta.535.2023.06.26.05.41.13 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 26 Jun 2023 05:41:13 -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=TjF6g1Bw; 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 1qDlR5-00028m-Rb; Mon, 26 Jun 2023 08:35:18 -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 1qDlLB-0002TT-3X for qemu-devel@nongnu.org; Mon, 26 Jun 2023 08:29:12 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qDlL7-00033e-0g for qemu-devel@nongnu.org; Mon, 26 Jun 2023 08:29:07 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1687782543; 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=H0oeErSXAGqtdLlL9WwcgUJY5/rn+3CrQVAQVjQGGBg=; b=TjF6g1Bw9ukjDqP4XdECAE9P3dNPV9XAyNgj09483XVjKq3hhJ4jhCcz2NPJWWmE5l8Cx6 ovnFUXd8CxEtNFqg8oQstVwAgXCT5AoEeyiRSEbnHjPCZRNJe0uBPHaKimxx0duP0xgSYj MHEj3xOHVtWgrmC23PK5R50gn5pRZJk= Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-379-ZTQjL5VXN1e6qL90vEbXEA-1; Mon, 26 Jun 2023 08:29:01 -0400 X-MC-Unique: ZTQjL5VXN1e6qL90vEbXEA-1 Received: by mail-wm1-f69.google.com with SMTP id 5b1f17b1804b1-3fa979d0c32so3382305e9.2 for ; Mon, 26 Jun 2023 05:29:00 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687782539; x=1690374539; 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=H0oeErSXAGqtdLlL9WwcgUJY5/rn+3CrQVAQVjQGGBg=; b=XKmePHPPh6Z3rOI5zs/h0o0hTaB6MxeM2AvBTFXsfhDZFHmZ+9k8lY9HNXIAmiWKWx NSED+8LXEKUBpZTExSTB4c99xBjdEumDEYC24SD9LiM6GmYeLQt7rdG58CHdlxTj4flP e9zA2UPT3DtoZ4075Q5u2ekH8beh3xQBmjcyoFxv6XMNKmKLeTgF29AjQj7h07FUyBH8 KVyTnY2B7gFGI426iZGZ27fbQOyZ7m44cQ/V/790xk/NEwmsHCjRyfAeARXiGTehMhot +Wk3snhv67tDbiXxDf2kfkmhl4Q7B9pPHJAOcoBsklWwelq0Pn1QsSkVQkm+HHgNoAYZ Xl2Q== X-Gm-Message-State: AC+VfDwBtM8BsjgXUZI7KLAbwbyH95gMHFf9rYRDFwa+ry+2bx6VmPQv cfAdAXk99UKr1dop73qjPvz+BtYpFldhch5nRquEb9YkkHBYi37VP92TtT0XF58JJvZ6SYqlh4r Hxx9cQhRh6cTvwRYjMBToCgqZDej7Z71dYJyp8OmnBb9F5dwqEJJpnP/Aq9O9b0E/GWIj X-Received: by 2002:a5d:548e:0:b0:313:ed1b:3622 with SMTP id h14-20020a5d548e000000b00313ed1b3622mr2609368wrv.7.1687782539409; Mon, 26 Jun 2023 05:28:59 -0700 (PDT) X-Received: by 2002:a5d:548e:0:b0:313:ed1b:3622 with SMTP id h14-20020a5d548e000000b00313ed1b3622mr2609347wrv.7.1687782539072; Mon, 26 Jun 2023 05:28:59 -0700 (PDT) Received: from redhat.com ([2.52.156.102]) by smtp.gmail.com with ESMTPSA id t1-20020adfe441000000b00313f45f74a8sm1706603wrm.103.2023.06.26.05.28.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Jun 2023 05:28:58 -0700 (PDT) Date: Mon, 26 Jun 2023 08:28:56 -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 , Thomas Huth , Stefan Hajnoczi , Kevin Wolf , Hanna Reitz , Paolo Bonzini , Fam Zheng , qemu-block@nongnu.org Subject: [PULL 22/53] hw/virtio: Build various target-agnostic objects just once Message-ID: <7a0903f7ea8ac7e5b3191c9a2cfd1751b153f48c.1687782442.git.mst@redhat.com> 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.129.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_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Philippe Mathieu-Daudé 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é Reviewed-by: Richard Henderson Reviewed-by: Thomas Huth Message-Id: <20230524093744.88442-11-philmd@linaro.org> Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- 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..025b3b061b 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')) +system_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 43746700be..bb7d289aa0 100644 --- a/hw/scsi/meson.build +++ b/hw/scsi/meson.build @@ -1,5 +1,6 @@ scsi_ss = ss.source_set() specific_scsi_ss = ss.source_set() +virtio_scsi_ss = ss.source_set() specific_virtio_scsi_ss = ss.source_set() scsi_ss.add(files( @@ -15,12 +16,15 @@ scsi_ss.add(when: 'CONFIG_MEGASAS_SCSI_PCI', if_true: files('megasas.c')) scsi_ss.add(when: 'CONFIG_MPTSAS_SCSI_PCI', if_true: files('mptsas.c', 'mptconfig.c', 'mptendian.c')) scsi_ss.add(when: 'CONFIG_VMW_PVSCSI_SCSI_PCI', if_true: files('vmw_pvscsi.c')) -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-user-scsi.c')) + +specific_virtio_scsi_ss.add(files('virtio-scsi.c')) specific_virtio_scsi_ss.add(when: 'CONFIG_VHOST_SCSI_COMMON', if_true: files('vhost-scsi-common.c')) -specific_virtio_scsi_ss.add(when: 'CONFIG_VHOST_SCSI', if_true: files('vhost-scsi.c')) -specific_virtio_scsi_ss.add(when: 'CONFIG_VHOST_USER_SCSI', if_true: files('vhost-user-scsi.c')) specific_scsi_ss.add_all(when: 'CONFIG_VIRTIO_SCSI', if_true: specific_virtio_scsi_ss) +scsi_ss.add_all(when: 'CONFIG_VIRTIO_SCSI', if_true: virtio_scsi_ss) specific_scsi_ss.add(when: 'CONFIG_SPAPR_VSCSI', if_true: files('spapr_vscsi.c')) diff --git a/hw/virtio/meson.build b/hw/virtio/meson.build index a6ea5beae7..f32b22f61b 100644 --- a/hw/virtio/meson.build +++ b/hw/virtio/meson.build @@ -2,13 +2,18 @@ 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')) 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 - specific_virtio_ss.add(files('vhost.c', 'vhost-backend.c', 'vhost-iova-tree.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 specific_virtio_ss.add(when: 'CONFIG_VIRTIO_BALLOON', if_true: files('virtio-balloon.c')) -specific_virtio_ss.add(when: 'CONFIG_VIRTIO_CRYPTO', if_true: files('virtio-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-vsock.c')) specific_virtio_ss.add(when: 'CONFIG_VHOST_USER_VSOCK', if_true: files('vhost-user-vsock.c')) specific_virtio_ss.add(when: 'CONFIG_VIRTIO_RNG', if_true: files('virtio-rng.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-mem.c')) specific_virtio_ss.add(when: 'CONFIG_VHOST_USER_I2C', if_true: files('vhost-user-i2c.c')) specific_virtio_ss.add(when: 'CONFIG_VHOST_USER_RNG', if_true: files('vhost-user-rng.c')) specific_virtio_ss.add(when: 'CONFIG_VHOST_USER_GPIO', if_true: files('vhost-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')) virtio_pci_ss = ss.source_set() virtio_pci_ss.add(when: 'CONFIG_VHOST_VSOCK', if_true: files('vhost-vsock-pci.c'))