From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.5 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4E7E5C4741F for ; Wed, 4 Nov 2020 11:58:50 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 9BC7420759 for ; Wed, 4 Nov 2020 11:58:49 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="fxTcmXgX" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9BC7420759 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:53568 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kaHRA-00081Y-GW for qemu-devel@archiver.kernel.org; Wed, 04 Nov 2020 06:58:48 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:58980) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kaHPj-0006Pl-Fn for qemu-devel@nongnu.org; Wed, 04 Nov 2020 06:57:19 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:36080) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kaHPh-0005Ux-SE for qemu-devel@nongnu.org; Wed, 04 Nov 2020 06:57:19 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1604491037; 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=h9N9vQkOiFB/kqp8hDYxqpCMoA8SWVc+vmUYHADsYyo=; b=fxTcmXgXxgkYlK1Hy0R5AiU1eGKN95rezBfqkd2OZKEi7DDzAm1/6aFeCWluoIb2bf+MP4 rBM4xncBq5yoKX3LHsvkKMjGiFiJ0ss5aG58KZUtBbOeolvVhM0AzWXf05VK/FoPedDVjL YV7JWXLKoBam+zca410GGEAFlfCGsqQ= Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-149-fT5q_wV9Mh-AhC8jYpuz0w-1; Wed, 04 Nov 2020 06:57:15 -0500 X-MC-Unique: fT5q_wV9Mh-AhC8jYpuz0w-1 Received: by mail-wr1-f69.google.com with SMTP id x16so9106478wrg.7 for ; Wed, 04 Nov 2020 03:57:15 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=h9N9vQkOiFB/kqp8hDYxqpCMoA8SWVc+vmUYHADsYyo=; b=HLC4rFC+0m2HU1KdhcpQZez6HwvJpD36G4T5pL6HBDAlXC6gmfQRC9Cso0YBn/cOnI uIgZO6IYumY+0Z5c3MSvYdybj21OJ2BDe01vm91Rm2DBYwST06ts1mMMKwyqnWK/QaMf njCuaZ6Dy5RVlvWRMcm33sRNXlqxePWIt0wK1DMxvvk9l4YXwaZgKFCq5Zi32A8w4Lgs HBKe/4xyy3Suzx9XS/HAbld1UUurVbRtp2Ool6lCEWVB2wneqK8O4EPWBvw8vm6i9aef w6qohHwgEIVFJzQR5XT+OYA8PgJZdxlvLXttZXqn8H4xO/LR5f1VO+E6I71dWhF0CmGU HADA== X-Gm-Message-State: AOAM530EVMSbKoQGx9c2q88IgAIHnZASdfRQz4f+blXdw4+9n8KLop2j JsJ2/T0v5SMA8nqbqvO9RPUW3S7cV4SpATBYYR6JTINdERFYCM7zBUxRAA+YYxjrnsj3xrm+/CV Otepk+y4C2fj3lBw= X-Received: by 2002:a5d:4d8b:: with SMTP id b11mr31372789wru.110.1604491034265; Wed, 04 Nov 2020 03:57:14 -0800 (PST) X-Google-Smtp-Source: ABdhPJwN0koyqHk7gdH1Giv0KqVa8qQLZSKGLW9xpRE4HtdyZDUWNh5PP6cMWuWKZPub6wD79JwdMg== X-Received: by 2002:a5d:4d8b:: with SMTP id b11mr31372760wru.110.1604491034108; Wed, 04 Nov 2020 03:57:14 -0800 (PST) Received: from x1w.redhat.com (234.red-83-42-66.dynamicip.rima-tde.net. [83.42.66.234]) by smtp.gmail.com with ESMTPSA id c10sm1816612wmb.20.2020.11.04.03.57.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Nov 2020 03:57:13 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH-for-5.2 v3 1/4] s390x: fix build for --without-default-devices Date: Wed, 4 Nov 2020 12:57:03 +0100 Message-Id: <20201104115706.3101190-2-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201104115706.3101190-1-philmd@redhat.com> References: <20201104115706.3101190-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=216.205.24.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/11/03 00:03:41 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] 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_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fam Zheng , Thomas Huth , "Daniel P . Berrange" , Matthew Rosato , David Hildenbrand , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Cornelia Huck , Christian Schoenebeck , Greg Kurz , Wainer dos Santos Moschetta , Halil Pasic , Christian Borntraeger , qemu-s390x@nongnu.org, Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: Cornelia Huck s390-pci-vfio.c calls into the vfio code, so we need it to be built conditionally on vfio (which implies CONFIG_LINUX). Reported-by: Philippe Mathieu-Daudé Fixes: cd7498d07fbb ("s390x/pci: Add routine to get the vfio dma available count") Signed-off-by: Cornelia Huck Message-Id: <20201103123237.718242-1-cohuck@redhat.com> Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé Acked-by: Greg Kurz Tested-by: Greg Kurz Signed-off-by: Philippe Mathieu-Daudé --- include/hw/s390x/s390-pci-vfio.h | 3 ++- hw/s390x/meson.build | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/include/hw/s390x/s390-pci-vfio.h b/include/hw/s390x/s390-pci-vfio.h index c7984905b3b..ff708aef500 100644 --- a/include/hw/s390x/s390-pci-vfio.h +++ b/include/hw/s390x/s390-pci-vfio.h @@ -13,8 +13,9 @@ #define HW_S390_PCI_VFIO_H #include "hw/s390x/s390-pci-bus.h" +#include CONFIG_DEVICES -#ifdef CONFIG_LINUX +#ifdef CONFIG_VFIO bool s390_pci_update_dma_avail(int fd, unsigned int *avail); S390PCIDMACount *s390_pci_start_dma_count(S390pciState *s, S390PCIBusDevice *pbdev); diff --git a/hw/s390x/meson.build b/hw/s390x/meson.build index f4663a83551..2a7818d94b9 100644 --- a/hw/s390x/meson.build +++ b/hw/s390x/meson.build @@ -27,7 +27,7 @@ )) s390x_ss.add(when: 'CONFIG_S390_CCW_VIRTIO', if_true: files('s390-virtio-ccw.c')) s390x_ss.add(when: 'CONFIG_TERMINAL3270', if_true: files('3270-ccw.c')) -s390x_ss.add(when: 'CONFIG_LINUX', if_true: files('s390-pci-vfio.c')) +s390x_ss.add(when: 'CONFIG_VFIO', if_true: files('s390-pci-vfio.c')) virtio_ss = ss.source_set() virtio_ss.add(files('virtio-ccw.c')) -- 2.26.2