From nobody Tue Feb 10 20:07:04 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1597677696; cv=none; d=zohomail.com; s=zohoarc; b=UaGEGMhb0UuvdhfZe6RWhRqvcoUsN3i1z+l0Pe1cfppKMNTWQszDpg+IOh0CrXNAa5P7hBQGmOufRQLhgN93rB1whZJ9k6a8v6j907ORBo2Sohg7CV6QEPWxgyCPKFl9lDozpz3e5aXp2WgiygydeJV2tD/qBRGtQ/mx2w3YHG4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597677696; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=3C/7hgOHspBfIxBONsfiAWNW93qZIpPhApRZy9KVThY=; b=f1ZxkCHDepYcsAWdb8LRR5B+rWEpvvW2yfKyZXoyzPiScQVa2ZspUtyOD4oAVmHmO6tjJrWlvqyoDqvlfcqBn7IijT1BTbOeHhUP7hoB5vgoolLMGwZsqSg/UEp+sbxc3Qit8LVSQWWOIkfvr/S+hzEnQQcai28bQhJMCU/f4F0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1597677696308713.3490043574343; Mon, 17 Aug 2020 08:21:36 -0700 (PDT) Received: from localhost ([::1]:58972 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k7gx3-0007ur-2S for importer@patchew.org; Mon, 17 Aug 2020 11:21:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41686) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k7gHr-0005zr-VR for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:39:00 -0400 Received: from mail-wr1-x42a.google.com ([2a00:1450:4864:20::42a]:40723) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k7gHq-0006Ja-9y for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:38:59 -0400 Received: by mail-wr1-x42a.google.com with SMTP id l2so15252463wrc.7 for ; Mon, 17 Aug 2020 07:38:57 -0700 (PDT) Received: from donizetti.redhat.com ([2001:b07:6468:f312:a0d1:fc42:c610:f977]) by smtp.gmail.com with ESMTPSA id i22sm34966603wrb.45.2020.08.17.07.38.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Aug 2020 07:38:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=3C/7hgOHspBfIxBONsfiAWNW93qZIpPhApRZy9KVThY=; b=Pi7YQVO4jxzoAaWRhm/qCl5IDSHvNMrG5klVB2CCN3CmUw6cjzp55W2kLvndKjAPyE BkWM//RB5aHT8Ts1Jes8Jm89X+Id0ReKxtbCtenOAt84GhkoYFrvwf1+nRo4OBXn63gA pgAFyEpKga7rC1kmR3dOmXBOwaCm5DZcP35i0igbnUOqJvR3DgnB3TKCR/jdU/60tK3b 0hC4ncXme9CF7RjAW+riJ7FsYhWv4tY19/MRhGbfoyG9EMfiD+IvvnAwZlrXlrnq2nym PmbcDEPPcEvgwSm75yiYVjcqKGOq6eN7WUk0sWW/cUY25QrDhTmWwrEO5fiCFTfaIg/7 2ltQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=3C/7hgOHspBfIxBONsfiAWNW93qZIpPhApRZy9KVThY=; b=biF1DdDwGLH5s9zbg7HZCJyaT6KANTeisyRxvBGpYuZRld1NL2yoX9X3l3pfyrUnYY ITBg0ZmtsAumH4GkM8nMW6/5ZO2NSvojSe6xy0PYng6FUrMfjEzO+Hgmy7ixiobErdkm VZ4TnGvwwGRT6tsEDXE534BPOy9pSN9gLkpOnugd1uMM2AkW+TCuj8NrfhiW4g2xpQai wIHZKfCfspK5fWY0nsfv4veD397QvWqMlDpZOQyVcGcKhjip61bbPRzXRmQNZM0sNH9a KOoN2tSV4yPgaRsLBSSo31t0ZsGS5wATaAyMF7wO14EoiNug6923wYdnSY/nOMx4U6B5 idcQ== X-Gm-Message-State: AOAM530xTLIfAoeLzj9gqls0w8epIxRlem8YoEyG8DAPGZb2mF2s/9uI IqSQ3ruqhS18ereFzd9yFqVuZcYWD4A= X-Google-Smtp-Source: ABdhPJwQLvbbwyNFV49FrETW8Ao20tqm0iSftw46YNbVWso7mAn8cwpP7nOb5MJgm+4Y5tzISSAEnw== X-Received: by 2002:a5d:440e:: with SMTP id z14mr15506103wrq.422.1597675136611; Mon, 17 Aug 2020 07:38:56 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 092/150] meson: convert hw/vfio Date: Mon, 17 Aug 2020 16:36:25 +0200 Message-Id: <20200817143723.343284-93-pbonzini@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200817143723.343284-1-pbonzini@redhat.com> References: <20200817143723.343284-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::42a; envelope-from=paolo.bonzini@gmail.com; helo=mail-wr1-x42a.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: 0 X-Spam_score: 0.0 X-Spam_bar: / X-Spam_report: (0.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=1, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=no 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: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Marc-Andr=C3=A9 Lureau Signed-off-by: Marc-Andr=C3=A9 Lureau Signed-off-by: Paolo Bonzini --- hw/Makefile.objs | 1 - hw/meson.build | 1 + hw/vfio/Makefile.objs | 8 -------- hw/vfio/meson.build | 18 ++++++++++++++++++ 4 files changed, 19 insertions(+), 9 deletions(-) delete mode 100644 hw/vfio/Makefile.objs create mode 100644 hw/vfio/meson.build diff --git a/hw/Makefile.objs b/hw/Makefile.objs index a1cfb99334..f6e08f6660 100644 --- a/hw/Makefile.objs +++ b/hw/Makefile.objs @@ -31,7 +31,6 @@ devices-dirs-y +=3D ssi/ devices-dirs-y +=3D timer/ devices-dirs-$(CONFIG_TPM) +=3D tpm/ devices-dirs-y +=3D usb/ -devices-dirs-$(CONFIG_VFIO) +=3D vfio/ endif =20 common-obj-y +=3D $(devices-dirs-y) diff --git a/hw/meson.build b/hw/meson.build index 8338fc4408..4dafc8a08e 100644 --- a/hw/meson.build +++ b/hw/meson.build @@ -3,6 +3,7 @@ subdir('mem') subdir('nubus') subdir('semihosting') subdir('smbios') +subdir('vfio') subdir('virtio') subdir('watchdog') subdir('xen') diff --git a/hw/vfio/Makefile.objs b/hw/vfio/Makefile.objs deleted file mode 100644 index 9bb1c09e84..0000000000 --- a/hw/vfio/Makefile.objs +++ /dev/null @@ -1,8 +0,0 @@ -obj-y +=3D common.o spapr.o -obj-$(CONFIG_VFIO_PCI) +=3D pci.o pci-quirks.o display.o -obj-$(CONFIG_VFIO_CCW) +=3D ccw.o -obj-$(CONFIG_VFIO_PLATFORM) +=3D platform.o -obj-$(CONFIG_VFIO_XGMAC) +=3D calxeda-xgmac.o -obj-$(CONFIG_VFIO_AMD_XGBE) +=3D amd-xgbe.o -obj-$(CONFIG_VFIO_AP) +=3D ap.o -obj-$(CONFIG_VFIO_IGD) +=3D igd.o diff --git a/hw/vfio/meson.build b/hw/vfio/meson.build new file mode 100644 index 0000000000..37efa74018 --- /dev/null +++ b/hw/vfio/meson.build @@ -0,0 +1,18 @@ +vfio_ss =3D ss.source_set() +vfio_ss.add(files( + 'common.c', + 'spapr.c', +)) +vfio_ss.add(when: 'CONFIG_VFIO_PCI', if_true: files( + 'display.c', + 'pci-quirks.c', + 'pci.c', +)) +vfio_ss.add(when: 'CONFIG_VFIO_CCW', if_true: files('ccw.c')) +vfio_ss.add(when: 'CONFIG_VFIO_PLATFORM', if_true: files('platform.c')) +vfio_ss.add(when: 'CONFIG_VFIO_XGMAC', if_true: files('calxeda-xgmac.c')) +vfio_ss.add(when: 'CONFIG_VFIO_AMD_XGBE', if_true: files('amd-xgbe.c')) +vfio_ss.add(when: 'CONFIG_VFIO_AP', if_true: files('ap.c')) +vfio_ss.add(when: 'CONFIG_VFIO_IGD', if_true: files('igd.c')) + +specific_ss.add_all(when: 'CONFIG_VFIO', if_true: vfio_ss) --=20 2.26.2